From 8d2b306c90ab0266eace77716c8222330d3faa0e Mon Sep 17 00:00:00 2001 From: TheGreenTie Date: Fri, 28 Feb 2020 22:21:53 -0600 Subject: [PATCH] Separate Shiny save data! --- Project/DexTool/DexTool.yyp | 11 ++++++++++- Project/DexTool/scripts/click_slot/click_slot.gml | 4 +++- .../DexTool/scripts/savedata_load/savedata_load.gml | 6 ++++-- .../savedata_section_get/savedata_section_get.gml | 6 ++++++ .../savedata_section_get/savedata_section_get.yy | 8 ++++++++ .../views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy | 3 ++- 6 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 Project/DexTool/scripts/savedata_section_get/savedata_section_get.gml create mode 100644 Project/DexTool/scripts/savedata_section_get/savedata_section_get.yy diff --git a/Project/DexTool/DexTool.yyp b/Project/DexTool/DexTool.yyp index b60532f..54e459f 100644 --- a/Project/DexTool/DexTool.yyp +++ b/Project/DexTool/DexTool.yyp @@ -21318,6 +21318,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "d586db78-0f49-acc1-1594-f50f2a038c70", + "Value": { + "id": "3434b8d4-df9e-64b2-8769-255fa1e598fb", + "resourcePath": "scripts\\savedata_section_get\\savedata_section_get.yy", + "resourceType": "GMScript" + } + }, { "Key": "d591607b-ec57-4689-b01c-c5556e491a6d", "Value": { @@ -25484,7 +25492,8 @@ "27426a5b-252b-ce49-0d97-9a0b620973f4", "01109f28-4eca-fc23-b0d9-649acb9c158c", "0c8bde50-6fda-efe6-8809-de6b265ccbcc", - "cf1f53d0-1b66-da1a-c70e-53a1d7177805" + "cf1f53d0-1b66-da1a-c70e-53a1d7177805", + "d586db78-0f49-acc1-1594-f50f2a038c70" ], "tutorial": "" } \ No newline at end of file diff --git a/Project/DexTool/scripts/click_slot/click_slot.gml b/Project/DexTool/scripts/click_slot/click_slot.gml index 7802aa6..410312e 100644 --- a/Project/DexTool/scripts/click_slot/click_slot.gml +++ b/Project/DexTool/scripts/click_slot/click_slot.gml @@ -14,7 +14,9 @@ global.savedata[idno] = own; if (file_exists("save.ini")) { ini_open("save.ini"); - ini_write_real("Pokemon", string(idno), own) + var section = savedata_section_get(global.show_shiny); + + ini_write_real(section, string(idno), own) //ini_write_real("Progress","count",global.count) show_debug_message("Saved "+pokemon+" as "+string(own)+"."); ini_close(); diff --git a/Project/DexTool/scripts/savedata_load/savedata_load.gml b/Project/DexTool/scripts/savedata_load/savedata_load.gml index 5229417..41efe49 100644 --- a/Project/DexTool/scripts/savedata_load/savedata_load.gml +++ b/Project/DexTool/scripts/savedata_load/savedata_load.gml @@ -6,9 +6,11 @@ if (file_exists("save.ini")) global.current_box = ini_read_real("Navigation", "Current Box", 1); global.show_galar = ini_read_real("Display", "Galar Dex", false); global.show_shiny = ini_read_real("Display", "Shiny Mode", false); - + + var section = savedata_section_get(global.show_shiny); + for (var i=0; i<=global.dex_len; i++) - global.savedata[i] = ini_read_real("Pokemon", string(i), 0); + global.savedata[i] = ini_read_real(section, string(i), 0); ini_close(); show_debug_message("LOADED SAVE FILE."); diff --git a/Project/DexTool/scripts/savedata_section_get/savedata_section_get.gml b/Project/DexTool/scripts/savedata_section_get/savedata_section_get.gml new file mode 100644 index 0000000..cd7c7f2 --- /dev/null +++ b/Project/DexTool/scripts/savedata_section_get/savedata_section_get.gml @@ -0,0 +1,6 @@ +///savedata_section_get(shiny?) + +if (!argument0) + return "Pokemon"; +else + return "Shiny"; \ No newline at end of file diff --git a/Project/DexTool/scripts/savedata_section_get/savedata_section_get.yy b/Project/DexTool/scripts/savedata_section_get/savedata_section_get.yy new file mode 100644 index 0000000..3d1d9b7 --- /dev/null +++ b/Project/DexTool/scripts/savedata_section_get/savedata_section_get.yy @@ -0,0 +1,8 @@ +{ + "id": "d586db78-0f49-acc1-1594-f50f2a038c70", + "modelName": "GMScript", + "mvc": "1.0", + "name": "savedata_section_get", + "IsCompatibility": false, + "IsDnD": false +} \ No newline at end of file diff --git a/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy b/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy index b258de4..8d76e93 100644 --- a/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy +++ b/Project/DexTool/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy @@ -41,7 +41,8 @@ "27426a5b-252b-ce49-0d97-9a0b620973f4", "01109f28-4eca-fc23-b0d9-649acb9c158c", "0c8bde50-6fda-efe6-8809-de6b265ccbcc", - "cf1f53d0-1b66-da1a-c70e-53a1d7177805" + "cf1f53d0-1b66-da1a-c70e-53a1d7177805", + "d586db78-0f49-acc1-1594-f50f2a038c70" ], "filterType": "GMScript", "folderName": "scripts",