v2.2.8: Bugfixes for Alberta map and Snowfall Update

Author: RyMaxim

modbuilder/__init__.py

@@ -1,2 +1,2 @@
 __app_name__ = "modbuilder"
-__version__ = "2.2.7"
+__version__ = "2.2.8"

modbuilder/mods2.py

@@ -9,10 +9,10 @@
 from modbuilder import mods
 
 
-def deserialize_adf(filename: str) -> Adf:
-  modded_file = mods.get_modded_file(filename)
+def deserialize_adf(filename: str, modded: bool = True) -> Adf:
+  file = mods.get_modded_file(filename) if modded else mods.get_org_file(filename)
   adf = Adf()
-  with ArchiveFile(open(modded_file, 'rb')) as f:
+  with ArchiveFile(open(file, 'rb')) as f:
     adf.deserialize(f)
   return adf
 

modbuilder/plugins/clean_scope_lenses.py

@@ -27,7 +27,7 @@ def format(options: dict) -> str:
 def get_files(options: dict) -> list[str]:
   night_vision = options.get("remove_night_vision_tint")
   if night_vision:
-    return [NIGHT_VISION_FILE, NIGHT_VISION_WHITE_FILE]
+    return [NIGHT_VISION_FILE]
   return []
 
 def merge_files(files: list[str], options: dict) -> None:
@@ -41,7 +41,7 @@ def merge_files(files: list[str], options: dict) -> None:
 def process(options: dict) -> None:
   night_vision = options.get("remove_night_vision_tint")
   if night_vision:
-    white_adf = mods2.deserialize_adf(NIGHT_VISION_WHITE_FILE)
+    white_adf = mods2.deserialize_adf(NIGHT_VISION_WHITE_FILE, modded=False)
     tint_index = white_adf.table_instance_full_values[0].value["Hashes"].value.index(2219558163)
     tint_value_1 = white_adf.table_instance_full_values[0].value["Parameters"].value[tint_index].value["Keys"].value[0]
     tint_value_2 = white_adf.table_instance_full_values[0].value["Parameters"].value[tint_index].value["Values"].value[0]

modbuilder/plugins/decrease_wobble.py

@@ -1,4 +1,4 @@
-from typing import List
+from modbuilder import mods2
 
 DEBUG = False
 NAME = "Decrease Wobble"
@@ -28,24 +28,21 @@ def format(options: dict) -> str:
   prone_percent = options['reduce_prone_percent']
   return f"Decrease Wobble (-{int(stand_percent)}% stand, -{int(crouch_percent)}% crouch, -{int(prone_percent)}% prone)"
 
-def update_values_at_offset(options: dict) -> List[dict]:
-  stand_percent = options['reduce_stand_percent']
-  crouch_percent = options['reduce_crouch_percent']
-  prone_percent = options['reduce_prone_percent']
-  stand_value = round(1.0 - stand_percent / 100, 1)
-  crouch_value = round(1.0 - crouch_percent / 100, 1)
-  prone_value = round(1.0 - prone_percent / 100, 1)
-  return [
+def update_values_at_offset(options: dict) -> None:
+  movement_file = mods2.deserialize_adf(FILE)
+  weapon_settings = movement_file.table_instance_full_values[0].value["FpsSettings"].value["WeaponSkillSettings"].value
+  updates = [
     {
-      "offset": 444,
-      "value": stand_value
+      "offset": weapon_settings["StandingWoobleModifier"].data_offset,
+      "value": round(1.0 - options['reduce_stand_percent'] / 100, 1),
     },
     {
-      "offset": 448,
-      "value": crouch_value
+      "offset": weapon_settings["CrouchWoobleModifier"].data_offset,
+      "value": round(1.0 - options['reduce_crouch_percent'] / 100, 1),
     },
     {
-      "offset": 452,
-      "value": prone_value
-    }
-  ]
+      "offset": weapon_settings["CrawlWoobleModifier"].data_offset,
+      "value": round(1.0 - options['reduce_prone_percent'] / 100, 1),
+    },
+  ]
+  return updates

modbuilder/plugins/increase_speed.py

@@ -1,4 +1,4 @@
-from typing import List
+from modbuilder import mods2
 
 DEBUG = False
 NAME = "Increase Speed"
@@ -23,7 +23,9 @@ def format(options: dict) -> str:
   prone_sprint_multiplier = options['prone_sprint_speed_multiplier']
   return f"Increase Speed ({round(stand_multiplier, 1)}/{round(stand_sprint_multiplier, 1)}x, {round(crouch_multiplier, 1)}/{round(crouch_sprint_multiplier, 1)}x, {round(prone_multiplier, 1)}/{round(prone_sprint_multiplier, 1)}x)"
 
-def update_values_at_offset(options: dict) -> List[dict]:
+def update_values_at_offset(options: dict) -> None:
+  movement_file = mods2.deserialize_adf(FILE)
+  fps_settings = movement_file.table_instance_full_values[0].value["FpsSettings"].value
   stand_multiplier = options['stand_speed_multiplier']
   crouch_multiplier = options['crouch_speed_multiplier']
   prone_multiplier = options['prone_speed_multiplier']
@@ -32,70 +34,75 @@ def update_values_at_offset(options: dict) -> List[dict]:
   prone_sprint_multiplier = options['prone_sprint_speed_multiplier']
   jump_multiplier = options['jump_speed_multiplier']
 
-  return [
+  updates = [
+    # Gamepad settings
     {
-      "offset": 176,
+      "offset": fps_settings["GamepadStanceStandSpeedModifier"].data_offset,
       "transform": "multiply",
       "value": stand_multiplier
     },
     {
-      "offset": 180,
+      "offset": fps_settings["GamepadStanceStandSprintSpeedModifier"].data_offset,
       "transform": "multiply",
       "value": stand_sprint_multiplier
     },
     {
-      "offset": 200,
+      "offset": fps_settings["GamepadStanceCrouchSpeedModifier"].data_offset,
       "transform": "multiply",
-      "value": stand_multiplier
+      "value": crouch_multiplier
     },
     {
-      "offset": 204,
+      "offset": fps_settings["GamepadStanceCrouchSprintModifier"].data_offset,
       "transform": "multiply",
-      "value": stand_sprint_multiplier
+      "value": crouch_sprint_multiplier
     },
     {
-      "offset": 184,
+      "offset": fps_settings["GamepadStanceProneSpeedModifier"].data_offset,
       "transform": "multiply",
-      "value": crouch_multiplier
+      "value": prone_multiplier
     },
     {
-      "offset": 188,
+      "offset": fps_settings["GamepadStanceProneSprintModifier"].data_offset,
       "transform": "multiply",
-      "value": crouch_sprint_multiplier
+      "value": prone_sprint_multiplier
     },
+    # Keyboard settings
     {
-      "offset": 208,
+      "offset": fps_settings["KeyboardStanceStandSpeedModifier"].data_offset,
       "transform": "multiply",
-      "value": crouch_multiplier
+      "value": stand_multiplier
     },
     {
-      "offset": 212,
+      "offset": fps_settings["KeyboardStanceStandSprintSpeedModifier"].data_offset,
       "transform": "multiply",
-      "value": crouch_sprint_multiplier
+      "value": stand_sprint_multiplier
     },
     {
-      "offset": 192,
+      "offset": fps_settings["KeyboardStanceCrouchSpeedModifier"].data_offset,
       "transform": "multiply",
-      "value": prone_multiplier
+      "value": crouch_multiplier
     },
     {
-      "offset": 196,
+      "offset": fps_settings["KeyboardStanceCrouchSprintModifier"].data_offset,
       "transform": "multiply",
-      "value": prone_sprint_multiplier
+      "value": crouch_sprint_multiplier
     },
     {
-      "offset": 216,
+      "offset": fps_settings["KeyboardStanceProneSpeedModifier"].data_offset,
       "transform": "multiply",
       "value": prone_multiplier
     },
     {
-      "offset": 220,
+      "offset": fps_settings["KeyboardStanceProneSprintModifier"].data_offset,
       "transform": "multiply",
       "value": prone_sprint_multiplier
     },
+    # Jump settings
     {
-      "offset": 228,
+      "offset": fps_settings["JumpSpeed"].data_offset,
       "transform": "multiply",
       "value": jump_multiplier
     }
-  ]
+  ]
+
+  return updates

