diff --git a/project/project.godot b/project/project.godot index 1263a65..cb47b4c 100644 --- a/project/project.godot +++ b/project/project.godot @@ -31,14 +31,12 @@ WinDialogs="*res://scn/WinDialogs.tscn" [debug] gdscript/completion/autocomplete_setters_and_getters=true -gdscript/warnings/unsafe_property_access=true -gdscript/warnings/unsafe_method_access=true -gdscript/warnings/unsafe_cast=true -gdscript/warnings/unsafe_call_argument=true [display] -window/size/resizable=false +window/dpi/allow_hidpi=true +window/stretch/mode="viewport" +window/stretch/aspect="keep" [input] diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index b0df14c..4a20c2f 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://sprites/tail/tail0.png" type="Texture" id=1] [ext_resource path="res://sprites/tail/tail1.png" type="Texture" id=2] @@ -22,6 +22,9 @@ [ext_resource path="res://sprites/mouth/mouth9.png" type="Texture" id=20] [ext_resource path="res://sprites/mouth/mouth10.png" type="Texture" id=21] [ext_resource path="res://sprites/mouth/mouth12.png" type="Texture" id=22] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=23] +[ext_resource path="res://sprites/bottoms_placeholder.png" type="Texture" id=24] +[ext_resource path="res://sprites/tops_placeholder.png" type="Texture" id=25] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -47,39 +50,44 @@ animations = [ { "speed": 4.0 } ] -[node name="Nathane" type="Node2D"] +[node name="Character" type="Node2D"] -[node name="Tail" type="AnimatedSprite" parent="."] -position = Vector2( 49.6951, 374.417 ) +[node name="Base" type="Node2D" parent="."] + +[node name="Tail" type="AnimatedSprite" parent="Base"] +position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 8 +frame = 6 playing = true -__meta__ = { -"_edit_lock_": true -} -[node name="Base" type="Sprite" parent="."] -position = Vector2( 91.6446, 354.064 ) +[node name="Nathan" type="Sprite" parent="Base"] +position = Vector2( 96.3522, 164.086 ) texture = ExtResource( 4 ) -__meta__ = { -"_edit_lock_": true -} -[node name="Eyes" type="AnimatedSprite" parent="."] -position = Vector2( 109.519, 253.9 ) +[node name="Eyes" type="AnimatedSprite" parent="Base"] +position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 2 +frame = 11 playing = true -__meta__ = { -"_edit_lock_": true -} -[node name="Mouth" type="AnimatedSprite" parent="."] -position = Vector2( 126.316, 257.474 ) +[node name="Mouth" type="AnimatedSprite" parent="Base"] +position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 2 +frame = 16 playing = true -__meta__ = { -"_edit_lock_": true -} +[node name="Undies" type="Sprite" parent="."] +position = Vector2( 86.5077, 256.295 ) +texture = ExtResource( 23 ) + +[node name="Bottom" type="Sprite" parent="."] +position = Vector2( 88.1872, 251.328 ) +texture = ExtResource( 24 ) + +[node name="Top" type="Sprite" parent="."] +position = Vector2( 96.3619, 160.432 ) +texture = ExtResource( 25 ) + +[node name="Accessory" type="Sprite" parent="."] +position = Vector2( 93.2243, 155.139 ) +texture = ExtResource( 25 ) diff --git a/project/scn/ClassicClothes.tscn b/project/scn/ClassicClothes.tscn index 08e76b9..2fadf5a 100644 --- a/project/scn/ClassicClothes.tscn +++ b/project/scn/ClassicClothes.tscn @@ -1,219 +1,256 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=45 format=2] -[ext_resource path="res://sprites/classic/briefs_classic.png" type="Texture" id=1] -[ext_resource path="res://src/ItemDrag.gd" type="Script" id=2] -[ext_resource path="res://sprites/classic/z_briefs_classic.png" type="Texture" id=3] -[ext_resource path="res://sprites/classic/fundosi_classic.png" type="Texture" id=4] -[ext_resource path="res://sprites/jeans.svg" type="Texture" id=5] -[ext_resource path="res://sprites/dj_shorts.png" type="Texture" id=6] -[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=7] -[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=8] -[ext_resource path="res://sprites/beat_up_jeans.png" type="Texture" id=9] -[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=10] -[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=11] -[ext_resource path="res://sprites/raw_shirt.png" type="Texture" id=12] -[ext_resource path="res://sprites/atomic_shirt.png" type="Texture" id=13] -[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=14] -[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=15] -[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=16] -[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=17] -[ext_resource path="res://sprites/classic/camera_classic.png" type="Texture" id=18] -[ext_resource path="res://sprites/classic/owo_censor_classic.png" type="Texture" id=19] +[ext_resource path="res://sprites/tail/tail0.png" type="Texture" id=1] +[ext_resource path="res://sprites/tail/tail1.png" type="Texture" id=2] +[ext_resource path="res://sprites/tail/tail2.png" type="Texture" id=3] +[ext_resource path="res://sprites/character_base.svg" type="Texture" id=4] +[ext_resource path="res://sprites/eyes/eyes1.png" type="Texture" id=5] +[ext_resource path="res://sprites/eyes/eyes2.png" type="Texture" id=6] +[ext_resource path="res://sprites/eyes/eyes3.png" type="Texture" id=7] +[ext_resource path="res://sprites/eyes/eyes4.png" type="Texture" id=8] +[ext_resource path="res://sprites/eyes/eyes5.png" type="Texture" id=9] +[ext_resource path="res://sprites/eyes/eyes6.png" type="Texture" id=10] +[ext_resource path="res://sprites/eyes/eyes7.png" type="Texture" id=11] +[ext_resource path="res://sprites/mouth/mouth.png" type="Texture" id=12] +[ext_resource path="res://sprites/mouth/mouth2.png" type="Texture" id=13] +[ext_resource path="res://sprites/mouth/mouth3.png" type="Texture" id=14] +[ext_resource path="res://sprites/mouth/mouth4.png" type="Texture" id=15] +[ext_resource path="res://sprites/mouth/mouth5.png" type="Texture" id=16] +[ext_resource path="res://sprites/mouth/mouth6.png" type="Texture" id=17] +[ext_resource path="res://sprites/mouth/mouth7.png" type="Texture" id=18] +[ext_resource path="res://sprites/mouth/mouth8.png" type="Texture" id=19] +[ext_resource path="res://sprites/mouth/mouth9.png" type="Texture" id=20] +[ext_resource path="res://sprites/mouth/mouth10.png" type="Texture" id=21] +[ext_resource path="res://sprites/mouth/mouth12.png" type="Texture" id=22] +[ext_resource path="res://sprites/classic/briefs_classic.png" type="Texture" id=23] +[ext_resource path="res://src/ItemDrag.gd" type="Script" id=24] +[ext_resource path="res://sprites/classic/z_briefs_classic.png" type="Texture" id=25] +[ext_resource path="res://sprites/classic/fundosi_classic.png" type="Texture" id=26] +[ext_resource path="res://sprites/jeans.svg" type="Texture" id=27] +[ext_resource path="res://sprites/dj_shorts.svg" type="Texture" id=28] +[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=29] +[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=30] +[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=31] +[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=32] +[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=33] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=34] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=35] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=36] +[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=37] +[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=38] +[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=39] +[ext_resource path="res://sprites/classic/camera_classic.png" type="Texture" id=40] +[ext_resource path="res://sprites/classic/owo_censor_classic.png" type="Texture" id=41] -[node name="Clothes" type="Control"] +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 1 ), ExtResource( 1 ), ExtResource( 1 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 3 ), ExtResource( 3 ) ], +"loop": true, +"name": "default", +"speed": 2.0 +} ] -[node name="Wordrobe" type="ReferenceRect" parent="."] -margin_left = 193.0 -margin_top = 17.0 -margin_right = 775.0 -margin_bottom = 527.0 -__meta__ = { -"_edit_lock_": true -} +[sub_resource type="SpriteFrames" id=2] +animations = [ { +"frames": [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 11 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] -[node name="Underwear" type="Control" parent="Wordrobe"] -margin_left = -197.0 -margin_top = -8.0 -margin_right = -197.0 -margin_bottom = -8.0 +[sub_resource type="SpriteFrames" id=3] +animations = [ { +"frames": [ ExtResource( 12 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 18 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 22 ) ], +"loop": true, +"name": "default", +"speed": 4.0 +} ] -[node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear"] -margin_left = 68.0 -margin_top = 391.0 -margin_right = 136.0 -margin_bottom = 425.0 -texture_normal = ExtResource( 1 ) -script = ExtResource( 2 ) +[node name="Clothes" type="Node"] -[node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear"] -margin_left = 375.0 -margin_top = 454.0 -margin_right = 443.0 -margin_bottom = 488.0 -texture_normal = ExtResource( 3 ) -script = ExtResource( 2 ) +[node name="Character" type="Node2D" parent="."] +editor/display_folded = true +position = Vector2( 129.236, 38.0905 ) -[node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear"] -margin_left = 512.0 -margin_top = 453.0 -margin_right = 580.0 -margin_bottom = 493.0 -texture_normal = ExtResource( 4 ) -script = ExtResource( 2 ) +[node name="Tail" type="AnimatedSprite" parent="Character"] +position = Vector2( -36.5244, 390.553 ) +frames = SubResource( 1 ) +playing = true -[node name="Bottoms" type="Control" parent="Wordrobe"] -margin_left = -197.0 -margin_top = -8.0 -margin_right = -197.0 -margin_bottom = -8.0 +[node name="Nathan" type="Sprite" parent="Character"] +position = Vector2( 5.42515, 370.2 ) +texture = ExtResource( 4 ) -[node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms"] -margin_left = 614.0 -margin_top = 292.0 -margin_right = 720.0 -margin_bottom = 404.0 -texture_normal = ExtResource( 5 ) -script = ExtResource( 2 ) +[node name="Eyes" type="AnimatedSprite" parent="Character"] +position = Vector2( 23.2995, 270.036 ) +frames = SubResource( 2 ) +frame = 15 +playing = true -[node name="DJ Shorts" type="TextureButton" parent="Wordrobe/Bottoms"] -margin_left = 628.0 -margin_top = 415.0 -margin_right = 734.0 -margin_bottom = 527.0 -texture_normal = ExtResource( 6 ) -script = ExtResource( 2 ) +[node name="Mouth" type="AnimatedSprite" parent="Character"] +position = Vector2( 40.0965, 273.61 ) +frames = SubResource( 3 ) +frame = 14 +playing = true -[node name="Sweats" type="TextureButton" parent="Wordrobe/Bottoms"] -margin_left = 484.0 -margin_top = 318.0 -margin_right = 590.0 -margin_bottom = 430.0 -texture_normal = ExtResource( 7 ) -script = ExtResource( 2 ) +[node name="Briefs" type="TextureButton" parent="."] +margin_left = 108.103 +margin_top = 449.068 +margin_right = 176.103 +margin_bottom = 483.068 +texture_normal = ExtResource( 23 ) +script = ExtResource( 24 ) -[node name="Blue Camo Jeans" type="TextureButton" parent="Wordrobe/Bottoms"] -margin_left = 234.0 -margin_top = 400.0 -margin_right = 340.0 -margin_bottom = 512.0 -texture_normal = ExtResource( 8 ) -script = ExtResource( 2 ) +[node name="ZBriefs" type="TextureButton" parent="."] +margin_left = 904.613 +margin_top = 137.606 +margin_right = 972.613 +margin_bottom = 171.606 +texture_normal = ExtResource( 25 ) +script = ExtResource( 24 ) -[node name="Beat Up Jeans" type="TextureButton" parent="Wordrobe/Bottoms"] -margin_left = 366.0 -margin_top = 316.0 -margin_right = 472.0 -margin_bottom = 428.0 -texture_normal = ExtResource( 9 ) -script = ExtResource( 2 ) +[node name="Fundosi" type="TextureButton" parent="."] +margin_left = 904.429 +margin_top = 46.3994 +margin_right = 972.429 +margin_bottom = 86.3994 +texture_normal = ExtResource( 26 ) +script = ExtResource( 24 ) -[node name="Tops" type="Control" parent="Wordrobe"] -margin_left = -197.0 -margin_top = -8.0 -margin_right = -197.0 -margin_bottom = -8.0 +[node name="Jeans" type="TextureButton" parent="."] +margin_left = 877.209 +margin_top = 330.098 +margin_right = 983.209 +margin_bottom = 442.098 +texture_normal = ExtResource( 27 ) +script = ExtResource( 24 ) -[node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 643.0 -margin_top = 34.0 -margin_right = 728.0 -margin_bottom = 144.0 -texture_normal = ExtResource( 10 ) -script = ExtResource( 2 ) +[node name="DJ Shorts" type="TextureButton" parent="."] +margin_left = 882.788 +margin_top = 452.045 +margin_right = 988.788 +margin_bottom = 564.045 +texture_normal = ExtResource( 28 ) +script = ExtResource( 24 ) -[node name="DJ Shirt" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 644.0 -margin_top = 156.0 -margin_right = 729.0 -margin_bottom = 271.0 -texture_normal = ExtResource( 11 ) -script = ExtResource( 2 ) +[node name="Sweats" type="TextureButton" parent="."] +margin_left = 744.929 +margin_top = 441.685 +margin_right = 850.929 +margin_bottom = 553.685 +texture_normal = ExtResource( 29 ) +script = ExtResource( 24 ) -[node name="Raw" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 247.0 -margin_top = 25.0 -margin_right = 332.0 -margin_bottom = 138.0 -texture_normal = ExtResource( 12 ) -script = ExtResource( 2 ) +[node name="Blue Camo Jeans" type="TextureButton" parent="."] +margin_left = 495.104 +margin_top = 434.94 +margin_right = 601.104 +margin_bottom = 546.94 +texture_normal = ExtResource( 30 ) +script = ExtResource( 24 ) -[node name="Atomic Shirt" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 518.0 -margin_top = 33.0 -margin_right = 603.0 -margin_bottom = 148.0 -texture_normal = ExtResource( 13 ) -script = ExtResource( 2 ) +[node name="Beat Up Jeans" type="TextureButton" parent="."] +margin_left = 623.246 +margin_top = 439.685 +margin_right = 729.246 +margin_bottom = 551.685 +texture_normal = ExtResource( 31 ) +script = ExtResource( 24 ) -[node name="Z Shirt" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 385.0 -margin_top = 178.0 -margin_right = 466.0 -margin_bottom = 293.0 -texture_normal = ExtResource( 14 ) -script = ExtResource( 2 ) +[node name="Sweatshirt" type="TextureButton" parent="."] +margin_left = 388.813 +margin_top = 432.874 +margin_right = 473.813 +margin_bottom = 542.874 +texture_normal = ExtResource( 32 ) +script = ExtResource( 24 ) -[node name="Biker Jacket" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 253.0 -margin_top = 275.0 -margin_right = 338.0 -margin_bottom = 390.0 -texture_normal = ExtResource( 15 ) -script = ExtResource( 2 ) +[node name="DJ Shirt" type="TextureButton" parent="."] +margin_left = 898.788 +margin_top = 219.361 +margin_right = 983.788 +margin_bottom = 334.361 +texture_normal = ExtResource( 33 ) +script = ExtResource( 24 ) -[node name="What's New" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 249.0 -margin_top = 150.0 -margin_right = 334.0 -margin_bottom = 265.0 -texture_normal = ExtResource( 16 ) -script = ExtResource( 2 ) +[node name="Raw" type="TextureButton" parent="."] +margin_left = 647.703 +margin_top = 160.841 +margin_right = 732.703 +margin_bottom = 275.841 +texture_normal = ExtResource( 34 ) +script = ExtResource( 24 ) -[node name="Train Shirt" type="TextureButton" parent="Wordrobe/Tops"] -margin_left = 512.0 -margin_top = 176.0 -margin_right = 597.0 -margin_bottom = 291.0 -texture_normal = ExtResource( 17 ) -script = ExtResource( 2 ) +[node name="Atomic Shirt" type="TextureButton" parent="."] +margin_left = 392.345 +margin_top = 282.289 +margin_right = 477.345 +margin_bottom = 397.289 +texture_normal = ExtResource( 35 ) +script = ExtResource( 24 ) -[node name="Accessories" type="Control" parent="Wordrobe"] -margin_left = -197.0 -margin_top = -8.0 -margin_right = -197.0 -margin_bottom = -8.0 +[node name="Z Shirt" type="TextureButton" parent="."] +margin_left = 642.246 +margin_top = 301.685 +margin_right = 723.246 +margin_bottom = 416.685 +texture_normal = ExtResource( 36 ) +script = ExtResource( 24 ) -[node name="Camera" type="TextureButton" parent="Wordrobe/Accessories"] -margin_left = 398.0 -margin_top = 94.0 -margin_right = 447.0 -margin_bottom = 156.0 -texture_normal = ExtResource( 18 ) -script = ExtResource( 2 ) +[node name="Biker Jacket" type="TextureButton" parent="."] +margin_left = 515.157 +margin_top = 300.466 +margin_right = 600.157 +margin_bottom = 415.466 +texture_normal = ExtResource( 37 ) +script = ExtResource( 24 ) -[node name="OwO Censor" type="TextureButton" parent="Wordrobe/Accessories"] -margin_left = 369.0 -margin_top = 16.0 -margin_right = 475.0 -margin_bottom = 56.0 -texture_normal = ExtResource( 19 ) -script = ExtResource( 2 ) +[node name="What's New" type="TextureButton" parent="."] +margin_left = 767.044 +margin_top = 170.297 +margin_right = 852.044 +margin_bottom = 285.297 +texture_normal = ExtResource( 38 ) +script = ExtResource( 24 ) -[connection signal="gui_input" from="Wordrobe/Underwear/Briefs" to="Wordrobe/Underwear/Briefs" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Underwear/ZBriefs" to="Wordrobe/Underwear/ZBriefs" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Underwear/Fundosi" to="Wordrobe/Underwear/Fundosi" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Bottoms/Jeans" to="Wordrobe/Bottoms/Jeans" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Bottoms/DJ Shorts" to="Wordrobe/Bottoms/DJ Shorts" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Bottoms/Sweats" to="Wordrobe/Bottoms/Sweats" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Bottoms/Blue Camo Jeans" to="Wordrobe/Bottoms/Blue Camo Jeans" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Bottoms/Beat Up Jeans" to="Wordrobe/Bottoms/Beat Up Jeans" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Sweatshirt" to="Wordrobe/Tops/Sweatshirt" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/DJ Shirt" to="Wordrobe/Tops/DJ Shirt" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Raw" to="Wordrobe/Tops/Raw" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Atomic Shirt" to="Wordrobe/Tops/Atomic Shirt" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Z Shirt" to="Wordrobe/Tops/Z Shirt" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Biker Jacket" to="Wordrobe/Tops/Biker Jacket" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/What's New" to="Wordrobe/Tops/What's New" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Tops/Train Shirt" to="Wordrobe/Tops/Train Shirt" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Accessories/Camera" to="Wordrobe/Accessories/Camera" method="_on_outfit_gui_input"] -[connection signal="gui_input" from="Wordrobe/Accessories/OwO Censor" to="Wordrobe/Accessories/OwO Censor" method="_on_outfit_gui_input"] +[node name="Train Shirt" type="TextureButton" parent="."] +margin_left = 769.246 +margin_top = 299.685 +margin_right = 854.246 +margin_bottom = 414.685 +texture_normal = ExtResource( 39 ) +script = ExtResource( 24 ) + +[node name="Camera" type="TextureButton" parent="."] +margin_left = 406.979 +margin_top = 188.547 +margin_right = 455.979 +margin_bottom = 250.547 +texture_normal = ExtResource( 40 ) +script = ExtResource( 24 ) + +[node name="OwO Censor" type="TextureButton" parent="."] +margin_left = 489.905 +margin_top = 185.841 +margin_right = 595.905 +margin_bottom = 225.841 +texture_normal = ExtResource( 41 ) +script = ExtResource( 24 ) +[connection signal="gui_input" from="Briefs" to="Briefs" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="ZBriefs" to="ZBriefs" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Fundosi" to="Fundosi" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Jeans" to="Jeans" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="DJ Shorts" to="DJ Shorts" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Sweats" to="Sweats" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Blue Camo Jeans" to="Blue Camo Jeans" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Beat Up Jeans" to="Beat Up Jeans" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Sweatshirt" to="Sweatshirt" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="DJ Shirt" to="DJ Shirt" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Raw" to="Raw" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Atomic Shirt" to="Atomic Shirt" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Z Shirt" to="Z Shirt" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Biker Jacket" to="Biker Jacket" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="What's New" to="What's New" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Train Shirt" to="Train Shirt" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Camera" to="Camera" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="OwO Censor" to="OwO Censor" method="_on_outfit_gui_input"] diff --git a/project/scn/ClassicScn.tscn b/project/scn/ClassicScn.tscn index 0fb082c..5c3cf92 100644 --- a/project/scn/ClassicScn.tscn +++ b/project/scn/ClassicScn.tscn @@ -1,31 +1,15 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://src/GameScn.gd" type="Script" id=1] -[ext_resource path="res://sprites/classic_dress_up_bg.png" type="Texture" id=2] -[ext_resource path="res://sprites/lights.png" type="Texture" id=3] -[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=4] -[ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/ClassicScn.gd" type="Script" id=1] +[ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=2] +[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3] +[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=4] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) -[node name="Background" type="Sprite" parent="."] -position = Vector2( 400, 277 ) -texture = ExtResource( 2 ) -__meta__ = { -"_edit_lock_": true -} +[node name="Clothes" parent="." instance=ExtResource( 2 )] -[node name="Lights" type="Sprite" parent="."] -position = Vector2( 477.823, 100.811 ) -texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} +[node name="WinDialogs" parent="." instance=ExtResource( 3 )] -[node name="Nathan" parent="." instance=ExtResource( 4 )] - -[node name="Clothes" parent="." instance=ExtResource( 5 )] - -[node name="WinDialogs" parent="." instance=ExtResource( 6 )] +[node name="GlobalMenu" parent="." instance=ExtResource( 4 )] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index ab7890a..3409802 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,65 +1,52 @@ -[gd_scene load_steps=31 format=2] +[gd_scene load_steps=26 format=2] -[ext_resource path="res://src/Clothes.gd" type="Script" id=1] -[ext_resource path="res://sprites/dressup_wardrobe.svg" type="Texture" id=2] -[ext_resource path="res://sprites/lights.png" type="Texture" id=3] -[ext_resource path="res://sprites/jeans.svg" type="Texture" id=4] -[ext_resource path="res://sprites/dj_shorts.svg" type="Texture" id=5] -[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=6] -[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=7] -[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=8] -[ext_resource path="res://sprites/x_button.svg" type="Texture" id=9] -[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=10] -[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=11] -[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=12] -[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=13] -[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=14] -[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=15] -[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=16] -[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=17] -[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=18] -[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=19] -[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=20] -[ext_resource path="res://sprites/briefs.svg" type="Texture" id=21] -[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=22] -[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=23] -[ext_resource path="res://sprites/camera.png" type="Texture" id=24] -[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=25] -[ext_resource path="res://sprites/bottoms_placeholder.png" type="Texture" id=26] -[ext_resource path="res://sprites/tops_placeholder.png" type="Texture" id=27] - -[sub_resource type="StyleBoxEmpty" id=1] - -[sub_resource type="StyleBoxEmpty" id=2] -resource_local_to_scene = true -content_margin_left = 5.0 -content_margin_right = 5.0 -content_margin_top = 5.0 -content_margin_bottom = 10.0 - -[sub_resource type="StyleBoxEmpty" id=3] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] +[ext_resource path="res://styles/tab.stylebox" type="StyleBox" id=2] +[ext_resource path="res://styles/tabbg.stylebox" type="StyleBox" id=3] +[ext_resource path="res://styles/wordrobe_panel.stylebox" type="StyleBox" id=4] +[ext_resource path="res://sprites/lights.png" type="Texture" id=5] +[ext_resource path="res://sprites/jeans.svg" type="Texture" id=6] +[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=7] +[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=8] +[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=9] +[ext_resource path="res://sprites/x_button.svg" type="Texture" id=10] +[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=11] +[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=12] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=13] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=14] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=15] +[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=16] +[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=17] +[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=18] +[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=19] +[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=20] +[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=21] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=22] +[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=23] +[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=24] +[ext_resource path="res://sprites/camera.png" type="Texture" id=25] [node name="Clothes" type="Node"] -script = ExtResource( 1 ) - -[node name="Wordrobe BG" type="Sprite" parent="."] -position = Vector2( 635.979, 306.788 ) -texture = ExtResource( 2 ) - -[node name="Lights" type="Sprite" parent="."] -position = Vector2( 646.371, 187.333 ) -texture = ExtResource( 3 ) [node name="Wordrobe" type="TabContainer" parent="."] -margin_left = 323.421 -margin_top = 63.0 -margin_right = 956.421 -margin_bottom = 555.0 -custom_styles/tab_fg = SubResource( 1 ) -custom_styles/tab_bg = SubResource( 2 ) -custom_styles/panel = SubResource( 3 ) -custom_colors/font_color_bg = Color( 1, 1, 1, 1 ) -custom_colors/font_color_fg = Color( 0.980392, 0.992157, 0.768627, 1 ) +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -721.0 +margin_top = 32.0 +margin_right = -25.0 +margin_bottom = -6.0 +theme = ExtResource( 1 ) +custom_styles/tab_fg = ExtResource( 2 ) +custom_styles/tab_bg = ExtResource( 3 ) +custom_styles/panel = ExtResource( 4 ) +custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) +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="Lights" type="Sprite" parent="Wordrobe"] +position = Vector2( 346.41, 165.623 ) +texture = ExtResource( 5 ) [node name="Pants" type="Tabs" parent="Wordrobe"] anchor_right = 1.0 @@ -68,196 +55,192 @@ margin_top = 29.0 custom_constants/hseparation = 0 [node name="PantsGrid" type="GridContainer" parent="Wordrobe/Pants"] -margin_left = 42.0 -margin_top = 13.0 -margin_right = 600.0 -margin_bottom = 425.0 +margin_left = 25.0 +margin_top = 24.0 +margin_right = 679.0 +margin_bottom = 505.0 columns = 5 [node name="Jeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_right = 118.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 4 ) - -[node name="DJShorts" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 122.0 -margin_right = 228.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 5 ) - -[node name="Sweats" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 232.0 -margin_right = 338.0 -margin_bottom = 112.0 +margin_right = 106.0 +margin_bottom = 118.0 texture_normal = ExtResource( 6 ) -[node name="BlueCamo Jeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 342.0 -margin_right = 448.0 -margin_bottom = 112.0 +[node name="Sweats" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 118.0 texture_normal = ExtResource( 7 ) -[node name="BeatUpJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 452.0 -margin_right = 558.0 -margin_bottom = 112.0 +[node name="BlueCamoJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 118.0 texture_normal = ExtResource( 8 ) +[node name="BeatUpJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] +margin_left = 330.0 +margin_right = 436.0 +margin_bottom = 118.0 +texture_normal = ExtResource( 9 ) + [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] -margin_top = 116.0 -margin_right = 118.0 -margin_bottom = 234.0 +margin_left = 440.0 +margin_right = 558.0 +margin_bottom = 118.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 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 9 ) +icon = ExtResource( 10 ) flat = true [node name="Shirts" type="Tabs" parent="Wordrobe"] +editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 29.0 [node name="ShirtsGrid" type="GridContainer" parent="Wordrobe/Shirts"] -margin_left = 82.0 -margin_top = 8.0 -margin_right = 556.0 -margin_bottom = 441.0 -columns = 5 +margin_left = 18.0 +margin_top = 29.0 +margin_right = 666.0 +margin_bottom = 502.0 +columns = 7 [node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_right = 118.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 10 ) - -[node name="DJShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 122.0 -margin_right = 207.0 +margin_right = 85.0 margin_bottom = 115.0 texture_normal = ExtResource( 11 ) -[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 211.0 -margin_right = 296.0 +[node name="DJShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 89.0 +margin_right = 174.0 margin_bottom = 115.0 texture_normal = ExtResource( 12 ) -[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 300.0 -margin_right = 385.0 +[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 178.0 +margin_right = 263.0 margin_bottom = 115.0 texture_normal = ExtResource( 13 ) -[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 389.0 -margin_right = 474.0 +[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 267.0 +margin_right = 385.0 margin_bottom = 115.0 texture_normal = ExtResource( 14 ) -[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_top = 119.0 -margin_right = 118.0 -margin_bottom = 234.0 +[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 389.0 +margin_right = 470.0 +margin_bottom = 115.0 texture_normal = ExtResource( 15 ) -[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 122.0 -margin_top = 119.0 -margin_right = 207.0 -margin_bottom = 234.0 +[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 474.0 +margin_right = 559.0 +margin_bottom = 115.0 texture_normal = ExtResource( 16 ) -[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 211.0 -margin_top = 119.0 -margin_right = 296.0 -margin_bottom = 234.0 +[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 563.0 +margin_right = 648.0 +margin_bottom = 115.0 texture_normal = ExtResource( 17 ) -[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 300.0 +[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_top = 119.0 -margin_right = 385.0 -margin_bottom = 234.0 +margin_right = 85.0 +margin_bottom = 237.0 texture_normal = ExtResource( 18 ) -[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 389.0 +[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 89.0 margin_top = 119.0 -margin_right = 474.0 -margin_bottom = 234.0 +margin_right = 174.0 +margin_bottom = 237.0 texture_normal = ExtResource( 19 ) +[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 178.0 +margin_top = 119.0 +margin_right = 263.0 +margin_bottom = 237.0 +texture_normal = ExtResource( 20 ) + [node name="RemoveShirt" type="Button" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_top = 238.0 -margin_right = 118.0 -margin_bottom = 356.0 +margin_left = 267.0 +margin_top = 119.0 +margin_right = 385.0 +margin_bottom = 237.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 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 9 ) +icon = ExtResource( 10 ) flat = true [node name="Underwear" type="Tabs" parent="Wordrobe"] +editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 29.0 [node name="UndiesGrid" type="GridContainer" parent="Wordrobe/Underwear"] -margin_left = 68.0 -margin_top = 10.0 -margin_right = 585.0 -margin_bottom = 451.0 -columns = 5 +margin_left = 21.0 +margin_top = 31.0 +margin_right = 672.0 +margin_bottom = 498.0 +columns = 6 [node name="OwOCensor" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_right = 106.0 margin_bottom = 112.0 -texture_normal = ExtResource( 20 ) +texture_normal = ExtResource( 21 ) [node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 110.0 margin_right = 216.0 margin_bottom = 112.0 -texture_normal = ExtResource( 21 ) +texture_normal = ExtResource( 22 ) [node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 220.0 margin_right = 326.0 margin_bottom = 112.0 -texture_normal = ExtResource( 22 ) +texture_normal = ExtResource( 23 ) [node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 330.0 margin_right = 436.0 margin_bottom = 112.0 -texture_normal = ExtResource( 23 ) +texture_normal = ExtResource( 24 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] +editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 29.0 -[node name="AccessoiresGrid" type="GridContainer" parent="Wordrobe/Accessoires"] -margin_left = 85.0 -margin_top = 14.0 -margin_right = 556.0 -margin_bottom = 458.0 -columns = 5 +[node name="AccsGrid" type="GridContainer" parent="Wordrobe/Accessoires"] +margin_left = 20.0 +margin_top = 35.0 +margin_right = 668.0 +margin_bottom = 503.0 +columns = 6 -[node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccessoiresGrid"] +[node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccsGrid"] margin_right = 85.0 margin_bottom = 118.0 -texture_normal = ExtResource( 24 ) +texture_normal = ExtResource( 25 ) -[node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccessoiresGrid"] +[node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccsGrid"] margin_left = 89.0 margin_right = 207.0 margin_bottom = 118.0 @@ -266,53 +249,5 @@ custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 9 ) +icon = ExtResource( 10 ) flat = true - -[node name="Nathane" parent="." instance=ExtResource( 25 )] -position = Vector2( 57.2474, 52.0605 ) - -[node name="Body" type="ReferenceRect" parent="."] -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -margin_left = -428.753 -margin_top = -264.94 -margin_right = -310.753 -margin_bottom = -30.9396 - -[node name="Undies" type="Sprite" parent="Body"] -position = Vector2( 56.9419, 154.296 ) -texture = ExtResource( 21 ) - -[node name="Bottom" type="Sprite" parent="Body"] -position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 26 ) - -[node name="Top" type="Sprite" parent="Body"] -position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 27 ) - -[node name="Accessory" type="Sprite" parent="Body"] -position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 27 ) -[connection signal="pressed" from="Wordrobe/Pants/PantsGrid/BlueCamo Jeans" to="." method="_on_Blue_Camo_Jeans_pressed"] -[connection signal="pressed" from="Wordrobe/Pants/PantsGrid/BeatUpJeans" to="." method="_on_Beat_Up_Jeans_pressed"] -[connection signal="pressed" from="Wordrobe/Pants/PantsGrid/RemovePants" to="." method="_on_Remove_Pants_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/Sweatshirt" to="." method="_on_Sweatshirt_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/DJShirt" to="." method="_on_DJ_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/Raw" to="." method="_on_Raw_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/Atomic" to="." method="_on_Atomic_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/ZShirt" to="." method="_on_Z_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/BikerJacket" to="." method="_on_Biker_Jacket_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/NLJacket" to="." method="_on_NL_Jacket_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/TrainHoodie" to="." method="_on_Train_Hoodie_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/KormShirt" to="." method="_on_Korm_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/WhatsNewShirt" to="." method="_on_Whats_New_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Shirts/ShirtsGrid/RemoveShirt" to="." method="_on_Remove_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/UndiesGrid/OwOCensor" to="." method="_on_OwO_Censor_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/UndiesGrid/Briefs" to="." method="_on_Briefs_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/UndiesGrid/ZBriefs" to="." method="_on_ZBriefs_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/UndiesGrid/Fundosi" to="." method="_on_Fundosi_pressed"] -[connection signal="pressed" from="Wordrobe/Accessoires/AccessoiresGrid/RemoveAccessory" to="." method="_on_Remove_Accessory_pressed"] diff --git a/project/scn/GameScn.tscn b/project/scn/GameScn.tscn index 7fc5b58..a5def0c 100644 --- a/project/scn/GameScn.tscn +++ b/project/scn/GameScn.tscn @@ -1,21 +1,28 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/GameScn.gd" type="Script" id=1] [ext_resource path="res://sprites/icrazy_frame.png" type="Texture" id=2] [ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=3] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=4] +[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=5] +[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=6] +[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=7] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) [node name="PicFrame" type="Sprite" parent="."] -position = Vector2( 204.942, 120.396 ) +position = Vector2( 167.38, 140.341 ) texture = ExtResource( 2 ) [node name="Clothes" parent="." instance=ExtResource( 3 )] -[node name="WinDialogs" parent="." instance=ExtResource( 4 )] - [node name="Music" type="AudioStreamPlayer" parent="."] -script = ExtResource( 5 ) +script = ExtResource( 4 ) + +[node name="WinDialogs" parent="." instance=ExtResource( 5 )] + +[node name="GlobalMenu" parent="." instance=ExtResource( 6 )] + +[node name="Nathan" parent="." instance=ExtResource( 7 )] +position = Vector2( 84.5004, 252.934 ) diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn index 90d8b7e..9b9f5d3 100644 --- a/project/scn/TitleScn.tscn +++ b/project/scn/TitleScn.tscn @@ -1,21 +1,27 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] -[ext_resource path="res://sprites/title.svg" type="Texture" id=2] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] +[ext_resource path="res://sprites/title.svg" type="Texture" id=3] +[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] [node name="Start" type="Node"] script = ExtResource( 1 ) -[node name="Title" type="Sprite" parent="."] -position = Vector2( 522.047, 150.148 ) -texture = ExtResource( 2 ) - [node name="MenuRf" type="ReferenceRect" parent="."] -margin_left = 311.292 -margin_top = 72.2924 -margin_right = 730.292 -margin_bottom = 523.292 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -209.5 +margin_top = -225.5 +margin_right = 209.5 +margin_bottom = 225.5 +theme = ExtResource( 2 ) + +[node name="Title" type="Sprite" parent="MenuRf"] +position = Vector2( 210.755, 77.8556 ) +texture = ExtResource( 3 ) [node name="StartVbox" type="VBoxContainer" parent="MenuRf"] anchor_left = 0.5 @@ -29,20 +35,20 @@ margin_bottom = 42.5 [node name="PlayBtn" type="Button" parent="MenuRf/StartVbox"] margin_right = 136.0 -margin_bottom = 20.0 +margin_bottom = 25.0 toggle_mode = true text = "KPLY" [node name="CreditsBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 24.0 +margin_top = 29.0 margin_right = 136.0 -margin_bottom = 44.0 +margin_bottom = 54.0 text = "KCRE" [node name="LicenseBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 48.0 +margin_top = 58.0 margin_right = 136.0 -margin_bottom = 68.0 +margin_bottom = 83.0 text = "KLIC" [node name="ModePanel" type="WindowDialog" parent="MenuRf"] @@ -81,7 +87,7 @@ margin_right = 136.0 margin_bottom = 62.0 text = "KCLS" -[node name="WinDialogs" parent="." instance=ExtResource( 3 )] +[node name="WinDialogs" parent="." instance=ExtResource( 4 )] margin_left = 97.0 margin_top = 37.0 margin_right = 97.0 diff --git a/project/scn/WinDialogs.tscn b/project/scn/WinDialogs.tscn index bf80dac..567ae0a 100644 --- a/project/scn/WinDialogs.tscn +++ b/project/scn/WinDialogs.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://src/WinDialogs.gd" type="Script" id=1] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] +[ext_resource path="res://src/WinDialogs.gd" type="Script" id=2] [node name="WinDialogs" type="Control"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -script = ExtResource( 1 ) +theme = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="PauseWin" type="PopupDialog" parent="."] pause_mode = 2 @@ -71,7 +73,7 @@ anchor_bottom = 1.0 margin_left = 8.0 margin_top = 8.0 margin_right = -8.0 -margin_bottom = -36.0 +margin_bottom = -41.0 focus_mode = 2 bbcode_enabled = true bbcode_text = "[center]Created by @@ -80,6 +82,9 @@ Anthony Wilcox Music by Michael Carey +Fonts by +Google + Clothing inspired by Megawolf77 Canon Rhode @@ -94,6 +99,9 @@ Anthony Wilcox Music by Michael Carey +Fonts by +Google + Clothing inspired by Megawolf77 Canon Rhode @@ -125,7 +133,7 @@ anchor_bottom = 0.5 margin_left = -68.0 margin_top = -26.0 margin_right = 68.0 -margin_bottom = -2.0 +margin_bottom = -7.0 columns = 3 [node name="Languages" type="MenuButton" parent="SettingsWin/Grid"] @@ -161,7 +169,7 @@ anchor_right = 0.5 margin_left = -194.0 margin_top = 8.0 margin_right = 194.0 -margin_bottom = 239.0 +margin_bottom = 234.0 bbcode_enabled = true bbcode_text = "Nathan's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/project/sprites/pants_icon.svg b/project/sprites/pants_icon.svg index fa25be5..eb8ad9a 100644 --- a/project/sprites/pants_icon.svg +++ b/project/sprites/pants_icon.svg @@ -1,60 +1,19 @@ - - - - - - - - image/svg+xml - - - - - - - - + + + + + + diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd index bff00a0..dadef6a 100644 --- a/project/src/GameScn.gd +++ b/project/src/GameScn.gd @@ -2,7 +2,90 @@ # See the LICENSE file in the project root for more information. extends "res://src/GameKit.gd" +# Default clothing +onready var bottoms = load("res://sprites/bottoms_placeholder.png") +onready var tops = load("res://sprites/tops_placeholder.png") +onready var accessory = load("res://sprites/tops_placeholder.png") +# ZC's Dress Up was stylized to be cute, not adult. +# Underwear cam be suggestive but never lewd. +onready var undies = load("res://sprites/briefs.svg") + +func change_bottoms(new_bottom): + bottoms = new_bottom + + if new_bottom == null: + $Nathan/Bottom.texture = bottoms + + if undies == load("res://sprites/owo_censor.svg"): + change_undies(null) + + $Nathan/Bottom.texture = bottoms + +func change_undies(new_undies): + undies = new_undies + $Nathan/Undies.texture = undies + +func change_tops(new_top): + tops = new_top + + if new_top == null: + $Nathan/Top.texture = tops + + $Nathan/Top.texture = tops + +func change_accessoires(new_accessory): + accessory = new_accessory + + if new_accessory == null: + $Nathan/Top.texture = accessory + + $Nathan/Accessory.texture = accessory + func _process(delta): - if Input.is_action_pressed("ui_pause"): - is_game_paused(true) - $WinDialogs/PauseWin.show() \ No newline at end of file + + # Change clothes + # =========================================================== + + if $Clothes/Wordrobe/Accessoires/AccsGrid/CanonCam.is_pressed(): + change_accessoires(load("res://sprites/camera.png")) + + if $Clothes/Wordrobe/Pants/PantsGrid/Jeans.is_pressed(): + change_bottoms(load("res://sprites/jeans.svg")) + + if $Clothes/Wordrobe/Pants/PantsGrid/Sweats.is_pressed(): + change_bottoms(load("res://sprites/sweat_pants.svg")) + + if $Clothes/Wordrobe/Pants/PantsGrid/BeatUpJeans.is_pressed(): + change_bottoms(load("res://sprites/beat_up_jeans.svg")) + + # if $Clothes/Wordrobe/Pants/PantsGrid/DJShorts.is_pressed(): + # change_bottoms(load("res://sprites/dj_shorts.svg")) + + if $Clothes/Wordrobe/Underwear/UndiesGrid/Briefs.is_pressed(): + change_undies(load("res://sprites/briefs.svg")) + + if $Clothes/Wordrobe/Underwear/UndiesGrid/ZBriefs.is_pressed(): + change_undies(load("res://sprites/z_briefs.svg")) + + if $Clothes/Wordrobe/Underwear/UndiesGrid/Fundosi.is_pressed(): + change_undies(load("res://sprites/fundosi.svg")) + + if $Clothes/Wordrobe/Underwear/UndiesGrid/OwOCensor.is_pressed(): + change_bottoms(null) + change_undies(load("res://sprites/owo_censor.svg")) + + + if $Clothes/Wordrobe/Pants/PantsGrid/BlueCamoJeans.is_pressed(): + change_bottoms(load("res://sprites/blue_camo_jeans.svg")) + + # Remove clothes + # =========================================================== + + if $Clothes/Wordrobe/Accessoires/AccsGrid/RemoveAccessory.is_pressed(): + change_accessoires(null) + + if $Clothes/Wordrobe/Shirts/ShirtsGrid/RemoveShirt.is_pressed(): + change_tops(null) + + if $Clothes/Wordrobe/Pants/PantsGrid/RemovePants.is_pressed(): + change_bottoms(null) \ No newline at end of file