remove unused comestible radiation (CleverRaven#64766)

* remove unused comestible radiation * also remove from docs
Maleclypse · Apr 6, 2023 · abb4ea0 · abb4ea0
1 parent 258c223
commit abb4ea0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
@@ -3384,7 +3384,6 @@ CBMs can be defined like this:
 "use_action" : [ "CRACK" ],     // What effects a comestible has when used, see special definitions below
 "stim" : 40,                // Stimulant effect
 "fatigue_mod": 3,           // How much fatigue this comestible removes. (Negative values add fatigue)
-"radiation": 8,             // How much radiation you get from this comestible.
 "comestible_type" : "MED",  // Comestible type, used for inventory sorting. One of 'FOOD', 'DRINK', 'MED', or 'INVALID' (consider using a different "type" than COMESTIBLE instead of using INVALID)
 "consumption_effect_on_conditions" : [ "EOC_1" ],  // Effect on conditions to run after consuming.  Inline or string id supported
 "quench" : 0,               // Thirst quenched

diff --git a/src/consumption.cpp b/src/consumption.cpp
@@ -1163,11 +1163,6 @@ void Character::modify_fatigue( const islot_comestible &comest )
     mod_fatigue( -comest.fatigue_mod );
 }
 
-void Character::modify_radiation( const islot_comestible &comest )
-{
-    irradiate( comest.radiation );
-}
-
 void Character::modify_addiction( const islot_comestible &comest )
 {
     add_addiction( comest.add, comest.addict );
@@ -1467,7 +1462,6 @@ bool Character::consume_effects( item &food )
     }
     modify_stimulation( comest );
     modify_fatigue( comest );
-    modify_radiation( comest );
     modify_addiction( comest );
     modify_morale( food, nutr );
 
@@ -1727,7 +1721,6 @@ static bool consume_med( item &target, Character &you )
         you.modify_health( comest );
         you.modify_stimulation( comest );
         you.modify_fatigue( comest );
-        you.modify_radiation( comest );
         you.modify_addiction( comest );
         you.modify_morale( target );
         activate_consume_eocs( you, target );

diff --git a/src/item_factory.cpp b/src/item_factory.cpp
@@ -3089,7 +3089,6 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std
     assign( jo, "fatigue_mod", slot.fatigue_mod, strict );
     assign( jo, "healthy", slot.healthy, strict );
     assign( jo, "parasites", slot.parasites, strict, 0 );
-    assign( jo, "radiation", slot.radiation, strict );
     assign( jo, "freezing_point", slot.freeze_point, strict );
     assign( jo, "spoils_in", slot.spoils, strict, 1_hours );
     assign( jo, "cooks_like", slot.cooks_like, strict );

diff --git a/src/itype.h b/src/itype.h
@@ -159,9 +159,6 @@ struct islot_comestible {
         /** chance (odds) of becoming parasitised when eating (zero if never occurs) */
         int parasites = 0;
 
-        /**Amount of radiation you get from this comestible*/
-        int radiation = 0;
-
         /** freezing point in degrees celsius, below this temperature item can freeze */
         float freeze_point = 0;