Dominik Roth
23615a8c92
rerender on assign/alive/shell, add Windows build tooling - Board.add_target/add_ally's id auto-assignment used a bare next(c for c in string.ascii_uppercase if c not in used), which raises StopIteration once 26 entities of a group exist -- a real crash confirmed via a live traceback, and a direct regression from moving that sequence from per-type to per-group. This was the actual cause of "Accept as"/"Accept all" silently doing nothing. Fixed with _next_free_id(), which rolls over to two-letter ids instead of raising. - New TargetType.STRIKE_REQUEST: the bearing/distance-offset "taking fire" fire-support request (see the earlier two-entity split) now creates this instead of reusing STRIKE, so a radioed-in request is never confused with a strike the player placed themselves. Same crosshair icon, excluded from type pickers/dedupe like STRIKE. - The "Accept as..." popover on a detected map marker now uses the same icon grid the entity-edit "Change type" popover does (was a plain unfiltered text list of every TargetType, which also wrongly offered STRIKE/STRIKE_REQUEST as pickable). - Firing panel: _cycle_assignment/_toggle_alive/_pick_shell no longer route through app.py's full solver+dedupe+canvas+panel refresh -- none of the three can affect the solver or dedupe, and none change which cards exist or their order (except _toggle_alive in hide/sort_later mode). New FiringPanel._rebuild_one() rebuilds just the one changed card; on_visual_change is a new, lighter callback (just a map redraw) for the two of these three that actually affect it. This was a real, confirmed lag source with many units on the board: every click on any of these was previously rebuilding every card of every target. - Map right-click entity menu: added "Mark destroyed"/"Mark alive", reusing the same cheap-refresh path (new FiringPanel.refresh_after_alive_change). - packaging/windows/: a from-scratch (untested against a real boot) MSYS2 + WiX .msi build pipeline for Windows, driven from Linux via dockur/windows (KVM-in-container), no Windows machine or GitHub required. See its own README for status/caveats. - New/updated tests: id-namespace sharing + the 26-entity overflow regression (tests/test_models.py), StrikeRequest split (tests/test_ocr.py), warp_to_map's img_scale param (tests/test_map_vision_warp.py). 44/44 passing. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
69 lines
3.1 KiB
XML
69 lines
3.1 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!--
|
|
Hand-authored shell: directory layout, the Start Menu shortcut, and the
|
|
PYTHONPATH environment variable the shortcut relies on (see run.sh's
|
|
equivalent `PYTHONPATH=src python -m fenigma.app`). The actual app/
|
|
runtime files are a separate auto-harvested fragment (files.wxs, built
|
|
by heat.exe in build.bat) referenced here only by its ComponentGroup id.
|
|
|
|
UpgradeCode below is a fixed, generated-once GUID: DO NOT regenerate
|
|
it, that's what lets a newer .msi upgrade an older install in place
|
|
instead of installing side by side. ProductCode is left as "*" (auto-
|
|
generated per build), which is the normal WiX pattern.
|
|
|
|
UNTESTED (see build.bat's top-of-file note).
|
|
-->
|
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
|
<Product Id="*"
|
|
Name="FEnigma"
|
|
Language="1033"
|
|
Version="$(var.AppVersion)"
|
|
Manufacturer="FEnigma"
|
|
UpgradeCode="DAB672A3-9E27-4F3F-8251-0AACD6E57B94">
|
|
|
|
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
|
|
|
|
<MajorUpgrade DowngradeErrorMessage="A newer version of FEnigma is already installed." />
|
|
<MediaTemplate EmbedCab="yes" />
|
|
|
|
<Directory Id="TARGETDIR" Name="SourceDir">
|
|
<Directory Id="ProgramFiles64Folder">
|
|
<Directory Id="INSTALLFOLDER" Name="FEnigma" />
|
|
</Directory>
|
|
<Directory Id="ProgramMenuFolder">
|
|
<Directory Id="ApplicationProgramsFolder" Name="FEnigma" />
|
|
</Directory>
|
|
</Directory>
|
|
|
|
<!-- AppFiles (all of dist\mingw64 + dist\src, harvested by heat.exe
|
|
into files.wxs) is referenced by id only: its actual file list
|
|
lives in that generated fragment, not here. -->
|
|
<Feature Id="MainFeature" Title="FEnigma" Level="1">
|
|
<ComponentGroupRef Id="AppFiles" />
|
|
<ComponentRef Id="ApplicationShortcutComponent" />
|
|
</Feature>
|
|
|
|
<DirectoryRef Id="ApplicationProgramsFolder">
|
|
<Component Id="ApplicationShortcutComponent" Guid="*">
|
|
<Shortcut Id="ApplicationStartMenuShortcut"
|
|
Name="FEnigma"
|
|
Description="Screen-reading helper for IRON NEST: Heavy Turret Simulator"
|
|
Target="[INSTALLFOLDER]mingw64\bin\pythonw.exe"
|
|
Arguments="-m fenigma.app"
|
|
WorkingDirectory="INSTALLFOLDER" />
|
|
<RemoveFolder Id="CleanUpShortcut" On="uninstall" />
|
|
<!-- Machine-wide PYTHONPATH so the bundled mingw64\bin\pythonw.exe
|
|
(which knows nothing about this app on its own) can find the
|
|
fenigma package: same role run.sh's env var plays on Linux.
|
|
Permanent="no": removed again on uninstall. -->
|
|
<Environment Id="PythonPathEnv" Name="PYTHONPATH" Value="[INSTALLFOLDER]src"
|
|
Permanent="no" Action="set" System="yes" Part="last" />
|
|
<RegistryValue Root="HKCU" Key="Software\FEnigma" Name="installed" Type="integer" Value="1" KeyPath="yes" />
|
|
</Component>
|
|
</DirectoryRef>
|
|
|
|
<!-- WixUI_Minimal: no EULA screen, so no WixUILicenseRtf override needed. -->
|
|
<UIRef Id="WixUI_Minimal" />
|
|
</Product>
|
|
</Wix>
|