modbuilder/plugins/increase_weapon_fov.py

@@ -1,4 +1,4 @@
-from modbuilder import mods
+from modbuilder import mods, mods2
 
 DEBUG = False
 NAME = "Increase Weapon FOV"
@@ -28,5 +28,9 @@ def get_files(options: dict) -> list[str]:
 
 def process(options: dict) -> None:
   weapon_fov = options["first-person_weapon_fov"]
-  mods.update_file_at_offset(FIRST_PERSON_FOV_FILE, 248, weapon_fov)
-  mods.update_file_at_offset(PRONE_FOV_FILE, 248, weapon_fov)
+  first_person_file = mods2.deserialize_adf(FIRST_PERSON_FOV_FILE)
+  first_person_fov = first_person_file.table_instance_full_values[0].value["ForeGroundFOV"]
+  prone_file = mods2.deserialize_adf(FIRST_PERSON_FOV_FILE)
+  prone_fov = prone_file.table_instance_full_values[0].value["ForeGroundFOV"]
+  mods.update_file_at_offset(FIRST_PERSON_FOV_FILE, first_person_fov.data_offset, weapon_fov)
+  mods.update_file_at_offset(PRONE_FOV_FILE, prone_fov.data_offset, weapon_fov)

modbuilder/plugins/modify_animal_senses.py

@@ -97,12 +97,15 @@ def process(options: dict) -> list[dict]:
   defensive_duration_percent = 1 - options.get('reduce_defensive_duration_percent', 0) / 100
   mods2.update_file_at_multiple_coordinates_with_value(ANIMAL_SENSES_FILE, "species_data", ["B14", "B15", "B16", "B17"], defensive_duration_percent, transform="multiply", skip_add_data=True)
 
+  ai_data = mods2.deserialize_adf(AI_FILE)
+  ai_data_ranges = ai_data.table_instance_full_values[0].value["Perception"].value["EventRanges"].value
   tent_distance = options.get("tent_detection_distance")
   if tent_distance is not None:
-    mods.update_file_at_offset(AI_FILE, 800, tent_distance)
+    mods.update_file_at_offset(AI_FILE, ai_data_ranges["SpookInRadius"].data_offset, tent_distance)
 
   weapon_fire_distance = options.get("weapon_fire_detection_distance")
   if weapon_fire_distance is not None:
     weapon_fire_distance_multiplier = weapon_fire_distance / 300  # default range
     weapon_fire_coordinates = mods2.get_coordinates_range_from_file(ANIMAL_SENSES_FILE, "weapon_data", rows=(3, 4), cols=("B", None))
     mods2.update_file_at_multiple_coordinates_with_value(ANIMAL_SENSES_FILE, "weapon_data", weapon_fire_coordinates, weapon_fire_distance_multiplier, transform="multiply", skip_add_data=True)
+    mods.update_file_at_offset(AI_FILE, ai_data_ranges["WeaponFire"].data_offset, weapon_fire_distance)

modbuilder/plugins/modify_atv.py

@@ -122,71 +122,57 @@ def get_files(options: dict) -> list[str]:
   return atv_files
 
 def _update_gears(values: list[float], start_offset: int) -> None:
+  updates = []
   for i, value in enumerate(values):
