Fix XML textures padding

Add minimap position and scale configuration options and expanded mode toggle
- Toggle expanded minimap mode - Choose between round and square minimap shapes - `gui.session.minimap.position`, lets you switch between two positioning modes: panel-left and screen-left - `gui.session.minimap.size`, change size between 1.0 and 2.0, default is 1.0.
2026-08-15 14:43:32 -07:00 · 2026-07-31 13:49:57 -03:00 · 2026-07-31 13:48:09 -03:00
87 changed files with 887 additions and 1451 deletions
--- a/.gitea/workflows/checkrefs.yml
+++ b/.gitea/workflows/checkrefs.yml
@ -11,7 +11,7 @@ jobs:
  lfscheck:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4

      - name: Fetch the base branch
        run: git fetch origin ${{ env.BASE_SHA }}
@ -24,14 +24,27 @@ jobs:
    env:
      GIT_LFS_SKIP_SMUDGE: "1"
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
        with:
          python-version: "3.11"
      - name: Add remote fork origin for LFS
        run: |
          PR_REPO="${{ gitea.event.pull_request.head.repo.full_name || gitea.repository }}"
          git remote add ${{ gitea.actor }} https://gitea.wildfiregames.com/${PR_REPO}.git
+      - name: Workaround for authentication problem with LFS
+        # https://gitea.com/gitea/act_runner/issues/164
+        run: |
+          git config --local \
+          http.${{ gitea.server_url }}/${{ gitea.repository }}.git/info/lfs/objects/.extraheader ''
+
+          PR_REPO="${{ gitea.event.pull_request.head.repo.full_name || gitea.repository }}"
+          EXTRAHEADER="$(git config --get --local http.${{ gitea.server_url }}/.extraheader)"
+          git config --local \
+            http.${{ gitea.server_url }}/${PR_REPO}.git/info/lfs/objects/batch.extraheader \
+            '${EXTRAHEADER}'
+          git config --local \
+            http.${{ gitea.server_url }}/${PR_REPO}.git/info/lfs/objects/.extraheader ''
      - name: Download necessary LFS assets
        shell: sh {0}
        run: |
--- a/.gitea/workflows/lint.yml
+++ b/.gitea/workflows/lint.yml
@ -12,7 +12,7 @@ jobs:
  cppcheck:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4

      # cache only works for items in workspace, so configure apt to allow for caching.
      - name: Setup apt cache locations
@ -26,7 +26,7 @@ jobs:

      - name: Cache apt pkg db and and deb files
        id: apt-cache
-        uses: actions/cache@v6
+        uses: actions/cache@v4
        with:
          path: |
            apt-cache
@ -49,11 +49,11 @@ jobs:
  copyright:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 100

-      - uses: actions/setup-python@v7
+      - uses: actions/setup-python@v5
        with:
          python-version: "3.11"

@ -66,10 +66,10 @@ jobs:
  jenkinsfiles:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4

      - name: Set up Node.js
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
        with:
          node-version: '20'

--- a/.gitea/workflows/pre-commit.yml
+++ b/.gitea/workflows/pre-commit.yml
@ -3,27 +3,22 @@ name: pre-commit
 on:
  - push
  - pull_request
-env:
-  PRE_COMMIT_VERSION: 4.6.0
 jobs:
-  pre-commit:
+  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
        with:
          python-version: "3.11"
-      - uses: actions/cache@v6
+      - id: restore-pip-cache
+        uses: actions/cache/restore@v4
        with:
-          key: pip-cache-v1-${{github.workflow}}-${{env.pythonLocation}}-${{env.PRE_COMMIT_VERSION}}
+          key: pip-cache-v1-${{ github.workflow }}
          path: ~/.cache/pip
-      - run: python -m pip install pre-commit=="${{ env.PRE_COMMIT_VERSION }}"
-        shell: bash
-      - run: python -m pip freeze --local
-        shell: bash
-      - uses: actions/cache@v6
+      - uses: pre-commit/action@v3.0.1
+      - uses: actions/cache/save@v4
+        if: steps.restore-pip-cache.outcome == 'success'
        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      - run: pre-commit run --show-diff-on-failure --color=always --all-files
-        shell: bash
+          key: pip-cache-v1-${{ github.workflow }}
+          path: ~/.cache/pip
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -34,7 +34,7 @@ repos:
            \.patch$
          )
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.0
+    rev: v0.12.9
    hooks:
      - id: ruff-check
        args:
@ -56,7 +56,7 @@ repos:
        files: ^binaries/
        exclude: (^binaries/data/mods/(mod|public)/art/.*\.xml|\.dae$)
  - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.13.1-1
+    rev: v3.12.0-2
    hooks:
      - id: shfmt
        args:
@ -67,7 +67,7 @@ repos:
    hooks:
      - id: shellcheck
  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.47.0
+    rev: v0.45.0
    hooks:
      - id: markdownlint
        language_version: 22.14.0
@ -77,13 +77,13 @@ repos:
            ^source/third_party/
          )
  - repo: https://github.com/adrienverge/yamllint
-    rev: v1.38.0
+    rev: v1.37.1
    hooks:
      - id: yamllint
        args:
          - --strict
  - repo: https://github.com/eslint/eslint
-    rev: v10.8.0
+    rev: v9.39.2
    hooks:
      - id: eslint
        language_version: 22.14.0
--- a/binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.js
+++ b/binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.js
@ -1,8 +1,6 @@
-/* eslint-disable prefer-const -- Mods should be able to change it */
-let g_IncompatibleModsFile = "gui/incompatible_mods/incompatible_mods.txt";
-/* eslint-enable prefer-const */
+var g_IncompatibleModsFile = "gui/incompatible_mods/incompatible_mods.txt";

