specify what to pickup in picking_flowers
All checks were successful
/ test (push) Successful in 20s

This commit is contained in:
Johan Lundberg 2026-09-03 23:33:32 +02:00
parent 9aca53d2ab
commit 1c849b8747
2 changed files with 101 additions and 9 deletions

View file

@ -148,7 +148,9 @@ STATE: {Hunt}
Expr {wobjectgetname[wobjectfindnearestbyobjectclass[37]]==Amber Crystal}
Expr {getvar[pickFlowers]==1}
ItemCountGE 5 {Viridian Essence}
DO: SetState {picking_flowers}
DO: DoAll
DoExpr {setvar[whatToPick, wobjectgetname[wobjectfindnearestbyobjectclass[37]]]}
SetState {picking_flowers}
IF: All
Expr {getvar[ammoType]==1}
Any
@ -236,6 +238,8 @@ STATE: {vitae_run}
DO: Chat {/vt nav load vr_vitae_run_follower}
IF: ChatMatch {^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$}
DO: SetState {Default}
IF: Always
DO: SetWatchdog 3 300 {Default}
STATE: {vitae_run_leader}
IF: Always
@ -244,6 +248,8 @@ STATE: {vitae_run_leader}
DO: DoAll
Chat {/fellowship #vitaerundoneviridianrise}
SetState {Default}
IF: Always
DO: SetWatchdog 3 300 {Default}
STATE: {vr_gas_dodge}
IF: Always
@ -293,7 +299,7 @@ STATE: {vr_portal}
IF: ChatMatch {^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$}
DO: SetState {Default}
IF: Always
DO: SetWatchdog 3 300 {Default}
DO: SetWatchdog 3 300 {Default}
STATE: {recomp}
IF: Death
@ -323,13 +329,14 @@ STATE: {recomp}
DO: SetWatchdog 3 300 {Default}
STATE: {picking_flowers}
IF: Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[37]]]<=getvar[pickupRange]+3}
IF: All
Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]<=getvar[pickupRange]+3}
DO: DoAll
DoExpr {setvar[ObjectClose, 1]}
EmbedNav nav2__pickup_nav {pickup.nav}
IF: All
Expr {getvar[ObjectClose]==1}
Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[37]]]>getvar[pickupRange]+4}
Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]]>getvar[pickupRange]+4}
DO: DoAll
DoExpr {setvar[ObjectClose, 0]}
SetState {Hunt}

View file

@ -11,7 +11,7 @@ n
n
n
n
79
81
i
1
i
@ -1136,7 +1136,7 @@ Hunt
i
2
i
1
3
TABLE
2
K
@ -1213,6 +1213,28 @@ s
c
i
5
TABLE
2
K
V
n
n
2
i
7
TABLE
2
k
v
n
n
1
s
e
s
setvar[whatToPick, wobjectgetname[wobjectfindnearestbyobjectclass[37]]]
i
1
s
picking_flowers
s
@ -1941,6 +1963,33 @@ vitae_run
i
1
i
9
i
0
TABLE
2
k
v
n
n
3
s
s
s
Default
s
r
d
3
s
t
d
300
s
vitae_run
i
1
i
2
i
0
@ -1974,6 +2023,33 @@ vitae_run_leader
i
1
i
9
i
0
TABLE
2
k
v
n
n
3
s
s
s
Default
s
r
d
3
s
t
d
300
s
vitae_run_leader
i
1
i
2
i
0
@ -2489,11 +2565,20 @@ d
s
recomp
i
26
2
i
3
TABLE
2
K
V
n
n
1
i
26
TABLE
2
k
v
n
@ -2502,7 +2587,7 @@ n
s
e
s
coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[37]]]<=getvar[pickupRange]+3
coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]<=getvar[pickupRange]+3
TABLE
2
K
@ -2582,7 +2667,7 @@ n
s
e
s
coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[37]]]>getvar[pickupRange]+4
coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbynameandobjectclass[37, getvar[whatToPick]]]]>getvar[pickupRange]+4
TABLE
2
K