Skip to content

Commit 0d1fd0f

Browse files
author
ShinkoNet
committed
Extended Custom Instrument Limit from 9 to 18
Added new sprites/icons for these instruments, and modified current custom instrument sprites.
1 parent 2d7b53c commit 0d1fd0f

File tree

80 files changed

+214
-359
lines changed

Some content is hidden

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

80 files changed

+214
-359
lines changed

scripts/draw_block/draw_block.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ salpha = argument5
99

1010
index = ds_list_find_index(instrument_list, ins)
1111
if (ins.user || !use_colored)
12-
index += 16
12+
index = 32
1313
if(theme=2) draw_sprite_ext(spr_altblock, index, xx, yy, 1, 1, 0, -1, alpha)
1414
else draw_sprite_ext(spr_block, index, xx, yy, 1, 1, 0, -1, alpha)
1515
if (ins.user || key < 33 || key > 57) {

scripts/draw_window_instruments/draw_window_instruments.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ popup_set_window(x1 + 13, y1 + 67, 194, 20, "The name of this instrument.")
3434
draw_text(x1 + 18, y1 + 70, "Name")
3535
if (draw_button2(x1 + 12, y1 + 318, 80, "Import")) load_instruments("")
3636
c = 0
37-
if (draw_button2(x1 + 256, y1 + 318, 80, "Add", user_instruments >= 9) && wmenu = 0) {
37+
if (draw_button2(x1 + 256, y1 + 318, 80, "Add", user_instruments >= 18) && wmenu = 0) {
3838
changed = true
3939
insselect = ds_list_size(instrument_list)
4040
ds_list_add(instrument_list, new_instrument("Custom instrument #" + string(user_instruments + 1), "", true))

scripts/icons_init/icons_init.gml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ enum icons {
3737
CUSTOM_INS_7,
3838
CUSTOM_INS_8,
3939
CUSTOM_INS_9,
40+
CUSTOM_INS_10,
41+
CUSTOM_INS_11,
42+
CUSTOM_INS_12,
43+
CUSTOM_INS_13,
44+
CUSTOM_INS_14,
45+
CUSTOM_INS_15,
46+
CUSTOM_INS_16,
47+
CUSTOM_INS_17,
48+
CUSTOM_INS_18,
4049
UNDO_INACTIVE,
4150
UNDO,
4251
REDO_INACTIVE,
488 Bytes
-451 Bytes
Binary file not shown.
-451 Bytes
Binary file not shown.
-456 Bytes
Binary file not shown.
-459 Bytes
Binary file not shown.
-458 Bytes
Binary file not shown.
-445 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)