01/04/2020 #1

This commit is contained in:
TheGreenTie 2020-02-17 14:34:11 -06:00
parent 972b7cb47d
commit dd31b74da8
4 changed files with 12 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -418,30 +418,11 @@ else if (mouse_wheel_down())
<kind>1</kind>
<string>/// DRAW
/// Display Info
var color = get_color3(global.selected[dex.own], false);
draw_set_color(color);
/// DRAW HOVER INFO
/*var len = global.box_len/8;
var hal = len/2;
var mid = room_width*0.75;
draw_set_font(global.font)
draw_set_halign(fa_middle)
draw_text_transformed(mid, room_height*0.1, scr_zeros(global.selected[dex.dexno]), len, len, 0);
draw_text_transformed(mid, room_height*0.5, global.selected[dex.pokemon], len, len, 0);
draw_set_color(c_white);
if (global.selected[dex.type2] != "")
{
draw_sprite_ext(spr_type, scr_typeget(global.selected[dex.type1]), mid-(30*hal)-hal, room_height*0.6, hal, hal, image_angle, image_blend, image_alpha);
draw_sprite_ext(spr_type, scr_typeget(global.selected[dex.type2]), mid+hal, room_height*0.6, hal, hal, image_angle, image_blend, image_alpha);
}
else
{
}*/
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);
@ -449,6 +430,8 @@ draw_text_hud(global.selected[dex.form], 1.5, 3, color);
draw_type_hud(global.selected[dex.type1], global.selected[dex.type2], 4.5);
// Debug
draw_guidelines(false);
</string>
</argument>

View File

@ -48,6 +48,11 @@ draw_set_font(global.font);
draw_set_halign(fa_middle);
draw_set_color(col);
draw_text_transformed(mid_x, mid_y+start+len, str, sca, sca, 0);
var final_y = mid_y + start + len;
if (final_y < view_yview[0])
final_y = view_yview[0];
draw_text_transformed(mid_x, final_y, str, sca, sca, 0);
draw_set_color(c_white);

View File

@ -12,9 +12,9 @@ if (form != "")
show_debug_message(str);
}
sprtemp = sprite_add("Icons\Regular\"+string(str)+".png",0,true,false,19,14);
sprtemp = sprite_add("Icons\Regular\"+string(str)+".png",0,false,false,19,14);
if (sprite_get_width(sprtemp) > 40 || sprite_get_height(sprtemp) > 30)
if (sprite_get_width(sprtemp) > 40 || sprite_get_height(sprtemp) > 30 || sprite_get_height(sprtemp) == 29)
sprite_set_offset(sprtemp, sprite_get_width(sprtemp)/2, sprite_get_height(sprtemp)/2);
return sprtemp;