track export part 3

Author: OctoFlareDev

scripts/block_circuit_track/block_circuit_track.gml

@@ -1,7 +1,9 @@
 function block_circuit_track(x, y, z){
 	TAG_List("pos", 3, 3)
-		buffer_write_int_be(y)
+		buffer_write_int_be(99 - y)
 		buffer_write_int_be(z)
 		buffer_write_int_be(x)
 	TAG_Int("state", 1)
+	TAG_End()
+	totalblocksc++
 }

scripts/block_other_track/block_other_track.gml

@@ -1,5 +1,5 @@
 function block_other_track(x, y, z, id, data){
-	var insnum = insnum = ds_list_size(instrument_list)
+	var insnum = ds_list_size(instrument_list)
 	if (id = 0) TAG_Int("state", insnum * 26 + 4) //air
 	else if (id = 35 && data = 11) TAG_Int("state", insnum * 26 + 3) //blue_wool
 	else if (id = 65) TAG_Int("state", insnum * 26 + 5) //ladder
@@ -23,8 +23,9 @@ function block_other_track(x, y, z, id, data){
 		}
 	}
 	TAG_List("pos", 3, 3)
-		buffer_write_int_be(y)
+		buffer_write_int_be(99 - y)
 		buffer_write_int_be(z)
 		buffer_write_int_be(x)
 	TAG_End()
+	totalblocksc++
 }

scripts/block_repeater_track/block_repeater_track.gml

@@ -1,19 +1,26 @@
 function block_repeater_track(x, y, z, delay, direction, powered){
-	var insnum = insnum = ds_list_size(instrument_list)
+	var insnum = ds_list_size(instrument_list)
 	var dir
-	if (direction = 1) dir = 11
-	else if (direction = 1 + 4) dir = 12
-	else if (direction = 1 + 4 * 2) dir = 13
-	else if (direction = 1 + 4 * 3) dir = 14
-	else if (direction = 2) dir = 7
-	else if (direction = 2 + 4) dir = 8
-	else if (direction = 2 + 4 * 2) dir = 9
-	else if (direction = 2 + 4 * 3) dir = 10
-	else if (direction = 3) dir = 15
+	if (direction = 1) {
+		if (delay = 0) dir = 11
+		else if (delay = 1) dir = 12
+		else if (delay = 2) dir = 13
+		else if (delay = 3) dir = 14
+	}
+	else if (direction = 2) {
+		if (delay = 0) dir = 7
+		else if (delay = 1) dir = 8
+		else if (delay = 2) dir = 9
+		else if (delay = 3) dir = 10
+	}
+	else if (direction = 3) {
+		dir = 15
+	}
 	TAG_List("pos", 3, 3)
-		buffer_write_int_be(y)
+		buffer_write_int_be(99 - y)
 		buffer_write_int_be(z)
 		buffer_write_int_be(x)
 	TAG_Int("state", insnum * 26 + dir)
 	TAG_End()
+	totalblocksc++
 }

scripts/block_walkway_track/block_walkway_track.gml

@@ -1,8 +1,9 @@
 function block_walkway_track(x, y, z){
 	TAG_List("pos", 3, 3)
-		buffer_write_int_be(y)
+		buffer_write_int_be(99 - y)
 		buffer_write_int_be(z)
 		buffer_write_int_be(x)
 	TAG_Int("state", 0)
 	TAG_End()
+	totalblocksc++
 }

scripts/control_create/control_create.gml

@@ -56,7 +56,6 @@ function control_create() {
 	icon_time = -1
 	last_icon = -1
 	icon_display = 1
-	minus = 0
 
 	font_table =
 	[

scripts/control_draw/control_draw.gml

@@ -122,13 +122,6 @@ function control_draw() {
 		else set_msg("全屏模式 => 关闭")
 		}
 	}
-	if (keyboard_check_pressed(ord("M"))) {
-		minus -= 1
-	}
-	if (keyboard_check_pressed(ord("N"))) {
-		minus += 1
-	}
-	//show_debug_message(minus)
 	}
 
 	if (theme = 0) window_background = 15790320

scripts/macros/macros.gml

@@ -1,6 +1,6 @@
 function macros() {
 #macro gm_runtime_version "2022.2.0.487"
-#macro version_date "2022.05.24"
+#macro version_date "2022.06.16"
 #macro version "3.10.0-beta.3"
 #macro is_prerelease 1 // remember to change to 0 in the release!
 #macro nbs_version 5

scripts/schematic_export/schematic_export.gml

@@ -951,8 +951,8 @@ function schematic_export() {
 					TAG_Compound("nbt")
 						soundname = dat_instrument(noteblockins[a])
 						soundpitch = dat_pitch(noteblocknote[a] + 33 + noteblockpit[a] / 100)
-						if (noteblocknote[a] < 0) soundname += "_-1"
-						else if (noteblocknote[a] > 24) soundname += "_1"
+						if (noteblocknote[a] + noteblockpit[a] / 100 < 0) soundname += "_-1"
+						else if (noteblocknote[a] + noteblockpit[a] / 100 > 24) soundname += "_1"
 						TAG_String("Command", "playsound "+ soundname +" block @a ~ ~ ~ 3 " + string(soundpitch))
 						TAG_Byte("TrackOutput", 0)
 						TAG_Byte("powered", 0)