From 3442d3cee50ff8cf4ca90c864f75dffcd667c56d Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 1 Mar 2021 14:04:09 -0600 Subject: [PATCH] Press G to toggle Gigantamax! --- Project/DexTool.yyp | 1 + Project/scripts/check_skip/check_skip.gml | 2 +- Project/scripts/initials_set/initials_set.gml | 3 --- .../scripts/savedata_load/savedata_load.gml | 20 ++++++++----------- .../scripts/shortcut_check/shortcut_check.gml | 5 ++--- .../show_dex_toggle/show_dex_toggle.gml | 2 -- .../show_gigantamax_toggle.gml | 8 ++++++++ .../show_gigantamax_toggle.yy | 12 +++++++++++ 8 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.gml create mode 100644 Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.yy diff --git a/Project/DexTool.yyp b/Project/DexTool.yyp index 25b20d2..7ed4852 100644 --- a/Project/DexTool.yyp +++ b/Project/DexTool.yyp @@ -109,6 +109,7 @@ {"id":{"name":"notes","path":"notes/notes/notes.yy",},"order":1,}, {"id":{"name":"compatibility_report_280220_200614614","path":"notes/compatibility_report_280220_200614614/compatibility_report_280220_200614614.yy",},"order":3,}, {"id":{"name":"CSV_Manager","path":"extensions/CSV_Manager/CSV_Manager.yy",},"order":1,}, + {"id":{"name":"show_gigantamax_toggle","path":"scripts/show_gigantamax_toggle/show_gigantamax_toggle.yy",},"order":73,}, ], "Options": [ {"name":"iOS","path":"options/ios/options_ios.yy",}, diff --git a/Project/scripts/check_skip/check_skip.gml b/Project/scripts/check_skip/check_skip.gml index 362c0b6..d8f4b9f 100644 --- a/Project/scripts/check_skip/check_skip.gml +++ b/Project/scripts/check_skip/check_skip.gml @@ -3,7 +3,7 @@ function check_skip(argument0) { var form = global.dexdata[argument0, dex.form]; var bank = global.dexdata[argument0, dex.bankable]; - if (bank == "FALSE") + if (bank=="FALSE" || (form=="GIGANTAMAX" && !global.show_gigantamax)) return false; switch(form) diff --git a/Project/scripts/initials_set/initials_set.gml b/Project/scripts/initials_set/initials_set.gml index f79f4d2..658f987 100644 --- a/Project/scripts/initials_set/initials_set.gml +++ b/Project/scripts/initials_set/initials_set.gml @@ -37,7 +37,4 @@ function initials_set() { global.progress = 0; global.progress_max = 0; - - - } diff --git a/Project/scripts/savedata_load/savedata_load.gml b/Project/scripts/savedata_load/savedata_load.gml index f5b0369..39a82e0 100644 --- a/Project/scripts/savedata_load/savedata_load.gml +++ b/Project/scripts/savedata_load/savedata_load.gml @@ -4,9 +4,10 @@ function savedata_load() { if (file_exists("save.ini")) { ini_open("save.ini") - global.current_box = ini_read_real("Navigation", "Current Box", 1); - global.show_dex = ini_read_real("Display", "Galar Dex", shw.national); - global.show_shiny = ini_read_real("Display", "Shiny Mode", false); + global.current_box = ini_read_real("Navigation", "Current Box", 1); + global.show_dex = ini_read_real("Display", "Galar Dex", shw.national); + global.show_shiny = ini_read_real("Display", "Shiny Mode", false); + global.show_gigantamax = ini_read_real("Display", "Gigantamax", false); var section = savedata_section_get(global.show_shiny); global.countdata[0] =0 @@ -14,12 +15,6 @@ function savedata_load() { { global.savedata[i] = ini_read_real(section, string(i), 0); global.countdata[i] = ini_read_real(section+" Count", string(i), 0); - /* - if (global.savedata[global.dexdata[i, dex.idno]] || global.countdata[global.dexdata[i, dex.idno]]) - show_debug_message( "found: "+global.dexdata[i, dex.pokemon]+ - "\tid: "+string(i)+ - "\town: "+string(global.savedata[global.dexdata[i, dex.idno]])+ - "\tcount: "+global.countdata[global.dexdata[i, dex.idno]]);*/ } @@ -33,9 +28,10 @@ function savedata_load() { ini_write_real("Info", "Number", version_get()); ini_close(); - global.current_box = 1; - global.show_dex = 0; - global.show_shiny = false; + global.current_box = 1; + global.show_dex = 0; + global.show_shiny = false; + global.show_gigantamax = false; for (var i=0; i<=global.dex_len; i++) global.savedata[i] = 0; diff --git a/Project/scripts/shortcut_check/shortcut_check.gml b/Project/scripts/shortcut_check/shortcut_check.gml index 1dd4f66..59e11b0 100644 --- a/Project/scripts/shortcut_check/shortcut_check.gml +++ b/Project/scripts/shortcut_check/shortcut_check.gml @@ -2,9 +2,10 @@ function shortcut_check() { // Letters - if (keyboard_check_pressed(ord("G"))) show_dex_toggle(); + if (keyboard_check_pressed(ord("D"))) show_dex_toggle(); else if (keyboard_check_pressed(ord("I"))) make_screenshot(); else if (keyboard_check_pressed(ord("S"))) show_shiny_toggle(); + else if (keyboard_check_pressed(ord("G"))) show_gigantamax_toggle(); else if (keyboard_check_pressed(ord("C"))) counter_set(); // Plus and Minus @@ -21,6 +22,4 @@ function shortcut_check() { for (var i=ord("0"); i<=ord("9"); i++) if (keyboard_check_pressed(i)) box_gen_jump(i - ord("0")); - - } diff --git a/Project/scripts/show_dex_toggle/show_dex_toggle.gml b/Project/scripts/show_dex_toggle/show_dex_toggle.gml index 2fe62fa..d794dc1 100644 --- a/Project/scripts/show_dex_toggle/show_dex_toggle.gml +++ b/Project/scripts/show_dex_toggle/show_dex_toggle.gml @@ -7,6 +7,4 @@ function show_dex_toggle() { savedata_write("Display", "Galar Dex", global.show_dex); room_restart(); - - } diff --git a/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.gml b/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.gml new file mode 100644 index 0000000..d2de33d --- /dev/null +++ b/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.gml @@ -0,0 +1,8 @@ +function show_gigantamax_toggle() { + window_set_cursor(cr_hourglass); + + global.show_gigantamax = !global.show_gigantamax; + savedata_write("Display", "Gigantamax", global.show_gigantamax); + + room_restart(); +} \ No newline at end of file diff --git a/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.yy b/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.yy new file mode 100644 index 0000000..0616151 --- /dev/null +++ b/Project/scripts/show_gigantamax_toggle/show_gigantamax_toggle.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, + "resourceVersion": "1.0", + "name": "show_gigantamax_toggle", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file