Leahnaya/DexTool
1
0
Fork 0
mirror of https://github.com/PoshoDev/DexTool.git synced 2026-09-30 21:26:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Armor Dex loads fine now.

Browse Source
This commit is contained in:
Rodrigo Gómez Maitret
2020-06-19 14:09:44 -05:00
parent 3518c1c9bd
commit bd022b1325
19 changed files with 138 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Project/DexTool.yyp
View File

@@ -8586,7 +8586,7 @@
"Key": "5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
"Value": {
"id": "5fbb9f86-4fbb-99cd-ea2a-820b65d5cad0",
"resourcePath": "scripts\\show_galar_toggle\\show_galar_toggle.yy",
"resourcePath": "scripts\/show_dex_toggle\/show_dex_toggle.yy",
"resourceType": "GMScript"
}
},
@@ -9582,6 +9582,14 @@
"resourceType": "GMFolder"
}
},
{
"Key": "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
"Value": {
"id": "4e2d8d4b-12ce-da5d-7e30-77d3b96dbd2b",
"resourcePath": "scripts\\dex_armor_load\\dex_armor_load.yy",
"resourceType": "GMScript"
}
},
{
"Key": "6b10ade4-6ef7-473b-bbca-80467063ec65",
"Value": {
@@ -11990,6 +11998,14 @@
"resourceType": "GMIncludedFile"
}
},
{
"Key": "86a11d15-9ba9-ef00-cd20-52b16a03bd31",
"Value": {
"id": "cb4de92c-11a0-476d-dbf2-80191b6fffe2",
"resourcePath": "scripts\\version_get\\version_get.yy",
"resourceType": "GMScript"
}
},
{
"Key": "86a487a6-4f0d-478d-8c21-233fceb1485d",
"Value": {
@@ -13862,6 +13878,14 @@
"resourceType": "GMIncludedFile"
}
},
{
"Key": "9cd5f278-7287-1058-6ab4-3030cbba04a4",
"Value": {
"id": "b316acdf-52ca-8ef5-b84b-955222e336a9",
"resourcePath": "scripts\\show_check\\show_check.yy",
"resourceType": "GMScript"
}
},
{
"Key": "9cfd3481-bfce-47e4-ba8c-d724f5206e03",
"Value": {
@@ -22417,6 +22441,7 @@
"961739d9-bcef-9d3d-a9a7-6d0487191e8e",
"9d9efccc-e28a-2782-ecbe-3ea08da108d6",
"baf1e68b-6877-c2da-aed5-31f319313796",
"6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
"27426a5b-252b-ce49-0d97-9a0b620973f4",
"01109f28-4eca-fc23-b0d9-649acb9c158c",
"0c8bde50-6fda-efe6-8809-de6b265ccbcc",
@@ -22462,7 +22487,9 @@
"c854fb34-52ee-fd8e-b01b-086f33590212",
"d258aee7-2bed-eaae-edfb-2228979346df",
"a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
"4bee5f27-7512-964a-379d-a45443f42683"
"4bee5f27-7512-964a-379d-a45443f42683",
"9cd5f278-7287-1058-6ab4-3030cbba04a4",
"86a11d15-9ba9-ef00-cd20-52b16a03bd31"
],
"tutorial": ""
}

1
Project/objects/obj_global/Create_0.gml
View File

@@ -1,6 +1,7 @@
dex_data_load();
dex_galar_load();
dex_armor_load();
initials_set();
savedata_load();
boxes_spawn();

8
Project/scripts/boxes_spawn/boxes_spawn.gml
View File

@@ -1,5 +1,7 @@
///boxes_spawn()
window_set_cursor(cr_hourglass);
if (file_exists(working_directory+"/Logs/MissingSprites.log"))
file_delete(working_directory+"/Logs/MissingSprites.log");
@@ -41,7 +43,7 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
if (!check_jump(j, i, global.current))
{
if (check_galar(global.current, global.show_galar))
if (show_check(global.current, global.show_dex))
make_slot(j, i, global.current);
global.current++;
@@ -52,4 +54,6 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
}
}
global.gen_header[gen_current] = global.box_count-1; // Last header.
global.gen_header[gen_current] = global.box_count-1; // Last header.
window_set_cursor(cr_default);

2
Project/scripts/button_do/button_do.gml
View File

@@ -32,7 +32,7 @@ switch(argument0)
break;
case but.national:
show_galar_toggle();
show_dex_toggle();
break;
case but.shiny:

11
Project/scripts/button_set/button_set.gml
View File

@@ -55,10 +55,13 @@ switch(type)
break;
case but.national:
if (!global.show_galar)
text = "NATIONAL";
else
text = "GALAR";
switch(global.show_dex)
{
case shw.national: text="NATIONAL"; break;
case shw.galar: text="GALAR"; break;
case shw.armor: text="ARMOR"; break;
}
scale = global.icon_scale * 0.75;
x_ = button_align_x(region.bot_left, -1.25);
y_ = button_align_y(region._100, -0.5 - 0.5);

15
Project/scripts/dex_armor_load/dex_armor_load.gml Normal file
View File

@@ -0,0 +1,15 @@
///dex_armor_load()
// Isle of Armor Dex data loading
/*enum gdex
{
galarno,
dexno,
pokemon,
type1,
type2
}*/
//if (global.show_armor)
global.armordata = csv_load("armordex");

8
Project/scripts/dex_armor_load/dex_armor_load.yy Normal file
View File

@@ -0,0 +1,8 @@
{
"id": "6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
"modelName": "GMScript",
"mvc": "1.0",
"name": "dex_armor_load",
"IsCompatibility": false,
"IsDnD": false
}

