From 9ba4f11a1077d4e9ee953dc0e40d79dea5a85ac9 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com> Date: Sat, 4 May 2019 15:59:10 -0400 Subject: [PATCH] Use Godot's native resolution - Redid the wordrobe background which finally gives a chance to use Godot's native resolution, allowing for more screen real estate, and add more items. - Removed the Classic option. It may return in the future. --- project/project.godot | 2 - project/scn/Clothes.tscn | 167 +++++++++----------- project/scn/ModernScn.tscn | 30 +--- project/sprites/dressup_wardrobe.svg | 97 ++++++++++++ project/sprites/dressup_wardrobe.svg.import | 34 ++++ project/src/TitleScn.gd | 2 +- 6 files changed, 217 insertions(+), 115 deletions(-) create mode 100644 project/sprites/dressup_wardrobe.svg create mode 100644 project/sprites/dressup_wardrobe.svg.import diff --git a/project/project.godot b/project/project.godot index e963c04..1263a65 100644 --- a/project/project.godot +++ b/project/project.godot @@ -38,8 +38,6 @@ gdscript/warnings/unsafe_call_argument=true [display] -window/size/width=800 -window/size/height=554 window/size/resizable=false [input] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index 34c1432..8d15b32 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=31 format=2] [ext_resource path="res://src/Clothes.gd" type="Script" id=1] -[ext_resource path="res://sprites/dressup_wardrobe.png" type="Texture" id=2] +[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.png" type="Texture" id=5] @@ -24,8 +24,9 @@ [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://sprites/bottoms_placeholder.png" type="Texture" id=25] -[ext_resource path="res://sprites/tops_placeholder.png" type="Texture" id=26] +[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] @@ -42,56 +43,54 @@ content_margin_bottom = 10.0 script = ExtResource( 1 ) [node name="Wordrobe BG" type="Sprite" parent="."] -position = Vector2( 492.609, 280.27 ) +position = Vector2( 635.979, 306.788 ) texture = ExtResource( 2 ) [node name="Lights" type="Sprite" parent="."] -position = Vector2( 485.001, 160 ) +position = Vector2( 646.371, 187.333 ) texture = ExtResource( 3 ) [node name="RefRect" type="ReferenceRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 209.0 -margin_top = 18.0 -margin_right = 8.0 -margin_bottom = -21.0 -__meta__ = { -"_edit_lock_": true -} +margin_left = 323.421 +margin_top = 45.0 +margin_right = -38.579 +margin_bottom = -30.0 [node name="Wordrobe" type="TabContainer" parent="RefRect"] -margin_left = 28.0 -margin_top = 13.0 -margin_right = 585.0 -margin_bottom = 513.0 +margin_top = 18.0 +margin_right = 633.0 +margin_bottom = 510.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 ) -tab_align = 0 [node name="Pants" type="Tabs" parent="RefRect/Wordrobe"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = -22.0 margin_top = 29.0 +margin_right = -22.0 custom_constants/hseparation = 0 [node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants"] -margin_left = 32.0 -margin_top = 22.0 -margin_right = 489.0 -margin_bottom = 322.0 -columns = 4 +margin_left = 35.0 +margin_top = 13.0 +margin_right = 657.0 +margin_bottom = 425.0 +columns = 5 [node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"] -margin_right = 106.0 +margin_right = 118.0 margin_bottom = 112.0 texture_normal = ExtResource( 4 ) [node name="DJ Shorts" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"] -margin_left = 110.0 +margin_left = 122.0 margin_right = 228.0 margin_bottom = 112.0 texture_normal = ExtResource( 5 ) @@ -109,15 +108,14 @@ margin_bottom = 112.0 texture_normal = ExtResource( 7 ) [node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"] -margin_top = 116.0 -margin_right = 106.0 -margin_bottom = 234.0 +margin_left = 452.0 +margin_right = 558.0 +margin_bottom = 112.0 texture_normal = ExtResource( 8 ) [node name="Remove Pants" type="Button" parent="RefRect/Wordrobe/Pants/PantsGrid"] -margin_left = 110.0 margin_top = 116.0 -margin_right = 228.0 +margin_right = 118.0 margin_bottom = 234.0 rect_min_size = Vector2( 0, 112 ) custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) @@ -134,79 +132,79 @@ anchor_bottom = 1.0 margin_top = 29.0 [node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts"] -margin_left = 33.0 +margin_left = 13.0 margin_top = 14.0 -margin_right = 474.0 -margin_bottom = 364.0 -columns = 5 +margin_right = 632.0 +margin_bottom = 447.0 +columns = 6 [node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_right = 118.0 +margin_right = 85.0 margin_bottom = 115.0 texture_normal = ExtResource( 10 ) [node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 122.0 -margin_right = 207.0 +margin_left = 89.0 +margin_right = 174.0 margin_bottom = 115.0 texture_normal = ExtResource( 11 ) [node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 211.0 -margin_right = 296.0 +margin_left = 178.0 +margin_right = 263.0 margin_bottom = 115.0 texture_normal = ExtResource( 12 ) [node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 300.0 -margin_right = 385.0 +margin_left = 267.0 +margin_right = 352.0 margin_bottom = 115.0 texture_normal = ExtResource( 13 ) [node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 389.0 +margin_left = 356.0 margin_right = 474.0 margin_bottom = 115.0 texture_normal = ExtResource( 14 ) [node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_top = 119.0 -margin_right = 118.0 -margin_bottom = 234.0 +margin_left = 478.0 +margin_right = 563.0 +margin_bottom = 115.0 texture_normal = ExtResource( 15 ) [node name="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 122.0 margin_top = 119.0 -margin_right = 207.0 -margin_bottom = 234.0 +margin_right = 85.0 +margin_bottom = 237.0 texture_normal = ExtResource( 16 ) [node name="Train Hoodie" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 211.0 +margin_left = 89.0 margin_top = 119.0 -margin_right = 296.0 -margin_bottom = 234.0 +margin_right = 174.0 +margin_bottom = 237.0 texture_normal = ExtResource( 17 ) [node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 300.0 +margin_left = 178.0 margin_top = 119.0 -margin_right = 385.0 -margin_bottom = 234.0 +margin_right = 263.0 +margin_bottom = 237.0 texture_normal = ExtResource( 18 ) [node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_left = 389.0 +margin_left = 267.0 margin_top = 119.0 -margin_right = 474.0 -margin_bottom = 234.0 +margin_right = 352.0 +margin_bottom = 237.0 texture_normal = ExtResource( 19 ) [node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"] -margin_top = 238.0 -margin_right = 118.0 -margin_bottom = 356.0 +margin_left = 356.0 +margin_top = 119.0 +margin_right = 474.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 ) @@ -222,10 +220,10 @@ anchor_bottom = 1.0 margin_top = 29.0 [node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear"] -margin_left = -20.0 +margin_left = 13.0 margin_top = 10.0 -margin_right = 532.0 -margin_bottom = 122.0 +margin_right = 635.0 +margin_bottom = 451.0 columns = 5 [node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid"] @@ -252,16 +250,15 @@ margin_bottom = 112.0 texture_normal = ExtResource( 23 ) [node name="Accessoires" type="Tabs" parent="RefRect/Wordrobe"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_top = 29.0 [node name="AccessoiresGrid" type="GridContainer" parent="RefRect/Wordrobe/Accessoires"] -margin_left = -14.0 +margin_left = 7.0 margin_top = 14.0 -margin_right = 536.0 -margin_bottom = 119.0 +margin_right = 631.0 +margin_bottom = 458.0 columns = 6 [node name="Camera" type="TextureButton" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid"] @@ -281,44 +278,34 @@ custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) icon = ExtResource( 9 ) flat = true +[node name="Nathane" parent="." instance=ExtResource( 25 )] +position = Vector2( 57.2474, 52.0605 ) + [node name="Body" type="ReferenceRect" parent="."] -anchor_right = 1.0 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = 26.0 -margin_top = 285.0 -margin_right = -656.0 -margin_bottom = -35.0 -__meta__ = { -"_edit_lock_": true -} +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( 57.9419, 159.296 ) texture = ExtResource( 21 ) -__meta__ = { -"_edit_lock_": true -} [node name="Bottom" type="Sprite" parent="Body"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 25 ) -__meta__ = { -"_edit_lock_": true -} +texture = ExtResource( 26 ) [node name="Top" type="Sprite" parent="Body"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 26 ) -__meta__ = { -"_edit_lock_": true -} +texture = ExtResource( 27 ) [node name="Accessory" type="Sprite" parent="Body"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 26 ) -__meta__ = { -"_edit_lock_": true -} +texture = ExtResource( 27 ) [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Jeans" to="." method="_on_Jeans_pressed"] [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/DJ Shorts" to="." method="_on_DJ_Shorts_pressed"] [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Sweats" to="." method="_on_Sweats_pressed"] diff --git a/project/scn/ModernScn.tscn b/project/scn/ModernScn.tscn index 8983e28..17ad3b7 100644 --- a/project/scn/ModernScn.tscn +++ b/project/scn/ModernScn.tscn @@ -1,31 +1,17 @@ -[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/modern_dress_up_bg.png" type="Texture" id=2] -[ext_resource path="res://sprites/icrazy_frame.png" type="Texture" id=3] -[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=4] -[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=6] +[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] [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="PicFrame" type="Sprite" parent="."] -position = Vector2( 93.9417, 98.396 ) -texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} +position = Vector2( 204.942, 120.396 ) +texture = ExtResource( 2 ) -[node name="Nathan" parent="." instance=ExtResource( 4 )] +[node name="Clothes" parent="." instance=ExtResource( 3 )] -[node name="Clothes" parent="." instance=ExtResource( 5 )] - -[node name="WinDialogs" parent="." instance=ExtResource( 6 )] +[node name="WinDialogs" parent="." instance=ExtResource( 4 )] diff --git a/project/sprites/dressup_wardrobe.svg b/project/sprites/dressup_wardrobe.svg new file mode 100644 index 0000000..5a39ecb --- /dev/null +++ b/project/sprites/dressup_wardrobe.svg @@ -0,0 +1,97 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/sprites/dressup_wardrobe.svg.import b/project/sprites/dressup_wardrobe.svg.import new file mode 100644 index 0000000..adbd775 --- /dev/null +++ b/project/sprites/dressup_wardrobe.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_wardrobe.svg-045acf6c9249ae39f39347a2897230a1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/dressup_wardrobe.svg" +dest_files=[ "res://.import/dressup_wardrobe.svg-045acf6c9249ae39f39347a2897230a1.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/TitleScn.gd b/project/src/TitleScn.gd index 691a622..df4c1cb 100644 --- a/project/src/TitleScn.gd +++ b/project/src/TitleScn.gd @@ -15,4 +15,4 @@ func _on_LicenseBtn_pressed(): $WinDialogs/LicenseWin.show() func _on_PlayBtn_pressed(): - $MenuRf/ModePanel.show() + switch_scenes("modern")