Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull

Tesla Counterplay.
This commit is contained in:
silicons
2020-08-29 21:24:41 -07:00
committed by GitHub
3 changed files with 45 additions and 5 deletions
+8
View File
@@ -160,6 +160,14 @@
buckle_lying = FALSE
buckle_requires_restraints = TRUE
/obj/machinery/power/grounding_rod/Initialize()
GLOB.grounding_rods |= src
return ..()
/obj/machinery/power/grounding_rod/Destroy()
GLOB.grounding_rods.Remove(src)
return ..()
/obj/machinery/power/grounding_rod/default_unfasten_wrench(mob/user, obj/item/I, time = 20)
. = ..()
if(. == SUCCESSFUL_UNFASTEN)
+36 -5
View File
@@ -31,6 +31,7 @@
var/produced_power
var/energy_to_raise = 32
var/energy_to_lower = -20
var/obj/machinery/power/grounding_rod/rodtarget
/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
miniball = is_miniball
@@ -60,11 +61,12 @@
return //don't annnounce miniballs
..()
/obj/singularity/energy_ball/process()
if(!orbiting)
handle_energy()
determine_containment()
move_the_basket_ball(4 + orbiting_balls.len * 1.5)
playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30)
@@ -87,12 +89,19 @@
if(orbiting_balls.len)
. += "There are [orbiting_balls.len] mini-balls orbiting it."
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
//we face the last thing we zapped, so this lets us favor that direction a bit
var/move_bias = pick(GLOB.alldirs)
var/move_dir
for(var/rod in GLOB.grounding_rods) // grounding rods pull the tesla ball, picks the nearest one
if(!rodtarget || get_dist(src,rod)<get_dist(src,rodtarget))
rodtarget=rod
for(var/i in 0 to move_amount)
var/move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around
if(rodtarget)
move_dir = pick(GLOB.alldirs + get_dir(src,rodtarget))
else
move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around
if(target && prob(10))
move_dir = get_dir(src,target)
var/turf/T = get_step(src, move_dir)
@@ -102,6 +111,20 @@
for(var/mob/living/carbon/C in loc)
dust_mobs(C)
/obj/singularity/energy_ball/proc/determine_containment()
contained=0
var/found
var/tiletocheck
for(var/direction in GLOB.cardinals) // check a radius of 10 tiles around the ball for a full containment field
tiletocheck=get_step(src,direction)
for(var/tile in 1 to 10)
found=locate(/obj/machinery/field/containment) in tiletocheck
if(found)
continue
else if (!found && tile==10)
return // if one side is lacking a field it doesn't bother checking the others
tiletocheck=get_step(tiletocheck,direction)
contained=1
/obj/singularity/energy_ball/proc/handle_energy()
if(energy >= energy_to_raise)
@@ -121,6 +144,10 @@
else if(orbiting_balls.len)
dissipate() //sing code has a much better system.
if(energy<=0)
investigate_log("fizzled.", INVESTIGATE_SINGULO)
qdel(src)
/obj/singularity/energy_ball/proc/new_mini_ball()
if(!loc)
return
@@ -134,7 +161,6 @@
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
/obj/singularity/energy_ball/Bump(atom/A)
dust_mobs(A)
@@ -166,7 +192,6 @@
if (!QDELETED(src))
qdel(src)
/obj/singularity/energy_ball/proc/dust_mobs(atom/A)
if(isliving(A))
var/mob/living/L = A
@@ -329,6 +354,12 @@
else
power = closest_atom.zap_act(power, zap_flags, shocked_targets)
var/obj/singularity/energy_ball/tesla = source
if(istype(tesla))
if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained)
qdel(closest_atom) // each rod deletes two miniballs,
tesla.energy = round(tesla.energy/1.5625) // if there are no miniballs the rod stays and continues to pull the ball in
if(prob(20))//I know I know
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)