Allow EOCs to read artifact resonance

Author: RenechCDDA

doc/JSON/NPCs.md

@@ -1402,6 +1402,7 @@ _some functions support array arguments or kwargs, denoted with square brackets
 | climate_control_str_heat()    |  ✅   |   ❌  | u, n  | return amount of heat climate control that character currently has (character feels better in warm places with it), in warmth points; default 0, affected by CLIMATE_CONTROL_HEAT enchantment.<br/><br/>Example:<br/>`"condition": { "math": [ "u_climate_control_str_heat() < 0" ] }`|
 | climate_control_str_chill()    |  ✅   |   ❌  | u, n  | return amount of chill climate control that character currently has (character feels better in cold places with it), in warmth points; default 0, affected by CLIMATE_CONTROL_HEAT enchantment.<br/><br/>Example:<br/>`"condition": { "math": [ "n_climate_control_str_chill() < 0" ] }`|
 | calories()    |  ✅   |   ✅  | u, n  | Return amount of calories character has. If used on item, return amount of calories this item gives when consumed (not affected by enchantments or mutations).  Optional kwargs:<br/>`format`: `s`/`v` - return the value in specific format.  Can be `percent` (return percent to the healthy amount of calories, `100` being the target, bmi 25, or 110000 kcal) or `raw`.  If now used, `raw` is used by default.<br/>`dont_affect_weariness`: `true`/`false` (default false) When assigning value, whether the gained/spent calories should be tracked by weariness.<br/><br/>Example:<br/>`"condition": { "math": [ "u_calories() < 0" ] }`<br/>`"condition": { "math": [ "u_calories('format': 'percent') > 0" ] }`<br/>`"condition": { "math": [ "u_calories() = 110000" ] }`|
+| artifact_resonance()    |  ✅   |   ❌  | u, n  | Return amount of total artifact resonance character has. If used on item, return resonance of that item only. <br/><br/>Example:<br/>`"condition": { "math": [ "u_artifact_resonance() > 0" ] }`<br/>|
 | get_calories_daily()  |  ✅   |   ❌  | g  | Return amount of calories character consumed before, up to 30 days, in kcal. Calorie diary is something only character has, so it can't be used with NPCs. Optional kwargs:<br/>`day`: `d/v` - picks the date the value would be pulled from, from 0 to 30. Default 0, meaning amount of calories you consumed today.<br/>`type`: `s/v` - picks the data that would be pulled. Possible values are: `spent` - how much calories character spent in different activities throughout the day; `gained` - how much calories character ate that day; `ingested` - how much calories character processed that day; `total` - `gained` minus `spent`. Default is `total`;<br/><br/>Example:<br/>`"condition": { "math": [ "get_calories_daily() > 1000" ] }`<br/> `{ "math": [ "foo = get_calories_daily('type':'gained', 'day':'1')" ] }`|
 | quality( `s` / `v` )  |  ✅   |   ❌  | u, n | Return the level of a specified item tool quality. Only usable on item talkers.<br/>Argument is the quality ID. Returns the lowest integer value if the item lacks the specified quality.<br/>Optional kwargs:<br/>`strict`: `true` / `false` (default false) When true the item must be empty to have the boiling quality.<br/><br/>Example<br/>`"condition: { "math": [ " u_quality('HACK') > 0 " ] }`<br/>`{ "math": [ "_cut_quality = u_quality('CUT') " ] }`<br/>`condition: { "math": [ " u_quality('BOIL', 'strict': true ) > 0" ] }`
 

src/math_parser_diag.cpp

@@ -200,6 +200,13 @@ double distance_eval( const_dialogue const &d, char /* scope */,
     return rl_dist( get_pos( params[0] ), get_pos( params[1] ) );
 }
 
+double artifact_resonance_eval( const_dialogue const &d, char scope,
+                                std::vector<diag_value> const & /* params */,
+                                diag_kwargs const & /* kwargs */ )
+{
+    return d.const_actor( is_beta( scope ) )->get_artifact_resonance();
+}
+
 double damage_level_eval( const_dialogue const &d, char scope,
                           std::vector<diag_value> const & /* params */,
                           diag_kwargs const & /* kwargs */ )
@@ -1657,6 +1664,7 @@ std::map<std::string_view, dialogue_func> const dialogue_funcs{
     { "addiction_intensity", { "un", 1, addiction_intensity_eval } },
     { "addiction_turns", { "un", 1, addiction_turns_eval, addiction_turns_ass } },
     { "armor", { "un", 2, armor_eval } },
+    { "artifact_resonance", { "un", 0, artifact_resonance_eval } },
     { "attack_speed", { "un", 0, attack_speed_eval } },
     { "speed", { "un", 0, move_speed_eval } },
     { "characters_nearby", { "ung", 0, characters_nearby_eval, {}, { "radius", "attitude", "location" } } },

src/talker.h

@@ -152,6 +152,9 @@ class const_talker
             return false;
         }
         // stats, skills, traits, bionics, and magic
+        virtual int get_artifact_resonance() const {
+            return 0;
+        }
         virtual int str_cur() const {
             return 0;
         }

src/talker_character.cpp

@@ -28,6 +28,7 @@
 #include "item_location.h"
 #include "itype.h"
 #include "magic.h"
+#include "magic_enchantment.h"
 #include "map.h"
 #include "martialarts.h"
 #include "math_parser_diag_value.h"
@@ -123,6 +124,11 @@ units::temperature talker_character_const::get_cur_part_temp( const bodypart_id
     return me_chr_const->get_part_temp_conv( bp );
 }
 
+int talker_character_const::get_artifact_resonance() const
+{
+    return me_chr_const->enchantment_cache->get_value_add( enchant_vals::mod::ARTIFACT_RESONANCE );
+}
+
 int talker_character_const::str_cur() const
 {
     return me_chr_const->str_cur;

src/talker_character.h

@@ -51,6 +51,7 @@ class talker_character_const: virtual public const_talker
         units::temperature get_cur_part_temp( const bodypart_id &bp ) const override;
 
         // stats, skills, traits, bionics, and magic
+        int get_artifact_resonance() const override;
         int str_cur() const override;
         int dex_cur() const override;
         int int_cur() const override;

src/talker_item.cpp

@@ -10,6 +10,7 @@
 #include "item.h"
 #include "item_location.h"
 #include "itype.h"
+#include "magic_enchantment.h"
 #include "math_parser_diag_value.h"
 #include "messages.h"
 #include "units.h"
@@ -106,6 +107,15 @@ units::energy talker_item_const::power_max() const
     return 1_mJ * me_it_const->get_item()->ammo_capacity( ammo_battery );
 }
 
+int talker_item_const::get_artifact_resonance() const
+{
+    int ret = 0;
+    for( enchant_cache &this_ench : me_it_const->get_item()->get_proc_enchantments() ) {
+        ret += this_ench.get_value_add( enchant_vals::mod::ARTIFACT_RESONANCE );
+    }
+    return ret;
+}
+
 int talker_item_const::get_count() const
 {
     return me_it_const->get_item()->count();

src/talker_item.h

@@ -52,6 +52,7 @@ class talker_item_const: public const_talker_cloner<talker_item_const>
         int get_hp_max( const bodypart_id & ) const override;
         units::energy power_cur() const override;
         units::energy power_max() const override;
+        int get_artifact_resonance() const override;
 
         int get_count() const override;
         int coverage_at( bodypart_id & ) const override;