-export function init(data)
+function init(data)
 {
 	Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile(g_IncompatibleModsFile));
 	return new Promise(closePageCallback =>
--- a/binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.xml
+++ b/binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <objects>
 	<script directory="gui/common/"/>
-	<script module="gui/incompatible_mods/incompatible_mods.js"/>
+	<script directory="gui/incompatible_mods/"/>

 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
--- a/binaries/data/mods/mod/gui/modio/modio.js
+++ b/binaries/data/mods/mod/gui/modio/modio.js
@ -1,4 +1,4 @@
-let g_ModsAvailableOnline = [];
+var g_ModsAvailableOnline = [];

 /**
 * Indicates if we have encountered an error in one of the network-interaction attempts.
@ -8,7 +8,7 @@ let g_ModsAvailableOnline = [];
 * Set to `true` by showErrorMessageBox
 * Set to `false` by init, updateModList, downloadFile, and cancelRequest
 */
-let g_Failure;
+var g_Failure;

 /**
 * Indicates if the user has cancelled a request.
@ -19,11 +19,11 @@ let g_Failure;
 * Set to `true` by cancelRequest
 * Set to `false` by updateModList, and downloadFile
 */
-let g_RequestCancelled;
+var g_RequestCancelled;

-let g_RequestStartTime;
+var g_RequestStartTime;

-const g_ModIOState = {
+var g_ModIOState = {
 	/**
 	 * Finished status indicators
 	 */
@ -142,7 +142,7 @@ const g_ModIOState = {
 	}
 };

-export function init(data)
+function init(data)
 {
 	const promise = progressDialog(
 		translate("Initializing mod.io interface."),
@ -153,21 +153,6 @@ export function init(data)
 	g_Failure = false;
 	Engine.ModIoStartGetGameId();

-	Object.assign(Engine.GetGUIObjectByName("modFilter"), {
-		"onPress": displayMods,
-		"onTextEdit": displayMods
-	});
-
-	Object.assign(Engine.GetGUIObjectByName("modsAvailableList"), {
-		"onSelectionChange": showModDescription,
-		"onSelectionColumnChange": displayMods,
-		"onMouseLeftDoubleClickItem": downloadMod
-	});
-
-	Engine.GetGUIObjectByName("compatibilityFilter").onPress = displayMods;
-	Engine.GetGUIObjectByName("refreshButton").onPress = updateModList;
-	Engine.GetGUIObjectByName("downloadButton").onPress = downloadMod;
-
 	return Promise.race([
 		promise,
 		new Promise(closePageCallback =>
--- a/binaries/data/mods/mod/gui/modio/modio.xml
+++ b/binaries/data/mods/mod/gui/modio/modio.xml
@ -3,7 +3,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/modio/modio.js"/>
+	<script directory="gui/modio/"/>

 	<object type="image" sprite="ModernFade"/>

@ -25,6 +25,8 @@
 				style="ModernInput"
 				size="16 0 200 24"
 			>
+				<action on="Press">displayMods();</action>
+				<action on="TextEdit">displayMods();</action>
 				<translatableAttribute id="placeholder_text" context="placeholder text for input field to filter mods">Filter</translatableAttribute>
 			</object>

@ -37,6 +39,10 @@
 				selected_column_order="1"
 				font="sans-stroke-13"
 			>
+				<action on="SelectionChange">showModDescription();</action>
+				<action on="SelectionColumnChange">displayMods();</action>
+				<action on="MouseLeftDoubleClickItem">downloadMod();</action>
+
 				<!-- List headers -->
 				<!-- Keep in sync with mod property names -->
 				<column id="name_id" textcolor="255 255 255" width="20%">
@ -63,7 +69,9 @@
 		<!-- Right Panel: Compatibility Filter-->
 		<object name="rightPanel" size="100%-250 20 100%-10 40" >
 			<!-- Compatibility Filter Checkbox -->
-			<object name="compatibilityFilter" type="checkbox" checked="true" style="ModernTickBox" size="0 4 20 100%" />
+			<object name="compatibilityFilter" type="checkbox" checked="true" style="ModernTickBox" size="0 4 20 100%">
+				<action on="Press">displayMods();</action>
+			</object>
 			<!-- Compatibility Filter Label -->
 			<object type="text" size="20 2 100% 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Filter valid mods</translatableAttribute>
@ -77,10 +85,12 @@

 		<object name="refreshButton" type="button" style="ModernButtonRed" size="100%-368 100%-44 100%-188 100%-16" enabled="false">
 			<translatableAttribute id="caption">Refresh List</translatableAttribute>
+			<action on="Press">updateModList();</action>
 		</object>

 		<object name="downloadButton" type="button" style="ModernButtonRed" size="100%-184 100%-44 100%-16 100%-16" enabled="false">
 			<translatableAttribute id="caption">Download</translatableAttribute>
+			<action on="Press">downloadMod();</action>
 		</object>

 	</object>
--- a/binaries/data/mods/mod/gui/modmod/help/help.js
+++ b/binaries/data/mods/mod/gui/modmod/help/help.js
@ -1,4 +1,4 @@
-export function init(data)
+function init(data)
 {
 	Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile("gui/modmod/help/help.txt"));
 	return new Promise(closePageCallback =>
--- a/binaries/data/mods/mod/gui/modmod/help/help.xml
+++ b/binaries/data/mods/mod/gui/modmod/help/help.xml
@ -3,7 +3,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/modmod/help/help.js"/>
+	<script directory="gui/modmod/help/"/>

 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
--- a/binaries/data/mods/mod/gui/modmod/modmod.js
+++ b/binaries/data/mods/mod/gui/modmod/modmod.js
@ -19,37 +19,33 @@
 * This allows mods to express upwards and downwards compatibility.
 */

-import { downloadModsButton } from "gui/modmod/modmodio.js";
-import { regExpComparisonOperator, validateMod } from "gui/modmod/validatemod.js";
-
 /**
 * Mod definitions loaded from the files, including invalid mods.
 */
-let g_Mods = {};
+var g_Mods = {};

 /**
 * Folder names of all mods that are or can be launched.
 */
-let g_ModsEnabled = [];
-let g_ModsDisabled = [];
+var g_ModsEnabled = [];
+var g_ModsDisabled = [];

-let g_ModsEnabledFiltered = [];
-let g_ModsDisabledFiltered = [];
+var g_ModsEnabledFiltered = [];
+var g_ModsDisabledFiltered = [];

 /**
 * Cache mod compatibility recomputed when some mod is enbaled/disabled.
 */
-const g_ModsCompatibility = [];
+var g_ModsCompatibility = [];

 /**
 * Name of the mods installed by the ModInstaller.
 */
-let g_InstalledMods;
+var g_InstalledMods;

-let g_HasIncompatibleMods;
+var g_HasIncompatibleMods;

-/* eslint-disable prefer-const -- Mods should be able to change them */
-let g_FakeMod = {
+var g_FakeMod = {
 	"name": translate("This mod does not exist"),
 	"version": "",
 	"label": "",
@ -58,34 +54,12 @@ let g_FakeMod = {
 	"dependencies": []
 };

-let g_ColorNoModSelected = "255 255 100";
-let g_ColorDependenciesMet = "100 255 100";
-let g_ColorDependenciesNotMet = "255 100 100";
-/* eslint-enable prefer-const */
+var g_ColorNoModSelected = "255 255 100";
+var g_ColorDependenciesMet = "100 255 100";
+var g_ColorDependenciesNotMet = "255 100 100";

-export function init(data, hotloadData)
+function init(data, hotloadData)
 {
-	Object.assign(Engine.GetGUIObjectByName("modsDisabledList"), {
-		"onSelectionChange": selectedMod.bind(undefined, "modsDisabledList"),
-		"onSelectionColumnChange": displayModLists,
-		"onMouseLeftDoubleClickItem": enableMod
-	});
-	Object.assign(Engine.GetGUIObjectByName("modsEnabledList"), {
-		"onSelectionChange": selectedMod.bind(undefined, "modsEnabledList"),
-		"onMouseLeftDoubleClickItem": disableMod
-	});
-
-	Engine.GetGUIObjectByName("enabledModUp").onPress =
-		moveCurrItem.bind(undefined, "modsEnabledList", true);
-	Engine.GetGUIObjectByName("enabledModDown").onPress =
-		moveCurrItem.bind(undefined, "modsEnabledList", false);
-
-	Engine.GetGUIObjectByName("visitWebButton").onPress = visitModWebsite;
-	Engine.GetGUIObjectByName("downloadButton").onPress = downloadModsButton.bind(undefined, initMods);
-	Engine.GetGUIObjectByName("saveConfigurationButton").onPress = saveMods;
-	Engine.GetGUIObjectByName("startButton").onPress = startMods;
-
-
 	g_InstalledMods = data && data.installedMods || hotloadData && hotloadData.installedMods || [];
 	g_HasIncompatibleMods = Engine.HasIncompatibleMods();

@ -380,7 +354,7 @@ function recomputeCompatibility(disabledAction = false)
 */
 function isDependencyMet(dependency)
 {
-	const operator = dependency.match(regExpComparisonOperator);
+	const operator = dependency.match(g_RegExpComparisonOperator);
 	const [name, version] = operator ? dependency.split(operator[0]) : [dependency, undefined];

 	return g_ModsEnabled.some(folder =>
@ -429,7 +403,7 @@ function sortEnabledMods()
 {
 	const dependencies = {};
 	for (const folder of g_ModsEnabled)
-		dependencies[folder] = getMod(folder).dependencies.map(d => d.split(regExpComparisonOperator)[0]);
+		dependencies[folder] = getMod(folder).dependencies.map(d => d.split(g_RegExpComparisonOperator)[0]);

 	g_ModsEnabled.sort((folder1, folder2) =>
 		dependencies[folder1].indexOf(getMod(folder2).name) != -1 ? 1 :
--- a/binaries/data/mods/mod/gui/modmod/modmod.xml
+++ b/binaries/data/mods/mod/gui/modmod/modmod.xml
@ -3,7 +3,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/modmod/modmod.js"/>
+	<script directory="gui/modmod/"/>

 	<object type="image" style="ModernWindow">

@ -80,6 +80,10 @@
 				font="sans-stroke-13"
 				auto_scroll="true"
 			>
+				<action on="SelectionChange">selectedMod(this.name);</action>
+				<action on="SelectionColumnChange">displayModLists();</action>
+				<action on="MouseLeftDoubleClickItem">enableMod();</action>
+
 				<!-- List headers -->
 				<!-- Keep the column names in sync with the property names of mods -->
 				<column id="name" textcolor="255 255 255" width="10%">
@ -119,6 +123,9 @@
 				tooltip_style="pgToolTip"
 				auto_scroll="true"
 			>
+				<action on="SelectionChange">selectedMod(this.name);</action>
+				<action on="MouseLeftDoubleClickItem">disableMod();</action>
+
 				<!-- List headers -->
 				<column id="name" textcolor="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
@ -152,6 +159,7 @@
 				sprite_disabled="ModernArrowUpGrey"
 			>
 				<translatableAttribute id="tooltip">Change the order in which mods are launched. This should match the mods dependencies.</translatableAttribute>
+				<action on="Press">moveCurrItem("modsEnabledList", true);</action>
 			</object>
 			<object
 				name="enabledModDown"
@ -165,6 +173,7 @@
 				sprite_disabled="ModernArrowDownGrey"
 			>
 				<translatableAttribute id="tooltip">Change the order in which mods are launched. This should match the mods dependencies.</translatableAttribute>
+				<action on="Press">moveCurrItem("modsEnabledList", false);</action>
 			</object>
 		</object>

@ -172,6 +181,7 @@
 		<object name="toggleModButton" type="button" style="ModernButtonRed" size="16 100%-80 196 100%-52" enabled="false"/>
 		<object name="visitWebButton" type="button" style="ModernButtonRed" size="200 100%-80 380 100%-52" enabled="false">
 			<translatableAttribute id="caption">Visit Website</translatableAttribute>
+			<action on="Press">visitModWebsite();</action>
 		</object>

 		<!-- Message -->
@ -188,19 +198,22 @@

 		<object type="button" style="ModernButtonRed" size="100%-748 100%-44 100%-568 100%-16">
 			<translatableAttribute id="caption">Help</translatableAttribute>
-		  <action on="Press">Engine.OpenChildPage("page_modhelp.xml");</action>
+			<action on="Press">Engine.OpenChildPage("page_modhelp.xml");</action>
 		</object>

-		<object name="downloadButton" type="button" style="ModernButtonRed" size="100%-564 100%-44 100%-384 100%-16">
+		<object type="button" style="ModernButtonRed" size="100%-564 100%-44 100%-384 100%-16">
 			<translatableAttribute id="caption">Download Mods</translatableAttribute>
+			<action on="Press">downloadModsButton();</action>
 		</object>

 		<object name="saveConfigurationButton" type="button" style="ModernButtonRed" size="100%-380 100%-44 100%-200 100%-16">
 			<translatableAttribute id="caption">Save Configuration</translatableAttribute>
+			<action on="Press">saveMods();</action>
 		</object>

 		<object name="startButton" type="button" style="ModernButtonRed" size="100%-196 100%-44 100%-16 100%-16">
 			<translatableAttribute id="caption">Save and Restart</translatableAttribute>
+			<action on="Press">startMods();</action>
 		</object>
 	</object>
 </objects>
--- a/binaries/data/mods/mod/gui/modmod/modmodio.js
+++ b/binaries/data/mods/mod/gui/modmod/modmodio.js
@ -1,4 +1,4 @@
-export function downloadModsButton(initMods)
+function downloadModsButton()
 {
 	initTerms({
 		"Disclaimer": {
@ -6,7 +6,7 @@ export function downloadModsButton(initMods)
 			"file": "gui/modio/Disclaimer.txt",
 			"config": "modio.disclaimer",
 			"accepted": false,
-			"callback": openModIo.bind(undefined, initMods),
+			"callback": openModIo,
 			"urlButtons": [
 				{
 					"caption": translate("mod.io Terms"),
@ -23,7 +23,7 @@ export function downloadModsButton(initMods)
 	openTerms("Disclaimer");
 }

-async function openModIo(initMods, data)
+async function openModIo(data)
 {
 	if (!data.accepted)
 		return;
--- a/binaries/data/mods/mod/gui/modmod/validatemod.js
+++ b/binaries/data/mods/mod/gui/modmod/validatemod.js
@ -48,12 +48,12 @@ const g_RegExpVersion= /[0-9]+(\.[0-9]+){0,2}/;
 /**
 * Version checks in mod dependencies can use these operators.
 */
-export const regExpComparisonOperator = /(<=|>=|<|>|=)/;
+const g_RegExpComparisonOperator = /(<=|>=|<|>|=)/;

 /**
 * Tests if a dependency compares a mod version against another, for instance "0ad<=0.0.16".
 */
-const g_RegExpComparison = globalRegExp(new RegExp(g_RegExpName.source + regExpComparisonOperator.source + g_RegExpVersion.source));
+const g_RegExpComparison = globalRegExp(new RegExp(g_RegExpName.source + g_RegExpComparisonOperator.source + g_RegExpVersion.source));

 /**
 * The label may not be empty.
@ -69,7 +69,7 @@ function globalRegExp(regexp)
 * Returns whether the mod defines all required properties and whether all properties are valid.
 * Shows a notification if not.
 */
-export function validateMod(folder, modData, notify)
+function validateMod(folder, modData, notify)
 {
 	let valid = true;

--- a/binaries/data/mods/mod/gui/msgbox/msgbox.js
+++ b/binaries/data/mods/mod/gui/msgbox/msgbox.js
@ -2,7 +2,7 @@
 * Currently limited to at most 3 buttons per message box.
 * The convention is to have "cancel" appear first.
 */
-export function init(data)
+function init(data)
 {
 	// Set title
 	Engine.GetGUIObjectByName("mbTitleBar").caption = data.title;
--- a/binaries/data/mods/mod/gui/msgbox/msgbox.xml
+++ b/binaries/data/mods/mod/gui/msgbox/msgbox.xml
@ -3,7 +3,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/msgbox/msgbox.js"/>
+	<script directory="gui/msgbox/"/>

 	<!-- Fade out the background because it's non-interactable -->
 	<object sprite="ModernFade" type="image"/>
--- a/binaries/data/mods/mod/gui/pregame/mainmenu.js
+++ b/binaries/data/mods/mod/gui/pregame/mainmenu.js
@ -1,4 +1,4 @@
-export async function init()
+async function init()
 {
 	return { [Engine.openRequest]: {
 		"page": "page_modmod.xml",
--- a/binaries/data/mods/mod/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/mod/gui/pregame/mainmenu.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

 <objects>
-	<script module="gui/pregame/mainmenu.js"/>
+	<script directory="gui/pregame/"/>
 </objects>
--- a/binaries/data/mods/mod/gui/termsdialog/termsdialog.js
+++ b/binaries/data/mods/mod/gui/termsdialog/termsdialog.js
@ -7,11 +7,11 @@
 * The user should be able to save and print the text of the terms.
 */

-let g_TermsPage;
-let g_TermsFile;
-let g_TermsSprintf;
+var g_TermsPage;
+var g_TermsFile;
+var g_TermsSprintf;

-export async function init(data)
+async function init(data)
 {
 	g_TermsPage = data.page;
 	g_TermsFile = data.file;
--- a/binaries/data/mods/mod/gui/termsdialog/termsdialog.xml
+++ b/binaries/data/mods/mod/gui/termsdialog/termsdialog.xml
@ -2,7 +2,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/termsdialog/termsdialog.js"/>
+	<script directory="gui/termsdialog/"/>

 	<object type="image" sprite="ModernFade"/>

--- a/binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.js
+++ b/binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.js
@ -69,7 +69,7 @@ class TimedConfirmation
 	}
 }

-export function init(data)
+function init(data)
 {
 	return new TimedConfirmation().setup(data);
 }
--- a/binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.xml
+++ b/binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.xml
@ -3,7 +3,7 @@
 <objects>

 	<script directory="gui/common/"/>
-	<script module="gui/timedconfirmation/timedconfirmation.js"/>
+	<script directory="gui/timedconfirmation/"/>

 	<!-- Fade out the background because it's non-interactable -->
 	<object sprite="ModernFade" type="image"/>
--- a/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
+++ b/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
@ -21,6 +21,16 @@
 		ghost="true"
 	/>

+	<!-- Expanded minimap border -->
+	<object
+		name="minimapExpandedCircle"
+		type="image"
+		size="4 4 100%-4 100%-4"
+		sprite="stretched:session/minimap_expanded_circle.png"
+		ghost="true"
+		hidden="true"
+	/>
+
 	<!-- Idle Worker Button -->
 	<object name="idleWorkerButton"
 		type="button"
--- a/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js
+++ b/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js
@ -18,6 +18,16 @@ class MiniMapFlareButton

 	rebuild()
 	{
+		if (g_IsObserver)
+		{
+			this.flareButton.sprite = "stretched:session/minimap-observer-flare.png";
+			this.flareButton.sprite_over = "stretched:session/minimap-observer-flare-highlight.png";
+		}
+		else
+		{
+			this.flareButton.sprite = "stretched:session/minimap-player-flare.png";
+			this.flareButton.sprite_over = "stretched:session/minimap-player-flare-highlight.png";
+		}
 		this.updateTooltip();
 	}

--- a/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js
+++ b/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js
@ -84,6 +84,7 @@ class MiniMapPanel
 		this.expandedState = {
 			"panelSprite": "",
 			"hideButtons": true,
+			"showCircle": true,
 			"circleSprite": "stretched:session/minimap_expanded_circle.png",
 			"computeLayout": this.computeExpandedLayout.bind(this)
 		};
@ -93,7 +94,6 @@ class MiniMapPanel
 		this.minimapMap = Engine.GetGUIObjectByName("minimap");
 		this.minimapBackgroundTexture = Engine.GetGUIObjectByName("minimapBackgroundTexture");
 		this.session = Engine.GetGUIObjectByName("session");
-		this.supplementalPanel = Engine.GetGUIObjectByName("supplementalSelectionDetails");
 		this.idleWorkerButton = new MiniMapIdleWorkerButton(playerViewControl, idleWorkerClasses);
 		this.totalNumberIdleWorkers = Engine.GetGUIObjectByName("totalNumberIdleWorkers");
 		this.flareButton = new MiniMapFlareButton(playerViewControl);
@ -126,6 +126,7 @@ class MiniMapPanel
 		return {
 			...this.themes[this.shape],
 			"hideButtons": false,
+			"showCircle": true,
 			"computeLayout": this.computeNormalLayout.bind(this)
 		};
 	}
@ -158,8 +159,8 @@ class MiniMapPanel

 		this.panel.size = theme.computeLayout();
 		this.panel.sprite = theme.panelSprite;
-		this.minimapCircle.sprite = theme.circleSprite;
-		this.minimapCircle.hidden = false;
+		this.minimapCircle.sprite = theme.circleSprite ?? this.themes[this.shape].circleSprite;
+		this.minimapCircle.hidden = !theme.showCircle;
 		const offset = theme.mapOffset ?? 0;
 		this.minimapBackgroundTexture.size = `4 ${4 + offset} 100%-4 100%-${4 - offset}`;
 		this.minimapCircle.size = `4 ${4 + offset} 100%-4 100%-${4 - offset}`;
@ -214,8 +215,7 @@ class MiniMapPanel
 	{
 		if (!cfg)
 			return;
-		const original = cfg.baseSize.split(/\s+/);
-		const parts = original.map(part =>
+		const parts = cfg.baseSize.split(/\s+/).map(part =>
 		{
 			const match = part.match(/^100%-(\d+)$/);
 			if (match)
@ -230,6 +230,7 @@ class MiniMapPanel
 			return;
 		}
 		const scaled = { "left": parts[0], "top": parts[1], "right": parts[2], "bottom": parts[3] };
+		const original = cfg.baseSize.split(/\s+/);

 		for (const anchor of cfg.anchors)
 		{
@ -246,18 +247,11 @@ class MiniMapPanel
 			this.computeScreenLeftLayout();
 	}

-	getScaledPanelSize()
-	{
-		const scale = parseFloat(this.sizeScale) || 1.0;
-		return {
-			"width": Math.round(this.defaultPanelWidth * scale),
-			"height": Math.round(this.defaultPanelHeight * scale)
-		};
-	}
-
 	computePanelLeftLayout()
 	{
-		const { width, height } = this.getScaledPanelSize();
+		const scale = parseFloat(this.sizeScale) || 1.0;
+		const width = Math.round(this.defaultPanelWidth * scale);
+		const height = Math.round(this.defaultPanelHeight * scale);
 		const parentRect = this.panel.parent.getComputedSize();
 		const parentHeight = parentRect.bottom - parentRect.top;
 		return {
@ -270,11 +264,14 @@ class MiniMapPanel

 	computeScreenLeftLayout()
 	{
-		const { width, height } = this.getScaledPanelSize();
+		const scale = parseFloat(this.sizeScale) || 1.0;
+		const width = Math.round(this.defaultPanelWidth * scale);
+		const height = Math.round(this.defaultPanelHeight * scale);
 		const windowSize = this.session.getComputedSize();
 		const parentRect = this.panel.parent.getComputedSize();
 		const screenTop = (windowSize.bottom - windowSize.top) - height;
-		const maxRight = this.supplementalPanel.getComputedSize().left;
+		const supplementalPanel = Engine.GetGUIObjectByName("supplementalSelectionDetails");
+		const maxRight = supplementalPanel.getComputedSize().left;
 		let left = 0;
 		let right = width;
 		if (right > maxRight)
@ -329,6 +326,7 @@ class MiniMapPanel
 	setCivBackgroundTexture()
 	{
 		const playerCiv = g_ViewedPlayer > 0 ? g_Players[g_ViewedPlayer].civ : "gaia";
-		this.minimapBackgroundTexture.sprite = `stretched:session/icons/bkg/background_circle_${playerCiv}.png`;
+		const backgroundObject = Engine.GetGUIObjectByName("minimapBackgroundTexture");
+		backgroundObject.sprite = `stretched:session/icons/bkg/background_circle_${playerCiv}.png`;
 	}
-}
+}
--- a/binaries/data/mods/public/gui/session/top_panel/CounterPopulation.js
+++ b/binaries/data/mods/public/gui/session/top_panel/CounterPopulation.js
@ -25,17 +25,13 @@ class CounterPopulation
 		for (const resCode of g_ResourceData.GetCodes())
 			total += playerState.resourceGatherers[resCode];

-		const colorizedTotal = coloredText(total,
-			total ? this.DefaultTotalGatherersColor : this.DefaultTotalGatherersColorZero);
-		this.stats.caption = colorizedTotal;
+		this.stats.caption = coloredText(total, total ? this.DefaultTotalGatherersColor : this.DefaultTotalGatherersColorZero);

 		this.isTrainingBlocked = playerState.trainingBlocked;

 		this.panel.tooltip =
-			setStringTags(translate(this.PopulationTooltipTitle), CounterManager.ResourceTitleTags) +
-			"\n" + sprintf(this.PopulationTooltip, state) +
-			getAllyStatTooltip(this.getTooltipData.bind(this)) + "\n" +
-			sprintf(this.CurrentGatherersTooltip, { "currentGatherers": colorizedTotal });
+			setStringTags(translate(this.PopulationTooltip), CounterManager.ResourceTitleTags) +
+			getAllyStatTooltip(this.getTooltipData.bind(this));
 	}

 	getTooltipData(playerState, playername)
@ -66,20 +62,10 @@ class CounterPopulation
 // Translation: Do not insert spaces around the slash symbol for this exact string. Keep only one space between popLimit and popMax.
 CounterPopulation.prototype.CounterCaption = markForTranslation("%(popCount)s/%(popLimit)s (%(popMax)s)");

-CounterPopulation.prototype.PopulationTooltipTitle = markForTranslation("Population");
-CounterPopulation.prototype.PopulationTooltip =
-	translate("Current population: %(popCount)s\nPopulation limit: %(popLimit)s\nMaximum population: %(popMax)s");
+CounterPopulation.prototype.PopulationTooltip = markForTranslation("Population: current/limit (max)");

 CounterPopulation.prototype.AllyPopulationTooltip = markForTranslation("%(popCount)s/%(popLimit)s (%(popMax)s)");

-/**
- * Storing the translated and formatted gatherer string in the prototype.
- * Including the number might seem redundant but is required since the collor
- * isn't enough to associate it with the number in the top panel.
- */
-CounterPopulation.prototype.CurrentGatherersTooltip =
-	setStringTags(translate("Current gatherers: %(currentGatherers)s"), { "font": "sans-14" });
-
 /**
 * Color to highlight the total number of gatherers at zero.
 */
--- a/binaries/data/mods/public/gui/session/top_panel/CounterResource.js
+++ b/binaries/data/mods/public/gui/session/top_panel/CounterResource.js
@ -17,9 +17,7 @@ class CounterResource
 		this.count.caption = abbreviateLargeNumbers(Math.floor(playerState.resourceCounts[this.resCode]));

 		const gatherers = playerState.resourceGatherers[this.resCode];
-		const colorizedGatherers = coloredText(gatherers,
-			gatherers ? this.DefaultResourceGatherersColor : this.DefaultResourceGatherersColorZero);
-		this.stats.caption = colorizedGatherers;
+		this.stats.caption = coloredText(gatherers, gatherers ? this.DefaultResourceGatherersColor : this.DefaultResourceGatherersColorZero);


 		// TODO: Set the tooltip only if hovered?
@ -30,9 +28,7 @@ class CounterResource
 		this.panel.tooltip =
 			setStringTags(resourceNameFirstWord(this.resCode), CounterManager.ResourceTitleTags) +
 			description +
-			getAllyStatTooltip(this.getTooltipData.bind(this)) + "\n" +
-			sprintf(CounterPopulation.prototype.CurrentGatherersTooltip,
-				{ "currentGatherers": colorizedGatherers });
+			getAllyStatTooltip(this.getTooltipData.bind(this));
 	}

 	getTooltipData(playerState, playername)
--- a/binaries/data/mods/public/gui/text/quotes.txt
+++ b/binaries/data/mods/public/gui/text/quotes.txt
@ -208,13 +208,3 @@
 “This is a woman's resolve; as for men, they may live and be slaves.” \n— Boudicca, rallying against Roman occupation (Tacitus's Annals, Book 14, Chapter 35)
 “There are two things, knowledge and opinion; one makes its possessor know, the other to be ignorant.” \n— (Hippocratic treatise known as “The Law”, part of the Hippocratic Corpus)
 “Let them hate me, so long as they fear me.” \n— Caligula (Suetonius, The Twelve Caesars, Book 30)
-“There is no instance of a nation benefiting from prolonged warfare.” \n— Sun Tzu (“The Art of War”, Chapter 2)
-“To subdue the enemy without fighting is the acme of skill.” \n— Sun Tzu (“The Art of War”, Chapter 3)
-“One defends when his strength is inadequate; he attacks when it is abundant.” \n— Sun Tzu (“The Art of War”, Chapter 4)
-“When torrential water tosses boulders, it is because of its momentum. When the strike of a hawk breaks the body of its prey, it is because of timing.” \n— Sun Tzu (“The Art of War”, Chapter 5)
-“Treat your men as you would your own beloved sons. And they will follow you into the deepest valley.” \n— Sun Tzu (“The Art of War”, Chapter 10)
-“Woe to the defeated!” \n— Brennus disputing the weight of gold ransom while sacking Rome c. 387 BC  (Livy, “Ab Urbe Condita”, Book 5, Chapter 48)
-“\[Brutus] found the women fighting and perishing in company with the men with such bravery that they uttered no cry even in the midst of slaughter.” \n— Brutus in Lusitania during the battles with Viriathus (Appian of Alexandria, “The Spanish Wars”, 15)
-“What I desire for my own children, I desire for all men.” \n— Ashoka the Great (“The Kalinga Rock Edicts”)
-“If you Romans choose to lord it over the world, does it follow that the world is to accept slavery ?” \n— Caratacus pleading for pardon from Roman Emperor Claudius in Rome (Tacitus, “Annals”, 12.37)
-“And where am I to get so many soldiers ?” \n— Septimius Severus, frustrated with the challenge of controlling his own men and the harsh realities of frontier warfare against the northern tribes in Britannia. (Cassius Dio, “Roman History”, Vol IX, Book LXXVI, Section 11)
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@ -286,21 +286,17 @@ Attack.prototype.CanAttack = function(target, wantedTypes)
 	if (!cmpTargetPlayer || !cmpEntityPlayer)
 		return false;

-	// Must be visible or miraged / with retainInFog flag, not completely hidden
-	const cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-	if (cmpRangeManager)
-	{
-		const visibility = cmpRangeManager.GetLosVisibility(target, cmpEntityPlayer.GetPlayerID());
-		if (visibility == "hidden")
-			return false;
-	}
-
 	const types = this.GetAttackTypes(wantedTypes);
 	const entityOwner = cmpEntityPlayer.GetPlayerID();
 	const targetOwner = cmpTargetPlayer.GetPlayerID();
 	const cmpCapturable = QueryMiragedInterface(target, IID_Capturable);
 	const cmpDiplomacy = QueryPlayerIDInterface(entityOwner, IID_Diplomacy);

+	// Check if the relative height difference is larger than the attack range
+	// If the relative height is bigger, it means they will never be able to
+	// reach each other, no matter how close they come.
+	const heightDiff = Math.abs(cmpThisPosition.GetHeightOffset() - cmpTargetPosition.GetHeightOffset());
+
 	for (const type of types)
 	{
 		if (type != "Capture" && (!cmpDiplomacy?.IsEnemy(targetOwner) || !cmpHealth || !cmpHealth.GetHitpoints()))
@ -309,8 +305,7 @@ Attack.prototype.CanAttack = function(target, wantedTypes)
 		if (type == "Capture" && (!cmpCapturable || !cmpCapturable.CanCapture(entityOwner)))
 			continue;

-		// Check if the target is currently in range, or could ever be reached
-		if (!this.IsTargetInRange(target, type) && !this.CanEverReachTarget(target, type))
+		if (heightDiff > this.GetRange(type).max)
 			continue;

 		const restrictedClasses = this.GetRestrictedClasses(type);
@ -324,77 +319,6 @@ Attack.prototype.CanAttack = function(target, wantedTypes)
 	return false;
 };

-/**
- * Check if the target could potentially ever be reached with the given attack type,
- * as an optimistic estimate. This assumes the attacker can move to the closest
- * possible position to the target — ignoring obstructions and terrain features
- * (e.g., hills) that might help or hinder.
- *
- * This is a best-effort guess:
- *  - It may return true even when the target is actually unreachable (e.g., turreted
- *    units on walls with a height offset too large for the projectile to overcome).
- *  - It may return false even when the target is reachable (e.g., a nearby hill could
- *    provide enough elevation to hit a "too high" target, but we don't check for that).
- *
- * Currently these checks are mostly useful to determine if we can reach turreted units
- * (e.g. on a wall, outpost...).
- *
- * @param {number} targetId - The target entity ID.
- * @param {string} type - The attack type.
- * @return {boolean} - Whether the target is estimated to be reachable (see caveats above).
- */
-Attack.prototype.CanEverReachTarget = function(targetId, type)
-{
-	const cmpThisPosition = Engine.QueryInterface(this.entity, IID_Position);
-	const cmpTargetPosition = Engine.QueryInterface(targetId, IID_Position);
-
-	const thisHeightOffset = cmpThisPosition.GetHeightOffset();
-	const targetHeightOffset = cmpTargetPosition.GetHeightOffset();
-
-	const range = this.GetRange(type);
-
-	// Find the closest horizontal distance we could ever get to the target.
-	// We first determine the closest horizontal distance we could ever get to the target,
-	// accounting for turreted units inside buildings:
-	//  - If the building blocks movement, we can only reach its exterior edge.
-	//  - If the building is passable, we can walk right up to the turret point.
-	const cmpTurretable = Engine.QueryInterface(targetId, IID_Turretable);
-	const holderId = cmpTurretable?.HolderID();
-	let closestDistance = 0;
-	if (holderId && holderId != INVALID_ENTITY)
-	{
-		const cmpTurretHolder = Engine.QueryInterface(holderId, IID_TurretHolder);
-		if (cmpTurretHolder)
-		{
-			const turretPoint = cmpTurretHolder.GetOccupiedTurretPoint(targetId);
-			closestDistance = cmpTurretHolder.GetClosestApproachDistanceToTurretPoint(turretPoint);
-		}
-	}
-
-	if (!range.parabolic)
-	{
-		// For non-parabolic attacks (e.g., "Melee" attack type), we check if the height offset
-		// is within max range at the closest possible horizontal distance (simple 3D distance check).
-		const heightDiff = Math.abs(targetHeightOffset - thisHeightOffset);
-		return Math.sqrt(closestDistance * closestDistance + heightDiff * heightDiff) <= range.max;
-	}
-
-	// For parabolic attacks (generally "Ranged" attack type), we use the parabolic formula
-	// to determine if the height offset is surmountable at the closest possible distance.
-	// Typical scenario: units on walls/towers may be unreachable if the attacker's
-	// projectiles can't arc high enough, even at point-blank range.
-	const cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-	if (!cmpRangeManager)
-		return true;
-
-	const yOrigin = this.GetAttackYOrigin(type);
-
-	const maxReachableHeightDiff = cmpRangeManager.GetMaxReachableParabolicHeight(
-		range.max, yOrigin, closestDistance);
-
-	return targetHeightOffset - thisHeightOffset <= maxReachableHeightDiff;
-};
-
 /**
 * Returns undefined if we have no preference or the lowest index of a preferred class.
 */
@ -429,14 +353,12 @@ Attack.prototype.GetPreference = function(target)
 */
 Attack.prototype.GetFullAttackRange = function()
 {
-	const ret = { "min": Infinity, "max": 0, "parabolic": false };
+	const ret = { "min": Infinity, "max": 0 };
 	for (const type of this.GetAttackTypes())
 	{
 		const range = this.GetRange(type);
 		ret.min = Math.min(ret.min, range.min);
 		ret.max = Math.max(ret.max, range.max);
-		if (range.parabolic)
-			ret.parabolic = true;
 	}
 	return ret;
 };
@ -553,39 +475,7 @@ Attack.prototype.GetRange = function(type)
 	let min = +(this.template[type].MinRange || 0);
 	min = ApplyValueModificationsToEntity("Attack/" + type + "/MinRange", min, this.entity);

-	return {
-		"max": max,
-		"min": min,
-		"parabolic": type === "Ranged"
-	};
-};
-
-/**
- * Get the effective range for attacking a specific target, accounting
- * for elevation and projectile physics where applicable.
- * @param {number} target - The target entity ID.
- * @param {string} type - The attack type.
- * @return {{ min: number, max: number }} - The min and max effective range.
- */
-Attack.prototype.GetEffectiveAttackRange = function(target, type)
-{
-	const range = this.GetRange(type);
-
-	// Only Parabolic attacks get parabolic elevation adjustment
-	if (!range.parabolic)
-		return range;
-
-	const cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-	if (!cmpRangeManager)
-		return range;
-
-	const effectiveMax = cmpRangeManager.GetEffectiveParabolicRange(
-		this.entity, target, range.max, this.GetAttackYOrigin(type));
-
-	if (effectiveMax < 0)
-		return { "min": Infinity, "max": 0 }; // Out of range
-
-	return { "min": range.min, "max": effectiveMax };
+	return { "max": max, "min": min };
 };

 Attack.prototype.GetAttackYOrigin = function(type)
@ -923,9 +813,14 @@ Attack.prototype.PerformAttack = function(type, target)
 */
 Attack.prototype.IsTargetInRange = function(target, type)
 {
-	const range = this.GetEffectiveAttackRange(target, type);
-	return Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager).IsInTargetRange(
-		this.entity, target, range.min, range.max, false);
+	const range = this.GetRange(type);
+	return Engine.QueryInterface(SYSTEM_ENTITY, IID_ObstructionManager).IsInTargetParabolicRange(
+		this.entity,
+		target,
+		range.min,
+		range.max,
+		this.GetAttackYOrigin(type),
+		false);
 };

 Attack.prototype.OnValueModification = function(msg)
--- a/binaries/data/mods/public/simulation/components/BuildingAI.js
+++ b/binaries/data/mods/public/simulation/components/BuildingAI.js
@ -127,20 +127,10 @@ BuildingAI.prototype.SetupRangeQuery = function()

 	const range = cmpAttack.GetRange(attackType);
 	const yOrigin = cmpAttack.GetAttackYOrigin(attackType);
-
-	// Get building's vision range
-	const cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
-	const visionRange = cmpVision ? cmpVision.GetRange() : 0;
-
-	// Base range
-	const baseRange = Math.min(visionRange, range.max);
-
 	// This takes entity sizes into accounts, so no need to compensate for structure size.
 	this.enemyUnitsQuery = cmpRangeManager.CreateActiveParabolicQuery(
-		this.entity, range.min, range.max, baseRange, yOrigin,
-		enemies, IID_Resistance, cmpRangeManager.GetEntityFlagMask("normal"),
-		true  // Allow mirages for attack queries
-	);
+		this.entity, range.min, range.max, yOrigin,
+		enemies, IID_Resistance, cmpRangeManager.GetEntityFlagMask("normal"));

 	cmpRangeManager.EnableActiveQuery(this.enemyUnitsQuery);
 };
@ -166,17 +156,10 @@ BuildingAI.prototype.SetupGaiaRangeQuery = function()
 	const range = cmpAttack.GetRange(attackType);
 	const yOrigin = cmpAttack.GetAttackYOrigin(attackType);

-	// Get building's vision range
-	const cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
-	const visionRange = cmpVision ? cmpVision.GetRange() : 0;
-
-	// Base range
-	const baseRange = Math.min(visionRange, range.max);
-
 	// This query is only interested in Gaia entities that can attack.
 	// This takes entity sizes into accounts, so no need to compensate for structure size.
 	this.gaiaUnitsQuery = cmpRangeManager.CreateActiveParabolicQuery(
-		this.entity, range.min, range.max, baseRange, yOrigin,
+		this.entity, range.min, range.max, yOrigin,
 		[0], IID_Attack, cmpRangeManager.GetEntityFlagMask("normal"));

 	cmpRangeManager.EnableActiveQuery(this.gaiaUnitsQuery);
@ -187,6 +170,7 @@ BuildingAI.prototype.SetupGaiaRangeQuery = function()
 */
 BuildingAI.prototype.OnRangeUpdate = function(msg)
 {
+
 	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return;
@ -205,10 +189,10 @@ BuildingAI.prototype.OnRangeUpdate = function(msg)

 	// Add new targets.
 	for (const entity of msg.added)
-		if (!this.targetUnits.includes(entity))
+		if (cmpAttack.CanAttack(entity))
 			this.targetUnits.push(entity);

-	// Remove targets out of range.
+	// Remove targets outside of vision-range.
 	for (const entity of msg.removed)
 	{
 		const index = this.targetUnits.indexOf(entity);
@ -391,7 +375,13 @@ BuildingAI.prototype.FireArrows = function()
 	{

 		const selectedTarget = targets[targetIndex].entityId;
-		if (cmpAttack.CanAttack(selectedTarget, [attackType]))
+		if (this.CheckTargetVisible(selectedTarget) && cmpObstructionManager.IsInTargetParabolicRange(
+			this.entity,
+			selectedTarget,
+			range.min,
+			range.max,
+			yOrigin,
+			false))
 		{
 			cmpAttack.PerformAttack(attackType, selectedTarget);
 			PlaySound("attack_" + attackType.toLowerCase(), this.entity);
--- a/binaries/data/mods/public/simulation/components/TurretHolder.js
+++ b/binaries/data/mods/public/simulation/components/TurretHolder.js
@ -240,39 +240,6 @@ class TurretHolder
 		return turret ? turret.name : "";
 	}

-	/**
-	 * Calculate the closest horizontal distance an external entity could ever get
-	 * to the specified turret point. If the holder is passable, returns 0.
-	 * Otherwise returns the perpendicular distance from the turret point to the
-	 * nearest edge of the holder's obstruction.
-	 *
-	 * @param {string|Object} turretPoint - The turret point name or object.
-	 * @return {number} - The minimum possible horizontal distance.
-	 */
-	GetClosestApproachDistanceToTurretPoint(turretPoint)
-	{
-		if (typeof turretPoint === "string")
-			turretPoint = this.TurretPointByName(turretPoint);
-		if (!turretPoint)
-			return 0;
-
-		const cmpObstruction = Engine.QueryInterface(this.entity, IID_Obstruction);
-		if (!cmpObstruction || !cmpObstruction.GetBlockMovementFlag(false))
-			return 0;
-
-		const dxLocal = turretPoint.offset.x;
-		const dzLocal = turretPoint.offset.z;
-
-		const halfSizes = cmpObstruction.GetObstructionHalfSizes();
-		const hw = halfSizes.x;
-		const hh = halfSizes.y;
-
-		if (hw == null || hh == null || hw < 0 || hh < 0)
-			return 0;
-
-		return Math.max(0, Math.min(hw - Math.abs(dxLocal), hh - Math.abs(dzLocal)));
-	}
-
 	/**
 	 * @return {number[]} - The turretted entityIDs.
 	 */
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@ -4244,31 +4244,10 @@ UnitAI.prototype.SetupAttackRangeQuery = function(enable = true)
 		return;

 	const range = this.GetQueryRange(IID_Attack);
-	if (range.parabolic)
-	{
-		const cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
-		const yOrigin = cmpAttack ? cmpAttack.GetAttackYOrigin("Ranged") : 0;
-
-		// Do not compensate for entity sizes: LOS doesn't, and UnitAI relies on that.
-		this.losAttackRangeQuery = cmpRangeManager.CreateActiveParabolicQuery(
-			this.entity,
-			range.min,
-			range.max,
-			range.base,
-			yOrigin,
-			players,
-			IID_Resistance,
-			cmpRangeManager.GetEntityFlagMask("normal"),
-			true // Allow mirages for attack queries
-		);
-	}
-	else
-		this.losAttackRangeQuery = cmpRangeManager.CreateActiveQuery(this.entity,
-			range.min, range.max, players, IID_Resistance,
-			cmpRangeManager.GetEntityFlagMask("normal"),
-			false,
-			true // Allow mirages for attack queries
-		);
+	// Do not compensate for entity sizes: LOS doesn't, and UnitAI relies on that.
+	this.losAttackRangeQuery = cmpRangeManager.CreateActiveQuery(this.entity,
+		range.min, range.max, players, IID_Resistance,
+		cmpRangeManager.GetEntityFlagMask("normal"), false);

 	if (enable)
 		cmpRangeManager.EnableActiveQuery(this.losAttackRangeQuery);
@ -5178,24 +5157,24 @@ UnitAI.prototype.MoveToTargetAttackRange = function(target, type)
 	if (cmpFormation)
 		target = cmpFormation.GetClosestMemberToEntity(this.entity);

+	if (type != "Ranged")
+		return this.MoveToTargetRange(target, IID_Attack, type);
+
 	if (!this.CheckTargetVisible(target))
 		return false;

 	const cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return false;
+	const range = cmpAttack.GetRange(type);

-	const flatRange = cmpAttack.GetRange(type);
-	const effectiveRange = cmpAttack.GetEffectiveAttackRange(target, type);
-	if (effectiveRange.max < 0)
-		return false;
+	// In case the range returns negative, we are probably too high compared to the target. Hope we come close enough.
+	const parabolicMaxRange = Math.max(0, Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetEffectiveParabolicRange(this.entity, target, range.max, cmpAttack.GetAttackYOrigin(type)));

-	// The parabola changes while walking so be cautious:
-	const guessedMaxRange = effectiveRange.max > flatRange.max ?
-		(flatRange.max + effectiveRange.max) / 2 :
-		effectiveRange.max;
+	// The parabole changes while walking so be cautious:
+	const guessedMaxRange = parabolicMaxRange > range.max ? (range.max + parabolicMaxRange) / 2 : parabolicMaxRange;

-	return cmpUnitMotion && cmpUnitMotion.MoveToTargetRange(target, effectiveRange.min, guessedMaxRange);
+	return cmpUnitMotion && cmpUnitMotion.MoveToTargetRange(target, range.min, guessedMaxRange);
 };

 UnitAI.prototype.MoveToTargetRangeExplicit = function(target, min, max)
@ -5605,16 +5584,8 @@ UnitAI.prototype.ShouldChaseTargetedEntity = function(target, force)
 	if (!this.AbleToMove())
 		return false;

-	// Check if we should chase based on stance
 	if (this.GetStance().respondChase)
-	{
-		// If we're allowed to chase beyond vision, always chase
-		if (this.GetStance().respondChaseBeyondVision)
-			return true;
-
-		// Otherwise, only chase if the target is within our personal vision
-		return this.CheckTargetIsInVisionRange(target);
-	}
+		return true;

 	// If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker
 	if (this.isGuardOf)
@ -6649,22 +6620,9 @@ UnitAI.prototype.FindWalkAndFightTargets = function()
 	return false;
 };

-/**
- * Returns the detection range for the given interface, adjusted by stance.
- *
- * The query range depends on stance because it represents the distance at which
- * the unit should "notice" an enemy and potentially start moving toward it.
- *
- * @param {number} iid - IID_Vision, IID_Heal, or IID_Attack
- * @returns {{min: number, max: number, base: number, parabolic: boolean}}
- * 'parabolic' indicates that the caller
- * should use a parabolic range query (accounting for elevation) instead of a
- * flat 2D one. Generally used for projectile attacks.
- * 'base' is a non-parabolic 2D detection range that always counts as in-range.
- */
 UnitAI.prototype.GetQueryRange = function(iid)
 {
-	const ret = { "min": 0, "max": 0, "base": 0, "parabolic": false };
+	const ret = { "min": 0, "max": 0 };

 	const cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
 	if (!cmpVision)
@ -6677,35 +6635,27 @@ UnitAI.prototype.GetQueryRange = function(iid)
 		return ret;
 	}

-	const range = this.GetRange(iid);
-	if (!range)
-		return ret;
-
-	// The query range depends on stance because it represents the distance at which
-	// the unit should "notice" an enemy and potentially start moving toward it.
-
-	// In all stances, always spot targets within effective attack/heal range.
-	Object.assign(ret, range);
-
-	let nonParabolicMax = 0;
-	if (this.GetStance().respondChase)
-		// Chase: Always spot targets within vision range, so we can chase them.
-		nonParabolicMax = visionRange;
+	if (this.GetStance().respondStandGround)
+	{
+		const range = this.GetRange(iid);
+		if (!range)
+			return ret;
+		ret.min = range.min;
+		ret.max = Math.min(range.max, visionRange);
+	}
+	else if (this.GetStance().respondChase)
+		ret.max = visionRange;
 	else if (this.GetStance().respondHoldGround)
-		// HoldGround: willing to move a bit, so spot targets within attack range + half vision.
-		nonParabolicMax = Math.min(range.max + visionRange / 2, visionRange);
-
-	// StandGround: nonParabolicMax stays 0, using only parabolic range.
-
+	{
+		const range = this.GetRange(iid);
+		if (!range)
+			return ret;
+		ret.max = Math.min(range.max + visionRange / 2, visionRange);
+	}
 	// We probably have stance 'passive' and we wouldn't have a range,
 	// but as it is the default for healers we need to set it to something sane.
 	else if (iid === IID_Heal)
-		nonParabolicMax = visionRange;
-
-	if (ret.parabolic)
-		ret.base = nonParabolicMax;
-	else
-		ret.max = nonParabolicMax;
+		ret.max = visionRange;

 	return ret;
 };
--- a/binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
@ -32,8 +32,6 @@ Engine.LoadComponentScript("interfaces/Formation.js");
 Engine.LoadComponentScript("interfaces/Health.js");
 Engine.LoadComponentScript("interfaces/Resistance.js");
 Engine.LoadComponentScript("interfaces/TechnologyManager.js");
-Engine.LoadComponentScript("interfaces/Turretable.js");
-Engine.LoadComponentScript("interfaces/TurretHolder.js");
 Engine.LoadComponentScript("Attack.js");

 let entityID = 903;
@ -54,16 +52,6 @@ function attackComponentTest(defenderClass, isEnemy, test_function)
 		"IsEnemy": () => isEnemy
 	});

-	AddMock(SYSTEM_ENTITY, IID_ObstructionManager, {
-		"IsInTargetRange": () => true
-	});
-
-	AddMock(SYSTEM_ENTITY, IID_RangeManager, {
-		"GetEffectiveParabolicRange": () => 25,
-		"GetMaxReachableParabolicHeight": () => 15,
-		"GetLosVisibility": (target, owner) => "visible"
-	});
-
 	const attacker = entityID;

 	AddMock(attacker, IID_Position, {
@ -213,7 +201,7 @@ attackComponentTest(undefined, true, (attacker, cmpAttack, defender) =>

 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetPreferredClasses("Melee"), ["Civilian"]);
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetRestrictedClasses("Melee"), ["Elephant", "Archer"]);
-	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetFullAttackRange(), { "min": 0, "max": 80, "parabolic": true });
+	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetFullAttackRange(), { "min": 0, "max": 80 });
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackEffectsData("Capture"), { "Capture": 8 });

 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackEffectsData("Ranged"), {
@ -428,101 +416,3 @@ function testAttackPreference()
 	TS_ASSERT_EQUALS(cmpAttack.GetPreference(attacker+4), undefined);
 }
 testAttackPreference();
-
-function testCanEverReachTarget()
-{
-	const attacker = ++entityID;
-
-	AddMock(attacker, IID_Position, {
-		"IsInWorld": () => true,
-		"GetHeightOffset": () => 0,
-		"GetPosition2D": () => new Vector2D(1, 2)
-	});
-
-	const cmpAttack = ConstructComponent(attacker, "Attack", {
-		"Melee": {
-			"Damage": { "Hack": 10, "Pierce": 0, "Crush": 0 },
-			"MaxRange": 5
-		},
-		"Ranged": {
-			"Damage": { "Hack": 0, "Pierce": 10, "Crush": 0 },
-			"MaxRange": 30,
-			"Projectile": { "Speed": 50, "Spread": 1, "Gravity": 1, "FriendlyFire": "false" }
-		}
-	});
-
-	// Melee target within 3D range
-	{
-		const defender = ++entityID;
-		AddMock(defender, IID_Position, {
-			"IsInWorld": () => true,
-			"GetHeightOffset": () => 0
-		});
-		TS_ASSERT_EQUALS(cmpAttack.CanEverReachTarget(defender, "Melee"), true);
-	}
-
-	// Melee target too high
-	{
-		const defender = ++entityID;
-		AddMock(defender, IID_Position, {
-			"IsInWorld": () => true,
-			"GetHeightOffset": () => 10
-		});
-		TS_ASSERT_EQUALS(cmpAttack.CanEverReachTarget(defender, "Melee"), false);
-	}
-
-	// Melee target at same height, within range (close distance)
-	{
-		const defender = ++entityID;
-		AddMock(defender, IID_Position, {
-			"IsInWorld": () => true,
-			"GetHeightOffset": () => 4
-		});
-		// sqrt(0² + 4²) = 4 <= 5
-		TS_ASSERT_EQUALS(cmpAttack.CanEverReachTarget(defender, "Melee"), true);
-	}
-
-	// Ranged: target at same height — reachable from current position (check 1)
-	{
-		const defender = ++entityID;
-		AddMock(defender, IID_Position, {
-			"IsInWorld": () => true,
-			"GetHeightOffset": () => 0,
-			"GetPosition": () => new Vector3D(1, 0, 2)
-		});
-		// Need RangeManager mock for IsTargetInRange (check 1) to work
-		AddMock(SYSTEM_ENTITY, IID_RangeManager, {
-			"GetEffectiveParabolicRange": () => 25,
-			"GetMaxReachableParabolicHeight": () => 15
-		});
-		AddMock(SYSTEM_ENTITY, IID_ObstructionManager, {
-			"IsInTargetRange": () => true
-		});
-		TS_ASSERT_EQUALS(cmpAttack.CanEverReachTarget(defender, "Ranged"), true);
-	}
-
-	// Ranged: target too high for parabolic arc even at closest approach (check 2)
-	{
-		const defender = ++entityID;
-		AddMock(defender, IID_Position, {
-			"IsInWorld": () => true,
-			"GetHeightOffset": () => 20,
-			"GetPosition": () => new Vector3D(1, 20, 2)
-		});
-
-		AddMock(SYSTEM_ENTITY, IID_RangeManager, {
-			"GetEffectiveParabolicRange": () => -1, // out of range
-			"GetMaxReachableParabolicHeight": () => 10
-		});
-
-		AddMock(SYSTEM_ENTITY, IID_ObstructionManager, {
-			"IsInTargetRange": () => false
-		});
-
-		// heightDiff = 20 - 0 = 20, maxReachableHeightDiff = 10 → unreachable
-		TS_ASSERT_EQUALS(cmpAttack.CanEverReachTarget(defender, "Ranged"), false);
-	}
-}
-testCanEverReachTarget();
-
-
--- a/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_TurretHolder.js
@ -15,7 +15,6 @@ const enemyPlayer = 2;
 const alliedPlayer = 3;
 const turretHolderID = 9;
 const entitiesToTest = [10, 11, 12, 13];
-let entityID = 100;

 AddMock(turretHolderID, IID_Ownership, {
 	"GetOwner": () => player
@ -245,80 +244,3 @@ cmpTurretHolder.OnOwnershipChanged({
 	"from": INVALID_PLAYER
 });
 TS_ASSERT(cmpTurretHolder.OccupiesTurretPoint(spawned));
-
-// Test GetClosestApproachDistanceToTurretPoint
-{
-	const holder = ++entityID;
-
-	// Mock the holder's obstruction
-	AddMock(holder, IID_Obstruction, {
-		"GetBlockMovementFlag": () => true,
-		"GetObstructionHalfSizes": () => ({ "x": 10, "y": 15 })
-	});
-
-	const cmpHolder = ConstructComponent(holder, "TurretHolder", {
-		"TurretPoints": {
-			"center": {
-				"X": "0",
-				"Y": "5.0",
-				"Z": "0"
-			},
-			"edge": {
-				"X": "8.0",
-				"Y": "5.0",
-				"Z": "0"
-			},
-			"corner": {
-				"X": "10.0",
-				"Y": "5.0",
-				"Z": "15.0"
-			},
-			"outside": {
-				"X": "15.0",
-				"Y": "5.0",
-				"Z": "0"
-			}
-		}
-	});
-
-	// Center point (0,0) in 20x30 building → min(10, 15) = 10
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint("center"), 10);
-
-	// Edge point (8,0) in 20x30 building → min(10-8, 15-0) = 2
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint("edge"), 2);
-
-	// Corner point (10,15) in 20x30 building → min(10-10, 15-15) = 0
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint("corner"), 0);
-
-	// Outside point (15,0) in 20x30 building → min(10-15, 15-0) = -5 → clamped to 0
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint("outside"), 0);
-
-	// Nonexistent turret point
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint("nonexistent"), 0);
-
-	// Pass object directly
-	const turretPoint = cmpHolder.TurretPointByName("center");
-	TS_ASSERT_EQUALS(cmpHolder.GetClosestApproachDistanceToTurretPoint(turretPoint), 10);
-
-	// Passable building (no obstruction or doesn't block movement)
-	const passableHolder = ++entityID;
-	AddMock(passableHolder, IID_Obstruction, {
-		"GetBlockMovementFlag": () => false
-	});
-	const cmpHolderPassable = ConstructComponent(passableHolder, "TurretHolder", {
-		"TurretPoints": {
-			"center": { "X": "0", "Y": "5.0", "Z": "0" }
-		}
-	});
-	TS_ASSERT_EQUALS(cmpHolderPassable.GetClosestApproachDistanceToTurretPoint("center"), 0);
-
-	// No obstruction component at all
-	++entityID;
-	const cmpHolderNoObst = ConstructComponent(entityID, "TurretHolder", {
-		"TurretPoints": {
-			"center": { "X": "0", "Y": "5.0", "Z": "0" }
-		}
-	});
-	TS_ASSERT_EQUALS(cmpHolderNoObst.GetClosestApproachDistanceToTurretPoint("center"), 0);
-}
-
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_2.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/athen_catafalque_2.json
@ -8,5 +8,5 @@
 		{ "value": "Researcher/TechCostMultiplier/metal", "multiply": 0.9 }
 	],
 	"auraName": "Economic Fortune",
-	"auraDescription": "Solon brought in a new system of weights and measures, and fathers were encouraged to find trades for their sons.\nEconomic technologies −10% resource costs."
+	"auraDescription": "Solon brought in a new system of weights and measures, fathers were encouraged to find trades for their sons.\nEconomic technologies −10% resource costs."
 }
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/han_catafalque_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/han_catafalque_1.json
@ -5,5 +5,5 @@
 		{ "value": "TerritoryInfluence/Radius", "multiply": 1.2 }
 	],
 	"auraName": "Territorial Expansion",
-	"auraDescription": "At its height, the Empire's borders spanned from the Fergana Valley in the west to Korea in the east and to northern Vietnam in the south.\nTerritory influence bonus +20%."
+	"auraDescription": "At its height, the Empire's borders spanned from the Fergana Valley in the west, to Korea in the east, and to northern Vietnam in the south.\nTerritory influence bonus +20%."
 }
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
@ -7,5 +7,5 @@
 		{ "value": "Resistance/Entity/Damage/Crush", "add": 1 }
 	],
 	"auraName": "Founder and Defender of the Republic",
-	"auraDescription": "Brutus was one of the key figures in the overthrow of the monarchy and the founding of the Roman Republic. Later, as consul, he led a Roman army to victory against the Etruscan King Tarquinius who sought to retake the throne.\nHumans and Siege Engines +1 crush, hack, and pierce resistance."
+	"auraDescription": "Brutus was one of the key figures in the overthrow of the monarchy and the founding of the Roman Republic. Later, as consul he led a Roman army to victory against the Etruscan King Tarquinius who sought to retake the throne.\nHumans and Siege Engines +1 crush, hack, pierce resistance."
 }
--- a/binaries/data/mods/public/simulation/helpers/Transform.js
+++ b/binaries/data/mods/public/simulation/helpers/Transform.js
@ -24,12 +24,6 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
 	if (cmpVisual && cmpNewVisual)
 		cmpNewVisual.SetActorSeed(cmpVisual.GetActorSeed());

-	// Set ownership so turret checks work properly
-	const cmpOwnership = Engine.QueryInterface(oldEnt, IID_Ownership);
-	const cmpNewOwnership = Engine.QueryInterface(newEnt, IID_Ownership);
-	if (cmpOwnership && cmpNewOwnership)
-		cmpNewOwnership.SetOwner(cmpOwnership.GetOwner());
-
 	const cmpOldTurretable = Engine.QueryInterface(oldEnt, IID_Turretable);

 	// If the old entity is turreted, we need to handle it before copying position
@ -45,15 +39,9 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
 			// Check if it's allowed to occupy the turret point
 			const cmpTurretHolderOfOldEnt = Engine.QueryInterface(cmpOldTurretable.HolderID(), IID_TurretHolder);

-			if (cmpTurretHolderOfOldEnt)
-			{
-				// Find the actual turret point object using the old entity
-				const turretPoint = cmpTurretHolderOfOldEnt.GetOccupiedTurretPoint(oldEnt);
-
-				if (!turretPoint || !cmpTurretHolderOfOldEnt.AllowedToOccupyTurretPoint(newEnt, turretPoint, true))
-					cmpOldTurretable.LeaveTurret(true);
-				// If allowed, don't leave the turret - OnEntityRenamed will handle the swap
-			}
+			if (cmpTurretHolderOfNewEnt &&
+				!cmpTurretHolderOfOldEnt.AllowedToOccupyTurretPoint(newEnt, cmpOldTurretable.GetTurretPointName(), true))
+				cmpOldTurretable.LeaveTurret(true);
 		}
 	}

@ -98,6 +86,24 @@ function ChangeEntityTemplate(oldEnt, newTemplate)
 		for (const entity of cmpTurretHolder.GetEntities())
 			cmpNewTurretHolder.SetReservedTurretPoint(cmpTurretHolder.GetOccupiedTurretPointName(entity));

+	let owner;
+	const cmpTerritoryDecay = Engine.QueryInterface(newEnt, IID_TerritoryDecay);
+	if (cmpTerritoryDecay && cmpTerritoryDecay.HasTerritoryOwnership() && cmpNewPosition)
+	{
+		const pos = cmpNewPosition.GetPosition2D();
+		const cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
+		owner = cmpTerritoryManager.GetOwner(pos.x, pos.y);
+	}
+	else
+	{
+		const cmpOwnership = Engine.QueryInterface(oldEnt, IID_Ownership);
+		if (cmpOwnership)
+			owner = cmpOwnership.GetOwner();
+	}
+	const cmpNewOwnership = Engine.QueryInterface(newEnt, IID_Ownership);
+	if (cmpNewOwnership)
+		cmpNewOwnership.SetOwner(owner);
+
 	CopyControlGroups(oldEnt, newEnt);

 	// Rescale capture points
--- a/libraries/source/cpp-httplib/build.sh
+++ b/libraries/source/cpp-httplib/build.sh
@ -33,8 +33,6 @@ echo "Building cpp-httplib..."
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/libraries/source/cxxtest-4.4/build.sh
+++ b/libraries/source/cxxtest-4.4/build.sh
@ -33,8 +33,6 @@ done
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/libraries/source/fcollada/build.sh
+++ b/libraries/source/fcollada/build.sh
@ -49,8 +49,6 @@ done
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/libraries/source/nvtt/build.sh
+++ b/libraries/source/nvtt/build.sh
@ -49,8 +49,6 @@ done
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/libraries/source/premake-core/build.sh
+++ b/libraries/source/premake-core/build.sh
@ -36,8 +36,6 @@ done
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/libraries/source/spidermonkey/build.sh
+++ b/libraries/source/spidermonkey/build.sh
@ -56,8 +56,6 @@ echo "Building SpiderMonkey..."
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 OS="${OS:=$(uname -s)}"
--- a/libraries/source/spirv-reflect/build.sh
+++ b/libraries/source/spirv-reflect/build.sh
@ -33,8 +33,6 @@ done
 if [ -e .already-built ] && [ "$(cat .already-built || true)" = "${LIB_VERSION}" ]; then
 	echo "Skipping - already built (use --force-rebuild to override)"
 	exit
-else
-	rm -f .already-built
 fi

 # fetch
--- a/ruff.toml
+++ b/ruff.toml
@ -33,7 +33,6 @@ ignore = [
    "ANN",
    "C90",
    "COM812",
-    "CPY001",
    "D10",
    "EM",
    "FIX002",
--- a/source/graphics/LightEnv.h
+++ b/source/graphics/LightEnv.h
@ -53,6 +53,25 @@ public:
 	void SetElevation(float f);
 	void SetRotation(float f);

+	/**
+	 * Calculate brightness of a point of a unit with the given normal vector,
+	 * for rendering with CPU lighting.
+	 * The resulting color contains both ambient and diffuse light.
+	 * To cope with sun overbrightness, the color is scaled by 0.5.
+	 *
+	 * @param normal normal vector (must have length 1)
+	 */
+	RGBColor EvaluateUnitScaled(const CVector3D& normal) const
+	{
+		float dot = -normal.Dot(m_SunDir);
+
+		RGBColor color = m_AmbientColor;
+		if (dot > 0)
+			color += m_SunColor * dot;
+
+		return color * 0.5f;
+	}
+
 	// Comparison operators
 	bool operator==(const CLightEnv& o) const
 	{
--- a/source/graphics/ObjectBase.cpp
+++ b/source/graphics/ObjectBase.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -69,7 +69,7 @@ CObjectBase::CObjectBase(CObjectManager& objectManager, CActorDef& actorDef, u8
 	m_Properties.m_FloatOnWater = false;

 	// Remove leading art/actors/ & include quality level.
-	m_Identifier = fmt::format("{}{}", m_ActorDef.m_Pathname.string8().substr(11), m_QualityLevel);
+	m_Identifier = m_ActorDef.m_Pathname.string8().substr(11) + CStr::FromInt(m_QualityLevel);
 }

 std::unique_ptr<CObjectBase> CObjectBase::CopyWithQuality(u8 newQualityLevel) const
--- a/source/graphics/PreprocessorWrapper.cpp
+++ b/source/graphics/PreprocessorWrapper.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -156,8 +156,7 @@ bool ResolveIncludesImpl(
 			it = includeCache.emplace(path, std::move(includeContent)).first;
 		}
 		// We need to insert #line directives to have correct line numbers in errors.
-		chunks.emplace_back(fmt::format("{}1\n{}\n{}{}\n", lineDirective, it->second, lineDirective,
-			line + 1));
+		chunks.emplace_back(lineDirective + "1\n" + it->second + "\n" + lineDirective + CStr::FromUInt(line + 1) + "\n");
 		processedParts.emplace_back(currentPart.substr(0, lineStart));
 		if (!ResolveIncludesImpl(chunks.back(), includeCache, includeCallback, chunks, processedParts))
 			return false;
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@ -755,7 +755,7 @@ void CGUI::Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, IGUIObje
 	// Check if name isn't set, generate an internal name in that case.
 	if (!NameSet)
 	{
-		object->SetName(fmt::format("__internal({})", m_InternalNameNumber));
+		object->SetName("__internal(" + CStr::FromInt(m_InternalNameNumber) + ")");
 		++m_InternalNameNumber;
 	}

@ -977,7 +977,7 @@ void CGUI::Xeromyces_ReadRepeat(const XMBData& xmb, XMBElement element, IGUIObje

 	for (int n = 0; n < count; ++n)
 	{
-		NameSubst.emplace_back(var, fmt::format("[{}]", n));
+		NameSubst.emplace_back(var, "[" + CStr::FromInt(n) + "]");

 		XERO_ITER_EL(element, child)
 		{
--- a/source/network/NetMessage.cpp
+++ b/source/network/NetMessage.cpp
@ -88,7 +88,7 @@ CStr CNetMessage::ToString() const
 	if (GetType() == NMT_INVALID)
 		return "MESSAGE_TYPE_NONE { Undefined Message }";
 	else
-		return fmt::format("Unknown Message {}", static_cast<int>(GetType()));
+		return "Unknown Message " + CStr::FromInt(GetType());
 }

 CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@ -54,7 +54,6 @@

 #include <algorithm>
 #include <cstring>
-#include <fmt/format.h>
 #include <functional>
 #include <iterator>
 #include <memory>
@ -71,10 +70,6 @@
 #include <miniupnpc/upnperrors.h>
 #endif

-#if FMT_VERSION >= 80000
-#include <fmt/xchar.h>
-#endif
-
 /**
 * Number of peers to allocate for the enet host.
 * Limited by ENET_PROTOCOL_MAXIMUM_PEER_ID (4096).
@ -1646,7 +1641,7 @@ CStrW CNetServerWorker::DeduplicatePlayerName(const CStrW& original)
 		if (unique)
 			return name;

-		name = fmt::format(L"{}({})", original, id++);
+		name = original + L" (" + CStrW::FromUInt(id++) + L")";
 	}
 }

--- a/source/network/NetStats.cpp
+++ b/source/network/NetStats.cpp
@ -19,7 +19,6 @@

 #include "NetStats.h"

-#include <fmt/format.h>
 #include <string>

 enum
@ -78,7 +77,7 @@ const std::vector<ProfileColumn>& CNetStatsTable::GetColumns()
 		std::lock_guard<std::mutex> lock(m_Mutex);

 		for (size_t i = 0; i < m_LatchedData.size(); ++i)
-			m_ColumnDescriptions.push_back(ProfileColumn(fmt::format("Peer {}", i), 80));
+			m_ColumnDescriptions.push_back(ProfileColumn("Peer "+CStr::FromUInt(i), 80));
 	}

 	return m_ColumnDescriptions;
@ -96,7 +95,7 @@ CStr CNetStatsTable::GetCellText(size_t row, size_t col)
 	#define ROW(id, title, member) \
 	case id: \
 		if (col == 0) return title; \
-		if (m_Peer) return std::to_string(m_Peer->member); \
+		if (m_Peer) return CStr::FromUInt(m_Peer->member); \
 		return "???"

 	switch(row)
@ -130,7 +129,7 @@ void CNetStatsTable::LatchHostState(const ENetHost& host)
 	std::lock_guard<std::mutex> lock(m_Mutex);

 #define ROW(id, title, member) \
-	m_LatchedData[i].push_back(std::to_string(host.peers[i].member));
+	m_LatchedData[i].push_back(CStr::FromUInt(host.peers[i].member));

 	m_LatchedData.clear();
 	m_LatchedData.resize(host.peerCount);
--- a/source/network/StringConverters.h
+++ b/source/network/StringConverters.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -25,7 +25,7 @@

 static inline CStr NetMessageStringConvert(u32 arg)
 {
-	return std::to_string(arg);
+	return CStr::FromUInt(arg);
 }

 static inline CStr NetMessageStringConvert(const CStr8& arg)
--- a/source/ps/CStr.cpp
+++ b/source/ps/CStr.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -202,6 +202,27 @@ CStr CStr::Repeat(const CStr& str, size_t reps)

 // Construction from numbers:

+CStr CStr::FromInt(int n)
+{
+	tstringstream<StrBase> ss;
+	ss << n;
+	return ss.str();
+}
+
+CStr CStr::FromUInt(unsigned int n)
+{
+	tstringstream<StrBase> ss;
+	ss << n;
+	return ss.str();
+}
+
+CStr CStr::FromInt64(i64 n)
+{
+	tstringstream<StrBase> ss;
+	ss << n;
+	return ss.str();
+}
+
 CStr CStr::FromDouble(double n)
 {
 	tstringstream<StrBase> ss;
--- a/source/ps/CStr.h
+++ b/source/ps/CStr.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -95,6 +95,9 @@ public:

 	// Conversions:

+	static CStr FromInt(int n);
+	static CStr FromUInt(unsigned int n);
+	static CStr FromInt64(i64 n);
 	static CStr FromDouble(double n);

 	/**
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@ -90,6 +90,7 @@ CGame::CGame(bool replayLog, const SimulationDebugOptions debugOptions):
 	m_SimRate(1.0f),
 	m_PlayerID(-1),
 	m_ViewedPlayerID(-1),
+	m_IsSavedGame(false),
 	m_IsVisualReplay(false),
 	m_ReplayStream(NULL)
 {
@ -223,7 +224,7 @@ void CGame::RegisterInit(const JS::HandleValue attribs, const std::string& saved
 	const Script::Interface& scriptInterface = m_Simulation2->GetScriptInterface();
 	Script::Request rq(scriptInterface);

-	const bool isSavedGame{!savedState.empty()};
+	m_IsSavedGame = !savedState.empty();

 	m_Simulation2->SetInitAttributes(attribs);

@ -284,7 +285,7 @@ void CGame::RegisterInit(const JS::HandleValue attribs, const std::string& saved
 			co_return g_Renderer.GetSceneRenderer().GetWaterManager().LoadWaterTextures();
 		}, L"LoadWaterTextures", 80);

-	if (isSavedGame)
+	if (m_IsSavedGame)
 		PS::Loader::Register(std::bind_front(
 			[](CGame* game, const std::string& state) -> PS::Loader::Task
 		{
@ -297,32 +298,13 @@ void CGame::RegisterInit(const JS::HandleValue attribs, const std::string& saved
 			co_return game->LoadVisualReplayData();
 		}, this), L"Loading visual replay data", 1000);

-	// Call the script function InitGame only for new games, not saved games
-	if (!isSavedGame)
-	{
-		// Perform some simulation initializations (replace skirmish entities, explore territories, etc.)
-		// that needs to be done before setting up the AI and shouldn't be done in Atlas
-		if (!g_AtlasGameLoop->running)
-		{
-			PS::Loader::Register(std::bind_front([](CGame* game) -> PS::Loader::Task
-			{
-				game->m_Simulation2->PreInitGame();
-				co_return 0;
-			}, this), L"PreInitGame", 5000);
-		}
-
-		PS::Loader::Register(std::bind_front([](CGame* game) -> PS::Loader::Task
-		{
-			game->m_Simulation2->InitGame();
-			co_return 0;
-		}, this), L"InitGame", 4000);
-	}
-
 	PS::Loader::EndRegistering();
 }

 int CGame::LoadInitialState(const std::string& savedState)
 {
+	ENSURE(m_IsSavedGame);
+
 	std::stringstream stream(savedState);

 	bool ok = m_Simulation2->DeserializeState(stream);
@ -342,6 +324,17 @@ int CGame::LoadInitialState(const std::string& savedState)
 **/
 PSRETURN CGame::ReallyStartGame()
 {
+	// Call the script function InitGame only for new games, not saved games
+	if (!m_IsSavedGame)
+	{
+		// Perform some simulation initializations (replace skirmish entities, explore territories, etc.)
+		// that needs to be done before setting up the AI and shouldn't be done in Atlas
+		if (!g_AtlasGameLoop->running)
+			m_Simulation2->PreInitGame();
+
+		m_Simulation2->InitGame();
+	}
+
 	// We need to do an initial Interpolate call to set up all the models etc,
 	// because Update might never interpolate (e.g. if the game starts paused)
 	// and we could end up rendering before having set up any models (so they'd
--- a/source/ps/Game.h
+++ b/source/ps/Game.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -226,6 +226,7 @@ private:
 	std::vector<CColor> m_PlayerColors;

 	int LoadInitialState(const std::string& savedState);
+	bool m_IsSavedGame; // true if loading a saved game; false for a new game

 	bool m_CheatsEnabled;

--- a/source/ps/KeyName.cpp
+++ b/source/ps/KeyName.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -27,7 +27,6 @@
 #include <SDL_keycode.h>
 #include <algorithm>
 #include <cstring>
-#include <fmt/format.h>
 #include <string>
 #include <unordered_map>
 #include <utility>
@ -123,7 +122,7 @@ CStr FindScancodeName(SDL_Scancode scancode)
 	const char* name = SDL_GetScancodeName(scancode);
 	// Some scancodes have no name, but we must have something to save/load/recognize it, so parse it as SYM_XX
 	if (strlen(name) == 0)
-		return fmt::format("SYM_{}", static_cast<int>(scancode));
+		return CStr("SYM_") + CStr::FromInt(scancode);
 	return name;
 }

@ -222,7 +221,7 @@ CStr FindKeyName(SDL_Scancode scancode)
 		return name;

 	// Else, show something regardless, so the player knows it's at least recognized.
-	return fmt::format("SYM_{}", static_cast<int>(scancode));
+	return CStr("SYM_") + CStr::FromInt(scancode);
 }


--- a/source/ps/Profiler2.cpp
+++ b/source/ps/Profiler2.cpp
@ -517,7 +517,7 @@ void rewriteBuffer(u8* buffer, u32& bufferSize)
 			std::string basic = attrib;
 			std::map<std::string, double>::iterator time_attrib = time_per_attribute.find(attrib);
 			if (time_attrib != time_per_attribute.end())
-				basic = fmt::format("{} {}us", basic, 1000000 * time_attrib->second);
+				basic += " " + CStr::FromInt(1000000*time_attrib->second) + "us";

 			u32 length = static_cast<u32>(basic.size());
 			memcpy(buffer + writePos, &length, sizeof(length));
--- a/source/ps/UserReport.cpp
+++ b/source/ps/UserReport.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -44,7 +44,6 @@
 #include <cstring>
 #include <ctime>
 #include <deque>
-#include <fmt/format.h>
 #include <fstream>
 #include <memory>
 #include <mutex>
@ -338,7 +337,7 @@ private:
 		{
 			long code = -1;
 			curl_easy_getinfo(m_Curl, CURLINFO_RESPONSE_CODE, &code);
-			SetStatus(fmt::format("completed:{}", code));
+			SetStatus("completed:" + CStr::FromInt(code));

 			// Check for success code
 			if (code == 200)
@ -361,7 +360,7 @@ private:
 			if (errorString.empty())
 				errorString = curl_easy_strerror(err);

-			SetStatus(fmt::format("failed:{}:{}", static_cast<int>(err), errorString));
+			SetStatus("failed:" + CStr::FromInt(err) + ":" + errorString);
 		}

 		// We got an unhandled return code or a connection failure;
@ -386,12 +385,12 @@ private:
 		r += "user_id=";
 		AppendEscaped(r, m_UserID);

-		r = fmt::format("{}&time={}", std::move(r), report.m_Time);
+		r += "&time=" + CStr::FromInt64(report.m_Time);

 		r += "&type=";
 		AppendEscaped(r, report.m_Type);

-		r = fmt::format("{}&version={}", std::move(r), report.m_Version);
+		r += "&version=" + CStr::FromInt(report.m_Version);

 		r += "&data=";
 		AppendEscaped(r, report.m_Data);
@ -530,7 +529,7 @@ bool CUserReporter::IsReportingEnabled()

 void CUserReporter::SetReportingEnabled(bool enabled)
 {
-	const std::string val{std::to_string(enabled ? REPORTER_VERSION : 0)};
+	CStr val = CStr::FromInt(enabled ? REPORTER_VERSION : 0);
 	g_ConfigDB.SetValueString(CFG_USER, "userreport.enabledversion", val);
 	g_ConfigDB.WriteValueToFile(CFG_USER, "userreport.enabledversion", val);

--- a/source/renderer/CPUSkinnedModelRenderer.h
+++ b/source/renderer/CPUSkinnedModelRenderer.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -33,7 +33,7 @@ namespace Renderer::Backend { class IDeviceCommandContext; }
 * This computes and binds per-vertex data; the modifier is responsible
 * for setting any shader uniforms etc.
 */
-class CPUSkinnedModelVertexRenderer final : public ModelVertexRenderer
+class CPUSkinnedModelVertexRenderer : public ModelVertexRenderer
 {
 public:
 	CPUSkinnedModelVertexRenderer();
--- a/source/renderer/GPUSkinnedModelRenderer.h
+++ b/source/renderer/GPUSkinnedModelRenderer.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ namespace Renderer::Backend { class IShaderProgram; }
 * This computes and binds per-vertex data; the modifier is responsible
 * for setting any shader uniforms etc.
 */
-class GPUSkinnedModelModelRenderer final : public ModelVertexRenderer
+class GPUSkinnedModelModelRenderer : public ModelVertexRenderer
 {
 public:
 	GPUSkinnedModelModelRenderer();
--- a/source/renderer/InstancingModelRenderer.h
+++ b/source/renderer/InstancingModelRenderer.h
@ -34,7 +34,7 @@ struct InstancingModelRendererInternals;
 * This computes and binds per-vertex data; the modifier is responsible
 * for setting any shader uniforms etc (including the instancing transform).
 */
-class InstancingModelRenderer final : public ModelVertexRenderer
+class InstancingModelRenderer : public ModelVertexRenderer
 {
 public:
 	InstancingModelRenderer();
--- a/source/renderer/ModelRenderer.cpp
+++ b/source/renderer/ModelRenderer.cpp
@ -102,11 +102,15 @@ CMaterial::Pass GetMaterialPassFromCullGroup(const int cullGroup, const ERenderM

 }

-// static
+void ModelRenderer::Init()
+{
+}
+
+// Helper function to copy object-space position and normal vectors into arrays.
 void ModelRenderer::CopyPositionAndNormals(
-	const CModelDefPtr& mdef,
-	const VertexArrayIterator<CVector3D>& Position,
-	const VertexArrayIterator<CVector3D>& Normal)
+		const CModelDefPtr& mdef,
+		const VertexArrayIterator<CVector3D>& Position,
+		const VertexArrayIterator<CVector3D>& Normal)
 {
 	size_t numVertices = mdef->GetNumVertices();
 	SModelVertex* vertices = mdef->GetVertices();
@ -118,11 +122,11 @@ void ModelRenderer::CopyPositionAndNormals(
 	}
 }

-// static
+// Helper function to transform position and normal vectors into world-space.
 void ModelRenderer::BuildPositionAndNormals(
-	CModel* model,
-	const VertexArrayIterator<CVector3D>& Position,
-	const VertexArrayIterator<CVector3D>& Normal)
+		CModel* model,
+		const VertexArrayIterator<CVector3D>& Position,
+		const VertexArrayIterator<CVector3D>& Normal)
 {
 	CModelDefPtr mdef = model->GetModelDef();
 	size_t numVertices = mdef->GetNumVertices();
@ -156,16 +160,43 @@ void ModelRenderer::BuildPositionAndNormals(
 	}
 }

-// static
+
+// Helper function for lighting
+void ModelRenderer::BuildColor4ub(
+		CModel* model,
+		const VertexArrayIterator<CVector3D>& Normal,
+		const VertexArrayIterator<SColor4ub>& Color)
+{
+	PROFILE("lighting vertices");
+
+	CModelDefPtr mdef = model->GetModelDef();
+	size_t numVertices = mdef->GetNumVertices();
+	const CLightEnv& lightEnv = g_Renderer.GetSceneRenderer().GetLightEnv();
+	CColor shadingColor = model->GetShadingColor();
+
+	for (size_t j = 0; j < numVertices; ++j)
+	{
+		RGBColor tempcolor = lightEnv.EvaluateUnitScaled(Normal[j]);
+		tempcolor.X *= shadingColor.r;
+		tempcolor.Y *= shadingColor.g;
+		tempcolor.Z *= shadingColor.b;
+		Color[j] = ConvertRGBColorTo4ub(tempcolor);
+	}
+}
+
+
 void ModelRenderer::GenTangents(const CModelDefPtr& mdef, std::vector<float>& newVertices, bool gpuSkinning)
 {
 	MikkTSpace ms(mdef, newVertices, gpuSkinning);
 	ms.Generate();
 }

-// static
+
+// Copy UV coordinates
 void ModelRenderer::BuildUV(
-	const CModelDefPtr& mdef, const VertexArrayIterator<float[2]>& UV, int UVset)
+		const CModelDefPtr& mdef,
+		const VertexArrayIterator<float[2]>& UV,
+		int UVset)
 {
 	const size_t numVertices = mdef->GetNumVertices();
 	const size_t numberOfUVPerVertex = mdef->GetNumUVsPerVertex();
@ -178,9 +209,11 @@ void ModelRenderer::BuildUV(
 	}
 }

-// static
+
+// Build default indices array.
 void ModelRenderer::BuildIndices(
-	const CModelDefPtr& mdef, const VertexArrayIterator<u16>& Indices)
+		const CModelDefPtr& mdef,
+		const VertexArrayIterator<u16>& Indices)
 {
 	size_t idxidx = 0;
 	SModelFace* faces = mdef->GetFaces();
@ -194,6 +227,105 @@ void ModelRenderer::BuildIndices(
 	}
 }

+
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+// ShaderModelRenderer implementation
+
+
+/**
+ * Internal data of the ShaderModelRenderer.
+ *
+ * Separated into the source file to increase implementation hiding (and to
+ * avoid some causes of recompiles).
+ */
+struct ShaderModelRenderer::ShaderModelRendererInternals
+{
+	ShaderModelRendererInternals(ShaderModelRenderer* r) : m_Renderer(r) { }
+
+	/// Back-link to "our" renderer
+	ShaderModelRenderer* m_Renderer;
+
+	/// ModelVertexRenderer used for vertex transformations
+	ModelVertexRendererPtr vertexRenderer;
+
+	/// List of submitted models for rendering in this frame
+	std::vector<CModel*> submissions[CSceneRenderer::CULL_MAX];
+};
+
+
+// Construction/Destruction
+ShaderModelRenderer::ShaderModelRenderer(ModelVertexRendererPtr vertexrenderer)
+{
+	m = new ShaderModelRendererInternals(this);
+	m->vertexRenderer = vertexrenderer;
+}
+
+ShaderModelRenderer::~ShaderModelRenderer()
+{
+	delete m;
+}
+
+// Submit one model.
+void ShaderModelRenderer::Submit(int cullGroup, CModel* model)
+{
+	CModelRData* rdata = (CModelRData*)model->GetRenderData();
+
+	// Ensure model data is valid
+	const void* key = m->vertexRenderer.get();
+	if (!rdata || rdata->GetKey() != key)
+	{
+		model->InvalidatePosition();
+		rdata = m->vertexRenderer->CreateModelData(key, model);
+		model->SetRenderData(rdata);
+		model->SetDirty(~0u);
+	}
+
+	m->submissions[cullGroup].push_back(model);
+}
+
+
+// Call update for all submitted models and enter the rendering phase
+void ShaderModelRenderer::PrepareModels(
+	Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
+{
+	for (int cullGroup = 0; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
+	{
+		for (CModel* model : m->submissions[cullGroup])
+		{
+			model->ValidatePosition();
+
+			CModelRData* rdata = static_cast<CModelRData*>(model->GetRenderData());
+			ENSURE(rdata->GetKey() == m->vertexRenderer.get());
+		}
+
+		m->vertexRenderer->UpdateModelsData(deviceCommandContext, m->submissions[cullGroup]);
+
+		for (CModel* model : m->submissions[cullGroup])
+		{
+			CModelRData* rdata = static_cast<CModelRData*>(model->GetRenderData());
+			rdata->m_UpdateFlags = 0;
+		}
+	}
+}
+
+void ShaderModelRenderer::UploadModels(
+	Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
+{
+	for (int cullGroup = 0; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
+	{
+		m->vertexRenderer->UploadModelsData(deviceCommandContext, m->submissions[cullGroup]);
+	}
+}
+
+// Clear the submissions list
+void ShaderModelRenderer::EndFrame()
+{
+	for (int cullGroup = 0; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
+		m->submissions[cullGroup].clear();
+}
+
+
 // Helper structs for ShaderModelRenderer::Render():

 struct SMRSortByDistItem
@ -281,12 +413,12 @@ struct SMRCompareTechBucket
 	}
 };

-void ModelRenderer::Render(
+void ShaderModelRenderer::Render(
 	Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
-	ModelVertexRenderer& modelVertexRenderer, RenderModifier& modifier, const CShaderDefines& context,
-	int cullGroup, int flags, const ERenderMode renderMode, std::span<CModel*> submissions)
+	const RenderModifierPtr& modifier, const CShaderDefines& context,
+	int cullGroup, int flags, const ERenderMode renderMode)
 {
-	if (submissions.empty())
+	if (m->submissions[cullGroup].empty())
 		return;

 	CMatrix3D worldToCam;
@ -297,7 +429,7 @@ void ModelRenderer::Render(
 	/*
 	 * Rendering approach:
 	 *
-	 * submissions contains the list of CModels to render.
+	 * m->submissions contains the list of CModels to render.
 	 *
 	 * The data we need to render a model is:
 	 *  - CShaderTechnique
@ -365,9 +497,10 @@ void ModelRenderer::Render(
 	{
 		PROFILE3("bucketing by material");

-		for (CModel* model : submissions)
+		for (size_t i = 0; i < m->submissions[cullGroup].size(); ++i)
 		{
-			const CMaterial& material{model->GetMaterial()};
+			CModel* model = m->submissions[cullGroup][i];
+			const CMaterial material{model->GetMaterial()};
 			const CShaderDefines& defines{material.GetShaderDefines()};
 			const CStrIntern shaderEffect{material.GetShaderEffect(materialPass)};
 			SMRMaterialBucketKey key(shaderEffect, defines);
@ -550,7 +683,7 @@ void ModelRenderer::Render(

 				Renderer::Backend::IShaderProgram* shader = currentTech->GetShader(pass);

-				modifier.BeginPass(deviceCommandContext, shader);
+				modifier->BeginPass(deviceCommandContext, shader);

 				// TODO: Use a more generic approach to handle bound queries.
 				bool boundTime = false;
@ -620,7 +753,7 @@ void ModelRenderer::Render(
 						if (newModeldef != currentModeldef)
 						{
 							currentModeldef = newModeldef;
-							modelVertexRenderer.PrepareModelDef(deviceCommandContext, *currentModeldef);
+							m->vertexRenderer->PrepareModelDef(deviceCommandContext, *currentModeldef);
 						}

 						// Bind all uniforms when any change
@ -680,12 +813,12 @@ void ModelRenderer::Render(
 							}
 						}

-						modifier.PrepareModel(deviceCommandContext, model);
+						modifier->PrepareModel(deviceCommandContext, model);

 						CModelRData* rdata = static_cast<CModelRData*>(model->GetRenderData());
-						ENSURE(rdata->GetKey() == &modelVertexRenderer);
+						ENSURE(rdata->GetKey() == m->vertexRenderer.get());

-						modelVertexRenderer.RenderModel(deviceCommandContext, shader, model, rdata);
+						m->vertexRenderer->RenderModel(deviceCommandContext, shader, model, rdata);
 					}
 				}

--- a/source/renderer/ModelRenderer.h
+++ b/source/renderer/ModelRenderer.h
@ -30,7 +30,6 @@
 #include "lib/types.h"

 #include <memory>
-#include <span>
 #include <vector>

 class CModel;
@ -40,8 +39,17 @@ namespace Renderer::Backend { class IDeviceCommandContext; }
 struct SColor4ub;
 template <typename T> class VertexArrayIterator;

-class ModelVertexRenderer;
 class RenderModifier;
+typedef std::shared_ptr<RenderModifier> RenderModifierPtr;
+
+class LitRenderModifier;
+typedef std::shared_ptr<LitRenderModifier> LitRenderModifierPtr;
+
+class ModelVertexRenderer;
+typedef std::shared_ptr<ModelVertexRenderer> ModelVertexRendererPtr;
+
+class ModelRenderer;
+typedef std::shared_ptr<ModelRenderer> ModelRendererPtr;

 /**
 * Class CModelRData: Render data that is maintained per CModel.
@ -75,12 +83,25 @@ private:


 /**
- * ModelRenderer renders a per-frame list of models. It loads the appropriate
- * shaders for rendering each model, and that batches by shader technique (and
- * by mesh and texture).
+ * Class ModelRenderer: Abstract base class for all model renders.
 *
- * ModelRenderer delegates vertex transformation/setup to a
- * ModelVertexRenderer. It delegates fragment stage setup to a RenderModifier.
+ * A ModelRenderer manages a per-frame list of models.
+ *
+ * It is supposed to be derived in order to create new ways in which
+ * the per-frame list of models can be managed (for batching, for
+ * transparent rendering, etc.) or potentially for rarely used special
+ * effects.
+ *
+ * A typical ModelRenderer will delegate vertex transformation/setup
+ * to a ModelVertexRenderer.
+ * It will delegate fragment stage setup to a RenderModifier.
+ *
+ * For most purposes, you should use a BatchModelRenderer with
+ * specialized ModelVertexRenderer and RenderModifier implementations.
+ *
+ * It is suggested that a derived class implement the provided generic
+ * Render function, however in some cases it may be necessary to supply
+ * a Render function with a different prototype.
 *
 * ModelRenderer also contains a number of static helper functions
 * for building vertex arrays.
@ -88,10 +109,61 @@ private:
 class ModelRenderer
 {
 public:
+	ModelRenderer() { }
+	virtual ~ModelRenderer() { }
+
+	/**
+	 * Initialise global settings.
+	 * Should be called before using the class.
+	 */
+	static void Init();
+
+	/**
+	 * Submit: Submit a model for rendering this frame.
+	 *
+	 * preconditions : The model must not have been submitted to any
+	 * ModelRenderer in this frame. Submit may only be called
+	 * after EndFrame and before PrepareModels.
+	 *
+	 * @param model The model that will be added to the list of models
+	 * submitted this frame.
+	 */
+	virtual void Submit(int cullGroup, CModel* model) = 0;
+
+	/**
+	 * PrepareModels: Calculate renderer data for all previously
+	 * submitted models.
+	 *
+	 * Must be called before any rendering calls and after all models
+	 * for this frame have been submitted.
+	 */
+	virtual void PrepareModels(
+		Renderer::Backend::IDeviceCommandContext* deviceCommandContext) = 0;
+
+	/**
+	 * Upload renderer data for all previously submitted models to backend.
+	 *
+	 * Must be called before any rendering calls and after all models
+	 * for this frame have been prepared.
+	 */
+	virtual void UploadModels(
+		Renderer::Backend::IDeviceCommandContext* deviceCommandContext) = 0;
+
+	/**
+	 * EndFrame: Remove all models from the list of submitted
+	 * models.
+	 */
+	virtual void EndFrame() = 0;
+
 	/**
 	 * Render: Render submitted models, using the given RenderModifier to setup
 	 * the fragment stage.
 	 *
+	 * @note It is suggested that derived model renderers implement and use
+	 * this Render functions. However, a highly specialized model renderer
+	 * may need to "disable" this function and provide its own Render function
+	 * with a different prototype.
+	 *
 	 * preconditions  : PrepareModels must be called after all models have been
 	 * submitted and before calling Render.
 	 *
@ -100,10 +172,10 @@ public:
 	 * If flags is non-zero, only models that contain flags in their
 	 * CModel::GetFlags() are rendered.
 	 */
-	void Render(
+	virtual void Render(
 		Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
-		ModelVertexRenderer& modelVertexRenderer, RenderModifier& modifier, const CShaderDefines& context,
-		int cullGroup, int flags, const ERenderMode renderMode, std::span<CModel*> submissions);
+		const RenderModifierPtr& modifier, const CShaderDefines& context,
+		int cullGroup, int flags, const ERenderMode renderMode) = 0;

 	/**
 	 * CopyPositionAndNormals: Copy unanimated object-space vertices and
@ -118,9 +190,9 @@ public:
 	 * The array behind the iterator must be as large as the Position array.
 	 */
 	static void CopyPositionAndNormals(
-		const CModelDefPtr& mdef,
-		const VertexArrayIterator<CVector3D>& Position,
-		const VertexArrayIterator<CVector3D>& Normal);
+			const CModelDefPtr& mdef,
+			const VertexArrayIterator<CVector3D>& Position,
+			const VertexArrayIterator<CVector3D>& Normal);

 	/**
 	 * BuildPositionAndNormals: Build animated vertices and normals,
@ -137,9 +209,25 @@ public:
 	 * the Position array.
 	 */
 	static void BuildPositionAndNormals(
-		CModel* model,
-		const VertexArrayIterator<CVector3D>& Position,
-		const VertexArrayIterator<CVector3D>& Normal);
+			CModel* model,
+			const VertexArrayIterator<CVector3D>& Position,
+			const VertexArrayIterator<CVector3D>& Normal);
+
+	/**
+	 * BuildColor4ub: Build lighting colors for the given model,
+	 * based on previously calculated world space normals.
+	 *
+	 * @param model The model that is to be lit.
+	 * @param Normal Array of the model's normal vectors, animated and
+	 * transformed into world space.
+	 * @param Color Points to the array that will receive the lit vertex color.
+	 * The array behind the iterator must large enough to hold
+	 * model->GetModelDef()->GetNumVertices() vertices.
+	 */
+	static void BuildColor4ub(
+			CModel* model,
+			const VertexArrayIterator<CVector3D>& Normal,
+			const VertexArrayIterator<SColor4ub>& Color);

 	/**
 	 * BuildUV: Copy UV coordinates into the given vertex array.
@ -150,9 +238,9 @@ public:
 	 * mdef->GetNumVertices() vertices.
 	 */
 	static void BuildUV(
-		const CModelDefPtr& mdef,
-		const VertexArrayIterator<float[2]>& UV,
-		int UVset);
+			const CModelDefPtr& mdef,
+			const VertexArrayIterator<float[2]>& UV,
+			int UVset);

 	/**
 	 * BuildIndices: Create the indices array for the given CModelDef.
@ -162,7 +250,8 @@ public:
 	 * mdef->GetNumFaces()*3 elements.
 	 */
 	static void BuildIndices(
-		const CModelDefPtr& mdef, const VertexArrayIterator<u16>& Indices);
+			const CModelDefPtr& mdef,
+			const VertexArrayIterator<u16>& Indices);

 	/**
 	 * GenTangents: Generate tangents for the given CModelDef.
@ -174,4 +263,33 @@ public:
 	static void GenTangents(const CModelDefPtr& mdef, std::vector<float>& newVertices, bool gpuSkinning);
 };

+/**
+ * Implementation of ModelRenderer that loads the appropriate shaders for
+ * rendering each model, and that batches by shader technique (and by mesh and texture).
+ */
+class ShaderModelRenderer : public ModelRenderer
+{
+	friend struct ShaderModelRendererInternals;
+
+public:
+	ShaderModelRenderer(ModelVertexRendererPtr vertexrender);
+	~ShaderModelRenderer() override;
+
+	// Batching implementations
+	void Submit(int cullGroup, CModel* model) override;
+	void PrepareModels(
+		Renderer::Backend::IDeviceCommandContext* deviceCommandContext) override;
+	void UploadModels(
+		Renderer::Backend::IDeviceCommandContext* deviceCommandContext) override;
+	void EndFrame() override;
+	void Render(
+		Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
+		const RenderModifierPtr& modifier, const CShaderDefines& context,
+		int cullGroup, int flags, const ERenderMode renderMode) override;
+
+private:
+	struct ShaderModelRendererInternals;
+	ShaderModelRendererInternals* m;
+};
+
 #endif // INCLUDED_MODELRENDERER
--- a/source/renderer/Renderer.cpp
+++ b/source/renderer/Renderer.cpp
@ -62,6 +62,7 @@
 #include "ps/VideoMode.h"
 #include "ps/World.h"
 #include "renderer/DebugRenderer.h"
+#include "renderer/ModelRenderer.h"
 #include "renderer/PostprocManager.h"
 #include "renderer/RenderingOptions.h"
 #include "renderer/SceneRenderer.h"
@ -455,6 +456,7 @@ CRenderer::CRenderer(Renderer::Backend::IDevice* device)

 	ModelDefActivateFastImpl();
 	ColorActivateFastImpl();
+	ModelRenderer::Init();
 }

 CRenderer::~CRenderer()
--- a/source/renderer/RenderingOptions.cpp
+++ b/source/renderer/RenderingOptions.cpp
@ -212,17 +212,17 @@ void CRenderingOptions::ReadConfigAndSetupHooks()
 	m_ConfigHooks->Setup("silhouettes", m_Silhouettes);

 	m_ConfigHooks->Setup("gpuskinning", [this]() {
-		if (g_ConfigDB.Get("gpuskinning", false))
+		const Renderer::Backend::IDevice::Capabilities& capabilities{
+			g_VideoMode.GetBackendDevice()->GetCapabilities()};
+		if (!g_ConfigDB.Get("gpuskinning", false))
+			return;
+
+		if (capabilities.computeShaders && capabilities.storage)
+			m_GPUSkinning = true;
+		else
 		{
-			const Renderer::Backend::IDevice::Capabilities& capabilities{
-				g_VideoMode.GetBackendDevice()->GetCapabilities()};
-			if (capabilities.computeShaders && capabilities.storage)
-				m_GPUSkinning = true;
-			else
-			{
-				m_GPUSkinning = false;
-				LOGMESSAGE("GPU skinning isn't supported on the current hardware.");
-			}
+			m_GPUSkinning = false;
+			LOGMESSAGE("GPU skinning isn't supported on the current hardware.");
 		}

 		if (CRenderer::IsInitialised())
--- a/source/renderer/SceneRenderer.cpp
+++ b/source/renderer/SceneRenderer.cpp
@ -68,7 +68,6 @@

 #include <algorithm>
 #include <cmath>
-#include <optional>

 struct SScreenRect
 {
@ -116,192 +115,78 @@ public:

 	SilhouetteRenderer silhouetteRenderer;

-	// Various model renderers
+	/// Various model renderers
 	struct Models
 	{
+		// NOTE: The current renderer design (with ModelRenderer, ModelVertexRenderer,
+		// RenderModifier, etc) is mostly a relic of an older design that implemented
+		// the different materials and rendering modes through extensive subclassing
+		// and hooking objects together in various combinations.
+		// The new design uses the CShaderManager API to abstract away the details
+		// of rendering, and uses a data-driven approach to materials, so there are
+		// now a small number of generic subclasses instead of many specialised subclasses,
+		// but most of the old infrastructure hasn't been refactored out yet and leads to
+		// some unwanted complexity.
+
 		// Submitted models are split on two axes:
-		//  - Opaque vs Transparent - alpha-blended models are stored in a separate
+		//  - Normal vs Transp[arent] - alpha-blended models are stored in a separate
 		//    list so we can draw them above/below the alpha-blended water plane correctly
-		//  - Skinned vs Unskinned - we don't need to duplicate mesh data per
-		//    model instance (except for skinned models), so non-skinned models
-		//    get different ModelVertexRenderers
+		//  - Skinned vs Unskinned - with hardware lighting we don't need to
+		//    duplicate mesh data per model instance (except for skinned models),
+		//    so non-skinned models get different ModelVertexRenderers

-		struct Submissions
-		{
-			std::vector<CModel*> submissions[CSceneRenderer::CULL_MAX];
-		};
+		ModelRendererPtr NormalSkinned;
+		ModelRendererPtr NormalUnskinned; // == NormalSkinned if unskinned shader instancing not supported
+		ModelRendererPtr TranspSkinned;
+		ModelRendererPtr TranspUnskinned; // == TranspSkinned if unskinned shader instancing not supported

-		// Unskinned submissions should be prepared and rendered with
-		// VertexInstancingShader. Skinned - with Vertex*SkinningShader
-		// depending on whether GPU skinning is enabled.
-		Submissions OpaqueSkinned;
-		Submissions OpaqueUnskinned;
-		Submissions TransparentSkinned;
-		Submissions TransparentUnskinned;
+		ModelVertexRendererPtr VertexRendererShader;
+		ModelVertexRendererPtr VertexInstancingShader;
+		ModelVertexRendererPtr VertexGPUSkinningShader;

-		ModelRenderer modelRenderer;
-
-		InstancingModelRenderer VertexInstancingShader;
-		CPUSkinnedModelVertexRenderer VertexCPUSkinningShader;
-		// We can't create GPU skinning renderer for renderer devices without
-		// its support.
-		std::optional<GPUSkinnedModelModelRenderer> VertexGPUSkinningShader;
-
-		ShaderRenderModifier ModShader;
-
-		bool GPUSkinningEnabled{false};
+		LitRenderModifierPtr ModShader;
 	} Model;

 	CShaderDefines globalContext;

-	/**
-	 * Upload renderer data for all previously submitted models to backend.
-	 *
-	 * Must be called before any rendering calls and after all models
-	 * for this frame have been prepared.
-	 */
-	void UploadModels(Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
-	{
-		PROFILE3("upload models");
-
-		ModelVertexRenderer& modelVertexSkinningRenderer{
-			Model.GPUSkinningEnabled
-				? static_cast<ModelVertexRenderer&>(*Model.VertexGPUSkinningShader)
-				: static_cast<ModelVertexRenderer&>(Model.VertexCPUSkinningShader)};
-
-		for (int cullGroup{0}; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
-		{
-			modelVertexSkinningRenderer.UploadModelsData(deviceCommandContext, Model.OpaqueSkinned.submissions[cullGroup]);
-			modelVertexSkinningRenderer.UploadModelsData(deviceCommandContext, Model.TransparentSkinned.submissions[cullGroup]);
-		}
-
-		for (int cullGroup{0}; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
-		{
-			Model.VertexInstancingShader.UploadModelsData(deviceCommandContext, Model.OpaqueUnskinned.submissions[cullGroup]);
-			Model.VertexInstancingShader.UploadModelsData(deviceCommandContext, Model.TransparentUnskinned.submissions[cullGroup]);
-		}
-	}
-
-	/**
-	 * PrepareModels: Calculate renderer data for all previously
-	 * submitted models.
-	 *
-	 * Must be called before any rendering calls and after all models
-	 * for this frame have been submitted.
-	 */
-	void PrepareModels(
-		Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
-	{
-		PROFILE3("prepare models");
-
-		ModelVertexRenderer& modelVertexSkinningRenderer{
-			Model.GPUSkinningEnabled
-				? static_cast<ModelVertexRenderer&>(*Model.VertexGPUSkinningShader)
-				: static_cast<ModelVertexRenderer&>(Model.VertexCPUSkinningShader)};
-
-		for (int cullGroup{0}; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
-		{
-			PrepareModels(deviceCommandContext, modelVertexSkinningRenderer, Model.OpaqueSkinned.submissions[cullGroup]);
-			PrepareModels(deviceCommandContext, modelVertexSkinningRenderer, Model.TransparentSkinned.submissions[cullGroup]);
-		}
-
-		for (int cullGroup{0}; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
-		{
-			PrepareModels(deviceCommandContext, Model.VertexInstancingShader, Model.OpaqueUnskinned.submissions[cullGroup]);
-			PrepareModels(deviceCommandContext, Model.VertexInstancingShader, Model.TransparentUnskinned.submissions[cullGroup]);
-		}
-	}
-
-	void PrepareModels(
-		Renderer::Backend::IDeviceCommandContext* deviceCommandContext, ModelVertexRenderer& modelVertexRenderer, std::span<CModel*> submissions)
-	{
-		for (CModel* model : submissions)
-		{
-			model->ValidatePosition();
-
-			CModelRData* rdata = static_cast<CModelRData*>(model->GetRenderData());
-			ENSURE(rdata->GetKey() == &modelVertexRenderer);
-		}
-
-		modelVertexRenderer.UpdateModelsData(deviceCommandContext, submissions);
-
-		for (CModel* model : submissions)
-		{
-			CModelRData* rdata = static_cast<CModelRData*>(model->GetRenderData());
-			rdata->m_UpdateFlags = 0;
-		}
-	}
-
-	/**
-	 * Submit: Submit a model for rendering this frame.
-	 *
-	 * preconditions : The model must not have been submitted to any
-	 * ModelRenderer in this frame. Submit may only be called
-	 * after EndFrame and before PrepareModels.
-	 *
-	 * @param model The model that will be added to the list of models
-	 * submitted this frame.
-	 */
-	void Submit(const int cullGroup, ModelVertexRenderer& modelVertexRenderer, Models::Submissions& submissions, CModel* model)
-	{
-		CModelRData* rdata{static_cast<CModelRData*>(model->GetRenderData())};
-
-		// Ensure model data is valid.
-		// TODO: using a pointer as a key is unsafe.
-		const void* key{&modelVertexRenderer};
-		if (!rdata || rdata->GetKey() != key)
-		{
-			model->InvalidatePosition();
-			rdata = modelVertexRenderer.CreateModelData(key, model);
-			model->SetRenderData(rdata);
-			model->SetDirty(~0u);
-		}
-
-		submissions.submissions[cullGroup].push_back(model);
-	}
-
 	/**
 	 * Renders all non-alpha-blended models with the given context.
 	 */
-	void CallOpaqueModelRenderers(
+	void CallModelRenderers(
 		Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
 		const CShaderDefines& context, int cullGroup, int flags, const ERenderMode renderMode)
 	{
-		ModelVertexRenderer& modelVertexSkinningRenderer{
-			Model.GPUSkinningEnabled
-				? static_cast<ModelVertexRenderer&>(*Model.VertexGPUSkinningShader)
-				: static_cast<ModelVertexRenderer&>(Model.VertexCPUSkinningShader)};
-
 		CShaderDefines contextSkinned = context;
-		if (Model.GPUSkinningEnabled)
+		if (g_RenderingOptions.GetGPUSkinning())
 			contextSkinned.Add(str_USE_INSTANCING, str_1);
-		Model.modelRenderer.Render(deviceCommandContext, modelVertexSkinningRenderer, Model.ModShader, contextSkinned, cullGroup, flags, renderMode, Model.OpaqueSkinned.submissions[cullGroup]);
+		Model.NormalSkinned->Render(deviceCommandContext, Model.ModShader, contextSkinned, cullGroup, flags, renderMode);

-		CShaderDefines contextUnskinned = context;
-		contextUnskinned.Add(str_USE_INSTANCING, str_1);
-		Model.modelRenderer.Render(deviceCommandContext, Model.VertexInstancingShader, Model.ModShader, contextUnskinned, cullGroup, flags, renderMode, Model.OpaqueUnskinned.submissions[cullGroup]);
+		if (Model.NormalUnskinned != Model.NormalSkinned)
+		{
+			CShaderDefines contextUnskinned = context;
+			contextUnskinned.Add(str_USE_INSTANCING, str_1);
+			Model.NormalUnskinned->Render(deviceCommandContext, Model.ModShader, contextUnskinned, cullGroup, flags, renderMode);
+		}
 	}

 	/**
 	 * Renders all alpha-blended models with the given context.
 	 */
-	void CallTransparentModelRenderers(
+	void CallTranspModelRenderers(
 		Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
 		const CShaderDefines& context, int cullGroup, int flags, const ERenderMode renderMode)
 	{
-		ModelVertexRenderer& modelVertexSkinningRenderer{
-			Model.GPUSkinningEnabled
-				? static_cast<ModelVertexRenderer&>(*Model.VertexGPUSkinningShader)
-				: static_cast<ModelVertexRenderer&>(Model.VertexCPUSkinningShader)};
-
 		CShaderDefines contextSkinned = context;
-		if (Model.GPUSkinningEnabled)
+		if (g_RenderingOptions.GetGPUSkinning())
 			contextSkinned.Add(str_USE_INSTANCING, str_1);
-		Model.modelRenderer.Render(deviceCommandContext, modelVertexSkinningRenderer, Model.ModShader, contextSkinned, cullGroup, flags, renderMode, Model.TransparentSkinned.submissions[cullGroup]);
+		Model.TranspSkinned->Render(deviceCommandContext, Model.ModShader, contextSkinned, cullGroup, flags, renderMode);

-		CShaderDefines contextUnskinned = context;
-		contextUnskinned.Add(str_USE_INSTANCING, str_1);
-		Model.modelRenderer.Render(deviceCommandContext, Model.VertexInstancingShader, Model.ModShader, contextUnskinned, cullGroup, flags, renderMode, Model.TransparentUnskinned.submissions[cullGroup]);
+		if (Model.TranspUnskinned != Model.TranspSkinned)
+		{
+			CShaderDefines contextUnskinned = context;
+			contextUnskinned.Add(str_USE_INSTANCING, str_1);
+			Model.TranspUnskinned->Render(deviceCommandContext, Model.ModShader, contextUnskinned, cullGroup, flags, renderMode);
+		}
 	}
 };

@ -354,12 +239,26 @@ void CSceneRenderer::ReloadShaders([[maybe_unused]] Renderer::Backend::IDevice*
 	m->globalContext.Add(str_RENDER_DEBUG_MODE,
 		RenderDebugModeEnum::ToString(g_RenderingOptions.GetRenderDebugMode()));

-	m->Model.GPUSkinningEnabled = g_RenderingOptions.GetGPUSkinning();
-	if (m->Model.GPUSkinningEnabled)
+	m->Model.ModShader = LitRenderModifierPtr(new ShaderRenderModifier());
+
+	m->Model.VertexRendererShader = ModelVertexRendererPtr(new CPUSkinnedModelVertexRenderer());
+	m->Model.VertexInstancingShader = ModelVertexRendererPtr(new InstancingModelRenderer());
+
+	if (g_RenderingOptions.GetGPUSkinning())
 	{
-		if (!m->Model.VertexGPUSkinningShader.has_value())
-			m->Model.VertexGPUSkinningShader.emplace();
+		m->Model.VertexGPUSkinningShader = ModelVertexRendererPtr(new GPUSkinnedModelModelRenderer());
+		m->Model.NormalSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexGPUSkinningShader));
+		m->Model.TranspSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexGPUSkinningShader));
 	}
+	else
+	{
+		m->Model.VertexGPUSkinningShader.reset();
+		m->Model.NormalSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexRendererShader));
+		m->Model.TranspSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexRendererShader));
+	}
+
+	m->Model.NormalUnskinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexInstancingShader));
+	m->Model.TranspUnskinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexInstancingShader));
 }

 void CSceneRenderer::Initialize()
@ -383,8 +282,8 @@ void CSceneRenderer::Resize(int /*width*/, int /*height*/)
 void CSceneRenderer::BeginFrame()
 {
 	// choose model renderers for this frame
-	m->Model.ModShader.SetShadowMap(&m->shadow);
-	m->Model.ModShader.SetLightEnv(m_LightEnv);
+	m->Model.ModShader->SetShadowMap(&m->shadow);
+	m->Model.ModShader->SetLightEnv(m_LightEnv);
 }

 void CSceneRenderer::SetSimulation(CSimulation2* simulation)
@ -416,12 +315,12 @@ void CSceneRenderer::RenderShadowMap(

 		{
 			PROFILE("render models");
-			m->CallOpaqueModelRenderers(deviceCommandContext, {}, cullGroup, ModelFlag::CAST_SHADOWS, ERenderMode::SOLID);
+			m->CallModelRenderers(deviceCommandContext, {}, cullGroup, ModelFlag::CAST_SHADOWS, ERenderMode::SOLID);
 		}

 		{
 			PROFILE("render transparent models");
-			m->CallTransparentModelRenderers(deviceCommandContext, {}, cullGroup, ModelFlag::CAST_SHADOWS, ERenderMode::SOLID);
+			m->CallTranspModelRenderers(deviceCommandContext, {}, cullGroup, ModelFlag::CAST_SHADOWS, ERenderMode::SOLID);
 		}
 	}

@ -464,10 +363,10 @@ void CSceneRenderer::RenderModels(
 	const ERenderMode modelRenderMode{
 		m_ModelRenderMode == WIREFRAME ? WIREFRAME : SOLID};

-	m->CallOpaqueModelRenderers(deviceCommandContext, context, cullGroup, flags, modelRenderMode);
+	m->CallModelRenderers(deviceCommandContext, context, cullGroup, flags, modelRenderMode);

 	if (m_ModelRenderMode == EDGED_FACES)
-		m->CallOpaqueModelRenderers(deviceCommandContext, {}, cullGroup, flags, EDGED_FACES);
+		m->CallModelRenderers(deviceCommandContext, {}, cullGroup, flags, EDGED_FACES);
 }

 void CSceneRenderer::RenderTransparentModels(
@ -489,13 +388,13 @@ void CSceneRenderer::RenderTransparentModels(
 		m_ModelRenderMode == WIREFRAME ? WIREFRAME : SOLID};

 	if (transparentMode == TRANSPARENT || transparentMode == TRANSPARENT_OPAQUE)
-		m->CallTransparentModelRenderers(deviceCommandContext, contextOpaque, cullGroup, flags, modelRenderMode);
+		m->CallTranspModelRenderers(deviceCommandContext, contextOpaque, cullGroup, flags, modelRenderMode);

 	if (transparentMode == TRANSPARENT || transparentMode == TRANSPARENT_BLEND)
-		m->CallTransparentModelRenderers(deviceCommandContext, contextBlend, cullGroup, flags, modelRenderMode);
+		m->CallTranspModelRenderers(deviceCommandContext, contextBlend, cullGroup, flags, modelRenderMode);

 	if (m_ModelRenderMode == EDGED_FACES)
-		m->CallTransparentModelRenderers(deviceCommandContext, {}, cullGroup, flags, EDGED_FACES);
+		m->CallTranspModelRenderers(deviceCommandContext, {}, cullGroup, flags, EDGED_FACES);
 }

 // SetObliqueFrustumClipping: change the near plane to the given clip plane (in world space)
@ -810,24 +709,24 @@ void CSceneRenderer::RenderSilhouettes(

 	{
 		PROFILE("render model occluders");
-		m->CallOpaqueModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_OCCLUDER, 0, ERenderMode::SOLID);
+		m->CallModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_OCCLUDER, 0, ERenderMode::SOLID);
 	}

 	{
 		PROFILE("render transparent occluders");
-		m->CallTransparentModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_OCCLUDER, 0, ERenderMode::SOLID);
+		m->CallTranspModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_OCCLUDER, 0, ERenderMode::SOLID);
 	}

 	// Since we can't sort, we'll use the stencil buffer to ensure we only draw
 	// a pixel once (using the color of whatever model happens to be drawn first).
 	{
 		PROFILE("render model casters");
-		m->CallOpaqueModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_CASTER, 0, ERenderMode::SOLID);
+		m->CallModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_CASTER, 0, ERenderMode::SOLID);
 	}

 	{
 		PROFILE("render transparent casters");
-		m->CallTransparentModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_CASTER, 0, ERenderMode::SOLID);
+		m->CallTranspModelRenderers(deviceCommandContext, {}, CULL_SILHOUETTE_CASTER, 0, ERenderMode::SOLID);
 	}
 }

