Skip to content

Commit b2d8cab

Browse files
authored
Unscrew snail serum (#54978)
1 parent 2d3e465 commit b2d8cab

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

data/json/items/comestibles/mutagen.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
"description": "A super-concentrated mutagen with the consistency of snot. You need a syringe to inject it… if you really want to?",
251251
"color": "light_gray",
252252
"use_action": { "type": "mutagen_iv", "mutation_category": "GASTROPOD" },
253-
"vitamins": [ [ "mutagen_gastropod", 500 ] ]
253+
"vitamins": [ [ "mutagen_snail", 500 ] ]
254254
},
255255
{
256256
"id": "iv_mutagen_batrachian",
@@ -289,8 +289,7 @@
289289
"name": { "str": "mouse serum" },
290290
"description": "A super-concentrated mutagen resembling liquefied metal. You need a syringe to inject it… if you really want to?",
291291
"color": "light_gray",
292-
"use_action": { "type": "mutagen_iv", "mutation_category": "MOUSE" },
293-
"vitamins": [ [ "mutagen_mouse", 500 ] ]
292+
"use_action": { "type": "mutagen_iv", "mutation_category": "MOUSE" }
294293
},
295294
{
296295
"id": "mutagen",

src/iuse.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,9 @@ cata::optional<int> iuse::purifier( Character *p, item *it, bool, const tripoint
12081208
}
12091209

12101210
do_purify( *p );
1211-
p->vitamins_mod( it->get_comestible()->default_nutrition.vitamins );
1211+
if( it->is_comestible() && !it->get_comestible()->default_nutrition.vitamins.empty() ) {
1212+
p->vitamins_mod( it->get_comestible()->default_nutrition.vitamins );
1213+
}
12121214
return it->type->charges_to_use();
12131215
}
12141216

@@ -1251,7 +1253,10 @@ cata::optional<int> iuse::purify_iv( Character *p, item *it, bool, const tripoin
12511253
p->mod_thirst( 2 * num_cured );
12521254
p->mod_fatigue( 2 * num_cured );
12531255
}
1254-
p->vitamins_mod( it->get_comestible()->default_nutrition.vitamins );
1256+
1257+
if( it->is_comestible() && !it->get_comestible()->default_nutrition.vitamins.empty() ) {
1258+
p->vitamins_mod( it->get_comestible()->default_nutrition.vitamins );
1259+
}
12551260
return it->type->charges_to_use();
12561261
}
12571262

src/iuse_actor.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4333,7 +4333,9 @@ cata::optional<int> mutagen_actor::use( Character &p, item &it, bool, const trip
43334333
p.mod_stored_nutr( m_category.mutagen_hunger * mut_count );
43344334
p.mod_thirst( m_category.mutagen_thirst * mut_count );
43354335
p.mod_fatigue( m_category.mutagen_fatigue * mut_count );
4336-
p.vitamins_mod( it.get_comestible()->default_nutrition.vitamins );
4336+
if( it.is_comestible() && !it.get_comestible()->default_nutrition.vitamins.empty() ) {
4337+
p.vitamins_mod( it.get_comestible()->default_nutrition.vitamins );
4338+
}
43374339

43384340
return it.type->charges_to_use();
43394341
}
@@ -4392,7 +4394,9 @@ cata::optional<int> mutagen_iv_actor::use( Character &p, item &it, bool, const t
43924394
p.mod_hunger( m_category.iv_hunger * mut_count );
43934395
p.mod_thirst( m_category.iv_thirst * mut_count );
43944396
p.mod_fatigue( m_category.iv_fatigue * mut_count );
4395-
p.vitamins_mod( it.get_comestible()->default_nutrition.vitamins );
4397+
if( it.is_comestible() && !it.get_comestible()->default_nutrition.vitamins.empty() ) {
4398+
p.vitamins_mod( it.get_comestible()->default_nutrition.vitamins );
4399+
}
43964400

43974401
if( m_category.id == mutation_category_CHIMERA ) {
43984402
p.add_morale( MORALE_MUTAGEN_CHIMERA, m_category.iv_morale, m_category.iv_morale_max );

0 commit comments

Comments
 (0)