From c7009c1c35a87b018c8a1f9c4804b16510ce2bba Mon Sep 17 00:00:00 2001
From: Eric <52087122+Ramza13@users.noreply.github.com>
Date: Mon, 9 Jan 2023 02:10:28 -0500
Subject: [PATCH] Dialog, allow more variable usage and documentation cleanup
 (#62238)

* Loads

* More changes to use vars

* More cleanup

* Variabling

* More cleanup

* Fixes

* Update condition.cpp

* Documentation

* Update npctalk.cpp

* Update npctalk.cpp

* Update npctalk.cpp
---
 doc/NPCs.md            | 233 +++++++-------
 src/condition.cpp      | 355 +++++++++++-----------
 src/condition.h        |  40 +--
 src/dialogue_helpers.h |  47 ++-
 src/npctalk.cpp        | 673 ++++++++++++++++++++++-------------------
 5 files changed, 706 insertions(+), 642 deletions(-)

diff --git a/doc/NPCs.md b/doc/NPCs.md
index 4490379eddf58..8b610a6ed87f9 100644
--- a/doc/NPCs.md
+++ b/doc/NPCs.md
@@ -651,17 +651,15 @@ One of `"for_item"` or `"for_category"`, and each can either be a single string
 
 ---
 
-## Dialogue Effects
-The `effect` field of `speaker_effect` or a `response` can be any of the following effects. Multiple effects should be arranged in a list and are processed in the order listed.
-
-`variable_object`: This is either an object, an `arithmetic` expression(see arithmetic below) or array describing a variable name. It can either describe an int or a time duration. If it is an array it must have 2 values the first of which will be a minimum and the second will be a maximum and the value will be randomly between the two. If it is an int `default` is a required int which will be the value returned if the variable is not defined. If is it a duration then `default` can be either an int or a string describing a time span. `u_val`, `npc_val`, or `global_val` can be the used for the variable name element.  If `u_val` is used it describes a variable on player u, if `npc_val` is used it describes a variable on player npc, if `global_val` is used it describes a global variable.  If this is a duration `infinite` will be accepted to be a virtually infinite value(it is actually more than a year, if longer is needed a code change to make this a flag or something will be needed).
+#### Variable Object
+`variable_object`: This is either an object, an `arithmetic` [expression](#compare-integers-and-arithmetics) or array describing a variable name. It can either describe an int, a time duration or a string. If it is an array it must have 2 values the first of which will be a minimum and the second will be a maximum, the value will be randomly between the two. If it is an int `default` is an int which will be the value returned if the variable is not defined. If is it a duration then `default` can be either an int or a string describing a time span. `u_val`, `npc_val`, or `global_val` can be the used for the variable name element.  If `u_val` is used it describes a variable on player u, if `npc_val` is used it describes a variable on player npc, if `global_val` is used it describes a global variable.  If this is a duration `infinite` will be accepted to be a virtually infinite value(it is actually more than a year, if longer is needed a code change to make this a flag or something will be needed).
 
 example json:
 ```
 "effect": [ { "u_mod_focus": { "u_val":"test", "default": 1 } },
   { "u_mod_focus": [ 0, { "u_val":"test", "default": 1 } ] }
   { "u_add_morale": "morale_honey","bonus": -20,"max_bonus": -60, "decay_start": 1,
-  "duration": { "global_val": "test2", "type": "debug", "context": "testing", "default": "2 minutes" },
+  "duration": { "global_val": "test2", "default": "2 minutes" },
   {
     "u_spawn_monster": "mon_absence",
     "real_count": { "arithmetic": [ { "arithmetic": [ { "const":1 }, "+", { "const": 1 } ] }, "+", { "const": 1 } ] }
@@ -669,6 +667,9 @@ example json:
 
 ```
 
+## Dialogue Effects
+The `effect` field of `speaker_effect` or a `response` can be any of the following effects. Multiple effects should be arranged in a list and are processed in the order listed.
+
 #### Missions
 
 Effect | Description
@@ -697,34 +698,35 @@ Effect | Description
 
 Effect | Description
 ---|---
-`u_mutate`, `npc_mutate`: `chance_int`, *optional* `use_vitamins: vitamin_bool` | Your character or the NPC will attempt to mutate, with a one in `chance_int` chance of using the highest category, with 0 never using the highest category, requiring vitamins if `vitamin_bool` is true(defaults true)
-`u_mutate_category`, `npc_mutate_category`: `category_str`, *optional* `use_vitamins: vitamin_bool` | Your character or the NPC will attempt to mutate in the category `category_str`, requiring vitamins if `vitamin_bool` is true(defaults true)
-`u_add_effect: effect_string`, (*one of* `duration: duration_string`, `duration: duration_int`, `duration_variable_object`),(*optional* `target_part: target_part_string`, `intensity: intensity_int`)<br/>`npc_add_effect: effect_string`, (*one of* `duration: duration_string`, `duration: duration_int`, `duration_variable_object`), (*optional* `target_part: target_part_string`, `force: force_bool`, `intensity: intensity_int or intensity_variable_object`) | Your character or the NPC will gain the effect for `duration_string` or the value of the variable described by `duration_object` see `variable_object` above, turns at intensity `intensity_int` (or the value of the variable described by `intensity_variable_object` see `variable_object` above) or 0 if it was not supplied. If `force_bool` is true(defaults false) immunity will be ignored. If `target_part` is supplied that part will get the effect otherwise its a whole body effect. If `target_part` is `RANDOM` a random body part will be used. If `duration_string` is `"PERMANENT"`, the effect will be added permanently.
-`u_add_bionic: bionic_string`<br/>`npc_add_bionic: bionic_string` | Your character or the NPC will gain the bionic.
-`u_lose_bionic: bionic_string`<br/>`npc_lose_bionic: bionic_string` | Your character or the NPC will lose the bionic.
-`u_add_trait: trait_string`<br/>`npc_add_trait: trait_string` | Your character or the NPC will gain the trait.
-`u_lose_effect: effect_string`<br/>`npc_lose_effect: effect_string` | Your character or the NPC will lose the effect if they have it.
-`u_lose_trait: trait_string`<br/>`npc_lose_trait: trait_string` | Your character or the NPC will lose the trait.
+`u_mutate`, `npc_mutate`: int or [variable object](#variable-object), (*optional* `use_vitamins: vitamin_bool`) | Your character or the NPC will attempt to mutate, with a one in int chance of using the highest category, with 0 never using the highest category, requiring vitamins if `vitamin_bool` is true(defaults true)
+`u_mutate_category`, `npc_mutate_category`: string or [variable object](#variable-object), (*optional* `use_vitamins: vitamin_bool`) | Your character or the NPC will attempt to mutate in the category, requiring vitamins if `vitamin_bool` is true(defaults true)
+`u_add_effect, npc_add_effect: ` string or [variable object](#variable-object), (`duration: ` duration or [variable object](#variable-object)),(*optional* `target_part: ` [string or variable object](#variable-object) ) , (*optional* `intensity: ` int or [variable object](#variable-object) )<br/> | Your character or the NPC will gain the effect for `duration`, turns at intensity `intensity` or 0 if it was not supplied. If `force_bool` is true(defaults false) immunity will be ignored. If `target_part` is supplied that part will get the effect otherwise its a whole body effect. If `target_part` is `RANDOM` a random body part will be used. If `duration` is `"PERMANENT"`, the effect will be added permanently.
+`u_add_bionic, npc_add_bionic: ` string or [variable object](#variable-object) | Your character or the NPC will gain the bionic.
+`u_lose_bionic, npc_lose_bionic: ` string or [variable object](#variable-object) | Your character or the NPC will lose the bionic.
+`u_add_trait, npc_add_trait: `string or [variable object](#variable-object) | Your character or the NPC will gain the trait.
+`u_lose_effect, npc_lose_effect: `string or [variable object](#variable-object) | Your character or the NPC will lose the effect if they have it.
+`u_lose_trait, npc_lose_trait: `string or [variable object](#variable-object) | Your character or the NPC will lose the trait.
 `u_add_var, npc_add_var`: `var_name, type: type_str`, `context: context_str`, either `value: value_str` or `time: true` or `possible_values: string_array` | Your character or the NPC will store `value_str` as a variable that can be later retrieved by `u_has_var` or `npc_has_var`.  `npc_add_var` can be used to store arbitrary local variables, and `u_add_var` can be used to store arbitrary "global" variables, and should be used in preference to setting effects.  If `time` is used instead of `value_str`, then the current turn of the game is stored. If `possible_values` is used one of the values given at random will be used.
 `u_lose_var`, `npc_lose_var`: `var_name`, `type: type_str`, `context: context_str` | Your character or the NPC will clear any stored variable that has the same `var_name`, `type_str`, and `context_str`.
-`u_adjust_var, npc_adjust_var`: `var_name, type: type_str`, `context: context_str`, `adjustment: adjustment_num or adjustment_variable_object` | Your character or the NPC will adjust the stored variable by `adjustment_num` (or the value of the variable described by `adjustment_num` see `variable_object` above).
-`set_string_var`: `type: string or variable object or array of either`, `target_var: variable_object`| Store string (or the variable described) from `set_string_var` in the variable object `target_var`. If an array is provided a random element will be used.
-`u_location_variable, npc_location_variable`: `target_var`,*optional* `min_radius: min_radius_int or min_radius_variable_object`,*optional* `max_radius: max_radius_int or max_radius_variable_object`, *optional* `outdoor_only: outdoor_only_bool`, *optional* `target_params: assign_mission_target` parameters, *optional* `z_adjust: int or variable_object`, *optional* `x_adjust: int or variable_object`, *optional* `y_adjust: int or variable_object`, *optional* `z_override: bool` | If `target_params` is defined it will be used to find a tile. See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters. Otherwise targets a point between `min_radius_int`( or `min_radius_variable_object`)(defaults to 0) and `max_radius_int`( or `max_radius_variable_object`)(defaults to 0) spaces of the target and if `outdoor_only_bool` is true(defaults to false) will only choose outdoor spaces. The chosen point will be saved to `target_var` which is a `variable_object`.  `z_adjust` will be used as the Z value if `z_override`(defaults false) is true or added to the current z value otherwise. x_adjust and y_adjust are added to the final position.
+`u_adjust_var, npc_adjust_var`: `var_name, type: type_str`, `context: context_str`, `adjustment: `int or [variable object](#variable-object) | Your character or the NPC will adjust the stored variable by `adjustment`.
+`set_string_var`: string or [variable object](#variable-object) or array of either, `target_var: ` [variable object](#variable-object) | Store string from `set_string_var` in the variable object `target_var`. If an array is provided a random element will be used.
+`u_location_variable, npc_location_variable`: `target_var`, (*optional* `min_radius: `int or [variable object](#variable-object)) , (*optional* `max_radius: ` int or [variable object](#variable-object)), (*optional* `outdoor_only: outdoor_only_bool`), (*optional* `target_params: assign_mission_target` parameters), (*optional* `z_adjust: ` int or [variable object](#variable-object)), (*optional* `x_adjust: `string or [variable object](#variable-object)), (*optional* `y_adjust: `int or [variable object](#variable-object)), (*optional* `z_override: bool`) | If `target_params` is defined it will be used to find a tile. See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters. Otherwise targets a point between `min_radius_int`( or `min_radius_variable_object`)(defaults to 0) and `max_radius_int`( or `max_radius_variable_object`)(defaults to 0) spaces of the target and if `outdoor_only_bool` is true(defaults to false) will only choose outdoor spaces. The chosen point will be saved to `target_var` which is a `variable_object`.  `z_adjust` will be used as the Z value if `z_override`(defaults false) is true or added to the current z value otherwise. x_adjust and y_adjust are added to the final position.
 `barber_hair` | Opens a menu allowing the player to choose a new hair style.
 `barber_beard` | Opens a menu allowing the player to choose a new beard style.
-`u_learn_recipe: recipe_string`  | Your character will learn and memorize the recipe `recipe_string`.
-`npc_first_topic: talk_topic_string` | Changes the initial talk_topic of the NPC in all future dialogues.
-`u_add_wet: wet_int`<br/>`npc_add_wet: wet_int or wet_variable_object` | Your character or the NPC will be wet `wet_int` (or the value of the variable described by `wet_variable_object` see `variable_object` above) as if they were in the rain.
-`u_make_sound, npc_make_sound: message_string`, `volume: volume_int`, `type: type_string`,*optional* `target_var: target_var_object`, *optional* `snippet: snippet_bool`, *optional* `same_snippet: same_snippet_bool`  | A sound of description `message_string` will be made at your character or the NPC's location of volume `volume_int` and type `type_string`. Possible types are: background, weather, music, movement, speech, electronic_speech, activity, destructive_activity, alarm, combat, alert, or order. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  `target_var` is an object with `value`,`type` and `context` as string values and a bool `global` which determines if the variable is global or not. If `snippet_bool` is true(defaults to false) it will instead display a random snippet from `message_string` category, if `same_snippet_bool` is true(defaults to false) it will always use the same snippet and will set a variable that can be used for custom item names(this requires the snippets to have id's set)
-`u_mod_healthy, npc_mod_healthy : amount_int or amount_variable_object, cap: cap_int or cap_variable_object` | Your character or the NPC will have `amount_int` ( or the value of the variable described by `amount_variable_object` see `variable_object` above) added or subtracted from its health value, but not beyond `cap_int` or `cap_variable_object`.
-`u_add_morale: morale_string`, (*optional* `bonus: bonus_int` ), (*optional* `max_bonus: max_bonus_int or max_bonus_variable_object` ), (*optional* `duration: duration_string or duration_variable_object`), (*optional* `decay_start` : `decay_string or decay_variable_object`), (*optional* `capped`: `capped_bool`)<br/> `npc_add_morale: morale_string`, (*optional* `bonus: bonus_int or bonus_variable_object` ), (*optional* `max_bonus: max_bonus_int` ), (*optional* `duration: duration_int`), (*optional*`decay_start` : `decay_int`), (*optional* `capped`: `capped_bool`)| Your character or the NPC will gain a morale bonus of type `morale_string`. Morale is changed by `bonus_int`( or the value of the variable described by `bonus_variable_object` see `variable_object` above) (default 1), with a maximum of up to `max_bonus_int`(or `max_bonus_variable_object`)  (default 1). It will last for `duration: duration_string` time (default 1 hour) or `duration_variable_object`. It will begin to decay after `decay_string` time (default 30 minutes) or `decay_variable_object`. `capped_bool` Whether this morale is capped or not, defaults to false.
-`u_lose_morale: morale_string`<br/>`npc_lose_morale: morale_string` | Your character or the NPC will lose any morale of type `morale_string`.
-`u_add_faction_trust: amount_int`<br/>`u_lose_faction_trust: amount_int` | Your character gains or loses trust with the speaking NPC's faction, which affects which items become available for trading from shopkeepers of that faction.
-`u_message, npc_message: message_string`, (*optional* `sound: sound_bool`),(*optional* `outdoor_only: outdoor_only_bool`),(*optional* `snippet: snippet_bool`),(*optional* `same_snippet: snippet_bool`,(*optional* `type: type_string`),(*optional* `popup: popup_bool`) | Displays a message to either the player or the npc of `message_string`.  Will not display unless the player or npc is the actual player.  If `snippet_bool` is true(defaults to false) it will instead display a random snippet from `message_string` category, if `same_snippet_bool` is true(defaults to false) it will always use the same snippet and will set a variable that can be used for custom item names(this requires the snippets to have id's set).  If `sound` is true (defaults to false) it will only display the message if the player is not deaf.  `outdoor_only`(defaults to false) only matters when `sound` is true and will make the message less likely to be heard if the player is underground. Message will display as type of `type_string`. Type affects the color of message and can be any of the following values: good, neutral, bad, mixed, warning, info, debug, headshot, critical, grazing.  enums.h has more info on each types use. If `popup_bool` is true the message will be in a modal popup the user has to dismiss to continue.  You can use any of the  Special Custom Entries(defined above).
-`u_cast_spell, npc_cast_spell : fake_spell_data`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array` | The spell described by fake_spell_data will be cast with u or the npc as the caster and u or the npc's location as the target.  Fake spell data can have the following attributes: `id:string`: the id of the spell to cast, (*optional* `hit_self`: bool ( defaults to false ) if true can hit the caster, `trigger_message`: string to display on trigger, `npc_message`: string for message if npc uses, `max_level` int max level of the spell, `min_level` int min level of the spell ).  If the spell is cast, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
-`u_assign_activity, npc_assign_activity: activity_id_string`, `duration: duration_string or duration_variable_object`) | Your character or the NPC will start activity `activity_id_string`. It will last for `duration: duration_string` time or `duration_variable_object`.
-`u_teleport, npc_teleport: target_var_object`, (*optional* `success_message: success_message_string`), (*optional* `fail_message: fail_message_string`), (*optional* `force: fprce_bool`) | u or npc are teleported to the destination stored in the variable named by `target_var`.  `target_var` is an object with `value`,`type` and `context` as string values and a bool `global` which determines if the variable is global or not. If the teleport succeeds and `success_message` is defined it will be displayed, if it fails and `fail_message` is defined it will be displayed.  If `force` is true any creatures at the destination will be killed and if blocked a nearby spot will be chosen to teleport to instead.
-`u_set_hp, npc_set_hp : amount_int or variable_object`, (*optional* `target_part: string or string_variable_object`),(*optional* `only_increase: bool`) | Your character or the NPC will have the hp of `target_part`(or all parts if it was not used) set to `amount_int` ( or the value of the variable described by `amount_variable_object` see `variable_object` above).  If `only_increase` is true (defaults to false) this will only happen if it increases the parts hp.
+`u_learn_recipe: `string or [variable object](#variable-object)  | Your character will learn and memorize the recipe.
+`npc_first_topic: `string or [variable object](#variable-object) | Changes the initial talk_topic of the NPC in all future dialogues.
+`u_add_wet, npc_add_wet: `int or [variable object](#variable-object) | Your character or the NPC will be wet as if they were in the rain.
+`u_make_sound, npc_make_sound:`string or [variable object](#variable-object), `volume: `int or [variable object](#variable-object), `type: `string or [variable object](#variable-object), (*optional* `target_var: `[variable object](#variable-object)), (*optional* `snippet: snippet_bool`), (*optional* `same_snippet: same_snippet_bool`)  | A sound of description `message_string` will be made at your character or the NPC's location of volume `volume` and type `type_`. Possible types are: background, weather, music, movement, speech, electronic_speech, activity, destructive_activity, alarm, combat, alert, or order. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  If `snippet_bool` is true(defaults to false) it will instead display a random snippet from `message_string` category, if `same_snippet_bool` is true(defaults to false) it will always use the same snippet and will set a variable that can be used for custom item names(this requires the snippets to have id's set)
+`u_mod_healthy, npc_mod_healthy : `int or [variable object](#variable-object), `cap: ` int or [variable object](#variable-object) | Your character or the NPC will have `amount_int` added or subtracted from its health value, but not beyond `cap_int` or `cap_variable_object`.
+`u_add_morale, npc_add_morale: `string or [variable object](#variable-object), (*optional* `bonus: `int or [variable object](#variable-object)), (*optional* `max_bonus: `int or [variable object](#variable-object)), (*optional* `duration: `duration or [variable object](#variable-object)), (*optional* `decay_start: `duration or [variable object](#variable-object) ), (*optional* `capped`: `capped_bool`)| Your character or the NPC will gain a morale bonus of type `morale_string`. Morale is changed by `bonus`(default 1), with a maximum of up to `max_bonus_int`(default 1). It will last for `duration` time (default 1 hour). It will begin to decay after `decay_start` time (default 30 minutes). `capped_bool` Whether this morale is capped or not, defaults to false.
+`u_lose_morale, npc_lose_morale: `string or [variable object](#variable-object) | Your character or the NPC will lose any morale of type `morale_string`.
+`u_add_faction_trust: `int or [variable object](#variable-object) | Your character gains trust with the speaking NPC's faction, which affects which items become available for trading from shopkeepers of that faction.
+`u_lose_faction_trust: `int or [variable object](#variable-object) | Your character loses trust with the speaking NPC's faction, which affects which items become available for trading from shopkeepers of that faction.
+`u_message, npc_message: `string or [variable object](#variable-object), (*optional* `sound: sound_bool`), (*optional* `outdoor_only: outdoor_only_bool`), (*optional* `snippet: snippet_bool`), (*optional* `same_snippet: snippet_bool`, (*optional* `type: `string or [variable object](#variable-object)), (*optional* `popup: popup_bool`) | Displays a message to either the player or the npc of `message_string`.  Will not display unless the player or npc is the actual player.  If `snippet_bool` is true(defaults to false) it will instead display a random snippet from `message_string` category, if `same_snippet_bool` is true(defaults to false) it will always use the same snippet and will set a variable that can be used for custom item names(this requires the snippets to have id's set).  If `sound` is true (defaults to false) it will only display the message if the player is not deaf.  `outdoor_only`(defaults to false) only matters when `sound` is true and will make the message less likely to be heard if the player is underground. Message will display as type of `type`. Type affects the color of message and can be any of the following values: good, neutral, bad, mixed, warning, info, debug, headshot, critical, grazing.  enums.h has more info on each types use. If `popup_bool` is true the message will be in a modal popup the user has to dismiss to continue.  You can use any of the  Special Custom Entries(defined above).
+`u_cast_spell, npc_cast_spell : fake_spell_data`, (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | The spell described by fake_spell_data will be cast with u or the npc as the caster and u or the npc's location as the target.  Fake spell data can have the following attributes: `id:string`: the id of the spell to cast, (*optional* `hit_self`: bool ( defaults to false ) if true can hit the caster, `trigger_message`: string to display on trigger, `npc_message`: string for message if npc uses, `max_level` int max level of the spell, `min_level` int min level of the spell ).  If the spell is cast, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`u_assign_activity, npc_assign_activity: `string or [variable object](#variable-object), `duration: `duration or [variable object](#variable-object) | Your character or the NPC will start activity `u_assign_activity`. It will last for `duration` time.
+`u_teleport, npc_teleport: `[variable object](#variable-object), (*optional* `success_message: `string or [variable object](#variable-object)), (*optional* `fail_message: `string or [variable object](#variable-object)), (*optional* `force: force_bool`) | u or npc are teleported to the destination stored in the variable named by `target_var`.  If the teleport succeeds and `success_message` is defined it will be displayed, if it fails and `fail_message` is defined it will be displayed.  If `force` is true any creatures at the destination will be killed and if blocked a nearby spot will be chosen to teleport to instead.
+`u_set_hp, npc_set_hp : `int or [variable object](#variable-object), (*optional* `target_part: `string or [variable object](#variable-object)), (*optional* `only_increase: bool`) | Your character or the NPC will have the hp of `target_part`(or all parts if it was not used) set to `amount`.  If `only_increase` is true (defaults to false) this will only happen if it increases the parts hp.
 
 #### Trade / Items
 
@@ -734,16 +736,16 @@ Effect | Description
 `give_equipment` | Allows your character to select items from the NPC's inventory and transfer them to your inventory.
 `npc_gets_item` | Allows your character to select an item from your character's inventory and transfer it to the NPC's inventory.  The NPC will not accept it if they do not have space or weight to carry it, and will set a reason that can be referenced in a future dynamic line with `"use_reason"`.
 `npc_gets_item_to_use` | Allow your character to select an item from your character's inventory and transfer it to the NPC's inventory.  The NPC will attempt to wield it and will not accept it if it is too heavy or is an inferior weapon to what they are currently using, and will set a reason that can be referenced in a future dynamic line with `"use_reason"`.
-`u_spawn_item: item_string or variable_object`, (*optional* `count: count_num`, *optional* `container: container_string`) | Your character gains the item or `count_num` copies of the item, contained in container if specified. If used in an NPC conversation the items are said to be given by the NPC.  If a variable item is passed for the name an item of the type contained in it will be used.
-`u_buy_item: item_string`, (`cost: cost_num`, *optional* `count: count_num`, *optional* `container: container_string`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`) | The NPC will sell your character the item or `count_num` copies of the item, contained in `container`, and will subtract `cost_num` from `op_of_u.owed`.  If the `op_o_u.owed` is less than `cost_num`, the trade window will open and the player will have to trade to make up the difference; the NPC will not give the player the item unless `cost_num` is satisfied.
-`u_sell_item: item_string`, (*optional* `cost: cost_num`, *optional* `count: count_num`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`) | Your character will give the NPC the item or `count_num` copies of the item, and will add `cost_num` to the NPC's `op_of_u.owed` if specified.<br/>If cost isn't present, the your character gives the NPC the item at no charge.<br/>This effect will fail if you do not have at least `count_num` copies of the item, so it should be checked with.  If the item is sold, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
-`u_bulk_trade_accept`<br/>`npc_bulk_trade_accept` *or*  `u_bulk_trade_accept: quantity_int` <br/>`npc_bulk_trade_accept: quantity_int`  | Only valid after a `repeat_response`.  The player trades all instances of the item from the `repeat_response` with the NPC.  For `u_bulk_trade_accept`, the player loses the items from their inventory and gains the same value of the NPC's faction currency; for `npc_bulk_trade_accept`, the player gains the items from the NPC's inventory and loses the same value of the NPC's faction currency.  If there is remaining value, or the NPC doesn't have a faction currency, the remainder goes into the NPC's `op_of_u.owed`. If `quantity_int` is specified only that many items/charges will be moved.
-`u_bulk_donate`<br/>`npc_bulk_donate` *or*  `u_bulk_donate: quantity_int` <br/>`npc_bulk_donate: quantity_int`  | Only valid after a `repeat_response`.  The player or NPC transfers all instances of the item from the `repeat_response`.  For `u_bulk_donate`, the player loses the items from their inventory and the NPC gains them; for `npc_bulk_donate`, the player gains the items from the NPC's inventory and the NPC loses them. If `quantity_int` is specified only that many items/charges will be moved.
-`u_spend_cash: cost_num`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array` | Remove `cost_num` from your character's cash.  Negative values means your character gains cash.  *deprecated* NPCs should not deal in e-cash anymore, only personal debts and items. If the cash is spent, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`u_spawn_item: `string or [variable object](#variable-object), (*optional* `count: `int or [variable object](#variable-object)), (*optional* `container: `string or [variable object](#variable-object)) | Your character gains the item or `count` copies of the item, contained in container if specified. If used in an NPC conversation the items are said to be given by the NPC.  If a variable item is passed for the name an item of the type contained in it will be used.
+`u_buy_item: `string or [variable object](#variable-object), `cost: `int or [variable object](#variable-object), (*optional* `count: `int or [variable object](#variable-object)), (*optional* `container: `string or [variable object](#variable-object)), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | The NPC will sell your character the item or `count` copies of the item, contained in `container`, and will subtract `cost` from `op_of_u.owed`.  If the `op_o_u.owed` is less than `cost`, the trade window will open and the player will have to trade to make up the difference; the NPC will not give the player the item unless `cost` is satisfied.
+`u_sell_item: `string or [variable object](#variable-object), (*optional* `cost: `int or [variable object](#variable-object)), (*optional* `count: `string or [variable object](#variable-object)), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | Your character will give the NPC the item or `count` copies of the item, and will add `cost` to the NPC's `op_of_u.owed` if specified.<br/>If cost isn't present, the your character gives the NPC the item at no charge.<br/>This effect will fail if you do not have at least `count` copies of the item, so it should be checked with.  If the item is sold, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`u_bulk_trade_accept, npc_bulk_trade_accept, u_bulk_trade_accept, npc_bulk_trade_accept: `int or [variable object](#variable-object)  | Only valid after a `repeat_response`.  The player trades all instances of the item from the `repeat_response` with the NPC.  For `u_bulk_trade_accept`, the player loses the items from their inventory and gains the same value of the NPC's faction currency; for `npc_bulk_trade_accept`, the player gains the items from the NPC's inventory and loses the same value of the NPC's faction currency.  If there is remaining value, or the NPC doesn't have a faction currency, the remainder goes into the NPC's `op_of_u.owed`. If `quantity` is specified only that many items/charges will be moved.
+`u_bulk_donate, npc_bulk_donate` or  `u_bulk_donate, npc_bulk_donate: `int or [variable object](#variable-object)  | Only valid after a `repeat_response`.  The player or NPC transfers all instances of the item from the `repeat_response`.  For `u_bulk_donate`, the player loses the items from their inventory and the NPC gains them; for `npc_bulk_donate`, the player gains the items from the NPC's inventory and the NPC loses them. If a value is specified only that many items/charges will be moved.
+`u_spend_cash: `int or [variable object](#variable-object), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | Remove an amount from your character's cash.  Negative values means your character gains cash.  *deprecated* NPCs should not deal in e-cash anymore, only personal debts and items. If the cash is spent, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
 `add_debt: mod_list` | Increases the NPC's debt to the player by the values in the `mod_list`.<br/>The following would increase the NPC's debt to the player by 1500x the NPC's altruism and 1000x the NPC's opinion of the player's value: `{ "effect": { "add_debt": [ [ "ALTRUISM", 3 ], [ "VALUE", 2 ], [ "TOTAL", 500 ] ] } }`
-`u_consume_item`, `npc_consume_item: item_string`, (*optional* `count: count_num`), (*optional* `charges: charges_num`), (*optional* `popup: popup_bool`) | You or the NPC will delete the item or `count_num` copies of the item or `charges_num` charges of the item from their inventory.<br/>This effect will fail if the you or NPC does not have at least `count_num` copies of the item or `charges_num` charges of the item, so it should be checked with `u_has_items` or `npc_has_items`.<br/>If `popup_bool` is `true`, `u_consume_item` will show a message displaying the character giving the items to the NPC. It defaults to `false` if not defined, and has no effect when used in `npc_consume_item`.
-`u_remove_item_with`, `npc_remove_item_with: item_string` | You or the NPC will delete any instances of item in inventory.<br/>This is an unconditional remove and will not fail if you or the NPC does not have the item.
-`u_buy_monster: monster_type_string`, (*optional* `cost: cost_num`, *optional* `count: count_num`, *optional* `name: name_string`, *optional* `pacified: pacified_bool`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`) | The NPC will give your character `count_num` (default 1) instances of the monster as pets and will subtract `cost_num` from `op_of_u.owed` if specified.  If the `op_o_u.owed` is less than `cost_num`, the trade window will open and the player will have to trade to make up the difference; the NPC will not give the player the item unless `cost_num` is satisfied.<br/>If cost isn't present, the NPC gives your character the item at no charge.<br/>If `name_string` is specified the monster(s) will have the specified name. If `pacified_bool` is set to true, the monster will have the pacified effect applied.  If the monster is sold, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`u_consume_item`, `npc_consume_item: `string or [variable object](#variable-object), (*optional* `count: `int or [variable object](#variable-object)), (*optional* `charges: `int or [variable object](#variable-object)), (*optional* `popup: popup_bool`) | You or the NPC will delete the item or `count` copies of the item or `charges` charges of the item from their inventory.<br/>This effect will fail if the you or NPC does not have at least `count` copies of the item or `charges` charges of the item, so it should be checked with `u_has_items` or `npc_has_items`.<br/>If `popup_bool` is `true`, `u_consume_item` will show a message displaying the character giving the items to the NPC. It defaults to `false` if not defined, and has no effect when used in `npc_consume_item`.
+`u_remove_item_with`, `npc_remove_item_with: `string or [variable object](#variable-object) | You or the NPC will delete any instances of item in inventory.<br/>This is an unconditional remove and will not fail if you or the NPC does not have the item.
+`u_buy_monster: `string or [variable object](#variable-object), (*optional* `cost: `int or [variable object](#variable-object)), (*optional* `count: `int or [variable object](#variable-object)), (*optional* `name: `string or [variable object](#variable-object)), (*optional* `pacified: pacified_bool`), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | The NPC will give your character `count` (default 1) instances of the monster as pets and will subtract `cost` from `op_of_u.owed` if specified.  If the `op_o_u.owed` is less than `cost`, the trade window will open and the player will have to trade to make up the difference; the NPC will not give the player the item unless `cost_num` is satisfied.<br/>If cost isn't present, the NPC gives your character the item at no charge.<br/>If `name` is specified the monster(s) will have the specified name. If `pacified_bool` is set to true, the monster will have the pacified effect applied.  If the monster is sold, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
 
 #### Behavior / AI
 
@@ -776,48 +778,48 @@ Effect | Description
 `basecamp_mission` | The NPC will offer you a list of missions for your allied NPCs, depending on the local basecamp.
 `bionic_install` | The NPC installs a bionic from your character's inventory onto your character, using very high skill, and charging you according to the operation's difficulty.
 `bionic_remove` | The NPC removes a bionic from your character, using very high skill, and charging you according to the operation's difficulty.
-`npc_class_change: class_string` | Change the NPC's faction to `class_string`.
-`npc_faction_change: faction_string` | Change the NPC's faction membership to `faction_string`.
-`u_faction_rep: rep_num` | Increases your reputation with the NPC's current faction, or decreases it if `rep_num` is negative.
-`toggle_npc_rule: rule_string` | Toggles the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
-`set_npc_rule: rule_string` | Sets the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
-`clear_npc_rule: rule_string` | Clears the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
-`set_npc_engagement_rule: rule_string` | Sets the NPC follower AI rule for engagement distance to the value of `rule_string`.
-`set_npc_aim_rule: rule_string` | Sets the NPC follower AI rule for aiming speed to the value of `rule_string`.
+`npc_class_change: `string or [variable object](#variable-object) | Change the NPC's class to the new value.
+`npc_faction_change: `string or [variable object](#variable-object) | Change the NPC's faction membership to the new value.
+`u_faction_rep: `int or [variable object](#variable-object) | Increases your reputation with the NPC's current faction, or decreases it if the value is negative.
+`toggle_npc_rule: `string or [variable object](#variable-object) | Toggles the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
+`set_npc_rule: `string or [variable object](#variable-object) | Sets the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
+`clear_npc_rule: `string or [variable object](#variable-object) | Clears the value of a boolean NPC follower AI rule such as `"use_silent"` or `"allow_bash"`
+`set_npc_engagement_rule: `string or [variable object](#variable-object) | Sets the NPC follower AI rule for engagement distance to the value of `rule_string`.
+`set_npc_aim_rule: `string or [variable object](#variable-object) | Sets the NPC follower AI rule for aiming speed to the value of `rule_string`.
 `npc_die` | The NPC will die at the end of the conversation.
-`npc_set_goal:assign_mission_target_object`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array` | The NPC will walk to `assign_mission_target_object`. See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters.  If the goal is assigned, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`npc_set_goal:assign_mission_target_object`, (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | The NPC will walk to `assign_mission_target_object`. See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters.  If the goal is assigned, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
 
 #### Map Updates
 Effect | Description
 ---|---
-`mapgen_update: mapgen_update_id_string`<br/>`mapgen_update:` *list of `mapgen_update_id_string`s*, (optional `assign_mission_target` parameters), (optional `target_var: variable_object`), (*optional* `time_in_future: duration_string or duration_variable_object`), (*optional* `key: string_variable_object`) | With no other parameters, updates the overmap tile at the player's current location with the changes described in `mapgen_update_id` (or for each `mapgen_update_id` in the list). If `time_in_future` is set the update will happen that far in the future, in this case however the target location will be determined now and not changed even if its variables update.  The `assign_mission_target` parameters can be used to change the location of the overmap tile that gets updated.  See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters and [the mapgen docs](MAPGEN.md) for `mapgen_update`. If `target_var` ( see `variable_object` above) is set this effect will be centered on a location saved to a variable with its name instead.
-`revert_location: variable_object`, `time_in_future: duration_string or duration_variable_object` | `revert_location` is a variable object of the location.  The map tile at that location will be saved(terrain,furniture and traps) and restored at `time_in_future`.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early. 
-`alter_timed_events: string_variable_object`, (*optional* `time_in_future: duration_string or duration_variable_object`) | Will cause all future events associated with the title string as a key to occur `time_in_future`(defaults to 0) in the future.  
+`mapgen_update: `string or [variable object](#variable-object)<br/>`mapgen_update:` *array of string or [variable objects](#variable-object)*, (optional `assign_mission_target` parameters), (optional `target_var: `[variable object](#variable-object)), (*optional* `time_in_future: `duration or [variable object](#variable-object)), (*optional* `key: `string or [variable object](#variable-object)) | With no other parameters, updates the overmap tile at the player's current location with the changes described in `mapgen_update` (or for each `mapgen_update` entry). If `time_in_future` is set the update will happen that far in the future, in this case however the target location will be determined now and not changed even if its variables update.  The `assign_mission_target` parameters can be used to change the location of the overmap tile that gets updated.  See [the missions docs](MISSIONS_JSON.md) for `assign_mission_target` parameters and [the mapgen docs](MAPGEN.md) for `mapgen_update`. If `target_var` is set this effect will be centered on a location saved to a variable with its name instead.
+`revert_location: `[variable object](#variable-object), `time_in_future: `duration or [variable object](#variable-object) | `revert_location` is a variable object of the location.  The map tile at that location will be saved(terrain,furniture and traps) and restored at `time_in_future`.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early. 
+`alter_timed_events: `string or [variable object](#variable-object), (*optional* `time_in_future: `duration or [variable object](#variable-object)) | Will cause all future events associated with the title string as a key to occur `time_in_future`(defaults to 0) in the future.  
 `lightning` | Allows supercharging monster in electrical fields, legacy command for lightning weather.
 `next_weather` | Forces a check for what weather it should be.
-`custom_light_level: custom_light_level_int or custom_light_level_variable_object, length: duration_string or duration_variable_object`, (*optional* `key: string_variable_object`) | Sets the ambient light from the sun/moon to be `custom_light_level_int` ( or the value of the variable described by `custom_light_level_variable_object` see `variable_object` above).  This can vary naturally between 0 and 125 depending on the sun to give a scale. This lasts `length`.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early.
-`u_transform_radius, npc_transform_radius: transform_radius_int or transform_radius_variable_object, ter_furn_transform: ter_furn_transform_string`, (*optional* `target_var: target_var_object`), (*optional* `time_in_future: duration_string or duration_variable_object`), (*optional* `key: key_string or duration_variable_object`) | Applies the ter_furn_transform of id `ter_furn_transform` (See [the transform docs](TER_FURN_TRANSFORM.md)) in radius `translate_radius`. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  `target_var` is an object with `value`,`type` and `context` as string values and a bool `global` which determines if the variable is global or not. If `time_in_future` is set the transform will that far in the future, in this case however the target location and radius will be determined now and not changed even if their variables update.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early.
-`transform_line: ter_furn_transform_string`, `first: target_var_object`, `second: target_var_object` | Applies the ter_furn_transform of id `ter_furn_transform` (See [the transform docs](TER_FURN_TRANSFORM.md)) on a line between points `first` and `second`.
-`place_override: string_variable_object, length: duration_variable_object`, (*optional* `key: key_string or duration_variable_object`) | Overrides the location name in the sidebar to instead be the title string.  Also disables map and map memory.  If `length` is set the effect will last that long.  If `key` is provided it can be used with `alter_timed_events` to force it to end early.
-`u_spawn_monster: mtype_id_string, npc_spawn_monster: mtype_id_string`,(*optional* `group: group_bool`, *optional* `hallucination_count: hallucination_count_int or hallucination_count_variable_object`, *optional* `real_count: real_count_int or real_count_variable_object`,*optional* `min_radius: min_radius_int or min_radius_variable_object`,*optional* `max_radius: max_radius_int or max_radius_variable_object`,*optional* `outdoor_only: outdoor_only_bool`,*optional* `open_air_allowed: open_air_allowed_bool`,*optional* `target_range : target_range_int or target_range_variable_object`), *optional* `lifespan: timespan_min_string or variable_object`, *optional* `target_var: target_var_object`,*optional* `spawn_message: spawn_message_string`,*optional* `spawn_message_plural: spawn_message_plural_spawn`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array` | Spawns `real_count_int`( or the value of the variable described by `real_count_variable_object` see `variable_object` above)(defaults to 0) monsters and `hallucination_count_int`( or `hallucination_count_variable_object`) (defaults to 0) hallucinations near you or the npc. The spawn will be of type `mtype_id_string`, if `group_bool` is false(defaults to false, if it is true a random monster from monster_group `mtype_id_string` will be used), if this is an empty string it will instead be a random monster within `target_range_int`( or `target_range_variable_object`) spaces of you. The spawns will happen between `min_radius_int`( or `min_radius_variable_object`)(defaults to 1) and `max_radius_int`( or `max_radius_variable_object`)(defaults to 10) spaces of the target and if `outdoor_only_bool` is true(defaults to false) will only choose outdoor spaces. If `open_air_allowed` is true(defaults to false) monsters can be spawned on open air. If `lifespan` (or the `variable_object`) is provided the monster or hallucination will only that long. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  `target_var` is a `variable_object`. If at least one spawned creature is visible `spawn_message` will be displayed.  If `spawn_message_plural` is defined and more than one spawned creature is visible it will be used instead.  If at least one monster is spawned, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
-`u_set_field: field_id_string or npc_set_field: field_id_string`,(*optional* `intensity: intensity_int or intensity_variable_onject`, *optional* `age: age_int or variable_object`,*optional* `radius: radius_int or radius_variable_onject`,*optional* `outdoor_only: outdoor_only_bool`,*optional* `indoor_only: indoor_only_bool`,*optional* `hit_player : hit_player_bool`,*optional* `target_var: target_var_object` ) | Add a field centered on you or the npc of type `field_type_id_string`, of intensity `intensity_int`( or the value of the variable described by `real_count_variable_object` see `variable_object` above)( defaults to 1,) of radius `radius_int`( or `radius_variable_object`)(defaults to 10000000) and age `age_int` (defaults 1) or `age_variable_object`. It will only happen outdoors if `outdoor_only` is true, it defaults to false. `indoor_only` is the opposite. It will hit the player as if they entered it if `hit_player` is true, it defaults to true. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  `target_var` is an object with `value`,`type` and `context` as string values and a bool `global` which determines if the variable is global or not.
+`custom_light_level: `int or [variable object](#variable-object), `length: `duration or [variable object](#variable-object), (*optional* `key: `string or [variable object](#variable-object)) | Sets the ambient light from the sun/moon to be `custom_light_level`.  This can vary naturally between 0 and 125 depending on the sun to give a scale. This lasts `length`.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early.
+`u_transform_radius, npc_transform_radius: `int or [variable object](#variable-object), `ter_furn_transform: `string or [variable object](#variable-object), (*optional* `target_var: `[variable object](#variable-object)), (*optional* `time_in_future: `duration or [variable object](#variable-object)), (*optional* `key: `string or [variable object](#variable-object)) | Applies the ter_furn_transform of id `ter_furn_transform` (See [the transform docs](TER_FURN_TRANSFORM.md)) in radius `transform_radius`. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  If `time_in_future` is set the transform will that far in the future, in this case however the target location and radius will be determined now and not changed even if their variables update.  If `key` is provided it can be used with `alter_timed_events` to force it to occur early.
+`transform_line: `string or [variable object](#variable-object), `first: `[variable object](#variable-object), `second: `[variable object](#variable-object) | Applies the ter_furn_transform of id `transform_line` (See [the transform docs](TER_FURN_TRANSFORM.md)) on a line between points `first` and `second`.
+`place_override: `string or [variable object](#variable-object), `length: `duration or [variable object](#variable-object), (*optional* `key: `string or [variable object](#variable-object)) | Overrides the location name in the sidebar to instead be the title string.  Also disables map and map memory.  If `length` is set the effect will last that long.  If `key` is provided it can be used with `alter_timed_events` to force it to end early.
+`u_spawn_monster, npc_spawn_monster: `string or [variable object](#variable-object),(*optional* `group: group_bool`), (*optional* `hallucination_count: `int or [variable object](#variable-object)), (*optional* `real_count: `int or [variable object](#variable-object)),(*optional* `min_radius: `int or [variable object](#variable-object)), (*optional* `max_radius: `int or [variable object](#variable-object)), (*optional* `outdoor_only: outdoor_only_bool`), (*optional* `open_air_allowed: open_air_allowed_bool`), (*optional* `target_range : `int or [variable object](#variable-object)), (*optional* `lifespan: `duration or [variable object](#variable-object)), (*optional* `target_var: `[variable object](#variable-object)), (*optional* `spawn_message: `string or [variable object](#variable-object)), (*optional* `spawn_message_plural: `string or [variable object](#variable-object)), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | Spawns `real_count`(defaults to 0) monsters and `hallucination_count`(defaults to 0) hallucinations near you or the npc. The spawn will be of type `_spawn_monster`, if `group_bool` is false(defaults to false, if it is true a random monster from monster_group `_spawn_monster` will be used), if this is an empty string it will instead be a random monster within `target_range` spaces of you. The spawns will happen between `min_radius`(defaults to 1) and `max_radius`(defaults to 10) spaces of the target and if `outdoor_only_bool` is true(defaults to false) will only choose outdoor spaces. If `open_air_allowed` is true(defaults to false) monsters can be spawned on open air. If `lifespan` is provided the monster or hallucination will only that long. If `target_var` is set this effect will be centered on a location saved to a variable with its name.  If at least one spawned creature is visible `spawn_message` will be displayed.  If `spawn_message_plural` is defined and more than one spawned creature is visible it will be used instead.  If at least one monster is spawned, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`u_set_field, npc_set_field: `string or [variable object](#variable-object),(*optional* `intensity: `int or [variable object](#variable-object)), (*optional* `age: `int or [variable object](#variable-object)), (*optional* `radius: `int or [variable object](#variable-object)), (*optional* `outdoor_only: outdoor_only_bool`), (*optional* `indoor_only: indoor_only_bool`), (*optional* `hit_player : hit_player_bool`), (*optional* `target_var: `[variable object](#variable-object)) | Add a field centered on you or the npc of type `_set_field`, of intensity `intensity`( defaults to 1,) of radius `radius`(defaults to 10000000) and age `age` (defaults 1). It will only happen outdoors if `outdoor_only` is true, it defaults to false. `indoor_only` is the opposite. It will hit the player as if they entered it if `hit_player` is true, it defaults to true. If `target_var` is set this effect will be centered on a location saved to a variable with its name.
 
 #### General
 Effect | Description
 ---|---
-`sound_effect: sound_effect_id_string`, *optional* `sound_effect_variant: variant_string`, *optional* `outdoor_event: outdoor_event`,*optional* `volume: volume_int`  | Will play a sound effect of id `sound_effect_id_string` and variant `variant_string`. If `volume_int` is defined it will be used otherwise 80 is the default. If `outdoor_event`(defaults to false) is true this will be less likely to play if the player is underground.
-`open_dialogue`, *optional* `topic: variable_str_object`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`. Opens up a dialog between the participants. This should only be used in effect_on_conditions. If the dialog is opened, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run. If `topic` is supplied than a conversation with an empty talker starting with the topic `topic` will be opened.
-`take_control`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`. If the npc is a character then take control of them and then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
-`take_control_menu`. Opens up a menu to choose a follower to take control of.
-`assign_mission: mission_type_id string` | Will assign mission `mission_type_id` to the player.
-`remove_active_mission: mission_type_id string` | Will remove mission `mission_type_id` from the player's active mission list without failing it.
-`finish_mission: mission_type_id string`,(*optional* `success: success_bool` ), (*optional `step: step_int`)  | Will complete mission `mission_type_id` to the player as a success if `success` is true, as a failure otherwise. If a `step` is provided that step of the mission will be completed.
-`offer_mission" mission_type_id string or array`. Adds mission_type_id(s) to the npc's missions that they offer.
+`sound_effect: `string or [variable object](#variable-object), (*optional* `sound_effect_variant: `string or [variable object](#variable-object)), (*optional* `outdoor_event: outdoor_event`), (*optional* `volume: `int or [variable object](#variable-object))  | Will play a sound effect of id `sound_effect` and variant `sound_effect_variant`. If `volume` is defined it will be used otherwise 80 is the default. If `outdoor_event`(defaults to false) is true this will be less likely to play if the player is underground.
+`open_dialogue`, (*optional* `topic: `string or [variable object](#variable-object)), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`). | Opens up a dialog between the participants. This should only be used in effect_on_conditions. If the dialog is opened, then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run. If `topic` is supplied than a conversation with an empty talker starting with the topic `topic` will be opened.
+`take_control`, (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | If the npc is a character then take control of them and then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`take_control_menu` | Opens up a menu to choose a follower to take control of.
+`assign_mission: `string or [variable object](#variable-object) | Will assign mission to the player.
+`remove_active_mission: `string or [variable object](#variable-object) | Will remove mission from the player's active mission list without failing it.
+`finish_mission: `string or [variable object](#variable-object), (*optional* `success: success_bool` ), (*optional* `step: step_int`)  | Will complete mission to the player as a success if `success` is true, as a failure otherwise. If a `step` is provided that step of the mission will be completed.
+`offer_mission: `string or [variable object](#variable-object) or array of them | Adds mission_type_id(s) to the npc's missions that they offer.
 `run_eocs : effect_on_condition_array or single effect_condition_object` | Will run up all members of the `effect_on_condition_array`. Members should either be the id of an effect_on_condition or an inline effect_on_condition.
-`queue_eocs : effect_on_condition_array or single effect_condition_object`, `time_in_future: time_in_future_int or string or variable_object` | Will queue up all members of the `effect_on_condition_array`. Members should either be the id of an effect_on_condition or an inline effect_on_condition. Members will be run `time_in_future` seconds or if it is a string the future values of them or if they are variable objects the variable they name.  If the eoc is global the avatar will be u and npc will be invalid. Otherwise it will be queued for the current alpha if they are a character and not be queued otherwise.
-`u_roll_remainder, npc_roll_remainder : string_array`, `type: string`, *optional* `true_eocs: eocs_array`, *optional* `false_eocs: eocs_array`. | Will queue up all members of the `effect_on_condition_array`. Type must be either `bionic`, or `mutation`.  If the u or npc does not have all of the listed bionics, or mutations they will be given one randomly and and then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
+`queue_eocs : effect_on_condition_array or single effect_condition_object`, `time_in_future: `duration or [variable object](#variable-object) | Will queue up all members of the `effect_on_condition_array`. Members should either be the id of an effect_on_condition or an inline effect_on_condition. Members will be run `time_in_future` in the future.  If the eoc is global the avatar will be u and npc will be invalid. Otherwise it will be queued for the current alpha if they are a character and not be queued otherwise.
+`u_roll_remainder, npc_roll_remainder : `array of strings and/or [variable objects](#variable-object), `type: `string or [variable object](#variable-object), (*optional* `true_eocs: eocs_array`), (*optional* `false_eocs: eocs_array`) | Type must be either `bionic`, or `mutation`.  If the u or npc does not have all of the listed bionics, or mutations they will be given one randomly and and then all of the effect_on_conditions in `true_eocs` are run, otherwise all the effect_on_conditions in `false_eocs` are run.
 `switch : arithmetic_expression`, `cases: effect_array` | Will calculate value of `switch` and then run member of `cases` with the highest `case` that the `switch` is higher or equal to. `cases` is an array of objects with an int_or_var `case` and an `effect` field which is a dialog effect.
-`u_run_npc_eocs or npc_run_npc_eocs : effect_on_condition_array`, (*optional* `unique_ids: unique_ids_string_array`), (*optional* `npcs_must_see: npcs_must_see_bool`), (*optional* `npc_range: npc_range_int`), (*optional* `local: local_bool`) | Will run all members of the `effect_on_condition_array` on npcs. Members should either be the id of an effect_on_condition or an inline effect_on_condition.  If `local`(default: false) is false, then regardless of location all npcs with unique ids in the array `unique_ids` will be affected.  If `local` is true, only unique_ids listed in `unique_ids` will be affected, if it is empty all npcs in range will be effected. If a value is given for `npc_range` the npc must be that close to the source and if `npcs_must_see`(defaults to false) is true the npc must be able to see the source. For `u_run_npc_eocs` u is the source for `npc_run_npc_eocs` it is the npc.
+`u_run_npc_eocs or npc_run_npc_eocs : effect_on_condition_array`, (*optional* `unique_ids: `array of strings and/or [variable objects](#variable-object)), (*optional* `npcs_must_see: npcs_must_see_bool`), (*optional* `npc_range: `int or [variable object](#variable-object)), (*optional* `local: local_bool`) | Will run all members of the `effect_on_condition_array` on npcs. Members should either be the id of an effect_on_condition or an inline effect_on_condition.  If `local`(default: false) is false, then regardless of location all npcs with unique ids in the array `unique_ids` will be affected.  If `local` is true, only unique_ids listed in `unique_ids` will be affected, if it is empty all npcs in range will be effected. If a value is given for `npc_range` the npc must be that close to the source and if `npcs_must_see`(defaults to false) is true the npc must be able to see the source. For `u_run_npc_eocs` u is the source for `npc_run_npc_eocs` it is the npc.
 `weighted_list_eocs: array_array` | Will choose one of a list of eocs to activate based on weight. Members should be an array of first the id of an effect_on_condition or an inline effect_on_condition and second an object that resolves to an integer weight.
 Example: This will cause "EOC_SLEEP" 1/10 as often as it makes a test message appear.
 ``` json
@@ -883,8 +885,6 @@ Condition | Type | Description
 #### Player or NPC conditions
 These conditions can be tested for the player using the `"u_"` form, and for the NPC using the `"npc_"` form.
 
-`variable_object`: This is an object describing a variable name. `default` is a required int which will be the value returned if the variable is not defined.
-
 example json:
 ```
 "condition": { "u_has_strength": { "name" :"variable_name", "type":"test", "context":"documentation", "default":5 } }
@@ -893,37 +893,36 @@ Condition | Type | Description
 --- | --- | ---
 `"u_male"`<br/>`"npc_male"` | simple string | `true` if the player character or NPC is male.
 `"u_female"`<br/>`"npc_female"` | simple string | `true` if the player character or NPC is female.
-`"u_at_om_location"`<br/>`"npc_at_om_location"` | string | `true` if the player character or NPC is standing on an overmap tile with `u_at_om_location`'s id.  The special string `"FACTION_CAMP_ANY"` changes it to return true if the player or NPC is standing on a faction camp overmap tile.  The special string `"FACTION_CAMP_START"` changes it to return true if the overmap tile that the player or NPC is standing on can be turned into a faction camp overmap tile.
-`"u_has_trait"`<br/>`"npc_has_trait"` | string | `true` if the player character or NPC has a specific trait.  Simpler versions of `u_has_any_trait` and `npc_has_any_trait` that only checks for one trait.
-`"u_has_flag"`<br/>`"npc_has_flag"` | string | `true` if the player character or NPC has the specified character flag.  The special trait flag `"MUTATION_THRESHOLD"` checks to see if the player or NPC has crossed a mutation threshold.
-`"u_has_any_trait"`<br/>`"npc_has_any_trait"` | array | `true` if the player character or NPC has any trait or mutation in the array. Used to check multiple specific traits.
+`"u_at_om_location"`<br/>`"npc_at_om_location"` | string or [variable object](#variable-object) | `true` if the player character or NPC is standing on an overmap tile with `u_at_om_location`'s id.  The special string `"FACTION_CAMP_ANY"` changes it to return true if the player or NPC is standing on a faction camp overmap tile.  The special string `"FACTION_CAMP_START"` changes it to return true if the overmap tile that the player or NPC is standing on can be turned into a faction camp overmap tile.
+`"u_has_trait"`<br/>`"npc_has_trait"` | string or [variable object](#variable-object) | `true` if the player character or NPC has a specific trait.  Simpler versions of `u_has_any_trait` and `npc_has_any_trait` that only checks for one trait.
+`"u_has_flag"`<br/>`"npc_has_flag"` | string or [variable object](#variable-object) | `true` if the player character or NPC has the specified character flag.  The special trait flag `"MUTATION_THRESHOLD"` checks to see if the player or NPC has crossed a mutation threshold.
+`"u_has_any_trait"`<br/>`"npc_has_any_trait"` | array of strings and/or [variable objects](#variable-object) | `true` if the player character or NPC has any trait or mutation in the array. Used to check multiple specific traits.
 `"u_has_var"`, `"npc_has_var"` | string | `"type": type_str`, `"context": context_str`, and `"value": value_str` are required fields in the same dictionary as `"u_has_var"` or `"npc_has_var"`.<br/>`true` is the player character or NPC has a variable set by `"u_add_var"` or `"npc_add_var"` with the string, `type_str`, `context_str`, and `value_str`.
-`"u_compare_var"`, `"npc_compare_var"` | dictionary | `"type": type_str`, `"context": context_str`, `"op": op_str`, `"value": value_num or variable_object` are required fields, referencing a var as in `"u_add_var"` or `"npc_add_var"`.<br/>`true` if the player character or NPC has a stored variable that is true for the provided operator `op_str` (one of `==`, `!=`, `<`, `>`, `<=`, `>=`) and value (or the value of the variable described by `value` see `variable_object` above).
+`"u_compare_var"`, `"npc_compare_var"` | dictionary | `"type": type_str`, `"context": context_str`, `"op": op_str`, `"value": `int or [variable object](#variable-object) ` are required fields, referencing a var as in `"u_add_var"` or `"npc_add_var"`.<br/>`true` if the player character or NPC has a stored variable that is true for the provided operator `op_str` (one of `==`, `!=`, `<`, `>`, `<=`, `>=`) and value.
 `"u_compare_time_since_var"`, `"npc_compare_time_since_var_"` | dictionary | `"type": type_str`, `"context": context_str`, `"op": op_str`, `"time": time_string` are required fields, referencing a var as in `"u_add_var"` or `"npc_add_var"`.<br/>`true` if the player character or NPC has a stored variable and the current turn and that value (converted to a time point) plus the time_string is true for the provided operator `op_str` (one of `==`, `!=`, `<`, `>`, `<=`, `>=`).  *example*: `{ "u_compare_time_since_var": "test", "type": "test", "context": "var_time_test", "op": ">", "time": "3 days" }` returns true if the player character has a "test", "test", "var_time_test" variable and the current turn is greater than that value plus 3 days' worth of turns.
-`"compare_string"` | array | The array must contain exactly two entries.  They can be either strings or objects containing a variable object.  Returns true if the strings are the same.
-`"u_has_strength"`<br/>`"npc_has_strength"` | int or variable_object | `true` if the player character's or NPC's strength is at least the value of `u_has_strength` or `npc_has_strength` (or the value of the variable described see `variable_object` above).
-`"u_has_dexterity"`<br/>`"npc_has_dexterity"` | int or variable_object | `true` if the player character's or NPC's dexterity is at least the value of `u_has_dexterity` or `npc_has_dexterity` ( or the value of the variable described see `variable_object` above).
-`"u_has_intelligence"`<br/>`"npc_has_intelligence"` | int or variable_object| `true` if the player character's or NPC's intelligence is at least the value of `u_has_intelligence` or `npc_has_intelligence` ( or the value of the variable described see `variable_object` above).
-`"u_has_perception"`<br/>`"npc_has_perception"` | int or variable_object| `true` if the player character's or NPC's perception is at least the value of `u_has_perception` or `npc_has_perception` ( or the value of the variable described see `variable_object` above).
-`"u_has_item"`<br/>`"npc_has_item"` | string | `true` if the player character or NPC has something with `u_has_item`'s or `npc_has_item`'s `item_id` in their inventory.
-`"u_has_items"`<br/>`"npc_has_item"` | dictionary | `u_has_items` or `npc_has_items` must be a dictionary with an `item` string and a `count` int or `charges` int.<br/>`true` if the player character or NPC has at least `charges` charges or counts of `item` in their inventory.
-`"u_has_item_category"`<br/>`"npc_has_item_category"` | string | `"count": item_count` is an optional field that must be in the same dictionary and defaults to 1 if not specified.  `true` if the player or NPC has `item_count` items with the same category as `u_has_item_category` or `npc_has_item_category`.
-`"u_has_bionics"`<br/>`"npc_has_bionics"` | string | `true` if the player or NPC has an installed bionic with an `bionic_id` matching `"u_has_bionics"` or `"npc_has_bionics"`.  The special string "ANY" returns true if the player or NPC has any installed bionics.
-`"u_has_effect"`<br/>`"npc_has_effect"`, (*optional* `intensity : int`),(*optional* `bodypart : string`) | string | `true` if the player character or NPC is under the effect with `u_has_effect` or `npc_has_effect`'s `effect_id`. If `intensity` is specified it will need to be at least that strong.  If `bodypart` is specified it will check only that bodypart for the effect.
+`"compare_string"` | array | The array must contain exactly two entries.  They can be either strings and/or [variable objects](#variable-object).  Returns true if the strings are the same.
+`"u_has_strength"`<br/>`"npc_has_strength"` | int or [variable object](#variable-object) | `true` if the player character's or NPC's strength is at least the value of `u_has_strength` or `npc_has_strength`.
+`"u_has_dexterity"`<br/>`"npc_has_dexterity"` | int or [variable object](#variable-object) | `true` if the player character's or NPC's dexterity is at least the value of `u_has_dexterity` or `npc_has_dexterity`.
+`"u_has_intelligence"`<br/>`"npc_has_intelligence"` | int or [variable object](#variable-object) | `true` if the player character's or NPC's intelligence is at least the value of `u_has_intelligence` or `npc_has_intelligence`.
+`"u_has_perception"`<br/>`"npc_has_perception"` | int or [variable object](#variable-object) | `true` if the player character's or NPC's perception is at least the value of `u_has_perception` or `npc_has_perception`.
+`"u_has_item"`<br/>`"npc_has_item"` | string or [variable object](#variable-object) | `true` if the player character or NPC has something with `u_has_item`'s or `npc_has_item`'s `item_id` in their inventory.
+`"u_has_items"`<br/>`"npc_has_item"` | dictionary | `u_has_items` or `npc_has_items` must be a dictionary with an `item` string or [variable object](#variable-object) and a `count` int or [variable object](#variable-object) or `charges` int or [variable object](#variable-object).<br/>`true` if the player character or NPC has at least `charges` charges or counts of `item` in their inventory.
+`"u_has_item_category"`<br/>`"npc_has_item_category"` | string or [variable object](#variable-object) | `"count": `int or [variable object](#variable-object) is an optional field that must be in the same dictionary and defaults to 1 if not specified.  `true` if the player or NPC has `count` items with the same category as `u_has_item_category` or `npc_has_item_category`.
+`"u_has_bionics"`<br/>`"npc_has_bionics"` | string or [variable object](#variable-object) | `true` if the player or NPC has an installed bionic with an `bionic_id` matching `"u_has_bionics"` or `"npc_has_bionics"`.  The special string "ANY" returns true if the player or NPC has any installed bionics.
+`"u_has_effect"`<br/>`"npc_has_effect"`, (*optional* `intensity : int`),(*optional* `bodypart : string`) | string or [variable object](#variable-object) | `true` if the player character or NPC is under the effect with `u_has_effect` or `npc_has_effect`'s `effect_id`. If `intensity` is specified it will need to be at least that strong.  If `bodypart` is specified it will check only that bodypart for the effect.
 `"u_can_stow_weapon"`<br/>`"npc_can_stow_weapon"` | simple string | `true` if the player character or NPC is wielding a weapon and has enough space to put it away.
 `"u_can_drop_weapon"`<br/>`"npc_can_drop_weapon"` | simple string | `true` if the player character or NPC is wielding a weapon and can drop it on the ground, i.e. weapon isn't unwieldable like retracted bionic claws or monomolecular blade bionics.
 `"u_has_weapon"`<br/>`"npc_has_weapon"` | simple string | `true` if the player character or NPC is wielding a weapon.
 `"u_driving"`<br/>`"npc_driving"` | simple string | `true` if the player character or NPC is operating a vehicle.  <b>Note</b> NPCs cannot currently operate vehicles.
-`"u_has_skill"`<br/>`"npc_has_skill"` | dictionary | `u_has_skill` or `npc_has_skill` must be a dictionary with a `skill` string and a `level` int.<br/>`true` if the player character or NPC has at least the value of `level` in `skill`.
-`"u_know_recipe"` | string | `true` if the player character knows the recipe specified in `u_know_recipe`.  It only counts as known if it is actually memorized--holding a book with the recipe in it will not count.
-`"u_has_worn_with_flag"`<br/>`"npc_has_worn_with_flag"` | string | `true` if the player character or NPC is wearing something with the `u_has_worn_with_flag` or `npc_has_worn_with_flag` flag.
-`"u_has_wielded_with_flag"`<br/>`"npc_has_wielded_with_flag"` | string | `true` if the player character or NPC is wielding something with the `u_has_wielded_with_flag` or `npc_has_wielded_with_flag` flag.
+`"u_has_skill"`<br/>`"npc_has_skill"` | dictionary | `u_has_skill` or `npc_has_skill` must be a dictionary with a `skill` string or [variable object](#variable-object) and a `level` int or [variable object](#variable-object).<br/>`true` if the player character or NPC has at least the value of `level` in `skill`.
+`"u_know_recipe"` | string or [variable object](#variable-object) | `true` if the player character knows the recipe specified in `u_know_recipe`.  It only counts as known if it is actually memorized--holding a book with the recipe in it will not count.
+`"u_has_worn_with_flag"`<br/>`"npc_has_worn_with_flag"` | string or [variable object](#variable-object) | `true` if the player character or NPC is wearing something with the `u_has_worn_with_flag` or `npc_has_worn_with_flag` flag.
+`"u_has_wielded_with_flag"`<br/>`"npc_has_wielded_with_flag"` | string or [variable object](#variable-object) | `true` if the player character or NPC is wielding something with the `u_has_wielded_with_flag` or `npc_has_wielded_with_flag` flag.
 `"u_can_see"`<br/>`"npc_can_see"` | simple string | `true` if the player character or NPC is not blind and is either not sleeping or has the see_sleep trait.
-`"u_is_deaf"`<br/>`"npc_is_deaf"` | int | `true` if the player character or NPC can't hear.
-the value of `u_has_focus` or `npc_has_focus` ( or the value of the variable described see `variable_object` above).
-`"u_is_on_terrain"`<br/>`"npc_is_on_terrain"` | string | `true` if the player character or NPC is on terrain named `"u_is_on_terrain"` or `"npc_is_on_terrain"`.
-`"u_is_in_field"`<br/>`"npc_is_in_field"` | string | `true` if the player character or NPC is in a field of type `"u_is_in_field"` or `"npc_is_in_field"`..
-`"u_query"`<br/>`"npc_query", default : bool` | string | if the player character or NPC is the avatar will popup a yes/no query with the provided message and users response is used as the return value.  If called for a non avatar will return `default`.
+`"u_is_deaf"`<br/>`"npc_is_deaf"` | simple string | `true` if the player character or NPC can't hear.
+`"u_is_on_terrain"`<br/>`"npc_is_on_terrain"` | string or [variable object](#variable-object) | `true` if the player character or NPC is on terrain named `"u_is_on_terrain"` or `"npc_is_on_terrain"`.
+`"u_is_in_field"`<br/>`"npc_is_in_field"` | string or [variable object](#variable-object) | `true` if the player character or NPC is in a field of type `"u_is_in_field"` or `"npc_is_in_field"`..
+`"u_query"`<br/>`"npc_query", default : bool` | string or [variable object](#variable-object) | if the player character or NPC is the avatar will popup a yes/no query with the provided message and users response is used as the return value.  If called for a non avatar will return `default`.
 example
 ```
 "condition": { "u_query": "Should we test?", "default": true },
@@ -932,11 +931,11 @@ example
 
 Condition | Type | Description
 --- | --- | ---
-`"u_has_mission"` | string | `true` if the mission is assigned to the player character.
-`"u_has_cash"` | int or variable_object | `true` if the player character has at least `u_has_cash`( or the value of the variable described see `variable_object` above) cash available.  *Deprecated*  Previously used to check if the player could buy something, but NPCs shouldn't use e-cash for trades anymore.
-`"u_are_owed"` | int or variable_object | `true` if the NPC's op_of_u.owed is at least `u_are_owed`( or the value of the variable described see `variable_object` above).  Can be used to check if the player can buy something from the NPC without needing to barter anything.
+`"u_has_mission"` | string or [variable object](#variable-object) | `true` if the mission is assigned to the player character.
+`"u_has_cash"` | int  or [variable object](#variable-object) | `true` if the player character has at least `u_has_cash` cash available.  *Deprecated*  Previously used to check if the player could buy something, but NPCs shouldn't use e-cash for trades anymore.
+`"u_are_owed"` | int or [variable object](#variable-object) | `true` if the NPC's op_of_u.owed is at least `u_are_owed`.  Can be used to check if the player can buy something from the NPC without needing to barter anything.
 `"u_has_camp"` | simple string | `true` is the player has one or more active base camps.
-`"u_has_faction_trust"` | int | `true` if the player character has at least the given amount of trust with the speaker's faction.
+`"u_has_faction_trust"` | int or [variable object](#variable-object) | `true` if the player character has at least the given amount of trust with the speaker's faction.
 
 #### Player and NPC interaction conditions
 
@@ -948,14 +947,14 @@ Condition | Type | Description
 `"has_no_available_mission" or "npc_has_no_available_mission" or "u_has_no_available_mission"` | simple string | `true` if u or the NPC has no jobs available for the player character.
 `"has_available_mission" or "u_has_available_mission" or "npc_has_available_mission"` | simple string | `true` if u or the NPC has one job available for the player character.
 `"has_many_available_missions"` | simple string | `true` if the NPC has several jobs available for the player character.
-`"mission_goal" or "npc_mission_goal" or "u_mission_goal"` | string | `true` if u or the NPC's current mission has the same goal as `mission_goal`.
+`"mission_goal" or "npc_mission_goal" or "u_mission_goal"` | string or [variable object](#variable-object) | `true` if u or the NPC's current mission has the same goal as `mission_goal`.
 `"mission_complete" or "npc_mission_complete" or "u_mission_complete"` | simple string | `true` if u or the NPC has completed the other's current mission.
 `"mission_incomplete" or "npc_mission_incomplete" or "u_mission_incomplete"` | simple string | `true` if u or the NPC hasn't completed the other's current mission.
 `"mission_failed" or "npc_mission_failed" or "u_mission_failed"` | simple string | `true` if u or the NPC has failed the other's current mission.
 `"mission_has_generic_rewards"` | simple string | `true` if the NPC's current mission is flagged as having generic rewards.
 `"npc_service"` | int | `true` if the NPC does not have the `"currently_busy"` effect and the player character has at least `npc_service` cash available.  Useful to check if the player character can hire an NPC to perform a task that would take time to complete.  Functionally, this is identical to `"and": [ { "not": { "npc_has_effect": "currently_busy" } }, { "u_has_cash": service_cost } ]`
-`"npc_allies"` | int or variable_object | `true` if the player character has at least `npc_allies` (or the value of the variable described; see `variable_object` above) number of NPC allies _within the reality bubble_.
-`"npc_allies_global"` | int or variable_object | `true` if the player character has at least `npc_allies_global` (or the value of the variable as above) number of NPC allies _anywhere_.
+`"npc_allies"` | int or [variable object](#variable-object) | `true` if the player character has at least `npc_allies` number of NPC allies _within the reality bubble_.
+`"npc_allies_global"` | int or [variable object](#variable-object) | `true` if the player character has at least `npc_allies_global` number of NPC allies _anywhere_.
 `"is_by_radio"` | simple string | `true` if the player is talking to the NPC over a radio.
 `"u_available" or "npc_available"` | simple string | `true` if u or the NPC does not have effect `"currently_busy"`.
 `"u_following" or "npc_following"` | simple string | `true` if u or the NPC is following the player character.
@@ -963,44 +962,44 @@ Condition | Type | Description
 `"u_hostile" or "npc_hostile"` | simple string | `true` if u or the NPC is an enemy of the player character.
 `"u_train_skills" or "npc_train_skills"` | simple string | `true` if u or the NPC has one or more skills with more levels than the player.
 `"u_train_styles" or "npc_train_styles"` | simple string | `true` if u or the NPC knows one or more martial arts styles that the player does not know.
-`"u_has_class" or "npc_has_class"` | array | `true` if u or the NPC is a member of an NPC class.
-`"u_near_om_location" or "npc_near_om_location"`, (*optional* `range : int or variable_object`) | string | same as at_om_location except it checks in a square stretching from the character range OMT's. NOTE: can only check OMT's in the reality bubble.
-`"u_aim_rule" or "npc_aim_rule"` | string | `true` if u or the NPC follower AI rule for aiming matches the string.
-`"u_engagement_rule" or "npc_engagement_rule"` | string | `true` if u or the NPC follower AI rule for engagement matches the string.
-`"u_cbm_reserve_rule" or "npc_cbm_reserve_rule"` | string | `true` if u or the NPC follower AI rule for cbm, reserve matches the string.
-`"u_cbm_recharge_rule" or "npc_cbm_recharge_rule"` | string | `true` if u or the NPC follower AI rule for cbm recharge matches the string.
-`"u_rule" or "npc_rule"` | string | `true` if u or the NPC follower AI rule for that matches string is set.
-`"u_override" or "npc_override"` | string | `true` if u or the NPC has an override for the string.
-`"has_pickup_list" or "u_has_pickup_list" or "npc_has_pickup_list"` | string | `true` if u or the NPC has a pickup list.
+`"u_has_class" or "npc_has_class"` | string or [variable object](#variable-object) | `true` if u or the NPC is a member of an NPC class.
+`"u_near_om_location" or "npc_near_om_location"`, (*optional* `range : `int or [variable object](#variable-object) ) | string or [variable object](#variable-object) | same as at_om_location except it checks in a square stretching from the character range OMT's. NOTE: can only check OMT's in the reality bubble.
+`"u_aim_rule" or "npc_aim_rule"` | string or [variable object](#variable-object) | `true` if u or the NPC follower AI rule for aiming matches the string.
+`"u_engagement_rule" or "npc_engagement_rule"` | string or [variable object](#variable-object) | `true` if u or the NPC follower AI rule for engagement matches the string.
+`"u_cbm_reserve_rule" or "npc_cbm_reserve_rule"` | string or [variable object](#variable-object) | `true` if u or the NPC follower AI rule for cbm, reserve matches the string.
+`"u_cbm_recharge_rule" or "npc_cbm_recharge_rule"` | string or [variable object](#variable-object) | `true` if u or the NPC follower AI rule for cbm recharge matches the string.
+`"u_rule" or "npc_rule"` | string or [variable object](#variable-object) | `true` if u or the NPC follower AI rule for that matches string is set.
+`"u_override" or "npc_override"` | string or [variable object](#variable-object)| `true` if u or the NPC has an override for the string.
+`"has_pickup_list" or "u_has_pickup_list" or "npc_has_pickup_list"` | simple string | `true` if u or the NPC has a pickup list.
 
 #### NPC only conditions
 
 Condition | Type | Description
 --- | --- | ---
-`"npc_role_nearby"` | string | `true` if there is an NPC with the same companion mission role as `npc_role_nearby` within 100 tiles.
+`"npc_role_nearby"` | string or [variable object](#variable-object) | `true` if there is an NPC with the same companion mission role as `npc_role_nearby` within 100 tiles.
 `"has_reason"` | simple string | `true` if a previous effect set a reason for why an effect could not be completed.
 
 #### Environment
 
 Condition | Type | Description
 --- | --- | ---
-`"days_since_cataclysm"` | int or variable_object | `true` if at least `days_since_cataclysm`( or the value of the variable described see `variable_object` above) days have passed since the Cataclysm.
-`"is_season"` | string | `true` if the current season matches `is_season`, which must be one of "`spring"`, `"summer"`, `"autumn"`, or `"winter"`.
+`"days_since_cataclysm"` | int or [variable object](#variable-object) | `true` if at least `days_since_cataclysm` days have passed since the Cataclysm.
+`"is_season"` | string or [variable object](#variable-object) | `true` if the current season matches `is_season`, which must be one of "`spring"`, `"summer"`, `"autumn"`, or `"winter"`.
 `"is_day"` | simple string | `true` if it is currently daytime.
 `"u_is_outside"`</br>`"npc_is_outside"`  | simple string | `true` if you or the NPC is on a tile without a roof.
 `"u_is_underwater"`</br>`"npc_is_underwater"`  | simple string | `true` if you or the NPC is underwater.
-`"one_in_chance"` | int or variable_object | `true` if a one in `one_in_chance`( or the value of the variable described see `variable_object` above) random chance occurs.
-`"x_in_y_chance"` | object | `true` if a `x` in `y` random chance occurs. `x` and `y` are either ints or `variable_object`s ( see `variable_object` above).
-`"is_weather"` | int or variable_object | `true` if current weather is `"is_weather"`.
+`"one_in_chance"` | intor [variable object](#variable-object) | `true` if a one in `one_in_chance` random chance occurs.
+`"x_in_y_chance"` | object | `true` if a `x` in `y` random chance occurs. `x` and `y` are either ints  or [variable object](#variable-object).
+`"is_weather"` | string or [variable object](#variable-object)  | `true` if current weather is `"is_weather"`.
 
 #### Meta
 
 Condition | Type | Description
 --- | --- | ---
-`"mod_is_loaded"` | string | `true` if the mod with the given ID is loaded.
+`"mod_is_loaded"` | string or [variable object](#variable-object) | `true` if the mod with the given ID is loaded.
 
 
-#### Compare itergers & arithmetics
+#### Compare Integers and Arithmetics
 `"compare_int"` can be used to compare two values to each other, while `"arithmetic"` can be used to take up to two values, perform arithmetic on them, and then save them in a third value. The syntax is as follows.
 ```
 {
diff --git a/src/condition.cpp b/src/condition.cpp
index 701efcb0d1f4b..1552c00e23199 100644
--- a/src/condition.cpp
+++ b/src/condition.cpp
@@ -344,14 +344,14 @@ template<class T>
 void conditional_t<T>::set_has_any_trait( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::vector<trait_id> traits_to_check;
-    for( auto&& f : jo.get_string_array( member ) ) { // *NOPAD*
-        traits_to_check.emplace_back( f );
+    std::vector<str_or_var<T>> traits_to_check;
+    for( JsonValue jv : jo.get_array( member ) ) {
+        traits_to_check.emplace_back( get_str_or_var<T>( jv, member ) );
     }
     condition = [traits_to_check, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
-        for( const auto &trait : traits_to_check ) {
-            if( actor->has_trait( trait ) ) {
+        for( const str_or_var<T> &trait : traits_to_check ) {
+            if( actor->has_trait( trait_id( trait.evaluate( d ) ) ) ) {
                 return true;
             }
         }
@@ -362,9 +362,9 @@ void conditional_t<T>::set_has_any_trait( const JsonObject &jo, const std::strin
 template<class T>
 void conditional_t<T>::set_has_trait( const JsonObject &jo, const std::string &member, bool is_npc )
 {
-    const std::string &trait_to_check = jo.get_string( member );
+    str_or_var<T> trait_to_check = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [trait_to_check, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_trait( trait_id( trait_to_check ) );
+        return d.actor( is_npc )->has_trait( trait_id( trait_to_check.evaluate( d ) ) );
     };
 }
 
@@ -372,13 +372,13 @@ template<class T>
 void conditional_t<T>::set_has_flag( const JsonObject &jo, const std::string &member,
                                      bool is_npc )
 {
-    const json_character_flag &trait_flag_to_check = json_character_flag( jo.get_string( member ) );
+    str_or_var<T> trait_flag_to_check = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [trait_flag_to_check, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
-        if( trait_flag_to_check == json_flag_MUTATION_THRESHOLD ) {
+        if( json_character_flag( trait_flag_to_check.evaluate( d ) ) == json_flag_MUTATION_THRESHOLD ) {
             return actor->crossed_threshold();
         }
-        return actor->has_flag( trait_flag_to_check );
+        return actor->has_flag( json_character_flag( trait_flag_to_check.evaluate( d ) ) );
     };
 }
 
@@ -399,21 +399,22 @@ void conditional_t<T>::set_is_riding( bool is_npc )
 }
 
 template<class T>
-void conditional_t<T>::set_npc_has_class( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_has_class( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    const std::string &class_to_check = jo.get_string( "npc_has_class" );
+    str_or_var<T> class_to_check = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [class_to_check, is_npc]( const T & d ) {
-        return d.actor( is_npc )->is_myclass( npc_class_id( class_to_check ) );
+        return d.actor( is_npc )->is_myclass( npc_class_id( class_to_check.evaluate( d ) ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_u_has_mission( const JsonObject &jo )
+void conditional_t<T>::set_u_has_mission( const JsonObject &jo, const std::string &member )
 {
-    const std::string &u_mission = jo.get_string( "u_has_mission" );
-    condition = [u_mission]( const T & ) {
+    str_or_var<T> u_mission = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [u_mission]( const T & d ) {
         for( mission *miss_it : get_avatar().get_active_missions() ) {
-            if( miss_it->mission_id() == mission_type_id( u_mission ) ) {
+            if( miss_it->mission_id() == mission_type_id( u_mission.evaluate( d ) ) ) {
                 return true;
             }
         }
@@ -422,24 +423,27 @@ void conditional_t<T>::set_u_has_mission( const JsonObject &jo )
 }
 
 template<class T>
-void conditional_t<T>::set_u_monsters_in_direction( const JsonObject &jo )
+void conditional_t<T>::set_u_monsters_in_direction( const JsonObject &jo,
+        const std::string &member )
 {
-    const std::string &dir = jo.get_string( "u_monsters_in_direction" );
-    condition = [dir]( const T & ) {
+    str_or_var<T> dir = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [dir]( const T & d ) {
         //This string_to_enum function is defined in widget.h. Should it be moved?
-        const int card_dir = static_cast<int>( io::string_to_enum<cardinal_direction>( dir ) );
+        const int card_dir = static_cast<int>( io::string_to_enum<cardinal_direction>( dir.evaluate(
+                d ) ) );
         int monster_count = get_avatar().get_mon_visible().unique_mons[card_dir].size();
         return monster_count > 0;
     };
 }
 
 template<class T>
-void conditional_t<T>::set_u_safe_mode_trigger( const JsonObject &jo )
+void conditional_t<T>::set_u_safe_mode_trigger( const JsonObject &jo, const std::string &member )
 {
-    const std::string &dir = jo.get_string( "u_safe_mode_trigger" );
-    condition = [dir]( const T & ) {
+    str_or_var<T> dir = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [dir]( const T & d ) {
         //This string_to_enum function is defined in widget.h. Should it be moved?
-        const int card_dir = static_cast<int>( io::string_to_enum<cardinal_direction>( dir ) );
+        const int card_dir = static_cast<int>( io::string_to_enum<cardinal_direction>( dir.evaluate(
+                d ) ) );
         return get_avatar().get_mon_visible().dangerous[card_dir];
     };
 }
@@ -513,19 +517,20 @@ template<class T>
 void conditional_t<T>::set_is_wearing( const JsonObject &jo, const std::string &member,
                                        bool is_npc )
 {
-    const itype_id item_id( jo.get_string( member ) );
+    str_or_var<T> item_id = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [item_id, is_npc]( const T & d ) {
-        return d.actor( is_npc )->is_wearing( item_id );
+        return d.actor( is_npc )->is_wearing( itype_id( item_id.evaluate( d ) ) );
     };
 }
 
 template<class T>
 void conditional_t<T>::set_has_item( const JsonObject &jo, const std::string &member, bool is_npc )
 {
-    const itype_id item_id( jo.get_string( member ) );
+    str_or_var<T> item_id = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [item_id, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
-        return actor->charges_of( item_id ) > 0 || actor->has_amount( item_id, 1 );
+        return actor->charges_of( itype_id( item_id.evaluate( d ) ) ) > 0 ||
+               actor->has_amount( itype_id( item_id.evaluate( d ) ), 1 );
     };
 }
 
@@ -539,28 +544,23 @@ void conditional_t<T>::set_has_items( const JsonObject &jo, const std::string &m
             return false;
         };
     } else {
-        const itype_id item_id( has_items.get_string( "item" ) );
-        int count = 0;
-        if( has_items.has_int( "count" ) ) {
-            count = has_items.get_int( "count" );
-        }
-        int charges = 0;
-        if( has_items.has_int( "charges" ) ) {
-            charges = has_items.get_int( "charges" );
-        }
+        str_or_var<T> item_id = get_str_or_var<T>( has_items.get_member( "item" ), "item", true );
+        int_or_var<T> count = get_int_or_var<T>( has_items, "count", false );
+        int_or_var<T> charges = get_int_or_var<T>( has_items, "charges", false );
         condition = [item_id, count, charges, is_npc]( const T & d ) {
             const talker *actor = d.actor( is_npc );
-            if( charges == 0 && item::count_by_charges( item_id ) ) {
-                return actor->has_charges( item_id, count, true );
+            itype_id id = itype_id( item_id.evaluate( d ) );
+            if( charges.evaluate( d ) == 0 && item::count_by_charges( id ) ) {
+                return actor->has_charges( id, count.evaluate( d ), true );
             }
-            if( charges > 0 && count == 0 ) {
-                return actor->has_charges( item_id, charges, true );
+            if( charges.evaluate( d ) > 0 && count.evaluate( d ) == 0 ) {
+                return actor->has_charges( id, charges.evaluate( d ), true );
             }
             bool has_enough_charges = true;
-            if( charges > 0 ) {
-                has_enough_charges = actor->has_charges( item_id, charges, true );
+            if( charges.evaluate( d ) > 0 ) {
+                has_enough_charges = actor->has_charges( id, charges.evaluate( d ), true );
             }
-            return has_enough_charges && actor->has_amount( item_id, count );
+            return has_enough_charges && actor->has_amount( id, count.evaluate( d ) );
         };
     }
 }
@@ -569,9 +569,9 @@ template<class T>
 void conditional_t<T>::set_has_item_with_flag( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string flag( jo.get_string( member ) );
+    str_or_var<T> flag = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [flag, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_item_with_flag( flag_id( flag ) );
+        return d.actor( is_npc )->has_item_with_flag( flag_id( flag.evaluate( d ) ) );
     };
 }
 
@@ -579,8 +579,7 @@ template<class T>
 void conditional_t<T>::set_has_item_category( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const item_category_id category_id = item_category_id( jo.get_string( member ) );
-
+    str_or_var<T> category_id = get_str_or_var<T>( jo.get_member( member ), member, true );
     size_t count = 1;
     if( jo.has_int( "count" ) ) {
         int tcount = jo.get_int( "count" );
@@ -591,8 +590,9 @@ void conditional_t<T>::set_has_item_category( const JsonObject &jo, const std::s
 
     condition = [category_id, count, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
-        const auto items_with = actor->const_items_with( [category_id]( const item & it ) {
-            return it.get_category_shallow().get_id() == category_id;
+        const item_category_id cat_id = item_category_id( category_id.evaluate( d ) );
+        const auto items_with = actor->const_items_with( [cat_id]( const item & it ) {
+            return it.get_category_shallow().get_id() == cat_id;
         } );
         return items_with.size() >= count;
     };
@@ -602,13 +602,13 @@ template<class T>
 void conditional_t<T>::set_has_bionics( const JsonObject &jo, const std::string &member,
                                         bool is_npc )
 {
-    const std::string bionics_id = jo.get_string( member );
+    str_or_var<T> bionics_id = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [bionics_id, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
-        if( bionics_id == "ANY" ) {
+        if( bionics_id.evaluate( d ) == "ANY" ) {
             return actor->num_bionics() > 0 || actor->has_max_power();
         }
-        return actor->has_bionic( bionic_id( bionics_id ) );
+        return actor->has_bionic( bionic_id( bionics_id.evaluate( d ) ) );
     };
 }
 
@@ -616,22 +616,26 @@ template<class T>
 void conditional_t<T>::set_has_effect( const JsonObject &jo, const std::string &member,
                                        bool is_npc )
 {
-    const std::string &effect_id = jo.get_string( member );
-    cata::optional<int> intensity;
-    cata::optional<bodypart_id> bp;
-    optional( jo, false, "intensity", intensity );
-    optional( jo, false, "bodypart", bp );
+    str_or_var<T> effect_id = get_str_or_var<T>( jo.get_member( member ), member, true );
+    int_or_var<T> intensity = get_int_or_var<T>( jo, "intensity", false, -1 );
+    str_or_var<T> bp;
+    if( jo.has_member( "bodypart" ) ) {
+        bp = get_str_or_var<T>( jo.get_member( "target_part" ), "target_part", true );
+    } else {
+        bp.str_val = "";
+    }
     condition = [effect_id, intensity, bp, is_npc]( const T & d ) {
-        bodypart_id bid = bp.value_or( get_bp_from_str( d.reason ) );
-        effect target = d.actor( is_npc )->get_effect( efftype_id( effect_id ), bid );
-        return !target.is_null() && intensity.value_or( -1 ) <= target.get_intensity();
+        bodypart_id bid = bp.evaluate( d ) == "" ? get_bp_from_str( d.reason ) : bodypart_id( bp.evaluate(
+                              d ) );
+        effect target = d.actor( is_npc )->get_effect( efftype_id( effect_id.evaluate( d ) ), bid );
+        return !target.is_null() && intensity.evaluate( d ) <= target.get_intensity();
     };
 }
 
 template<class T>
 void conditional_t<T>::set_need( const JsonObject &jo, const std::string &member, bool is_npc )
 {
-    const std::string &need = jo.get_string( member );
+    str_or_var<T> need = get_str_or_var<T>( jo.get_member( member ), member, true );
     int_or_var<T> iov;
     if( jo.has_int( "amount" ) ) {
         iov.min.int_val = jo.get_int( "amount" );
@@ -647,9 +651,9 @@ void conditional_t<T>::set_need( const JsonObject &jo, const std::string &member
     condition = [need, iov, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
         int amount = iov.evaluate( d );
-        return ( actor->get_fatigue() > amount && need == "fatigue" ) ||
-               ( actor->get_hunger() > amount && need == "hunger" ) ||
-               ( actor->get_thirst() > amount && need == "thirst" );
+        return ( actor->get_fatigue() > amount && need.evaluate( d ) == "fatigue" ) ||
+               ( actor->get_hunger() > amount && need.evaluate( d ) == "hunger" ) ||
+               ( actor->get_thirst() > amount && need.evaluate( d ) == "thirst" );
     };
 }
 
@@ -657,23 +661,23 @@ template<class T>
 void conditional_t<T>::set_at_om_location( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string &location = jo.get_string( member );
+    str_or_var<T> location = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [location, is_npc]( const T & d ) {
         const tripoint_abs_omt omt_pos = d.actor( is_npc )->global_omt_location();
         const oter_id &omt_ter = overmap_buffer.ter( omt_pos );
         const std::string &omt_str = omt_ter.id().c_str();
 
-        if( location == "FACTION_CAMP_ANY" ) {
+        if( location.evaluate( d ) == "FACTION_CAMP_ANY" ) {
             cata::optional<basecamp *> bcp = overmap_buffer.find_camp( omt_pos.xy() );
             if( bcp ) {
                 return true;
             }
             // legacy check
             return omt_str.find( "faction_base_camp" ) != std::string::npos;
-        } else if( location == "FACTION_CAMP_START" ) {
+        } else if( location.evaluate( d ) == "FACTION_CAMP_START" ) {
             return !recipe_group::get_recipes_by_id( "all_faction_base_types", omt_str ).empty();
         } else {
-            return oter_no_dir( omt_ter ) == location;
+            return oter_no_dir( omt_ter ) == location.evaluate( d );
         }
     };
 }
@@ -682,7 +686,7 @@ template<class T>
 void conditional_t<T>::set_near_om_location( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string &location = jo.get_string( member );
+    str_or_var<T> location = get_str_or_var<T>( jo.get_member( member ), member, true );
     const int_or_var<T> range = get_int_or_var<T>( jo, "range", false, 1 );
     condition = [location, range, is_npc]( const T & d ) {
         const tripoint_abs_omt omt_pos = d.actor( is_npc )->global_omt_location();
@@ -691,7 +695,7 @@ void conditional_t<T>::set_near_om_location( const JsonObject &jo, const std::st
             const oter_id &omt_ter = overmap_buffer.ter( curr_pos );
             const std::string &omt_str = omt_ter.id().c_str();
 
-            if( location == "FACTION_CAMP_ANY" ) {
+            if( location.evaluate( d ) == "FACTION_CAMP_ANY" ) {
                 cata::optional<basecamp *> bcp = overmap_buffer.find_camp( curr_pos.xy() );
                 if( bcp ) {
                     return true;
@@ -700,11 +704,11 @@ void conditional_t<T>::set_near_om_location( const JsonObject &jo, const std::st
                 if( omt_str.find( "faction_base_camp" ) != std::string::npos ) {
                     return true;
                 }
-            } else if( location == "FACTION_CAMP_START" &&
+            } else if( location.evaluate( d ) == "FACTION_CAMP_START" &&
                        !recipe_group::get_recipes_by_id( "all_faction_base_types", omt_str ).empty() ) {
                 return true;
             } else {
-                if( oter_no_dir( omt_ter ) == location ) {
+                if( oter_no_dir( omt_ter ) == location.evaluate( d ) ) {
                     return true;
                 }
             }
@@ -814,12 +818,13 @@ void conditional_t<T>::set_compare_time_since_var( const JsonObject &jo, const s
 }
 
 template<class T>
-void conditional_t<T>::set_npc_role_nearby( const JsonObject &jo )
+void conditional_t<T>::set_npc_role_nearby( const JsonObject &jo, const std::string &member )
 {
-    const std::string &role = jo.get_string( "npc_role_nearby" );
+    str_or_var<T> role = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [role]( const T & d ) {
         const std::vector<npc *> available = g->get_npcs_if( [&]( const npc & guy ) {
-            return d.actor( false )->posz() == guy.posz() && guy.companion_mission_role_id == role &&
+            return d.actor( false )->posz() == guy.posz() &&
+                   guy.companion_mission_role_id == role.evaluate( d ) &&
                    ( rl_dist( d.actor( false )->pos(), guy.pos() ) <= 48 );
         } );
         return !available.empty();
@@ -827,9 +832,9 @@ void conditional_t<T>::set_npc_role_nearby( const JsonObject &jo )
 }
 
 template<class T>
-void conditional_t<T>::set_npc_allies( const JsonObject &jo )
+void conditional_t<T>::set_npc_allies( const JsonObject &jo, const std::string &member )
 {
-    int_or_var<T> iov = get_int_or_var<T>( jo, "npc_allies" );
+    int_or_var<T> iov = get_int_or_var<T>( jo, member );
     condition = [iov]( const T & d ) {
         return g->allies().size() >= static_cast<std::vector<npc *>::size_type>( iov.evaluate( d ) );
     };
@@ -837,10 +842,9 @@ void conditional_t<T>::set_npc_allies( const JsonObject &jo )
 
 
 template<class T>
-void conditional_t<T>::set_npc_allies_global( const JsonObject &jo )
+void conditional_t<T>::set_npc_allies_global( const JsonObject &jo, const std::string &member )
 {
-    int_or_var<T> iov = get_int_or_var<T>( jo, "npc_allies_global" );
-
+    int_or_var<T> iov = get_int_or_var<T>( jo, member );
     condition = [iov]( const T & d ) {
         const auto all_npcs = overmap_buffer.get_overmap_npcs();
         const size_t count = std::count_if( all_npcs.begin(),
@@ -854,109 +858,115 @@ void conditional_t<T>::set_npc_allies_global( const JsonObject &jo )
 
 
 template<class T>
-void conditional_t<T>::set_u_has_cash( const JsonObject &jo )
+void conditional_t<T>::set_u_has_cash( const JsonObject &jo, const std::string &member )
 {
-    int_or_var<T> iov = get_int_or_var<T>( jo, "u_has_cash" );
+    int_or_var<T> iov = get_int_or_var<T>( jo, member );
     condition = [iov]( const T & d ) {
         return d.actor( false )->cash() >= iov.evaluate( d );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_u_are_owed( const JsonObject &jo )
+void conditional_t<T>::set_u_are_owed( const JsonObject &jo, const std::string &member )
 {
-    int_or_var<T> iov = get_int_or_var<T>( jo, "u_are_owed" );
+    int_or_var<T> iov = get_int_or_var<T>( jo, member );
     condition = [iov]( const T & d ) {
         return d.actor( true )->debt() >= iov.evaluate( d );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_aim_rule( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_aim_rule( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    const std::string &setting = jo.get_string( "npc_aim_rule" );
+    str_or_var<T> setting = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [setting, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "aim_rule", setting );
+        return d.actor( is_npc )->has_ai_rule( "aim_rule", setting.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_engagement_rule( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_engagement_rule( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    const std::string &setting = jo.get_string( "npc_engagement_rule" );
+    str_or_var<T> setting = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [setting, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "engagement_rule", setting );
+        return d.actor( is_npc )->has_ai_rule( "engagement_rule", setting.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_cbm_reserve_rule( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_cbm_reserve_rule( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    const std::string &setting = jo.get_string( "npc_cbm_reserve_rule" );
+    str_or_var<T> setting = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [setting, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "cbm_reserve_rule", setting );
+        return d.actor( is_npc )->has_ai_rule( "cbm_reserve_rule", setting.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_cbm_recharge_rule( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_cbm_recharge_rule( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    const std::string &setting = jo.get_string( "npc_cbm_recharge_rule" );
+    str_or_var<T> setting = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [setting, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "cbm_recharge_rule", setting );
+        return d.actor( is_npc )->has_ai_rule( "cbm_recharge_rule", setting.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_rule( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_rule( const JsonObject &jo, const std::string &member, bool is_npc )
 {
-    std::string rule = jo.get_string( "npc_rule" );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [rule, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "ally_rule", rule );
+        return d.actor( is_npc )->has_ai_rule( "ally_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_npc_override( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_npc_override( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    std::string rule = jo.get_string( "npc_override" );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [rule, is_npc]( const T & d ) {
-        return d.actor( is_npc )->has_ai_rule( "ally_override", rule );
+        return d.actor( is_npc )->has_ai_rule( "ally_override", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_days_since( const JsonObject &jo )
+void conditional_t<T>::set_days_since( const JsonObject &jo, const std::string &member )
 {
-    int_or_var<T> iov = get_int_or_var<T>( jo, "days_since_cataclysm" );
+    int_or_var<T> iov = get_int_or_var<T>( jo, member );
     condition = [iov]( const T & d ) {
         return calendar::turn >= calendar::start_of_cataclysm + 1_days * iov.evaluate( d );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_is_season( const JsonObject &jo )
+void conditional_t<T>::set_is_season( const JsonObject &jo, const std::string &member )
 {
-    std::string season_name = jo.get_string( "is_season" );
-    condition = [season_name]( const T & ) {
+    str_or_var<T> season_name = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [season_name]( const T & d ) {
         const season_type season = season_of_year( calendar::turn );
-        return ( season == SPRING && season_name == "spring" ) ||
-               ( season == SUMMER && season_name == "summer" ) ||
-               ( season == AUTUMN && season_name == "autumn" ) ||
-               ( season == WINTER && season_name == "winter" );
+        return ( season == SPRING && season_name.evaluate( d ) == "spring" ) ||
+               ( season == SUMMER && season_name.evaluate( d ) == "summer" ) ||
+               ( season == AUTUMN && season_name.evaluate( d ) == "autumn" ) ||
+               ( season == WINTER && season_name.evaluate( d ) == "winter" );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_mission_goal( const JsonObject &jo, bool is_npc )
+void conditional_t<T>::set_mission_goal( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    std::string mission_goal_str = jo.get_string( "mission_goal" );
+    str_or_var<T> mission_goal_str = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [mission_goal_str, is_npc]( const T & d ) {
         mission *miss = d.actor( is_npc )->selected_mission();
         if( !miss ) {
             return false;
         }
-        const mission_goal mgoal = io::string_to_enum<mission_goal>( mission_goal_str );
+        const mission_goal mgoal = io::string_to_enum<mission_goal>( mission_goal_str.evaluate( d ) );
         return miss->get_type().goal == mgoal;
     };
 }
@@ -1191,12 +1201,12 @@ void conditional_t<T>::set_one_in_chance( const JsonObject &jo, const std::strin
 template<class T>
 void conditional_t<T>::set_query( const JsonObject &jo, const std::string &member, bool is_npc )
 {
-    std::string message = jo.get_string( member );
+    str_or_var<T> message = get_str_or_var<T>( jo.get_member( member ), member, true );
     bool default_val = jo.get_bool( "default" );
     condition = [message, default_val, is_npc]( const T & d ) {
         const talker *actor = d.actor( is_npc );
         if( actor->get_character() && actor->get_character()->is_avatar() ) {
-            std::string translated_message = _( message );
+            std::string translated_message = _( message.evaluate( d ) );
             return query_yn( translated_message );
         } else {
             return default_val;
@@ -1217,21 +1227,22 @@ void conditional_t<T>::set_x_in_y_chance( const JsonObject &jo, const std::strin
 }
 
 template<class T>
-void conditional_t<T>::set_is_weather( const JsonObject &jo )
+void conditional_t<T>::set_is_weather( const JsonObject &jo, const std::string &member )
 {
-    weather_type_id weather = weather_type_id( jo.get_string( "is_weather" ) );
-    condition = [weather]( const T & ) {
-        return get_weather().weather_id == weather;
+    str_or_var<T> weather = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [weather]( const T & d ) {
+        return get_weather().weather_id == weather_type_id( weather.evaluate( d ) );
     };
 }
 
 template<class T>
-void conditional_t<T>::set_mod_is_loaded( const JsonObject &jo )
+void conditional_t<T>::set_mod_is_loaded( const JsonObject &jo, const std::string &member )
 {
-    mod_id compared_mod = mod_id( jo.get_string( "mod_is_loaded" ) );
-    condition = [compared_mod]( const T & ) {
+    str_or_var<T> compared_mod = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [compared_mod]( const T & d ) {
+        mod_id comp_mod = mod_id( compared_mod.evaluate( d ) );
         for( const mod_id &mod : world_generator->active_world->active_mod_order ) {
-            if( compared_mod == mod ) {
+            if( comp_mod == mod ) {
                 return true;
             }
         }
@@ -2580,10 +2591,10 @@ void conditional_t<T>::set_has_skill( const JsonObject &jo, const std::string &m
             return false;
         };
     } else {
-        const skill_id skill( has_skill.get_string( "skill" ) );
-        int level = has_skill.get_int( "level" );
+        str_or_var<T> skill = get_str_or_var<T>( has_skill.get_member( "skill" ), "skill", true );
+        int_or_var<T> level = get_int_or_var<T>( has_skill, "level", true );
         condition = [skill, level, is_npc]( const T & d ) {
-            return d.actor( is_npc )->get_skill_level( skill ) >= level;
+            return d.actor( is_npc )->get_skill_level( skill_id( skill.evaluate( d ) ) ) >= level.evaluate( d );
         };
     }
 }
@@ -2591,9 +2602,9 @@ void conditional_t<T>::set_has_skill( const JsonObject &jo, const std::string &m
 template<class T>
 void conditional_t<T>::set_u_know_recipe( const JsonObject &jo, const std::string &member )
 {
-    const std::string &known_recipe_id = jo.get_string( member );
-    condition = [known_recipe_id]( const T & ) {
-        const recipe &rep = recipe_id( known_recipe_id ).obj();
+    str_or_var<T> known_recipe_id = get_str_or_var<T>( jo.get_member( member ), member, true );
+    condition = [known_recipe_id]( const T & d ) {
+        const recipe &rep = recipe_id( known_recipe_id.evaluate( d ) ).obj();
         // should be a talker function but recipes aren't in Character:: yet
         return get_player_character().knows_recipe( &rep );
     };
@@ -2616,12 +2627,12 @@ template<class T>
 void conditional_t<T>::set_has_worn_with_flag( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string flag( jo.get_string( member ) );
+    str_or_var<T> flag = get_str_or_var<T>( jo.get_member( member ), member, true );
     cata::optional<bodypart_id> bp;
     optional( jo, false, "bodypart", bp );
     condition = [flag, bp, is_npc]( const T & d ) {
         bodypart_id bid = bp.value_or( get_bp_from_str( d.reason ) );
-        return d.actor( is_npc )->worn_with_flag( flag_id( flag ), bid );
+        return d.actor( is_npc )->worn_with_flag( flag_id( flag.evaluate( d ) ), bid );
     };
 }
 
@@ -2629,9 +2640,9 @@ template<class T>
 void conditional_t<T>::set_has_wielded_with_flag( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string flag( jo.get_string( member ) );
+    str_or_var<T> flag = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [flag, is_npc]( const T & d ) {
-        return d.actor( is_npc )->wielded_with_flag( flag_id( flag ) );
+        return d.actor( is_npc )->wielded_with_flag( flag_id( flag.evaluate( d ) ) );
     };
 }
 
@@ -2655,10 +2666,10 @@ template<class T>
 void conditional_t<T>::set_is_on_terrain( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string terrain_type = jo.get_string( member );
+    str_or_var<T> terrain_type = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [terrain_type, is_npc]( const T & d ) {
         map &here = get_map();
-        return here.ter( d.actor( is_npc )->pos() ) == ter_id( terrain_type );
+        return here.ter( d.actor( is_npc )->pos() ) == ter_id( terrain_type.evaluate( d ) );
     };
 }
 
@@ -2666,10 +2677,10 @@ template<class T>
 void conditional_t<T>::set_is_in_field( const JsonObject &jo, const std::string &member,
                                         bool is_npc )
 {
-    std::string field_type = jo.get_string( member );
+    str_or_var<T> field_type = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [field_type, is_npc]( const T & d ) {
         map &here = get_map();
-        field_type_id ft = field_type_id( field_type );
+        field_type_id ft = field_type_id( field_type.evaluate( d ) );
         for( const std::pair<const field_type_id, field_entry> &f : here.field_at( d.actor(
                     is_npc )->pos() ) ) {
             if( f.second.get_field_type() == ft ) {
@@ -2684,9 +2695,9 @@ template<class T>
 void conditional_t<T>::set_has_move_mode( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    move_mode_id mode( jo.get_string( member ) );
+    str_or_var<T> mode = get_str_or_var<T>( jo.get_member( member ), member, true );
     condition = [mode, is_npc]( const T & d ) {
-        return d.actor( is_npc )->get_move_mode() == mode;
+        return d.actor( is_npc )->get_move_mode() == move_mode_id( mode.evaluate( d ) );
     };
 }
 
@@ -2767,19 +2778,19 @@ conditional_t<T>::conditional_t( const JsonObject &jo )
     } else if( jo.has_member( "npc_has_flag" ) ) {
         set_has_flag( jo, "npc_has_flag", true );
     } else if( jo.has_member( "npc_has_class" ) ) {
-        set_npc_has_class( jo, true );
+        set_npc_has_class( jo, "npc_has_class", true );
     } else if( jo.has_member( "u_has_class" ) ) {
-        set_npc_has_class( jo, false );
+        set_npc_has_class( jo, "u_has_class", false );
     } else if( jo.has_string( "npc_has_activity" ) ) {
         set_has_activity( is_npc );
     } else if( jo.has_string( "npc_is_riding" ) ) {
         set_is_riding( is_npc );
     } else if( jo.has_string( "u_has_mission" ) ) {
-        set_u_has_mission( jo );
+        set_u_has_mission( jo, "u_has_mission" );
     } else if( jo.has_string( "u_monsters_in_direction" ) ) {
-        set_u_monsters_in_direction( jo );
+        set_u_monsters_in_direction( jo, "u_monsters_in_direction" );
     } else if( jo.has_string( "u_safe_mode_trigger" ) ) {
-        set_u_safe_mode_trigger( jo );
+        set_u_safe_mode_trigger( jo, "u_safe_mode_trigger" );
     } else if( jo.has_int( "u_has_strength" ) || jo.has_object( "u_has_strength" ) ) {
         set_has_strength( jo, "u_has_strength" );
     } else if( jo.has_int( "npc_has_strength" ) || jo.has_object( "npc_has_strength" ) ) {
@@ -2861,51 +2872,53 @@ conditional_t<T>::conditional_t( const JsonObject &jo )
     } else if( jo.has_string( "npc_compare_time_since_var" ) ) {
         set_compare_time_since_var( jo, "npc_compare_time_since_var", is_npc );
     } else if( jo.has_string( "npc_role_nearby" ) ) {
-        set_npc_role_nearby( jo );
+        set_npc_role_nearby( jo, "npc_role_nearby" );
     } else if( jo.has_int( "npc_allies" ) || jo.has_object( "npc_allies" ) ) {
-        set_npc_allies( jo );
+        set_npc_allies( jo, "npc_allies" );
     } else if( jo.has_int( "npc_allies_global" ) || jo.has_object( "npc_allies_global" ) ) {
-        set_npc_allies_global( jo );
+        set_npc_allies_global( jo, "npc_allies_global" );
     } else if( jo.get_bool( "npc_service", false ) ) {
         set_npc_available( true );
     } else if( jo.get_bool( "u_service", false ) ) {
         set_npc_available( false );
     } else if( jo.has_int( "u_has_cash" ) || jo.has_object( "u_has_cash" ) ) {
-        set_u_has_cash( jo );
+        set_u_has_cash( jo, "u_has_cash" );
     } else if( jo.has_int( "u_are_owed" ) || jo.has_object( "u_are_owed" ) ) {
-        set_u_are_owed( jo );
+        set_u_are_owed( jo, "u_are_owed" );
     } else if( jo.has_string( "npc_aim_rule" ) ) {
-        set_npc_aim_rule( jo, true );
+        set_npc_aim_rule( jo, "npc_aim_rule", true );
     } else if( jo.has_string( "u_aim_rule" ) ) {
-        set_npc_aim_rule( jo, false );
+        set_npc_aim_rule( jo, "u_aim_rule", false );
     } else if( jo.has_string( "npc_engagement_rule" ) ) {
-        set_npc_engagement_rule( jo, true );
+        set_npc_engagement_rule( jo, "npc_engagement_rule", true );
     } else if( jo.has_string( "u_engagement_rule" ) ) {
-        set_npc_engagement_rule( jo, false );
+        set_npc_engagement_rule( jo, "u_engagement_rule", false );
     } else if( jo.has_string( "npc_cbm_reserve_rule" ) ) {
-        set_npc_cbm_reserve_rule( jo, true );
+        set_npc_cbm_reserve_rule( jo, "npc_cbm_reserve_rule", true );
     } else if( jo.has_string( "u_cbm_reserve_rule" ) ) {
-        set_npc_cbm_reserve_rule( jo, false );
+        set_npc_cbm_reserve_rule( jo, "u_cbm_reserve_rule", false );
     } else if( jo.has_string( "npc_cbm_recharge_rule" ) ) {
-        set_npc_cbm_recharge_rule( jo, true );
+        set_npc_cbm_recharge_rule( jo, "npc_cbm_recharge_rule", true );
     } else if( jo.has_string( "u_cbm_recharge_rule" ) ) {
-        set_npc_cbm_recharge_rule( jo, false );
+        set_npc_cbm_recharge_rule( jo, "u_cbm_recharge_rule", false );
     } else if( jo.has_string( "npc_rule" ) ) {
-        set_npc_rule( jo, true );
+        set_npc_rule( jo, "npc_rule", true );
     } else if( jo.has_string( "u_rule" ) ) {
-        set_npc_rule( jo, false );
+        set_npc_rule( jo, "npc_rule", false );
     } else if( jo.has_string( "npc_override" ) ) {
-        set_npc_override( jo, true );
+        set_npc_override( jo, "npc_override", true );
     } else if( jo.has_string( "u_override" ) ) {
-        set_npc_override( jo, false );
+        set_npc_override( jo, "u_override", false );
     } else if( jo.has_int( "days_since_cataclysm" ) || jo.has_object( "days_since_cataclysm" ) ) {
-        set_days_since( jo );
+        set_days_since( jo, "days_since_cataclysm" );
     } else if( jo.has_string( "is_season" ) ) {
-        set_is_season( jo );
-    } else if( jo.has_string( "mission_goal" ) || jo.has_string( "npc_mission_goal" ) ) {
-        set_mission_goal( jo, true );
+        set_is_season( jo, "is_season" );
+    } else if( jo.has_string( "mission_goal" ) ) {
+        set_mission_goal( jo, "mission_goal", true );
+    } else if( jo.has_string( "npc_mission_goal" ) ) {
+        set_mission_goal( jo, "npc_mission_goal", true );
     } else if( jo.has_string( "u_mission_goal" ) ) {
-        set_mission_goal( jo, false );
+        set_mission_goal( jo, "u_mission_goal", false );
     } else if( jo.has_member( "u_has_skill" ) ) {
         set_has_skill( jo, "u_has_skill" );
     } else if( jo.has_member( "npc_has_skill" ) ) {
@@ -2937,9 +2950,9 @@ conditional_t<T>::conditional_t( const JsonObject &jo )
     } else if( jo.has_string( "npc_has_move_mode" ) ) {
         set_has_move_mode( jo, "npc_has_move_mode", is_npc );
     } else if( jo.has_string( "is_weather" ) ) {
-        set_is_weather( jo );
+        set_is_weather( jo, "is_weather" );
     } else if( jo.has_string( "mod_is_loaded" ) ) {
-        set_mod_is_loaded( jo );
+        set_mod_is_loaded( jo, "mod_is_loaded" );
     } else if( jo.has_int( "u_has_faction_trust" ) || jo.has_object( "u_has_faction_trust" ) ) {
         set_has_faction_trust( jo, "u_has_faction_trust" );
     } else if( jo.has_member( "compare_int" ) ) {
diff --git a/src/condition.h b/src/condition.h
index aaca5a4e0c12f..c768cff981bf8 100644
--- a/src/condition.h
+++ b/src/condition.h
@@ -127,10 +127,10 @@ struct conditional_t {
                                          bool is_npc = false );
         void set_has_activity( bool is_npc = false );
         void set_is_riding( bool is_npc = false );
-        void set_npc_has_class( const JsonObject &jo, bool is_npc );
-        void set_u_has_mission( const JsonObject &jo );
-        void set_u_monsters_in_direction( const JsonObject &jo );
-        void set_u_safe_mode_trigger( const JsonObject &jo );
+        void set_npc_has_class( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_u_has_mission( const JsonObject &jo, const std::string &member );
+        void set_u_monsters_in_direction( const JsonObject &jo, const std::string &member );
+        void set_u_safe_mode_trigger( const JsonObject &jo, const std::string &member );
         void set_has_strength( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_has_dexterity( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_has_intelligence( const JsonObject &jo, const std::string &member, bool is_npc = false );
@@ -157,22 +157,22 @@ struct conditional_t {
         void set_at_om_location( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_near_om_location( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_has_move_mode( const JsonObject &jo, const std::string &member, bool is_npc = false );
-        void set_npc_role_nearby( const JsonObject &jo );
-        void set_npc_allies( const JsonObject &jo );
-        void set_npc_allies_global( const JsonObject &jo );
-        void set_u_has_cash( const JsonObject &jo );
-        void set_u_are_owed( const JsonObject &jo );
-        void set_npc_aim_rule( const JsonObject &jo, bool is_npc );
-        void set_npc_engagement_rule( const JsonObject &jo, bool is_npc );
-        void set_npc_cbm_reserve_rule( const JsonObject &jo, bool is_npc );
-        void set_npc_cbm_recharge_rule( const JsonObject &jo, bool is_npc );
-        void set_npc_rule( const JsonObject &jo, bool is_npc );
-        void set_npc_override( const JsonObject &jo, bool is_npc );
-        void set_days_since( const JsonObject &jo );
-        void set_is_season( const JsonObject &jo );
-        void set_is_weather( const JsonObject &jo );
-        void set_mod_is_loaded( const JsonObject &jo );
-        void set_mission_goal( const JsonObject &jo, bool is_npc );
+        void set_npc_role_nearby( const JsonObject &jo, const std::string &member );
+        void set_npc_allies( const JsonObject &jo, const std::string &member );
+        void set_npc_allies_global( const JsonObject &jo, const std::string &member );
+        void set_u_has_cash( const JsonObject &jo, const std::string &member );
+        void set_u_are_owed( const JsonObject &jo, const std::string &member );
+        void set_npc_aim_rule( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_npc_engagement_rule( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_npc_cbm_reserve_rule( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_npc_cbm_recharge_rule( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_npc_rule( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_npc_override( const JsonObject &jo, const std::string &member, bool is_npc );
+        void set_days_since( const JsonObject &jo, const std::string &member );
+        void set_is_season( const JsonObject &jo, const std::string &member );
+        void set_is_weather( const JsonObject &jo, const std::string &member );
+        void set_mod_is_loaded( const JsonObject &jo, const std::string &member );
+        void set_mission_goal( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_has_faction_trust( const JsonObject &jo, const std::string &member );
         void set_no_assigned_mission();
         void set_has_assigned_mission();
diff --git a/src/dialogue_helpers.h b/src/dialogue_helpers.h
index 49fc76f07724a..8bd00dffc240f 100644
--- a/src/dialogue_helpers.h
+++ b/src/dialogue_helpers.h
@@ -60,43 +60,38 @@ struct talk_effect_fun_t {
         void set_add_var( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_remove_var( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_adjust_var( const JsonObject &jo, const std::string &member, bool is_npc = false );
-        void set_u_spawn_item( const JsonObject &jo, const std::string &member, int count,
-                               const std::string &container_name );
-        void set_u_buy_item( const itype_id &item_name, int cost, int count,
-                             const std::string &container_name, const JsonObject &jo );
-        void set_u_spend_cash( int amount, const JsonObject &jo );
-        void set_u_sell_item( const itype_id &item_name, int cost, int count, const JsonObject &jo );
-        void set_consume_item( const JsonObject &jo, const std::string &member, int count, int charges,
-                               bool is_npc = false );
+        void set_u_spawn_item( const JsonObject &jo, const std::string &member );
+        void set_u_buy_item( const JsonObject &jo, const std::string &member );
+        void set_u_spend_cash( const JsonObject &jo, const std::string &member );
+        void set_u_sell_item( const JsonObject &jo, const std::string &member );
+        void set_consume_item( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_remove_item_with( const JsonObject &jo, const std::string &member, bool is_npc = false );
-        void set_npc_change_faction( const std::string &faction_name );
-        void set_npc_change_class( const std::string &class_name );
-        void set_change_faction_rep( int rep_change );
+        void set_npc_change_faction( const JsonObject &jo, const std::string &member );
+        void set_npc_change_class( const JsonObject &jo, const std::string &member );
+        void set_change_faction_rep( const JsonObject &jo, const std::string &member );
         void set_add_debt( const std::vector<trial_mod> &debt_modifiers );
-        void set_toggle_npc_rule( const std::string &rule );
-        void set_set_npc_rule( const std::string &rule );
-        void set_clear_npc_rule( const std::string &rule );
-        void set_npc_engagement_rule( const std::string &setting );
-        void set_npc_aim_rule( const std::string &setting );
-        void set_npc_cbm_reserve_rule( const std::string &setting );
-        void set_npc_cbm_recharge_rule( const std::string &setting );
+        void set_toggle_npc_rule( const JsonObject &jo, const std::string &member );
+        void set_set_npc_rule( const JsonObject &jo, const std::string &member );
+        void set_clear_npc_rule( const JsonObject &jo, const std::string &member );
+        void set_npc_engagement_rule( const JsonObject &jo, const std::string &member );
+        void set_npc_aim_rule( const JsonObject &jo, const std::string &member );
+        void set_npc_cbm_reserve_rule( const JsonObject &jo, const std::string &member );
+        void set_npc_cbm_recharge_rule( const JsonObject &jo, const std::string &member );
         void set_location_variable( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_transform_radius( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_transform_line( const JsonObject &jo, const std::string &member );
         void set_place_override( const JsonObject &jo, const std::string &member );
         void set_mapgen_update( const JsonObject &jo, const std::string &member );
-        void set_remove_npc( const JsonObject &jo, const std::string &member );
         void set_alter_timed_events( const JsonObject &jo, const std::string &member );
         void set_revert_location( const JsonObject &jo, const std::string &member );
         void set_npc_goal( const JsonObject &jo, const std::string &member );
-        void set_bulk_trade_accept( bool is_trade, int quantity, bool is_npc = false );
+        void set_bulk_trade_accept( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_npc_gets_item( bool to_use );
-        void set_add_mission( const std::string &mission_id );
+        void set_add_mission( const JsonObject &jo, const std::string &member );
         const std::vector<std::pair<int, itype_id>> &get_likely_rewards() const;
-        void set_u_buy_monster( const std::string &monster_type_id, int cost, int count, bool pacified,
-                                const translation &name, const JsonObject &jo );
-        void set_u_learn_recipe( const std::string &learned_recipe_id );
-        void set_npc_first_topic( const std::string &chat_topic );
+        void set_u_buy_monster( const JsonObject &jo, const std::string &member );
+        void set_u_learn_recipe( const JsonObject &jo, const std::string &member );
+        void set_npc_first_topic( const JsonObject &jo, const std::string &member );
         void set_add_morale( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_lose_morale( const JsonObject &jo, const std::string &member, bool is_npc );
         void set_add_faction_trust( const JsonObject &jo, const std::string &member );
@@ -119,7 +114,6 @@ struct talk_effect_fun_t {
         }
 };
 
-
 struct var_info {
     var_info( var_type in_type, std::string in_name ): type( in_type ),
         name( std::move( in_name ) ) {}
@@ -161,7 +155,6 @@ static std::string read_var_value( const var_info &info, const T &d )
     return ret_val;
 }
 
-
 template<class T>
 struct str_or_var {
     cata::optional<std::string> str_val;
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
index f607eded2a85e..2a6312bf39c9e 100644
--- a/src/npctalk.cpp
+++ b/src/npctalk.cpp
@@ -2057,7 +2057,7 @@ template<class T>
 void talk_effect_fun_t<T>::set_add_effect( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string new_effect = jo.get_string( member );
+    str_or_var<T> new_effect = get_str_or_var<T>( jo.get_member( member ), member, true );
     bool permanent = false;
     bool force = false;
     duration_or_var<T> dov_duration;
@@ -2077,12 +2077,17 @@ void talk_effect_fun_t<T>::set_add_effect( const JsonObject &jo, const std::stri
     if( jo.has_bool( "force" ) ) {
         force = jo.get_bool( "force" );
     }
-    std::string target = jo.get_string( "target_part", "bp_null" );
+    str_or_var<T> target;
+    if( jo.has_member( "target_part" ) ) {
+        target = get_str_or_var<T>( jo.get_member( "target_part" ), "target_part", false, "bp_null" );
+    } else {
+        target.str_val = "bp_null";
+    }
     function = [is_npc, new_effect, dov_duration, target, permanent, force,
             iov_intensity]( const T & d ) {
-        d.actor( is_npc )->add_effect( efftype_id( new_effect ),
+        d.actor( is_npc )->add_effect( efftype_id( new_effect.evaluate( d ) ),
                                        dov_duration.evaluate( d ),
-                                       target, permanent, force,
+                                       target.evaluate( d ), permanent, force,
                                        iov_intensity.evaluate( d ) );
     };
 }
@@ -2091,9 +2096,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_remove_effect( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string old_effect = jo.get_string( member );
+    str_or_var<T> old_effect = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, old_effect]( const T & d ) {
-        d.actor( is_npc )->remove_effect( efftype_id( old_effect ) );
+        d.actor( is_npc )->remove_effect( efftype_id( old_effect.evaluate( d ) ) );
     };
 }
 
@@ -2101,9 +2106,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_add_trait( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string new_trait = jo.get_string( member );
+    str_or_var<T> new_trait = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, new_trait]( const T & d ) {
-        d.actor( is_npc )->set_mutation( trait_id( new_trait ) );
+        d.actor( is_npc )->set_mutation( trait_id( new_trait.evaluate( d ) ) );
     };
 }
 
@@ -2111,9 +2116,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_remove_trait( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string old_trait = jo.get_string( member );
+    str_or_var<T> old_trait = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, old_trait]( const T & d ) {
-        d.actor( is_npc )->unset_mutation( trait_id( old_trait ) );
+        d.actor( is_npc )->unset_mutation( trait_id( old_trait.evaluate( d ) ) );
     };
 }
 
@@ -2143,9 +2148,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_add_bionic( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string new_bionic = jo.get_string( member );
+    str_or_var<T> new_bionic = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, new_bionic]( const T & d ) {
-        d.actor( is_npc )->add_bionic( bionic_id( new_bionic ) );
+        d.actor( is_npc )->add_bionic( bionic_id( new_bionic.evaluate( d ) ) );
     };
 }
 
@@ -2153,9 +2158,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_lose_bionic( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string old_bionic = jo.get_string( member );
+    str_or_var<T> old_bionic = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, old_bionic]( const T & d ) {
-        d.actor( is_npc )->remove_bionic( bionic_id( old_bionic ) );
+        d.actor( is_npc )->remove_bionic( bionic_id( old_bionic.evaluate( d ) ) );
     };
 }
 
@@ -2255,91 +2260,139 @@ static void receive_item( const itype_id &item_name, int count, const std::strin
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_spawn_item( const JsonObject &jo, const std::string &member,
-        int count,
-        const std::string &container_name )
+void talk_effect_fun_t<T>::set_u_spawn_item( const JsonObject &jo, const std::string &member )
 {
-    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, false, "default" );
+    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, true );
+    str_or_var<T> container_name;
+    if( jo.has_member( "container" ) ) {
+        container_name = get_str_or_var<T>( jo.get_member( "container" ), "container", true );
+    } else {
+        container_name.str_val = "";
+    }
+    int_or_var<T> cost = get_int_or_var<T>( jo, "cost", false, 0 );
+    int_or_var<T> count;
+    if( !jo.has_int( "charges" ) ) {
+        count = get_int_or_var<T>( jo, "count", false, 1 );
+    } else {
+        count = get_int_or_var<T>( jo, "count", false, 0 );
+    }
     function = [item_name, count, container_name]( const T & d ) {
-        receive_item( itype_id( item_name.evaluate( d ) ), count, container_name, d );
+        receive_item( itype_id( item_name.evaluate( d ) ), count.evaluate( d ),
+                      container_name.evaluate( d ), d );
     };
     dialogue d( get_talker_for( get_avatar() ), nullptr );
-    likely_rewards.emplace_back( count, itype_id( item_name.evaluate( d ) ) );
+    likely_rewards.emplace_back( count.evaluate( d ), itype_id( item_name.evaluate( d ) ) );
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_buy_item( const itype_id &item_name, int cost, int count,
-        const std::string &container_name, const JsonObject &jo )
+void talk_effect_fun_t<T>::set_u_buy_item( const JsonObject &jo, const std::string &member )
 {
     std::vector<effect_on_condition_id> true_eocs = load_eoc_vector( jo, "true_eocs" );
     std::vector<effect_on_condition_id> false_eocs = load_eoc_vector( jo, "false_eocs" );
+    int_or_var<T> cost = get_int_or_var<T>( jo, "cost", false, 0 );
+    int_or_var<T> count;
+    if( !jo.has_int( "charges" ) ) {
+        count = get_int_or_var<T>( jo, "count", false, 1 );
+    } else {
+        count = get_int_or_var<T>( jo, "count", false, 0 );
+    }
+    str_or_var<T> container_name;
+    if( jo.has_member( "container" ) ) {
+        container_name = get_str_or_var<T>( jo.get_member( "container" ), "container", true );
+    } else {
+        container_name.str_val = "";
+    }
+    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [item_name, cost, count, container_name, true_eocs, false_eocs]( const T & d ) {
-        if( !d.actor( true )->buy_from( cost ) ) {
+        if( !d.actor( true )->buy_from( cost.evaluate( d ) ) ) {
             popup( _( "You can't afford it!" ) );
             run_eoc_vector( false_eocs, d );
             return;
         }
-        receive_item( item_name, count, container_name, d );
+        receive_item( itype_id( item_name.evaluate( d ) ), count.evaluate( d ),
+                      container_name.evaluate( d ), d );
         run_eoc_vector( true_eocs, d );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_sell_item( const itype_id &item_name, int cost, int count,
-        const JsonObject &jo )
+void talk_effect_fun_t<T>::set_u_sell_item( const JsonObject &jo, const std::string &member )
 {
     std::vector<effect_on_condition_id> true_eocs = load_eoc_vector( jo, "true_eocs" );
     std::vector<effect_on_condition_id> false_eocs = load_eoc_vector( jo, "false_eocs" );
+    int_or_var<T> cost = get_int_or_var<T>( jo, "cost", false, 0 );
+    int_or_var<T> count;
+    if( !jo.has_int( "charges" ) ) {
+        count = get_int_or_var<T>( jo, "count", false, 1 );
+    } else {
+        count = get_int_or_var<T>( jo, "count", false, 0 );
+    }
+    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [item_name, cost, count, true_eocs, false_eocs]( const T & d ) {
-        if( item::count_by_charges( item_name ) && d.actor( false )->has_charges( item_name, count ) ) {
-            for( const item &it : d.actor( false )->use_charges( item_name, count ) ) {
+        int current_count = count.evaluate( d );
+        itype_id current_item_name = itype_id( item_name.evaluate( d ) );
+        if( item::count_by_charges( current_item_name ) &&
+            d.actor( false )->has_charges( current_item_name, current_count ) ) {
+            for( const item &it : d.actor( false )->use_charges( current_item_name, current_count ) ) {
                 d.actor( true )->i_add( it );
             }
-        } else if( d.actor( false )->has_amount( item_name, count ) ) {
-            for( const item &it : d.actor( false )->use_amount( item_name, count ) ) {
+        } else if( d.actor( false )->has_amount( current_item_name, current_count ) ) {
+            for( const item &it : d.actor( false )->use_amount( current_item_name, current_count ) ) {
                 d.actor( true )->i_add( it );
             }
         } else {
             //~ %1$s is a translated item name
-            popup( _( "You don't have a %1$s!" ), item::nname( item_name ) );
+            popup( _( "You don't have a %1$s!" ), item::nname( current_item_name ) );
             run_eoc_vector( false_eocs, d );
             return;
         }
-        if( count == 1 ) {
+        if( current_count == 1 ) {
             //~ %1%s is the NPC name, %2$s is an item
-            popup( _( "You give %1$s a %2$s." ), d.actor( true )->disp_name(), item::nname( item_name ) );
+            popup( _( "You give %1$s a %2$s." ), d.actor( true )->disp_name(),
+                   item::nname( current_item_name ) );
         } else {
             //~ %1%s is the NPC name, %2$d is a number of items, %3$s are items
-            popup( _( "You give %1$s %2$d %3$s." ), d.actor( true )->disp_name(), count,
-                   item::nname( item_name, count ) );
+            popup( _( "You give %1$s %2$d %3$s." ), d.actor( true )->disp_name(), current_count,
+                   item::nname( current_item_name, current_count ) );
         }
-        d.actor( true )->add_debt( cost );
+        d.actor( true )->add_debt( cost.evaluate( d ) );
         run_eoc_vector( true_eocs, d );
     };
 }
 
 template<class T>
 void talk_effect_fun_t<T>::set_consume_item( const JsonObject &jo, const std::string &member,
-        int count, int charges, bool is_npc )
+        bool is_npc )
 {
-    itype_id item_name;
-    jo.read( member, item_name, true );
+    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, true );
+    int_or_var<T> charges = get_int_or_var<T>( jo, "charges", false, 0 );
+    int_or_var<T> count;
+    if( !jo.has_int( "charges" ) ) {
+        count = get_int_or_var<T>( jo, "count", false, 1 );
+    } else {
+        count = get_int_or_var<T>( jo, "count", false, 0 );
+    }
     const bool do_popup = jo.get_bool( "popup", false );
     function = [do_popup, is_npc, item_name, count, charges]( const T & d ) {
         // this is stupid, but I couldn't get the assignment to work
-        const auto consume_item = [&]( talker & p, const itype_id & item_name, int count, int charges ) {
-            if( charges == 0 && item::count_by_charges( item_name ) ) {
-                charges = count;
-                count = 0;
+        int current_count = count.evaluate( d );
+        int current_charges = charges.evaluate( d );
+        itype_id current_item_name = itype_id( item_name.evaluate( d ) );
+        const auto consume_item = [&]( talker & p, const itype_id & item_name, int current_count,
+        int current_charges ) {
+            if( current_charges == 0 && item::count_by_charges( item_name ) ) {
+                current_charges = current_count;
+                current_count = 0;
             }
 
-            if( count == 0 && charges > 0 && p.has_charges( item_name, charges, true ) ) {
-                p.use_charges( item_name, charges, true );
-            } else if( p.has_amount( item_name, count ) ) {
-                if( charges > 0 && p.has_charges( item_name, charges, true ) ) {
-                    p.use_charges( item_name, charges, true );
+            if( current_count == 0 && current_charges > 0 &&
+                p.has_charges( item_name, current_charges, true ) ) {
+                p.use_charges( item_name, current_charges, true );
+            } else if( p.has_amount( item_name, current_count ) ) {
+                if( current_charges > 0 && p.has_charges( item_name, current_charges, true ) ) {
+                    p.use_charges( item_name, current_charges, true );
                 }
-                p.use_amount( item_name, count );
+                p.use_amount( item_name, current_count );
             } else {
                 item old_item( item_name );
                 //~ %1%s is the "You" or the NPC name, %2$s are a translated item name
@@ -2347,17 +2400,18 @@ void talk_effect_fun_t<T>::set_consume_item( const JsonObject &jo, const std::st
             }
         };
         if( is_npc ) {
-            consume_item( *d.actor( true ), item_name, count, charges );
+            consume_item( *d.actor( true ), current_item_name, current_count, current_charges );
         } else {
             if( do_popup ) {
-                if( count == 1 ) {
-                    popup( _( "You give %1$s a %2$s." ), d.actor( true )->disp_name(), item::nname( item_name ) );
+                if( current_count == 1 ) {
+                    popup( _( "You give %1$s a %2$s." ), d.actor( true )->disp_name(),
+                           item::nname( current_item_name ) );
                 } else {
-                    popup( _( "You give %1$s %2$d %3$s." ), d.actor( true )->disp_name(), count,
-                           item::nname( item_name, count ) );
+                    popup( _( "You give %1$s %2$d %3$s." ), d.actor( true )->disp_name(), current_count,
+                           item::nname( current_item_name ), current_count );
                 }
             }
-            consume_item( *d.actor( false ), item_name, count, charges );
+            consume_item( *d.actor( false ), current_item_name, current_count, current_charges );
         }
     };
 }
@@ -2366,9 +2420,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_remove_item_with( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    const std::string &item_name = jo.get_string( member );
+    str_or_var<T> item_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, item_name]( const T & d ) {
-        itype_id item_id = itype_id( item_name );
+        itype_id item_id = itype_id( item_name.evaluate( d ) );
         d.actor( is_npc )->remove_items_with( [item_id]( const item & it ) {
             return it.typeId() == item_id;
         } );
@@ -2376,12 +2430,13 @@ void talk_effect_fun_t<T>::set_remove_item_with( const JsonObject &jo, const std
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_spend_cash( int amount, const JsonObject &jo )
+void talk_effect_fun_t<T>::set_u_spend_cash( const JsonObject &jo, const std::string &member )
 {
+    int_or_var<T> amount = get_int_or_var<T>( jo, member );
     std::vector<effect_on_condition_id> true_eocs = load_eoc_vector( jo, "true_eocs" );
     std::vector<effect_on_condition_id> false_eocs = load_eoc_vector( jo, "false_eocs" );
     function = [amount, true_eocs, false_eocs]( const T & d ) {
-        if( d.actor( true )->buy_from( amount ) ) {
+        if( d.actor( true )->buy_from( amount.evaluate( d ) ) ) {
             run_eoc_vector( true_eocs, d );
         } else {
             run_eoc_vector( false_eocs, d );
@@ -2390,26 +2445,29 @@ void talk_effect_fun_t<T>::set_u_spend_cash( int amount, const JsonObject &jo )
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_change_faction( const std::string &faction_name )
+void talk_effect_fun_t<T>::set_npc_change_faction( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> faction_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [faction_name]( const T & d ) {
-        d.actor( true )->set_fac( faction_id( faction_name ) );
+        d.actor( true )->set_fac( faction_id( faction_name.evaluate( d ) ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_change_class( const std::string &class_name )
+void talk_effect_fun_t<T>::set_npc_change_class( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> class_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [class_name]( const T & d ) {
-        d.actor( true )->set_class( npc_class_id( class_name ) );
+        d.actor( true )->set_class( npc_class_id( class_name.evaluate( d ) ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_change_faction_rep( int rep_change )
+void talk_effect_fun_t<T>::set_change_faction_rep( const JsonObject &jo, const std::string &member )
 {
+    int_or_var<T> rep_change = get_int_or_var<T>( jo, member );
     function = [rep_change]( const T & d ) {
-        d.actor( true )->add_faction_rep( rep_change );
+        d.actor( true )->add_faction_rep( rep_change.evaluate( d ) );
     };
 }
 
@@ -2430,58 +2488,68 @@ void talk_effect_fun_t<T>::set_add_debt( const std::vector<trial_mod> &debt_modi
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_toggle_npc_rule( const std::string &rule )
+void talk_effect_fun_t<T>::set_toggle_npc_rule( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [rule]( const T & d ) {
-        d.actor( true )->toggle_ai_rule( "ally_rule", rule );
+        d.actor( true )->toggle_ai_rule( "ally_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_set_npc_rule( const std::string &rule )
+void talk_effect_fun_t<T>::set_set_npc_rule( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [rule]( const T & d ) {
-        d.actor( true )->set_ai_rule( "ally_rule", rule );
+        d.actor( true )->set_ai_rule( "ally_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_clear_npc_rule( const std::string &rule )
+void talk_effect_fun_t<T>::set_clear_npc_rule( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [rule]( const T & d ) {
-        d.actor( true )->clear_ai_rule( "ally_rule", rule );
+        d.actor( true )->clear_ai_rule( "ally_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_engagement_rule( const std::string &setting )
+void talk_effect_fun_t<T>::set_npc_engagement_rule( const JsonObject &jo,
+        const std::string &member )
 {
-    function = [setting]( const T & d ) {
-        d.actor( true )->set_ai_rule( "engagement_rule", setting );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [rule]( const T & d ) {
+        d.actor( true )->set_ai_rule( "engagement_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_aim_rule( const std::string &setting )
+void talk_effect_fun_t<T>::set_npc_aim_rule( const JsonObject &jo, const std::string &member )
 {
-    function = [setting]( const T & d ) {
-        d.actor( true )->set_ai_rule( "aim_rule", setting );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [rule]( const T & d ) {
+        d.actor( true )->set_ai_rule( "aim_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_cbm_reserve_rule( const std::string &setting )
+void talk_effect_fun_t<T>::set_npc_cbm_reserve_rule( const JsonObject &jo,
+        const std::string &member )
 {
-    function = [setting]( const T & d ) {
-        d.actor( true )->set_ai_rule( "cbm_reserve_rule", setting );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [rule]( const T & d ) {
+        d.actor( true )->set_ai_rule( "cbm_reserve_rule", rule.evaluate( d ) );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_cbm_recharge_rule( const std::string &setting )
+void talk_effect_fun_t<T>::set_npc_cbm_recharge_rule( const JsonObject &jo,
+        const std::string &member )
 {
-    function = [setting]( const T & d ) {
-        d.actor( true )->set_ai_rule( "cbm_recharge_rule", setting );
+    str_or_var<T> rule = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [rule]( const T & d ) {
+        d.actor( true )->set_ai_rule( "cbm_recharge_rule", rule.evaluate( d ) );
     };
 }
 
@@ -2558,7 +2626,8 @@ template<class T>
 void talk_effect_fun_t<T>::set_transform_radius( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    ter_furn_transform_id transform = ter_furn_transform_id( jo.get_string( "ter_furn_transform" ) );
+    str_or_var<T> transform = get_str_or_var<T>( jo.get_member( "ter_furn_transform" ),
+                              "ter_furn_transform", true );
     int_or_var<T> iov = get_int_or_var<T>( jo, member );
     duration_or_var<T> dov_time_in_future = get_duration_or_var<T>( jo, "time_in_future", false,
                                             0_seconds );
@@ -2584,11 +2653,11 @@ void talk_effect_fun_t<T>::set_transform_radius( const JsonObject &jo, const std
             get_timed_events().add( timed_event_type::TRANSFORM_RADIUS,
                                     calendar::turn + future + 1_seconds,
                                     //Timed events happen before the player turn and eocs are during so we add a second here to sync them up using the same variable
-                                    -1, target_pos, radius, transform.str(), key.evaluate( d ) );
+                                    -1, target_pos, radius, transform.evaluate( d ), key.evaluate( d ) );
         } else {
             map tm;
             tm.load( project_to<coords::sm>( target_pos - point{ radius, radius} ), false );
-            tm.transform_radius( transform, radius, target_pos );
+            tm.transform_radius( ter_furn_transform_id( transform.evaluate( d ) ), radius, target_pos );
         }
     };
 }
@@ -2596,7 +2665,7 @@ void talk_effect_fun_t<T>::set_transform_radius( const JsonObject &jo, const std
 template<class T>
 void talk_effect_fun_t<T>::set_transform_line( const JsonObject &jo, const std::string &member )
 {
-    ter_furn_transform_id transform = ter_furn_transform_id( jo.get_string( member ) );
+    str_or_var<T> transform = get_str_or_var<T>( jo.get_member( member ), member, true );
     var_info first = read_var_info( jo.get_object( "first" ) );
     var_info second = read_var_info( jo.get_object( "second" ) );
 
@@ -2606,7 +2675,7 @@ void talk_effect_fun_t<T>::set_transform_line( const JsonObject &jo, const std::
         tripoint_abs_ms const orig = coord_min( t_first, t_second );
         map tm;
         tm.load( project_to<coords::sm>( orig ), false );
-        tm.transform_line( transform, t_first, t_second );
+        tm.transform_line( ter_furn_transform_id( transform.evaluate( d ) ), t_first, t_second );
     };
 }
 
@@ -2633,14 +2702,14 @@ template<class T>
 void talk_effect_fun_t<T>::set_mapgen_update( const JsonObject &jo, const std::string &member )
 {
     mission_target_params target_params = mission_util::parse_mission_om_target( jo );
-    std::vector<update_mapgen_id> update_ids;
+    std::vector<str_or_var<T>> update_ids;
     duration_or_var<T> dov_time_in_future = get_duration_or_var<T>( jo, "time_in_future", false,
                                             0_seconds );
     if( jo.has_string( member ) ) {
-        update_ids.emplace_back( update_mapgen_id( jo.get_string( member ) ) );
+        update_ids.emplace_back( get_str_or_var<T>( jo.get_member( member ), member ) );
     } else if( jo.has_array( member ) ) {
-        for( const std::string line : jo.get_array( member ) ) {
-            update_ids.emplace_back( line );
+        for( JsonValue jv : jo.get_array( member ) ) {
+            update_ids.emplace_back( get_str_or_var<T>( jv, member ) );
         }
     }
     cata::optional<var_info> target_var;
@@ -2669,14 +2738,15 @@ void talk_effect_fun_t<T>::set_mapgen_update( const JsonObject &jo, const std::s
         if( future > 0_seconds ) {
             time_point tif = calendar::turn + future + 1_seconds;
             //Timed events happen before the player turn and eocs are during so we add a second here to sync them up using the same variable
-            for( const update_mapgen_id &mapgen_update_id : update_ids ) {
+            for( const str_or_var<T> &mapgen_update_id : update_ids ) {
                 get_timed_events().add( timed_event_type::UPDATE_MAPGEN, tif, -1, project_to<coords::ms>( omt_pos ),
-                                        0, mapgen_update_id.str(), key.evaluate( d ) );
+                                        0, mapgen_update_id.evaluate( d ), key.evaluate( d ) );
             }
 
         } else {
-            for( const update_mapgen_id &mapgen_update_id : update_ids ) {
-                run_mapgen_update_func( mapgen_update_id, omt_pos, d.actor( d.has_beta )->selected_mission() );
+            for( const str_or_var<T> &mapgen_update_id : update_ids ) {
+                run_mapgen_update_func( update_mapgen_id( mapgen_update_id.evaluate( d ) ), omt_pos,
+                                        d.actor( d.has_beta )->selected_mission() );
             }
             get_map().invalidate_map_cache( omt_pos.z() );
         }
@@ -2760,12 +2830,21 @@ void talk_effect_fun_t<T>::set_npc_goal( const JsonObject &jo, const std::string
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_bulk_trade_accept( bool is_trade, int quantity, bool is_npc )
+void talk_effect_fun_t<T>::set_bulk_trade_accept( const JsonObject &jo, const std::string &member,
+        bool is_npc )
 {
-    function = [is_trade, is_npc, quantity]( const T & d ) {
+    int_or_var<T> iov_quantity;
+    if( jo.has_member( member ) ) {
+        iov_quantity = get_int_or_var<T>( jo, member, false, -1 );
+    } else {
+        iov_quantity.min.int_val = -1;
+    }
+    bool is_trade = member == "u_bulk_trade_accept" || member == "npc_bulk_trade_accept";
+    function = [is_trade, is_npc, iov_quantity]( const T & d ) {
         talker *seller = d.actor( is_npc );
         talker *buyer = d.actor( !is_npc );
         item tmp( d.cur_item );
+        int quantity = iov_quantity.evaluate( d );
         int seller_has = 0;
         if( tmp.count_by_charges() ) {
             seller_has = seller->charges_of( d.cur_item );
@@ -2833,10 +2912,11 @@ void talk_effect_fun_t<T>::set_npc_gets_item( bool to_use )
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_add_mission( const std::string &mission_id )
+void talk_effect_fun_t<T>::set_add_mission( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> mission_id = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [mission_id]( const T & d ) {
-        d.actor( true )->add_mission( mission_type_id( mission_id ) );
+        d.actor( true )->add_mission( mission_type_id( mission_id.evaluate( d ) ) );
     };
 }
 
@@ -2847,16 +2927,26 @@ const std::vector<std::pair<int, itype_id>> &talk_effect_fun_t<T>::get_likely_re
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_buy_monster( const std::string &monster_type_id, int cost,
-        int count,
-        bool pacified, const translation &name, const JsonObject &jo )
-{
+void talk_effect_fun_t<T>::set_u_buy_monster( const JsonObject &jo, const std::string &member )
+{
+    str_or_var<T> monster_type_id = get_str_or_var<T>( jo.get_member( member ), member, true );
+    int_or_var<T> cost = get_int_or_var<T>( jo, "cost", false, 0 );
+    int_or_var<T> count = get_int_or_var<T>( jo, "count", false, 1 );
+    const bool pacified = jo.get_bool( "pacified", false );
+    str_or_var<T> name;
+    if( jo.has_member( "name" ) ) {
+        name = get_str_or_var<T>( jo.get_member( "name" ), "name", true );
+    } else {
+        name.str_val = "";
+    }
     std::vector<effect_on_condition_id> true_eocs = load_eoc_vector( jo, "true_eocs" );
     std::vector<effect_on_condition_id> false_eocs = load_eoc_vector( jo, "false_eocs" );
     function = [monster_type_id, cost, count, pacified, name, true_eocs,
                      false_eocs]( const T & d ) {
-        const mtype_id mtype( monster_type_id );
-        if( d.actor( false )->buy_monster( *d.actor( true ), mtype, cost, count, pacified, name ) ) {
+        const mtype_id mtype( monster_type_id.evaluate( d ) );
+        translation translated_name = to_translation( _( name.evaluate( d ) ) );
+        if( d.actor( false )->buy_monster( *d.actor( true ), mtype, cost.evaluate( d ), count.evaluate( d ),
+                                           pacified, translated_name ) ) {
             run_eoc_vector( true_eocs, d );
         } else {
             run_eoc_vector( false_eocs, d );
@@ -2865,20 +2955,22 @@ void talk_effect_fun_t<T>::set_u_buy_monster( const std::string &monster_type_id
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_u_learn_recipe( const std::string &learned_recipe_id )
+void talk_effect_fun_t<T>::set_u_learn_recipe( const JsonObject &jo, const std::string &member )
 {
-    function = [learned_recipe_id]( const T & ) {
-        const recipe &r = recipe_id( learned_recipe_id ).obj();
+    str_or_var<T> learned_recipe_id = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [learned_recipe_id]( const T & d ) {
+        const recipe &r = recipe_id( learned_recipe_id.evaluate( d ) ).obj();
         get_player_character().learn_recipe( &r );
         popup( _( "You learn how to craft %s." ), r.result_name() );
     };
 }
 
 template<class T>
-void talk_effect_fun_t<T>::set_npc_first_topic( const std::string &chat_topic )
+void talk_effect_fun_t<T>::set_npc_first_topic( const JsonObject &jo, const std::string &member )
 {
+    str_or_var<T> chat_topic = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [chat_topic]( const T & d ) {
-        d.actor( true )->set_first_topic( chat_topic );
+        d.actor( true )->set_first_topic( chat_topic.evaluate( d ) );
     };
 }
 
@@ -2893,40 +2985,49 @@ void talk_effect_fun_t<T>::set_message( const JsonObject &jo, const std::string
     const bool sound = jo.get_bool( "sound", false );
     const bool popup_msg = jo.get_bool( "popup", false );
     const bool popup_w_interrupt_query_msg = jo.get_bool( "popup_w_interrupt_query", false );
-    std::string interrupt_type = jo.get_string( "interrupt_type", "default" );
-    game_message_type type = m_neutral;
-    std::string type_string = jo.get_string( "type", "neutral" );
-    if( type_string == "good" ) {
-        type = m_good;
-    } else if( type_string == "neutral" ) {
-        type = m_neutral;
-    } else if( type_string == "bad" ) {
-        type = m_bad;
-    } else if( type_string == "mixed" ) {
-        type = m_mixed;
-    } else if( type_string == "warning" ) {
-        type = m_warning;
-    } else if( type_string == "info" ) {
-        type = m_info;
-    } else if( type_string == "debug" ) {
-        type = m_debug;
-    } else if( type_string == "headshot" ) {
-        type = m_headshot;
-    } else if( type_string == "critical" ) {
-        type = m_critical;
-    } else if( type_string == "grazing" ) {
-        type = m_grazing;
+    str_or_var<T> interrupt_type;
+    if( jo.has_member( "interrupt_type" ) ) {
+        interrupt_type = get_str_or_var<T>( jo.get_member( "interrupt_type" ), "interrupt_type", true );
     } else {
-        jo.throw_error( "Invalid message type." );
+        interrupt_type.str_val = "default";
     }
-
-    function = [message, outdoor_only, sound, snippet, same_snippet, type, popup_msg,
+    str_or_var<T> type_string;
+    if( jo.has_member( "type" ) ) {
+        type_string = get_str_or_var<T>( jo.get_member( "type" ), "type", true );
+    } else {
+        type_string.str_val = "neutral";
+    }
+    function = [message, outdoor_only, sound, snippet, same_snippet, type_string, popup_msg,
                          popup_w_interrupt_query_msg, interrupt_type,
              is_npc]( const T & d ) {
         Character *target = d.actor( is_npc )->get_character();
         if( !target || target->is_npc() ) {
             return;
         }
+        game_message_type type = m_neutral;
+        if( type_string.evaluate( d ) == "good" ) {
+            type = m_good;
+        } else if( type_string.evaluate( d ) == "neutral" ) {
+            type = m_neutral;
+        } else if( type_string.evaluate( d ) == "bad" ) {
+            type = m_bad;
+        } else if( type_string.evaluate( d ) == "mixed" ) {
+            type = m_mixed;
+        } else if( type_string.evaluate( d ) == "warning" ) {
+            type = m_warning;
+        } else if( type_string.evaluate( d ) == "info" ) {
+            type = m_info;
+        } else if( type_string.evaluate( d ) == "debug" ) {
+            type = m_debug;
+        } else if( type_string.evaluate( d ) == "headshot" ) {
+            type = m_headshot;
+        } else if( type_string.evaluate( d ) == "critical" ) {
+            type = m_critical;
+        } else if( type_string.evaluate( d ) == "grazing" ) {
+            type = m_grazing;
+        } else {
+            debugmsg( "Invalid message type." );
+        }
         std::string translated_message;
         if( snippet ) {
             if( same_snippet ) {
@@ -2978,10 +3079,10 @@ void talk_effect_fun_t<T>::set_message( const JsonObject &jo, const std::string
             g->cancel_activity_or_ignore_query( distraction_type::eoc, "" );
         }
         if( popup_w_interrupt_query_msg ) {
-            if( interrupt_type == "portal_storm_popup" ) {
+            if( interrupt_type.evaluate( d ) == "portal_storm_popup" ) {
                 g->portal_storm_query( distraction_type::portal_storm_popup,
                                        translated_message );
-            } else if( interrupt_type == "default" ) {
+            } else if( interrupt_type.evaluate( d ) == "default" ) {
                 debugmsg( "Interrupt query called in json without proper interrupt type." );
             }
             // Would probably need an else-if for every possible distraction type, like this:
@@ -3002,11 +3103,11 @@ void talk_effect_fun_t<T>::set_assign_activity( const JsonObject &jo, const std:
         bool is_npc )
 {
     duration_or_var<T> dov = get_duration_or_var<T>( jo, "duration", true );
-    activity_id act = activity_id( jo.get_string( member ) );
+    str_or_var<T> act = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, dov, act]( const T & d ) {
         Character *target = d.actor( is_npc )->get_character();
         if( target ) {
-            target->assign_activity( act, to_moves<int>( dov.evaluate( d ) ) );
+            target->assign_activity( activity_id( act.evaluate( d ) ), to_moves<int>( dov.evaluate( d ) ) );
         }
     };
 }
@@ -3091,26 +3192,33 @@ void talk_effect_fun_t<T>::set_take_control_menu()
 template<class T>
 void talk_effect_fun_t<T>::set_sound_effect( const JsonObject &jo, const std::string &member )
 {
-    std::string variant = jo.get_string( member );
-    std::string id = jo.get_string( "id" );
+    str_or_var<T> variant = get_str_or_var<T>( jo.get_member( member ), member, true );
+    str_or_var<T> id = get_str_or_var<T>( jo.get_member( "id" ), "id", true );
     const bool outdoor_event = jo.get_bool( "outdoor_event", false );
-    const int volume = jo.get_int( "volume", -1 );
-    function = [variant, id, outdoor_event, volume]( const T & ) {
+    int_or_var<T> volume;
+    if( jo.has_member( "volume" ) ) {
+        volume = get_int_or_var<T>( jo, "volume", false, -1 );
+    } else {
+        volume.min.int_val = -1;
+    }
+    function = [variant, id, outdoor_event, volume]( const T & d ) {
         map &here = get_map();
-        int local_volume = volume;
+        int local_volume = volume.evaluate( d );
         Character *target = &get_player_character(); //Only the player can hear sound effects.
         if( target && !target->has_effect( effect_sleep ) && !target->is_deaf() ) {
             if( !outdoor_event || here.get_abs_sub().z() >= 0 ) {
                 if( local_volume == -1 ) {
                     local_volume = 80;
                 }
-                sfx::play_variant_sound( id, variant, local_volume, random_direction() );
+                sfx::play_variant_sound( id.evaluate( d ), variant.evaluate( d ), local_volume,
+                                         random_direction() );
             } else if( one_in( std::max( roll_remainder( 2.0f * here.get_abs_sub().z() /
                                          target->mutation_value( "hearing_modifier" ) ), 1 ) ) ) {
                 if( local_volume == -1 ) {
                     local_volume = 80 * target->mutation_value( "hearing_modifier" );
                 }
-                sfx::play_variant_sound( id, variant, local_volume, random_direction() );
+                sfx::play_variant_sound( id.evaluate( d ), variant.evaluate( d ), local_volume,
+                                         random_direction() );
             }
         }
     };
@@ -3220,11 +3328,11 @@ void talk_effect_fun_t<T>::set_set_string_var( const JsonObject &jo, const std::
 template<class T>
 void talk_effect_fun_t<T>::set_assign_mission( const JsonObject &jo, const std::string &member )
 {
-    std::string mission_name = jo.get_string( member );
-    function = [mission_name]( const T & ) {
+    str_or_var<T> mission_name = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [mission_name]( const T & d ) {
         avatar &player_character = get_avatar();
 
-        const mission_type_id &mission_type = mission_type_id( mission_name );
+        const mission_type_id &mission_type = mission_type_id( mission_name.evaluate( d ) );
         mission *new_mission = mission::reserve_new( mission_type, character_id() );
         new_mission->assign( player_character );
     };
@@ -3233,7 +3341,7 @@ void talk_effect_fun_t<T>::set_assign_mission( const JsonObject &jo, const std::
 template<class T>
 void talk_effect_fun_t<T>::set_finish_mission( const JsonObject &jo, const std::string &member )
 {
-    std::string mission_name = jo.get_string( member );
+    str_or_var<T> mission_name = get_str_or_var<T>( jo.get_member( member ), member, true );
     bool success = false;
     cata::optional<int> step;
     if( jo.has_int( "step" ) ) {
@@ -3241,9 +3349,9 @@ void talk_effect_fun_t<T>::set_finish_mission( const JsonObject &jo, const std::
     } else {
         success = jo.get_bool( "success" );
     }
-    function = [mission_name, success, step]( const T & ) {
+    function = [mission_name, success, step]( const T & d ) {
         avatar &player_character = get_avatar();
-        const mission_type_id &mission_type = mission_type_id( mission_name );
+        const mission_type_id &mission_type = mission_type_id( mission_name.evaluate( d ) );
         std::vector<mission *> missions = player_character.get_active_missions();
 
         for( mission *mission : missions ) {
@@ -3265,10 +3373,10 @@ template<class T>
 void talk_effect_fun_t<T>::set_remove_active_mission( const JsonObject &jo,
         const std::string &member )
 {
-    std::string mission_name = jo.get_string( member );
-    function = [mission_name]( const T & ) {
+    str_or_var<T> mission_name = get_str_or_var<T>( jo.get_member( member ), member, true );
+    function = [mission_name]( const T & d ) {
         avatar &player_character = get_avatar();
-        const mission_type_id &mission_type = mission_type_id( mission_name );
+        const mission_type_id &mission_type = mission_type_id( mission_name.evaluate( d ) );
         std::vector<mission *> missions = player_character.get_active_missions();
         for( mission *mission : missions ) {
             if( mission->mission_id() == mission_type ) {
@@ -3307,7 +3415,7 @@ template<class T>
 void talk_effect_fun_t<T>::set_make_sound( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string message = jo.get_string( member );
+    str_or_var<T> message = get_str_or_var<T>( jo.get_member( member ), member, true );
 
     int volume;
     mandatory( jo, false, "volume", volume );
@@ -3353,19 +3461,19 @@ void talk_effect_fun_t<T>::set_make_sound( const JsonObject &jo, const std::stri
         if( snippet ) {
             if( same_snippet ) {
                 talker *target = d.actor( !is_npc );
-                std::string sid = target->get_value( message + "_snippet_id" );
+                std::string sid = target->get_value( message.evaluate( d ) + "_snippet_id" );
                 if( sid.empty() ) {
-                    sid = SNIPPET.random_id_from_category( message ).c_str();
-                    target->set_value( message + "_snippet_id", sid );
+                    sid = SNIPPET.random_id_from_category( message.evaluate( d ) ).c_str();
+                    target->set_value( message.evaluate( d ) + "_snippet_id", sid );
                 }
                 translated_message = SNIPPET.expand( SNIPPET.get_snippet_by_id( snippet_id( sid ) ).value_or(
                         translation() ).translated() );
             } else {
-                translated_message = SNIPPET.expand( SNIPPET.random_from_category( message ).value_or(
+                translated_message = SNIPPET.expand( SNIPPET.random_from_category( message.evaluate( d ) ).value_or(
                         translation() ).translated() );
             }
         } else {
-            translated_message = _( message );
+            translated_message = _( message.evaluate( d ) );
         }
         sounds::sound( get_map().getlocal( target_pos ), volume, type, translated_message );
     };
@@ -3392,8 +3500,10 @@ void talk_effect_fun_t<T>::set_run_npc_eocs( const JsonObject &jo,
         const std::string &member, bool is_npc )
 {
     std::vector<effect_on_condition_id> eocs = load_eoc_vector( jo, member );
-
-    std::vector<std::string> unique_ids = jo.get_string_array( "unique_ids" );
+    std::vector<str_or_var<T>> unique_ids;
+    for( JsonValue jv : jo.get_array( "unique_ids" ) ) {
+        unique_ids.emplace_back( get_str_or_var<T>( jv, "unique_ids" ) );
+    }
 
     bool local = jo.get_bool( "local", false );
     cata::optional<int> npc_range;
@@ -3404,10 +3514,14 @@ void talk_effect_fun_t<T>::set_run_npc_eocs( const JsonObject &jo,
     if( local ) {
         function = [eocs, unique_ids, npc_must_see, npc_range, is_npc]( const T & d ) {
             tripoint actor_pos = d.actor( is_npc )->pos();
+            std::vector<std::string> ids( unique_ids.size() );
+            for( const str_or_var<T> &id : unique_ids ) {
+                ids.emplace_back( id.evaluate( d ) );
+            }
             const std::vector<npc *> available = g->get_npcs_if( [npc_must_see, npc_range, actor_pos,
-                          unique_ids]( const npc & guy ) {
-                bool id_valid = unique_ids.empty();
-                for( const std::string &id : unique_ids ) {
+                          ids]( const npc & guy ) {
+                bool id_valid = ids.empty();
+                for( const std::string &id : ids ) {
                     if( id == guy.get_unique_id() ) {
                         id_valid = true;
                         break;
@@ -3425,16 +3539,16 @@ void talk_effect_fun_t<T>::set_run_npc_eocs( const JsonObject &jo,
             }
         };
     } else {
-        function = [eocs, unique_ids]( const T & ) {
-            for( const std::string &target : unique_ids ) {
-                if( g->unique_npc_exists( target ) ) {
+        function = [eocs, unique_ids]( const T & d ) {
+            for( const str_or_var<T> &target : unique_ids ) {
+                if( g->unique_npc_exists( target.evaluate( d ) ) ) {
                     for( const effect_on_condition_id &eoc : eocs ) {
-                        npc *npc = g->find_npc_by_unique_id( target );
+                        npc *npc = g->find_npc_by_unique_id( target.evaluate( d ) );
                         if( npc ) {
                             dialogue newDialog( get_talker_for( npc ), nullptr );
                             eoc->activate( newDialog );
                         } else {
-                            debugmsg( "Tried to use invalid npc: %s", target );
+                            debugmsg( "Tried to use invalid npc: %s", target.evaluate( d ) );
                         }
                     }
                 }
@@ -3525,34 +3639,38 @@ template<class T>
 void talk_effect_fun_t<T>::set_roll_remainder( const JsonObject &jo,
         const std::string &member, bool is_npc )
 {
-    std::vector<std::string> list = jo.get_string_array( member );
-    std::string type = jo.get_string( "type" );
-    if( type != "bionic" && type != "mutation" ) {
-        jo.throw_error( "Type must be either bionic or mutation." );
+    std::vector<str_or_var<T>> list;
+    for( JsonValue jv : jo.get_array( member ) ) {
+        list.emplace_back( get_str_or_var<T>( jv, member ) );
     }
+    str_or_var<T> type = get_str_or_var<T>( jo.get_member( "type" ), "type", true );
     std::vector<effect_on_condition_id> true_eocs = load_eoc_vector( jo, "true_eocs" );
     std::vector<effect_on_condition_id> false_eocs = load_eoc_vector( jo, "false_eocs" );
 
     function = [list, type, is_npc, true_eocs, false_eocs]( const T & d ) {
         std::vector<std::string> not_had;
-        for( const std::string &cur_string : list ) {
-            if( type == "bionic" ) {
-                if( !d.actor( is_npc )->has_bionic( bionic_id( cur_string ) ) ) {
-                    not_had.push_back( cur_string );
+        for( const str_or_var<T> &cur_string : list ) {
+            if( type.evaluate( d ) == "bionic" ) {
+                if( !d.actor( is_npc )->has_bionic( bionic_id( cur_string.evaluate( d ) ) ) ) {
+                    not_had.push_back( cur_string.evaluate( d ) );
                 }
-            } else if( type == "mutation" ) {
-                if( !d.actor( is_npc )->has_trait( trait_id( cur_string ) ) ) {
-                    not_had.push_back( cur_string );
+            } else if( type.evaluate( d ) == "mutation" ) {
+                if( !d.actor( is_npc )->has_trait( trait_id( cur_string.evaluate( d ) ) ) ) {
+                    not_had.push_back( cur_string.evaluate( d ) );
                 }
+            } else {
+                debugmsg( "Invalid roll remainder type." );
             }
         }
         if( !not_had.empty() ) {
             int index = rng( 0, not_had.size() - 1 );
             std::string cur_choice = not_had[index];
-            if( type == "bionic" ) {
+            if( type.evaluate( d ) == "bionic" ) {
                 d.actor( is_npc )->add_bionic( bionic_id( cur_choice ) );
-            } else if( type == "mutation" ) {
+            } else if( type.evaluate( d ) == "mutation" ) {
                 d.actor( is_npc )->set_mutation( trait_id( cur_choice ) );
+            } else {
+                debugmsg( "Invalid roll remainder type." );
             }
             run_eoc_vector( true_eocs, d );
         } else {
@@ -3565,7 +3683,7 @@ template<class T>
 void talk_effect_fun_t<T>::set_add_morale( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string new_type = jo.get_string( member );
+    str_or_var<T> new_type = get_str_or_var<T>( jo.get_member( member ), member, true );
     int_or_var<T> iov_bonus = get_int_or_var<T>( jo, "bonus" );
     int_or_var<T> iov_max_bonus = get_int_or_var<T>( jo, "max_bonus" );
     duration_or_var<T> dov_duration = get_duration_or_var<T>( jo, "duration", false, 1_hours );
@@ -3573,7 +3691,7 @@ void talk_effect_fun_t<T>::set_add_morale( const JsonObject &jo, const std::stri
     const bool capped = jo.get_bool( "capped", false );
     function = [is_npc, new_type, iov_bonus, iov_max_bonus, dov_duration, dov_decay_start,
             capped]( const T & d ) {
-        d.actor( is_npc )->add_morale( morale_type( new_type ),
+        d.actor( is_npc )->add_morale( morale_type( new_type.evaluate( d ) ),
                                        iov_bonus.evaluate( d ),
                                        iov_max_bonus.evaluate( d ),
                                        dov_duration.evaluate( d ),
@@ -3586,9 +3704,9 @@ template<class T>
 void talk_effect_fun_t<T>::set_lose_morale( const JsonObject &jo, const std::string &member,
         bool is_npc )
 {
-    std::string old_morale = jo.get_string( member );
+    str_or_var<T> old_morale = get_str_or_var<T>( jo.get_member( member ), member, true );
     function = [is_npc, old_morale]( const T & d ) {
-        d.actor( is_npc )->remove_morale( morale_type( old_morale ) );
+        d.actor( is_npc )->remove_morale( morale_type( old_morale.evaluate( d ) ) );
     };
 }
 
@@ -3785,7 +3903,7 @@ template<class T>
 void talk_effect_fun_t<T>::set_field( const JsonObject &jo, const std::string &member,
                                       bool is_npc )
 {
-    field_type_str_id new_field = field_type_str_id( jo.get_string( member ) );
+    str_or_var<T> new_field = get_str_or_var<T>( jo.get_member( member ), member, true );
     int_or_var<T> iov_intensity = get_int_or_var<T>( jo, "intensity", false, 1 );
     duration_or_var<T> dov_age = get_duration_or_var<T>( jo, "age", false, 1_turns );
     int_or_var<T> iov_radius = get_int_or_var<T>( jo, "radius", false, 10000000 );
@@ -3811,7 +3929,8 @@ void talk_effect_fun_t<T>::set_field( const JsonObject &jo, const std::string &m
                 radius ) ) {
             if( ( !outdoor_only || get_map().is_outside( dest ) ) && ( !indoor_only ||
                     !get_map().is_outside( dest ) ) ) {
-                get_map().add_field( dest, new_field, intensity, dov_age.evaluate( d ),
+                get_map().add_field( dest, field_type_str_id( new_field.evaluate( d ) ), intensity,
+                                     dov_age.evaluate( d ),
                                      hit_player );
             }
         }
@@ -3823,8 +3942,19 @@ void talk_effect_fun_t<T>::set_teleport( const JsonObject &jo, const std::string
         bool is_npc )
 {
     cata::optional<var_info> target_var = read_var_info( jo.get_object( member ) );
-    std::string fail_message = jo.get_string( "fail_message", "" );
-    std::string success_message = jo.get_string( "success_message", "" );
+    str_or_var<T> fail_message;
+    if( jo.has_member( "fail_message" ) ) {
+        fail_message = get_str_or_var<T>( jo.get_member( "fail_message" ), "fail_message", false, "" );
+    } else {
+        fail_message.str_val = "";
+    }
+    str_or_var<T> success_message;
+    if( jo.has_member( "success_message" ) ) {
+        success_message = get_str_or_var<T>( jo.get_member( "success_message" ), "success_message", false,
+                                             "" );
+    } else {
+        success_message.str_val = "";
+    }
     bool force = jo.get_bool( "force", false );
     function = [is_npc, target_var, fail_message, success_message, force]( const T & d ) {
         tripoint_abs_ms target_pos = get_tripoint_from_var<T>( target_var, d );
@@ -3832,9 +3962,9 @@ void talk_effect_fun_t<T>::set_teleport( const JsonObject &jo, const std::string
         if( teleporter ) {
             if( teleport::teleport_to_point( *teleporter, get_map().getlocal( target_pos ), true, false,
                                              false, force ) ) {
-                teleporter->add_msg_if_player( _( success_message ) );
+                teleporter->add_msg_if_player( _( success_message.evaluate( d ) ) );
             } else {
-                teleporter->add_msg_if_player( _( fail_message ) );
+                teleporter->add_msg_if_player( _( fail_message.evaluate( d ) ) );
             }
         }
     };
@@ -3984,92 +4114,37 @@ void talk_effect_t<T>::parse_sub_effect( const JsonObject &jo )
     } else if( jo.has_member( "npc_mutate_category" ) ) {
         subeffect_fun.set_mutate_category( jo, "npc_mutate_category", is_npc );
     } else if( jo.has_int( "u_spend_cash" ) ) {
-        int cash_change = jo.get_int( "u_spend_cash" );
-        subeffect_fun.set_u_spend_cash( cash_change, jo );
-    } else if( jo.has_string( "u_sell_item" ) || jo.has_string( "u_buy_item" ) ||
-               jo.has_member( "u_spawn_item" ) ||
-               jo.has_string( "u_consume_item" ) || jo.has_string( "npc_consume_item" ) ||
-               jo.has_string( "u_remove_item_with" ) || jo.has_string( "npc_remove_item_with" ) ) {
-        int cost = 0;
-        if( jo.has_int( "cost" ) ) {
-            cost = jo.get_int( "cost" );
-        }
-        int count = 0;
-        int charges = 0;
-        if( jo.has_int( "charges" ) ) {
-            charges = jo.get_int( "charges" );
-        } else {
-            count = 1;
-        }
-
-        if( jo.has_int( "count" ) ) {
-            count = jo.get_int( "count" );
-        }
-
-        std::string container_name;
-        if( jo.has_string( "container" ) ) {
-            container_name = jo.get_string( "container" );
-        }
-        if( jo.has_string( "u_sell_item" ) ) {
-            itype_id item_name;
-            jo.read( "u_sell_item", item_name, true );
-            subeffect_fun.set_u_sell_item( item_name, cost, count, jo );
-        } else if( jo.has_string( "u_buy_item" ) ) {
-            if( cost <= 0 ) {
-                jo.throw_error_at( "u_buy_item", "u_buy_item expecting a non-zero cost parameter" );
-            }
-            itype_id item_name;
-            jo.read( "u_buy_item", item_name, true );
-            subeffect_fun.set_u_buy_item( item_name, cost, count, container_name, jo );
-        } else if( jo.has_member( "u_spawn_item" ) ) {
-            subeffect_fun.set_u_spawn_item( jo, "u_spawn_item", count, container_name );
-        } else if( jo.has_string( "u_consume_item" ) ) {
-            subeffect_fun.set_consume_item( jo, "u_consume_item", count, charges );
-        } else if( jo.has_string( "npc_consume_item" ) ) {
-            subeffect_fun.set_consume_item( jo, "npc_consume_item", count, charges, is_npc );
-        } else if( jo.has_string( "u_remove_item_with" ) ) {
-            subeffect_fun.set_remove_item_with( jo, "u_remove_item_with" );
-        } else if( jo.has_string( "npc_remove_item_with" ) ) {
-            subeffect_fun.set_remove_item_with( jo, "npc_remove_item_with", is_npc );
-        }
-    } else if( jo.has_int( "u_bulk_trade_accept" ) || jo.has_int( "npc_bulk_trade_accept" ) ||
-               jo.has_int( "u_bulk_donate" ) || jo.has_int( "npc_bulk_donate" ) ) {
-        talk_effect_fun_t<T> subeffect_fun;
-        int quantity = -1;
-        bool is_npc = false;
-        bool is_trade = false;
-        if( jo.has_int( "npc_bulk_trade_accept" ) ) {
-            is_npc = true;
-            is_trade = true;
-            quantity = jo.get_int( "npc_bulk_trade_accept" );
-        } else if( jo.has_int( "npc_bulk_donate" ) ) {
-            is_npc = true;
-            is_trade = false;
-            quantity = jo.get_int( "npc_bulk_donate" );
-        } else if( jo.has_int( "u_bulk_trade_accept" ) ) {
-            is_npc = false;
-            is_trade = true;
-            quantity = jo.get_int( "u_bulk_trade_accept" );
-        } else if( jo.has_int( "u_bulk_donate" ) ) {
-            is_npc = false;
-            is_trade = false;
-            quantity = jo.get_int( "u_bulk_donate" );
-        }
-        subeffect_fun.set_bulk_trade_accept( is_trade, quantity, is_npc );
-        set_effect( subeffect_fun );
-        return;
-    } else if( jo.has_string( "npc_change_class" ) ) {
-        std::string class_name = jo.get_string( "npc_change_class" );
-        subeffect_fun.set_npc_change_class( class_name );
-    } else if( jo.has_string( "add_mission" ) ) {
-        std::string mission_id = jo.get_string( "add_mission" );
-        subeffect_fun.set_add_mission( mission_id );
+        subeffect_fun.set_u_spend_cash( jo, "u_spend_cash" );
     } else if( jo.has_string( "npc_change_faction" ) ) {
-        std::string faction_name = jo.get_string( "npc_change_faction" );
-        subeffect_fun.set_npc_change_faction( faction_name );
+        subeffect_fun.set_npc_change_faction( jo, "npc_change_faction" );
+    } else if( jo.has_string( "npc_change_class" ) ) {
+        subeffect_fun.set_npc_change_class( jo, "npc_change_class" );
     } else if( jo.has_int( "u_faction_rep" ) ) {
-        int faction_rep = jo.get_int( "u_faction_rep" );
-        subeffect_fun.set_change_faction_rep( faction_rep );
+        subeffect_fun.set_change_faction_rep( jo, "u_faction_rep" );
+    } else if( jo.has_string( "add_mission" ) ) {
+        subeffect_fun.set_add_mission( jo, "add_mission" );
+    } else if( jo.has_member( "u_sell_item" ) ) {
+        subeffect_fun.set_u_sell_item( jo, "u_sell_item" );
+    } else if( jo.has_member( "u_buy_item" ) ) {
+        subeffect_fun.set_u_buy_item( jo, "u_buy_item" );
+    } else if( jo.has_member( "u_spawn_item" ) ) {
+        subeffect_fun.set_u_spawn_item( jo, "u_spawn_item" );
+    } else if( jo.has_string( "u_consume_item" ) ) {
+        subeffect_fun.set_consume_item( jo, "u_consume_item" );
+    } else if( jo.has_string( "npc_consume_item" ) ) {
+        subeffect_fun.set_consume_item( jo, "npc_consume_item", is_npc );
+    } else if( jo.has_string( "u_remove_item_with" ) ) {
+        subeffect_fun.set_remove_item_with( jo, "u_remove_item_with" );
+    } else if( jo.has_string( "npc_remove_item_with" ) ) {
+        subeffect_fun.set_remove_item_with( jo, "npc_remove_item_with", is_npc );
+    }  else if( jo.has_member( "u_bulk_trade_accept" ) ) {
+        subeffect_fun.set_bulk_trade_accept( jo, "u_bulk_trade_accept" );
+    }  else if( jo.has_member( "npc_bulk_trade_accept" ) ) {
+        subeffect_fun.set_bulk_trade_accept( jo, "npc_bulk_trade_accept", is_npc );
+    }  else if( jo.has_member( "u_bulk_donate" ) ) {
+        subeffect_fun.set_bulk_trade_accept( jo, "u_bulk_donate" );
+    }  else if( jo.has_member( "npc_bulk_donate" ) ) {
+        subeffect_fun.set_bulk_trade_accept( jo, "npc_bulk_donate", is_npc );
     } else if( jo.has_array( "add_debt" ) ) {
         std::vector<trial_mod> debt_modifiers;
         for( JsonArray jmod : jo.get_array( "add_debt" ) ) {
@@ -4080,26 +4155,19 @@ void talk_effect_t<T>::parse_sub_effect( const JsonObject &jo )
         }
         subeffect_fun.set_add_debt( debt_modifiers );
     } else if( jo.has_string( "toggle_npc_rule" ) ) {
-        const std::string rule = jo.get_string( "toggle_npc_rule" );
-        subeffect_fun.set_toggle_npc_rule( rule );
+        subeffect_fun.set_toggle_npc_rule( jo, "toggle_npc_rule" );
     } else if( jo.has_string( "set_npc_rule" ) ) {
-        const std::string rule = jo.get_string( "set_npc_rule" );
-        subeffect_fun.set_set_npc_rule( rule );
+        subeffect_fun.set_set_npc_rule( jo, "set_npc_rule" );
     } else if( jo.has_string( "clear_npc_rule" ) ) {
-        const std::string rule = jo.get_string( "clear_npc_rule" );
-        subeffect_fun.set_clear_npc_rule( rule );
+        subeffect_fun.set_clear_npc_rule( jo, "clear_npc_rule" );
     } else if( jo.has_string( "set_npc_engagement_rule" ) ) {
-        const std::string setting = jo.get_string( "set_npc_engagement_rule" );
-        subeffect_fun.set_npc_engagement_rule( setting );
+        subeffect_fun.set_npc_engagement_rule( jo, "set_npc_engagement_rule" );
     } else if( jo.has_string( "set_npc_aim_rule" ) ) {
-        const std::string setting = jo.get_string( "set_npc_aim_rule" );
-        subeffect_fun.set_npc_aim_rule( setting );
+        subeffect_fun.set_npc_aim_rule( jo, "set_npc_aim_rule" );
     } else if( jo.has_string( "set_npc_cbm_reserve_rule" ) ) {
-        const std::string setting = jo.get_string( "set_npc_cbm_reserve_rule" );
-        subeffect_fun.set_npc_cbm_reserve_rule( setting );
+        subeffect_fun.set_npc_cbm_reserve_rule( jo, "set_npc_cbm_reserve_rule" );
     } else if( jo.has_string( "set_npc_cbm_recharge_rule" ) ) {
-        const std::string setting = jo.get_string( "set_npc_cbm_recharge_rule" );
-        subeffect_fun.set_npc_cbm_recharge_rule( setting );
+        subeffect_fun.set_npc_cbm_recharge_rule( jo, "set_npc_cbm_recharge_rule" );
     } else if( jo.has_member( "npc_set_goal" ) ) {
         subeffect_fun.set_npc_goal( jo, "npc_set_goal" );
     } else if( jo.has_member( "mapgen_update" ) ) {
@@ -4125,19 +4193,11 @@ void talk_effect_t<T>::parse_sub_effect( const JsonObject &jo )
     } else if( jo.has_int( "npc_set_hp" ) ) {
         subeffect_fun.set_hp( jo, "npc_set_hp", true );
     } else if( jo.has_string( "u_buy_monster" ) ) {
-        const std::string &monster_type_id = jo.get_string( "u_buy_monster" );
-        const int cost = jo.get_int( "cost", 0 );
-        const int count = jo.get_int( "count", 1 );
-        const bool pacified = jo.get_bool( "pacified", false );
-        translation name;
-        jo.read( "name", name );
-        subeffect_fun.set_u_buy_monster( monster_type_id, cost, count, pacified, name, jo );
+        subeffect_fun.set_u_buy_monster( jo, "u_buy_monster" );
     } else if( jo.has_string( "u_learn_recipe" ) ) {
-        const std::string recipe_id = jo.get_string( "u_learn_recipe" );
-        subeffect_fun.set_u_learn_recipe( recipe_id );
+        subeffect_fun.set_u_learn_recipe( jo, "u_learn_recipe" );
     } else if( jo.has_string( "npc_first_topic" ) ) {
-        const std::string chat_topic = jo.get_string( "npc_first_topic" );
-        subeffect_fun.set_npc_first_topic( chat_topic );
+        subeffect_fun.set_npc_first_topic( jo, "npc_first_topic" );
     } else if( jo.has_string( "sound_effect" ) ) {
         subeffect_fun.set_sound_effect( jo, "sound_effect" );
     } else if( jo.has_member( "u_message" ) ) {
@@ -4346,8 +4406,7 @@ void talk_effect_t<T>::parse_string_effect( const std::string &effect_id, const
     if( effect_id == "u_bulk_trade_accept" || effect_id == "npc_bulk_trade_accept" ||
         effect_id == "u_bulk_donate" || effect_id == "npc_bulk_donate" ) {
         bool is_npc = effect_id == "npc_bulk_trade_accept" || effect_id == "npc_bulk_donate";
-        bool is_trade = effect_id == "u_bulk_trade_accept" || effect_id == "npc_bulk_trade_accept";
-        subeffect_fun.set_bulk_trade_accept( is_trade, -1, is_npc );
+        subeffect_fun.set_bulk_trade_accept( jo, effect_id, is_npc );
         set_effect( subeffect_fun );
         return;
     }