@ -871,7 +770,15 @@ void CSceneRenderer::PrepareSubmissions(
 	CShaderDefines context = m->globalContext;

 	// Prepare model renderers
-	m->PrepareModels(deviceCommandContext);
+	{
+	PROFILE3("prepare models");
+	m->Model.NormalSkinned->PrepareModels(deviceCommandContext);
+	m->Model.TranspSkinned->PrepareModels(deviceCommandContext);
+	if (m->Model.NormalUnskinned != m->Model.NormalSkinned)
+		m->Model.NormalUnskinned->PrepareModels(deviceCommandContext);
+	if (m->Model.TranspUnskinned != m->Model.TranspSkinned)
+		m->Model.TranspUnskinned->PrepareModels(deviceCommandContext);
+	}

 	m->terrainRenderer.PrepareForRendering();

@ -879,7 +786,15 @@ void CSceneRenderer::PrepareSubmissions(

 	m->particleRenderer.PrepareForRendering(context);

-	m->UploadModels(deviceCommandContext);
+	{
+		PROFILE3("upload models");
+		m->Model.NormalSkinned->UploadModels(deviceCommandContext);
+		m->Model.TranspSkinned->UploadModels(deviceCommandContext);
+		if (m->Model.NormalUnskinned != m->Model.NormalSkinned)
+			m->Model.NormalUnskinned->UploadModels(deviceCommandContext);
+		if (m->Model.TranspUnskinned != m->Model.TranspSkinned)
+			m->Model.TranspUnskinned->UploadModels(deviceCommandContext);
+	}

 	m->overlayRenderer.Upload(deviceCommandContext);

@ -993,13 +908,13 @@ void CSceneRenderer::EndFrame()
 	m->particleRenderer.EndFrame();
 	m->silhouetteRenderer.EndFrame();

-	for (int cullGroup{0}; cullGroup < CSceneRenderer::CULL_MAX; ++cullGroup)
-	{
-		m->Model.OpaqueSkinned.submissions[cullGroup].clear();
-		m->Model.TransparentSkinned.submissions[cullGroup].clear();
-		m->Model.OpaqueUnskinned.submissions[cullGroup].clear();
-		m->Model.TransparentUnskinned.submissions[cullGroup].clear();
-	}
+	// Finish model renderers
+	m->Model.NormalSkinned->EndFrame();
+	m->Model.TranspSkinned->EndFrame();
+	if (m->Model.NormalUnskinned != m->Model.NormalSkinned)
+		m->Model.NormalUnskinned->EndFrame();
+	if (m->Model.TranspUnskinned != m->Model.TranspSkinned)
+		m->Model.TranspUnskinned->EndFrame();
 }

 void CSceneRenderer::DisplayFrustum(Renderer::Backend::IDeviceCommandContext& deviceCommandContext)
@ -1114,25 +1029,21 @@ void CSceneRenderer::SubmitNonRecursive(CModel* model)
 		m->shadow.AddShadowCasterBound(cascade, model->GetWorldBounds());
 	}

