Original DK (non-gog) fixed

rainlizard · Jan 30, 2025 · 9e59501 · 9e59501
1 parent 4573ef6
commit 9e59501
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Autoload/Version.gd b/Autoload/Version.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var major_minor = "0.51"
+var major_minor = "0.52"
 var patch = "0000"
 var full = ""
 var unearth_map_format_version:float = 1.06

diff --git a/Scenes/CfgLoader.gd b/Scenes/CfgLoader.gd
@@ -83,12 +83,13 @@ func start(mapPath):
 		#	print(combined_cfg)
 
 		# Only load cfg after they've been combined (they're combined so they'll automatically have fallbacks)
-		match file_name:
-			"objects.cfg": load_objects_data(combined_cfg)
-			"creature.cfg": load_creatures_data(combined_cfg)
-			"trapdoor.cfg": load_trapdoor_data(combined_cfg)
-			"terrain.cfg": load_terrain_data(combined_cfg)
-			"cubes.cfg": Cube.read_cubes_cfg(combined_cfg)
+		if combined_cfg.empty() == false: # It can be empty if the file wasn't found
+			match file_name:
+				"objects.cfg": load_objects_data(combined_cfg)
+				"creature.cfg": load_creatures_data(combined_cfg)
+				"trapdoor.cfg": load_trapdoor_data(combined_cfg)
+				"terrain.cfg": load_terrain_data(combined_cfg)
+				"cubes.cfg": Cube.read_cubes_cfg(combined_cfg)
 
 	print('Loaded all .cfg and .toml files: ' + str(OS.get_ticks_msec() - CODETIME_LOADCFG_START) + 'ms')
 	if oConfigFilesListWindow.visible == true:
@@ -167,6 +168,10 @@ func load_terrain_data(cfg): # 4ms
 
 				var setName = slabSection.get("Name", "UNKNOWN")
 
+				var setIsOwnable = Slabs.NOT_OWNABLE
+				if slabSection.get("IsOwnable", 0) == 1:
+					setIsOwnable = Slabs.OWNABLE
+
 				var getBlockFlags = slabSection.get("BlockFlags", [])
 				if getBlockFlags is String and getBlockFlags == "":
 					getBlockFlags = []
@@ -175,11 +180,6 @@ func load_terrain_data(cfg): # 4ms
 				if "FILLED" in getBlockFlags or "DIGGABLE" in getBlockFlags or "VALUABLE" in getBlockFlags:
 					setBlockType = Slabs.BLOCK_SLAB
 
-				var setIsOwnable = Slabs.NOT_OWNABLE
-				if slabSection.get("IsOwnable", 0) == 1:
-					setIsOwnable = Slabs.OWNABLE
-
-
 				var setBitmask = Slabs.BITMASK_BLOCK
 
 				if slabSection.get("Animated", 0) == 1:

diff --git a/Shaders/textureanimationdatabase.png b/Shaders/textureanimationdatabase.png
diff --git a/Shaders/textureanimationdatabase.png.import b/Shaders/textureanimationdatabase.png.import
@@ -14,7 +14,7 @@ dest_files=[ "res://.import/textureanimationdatabase.png-309c52c412ecadf644122e0
 
 [params]
 
-compress/mode=3
+compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0