1 files changed, 11 insertions, 7 deletions

diff --git a/tools/mkasset.py b/tools/mkasset.py
index 3ca8a1d..fd2ead7 100644
--- a/tools/mkasset.py
+++ b/tools/mkasset.py
@@ -12,11 +12,11 @@
 #
 import argparse
 import ctypes
-import os
-from PIL import Image
 import sys
 from xml.etree import ElementTree
 
+from PIL import Image
+
 # Maximum length of path strings in .TS and .TM files.
 # Must match the engine's value.
 MAX_PATH_LENGTH = 128
@@ -291,20 +291,24 @@ def convert_sprite_sheet(input_file_paths, sprite_width, sprite_height,
 
 
 def main():
+    # TODO: Use subparser for each type of input file.
     parser = argparse.ArgumentParser()
     parser.add_argument("input",
                         nargs="+",
                         help="Input file (.tsx, .tmx) or path regex (sprite sheets)")
-    parser.add_argument("--width", type=int, help="Sprite width in pixels")
-    parser.add_argument("--height", type=int, help="Sprite height in pixels")
-    parser.add_argument("--out", help="Output file (sprite sheets)")
+    parser.add_argument("-W", "--width", type=int, help="Sprite width in pixels")
+    parser.add_argument("-H", "--height", type=int, help="Sprite height in pixels")
+    parser.add_argument("-o", "--out", help="Output file (sprite sheets)")
     args = parser.parse_args()
 
-    if ".tsx" in args.input:
+    # TODO: Add support for TSX files made from a single image. Currently, only collections are supported.
+    if ".tsx" in args.input[0]:
+        args.input = args.input[0]  # TODO: Remove this.
         output_filepath_no_ext = drop_extension(args.input)
         output_filepath = output_filepath_no_ext + ".ts"
         convert_tsx(args.input, output_filepath)
-    elif ".tmx" in args.input:
+    elif ".tmx" in args.input[0]:
+        args.input = args.input[0]  # TODO: Remove this.
         output_filepath_no_ext = drop_extension(args.input)
         output_filepath = output_filepath_no_ext + ".tm"
         convert_tmx(args.input, output_filepath)