Fixes shooting in adventure mode

advtools.lua

@@ -1,10 +1,12 @@
 --@ module=true
 
 local convo = reqscript('internal/advtools/convo')
+local shooting = reqscript('internal/advtools/shooting')
 local party = reqscript('internal/advtools/party')
 
 OVERLAY_WIDGETS = {
     conversation=convo.AdvRumorsOverlay,
+    fix_shooting=shooting.FixShootingOverlay,
 }
 
 if dfhack_flags.module then

changelog.txt

@@ -28,6 +28,7 @@ Template for new versions:
 
 ## New Tools
 - `advtools`: collection of useful commands and overlays for adventure mode
+- `advtools`: added a fix for the shooting bug that corrupts throwing/shooting and can cause crashes between save loads
 - `advtools`: advtools party - promotes one of your companions to become a controllable adventurer
 - `pop-control`: (reinstated) limit the maximum size of migrant waves
 - `bodyswap`: (reinstated) take control of another unit in adventure mode

internal/advtools/shooting.lua

@@ -0,0 +1,28 @@
+-- Fixes shooting/throwing options stacking on each other, causing null pointers and crashes
+--@ module = true
+
+local aim_projectile = df.global.game.main_interface.adventure.aim_projectile
+
+local overlay = require('plugins.overlay')
+
+FixShootingOverlay = defclass(FixShootingOverlay, overlay.OverlayWidget)
+FixShootingOverlay.ATTRS{
+    desc='Fixes Shooting your weapon breaking your Throw action.',
+    default_enabled=true,
+    viewscreens={
+        'dungeonmode/Inventory',
+        'dungeonmode/AimProjectile'
+    },
+    frame={w=0, h=0},
+}
+
+function FixShootingOverlay:onInput()
+    if aim_projectile.open == false then
+        aim_projectile.shooter_it = nil
+        aim_projectile.ammo_it = nil
+        aim_projectile.thrown_it = nil
+        aim_projectile.shooting = false
+    elseif aim_projectile.shooting then
+        aim_projectile.thrown_it = nil
+    end
+end