Skip to content

Commit 7ab2603

Browse files
OctoFlareDevOctoFlareDev
committed
High resolution part 3
1 parent 6318d47 commit 7ab2603

File tree

592 files changed

+3962
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+3962
-295
lines changed

‎Minecraft Note Block Studio.yyp‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/draw_block/draw_block.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function draw_block(argument0, argument1, argument2, argument3, argument4, argum
4343
draw_set_alpha(1)
4444
if (use_icons) {
4545
if (iscustom) {
46-
draw_icon_customins(xx + 16, yy + 16, index - first_custom_index, alpha, true)
46+
draw_icon_customins(xx + 16, yy + 16, index - first_custom_index, alpha, true, 1)
4747
} else {
4848
if (hires && theme = 3) gpu_set_texfilter(false)
4949
draw_sprite_ext(spr_instrumenticons, index, xx + 16, yy + 16, 1, 1, 0, -1, alpha)

‎scripts/draw_icon/draw_icon.gml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,17 @@ function draw_icon() {
2727
else draw_sprite(spr_frame1, a + 3 * theme + (fdark && theme = 3) * 3, xx, yy)
2828
}
2929
if (theme != 3) {
30-
draw_sprite(spr_icons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1))
30+
draw_sprite(spr_icons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1))
3131
} else {
32-
if (!fdark) draw_sprite_ext(spr_icons_f, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, (!dropmode) + dropalpha * (dropmode))
33-
else draw_sprite_ext(spr_icons_d, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, (!dropmode) + dropalpha * (dropmode))
34-
draw_sprite_ext(spr_icons_col, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, accent[6 - 2 * !fdark], (!dropmode) + dropalpha * (dropmode))
32+
if (!hires) {
33+
if (!fdark) draw_sprite_ext(spr_icons_f, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, (!dropmode) + dropalpha * (dropmode))
34+
else draw_sprite_ext(spr_icons_d, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, (!dropmode) + dropalpha * (dropmode))
35+
draw_sprite_ext(spr_icons_col, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, accent[6 - 2 * !fdark], (!dropmode) + dropalpha * (dropmode))
36+
} else {
37+
if (!fdark) draw_sprite_ext(spr_icons_f_hires, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, (!dropmode) + dropalpha * (dropmode))
38+
else draw_sprite_ext(spr_icons_d_hires, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, (!dropmode) + dropalpha * (dropmode))
39+
draw_sprite_ext(spr_icons_col_hires, i - locked, xx + 25 * 0.1 * (a = 2), yy + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, accent[6 - 2 * !fdark], (!dropmode) + dropalpha * (dropmode))
40+
}
3541
}
3642
// Repeat trigger when holding fast-forward and rewind
3743
if (i = 7 || i = 8) return (a = 2)

‎scripts/draw_icon_customins/draw_icon_customins.gml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function draw_icon_customins(xx, yy, ins, alpha, large) {
1+
function draw_icon_customins(xx, yy, ins, alpha, large, scale) {
22
var display, num1, num2, color1, color2;
33
display = (ins + 1) % 100
44
num1 = floor(display / 10)
@@ -15,10 +15,15 @@ function draw_icon_customins(xx, yy, ins, alpha, large) {
1515
if (hires && theme = 3) gpu_set_texfilter(true)
1616
} else {
1717
if(theme != 3) {
18-
draw_sprite_ext(spr_icons, icons.CUSTOM_INS_OVERLAY, xx, yy, 1, 1, 0, color1, 1)
18+
draw_sprite_ext(spr_icons, icons.CUSTOM_INS_OVERLAY, xx, yy, 1, 1, 0, color1, 1)
1919
} else {
20-
if (!fdark) draw_sprite_ext(spr_icons_f, icons.CUSTOM_INS_OVERLAY, xx, yy, 1, 1, 0, color1, 1)
21-
else draw_sprite_ext(spr_icons_d, icons.CUSTOM_INS_OVERLAY, xx, yy, 1, 1, 0, color1, 1)
20+
if (!hires) {
21+
if (!fdark) draw_sprite_ext(spr_icons_f, icons.CUSTOM_INS_OVERLAY, xx + 25 * ((1 - scale) / 2), yy + 23 * ((1 - scale) / 2), scale, scale, 0, color1, 1)
22+
else draw_sprite_ext(spr_icons_d, icons.CUSTOM_INS_OVERLAY, xx + 25 * ((1 - scale) / 2), yy + 23 * ((1 - scale) / 2), 1, 1, 0, color1, 1)
23+
} else {
24+
if (!fdark) draw_sprite_ext(spr_icons_f_hires, icons.CUSTOM_INS_OVERLAY, xx + 25 * ((1 - scale) / 2), yy + 23 * ((1 - scale) / 2), scale * 0.25, scale * 0.25, 0, color1, 1)
25+
else draw_sprite_ext(spr_icons_d_hires, icons.CUSTOM_INS_OVERLAY, xx + 25 * ((1 - scale) / 2), yy + 23 * ((1 - scale) / 2), scale * 0.25, scale * 0.25, 0, color1, 1)
26+
}
2227
}
2328
if (hires && theme = 3) gpu_set_texfilter(false)
2429
draw_sprite_ext(spr_numbers, num1, xx + 12, yy + 13, 1, 1, 0, color2, 1)

‎scripts/draw_icon_insbox/draw_icon_insbox.gml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,23 @@ function draw_icon_insbox() {
2525
sprite = isaction ? i : icons.INS_1 + min(i, first_custom_index)
2626
push = (a = 2 || pressed = 1) * (theme != 3)
2727
if (theme != 3) {
28-
draw_sprite(spr_icons, sprite, xx + push, yy + push)
28+
draw_sprite(spr_icons, sprite, xx + push, yy + push)
2929
} else {
30-
if (!fdark) draw_sprite_ext(spr_icons_f, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, 1)
31-
else draw_sprite_ext(spr_icons_d, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, 1)
32-
draw_sprite_ext(spr_icons_col, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, accent[6 - 2 * !fdark], 1)
30+
if (!hires) {
31+
if (!fdark) draw_sprite_ext(spr_icons_f, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, 1)
32+
else draw_sprite_ext(spr_icons_d, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), 1 - 0.2 * (a = 2), 1 - 0.2 * (a = 2), 0, -1, 1)
33+
} else {
34+
if (!fdark) {
35+
draw_sprite_ext(spr_icons_f_hires, 26, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, 1)
36+
draw_sprite_ext(spr_icons_f_hires, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, 1)
37+
} else {
38+
draw_sprite_ext(spr_icons_d_hires, 26, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, 1)
39+
draw_sprite_ext(spr_icons_d_hires, sprite, xx + push + 25 * 0.1 * (a = 2), yy + push + 23 * 0.1 * (a = 2), (1 - 0.2 * (a = 2)) * 0.25, (1 - 0.2 * (a = 2)) * 0.25, 0, -1, 1)
40+
}
41+
}
3342
}
3443
if (!isaction && i >= first_custom_index) {
35-
draw_icon_customins(xx + push, yy + push, i - first_custom_index, 1, false)
44+
draw_icon_customins(xx + push, yy + push, i - first_custom_index, 1, false, 1 - 0.2 * (a = 2) * (theme = 3))
3645
}
3746
return (a && mouse_check_button_released(mb_left))
3847

‎scripts/draw_layericon/draw_layericon.gml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ function draw_layericon(argument0, argument1, argument2, argument3, argument4, a
1414
a = (mouse_rectangle(xx, yy, 16, 16) && window = 0 && locked = 0 && sb_drag = -1)
1515
a += ((mouse_check_button(mb_left) || mouse_check_button_released(mb_left)) && a)
1616
if (pressed = 1) {
17-
draw_sprite(spr_frame4, 2 + 3 * theme, xx, yy)
17+
if (!hires || theme != 3) draw_sprite(spr_frame4, 2 + 3 * theme, xx, yy)
18+
else draw_sprite_ext(spr_frame4_hires, 2, xx, yy, 0.25, 0.25, 0, -1, draw_get_alpha())
1819
} else {
19-
draw_sprite(spr_frame4, a + 3 * theme, xx, yy)
20+
if (!hires || theme != 3) draw_sprite(spr_frame4, a + 3 * theme, xx, yy)
21+
else draw_sprite_ext(spr_frame4_hires, a, xx, yy, 0.25, 0.25, 0, -1, draw_get_alpha())
2022
}
2123
if(theme != 3) {
2224
draw_sprite_ext(spr_layericons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1), 1, 1, 0, color, 0.7)

‎scripts/draw_macroicon/draw_macroicon.gml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ function draw_macroicon(argument0, argument1, argument2, argument3, argument4, a
1414
a = (mouse_rectangle(xx, yy, 16, 16) && window = 0 && locked = 0 && sb_drag = -1)
1515
a += ((mouse_check_button(mb_left) || mouse_check_button_released(mb_left)) && a)
1616
if (pressed = 1) {
17-
draw_sprite(spr_frame4, 2 + 3 * theme + 3 * (fdark && theme = 3), xx, yy)
17+
if (!hires || theme = 3) draw_sprite(spr_frame4, 2 + 3 * theme + 3 * (fdark && theme = 3), xx, yy)
18+
else draw_sprite_ext(spr_frame4_hires, 2 + 3 * fdark, xx, yy, 0.25, 0.25, 0, -1, draw_get_alpha())
1819
} else {
19-
draw_sprite(spr_frame4, a + 3 * theme + 3 * (fdark && theme = 3), xx, yy)
20+
if (!hires || theme = 3) draw_sprite(spr_frame4, a + 3 * theme + 3 * (fdark && theme = 3), xx, yy)
21+
else draw_sprite_ext(spr_frame4_hires, a + 3 * fdark, xx, yy, 0.25, 0.25, 0, -1, draw_get_alpha())
2022
}
2123
if (!hires || theme != 3) draw_sprite_ext(spr_macroicons, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1), 1, 1, 0, color, 0.7)
2224
else draw_sprite_ext(spr_macroicons_hires, i - locked, xx + (a = 2 || pressed = 1), yy + (a = 2 || pressed = 1), 0.25, 0.25, 0, color, 0.7)

0 commit comments

Comments
 (0)