-	const bool requiresSkinning{model->GetModelDef()->GetNumBones() != 0};
-	ModelVertexRenderer& modelVertexSkinningRenderer{
-		m->Model.GPUSkinningEnabled
-			? static_cast<ModelVertexRenderer&>(*m->Model.VertexGPUSkinningShader)
-			: static_cast<ModelVertexRenderer&>(m->Model.VertexCPUSkinningShader)};
+	bool requiresSkinning = (model->GetModelDef()->GetNumBones() != 0);

 	if (model->GetMaterial().UsesAlphaBlending())
 	{
 		if (requiresSkinning)
-			m->Submit(m_CurrentCullGroup, modelVertexSkinningRenderer, m->Model.TransparentSkinned, model);
+			m->Model.TranspSkinned->Submit(m_CurrentCullGroup, model);
 		else
-			m->Submit(m_CurrentCullGroup, m->Model.VertexInstancingShader, m->Model.TransparentUnskinned, model);
+			m->Model.TranspUnskinned->Submit(m_CurrentCullGroup, model);
 	}
 	else
 	{
 		if (requiresSkinning)
-			m->Submit(m_CurrentCullGroup, modelVertexSkinningRenderer, m->Model.OpaqueSkinned, model);
+			m->Model.NormalSkinned->Submit(m_CurrentCullGroup, model);
 		else
-			m->Submit(m_CurrentCullGroup, m->Model.VertexInstancingShader, m->Model.OpaqueUnskinned, model);
+			m->Model.NormalUnskinned->Submit(m_CurrentCullGroup, model);
 	}
 }

