From 5d70b0e2e3beff9025c121be979e2f9050777205 Mon Sep 17 00:00:00 2001 From: BordListian Date: Wed, 7 Feb 2018 15:58:01 +0100 Subject: [PATCH 1/3] 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 From 0d7d8095bb8f26ba77f7b24b608a594385f85d4b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 7 Feb 2018 14:13:13 -0500 Subject: [PATCH 2/3] Update doppler_array.dm --- code/game/machinery/doppler_array.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index b5942bde56..084bb29591 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -109,20 +109,14 @@ 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 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) + say("Explosion not large enough for research calculations.") return linked_techweb.max_bomb_value = orig_light - 10 linked_techweb.research_points += point_gain From 7295e9ba82a899d948be7e5e3c6643d6a6df954d Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 7 Feb 2018 14:14:53 -0500 Subject: [PATCH 3/3] Update doppler_array.dm --- code/game/machinery/doppler_array.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 4bd374b68c..084bb29591 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -110,15 +110,11 @@ GLOBAL_LIST_EMPTY(doppler_arrays) if(!istype(linked_techweb)) say("Warning: No linked research system!") return - var/adjusted = orig_light - 20 - linked_techweb.max_bomb_value + var/adjusted = orig_light - 10 - linked_techweb.max_bomb_value if(adjusted <= 0) say("Explosion not large enough for research calculations.") return var/point_gain = techweb_scale_bomb(adjusted) - if(point_gain <= 0) - say("Explosion not large enough for research calculations.") - return - var/point_gain = techweb_scale_bomb(adjusted) if(point_gain <= 0) say("Explosion not large enough for research calculations.") return