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

Globber balance overhaul #3039

Merged
merged 8 commits into from
Apr 21, 2023
Merged

Globber balance overhaul #3039

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a83e58
the funna
TotalEpicness Apr 1, 2023
cea29f2
ASRS fixes
TotalEpicness Apr 10, 2023
f73c6dc
Globber balance patch
TotalEpicness Apr 10, 2023
0a0e3a1
Merge branch 'master' into Globbabal
morrowwolf Apr 10, 2023
f774899
FALSE
morrowwolf Apr 10, 2023
837fb47
AND
morrowwolf Apr 10, 2023
575b44c
Fire damage recalc, should make more sense now as an actual multiplie…
morrowwolf Apr 21, 2023
6f3fc89
Merge branch 'master' into Globbabal
morrowwolf Apr 21, 2023
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
7 changes: 6 additions & 1 deletion code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,12 @@
#define FIRE_IMMUNITY_XENO_FRENZY (1<<2)
#define FIRE_VULNERABILITY (1<<3)

#define FIRE_VULNERABILITY_MULTIPLIER 1.5
#define FIRE_MULTIPLIER_BASE 1
#define FIRE_MULTIPLIER_LOW 1.25
#define FIRE_MULTIPLIER_MEDIUM 1.5
#define FIRE_MULTIPLIER_HIGH 1.75 // Really starts chunking HP
#define FIRE_MULTIPLIER_EXTREME 2
#define FIRE_MULTIPLIER_DEADLY 3

#define TRAPPER_VIEWRANGE 13

Expand Down
8 changes: 5 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
plasma_gain = XENO_PLASMA_GAIN_TIER_7
plasma_max = XENO_PLASMA_TIER_4
xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_2
armor_deflection = XENO_ARMOR_TIER_2
armor_deflection = XENO_ARMOR_TIER_1
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
evasion = XENO_EVASION_NONE
speed = XENO_SPEED_TIER_3

Expand All @@ -23,6 +23,8 @@
caste_luminosity = 2
spit_types = list(/datum/ammo/xeno/boiler_gas, /datum/ammo/xeno/boiler_gas/acid)
fire_immunity = FIRE_VULNERABILITY
// 2x fire damage
fire_vulnerability_mult = FIRE_MULTIPLIER_EXTREME

tackle_min = 2
tackle_max = 6
Expand All @@ -49,8 +51,8 @@
gib_chance = 100
drag_delay = 6 //pulling a big dead xeno is hard
mutation_type = BOILER_NORMAL
spit_delay = 25 SECONDS
tileoffset = 4
spit_delay = 30 SECONDS
tileoffset = 3
viewsize = 7

icon_xeno = 'icons/mob/xenos/boiler.dmi'
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 @@ -78,8 +78,8 @@
if(!caste || !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire_reagent.fire_penetrating)
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"))
if(caste.fire_immunity & FIRE_VULNERABILITY)
apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * FIRE_VULNERABILITY_MULTIPLIER, BURN)
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)

#undef PASSIVE_BURN_DAM_CALC

Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@

var/caste_luminosity = 0

/// if fire_immunity is set to be vulnerable, how much will fire damage be multiplied. Defines in xeno.dm
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either change how the damage calculation works (as it doubles damage at the multiplier being 1 currently per line 82 of .../carbon/xenomorph/life.dm) or change the description here to say it adds the regular damage again times this number.

var/fire_vulnerability_mult = 0

var/burrow_cooldown = 5 SECONDS
var/tunnel_cooldown = 100
var/widen_cooldown = 10 SECONDS
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/ammo_datums.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2708,7 +2708,7 @@
name = "glob of neuro gas"
icon_state = "neuro_glob"
ping = "ping_x"
debilitate = list(2,2,0,0,11,12,1,10) // Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony
debilitate = list(2,2,0,1,11,12,1,10) // Stun,knockdown,knockout,irradiate,stutter,eyeblur,drowsy,agony
flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_EXPLOSIVE|AMMO_IGNORE_RESIST|AMMO_HITS_TARGET_TURF|AMMO_ACIDIC
var/datum/effect_system/smoke_spread/smoke_system
spit_cost = 200
Expand All @@ -2718,6 +2718,7 @@
accuracy_var_low = PROJECTILE_VARIANCE_TIER_4
accuracy = HIT_ACCURACY_TIER_2
scatter = SCATTER_AMOUNT_TIER_4
shell_speed = 0.75
max_range = 16
/// range on the smoke in tiles from center
var/smokerange = 4
Expand Down Expand Up @@ -2775,7 +2776,6 @@
icon_state = "acid_glob"
ping = "ping_x"
accuracy_var_high = PROJECTILE_VARIANCE_TIER_4
max_range = 16
smokerange = 3


Expand Down