From b36de76c151585e8fd558dac76915e517ba58cb3 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 27 Aug 2022 15:48:40 +1000 Subject: [PATCH] Adjusting chems/nutrition for drakes. --- code/modules/mob/living/simple_mob/subtypes/animal/animal.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm | 2 +- code/modules/reagents/reagents/food_drinks.dm | 4 +++- code/modules/reagents/reagents/medicine.dm | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm index 040266740b..b6088e380b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm @@ -131,4 +131,4 @@ snack.animal_consumed(src) /mob/living/simple_mob/animal/proc/get_dietary_food_modifier(var/datum/reagent/nutriment/food) - return 0.3 + return 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 61542a2593..b450752335 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -294,7 +294,7 @@ var/global/list/last_drake_howl = list() /mob/living/simple_mob/animal/sif/grafadreka/get_dietary_food_modifier(var/datum/reagent/nutriment/food) if(food.allergen_type & ALLERGEN_MEAT) return ..() - return 0.1 + return 0.25 // Quarter nutrition from non-meat. /mob/living/simple_mob/animal/sif/grafadreka/Life() . = ..() diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 00e3c153b5..f480cd99b1 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -36,9 +36,11 @@ if(data[taste]/totalFlavor < 0.1) data -= taste +#define ANIMAL_NUTRITION_MULTIPLIER 0.2 /datum/reagent/nutriment/affect_animal(var/mob/living/simple_mob/animal/M, var/removed) - M.add_nutrition((nutriment_factor * removed) * M.get_dietary_food_modifier(src) * 0.5) + M.add_nutrition(nutriment_factor * removed * M.get_dietary_food_modifier(src) * ANIMAL_NUTRITION_MULTIPLIER) return ..() +#undef ANIMAL_NUTRITION_MULTIPLIER /datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(!injectable && alien != IS_SLIME) diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index 72be8b2157..6ed18045b7 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -56,6 +56,7 @@ if(istype(M, /mob/living/simple_mob/animal/sif/grafadreka)) var/mob/living/simple_mob/animal/sif/grafadreka/drake = M drake.sap_heal_threshold = clamp(drake.sap_heal_threshold + (0.1 * removed), 0, 1) + M.adjustBruteLoss(-removed) return ..() /datum/reagent/bicaridine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)