diff --git a/src/base-environments/youth_room/shaders/window.material b/src/base-environments/youth_room/shaders/window.material index e88393b..d0cb259 100644 Binary files a/src/base-environments/youth_room/shaders/window.material and b/src/base-environments/youth_room/shaders/window.material differ diff --git a/src/import/fonts/AtkinsonHyperlegible-Regular.md b/src/import/fonts/AtkinsonHyperlegible-Regular.md new file mode 100644 index 0000000..3343dc8 --- /dev/null +++ b/src/import/fonts/AtkinsonHyperlegible-Regular.md @@ -0,0 +1,33 @@ +# ATKINSON HYPERLEGIBLE FONT LICENSE + +Copyright © 2020, [Braille Institute of America, Inc.](https://www.brailleinstitute.org/freefont), with Reserved Typeface Name Atkinson Hyperlegible Font. + +## GENERAL +Copyright Holder allows the Font to be used, studied, modified and redistributed freely as long as it is not sold by itself. The Font, including any derivative works, may be bundled, embedded, redistributed and/or sold with any software or other work provided that the Reserved Typeface Name is not used on, in or by any derivative work. The Font and derivatives, however, cannot be released under any other type of license. The requirement for the Font to remain under this license does not apply to any document created using the Font or any of its derivatives. + +## DEFINITIONS +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + - “Copyright Holder” refers to Braille Institute of America, Inc. + - “Font” refers to the Atkinson Hyperlegible Font developed by Copyright Holder. + - "Font Software" refers to the set of files released by Copyright Holder under this license. This may include source files, build scripts and documentation. + - "Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + - "Original Version" refers to the collection of the Font Software components as distributed by Copyright Holder. + - "Reserved Typeface Name" refers to the name Atkinson Hyperlegible Font. + +## PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original Version or Modified Version, may be sold by itself. +2) The Original Version or Modified Version of the Font Software may be bundled, redistributed and/or sold with any other software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. +3) No Modified Version of the Font Software may use the Reserved Typeface Name unless explicit written permission is granted by Copyright Holder. This restriction only applies to the primary font name as presented to the users. +4) The name of Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version or any related software or other product, except: + a) to acknowledge the contribution(s) of Copyright Holder and the Author(s); or + b) with the prior written permission of Copyright Holder. +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. + +## TERMINATION +This license shall immediately terminate and become null and void if any of the above conditions are not met. + +## DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK OR OTHER RIGHT. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OF OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 02bad89..b027884 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -11,12 +11,23 @@ var noise: Noise = FastNoiseLite.new() var wiggle_tween var scale_tween +var transfor_arr: Array[Transform2D] = [ + Transform2D(0.9, Vector2(-125, -83)), + Transform2D(-0.3, Vector2(-126, -75)), + Transform2D(-0.3, Vector2(-126, -74)), + Transform2D(-0.3, Vector2(-126, -73)), + Transform2D(0.5, Vector2(-126, -77)) +] + @export var text: String = "" : set(value): text = value if get_children() != [] or Engine.is_editor_hint(): $Label.text = value + var curr_frame = text.hash() % $BackgroundSprite.sprite_frames.get_frame_count($BackgroundSprite.animation) $BackgroundSprite.frame = text.hash() % $BackgroundSprite.sprite_frames.get_frame_count($BackgroundSprite.animation) + $Label.rotation = deg_to_rad(transfor_arr[curr_frame].get_rotation()) + $Label.position = transfor_arr[curr_frame].origin if !Engine.is_editor_hint(): wiggle_pos = float(text.hash() % 100) _handle_wiggle(0) diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index 4a696a1..de06090 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -64,7 +64,7 @@ shape = SubResource("CapsuleShape2D_foovg") clip_children = 2 scale = Vector2(0.6, 0.6) sprite_frames = SubResource("SpriteFrames_ckivt") -frame = 1 +frame = 3 [node name="Label" type="Label" parent="."] anchors_preset = 8 @@ -72,12 +72,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -127.0 -offset_top = -82.5 -offset_right = 127.0 -offset_bottom = 82.5 +offset_left = -126.0 +offset_top = -77.0 +offset_right = 128.0 +offset_bottom = 88.0 grow_horizontal = 2 grow_vertical = 2 +rotation = 0.00872665 theme = ExtResource("3_rktsa") theme_type_variation = &"card_text" autowrap_mode = 3 diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn index 36c22ab..a9968fa 100644 --- a/src/logic-scenes/startup/startup.tscn +++ b/src/logic-scenes/startup/startup.tscn @@ -1,15 +1,19 @@ -[gd_scene load_steps=10 format=3 uid="uid://gldtxysavetf"] +[gd_scene load_steps=11 format=3 uid="uid://gldtxysavetf"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="1_8giso"] -[ext_resource type="Theme" uid="uid://dla4kae5kbwdh" path="res://logic-scenes/themes/system.theme" id="1_rf5xr"] +[ext_resource type="Theme" uid="uid://rtfhl42vrsq0" path="res://logic-scenes/themes/hyperlegible.theme" id="1_x555l"] [ext_resource type="Script" path="res://logic-scenes/startup/volume_sliders.gd" id="3_q2gbh"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_s5ssh"] +[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="5_7c77g"] [sub_resource type="GDScript" id="GDScript_a78qq"] script/source = "extends Panel @onready var show_navigation_buttons = $\"CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/margin/show nav ui\" +func _ready(): + theme = State.current_main_theme + func starting(): $\"CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/navbuttons/Next\".grab_focus() @@ -207,7 +211,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("1_rf5xr") +theme = ExtResource("1_x555l") script = SubResource("GDScript_a78qq") [node name="Label" type="Label" parent="."] @@ -693,6 +697,10 @@ grow_horizontal = 2 grow_vertical = 2 text = "I stream this game, please show content notes." +[node name="card" parent="." instance=ExtResource("5_7c77g")] +position = Vector2(1491, 598) +text = "I never put in much effort for Homework" + [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/Screenreader" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="_on_screenreader_toggled"] [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/margin2/show nav buttons" to="." method="_on_disable_rendering_toggled"] [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/simplified controls" to="." method="_on_simplified_controls_toggled"] diff --git a/src/logic-scenes/themes/easy-handwriting.theme b/src/logic-scenes/themes/easy-handwriting.theme index 1fe9c27..f79ad7e 100644 Binary files a/src/logic-scenes/themes/easy-handwriting.theme and b/src/logic-scenes/themes/easy-handwriting.theme differ diff --git a/src/logic-scenes/themes/hyperlegible.theme b/src/logic-scenes/themes/hyperlegible.theme new file mode 100644 index 0000000..23de0cb Binary files /dev/null and b/src/logic-scenes/themes/hyperlegible.theme differ diff --git a/src/logic-scenes/themes/system.theme b/src/logic-scenes/themes/system.theme index 3064aae..db3f0af 100644 Binary files a/src/logic-scenes/themes/system.theme and b/src/logic-scenes/themes/system.theme differ diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index 9042afb..b17625a 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -15,6 +15,8 @@ var allow_skipping: bool = false var stage_list:Array = [] var lock_focus: bool = false +var current_main_theme:Theme = preload("res://logic-scenes/themes/easy-handwriting.theme") + func _ready(): for child in get_parent().get_children(): if "has_stage" in child: