From 4b501e0c6e1eefcc7bcce13c1461b79ead8c34ba Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com> Date: Sun, 5 May 2019 17:03:43 -0400 Subject: [PATCH] Train and What's New hoodies - Tab Container is now properly themed --- project/scn/Character.tscn | 4 +- project/scn/Clothes.tscn | 101 +++++++++-------- project/sprites/train_hoodie.svg | 125 ++++++++++++++++++++++ project/sprites/train_hoodie.svg.import | 34 ++++++ project/sprites/whatsnew_shirt.svg | 122 +++++++++++++++++++++ project/sprites/whatsnew_shirt.svg.import | 34 ++++++ project/src/GameScn.gd | 6 ++ project/styles/DressUpTheme.res | Bin 675 -> 532 bytes 8 files changed, 370 insertions(+), 56 deletions(-) create mode 100644 project/sprites/train_hoodie.svg create mode 100644 project/sprites/train_hoodie.svg.import create mode 100644 project/sprites/whatsnew_shirt.svg create mode 100644 project/sprites/whatsnew_shirt.svg.import diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index 4a20c2f..17f8eda 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -57,7 +57,6 @@ animations = [ { [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 6 playing = true [node name="Nathan" type="Sprite" parent="Base"] @@ -67,13 +66,12 @@ texture = ExtResource( 4 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 11 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 16 +frame = 22 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index 3409802..da2ea5d 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,30 +1,28 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=24 format=2] [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] +[ext_resource path="res://styles/wordrobe_panel.stylebox" type="StyleBox" 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/sweat_pants.svg" type="Texture" id=5] +[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=6] +[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=7] +[ext_resource path="res://sprites/x_button.svg" type="Texture" id=8] +[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=9] +[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=10] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=11] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=12] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=13] +[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=14] +[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=15] +[ext_resource path="res://sprites/train_hoodie.svg" type="Texture" id=16] +[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=17] +[ext_resource path="res://sprites/whatsnew_shirt.svg" type="Texture" id=18] +[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=19] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=20] +[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=21] +[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=22] +[ext_resource path="res://sprites/camera.png" type="Texture" id=23] [node name="Clothes" type="Node"] @@ -37,18 +35,17 @@ 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_styles/panel = ExtResource( 2 ) 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 ) +texture = ExtResource( 3 ) [node name="Pants" type="Tabs" parent="Wordrobe"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 29.0 @@ -64,25 +61,25 @@ columns = 5 [node name="Jeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_right = 106.0 margin_bottom = 118.0 -texture_normal = ExtResource( 6 ) +texture_normal = ExtResource( 4 ) [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 ) +texture_normal = ExtResource( 5 ) [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 ) +texture_normal = ExtResource( 6 ) [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 ) +texture_normal = ExtResource( 7 ) [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] margin_left = 440.0 @@ -93,12 +90,10 @@ 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( 10 ) +icon = ExtResource( 8 ) 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 @@ -113,63 +108,63 @@ columns = 7 [node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_right = 85.0 margin_bottom = 115.0 -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 9 ) [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 ) +texture_normal = ExtResource( 10 ) [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 ) +texture_normal = ExtResource( 11 ) [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 ) +texture_normal = ExtResource( 12 ) [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 ) +texture_normal = ExtResource( 13 ) [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 ) +texture_normal = ExtResource( 14 ) [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 ) +texture_normal = ExtResource( 15 ) [node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_top = 119.0 margin_right = 85.0 margin_bottom = 237.0 -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 16 ) [node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_top = 119.0 margin_right = 174.0 margin_bottom = 237.0 -texture_normal = ExtResource( 19 ) +texture_normal = ExtResource( 17 ) [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 ) +texture_normal = ExtResource( 18 ) [node name="RemoveShirt" type="Button" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 267.0 @@ -181,7 +176,7 @@ 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( 10 ) +icon = ExtResource( 8 ) flat = true [node name="Underwear" type="Tabs" parent="Wordrobe"] @@ -201,25 +196,25 @@ columns = 6 [node name="OwOCensor" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_right = 106.0 margin_bottom = 112.0 -texture_normal = ExtResource( 21 ) +texture_normal = ExtResource( 19 ) [node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 110.0 margin_right = 216.0 margin_bottom = 112.0 -texture_normal = ExtResource( 22 ) +texture_normal = ExtResource( 20 ) [node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 220.0 margin_right = 326.0 margin_bottom = 112.0 -texture_normal = ExtResource( 23 ) +texture_normal = ExtResource( 21 ) [node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 330.0 margin_right = 436.0 margin_bottom = 112.0 -texture_normal = ExtResource( 24 ) +texture_normal = ExtResource( 22 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] editor/display_folded = true @@ -238,7 +233,7 @@ columns = 6 [node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccsGrid"] margin_right = 85.0 margin_bottom = 118.0 -texture_normal = ExtResource( 25 ) +texture_normal = ExtResource( 23 ) [node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccsGrid"] margin_left = 89.0 @@ -249,5 +244,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( 10 ) +icon = ExtResource( 8 ) flat = true diff --git a/project/sprites/train_hoodie.svg b/project/sprites/train_hoodie.svg new file mode 100644 index 0000000..3d8fa6d --- /dev/null +++ b/project/sprites/train_hoodie.svg @@ -0,0 +1,125 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/train_hoodie.svg.import b/project/sprites/train_hoodie.svg.import new file mode 100644 index 0000000..408dce7 --- /dev/null +++ b/project/sprites/train_hoodie.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/train_hoodie.svg-437ba1a0f0dc90d83164909d14ede895.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/train_hoodie.svg" +dest_files=[ "res://.import/train_hoodie.svg-437ba1a0f0dc90d83164909d14ede895.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/whatsnew_shirt.svg b/project/sprites/whatsnew_shirt.svg new file mode 100644 index 0000000..994216b --- /dev/null +++ b/project/sprites/whatsnew_shirt.svg @@ -0,0 +1,122 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/whatsnew_shirt.svg.import b/project/sprites/whatsnew_shirt.svg.import new file mode 100644 index 0000000..edca9a1 --- /dev/null +++ b/project/sprites/whatsnew_shirt.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/whatsnew_shirt.svg-3679963ea83eef4aef7bdf8f4503eb3e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/whatsnew_shirt.svg" +dest_files=[ "res://.import/whatsnew_shirt.svg-3679963ea83eef4aef7bdf8f4503eb3e.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd index dadef6a..6442ab9 100644 --- a/project/src/GameScn.gd +++ b/project/src/GameScn.gd @@ -78,6 +78,12 @@ func _process(delta): if $Clothes/Wordrobe/Pants/PantsGrid/BlueCamoJeans.is_pressed(): change_bottoms(load("res://sprites/blue_camo_jeans.svg")) + if $Clothes/Wordrobe/Shirts/ShirtsGrid/TrainHoodie.is_pressed(): + change_tops(load("res://sprites/train_hoodie.svg")) + + if $Clothes/Wordrobe/Shirts/ShirtsGrid/WhatsNewShirt.is_pressed(): + change_tops(load("res://sprites/whatsnew_shirt.svg")) + # Remove clothes # =========================================================== diff --git a/project/styles/DressUpTheme.res b/project/styles/DressUpTheme.res index 6bb9260ce7b4c8c5443a8fc2618ac4dd837cca26..1eca1a02e552e15490557a19cf2db50c020e9819 100644 GIT binary patch literal 532 zcmV+v0_*)!Q$s@n000005C8yB1pom20RR9fwJ-f(Pz03^0Cto{H&9WO04vWk#}7lT zKMcdL)+*6&NqRCR4M;LcFJ&JQ#b~xM22hdJ+C-oh%C}s{W@M4rHq)XWF#t6HH2@NB zm6PKZ<5fK#Tr+zHS)o@09s_XQFA$AUAh_fC3TfsTW0)O6-T!XD~&(bn$&d0NlBCgAE_md zX8J)vY~`r)U-Cclnn6nS|AapabK$mP9$9WCHOEoyOGq+ik??vjUJqWaO2(K{9Gnm6 zGf|OiQMBmxl?oFpY>q|$aXirYEr zNNwrl#ssw#`&ZeQ2nym?$zE^m6NUY<_&=xE>Jrjo9^z>%)r?*_;BI5r_#09geFqI> zJpP*lX!ic}Qtdn*mre*1!V^$64f{=0dsQYgYDNS1x($xvV_70DKAO5#3C3_}qY9n( zw*<#LoLqxPk+kutLvp#}kiqq0Xrh)+YxU_&lcD*Q00?)Ynm#2^<11uNpyx_jO6&gX W0?|W)iRX=NOK9DSxU&gTQ$s_A%<549 literal 675 zcmV;U0$lx4Q$s@n000005C8xQ1^@ty0ssIgwJ-f(3Iz=m05%+3IY4g!0Q&2{nfFW! zKQlAal-67Mx&Aum!q>g`+;?0LXfiv~WzJgIf-2xZL>){xgnmBEA|_^vdIv)QM*v3v z&v-seXR`kr__W>YG`QQIyrqae${Wh2ltm9G)tarl{&PGhRE?+RVzsRru5BvU!z}0f z|KPue=akaOe*ysh3-|-Nkm`m(C?Ch(;{OHyvNe}Ff$w?ScByP^m}eEd;bQ%gq+#o# zU~eTQtQsZ6$s|8yo}_x>rOCO$u?@+zur!QN-!u( ze1E|s6*-7m@OfD5b9GHJ_D8pa2qnN{a`90*%jF^&9s9&{@+>>ECzzH2F4XHqUt z5)yR1excjR(W=?AiD5Mlqr=cDe3c4rfOr7G=O_dMj9HrGR23UyqLF*&=Pg#tG@5D! J1rJhFLqmMsI-mdm