--- a/source/scriptinterface/Stats.cpp
+++ b/source/scriptinterface/Stats.cpp
@ -90,21 +90,21 @@ CStr CScriptStatsTable::GetCellText(size_t row, size_t col)
 		if (col == 0)
 			return "max nominal heap bytes";
 		uint32_t n = JS_GetGCParameter(m_ScriptInterfaces.at(col-1).first->GetGeneralJSContext(), JSGC_MAX_BYTES);
-		return std::to_string(n);
+		return CStr::FromUInt(n);
 	}
 	case Row_Bytes:
 	{
 		if (col == 0)
 			return "allocated bytes";
 		uint32_t n = JS_GetGCParameter(m_ScriptInterfaces.at(col-1).first->GetGeneralJSContext(), JSGC_BYTES);
-		return std::to_string(n);
+		return CStr::FromUInt(n);
 	}
 	case Row_NumberGC:
 	{
 		if (col == 0)
 			return "number of GCs";
 		uint32_t n = JS_GetGCParameter(m_ScriptInterfaces.at(col-1).first->GetGeneralJSContext(), JSGC_NUMBER);
-		return std::to_string(n);
+		return CStr::FromUInt(n);
 	}
 	default:
 		return "???";
@ -116,4 +116,4 @@ AbstractProfileTable* CScriptStatsTable::GetChild(size_t /*row*/)
 	return 0;
 }

