modularize out taser rework

2020-02-04 03:49:09 -07:00
parent 8556a6188f
commit 8db3fbdf88
8 changed files with 31 additions and 94 deletions
@@ -56,12 +56,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204


 //Movement Types
-#define GROUND				(1<<0)
-#define FLYING				(1<<1)
-#define VENTCRAWLING		(1<<2)
-#define FLOATING			(1<<3)
-#define UNSTOPPABLE			(1<<4)			//When moving, will Bump()/Cross()/Uncross() everything, but won't be stopped.
-#define CRAWLING			(1<<5)			//Applied if you're crawling around on the ground/resting.
+#define GROUND (1<<0)
+#define FLYING (1<<1)
+#define VENTCRAWLING (1<<2)
+#define FLOATING (1<<3)
+#define UNSTOPPABLE		(1<<4)			//When moving, will Bump()/Cross()/Uncross() everything, but won't be stopped.

 //Fire and Acid stuff, for resistance_flags
 #define LAVA_PROOF		(1<<0)
@@ -46,9 +46,7 @@

 #define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep

-#define STATUS_EFFECT_TASED_WEAK /datum/status_effect/electrode				//not as crippling, just slows down
-
-#define STATUS_EFFECT_TASED /datum/status_effect/electrode/no_combat_mode //the affected has been tased, preventing fine muscle control
+#define STATUS_EFFECT_TASED /datum/status_effect/no_combat_mode/electrode/ //the affected has been tased, preventing fine muscle control

 #define STATUS_EFFECT_PACIFY /datum/status_effect/pacify //the affected is pacified, preventing direct hostile actions

@@ -33,6 +33,7 @@
 	if(owner.getStaminaLoss())
 		owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds

+
 //UNCONSCIOUS
 /datum/status_effect/incapacitating/unconscious
 	id = "unconscious"
@@ -112,53 +113,31 @@
 	icon = 'icons/mob/actions/bloodsucker.dmi'
 	icon_state = "power_mez"

-/datum/status_effect/electrode
+/datum/status_effect/no_combat_mode/electrode
 	id = "tased"
-	var/slowdown = 1.5
-	var/slowdown_priority = 50		//to make sure the stronger effect overrides
-	var/affect_crawl = FALSE
-	var/nextmove_modifier = 1
-	var/stamdmg_per_ds = 1		//a 20 duration would do 20 stamdmg, disablers do 24 or something
-	var/last_tick = 0			//fastprocess processing speed is a goddamn sham, don't trust it.

-/datum/status_effect/electrode/on_creation(mob/living/new_owner, set_duration)
+/datum/status_effect/no_combat_mode/electrode/on_creation(mob/living/new_owner, set_duration)
 	if(isnum(set_duration)) //TODO, figure out how to grab from subtype
 		duration = set_duration
 	. = ..()
-	last_tick = world.time
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
 		if(C.combatmode)
 			C.toggle_combat_mode(TRUE)
-		C.add_movespeed_modifier("[MOVESPEED_ID_TASED_STATUS]_[id]", TRUE, priority = slowdown_priority, override = TRUE, multiplicative_slowdown = slowdown, blacklisted_movetypes = affect_crawl? NONE : CRAWLING)
+		C.add_movespeed_modifier(MOVESPEED_ID_TASED_STATUS, TRUE, override = TRUE, multiplicative_slowdown = 8)

-/datum/status_effect/electrode/on_remove()
+/datum/status_effect/no_combat_mode/electrode/on_remove()
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
-		C.remove_movespeed_modifier("[MOVESPEED_ID_TASED_STATUS]_[id]")
+		C.remove_movespeed_modifier(MOVESPEED_ID_TASED_STATUS)
 	. = ..()

-/datum/status_effect/electrode/tick()
-	var/diff = world.time - last_tick
+/datum/status_effect/no_combat_mode/electrode/tick()
 	if(owner)
-		owner.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
-	last_tick = world.time
+		owner.adjustStaminaLoss(5) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.

-/datum/status_effect/electrode/no_combat_mode
-	id = "tased_strong"
-	slowdown = 8
-	slowdown_priority = 100
-	nextmove_modifier = 2
-
-/datum/status_effect/electrode/no_combat_mode/on_creation(mob/living/new_owner, set_duration)
-	. = ..()
-	if(iscarbon(owner))
-		var/mob/living/carbon/C = owner
-		if(C.combatmode)
-			C.toggle_combat_mode(TRUE)
-
-/datum/status_effect/electrode/no_combat_mode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
-	return nextmove_modifier
+/datum/status_effect/no_combat_mode/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
+	return 2

 //OTHER DEBUFFS
 /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
@@ -1087,10 +1087,6 @@
 			fall(forced = 1)
 	canmove = !(ko || recoveringstam || pinned || IsStun() || IsFrozen() || chokehold || buckled || (!has_legs && !ignore_legs && !has_arms)) //Cit change - makes it plausible to move while resting, adds pinning and stamina crit
 	density = !lying
-	if(resting)
-		ENABLE_BITFIELD(movement_type, CRAWLING)
-	else
-		DISABLE_BITFIELD(movement_type, CRAWLING)
 	if(lying)
 		if(layer == initial(layer)) //to avoid special cases like hiding larvas.
 			layer = LYING_MOB_LAYER //so mob lying always appear behind standing mobs
