cfg refactor wip 11

Author: rainlizard

Autoload/Things.gd

@@ -38,6 +38,7 @@ func _init():
 	default_data["DATA_EFFECTGEN"] = DATA_EFFECTGEN.duplicate(true)
 	default_data["DATA_CREATURE"] = DATA_CREATURE.duplicate(true)
 	default_data["DATA_OBJECT"] = DATA_OBJECT.duplicate(true)
+	default_data["LIST_OF_BOXES"] = LIST_OF_BOXES.duplicate(true)
 
 func reset_thing_data_to_default(): # Reset data. Takes 1ms.
 	DATA_EXTRA = default_data["DATA_EXTRA"].duplicate(true)
@@ -46,6 +47,7 @@ func reset_thing_data_to_default(): # Reset data. Takes 1ms.
 	DATA_EFFECTGEN = default_data["DATA_EFFECTGEN"].duplicate(true)
 	DATA_CREATURE = default_data["DATA_CREATURE"].duplicate(true)
 	DATA_OBJECT = default_data["DATA_OBJECT"].duplicate(true)
+	LIST_OF_BOXES = default_data["LIST_OF_BOXES"].duplicate(true)
 
 func fetch_sprite(thing_type, sub_type):
 	var sub_type_data = data_structure(thing_type).get(sub_type)
@@ -76,7 +78,11 @@ func fetch_name(thing_type, sub_type):
 		var sub_type_data = data_structure.get(sub_type)
 		if sub_type_data:
 			var nameId = sub_type_data[NAME_ID]
-			return dictionary_of_names.get(nameId, nameId.capitalize())
+			if nameId is String:
+				return dictionary_of_names.get(nameId, nameId.capitalize())
+			elif nameId is Array: # This is to take into considersation someone accidentally using two words with spaces as an object name. (otherwise we get a crash)
+				return dictionary_of_names.get(nameId[0], nameId[0].capitalize())
+			return "Error1337"
 		else:
 			return "Unknown " + data_structure_name[thing_type] + " Subtype: " + str(sub_type)
 	else:
@@ -165,22 +171,16 @@ func data_structure(thingType):
 
 
 var LIST_OF_BOXES = {
-094 : [TYPE.TRAP, 1], # Boulder Trap
-095 : [TYPE.TRAP, 2], # Alarm Trap
-096 : [TYPE.TRAP, 3], # Poison Gas Trap
-097 : [TYPE.TRAP, 4], # Lightning Trap
-098 : [TYPE.TRAP, 5], # Word of Power Trap
-099 : [TYPE.TRAP, 6], # Lava Trap
-100 : [TYPE.TRAP, 7], # Dummy Trap 2
-101 : [TYPE.TRAP, 8], # Dummy Trap 3
-102 : [TYPE.TRAP, 9], # Dummy Trap 4
-103 : [TYPE.TRAP, 10], # Dummy Trap 5
-104 : [TYPE.TRAP, 11], # Dummy Trap 6
-105 : [TYPE.TRAP, 12], # Dummy Trap 7
-106 : [TYPE.DOOR, 1], # Wooden Door
-107 : [TYPE.DOOR, 2], # Braced Door
-108 : [TYPE.DOOR, 3], # Iron Door
-109 : [TYPE.DOOR, 4], # Magic Door
+"WRKBOX_BOULDER" : [TYPE.TRAP, 1],
+"WRKBOX_ALARM" : [TYPE.TRAP, 2],
+"WRKBOX_POISONG" : [TYPE.TRAP, 3],
+"WRKBOX_LIGHTNG" : [TYPE.TRAP, 4],
+"WRKBOX_WRDOFPW" : [TYPE.TRAP, 5],
+"WRKBOX_LAVA" : [TYPE.TRAP, 6],
+"WRKBOX_WOOD" : [TYPE.DOOR, 1],
+"WRKBOX_BRACE" : [TYPE.DOOR, 2],
+"WRKBOX_STEEL" : [TYPE.DOOR, 3],
+"WRKBOX_MAGIC" : [TYPE.DOOR, 4],
 }
 
 

Scenes/CfgLoader.gd

@@ -19,8 +19,9 @@ enum {
 	LOAD_CFG_CAMPAIGN,
 	LOAD_CFG_CURRENT_MAP,
 }
+
 func start(mapPath):
-	if Cube.tex.empty() == true:
+	if Cube.tex.empty():
 		Cube.read_cubes_cfg()
 
 	var CODETIME_LOADCFG_START = OS.get_ticks_msec()