-} // namespace Script
+} // namespace Script
--- a/source/simulation2/components/CCmpRangeManager.cpp
+++ b/source/simulation2/components/CCmpRangeManager.cpp
@ -188,7 +188,6 @@ struct Query
 	CEntityHandle source; // TODO: this could crash if an entity is destroyed while a Query is still referencing it
 	entity_pos_t minRange;
 	entity_pos_t maxRange;
-	entity_pos_t baseRange;  // Non-parabolic detection range
 	entity_pos_t yOrigin; // Used for parabolas only.
 	u32 ownersMask;
 	i32 interface;
@ -196,7 +195,6 @@ struct Query
 	bool enabled;
 	bool parabolic;
 	bool accountForSize; // If true, the query accounts for unit sizes, otherwise it treats all entities as points.
-	bool preferMirages;  // If true, include mirages and filter HIDDEN entities. Otherwise exclude mirages and no visibility filter.
 };

 /**
@ -351,7 +349,6 @@ struct SerializeHelper<Query>
 	{
 		serialize.NumberFixed_Unbounded("min range", value.minRange);
 		serialize.NumberFixed_Unbounded("max range", value.maxRange);
-		serialize.NumberFixed_Unbounded("baseRange", value.baseRange);
 		serialize.NumberFixed_Unbounded("yOrigin", value.yOrigin);
 		serialize.NumberU32_Unbounded("owners mask", value.ownersMask);
 		serialize.NumberI32_Unbounded("interface", value.interface);
@ -360,7 +357,6 @@ struct SerializeHelper<Query>
 		serialize.Bool("enabled", value.enabled);
 		serialize.Bool("parabolic",value.parabolic);
 		serialize.Bool("account for size",value.accountForSize);
-		serialize.Bool("preferMirages", value.preferMirages);
 	}

 	void operator()(ISerializer& serialize, const char* name, Query& value, const CSimContext&)
@ -996,20 +992,21 @@ public:

 	tag_t CreateActiveQuery(entity_id_t source,
 		entity_pos_t minRange, entity_pos_t maxRange,
-		const std::vector<int>& owners, int requiredInterface, u8 flags,
-		bool accountForSize, bool preferMirages) override
+		const std::vector<int>& owners, int requiredInterface, u8 flags, bool accountForSize) override
 	{
 		tag_t id = m_QueryNext++;
-		m_Queries[id] = ConstructQuery(source, minRange, maxRange, owners, requiredInterface, flags, accountForSize, preferMirages);
+		m_Queries[id] = ConstructQuery(source, minRange, maxRange, owners, requiredInterface, flags, accountForSize);
+
 		return id;
 	}

 	tag_t CreateActiveParabolicQuery(entity_id_t source,
-		entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t baseRange, entity_pos_t yOrigin,
-		const std::vector<int>& owners, int requiredInterface, u8 flags, bool preferMirages = false) override
+		entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t yOrigin,
+		const std::vector<int>& owners, int requiredInterface, u8 flags) override
 	{
 		tag_t id = m_QueryNext++;
-		m_Queries[id] = ConstructParabolicQuery(source, minRange, maxRange, baseRange, yOrigin, owners, requiredInterface, flags, true, preferMirages);
+		m_Queries[id] = ConstructParabolicQuery(source, minRange, maxRange, yOrigin, owners, requiredInterface, flags, true);
+
 		return id;
 	}

@ -1300,35 +1297,10 @@ public:
 		if (id == q.source.GetId())
 			return false;

-		// Check if this is a mirage entity
-		CmpPtr<ICmpMirage> cmpMirage(GetSimContext(), id);
-		bool isMirage = !!cmpMirage;
-
-		// If it's a mirage and we're not including mirages, skip it
-		if (isMirage && !q.preferMirages)
+		// Ignore if it's missing the required interface
+		if (q.interface && !GetSimContext().GetComponentManager().QueryInterface(id, q.interface))
 			return false;

-		// If it's not a mirage, check interface normally
-		if (!isMirage && q.interface && !GetSimContext().GetComponentManager().QueryInterface(id, q.interface))
-			return false;
-
-		// Filter hidden entities when we want mirages (i.e., we care about visibility)
-		if (q.preferMirages && q.source.GetId() != INVALID_ENTITY)
-		{
-			// Look up the source's current owner
-			EntityMap<EntityData>::const_iterator itSource = m_EntityData.find(q.source.GetId());
-			if (itSource != m_EntityData.end())
-			{
-				player_id_t sourceOwner = itSource->second.owner;
-				if (sourceOwner != INVALID_PLAYER)
-				{
-					LosVisibility vis = GetPlayerVisibility(entity.visibilities, sourceOwner);
-					if (vis == LosVisibility::HIDDEN)
-						return false;
-				}
-			}
-		}
-
 		return true;
 	}

@ -1352,18 +1324,13 @@ public:
 		// Not the entire world, so check a parabolic range, or a regular range.
 		else if (q.parabolic)
 		{
-			// The yOrigin is part of the 3D position, as the source is really that much higher.
+			// The yOrigin is part of the 3D position, as the source is really that much heigher.
 			CmpPtr<ICmpPosition> cmpSourcePosition(q.source);
-			CFixedVector3D pos3d = cmpSourcePosition->GetPosition() +
-				CFixedVector3D(entity_pos_t::Zero(), q.yOrigin, entity_pos_t::Zero());
-			// Get a quick list of entities that are potentially in range.
-			// For parabolic queries, the search radius must cover:
-			//   1. The baseRange circle (non-parabolic detection)
-			//   2. The maximum possible horizontal extent of the parabolic range
-			// Multiplying maxRange by 2 provides a safe upper bound for all possible height differences.
-			entity_pos_t subdivisionRange = std::max(q.baseRange, q.maxRange * 2);
+			CFixedVector3D pos3d = cmpSourcePosition->GetPosition()+
+			    CFixedVector3D(entity_pos_t::Zero(), q.yOrigin, entity_pos_t::Zero()) ;
+			// Get a quick list of entities that are potentially in range, with a cutoff of 2*maxRange.
 			subdivisionResultsBuffer.clear();
-			m_Subdivision.GetNear(subdivisionResultsBuffer, pos, subdivisionRange);
+			m_Subdivision.GetNear(subdivisionResultsBuffer, pos, q.maxRange * 2);

 			for (size_t i = 0; i < subdivisionResultsBuffer.size(); ++i)
 			{
@ -1373,20 +1340,6 @@ public:
 				if (!TestEntityQuery(q, it->first, it->second))
 					continue;

-				CFixedVector2D delta2D = CFixedVector2D(it->second.x, it->second.z) - pos;
-
-				// Check base range first
-				bool inBaseRange = !q.baseRange.IsZero() && delta2D.CompareLength(q.baseRange) <= 0;
-
-				if (inBaseRange)
-				{
-					// In base range - no need for parabolic check
-					if (q.minRange.IsZero() || delta2D.CompareLength(q.minRange) >= 0)
-						r.push_back(it->first);
-					continue;
-				}
-
-				// Parabolic check for entities outside base range
 				CmpPtr<ICmpPosition> cmpSecondPosition(GetSimContext(), subdivisionResultsBuffer[i]);
 				if (!cmpSecondPosition || !cmpSecondPosition->IsInWorld())
 					continue;
@ -1404,7 +1357,7 @@ public:
 					continue;

 				if (!q.minRange.IsZero())
-					if (delta2D.CompareLength(q.minRange) < 0)
+					if ((CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.minRange) < 0)
 						continue;

 				r.push_back(it->first);
@ -1441,22 +1394,6 @@ public:
 		}
 	}

-	/**
-	 * Compute effective horizontal range given a reference range and height difference.
-	 */
-	static entity_pos_t ComputeParabolicRange(entity_pos_t range, entity_pos_t heightDiff)
-	{
-		if (heightDiff < -range / 2)
-			return NEVER_IN_RANGE;
-
-		entity_pos_t effectiveRange;
-		effectiveRange.SetInternalValue(static_cast<i32>(isqrt64(
-			SQUARE_U64_FIXED(range) +
-			static_cast<i64>(heightDiff.GetInternalValue()) * static_cast<i64>(range.GetInternalValue()) * 2
-		)));
-		return effectiveRange;
-	}
-
 	entity_pos_t GetEffectiveParabolicRange(entity_id_t source, entity_id_t target, entity_pos_t range, entity_pos_t yOrigin) const override
 	{
 		// For non-positive ranges, just return the range.
@ -1471,32 +1408,13 @@ public:
 		if (!cmpTargetPosition || !cmpTargetPosition->IsInWorld())
 			return NEVER_IN_RANGE;

-		// GetPosition() returns the world height (terrain + water + offset)
-		CFixedVector3D sourcePos = cmpSourcePosition->GetPosition();
-		CFixedVector3D targetPos = cmpTargetPosition->GetPosition();
+		entity_pos_t heightDifference = cmpSourcePosition->GetHeightOffset() - cmpTargetPosition->GetHeightOffset() + yOrigin;
+		if (heightDifference < -range / 2)
+			return NEVER_IN_RANGE;

-		entity_pos_t heightDiff = sourcePos.Y - targetPos.Y + yOrigin;
-		return ComputeParabolicRange(range, heightDiff);
-	}
-
-	entity_pos_t GetMaxReachableParabolicHeight(entity_pos_t range, entity_pos_t yOrigin, entity_pos_t horizDistance) const override
-	{
-		// EffectiveRange² = range² + 2 * range * heightDiff
-		// Solve for heightDiff when effectiveRange = horizDistance:
-		//   heightDiff = (horizDistance² - range²) / (2 * range)
-		// Max target height above source = yOrigin - heightDiff
-		//                               = yOrigin + (range² - horizDistance²) / (2 * range)
-		//
-		// If horizDistance > range, the result is less than yOrigin (can be negative),
-		// meaning the source must be above the target to compensate for the extra horizontal distance.
-		// The caller can decide if that's acceptable.
-		i64 rangeSq = SQUARE_U64_FIXED(range);
-		i64 distSq = SQUARE_U64_FIXED(horizDistance);
-		i64 numerator = rangeSq - distSq;
-
-		entity_pos_t result;
-		result.SetInternalValue(static_cast<i32>(numerator / static_cast<i64>(range.GetInternalValue() * 2)));
-		return yOrigin + result;
+		entity_pos_t effectiveRange;
+		effectiveRange.SetInternalValue(static_cast<i32>(isqrt64(SQUARE_U64_FIXED(range) + static_cast<i64>(heightDifference.GetInternalValue()) * static_cast<i64>(range.GetInternalValue()) * 2)));
+		return effectiveRange;
 	}

 	entity_pos_t GetElevationAdaptedRange(const CFixedVector3D& pos1, const CFixedVector3D& rot, entity_pos_t range, entity_pos_t yOrigin, entity_pos_t angle) const override
