Prettying up code.

This commit is contained in:
TheGreenTie 2020-02-29 20:16:42 -06:00
parent 0dca56e6ae
commit 54ede52710
8 changed files with 68 additions and 27 deletions

View File

@ -7490,7 +7490,7 @@
"Key": "4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
"Value": {
"id": "a4aed7b8-3569-686e-86ea-ff5c94787515",
"resourcePath": "scripts\/box_gen_jump\/box_gen_jump.yy",
"resourcePath": "scripts/box_gen_jump/box_gen_jump.yy",
"resourceType": "GMScript"
}
},
@ -8178,7 +8178,7 @@
"Key": "51d00fa8-eb85-4086-a732-a161d9d217d8",
"Value": {
"id": "85207e30-7cc0-3776-b034-06e06a4b170a",
"resourcePath": "scripts\/button_set\/button_set.yy",
"resourcePath": "scripts/button_set/button_set.yy",
"resourceType": "GMScript"
}
},
@ -11138,7 +11138,7 @@
"Key": "6ee30c99-62bc-bcf5-3853-e159533ab6d0",
"Value": {
"id": "c2bb0f39-a2d2-3f48-0435-8f8ddcd09621",
"resourcePath": "scripts\/button_align_x\/button_align_x.yy",
"resourcePath": "scripts/button_align_x/button_align_x.yy",
"resourceType": "GMScript"
}
},
@ -14674,7 +14674,7 @@
"Key": "9081971b-e1be-521f-34be-38fcfa32f684",
"Value": {
"id": "5556752a-d72e-8013-c6ef-9fc461634e8e",
"resourcePath": "scripts\/button_align_y\/button_align_y.yy",
"resourcePath": "scripts/button_align_y/button_align_y.yy",
"resourceType": "GMScript"
}
},
@ -15210,7 +15210,7 @@
"Key": "961739d9-bcef-9d3d-a9a7-6d0487191e8e",
"Value": {
"id": "cf68e563-92be-d148-9a63-2bb86baa8cc2",
"resourcePath": "scripts\/icon_path_get\/icon_path_get.yy",
"resourcePath": "scripts/icon_path_get/icon_path_get.yy",
"resourceType": "GMScript"
}
},
@ -22722,7 +22722,7 @@
"Key": "e10f4338-d865-41ce-6c7c-ffe8b9302bc2",
"Value": {
"id": "bc9ef1b6-6c89-650e-c291-a4ffb4d4cd96",
"resourcePath": "scripts\/savedata_read_real\/savedata_read_real.yy",
"resourcePath": "scripts/savedata_read_real/savedata_read_real.yy",
"resourceType": "GMScript"
}
},
@ -25629,6 +25629,22 @@
"resourcePath": "datafiles_yy\\Icons\\Shiny\\gastrodon-east.png.yy",
"resourceType": "GMIncludedFile"
}
},
{
"Key": "a6e48265-2887-9dce-6824-b73d2ed253e1",
"Value": {
"id": "1bd2e400-7e70-bdab-e406-aa43ad85ed3e",
"resourcePath": "scripts\\hud_draw_selected\\hud_draw_selected.yy",
"resourceType": "GMScript"
}
},
{
"Key": "fe4fdbbd-947b-8e06-4930-f2b97cf5a423",
"Value": {
"id": "2ff1ef3c-dcb0-0a26-8adc-1ae4fe941eab",
"resourcePath": "scripts\\hud_draw_counter\\hud_draw_counter.yy",
"resourceType": "GMScript"
}
}
],
"script_order": [

View File

@ -1,25 +1,7 @@
/// @description DRAW
/// Display Info
var color = get_color3(global.selected[dex.own], false);
draw_set_color(color);
draw_text_hud(global.selected[dex.dexno], 2, -2, color);
draw_pokemon_hud(global.selected[dex.sprite]);
draw_text_hud(global.selected[dex.pokemon], 2, 1, color);
draw_text_hud(global.selected[dex.form], 1.5, 3, color);
draw_type_hud(global.selected[dex.type1], global.selected[dex.type2], 4.5);
// The famous counter
if (instance_exists(obj_lock) || global.counter>0)
{
draw_set_halign(fa_center);
draw_set_valign(fa_middle);
draw_set_color(c_white);
draw_text_transformed(align_x(region.mid_right, 0), align_y(region.mid_right, 0), global.counter, global.icon_scale*3, global.icon_scale*3, image_angle);
}
hud_draw_selected();
hud_draw_counter();
// Debug
draw_guidelines(true);

View File

@ -0,0 +1,10 @@
///hud_draw_counter()
// The famous counter
if (instance_exists(obj_lock) || global.counter>0)
{
draw_set_halign(fa_center);
draw_set_valign(fa_middle);
draw_set_color(c_white);
draw_text_transformed(align_x(region.mid_right, 0), align_y(region.mid_right, 0), global.counter, global.icon_scale*3, global.icon_scale*3, image_angle);
}

View File

@ -0,0 +1,8 @@
{
"id": "fe4fdbbd-947b-8e06-4930-f2b97cf5a423",
"modelName": "GMScript",
"mvc": "1.0",
"name": "hud_draw_counter",
"IsCompatibility": false,
"IsDnD": false
}

View File

@ -0,0 +1,12 @@
///hud_draw_selected()
// Display Info
var color = get_color3(global.selected[dex.own], false);
draw_set_color(color);
draw_text_hud(global.selected[dex.dexno], 2, -2, color);
draw_pokemon_hud(global.selected[dex.sprite]);
draw_text_hud(global.selected[dex.pokemon], 2, 1, color);
draw_text_hud(global.selected[dex.form], 1.5, 3, color);
draw_type_hud(global.selected[dex.type1], global.selected[dex.type2], 4.5);

View File

@ -0,0 +1,8 @@
{
"id": "a6e48265-2887-9dce-6824-b73d2ed253e1",
"modelName": "GMScript",
"mvc": "1.0",
"name": "hud_draw_selected",
"IsCompatibility": false,
"IsDnD": false
}

View File

@ -26,4 +26,7 @@ global.various_to = 0;
global.selecting = noone;
global.counter = 9999;
global.changes = false;
global.changes_last = current_time;
enum region { boxes, top, mid_left, mid_right, bottom }

View File

@ -62,7 +62,9 @@
"5d6dc131-402b-45b8-c0ee-331d3e8a9908",
"c6341f0c-570d-0e72-8439-2672f5cbb32e",
"4a34078c-7fa4-d9ca-eb35-df0a0ce93667",
"b0a1886d-571c-9ed1-098f-65abb5bf18f6"
"b0a1886d-571c-9ed1-098f-65abb5bf18f6",
"a6e48265-2887-9dce-6824-b73d2ed253e1",
"fe4fdbbd-947b-8e06-4930-f2b97cf5a423"
],
"filterType": "GMScript",
"folderName": "scripts",