From 6e74828a837b746f528e0b400e4dae4199878dc2 Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Wed, 14 Mar 2012 06:04:16 +0000 Subject: [PATCH] Bit of extra logging added to the tensioner, fixes possible bug, exposes some server settings via show-server-revision. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3287 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/configuration.dm | 2 +- code/datums/helper_datums/getrev.dm | 6 ++++++ code/datums/helper_datums/tension.dm | 17 ++++++++++++++++- code/modules/admin/verbs/diagnostics.dm | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index d967a48e910..2fc67fe9c3e 100644 --- a/code/datums/configuration.dm +++ b/code/datums/configuration.dm @@ -236,7 +236,7 @@ if("protect_roles_from_antagonist") config.protect_roles_from_antagonist = 1 - if("Tensioner_Active") + if("tensioner_active") config.Tensioner_Active = 1 if ("probability") diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index ee4e577f9f9..df60b9bb5af 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -86,5 +86,11 @@ client/verb/showrevinfo() var/output = "Sorry, the revision info is unavailable." if(revdata) output = revdata.showInfo() + + output += "Current Infomational Settings:
" + output += "Tensioner Status: [config.Tensioner_Active]
" + //output += "Current Tension: [tension_master.score]
" + //output += "Tensioner Debug Data: R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]
" + output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]
" usr << browse(output,"window=revdata"); return diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm index de51d3f4b77..8cbb625c43e 100644 --- a/code/datums/helper_datums/tension.dm +++ b/code/datums/helper_datums/tension.dm @@ -29,6 +29,13 @@ var/global/datum/tension/tension_master var/forcenexttick = 0 var/supress = 0 + var/eversupressed = 0 + var/cooldown = 0 + + var/round1 = 0 + var/round2 = 0 + var/round3 = 0 + var/round4 = 0 var/list/antagonistmodes = list ( "POINTS_FOR_TRATIOR" = 10000, @@ -58,9 +65,12 @@ var/global/datum/tension/tension_master if(config.Tensioner_Active) if(score > 10000) - if(!supress) + round1++ + if(!supress && !cooldown) if(prob(1) || forcenexttick) + round2++ if(prob(50) || forcenexttick) + round3++ if(forcenexttick) forcenexttick = 0 @@ -70,6 +80,10 @@ var/global/datum/tension/tension_master spawn(300) if(!supress) + cooldown = 1 + spawn(6000) + cooldown = 0 + round4++ for(var/V in antagonistmodes) // OH SHIT SOMETHING IS GOING TO HAPPEN NOW if(antagonistmodes[V] < score) potentialgames.Add(V) @@ -210,6 +224,7 @@ var/global/datum/tension/tension_master else if (href_list["Supress"]) supress = 1 + eversupressed++ spawn(6000) supress = 0 diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 75f48d40941..e2285de931b 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -226,6 +226,7 @@ Tension: [tension_master.score]
Increase Tension by 50000
Tension per player: [tension_master.score/tension_master.get_num_players()]
+Tensioner Debug Data: R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]
Recommendations: All the modes. All of them. Press all of them.