shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING

Browse Source 
[READY] Redtext bug fix + Endround objective check cleanup
This commit is contained in:
deathride58
2017-11-21 05:53:00 +00:00
committed by GitHub
parent 8b5585afcf c2864b3b8b
commit 2e210d08e1
4 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/brother/traitor_bro.dm
+7 -6
View File
@@ -1,6 +1,6 @@
/datum/objective_team/brother_team /datum/objective_team/brother_team
name = "brotherhood" name = "brotherhood"
member_name = "blood brother" member_name = "blood brother"
var/list/objectives = list() var/list/objectives = list()
var/meeting_area var/meeting_area
@@ -71,7 +71,7 @@
num_teams = max(1, round(num_players() / bsc)) num_teams = max(1, round(num_players() / bsc))
for(var/j = 1 to num_teams) for(var/j = 1 to num_teams)
if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies) if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies)
break break
var/datum/objective_team/brother_team/team = new var/datum/objective_team/brother_team/team = new
var/team_size = prob(10) ? min(3, possible_brothers.len) : 2 var/team_size = prob(10) ? min(3, possible_brothers.len) : 2
@@ -113,12 +113,13 @@
var/objective_count = 1 var/objective_count = 1
for(var/datum/objective/objective in team.objectives) for(var/datum/objective/objective in team.objectives)
if(objective.check_completion()) if(objective.check_completion())
text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>" text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else else
text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>" text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
win = FALSE if(!(istype(objective, /datum/objective/crew)))
win = FALSE
objective_count++ objective_count++
if(win) if(win)
text += "<br><font color='green'><B>The blood brothers were successful!</B></font>" text += "<br><font color='green'><B>The blood brothers were successful!</B></font>"
code/game/gamemodes/changeling/changeling.dm
+6 -13
View File
@@ -113,20 +113,13 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
if(changeling.objectives.len) if(changeling.objectives.len)
var/count = 1 var/count = 1
for(var/datum/objective/objective in changeling.objectives) for(var/datum/objective/objective in changeling.objectives)
if(istype(objective, /datum/objective/crew)) if(objective.check_completion())
if(objective.check_completion()) text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> <font color='grey'>(Optional)</font>" SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
else
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
else else
if(objective.check_completion()) text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>" SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS") if(!(istype(objective, /datum/objective/crew)))
else
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>"
SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
changelingwin = 0 changelingwin = 0
count++ count++
code/game/gamemodes/traitor/traitor.dm
+6 -9
View File
@@ -113,17 +113,14 @@
if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
var/count = 1 var/count = 1
for(var/datum/objective/objective in traitor.objectives) for(var/datum/objective/objective in traitor.objectives)
if(istype(objective, /datum/objective/crew)) if(objective.check_completion())
if(objective.check_completion()) objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>" SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
else else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>" objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
traitorwin = FALSE if(!(istype(objective, /datum/objective/crew)))
traitorwin = FALSE
count++ count++
if(uplink_true) if(uplink_true)
code/game/gamemodes/wizard/wizard.dm
+8 -15
View File
@@ -47,7 +47,7 @@
for(var/datum/mind/wizard in wizards) for(var/datum/mind/wizard in wizards)
if(isliving(wizard.current) && wizard.current.stat!=DEAD) if(isliving(wizard.current) && wizard.current.stat!=DEAD)
return FALSE return FALSE
for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead() for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead()
if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard)) if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard))
return FALSE return FALSE
@@ -55,7 +55,7 @@
if(SSevents.wizardmode) //If summon events was active, turn it off if(SSevents.wizardmode) //If summon events was active, turn it off
SSevents.toggleWizardmode() SSevents.toggleWizardmode()
SSevents.resetFrequency() SSevents.resetFrequency()
return TRUE return TRUE
/datum/game_mode/wizard/declare_completion() /datum/game_mode/wizard/declare_completion()
@@ -89,20 +89,13 @@
var/count = 1 var/count = 1
var/wizardwin = 1 var/wizardwin = 1
for(var/datum/objective/objective in wizard.objectives) for(var/datum/objective/objective in wizard.objectives)
if(istype(objective, /datum/objective/crew)) if(objective.check_completion())
if(objective.check_completion()) text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>" SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
else else
if(objective.check_completion()) text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>" SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS") if(!(istype(objective, /datum/objective/crew)))
else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
wizardwin = 0 wizardwin = 0
count++ count++