Arrow key font and greener progress bar.

This commit is contained in:
Rodrigo Gómez Maitret 2020-03-03 12:52:21 -06:00
parent a2f83fcfbb
commit aaead8dcff
78 changed files with 117 additions and 8 deletions

View File

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 143 B

View File

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

View File

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 223 B

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 185 B

View File

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 218 B

View File

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 219 B

View File

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 220 B

View File

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 184 B

View File

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 187 B

View File

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 224 B

View File

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 219 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 218 B

View File

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 217 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 210 B

View File

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 209 B

View File

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 221 B

View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View File

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 230 B

View File

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 227 B

View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

View File

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 230 B

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 218 B

View File

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

View File

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View File

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

View File

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 238 B

View File

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 218 B

View File

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 224 B

View File

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 219 B

View File

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

View File

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

View File

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

View File

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 235 B

View File

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

View File

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 217 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

View File

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 184 B

View File

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

View File

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

View File

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 169 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

@ -1,6 +1,6 @@
enum but { info, area, plus, minus, image, national, shiny };
enum src { red, yellow, green, blue, black, pink, orange, purple, white, flip };
enum src { red, yellow, green, blue, black, pink, orange, purple, white, flip, progress };
hover = false;
pressed = false;

View File

@ -7,21 +7,19 @@ draw_set_font(global.font)
draw_set_halign(fa_center);
draw_set_valign(fa_middle);
var charstr = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /♂♀+äöü";
for (var i=0; i<string_length(charstr); i++)
for (var i=1; i<string_length(global.font_str); i++)
{
var surf = surface_create(w, h);
surface_set_target(surf);
draw_sprite_stretched(spr_source, src.black, 0, 0, w, h);
draw_text_transformed((w/2)+2, (h/2)-2, string_char_at(charstr, i), 3, 3, image_angle);
draw_text_transformed((w/2)+2, (h/2)-2, string_char_at(global.font_str, i), 3, 3, image_angle);
surface_reset_target();
var spr = sprite_create_from_surface(surf, 0, 0, w, h, false, true, 0, 0);
surface_free(surf);
sprite_save(spr, 0, working_directory+"Export/icon_button_"+string_char_at(charstr, i)+".png");
sprite_save(spr, 0, working_directory+"Export/icon_button_"+string_char_at(global.font_str, i)+".png");
}

View File

@ -12,7 +12,7 @@ draw_sprite_stretched(spr_source, src.flip,
x_s, align_y(region.bot_left, 0 - 0.5),
w, h);
draw_sprite_stretched(spr_source, src.green,
draw_sprite_stretched(spr_source, src.progress,
x_s, align_y(region.bot_left, 0 - 0.5),
w*percent/100, h);

View File

@ -11,7 +11,8 @@ global.window_height = window_get_height();
global.box_len = global.window_width/2/7;
global.icon_scale = 2;
global.font = font_add_sprite_ext(spr_font,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /♂♀+äöü", true, 1);
global.font_str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZéÉ#-'!?():@_.% /♂♀+äöü↑↓←→";
global.font = font_add_sprite_ext(spr_font, global.font_str, true, 1);
global.dex_len = array_height_2d(global.dexdata);

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 B

View File

@ -1290,6 +1290,94 @@
"LayerId": "e69b6581-b178-4877-915f-d3e726eaa004"
}
]
},
{
"id": "012e621c-a6a9-47c8-9f63-b9e920d0a719",
"modelName": "GMSpriteFrame",
"mvc": "1.0",
"SpriteId": "a6bfc673-f83a-4ef8-9157-215789abf337",
"compositeImage": {
"id": "0e72c185-7edd-40a5-aa61-db17f5edc726",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "012e621c-a6a9-47c8-9f63-b9e920d0a719",
"LayerId": "00000000-0000-0000-0000-000000000000"
},
"images": [
{
"id": "abd01e01-8048-4e4e-b48b-0c3c01badf58",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "012e621c-a6a9-47c8-9f63-b9e920d0a719",
"LayerId": "e69b6581-b178-4877-915f-d3e726eaa004"
}
]
},
{
"id": "067524cb-994d-474b-9f00-2ce6f5c192c7",
"modelName": "GMSpriteFrame",
"mvc": "1.0",
"SpriteId": "a6bfc673-f83a-4ef8-9157-215789abf337",
"compositeImage": {
"id": "e7e5d107-a487-428f-ae68-1eeef487c398",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "067524cb-994d-474b-9f00-2ce6f5c192c7",
"LayerId": "00000000-0000-0000-0000-000000000000"
},
"images": [
{
"id": "05cb9875-9d91-4a52-8604-4ebd00e4baab",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "067524cb-994d-474b-9f00-2ce6f5c192c7",
"LayerId": "e69b6581-b178-4877-915f-d3e726eaa004"
}
]
},
{
"id": "18104e41-ea88-4913-9032-804b342b2274",
"modelName": "GMSpriteFrame",
"mvc": "1.0",
"SpriteId": "a6bfc673-f83a-4ef8-9157-215789abf337",
"compositeImage": {
"id": "5838e583-ffb8-4ade-8253-5a7ac256d235",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "18104e41-ea88-4913-9032-804b342b2274",
"LayerId": "00000000-0000-0000-0000-000000000000"
},
"images": [
{
"id": "dcb1595f-2eb6-4352-a2a1-abd2b59d19de",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "18104e41-ea88-4913-9032-804b342b2274",
"LayerId": "e69b6581-b178-4877-915f-d3e726eaa004"
}
]
},
{
"id": "1fb80ca3-52d8-4b06-8abb-b9d5ca5cd192",
"modelName": "GMSpriteFrame",
"mvc": "1.0",
"SpriteId": "a6bfc673-f83a-4ef8-9157-215789abf337",
"compositeImage": {
"id": "7124a87b-270d-47ad-aa52-d1cd49968734",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "1fb80ca3-52d8-4b06-8abb-b9d5ca5cd192",
"LayerId": "00000000-0000-0000-0000-000000000000"
},
"images": [
{
"id": "37dafb1b-18ae-4a5f-98f6-64d2dc680424",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "1fb80ca3-52d8-4b06-8abb-b9d5ca5cd192",
"LayerId": "e69b6581-b178-4877-915f-d3e726eaa004"
}
]
}
],
"gridX": 0,

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

View File

@ -234,6 +234,28 @@
"LayerId": "76f0ab86-cdf5-42b1-9e75-0396a4ea6aca"
}
]
},
{
"id": "fc732315-a2c2-4243-b7a8-0f69cc7200f5",
"modelName": "GMSpriteFrame",
"mvc": "1.0",
"SpriteId": "55447b82-1730-4429-a3f8-d81a83dcacf6",
"compositeImage": {
"id": "aa6c6c16-be4e-41d8-b854-fc0a416d0be9",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "fc732315-a2c2-4243-b7a8-0f69cc7200f5",
"LayerId": "00000000-0000-0000-0000-000000000000"
},
"images": [
{
"id": "275e41e3-98db-4d55-a48d-7d5d353db9dc",
"modelName": "GMSpriteImage",
"mvc": "1.0",
"FrameId": "fc732315-a2c2-4243-b7a8-0f69cc7200f5",
"LayerId": "76f0ab86-cdf5-42b1-9e75-0396a4ea6aca"
}
]
}
],
"gridX": 0,