From 5d70b0e2e3beff9025c121be979e2f9050777205 Mon Sep 17 00:00:00 2001 From: BordListian Date: Wed, 7 Feb 2018 15:58:01 +0100 Subject: [PATCH] Changes doppler array point formula --- code/game/machinery/doppler_array.dm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 75e3414b59..b5942bde56 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -109,11 +109,22 @@ GLOBAL_LIST_EMPTY(doppler_arrays) . = ..() if(!istype(linked_techweb)) say("Warning: No linked research system!") +<<<<<<< HEAD return var/point_gain = techweb_scale_bomb(orig_light - 20 - linked_techweb.max_bomb_value) if(!point_gain) +======= + return + var/adjusted = orig_light - 10 - linked_techweb.max_bomb_value + if(adjusted <= 0) + say("Explosion not large enough for research calculations.") return - linked_techweb.max_bomb_value = orig_light - 20 + var/point_gain = techweb_scale_bomb(adjusted) + if(point_gain <= 0) + say("Explosion not large enough for research calculations.") +>>>>>>> 08ed516... Changes doppler array point formula (#35383) + return + linked_techweb.max_bomb_value = orig_light - 10 linked_techweb.research_points += point_gain say("Gained [point_gain] points from explosion dataset.") @@ -124,4 +135,4 @@ GLOBAL_LIST_EMPTY(doppler_arrays) linked_techweb = SSresearch.science_tech /proc/techweb_scale_bomb(lightradius) - return (lightradius ** 0.5) * 13000 + return (lightradius ** 0.5) * 5000