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 1f8cb46..89626a4 100644 Binary files a/project/lang/local.en.translation and b/project/lang/local.en.translation differ diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation index 368c080..e4ab8c5 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ 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" + } +]