feat(aiv): add inverty and skipkeep format options

Author: gynt

sourcehold/tool/convert/aiv/__init__.py

@@ -15,36 +15,53 @@ def convert_aiv(args):
   inp = args.input
   if not pathlib.Path(inp).exists():
       raise Exception(f"file does not exist: {inp}")
-  
+  inp_invert_y = False
   inp_format = args.from_format
   if not inp_format:
-      if inp.endswith(".aiv"):
-        inp_format = 'aiv'
-      elif inp.endswith(".json"):
-        inp_format = "json"
+    if inp.endswith(".aiv"):
+      inp_format = 'aiv'
+    elif inp.endswith(".json"):
+      inp_format = "json"
+      inp_invert_y = True
+  else:
+    inp_format_tokens = inp_format.split(",")
+    if 'inverty' in inp_format_tokens:
+      inp_invert_y = True
+  
+  out_invert_y = False
+  out_skip_keep = False
   out_format = args.to_format
   if not out_format:
     if inp_format == "aiv":
       out_format = "json"
+      out_invert_y = True
     elif inp_format == "json":
       out_format = "aiv"
+  else:
+    out_format_tokens = out_format.split(",")
+    if 'inverty' in out_format_tokens:
+      out_invert_y = True
+    if 'skipkeep' in out_format_tokens:
+      out_skip_keep = True  
   if args.output == None:
     if out_format == "json":
       args.output = "-"
     elif out_format == "aiv":
       args.output = f"{pathlib.Path(inp).name}.aiv"
     #args.output = f"{pathlib.Path(inp).name}.json"
-
+  
   if args.debug:
-    print(f"converting '{inp_format}' file '{inp}' to '{out_format}' file '{args.output}'")
-  if inp_format == 'aiv' and out_format == "json":
-    conv = to_json(path = inp, include_extra=args.extra, report=args.debug)
+    print(f"converting '{inp_format}: inverty={inp_invert_y}' file '{inp}' to '{out_format}: inverty={out_invert_y}' file '{args.output}'")
+  
+  if inp_format.startswith('aiv') and out_format.startswith("json"):
+
+    conv = to_json(path = inp, include_extra=args.extra, report=args.debug, invert_y=out_invert_y, skip_keep=out_skip_keep)
     if args.output == "-":
       print(conv)
     else:
       pathlib.Path(args.output).write_text(conv)
-  elif inp_format == "json" and out_format == "aiv":
-    conv = from_json(path = inp, report=args.debug)
+  elif inp_format.startswith('json') and out_format.startswith("aiv"):
+    conv = from_json(path = inp, report=args.debug, invert_y=inp_invert_y)
     conv.to_file(args.output)
   else:
     raise NotImplementedError(f"combination of in-format '{inp_format}' and out-format '{out_format}' not implemented")

sourcehold/tool/convert/aiv/exports.py

@@ -21,7 +21,7 @@
 
 
 
-def to_json(aiv=None, path: str='', include_extra=False, invert_y=True, report=False):
+def to_json(aiv=None, path: str='', include_extra=False, invert_y=True, skip_keep=False, report=False):
   if aiv == None and not path:
     raise Exception()
   if aiv == None:
@@ -91,7 +91,7 @@ def to_json(aiv=None, path: str='', include_extra=False, invert_y=True, report=F
         processed[offset] = True
         continue
 
-      elif construction == 38: #keep2
+      elif skip_keep and construction == 38: #keep2
         processed[offset] = True
         continue
 

sourcehold/tool/convert/aiv/info.py

@@ -659,6 +659,7 @@ def convertMapperEnumToAIVEnum(k=None, v=None):
   "MAPPER_HOVEL" : 4, # 0x36
   "MAPPER_OXENBASE" : 2, # 0x37
   "MAPPER_QUARRY" : 6, # 0x38
+  "MAPPER_KEEP2" : 7, # 0x3d
   "MAPPER_STABLES" : 6, # 0x41
   "MAPPER_WHEATFARM" : 9, # 0x46
   "MAPPER_HOPSFARM" : 9, # 0x47