slabset refactor, beginnings of editing slab objects

Autoload/Columnset.gd

@@ -14,7 +14,7 @@ var floorTexture = []
 # map0000x.clm : 49,160 bytes. first 4 bytes contains 2048, second 4 bytes are ???, then comes the column data.
 # slabs.clm : 49,156 bytes. first 4 bytes contains 2048, then comes the column data.
 
-func clm_load_slabset():
+func load_columnset():
 	var CODETIME_START = OS.get_ticks_msec()
 	clear_all_column_data() # Important, for reloading/refreshing slabs.clm
 
@@ -47,4 +47,29 @@ func clm_load_slabset():
 		for cubeNumber in 8:
 			cubes[entry][cubeNumber] = buffer.get_u16() # 8-23
 
-	print('Created CLM asset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+	print('Created Columnset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+
+
+func create_cfg_columns(filePath): #"res://columns.cfg"
+	var oMessage = Nodelist.list["oMessage"]
+	var textFile = File.new()
+	if textFile.open(filePath, File.WRITE) == OK:
+
+		textFile.store_line('[common]')
+		textFile.store_line('ColumnsCount = 2048')
+		textFile.store_line('\r')
+
+		for i in Columnset.utilized.size():
+			textFile.store_line('[column' + str(i) +']')
+			textFile.store_line('Utilized = ' + str(Columnset.utilized[i])) #(0-1)
+			textFile.store_line('Permanent = ' + str(Columnset.permanent[i])) #(2)
+			textFile.store_line('Lintel = ' + str(Columnset.lintel[i])) #(2)
+			textFile.store_line('Height = ' + str(Columnset.height[i])) #(2)
+			textFile.store_line('SolidMask = ' + str(Columnset.solidMask[i])) #(3-4)
+			textFile.store_line('FloorTexture = ' + str(Columnset.floorTexture[i])) #(5-6)
+			textFile.store_line('Orientation = ' + str(Columnset.orientation[i])) #(7)
+			textFile.store_line('Cubes = ' + str(Columnset.cubes[i])) #(8-23)
+			textFile.store_line('\r')
+		oMessage.quick("Saved: " + filePath)
+	else:
+		oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.")

Autoload/Slabset.gd

@@ -1,11 +1,30 @@
 extends Node
-onready var oGame = Nodelist.list["oGame"]
+
+var tngIndex = []
+var tngObject = []
+var numberOfThings = 0
 
 # dat[slabID][variation][subtile]
 var dat = []
+var CODETIME_START
+
+enum dir {
+	s = 0
+	w = 1
+	n = 2
+	e = 3
+	sw = 4
+	nw = 5
+	ne = 6
+	se = 7
+	all = 8
+	center = 27
+}
 
-func dat_load_slabset():
-	var CODETIME_START = OS.get_ticks_msec()
+func load_slabset():
+	var oGame = Nodelist.list["oGame"]
+
+	CODETIME_START = OS.get_ticks_msec()
 
 	var filePath = oGame.get_precise_filepath(oGame.DK_DATA_DIRECTORY, "SLABS.DAT")
 	var buffer = Filetypes.file_path_to_buffer(filePath)
@@ -27,4 +46,231 @@ func dat_load_slabset():
 				for subtile in 9:
 					dat[slabID][variation][subtile] = 0
 
-	print('Created DAT asset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+	print('Created Slabset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+
+
+func create_cfg_slabset(filePath): #"res://slabset.cfg"
+	var oMessage = Nodelist.list["oMessage"]
+	var textFile = File.new()
+	if textFile.open(filePath, File.WRITE) == OK:
+		var slabSection = 0
+
+		for slabID in 58:
+			#textFile.store_line('[[slab' + str(slabSection) + '.columns]]')
+
+			var variationStart = (slabID * 28)
+			if slabID >= 42:
+				variationStart = (42 * 28) + (8 * (slabID - 42))
+
+			var variationCount = 28
+			if slabID >= 42:
+				variationCount = 8
+
+			textFile.store_line('[slab' + str(slabID) + ']')
+
+			for variationNumber in variationCount:
+				if variationStart + variationNumber < Slabset.dat.size():
+					#var beginLine = get_dir_text(variationNumber) + ' = '
+					textFile.store_line('[slab' + str(slabSection) + '.' + get_dir_text(variationNumber) + ']')
+					textFile.store_line('columns = ' + String(Slabset.dat[variationStart + variationNumber])) #.replace(',','').replace('[','').replace(']','')
+
+				#var objectNumber = 0
+				var hasObjects = false
+				for i in tngObject.size():
+					if tngObject[i][1] == variationStart + variationNumber: #VariationIndex
+						textFile.store_line("\r")
+						hasObjects = true
+						textFile.store_line('[[slab' + str(slabSection) + '.' + get_dir_text(variationNumber) + '_objects' + ']]')
+						for z in 9:
+							var val = tngObject[i][z]
+							var beginLine = ''
+							match z:
+								0: beginLine = 'IsLight'
+								1: beginLine = 'VariationIndex'
+								2: beginLine = 'Subtile'
+								3: beginLine = 'RelativeX'
+								4: beginLine = 'RelativeY'
+								5: beginLine = 'RelativeZ'
+								6: beginLine = 'ThingType'
+								7: beginLine = 'Subtype'
+								8: beginLine = 'EffectRange'
+							if z == 1: continue # skip "VariationIndex"
+
+							beginLine += ' = '
+
+							textFile.store_line(beginLine + String(val))
+						#objectNumber += 1
+
+				if hasObjects == false:
+					textFile.store_line('objects = []')
+
+				textFile.store_line("\r")
+
+			textFile.store_line("\r")
+
+			slabSection += 1
+
+		textFile.close()
+		oMessage.quick("aaaaa Saved: " + filePath)
+	else:
+		oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.")
+
+
+func get_dir_text(variationNumber):
+	match variationNumber:
+		00: return 'S'
+		01: return 'W'
+		02: return 'N'
+		03: return 'E'
+		04: return 'SW'
+		05: return 'NW'
+		06: return 'NE'
+		07: return 'SE'
+		08: return 'ALL' #SWNE
+		09: return 'S_LAVA'
+		10: return 'W_LAVA'
+		11: return 'N_LAVA'
+		12: return 'E_LAVA'
+		13: return 'SW_LAVA'
+		14: return 'NW_LAVA'
+		15: return 'NE_LAVA'
+		16: return 'SE_LAVA'
+		17: return 'ALL_LAVA' #SWNE_LAVA
+		18: return 'S_WATER'
+		19: return 'W_WATER'
+		20: return 'N_WATER'
+		21: return 'E_WATER'
+		22: return 'SW_WATER'
+		23: return 'NW_WATER'
+		24: return 'NE_WATER'
+		25: return 'SE_WATER'
+		26: return 'ALL_WATER' #SWNE_WATER
+		27: return 'CENTER'
+
+func load_slabset_things():
+	var oGame = Nodelist.list["oGame"]
+	var filePath = oGame.get_precise_filepath(oGame.DK_DATA_DIRECTORY, "SLABS.TNG")
+	var buffer = Filetypes.file_path_to_buffer(filePath)
+
+	buffer.seek(0)
+	numberOfThings = buffer.get_u16() # It says 359, however there are actually 362 entries in the file.
+	print('Number of Things: '+str(numberOfThings))
+
+	slabtng_index_asset(buffer)
+	slabtng_object_entry_asset(buffer)
+
+	#test_creation_of_object()
+
+func slabtng_index_asset(buffer):
+	CODETIME_START = OS.get_ticks_msec()
+
+#	var textFile = File.new()
+#	textFile.open("res://slabtng_index_asset.txt", File.WRITE)
+
+	buffer.seek(2)
+	var numberOfSets = 1304
+	tngIndex.resize(numberOfSets)
+
+	for i in tngIndex.size():
+		var value = buffer.get_u16()
+		tngIndex[i] = value
+		#var lineOfText = str(value)
+		#textFile.store_line(lineOfText)
+
+	#textFile.close()
+	#print('slabtng_index_asset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+
+func slabtng_object_entry_asset(buffer):
+	CODETIME_START = OS.get_ticks_msec()
+
+	buffer.seek(2 + (1304*2))
+
+	#var textFile = File.new()
+	#textFile.open("res://slabtng_object_entry_asset.txt", File.WRITE)
+
+	tngObject.resize(numberOfThings)
+	for i in tngObject.size():
+
+		tngObject[i] = []
+		tngObject[i].resize(9) #(this is coincidentally size 9, it has nothing to do with subtiles)
+		tngObject[i][0] = buffer.get_u8() # 0 = object/effectgen, 1 = light
+		tngObject[i][1] = buffer.get_u16() # slabVariation
+		tngObject[i][2] = buffer.get_u8() # subtile (between 0 and 8)
+
+		var datnum
+
+		# Location values can look like 255.75, this is supposed to be -0.25
+		datnum = buffer.get_u16() / 256.0
+		if datnum > 255: datnum -= 256
+		tngObject[i][3] = datnum
+
+		datnum = buffer.get_u16() / 256.0
+		if datnum > 255: datnum -= 256
+		tngObject[i][4] = datnum
+
+		datnum = buffer.get_u16() / 256.0
+		if datnum > 255: datnum -= 256
+		tngObject[i][5] = datnum
+
+		tngObject[i][6] = buffer.get_u8() # Thing type
+		tngObject[i][7] = buffer.get_u8() # Thing subtype
+		tngObject[i][8] = buffer.get_u8() # Effect range
+
+#		textFile.store_line(str(i)+'---------------------')
+#		for blah in 9:
+#			textFile.store_line(str(tngObject[i][blah]))
+
+	#textFile.close()
+
+	print('slabtng_object_entry_asset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
+
+#		tngObject[i][3] = wrapi(file.get_u16(), -511, 65025) / 256.0
+#		tngObject[i][4] = wrapi(file.get_u16(), -511, 65025) / 256.0
+#		tngObject[i][5] = wrapi(file.get_u16(), -511, 65025) / 256.0
+
+
+#
+#.................slabs.tng.................
+#First 16bit: Number of things. It says 359, however there are actually 362 entries in the file. Possibly cut content or something.
+#1304 entries - 16bit each. They determine "which tngEntry idx" is in the slabvariation.
+#Each slabvariation has only one tngEntry.
+#Each index is a 16bit integer. (255,255) or 65535 means there is no tngEntry there.
+#After the first 84 entries (28+28+28) then comes the first torch entry.
+#
+#
+#the subsequent 362 or so lines are obj like below
+#
+#0: 1=light, if it's 0 then it's an object OR effectgen.
+#89: field_1: slabVariation?
+#0
+#3: field 3: this is 0-8, this definitely "subtile". 0 = top left, 4 = middle subtile, 8 = bottom right.
+#192: field 4: within-subtile
+#255
+#128: field 6: within-subtile
+#0
+#224: field 8: within-subtile
+#2
+#1: field A: "objclass": Can be: 0, 1 or 7. Might be "thing subtype" so 7 might be "roomeffect".
+#2: sofield B: "objmodel" (Item/decoration subtype values, 1-134, see "Map Files Format Reference" page.
+#0: sofield C: effect range
+#
+##define SLABSET_COUNT        1304
+##define SLABOBJS_COUNT        512
+#
+#208, 4
+#
+#
+#
+#.................slabs.obj.................
+#same as slabs.tng where it has 3 sections, the number of objects, the slabvariation with indexes, then the list of array obj
+#The number of slabvariations is less than in slabs.tng and so are the number of objects.
+#42 * 28 = 1176 (and 1176*2=2352)
+#The list of arrays is of size 10. This one is different to the one inside slabs.tng. Who knows what the values are. One value is a subtile (0-8) though.
+
+
+#func test_creation_of_object():
+#	var idx = 0
+#	for yTile in 52:
+#		for xTile in 28:
+#			create_obj_on_slab(xTile, yTile, idx)
+#			idx += 1

Scenes/Instances.gd

@@ -512,9 +512,9 @@ func delete_attached_objects_on_slab(xSlab, ySlab):
 		#id.remove_child()
 		id.queue_free()
 
-#			if oDkTng.tngObject[idx][8] != 0:
-#				var id = oDkTng.tngObject[idx][7]
-#				print(Things.DATA_OBJECT[id][Things.NAME] + ". Unknown value: " + str(oDkTng.tngObject[idx][8]))
+#			if Slabset.tngObject[idx][8] != 0:
+#				var id = Slabset.tngObject[idx][7]
+#				print(Things.DATA_OBJECT[id][Things.NAME] + ". Unknown value: " + str(Slabset.tngObject[idx][8]))
 
 func get_free_index_number():
 	var listOfThingNumbers = []