cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the tesla being shit

Browse Source 
Fixes #14786

Muti-bolt is back, but the other ones don't go out as far and spread out more randomly

Power given has been cut down massively.

Ball expansion is now exponential.

Tesla now actually consumes energy and shrinks, causing the ball count to lower.

Fixes it repeatedly resetting shifting it pixel x/y causing flicks of the tesla ball apperenting 1 tile to the lowerleft

Fixes it growing even if it wasn't powered by a pr

Fixes #14786
This commit is contained in:
Kyle Spier-Swenson
2016-01-22 14:06:36 -08:00
parent dbf51fd9c4
commit 3e36a708a9
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+19 -12
View File
@@ -1,5 +1,5 @@
#define TESLA_DEFAULT_POWER 3476520
#define TESLA_MINI_POWER 1738260
#define TESLA_DEFAULT_POWER 1738260
#define TESLA_MINI_POWER 869130
var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/machinery/power/emitter,
@@ -31,6 +31,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
var/list/orbiting_balls = list()
var/produced_power
var/is_orbiting
var/energy_to_raise = 100
var/energy_to_lower = -10
/obj/singularity/energy_ball/Destroy()
for(var/obj/singularity/energy_ball/EB in orbiting_balls)
@@ -40,17 +42,11 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/process()
if(!is_orbiting)
handle_energy()
var/amount_to_move = 2 + orbiting_balls.len * 2
var/what_does_the_scouter_say_about_the_balls_power_level = (TESLA_DEFAULT_POWER + (TESLA_MINI_POWER * orbiting_balls.len))
move_the_basket_ball(amount_to_move)
pixel_x = 0
pixel_y = 0
move_the_basket_ball(2 + orbiting_balls.len * 2)
playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 15)
tesla_zap(src, 7, what_does_the_scouter_say_about_the_balls_power_level)
pixel_x = -32
pixel_y = -32
energy += rand(1,3) // ensure it generates energy without needing to be blasted by the PA too much due to its size, and that a tesla engine will always get bigger over time
tesla_zap(src, 7, TESLA_DEFAULT_POWER)
else
tesla_zap(src, rand(1,Clamp(orbiting_balls.len,3,7)), TESLA_MINI_POWER)
energy = 0 // ensure we dont have miniballs of miniballs
return
@@ -68,7 +64,10 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
loc = get_step(src,move_dir)
/obj/singularity/energy_ball/proc/handle_energy()
if(energy >= 300)
if(energy >= energy_to_raise)
energy_to_lower = energy_to_raise - 10
energy_to_raise += energy_to_raise
energy -= 300
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 15)
spawn(100)
@@ -82,6 +81,14 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
var/orbitsize = (I.Width()+I.Height())*pick(0.5,0.6,0.7)
orbitsize -= (orbitsize/world.icon_size)*(world.icon_size*0.25)
EB.orbit(src,orbitsize, pick(FALSE,TRUE), rand(10,25), pick(3,4,5,6,36))
else if (energy < energy_to_lower && orbiting_balls.len)
energy_to_raise = energy_to_raise * 0.5
energy_to_lower = (energy_to_raise * 0.5) - 10
var/Orchiectomy_target = pick(orbiting_balls)
orbiting_balls.Remove(Orchiectomy_target)
qdel(Orchiectomy_target)
else
energy -= 5*orbiting_balls.len