Added the very basis of cultist mode, it doesn't have proper objectives yet, but at least I can catch some bugs via playtesting, hopefully.

Wizards now shout a spell when they're casting - not corresponding to the spell itself, though, it's a placeholder until granny finishes his voice acting.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@336 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-20 21:46:31 +00:00
parent c53ece134d
commit 39efab2ce3
42 changed files with 498 additions and 5 deletions

View File

@@ -265,7 +265,7 @@ var/showadminmessages = 1
<A href='?src=\ref[src];c_mode2=blob'>Blob</A><br>
<A href='?src=\ref[src];c_mode2=sandbox'>Sandbox</A><br>
<A href='?src=\ref[src];c_mode2=revolution'>Revolution</A><br>
<A href='?src=\ref[src];c_mode2=malfunction'>AI Malfunction</A><br>
<A href='?src=\ref[src];c_mode2=cult'>Cult</A><br> <A href='?src=\ref[src];c_mode2=malfunction'>AI Malfunction</A><br>
<A href='?src=\ref[src];c_mode2=deathmatch'>Death Commando Deathmatch</A><br>
<A href='?src=\ref[src];c_mode2=confliction'>Confliction (TESTING)</A><br>
<A href='?src=\ref[src];c_mode2=ctf'>Capture The Flag (Beta)</A><br><br>
@@ -302,6 +302,8 @@ var/showadminmessages = 1
master_mode = "wizard"
if("revolution")
master_mode = "revolution"
if("cult")
master_mode = "cult"
if("malfunction")
master_mode = "malfunction"
if("deathmatch")
@@ -663,6 +665,10 @@ var/showadminmessages = 1
else if(M.mind in current_mode:revolutionaries)
alert("Is a Revolutionary!")
return
if("cult")
if(M.mind in current_mode:cult)
alert("Is a Cultist!")
return
if("wizard")
if(current_mode:wizard && M.mind == current_mode:wizard)
var/datum/mind/antagonist = M.mind
@@ -1310,6 +1316,23 @@ var/showadminmessages = 1
dat += "There are no wizards."
*/
if("cult")
dat += "<br><table cellspacing=5><tr><td><B>Cultists</B></td><td></td></tr>"
for(var/datum/mind/N in ticker.mode:cult)
var/mob/M = N.current
if(M)
dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
dat += "</table><table cellspacing=5><tr><td><B>Target(s)</B></td><td></td><td><B>Location</B></td></tr>"
for(var/datum/mind/N in ticker.mode:get_living_heads())
var/mob/M = N.current
if(M)
dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
var/turf/mob_loc = get_turf_loc(M)
dat += "<td>[mob_loc.loc]</td></tr>"
dat += "</table>"
else // i'll finish this later
if(ticker.mode.traitors.len > 0)
dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>"
@@ -1963,6 +1986,9 @@ var/showadminmessages = 1
if("revolution")
if(M.mind in (ticker.mode:head_revolutionaries + ticker.mode:revolutionaries))
return 1
if("cult")
if(M.mind in ticker.mode:cult)
return 1
if("malfunction")
if(M.mind in ticker.mode:malf_ai)
return 1