make ammoType an external variable instead of auto-detected
All checks were successful
/ test (push) Successful in 1m35s

This commit is contained in:
Erik 2026-03-07 21:43:40 +01:00
parent d50d04c298
commit 59201d250d
3 changed files with 4 additions and 31 deletions

View file

@ -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 | | `followTarget` | Yes (follower) | Follower | Leader's character name |
| `navRoute` | Yes (leader) | Leader | Main hunting nav route name (e.g. `neftet_route`) | | `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`) | | `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 ## Auto-Detected Variables
@ -24,7 +25,6 @@ These are set automatically at startup in the `Default` state:
| Variable | Values | Description | | 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) | | `pickFlowers` | `1` = on, `0` = off | Leader picks up Desert Flowers (default: on) |
| `pokePricklys` | `1` = on, `0` = off | Leader picks up Prickly Pears (default: on) | | `pokePricklys` | `1` = on, `0` = off | Leader picks up Prickly Pears (default: on) |
| `pickupRange` | distance | Range for flower/prickly detection (default: 10) | | `pickupRange` | distance | Range for flower/prickly detection (default: 10) |

View file

@ -9,6 +9,7 @@
~~ followTarget - leader character name (follower only) ~~ followTarget - leader character name (follower only)
~~ navRoute - main hunting route (leader only, e.g. neftet_route) ~~ 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) ~~ 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) ~~ (navCloseStopRangeDefault removed - hardcoded to 0.00825 for both roles)
~~ ~~
@ -82,7 +83,6 @@ STATE: {Default} ~~ {
DoExpr {setvar[pickFlowers, 1]} DoExpr {setvar[pickFlowers, 1]}
DoExpr {setvar[pokePricklys, 1]} DoExpr {setvar[pokePricklys, 1]}
DoExpr {setvar[pickupRange, 10]} 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} SetState {Hunt}
IF: All IF: All
Expr {getvar[isLeader]==0} Expr {getvar[isLeader]==0}
@ -93,7 +93,6 @@ STATE: {Default} ~~ {
Chat {/vt opt set enablebuffing true} Chat {/vt opt set enablebuffing true}
Chat {/vt opt set enablenav true} Chat {/vt opt set enablenav true}
Chat {/vt opt set navpriorityboost 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} SetState {Hunt}
~~ } ~~ }
STATE: {Hunt} ~~ { STATE: {Hunt} ~~ {

View file

@ -140,7 +140,7 @@ K
V V
n n
n n
13 12
i i
2 2
s s
@ -222,19 +222,6 @@ e
s s
setvar[pickupRange, 10] setvar[pickupRange, 10]
i 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 1
s s
Hunt Hunt
@ -270,7 +257,7 @@ K
V V
n n
n n
8 7
i i
2 2
s s
@ -296,19 +283,6 @@ i
s s
/vt opt set navpriorityboost true /vt opt set navpriorityboost true
i 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 1
s s
Hunt Hunt