From 18814e23c1975fbbba5ce80612afb79c4688f2ee Mon Sep 17 00:00:00 2001 From: Erthilo Date: Wed, 6 Jun 2012 21:11:36 +0100 Subject: [PATCH] Tajaran/Soghun balancing. Adds Searif to Skrell whitelist (He is the creator after all). * Reordered alien whitelist. I mean, someone was on there twice! * Tajarans get hungry 1.25 times as fast. * Tajarans move slightly faster when cold. * Tajrans heat up quicker, but cool slower. * Soghuns get hungry 0.5 times as fast. * Soghuns move slightly slower when cold. * Soghuns heat up slower. --- code/modules/mob/living/carbon/human/human.dm | 5 ++++ code/modules/mob/living/carbon/human/life.dm | 23 ++++++++++++++----- config/alienwhitelist.txt | 12 ++++++---- html/changelog.html | 1 + 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b59aeef6c31..82f9c27e0d3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -293,6 +293,11 @@ if (bodytemperature < 283.222) tally += (283.222 - bodytemperature) / 10 * 1.75 + if(mutantrace == "lizard") //Soghun are more affected by the cold + tally += 1 + if(istajaran()) //But Tajarans are slightly resistant + if(tally != 0) + tally -= tally*0.1 if (stuttering < 10) stuttering = 10 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 86db839b1a3..fbb1c2f4fcf 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -712,11 +712,17 @@ increments = difference/10 var/change = increments*boost // Get the amount to change by (x per increment) var/temp_change - if(current < loc_temp) - temperature = min(loc_temp, temperature+change) - else if(current > loc_temp) - temperature = max(loc_temp, temperature-change) - temp_change = (temperature - current) + if(current < loc_temp) //If your body temp is less than loc, then try to heat up + if(istajaran(src)) //If Tajaran, you heat up faster + change = change*4 + temperature = min(loc_temp, temperature+change) //Pick the minimum of these two + else if(current > loc_temp) //If your body temp is more than loc, then try to cool down + if(istajaran(src)) //If Tajaran, you cool down slower + change = change*0.5 + if(mutantrace == "lizard") //If Soghun, you cool down faster + change = change*3 + temperature = max(loc_temp, temperature-change) //Pick the max of these two + temp_change = (temperature - current) //Work out the actual change of temp return temp_change get_thermal_protection() @@ -835,7 +841,12 @@ if (nutrition > 0 && stat != 2) // sleeping slows the metabolism, hunger increases more slowly if(stat == 1) - nutrition = max (0, nutrition - HUNGER_FACTOR) + if(istajaran(src)) //Tajarans get hungry slightly faster + nutrition = max (0, nutrition - HUNGER_FACTOR*1.25) + if(mutantrace == "lizard") //Soghuns get hungry much slower + nutrition = max (0, nutrition - HUNGER_FACTOR*0.5) + else + nutrition = max (0, nutrition - HUNGER_FACTOR) else nutrition = max (0, nutrition - HUNGER_FACTOR / 4) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 39be52e1117..4acb829b75f 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,8 +1,10 @@ -forsamori - Tajaran -searif - Soghun -searif - Tajaran -galenus - Soghun botanistpower - Tajaran fenrisian - Tajaran forsamori - Tajaran -forsamori - Soghun \ No newline at end of file +forsamori - Soghun +galenus - Soghun +searif - Soghun +searif - Tajaran +searif - Skrell + + diff --git a/html/changelog.html b/html/changelog.html index aa77b4030f0..ce44b8f01fb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,7 @@ should be listed in the changelog upon commit though. Thanks. -->

06 June 2012

Erthilo updated: