From 0e3bb682bb3c90853c969adb78fc8015d800ab44 Mon Sep 17 00:00:00 2001
From: Anthony Wilcox <35226681+tonytins@users.noreply.github.com>
Date: Sun, 22 Dec 2019 09:03:29 -0500
Subject: [PATCH] Music Score and JSON files WIP
- WIP music score inspired by The Sims 2's CAS. This is what Tony's Dress Up was inspired by back when it was still a Flash project.
- WIP JSON support for parsing clothings and rendering clothing as buttons
- Extended gitignore to support all of .NET Core and Monodevelop, due to Godot's upcoming support of the latter and future-proofing the former with .NET 5 inbound.
---
.gitignore | 38 +-
assets/.gitkeep | 0
assets/the_dresser.musicxml | 810 ++++++++++++++++++++++++++++++
project/lang/local.en.translation | Bin 989 -> 989 bytes
project/lang/local.sv.translation | Bin 1028 -> 1028 bytes
project/scn/Clothing.tscn | 5 +
project/src/GameScn.gd | 27 +-
project/undies.json | 8 +
8 files changed, 877 insertions(+), 11 deletions(-)
delete mode 100644 assets/.gitkeep
create mode 100644 assets/the_dresser.musicxml
create mode 100644 project/scn/Clothing.tscn
create mode 100644 project/undies.json
diff --git a/.gitignore b/.gitignore
index a61b71d..cbc6def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
*.wav
*.ogg
-# Created by https://www.gitignore.io/api/linux,godot,macos,backup,windows,visualstudiocode
-# Edit at https://www.gitignore.io/?templates=linux,godot,macos,backup,windows,visualstudiocode
+# Created by https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode
+# Edit at https://www.gitignore.io/?templates=linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode
### Backup ###
*.bak
@@ -13,6 +13,28 @@
*.orig
*.tmp
+### DotnetCore ###
+# .NET Core build folders
+/bin
+/obj
+
+# Common node modules locations
+/node_modules
+/wwwroot/node_modules
+
+
+### Executable ###
+*.app
+*.bat
+*.cgi
+*.com
+*.exe
+*.gadget
+*.jar
+*.pif
+*.vb
+*.wsf
+
### Godot ###
# Godot-specific ignores
@@ -66,6 +88,16 @@ Network Trash Folder
Temporary Items
.apdisk
+### MonoDevelop ###
+#User Specific
+*.userprefs
+*.usertasks
+
+#Mono Project Files
+*.pidb
+*.resources
+test-results/
+
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
@@ -103,4 +135,4 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk
-# End of https://www.gitignore.io/api/linux,godot,macos,backup,windows,visualstudiocode
\ No newline at end of file
+# End of https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode
\ No newline at end of file
diff --git a/assets/.gitkeep b/assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/the_dresser.musicxml b/assets/the_dresser.musicxml
new file mode 100644
index 0000000..ee729d6
--- /dev/null
+++ b/assets/the_dresser.musicxml
@@ -0,0 +1,810 @@
+
+
+
+
+ The Dresser
+
+
+ Anthony Wilcox (Tonytins)
+ CC-BY
+
+ MuseScore 3.3.4
+ 2019-12-22
+
+
+
+
+
+
+
+
+
+ 7.05556
+ 40
+
+
+ 1584
+ 1224
+
+ 56.6929
+ 56.6929
+ 56.6929
+ 113.386
+
+
+ 56.6929
+ 56.6929
+ 56.6929
+ 113.386
+
+
+
+
+
+
+ Menu Loop
+
+
+ Anthony Wilcox (Tonytins)
+
+
+ CC-BY
+
+
+
+ Piano
+ Pno.
+
+ Piano
+
+
+
+ 1
+ 1
+ 78.7402
+ 0
+
+
+
+
+
+
+
+
+ 21.00
+ -901.51
+
+ 70.00
+
+
+ 65.00
+
+
+
+ 2
+
+ 0
+
+
+ 2
+
+ G
+ 2
+
+
+ F
+ 4
+
+
+
+
+ 2
+ 1
+ quarter
+ 1
+
+
+
+ B
+ 4
+
+ 2
+ 1
+ quarter
+ down
+ 1
+
+
+
+ D
+ 5
+
+ 2
+ 1
+ quarter
+ down
+ 1
+
+
+
+ G
+ 4
+
+ 2
+ 1
+ quarter
+ up
+ 1
+
+
+ 8
+
+
+
+ D
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ begin
+
+
+
+ G
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ continue
+
+
+
+ C
+ 4
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ continue
+
+
+
+ F
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ end
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ begin
+
+
+
+ A
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ continue
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ continue
+
+
+
+ B
+ 3
+
+ 1
+ 5
+ eighth
+ down
+ 2
+ end
+
+
+
+
+
+ 2
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ quarter
+ 1
+
+
+ 8
+
+
+
+ 2
+ 5
+ quarter
+ 2
+
+
+
+ 2
+ 5
+ quarter
+ 2
+
+
+
+ 4
+ 5
+ half
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+
+
+
+ 8
+ 1
+ 1
+
+
+ 8
+
+
+
+ 8
+ 5
+ 2
+
+
+ light-heavy
+
+
+
+
diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation
index 1f8cb46120a24de15ccf9ccaf4ca2091f12843ba..89626a40dedbbe654bbe286bf794232d7442071d 100644
GIT binary patch
delta 427
zcmcc1ewTg2Qbx%{1_lNWC}srGAnaoQdj-SfeT@2yQIp>>id$9y#kioD8LCF&k$RLJ
zkj)9jcjmlLH3zcUff!`oT82-xzLV{k#3f~cJXR=%*>L`<&Qhhxc}(J(g+LjQ9uN*p
z)@lhx;=@!w`=_3hIe8sWwHT6Y`HH`X-GO{ID2A!NYN(iKH2EFSWSFEh)*&OD|>!NX#oKX7DX7&P-+q&d4kR
za{f7YE^GeB;9QiNl3Aiz%n)1-WPtQ1mKLX`Ft{h?rYiX6r=&9YB<7`;CZ?wrGXw<(
GIRgM?5M3$&
delta 427
zcmcc1ewTg2Qbx&81_lNWC}srGAnaoQdqwQzeT@2yQj^~?id(t>#kioD8LCF&k$O}X
zkj)9jcjmlLO$M^rff!`oT82-xc9ZRx#3hS?JXR=%*>L`<&Qi_Ec}(J(en1(J9uN*p
z)@l((;=@!w`=_3xIC&jVwIPyh`HH`XEr5JBD2A!NYN(i4JNX^Z<_e$;y3MYi)KeHH
z%Q1`Ba|2~zJ_ng055zq{{Lgu^8^ga~Hu--Hu6gM>nZ+3l!5NuFCB;CQ&SlO27=p`F
zQ$V8sLT#ld`u}4HN-ZwUO=Sp3%mb?NEiKMWW^hl;O;zyCPXURR7N@2#I2Qr+0Hqz1
z@=Hq?{`oW;YsLdjN-ZhL%u6q3@JP)mU~sL-EMW-9Nvve>Nz6+xO-xTMW(W!nas~h_
Cc3qnQ
diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation
index 368c080f6ddd4f7ce68161a044a9b894010d8441..e4ab8c517ad5a01b55432b7e9bd7a0ef9e8c499c 100644
GIT binary patch
delta 451
zcmZqSXyMqfg;BDKfq{V&hxf3IMee3nt4v2gNVMsdqYKyfZ8W`?Sfc%&ZX
z4`lNJF+ULBne#r?14y$&@mhvYwaJrxnZza4kVIiNoWH8GRCjVMlelI#l5AkIR!b(3
z&jH0S)zAK^=QK~=3sfx)l;MWr@)ds%#{$`GPz+Oj)lf0fY4Ts7&B8z#bhBJPsi$yE
z)@2s2w?dKynIR9vi-Gu`2YaWi?mvcq-jj2@xj6lq|1pG?q#s_Im(FmwwIsEuw4k6Q
zk-;PD@RFPYhS0o})S~R1!%Kh^gKJ)TYEE%BLvTTAP9lR(W^!s?F~dL41I+&!4=E{2B!Ktz$zlg!Nv^dids4hDzzX)iScTQq)aVAjXKUbX{uD^EtV+bw-YRyh$2uLg~
ZPD}wC2(%+T704<&yfmAEAt*S=82}k9Yq$Ua
delta 451
zcmZqSXyMqfg;6q*fq{V&hxf3L`ze3nt4QF`)UMsdpkpg0#4Gegx#JW`LU
z1hV;nm>-Dm%z2+$1fd
z=YV3E>SzDdb5thp1**0L%5Xz*`HH`XU4U#hD2A!NYN(hvZSr5B&3!-_bhBJPsi!bZ
z)@2s22blwt1(_ia#EXIWpZDY(Z!S)M=6?*XdFiP+#n}wO*;)BTC5a5)If=!^nIM6(
z)V$*CM2673l+>c^oWo0i6vN@xlGLKof&!pIr^<@_A_m{m;!L30g47(Kiu6>5fW*?`
z#1w{qt~xthe>v{>$MDaCy;D~AAA?V3GSEDRf1U@J|1%z5GK162{~v=#*5M^N1q`7j
Z>4%r*rGt%01d>IEmu53C1O*2<0|1DeYr_Bl
diff --git a/project/scn/Clothing.tscn b/project/scn/Clothing.tscn
new file mode 100644
index 0000000..df0fbe8
--- /dev/null
+++ b/project/scn/Clothing.tscn
@@ -0,0 +1,5 @@
+[gd_scene format=2]
+
+[node name="Clothing" type="TextureButton"]
+anchor_right = 1.0
+anchor_bottom = 1.0
diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd
index 2eff854..98bb284 100644
--- a/project/src/GameScn.gd
+++ b/project/src/GameScn.gd
@@ -13,7 +13,11 @@ enum ClothingLayer {
onready var bottoms = load("res://sprites/bottoms_placeholder.png")
onready var tops = load("res://sprites/tops_placeholder.png")
onready var accessory = load("res://sprites/tops_placeholder.png")
-onready var undies = load("res://sprites/briefs.svg")
+
+var UndiesBtn = load("res://scn/Clothing.tscn")
+
+func _init():
+ init_underwear()
func change_bottoms(new_bottom):
bottoms = new_bottom
@@ -22,16 +26,15 @@ func change_bottoms(new_bottom):
$Character/Bottom.texture = bottoms
UserSettings.Bottoms = bottoms
- if undies == load("res://sprites/owo_censor.svg"):
- change_undies(null)
+# if undies == load("res://sprites/owo_censor.svg"):
+# change_undies(null)
$Character/Bottom.texture = bottoms
UserSettings.Bottoms = bottoms
func change_undies(new_undies):
- undies = new_undies
- $Character/Undies.texture = undies
- UserSettings.Underwear = undies
+ $Character/Undies.texture = new_undies
+ UserSettings.Underwear = new_undies
func change_tops(new_top):
tops = new_top
@@ -53,8 +56,16 @@ func change_accessoires(new_accessory):
$Character/Accessory.texture = accessory
UserSettings.Accessory = accessory
-func change_clothings(new_clothes, clothing_type):
- pass
+func init_underwear():
+ var undiesFile = File.new()
+ undiesFile.open("res://undies.json", undiesFile.READ)
+ var undiesJson = parse_json(undiesFile.get_as_text())
+
+ for object in undiesJson:
+ var underwear = UndiesBtn.instance()
+
+ underwear.texture = load(object.sprite)
+
# warning-ignore:unused_argument
func _process(delta):
diff --git a/project/undies.json b/project/undies.json
new file mode 100644
index 0000000..8394de8
--- /dev/null
+++ b/project/undies.json
@@ -0,0 +1,8 @@
+[
+ {
+ "icon": "res://sprites/z_briefs.svg"
+ },
+ {
+ "icon": "res://sprites/fundosi.svg"
+ }
+]