-      mods.update_file_at_offset(TRANSMISSION_FILE, start_offset + (i * 4), float(value))
-
-def process(options: dict) -> None:
-  options = map_options(options)
-  top_speed = options["top_speed"]
-  acceleration = options["acceleration"]
-  traction = options["traction"]
-  noise = options["noise_distance"]
-  vision = options["vision_distance"]
-
-  if top_speed == "90":
-    speed_options = SPEED_90
-  elif top_speed == "120":
-    speed_options = SPEED_120
-  elif top_speed == "150":
-    speed_options = SPEED_150
-  elif top_speed == "170":
-    speed_options = SPEED_170
-  else:
-    speed_options = SPEED_70
-
-  if acceleration == "medium":
-    torque_option = TORQUE_MEDIUM
-  elif acceleration == "high":
-    torque_option = TORQUE_HIGH
-  else:
-    torque_option = TORQUE_DEFAULT
-
-  if traction == "medium":
-    traction_option = TRACTION_MEDIUM
-  elif traction == "high":
-    traction_option = TRACTION_HIGH
-  else:
-    traction_option = TRACTION_DEFAULT
-
-  gears = speed_options["gears"]
-  upshift = speed_options["upshift"]
-  downshift = speed_options["downshift"]
-
-  _update_gears([gears[0], gears[1], gears[2], gears[3], gears[4], gears[5], gears[6], gears[7]], 196)
-  _update_gears([upshift[0], upshift[1], upshift[2], upshift[3], upshift[4], upshift[5], upshift[6], upshift[7]], 228)
-  _update_gears([downshift[0], downshift[1], downshift[2], downshift[3], downshift[4], downshift[5], downshift[6], downshift[7]], 260)
-
-  mods.update_file_at_offset(TRANSMISSION_FILE, 192, 1)
-  mods.update_file_at_offset(TRANSMISSION_FILE, 316, 250.0)
-  mods.update_file_at_offset(TRANSMISSION_FILE, 332, 3.0)
-
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 236, traction_option["front_friction"])
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 240, 0.0)
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 268, traction_option["rear_friction"])
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 272, 0.0)
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 228, 0, format="sint08")
-  mods.update_file_at_offset(LANDGLOBAL_FILE, 260, 0, format="sint08")
-  mods.update_file_at_offset(LANDENGINE_FILE, 196, 0.05)
-  mods.update_file_at_offset(LANDENGINE_FILE, 208, speed_options["max_rpm"])
-  mods.update_file_at_offset(LANDENGINE_FILE, 216, speed_options["optimal_rpm"])
-  mods.update_file_at_offset(LANDENGINE_FILE, 220, torque_option["max"])
-  mods.update_file_at_offset(LANDENGINE_FILE, 224, torque_option["min"])
-  mods.update_file_at_offset(LANDENGINE_FILE, 228, torque_option["optimal"])
-
-  mods.update_file_at_offset(AERODYNAMICS_FILE, 192, 1.25)
-  mods.update_file_at_offset(AERODYNAMICS_FILE, 196, 0.3)
-  mods.update_file_at_offset(AERODYNAMICS_FILE, 200, 0.3)
-
+    updates.append({"offset": start_offset + (i * 4), "value": float(value)})
+  return updates
+
+def update_transmission_file(speed_options: dict) -> None:
+  transmission = mods2.deserialize_adf(TRANSMISSION_FILE).table_instance_full_values[0].value
+  updates = [
+    {"offset": transmission["nitrous_gears"].data_offset, "value": 1},
+    {"offset": transmission["top_speed"].data_offset, "value": 250.0},
+    {"offset": transmission["reverse_gear_ratio"].data_offset, "value": 3.0},
+  ]
+  updates.extend(_update_gears(speed_options["gears"], transmission["gear_ratios"].data_offset))
+  updates.extend(_update_gears(speed_options["upshift"], transmission["upshift_rpm"].data_offset))
+  updates.extend(_update_gears(speed_options["downshift"], transmission["downshift_rpm"].data_offset))
+  mods.apply_updates_to_file(TRANSMISSION_FILE, updates)
+
+def update_landengine_file(speed_options: dict, torque_option: dict) -> None:
+  landengine = mods2.deserialize_adf(LANDENGINE_FILE).table_instance_full_values[0].value
+  updates = [
+    {"offset": landengine["resistance_at_max_rpm"].data_offset, "value": 0.05},
+    {"offset": landengine["max_rpm"].data_offset, "value": speed_options["max_rpm"]},
+    {"offset": landengine["optimal_rpm"].data_offset, "value": speed_options["optimal_rpm"]},
+    {"offset": landengine["torque_factor_at_max_rpm"].data_offset, "value": torque_option["max"]},
+    {"offset": landengine["torque_factor_at_min_rpm"].data_offset, "value": torque_option["min"]},
+    {"offset": landengine["torque_factor_at_optimal_rpm"].data_offset, "value": torque_option["optimal"]},
+  ]
+  mods.apply_updates_to_file(LANDENGINE_FILE, updates)
+
+def update_landglobal_file(traction_option: dict) -> None:
+  landglobal = mods2.deserialize_adf(LANDGLOBAL_FILE).table_instance_full_values[0].value
+  updates = [
+    {"offset": landglobal["front_wheels"].value["arcade_friction_multiplier"].data_offset, "value": traction_option["front_friction"]},
+    {"offset": landglobal["front_wheels"].value["arcade_drag_multiplier"].data_offset, "value": 0.0},
+    {"offset": landglobal["rear_wheels"].value["arcade_friction_multiplier"].data_offset, "value": traction_option["rear_friction"]},
+    {"offset": landglobal["rear_wheels"].value["arcade_drag_multiplier"].data_offset, "value": 0.0},
+    {"offset": landglobal["front_wheels"].value["use_shape_cast"].data_offset, "value": 0, "format": "sint08"},
+    {"offset": landglobal["rear_wheels"].value["use_shape_cast"].data_offset, "value": 0, "format": "sint08"},
+  ]
+  mods.apply_updates_to_file(LANDGLOBAL_FILE, updates)
+
+def update_aerodynamics_file() -> None:
+  aerodynamics = mods2.deserialize_adf(AERODYNAMICS_FILE).table_instance_full_values[0].value
+  updates = [
+    {"offset": aerodynamics["frontal_area"].data_offset, "value": 1.25},
+    {"offset": aerodynamics["drag_coefficient"].data_offset, "value": 0.3},
+    {"offset": aerodynamics["top_speed_drag_coefficient"].data_offset, "value": 0.3},
+  ]
+  mods.apply_updates_to_file(AERODYNAMICS_FILE, updates)
+
+def update_noise_file(noise: float, vision: float) -> None:
   if noise != 500.0:
     mods2.update_file_at_multiple_coordinates_with_value(NOISE_PATH, "vehicle_data", ["B4", "C4"], int(noise))
     if noise < 150:
