Add ability to count character flags, move all trait flag checks over to character flag (#55061)

Co-authored-by: Venera3 <[email protected]>

Author: Venera3

data/json/npcs/TALK_COMMON_ALLY.json

@@ -70,7 +70,7 @@
         "text": "Mind if we just chat for a bit about your history?",
         "topic": "TALK_FRIEND_CONVERSATION",
         "condition": {
-          "and": [ "at_safe_space", { "or": [ { "npc_has_trait_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] } ]
+          "and": [ "at_safe_space", { "or": [ { "npc_has_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] } ]
         },
         "//": "If the NPC already has a BG story, or started out as a static NPC (and so probably doesn't need a random bg story), then go on.",
         "switch": true

data/json/npcs/TALK_FRIEND_CONVERSATION.json

@@ -7,7 +7,7 @@
       {
         "text": "It's fine, we've got a moment.",
         "topic": "TALK_FRIEND_CONVERSATION",
-        "condition": { "or": [ { "npc_has_trait_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] },
+        "condition": { "or": [ { "npc_has_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] },
         "//": "If the NPC already has a BG story, or started out as a static NPC (and so probably doesn't need a random bg story), then go on.",
         "switch": true
       },

data/json/npcs/TALK_MARLOSS_VOICE.json

@@ -25,7 +25,7 @@
       {
         "text": "I don't know what kind of heresy you are spreading, but I'm putting an end to it!",
         "topic": "TALK_DONE",
-        "condition": { "and": [ { "u_has_trait": "SPIRITUAL" }, { "not": { "u_has_trait_flag": "mycus" } } ] },
+        "condition": { "and": [ { "u_has_trait": "SPIRITUAL" }, { "not": { "u_has_flag": "mycus" } } ] },
         "effect": "hostile"
       },
       {
@@ -54,15 +54,11 @@
     "dynamic_line": "I'm a priest or guide of a sort.  I sing the hymns along my companions so that we may learn to live in unity, both with each other and with our ailing world.",
     "responses": [
       { "text": "Alright.", "topic": "TALK_MARLOSS_VOICE" },
-      {
-        "text": "Can I join you?",
-        "topic": "TALK_MARLOSS_VOICE_WITH_US",
-        "condition": { "u_has_trait_flag": "mycus" }
-      },
+      { "text": "Can I join you?", "topic": "TALK_MARLOSS_VOICE_WITH_US", "condition": { "u_has_flag": "mycus" } },
       {
         "text": "Understood.  Can I join you?",
         "topic": "TALK_MARLOSS_VOICE_OFFER_BERRY",
-        "condition": { "and": [ { "not": { "u_has_trait_flag": "mycus" } }, { "not": { "u_has_effect": "u_given_berry" } } ] }
+        "condition": { "and": [ { "not": { "u_has_flag": "mycus" } }, { "not": { "u_has_effect": "u_given_berry" } } ] }
       },
       { "text": "Well, I gotta go.", "topic": "TALK_DONE" }
     ]
@@ -87,7 +83,7 @@
       {
         "text": "I'm joining no stinking cult!  Take your berry and shove it!",
         "topic": "TALK_DONE",
-        "condition": { "not": { "u_has_trait_flag": "mycus" } },
+        "condition": { "not": { "u_has_flag": "mycus" } },
         "effect": "hostile"
       }
     ]

data/json/npcs/TALK_TEST.json

@@ -83,12 +83,12 @@
       {
         "text": "This is a trait flags test response.",
         "topic": "TALK_DONE",
-        "condition": { "u_has_trait_flag": "CANNIBAL" }
+        "condition": { "u_has_flag": "CANNIBAL" }
       },
       {
         "text": "This is a npc trait flags test response.",
         "topic": "TALK_DONE",
-        "condition": { "npc_has_trait_flag": "CANNIBAL" }
+        "condition": { "npc_has_flag": "CANNIBAL" }
       }
     ]
   },

data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json

@@ -9,7 +9,7 @@
       {
         "text": "[Cannibal + Psychopath] Wait, I thought you were having food problems.",
         "topic": "TALK_FREE_MERCHANTS_MERCHANT_AboutGreeting_Cannibal",
-        "condition": { "and": [ { "u_has_trait_flag": "CANNIBAL" }, { "u_has_trait": "PSYCHOPATH" } ] }
+        "condition": { "and": [ { "u_has_flag": "CANNIBAL" }, { "u_has_trait": "PSYCHOPATH" } ] }
       }
     ]
   },

doc/JSON_FLAGS.md

@@ -11,6 +11,7 @@
     - [Covers](#covers)
     - [Flags](#flags)
   - [Bionics](#bionics)
+  - [Bodyparts](#bodyparts)
   - [Books](#books)
     - [Use actions](#use-actions)
   - [Character - (Bionic/Mutation/Effect)](#character)
@@ -1090,7 +1091,6 @@ Special attacks have been moved to [MONSTER_SPECIAL_ATTACKS.md](MONSTER_SPECIAL_
 
 #### Flags
 
-- ```HARDTOHIT``` Whenever something attacks you, RNG gets rolled twice and you get the better result.
 - ```UNARMED_BONUS``` You get a bonus to unarmed bash and cut damage equal to unarmed_skill/2 up to 4.
 
 ### Categories
@@ -1515,6 +1515,7 @@ Gun fault flags:
 - ```NO_MINIMAL_HEALING``` This mutation disables the minimal healing of 1 hp a day.
 - ```SUPER_HEARING``` You can hear much better than a normal person.
 - ```IMMUNE_HEARING_DAMAGE``` Immune to hearing damage from loud sounds.
+- ```CANNIBAL``` Butcher humans, eat foods with the `CANNIBALISM` and `STRICT_HUMANITARIANISM` flags without a morale penalty
 -````CLIMB_NO_LADDER``` Capable of climbing up single-level walls without support.
 - ```DEAF``` Makes you deaf.
 - ```BLIND``` Makes you blind.
@@ -1550,7 +1551,21 @@ Gun fault flags:
 - ```THERMOMETER``` You always know what temperature it is.
 - ```CBQ_LEARN_BONUS``` You learn CBQ from the bionic bio_cqb faster.
 - ```GILLS``` You can breathe underwater.
+- ```HARDTOHIT``` Whenever something attacks you, RNG gets rolled twice and you get the better result.
+- ````HUGE``` Changes your size to `creature_size::huge`.  Checked last of the size category flags, if no size flags are found your size defaults to `creature_size::medium`.
+- ````LARGE``` Changes your size to `creature_size::large`.  Checked third of the size category flags.
+- ```PSYCHOPATH``` Butcher humans without a morale penalty
+- ```PRED1``` Small morale bonus from foods with the `PREDATOR_FUN` flag.  Lower morale panalty from the guilt mondeath effect.
+- ```PRED2``` Learn combat skills wit double catchup modifier.  Resist skill rust on combat skills. Small morale bonus from foods with the `PREDATOR_FUN` flag.  Lower morale panalty from the guilt mondeath effect.
+- ```PRED3``` Learn combat skills wit double catchup modifier.  Resist skill rust on combat skills. Medium morale bonus from foods with the `PREDATOR_FUN` flag.  Immune to the guilt mondeath effect.
+- ```PRED4``` Learn combat skills wit triple catchup modifier.  Learn combat skills without spending focus.  Resist skill rust on combat skills. Large morale bonus from foods with the `PREDATOR_FUN` flag.  Immune to the guilt mondeath effect.
+- ```SAPIOVORE``` Butcher humans without a morale penalty
+- ````SMALL``` Changes your size to `creature_size::small`.  Checked second of the size category flags.
+- ```STEADY``` Your speed can never go below base speed, bonuses from effects etc can still apply.
+- ````STRICT_HUMANITARIAN``` You can eat foodstuffs tagged with `STRICT_HUMANITARIANISM` without morale penalties.
+- ````TINY``` Changes your size to `creature_size::tiny`.  Checked first of the size category flags.
 - ```WEB_RAPPEL``` You can rappel down staircases and sheer drops of any height.
 - ```WALL_CLING``` You can ascend/descend sheer cliffs as long as the tile above borders at least one wall. Chance to slip and fall each step.
+- ````WALL_CLING_FOURTH``` Same as `WALL_CLING`, but you need four instances of the flag for it to function (ex. four bodyparts with the flag).
 - ```WINGS_1``` You have 50% chance to ignore falling traps (including ledges).
-- ```WINGS_2``` You have 100% chance to ignore falling traps (including ledges).
+- ```WINGS_2``` You have 100% chance to ignore falling traps (including ledges).  Requires two flag instances.

doc/NPCs.md

@@ -809,7 +809,7 @@ Condition | Type | Description
 `"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_trait_flag"`<br/>`"npc_has_trait_flag"` | string | `true` if the player character or NPC has any traits with the specific trait flag.  More robust versions of `u_has_any_trait` and `npc_has_any_trait`.  The special trait flag `"MUTATION_THRESHOLD"` checks to see if the player or NPC has crossed a mutation threshold.
+`"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_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).

src/activity_handlers.cpp

@@ -573,9 +573,9 @@ static void set_up_butchery( player_activity &act, Character &you, butcher_type
     // applies to all butchery actions
     const bool is_human = corpse.id == mtype_id::NULL_ID() || ( corpse.in_species( species_HUMAN ) &&
                           !corpse.in_species( species_ZOMBIE ) );
-    if( is_human && !( you.has_trait_flag( json_flag_CANNIBAL ) ||
-                       you.has_trait_flag( json_flag_PSYCHOPATH ) ||
-                       you.has_trait_flag( json_flag_SAPIOVORE ) ) ) {
+    if( is_human && !( you.has_flag( json_flag_CANNIBAL ) ||
+                       you.has_flag( json_flag_PSYCHOPATH ) ||
+                       you.has_flag( json_flag_SAPIOVORE ) ) ) {
 
         if( you.is_avatar() ) {
             if( query_yn( _( "Would you dare desecrate the mortal remains of a fellow human being?" ) ) ) {

src/ballistics.cpp

@@ -214,7 +214,7 @@ dealt_projectile_attack projectile_attack( const projectile &proj_arg, const tri
     projectile_attack_aim aim = projectile_attack_roll( dispersion, range, target_size );
 
     if( target_critter && target_critter->as_character() &&
-        target_critter->as_character()->has_trait_flag( json_flag_HARDTOHIT ) ) {
+        target_critter->as_character()->has_flag( json_flag_HARDTOHIT ) ) {
 
         projectile_attack_aim lucky_aim = projectile_attack_roll( dispersion, range, target_size );
         // if the target's lucky they're more likely to be missed

src/character.cpp

@@ -1711,10 +1711,10 @@ bool Character::uncanny_dodge()
 
     const bool can_dodge_bio = get_power_level() >= trigger_cost &&
                                has_active_bionic( bio_uncanny_dodge );
-    const bool can_dodge_mut = get_stamina() >= 300 && has_trait_flag( json_flag_UNCANNY_DODGE );
+    const bool can_dodge_mut = get_stamina() >= 300 && count_trait_flag( json_flag_UNCANNY_DODGE );
     const bool can_dodge_both = get_power_level() >= ( trigger_cost / 2 ) &&
                                 has_active_bionic( bio_uncanny_dodge ) &&
-                                get_stamina() >= 150 && has_trait_flag( json_flag_UNCANNY_DODGE );
+                                get_stamina() >= 150 && count_trait_flag( json_flag_UNCANNY_DODGE );
 
     if( !( can_dodge_bio || can_dodge_mut || can_dodge_both ) ) {
         return false;
@@ -2287,11 +2287,11 @@ void Character::recalc_sight_limits()
         vision_mode_cache.set( IR_VISION );
     }
 
-    if( has_trait_flag( json_flag_SUPER_CLAIRVOYANCE ) ) {
+    if( has_flag( json_flag_SUPER_CLAIRVOYANCE ) ) {
         vision_mode_cache.set( VISION_CLAIRVOYANCE_SUPER );
-    } else if( has_trait_flag( json_flag_CLAIRVOYANCE_PLUS ) ) {
+    } else if( has_flag( json_flag_CLAIRVOYANCE_PLUS ) ) {
         vision_mode_cache.set( VISION_CLAIRVOYANCE_PLUS );
-    } else if( has_trait_flag( json_flag_CLAIRVOYANCE ) ) {
+    } else if( has_flag( json_flag_CLAIRVOYANCE ) ) {
         vision_mode_cache.set( VISION_CLAIRVOYANCE );
     }
 }
@@ -2422,14 +2422,14 @@ bool Character::practice( const skill_id &id, int amount, int cap, bool suppress
     if( has_trait( trait_PACIFIST ) && skill.is_combat_skill() ) {
         amount /= 3.0f;
     }
-    if( has_trait_flag( json_flag_PRED2 ) && skill.is_combat_skill() ) {
+    if( has_flag( json_flag_PRED2 ) && skill.is_combat_skill() ) {
         catchup_modifier *= 2.0f;
     }
-    if( has_trait_flag( json_flag_PRED3 ) && skill.is_combat_skill() ) {
+    if( has_flag( json_flag_PRED3 ) && skill.is_combat_skill() ) {
         catchup_modifier *= 2.0f;
     }
 
-    if( has_trait_flag( json_flag_PRED4 ) && skill.is_combat_skill() ) {
+    if( has_flag( json_flag_PRED4 ) && skill.is_combat_skill() ) {
         catchup_modifier *= 3.0f;
     }
 
@@ -2471,7 +2471,7 @@ bool Character::practice( const skill_id &id, int amount, int cap, bool suppress
 
         // Apex Predators don't think about much other than killing.
         // They don't lose Focus when practicing combat skills.
-        if( !( has_trait_flag( json_flag_PRED4 ) && skill.is_combat_skill() ) ) {
+        if( !( has_flag( json_flag_PRED4 ) && skill.is_combat_skill() ) ) {
             // Base reduction on the larger of 1% of total, or practice amount.
             // The latter kicks in when long actions like crafting
             // apply many turns of gains at once.
@@ -3296,9 +3296,9 @@ void Character::do_skill_rust()
         SkillLevel &skill_level_obj = pair.second;
 
         if( aSkill.is_combat_skill() &&
-            ( ( has_trait_flag( json_flag_PRED2 ) && calendar::once_every( 8_hours ) ) ||
-              ( has_trait_flag( json_flag_PRED3 ) && calendar::once_every( 4_hours ) ) ||
-              ( has_trait_flag( json_flag_PRED4 ) && calendar::once_every( 3_hours ) ) ) ) {
+            ( ( has_flag( json_flag_PRED2 ) && calendar::once_every( 8_hours ) ) ||
+              ( has_flag( json_flag_PRED3 ) && calendar::once_every( 4_hours ) ) ||
+              ( has_flag( json_flag_PRED4 ) && calendar::once_every( 3_hours ) ) ) ) {
             // Their brain is optimized to remember this
             if( one_in( 13 ) ) {
                 // They've already passed the roll to avoid rust at
@@ -3852,7 +3852,7 @@ int Character::get_enchantment_speed_bonus() const
 
 int Character::get_speed() const
 {
-    if( has_trait_flag( json_flag_STEADY ) ) {
+    if( has_flag( json_flag_STEADY ) ) {
         return get_speed_base() + std::max( 0, get_speed_bonus() ) + std::max( 0,
                 get_speedydex_bonus( get_dex() ) );
     }
@@ -10143,41 +10143,43 @@ int Character::book_fun_for( const item &book, const Character &p ) const
     return fun_bonus;
 }
 
-bool Character::has_bionic_with_flag( const json_character_flag &flag ) const
+int Character::count_bionic_with_flag( const json_character_flag &flag ) const
 {
+    int ret = 0;
     for( const bionic &bio : *my_bionics ) {
         if( bio.info().has_flag( flag ) ) {
-            return true;
+            ret++;
         }
         if( bio.info().activated ) {
             if( ( bio.info().has_active_flag( flag ) && has_active_bionic( bio.id ) ) ||
                 ( bio.info().has_inactive_flag( flag ) && !has_active_bionic( bio.id ) ) ) {
-                return true;
+                ret++;
             }
         }
     }
 
-    return false;
+    return ret;
 }
 
-bool Character::has_bodypart_with_flag( const json_character_flag &flag ) const
+int Character::count_bodypart_with_flag( const json_character_flag &flag ) const
 {
+    int ret = 0;
     for( const bodypart_id &bp : get_all_body_parts() ) {
         if( bp->has_flag( flag ) ) {
-            return true;
+            ret++;
         }
         if( get_part( bp )->has_conditional_flag( flag ) ) {
-            return true;
+            ret++;
         }
     }
-    return false;
+    return ret;
 }
 
-bool Character::has_flag( const json_character_flag &flag ) const
+int Character::has_flag( const json_character_flag &flag ) const
 {
     // If this is a performance problem create a map of flags stored for a character and updated on trait, mutation, bionic add/remove, activate/deactivate, effect gain/loss
-    return has_trait_flag( flag ) || has_bionic_with_flag( flag ) || has_effect_with_flag( flag ) ||
-           has_bodypart_with_flag( flag );
+    return count_trait_flag( flag ) + count_bionic_with_flag( flag ) + has_effect_with_flag(
+               flag ) + count_bodypart_with_flag( flag );
 }
 
 bool Character::is_driving() const