diff --git a/Scenes/Cutscene1.tscn b/Scenes/Cutscene1.tscn index 5e7908d..e75a1a6 100644 --- a/Scenes/Cutscene1.tscn +++ b/Scenes/Cutscene1.tscn @@ -170,6 +170,9 @@ margin_right = -24.0 margin_bottom = -12.0 custom_colors/default_color = Color( 0.196078, 0.2, 0.32549, 1 ) custom_fonts/normal_font = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="AnimationPlayer" type="AnimationPlayer" parent="DialogueBox"] anims/DialogueFade = SubResource( 3 ) @@ -178,6 +181,7 @@ anims/InitialFade = SubResource( 1 ) anims/RESET = SubResource( 2 ) [node name="ColorRect" type="ColorRect" parent="."] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 color = Color( 0, 0, 0, 1 ) diff --git a/Scenes/Cutscene3.tscn b/Scenes/Cutscene3.tscn index cadedce..584520a 100644 --- a/Scenes/Cutscene3.tscn +++ b/Scenes/Cutscene3.tscn @@ -142,6 +142,9 @@ tracks/1/keys = { anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} cutscene_name = "Cutscene3" next_scene_to_load = "TitleScreen" diff --git a/Scenes/SandboxScene.tscn b/Scenes/SandboxScene.tscn index fd705e4..6b207a2 100644 --- a/Scenes/SandboxScene.tscn +++ b/Scenes/SandboxScene.tscn @@ -4,9 +4,10 @@ [ext_resource path="res://Scripts/GameScene.gd" type="Script" id=5] [ext_resource path="res://Units/Player.tscn" type="PackedScene" id=6] -[node name="Scene" type="Node"] +[node name="Scene2" type="Node"] script = ExtResource( 5 ) tile_set_name = "TestTileSet" +camera_h_offset = null spawning = { Vector2( 12, 3 ): "NPC" } diff --git a/Scenes/TitleScreen.tscn b/Scenes/TitleScreen.tscn index 0b3c3ea..7cd4776 100644 --- a/Scenes/TitleScreen.tscn +++ b/Scenes/TitleScreen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://Scenes/TitleScreen/StartGame.tscn" type="PackedScene" id=1] [ext_resource path="res://Scenes/TitleScreen/MenuButton.tscn" type="PackedScene" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://Scenes/TitleScreen/FadeIn.tscn" type="PackedScene" id=4] [ext_resource path="res://Scenes/TitleScreen/StartGame.gd" type="Script" id=5] [ext_resource path="res://Scenes/Title_Screen.gd" type="Script" id=6] +[ext_resource path="res://Scenes/TitleScreen/the_title_thing.png" type="Texture" id=7] +[ext_resource path="res://Graphics/Background/sprite_3.png" type="Texture" id=8] [node name="TitleScreen" type="Control"] anchor_right = 1.0 @@ -15,79 +17,77 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Menu" type="VBoxContainer" parent="."] -margin_left = 120.0 -margin_top = 80.0 -margin_right = 904.0 -margin_bottom = 688.0 +[node name="TextureRect" type="TextureRect" parent="."] +margin_right = 1024.0 +margin_bottom = 768.0 +texture = ExtResource( 8 ) __meta__ = { "_edit_use_anchors_": false } -[node name="Logo" type="TextureRect" parent="Menu"] -margin_right = 784.0 +[node name="Logo" type="TextureRect" parent="."] +margin_left = -3.0 +margin_top = -95.0 +margin_right = 1021.0 +margin_bottom = 673.0 +texture = ExtResource( 7 ) stretch_mode = 4 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Menu" type="VBoxContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 323.0 +margin_top = 492.0 +margin_right = -341.0 +margin_bottom = -46.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="CenterRow" type="HBoxContainer" parent="Menu"] -margin_top = 4.0 -margin_right = 784.0 -margin_bottom = 608.0 +margin_right = 360.0 +margin_bottom = 230.0 size_flags_vertical = 3 [node name="Buttons" type="VBoxContainer" parent="Menu/CenterRow"] -margin_right = 390.0 -margin_bottom = 604.0 +margin_right = 360.0 +margin_bottom = 230.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 20 alignment = 1 [node name="StartGame" parent="Menu/CenterRow/Buttons" instance=ExtResource( 1 )] -margin_top = 192.0 -margin_right = 390.0 -margin_bottom = 252.0 +margin_left = 0.0 +margin_top = 5.0 +margin_right = 360.0 +margin_bottom = 65.0 rect_min_size = Vector2( 360, 60 ) flat = false script = ExtResource( 5 ) scene_to_load = "res://Scenes/Cutscene1.tscn" [node name="ManualButton" parent="Menu/CenterRow/Buttons" instance=ExtResource( 2 )] -margin_top = 272.0 -margin_right = 390.0 -margin_bottom = 332.0 +margin_left = 0.0 +margin_top = 85.0 +margin_right = 360.0 +margin_bottom = 145.0 rect_min_size = Vector2( 360, 60 ) flat = false script = ExtResource( 5 ) -__meta__ = { -"_edit_use_anchors_": false -} scene_to_load = "res://Scenes/TitleScreen/Manual.tscn" [node name="CreditsButton" parent="Menu/CenterRow/Buttons" instance=ExtResource( 3 )] -margin_top = 352.0 -margin_right = 390.0 -margin_bottom = 412.0 +margin_top = 165.0 +margin_right = 360.0 +margin_bottom = 225.0 rect_min_size = Vector2( 360, 60 ) -flat = false script = ExtResource( 5 ) -__meta__ = { -"_edit_use_anchors_": false -} scene_to_load = "res://Scenes/TitleScreen/Credits.tscn" -[node name="CenterContainer" type="CenterContainer" parent="Menu/CenterRow"] -margin_left = 394.0 -margin_right = 784.0 -margin_bottom = 604.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="Characters" type="TextureRect" parent="Menu/CenterRow/CenterContainer"] -margin_left = 195.0 -margin_top = 302.0 -margin_right = 195.0 -margin_bottom = 302.0 - [node name="Version Label" type="Label" parent="Menu"] visible = false margin_top = 308.0 diff --git a/Scenes/TitleScreen/Credits.png b/Scenes/TitleScreen/Credits.png new file mode 100644 index 0000000..c8ed0f9 Binary files /dev/null and b/Scenes/TitleScreen/Credits.png differ diff --git a/Scenes/TitleScreen/Credits.png.import b/Scenes/TitleScreen/Credits.png.import new file mode 100644 index 0000000..f20cf2d --- /dev/null +++ b/Scenes/TitleScreen/Credits.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Credits.png-32f9b04fdca679d11e93136bad05c549.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/TitleScreen/Credits.png" +dest_files=[ "res://.import/Credits.png-32f9b04fdca679d11e93136bad05c549.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=true +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=true +svg/scale=1.0 diff --git a/Scenes/TitleScreen/Credits.tscn b/Scenes/TitleScreen/Credits.tscn index 4ee5116..fd3cbf6 100644 --- a/Scenes/TitleScreen/Credits.tscn +++ b/Scenes/TitleScreen/Credits.tscn @@ -1,16 +1,56 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=4 format=2] -[ext_resource path="res://Scenes/TitleScreen/NewGAme.tscn" type="PackedScene" id=1] +[ext_resource path="res://Scenes/TitleScreen/new_dynamicfont.tres" type="DynamicFont" id=1] +[ext_resource path="res://Scenes/TitleScreen/ReturnToTitle.gd" type="Script" id=2] +[ext_resource path="res://Scenes/TitleScreen/Credits.png" type="Texture" id=3] -[node name="Credits" instance=ExtResource( 1 )] +[node name="Credits" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="VBoxContainer" parent="CenterContainer" index="0"] -margin_left = 414.0 -margin_right = 610.0 +[node name="TextureRect" type="TextureRect" parent="."] +margin_right = 2048.0 +margin_bottom = 1536.0 +rect_scale = Vector2( 0.5, 0.5 ) +texture = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Label" parent="CenterContainer/VBoxContainer" index="0"] -margin_right = 196.0 -text = "Credits" +[node name="CenterContainer" type="CenterContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -411.0 +margin_top = 306.0 +margin_right = -411.0 +margin_bottom = 306.0 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Button" parent="CenterContainer/VBoxContainer" index="1"] -margin_right = 196.0 +[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] +margin_left = 449.0 +margin_top = 330.0 +margin_right = 574.0 +margin_bottom = 438.0 + +[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"] +margin_right = 125.0 +margin_bottom = 49.0 +custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_constants/shadow_offset_x = 0 +custom_constants/shadow_offset_y = 5 +custom_fonts/font = ExtResource( 1 ) + +[node name="Button" type="Button" parent="CenterContainer/VBoxContainer"] +margin_top = 53.0 +margin_right = 125.0 +margin_bottom = 108.0 +custom_fonts/font = ExtResource( 1 ) +text = "Back" + +[connection signal="pressed" from="CenterContainer/VBoxContainer/Button" to="." method="_on_Button_pressed"] diff --git a/Scenes/TitleScreen/CreditsButton.tscn b/Scenes/TitleScreen/CreditsButton.tscn index 9e2482f..2e6b7bd 100644 --- a/Scenes/TitleScreen/CreditsButton.tscn +++ b/Scenes/TitleScreen/CreditsButton.tscn @@ -1,8 +1,19 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Scenes/TitleScreen/MenuButton.tscn" type="PackedScene" id=1] +[ext_resource path="res://Fonts/luckiest-guy/luckiest-guy.tres" type="DynamicFont" id=2] [node name="CreditsButton" instance=ExtResource( 1 )] +margin_left = 0.0 +margin_top = 0.0 +margin_right = 784.0 +margin_bottom = 20.0 +custom_fonts/font = ExtResource( 2 ) +flat = false [node name="Label" parent="." index="0"] +margin_left = 36.0 +margin_top = 11.0 +margin_right = 396.0 +margin_bottom = 71.0 text = "Credits" diff --git a/Scenes/TitleScreen/HowToPlay.png b/Scenes/TitleScreen/HowToPlay.png new file mode 100644 index 0000000..2bd1f94 Binary files /dev/null and b/Scenes/TitleScreen/HowToPlay.png differ diff --git a/Scenes/TitleScreen/HowToPlay.png.import b/Scenes/TitleScreen/HowToPlay.png.import new file mode 100644 index 0000000..d591b01 --- /dev/null +++ b/Scenes/TitleScreen/HowToPlay.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/HowToPlay.png-f7084e1c5d9f0e7c239b8ae978bed4cc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/TitleScreen/HowToPlay.png" +dest_files=[ "res://.import/HowToPlay.png-f7084e1c5d9f0e7c239b8ae978bed4cc.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=true +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=true +svg/scale=1.0 diff --git a/Scenes/TitleScreen/Manual.tscn b/Scenes/TitleScreen/Manual.tscn index 323623f..ad4e08c 100644 --- a/Scenes/TitleScreen/Manual.tscn +++ b/Scenes/TitleScreen/Manual.tscn @@ -1,16 +1,66 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://Scenes/TitleScreen/NewGAme.tscn" type="PackedScene" id=1] +[ext_resource path="res://Scenes/TitleScreen/new_dynamicfont.tres" type="DynamicFont" id=1] +[ext_resource path="res://Fonts/luckiest-guy/luckiest-guy.tres" type="DynamicFont" id=2] +[ext_resource path="res://Scenes/TitleScreen/HowToPlay.png" type="Texture" id=3] +[ext_resource path="res://Scenes/TitleScreen/ReturnToTitle.gd" type="Script" id=4] -[node name="Manual" instance=ExtResource( 1 )] +[node name="Manual" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -1.0 +margin_right = -1.0 +script = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="VBoxContainer" parent="CenterContainer" index="0"] -margin_left = 415.0 -margin_right = 608.0 +[node name="TextureRect" type="TextureRect" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -384.0 +margin_right = 512.0 +margin_bottom = 384.0 +texture = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Label" parent="CenterContainer/VBoxContainer" index="0"] +[node name="Button" type="Button" parent="."] +margin_left = 37.0 +margin_top = 688.0 +margin_right = 177.0 +margin_bottom = 745.0 +custom_fonts/font = ExtResource( 2 ) +text = "Back" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="CenterContainer" type="CenterContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] +margin_left = 512.0 +margin_top = 384.0 +margin_right = 512.0 +margin_bottom = 384.0 + +[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"] +visible = false margin_right = 193.0 +margin_bottom = 42.0 +custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) +custom_constants/shadow_offset_x = 0 +custom_constants/shadow_offset_y = 5 +custom_fonts/font = ExtResource( 1 ) text = "Manual" -[node name="Button" parent="CenterContainer/VBoxContainer" index="1"] -margin_right = 193.0 +[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"] diff --git a/Scenes/TitleScreen/StartGame.tscn b/Scenes/TitleScreen/StartGame.tscn index 81539d8..e5cc928 100644 --- a/Scenes/TitleScreen/StartGame.tscn +++ b/Scenes/TitleScreen/StartGame.tscn @@ -1,19 +1,26 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Graphics/Fonts/CC Wild Words Roman.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://Fonts/luckiest-guy/LuckiestGuy.ttf" type="DynamicFontData" id=1] [sub_resource type="DynamicFont" id=1] size = 48 font_data = ExtResource( 1 ) [node name="MenuButton" type="Button"] -margin_right = 784.0 -margin_bottom = 20.0 +margin_left = 3.0 +margin_top = 3.0 +margin_right = 787.0 +margin_bottom = 23.0 flat = true +__meta__ = { +"_edit_use_anchors_": false +} [node name="Label" type="Label" parent="."] -margin_right = 40.0 -margin_bottom = 14.0 +margin_left = 37.0 +margin_top = 16.0 +margin_right = 397.0 +margin_bottom = 76.0 rect_min_size = Vector2( 360, 60 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_offset_x = 0 diff --git a/Scenes/TitleScreen/new_dynamicfont.tres b/Scenes/TitleScreen/new_dynamicfont.tres index 2a64683..408b376 100644 --- a/Scenes/TitleScreen/new_dynamicfont.tres +++ b/Scenes/TitleScreen/new_dynamicfont.tres @@ -1,8 +1,7 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[sub_resource type="DynamicFontData" id=1] -font_path = "res://Graphics/Fonts/CC Wild Words Roman.ttf" +[ext_resource path="res://Fonts/luckiest-guy/LuckiestGuy.ttf" type="DynamicFontData" id=1] [resource] size = 48 -font_data = SubResource( 1 ) +font_data = ExtResource( 1 ) diff --git a/Scenes/TitleScreen/the_title_thing.png b/Scenes/TitleScreen/the_title_thing.png new file mode 100644 index 0000000..e7418ee Binary files /dev/null and b/Scenes/TitleScreen/the_title_thing.png differ diff --git a/Scenes/TitleScreen/the_title_thing.png.import b/Scenes/TitleScreen/the_title_thing.png.import new file mode 100644 index 0000000..dc46f61 --- /dev/null +++ b/Scenes/TitleScreen/the_title_thing.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/the_title_thing.png-299f495ccadbcefc873c509449982be9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/TitleScreen/the_title_thing.png" +dest_files=[ "res://.import/the_title_thing.png-299f495ccadbcefc873c509449982be9.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=true +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=true +svg/scale=1.0 diff --git a/Sounds/ski-67717.wav.import b/Sounds/ski-67717.wav.import index ad207d6..ed6ae53 100644 --- a/Sounds/ski-67717.wav.import +++ b/Sounds/ski-67717.wav.import @@ -17,7 +17,5 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop_mode=2 -edit/loop_begin=0 -edit/loop_end=-1 +edit/loop=false compress/mode=0