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
This commit is contained in:
VivianFoxfoot@gmail.com
2012-03-14 06:04:16 +00:00
parent 216b3fbf29
commit 6e74828a83
4 changed files with 24 additions and 2 deletions

View File

@@ -236,7 +236,7 @@
if("protect_roles_from_antagonist") if("protect_roles_from_antagonist")
config.protect_roles_from_antagonist = 1 config.protect_roles_from_antagonist = 1
if("Tensioner_Active") if("tensioner_active")
config.Tensioner_Active = 1 config.Tensioner_Active = 1
if ("probability") if ("probability")

View File

@@ -86,5 +86,11 @@ client/verb/showrevinfo()
var/output = "Sorry, the revision info is unavailable." var/output = "Sorry, the revision info is unavailable."
if(revdata) if(revdata)
output = revdata.showInfo() output = revdata.showInfo()
output += "Current Infomational Settings: <br>"
output += "Tensioner Status: [config.Tensioner_Active]<br>"
//output += "Current Tension: [tension_master.score]<br>"
//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]<br>"
output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>"
usr << browse(output,"window=revdata"); usr << browse(output,"window=revdata");
return return

View File

@@ -29,6 +29,13 @@ var/global/datum/tension/tension_master
var/forcenexttick = 0 var/forcenexttick = 0
var/supress = 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 ( var/list/antagonistmodes = list (
"POINTS_FOR_TRATIOR" = 10000, "POINTS_FOR_TRATIOR" = 10000,
@@ -58,9 +65,12 @@ var/global/datum/tension/tension_master
if(config.Tensioner_Active) if(config.Tensioner_Active)
if(score > 10000) if(score > 10000)
if(!supress) round1++
if(!supress && !cooldown)
if(prob(1) || forcenexttick) if(prob(1) || forcenexttick)
round2++
if(prob(50) || forcenexttick) if(prob(50) || forcenexttick)
round3++
if(forcenexttick) if(forcenexttick)
forcenexttick = 0 forcenexttick = 0
@@ -70,6 +80,10 @@ var/global/datum/tension/tension_master
spawn(300) spawn(300)
if(!supress) if(!supress)
cooldown = 1
spawn(6000)
cooldown = 0
round4++
for(var/V in antagonistmodes) // OH SHIT SOMETHING IS GOING TO HAPPEN NOW for(var/V in antagonistmodes) // OH SHIT SOMETHING IS GOING TO HAPPEN NOW
if(antagonistmodes[V] < score) if(antagonistmodes[V] < score)
potentialgames.Add(V) potentialgames.Add(V)
@@ -210,6 +224,7 @@ var/global/datum/tension/tension_master
else if (href_list["Supress"]) else if (href_list["Supress"])
supress = 1 supress = 1
eversupressed++
spawn(6000) spawn(6000)
supress = 0 supress = 0

View File

@@ -226,6 +226,7 @@
<B>Tension:</B> [tension_master.score]<BR> <B>Tension:</B> [tension_master.score]<BR>
<a href='?src=\ref[tension_master];addScore=1'>Increase Tension by 50000</a><br> <a href='?src=\ref[tension_master];addScore=1'>Increase Tension by 50000</a><br>
<B>Tension per player:</B> [tension_master.score/tension_master.get_num_players()]<BR> <B>Tension per player:</B> [tension_master.score/tension_master.get_num_players()]<BR>
<B>Tensioner Debug Data:</B> R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]<br>
<B>Recommendations:</B> All the modes. All of them. Press all of them.<BR> <B>Recommendations:</B> All the modes. All of them. Press all of them.<BR>
<BR> <BR>