cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3670 from Verkister/indigestion

Browse Source 
Makes gurgle gains scale according to actual received damage.
This commit is contained in:
Aronai Sieyes
2018-05-13 23:21:21 -04:00
committed by GitHub
parent 0e65475d2e 08269f45fb
commit dc9037f45e
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
View File

@@ -23,6 +23,8 @@
var/startdrain = 500 var/startdrain = 500
var/max_item_count = 1 var/max_item_count = 1
var/gulpsound = 'sound/vore/gulp.ogg' var/gulpsound = 'sound/vore/gulp.ogg'
var/digest_brute = 2
var/digest_burn = 3
/obj/item/device/dogborg/sleeper/New() /obj/item/device/dogborg/sleeper/New()
..() ..()
@@ -504,9 +506,14 @@
if((T.status_flags & GODMODE) || !T.digestable) if((T.status_flags & GODMODE) || !T.digestable)
items_preserved += T items_preserved += T
else else
T.adjustBruteLoss(2) var/old_brute = T.getBruteLoss()
T.adjustFireLoss(3) var/old_burn = T.getFireLoss()
drain(-100) //20*total loss as with voreorgan stats. T.adjustBruteLoss(digest_brute)
T.adjustFireLoss(digest_burn)
var/actual_brute = T.getBruteLoss() - old_brute
var/actual_burn = T.getFireLoss() - old_burn
var/damage_gain = actual_brute + actual_burn
drain(-25 * damage_gain) //25*total loss as with voreorgan stats.
update_patient() update_patient()
//Pick a random item to deal with (if there are any) //Pick a random item to deal with (if there are any)

11
code/modules/vore/eating/bellymodes_vr.dm
View File

@@ -126,18 +126,23 @@
continue continue
// Deal digestion damage (and feed the pred) // Deal digestion damage (and feed the pred)
var/old_brute = M.getBruteLoss()
var/old_burn = M.getFireLoss()
M.adjustBruteLoss(digest_brute) M.adjustBruteLoss(digest_brute)
M.adjustFireLoss(digest_burn) M.adjustFireLoss(digest_burn)
var/actual_brute = M.getBruteLoss() - old_brute
var/actual_burn = M.getFireLoss() - old_burn
var/damage_gain = actual_brute + actual_burn
var/offset = (1 + ((M.weight - 137) / 137)) // 130 pounds = .95 140 pounds = 1.02 var/offset = (1 + ((M.weight - 137) / 137)) // 130 pounds = .95 140 pounds = 1.02
var/difference = owner.size_multiplier / M.size_multiplier var/difference = owner.size_multiplier / M.size_multiplier
if(isrobot(owner)) if(isrobot(owner))
var/mob/living/silicon/robot/R = owner var/mob/living/silicon/robot/R = owner
R.cell.charge += 25*(digest_brute+digest_burn) R.cell.charge += 25*damage_gain
if(offset) // If any different than default weight, multiply the % of offset. if(offset) // If any different than default weight, multiply the % of offset.
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. owner.nutrition += offset*(4.5*(damage_gain)/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 else
owner.nutrition += 4.5*(digest_brute+digest_burn)/difference owner.nutrition += 4.5*(damage_gain)/difference
//////////////////////////// DM_ABSORB //////////////////////////// //////////////////////////// DM_ABSORB ////////////////////////////