cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

shortparry window restored, glaive parry req wield

Browse Source
This commit is contained in:
Hatterhat
2020-08-12 23:33:59 -05:00
parent f4f8812318
commit d5b788a655
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weaponry.dm
View File

@@ -309,8 +309,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/datum/block_parry_data/bokken/quick_parry // emphasizing REALLY SHORT PARRIES
parry_stamina_cost = 6 // still more costly than most parries, but less than a full bokken parry
parry_time_active = 4 // REALLY small parry window
parry_time_perfect = 2 // however...
parry_time_active = 5 // REALLY small parry window
parry_time_perfect = 2.5 // however...
parry_time_perfect_leeway = 2 // the entire time, the parry is perfect
parry_failed_stagger_duration = 1 SECONDS
parry_failed_clickcd_duration = 1 SECONDS // more forgiving punishments for missed parries

11
code/modules/mining/equipment/kinetic_crusher.dm
View File

@@ -183,7 +183,6 @@
attack_verb = list("stabbed", "diced", "sliced", "cleaved", "chopped", "lacerated", "cut", "jabbed", "punctured")
icon_state = "crusher-glaive"
item_state = "crusher0-glaive"
item_flags = ITEM_CAN_PARRY
block_parry_data = /datum/block_parry_data/crusherglaive
//ideas: altclick that lets you pummel people with the handguard/handle?
//parrying functionality?
@@ -217,6 +216,16 @@
if(owner.Adjacent(attacker) && (!attacker.anchored || ismegafauna(attacker))) // free backstab, if you perfect parry
attacker.dir = get_dir(owner,attacker)
/// triggered on wield of two handed item
/obj/item/kinetic_crusher/glaive/on_wield(obj/item/source, mob/user)
wielded = TRUE
item_flags |= (ITEM_CAN_PARRY)
/// triggered on unwield of two handed item
/obj/item/kinetic_crusher/glaive/on_unwield(obj/item/source, mob/user)
wielded = FALSE
item_flags &= ~(ITEM_CAN_PARRY)
/obj/item/kinetic_crusher/glaive/update_icon_state()
item_state = "crusher[wielded]-glaive" // this is not icon_state and not supported by 2hcomponent