Fixed previous bmp -> png commit.

Author: MyNameIsTrez

ConversionRules/Images.json

@@ -186,4 +186,5 @@
 	"Base.rte/Actors/Doors/MotorGibC.bmp": "Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Gibs/MotorGibC.png",
 	"Dummy.rte/Devices/Sprites/ShieldWall.bmp": "Base.rte/Null.png",
 	"Dummy.rte/Devices/Sprites/ShieldWallDent.bmp": "Base.rte/Null.png",
+	"Base.rte/Effects/Pyro/FirePuff0.bmp": "Base.rte/Effects/Pyro/FirePuff.png",
 }

Python/convert.py

@@ -119,6 +119,13 @@ def create_converted_file(input_file_path, output_file_path, input_folder_path):
 			for line in file_in:
 				line_number += 1
 
+				for old_str, new_str in conversion_rules.items():
+					line = line.replace(old_str, new_str)
+
+				if ".bmp" in line:
+					if not any(keep_bmp in line for keep_bmp in ["palette.bmp", "palettemat.bmp"]):
+						line = line.replace(".bmp", ".png")
+
 				if warnings.warnings_available:
 					regex_rules.playsound_warning(line, file_path, line_number)
 
@@ -130,11 +137,8 @@ def create_converted_file(input_file_path, output_file_path, input_folder_path):
 
 			all_lines = "".join(all_lines_list)
 
-			for old_str, new_str in conversion_rules.items():
-				all_lines = all_lines.replace(old_str, new_str)
-
 			all_lines = regex_rules.regex_replace(all_lines)
-			file_out.write(regex_rules.regex_replace_bmps_and_wavs(all_lines))
+			file_out.write(regex_rules.regex_replace_wavs(all_lines))
 	# except:
 	# 	shutil.copyfile(input_file_path, output_file_path)
 

Python/regex_rules.py

@@ -74,10 +74,8 @@ def regex_use_capture(all_lines, pattern, replacement, matches):
 #	# AudioMan:PlaySound("ModName.rte/Folder/SoundName.wav", self.Pos)	-- Cut everything and leave the thing inside the brackets after SceneMan:TargetDistanceScalar
 
 
-def regex_replace_bmps_and_wavs(all_lines):
-	# TODO: Combine these four patterns into two.
-	all_lines = specific_replace(all_lines, regex_use_capture, False, "Base\.rte(.*?)\.bmp", "Base.rte{}.png")
-	all_lines = specific_replace(all_lines, regex_use_capture, False, "base\.rte(.*?)\.bmp", "Base.rte{}.png")
+def regex_replace_wavs(all_lines):
+	# TODO: Combine patterns into one.
 	all_lines = specific_replace(all_lines, regex_use_capture, False, "Base\.rte(.*?)\.wav", "Base.rte{}.flac")
 	all_lines = specific_replace(all_lines, regex_use_capture, False, "base\.rte(.*?)\.wav", "Base.rte{}.flac")
 	return all_lines