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] 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 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + 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"))