@@ -5,10 +5,6 @@
 	e_cost = 200
 	harmful = FALSE

-/obj/item/ammo_casing/energy/electrode/security
-	projectile_type = /obj/item/projectile/energy/electrode/security
-	e_cost = 100
-
 /obj/item/ammo_casing/energy/electrode/spec
 	e_cost = 100

@@ -17,7 +13,6 @@
 	e_cost = 100

 /obj/item/ammo_casing/energy/electrode/hos
-	projectile_type = /obj/item/projectile/energy/electrode/security/hos
 	e_cost = 200

 /obj/item/ammo_casing/energy/electrode/old
@@ -32,4 +27,4 @@
 	click_cooldown_override = 3.5

 /obj/item/ammo_casing/energy/disabler/secborg
-	e_cost = 50
+	e_cost = 50
@@ -97,7 +97,7 @@
 	pin = null
 	can_charge = 0
 	ammo_x_offset = 1
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
 	selfcharge = EGUN_SELFCHARGE
 	var/fail_tick = 0
 	var/fail_chance = 0
@@ -113,21 +113,18 @@
 	..()

 /obj/item/gun/energy/e_gun/nuclear/proc/failcheck()
-	if(prob(fail_chance))
+	if(prob(fail_chance) && isliving(loc))
+		var/mob/living/M = loc
 		switch(fail_tick)
 			if(0 to 200)
 				fail_tick += (2*(fail_chance))
-				radiation_pulse(src, 50)
-				var/mob/M = (ismob(loc) && loc) || (ismob(loc.loc) && loc.loc)		//thank you short circuiting. if you powergame and nest these guns deeply you get to suffer no-warning radiation death.
-				if(M)
-					to_chat(M, "<span class='userdanger'>Your [name] feels warmer.</span>")
+				M.rad_act(400)
+				to_chat(M, "<span class='userdanger'>Your [name] feels warmer.</span>")
 			if(201 to INFINITY)
 				SSobj.processing.Remove(src)
-				radiation_pulse(src, 200)
-				crit_fail = TRUE
-				var/mob/M = (ismob(loc) && loc) || (ismob(loc.loc) && loc.loc)
-				if(M)
-					to_chat(M, "<span class='userdanger'>Your [name]'s reactor overloads!</span>")
+				M.rad_act(800)
+				crit_fail = 1
+				to_chat(M, "<span class='userdanger'>Your [name]'s reactor overloads!</span>")

 /obj/item/gun/energy/e_gun/nuclear/emp_act(severity)
 	. = ..()
@@ -18,23 +18,10 @@

 /obj/item/gun/energy/e_gun/advtaser
 	name = "hybrid taser"
-	desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams. <span class='boldnotice'>Right click in combat mode to fire a taser shot with a cooldown.</span>"
+	desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
 	icon_state = "advtaser"
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/electrode/security = FALSE)
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/electrode)
 	ammo_x_offset = 2
-	// Not enough guns have altfire systems like this yet for this to be a universal framework.
-	var/last_altfire = 0
-	var/altfire_delay = 15
-
-/obj/item/gun/energy/e_gun/advtaser/altafterattack(atom/target, mob/user, proximity_flag, params)
-	. = TRUE
-	if(last_altfire + altfire_delay > world.time)
-		return
-	var/current_index = current_firemode_index
-	set_firemode_to_type(/obj/item/ammo_casing/energy/electrode)
-	process_afterattack(target, user, proximity_flag, params)
-	set_firemode_index(current_index)
-	last_altfire = world.time

 /obj/item/gun/energy/e_gun/advtaser/cyborg
 	name = "cyborg taser"
@@ -2,11 +2,11 @@
 	name = "electrode"
 	icon_state = "spark"
 	color = "#FFFF00"
-	nodamage = TRUE
+	nodamage = 1
 	knockdown = 60
 	knockdown_stamoverride = 36
 	knockdown_stam_max = 50
-	stutter = 10
+	stutter = 5
 	jitter = 20
 	hitsound = 'sound/weapons/taserhit.ogg'
 	range = 7
@@ -14,7 +14,6 @@
 	muzzle_type = /obj/effect/projectile/muzzle/stun
 	impact_type = /obj/effect/projectile/impact/stun
 	var/tase_duration = 50
-	var/strong_tase = TRUE

 /obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = FALSE)
 	. = ..()
@@ -27,23 +26,10 @@
 		C.IgniteMob()
 		if(C.dna && C.dna.check_mutation(HULK))
 			C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
-		else if(tase_duration && (C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE))
-			C.apply_status_effect(strong_tase? STATUS_EFFECT_TASED : STATUS_EFFECT_TASED_WEAK, tase_duration)
+		else if((C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE))
+			C.apply_status_effect(STATUS_EFFECT_TASED, tase_duration)
 			addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, jitter), 5)

 /obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
 	do_sparks(1, TRUE, src)
 	..()
-
-/obj/item/projectile/energy/electrode/security
-	tase_duration = 20
-	knockdown = 0
-	stamina = 10
-	knockdown_stamoverride = 0
-	knockdown_stam_max = 0
-	strong_tase = FALSE
-
-/obj/item/projectile/energy/electrode/security/hos
-	knockdown = 100
-	knockdown_stamoverride = 30
-	knockdown_stam_max = null