diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index c62df3d..f1b46b0 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -57,7 +57,7 @@ animations = [ { [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 5 +frame = 8 playing = true [node name="Nathan" type="Sprite" parent="Base"] @@ -67,13 +67,13 @@ texture = ExtResource( 4 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 1 +frame = 13 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 23 +frame = 2 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index 5a5bdfb..2e89c7c 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -39,7 +39,6 @@ custom_colors/font_color_bg = Color( 0.921569, 0.921569, 0.921569, 1 ) custom_colors/font_color_fg = Color( 1, 1, 1, 1 ) [node name="Pants" type="Tabs" parent="Wordrobe"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 31.0 @@ -76,9 +75,9 @@ margin_bottom = 112.0 texture_normal = ExtResource( 6 ) [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] -margin_top = 116.0 -margin_right = 106.0 -margin_bottom = 228.0 +margin_left = 440.0 +margin_right = 546.0 +margin_bottom = 112.0 rect_min_size = Vector2( 0, 112 ) custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) @@ -88,6 +87,7 @@ icon = ExtResource( 7 ) flat = true [node name="Shirts" type="Tabs" parent="Wordrobe"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 31.0 @@ -204,7 +204,6 @@ margin_bottom = 112.0 texture_normal = ExtResource( 20 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] -editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/project/src/GameScn.cs b/project/src/GameScn.cs index 9cf36fe..806bba5 100644 --- a/project/src/GameScn.cs +++ b/project/src/GameScn.cs @@ -12,7 +12,7 @@ public class GameScn : Node { void ChangeClothes(string path, ClothingType clothingType) { - var texture = ResourceLoader.Load($"res://{path}"); + var texture = ResourceLoader.Load($"res://sprites/{path}"); switch (clothingType) { @@ -35,7 +35,7 @@ public class GameScn : Node } } - TextureButton ClothingButton(string path, ClothingType clothingType) + TextureButton ClothesButton(string path, ClothingType clothingType) { switch (clothingType) { @@ -53,8 +53,12 @@ public class GameScn : Node public override void _Process(float delta) { - // Change clothes - if (ClothingButton("CanonCam", ClothingType.Accessory).IsPressed()) - ChangeClothes("sprites/camera.png", ClothingType.Accessory); + // Accessories + if (ClothesButton("CanonCam", ClothingType.Accessory).Pressed) + ChangeClothes("camera.png", ClothingType.Accessory); + + // Pants + if (ClothesButton("Jeans", ClothingType.Pants).Pressed) + ChangeClothes("jeans.svg", ClothingType.Pants); } } diff --git a/project/src/TitleScn.cs b/project/src/TitleScn.cs index eb21a2c..a968e25 100644 --- a/project/src/TitleScn.cs +++ b/project/src/TitleScn.cs @@ -4,11 +4,11 @@ using Godot; public class TitleScn : Node { void _on_PlayBtn_pressed() { - GetTree ().ChangeScene ("res://scn/GameScn.tscn"); + GetTree().ChangeScene("res://scn/GameScn.tscn"); } void _on_CreditsBtn_pressed() { - GetTree ().ChangeScene ("res://scn/CreditsScn.tscn"); + GetTree().ChangeScene("res://scn/CreditsScn.tscn"); } void _on_LicenseBtn_pressed() {