diff --git a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 index 1c80536..ea42599 100644 --- a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 +++ b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 @@ -1,3 +1,3 @@ -source_md5="8801bba0aba8f4c2a5382186a295ef57" -dest_md5="90b91d4cd49b656f93e90d42e22ee829" +source_md5="b0989b0b32639e93e7bb9de031cc630c" +dest_md5="c7494eb2c4518e849d04bd411a623706" diff --git a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr index e915511..8fa7749 100644 Binary files a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr and b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr differ diff --git a/godot/PixelFJVerdana12pt.ttf b/godot/PixelFJVerdana12pt.ttf new file mode 100644 index 0000000..5531267 Binary files /dev/null and b/godot/PixelFJVerdana12pt.ttf differ diff --git a/godot/PolarisHRInstanced_font.ttf b/godot/PolarisHRInstanced_font.ttf new file mode 100644 index 0000000..55843ec Binary files /dev/null and b/godot/PolarisHRInstanced_font.ttf differ diff --git a/godot/animated_squirrell.tscn b/godot/animated_squirrell.tscn new file mode 100644 index 0000000..bb1ab62 --- /dev/null +++ b/godot/animated_squirrell.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://assets/squirrel_model.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/creature_animation.tscn" type="PackedScene" id=2] +[ext_resource path="res://animated_creature.gd" type="Script" id=3] +[ext_resource path="res://CursorInteractArea.tscn" type="PackedScene" id=4] +[ext_resource path="res://assets/audio/squirrel.ogg" type="AudioStream" id=5] +[ext_resource path="res://Sound.gd" type="Script" id=6] + +[sub_resource type="BoxShape" id=1] + +[node name="AnimatedSquirrel" type="Spatial"] +script = ExtResource( 3 ) + +[node name="creature" parent="." instance=ExtResource( 2 )] + +[node name="squirrel_model" parent="creature/animated" index="0" instance=ExtResource( 1 )] +transform = Transform( 0.492546, 0, 0.0860131, 0, 0.5, 0, -0.0860131, 0, 0.492546, -0.242217, -0.0997212, -1.38703 ) + +[node name="StaticBody" type="StaticBody" parent="."] + +[node name="CollisionShape" type="CollisionShape" parent="StaticBody"] +transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 1.39319, 0.163039 ) +shape = SubResource( 1 ) + +[node name="GoalInteractArea" parent="." instance=ExtResource( 4 )] +transform = Transform( 4, 0, 0, 0, 3.046, 0, 0, 0, 4, 0, 1.29309, 0 ) +on_interact_func = "_on_Cursor_goal" +call_array = [ "squirrel" ] + +[node name="Sound" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) +script = ExtResource( 6 ) + +[connection signal="interact" from="GoalInteractArea" to="Sound" method="play_sound"] + +[editable path="creature"] diff --git a/godot/assets/audio/squirrel.ogg b/godot/assets/audio/squirrel.ogg index 012704c..d3380c7 100644 --- a/godot/assets/audio/squirrel.ogg +++ b/godot/assets/audio/squirrel.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6b4410c1c43c82378c297a714f49dc6165b9715994e8fab0b422b0170077db7 -size 18639 +oid sha256:7d83b5d71ac6e6babb2ff6333af500ab750311dc9beb2d4098ab8e865a7f02ed +size 17115 diff --git a/godot/assets/audio/voice_lines/LineReader.gd b/godot/assets/audio/voice_lines/LineReader.gd index cd0ef34..070867e 100644 --- a/godot/assets/audio/voice_lines/LineReader.gd +++ b/godot/assets/audio/voice_lines/LineReader.gd @@ -49,7 +49,9 @@ func script_loop(): $ImpatienceTimer.start(impatience) while not completed and yield(self, "advance"): yield(read_line(line), "completed") - $ImpatienceTimer.start(impatience) + $ImpatienceTimer.start(impatience) + $ImpatienceTimer.stop() + yield(get_tree().create_timer(3), "timeout") var _err = get_tree().change_scene("res://screens/finished.tscn") diff --git a/godot/font.tres b/godot/font.tres new file mode 100644 index 0000000..1aa8da3 --- /dev/null +++ b/godot/font.tres @@ -0,0 +1,6 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://PixelFJVerdana12pt.ttf" type="DynamicFontData" id=1] + +[resource] +font_data = ExtResource( 1 ) diff --git a/godot/project.godot b/godot/project.godot index 01bbbb7..a9d7cdf 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -11,6 +11,7 @@ config_version=4 [application] config/name="Goodnight Jellybean" +run/main_scene="res://screens/disclaimer.tscn" config/icon="res://icon.png" [autoload] diff --git a/godot/screens/disclaimer.tscn b/godot/screens/disclaimer.tscn index d08d832..cfee0af 100644 --- a/godot/screens/disclaimer.tscn +++ b/godot/screens/disclaimer.tscn @@ -2,8 +2,7 @@ [ext_resource path="res://3DCursor.tscn" type="PackedScene" id=1] [ext_resource path="res://CursorInteractArea.tscn" type="PackedScene" id=2] - -[sub_resource type="Theme" id=1] +[ext_resource path="res://screens/theme.tres" type="Theme" id=3] [sub_resource type="Environment" id=2] background_mode = 1 @@ -42,15 +41,15 @@ transmission = Color( 1, 0, 0, 1 ) anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 1 -theme = SubResource( 1 ) +theme = ExtResource( 3 ) [node name="Label" type="Label" parent="CanvasLayer/Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 31.0 -margin_top = 22.0 -margin_right = -168.0 -margin_bottom = -92.0 +margin_left = 243.0 +margin_top = 18.0 +margin_right = -211.0 +margin_bottom = 842.0 mouse_filter = 1 text = "Welcome to Goodnight Jellybean! We're excited to have you join us on this educational adventure. @@ -89,7 +88,7 @@ KB_ACTIONS_PER_SECOND = 6.0 interact_brightness = 100.0 [node name="Camera" type="Camera" parent="."] -transform = Transform( 0.710849, -0.253477, 0.656082, 0, 0.932803, 0.360388, -0.703345, -0.256181, 0.663082, 5.46264, 2.36601, 5.69697 ) +transform = Transform( 0.710849, -0.253477, 0.656082, 0, 0.932803, 0.360388, -0.703345, -0.256181, 0.663082, 5.463, 4.002, 5.697 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.969906, 0, 0.24348, 0, 1, 0, -0.24348, 0, 0.969906, -0.095212, 0.028264, 4.01219 ) diff --git a/godot/screens/finished.tscn b/godot/screens/finished.tscn index 5224c3b..86090eb 100644 --- a/godot/screens/finished.tscn +++ b/godot/screens/finished.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://3DCursor.tscn" type="PackedScene" id=1] +[ext_resource path="res://screens/theme.tres" type="Theme" id=2] [sub_resource type="Theme" id=1] @@ -38,14 +39,15 @@ theme = SubResource( 1 ) [node name="Label" type="Label" parent="CanvasLayer/Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 31.0 -margin_top = 22.0 -margin_right = -168.0 -margin_bottom = -92.0 +margin_left = 182.0 +margin_top = 24.0 +margin_right = -173.0 +margin_bottom = -88.0 mouse_filter = 1 +theme = ExtResource( 2 ) text = "Congratulations on completing Goodnight Jellybean, brought to you by SoftWaves! -We hope you had fun using FunMouse(tm) and learning about all the different topics in the game. If you are feeling nauseous as a result of playing the game,, remember to take deep breaths and find a quiet place to rest. +We hope you had fun using FunMouse(tm) and learning about all the different topics in the game. If you are feeling nauseous as a result of playing the game, remember to take deep breaths and find a quiet place to rest. Thank you for playing! If you would like more fun learning, please insert CD 2 for more educational adventures from SoftWaves or order a copy of our catalog for more educational fun! Please write to us at Softwaves HQ, 123 Fun Learning Lane, Funville, USA 12345 and include a $5 bill to request a copy of our games catalog." autowrap = true diff --git a/godot/screens/theme.tres b/godot/screens/theme.tres new file mode 100644 index 0000000..65f5aee --- /dev/null +++ b/godot/screens/theme.tres @@ -0,0 +1,6 @@ +[gd_resource type="Theme" load_steps=2 format=2] + +[ext_resource path="res://font.tres" type="DynamicFont" id=1] + +[resource] +default_font = ExtResource( 1 ) diff --git a/godot/world.tscn b/godot/world.tscn index 45bf969..e56d991 100644 --- a/godot/world.tscn +++ b/godot/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=2] +[gd_scene load_steps=40 format=2] [ext_resource path="res://assets/effects/dithering/CanvasLayer.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/room/environment.tscn" type="PackedScene" id=2] @@ -10,6 +10,7 @@ [ext_resource path="res://AtticAmberLight.gd" type="Script" id=8] [ext_resource path="res://assets/audio/voice_lines/LineReader.tscn" type="PackedScene" id=9] [ext_resource path="res://animated_frog.tscn" type="PackedScene" id=10] +[ext_resource path="res://animated_squirrell.tscn" type="PackedScene" id=11] [sub_resource type="Environment" id=1] background_mode = 1 @@ -315,6 +316,13 @@ hop = true [node name="AnimatedFrog3" parent="." instance=ExtResource( 10 )] transform = Transform( -0.134924, 0, 0.210465, 0, 0.25, 0, -0.210465, 0, -0.134924, -24.9938, 12.6545, -2.18772 ) + +[node name="AnimatedSquirrel" parent="." instance=ExtResource( 11 )] +transform = Transform( -0.175053, 0, -0.178484, 0, 0.25, 0, 0.178484, 0, -0.175053, 2.91965, 2.82708, 1.3549 ) +hop = true + +[node name="AnimatedSquirrel2" parent="." instance=ExtResource( 11 )] +transform = Transform( -0.23556, 0, -0.0837355, 0, 0.25, 0, 0.0837355, 0, -0.23556, 1.2157, -3.69864, 14.5479 ) hop = true [connection signal="motion_status" from="AnimationTree" to="3DCursor" method="_on_AnimationTree_motion_status"]