Leahnaya/DexTool
1
0
Fork 0
mirror of https://github.com/PoshoDev/DexTool.git synced 2026-04-18 22:47:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Info & Area buttons.

Browse Source
This commit is contained in:
TheGreenTie 2020-03-01 19:27:30 -06:00
parent d9f123b438
commit f8ffe2de19
17 changed files with 127 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Project/DexTool.yyp
View File

@ -9422,6 +9422,14 @@
"resourceType": "GMIncludedFile"
}
},
{
"Key": "6ce290dc-805f-91e8-ca66-1b31a6b638b4",
"Value": {
"id": "6b6b0fa9-bf2f-31b5-8dd0-35a94c34404f",
"resourcePath": "views\\6ce290dc-805f-91e8-ca66-1b31a6b638b4.yy",
"resourceType": "GMFolder"
}
},
{
"Key": "6ce86192-5fa5-4e51-a010-2fd9c1ceed55",
"Value": {
@ -14934,6 +14942,14 @@
"resourceType": "GMIncludedFile"
}
},
{
"Key": "aa0cd879-2cce-411a-dd1a-10c3fd63f802",
"Value": {
"id": "00e3183d-b628-53c1-a6da-4760e8f85a1a",
"resourcePath": "scripts\\url_get\\url_get.yy",
"resourceType": "GMScript"
}
},
{
"Key": "aa122061-90ea-4fe3-b50a-3400835e6710",
"Value": {
@ -22224,24 +22240,17 @@
"d586db78-0f49-acc1-1594-f50f2a038c70",
"29776285-9293-eecd-60ce-080d874ed4ca",
"5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
"c07397b8-105a-cf00-f119-47f5091762ab",
"51d00fa8-eb85-4086-a732-a161d9d217d8",
"5c7fb6ce-864a-a30e-f665-d51d74835878",
"46940c02-accc-0a61-a238-03c213c44822",
"e5c6bbdd-36db-453b-9a43-7cd0c52b31ba",
"6ee30c99-62bc-bcf5-3853-e159533ab6d0",
"9081971b-e1be-521f-34be-38fcfa32f684",
"1087bf1b-acd2-8101-2f92-1c8433c77a66",
"73ea69de-6c0e-9d8b-6da5-41f465a27cce",
"1c861d7a-eed5-61b7-02f5-201672b6f730",
"5e879a22-94f8-a47e-fee7-5e134971dd7f",
"2370f9cd-bc43-8204-019c-9bc13fa8d58f",
"18704ffc-a564-c635-1f87-c3fbc7a7c1c0",
"e10f4338-d865-41ce-6c7c-ffe8b9302bc2",
"5d6dc131-402b-45b8-c0ee-331d3e8a9908",
"c6341f0c-570d-0e72-8439-2672f5cbb32e",
"4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
"b0a1886d-571c-9ed1-098f-65abb5bf18f6",
"a6e48265-2887-9dce-6824-b73d2ed253e1",
"fe4fdbbd-947b-8e06-4930-f2b97cf5a423",
"8b60df32-c201-4d7d-5dc4-f2a2376232c3",
@ -22254,7 +22263,15 @@
"a4583316-ee45-806d-bf28-e6c94f924583",
"b08ce952-50a4-ff53-bc1b-0c28d2369b92",
"b4ff0585-7cbf-020b-86b6-71a74247d56a",
"247a6c1c-04b6-7db1-67ff-297c3ee1feca"
"247a6c1c-04b6-7db1-67ff-297c3ee1feca",
"aa0cd879-2cce-411a-dd1a-10c3fd63f802",
"51d00fa8-eb85-4086-a732-a161d9d217d8",
"2370f9cd-bc43-8204-019c-9bc13fa8d58f",
"5c7fb6ce-864a-a30e-f665-d51d74835878",
"c07397b8-105a-cf00-f119-47f5091762ab",
"6ee30c99-62bc-bcf5-3853-e159533ab6d0",
"9081971b-e1be-521f-34be-38fcfa32f684",
"b0a1886d-571c-9ed1-098f-65abb5bf18f6"
],
"tutorial": ""
}

5
Project/objects/obj_button/Create_0.gml
View File

@ -1,6 +1,7 @@
enum but { plus, minus, method }
enum but { info, area, plus, minus };
enum src { red, yellow, green, blue, black, pink, orange, purple, white };
hover = false;
pressed = false;
inverse = 1;
inverse = 1;

2
Project/objects/obj_button/Draw_0.gml
View File

