cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix forcewall, temporal spellblades + H.E.C.K. suit processing (#28413)

Browse Source 
* 2 fixes!!

* ok, give it a bit more time
This commit is contained in:
kyunkyunkyun
2025-02-26 15:03:48 +05:00
committed by GitHub
parent b5595afa60
commit b3bdb3b43e
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/melee_misc.dm
+23 -20
View File
@@ -351,9 +351,9 @@
/obj/item/melee/spellblade/proc/add_enchantment(new_enchant, mob/living/user, intentional = TRUE)
var/datum/enchantment/E = new new_enchant
enchant = E
E.on_apply_to_blade(src)
E.on_gain(src, user)
E.power *= power
E.on_apply_to_blade(src)
if(intentional)
SSblackbox.record_feedback("nested tally", "spellblade_enchants", 1, list("[E.name]"))
@@ -377,15 +377,14 @@
var/power = 1
/// whether the enchant procs despite not being in proximity
var/ranged = FALSE
/// stores the world.time after which it can be used again, the `initial(cooldown)` is the cooldown between activations.
var/cooldown = -1
/// stores cooldown between activations.
var/cooldown = 0
/// If the spellblade has traits, has it applied them?
var/applied_traits = FALSE
/// A modifier that can be appled to the cooldown after the enchantment has been initialized. Used by the forcewall spellblade
var/cooldown_multiplier = 1
COOLDOWN_DECLARE(enchant_cooldown)
/datum/enchantment/proc/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S)
if(world.time < cooldown)
if(!COOLDOWN_FINISHED(src, enchant_cooldown))
return FALSE
if(!istype(target))
return FALSE
@@ -393,7 +392,6 @@
return FALSE
if(!ranged && !proximity)
return FALSE
cooldown = world.time + (initial(cooldown) * cooldown_multiplier)
return TRUE
/datum/enchantment/proc/on_gain(obj/item/melee/spellblade, mob/living/user)
@@ -423,6 +421,7 @@
. = ..()
if(.)
zap(target, user, list(user), power)
COOLDOWN_START(src, enchant_cooldown, cooldown)
/datum/enchantment/lightning/toggle_traits(obj/item/I, mob/living/user)
var/enchant_ID = UID() // so it only removes the traits applied by this specific enchant.
@@ -476,6 +475,7 @@
. = ..()
if(.)
fireflash_s(target, 4, 8000 * power, 500)
COOLDOWN_START(src, enchant_cooldown, cooldown)
/datum/enchantment/forcewall
name = "forcewall"
@@ -485,13 +485,13 @@
power = 2
/datum/enchantment/forcewall/on_apply_to_blade(obj/item/melee/spellblade)
cooldown_multiplier /= power
cooldown /= power
/datum/enchantment/forcewall/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S)
. = ..()
if(!.)
return
user.apply_status_effect(STATUS_EFFECT_FORCESHIELD)
if(.)
user.apply_status_effect(STATUS_EFFECT_FORCESHIELD)
COOLDOWN_START(src, enchant_cooldown, cooldown)
/datum/enchantment/bluespace
name = "bluespace"
@@ -523,11 +523,12 @@
user.forceMove(target_turf)
S.melee_attack_chain(user, target)
target.Weaken(power)
COOLDOWN_START(src, enchant_cooldown, cooldown)
/datum/enchantment/time_slash
name = "temporal"
desc = "this blade will slice faster but weaker, and will curse the target, slashing them a few seconds after they have not been swinged at for each hit"
power = 15 // This should come out to 40 damage per hit. However, delayed.
power = 20 // This should come out to 32.5 damage per hit. However, delayed.
/datum/enchantment/time_slash/on_apply_to_blade(obj/item/melee/spellblade)
spellblade.force /= 2
@@ -535,9 +536,8 @@
/datum/enchantment/time_slash/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S)
user.changeNext_move(CLICK_CD_MELEE * 0.5)
. = ..()
if(!.)
return
target.apply_status_effect(STATUS_EFFECT_TEMPORAL_SLASH, power)
if(.)
target.apply_status_effect(STATUS_EFFECT_TEMPORAL_SLASH, power)
/obj/effect/temp_visual/temporal_slash
name = "temporal slash"
@@ -574,10 +574,13 @@
/obj/item/melee/spellblade/random/Initialize(mapload)
. = ..()
var/list/options = list(/datum/enchantment/lightning,
/datum/enchantment/fire,
/datum/enchantment/forcewall,
/datum/enchantment/bluespace,
/datum/enchantment/time_slash,)
var/list/options = list(
/datum/enchantment/lightning,
/datum/enchantment/fire,
/datum/enchantment/forcewall,
/datum/enchantment/bluespace,
/datum/enchantment/time_slash,
)
var/datum/enchantment/E = pick(options)
add_enchantment(E, intentional = FALSE)