diff --git a/fonts/ALittleNameCalled.tres b/fonts/ALittleNameCalled.tres index 2029386e2..51164dd1f 100644 --- a/fonts/ALittleNameCalled.tres +++ b/fonts/ALittleNameCalled.tres @@ -3,7 +3,4 @@ [ext_resource path="res://fonts/ALittleNameCalle.ttf" type="DynamicFontData" id=1] [resource] -size = 48 -outline_size = 3 -outline_color = Color( 0, 0, 0, 1 ) font_data = ExtResource( 1 ) diff --git a/scenes/levels/story_mode/StoryMode.tscn b/scenes/levels/story_mode/StoryMode.tscn index 099668455..f300cd27c 100644 --- a/scenes/levels/story_mode/StoryMode.tscn +++ b/scenes/levels/story_mode/StoryMode.tscn @@ -325,10 +325,10 @@ position = Vector2( 2, -120 ) texture = ExtResource( 23 ) [node name="TalkToLabel" parent="YSort/Characters/LadderMan" index="2"] -margin_left = 39.0 -margin_top = -150.0 -margin_right = 159.0 -margin_bottom = -136.0 +margin_left = -127.0 +margin_top = 10.0 +margin_right = 137.0 +margin_bottom = 24.0 text = "[Q] Talk to Ladder Man" [node name="Stone" parent="YSort/Characters" instance=ExtResource( 5 )] @@ -341,9 +341,9 @@ position = Vector2( 2, -31 ) texture = ExtResource( 22 ) [node name="TalkToLabel" parent="YSort/Characters/Stone" index="2"] -margin_left = -66.0 +margin_left = -102.0 margin_top = 21.0 -margin_right = 20.0 +margin_right = 102.0 margin_bottom = 35.0 text = "[Q] Talk to Stone" @@ -361,10 +361,10 @@ position = Vector2( 2, -30 ) texture = ExtResource( 24 ) [node name="TalkToLabel" parent="YSort/Characters/Lever" index="2"] -margin_left = 33.0 -margin_top = -35.0 -margin_right = 119.0 -margin_bottom = -21.0 +margin_left = -26.0 +margin_top = 8.0 +margin_right = 130.0 +margin_bottom = 22.0 text = "[Q] Use Lever" [node name="Sign" parent="YSort/Characters" instance=ExtResource( 5 )] @@ -383,9 +383,9 @@ texture = ExtResource( 15 ) [node name="TalkToLabel" parent="YSort/Characters/Sign" index="2"] margin_left = -127.0 -margin_top = -29.0 -margin_right = -41.0 -margin_bottom = -15.0 +margin_top = 25.0 +margin_right = 65.0 +margin_bottom = 39.0 text = "[Q] Look at Sign" [node name="Donk" parent="YSort/Characters" instance=ExtResource( 5 )] @@ -399,6 +399,8 @@ position = Vector2( 0, -45 ) texture = SubResource( 1 ) [node name="TalkToLabel" parent="YSort/Characters/Donk" index="2"] +margin_left = -67.0 +margin_right = 209.0 text = "[Q] Talk to weird group" [node name="WizardDude" parent="YSort/Characters" instance=ExtResource( 5 )] @@ -425,9 +427,9 @@ scale = Vector2( 2, 2 ) texture = ExtResource( 37 ) [node name="TalkToLabel" parent="YSort/Characters/Sora" index="2"] -margin_left = -47.0 +margin_left = -100.0 margin_top = -80.0 -margin_right = 49.0 +margin_right = 92.0 margin_bottom = -66.0 text = "[Q] Talk to Sora" diff --git a/scenes/levels/story_mode/character/Character.tscn b/scenes/levels/story_mode/character/Character.tscn index f6224f955..405b2f1f5 100644 --- a/scenes/levels/story_mode/character/Character.tscn +++ b/scenes/levels/story_mode/character/Character.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/levels/story_mode/character/Character.gd" type="Script" id=1] +[ext_resource path="res://fonts/ALittleNameCalled.tres" type="DynamicFont" id=2] [sub_resource type="CircleShape2D" id=1] radius = 158.382 @@ -21,11 +22,12 @@ shape = SubResource( 1 ) position = Vector2( 2, -40 ) [node name="TalkToLabel" type="Label" parent="."] -margin_left = 28.0 -margin_top = -134.0 -margin_right = 114.0 -margin_bottom = -120.0 +margin_left = -53.0 +margin_top = -121.0 +margin_right = 115.0 +margin_bottom = -107.0 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 2 ) custom_styles/normal = SubResource( 2 ) text = "[B] Talk to %s" diff --git a/scenes/levels/story_mode/item/GroundItem.tscn b/scenes/levels/story_mode/item/GroundItem.tscn index fd9cfa192..70095ce5d 100644 --- a/scenes/levels/story_mode/item/GroundItem.tscn +++ b/scenes/levels/story_mode/item/GroundItem.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://sprites/food.png" type="Texture" id=1] [ext_resource path="res://scenes/levels/story_mode/item/GroundItem.gd" type="Script" id=2] +[ext_resource path="res://fonts/ALittleNameCalled.tres" type="DynamicFont" id=3] [sub_resource type="AtlasTexture" id=22] atlas = ExtResource( 1 ) @@ -27,11 +28,12 @@ position = Vector2( -1, 0 ) shape = SubResource( 23 ) [node name="PickupLabel" type="Label" parent="."] -margin_left = -34.0 +margin_left = -60.0 margin_top = -51.0 -margin_right = 35.0 +margin_right = 60.0 margin_bottom = -37.0 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 3 ) custom_styles/normal = SubResource( 24 ) text = "Pick up %s" diff --git a/sprites/jump/badplatform.png b/sprites/jump/badplatform.png new file mode 100644 index 000000000..87fc6cb34 Binary files /dev/null and b/sprites/jump/badplatform.png differ diff --git a/sprites/jump/badplatform.png.import b/sprites/jump/badplatform.png.import new file mode 100644 index 000000000..d5e926fad --- /dev/null +++ b/sprites/jump/badplatform.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/badplatform.png-fb89a24cfff1c3bf1da8b8ac32f48d77.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/jump/badplatform.png" +dest_files=[ "res://.import/badplatform.png-fb89a24cfff1c3bf1da8b8ac32f48d77.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/jump/badplatformparticlel.png b/sprites/jump/badplatformparticlel.png new file mode 100644 index 000000000..6bf98d0ae Binary files /dev/null and b/sprites/jump/badplatformparticlel.png differ diff --git a/sprites/jump/badplatformparticlel.png.import b/sprites/jump/badplatformparticlel.png.import new file mode 100644 index 000000000..7857269f6 --- /dev/null +++ b/sprites/jump/badplatformparticlel.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/badplatformparticlel.png-45b697d9a22d8aa4d77fa5abfce2dbdf.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/jump/badplatformparticlel.png" +dest_files=[ "res://.import/badplatformparticlel.png-45b697d9a22d8aa4d77fa5abfce2dbdf.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/jump/badplatformparticler.png b/sprites/jump/badplatformparticler.png new file mode 100644 index 000000000..854905a1e Binary files /dev/null and b/sprites/jump/badplatformparticler.png differ diff --git a/sprites/jump/badplatformparticler.png.import b/sprites/jump/badplatformparticler.png.import new file mode 100644 index 000000000..27b7c13d3 --- /dev/null +++ b/sprites/jump/badplatformparticler.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/badplatformparticler.png-3c5003851a97b94ae7ee482c489e3598.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/jump/badplatformparticler.png" +dest_files=[ "res://.import/badplatformparticler.png-3c5003851a97b94ae7ee482c489e3598.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/jump/movingplatform.png b/sprites/jump/movingplatform.png new file mode 100644 index 000000000..60c4ba4bb Binary files /dev/null and b/sprites/jump/movingplatform.png differ diff --git a/sprites/jump/movingplatform.png.import b/sprites/jump/movingplatform.png.import new file mode 100644 index 000000000..1eeb234b1 --- /dev/null +++ b/sprites/jump/movingplatform.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/movingplatform.png-c810713bb8f7e5c91f4dfb6704e5154b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/jump/movingplatform.png" +dest_files=[ "res://.import/movingplatform.png-c810713bb8f7e5c91f4dfb6704e5154b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/jump/normalplatform.png b/sprites/jump/normalplatform.png new file mode 100644 index 000000000..17c946eba Binary files /dev/null and b/sprites/jump/normalplatform.png differ diff --git a/sprites/jump/normalplatform.png.import b/sprites/jump/normalplatform.png.import new file mode 100644 index 000000000..ef2713b40 --- /dev/null +++ b/sprites/jump/normalplatform.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/normalplatform.png-32871bcf556ff228cf3d6280ec9a1fad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/jump/normalplatform.png" +dest_files=[ "res://.import/normalplatform.png-32871bcf556ff228cf3d6280ec9a1fad.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0