Merge pull request #3239 from Verkister/patch-16

Little more realistic gurgle gain tweak and oxyloss compensation.
This commit is contained in:
Aronai Sieyes
2018-05-08 14:44:57 -04:00
committed by GitHub
+12 -3
View File
@@ -97,6 +97,7 @@
if(M.stat == DEAD)
var/digest_alert_owner = pick(digest_messages_owner)
var/digest_alert_prey = pick(digest_messages_prey)
var/compensation = M.getOxyLoss() //How much of the prey's damage was caused by passive crit oxyloss to compensate the lost nutrition.
//Replace placeholder vars
digest_alert_owner = replacetext(digest_alert_owner,"%pred",owner)
@@ -114,7 +115,14 @@
play_sound = pick(death_sounds)
digestion_death(M)
owner.update_icons()
if(compensation > 0)
if(isrobot(owner))
var/mob/living/silicon/robot/R = owner
R.cell.charge += 25*compensation
else
owner.nutrition += 4.5*compensation
to_update = TRUE
continue
// Deal digestion damage (and feed the pred)
@@ -125,11 +133,12 @@
var/difference = owner.size_multiplier / M.size_multiplier
if(isrobot(owner))
var/mob/living/silicon/robot/R = owner
R.cell.charge += 20*(digest_brute+digest_burn)
R.cell.charge += 25*(digest_brute+digest_burn)
if(offset) // If any different than default weight, multiply the % of offset.
owner.nutrition += offset*(2*(digest_brute+digest_burn)/difference) // 9.5 nutrition per digestion tick if they're 130 pounds and it's same size. 10.2 per digestion tick if they're 140 and it's same size. Etc etc.
owner.nutrition += offset*(4.5*(digest_brute+digest_burn)/difference) //4.5 nutrition points per health point. Normal same size 100+100 health prey with average weight would give 900 points if the digestion was instant. With all the size/weight offset taxes plus over time oxyloss+hunger taxes deducted with non-instant digestion, this should be enough to not leave the pred starved.
else
owner.nutrition += 2*(digest_brute+digest_burn)/difference
owner.nutrition += 4.5*(digest_brute+digest_burn)/difference
//////////////////////////// DM_ABSORB ////////////////////////////
else if(digest_mode == DM_ABSORB)