8
Project/scripts/initials_set/initials_set.gml
View File

@@ -1,5 +1,10 @@
///initials_set()
enum region { boxes, top, mid_left, mid_right, bot_left, bot_right,
_0, _25, _50, _75, _100 };
enum shw { national, galar, armor, LENGTH};
global.window_width = window_get_width();
global.window_height = window_get_height();
@@ -31,6 +36,3 @@ global.change = false;
global.progress = 0;
global.progress_max = 0;
enum region { boxes, top, mid_left, mid_right, bot_left, bot_right,
_0, _25, _50, _75, _100 };

10
Project/scripts/savedata_load/savedata_load.gml
View File

@@ -3,9 +3,9 @@
if (file_exists("save.ini"))
{
ini_open("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);
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);
var section = savedata_section_get(global.show_shiny);
global.countdata[0] =0
@@ -29,11 +29,11 @@ if (file_exists("save.ini"))
else
{
ini_open("save.ini");
ini_write_real("Info", "Number", 0.2);
ini_write_real("Info", "Number", version_get());
ini_close();
global.current_box = 1;
global.show_galar = false;
global.show_dex = 0;
global.show_shiny = false;
for (var i=0; i<=global.dex_len; i++)

2
Project/scripts/shortcut_check/shortcut_check.gml
View File

@@ -1,7 +1,7 @@
///shortcut_check()
// Letters
if (keyboard_check_pressed(ord("G"))) show_galar_toggle();
if (keyboard_check_pressed(ord("G"))) show_dex_toggle();
else if (keyboard_check_pressed(ord("I"))) make_screenshot();
else if (keyboard_check_pressed(ord("S"))) show_shiny_toggle();

29
Project/scripts/show_check/show_check.gml Normal file
View File

@@ -0,0 +1,29 @@
/// @description check_galar(id, _show?)
/// @param idee
/// @param ...
// Checks if the Pokémon can move to Sword/Shield.
var idee = argument[0];
// Sanity Check™
if (argument_count>1 && argument[1]==shw.national)
return true;
var nat = global.dexdata[idee, dex.dexno];
switch(global.show_dex)
{
case shw.galar:
for (var i=1; i<array_height_2d(global.galardata); i++)
if (nat == global.galardata[i, gdex.dexno])
return true;
break;
case shw.armor:
for (var i=1; i<array_height_2d(global.armordata); i++)
if (nat == global.armordata[i, gdex.dexno])
return true;
break;
}
return false;

8
Project/scripts/show_check/show_check.yy Normal file
View File

@@ -0,0 +1,8 @@
{
"id": "9cd5f278-7287-1058-6ab4-3030cbba04a4",
"modelName": "GMScript",
"mvc": "1.0",
"name": "show_check",
"IsCompatibility": false,
"IsDnD": false
}

8
Project/scripts/show_dex_toggle/show_dex_toggle.gml Normal file
View File

@@ -0,0 +1,8 @@
window_set_cursor(cr_hourglass);
if (++global.show_dex >= shw.LENGTH)
global.show_dex = 0;
savedata_write("Display", "Galar Dex", global.show_dex);
room_restart();

2
Project/scripts/show_galar_toggle/show_galar_toggle.yy → Project/scripts/show_dex_toggle/show_dex_toggle.yy
View File

@@ -2,7 +2,7 @@
"id": "5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
"modelName": "GMScript",
"mvc": "1.0",
"name": "show_galar_toggle",
"name": "show_dex_toggle",
"IsCompatibility": false,
"IsDnD": false
}

5
Project/scripts/show_galar_toggle/show_galar_toggle.gml
View File

@@ -1,5 +0,0 @@
global.show_galar = !global.show_galar
savedata_write("Display", "Galar Dex", global.show_galar);
room_restart();

1
Project/scripts/show_shiny_toggle/show_shiny_toggle.gml
View File

@@ -1,4 +1,5 @@
///show_shiny_toggle()
window_set_cursor(cr_hourglass);
global.show_shiny = !global.show_shiny

1
Project/scripts/version_get/version_get.gml Normal file
View File

@@ -0,0 +1 @@
return 0.4;

8
Project/scripts/version_get/version_get.yy Normal file
View File

@@ -0,0 +1,8 @@
{
"id": "86a11d15-9ba9-ef00-cd20-52b16a03bd31",
"modelName": "GMScript",
"mvc": "1.0",
"name": "version_get",
"IsCompatibility": false,
"IsDnD": false
}

5
Project/views/e8dd30c9-50fd-43ce-9594-4568eb99fad7.yy
View File

@@ -33,6 +33,7 @@
"961739d9-bcef-9d3d-a9a7-6d0487191e8e",
"9d9efccc-e28a-2782-ecbe-3ea08da108d6",
"baf1e68b-6877-c2da-aed5-31f319313796",
"6ade07ea-0dc5-f3e3-549d-5765f94bcb31",
"27426a5b-252b-ce49-0d97-9a0b620973f4",
"01109f28-4eca-fc23-b0d9-649acb9c158c",
"0c8bde50-6fda-efe6-8809-de6b265ccbcc",
@@ -71,7 +72,9 @@
"c854fb34-52ee-fd8e-b01b-086f33590212",
"d258aee7-2bed-eaae-edfb-2228979346df",
"a7ef39a4-ac5a-45bb-7ded-c0562f4f4d23",
"4bee5f27-7512-964a-379d-a45443f42683"
"4bee5f27-7512-964a-379d-a45443f42683",
"9cd5f278-7287-1058-6ab4-3030cbba04a4",
"86a11d15-9ba9-ef00-cd20-52b16a03bd31"
],
"filterType": "GMScript",
"folderName": "scripts",