From 59201d250d37538263fa4246e3fb9e3cee5c1f9c Mon Sep 17 00:00:00 2001
From: Erik <erik.nihlen@gmail.com>
Date: Sat, 7 Mar 2026 21:43:40 +0100
Subject: [PATCH] make ammoType an external variable instead of auto-detected

---
 neftet/README.md  |  2 +-
 neftet/neftet.af  |  3 +--
 neftet/neftet.met | 30 ++----------------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/neftet/README.md b/neftet/README.md
index 150846c..47fe002 100644
--- a/neftet/README.md
+++ b/neftet/README.md
@@ -17,6 +17,7 @@ These must be set before loading the meta (e.g. via launcher or `/ub setvar`):
 | `followTarget` | Yes (follower) | Follower | Leader's character name |
 | `navRoute` | Yes (leader) | Leader | Main hunting nav route name (e.g. `neftet_route`) |
 | `navWaitFollow` | Yes | Both | Return-to-start nav route name (e.g. `neftet_wait_follow`) |
+| `ammoType` | Yes | Both | `0` = mage/none, `1` = xbow, `2` = bow |
 
 ## Auto-Detected Variables
 
@@ -24,7 +25,6 @@ These are set automatically at startup in the `Default` state:
 
 | Variable | Values | Description |
 |---|---|---|
-| `ammoType` | `0` = mage/none, `1` = xbow, `2` = bow | Detected from inventory (Quarrelshafts vs Arrowshafts) |
 | `pickFlowers` | `1` = on, `0` = off | Leader picks up Desert Flowers (default: on) |
 | `pokePricklys` | `1` = on, `0` = off | Leader picks up Prickly Pears (default: on) |
 | `pickupRange` | distance | Range for flower/prickly detection (default: 10) |
diff --git a/neftet/neftet.af b/neftet/neftet.af
index f9cbc7c..2649937 100644
--- a/neftet/neftet.af
+++ b/neftet/neftet.af
@@ -9,6 +9,7 @@
 ~~   followTarget          - leader character name (follower only)
 ~~   navRoute              - main hunting route (leader only, e.g. neftet_route)
 ~~   navWaitFollow         - return-to-start route (both roles, e.g. neftet_wait_follow / neftet_wait_follow2)
+~~   ammoType              - 0 = mage/none, 1 = xbow, 2 = bow
 ~~   (navCloseStopRangeDefault removed - hardcoded to 0.00825 for both roles)
 ~~
 
@@ -82,7 +83,6 @@ STATE: {Default} ~~ {
 				DoExpr {setvar[pickFlowers, 1]}
 				DoExpr {setvar[pokePricklys, 1]}
 				DoExpr {setvar[pickupRange, 10]}
-				DoExpr {setvar[ammoType, cond[getinvcount[Wrapped Bundle of Quarrelshafts]>0, 1, cond[getinvcount[Wrapped Bundle of Arrowshafts]>0, 2, 0]]]}
 				SetState {Hunt}
 	IF:	All
 			Expr {getvar[isLeader]==0}
@@ -93,7 +93,6 @@ STATE: {Default} ~~ {
 				Chat {/vt opt set enablebuffing true}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set navpriorityboost true}
-				DoExpr {setvar[ammoType, cond[getinvcount[Wrapped Bundle of Quarrelshafts]>0, 1, cond[getinvcount[Wrapped Bundle of Arrowshafts]>0, 2, 0]]]}
 				SetState {Hunt}
 ~~ }
 STATE: {Hunt} ~~ {
diff --git a/neftet/neftet.met b/neftet/neftet.met
index e989900..6906955 100644
--- a/neftet/neftet.met
+++ b/neftet/neftet.met
@@ -140,7 +140,7 @@ K
 V
 n
 n
-13
+12
 i
 2
 s
@@ -222,19 +222,6 @@ e
 s
 setvar[pickupRange, 10]
 i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[ammoType, cond[getinvcount[Wrapped Bundle of Quarrelshafts]>0, 1, cond[getinvcount[Wrapped Bundle of Arrowshafts]>0, 2, 0]]]
-i
 1
 s
 Hunt
@@ -270,7 +257,7 @@ K
 V
 n
 n
-8
+7
 i
 2
 s
@@ -296,19 +283,6 @@ i
 s
 /vt opt set navpriorityboost true
 i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[ammoType, cond[getinvcount[Wrapped Bundle of Quarrelshafts]>0, 1, cond[getinvcount[Wrapped Bundle of Arrowshafts]>0, 2, 0]]]
-i
 1
 s
 Hunt