Fix IM montage creating palettes with wrong colors

Author: oli414

rct-graphics-helper/magick_command.py

@@ -12,9 +12,9 @@ def __init__(self, input):
     # Replaces the command with a montage command for generating spritesheets
     def as_montage(self, inputs):
         self.use_repage = False
-        self.full_command = "montage \"" + \
+        self.full_command = "\"" + \
             "\" \"".join(inputs) + \
-            "\" -tile x1 -geometry +0+0 -background none"
+            "\" +append -background none"
 
     # Writes the current result to the MPR for reuse in the same command. The cached result can be referenced using mpr:{id}
     def write_to_cache(self, id, delete_previous=False, next_file=""):

rct-graphics-helper/models/palette.py

@@ -237,7 +237,7 @@ def generate_output(self, renderer, output_path):
         cmd.as_montage(color_paths)
 
         subprocess.check_output(cmd.get_command_string(
-            renderer.magick_path, "PNG8:" + output_path), shell=True)
+            renderer.magick_path, output_path), shell=True)
 
         self.path = output_path
         self.generated = True

rct-graphics-helper/palette_manager.py

@@ -15,7 +15,7 @@
 from .models.palette import Palette, palette_base_path
 
 default_full_palette = Palette(os.path.join(
-    palette_base_path, "default_full_palette.png"), [
+    palette_base_path, "default_full_palette.bmp"), [
     "black",
     "gray",
     "lavender_purple",
@@ -40,44 +40,44 @@
 ])
 
 default_vehicle_palette = Palette(os.path.join(
-    palette_base_path, "default_vehicle_palette.png"), [
+    palette_base_path, "default_vehicle_palette.bmp"), [
     "black",
     "gray",
     "transparent"
 ])
 
-rider_palette = Palette(os.path.join(palette_base_path, "peep_palette.png"), [
+rider_palette = Palette(os.path.join(palette_base_path, "peep_palette.bmp"), [
     "black",
     "salmon",
     "transparent"
 ])
 
 recolor_1_palette = Palette(os.path.join(
-    palette_base_path, "recolor_1_palette.png"), [
+    palette_base_path, "recolor_1_palette.bmp"), [
     "recolor_1",
     "transparent"
 ])
 
 recolor_1_orct2_palette = Palette(os.path.join(
-    palette_base_path, "recolor_1_orct2_palette.png"), [
+    palette_base_path, "recolor_1_orct2_palette.bmp"), [
     "recolor_1_orct2",
     "transparent"
 ])
 
 recolor_2_palette = Palette(os.path.join(
-    palette_base_path, "recolor_2_palette.png"), [
+    palette_base_path, "recolor_2_palette.bmp"), [
     "magenta",
     "transparent"
 ])
 
 recolor_3_palette = Palette(os.path.join(
-    palette_base_path, "recolor_3_palette.png"), [
+    palette_base_path, "recolor_3_palette.bmp"), [
     "yellow",
     "transparent"
 ])
 
 custom_palette = Palette(os.path.join(
-    palette_base_path, "custom_palette.png"), [
+    palette_base_path, "custom_palette.bmp"), [
     "yellow",
 ])