@@ -29,30 +30,24 @@ func start(mapPath):
 	var campaign_cfg = load_campaign_data(mapPath)
 
 	var config_dirs = {
-		LOAD_CFG_FXDATA : oGame.DK_FXDATA_DIRECTORY,
-		LOAD_CFG_CAMPAIGN : oGame.GAME_DIRECTORY.plus_file(campaign_cfg.get("common", {}).get("CONFIGS_LOCATION", "")),
-		LOAD_CFG_CURRENT_MAP : "" # Add the directory for LOAD_CFG_CURRENT_MAP if needed
+		LOAD_CFG_FXDATA: oGame.DK_FXDATA_DIRECTORY,
+		LOAD_CFG_CAMPAIGN: oGame.GAME_DIRECTORY.plus_file(campaign_cfg.get("common", {}).get("CONFIGS_LOCATION", "")),
+		LOAD_CFG_CURRENT_MAP: mapPath.get_basename()
 	}
-	
-	# Load data from each directory in the specified order
-	for i in [LOAD_CFG_FXDATA, LOAD_CFG_CAMPAIGN, LOAD_CFG_CURRENT_MAP]:
-		var cfg_dir = config_dirs[i]
-		if cfg_dir == "": continue
-		
-		match i:
-			LOAD_CFG_FXDATA:      oMessage.quick("Step 1: Data loaded from /fxdata/")
-			LOAD_CFG_CAMPAIGN:    oMessage.quick("Step 2: Data loaded from campaign configs directory")
-			LOAD_CFG_CURRENT_MAP: oMessage.quick("Step 3?")
-		
-		load_objects_data(cfg_dir.plus_file("objects.cfg"))
-		load_creatures_data(cfg_dir.plus_file("creature.cfg"))
-		load_trapdoor_data(cfg_dir.plus_file("trapdoor.cfg"))
-		load_terrain_data(cfg_dir.plus_file("terrain.cfg"))
+	for cfg_type in [LOAD_CFG_FXDATA, LOAD_CFG_CAMPAIGN, LOAD_CFG_CURRENT_MAP]:
+		var cfg_dir = config_dirs[cfg_type]
+		for file_name in ["objects.cfg", "creature.cfg", "trapdoor.cfg", "terrain.cfg"]:
+			var file_path = cfg_dir.plus_file(file_name)
+			if cfg_type == LOAD_CFG_CURRENT_MAP:
+				file_path = cfg_dir + "." + file_name
+			match file_name:
+				"objects.cfg": load_objects_data(file_path)
+				"creature.cfg": load_creatures_data(file_path)
+				"trapdoor.cfg": load_trapdoor_data(file_path)
+				"terrain.cfg": load_terrain_data(file_path)
 
 	print('Loaded things from cfg files: ' + str(OS.get_ticks_msec() - CODETIME_LOADCFG_START) + 'ms')
 
-
-
 func load_objects_data(path):
 	var objects_cfg = Utils.read_dkcfg_file(path)
 	for section in objects_cfg:
@@ -84,6 +79,7 @@ func load_trapdoor_data(path):
 	var trapdoor_cfg = Utils.read_dkcfg_file(path)
 	for section in trapdoor_cfg:
 		var id = int(section)
+		if id == 0: continue
 		var trapOrDoor = -1
 		if section.begins_with("door"):
 			trapOrDoor = Things.TYPE.DOOR
@@ -101,10 +97,7 @@ func load_trapdoor_data(path):
 			Things.DATA_DOOR[id] = [newName, newSprite, Things.TAB_MISC]
 		elif trapOrDoor == Things.TYPE.TRAP:
 			Things.DATA_TRAP[id] = [newName, newSprite, Things.TAB_TRAP]
-		
-		var crate_id_number = Things.find_subtype_by_name(Things.TYPE.OBJECT, crateName)
-		Things.LIST_OF_BOXES[crate_id_number] = [trapOrDoor, id]
-
+		Things.LIST_OF_BOXES[crateName] = [trapOrDoor, id]
 
 func load_terrain_data(path):
 	var terrain_cfg = Utils.read_dkcfg_file(path)

Scenes/PickThingWindow.gd

@@ -197,47 +197,41 @@ func add_item_to_grid(tabID, id, set_text):
 	id.connect("pressed",self,"pressed",[id])
 	id.rect_min_size = Vector2(grid_item_size.x * grid_window_scale, grid_item_size.y * grid_window_scale)
 
-	#yield(get_tree(),'idle_frame')
 	if is_instance_valid(id) == true:
-		var subtype = id.get_meta("thingSubtype")
-		if Things.LIST_OF_BOXES.has(subtype):
-			add_workshop_item_sprite_overlay(id, subtype)
+		add_workshop_item_sprite_overlay(id, id.get_meta("thingSubtype"))
 
 func add_workshop_item_sprite_overlay(textureParent, subtype):
-	var itemType = Things.LIST_OF_BOXES[subtype][0]
-	var itemSubtype = Things.LIST_OF_BOXES[subtype][1]
-	
-	var workshopItemInTheBox = TextureRect.new()
-	
-	match itemType:
-		Things.TYPE.TRAP: workshopItemInTheBox.texture = Things.fetch_sprite(itemType, itemSubtype)
-		Things.TYPE.DOOR: workshopItemInTheBox.texture = Things.fetch_sprite(itemType, itemSubtype)
-	
-	workshopItemInTheBox.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
-	#workshopItemInTheBox.size_flags_vertical = Control.SIZE_EXPAND_FILL
-	#workshopItemInTheBox.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-	workshopItemInTheBox.expand = true
-	
-	# It was tricky to get them consistent with each other (in ThingPickerWindow and on map), so just did it manually.
-	if textureParent is TextureButton:
-		workshopItemInTheBox.anchor_left = 0.25
-		workshopItemInTheBox.anchor_top = 0.25
-		workshopItemInTheBox.anchor_right = 0.75
-		workshopItemInTheBox.anchor_bottom = 0.75
-	else:
-		workshopItemInTheBox.anchor_left = 0.15
-		workshopItemInTheBox.anchor_top = 0.15
-		workshopItemInTheBox.anchor_right = 0.85
-		workshopItemInTheBox.anchor_bottom = 0.85
-	
-	workshopItemInTheBox.rect_position.x += 2
-	workshopItemInTheBox.rect_position.y -= 1
-	
-	workshopItemInTheBox.modulate = Color(1,1,1,0.5)
-	workshopItemInTheBox.mouse_filter = Control.MOUSE_FILTER_IGNORE
-	
-	textureParent.add_child(workshopItemInTheBox)
-
+	if Things.DATA_OBJECT.has(subtype):
+		var nameID = Things.DATA_OBJECT[subtype][Things.NAME_ID]
+		if Things.LIST_OF_BOXES.has(nameID):
+			var itemData = Things.LIST_OF_BOXES[nameID]
+			var itemType = itemData[0]
+			var itemSubtype = itemData[1]
+
+			var workshopItemInTheBox = TextureRect.new()
+			workshopItemInTheBox.texture = Things.fetch_sprite(itemType, itemSubtype)
+			workshopItemInTheBox.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
+			workshopItemInTheBox.expand = true
+
+			if textureParent is TextureButton:
+				workshopItemInTheBox.anchor_left = 0.25
+				workshopItemInTheBox.anchor_top = 0.25
+				workshopItemInTheBox.anchor_right = 0.75
+				workshopItemInTheBox.anchor_bottom = 0.75
+			else:
+				workshopItemInTheBox.anchor_left = 0.15
+				workshopItemInTheBox.anchor_top = 0.15
+				workshopItemInTheBox.anchor_right = 0.85
+				workshopItemInTheBox.anchor_bottom = 0.85
+
+			workshopItemInTheBox.rect_position = Vector2(2, -1)
+			workshopItemInTheBox.modulate = Color(1, 1, 1, 0.5)
+			workshopItemInTheBox.mouse_filter = Control.MOUSE_FILTER_IGNORE
+
+			textureParent.add_child(workshopItemInTheBox)
+			return true
+
+	return false
 
 func current_grid_container():
 	return get_grid_container_node(oThingTabs.get_current_tab_control())

Scenes/ThingInstance.gd

@@ -218,9 +218,9 @@ func set_texture_based_on_thingtype():
 		Things.TYPE.OBJECT:
 			if subtype in [49, 111,120,121,122]: # Heart Flame and Gate
 				$ThingTexture.self_modulate = "a0ffffff"
-			elif Things.LIST_OF_BOXES.has(subtype):
+			var successOrFailure = Nodelist.list["oPickThingWindow"].add_workshop_item_sprite_overlay($ThingTexture, subtype)
+			if successOrFailure == true:
 				$ThingTexture.rect_position += Vector2(-1,9)
-				Nodelist.list["oPickThingWindow"].add_workshop_item_sprite_overlay($ThingTexture, subtype)
 		Things.TYPE.CREATURE:
 			if tex != null:
 				#$ThingTexture.rect_position.y -= 12