From 56e5a3cea3cc39b97b90d41bc6602a9d872fcdf5 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Wed, 23 Mar 2016 15:36:20 +0000 Subject: [PATCH] Here come the nerfs, all dressed in your tears~ * Plant Health gained per pollination is now half the bees health (down from all the bees health, which was only 10 max anyway) * Pests are now only reduced in 33% of pollinations (33% chance to reduce pests, down from 100%) * Yieldmod is now only increased 5% of the time (down from 100%) * Yieldmod is now a new variable, innate_yieldmod on plants, this is so having bees and THEN using chemicals on the plants doesn't magically undo the bee's work, it is added onto the yield mod of the tray. * To make up for the above, there is now a 50% chance per pollination (up from 0%) for the potency (how many reagents the plant gets) to go up by 1, this isn't much, but 50% of the time adds up --- code/modules/hydroponics/seeds.dm | 4 +++- .../mob/living/simple_animal/hostile/bees.dm | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 7729e7073e6..2daf7c40508 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -33,6 +33,8 @@ // Stronger reagents must always come first to avoid being displaced by weaker ones. // Total amount of any reagent in plant is calculated by formula: 1 + round(potency * multiplier) + var/innate_yieldmod = 1 //modifier for yield, seperate to the one in Hydro trays, as that one is SPECIFICALLY for nutriment/chems (which means it's constantly reset) + //This is added onto the yield mod of the hydro tray, yield *= (parent.yieldmod+innate_yieldmod) /obj/item/seeds/New(loc, nogenes = 0) ..() @@ -122,7 +124,7 @@ if(parent.yieldmod == 0) return_yield = min(return_yield, 1)//1 if above zero, 0 otherwise else - return_yield *= parent.yieldmod + return_yield *= (parent.yieldmod+innate_yieldmod) return return_yield diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d07bb4d49be..51262083000 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -6,6 +6,9 @@ #define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again #define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) +#define BEE_POLLINATE_YIELD_CHANCE 10 +#define BEE_POLLINATE_PEST_CHANCE 33 +#define BEE_POLLINATE_POTENTCY_CHANCE 50 /mob/living/simple_animal/hostile/poison/bees name = "bee" @@ -160,9 +163,13 @@ var/growth = health //Health also means how many bees are in the swarm, roughly. //better healthier plants! - Hydro.health += growth - Hydro.pestlevel = max(0, --Hydro.pestlevel) - Hydro.yieldmod++ + Hydro.health += round(growth*0.5) + if(prob(BEE_POLLINATE_PEST_CHANCE)) + Hydro.pestlevel = max(0, --Hydro.pestlevel) + if(prob(BEE_POLLINATE_YIELD_CHANCE)) //Yield mod is HELLA powerful, but quite rare + Hydro.myseed.innate_yieldmod++ + if(prob(BEE_POLLINATE_POTENTCY_CHANCE)) + Hydro.myseed.potency++ if(beehome) beehome.bee_resources = min(beehome.bee_resources + growth, 100)