From 21024f9c82c73f6badab0565308f589e32587271 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Mon, 29 Apr 2019 23:21:54 -0400
Subject: [PATCH 01/15] SVG ramaster, WIP
---
project/scn/Character.tscn | 9 +-
project/sprites/character_base.svg | 188 ++++++++++++++++++++++
project/sprites/character_base.svg.import | 34 ++++
3 files changed, 226 insertions(+), 5 deletions(-)
create mode 100644 project/sprites/character_base.svg
create mode 100644 project/sprites/character_base.svg.import
diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn
index 01073e3..742dade 100644
--- a/project/scn/Character.tscn
+++ b/project/scn/Character.tscn
@@ -3,7 +3,7 @@
[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.png" type="Texture" id=4]
+[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]
@@ -23,7 +23,6 @@
[ext_resource path="res://sprites/mouth/mouth10.png" type="Texture" id=21]
[ext_resource path="res://sprites/mouth/mouth12.png" type="Texture" id=22]
-
[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 ) ],
@@ -53,7 +52,7 @@ animations = [ {
[node name="Tail" type="AnimatedSprite" parent="."]
position = Vector2( 49.6951, 374.417 )
frames = SubResource( 1 )
-frame = 7
+frame = 6
playing = true
__meta__ = {
"_edit_lock_": true
@@ -69,7 +68,7 @@ __meta__ = {
[node name="Eyes" type="AnimatedSprite" parent="."]
position = Vector2( 109.519, 253.9 )
frames = SubResource( 2 )
-frame = 7
+frame = 18
playing = true
__meta__ = {
"_edit_lock_": true
@@ -78,7 +77,7 @@ __meta__ = {
[node name="Mouth" type="AnimatedSprite" parent="."]
position = Vector2( 126.316, 257.474 )
frames = SubResource( 3 )
-frame = 26
+frame = 6
playing = true
__meta__ = {
"_edit_lock_": true
diff --git a/project/sprites/character_base.svg b/project/sprites/character_base.svg
new file mode 100644
index 0000000..d32a547
--- /dev/null
+++ b/project/sprites/character_base.svg
@@ -0,0 +1,188 @@
+
+
+
+
diff --git a/project/sprites/character_base.svg.import b/project/sprites/character_base.svg.import
new file mode 100644
index 0000000..cbf71f6
--- /dev/null
+++ b/project/sprites/character_base.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/character_base.svg-5ea6954c66ca6e666096a6a63d2174dc.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/character_base.svg"
+dest_files=[ "res://.import/character_base.svg-5ea6954c66ca6e666096a6a63d2174dc.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
From 782361dc0b857adb70fedccacbf53ae3cb31c3bf Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Tue, 30 Apr 2019 01:51:53 -0400
Subject: [PATCH 02/15] Recreated a few pants
- Recreated and replaced most pants from the original with the newer recreations
- Added debug settings to project
- Created assets folder for non-SVG art source files
---
assets/.gitkeep | 0
project/project.godot | 8 +
project/scn/Character.tscn | 6 +-
project/scn/ClassicClothes.tscn | 452 +-----------
project/scn/Clothes.tscn | 783 +++------------------
project/scn/ModernScn.tscn | 1 -
project/sprites/blue_camo_jeans.svg | 201 ++++++
project/sprites/blue_camo_jeans.svg.import | 34 +
project/sprites/character_base.svg | 22 +-
project/sprites/jeans.svg | 102 +++
project/sprites/jeans.svg.import | 34 +
project/sprites/sweat_pants.svg | 73 ++
project/sprites/sweat_pants.svg.import | 34 +
project/src/Clothes.gd | 6 +-
14 files changed, 644 insertions(+), 1112 deletions(-)
create mode 100644 assets/.gitkeep
create mode 100644 project/sprites/blue_camo_jeans.svg
create mode 100644 project/sprites/blue_camo_jeans.svg.import
create mode 100644 project/sprites/jeans.svg
create mode 100644 project/sprites/jeans.svg.import
create mode 100644 project/sprites/sweat_pants.svg
create mode 100644 project/sprites/sweat_pants.svg.import
diff --git a/assets/.gitkeep b/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/project/project.godot b/project/project.godot
index a6f5c3f..734b015 100644
--- a/project/project.godot
+++ b/project/project.godot
@@ -28,6 +28,14 @@ name_sv="Nathans klä upp"
GameKit="*res://src/GameKit.gd"
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/width=800
diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn
index 742dade..ffaa1f6 100644
--- a/project/scn/Character.tscn
+++ b/project/scn/Character.tscn
@@ -52,7 +52,7 @@ animations = [ {
[node name="Tail" type="AnimatedSprite" parent="."]
position = Vector2( 49.6951, 374.417 )
frames = SubResource( 1 )
-frame = 6
+frame = 8
playing = true
__meta__ = {
"_edit_lock_": true
@@ -68,7 +68,7 @@ __meta__ = {
[node name="Eyes" type="AnimatedSprite" parent="."]
position = Vector2( 109.519, 253.9 )
frames = SubResource( 2 )
-frame = 18
+frame = 16
playing = true
__meta__ = {
"_edit_lock_": true
@@ -77,7 +77,7 @@ __meta__ = {
[node name="Mouth" type="AnimatedSprite" parent="."]
position = Vector2( 126.316, 257.474 )
frames = SubResource( 3 )
-frame = 6
+frame = 10
playing = true
__meta__ = {
"_edit_lock_": true
diff --git a/project/scn/ClassicClothes.tscn b/project/scn/ClassicClothes.tscn
index a6d4671..08e76b9 100644
--- a/project/scn/ClassicClothes.tscn
+++ b/project/scn/ClassicClothes.tscn
@@ -4,10 +4,10 @@
[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.png" type="Texture" id=5]
+[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.png" type="Texture" id=7]
-[ext_resource path="res://sprites/blue_camo_jeans.png" type="Texture" id=8]
+[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]
@@ -20,592 +20,200 @@
[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]
-
[node name="Clothes" type="Control"]
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="Wordrobe" type="ReferenceRect" parent="." index="0"]
-
-editor/display_folded = true
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Wordrobe" type="ReferenceRect" parent="."]
margin_left = 193.0
margin_top = 17.0
margin_right = 775.0
margin_bottom = 527.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
__meta__ = {
"_edit_lock_": true
}
-[node name="Underwear" type="Control" parent="Wordrobe" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Underwear" type="Control" parent="Wordrobe"]
margin_left = -197.0
margin_top = -8.0
margin_right = -197.0
margin_bottom = -8.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-[node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 1 )
script = ExtResource( 2 )
-[node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear"]
margin_left = 375.0
margin_top = 454.0
margin_right = 443.0
margin_bottom = 488.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear"]
margin_left = 512.0
margin_top = 453.0
margin_right = 580.0
margin_bottom = 493.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 4 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Bottoms" type="Control" parent="Wordrobe" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Bottoms" type="Control" parent="Wordrobe"]
margin_left = -197.0
margin_top = -8.0
margin_right = -197.0
margin_bottom = -8.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-[node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms"]
margin_left = 614.0
margin_top = 292.0
margin_right = 720.0
margin_bottom = 404.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 5 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="DJ Shorts" type="TextureButton" parent="Wordrobe/Bottoms" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 6 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Anchor", "Textures" ]
-[node name="Sweats" type="TextureButton" parent="Wordrobe/Bottoms" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Sweats" type="TextureButton" parent="Wordrobe/Bottoms"]
margin_left = 484.0
margin_top = 318.0
margin_right = 590.0
margin_bottom = 430.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 7 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Blue Camo Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 8 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Beat Up Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="4"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 9 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Tops" type="Control" parent="Wordrobe" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Tops" type="Control" parent="Wordrobe"]
margin_left = -197.0
margin_top = -8.0
margin_right = -197.0
margin_bottom = -8.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-[node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Tops" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Tops"]
margin_left = 643.0
margin_top = 34.0
margin_right = 728.0
margin_bottom = 144.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 10 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="DJ Shirt" type="TextureButton" parent="Wordrobe/Tops" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 11 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Raw" type="TextureButton" parent="Wordrobe/Tops" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Raw" type="TextureButton" parent="Wordrobe/Tops"]
margin_left = 247.0
margin_top = 25.0
margin_right = 332.0
margin_bottom = 138.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 12 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Atomic Shirt" type="TextureButton" parent="Wordrobe/Tops" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 13 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Z Shirt" type="TextureButton" parent="Wordrobe/Tops" index="4"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 14 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Biker Jacket" type="TextureButton" parent="Wordrobe/Tops" index="5"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 15 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="What's New" type="TextureButton" parent="Wordrobe/Tops" index="6"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 16 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Train Shirt" type="TextureButton" parent="Wordrobe/Tops" index="7"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[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
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 17 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="Accessories" type="Control" parent="Wordrobe" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Accessories" type="Control" parent="Wordrobe"]
margin_left = -197.0
margin_top = -8.0
margin_right = -197.0
margin_bottom = -8.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-[node name="Camera" type="TextureButton" parent="Wordrobe/Accessories" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Camera" type="TextureButton" parent="Wordrobe/Accessories"]
margin_left = 398.0
margin_top = 94.0
margin_right = 447.0
margin_bottom = 156.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 18 )
script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
-[node name="OwO Censor" type="TextureButton" parent="Wordrobe/Accessories" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 371.0
-margin_top = 37.0
-margin_right = 476.0
-margin_bottom = 77.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
+[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 )
-_sections_unfolded = [ "Textures" ]
[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"]
-
-
diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn
index a614c9f..6f3494d 100644
--- a/project/scn/Clothes.tscn
+++ b/project/scn/Clothes.tscn
@@ -1,905 +1,344 @@
-[gd_scene load_steps=30 format=2]
+[gd_scene load_steps=29 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/lights.png" type="Texture" id=3]
-[ext_resource path="res://sprites/DressUp.theme" type="Theme" id=4]
-[ext_resource path="res://sprites/jeans.png" type="Texture" id=5]
-[ext_resource path="res://sprites/dj_shorts.png" type="Texture" id=6]
-[ext_resource path="res://sprites/sweat_pants.png" type="Texture" id=7]
-[ext_resource path="res://sprites/blue_camo_jeans.png" 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/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.png" type="Texture" id=20]
-[ext_resource path="res://sprites/briefs.png" type="Texture" id=21]
-[ext_resource path="res://sprites/z_briefs.png" type="Texture" id=22]
-[ext_resource path="res://sprites/fundosi.png" 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://sprites/jeans.svg" type="Texture" id=4]
+[ext_resource path="res://sprites/dj_shorts.png" 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.png" 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.png" type="Texture" id=11]
+[ext_resource path="res://sprites/atomic_shirt.png" 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.png" type="Texture" id=16]
+[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=17]
+[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=18]
+[ext_resource path="res://sprites/owo_censor.png" type="Texture" id=19]
+[ext_resource path="res://sprites/briefs.png" type="Texture" id=20]
+[ext_resource path="res://sprites/z_briefs.png" type="Texture" id=21]
+[ext_resource path="res://sprites/fundosi.png" type="Texture" id=22]
+[ext_resource path="res://sprites/camera.png" 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="StyleBoxEmpty" id=1]
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-
[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
-_sections_unfolded = [ "Content Margin", "Resource" ]
[sub_resource type="StyleBoxEmpty" id=3]
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-
[node name="Clothes" type="Node"]
-
script = ExtResource( 1 )
-[node name="Wordrobe BG" type="Sprite" parent="." index="0"]
-
+[node name="Wordrobe BG" type="Sprite" parent="."]
position = Vector2( 492.609, 280.27 )
texture = ExtResource( 2 )
-[node name="Lights" type="Sprite" parent="." index="1"]
-
+[node name="Lights" type="Sprite" parent="."]
position = Vector2( 485.001, 160 )
texture = ExtResource( 3 )
-[node name="RefRect" type="ReferenceRect" parent="." index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="RefRect" type="ReferenceRect" parent="."]
+editor/display_folded = true
+anchor_right = 1.0
+anchor_bottom = 1.0
margin_left = 209.0
margin_top = 18.0
-margin_right = 808.0
-margin_bottom = 533.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-theme = ExtResource( 4 )
-_sections_unfolded = [ "Theme" ]
+margin_right = 8.0
+margin_bottom = -21.0
+__meta__ = {
+"_edit_lock_": true
+}
-[node name="Wordrobe" type="TabContainer" parent="RefRect" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Wordrobe" type="TabContainer" parent="RefRect"]
margin_left = 28.0
margin_top = 13.0
margin_right = 585.0
margin_bottom = 513.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
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
-tabs_visible = true
-_sections_unfolded = [ "custom_colors", "custom_styles" ]
-[node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
+[node name="Pants" type="Tabs" parent="RefRect/Wordrobe"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
custom_constants/hseparation = 0
-tab_align = 1
-scrolling_enabled = true
-_sections_unfolded = [ "Margin", "Rect", "Theme", "custom_fonts", "custom_icons", "custom_styles" ]
-[node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants"]
margin_left = -15.0
margin_top = 22.0
margin_right = 536.0
margin_bottom = 322.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
columns = 5
-_sections_unfolded = [ "Margin" ]
-[node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"]
margin_right = 106.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 5 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 4 )
-[node name="DJ Shorts" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="DJ Shorts" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"]
margin_left = 110.0
margin_right = 216.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 6 )
-_sections_unfolded = [ "Anchor", "Textures" ]
+texture_normal = ExtResource( 5 )
-[node name="Sweats" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Sweats" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"]
margin_left = 220.0
-margin_right = 323.0
+margin_right = 326.0
+margin_bottom = 112.0
+texture_normal = ExtResource( 6 )
+
+[node name="Blue Camo Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"]
+margin_left = 330.0
+margin_right = 436.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 7 )
-_sections_unfolded = [ "Textures" ]
-[node name="Blue Camo Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 327.0
-margin_right = 433.0
+[node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid"]
+margin_left = 440.0
+margin_right = 546.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
texture_normal = ExtResource( 8 )
-_sections_unfolded = [ "Textures" ]
-[node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="4"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 437.0
-margin_right = 543.0
-margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 9 )
-_sections_unfolded = [ "Textures" ]
-
-[node name="Remove Pants" type="Button" parent="RefRect/Wordrobe/Pants/PantsGrid" index="5"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Remove Pants" type="Button" parent="RefRect/Wordrobe/Pants/PantsGrid"]
margin_top = 116.0
margin_right = 106.0
margin_bottom = 228.0
rect_min_size = Vector2( 0, 112 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
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 )
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
text = "KRBT"
flat = true
-align = 1
-_sections_unfolded = [ "Rect", "custom_colors" ]
-
-[node name="Shirts" type="Tabs" parent="RefRect/Wordrobe" index="1"]
+[node name="Shirts" type="Tabs" parent="RefRect/Wordrobe"]
visible = false
-anchor_left = 0.0
-anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-tab_align = 1
-scrolling_enabled = true
-_sections_unfolded = [ "Margin" ]
-[node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts"]
margin_left = 33.0
margin_top = 14.0
margin_right = 474.0
margin_bottom = 457.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
columns = 5
-_sections_unfolded = [ "Grow Direction", "Margin" ]
-[node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_right = 85.0
margin_bottom = 115.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
+texture_normal = ExtResource( 9 )
+
+[node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
+margin_left = 89.0
+margin_right = 174.0
+margin_bottom = 115.0
texture_normal = ExtResource( 10 )
-_sections_unfolded = [ "Textures" ]
-[node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 89.0
-margin_right = 174.0
-margin_bottom = 115.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 11 )
-_sections_unfolded = [ "Textures" ]
-
-[node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 178.0
margin_right = 263.0
margin_bottom = 115.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 12 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 11 )
-[node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 267.0
margin_right = 352.0
margin_bottom = 115.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 13 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 12 )
-[node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="4"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 356.0
margin_right = 441.0
margin_bottom = 115.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 14 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 13 )
-[node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="5"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_top = 119.0
margin_right = 85.0
margin_bottom = 234.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 15 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 14 )
-[node name="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="6"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 89.0
margin_top = 119.0
margin_right = 174.0
margin_bottom = 234.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 16 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 15 )
-[node name="Train Hoodie" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="7"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Train Hoodie" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 178.0
margin_top = 119.0
margin_right = 263.0
margin_bottom = 234.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 17 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 16 )
-[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="8"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 267.0
margin_top = 119.0
margin_right = 352.0
margin_bottom = 234.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 18 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 17 )
-[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="9"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_left = 356.0
margin_top = 119.0
margin_right = 441.0
margin_bottom = 234.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 19 )
-_sections_unfolded = [ "Rect", "Textures" ]
+texture_normal = ExtResource( 18 )
-[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="10"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
margin_top = 238.0
margin_right = 85.0
margin_bottom = 350.0
rect_min_size = Vector2( 0, 112 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
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 )
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
text = "KRTP"
flat = true
-align = 1
-_sections_unfolded = [ "Rect", "custom_colors" ]
-
-[node name="Underwear" type="Tabs" parent="RefRect/Wordrobe" index="2"]
+[node name="Underwear" type="Tabs" parent="RefRect/Wordrobe"]
visible = false
-anchor_left = 0.0
-anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-tab_align = 1
-scrolling_enabled = true
-_sections_unfolded = [ "Margin" ]
-[node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear"]
margin_left = -20.0
margin_top = 10.0
margin_right = 532.0
margin_bottom = 122.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
columns = 5
-_sections_unfolded = [ "Margin" ]
-[node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid"]
margin_right = 106.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 20 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 19 )
-[node name="Briefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Briefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid"]
margin_left = 110.0
margin_right = 216.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 21 )
+texture_normal = ExtResource( 20 )
-[node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid"]
margin_left = 220.0
margin_right = 326.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 22 )
-_sections_unfolded = [ "Textures" ]
+texture_normal = ExtResource( 21 )
-[node name="Fundosi" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Fundosi" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid"]
margin_left = 330.0
margin_right = 436.0
margin_bottom = 112.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 23 )
-_sections_unfolded = [ "Textures" ]
-
-[node name="Accessoires" type="Tabs" parent="RefRect/Wordrobe" index="3"]
+texture_normal = ExtResource( 22 )
+[node name="Accessoires" type="Tabs" parent="RefRect/Wordrobe"]
visible = false
-anchor_left = 0.0
-anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-tab_align = 1
-scrolling_enabled = true
-[node name="AccessoiresGrid" type="GridContainer" parent="RefRect/Wordrobe/Accessoires" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="AccessoiresGrid" type="GridContainer" parent="RefRect/Wordrobe/Accessoires"]
margin_left = -14.0
margin_top = 14.0
margin_right = 536.0
margin_bottom = 119.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
columns = 6
-[node name="Camera" type="TextureButton" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Camera" type="TextureButton" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid"]
margin_right = 85.0
margin_bottom = 105.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 24 )
-_sections_unfolded = [ "Rect", "Textures" ]
+texture_normal = ExtResource( 23 )
-[node name="Remove Accessory" type="Button" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Remove Accessory" type="Button" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid"]
margin_left = 89.0
margin_right = 222.0
margin_bottom = 105.0
rect_min_size = Vector2( 85, 105 )
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
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 )
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
text = "Remove Accessory"
flat = true
-align = 1
-_sections_unfolded = [ "custom_colors" ]
-[node name="Body" type="ReferenceRect" parent="." index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Body" type="ReferenceRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
margin_left = 26.0
margin_top = 285.0
-margin_right = 144.0
-margin_bottom = 519.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
+margin_right = -656.0
+margin_bottom = -35.0
__meta__ = {
"_edit_lock_": true
}
-[node name="Undies" type="Sprite" parent="Body" index="0"]
-
+[node name="Undies" type="Sprite" parent="Body"]
position = Vector2( 57.9419, 159.296 )
-texture = ExtResource( 21 )
+texture = ExtResource( 20 )
__meta__ = {
"_edit_lock_": true
}
-[node name="Bottom" type="Sprite" parent="Body" index="1"]
-
+[node name="Bottom" type="Sprite" parent="Body"]
position = Vector2( 57.9419, 159.296 )
+texture = ExtResource( 24 )
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="Top" type="Sprite" parent="Body"]
+position = Vector2( 65.0597, 65.3242 )
texture = ExtResource( 25 )
__meta__ = {
"_edit_lock_": true
}
-[node name="Top" type="Sprite" parent="Body" index="2"]
-
+[node name="Accessory" type="Sprite" parent="Body"]
position = Vector2( 65.0597, 65.3242 )
-texture = ExtResource( 26 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="Accessory" type="Sprite" parent="Body" index="3"]
-
-position = Vector2( 65.0597, 65.3242 )
-texture = ExtResource( 26 )
+texture = ExtResource( 25 )
__meta__ = {
"_edit_lock_": true
}
[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"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Blue Camo Jeans" to="." method="_on_Blue_Camo_Jeans_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Beat Up Jeans" to="." method="_on_Beat_Up_Jeans_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Remove Pants" to="." method="_on_Remove_Pants_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Sweatshirt" to="." method="_on_Sweatshirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/DJ Shirt" to="." method="_on_DJ_Shirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Raw" to="." method="_on_Raw_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Atomic" to="." method="_on_Atomic_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Z Shirt" to="." method="_on_Z_Shirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Biker Jacket" to="." method="_on_Biker_Jacket_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/NL Jacket" to="." method="_on_NL_Jacket_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Train Hoodie" to="." method="_on_Train_Hoodie_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Korm Shirt" to="." method="_on_Korm_Shirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/What's New Shirt" to="." method="_on_Whats_New_Shirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Remove Shirt" to="." method="_on_Remove_Shirt_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/OwO Censor" to="." method="_on_OwO_Censor_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Briefs" to="." method="_on_Briefs_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/ZBriefs" to="." method="_on_ZBriefs_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Fundosi" to="." method="_on_Fundosi_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/Camera" to="." method="_on_Camera_pressed"]
-
[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/Remove Accessory" to="." method="_on_Remove_Accessory_pressed"]
-
-
diff --git a/project/scn/ModernScn.tscn b/project/scn/ModernScn.tscn
index 394becd..87dc944 100644
--- a/project/scn/ModernScn.tscn
+++ b/project/scn/ModernScn.tscn
@@ -7,7 +7,6 @@
[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=5]
[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=6]
-
[node name="GameScreen" type="Node"]
script = ExtResource( 1 )
diff --git a/project/sprites/blue_camo_jeans.svg b/project/sprites/blue_camo_jeans.svg
new file mode 100644
index 0000000..b3fcdf3
--- /dev/null
+++ b/project/sprites/blue_camo_jeans.svg
@@ -0,0 +1,201 @@
+
+
+
+
diff --git a/project/sprites/blue_camo_jeans.svg.import b/project/sprites/blue_camo_jeans.svg.import
new file mode 100644
index 0000000..9e987f6
--- /dev/null
+++ b/project/sprites/blue_camo_jeans.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/blue_camo_jeans.svg-41f698e822667bb843272733405fda26.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/blue_camo_jeans.svg"
+dest_files=[ "res://.import/blue_camo_jeans.svg-41f698e822667bb843272733405fda26.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/character_base.svg b/project/sprites/character_base.svg
index d32a547..a826d68 100644
--- a/project/sprites/character_base.svg
+++ b/project/sprites/character_base.svg
@@ -25,11 +25,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="70.754725"
- inkscape:cy="49.388861"
+ inkscape:zoom="1.979899"
+ inkscape:cx="80.061629"
+ inkscape:cy="172.34635"
inkscape:document-units="mm"
- inkscape:current-layer="layer3"
+ inkscape:current-layer="layer2"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
@@ -64,7 +64,8 @@
+ inkscape:label="Color"
+ sodipodi:insensitive="true">
+ inkscape:label="Re-ink">
+
+
+
diff --git a/project/sprites/jeans.svg.import b/project/sprites/jeans.svg.import
new file mode 100644
index 0000000..e4617bb
--- /dev/null
+++ b/project/sprites/jeans.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/jeans.svg-7d67c27e9800a7e7f837e3f29c2dd43f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/jeans.svg"
+dest_files=[ "res://.import/jeans.svg-7d67c27e9800a7e7f837e3f29c2dd43f.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/sweat_pants.svg b/project/sprites/sweat_pants.svg
new file mode 100644
index 0000000..2d5dcc5
--- /dev/null
+++ b/project/sprites/sweat_pants.svg
@@ -0,0 +1,73 @@
+
+
+
+
diff --git a/project/sprites/sweat_pants.svg.import b/project/sprites/sweat_pants.svg.import
new file mode 100644
index 0000000..a80a6c7
--- /dev/null
+++ b/project/sprites/sweat_pants.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/sweat_pants.svg-1954ece07ca8c041219480fca138c463.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/sweat_pants.svg"
+dest_files=[ "res://.import/sweat_pants.svg-1954ece07ca8c041219480fca138c463.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/Clothes.gd b/project/src/Clothes.gd
index 6197717..ebfef4d 100644
--- a/project/src/Clothes.gd
+++ b/project/src/Clothes.gd
@@ -60,14 +60,14 @@ func _on_Briefs_pressed():
change_undies(load("res://sprites/briefs.png"))
func _on_Jeans_pressed():
- change_bottoms(load("res://sprites/jeans.png"))
+ change_bottoms(load("res://sprites/jeans.svg"))
func _on_OwO_Censor_pressed():
change_bottoms(null)
change_undies(load("res://sprites/owo_censor.png"))
func _on_Sweats_pressed():
- change_bottoms(load("res://sprites/sweat_pants.png"))
+ change_bottoms(load("res://sprites/sweat_pants.svg"))
func _on_Sweatshirt_pressed():
change_tops(load("res://sprites/old_sweatshirt.png"))
@@ -100,7 +100,7 @@ func _on_NL_Jacket_pressed():
change_tops(load("res://sprites/nl_jacket.png"))
func _on_Blue_Camo_Jeans_pressed():
- change_bottoms(load("res://sprites/blue_camo_jeans.png"))
+ change_bottoms(load("res://sprites/blue_camo_jeans.svg"))
func _on_Whats_New_Shirt_pressed():
change_tops(load("res://sprites/whatsnew_shirt.png"))
From 05cc47e9d91b999816f7fbdd482f2b2f45876869 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Wed, 1 May 2019 00:56:33 -0400
Subject: [PATCH 03/15] New title! Finally.
- Changing Nathan to a fennec, starting with the ears.
- Cleaned up README
---
README.md | 2 +-
project/default_env.tres | 1 -
project/scn/Character.tscn | 4 +-
project/scn/ClassicScn.tscn | 20 ++----
project/scn/TitleScn.tscn | 50 +++++--------
project/sprites/blue_camo_jeans.svg | 36 +++++-----
project/sprites/character_base.svg | 97 +++++++++++++------------
project/sprites/title.svg | 105 +++++++++++++++++++++++-----
project/src/TitleScn.gd | 15 +---
9 files changed, 186 insertions(+), 144 deletions(-)
diff --git a/README.md b/README.md
index 8b9b679..4945c89 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://ko-fi.com/X8X5LDU7)
-​Nathan's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up, that contains all the original assets with only minor edits. You can download this game for free, with an option to donate, at [Itch.io](https://antonwilc0x.itch.io/zacksdressup) or become a [Patreon​​](https://www.patreon.com/antonwilc0x) and get your name in the credits.
+​Nathan's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up.
## Screenshot
diff --git a/project/default_env.tres b/project/default_env.tres
index 378e0c1..dfe62ab 100644
--- a/project/default_env.tres
+++ b/project/default_env.tres
@@ -12,4 +12,3 @@ sun_energy = 16.0
[resource]
background_mode = 2
background_sky = SubResource( 1 )
-
diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn
index ffaa1f6..b0df14c 100644
--- a/project/scn/Character.tscn
+++ b/project/scn/Character.tscn
@@ -68,7 +68,7 @@ __meta__ = {
[node name="Eyes" type="AnimatedSprite" parent="."]
position = Vector2( 109.519, 253.9 )
frames = SubResource( 2 )
-frame = 16
+frame = 2
playing = true
__meta__ = {
"_edit_lock_": true
@@ -77,7 +77,7 @@ __meta__ = {
[node name="Mouth" type="AnimatedSprite" parent="."]
position = Vector2( 126.316, 257.474 )
frames = SubResource( 3 )
-frame = 10
+frame = 2
playing = true
__meta__ = {
"_edit_lock_": true
diff --git a/project/scn/ClassicScn.tscn b/project/scn/ClassicScn.tscn
index c7fc678..0fb082c 100644
--- a/project/scn/ClassicScn.tscn
+++ b/project/scn/ClassicScn.tscn
@@ -7,33 +7,25 @@
[ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=5]
[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=6]
-
-
-[node name="GameScreen" type="Node" index="0"]
-
+[node name="GameScreen" type="Node"]
script = ExtResource( 1 )
-[node name="Background" type="Sprite" parent="." index="0"]
-
+[node name="Background" type="Sprite" parent="."]
position = Vector2( 400, 277 )
texture = ExtResource( 2 )
__meta__ = {
"_edit_lock_": true
}
-[node name="Lights" type="Sprite" parent="." index="1"]
-
+[node name="Lights" type="Sprite" parent="."]
position = Vector2( 477.823, 100.811 )
texture = ExtResource( 3 )
-_sections_unfolded = [ "Z Index" ]
__meta__ = {
"_edit_lock_": true
}
-[node name="Nathan" parent="." index="2" instance=ExtResource( 4 )]
-
-[node name="Clothes" parent="." index="3" instance=ExtResource( 5 )]
-
-[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )]
+[node name="Nathan" parent="." instance=ExtResource( 4 )]
+[node name="Clothes" parent="." instance=ExtResource( 5 )]
+[node name="WinDialogs" parent="." instance=ExtResource( 6 )]
diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn
index e121d17..67ef605 100644
--- a/project/scn/TitleScn.tscn
+++ b/project/scn/TitleScn.tscn
@@ -1,44 +1,30 @@
-[gd_scene load_steps=6 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/modern_dress_up_blurred_bg.png" type="Texture" id=2]
-[ext_resource path="res://sprites/dressup_blurred_wardrobe.png" type="Texture" id=3]
-[ext_resource path="res://sprites/classic_dress_up_blurred_bg.png" type="Texture" id=4]
-[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=5]
+[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="Modern" type="Node2D" parent="."]
-
-[node name="ModernBG" type="Sprite" parent="Modern"]
+[node name="ModernBG" type="Sprite" parent="."]
position = Vector2( 400, 277 )
texture = ExtResource( 2 )
__meta__ = {
"_edit_lock_": true
}
-[node name="WordrobeBG" type="Sprite" parent="Modern"]
-visible = false
-position = Vector2( 492.609, 280.27 )
+[node name="Title" type="Sprite" parent="."]
+position = Vector2( 399.047, 113.148 )
texture = ExtResource( 3 )
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="ClassicBG" type="Sprite" parent="."]
-visible = false
-position = Vector2( 400, 277 )
-texture = ExtResource( 4 )
-__meta__ = {
-"_edit_lock_": true
-}
[node name="MenuRf" type="ReferenceRect" parent="."]
-margin_left = 202.0
-margin_top = 67.0
-margin_right = 762.0
-margin_bottom = 518.0
+editor/display_folded = true
+margin_left = 130.323
+margin_top = 34.4196
+margin_right = 690.323
+margin_bottom = 485.42
[node name="StartVbox" type="VBoxContainer" parent="MenuRf"]
anchor_left = 0.5
@@ -68,15 +54,14 @@ margin_right = 136.0
margin_bottom = 68.0
text = "KLIC"
-[node name="ModePanel" type="Panel" parent="MenuRf"]
-visible = false
+[node name="ModePanel" type="WindowDialog" parent="MenuRf"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
-margin_left = 80.0
+margin_left = -73.0
margin_top = -46.0
-margin_right = 226.0
+margin_right = 73.0
margin_bottom = 46.0
[node name="PlayVbox" type="VBoxContainer" parent="MenuRf/ModePanel"]
@@ -117,12 +102,9 @@ __meta__ = {
"_edit_lock_": true
}
-[node name="WinDialogs" parent="." instance=ExtResource( 5 )]
-
-[connection signal="toggled" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_toggled"]
+[node name="WinDialogs" parent="." instance=ExtResource( 4 )]
+[connection signal="pressed" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_pressed"]
[connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"]
[connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"]
[connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ModernBtn" to="." method="_on_ModernBtn_pressed"]
-[connection signal="mouse_entered" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_entered"]
-[connection signal="mouse_exited" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_exited"]
[connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_pressed"]
diff --git a/project/sprites/blue_camo_jeans.svg b/project/sprites/blue_camo_jeans.svg
index b3fcdf3..0835ead 100644
--- a/project/sprites/blue_camo_jeans.svg
+++ b/project/sprites/blue_camo_jeans.svg
@@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.839192"
+ inkscape:zoom="5.6"
inkscape:cx="67.738265"
- inkscape:cy="77.809596"
+ inkscape:cy="72.758833"
inkscape:document-units="mm"
inkscape:current-layer="layer2"
showgrid="false"
@@ -41,7 +41,8 @@
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
- inkscape:window-maximized="1" />
+ inkscape:window-maximized="1"
+ inkscape:lockguides="true" />
@@ -54,15 +55,12 @@
-
+ inkscape:label="Re-ink"
+ style="display:inline"
+ sodipodi:insensitive="true">
@@ -103,27 +101,27 @@
id="path2579"
inkscape:connector-curvature="0" />
@@ -152,7 +150,7 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
@@ -163,7 +161,7 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
diff --git a/project/sprites/character_base.svg b/project/sprites/character_base.svg
index a826d68..925e51f 100644
--- a/project/sprites/character_base.svg
+++ b/project/sprites/character_base.svg
@@ -25,23 +25,23 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="80.061629"
- inkscape:cy="172.34635"
+ inkscape:zoom="2.8"
+ inkscape:cx="86.349322"
+ inkscape:cy="146.4697"
inkscape:document-units="mm"
- inkscape:current-layer="layer2"
+ inkscape:current-layer="layer3"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:pagecheckerboard="true"
- showguides="false"
- inkscape:window-width="1920"
- inkscape:window-height="1001"
- inkscape:window-x="-9"
- inkscape:window-y="-9"
- inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:window-width="958"
+ inkscape:window-height="991"
+ inkscape:window-x="-8"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
inkscape:lockguides="false" />
@@ -64,20 +64,13 @@
+ inkscape:label="Color">
-
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
-
+ sodipodi:nodetypes="zczczzcczscz" />
+
+
+
+
+ inkscape:label="Re-ink"
+ style="display:inline"
+ sodipodi:insensitive="true">
+ sodipodi:nodetypes="csc" />
-
+
diff --git a/project/sprites/title.svg b/project/sprites/title.svg
index 93c277b..b019278 100644
--- a/project/sprites/title.svg
+++ b/project/sprites/title.svg
@@ -9,9 +9,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="102.53982mm"
- height="12.457465mm"
- viewBox="0 0 102.53982 12.457465"
+ width="103.24624mm"
+ height="36.245796mm"
+ viewBox="0 0 103.24624 36.245796"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
@@ -26,8 +26,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
- inkscape:cx="177.04774"
- inkscape:cy="-43.325592"
+ inkscape:cx="426.57668"
+ inkscape:cy="19.131602"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -57,17 +57,88 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(54.296804,-86.706353)">
- Nathan's Dress Up
+ transform="translate(54.41838,-81.046773)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/project/src/TitleScn.gd b/project/src/TitleScn.gd
index 8238689..691a622 100644
--- a/project/src/TitleScn.gd
+++ b/project/src/TitleScn.gd
@@ -8,22 +8,11 @@ func _on_ClassicBtn_pressed():
func _on_ModernBtn_pressed():
switch_scenes("modern")
-func _on_ClassicBtn_mouse_entered():
- $Modern.hide()
- $ClassicBG.show()
-
-func _on_ClassicBtn_mouse_exited():
- $ClassicBG.hide()
- $Modern.show()
-
func _on_CreditsBtn_pressed():
$WinDialogs/CreditsWin.show()
func _on_LicenseBtn_pressed():
$WinDialogs/LicenseWin.show()
-func _on_PlayBtn_toggled(button_pressed):
- if button_pressed == true:
- $MenuRf/ModePanel.show()
- else:
- $MenuRf/ModePanel.hide()
+func _on_PlayBtn_pressed():
+ $MenuRf/ModePanel.show()
From 2ee3f5a431abe071677cd82c1c9160cfd47ddcbc Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Wed, 1 May 2019 02:23:09 -0400
Subject: [PATCH 04/15] Remade the Atomic and RAW shirts
- The RAW shirt was changed to PAW, to avoid any copyright issues. I still haven't reproduced the look and feel of that shirt quite how I want it to be. I may change the shirt to something else entirely, though.
---
project/scn/Clothes.tscn | 10 +-
project/sprites/atomic_shirt.svg | 121 ++++++++++++++++++++++++
project/sprites/atomic_shirt.svg.import | 34 +++++++
project/sprites/raw_shirt.svg | 109 +++++++++++++++++++++
project/sprites/raw_shirt.svg.import | 34 +++++++
project/src/Clothes.gd | 4 +-
6 files changed, 304 insertions(+), 8 deletions(-)
create mode 100644 project/sprites/atomic_shirt.svg
create mode 100644 project/sprites/atomic_shirt.svg.import
create mode 100644 project/sprites/raw_shirt.svg
create mode 100644 project/sprites/raw_shirt.svg.import
diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn
index 6f3494d..2f0371a 100644
--- a/project/scn/Clothes.tscn
+++ b/project/scn/Clothes.tscn
@@ -10,8 +10,8 @@
[ext_resource path="res://sprites/beat_up_jeans.png" 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.png" type="Texture" id=11]
-[ext_resource path="res://sprites/atomic_shirt.png" type="Texture" id=12]
+[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]
@@ -49,7 +49,6 @@ position = Vector2( 485.001, 160 )
texture = ExtResource( 3 )
[node name="RefRect" type="ReferenceRect" parent="."]
-editor/display_folded = true
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 209.0
@@ -73,6 +72,7 @@ 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_top = 29.0
@@ -127,7 +127,6 @@ text = "KRBT"
flat = true
[node name="Shirts" type="Tabs" parent="RefRect/Wordrobe"]
-visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
@@ -136,7 +135,7 @@ margin_top = 29.0
margin_left = 33.0
margin_top = 14.0
margin_right = 474.0
-margin_bottom = 457.0
+margin_bottom = 364.0
columns = 5
[node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
@@ -318,7 +317,6 @@ texture = ExtResource( 25 )
__meta__ = {
"_edit_lock_": true
}
-
[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/sprites/atomic_shirt.svg b/project/sprites/atomic_shirt.svg
new file mode 100644
index 0000000..1c218f6
--- /dev/null
+++ b/project/sprites/atomic_shirt.svg
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/project/sprites/atomic_shirt.svg.import b/project/sprites/atomic_shirt.svg.import
new file mode 100644
index 0000000..d983676
--- /dev/null
+++ b/project/sprites/atomic_shirt.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/atomic_shirt.svg-b3ba00542391d52e77d38154f516ba81.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/atomic_shirt.svg"
+dest_files=[ "res://.import/atomic_shirt.svg-b3ba00542391d52e77d38154f516ba81.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/raw_shirt.svg b/project/sprites/raw_shirt.svg
new file mode 100644
index 0000000..cd038f9
--- /dev/null
+++ b/project/sprites/raw_shirt.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/project/sprites/raw_shirt.svg.import b/project/sprites/raw_shirt.svg.import
new file mode 100644
index 0000000..c3f4a89
--- /dev/null
+++ b/project/sprites/raw_shirt.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/raw_shirt.svg-1202cc08aee5b0934f83fe7787bf5d7c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/raw_shirt.svg"
+dest_files=[ "res://.import/raw_shirt.svg-1202cc08aee5b0934f83fe7787bf5d7c.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/Clothes.gd b/project/src/Clothes.gd
index ebfef4d..4601fe7 100644
--- a/project/src/Clothes.gd
+++ b/project/src/Clothes.gd
@@ -76,10 +76,10 @@ func _on_DJ_Shirt_pressed():
change_tops(load("res://sprites/dj_shirt.png"))
func _on_Raw_pressed():
- change_tops(load("res://sprites/raw_shirt.png"))
+ change_tops(load("res://sprites/raw_shirt.svg"))
func _on_Atomic_pressed():
- change_tops(load("res://sprites/atomic_shirt.png"))
+ change_tops(load("res://sprites/atomic_shirt.svg"))
func _on_Korm_Shirt_pressed():
change_tops(load("res://sprites/korm_shirt.png"))
From 6aac8c0dec91159c13a6de6d62a77c1c899e88e1 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Sat, 4 May 2019 14:16:37 -0400
Subject: [PATCH 05/15] Redid all of the underwear!
The following have been redone: beat up jeans, briefs, z briefs, fundosi and the owo censor.
---
project/project.godot | 1 +
project/scn/Clothes.tscn | 12 +--
project/scn/ModernScn.tscn | 1 -
project/scn/TitleScn.tscn | 3 +-
project/sprites/DressUp.theme | Bin 648 -> 0 bytes
project/sprites/beat_up_jeans.svg | 114 +++++++++++++++++++++++
project/sprites/beat_up_jeans.svg.import | 34 +++++++
project/sprites/briefs.svg | 95 +++++++++++++++++++
project/sprites/briefs.svg.import | 34 +++++++
project/sprites/fundosi.svg | 102 ++++++++++++++++++++
project/sprites/fundosi.svg.import | 34 +++++++
project/sprites/jeans.svg | 10 +-
project/sprites/owo_censor.svg | 91 ++++++++++++++++++
project/sprites/owo_censor.svg.import | 34 +++++++
project/sprites/z_briefs.svg | 112 ++++++++++++++++++++++
project/sprites/z_briefs.svg.import | 34 +++++++
project/src/Clothes.gd | 12 +--
17 files changed, 703 insertions(+), 20 deletions(-)
delete mode 100644 project/sprites/DressUp.theme
create mode 100644 project/sprites/beat_up_jeans.svg
create mode 100644 project/sprites/beat_up_jeans.svg.import
create mode 100644 project/sprites/briefs.svg
create mode 100644 project/sprites/briefs.svg.import
create mode 100644 project/sprites/fundosi.svg
create mode 100644 project/sprites/fundosi.svg.import
create mode 100644 project/sprites/owo_censor.svg
create mode 100644 project/sprites/owo_censor.svg.import
create mode 100644 project/sprites/z_briefs.svg
create mode 100644 project/sprites/z_briefs.svg.import
diff --git a/project/project.godot b/project/project.godot
index 734b015..e963c04 100644
--- a/project/project.godot
+++ b/project/project.godot
@@ -62,4 +62,5 @@ quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=0
quality/2d/use_pixel_snap=true
+vram_compression/import_etc=true
environment/default_environment="res://default_env.tres"
diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn
index 2f0371a..d118603 100644
--- a/project/scn/Clothes.tscn
+++ b/project/scn/Clothes.tscn
@@ -7,7 +7,7 @@
[ext_resource path="res://sprites/dj_shorts.png" 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.png" type="Texture" id=8]
+[ext_resource path="res://sprites/beat_up_jeans.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]
@@ -18,10 +18,10 @@
[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=16]
[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=17]
[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=18]
-[ext_resource path="res://sprites/owo_censor.png" type="Texture" id=19]
-[ext_resource path="res://sprites/briefs.png" type="Texture" id=20]
-[ext_resource path="res://sprites/z_briefs.png" type="Texture" id=21]
-[ext_resource path="res://sprites/fundosi.png" type="Texture" id=22]
+[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]
[ext_resource path="res://sprites/bottoms_placeholder.png" type="Texture" id=24]
[ext_resource path="res://sprites/tops_placeholder.png" type="Texture" id=25]
@@ -72,7 +72,6 @@ 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_top = 29.0
@@ -127,6 +126,7 @@ text = "KRBT"
flat = true
[node name="Shirts" type="Tabs" parent="RefRect/Wordrobe"]
+visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 29.0
diff --git a/project/scn/ModernScn.tscn b/project/scn/ModernScn.tscn
index 87dc944..8983e28 100644
--- a/project/scn/ModernScn.tscn
+++ b/project/scn/ModernScn.tscn
@@ -29,4 +29,3 @@ __meta__ = {
[node name="Clothes" parent="." instance=ExtResource( 5 )]
[node name="WinDialogs" parent="." instance=ExtResource( 6 )]
-
diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn
index 67ef605..55179dd 100644
--- a/project/scn/TitleScn.tscn
+++ b/project/scn/TitleScn.tscn
@@ -16,11 +16,10 @@ __meta__ = {
}
[node name="Title" type="Sprite" parent="."]
-position = Vector2( 399.047, 113.148 )
+position = Vector2( 408.047, 113.148 )
texture = ExtResource( 3 )
[node name="MenuRf" type="ReferenceRect" parent="."]
-editor/display_folded = true
margin_left = 130.323
margin_top = 34.4196
margin_right = 690.323
diff --git a/project/sprites/DressUp.theme b/project/sprites/DressUp.theme
deleted file mode 100644
index 6d3cc0e6b6477ad684a733e50052bdec214d663d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 648
zcmV;30(bpVQ$s@n000005C8zV1^@tX0ssIgwJ-f(xdk;7045kxIY5hG0P5~;<(XNU
z|Ns9-OSBWc?w53VABar_b?@6C(8LhYOf5rD%lk%P0SkYE;H7eD%8d2W*f8)Q$AHL5z
zBmW^D;17qdnJ~&lqU5qA8_eNLaL5$1b;-C~Po>ksQKJtd@k$HL8n1lP*sCsR*-6}U
zHP4Q_W!?%YcwG|eGfjD#!@IZow4Vm{|=E4tPLZLsP2@#kVri8MO*(`A{bg@F>
z?N}iWfRCtASu{lf03aGD0HA__sv&L?;DaPmgD6)324(;RCT#r!|E18$jsYMgyPqT>
zR)pasx9PP1d#3V*d8Y6?AB;!;SE1H=*khw?!0>;=Wo8bJhF|f7?;`j6R=`90Sx7C!
zHJ*R?%l*Gu1nXF;os1u}d)mALKewB&N4O(Biw+X>7P2sy!XJ^C$?LjHPpp6~%0=5t
zjxW>XiB>gFa4R0lugY;QfP{^CCl&v
imE`2eYH!^B$?XRI{>{)PJKw5%JhUeUxVSP>Q$s`hQz>8o
diff --git a/project/sprites/beat_up_jeans.svg b/project/sprites/beat_up_jeans.svg
new file mode 100644
index 0000000..88d4402
--- /dev/null
+++ b/project/sprites/beat_up_jeans.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/project/sprites/beat_up_jeans.svg.import b/project/sprites/beat_up_jeans.svg.import
new file mode 100644
index 0000000..b16cf9a
--- /dev/null
+++ b/project/sprites/beat_up_jeans.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/beat_up_jeans.svg-03d15b89036beb9eef0ad5d0514187f7.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/beat_up_jeans.svg"
+dest_files=[ "res://.import/beat_up_jeans.svg-03d15b89036beb9eef0ad5d0514187f7.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/briefs.svg b/project/sprites/briefs.svg
new file mode 100644
index 0000000..9ee0fbe
--- /dev/null
+++ b/project/sprites/briefs.svg
@@ -0,0 +1,95 @@
+
+
+
+
diff --git a/project/sprites/briefs.svg.import b/project/sprites/briefs.svg.import
new file mode 100644
index 0000000..4cbb35e
--- /dev/null
+++ b/project/sprites/briefs.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/briefs.svg-9a7fc83a2615d5060d598e416767b736.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/briefs.svg"
+dest_files=[ "res://.import/briefs.svg-9a7fc83a2615d5060d598e416767b736.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/fundosi.svg b/project/sprites/fundosi.svg
new file mode 100644
index 0000000..6b6e07a
--- /dev/null
+++ b/project/sprites/fundosi.svg
@@ -0,0 +1,102 @@
+
+
+
+
diff --git a/project/sprites/fundosi.svg.import b/project/sprites/fundosi.svg.import
new file mode 100644
index 0000000..61e012b
--- /dev/null
+++ b/project/sprites/fundosi.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/fundosi.svg-faa9e69901a505e92e5b3e529aca7f92.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/fundosi.svg"
+dest_files=[ "res://.import/fundosi.svg-faa9e69901a505e92e5b3e529aca7f92.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/jeans.svg b/project/sprites/jeans.svg
index 8e1ad7d..5fc5bbd 100644
--- a/project/sprites/jeans.svg
+++ b/project/sprites/jeans.svg
@@ -26,7 +26,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.9195959"
- inkscape:cx="51.627347"
+ inkscape:cx="30.540413"
inkscape:cy="71.8377"
inkscape:document-units="mm"
inkscape:current-layer="layer2"
@@ -71,19 +71,19 @@
sodipodi:nodetypes="ssssscss" />
diff --git a/project/sprites/owo_censor.svg b/project/sprites/owo_censor.svg
new file mode 100644
index 0000000..31fcae8
--- /dev/null
+++ b/project/sprites/owo_censor.svg
@@ -0,0 +1,91 @@
+
+
+
+
diff --git a/project/sprites/owo_censor.svg.import b/project/sprites/owo_censor.svg.import
new file mode 100644
index 0000000..ebb8a25
--- /dev/null
+++ b/project/sprites/owo_censor.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/owo_censor.svg-c10221601fea246b468116135228d207.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/owo_censor.svg"
+dest_files=[ "res://.import/owo_censor.svg-c10221601fea246b468116135228d207.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/z_briefs.svg b/project/sprites/z_briefs.svg
new file mode 100644
index 0000000..147ce1c
--- /dev/null
+++ b/project/sprites/z_briefs.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/project/sprites/z_briefs.svg.import b/project/sprites/z_briefs.svg.import
new file mode 100644
index 0000000..eb64544
--- /dev/null
+++ b/project/sprites/z_briefs.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/z_briefs.svg-b2e2e1eb71668c23f61b66914c6388da.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/z_briefs.svg"
+dest_files=[ "res://.import/z_briefs.svg-b2e2e1eb71668c23f61b66914c6388da.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/Clothes.gd b/project/src/Clothes.gd
index 4601fe7..87c72ef 100644
--- a/project/src/Clothes.gd
+++ b/project/src/Clothes.gd
@@ -8,7 +8,7 @@ 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.png")
+onready var undies = load("res://sprites/briefs.svg")
func change_bottoms(new_bottom):
bottoms = new_bottom
@@ -16,7 +16,7 @@ func change_bottoms(new_bottom):
if new_bottom == null:
$Body/Bottom.texture = bottoms
- if undies == load("res://sprites/owo_censor.png"):
+ if undies == load("res://sprites/owo_censor.svg"):
change_undies(null)
$Body/Bottom.texture = bottoms
@@ -57,14 +57,14 @@ func _on_ZBriefs_pressed():
change_undies(load("res://sprites/z_briefs.png"))
func _on_Briefs_pressed():
- change_undies(load("res://sprites/briefs.png"))
+ change_undies(load("res://sprites/briefs.svg"))
func _on_Jeans_pressed():
change_bottoms(load("res://sprites/jeans.svg"))
func _on_OwO_Censor_pressed():
change_bottoms(null)
- change_undies(load("res://sprites/owo_censor.png"))
+ change_undies(load("res://sprites/owo_censor.svg"))
func _on_Sweats_pressed():
change_bottoms(load("res://sprites/sweat_pants.svg"))
@@ -94,7 +94,7 @@ func _on_Train_Hoodie_pressed():
change_tops(load("res://sprites/train_hoodie.png"))
func _on_Beat_Up_Jeans_pressed():
- change_bottoms(load("res://sprites/beat_up_jeans.png"))
+ change_bottoms(load("res://sprites/beat_up_jeans.svg"))
func _on_NL_Jacket_pressed():
change_tops(load("res://sprites/nl_jacket.png"))
@@ -106,7 +106,7 @@ func _on_Whats_New_Shirt_pressed():
change_tops(load("res://sprites/whatsnew_shirt.png"))
func _on_Fundosi_pressed():
- change_undies(load("res://sprites/fundosi.png"))
+ change_undies(load("res://sprites/fundosi.svg"))
func _on_Camera_pressed():
change_accessoires(load("res://sprites/camera.png"))
From 8364b235a611d0426dc12d03def9959b3b2edeb9 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Sat, 4 May 2019 15:11:24 -0400
Subject: [PATCH 06/15] X button
- Replaced "Remove [clothing type]" text with an X button. Common visuals are easier to understand and universal, regardless of language or country.
---
project/lang/local.csv | 2 -
project/lang/local.en.translation | Bin 1076 -> 989 bytes
project/lang/local.sv.translation | Bin 1100 -> 1028 bytes
project/scn/Clothes.tscn | 162 +++++++++++++-------------
project/sprites/pants_icon.svg | 60 ++++++++++
project/sprites/pants_icon.svg.import | 34 ++++++
project/sprites/x_button.svg | 72 ++++++++++++
project/sprites/x_button.svg.import | 34 ++++++
8 files changed, 282 insertions(+), 82 deletions(-)
create mode 100644 project/sprites/pants_icon.svg
create mode 100644 project/sprites/pants_icon.svg.import
create mode 100644 project/sprites/x_button.svg
create mode 100644 project/sprites/x_button.svg.import
diff --git a/project/lang/local.csv b/project/lang/local.csv
index 683ee21..b6e6f0c 100644
--- a/project/lang/local.csv
+++ b/project/lang/local.csv
@@ -3,8 +3,6 @@ KENG,English,Engelsk
KSWD,Swedish,Svenska
KBOT,Pants,Byxor
KTOP,Shirts,Skjorta
-KRTP,Remove Shirt,Ta av skjortan
-KRBT,Remove Pants,Ta bort byxor
KCLS,Classic,Klassisk
KUND,Underwear,Underkläder
KRUS,Resume,Ă…teruppta
diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation
index 479fa446aca48a09041ef7f2eea588ec1bdca7ee..85c7cd312fbddfeb5df026eb4da877271e171cfa 100644
GIT binary patch
literal 989
zcmbu8F=!M)6oy~aiyBWQiWpGL1;hglgcu76CmPQrS0s4ZRR|U?bGyUd>Sj0W%#tWb
zz!M~3BZ8H!lE%(P1RJri5{q{LRpYX
z312GO4W}I;X&WMq_z
z+%(3PJ@d!d1xny3;L!_;;1J+`PJm%>7W~CH4|_SE*K%v+c0RW^bIa>_c<>9L1a1MY
ziK+acUxCt0{bLkumzY!#%Ad@cAQl?z2+tyU#V5_2v)^
zd@0`uq4OVLK0o^@=U`3zOWL?M4!=A9>rcy1A42C|7?c0w`tbAP@Hsc<+L6C|H9vHB
z40GO>nR8D+;5EiK@n5qtm-GKSnD}Jk)Z3FC>zCI4ygLZLyRP-oA>l*suIu}^!kfkx
z`s7C0n}W_KjsLZ&qw=fp{tSGsk>Nap;1RHwq!*|r+07u)is~Z5Gpnw?Xl0aLzi{mF
z)r>5uQXK5b$PamGU8G8SG@GixrHMwIY6Lu)qRj3cM9@rY%*kjPSD`c;dk9+&G}S|K
chis{J`*_cY$WPn%qnaQ+GS+0cNER;kKSr~->;M1&
literal 1076
zcmbW1L1+^}6oy~bRIO1IQ41cr^^jl@+G4$wN)0hKNK0d)BE7`PW=xiDcFWGJt%4{<
zgkA(Gc+#V#7xCgnL@(mOlX~b)Ja`cGQs_w#SO1spln{Dy;LE@7pLsKHW_MC76|)q#
z?QMDh&xO2D^^1Yn>#WfQ%C
zDkW-C(M|-d3`u+NSVwhbEh?_0y$CCzJu7u=@JdPtj#t}AQ+D9YX_!P^pa-;O8XX)Q
zrX*WvTkbi5j&0x=k3i!?VvkjNv;$&+BY;~s*bfc^3#7mZ7zKaP&Opz{&xKfLV!ayc
zwODyPHy1H4X@LN6xy;y4av;Q;Ww=cC&yN3I;h1Y-J|0g!S5Q7BW;6f&#NrZSJ`Kj?
zj~wi3<`MIG^E_Y1Q?D;WJM(WRd+u8BO+Ft9&)xeqJ@W+0FOT{Bcun%FHS;~A^;-jo
zO?{@Gm!B3MJ%G=9WsLt}^~BRz#9T{zoiDER-{f=Ud6^6Lz`g0V*yMkU(yk4k^BJ?x
zAd`BNX&XPk^5^Xx#GQ4m4)=>w@H^}J@jdZsXbV5Lo~|B(&mUC2D0jCMVX2pYKkVCC(98<*`;$7mAd;Pn!s(aru?d;sZcpKJ(i%ee~gUWI7AN!^n-_oL6&sNM5>g
VG%37V*t&Qnsdeir5f$-&@ekmD$prua
diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation
index 1165ade2000f78f74c3d9f7f47a020db5e160b14..e22ac8bde934f94a199395810b8a5c02999e9eda 100644
GIT binary patch
literal 1028
zcmbu8PiPZC6vkhSwI;^@puMQ=#ehUgMNlMAtfod%X-!%v9vY^bal6^=ChTl#6jbof
zq2R3`9(pr@Uc7mz2qG*VJc)r)ZC;eT;&Mgs=2WKFLq;jAMm8AH9SL>othz>vR^AJL%Ndob&t7XUQzP`JUyPo6D5pS#=-gW`{{=r_zPN
z!68a<(}-<*-iZOeke*1@0<3lAM`W_!$y$Q)#qgfmzdZbVWehnt&fRH0`~J$}6Xbk%jP}nSjy*hroa->!
zzn@AzxQU!=F#4P5`<%XU4>`Z0{ovE`4_Sulx-V$`?kIA;3r5#_^|ASMxoe*GKdfci
zC*bp&V|D-@dpSLDXBevMUN=rX;+`~m{g*K9!2aj!_1?vkZ!+-t17U8h{0R;~x1MWl
zXh1Z#@xOiTd0mIUb-&ztx-to$Yw~&ZIkG={-ks~3&--v+&p~NHy2=(*va2=E7c_Fa
zS@Wpi2&F7#)0A70p6vuJ2nCOQ={4$gOv|~ZbTB?48cI~?T0>bjh56paW2Zw33rkKR
znHZ0UG-lzaQBa+Rz(Uv
zz^)6T;6_ZK8|lVHMJmGJ!j-z{PF%PUbt7~o6{r3uosm$w^1{b|&p-FvbLQlcN~cbf
zw*pPNAN$dSP?H%;n92~gRx`wz6-O(W(zn9oDeB&#Y
zv-Rsdr`6j%h5@cC0_{61fdcibFqI)6DIyLSaKzc=IO
ze|5VI)#Us6)^PN70zS`$xxVnnnTKxfYo)J4oY=zu{w?_GIQ-4^;;UT+{+jch+^^rq
z;IH7@$4%$C&JnN-+<5m=d~L}kH_rBhm;Dp@cxA|k30wGo+=uA+c0Xv{1~
zOUKO+ax>4evCi4Gm`kT_%#
+
+
+
diff --git a/project/sprites/pants_icon.svg.import b/project/sprites/pants_icon.svg.import
new file mode 100644
index 0000000..26f990d
--- /dev/null
+++ b/project/sprites/pants_icon.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/pants_icon.svg-1504bee50c96f9a58b6f753201be5a91.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/pants_icon.svg"
+dest_files=[ "res://.import/pants_icon.svg-1504bee50c96f9a58b6f753201be5a91.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/x_button.svg b/project/sprites/x_button.svg
new file mode 100644
index 0000000..19986f0
--- /dev/null
+++ b/project/sprites/x_button.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/project/sprites/x_button.svg.import b/project/sprites/x_button.svg.import
new file mode 100644
index 0000000..953c1d0
--- /dev/null
+++ b/project/sprites/x_button.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/x_button.svg-6cf395375517e4cea385a7bade20ecb1.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/x_button.svg"
+dest_files=[ "res://.import/x_button.svg-6cf395375517e4cea385a7bade20ecb1.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
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 07/15] 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 @@
+
+
+
+
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")
From e39458cb3cb0d3d77450bf0ef54d47d732f4e0e3 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Sat, 4 May 2019 16:08:27 -0400
Subject: [PATCH 08/15] Rearranged title screen
- Rearranged title screen for the increased resoluation
---
project/scn/Clothes.tscn | 78 +++++++++++++++++++--------------------
project/scn/TitleScn.tscn | 44 +++++++---------------
2 files changed, 52 insertions(+), 70 deletions(-)
diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn
index 8d15b32..eafed02 100644
--- a/project/scn/Clothes.tscn
+++ b/project/scn/Clothes.tscn
@@ -72,15 +72,13 @@ custom_colors/font_color_fg = Color( 0.980392, 0.992157, 0.768627, 1 )
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 = 35.0
+margin_left = 42.0
margin_top = 13.0
-margin_right = 657.0
+margin_right = 600.0
margin_bottom = 425.0
columns = 5
@@ -132,79 +130,79 @@ anchor_bottom = 1.0
margin_top = 29.0
[node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts"]
-margin_left = 13.0
-margin_top = 14.0
-margin_right = 632.0
-margin_bottom = 447.0
-columns = 6
+margin_left = 82.0
+margin_top = 8.0
+margin_right = 556.0
+margin_bottom = 441.0
+columns = 5
[node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_right = 85.0
+margin_right = 118.0
margin_bottom = 115.0
texture_normal = ExtResource( 10 )
[node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 89.0
-margin_right = 174.0
+margin_left = 122.0
+margin_right = 207.0
margin_bottom = 115.0
texture_normal = ExtResource( 11 )
[node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 178.0
-margin_right = 263.0
+margin_left = 211.0
+margin_right = 296.0
margin_bottom = 115.0
texture_normal = ExtResource( 12 )
[node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 267.0
-margin_right = 352.0
+margin_left = 300.0
+margin_right = 385.0
margin_bottom = 115.0
texture_normal = ExtResource( 13 )
[node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 356.0
+margin_left = 389.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_left = 478.0
-margin_right = 563.0
-margin_bottom = 115.0
+margin_top = 119.0
+margin_right = 118.0
+margin_bottom = 234.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 = 85.0
-margin_bottom = 237.0
+margin_right = 207.0
+margin_bottom = 234.0
texture_normal = ExtResource( 16 )
[node name="Train Hoodie" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 89.0
+margin_left = 211.0
margin_top = 119.0
-margin_right = 174.0
-margin_bottom = 237.0
+margin_right = 296.0
+margin_bottom = 234.0
texture_normal = ExtResource( 17 )
[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 178.0
+margin_left = 300.0
margin_top = 119.0
-margin_right = 263.0
-margin_bottom = 237.0
+margin_right = 385.0
+margin_bottom = 234.0
texture_normal = ExtResource( 18 )
[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 267.0
+margin_left = 389.0
margin_top = 119.0
-margin_right = 352.0
-margin_bottom = 237.0
+margin_right = 474.0
+margin_bottom = 234.0
texture_normal = ExtResource( 19 )
[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid"]
-margin_left = 356.0
-margin_top = 119.0
-margin_right = 474.0
-margin_bottom = 237.0
+margin_top = 238.0
+margin_right = 118.0
+margin_bottom = 356.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 )
@@ -220,9 +218,9 @@ anchor_bottom = 1.0
margin_top = 29.0
[node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear"]
-margin_left = 13.0
+margin_left = 68.0
margin_top = 10.0
-margin_right = 635.0
+margin_right = 585.0
margin_bottom = 451.0
columns = 5
@@ -255,11 +253,11 @@ anchor_bottom = 1.0
margin_top = 29.0
[node name="AccessoiresGrid" type="GridContainer" parent="RefRect/Wordrobe/Accessoires"]
-margin_left = 7.0
+margin_left = 85.0
margin_top = 14.0
-margin_right = 631.0
+margin_right = 556.0
margin_bottom = 458.0
-columns = 6
+columns = 5
[node name="Camera" type="TextureButton" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid"]
margin_right = 85.0
diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn
index 55179dd..d139a09 100644
--- a/project/scn/TitleScn.tscn
+++ b/project/scn/TitleScn.tscn
@@ -1,29 +1,21 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/TitleScn.gd" type="Script" id=1]
-[ext_resource path="res://sprites/modern_dress_up_blurred_bg.png" type="Texture" id=2]
-[ext_resource path="res://sprites/title.svg" type="Texture" id=3]
-[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4]
+[ext_resource path="res://sprites/title.svg" type="Texture" id=2]
+[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3]
[node name="Start" type="Node"]
script = ExtResource( 1 )
-[node name="ModernBG" type="Sprite" parent="."]
-position = Vector2( 400, 277 )
-texture = ExtResource( 2 )
-__meta__ = {
-"_edit_lock_": true
-}
-
[node name="Title" type="Sprite" parent="."]
-position = Vector2( 408.047, 113.148 )
-texture = ExtResource( 3 )
+position = Vector2( 526.047, 150.148 )
+texture = ExtResource( 2 )
[node name="MenuRf" type="ReferenceRect" parent="."]
-margin_left = 130.323
-margin_top = 34.4196
-margin_right = 690.323
-margin_bottom = 485.42
+margin_left = 315.292
+margin_top = 72.2924
+margin_right = 734.292
+margin_bottom = 523.292
[node name="StartVbox" type="VBoxContainer" parent="MenuRf"]
anchor_left = 0.5
@@ -70,38 +62,30 @@ margin_left = 5.0
margin_top = 5.0
margin_right = -5.0
margin_bottom = -5.0
-__meta__ = {
-"_edit_lock_": true
-}
[node name="ModeLbl" type="Label" parent="MenuRf/ModePanel/PlayVbox"]
margin_right = 136.0
margin_bottom = 14.0
text = "KGMO"
align = 1
-__meta__ = {
-"_edit_lock_": true
-}
[node name="ModernBtn" type="Button" parent="MenuRf/ModePanel/PlayVbox"]
margin_top = 18.0
margin_right = 136.0
margin_bottom = 38.0
text = "Modern"
-__meta__ = {
-"_edit_lock_": true
-}
[node name="ClassicBtn" type="Button" parent="MenuRf/ModePanel/PlayVbox"]
margin_top = 42.0
margin_right = 136.0
margin_bottom = 62.0
text = "KCLS"
-__meta__ = {
-"_edit_lock_": true
-}
-[node name="WinDialogs" parent="." instance=ExtResource( 4 )]
+[node name="WinDialogs" parent="." instance=ExtResource( 3 )]
+margin_left = 113.0
+margin_top = 37.0
+margin_right = 113.0
+margin_bottom = 37.0
[connection signal="pressed" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_pressed"]
[connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"]
[connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"]
From 2ac38db54da39ef34c26b892c82280fdcce6a11f Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com>
Date: Sat, 4 May 2019 17:27:43 -0400
Subject: [PATCH 09/15] Brand new soundtrack!
- Nathan's Dress Up finally has the makings of a proper soundtrack. Credit to Avgvsts Tunes. These are midi songs meant for RPGs but I find that they suit this game as well.
---
project/music/at_the_lake.ogg | Bin 0 -> 4869816 bytes
project/music/at_the_lake.ogg.import | 15 +++++++++++++++
project/music/reminiscing.ogg | Bin 0 -> 2842150 bytes
project/music/reminiscing.ogg.import | 15 +++++++++++++++
project/music/song.ogg | Bin 667284 -> 0 bytes
project/music/song.ogg.import | 15 ---------------
project/music/together_again.ogg | Bin 0 -> 3500314 bytes
project/music/together_again.ogg.import | 15 +++++++++++++++
project/scn/ModernScn.tscn | 6 +++++-
project/scn/TitleScn.tscn | 16 ++++++++++------
project/scn/WinDialogs.tscn | 20 +++++++++-----------
project/src/Soundtrack.gd | 22 ++++++++++++++++++++++
12 files changed, 91 insertions(+), 33 deletions(-)
create mode 100644 project/music/at_the_lake.ogg
create mode 100644 project/music/at_the_lake.ogg.import
create mode 100644 project/music/reminiscing.ogg
create mode 100644 project/music/reminiscing.ogg.import
delete mode 100644 project/music/song.ogg
delete mode 100644 project/music/song.ogg.import
create mode 100644 project/music/together_again.ogg
create mode 100644 project/music/together_again.ogg.import
create mode 100644 project/src/Soundtrack.gd
diff --git a/project/music/at_the_lake.ogg b/project/music/at_the_lake.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..603670fac977e1356c1dd86bc0101f7cf79c159d
GIT binary patch
literal 4869816
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