From 2f750b261af1aaae404d5dd0140fd98690843914 Mon Sep 17 00:00:00 2001 From: Alex6511 Date: Sat, 15 Aug 2015 03:55:57 -0400 Subject: [PATCH 1/4] Update wizard.dm --- code/game/gamemodes/wizard/wizard.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 148a4b41a25..bab42e18bc0 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -70,6 +70,11 @@ kill_objective.owner = wizard kill_objective.find_target() wizard.objectives += kill_objective + + var/datum/objective/steal/steal_objective = new + steal_objective.owner = wizard + steal_objective.find_target() + wizard.objectives += steal_objective if (!(locate(/datum/objective/escape) in wizard.objectives)) var/datum/objective/escape/escape_objective = new @@ -81,10 +86,10 @@ steal_objective.find_target() wizard.objectives += steal_objective - if (!(locate(/datum/objective/escape) in wizard.objectives)) - var/datum/objective/escape/escape_objective = new - escape_objective.owner = wizard - wizard.objectives += escape_objective + if (!(locate(/datum/objective/hijack) in wizard.objectives)) + var/datum/objective/hijack/hijack_objective = new + hijack_objective.owner = wizard + wizard.objectives += hijack_objective if(61 to 85) var/datum/objective/assassinate/kill_objective = new @@ -302,4 +307,4 @@ Made a proc so this is not repeated 14 (or more) times.*/ return 1 /proc/iswizard(mob/living/M as mob) - return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.wizards) \ No newline at end of file + return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.wizards) From 780cc34d6e8753fdabf7bed6a63c91f8264ee528 Mon Sep 17 00:00:00 2001 From: Alex6511 Date: Sat, 15 Aug 2015 04:03:01 -0400 Subject: [PATCH 2/4] Update wizard.dm --- code/game/gamemodes/wizard/wizard.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index bab42e18bc0..7c38d931a94 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -108,6 +108,11 @@ wizard.objectives += survive_objective else + var/datum/objective/steal/steal_objective = new + steal_objective.owner = wizard + steal_objective.find_target() + wizard.objectives += steal_objective + if (!(locate(/datum/objective/hijack) in wizard.objectives)) var/datum/objective/hijack/hijack_objective = new hijack_objective.owner = wizard From 8d131e664e3d6b3003ecb6f3aa462257e2fc150c Mon Sep 17 00:00:00 2001 From: Alex6511 Date: Sat, 15 Aug 2015 04:04:02 -0400 Subject: [PATCH 3/4] Update wizard.dm --- code/game/gamemodes/wizard/wizard.dm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 7c38d931a94..e9b12d95879 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -42,7 +42,7 @@ /datum/game_mode/wizard/pre_setup() for(var/datum/mind/wiz in wizards) - wiz.current.loc = pick(wizardstart) + wiz.current.loc = pick(wizardstart)io return 1 @@ -81,17 +81,6 @@ escape_objective.owner = wizard wizard.objectives += escape_objective if(31 to 60) - var/datum/objective/steal/steal_objective = new - steal_objective.owner = wizard - steal_objective.find_target() - wizard.objectives += steal_objective - - if (!(locate(/datum/objective/hijack) in wizard.objectives)) - var/datum/objective/hijack/hijack_objective = new - hijack_objective.owner = wizard - wizard.objectives += hijack_objective - - if(61 to 85) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = wizard kill_objective.find_target() @@ -107,6 +96,17 @@ survive_objective.owner = wizard wizard.objectives += survive_objective + if(61 to 85) + var/datum/objective/steal/steal_objective = new + steal_objective.owner = wizard + steal_objective.find_target() + wizard.objectives += steal_objective + + if (!(locate(/datum/objective/hijack) in wizard.objectives)) + var/datum/objective/hijack/hijack_objective = new + hijack_objective.owner = wizard + wizard.objectives += hijack_objective + else var/datum/objective/steal/steal_objective = new steal_objective.owner = wizard From ddaea2f664ed4ef127424ad3b507851f26492df4 Mon Sep 17 00:00:00 2001 From: Alex6511 Date: Sat, 15 Aug 2015 04:05:51 -0400 Subject: [PATCH 4/4] Update wizard.dm --- code/game/gamemodes/wizard/wizard.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index e9b12d95879..6ccb27d2c2b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -42,7 +42,7 @@ /datum/game_mode/wizard/pre_setup() for(var/datum/mind/wiz in wizards) - wiz.current.loc = pick(wizardstart)io + wiz.current.loc = pick(wizardstart) return 1 @@ -65,7 +65,6 @@ /datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard) switch(rand(1,100)) if(1 to 30) - var/datum/objective/assassinate/kill_objective = new kill_objective.owner = wizard kill_objective.find_target() @@ -97,10 +96,10 @@ wizard.objectives += survive_objective if(61 to 85) - var/datum/objective/steal/steal_objective = new - steal_objective.owner = wizard - steal_objective.find_target() - wizard.objectives += steal_objective + var/datum/objective/assassinate/kill_objective = new + kill_objective.owner = wizard + kill_objective.find_target() + wizard.objectives += kill_objective if (!(locate(/datum/objective/hijack) in wizard.objectives)) var/datum/objective/hijack/hijack_objective = new