v2.2.10: Modify Ammo advanced editor, ATV camera distance, check for update on startup, some bugfixes

Author: RyMaxim

modbuilder.spec

@@ -1,23 +1,34 @@
 # modbuilder.spec
+# -*- mode: python ; coding: utf-8 -*-
+
+import os
+
+REPO_ROOT = os.path.abspath(os.getcwd())
+SCRIPT_PATH = os.path.join(REPO_ROOT, "modbuilder.py")
+
+datas = [
+    (os.path.join(REPO_ROOT, "modbuilder/org"), "org"),
+    (os.path.join(REPO_ROOT, "modbuilder/plugins/*.py"), "plugins"),
+    (os.path.join(REPO_ROOT, "modbuilder/saves"), "saves"),
+    (os.path.join(REPO_ROOT, "modbuilder/name_map.yaml"), "."),
+    (os.path.join(REPO_ROOT, "deca/*.py"), "deca"),
+]
 
 a = Analysis(
-    ['modbuilder.py'],
-    pathex=['.'],
+    [SCRIPT_PATH],
+    pathex=[],
     binaries=[],
-    datas=[
-        ('modbuilder/org', 'org'),
-        ('modbuilder/plugins/*.py', 'plugins'),
-        ('modbuilder/saves', 'saves'),
-        ('deca/*.py', 'deca'),
-        ('modbuilder/name_map.yaml', '.'),
-    ],
+    datas=datas,
     hiddenimports=[],
     hookspath=[],
+    hooksconfig={},
     runtime_hooks=[],
     excludes=[],
+    noarchive=False,
+    optimize=1,
 )
 
-pyz = PYZ(a.pure, a.zipped_data)
+pyz = PYZ(a.pure)
 
 exe = EXE(
     pyz,
@@ -31,7 +42,7 @@ exe = EXE(
     upx=True,
     console=False,
     disable_windowed_traceback=False,
-    argv_emulation=True,
+    argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
@@ -40,7 +51,6 @@ exe = EXE(
 coll = COLLECT(
     exe,
     a.binaries,
-    a.zipfiles,
     a.datas,
     strip=False,
     upx=True,

modbuilder/gui.py

@@ -1,6 +1,9 @@
 import math
+import webbrowser
 import textwrap
 from importlib.metadata import version
+from packaging.version import Version as package_version
+import requests
 
 import FreeSimpleGUI as sg
 from deepmerge import always_merger
@@ -28,6 +31,45 @@ def _get_mods(window: sg.Window) -> None:
   window.set_icon(logo.value)  # fix taskbar icon if it didn't load properly
   window.refresh()
 
+def _check_for_update() -> None:
+  release_data = _get_latest_release()
+  if release_data:
+    latest_tag = release_data.get("tag_name", "").lstrip("v")
+    if package_version(latest_tag) > package_version(__version__):
+      _show_update_popup(release_data)
+
+def _get_latest_release() -> dict:
+  try:
+    resp = requests.get("https://api.github.com/repos/RyMaxim/cotw-mod-builder/releases/latest", timeout=5)
+    resp.raise_for_status()
+    data = resp.json()
+    return data
+  except Exception as e:
+    logger.info(f"Check for update failed: {e}")
+  return {}
+
+def _show_update_popup(release_data: dict) -> None:
+  nexus_url = "https://www.nexusmods.com/thehuntercallofthewild/mods/410?tab=files"
+  github_url = release_data["html_url"]
+  layout = [
+    [sg.Text(f"A newer version is available!", text_color="yellow")],
+    [sg.Text(release_data["name"])],
+    [sg.Button("NexusMods", key="-NEXUSMODS-"), sg.Button("GitHub", key="-GITHUB-")],
+  ]
+
+  window = sg.Window("Update Available", layout, icon=logo.value, modal=True)
+  while True:
+    event, _ = window.read()
+    if event in (sg.WINDOW_CLOSED, "Close"):
+      break
+    elif event == "-NEXUSMODS-":
+      webbrowser.open(nexus_url)
+      break
+    elif event == "-GITHUB-":
+      webbrowser.open(github_url)
+      break
+  window.close()
+
 def _mod_name_to_key(name: str) -> str:
   if name is None:
     return ""
@@ -402,6 +444,7 @@ def main() -> None:
 
   window = sg.Window("COTW: Mod Builder - Revived", layout, resizable=True, font=DEFAULT_FONT, icon=logo.value, size=(1300, 800), finalize=True)
   _get_mods(window)
+  _check_for_update()
 
   while True:
     event, values = window.read()

modbuilder/modbuilder.spec

@@ -60,7 +60,7 @@ class StatWithOffset:
   offset: int
 
   def __init__(self, stat: AdfValue | RtpcProperty = None, value: any = None, offset: int = None) -> None:
-    if not stat and (value is None and offset is None):
+    if stat is None and (value is None and offset is None):
       raise ValueError("Cannot create object: Missing stat or value + offset")
 
     if value is not None:
@@ -72,7 +72,7 @@ def __init__(self, stat: AdfValue | RtpcProperty = None, value: any = None, offs
     if isinstance(self.value, bytes):
       self.value = self.value.decode("utf-8")
 
-    if offset:
+    if offset is not None:
       self.offset = offset
     elif isinstance(stat, AdfValue):
       self.offset = stat.data_offset
@@ -173,6 +173,21 @@ def get_mod_option(mod_key: str, option_key: str) -> dict:
       return option
   return None
 
+def get_mod_option_default(option_key: str, options: dict = None, mod_key: str = None) -> float:
+  default = None
+  if options is None and mod_key is None:
+    raise ValueError(f"Unable to get default value for {option_key}: no options or mod_key provided. ")
+  if options:
+    for option in options:
+      if option_key == get_mod_key_from_name(option["name"]):
+        default = option["default"]
+  if options is None:
+    option = get_mod_option(option_key, mod_key)
+    default = option["default"]
+  if default is None:
+    raise ValueError(f"Unable to get default value for {option_key}: no matching option found")
+  return default
+
 def list_mod_files() -> list[str]:
   return _get_mod_filenames()
 

modbuilder/mods.py

@@ -749,15 +749,18 @@ optic:
   binoculars_01:
     name: Vantage 8x42 Binoculars
 
+  camera_01:
+    name: Camera
+
+  night_vision_01:
+    name: GenZero 8x50 Night Vision
+
   rangefinder_01:
     name: Venture 5x30 Rangefinder
 
   rangefinder_binoculars_01:
     name: Apexview 7x42 Rangefinder Binoculars
 
-  night_vision_01:
-    name: GenZero 8x50 Night Vision
-
 ##########
 
 ### Weapon names that end in identifier numbers like _01, _02, etc. are cosmetic variants of the same weapon