[ Xedra Evolved ] Fix Gracken trait improving items

data/mods/Xedra_Evolved/items/gracken_trait_improvements.json

@@ -2,8 +2,7 @@
   {
     "abstract": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "comestible_type": "INVALID",
+    "subtypes": [ "TOOL" ],
     "category": "MED",
     "name": { "str": "abstract gracken improvement", "//~": "NO_I18N" },
     "weight": "2041 g",
@@ -12,17 +11,22 @@
     "symbol": "!",
     "color": "light_gray",
     "price_postapoc": "10 USD",
-    "flags": [ "NO_INGEST", "EDIBLE_FROZEN" ]
+    "flags": [ "SINGLE_USE" ]
   },
   {
     "id": "gracken_shade_arms",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Shade Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms back to a base state.",
-    "consumption_effect_on_conditions": [ "shade_arms" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "shade_arms" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -35,11 +39,16 @@
     "id": "gracken_strong_arms",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Strong Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a stronger form.",
-    "consumption_effect_on_conditions": [ "strong_arms" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "strong_arms" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -52,11 +61,16 @@
     "id": "gracken_long_arms",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Long Arms" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their arms to a longer form.",
-    "consumption_effect_on_conditions": [ "long_arms" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "long_arms" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -69,11 +83,16 @@
     "id": "gracken_shade_hands",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Shade Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands back to a base state.",
-    "consumption_effect_on_conditions": [ "shade_hands" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "shade_hands" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -86,11 +105,16 @@
     "id": "gracken_sharp_nails",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Sharp Nails" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands to a sharper form.",
-    "consumption_effect_on_conditions": [ "sharp_nails" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "sharp_nails" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -103,11 +127,16 @@
     "id": "gracken_dextrous_hands",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Dextrous Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their hands to a more agile form.",
-    "consumption_effect_on_conditions": [ "dextrous_hands" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "dextrous_hands" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -120,11 +149,16 @@
     "id": "gracken_herbivorous_stomach",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Herbivorous Stomach" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their diet to an herbivorous one.",
-    "consumption_effect_on_conditions": [ "herbivorous_stomach" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "herbivorous_stomach" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -137,11 +171,16 @@
     "id": "gracken_omnivorous_stomach",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Dextrous Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their diet to an omnivorous one.",
-    "consumption_effect_on_conditions": [ "omnivorous_stomach" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "omnivorous_stomach" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -154,11 +193,16 @@
     "id": "gracken_carnivorous_stomach",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Dextrous Hands" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their diet to an carnivorous one.",
-    "consumption_effect_on_conditions": [ "carnivorous_stomach" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "carnivorous_stomach" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -171,11 +215,16 @@
     "id": "gracken_shade_legs",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Shade Legs" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their legs back to a base state.",
-    "consumption_effect_on_conditions": [ "shade_legs" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "shade_legs" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -188,11 +237,16 @@
     "id": "gracken_short_legs",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Short Legs" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their legs to a shorter form.",
-    "consumption_effect_on_conditions": [ "short_legs" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "short_legs" ]
+    }
   },
   {
     "type": "effect_on_condition",
@@ -205,11 +259,16 @@
     "id": "gracken_long_legs",
     "copy-from": "gracken_improvement_general",
     "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
+    "subtypes": [ "TOOL" ],
     "name": { "str_sp": "Gracken Long Legs" },
     "looks_like": "offal",
     "description": "An organ that allows a mature Gracken to convert their legs to a longer form.",
-    "consumption_effect_on_conditions": [ "long_legs" ]
+    "use_action": {
+      "type": "effect_on_conditions",
+      "consume": true,
+      "description": "You graft this organ onto your body replacing whatever was there before.",
+      "effect_on_conditions": [ "long_legs" ]
+    }
   },
   {
     "type": "effect_on_condition",

src/npctalk.cpp

@@ -3491,6 +3491,33 @@
         const trait_id trait = trait_id( new_trait.evaluate( d ) );
         const mutation_variant *variant = trait->variant( new_variant.evaluate( d ) );
 
+        Character *guy = d.actor( is_npc )->get_character();
+        if( !guy ) {
+            debugmsg( "f_add_trait: No valid character." );
+            return;
+        }
+
+        const auto &new_types = trait->types;
+
+        for( const trait_id &existing : guy->get_mutations() ) {
+            if( existing == trait ) {
+                continue;
+            }
+            const auto &existing_types = existing->types;
+            for( const std::string &t : existing_types ) {
+                bool match = false;
+                if constexpr( std::is_same<decltype( new_types ), const std::set<std::string> &>::value ) {
+                    match = new_types.count( t ) > 0;
+                } else {
+                    match = std::find( new_types.begin(), new_types.end(), t ) != new_types.end();
+                }
+                if( match ) {
+                    guy->unset_mutation( existing );
+                    break;
+                }
+            }
+        }
+
         d.actor( is_npc )->set_mutation( trait, variant );
     };
 }

tests/iuse_test.cpp

@@ -8,9 +8,11 @@
 #include "bodypart.h"
 #include "calendar.h"
 #include "cata_catch.h"
+#include "character_id.h"
 #include "character_attire.h"
 #include "coordinates.h"
 #include "flag.h"
+#include "game.h"
 #include "inventory.h"
 #include "item.h"
 #include "item_location.h"
@@ -19,10 +21,13 @@
 #include "map.h"
 #include "map_helpers.h"
 #include "map_selector.h"
+#include "mod_manager.h"
 #include "player_helpers.h"
 #include "pocket_type.h"
 #include "point.h"
+#include "profession.h"
 #include "ret_val.h"
+#include "trait_group.h"
 #include "type_id.h"
 #include "value_ptr.h"
 
@@ -66,6 +71,7 @@
 static const itype_id itype_backpack( "backpack" );
 static const itype_id itype_coffee( "coffee" );
 static const itype_id itype_diazepam( "diazepam" );
+static const itype_id itype_gracken_strong_arms( "gracken_strong_arms" );
 static const itype_id itype_inhaler( "inhaler" );
 static const itype_id itype_oxygen( "oxygen" );
 static const itype_id itype_oxygen_tank( "oxygen_tank" );
@@ -1077,3 +1083,27 @@
 
     }
 }
+
+
+TEST_CASE( "gracken_strong_arms_trait_change", "[gracken][traits][mutation][item_use]" )
+{
+    set_game_mods( { "dda", "Xedra_Evolved" } );
+    clear_avatar();
+
+    avatar &you = get_avatar();
+    you.set_profession( profession_id( "xe_gracken_hunter" ) );
+
+    REQUIRE( you.has_trait( trait_id( "SHADE_ARMS" ) ) );
+
+    item strong_arms( itype_gracken_strong_arms, calendar::turn_zero );
+    you.i_add( strong_arms );
+    REQUIRE( you.has_amount( "gracken_strong_arms", 1 ) );
+
+    int pos = you.inv->position_by_type( itype_gracken_strong_arms );
+    REQUIRE( pos != INT_MIN );
+    you.use( pos );
+
+    REQUIRE_FALSE( you.has_amount( "gracken_strong_arms", 1 ) );
+    REQUIRE_FALSE( you.has_trait( trait_id( "SHADE_ARMS" ) ) );
+    REQUIRE( you.has_trait( trait_id( "SHADE_STRONG_ARMS" ) ) );
+}