Skip to content

Commit

Permalink
Tesla coil input multiplier balance (#2038)
Browse files Browse the repository at this point in the history
zappy bois input multiplier
  • Loading branch information
lessthnthree authored and StealsThePRs committed Apr 20, 2024
1 parent d61b324 commit d35aec9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/modules/power/tesla/coil.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
return ITEM_INTERACT_BLOCKING
return ..()

/* NOVA EDIT CHANGE BEGIN - MOVED TO modular_nova/master_files/code/modules/power/tesla/coil.dm
/obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts()
. = ..()
var/power_multiplier = 0
Expand All @@ -50,6 +51,7 @@
power_multiplier += capacitor.tier
zap_cooldown -= (capacitor.tier * 20)
input_power_multiplier = max(1 * (power_multiplier / 8), 0.25) //Max out at 50% efficency.
*/// NOVA EDIT CHANGE END

/obj/machinery/power/energy_accumulator/tesla_coil/examine(mob/user)
. = ..()
Expand Down
9 changes: 9 additions & 0 deletions modular_nova/master_files/code/modules/power/tesla/coil.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts()
. = ..()
var/new_power_multiplier = 0.44
zap_cooldown = 10 SECONDS
for(var/datum/stock_part/capacitor/capacitor in component_parts)
new_power_multiplier += capacitor.tier * 0.12
zap_cooldown -= (capacitor.tier * 2 SECONDS)

input_power_multiplier = clamp(new_power_multiplier, 0.44, 0.92)
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6643,6 +6643,7 @@
#include "modular_nova\master_files\code\modules\power\powernet.dm"
#include "modular_nova\master_files\code\modules\power\lighting\light_mapping_helpers.dm"
#include "modular_nova\master_files\code\modules\power\singularity\containment_field.dm"
#include "modular_nova\master_files\code\modules\power\tesla\coil.dm"
#include "modular_nova\master_files\code\modules\projectiles\boxes_magazines\external\shotgun.dm"
#include "modular_nova\master_files\code\modules\projectiles\boxes_magazines\external\smg.dm"
#include "modular_nova\master_files\code\modules\projectiles\guns\ballistic.dm"
Expand Down

0 comments on commit d35aec9

Please sign in to comment.