@@ -196,6 +182,32 @@ def process(options: dict) -> None:
     if vision < 50:
       mods2.update_file_at_multiple_coordinates_with_value(NOISE_PATH, "vehicle_data", ["B8", "C8"], int(noise))
 
+def process(options: dict) -> None:
+  options = map_options(options)
+
+  speed_options = {
+    "90": SPEED_90,
+    "120": SPEED_120,
+    "150": SPEED_150,
+    "170": SPEED_170,
+  }.get(options["top_speed"], SPEED_70)
+
+  torque_option = {
+    "medium": TORQUE_MEDIUM,
+    "high": TORQUE_HIGH,
+  }.get(options["acceleration"], TORQUE_DEFAULT)
+
+  traction_option = {
+    "medium": TRACTION_MEDIUM,
+    "high": TRACTION_HIGH,
+  }.get(options["traction"], TRACTION_DEFAULT)
+
+  update_transmission_file(speed_options)
+  update_landengine_file(speed_options, torque_option)
+  update_landglobal_file(traction_option)
+  update_aerodynamics_file()
+  update_noise_file(options["noise_distance"], options["vision_distance"])
+
 def merge_files(files: list[str], options: dict) -> None:
   for bundle_file in [RED_MERGE_PATH, SILVER_MERGE_PATH, JADE_MERGE_PATH]:
     bundle_lookup = mods.get_sarc_file_info(mods.APP_DIR_PATH / "org" / bundle_file)