@ -1601,8 +1519,7 @@ public:

 	Query ConstructQuery(entity_id_t source,
 		entity_pos_t minRange, entity_pos_t maxRange,
-		const std::vector<int>& owners, int requiredInterface, u8 flagsMask,
-		bool accountForSize, bool preferMirages = false) const
+		const std::vector<int>& owners, int requiredInterface, u8 flagsMask, bool accountForSize) const
 	{
 		// Min range must be non-negative.
 		if (minRange < entity_pos_t::Zero())
@ -1613,8 +1530,6 @@ public:
 		if (maxRange < entity_pos_t::Zero() && maxRange != ALWAYS_IN_RANGE)
 			LOGWARNING("CCmpRangeManager: Invalid max range %f in query for entity %u", maxRange.ToDouble(), source);

-		CmpPtr<ICmpOwnership> cmpOwnership(GetSimContext(), source);
-
 		Query q;
 		q.enabled = false;
 		q.parabolic = false;
@ -1623,7 +1538,6 @@ public:
 		q.maxRange = maxRange;
 		q.yOrigin = entity_pos_t::Zero();
 		q.accountForSize = accountForSize;
-		q.preferMirages = preferMirages;

 		if (q.accountForSize && q.source.GetId() != INVALID_ENTITY && q.maxRange != ALWAYS_IN_RANGE)
 		{
@ -1660,14 +1574,12 @@ public:
 	}

 	Query ConstructParabolicQuery(entity_id_t source,
-		entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t baseRange, entity_pos_t yOrigin,
-		const std::vector<int>& owners, int requiredInterface, u8 flagsMask,
-		bool accountForSize, bool preferMirages = false) const
+		entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t yOrigin,
+		const std::vector<int>& owners, int requiredInterface, u8 flagsMask, bool accountForSize) const
 	{
-		Query q = ConstructQuery(source, minRange, maxRange, owners, requiredInterface, flagsMask, accountForSize, preferMirages);
+		Query q = ConstructQuery(source, minRange, maxRange, owners, requiredInterface, flagsMask, accountForSize);
 		q.parabolic = true;
 		q.yOrigin = yOrigin;
-		q.baseRange = baseRange;
 		return q;
 	}

--- a/source/simulation2/components/ICmpObstruction.cpp
+++ b/source/simulation2/components/ICmpObstruction.cpp
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -45,14 +45,6 @@ std::string ICmpObstruction::CheckFoundation_wrapper(const std::string& classNam
 	}
 }

-CFixedVector2D ICmpObstruction::GetObstructionHalfSizes_wrapper() const
-{
-	ICmpObstructionManager::ObstructionSquare square;
-	if (!GetObstructionSquare(square))
-		return CFixedVector2D(entity_pos_t::FromInt(-1), entity_pos_t::FromInt(-1));
-	return CFixedVector2D(square.hw, square.hh);
-}
-
 BEGIN_INTERFACE_WRAPPER(Obstruction)
 DEFINE_INTERFACE_METHOD("GetSize", ICmpObstruction, GetSize)
 DEFINE_INTERFACE_METHOD("CheckShorePlacement", ICmpObstruction, CheckShorePlacement)
@ -63,7 +55,6 @@ DEFINE_INTERFACE_METHOD("GetEntitiesBlockingConstruction", ICmpObstruction, GetE
 DEFINE_INTERFACE_METHOD("GetEntitiesDeletedUponConstruction", ICmpObstruction, GetEntitiesDeletedUponConstruction)
 DEFINE_INTERFACE_METHOD("SetActive", ICmpObstruction, SetActive)
 DEFINE_INTERFACE_METHOD("SetDisableBlockMovementPathfinding", ICmpObstruction, SetDisableBlockMovementPathfinding)
-DEFINE_INTERFACE_METHOD("GetObstructionHalfSizes", ICmpObstruction, GetObstructionHalfSizes_wrapper)
 DEFINE_INTERFACE_METHOD("GetBlockMovementFlag", ICmpObstruction, GetBlockMovementFlag)
 DEFINE_INTERFACE_METHOD("SetControlGroup", ICmpObstruction, SetControlGroup)
 DEFINE_INTERFACE_METHOD("GetControlGroup", ICmpObstruction, GetControlGroup)
--- a/source/simulation2/components/ICmpObstruction.h
+++ b/source/simulation2/components/ICmpObstruction.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2025 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -104,12 +104,6 @@ public:
 	 */
 	virtual std::string CheckFoundation_wrapper(const std::string& className, bool onlyCenterPoint) const;

-	/**
-	 * GetObstructionSquare wrapper for script calls.
-	 * @return [hw, hh] half-sizes of the obstruction square, or empty array on failure.
-	 */
-	virtual CFixedVector2D GetObstructionHalfSizes_wrapper() const;
-
 	/**
 	 * Test whether this entity is colliding with any obstructions that share its
 	 * control groups and block the creation of foundations.
--- a/source/simulation2/components/ICmpRangeManager.cpp
+++ b/source/simulation2/components/ICmpRangeManager.cpp
@ -68,7 +68,6 @@ DEFINE_INTERFACE_METHOD("GetLosRevealWholeMap", ICmpRangeManager, GetLosRevealWh
 DEFINE_INTERFACE_METHOD("SetLosRevealWholeMapForAll", ICmpRangeManager, SetLosRevealWholeMapForAll)
 DEFINE_INTERFACE_METHOD("GetLosRevealWholeMapForAll", ICmpRangeManager, GetLosRevealWholeMapForAll)
 DEFINE_INTERFACE_METHOD("GetEffectiveParabolicRange", ICmpRangeManager, GetEffectiveParabolicRange)
-DEFINE_INTERFACE_METHOD("GetMaxReachableParabolicHeight", ICmpRangeManager, GetMaxReachableParabolicHeight)
 DEFINE_INTERFACE_METHOD("GetElevationAdaptedRange", ICmpRangeManager, GetElevationAdaptedRange)
 DEFINE_INTERFACE_METHOD("ActivateScriptedVisibility", ICmpRangeManager, ActivateScriptedVisibility)
 DEFINE_INTERFACE_METHOD("GetLosVisibility", ICmpRangeManager, GetLosVisibility_wrapper)
--- a/source/simulation2/components/ICmpRangeManager.h
+++ b/source/simulation2/components/ICmpRangeManager.h
@ -161,42 +161,29 @@ public:
 	 * @param requiredInterface if non-zero, an interface ID that matching entities must implement.
 	 * @param flags if a entity in range has one of the flags set it will show up.
 	 * @param accountForSize if true, compensate for source/target entity sizes.
-	 * @param preferMirages if true, mirage entities are included (bypassing interface checks)
-	 *        and HIDDEN entities are filtered out (needed for targeting fogged enemies).
-	 *        When false (default), mirages are excluded entirely and real entities
-	 *        are returned regardless of visibility (even if hidden).
 	 * @return unique non-zero identifier of query.
 	 */
-	virtual tag_t CreateActiveQuery(entity_id_t source,
-		entity_pos_t minRange, entity_pos_t maxRange,
-		const std::vector<int>& owners, int requiredInterface, u8 flags,
-		bool accountForSize, bool preferMirages = false) = 0;
+	virtual tag_t CreateActiveQuery(entity_id_t source, entity_pos_t minRange, entity_pos_t maxRange,
+		const std::vector<int>& owners, int requiredInterface, u8 flags, bool accountForSize) = 0;

-	/**
-	 * Construct an active query of a parabolic form around the unit.
+    /**
+	 * Construct an active query of a paraboloic form around the unit.
 	 * The query will be disabled by default.
 	 * @param source the entity around which the range will be computed.
 	 * @param minRange non-negative minimum horizontal distance in metres (inclusive). MinRange doesn't do parabolic checks.
 	 * @param maxRange non-negative maximum distance in metres (inclusive) for units on the same elevation;
 	 *      or -1.0 to ignore distance.
 	 *      For units on a different height positions, a physical correct paraboloid with height=maxRange/2 above the unit is used to query them
-	 * @param baseRange non-negative base detection range in metres (inclusive) for simple 2D circle checks.
-	 *      Units within this horizontal distance are always considered in range regardless of height.
-	 *      Set to 0 to disable (original parabolic-only behavior).
 	 * @param yOrigin extra bonus so the source can be placed higher and shoot further
 	 * @param owners list of player IDs that matching entities may have; -1 matches entities with no owner.
 	 * @param requiredInterface if non-zero, an interface ID that matching entities must implement.
 	 * @param flags if a entity in range has one of the flags set it will show up.
-	 * @param preferMirages if true, mirage entities are included (bypassing interface checks)
-	 *        and HIDDEN entities are filtered out (needed for targeting fogged enemies).
-	 *        When false (default), mirages are excluded entirely and real entities
-	 *        are returned regardless of visibility (even if hidden).
 	 * NB: this one has no accountForSize parameter (assumed true), because we currently can only have 7 arguments for JS functions.
 	 * @return unique non-zero identifier of query.
 	 */
-	virtual tag_t CreateActiveParabolicQuery(entity_id_t source,
-		entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t baseRange, entity_pos_t yOrigin,
-		const std::vector<int>& owners, int requiredInterface, u8 flags, bool preferMirages = false) = 0;
+	virtual tag_t CreateActiveParabolicQuery(entity_id_t source, entity_pos_t minRange, entity_pos_t maxRange, entity_pos_t yOrigin,
+		const std::vector<int>& owners, int requiredInterface, u8 flags) = 0;
+

 	/**
 	 * Get the effective range in a parablic range query.
@ -208,18 +195,6 @@ public:
 	 */
 	virtual entity_pos_t GetEffectiveParabolicRange(entity_id_t source, entity_id_t target, entity_pos_t range, entity_pos_t yOrigin) const = 0;

-	/**
-	* Get the max height (relative to the source) a parabolic projectile can reach
-	* at a given horizontal distance.
-	* @param source the entity at the origin.
-	* @param range the maximum parabolic range on flat terrain.
-	* @param yOrigin height bonus for the source.
-	* @param horizDistance the horizontal distance to check.
-	* @return the maximum reachable height difference (target height - source height),
-	*         or a very negative value if the horizontal distance exceeds the range.
-	*/
-	virtual entity_pos_t GetMaxReachableParabolicHeight(entity_pos_t range, entity_pos_t yOrigin, entity_pos_t horizDistance) const = 0;
-
 	/**
 	 * Get the average elevation over 8 points on distance range around the entity
 	 * @param id the entity id to look around
--- a/source/simulation2/components/tests/test_RangeManager.h
+++ b/source/simulation2/components/tests/test_RangeManager.h
@ -63,13 +63,13 @@ public:
 	entity_id_t GetTurretParent() const override {return INVALID_ENTITY;}
 	void UpdateTurretPosition() override {}
 	std::set<entity_id_t>* GetTurrets() override { return nullptr; }
-	bool IsInWorld() const override { return m_InWorld; }
-	void MoveOutOfWorld() override { m_InWorld = false; }
+	bool IsInWorld() const override { return true; }
+	void MoveOutOfWorld() override { }
 	void MoveTo(entity_pos_t /*x*/, entity_pos_t /*z*/) override { }
 	void MoveAndTurnTo(entity_pos_t /*x*/, entity_pos_t /*z*/, entity_angle_t /*a*/) override { }
 	void JumpTo(entity_pos_t /*x*/, entity_pos_t /*z*/) override { }
-	void SetHeightOffset(entity_pos_t dy) override { m_HeightOffset = dy; }
-	entity_pos_t GetHeightOffset() const override { return m_HeightOffset; }
+	void SetHeightOffset(entity_pos_t /*dy*/) override { }
+	entity_pos_t GetHeightOffset() const override { return entity_pos_t::Zero(); }
 	void SetHeightFixed(entity_pos_t /*y*/) override { }
 	entity_pos_t GetHeightFixed() const override { return entity_pos_t::Zero(); }
 	entity_pos_t GetHeightAtFixed(entity_pos_t, entity_pos_t) const override { return entity_pos_t::Zero(); }
@ -94,8 +94,6 @@ public:
 	CMatrix3D GetInterpolatedTransform(float /*frameOffset*/) const override { return CMatrix3D(); }

 	CFixedVector3D m_Pos;
-	entity_pos_t m_HeightOffset = entity_pos_t::Zero();
-	bool m_InWorld = true;
 };

 class MockObstructionRgm : public ICmpObstruction
@ -156,7 +154,7 @@ public:
 	{
 		ComponentTestHelper test(*g_ScriptContext);

-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
+		ICmpRangeManager* cmp = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);

 		MockVisionRgm vision;
 		test.AddMock(100, IID_Vision, vision);
@ -167,41 +165,41 @@ public:
 		// This tests that the incremental computation produces the correct result
 		// in various edge cases

-		rangeManager->SetBounds(entity_pos_t::FromInt(0), entity_pos_t::FromInt(0), entity_pos_t::FromInt(512), entity_pos_t::FromInt(512));
-		rangeManager->Verify();
-		{ CMessageCreate msg(100); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessageOwnershipChanged msg(100, -1, 1); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(247), entity_pos_t::FromDouble(257.95), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(247), entity_pos_t::FromInt(253), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
+		cmp->SetBounds(entity_pos_t::FromInt(0), entity_pos_t::FromInt(0), entity_pos_t::FromInt(512), entity_pos_t::FromInt(512));
+		cmp->Verify();
+		{ CMessageCreate msg(100); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessageOwnershipChanged msg(100, -1, 1); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(247), entity_pos_t::FromDouble(257.95), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(247), entity_pos_t::FromInt(253), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();

-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();

-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256)+entity_pos_t::Epsilon(), entity_pos_t::FromInt(256), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256)-entity_pos_t::Epsilon(), entity_pos_t::FromInt(256), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256)+entity_pos_t::Epsilon(), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256)-entity_pos_t::Epsilon(), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256)+entity_pos_t::Epsilon(), entity_pos_t::FromInt(256), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256)-entity_pos_t::Epsilon(), entity_pos_t::FromInt(256), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256)+entity_pos_t::Epsilon(), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(256), entity_pos_t::FromInt(256)-entity_pos_t::Epsilon(), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();

