cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15439 from Furbeh/WiztendedNoMore

Browse Source 
Wizard Mode can now have groups of Wizards
This commit is contained in:
Rob Nelson
2017-07-28 16:21:50 -07:00
committed by GitHub
parent ddcd1f29f1 e6b3f91fcb
commit 5585a47222
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/game/gamemodes/wizard/wizard.dm
View File

@@ -19,14 +19,16 @@
var/finished = 0 var/finished = 0
var/const/players_per_wizard = 10
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
var/wizard_amount= 1
can_be_mixed = TRUE can_be_mixed = TRUE
/datum/game_mode/wizard/announce() /datum/game_mode/wizard/announce()
to_chat(world, "<B>The current game mode is - Wizard!</B>") to_chat(world, "<B>The current game mode is - Wizard!</B>")
to_chat(world, "<B>There is a <span class='danger'>SPACE WIZARD on the station. You can't let him achieve his objective!</span>") to_chat(world, "<B>There are several <span class='danger'>SPACE WIZARDS on the station. You can't let them achieve their objectives!</span>")
/datum/game_mode/wizard/pre_setup() /datum/game_mode/wizard/pre_setup()
var/list/datum/mind/possible_wizards = get_players_for_role(ROLE_WIZARD) var/list/datum/mind/possible_wizards = get_players_for_role(ROLE_WIZARD)
@@ -34,29 +36,30 @@
log_admin("Failed to set-up a round of wizard. Couldn't find any volunteers to be wizards.") log_admin("Failed to set-up a round of wizard. Couldn't find any volunteers to be wizards.")
message_admins("Failed to set-up a round of wizard. Couldn't find any volunteers to be wizards.") message_admins("Failed to set-up a round of wizard. Couldn't find any volunteers to be wizards.")
return 0 return 0
var/datum/mind/wizard
while(possible_wizards.len) wizard_amount= max(round(num_players()/players_per_wizard, 1), 1)
wizard = pick(possible_wizards)
if(wizard.special_role || (mixed && (wizard in ticker.mode.modePlayer))) for(var/j = 0, j < wizard_amount, j++)
possible_wizards -= wizard if(!possible_wizards.len)
wizard = null
continue
else
break break
if(isnull(wizard)) var/datum/mind/wizard = pick(possible_wizards)
log_admin("COULD NOT MAKE A WIZARD, Mixed mode is [mixed ? "enabled" : "disabled"]") possible_wizards -= wizard
message_admins("COULD NOT MAKE A WIZARD, Mixed mode is [mixed ? "enabled" : "disabled"]") if(wizard.special_role || (mixed && (wizard in ticker.mode.modePlayer)))
return 0 j--
wizards += wizard continue
modePlayer += wizard wizards += wizard
modePlayer += wizard
wizard.assigned_role = "MODE" //So they aren't chosen for other jobs.
wizard.special_role = "Wizard"
wizard.original = wizard.current
if(mixed) if(mixed)
ticker.mode.modePlayer += wizards //merge into master antag list ticker.mode.modePlayer += wizards //merge into master antag list
ticker.mode.wizards += wizards ticker.mode.wizards += wizards
wizard.assigned_role = "MODE" //So they aren't chosen for other jobs.
wizard.special_role = "Wizard"
wizard.original = wizard.current
if(wizardstart.len == 0) if(wizardstart.len == 0)
to_chat(wizard.current, "<span class='danger'>A starting location for you could not be found, please report this bug!</span>") for(var/datum/mind/wwwizard in wizards)
to_chat(wwwizard.current, "<span class='danger'>A starting location for you could not be found, please report this bug!</span>")
log_admin("Failed to set-up a round of wizard. Couldn't find any wizard spawn points.") log_admin("Failed to set-up a round of wizard. Couldn't find any wizard spawn points.")
message_admins("Failed to set-up a round of wizard. Couldn't find any wizard spawn points.") message_admins("Failed to set-up a round of wizard. Couldn't find any wizard spawn points.")
return 0 return 0
@@ -142,7 +145,7 @@
var/wizard_name_second = pick(wizard_second) var/wizard_name_second = pick(wizard_second)
var/randomname = "[wizard_name_first] [wizard_name_second]" var/randomname = "[wizard_name_first] [wizard_name_second]"
spawn(0) spawn(0)
var/newname = copytext(sanitize(input(wizard_mob, "You are the Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN) var/newname = copytext(sanitize(input(wizard_mob, "You are a Space Wizard. Would you like to change your name to something else?", "Name change", randomname) as null|text),1,MAX_NAME_LEN)
if (!newname) if (!newname)
newname = randomname newname = randomname
@@ -154,7 +157,7 @@
/datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1)
if (you_are) if (you_are)
var/wikiroute = role_wiki[ROLE_WIZARD] var/wikiroute = role_wiki[ROLE_WIZARD]
to_chat(wizard.current, "<span class='danger'>You are the Space Wizard!</span> <span class='info'><a HREF='?src=\ref[wizard.current];getwiki=[wikiroute]'>(Wiki Guide)</a></span>") to_chat(wizard.current, "<span class='danger'>You are a Space Wizard!</span> <span class='info'><a HREF='?src=\ref[wizard.current];getwiki=[wikiroute]'>(Wiki Guide)</a></span>")
to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>") to_chat(wizard.current, "<B>The Space Wizards Federation has given you the following tasks:</B>")
var/obj_count = 1 var/obj_count = 1