From b3a81d9c8ef28a2f465b66966c42e1e0e48bc238 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 13 Feb 2020 15:59:58 -0700
Subject: [PATCH] ok
---
code/game/objects/items/stunbaton.dm | 78 ++++++++++----------
modular_citadel/code/_onclick/item_attack.dm | 4 +-
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 45313dc9b0..5d97866f95 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -15,13 +15,17 @@
attack_verb = list("beaten")
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
- var/stunforce = 70
+ var/stamforce = 25
var/status = FALSE
var/obj/item/stock_parts/cell/cell
var/hitcost = 1000
var/throw_hit_chance = 35
var/preload_cell_type //if not empty the baton starts with this type of cell
+/obj/item/melee/baton/examine(mob/user)
+ . = ..()
+ . += "Right click attack while in combat mode to disarm instead of stun."
+
/obj/item/melee/baton/get_cell()
. = cell
if(iscyborg(loc))
@@ -32,7 +36,7 @@
user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
-/obj/item/melee/baton/Initialize()
+/obj/item/melee/baton/Initialize(mapload)
. = ..()
if(preload_cell_type)
if(!ispath(preload_cell_type,/obj/item/stock_parts/cell))
@@ -134,44 +138,40 @@
add_fingerprint(user)
/obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
+ var/interrupt = common_baton_melee(M, user, FALSE)
+ if(!interrupt)
+ ..()
+
+/obj/item/melee/baton/alt_pre_attack(atom/A, mob/living/user, params)
+ . = common_baton_melee(M, user, TRUE) //return true (attackchain interrupt) if this also returns true. no harm-disarming.
+
+//return TRUE to interrupt attack chain.
+/obj/item/melee/baton/proc/common_baton_melee(mob/M, mob/living/user, disarming = FALSE)
+ if(iscyborg(M) || !isliving(M)) //can't baton cyborgs
+ return FALSE
if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user)
- return
-
- if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
- to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
- return //CIT CHANGE - ditto
-
- if(iscyborg(M))
- ..()
- return
-
-
+ if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) //CIT CHANGE - makes it impossible to baton in stamina softcrit
+ to_chat(user, "You're too exhausted for that.")
+ return TRUE
if(ishuman(M))
var/mob/living/carbon/human/L = M
if(check_martial_counter(L, user))
- return
+ return TRUE
+ if(status)
+ if(baton_stun(M, user, disarming))
+ user.do_attack_animation(M)
+ user.adjustStaminaLossBuffered(getweight()) //CIT CHANGE - makes stunbatonning others cost stamina
+ else if(user.a_intent != INTENT_HARM) //they'll try to bash in the last proc.
+ M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \
+ "[user] has prodded you with [src]. Luckily it was off")
+ return disarming || (user.a_intent != INTENT_HARM)
- if(user.a_intent != INTENT_HARM)
- if(status)
- if(baton_stun(M, user))
- user.do_attack_animation(M)
- user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes stunbatonning others cost stamina
- return
- else
- M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \
- "[user] has prodded you with [src]. Luckily it was off")
- else
- if(status)
- baton_stun(M, user)
- ..()
-
-
-/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user)
+/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE)
if(L.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
- var/stunpwr = stunforce
+ var/stunpwr = stamforce
var/obj/item/stock_parts/cell/our_cell = get_cell()
if(!our_cell)
switch_status(FALSE)
@@ -187,17 +187,19 @@
return FALSE
stunpwr *= round(stuncharge/hitcost, 0.1)
-
- L.Knockdown(stunpwr, override_stamdmg = 0)
- L.apply_damage(stunpwr*0.5, STAMINA, user.zone_selected)
- L.apply_effect(EFFECT_STUTTER, stunforce)
+ if(!disarming)
+ L.Knockdown(100, override_stamdmg = 0) //knockdown
+ L.adjustStaminaLoss(stunpwr)
+ else
+ L.drop_all_held_items() //no knockdown/stamina damage, instead disarm.
+ L.apply_effect(EFFECT_STUTTER, stamforce)
SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
if(user)
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
- L.visible_message("[user] has stunned [L] with [src]!", \
- "[user] has stunned you with [src]!")
- log_combat(user, L, "stunned")
+ L.visible_message("[user] has [disarming? "disarmed" : "stunned"] [L] with [src]!", \
+ "[user] has [disarming? "disarmed" : "stunned"] you with [src]!")
+ log_combat(user, L, disarming? "disarmed" : "stunned")
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
diff --git a/modular_citadel/code/_onclick/item_attack.dm b/modular_citadel/code/_onclick/item_attack.dm
index 80281ee084..d87b2be661 100644
--- a/modular_citadel/code/_onclick/item_attack.dm
+++ b/modular_citadel/code/_onclick/item_attack.dm
@@ -1,12 +1,12 @@
/obj/item/proc/rightclick_melee_attack_chain(mob/user, atom/target, params)
- if(!pre_altattackby(target, user, params)) //Hey, does this item have special behavior that should override all normal right-click functionality?
+ if(!alt_pre_attack(target, user, params)) //Hey, does this item have special behavior that should override all normal right-click functionality?
if(!target.altattackby(src, user, params)) //Does the target do anything special when we right-click on it?
melee_attack_chain(user, target, params) //Ugh. Lame! I'm filing a legal complaint about the discrimination against the right mouse button!
else
altafterattack(target, user, TRUE, params)
return
-/obj/item/proc/pre_altattackby(atom/A, mob/living/user, params)
+/obj/item/proc/alt_pre_attack(atom/A, mob/living/user, params)
return FALSE //return something other than false if you wanna override attacking completely
/atom/proc/altattackby(obj/item/W, mob/user, params)