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

Xeno upgrades nerf #762

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Xeno upgrades nerf #762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ad3860
xeno upgrades nerf
definitelynotspaghetti Dec 5, 2024
07a458d
Update xeno_buffs.dm
definitelynotspaghetti Dec 5, 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
1 change: 1 addition & 0 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define DEFILER_TRANSVITOX "Transvitox"
#define DEFILER_OZELOMELYN "Ozelomelyn"
#define DEFILER_ACID "Sulphuric acid"
#define DEFILER_SANGUINAL "Sanguinal"

//Panther tearing tail reagents
#define PANTHER_HEMODILE "Hemodile"
Expand Down
28 changes: 12 additions & 16 deletions code/datums/status_effects/xeno_buffs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@
status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/upgrade_carapace
var/mob/living/carbon/xenomorph/buff_owner
var/armor_buff_per_chamber = 5
var/armor_buff_per_chamber = 2.5
var/chamber_scaling = 0

/datum/status_effect/upgrade_carapace/on_apply()
Expand Down Expand Up @@ -1010,8 +1010,8 @@
status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/upgrade_regeneration
var/mob/living/carbon/xenomorph/buff_owner
var/regen_buff_per_chamber = 0.05
var/sunder_regen_per_chamber = 0.33
var/regen_buff_per_chamber = 0.008
var/sunder_regen_per_chamber = 0.166
var/chamber_scaling = 0

/datum/status_effect/upgrade_regeneration/on_apply()
Expand Down Expand Up @@ -1044,7 +1044,7 @@
status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/upgrade_vampirism
var/mob/living/carbon/xenomorph/buff_owner
var/leech_buff_per_chamber = 0.033
var/leech_buff_per_chamber = 0.016
var/chamber_scaling = 0

/datum/status_effect/upgrade_vampirism/on_apply()
Expand All @@ -1067,14 +1067,10 @@

/datum/status_effect/upgrade_vampirism/proc/on_slash(datum/source, mob/living/target)
SIGNAL_HANDLER
if(target.stat == DEAD)
return
if(!ishuman(target))
if(target.stat == DEAD || !ishuman(target))
return
var/bruteloss_healed = buff_owner.maxHealth * leech_buff_per_chamber * chamber_scaling
var/fireloss_healed = clamp(bruteloss_healed - buff_owner.bruteloss, 0, bruteloss_healed)
buff_owner.adjustBruteLoss(-bruteloss_healed)
buff_owner.adjustFireLoss(-fireloss_healed)
var/health_amount = buff_owner.maxHealth * leech_buff_per_chamber * chamber_scaling
HEAL_XENO_DAMAGE(buff_owner, health_amount, FALSE)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Я же специально сделал так что-бы вампирик всегда хилил одинаковое количество ХП, теперь через HEAL_XENO_DAMAGE он будет хилить по-разному в зависимости наличия брута и бёрна

Copy link
Contributor Author

Choose a reason for hiding this comment

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

пон

buff_owner.updatehealth()

// ***************************************
Expand Down Expand Up @@ -1199,7 +1195,7 @@
DEFILER_OZELOMELYN = image('icons/Xeno/actions.dmi', icon_state = DEFILER_OZELOMELYN),
DEFILER_HEMODILE = image('icons/Xeno/actions.dmi', icon_state = DEFILER_HEMODILE),
DEFILER_TRANSVITOX = image('icons/Xeno/actions.dmi', icon_state = DEFILER_TRANSVITOX),
DEFILER_NEUROTOXIN = image('icons/Xeno/actions.dmi', icon_state = DEFILER_NEUROTOXIN),
DEFILER_SANGUINAL = image('icons/Xeno/actions.dmi', icon_state = DEFILER_SANGUINAL),
DEFILER_ACID = image('icons/Xeno/actions.dmi', icon_state = DEFILER_ACID),
)
var/datum/status_effect/upgrade_toxin/effect = attached_effect
Expand All @@ -1224,12 +1220,12 @@
var/mob/living/carbon/xenomorph/buff_owner
var/toxin_amount_per_chamber = 1
var/chamber_scaling = 0
var/datum/reagent/toxin/injected_reagent = /datum/reagent/toxin/xeno_neurotoxin
var/datum/reagent/toxin/injected_reagent = /datum/reagent/toxin/xeno_transvitox
var/list/selectable_reagents = list(
/datum/reagent/toxin/xeno_ozelomelyn,
/datum/reagent/toxin/xeno_hemodile,
/datum/reagent/toxin/xeno_transvitox,
/datum/reagent/toxin/xeno_neurotoxin,
/datum/reagent/toxin/xeno_sanguinal,
/datum/reagent/toxin/acid,
)

Expand Down Expand Up @@ -1290,7 +1286,7 @@
alert_type = /atom/movable/screen/alert/status_effect/upgrade_pheromones
var/mob/living/carbon/xenomorph/buff_owner
var/datum/aura_bearer/current_aura
var/phero_power_per_chamber = 1
var/phero_power_per_chamber = 0.5
var/phero_power_base = 1
var/chamber_scaling = 0
var/emitted_aura = AURA_XENO_RECOVERY
Expand Down Expand Up @@ -1348,7 +1344,7 @@
var/chamber_scaling = 0
var/list/selectable_trails = list(
/obj/effect/xenomorph/spray,
/obj/alien/resin/sticky/thin,
/obj/alien/resin/sticky/thin/temporary,
)

/datum/status_effect/upgrade_trail/on_apply()
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/structures/xeno/resin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,7 @@

ignore_weed_destruction = FALSE
refundable = FALSE

/obj/alien/resin/sticky/thin/temporary/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, PROC_REF(obj_destruction), MELEE), 3 SECONDS)
Copy link
Collaborator

Choose a reason for hiding this comment

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

эдд таймер не будет сильно тикер нагружать? на каждую резину будет свой таймер создаваться

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Хз если честно, но у оффов так же сделано, так что возможно не особо нагружает

Loading