Skip to content

Commit 466b761

Browse files
OctoFlareDevOctoFlareDev
committed
Most of the support for the trumpet instruments
And fix sound stopper window not allowing 0
1 parent 08b653a commit 466b761

1,460 files changed

Lines changed: 548 additions & 369 deletions

File tree

Some content is hidden

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

‎Minecraft Note Block Studio.yyp‎

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

‎extensions/GMX11Caption/GMX11Caption.yy‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/block_get_ins/block_get_ins.gml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function block_get_ins(argument0) {
2222
if (block = 25) ins = 1
2323
if (block = 35) ins = 5
2424
if (block = 41) ins = 7
25+
if (block = 42) ins = 10
2526
if (block = 43) ins = 2
2627
if (block = 44) ins = 2
2728
if (block = 45) ins = 2
@@ -39,17 +40,29 @@ function block_get_ins(argument0) {
3940
if (block = 82) ins = 6
4041
if (block = 84) ins = 1
4142
if (block = 85) ins = 1
43+
if (block = 86) ins = 12
4244
if (block = 87) ins = 2
43-
if (block = 88) ins = 3
44-
if (block = 89) ins = 2
45+
if (block = 88) ins = 11
46+
if (block = 89) ins = 15
4547
if (block = 97) ins = 2
4648
if (block = 98) ins = 2
4749
if (block = 107) ins = 1
4850
if (block = 108) ins = 2
4951
if (block = 109) ins = 2
52+
if (block = 133) ins = 13
53+
if (block = 170) ins = 14
5054
if (block = 174) ins = 8
5155
if (block = 216) ins = 9
52-
// 1.8 end
56+
if (block = -155) ins = 12
57+
if (block = -340) ins = 16
58+
if (block = -341) ins = 17
59+
if (block = -342) ins = 18
60+
if (block = -343) ins = 19
61+
if (block = -344) ins = 16
62+
if (block = -345) ins = 17
63+
if (block = -346) ins = 18
64+
if (block = -446) ins = 19
65+
// 26.1 end
5366
return ins
5467

5568

‎scripts/block_get_name/block_get_name.gml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ function block_get_name(argument0, argument1) {
128128
case 216: return "Bone Block"
129129
case 251: return "Concrete"
130130
case 252: return "Concrete Powder"
131+
case -340: return "Copper Block"
132+
case -341: return "Exposed Copper Block"
133+
case -342: return "Weathered Copper Block"
134+
case -343: return "Oxidized Copper Block"
135+
case -344: return "Waxed Copper Block"
136+
case -345: return "Waxed Exposed Copper Block"
137+
case -346: return "Waxed Weathered Copper Block"
138+
case -446: return "Waxed Oxidized Copper Block"
131139
}
132140

133141
return ""

‎scripts/block_get_namespaced_id/block_get_namespaced_id.gml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ function block_get_namespaced_id(argument0, argument1=0) {
130130
case 216: return "bone_block"
131131
case 251: return color + "concrete"
132132
case 252: return color + "concrete_powder"
133+
case -340: return "copper_block"
134+
case -341: return "exposed_copper"
135+
case -342: return "weathered_copper"
136+
case -343: return "oxidized_copper"
137+
case -344: return "waxed_copper_block"
138+
case -345: return "waxed_exposed_copper"
139+
case -346: return "waxed_weathered_copper"
140+
case -446: return "waxed_oxidized_copper"
133141
}
134142

135143
return ""

‎scripts/control_create/control_create.gml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -264,22 +264,26 @@ function control_create() {
264264
refresh_resourcepacks()
265265

266266
original_instruments = []
267-
array_push(original_instruments, new_instrument("Harp", "harp.ogg", false, true))
268-
array_push(original_instruments, new_instrument("Double Bass", "dbass.ogg", false, true))
269-
array_push(original_instruments, new_instrument("Bass Drum", "bdrum.ogg", false))
270-
array_push(original_instruments, new_instrument("Snare Drum", "sdrum.ogg", false))
271-
array_push(original_instruments, new_instrument("Click", "click.ogg", false))
272-
array_push(original_instruments, new_instrument("Guitar", "guitar.ogg", false, true))
273-
array_push(original_instruments, new_instrument("Flute", "flute.ogg", false, true))
274-
array_push(original_instruments, new_instrument("Bell", "bell.ogg", false, true))
275-
array_push(original_instruments, new_instrument("Chime", "icechime.ogg", false, true))
276-
array_push(original_instruments, new_instrument("Xylophone", "xylobone.ogg", false, true))
277-
array_push(original_instruments, new_instrument("Iron Xylophone","iron_xylophone.ogg", false, true))
278-
array_push(original_instruments, new_instrument("Cow Bell", "cow_bell.ogg", false, true))
279-
array_push(original_instruments, new_instrument("Didgeridoo", "didgeridoo.ogg", false, true))
280-
array_push(original_instruments, new_instrument("Bit", "bit.ogg", false, true))
281-
array_push(original_instruments, new_instrument("Banjo", "banjo.ogg", false, true))
282-
array_push(original_instruments, new_instrument("Pling", "pling.ogg", false, true))
267+
array_push(original_instruments, new_instrument("Harp", "harp.ogg", false, true))
268+
array_push(original_instruments, new_instrument("Double Bass", "dbass.ogg", false, true))
269+
array_push(original_instruments, new_instrument("Bass Drum", "bdrum.ogg", false))
270+
array_push(original_instruments, new_instrument("Snare Drum", "sdrum.ogg", false))
271+
array_push(original_instruments, new_instrument("Click", "click.ogg", false))
272+
array_push(original_instruments, new_instrument("Guitar", "guitar.ogg", false, true))
273+
array_push(original_instruments, new_instrument("Flute", "flute.ogg", false, true))
274+
array_push(original_instruments, new_instrument("Bell", "bell.ogg", false, true))
275+
array_push(original_instruments, new_instrument("Chime", "icechime.ogg", false, true))
276+
array_push(original_instruments, new_instrument("Xylophone", "xylobone.ogg", false, true))
277+
array_push(original_instruments, new_instrument("Iron Xylophone", "iron_xylophone.ogg", false, true))
278+
array_push(original_instruments, new_instrument("Cow Bell", "cow_bell.ogg", false, true))
279+
array_push(original_instruments, new_instrument("Didgeridoo", "didgeridoo.ogg", false, true))
280+
array_push(original_instruments, new_instrument("Bit", "bit.ogg", false, true))
281+
array_push(original_instruments, new_instrument("Banjo", "banjo.ogg", false, true))
282+
array_push(original_instruments, new_instrument("Pling", "pling.ogg", false, true))
283+
array_push(original_instruments, new_instrument("Trumpet", "trumpet.ogg", false, true))
284+
array_push(original_instruments, new_instrument("Exposed Trumpet", "trumpet_exposed.ogg", false, true))
285+
array_push(original_instruments, new_instrument("Weathered Trumpet","trumpet_weathered.ogg", false, true))
286+
array_push(original_instruments, new_instrument("Oxidized Trumpet", "trumpet_oxidized.ogg", false, true))
283287

284288
// Navigating sounds
285289
str = ""

‎scripts/control_draw/control_draw.gml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -727,8 +727,8 @@ function control_draw() {
727727
}
728728
}
729729
}else{
730-
//Last 7 (ctrl+shift)
731-
for (a = 1; a <= 7; a++) {
730+
//Last 9 (ctrl+shift)
731+
for (a = 1; a <= 9; a++) {
732732
if (keyboard_check_pressed(ord(string(a % 10)))) {
733733
current_song.instrument = current_song.instrument_list[| a + 8]
734734
selected_vel = 100
@@ -1763,8 +1763,10 @@ function control_draw() {
17631763
else{
17641764
if(a < 9){
17651765
str += check(current_song.instrument = ins) + get_hotkey("ins_ctrl") + string((a + 1) % 10) + "$" + clean(ins.name) + "|"
1766-
}else{
1766+
}else if (a < 18){
17671767
str += check(current_song.instrument = ins) + get_hotkey("ins_ctrl_shift") + string((a + 2) % 10) + "$" + clean(ins.name) + "|"
1768+
} else {
1769+
str += check(current_song.instrument = ins) + clean(ins.name) + "|"
17681770
}
17691771
}
17701772
if (a % 25 == 0 && a > 1 && a < ds_list_size(current_song.instrument_list) - 1) {
@@ -1856,10 +1858,12 @@ function control_draw() {
18561858
if (ins.user)
18571859
customstr += check(current_song.instrument = ins) + clean(ins.name) + "|"
18581860
else{
1859-
if(a < 10){
1861+
if(a < 9){
18601862
str += check(current_song.instrument = ins) + get_hotkey("ins_ctrl") + string((a + 1) % 10) + "$" + clean(ins.name) + "|"
1861-
}else{
1863+
}else if (a < 18){
18621864
str += check(current_song.instrument = ins) + get_hotkey("ins_ctrl_shift") + string((a + 1) % 10) + "$" + clean(ins.name) + "|"
1865+
} else {
1866+
str += check(current_song.instrument = ins) + clean(ins.name) + "|"
18631867
}
18641868
}
18651869
if (a % 25 == 0 && a > 1 && a < ds_list_size(current_song.instrument_list) - 1) {

‎scripts/dat_instrument/dat_instrument.gml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ function dat_instrument(argument0) {
3939
return str + "banjo"
4040
case 15:
4141
return str + "pling"
42+
case 16:
43+
return str + "trumpet"
44+
case 17:
45+
return str + "trumpet_exposed"
46+
case 18:
47+
return str + "trumpet_weathered"
48+
case 19:
49+
return str + "trumpet_oxidized"
4250
}
4351
}
4452
if instrumentnumber >= 16 {

‎scripts/draw_window_branch_export/draw_window_branch_export.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ function draw_window_branch_export() {
360360
block[b, 0] = 216 block[b, 1] = 0 b += 1
361361
} else {
362362
b = 0
363-
for (a = 0; a < 256; a += 1) {
363+
for (a = -500; a < 256; a += 1) {
364364
if (a = 35 || a = 95 || a = 159) {
365365
block[b, 0] = a block[b, 1] = 0 b += 1
366366
for (c = 0; c < 16; c += 1) {block[b + c, 0] = a block[b + c, 1] = c} b += 16

‎scripts/draw_window_edit_sound_stopper/draw_window_edit_sound_stopper.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function draw_window_edit_sound_stopper() {
4141
try {
4242
temp_start = int64(sound_stopper_set_start)
4343
temp_until = int64(sound_stopper_set_until)
44-
if (temp_start > 0 && temp_until > 0) {
44+
if (temp_start >= 0 && temp_until >= 0) {
4545
songs[song].song_pit[@ tempo_changer_sel_x, tempo_changer_sel_y] = temp_start
4646
var temp_arr = short_to_panning_velocity(temp_until)
4747
songs[song].song_pan[@ tempo_changer_sel_x, tempo_changer_sel_y] = temp_arr[0]

0 commit comments

Comments
 (0)