Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes trapper fire damage #6310

Closed
wants to merge 2 commits into from
Closed

Fixes trapper fire damage #6310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42536a6
Update trapper.dm
Git-Nivrak May 19, 2024
91632ca
makes it work
Git-Nivrak May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,9 @@
// Hive Pylon protection range
#define XENO_HIVE_PYLON_PROTECTION_RANGE 8

// Fire damage multiplier
#define XENO_FIRE_DAMAGE_MULT_VERY_LARGE 3

/////////////////////////////////////////////////////////////////////////////////////
//
// Default scaling values
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
var/evasion_modifier = 0
var/attack_speed_modifier = 0
var/armor_integrity_modifier = 0
var/fire_vulnerability_mult_modifier = 0

var/list/modifier_sources

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
G.die()
drop_inv_item_on_ground(G)
if(!caste || !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire_reagent.fire_penetrating)
if(caste.fire_immunity & FIRE_VULNERABILITY && caste.fire_vulnerability_mult >= 1)
apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * caste.fire_vulnerability_mult, BURN)
if(caste.fire_immunity & FIRE_VULNERABILITY && (caste.fire_vulnerability_mult + fire_vulnerability_mult_modifier) >= 1)
apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * (caste.fire_vulnerability_mult + fire_vulnerability_mult_modifier), BURN)
else
apply_damage(armor_damage_reduction(GLOB.xeno_fire, PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks)), BURN)
INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), pick("roar", "needhelp"))
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/xenomorph/strains/castes/boiler/trapper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
boiler.health_modifier -= XENO_HEALTH_MOD_MED

boiler.speed_modifier += XENO_SPEED_SLOWMOD_TIER_5 // compensating for base buffs
boiler.fire_vulnerability_mult_modifier -= XENO_FIRE_DAMAGE_MULT_VERY_LARGE // Default is 0, not 1 for some reason
boiler.recalculate_everything()

/datum/behavior_delegate/boiler_trapper
Expand Down
Loading