-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(383), entity_pos_t::FromInt(84), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
-		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(348), entity_pos_t::FromInt(83), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		rangeManager->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(383), entity_pos_t::FromInt(84), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();
+		{ CMessagePositionChanged msg(100, true, entity_pos_t::FromInt(348), entity_pos_t::FromInt(83), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+		cmp->Verify();

 		std::mt19937 rng;
 		for (size_t i = 0; i < 1024; ++i)
 		{
 			double x = std::uniform_real_distribution<double>(0.0, 512.0)(rng);
 			double z = std::uniform_real_distribution<double>(0.0, 512.0)(rng);
-			{ CMessagePositionChanged msg(100, true, entity_pos_t::FromDouble(x), entity_pos_t::FromDouble(z), entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-			rangeManager->Verify();
+			{ CMessagePositionChanged msg(100, true, entity_pos_t::FromDouble(x), entity_pos_t::FromDouble(z), entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
+			cmp->Verify();
 		}

 		// Test OwnershipChange, GetEntitiesByPlayer, GetNonGaiaEntities
@ -210,22 +208,22 @@ public:
 			for (player_id_t newOwner = 0; newOwner < 8; ++newOwner)
 			{
 				CMessageOwnershipChanged msg(100, previousOwner, newOwner);
-				rangeManager->HandleMessage(msg, false);
+				cmp->HandleMessage(msg, false);

 				for (player_id_t i = 0; i < 8; ++i)
-					TS_ASSERT_EQUALS(rangeManager->GetEntitiesByPlayer(i).size(), i == newOwner ? 1 : 0);
+					TS_ASSERT_EQUALS(cmp->GetEntitiesByPlayer(i).size(), i == newOwner ? 1 : 0);

-				TS_ASSERT_EQUALS(rangeManager->GetNonGaiaEntities().size(), newOwner > 0 ? 1 : 0);
+				TS_ASSERT_EQUALS(cmp->GetNonGaiaEntities().size(), newOwner > 0 ? 1 : 0);
 				previousOwner = newOwner;
 			}
 		}
 	}

-	void test_range_queries_distance_only()
+	void test_queries()
 	{
 		ComponentTestHelper test(*g_ScriptContext);

-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
+		ICmpRangeManager* cmp = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);

 		MockVisionRgm vision, vision2;
 		MockPositionRgm position, position2;
@ -238,204 +236,101 @@ public:
 		test.AddMock(101, IID_Position, position2);
 		test.AddMock(101, IID_Obstruction, obs2);

-		rangeManager->SetBounds(entity_pos_t::FromInt(0), entity_pos_t::FromInt(0), entity_pos_t::FromInt(512), entity_pos_t::FromInt(512));
-		rangeManager->Verify();
-		{ CMessageCreate msg(100); rangeManager->HandleMessage(msg, false); }
-		{ CMessageCreate msg(101); rangeManager->HandleMessage(msg, false); }
+		cmp->SetBounds(entity_pos_t::FromInt(0), entity_pos_t::FromInt(0), entity_pos_t::FromInt(512), entity_pos_t::FromInt(512));
+		cmp->Verify();
+		{ CMessageCreate msg(100); cmp->HandleMessage(msg, false); }
+		{ CMessageCreate msg(101); cmp->HandleMessage(msg, false); }

-		// Don't set ownership for either entity - leave both as INVALID_PLAYER.
-		// This bypasses the visibility check in TestEntityQuery, allowing us to test
-		// the core distance calculation logic independently of the LOS system.
+		{ CMessageOwnershipChanged msg(100, -1, 1); cmp->HandleMessage(msg, false); }
+		{ CMessageOwnershipChanged msg(101, -1, 1); cmp->HandleMessage(msg, false); }

-		auto move = [&rangeManager](entity_id_t ent, MockPositionRgm& pos, fixed x, fixed z) {
+		auto move = [&cmp](entity_id_t ent, MockPositionRgm& pos, fixed x, fixed z) {
 			pos.m_Pos = CFixedVector3D(x, fixed::Zero(), z);
-			{ CMessagePositionChanged msg(ent, true, x, z, entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
+			{ CMessagePositionChanged msg(ent, true, x, z, entity_angle_t::Zero()); cmp->HandleMessage(msg, false); }
 		};

 		move(100, position, fixed::FromInt(10), fixed::FromInt(10));
 		move(101, position2, fixed::FromInt(10), fixed::FromInt(20));

-		// Query for owner -1 (INVALID_PLAYER) since both entities have no owner
-		std::vector<entity_id_t> nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {-1}, 0, true);
+		std::vector<entity_id_t> nearby = cmp->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{});
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});

 		move(101, position2, fixed::FromInt(10), fixed::FromInt(10));
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{});

 		move(101, position2, fixed::FromInt(10), fixed::FromInt(13));
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(4), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{});

 		move(101, position2, fixed::FromInt(10), fixed::FromInt(15));
 		// In range thanks to self obstruction size.
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(0), fixed::FromInt(4), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
 		// In range thanks to target obstruction size.
-		nearby = rangeManager->ExecuteQuery(101, fixed::FromInt(0), fixed::FromInt(4), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(101, fixed::FromInt(0), fixed::FromInt(4), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{100});

 		// Trickier: min-range is closest-to-closest, but rotation may change the real distance.
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(2), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(2), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(5), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(5), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
-		nearby = rangeManager->ExecuteQuery(100, fixed::FromInt(6), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(100, fixed::FromInt(6), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{});
-		nearby = rangeManager->ExecuteQuery(101, fixed::FromInt(5), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(101, fixed::FromInt(5), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{100});
-		nearby = rangeManager->ExecuteQuery(101, fixed::FromInt(6), fixed::FromInt(50), {-1}, 0, true);
+		nearby = cmp->ExecuteQuery(101, fixed::FromInt(6), fixed::FromInt(50), {1}, 0, true);
 		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{});

 	}

-	void test_range_queries_visibility_filtering()
+	void test_IsInTargetParabolicRange()
 	{
 		ComponentTestHelper test(*g_ScriptContext);
-
-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
-
-		MockVisionRgm vision, vision2;
-		MockPositionRgm position, position2;
-		MockObstructionRgm obs(fixed::FromInt(2)), obs2(fixed::Zero());
-		test.AddMock(100, IID_Vision, vision);
-		test.AddMock(100, IID_Position, position);
-		test.AddMock(100, IID_Obstruction, obs);
-
-		test.AddMock(101, IID_Vision, vision2);
-		test.AddMock(101, IID_Position, position2);
-		test.AddMock(101, IID_Obstruction, obs2);
-
-		rangeManager->SetBounds(entity_pos_t::FromInt(0), entity_pos_t::FromInt(0), entity_pos_t::FromInt(512), entity_pos_t::FromInt(512));
-		rangeManager->Verify();
-		{ CMessageCreate msg(100); rangeManager->HandleMessage(msg, false); }
-		{ CMessageCreate msg(101); rangeManager->HandleMessage(msg, false); }
-
-		// Set ownership for both entities so they have proper owners
-		{ CMessageOwnershipChanged msg(100, -1, 1); rangeManager->HandleMessage(msg, false); }
-		{ CMessageOwnershipChanged msg(101, -1, 1); rangeManager->HandleMessage(msg, false); }
-
-		auto move = [&rangeManager](entity_id_t ent, MockPositionRgm& pos, fixed x, fixed z) {
-			pos.m_Pos = CFixedVector3D(x, fixed::Zero(), z);
-			{ CMessagePositionChanged msg(ent, true, x, z, entity_angle_t::Zero()); rangeManager->HandleMessage(msg, false); }
-		};
-
-		move(100, position, fixed::FromInt(10), fixed::FromInt(10));
-		move(101, position2, fixed::FromInt(10), fixed::FromInt(15));
-
-		std::vector<int> owners;
-		owners.push_back(1);
-
-		// Test 1: With preferMirages = true, we should get the mirage entity when visible
-		ICmpRangeManager::tag_t query = rangeManager->CreateActiveQuery(
-			100,                                // source
-			fixed::FromInt(0),                  // minRange
-			fixed::FromInt(50),                 // maxRange
-			owners,                             // owners
-			0,                                  // requiredInterface
-			rangeManager->GetEntityFlagMask("normal"),
-			true,                               // accountForSize
-			true                                // preferMirages = true
-		);
-		rangeManager->EnableActiveQuery(query);
-
-		// With reveal map enabled, entity should be visible
-		rangeManager->SetLosRevealWholeMap(1, true);
-		{ CMessageUpdate msg(fixed::FromInt(1)); rangeManager->HandleMessage(msg, false); }
-
-		std::vector<entity_id_t> nearby = rangeManager->ResetActiveQuery(query);
-		// Should return either the real entity (101) or a mirage.
-		// For this test, we just verify something is returned.
-		TS_ASSERT_EQUALS(nearby.size(), 1);
-
-		// Disable reveal map - entity should become hidden
-		rangeManager->SetLosRevealWholeMap(1, false);
-		{ CMessageUpdate msg(fixed::FromInt(1)); rangeManager->HandleMessage(msg, false); }
-
-		nearby = rangeManager->ResetActiveQuery(query);
-		// Should return empty (no visible entities)
-		TS_ASSERT_EQUALS(nearby.size(), 0);
-
-		// Re-enable reveal map
-		rangeManager->SetLosRevealWholeMap(1, true);
-		{ CMessageUpdate msg(fixed::FromInt(1)); rangeManager->HandleMessage(msg, false); }
-
-		nearby = rangeManager->ResetActiveQuery(query);
-		TS_ASSERT_EQUALS(nearby.size(), 1);
-
-		// Test 2: With preferMirages = false (default), visibility filtering is disabled
-		ICmpRangeManager::tag_t query2 = rangeManager->CreateActiveQuery(
-			100,                                // source
-			fixed::FromInt(0),                  // minRange
-			fixed::FromInt(50),                 // maxRange
-			owners,                             // owners
-			0,                                  // requiredInterface
-			rangeManager->GetEntityFlagMask("normal"),
-			true,                               // accountForSize
-			false                               // preferMirages = false
-		);
-		rangeManager->EnableActiveQuery(query2);
-
-		// With preferMirages = false, entity should be returned even when hidden
-		rangeManager->SetLosRevealWholeMap(1, false);
-		{ CMessageUpdate msg(fixed::FromInt(1)); rangeManager->HandleMessage(msg, false); }
-
-		nearby = rangeManager->ResetActiveQuery(query2);
-		// Should return the real entity (101) even though hidden
-		TS_ASSERT_EQUALS(nearby, std::vector<entity_id_t>{101});
-
-		// Clean up
-		rangeManager->DestroyActiveQuery(query);
-		rangeManager->DestroyActiveQuery(query2);
-	}
-
-	void test_ParabolicRangeBasic()
-	{
-		ComponentTestHelper test(*g_ScriptContext);
-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
-
+		ICmpRangeManager* cmp = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
 		const entity_id_t source = 200;
 		const entity_id_t target = 201;
-		entity_pos_t range{fixed::FromInt(-3)};
-		entity_pos_t yOrigin{fixed::FromInt(-20)};
+		entity_pos_t range = fixed::FromInt(-3);
+		entity_pos_t yOrigin = fixed::FromInt(-20);

 		// Invalid range.
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), range);
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), range);

 		// No source ICmpPosition.
 		range = fixed::FromInt(10);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);

 		// No target ICmpPosition.
 		MockPositionRgm cmpSourcePosition;
 		test.AddMock(source, IID_Position, cmpSourcePosition);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);

 		// Too much height difference.
 		MockPositionRgm cmpTargetPosition;
 		test.AddMock(target, IID_Position, cmpTargetPosition);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);

 		// If no offset we get the range.
 		range = fixed::FromInt(20);
 		yOrigin = fixed::Zero();
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), range);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, fixed::Zero(), yOrigin), fixed::Zero());
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), range);
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, fixed::Zero(), yOrigin), fixed::Zero());

-		// Normal case with yOrigin only (no terrain difference)
+		// Normal case.
 		yOrigin = fixed::FromInt(5);
 		range = fixed::FromInt(10);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), fixed::FromFloat(14.142136f));
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), fixed::FromFloat(14.142136f));

 		// Big range.
 		range = fixed::FromInt(260);
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), fixed::FromFloat(264.952820f));
+		TS_ASSERT_EQUALS(cmp->GetEffectiveParabolicRange(source, target, range, yOrigin), fixed::FromFloat(264.952820f));
 	}

 	void test_ExploreCircle()
@ -472,72 +367,4 @@ public:

 		cmp->Verify();
 	}
-
-	void test_ParabolicRangeWithTerrain()
-	{
-		ComponentTestHelper test(*g_ScriptContext);
-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
-
-		const entity_id_t source{200};
-		const entity_id_t target{201};
-
-		MockPositionRgm sourcePos;
-		MockPositionRgm targetPos;
-		test.AddMock(source, IID_Position, sourcePos);
-		test.AddMock(target, IID_Position, targetPos);
-
-		const entity_pos_t range{fixed::FromInt(100)};
-		const entity_pos_t yOrigin{fixed::Zero()};
-
-		// Source on high ground (Y=10), target on low ground (Y=0)
-		sourcePos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::FromInt(10), fixed::Zero());
-		targetPos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::Zero(), fixed::FromInt(50));
-		entity_pos_t effective = rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin);
-		TS_ASSERT_DELTA(effective.ToFloat(), 109.5445f, 0.01f); // ~109.54
-
-		// Source on low ground (Y=0), target on high ground (Y=10)
-		sourcePos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::Zero(), fixed::Zero());
-		targetPos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::FromInt(10), fixed::FromInt(50));
-		effective = rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin);
-		TS_ASSERT_DELTA(effective.ToFloat(), 89.4427f, 0.01f); // ~89.44
-
-		// Source with height offset (Y=15), target on flat ground (Y=0), with yOrigin
-		sourcePos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::FromInt(15), fixed::Zero());
-		targetPos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::Zero(), fixed::FromInt(50));
-		const entity_pos_t yOrigin2{fixed::FromInt(2)};
-		effective = rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin2);
-		TS_ASSERT_DELTA(effective.ToFloat(), 115.7583f, 0.01f); // ~115.76
-	}
-
-	void test_ParabolicRangeTargetTooHigh()
-	{
-		ComponentTestHelper test(*g_ScriptContext);
-		ICmpRangeManager* rangeManager = test.Add<ICmpRangeManager>(CID_RangeManager, "", SYSTEM_ENTITY);
-
-		const entity_id_t source{200};
-		const entity_id_t target{201};
-
-		MockPositionRgm sourcePos;
-		MockPositionRgm targetPos;
-		test.AddMock(source, IID_Position, sourcePos);
-		test.AddMock(target, IID_Position, targetPos);
-
-		// Source on flat ground (height=0), target very high (height=30)
-		sourcePos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::Zero(), fixed::Zero());
-		targetPos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::FromInt(30), fixed::Zero());
-
-		const entity_pos_t range{fixed::FromInt(50)};
-		const entity_pos_t yOrigin{fixed::Zero()};
-
-		// heightDifference = 0 - 30 = -30, range/2 = 25
-		// -30 < -25 → NEVER_IN_RANGE
-		TS_ASSERT_EQUALS(rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin), NEVER_IN_RANGE);
-
-		// Target at borderline height (25)
-		targetPos.m_Pos = CFixedVector3D(fixed::Zero(), fixed::FromInt(25), fixed::Zero());
-
-		const entity_pos_t effective = rangeManager->GetEffectiveParabolicRange(source, target, range, yOrigin);
-		TS_ASSERT_DIFFERS(effective, NEVER_IN_RANGE);
-		TS_ASSERT_EQUALS(effective, fixed::Zero());
-	}
 };
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@ -273,16 +273,8 @@ private:

 		if (evt.GetWheelRotation())
 		{
-			if (evt.GetWheelAxis() == wxMOUSE_WHEEL_VERTICAL)
-			{
-				float speed = 16.f * ScenarioEditor::GetSpeedModifier();
-				POST_MESSAGE(SmoothZoom, (eRenderView::GAME, evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
-			}
-			else
-			{
-				float speed = ScenarioEditor::GetSpeedModifier();
-				POST_MESSAGE(RotateY, (evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
-			}
+			float speed = 16.f * ScenarioEditor::GetSpeedModifier();
+			POST_MESSAGE(SmoothZoom, (eRenderView::GAME, evt.GetWheelRotation() * speed / evt.GetWheelDelta()));
 		}
 		else
 		{
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
@ -45,15 +45,21 @@

 using AtlasMessage::Shareable;

+enum {
+	ID_PathsDrawing,
+	ID_PathsList,
+	ID_AddPath,
+	ID_DeletePath
+};
+
 CinemaSidebar::CinemaSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContainer, wxWindow* bottomBarContainer)
 	: Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer)
 {
 	{
 		auto* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Common settings"));

-		m_DrawPath = new wxCheckBox(sizer->GetStaticBox(), wxID_ANY, _("Draw all paths"));
+		m_DrawPath = new wxCheckBox(sizer->GetStaticBox(), ID_PathsDrawing, _("Draw all paths"));
 		m_DrawPath->SetToolTip(_("Display every cinematic path added to the map"));
-		m_DrawPath->Bind(wxEVT_CHECKBOX, [this](auto&){ SetPathsDrawing(m_DrawPath->IsChecked()); });

 		sizer->Add(m_DrawPath, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING));

@ -64,22 +70,20 @@ CinemaSidebar::CinemaSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarCo
 		auto* boxSizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Paths"));
 		auto* box = boxSizer->GetStaticBox();

-		m_PathList = new wxListBox(box, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT);
+		m_PathList = new wxListBox(box, ID_PathsList, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT);

-		auto* deleteButton = new wxButton(box, wxID_ANY, _("Delete"));
+		auto* deleteButton = new wxButton(box, ID_DeletePath, _("Delete"));
 		deleteButton->SetToolTip(_T("Delete selected path"));
-		deleteButton->Bind(wxEVT_BUTTON, [this](auto&){ DeleteSelectedPath(); });

-		auto* newPathName = new wxTextCtrl(box, wxID_ANY);
+		m_NewPathName = new wxTextCtrl(box, wxID_ANY);

-		auto* addButton = new wxButton(box, wxID_ANY, _("Add"));
-		addButton->Bind(wxEVT_BUTTON, [this, newPathName](auto&){ AddPath(newPathName->GetValue()); newPathName->Clear(); });
+		auto* addButton = new wxButton(box, ID_AddPath, _("Add"));

 		wxFlexGridSizer* pathsSizer = new wxFlexGridSizer(1, 5, 5);
 		pathsSizer->AddGrowableCol(0);
 		pathsSizer->Add(m_PathList, wxSizerFlags().Proportion(1).Expand());
 		pathsSizer->Add(deleteButton, wxSizerFlags().Expand());
-		pathsSizer->Add(newPathName, wxSizerFlags().Expand());
+		pathsSizer->Add(m_NewPathName, wxSizerFlags().Expand());
 		pathsSizer->Add(addButton, wxSizerFlags().Expand());

 		boxSizer->Add(pathsSizer, wxSizerFlags().Expand().Border(wxALL, Atlas::Style::STATICBOX_PADDING));
@ -102,21 +106,22 @@ void CinemaSidebar::OnMapReload()
 	ReloadPathList();
 }

-void CinemaSidebar::SetPathsDrawing(const bool enable)
+void CinemaSidebar::OnTogglePathsDrawing(wxCommandEvent& evt)
 {
-	POST_COMMAND(SetCinemaPathsDrawing, (enable));
+	POST_COMMAND(SetCinemaPathsDrawing, (evt.IsChecked()));
 }

-void CinemaSidebar::AddPath(wxString name)
+void CinemaSidebar::OnAddPath(wxCommandEvent&)
 {
-	if (name.empty())
+	if (m_NewPathName->GetValue().empty())
 		return;

-	POST_COMMAND(AddCinemaPath, (name.ToStdWstring()));
+	POST_COMMAND(AddCinemaPath, (m_NewPathName->GetValue().ToStdWstring()));
+	m_NewPathName->Clear();
 	ReloadPathList();
 }

-void CinemaSidebar::DeleteSelectedPath()
+void CinemaSidebar::OnDeletePath(wxCommandEvent&)
 {
 	int index = m_PathList->GetSelection();
 	if (index < 0)
@ -143,3 +148,9 @@ void CinemaSidebar::ReloadPathList()

 	m_PathList->SetStringSelection(selection);
 }
+
+wxBEGIN_EVENT_TABLE(CinemaSidebar, Sidebar)
+EVT_CHECKBOX(ID_PathsDrawing, CinemaSidebar::OnTogglePathsDrawing)
+EVT_BUTTON(ID_AddPath, CinemaSidebar::OnAddPath)
+EVT_BUTTON(ID_DeletePath, CinemaSidebar::OnDeletePath)
+wxEND_EVENT_TABLE();
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.h
@ -37,12 +37,15 @@ protected:
 	void OnFirstDisplay() override;

 private:
-	void SetPathsDrawing(const bool enable);
-	void AddPath(wxString name);
-	void DeleteSelectedPath();
+	void OnTogglePathsDrawing(wxCommandEvent& evt);
+	void OnAddPath(wxCommandEvent& evt);
+	void OnDeletePath(wxCommandEvent& evt);

 	void ReloadPathList();

 	wxCheckBox* m_DrawPath;
 	wxListBox* m_PathList;
+	wxTextCtrl* m_NewPathName;
+
+	wxDECLARE_EVENT_TABLE();
 };
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
@ -262,7 +262,7 @@ public:
 			wxGridSizer* gridSizer = new wxGridSizer(3, 5, 5);
 			wxButton* cameraSet = new wxButton(cameraSizer->GetStaticBox(), ID_CameraSet, _("Set"), wxDefaultPosition, wxSize(48, -1));
 			gridSizer->Add(Tooltipped(cameraSet,
-				_("Set player camera to this view")), wxSizerFlags().Expand());
+				_("Set player camera to cameraSizer->GetStaticBox() view")), wxSizerFlags().Expand());
 			wxButton* cameraView = new wxButton(cameraSizer->GetStaticBox(), ID_CameraView, _("View"), wxDefaultPosition, wxSize(48, -1));
 			cameraView->Enable(false);
 			gridSizer->Add(Tooltipped(cameraView,
--- a/source/tools/atlas/GameInterface/GameLoop.h
+++ b/source/tools/atlas/GameInterface/GameLoop.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2026 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -41,8 +41,7 @@ struct GameLoopState
 	struct Input
 	{
 		float scrollSpeed[6]; // [fwd, bwd, left, right, cw-rotation, ccw-rotation]. 0.0f for disabled.
-		float zoomDelta{0.f};
-		float rotateDelta{0.f};
+		float zoomDelta;
 	} input;
 };

--- a/source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/CameraCtrlHandlers.cpp
@ -199,14 +199,6 @@ MESSAGEHANDLER(RotateAround)
 	}
 }

-MESSAGEHANDLER(RotateY)
-{
-	if (!g_Game || g_Game->GetView()->GetCinema()->IsPlaying())
-		return;
-
-	g_AtlasGameLoop->input.rotateDelta = msg->angle;
-}
-
 MESSAGEHANDLER(LookAt)
 {
 	// TODO: different camera depending on msg->view
--- a/source/tools/atlas/GameInterface/InputProcessor.cpp
+++ b/source/tools/atlas/GameInterface/InputProcessor.cpp
@ -117,35 +117,6 @@ bool InputProcessor::ProcessInput(GameLoopState* state)
 		moved = true;
 	}

-	if (state->input.rotateDelta != 0.f)
-	{
-		float angle{4 * state->realFrameLength};
-		if (input.rotateDelta > 0 )
-		{
-			if (angle > input.rotateDelta)
-			{
-				angle = input.rotateDelta;
-				input.rotateDelta = 0.f;
-			}
-			else
-				input.rotateDelta -= angle;
-		}
-		else
-		{
-			angle *= -1;
-			if (angle < input.rotateDelta)
-			{
-				angle = input.rotateDelta;
-				input.rotateDelta = 0.f;
-			}
-			else
-				input.rotateDelta -= angle;
-		}
-		Rotate(camera, angle);
-
-		moved = true;
-	}
-
 	if (moved)
 	{
 		camera.UpdateFrustum();
--- a/source/tools/atlas/GameInterface/Messages.h
+++ b/source/tools/atlas/GameInterface/Messages.h
@ -456,10 +456,6 @@ MESSAGE(RotateAround,
 		((Position, pos))
 		);

-MESSAGE(RotateY,
-		((float, angle))
-		);
-
 MESSAGE(LookAt,
 		((int, view)) // eRenderView
 		((Position, pos))
--- a/source/tools/dist/build-osx-bundle.py
+++ b/source/tools/dist/build-osx-bundle.py
@ -137,7 +137,6 @@ with open(BUNDLE_CONTENTS + "/Info.plist", "wb") as f:
            "CFBundleDevelopmentRegion": "English",
            "CFBundleInfoDictionaryVersion": "6.0",
            "CFBundleIconFile": "0ad",
-            "LSApplicationCategoryType": "public.app-category.strategy-games",
            "LSHasLocalizedDisplayName": True,
            "LSMinimumSystemVersion": BUNDLE_MIN_OSX_VERSION,
            "NSHumanReadableCopyright": f"Copyright © {datetime.now(tz=UTC).year} Wildfire Games",
--- a/source/tools/entity/checkrefs.py
+++ b/source/tools/entity/checkrefs.py
@ -273,7 +273,7 @@ class CheckRefs:
                (version,) = unpack(int_fmt, f.read(int_len))
                if version != 7:
                    raise ValueError(f"Invalid PMP version ({version}) in '{ffp}'")
-                (datasize,) = unpack(int_fmt, f.read(int_len))  # noqa: RUF059
+                (datasize,) = unpack(int_fmt, f.read(int_len))
                (mapsize,) = unpack(int_fmt, f.read(int_len))
                f.seek(2 * (mapsize * 16 + 1) * (mapsize * 16 + 1), 1)  # skip heightmap
                (numtexs,) = unpack(int_fmt, f.read(int_len))
--- a/source/tools/lint/cppcheck/suppressions-list.txt
+++ b/source/tools/lint/cppcheck/suppressions-list.txt
@ -65,8 +65,8 @@ unknownMacro:source/lib/sysdep/os/win/wfirmware.cpp
 unknownMacro:source/lib/sysdep/os/win/wposix/wutsname.cpp
 unknownMacro:source/ps/CStr.cpp

-uninitvar:source/ps/Game.cpp
-uninitvar:source/ps/scripting/JSInterface_SavedGame.cpp
+uninitvar:source/ps/Game.cpp:246
+uninitvar:source/ps/scripting/JSInterface_SavedGame.cpp:149

 danglingLifetime:source/renderer/backend/gl/Device.cpp