@ -17,7 +17,7 @@ draw_set_color(color)
draw_set_halign(halign);
draw_set_valign(valign);
draw_text_transformed(x+width/2, y+height/2+plus/6, text, scale, scale, image_angle);
draw_text_transformed(x+width/2, y+height/2+plus/6, text, scale*textsize, scale*textsize, image_angle);
draw_set_halign(fa_left);
draw_set_valign(fa_top);

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

@ -1,8 +1,8 @@
dex_data_load();
dex_galar_load();
initials_set();
savedata_load();
dex_galar_load();
boxes_spawn();
selected_set();
scr_window_resize();

4
Project/scripts/align_x/align_x.gml
View File

@ -5,6 +5,10 @@ var percent = argument1;
switch(zone)
{
case region.mid_left:
var x_start = global.window_width*0.75 - global.window_width*0.25/2;
break;
case region.mid_right:
var x_start = global.window_width*0.75 + global.window_width*0.25/2;
break;

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

@ -5,6 +5,7 @@ var percent = argument1;
switch(zone)
{
case region.mid_left:
case region.mid_right:
var y_start = global.window_height * 0.7;
break;

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

@ -2,6 +2,14 @@
switch(argument0)
{
case but.info:
url_get(false);
break;
case but.area:
url_get(true);
break;
case but.plus:
global.counter++;

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

@ -4,29 +4,45 @@ x_ = argument0;
y_ = argument1;
type = argument2;
image_index = src.black;
image_speed = 0;
length = 0.25;
scale = global.icon_scale;
textsize = 1.5;
color = c_white;
halign = fa_center;
valign = fa_middle;
switch(type)
{
case but.info:
text = "INFO";
length = 1;
scale = global.icon_scale * 1.25;
x_ = button_align_x(region.mid_left, 0);
y_ = button_align_y(region.mid_left, -0.7);
break;
case but.area:
text = "AREA";
length = 1;
scale = global.icon_scale * 1.25;
x_ = button_align_x(region.mid_left, 0);
y_ = button_align_y(region.mid_left, 0.7);
break;
case but.plus:
text = "+";
image_index = 4;
scale = global.icon_scale * 1.5;
textsize = 2;
x_ = button_align_x(region.mid_right, 1.5);
y_ = button_align_y(region.mid_right, 0);
break;
case but.minus:
text = "-";
image_index = 4;
textsize = 2;
x_ = button_align_x(region.mid_right, -1.5);
y_ = button_align_y(region.mid_right, 0);
break;

12
Project/scripts/check_galar/check_galar.gml
View File

@ -1,19 +1,17 @@
/// @description check_galar(id, show?)
/// @param id
/// @param show?
/// @description check_galar(id, _show?)
// Checks if the Pokémon can move to Sword/Shield.
var idee = argument0;
var show = argument1;
var idee = argument[0];
// Sanity Check™
if (!show)
if (argument_count>1 && !argument[1])
return true;
var nat = global.dexdata[idee, dex.dexno];
for (var i=1; i<array_height_2d(global.galardata); i++)
{
//show_debug_message("Comparing "+nat+" to "+global.galardata[i, gdex.galarno]);
show_debug_message("Comparing "+nat+" to "+global.galardata[i, gdex.galarno]);
if (nat == global.galardata[i, gdex.dexno])
return true;

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

@ -11,5 +11,5 @@ enum gdex
type2
}
if (global.show_galar)
//if (global.show_galar)
global.galardata = csv_load("galardex");

3
Project/scripts/lock_create/lock_create.gml
View File

@ -9,6 +9,9 @@ if (!instance_exists(obj_lock))
{
plus = button_create(0, 0, but.plus);
minus = button_create(0, 0, but.minus);
info = button_create(0, 0, but.info);
area = button_create(0, 0, but.area);
}
button_update_all();

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

@ -81,6 +81,6 @@ var user = string(environment_get_variable("USERNAME"));
var dir = "C:\\Users\\"+string(user)+"\\Pictures";
var savestring = dir+"\\"+filename+".png";
var fromstring = "C:\\Users\\"+user+"\\AppData\\Local\\LivingDexSS\\"+filename+ext;
file_move_ns(fromstring, savestring);
//file_move_ns(fromstring, savestring);
show_debug_message("Image exported as '"+savestring+"'.");

3
Project/scripts/selected_set/selected_set.gml
View File

@ -6,7 +6,8 @@ if (argument_count < 1)
var hold = instance_find(obj_slot, 0);
else
var hold = argument[0];
global.selected[dex.idno] = hold.idno;
global.selected[dex.dexno] = hold.dexno;
global.selected[dex.pokemon] = hold.pokemon;
global.selected[dex.form] = hold.form;

22
Project/scripts/url_get/url_get.gml Normal file
View File

@ -0,0 +1,22 @@
///url_get(area?)
var location = argument0;
if (check_galar(real(global.selected[dex.idno])))
{
var pkmn = string_lower(global.selected[dex.pokemon]);
var url = "https://www.serebii.net/pokedex-swsh/"+pkmn+"/";
if (location)
url = string_insert("/locations.shtml", url, string_length(url)+1);
}
else
{
var dexno = global.selected[dex.dexno];
var url = "https://www.serebii.net/pokedex-sm/"+dexno+".shtml";
if (location)
url = string_replace(url, "sm/", "sm/location/");
}
url_open(url);

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

@ -0,0 +1,8 @@
{
"id": "aa0cd879-2cce-411a-dd1a-10c3fd63f802",
"modelName": "GMScript",
"mvc": "1.0",
"name": "url_get",
"IsCompatibility": false,
"IsDnD": false
}

19
Project/views/6ce290dc-805f-91e8-ca66-1b31a6b638b4.yy Normal file
View File

@ -0,0 +1,19 @@
{
"id": "6ce290dc-805f-91e8-ca66-1b31a6b638b4",
"modelName": "GMFolder",
"mvc": "1.1",
"name": "6ce290dc-805f-91e8-ca66-1b31a6b638b4",
"children": [
"51d00fa8-eb85-4086-a732-a161d9d217d8",
"2370f9cd-bc43-8204-019c-9bc13fa8d58f",
"5c7fb6ce-864a-a30e-f665-d51d74835878",
"c07397b8-105a-cf00-f119-47f5091762ab",
"6ee30c99-62bc-bcf5-3853-e159533ab6d0",
"9081971b-e1be-521f-34be-38fcfa32f684",
"b0a1886d-571c-9ed1-098f-65abb5bf18f6"
],
"filterType": "GMScript",
"folderName": "Buttons",
"isDefaultView": false,
"localisedFolderName": ""
}

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

@ -40,24 +40,17 @@
"d586db78-0f49-acc1-1594-f50f2a038c70",
"29776285-9293-eecd-60ce-080d874ed4ca",
"5ebf8e8d-9772-aef2-28cb-e8743d4d575d",
"c07397b8-105a-cf00-f119-47f5091762ab",
"51d00fa8-eb85-4086-a732-a161d9d217d8",
"5c7fb6ce-864a-a30e-f665-d51d74835878",
"46940c02-accc-0a61-a238-03c213c44822",
"e5c6bbdd-36db-453b-9a43-7cd0c52b31ba",
"6ee30c99-62bc-bcf5-3853-e159533ab6d0",
"9081971b-e1be-521f-34be-38fcfa32f684",
"1087bf1b-acd2-8101-2f92-1c8433c77a66",
"73ea69de-6c0e-9d8b-6da5-41f465a27cce",
"1c861d7a-eed5-61b7-02f5-201672b6f730",
"5e879a22-94f8-a47e-fee7-5e134971dd7f",
"2370f9cd-bc43-8204-019c-9bc13fa8d58f",
"18704ffc-a564-c635-1f87-c3fbc7a7c1c0",
"e10f4338-d865-41ce-6c7c-ffe8b9302bc2",
"5d6dc131-402b-45b8-c0ee-331d3e8a9908",
"c6341f0c-570d-0e72-8439-2672f5cbb32e",
"4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
"b0a1886d-571c-9ed1-098f-65abb5bf18f6",
"a6e48265-2887-9dce-6824-b73d2ed253e1",
"fe4fdbbd-947b-8e06-4930-f2b97cf5a423",
"8b60df32-c201-4d7d-5dc4-f2a2376232c3",
@ -70,7 +63,9 @@
"a4583316-ee45-806d-bf28-e6c94f924583",
"b08ce952-50a4-ff53-bc1b-0c28d2369b92",
"b4ff0585-7cbf-020b-86b6-71a74247d56a",
"247a6c1c-04b6-7db1-67ff-297c3ee1feca"
"247a6c1c-04b6-7db1-67ff-297c3ee1feca",
"aa0cd879-2cce-411a-dd1a-10c3fd63f802",
"6ce290dc-805f-91e8-ca66-1b31a6b638b4"
],
"filterType": "GMScript",
"folderName": "scripts",