Skip to content

Commit d9a581d

Browse files
OctoFlareDevOctoFlareDev
committed
adjust track noteblock distribution
1 parent aef84c6 commit d9a581d

2 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎scripts/macros/macros.gml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function macros() {
22
#macro gm_runtime_version "2022.2.0.487"
3-
#macro version_date "2022.06.16"
3+
#macro version_date "2022.06.17"
44
#macro version "3.10.0-beta.3"
55
#macro is_prerelease 1 // remember to change to 0 in the release!
66
#macro nbs_version 5

‎scripts/track_export/track_export.gml‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function track_export() {
22
// track_export()
3-
var fn, a, b, c, d, p, xx, yy, zz, len, wid, hei, o, chestx, chesty, chestz, signx, signy, signz, nblocks, layers, cyy, y1, x1, insnum, ins, repeats, remain, replen, blockamount, nbamount, cpan, cvol, blocktagpos;
3+
var fn, a, b, c, d, p, xx, yy, zz, len, wid, hei, o, chestx, chesty, chestz, signx, signy, signz, nblocks, layers, cyy, y1, x1, insnum, ins, repeats, remain, replen, blockamount, nbamount, cpan, cpanvol, cvol, blocktagpos;
44
var REPEATER, TORCHON, TORCHOFF, WIRE, LADDER, RAIL, POWEREDRAIL, SLAB, noteblocks, noteblockx, noteblocky, noteblockz, noteblocknote, noteblockins, noteblockpit;
55
fn = string(get_save_filename_ext("Minecraft Structures (*.nbt)|*.nbt", filename_new_ext(string_replace_all(string_lower(filename), " ", "_"), "") + ".nbt", "", "Export Track"))
66
if (fn = "") return 0
@@ -482,41 +482,42 @@ function track_export() {
482482
if (o.layerstereo[b] = 100) cpan = o.song_pan[a, b]
483483
else cpan = (o.layerstereo[b] + o.song_pan[a, b]) / 2
484484
cvol = (o.layervol[b] / 100) * o.song_vel[a, b]
485-
nblockinsl4[nblocksl4] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpan >= 180 && cpan < 200)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpan >= 180 && cpan < 200))
486-
nblockkeyl4[nblocksl4] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpan >= 180 && cpan < 200))
487-
nblockpitl4[nblocksl4] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpan >= 180 && cpan < 200))
485+
cpanvol = (cpan - 100) * cvol + 100
486+
nblockinsl4[nblocksl4] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol >= 180)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol >= 180))
487+
nblockkeyl4[nblocksl4] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol >= 180))
488+
nblockpitl4[nblocksl4] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol >= 180))
488489
nblocksl4 += 1
489-
nblockinsl3[nblocksl3] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpan >= 160 && cpan < 180)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpan >= 160 && cpan < 180))
490-
nblockkeyl3[nblocksl3] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpan >= 160 && cpan < 180))
491-
nblockpitl3[nblocksl3] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpan >= 160 && cpan < 180))
490+
nblockinsl3[nblocksl3] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol >= 160 && cpanvol < 180)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol >= 160 && cpanvol < 180))
491+
nblockkeyl3[nblocksl3] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol >= 160 && cpanvol < 180))
492+
nblockpitl3[nblocksl3] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol >= 160 && cpanvol < 180))
492493
nblocksl3 += 1
493-
nblockinsl2[nblocksl2] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpan >= 140 && cpan < 160)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpan >= 140 && cpan < 160))
494-
nblockkeyl2[nblocksl2] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpan >= 140 && cpan < 160))
495-
nblockpitl2[nblocksl2] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpan >= 140 && cpan < 160))
494+
nblockinsl2[nblocksl2] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol >= 140 && cpanvol < 160)) - !((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol >= 140 && cpanvol < 160))
495+
nblockkeyl2[nblocksl2] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol >= 140 && cpanvol < 160))
496+
nblockpitl2[nblocksl2] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 0 && cpan <= 80)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol >= 140 && cpanvol < 160))
496497
nblocksl2 += 1
497-
nblockinsl1[nblocksl1] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpan >= 120 && cpan < 140)) - !((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpan >= 120 && cpan < 140))
498-
nblockkeyl1[nblocksl1] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpan >= 120 && cpan < 140))
499-
nblockpitl1[nblocksl1] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpan >= 120 && cpan < 140))
498+
nblockinsl1[nblocksl1] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpanvol >= 120 && cpanvol < 140)) - !((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpanvol >= 120 && cpanvol < 140))
499+
nblockkeyl1[nblocksl1] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpanvol >= 120 && cpanvol < 140))
500+
nblockpitl1[nblocksl1] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 0 && cpan <= 80)) && cvol > 0.6) || (cpanvol >= 120 && cpanvol < 140))
500501
nblocksl1 += 1
501502
nblockins[nblocks] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * (cpan > 80 && cpan < 120 && cvol > 0.8) - !(cpan > 80 && cpan < 120 && cvol > 0.8)
502503
nblockkey[nblocks] = o.song_key[a, b] * (cpan > 80 && cpan < 120 && cvol > 0.8)
503504
nblockpit[nblocks] = o.song_pit[a, b] * (cpan > 80 && cpan < 120 && cvol > 0.8)
504505
nblocks += 1
505-
nblockinsr1[nblocksr1] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpan > 60 && cpan <= 80)) - !((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpan > 60 && cpan <= 80))
506-
nblockkeyr1[nblocksr1] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpan > 60 && cpan <= 80))
507-
nblockpitr1[nblocksr1] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpan > 60 && cpan <= 80))
506+
nblockinsr1[nblocksr1] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpanvol > 60 && cpanvol <= 80)) - !((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpanvol > 60 && cpanvol <= 80))
507+
nblockkeyr1[nblocksr1] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpanvol > 60 && cpanvol <= 80))
508+
nblockpitr1[nblocksr1] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120 && cvol <= 0.8) || (cpan > 120 && cpan <= 200)) && cvol > 0.6) || (cpanvol > 60 && cpanvol <= 80))
508509
nblocksr1 += 1
509-
nblockinsr2[nblocksr2] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpan > 40 && cpan <= 60)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpan > 40 && cpan <= 60))
510-
nblockkeyr2[nblocksr2] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpan > 40 && cpan <= 60))
511-
nblockpitr2[nblocksr2] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpan > 40 && cpan <= 60))
510+
nblockinsr2[nblocksr2] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol > 40 && cpanvol <= 60)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol > 40 && cpanvol <= 60))
511+
nblockkeyr2[nblocksr2] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol > 40 && cpanvol <= 60))
512+
nblockpitr2[nblocksr2] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.4 && cvol <= 0.6) || (cpanvol > 40 && cpanvol <= 60))
512513
nblocksr2 += 1
513-
nblockinsr3[nblocksr3] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpan > 20 && cpan <= 40)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpan > 20 && cpan <= 40))
514-
nblockkeyr3[nblocksr3] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpan > 20 && cpan <= 40))
515-
nblockpitr3[nblocksr3] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpan > 20 && cpan <= 40))
514+
nblockinsr3[nblocksr3] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol > 20 && cpanvol <= 40)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol > 20 && cpanvol <= 40))
515+
nblockkeyr3[nblocksr3] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol > 20 && cpanvol <= 40))
516+
nblockpitr3[nblocksr3] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.2 && cvol <= 0.4) || (cpanvol > 20 && cpanvol <= 40))
516517
nblocksr3 += 1
517-
nblockinsr4[nblocksr4] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpan > 00 && cpan <= 20)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpan > 00 && cpan <= 20))
518-
nblockkeyr4[nblocksr4] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpan > 00 && cpan <= 20))
519-
nblockpitr4[nblocksr4] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpan > 00 && cpan <= 20))
518+
nblockinsr4[nblocksr4] = ds_list_find_index(other.instrument_list, o.song_ins[a, b]) * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol <= 20)) - !((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpan <= 20))
519+
nblockkeyr4[nblocksr4] = o.song_key[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol <= 20))
520+
nblockpitr4[nblocksr4] = o.song_pit[a, b] * ((((cpan > 80 && cpan < 120) || (cpan > 120 && cpan <= 200)) && cvol > 0.0 && cvol <= 0.2) || (cpanvol <= 20))
520521
nblocksr4 += 1
521522
}
522523
}

0 commit comments

Comments
 (0)