From 463fec60b5febb421b37f2569fa3887557c8360b Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 28 Mar 2012 01:17:53 +0100 Subject: [PATCH] Gamemode fixes for TG update. --- code/game/gamemodes/cult/cult.dm | 1 + code/game/gamemodes/extended/extended.dm | 10 ++++++++++ code/game/gamemodes/malfunction/malfunction.dm | 8 +++++--- code/game/gamemodes/meteor/meteor.dm | 4 ++++ code/game/gamemodes/nuclear/nuclear.dm | 2 ++ code/game/gamemodes/revolution/revolution.dm | 4 +++- code/game/gamemodes/traitor/traitor.dm | 2 ++ code/game/gamemodes/wizard/wizard.dm | 1 + 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index a4900fb0670..b528394a39d 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -22,6 +22,7 @@ restricted_jobs = list("AI", "Cyborg") required_players = 3 required_enemies = 3 + recommended_enemies = 4 var/datum/mind/sacrifice_target = null var/finished = 0 diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index 49ffe694fe0..c5208c4dc93 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -6,6 +6,10 @@ uplink_welcome = "Syndicate Uplink Console:" uplink_uses = 10 +// Enable this and the below to have command reports in extended +// var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) +// var/const/waittime_h = 1800 + /datum/game_mode/announce() world << "The current game mode is - Extended Role-Playing!" world << "Just have fun and role-play!" @@ -14,3 +18,9 @@ // setup_sectors() // spawn_exporation_packs() return 1 + +// Enable this and the above to have command reports in extended +///datum/game_mode/extended/post_setup() +// send_intercept() +// +// ..() \ No newline at end of file diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 46f52e65753..7d37ad039e3 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -6,6 +6,11 @@ config_tag = "malfunction" required_players = 1 required_enemies = 1 + recommended_enemies = 1 + + uplink_welcome = "Crazy AI Uplink Console:" + uplink_uses = 10 + var/const/waittime_l = 600 var/const/waittime_h = 1800 // started at 1800 @@ -15,9 +20,6 @@ var/to_nuke_or_not_to_nuke = 0 var/apcs = 0 //Adding dis to track how many APCs the AI hacks. --NeoFite - uplink_welcome = "Crazy AI Uplink Console:" - uplink_uses = 10 - /datum/game_mode/malfunction/announce() world << "The current game mode is - AI Malfunction!" diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index a91ce6414d6..76113946fba 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -10,6 +10,7 @@ uplink_welcome = "EVIL METEOR Uplink Console:" uplink_uses = 10 + /datum/game_mode/meteor/announce() world << "The current game mode is - Meteor!" world << "The space station has been stuck in a major meteor shower. You must escape from the station or at least live." @@ -38,6 +39,7 @@ /datum/game_mode/meteor/declare_completion() var/list/survivors = list() var/area/escape_zone = locate(/area/shuttle/escape/centcom) + var/area/pod_zone = list( /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom ) for(var/mob/living/player in world) if (player.client) @@ -45,6 +47,8 @@ var/turf/location = get_turf(player.loc) if (location in escape_zone) survivors[player.real_name] = "shuttle" + else if (location.loc.type in pod_zone) + survivors[player.real_name] = "pod" else survivors[player.real_name] = "alive" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 2eb032eacaf..5b06f9af445 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -7,6 +7,7 @@ config_tag = "nuclear" required_players = 3 required_enemies = 2 + recommended_enemies = 5 uplink_welcome = "Corporate Backed Uplink Console:" uplink_uses = 40 @@ -29,6 +30,7 @@ /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later if(!..()) return 0 + var/list/possible_syndicates = get_players_for_role(BE_OPERATIVE) var/agent_number = 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 4210ac52d51..04d534826dd 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -17,6 +17,8 @@ restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") required_players = 3 required_enemies = 3 + recommended_enemies = 3 + uplink_welcome = "Revolutionary Uplink Console:" uplink_uses = 10 @@ -133,7 +135,7 @@ if (!where) mob << "The Syndicate were unfortunately unable to get you a flash." else - mob << "The flash in your [where] would help you to use your extreme persuasion skills." + mob << "The flash in your [where] will implant a memory engram to convert others to our cause." return 1 ////////////////////////////////////// diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 59dea467592..413bdba5e8d 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -8,6 +8,8 @@ restricted_jobs = list("Cyborg", "AI")//Approved by headmins for a week test, if you see this it would be nice if you didn't spread it everywhere required_players = 0 required_enemies = 1 + recommended_enemies = 4 + uplink_welcome = "Syndicate Uplink Console:" uplink_uses = 10 diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index b53d4686fe0..9ae136270a6 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -7,6 +7,7 @@ config_tag = "wizard" required_players = 0 required_enemies = 1 + recommended_enemies = 1 uplink_welcome = "Wizardly Uplink Console:" uplink_uses = 10