From bf33f543f1fd8bb7763b4661cae9c0875b498a26 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sun, 10 Nov 2024 05:23:19 -0700 Subject: [PATCH] new release --- export_presets.cfg | 4 ++-- global.gd | 3 ++- load.gd | 24 +++++++++++++++++++++++- save.gd | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index a33541b..cd5a1a9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -7,7 +7,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="./Midori in the Magic School.arm64" +export_path="./Midori in the Magic School.x86_64" script_export_mode=1 script_encryption_key="" @@ -15,7 +15,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -binary_format/architecture="arm64" +binary_format/architecture="x86_64" binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true diff --git a/global.gd b/global.gd index b2510dd..f4a8fb5 100644 --- a/global.gd +++ b/global.gd @@ -33,6 +33,7 @@ const npchars = ["res://sprites/common/midori/sprite.png", null, null, null, nul var cboss = [null, null, null] var isboss var party = [[0,0], [1,0], [9,0], [3,0]] +var sparty = [[null,null], [null,null], [null,null], [null,null]] const specialities = [2, 0, 3, 1, 5, 4] var dparty = [[0,0], [1,0], [3,0], [9,0]] var level = [1,1,1,1,1,1,1,1,1,1] @@ -47,7 +48,7 @@ var owlocation = [[null, null], [null, null]] const musictracks = ["res://music/midorinoyume.ogg", "res://music/seahorse.ogg", "res://music/chinesegoat.ogg", "res://music/doyoufeelold.ogg", "res://music/doyiuneedahealer.ogg", "res://music/adayatceres.ogg", "res://music/twintroublemakers.ogg", "res://music/easyquiz.ogg", "res://music/neowave.ogg", "res://music/multivectorsubmarines.ogg", "res://music/halfgeniegirls.ogg", "res://music/rusianmaverickfairy.ogg", "res://music/blacksmithofdestruction.ogg", "res://music/shininglikefireworks.ogg", "res://music/sadtrashcan.ogg", "res://music/akikonotegami.ogg", "res://music/asadcat.ogg", "res://music/lilydesire.ogg", "res://music/scholartrip.ogg", "res://music/quantumice.ogg", "res://music/unreeeal.ogg", "res://music/alsa.ogg", "res://music/silverblue.ogg"] const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"] var debug = false -const release = "R0.3.0-dev" +const release = "R0.3.0-beta" var sk = false var gamepad = 0 var quest = [0, 0, 0, 0, 0, 0] diff --git a/load.gd b/load.gd index b51664a..9b8907e 100644 --- a/load.gd +++ b/load.gd @@ -88,6 +88,28 @@ func _init(slot): else: Global.party[3][0] = null Global.party[3][1] = null + quest = savefile[5].rsplit(",", true, 9) + if quest[0] is int: + Global.sparty[0][0] = int(quest[0]) + Global.sparty[0][1] = int(quest[1]) + if quest[2] is int: + Global.sparty[1][0] = int(quest[2]) + Global.sparty[1][1] = int(quest[3]) + else: + Global.sparty[1][0] = null + Global.sparty[1][1] = null + if quest[4] is int: + Global.sparty[2][0] = int(quest[4]) + Global.sparty[2][1] = int(quest[5]) + else: + Global.sparty[2][0] = null + Global.sparty[2][1] = null + if quest[6] is int: + Global.sparty[3][0] = int(quest[6]) + Global.sparty[3][1] = int(quest[7]) + else: + Global.sparty[3][0] = null + Global.sparty[3][1] = null # We need to revert the game state so we're not cloning objects # during loading. This will vary wildly depending on the needs of a # project, so take care with this step. @@ -105,7 +127,7 @@ func _init(slot): file.open("user://userprefs", File.WRITE) file.store_string(saveinit) file.close() - saveinit = "0,0,,,,,,\n0\n0\n1,11,19\n0,0,0,0,0,0" + saveinit = "0,0,,,,,,\n0\n0\n1,11,19\n0,0,0,0,0,0\n,,,,,,," file = File.new() file.open("user://slot1", File.WRITE) file.store_string(saveinit) diff --git a/save.gd b/save.gd index 9bbb2f4..bd215e9 100644 --- a/save.gd +++ b/save.gd @@ -8,7 +8,7 @@ func _init(slot, erase): if erase: saveinit = "0,0,,,,,,\n0\n0\n1,11,19\n0,0,0,0,0,0" else: - saveinit = str(Global.party[0][0])+","+str(Global.party[0][1])+","+str(Global.party[1][0])+","+str(Global.party[1][1])+","+str(Global.party[2][0])+","+str(Global.party[2][1])+","+str(Global.party[3][0])+","+str(Global.party[3][1])+"\n"+str(Global.cpchar)+"\n"+str(Global.dificulty)+"\n"+str(Global.cplace[0])+","+str(Global.cplace[1])+","+str(Global.cplace[2])+"\n"+str(Global.quest[0])+","+str(Global.quest[1])+","+str(Global.quest[2])+","+str(Global.quest[3])+","+str(Global.quest[4])+","+str(Global.quest[5]) + saveinit = str(Global.party[0][0])+","+str(Global.party[0][1])+","+str(Global.party[1][0])+","+str(Global.party[1][1])+","+str(Global.party[2][0])+","+str(Global.party[2][1])+","+str(Global.party[3][0])+","+str(Global.party[3][1])+"\n"+str(Global.cpchar)+"\n"+str(Global.dificulty)+"\n"+str(Global.cplace[0])+","+str(Global.cplace[1])+","+str(Global.cplace[2])+"\n"+str(Global.quest[0])+","+str(Global.quest[1])+","+str(Global.quest[2])+","+str(Global.quest[3])+","+str(Global.quest[4])+","+str(Global.quest[5])+"\n"+str(Global.sparty[0][0])+","+str(Global.sparty[0][1])+","+str(Global.sparty[1][0])+","+str(Global.sparty[1][1])+","+str(Global.sparty[2][0])+","+str(Global.sparty[2][1])+","+str(Global.sparty[3][0])+","+str(Global.sparty[3][1]) if slot == 1: file = File.new() file.open("user://slot1", File.WRITE)