From fb15795f2b653ae4cd55ca7692af9f14c1b0f791 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 19 Sep 2014 13:38:10 -0300 Subject: [PATCH] Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" --- code/__HELPERS/game.dm | 58 +++--------- code/game/gamemodes/antag_spawner.dm | 21 ++--- code/game/gamemodes/blob/blobs/core.dm | 26 +++--- code/game/gamemodes/cult/cult.dm | 7 +- code/game/gamemodes/cult/runes.dm | 54 +++++------ code/game/gamemodes/game_mode.dm | 13 ++- code/game/gamemodes/wizard/rightandwrong.dm | 1 - code/game/machinery/transformer.dm | 16 +--- code/game/objects/items/devices/flash.dm | 17 +--- code/modules/admin/verbs/one_click_antag.dm | 91 ++++++++++++++++--- code/modules/events/alien_infestation.dm | 2 +- code/modules/events/ninja.dm | 5 +- .../carbon/alien/special/alien_embryo.dm | 14 +-- 13 files changed, 168 insertions(+), 157 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 1f95eaa70d3..440a907e527 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -311,56 +311,20 @@ return M return null -// Will poll ghosts for volunteers -/proc/get_candidates(be_special_flag=0, rolename=null, wait_time=200) - var/list/mob/dead/observer/volunteers = list() - var/list/client/candidates = list() - var/time_passed = world.time - - for(var/mob/dead/observer/G in player_list) - spawn(0) - if(!G.client) - return - if((G.client.prefs.be_special & be_special_flag) && !jobban_isbanned(G, get_roletext(be_special_flag)) || (be_special_flag < 0)) - switch(alert(G,"Do you want to be considered to be a [rolename ? rolename : get_roletext(be_special_flag)]?","Please answer in [wait_time/10] seconds!","Yes","No")) - if("Yes") - if((world.time-time_passed)>wait_time) - return - volunteers += G - if("No") - return - else - return - sleep(wait_time) - - for(var/mob/dead/observer/G in volunteers) - if(G.client) - candidates += G.client +// Will return a list of active candidates. It increases the buffer 5 times until it finds a candidate which is active within the buffer. +/proc/get_candidates(be_special_flag=0, afk_bracket=3000) + var/list/candidates = list() + // Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000)) + while(!candidates.len && afk_bracket < 6000) + for(var/mob/dead/observer/G in player_list) + if(G.client != null) + if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) + if(!G.client.is_afk(afk_bracket) && (G.client.prefs.be_special & be_special_flag)) + candidates += G.client + afk_bracket += 600 // Add a minute to the bracket, for every attempt return candidates -/proc/pick_from_candidates(be_special_flag=0, rolename=null, wait_time=200) - var/list/candidates = get_candidates(be_special_flag, rolename, wait_time) - if(candidates.len) - var/client/C = pick(candidates) - return C - return 0 //Unable to find a valid candidate - - -/proc/get_roletext(role) //Translates role flag to role text - var/roletext - switch(role) - if(BE_CHANGELING) roletext="changeling" - if(BE_TRAITOR) roletext="traitor" - if(BE_OPERATIVE) roletext="operative" - if(BE_WIZARD) roletext="wizard" - if(BE_REV) roletext="revolutionary" - if(BE_CULTIST) roletext="cultist" - if(BE_MONKEY) roletext="monkey" - if(BE_NINJA) roletext="ninja" - if(BE_ALIEN) roletext="alien" - return roletext - /proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480) if(!isobj(O)) O = new /obj/screen/text() O.maptext = maptext diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 9f2ecfdccea..1791a7319c7 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -3,7 +3,6 @@ throw_range = 5 w_class = 1.0 var/used = 0 - var/polling_ghosts = 0 /obj/item/weapon/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "") return @@ -43,7 +42,7 @@ ..() var/mob/living/carbon/human/H = usr - if(H.stat || H.restrained() || polling_ghosts) + if(H.stat || H.restrained()) return if(!istype(H, /mob/living/carbon/human)) return 1 @@ -54,12 +53,10 @@ if (used) H << "You already used this contract!" return - H << "You send out a call for aid into the realms! It will be about 20 seconds before you get a response." - polling_ghosts = 1 - var/client/C = pick_from_candidates(BE_WIZARD, "wizard's apprentice") - polling_ghosts = 0 - if(C) + var/list/candidates = get_candidates(BE_WIZARD) + if(candidates.len) src.used = 1 + var/client/C = pick(candidates) spawn_antag(C, get_turf(H.loc), href_list["school"]) else H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later." @@ -126,17 +123,13 @@ var/TC_cost = 0 /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) - if(polling_ghosts) - return if(used) user << "The teleporter is out of power." return - user << "Standby for reinforcements... ETA 20 seconds." - polling_ghosts = 1 - var/client/C = pick_from_candidates(BE_OPERATIVE, "Syndicate cyborg") - polling_ghosts = 0 - if(C) + var/list/borg_candicates = get_candidates(BE_OPERATIVE) + if(borg_candicates.len > 0) used = 1 + var/client/C = pick(borg_candicates) spawn_antag(C, get_turf(src.loc), "syndieborg") else user << "Unable to connect to Syndicate Command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index a179d503ce1..fd3ce5d5a5b 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -72,18 +72,20 @@ qdel(overmind) var/client/C = null + var/list/candidates = list() - spawn(0) - if(!new_overmind) - C = pick_from_candidates(BE_BLOB) - else - C = new_overmind + if(!new_overmind) + candidates = get_candidates(BE_BLOB) + if(candidates.len) + C = pick(candidates) + else + C = new_overmind - if(C) - var/mob/camera/blob/B = new(src.loc) - B.key = C.key - B.blob_core = src - src.overmind = B - return 1 - return 0 + if(C) + var/mob/camera/blob/B = new(src.loc) + B.key = C.key + B.blob_core = src + src.overmind = B + return 1 + return 0 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 69089cbb230..894e84f6ec9 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -101,7 +101,7 @@ // grant_runeword(cult_mind.current) // grant_secondword(cult_mind.current) update_cult_icons_added(cult_mind) - cult_mind.current << "You are a member of the cult!" + cult_mind.current << "You are a member of the cult!" memorize_cult_objectives(cult_mind) cult_mind.special_role = "Cultist" ..() @@ -129,11 +129,6 @@ // grant_runeword(cult_mind.current,"blood") // grant_runeword(cult_mind.current,"hell") -/datum/game_mode/proc/greet_cultist(mob/M) - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." - - /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob) if(!istype(mob)) return diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index ffc72668ec5..2b16cdcc366 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -113,24 +113,26 @@ var/list/sacrificed = list() "AAAAAAHHHH!", \ "You hear an anguished scream.") if(is_convertable_to_cult(M.mind)) - if(jobban_isbanned(M, "Syndicate") || jobban_isbanned(M, "cultist")) - M.visible_message("[M] screams horrifically before falling limp, his mind clearly broken by something he saw.", \ - "You are currently jobbanned from Cultist.") - M.ghostize(0) //Jobbanned players are force ghosted - M.resting = 1 - spawn(0) - var/client/C = pick_from_candidates(BE_CULTIST) //Try to find a suitable observer to replace the jobbanned player - if(C) - M.key = C.key - M << "Who are you? How did you get here? You can't seem to remember anything but..." - ticker.mode.add_cultist(M.mind) - M.mind.special_role = "Cultist" - ticker.mode.greet_cultist(M) - else - ticker.mode.add_cultist(M.mind) - M.mind.special_role = "Cultist" - ticker.mode.greet_cultist(M) - + ticker.mode.add_cultist(M.mind) + M.mind.special_role = "Cultist" + M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." + M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." +/*//convert no longer gives words + //picking which word to use + if(usr.mind.cult_words.len != ticker.mode.allwords.len) // No point running if they already know everything + var/convert_word + for(var/i=1, i<=3, i++) + convert_word = pick(ticker.mode.grantwords) + if(convert_word in usr.mind.cult_words) + if(i==3) convert_word = null //NOTE: If max loops is changed ensure this condition is changed to match /Mal + else + break + if(!convert_word) + usr << "\red This Convert was unworthy of knowledge of the other side!" + else + usr << "\red The Geometer of Blood is pleased to see his followers grow in numbers." + ticker.mode.grant_runeword(usr, convert_word) + return 1 */ else M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." M << "And not a single fuck was given, exterminate the cult at all costs." @@ -301,12 +303,8 @@ var/list/sacrificed = list() var/mob/dead/observer/ghost for(var/mob/dead/observer/O in loc) - if(!O.client) - continue - if(O.mind && O.mind.current && O.mind.current.stat != DEAD) - continue - if(!jobban_isbanned(O, "Syndicate") && !jobban_isbanned(O, "cultist")) - continue + if(!O.client) continue + if(O.mind && O.mind.current && O.mind.current.stat != DEAD) continue ghost = O break @@ -342,11 +340,12 @@ var/list/sacrificed = list() body_to_sacrifice.gib() // if(ticker.mode.name == "cult") -// ticker.mode: corpse_to_raise.mind) +// ticker.mode:add_cultist(corpse_to_raise.mind) // else // ticker.mode.cult |= corpse_to_raise.mind - ticker.mode.greet_cultist(corpse_to_raise) + corpse_to_raise << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." + corpse_to_raise << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." return @@ -436,7 +435,8 @@ var/list/sacrificed = list() ticker.mode.cult+=D.mind D.mind.special_role = "Cultist" - ticker.mode.greet_cultist(D) + D << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." + D << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index f57c052457f..517ccae3a06 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -211,7 +211,16 @@ var/list/drafted = list() var/datum/mind/applicant = null - var/roletext = get_roletext(role) + var/roletext + switch(role) + if(BE_CHANGELING) roletext="changeling" + if(BE_TRAITOR) roletext="traitor" + if(BE_OPERATIVE) roletext="operative" + if(BE_WIZARD) roletext="wizard" + if(BE_REV) roletext="revolutionary" + if(BE_CULTIST) roletext="cultist" + if(BE_MONKEY) roletext="monkey" + // Ultimate randomizing code right here for(var/mob/new_player/player in player_list) @@ -371,6 +380,8 @@ proc/display_roundstart_logout_report() msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" continue //Ghosted while alive + + for(var/mob/M in mob_list) if(M.client && M.client.holder) M << msg diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index e4eae407ef3..04b837c7d0a 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -14,7 +14,6 @@ if(H.mind) if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice") continue if(prob(25) && !(H.mind in ticker.mode.traitors)) - if(jobban_isbanned(H, "Syndicate") || jobban_isbanned(H, "traitor")) continue ticker.mode.traitors += H.mind H.mind.special_role = "traitor" var/datum/objective/survive/survive = new diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 1aab4cf960d..5f00666e819 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -59,13 +59,12 @@ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) return - // Activate the cooldown if the human isn't jobbanned - if(!jobban_isbanned(H, "Cyborg")) - cooldown = 1 + // Activate the cooldown + cooldown = 1 + update_icon() + spawn(cooldown_duration) + cooldown = 0 update_icon() - spawn(cooldown_duration) - cooldown = 0 - update_icon() playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) H.emote("scream") // It is painful @@ -75,11 +74,6 @@ // Sleep for a couple of ticks to allow the human to see the pain sleep(5) - if(jobban_isbanned(H, "Cyborg")) //Jobbanned players get horribly maimed instead - H.adjustBruteLoss(1000) - playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - return - use_power(5000) // Use a lot of power. var/mob/living/silicon/robot/R = H.Robotize(1) // Delete the items or they'll all pile up in a single tile and lag diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b09865e9d6b..c719a49a664 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -84,21 +84,8 @@ // if(M.mind.has_been_rev) // revsafe = 2 if(!revsafe) - if(jobban_isbanned(M, "Syndicate") || jobban_isbanned(M, "revolutionary")) - M << "You are currently jobbanned from Revolutionary." - user << "This mind was unable to survive the rigors of conversion and has been wiped clean!" - M.ghostize(0) //Jobbanned players are force ghosted - M.resting = 1 - spawn(0) - var/client/C = pick_from_candidates(BE_REV) //Try to find a suitable observer to replace the jobbanned player - if(C) - M.key = C.key - M << "Who are you? How did you get here? You can't seem to remember anything but..." - M.mind.has_been_rev = 1 - ticker.mode.add_revolutionary(M.mind) - else - M.mind.has_been_rev = 1 - ticker.mode.add_revolutionary(M.mind) + M.mind.has_been_rev = 1 + ticker.mode.add_revolutionary(M.mind) else if(revsafe == 1) user << "Something seems to be blocking the flash!" else diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 0a9d99fcab1..21875856b58 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -147,10 +147,35 @@ client/proc/one_click_antag() return 0 /datum/admins/proc/makeWizard() - var/client/C = pick_from_candidates(BE_WIZARD) + var/list/mob/dead/observer/candidates = list() + var/mob/dead/observer/theghost = null + var/time_passed = world.time - if(C) - var/mob/living/carbon/human/new_character=makeBody(C.mob) + for(var/mob/dead/observer/G in player_list) + if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) + spawn(0) + switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No")) + if("Yes") + if((world.time-time_passed)>300)//If more than 30 game seconds passed. + return + candidates += G + if("No") + return + else + return + + sleep(300) + + if(candidates.len) + shuffle(candidates) + for(var/mob/i in candidates) + if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard + + theghost = i + break + + if(theghost) + var/mob/living/carbon/human/new_character=makeBody(theghost) new_character.mind.make_Wizard() return 1 @@ -192,22 +217,42 @@ client/proc/one_click_antag() /datum/admins/proc/makeNukeTeam() - var/list/candidates = get_candidates(BE_OPERATIVE) - + var/list/mob/dead/observer/candidates = list() var/list/mob/dead/observer/chosen = list() - var/client/C = null + var/mob/dead/observer/theghost = null + var/time_passed = world.time + + for(var/mob/dead/observer/G in player_list) + if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate")) + spawn(0) + switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No")) + if("Yes") + if((world.time-time_passed)>300)//If more than 30 game seconds passed. + return + candidates += G + if("No") + return + else + return + + sleep(300) if(candidates.len) var/numagents = 5 var/agentcount = 0 for(var/i = 0, i300)//If more than 30 game seconds passed. + return + candidates += G + if("No") + return + else + return + sleep(300) + + for(var/mob/dead/observer/G in candidates) + if(!G.key) + candidates.Remove(G) if(candidates.len >= 3) //Minimum 3 to be considered a squad //Pick the lucky players var/numagents = min(5,candidates.len) //How many commandos to spawn while(numagents && deathsquadspawn.len && candidates.len) var/spawnloc = deathsquadspawn[1] - var/client/C = pick(candidates) - var/mob/dead/observer/chosen_candidate = C.mob + var/mob/dead/observer/chosen_candidate = pick(candidates) candidates -= chosen_candidate if(!chosen_candidate.key) continue diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index b96f2d5472e..c4c82a9cf45 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -32,7 +32,7 @@ if(temp_vent.network.normal_members.len > 20) //Stops Aliens getting stuck in small networks. See: Security, Virology vents += temp_vent - var/list/candidates = get_candidates(BE_ALIEN) + var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) while(spawncount > 0 && vents.len && candidates.len) var/obj/vent = pick_n_take(vents) diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index 6390d3ea352..746d1010d0f 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -42,9 +42,10 @@ //selecting a candidate player if(!key) - var/client/C = pick_from_candidates(BE_NINJA) - if(!C) + var/list/candidates = get_candidates(BE_NINJA) + if(!candidates.len) return kill() + var/client/C = pick(candidates) key = C.key if(!key) return kill() diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 5c2d03085cf..b895068c1c2 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -9,7 +9,6 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds icon_state = "larva0_dead" var/mob/living/affected_mob var/stage = 0 - var/polling_ghosts = 0 /obj/item/alien_embryo/New() if(istype(loc, /mob/living)) @@ -71,20 +70,23 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds affected_mob << "You feel something tearing its way out of your stomach..." affected_mob.adjustToxLoss(10) affected_mob.updatehealth() - if(prob(50) && !polling_ghosts) + if(prob(50)) AttemptGrow() /obj/item/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1) - polling_ghosts = 1 - var/client/C = pick_from_candidates(BE_ALIEN) - polling_ghosts = 0 + var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) + var/client/C = null // To stop clientless larva, we will check that our host has a client // if we find no ghosts to become the alien. If the host has a client // he will become the alien but if he doesn't then we will set the stage // to 2, so we don't do a process heavy check everytime. - if(!C) + if(candidates.len) + C = pick(candidates) + else if(affected_mob.client) + C = affected_mob.client + else stage = 4 // Let's try again later. return