Merge pull request #77148 from sparr/f_is_controlling_vehicle

Add controlling_vehicle EOC condition

data/json/ui/structured/structured_speed_vehicle.json

@@ -36,11 +36,15 @@
  "width": 27,
  "clauses": [
  {
- "id": "not_driving",
+ "id": "not_controlling_vehicle",
  "widgets": [ "structured_wield_simple", "structured_speed_layout" ],
- "condition": { "not": "u_driving" }
+ "condition": { "not": "u_controlling_vehicle" }
  },
- { "id": "driving", "widgets": [ "structured_fuel", "structured_vehicle_speed" ], "condition": "u_driving" }
+ {
+ "id": "controlling_vehicle",
+ "widgets": [ "structured_fuel", "structured_vehicle_speed" ],
+ "condition": "u_controlling_vehicle"
+ }
  ]
  },
  {

doc/EFFECT_ON_CONDITION.md

@@ -875,9 +875,30 @@ You don't wield anything
 { "not": "u_has_weapon" }
 ```
 
+### `u_controlling_vehicle`, `npc_controlling_vehicle`
+- type: simple string
+- return true if alpha or beta talker control a vehicle; Nota bene: NPCs cannot currently operate vehicles
+
+#### Valid talkers:
+
+| Avatar | Character | NPC | Monster | Furniture | Item |
+| ------ | --------- | --------- | ---- | ------- | --- | 
+| ✔️ | ✔️ | ✔️ | ❌ | ❌ | ❌ |
+
+#### Examples
+
+```json
+"u_controlling_vehicle"
+```
+
+true if you do not drive
+```json
+{ "not": "u_controlling_vehicle" }
+```
+
 ### `u_driving`, `npc_driving`
 - type: simple string
-- return true if alpha or beta talker operate a vehicles; Nota bene: NPCs cannot currently operate vehicles
+- return true if alpha or beta talker operate a moving vehicle; Nota bene: NPCs cannot currently operate vehicles
 
 #### Valid talkers:
 
@@ -4524,4 +4545,4 @@ Combination of values work as `and`, no matter how they are arranged. This two n
 ```
 ```json
 "search_data": [ { "category": "weapons", "wielded_only": true } ]
-```
+```

src/condition.cpp

@@ -1558,11 +1558,22 @@ conditional_t::func f_has_weapon( bool is_npc )
  };
 }
 
+conditional_t::func f_is_controlling_vehicle( bool is_npc )
+{
+ return [is_npc]( dialogue const & d ) {
+ const talker *actor = d.actor( is_npc );
+ if( const optional_vpart_position &vp = get_map().veh_at( actor->pos() ) ) {
+ return actor->is_in_control_of( vp->vehicle() );
+ }
+ return false;
+ };
+}
+
 conditional_t::func f_is_driving( bool is_npc )
 {
  return [is_npc]( dialogue const & d ) {
  const talker *actor = d.actor( is_npc );
- if( const optional_vpart_position vp = get_map().veh_at( actor->pos() ) ) {
+ if( const optional_vpart_position &vp = get_map().veh_at( actor->pos() ) ) {
  return vp->vehicle().is_moving() && actor->is_in_control_of( vp->vehicle() );
  }
  return false;
@@ -2609,6 +2620,7 @@ parsers_simple = {
  {"u_can_stow_weapon", "npc_can_stow_weapon", &conditional_fun::f_can_stow_weapon },
  {"u_can_drop_weapon", "npc_can_drop_weapon", &conditional_fun::f_can_drop_weapon },
  {"u_has_weapon", "npc_has_weapon", &conditional_fun::f_has_weapon },
+ {"u_controlling_vehicle", "npc_controlling_vehicle", &conditional_fun::f_is_controlling_vehicle },
  {"u_driving", "npc_driving", &conditional_fun::f_is_driving },
  {"u_has_activity", "npc_has_activity", &conditional_fun::f_has_activity },
  {"u_is_riding", "npc_is_riding", &conditional_fun::f_is_riding },