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

Update wizard.dm

Browse Source
This commit is contained in:
deathride58
2017-11-17 23:29:09 -05:00
committed by GitHub
parent a0d70d8823
commit eea00b4d85
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/wizard.dm
+4 -14
View File
@@ -89,31 +89,21 @@
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)
<<<<<<< HEAD
if(istype(objective, /datum/objective/crew)) 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> <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.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "SUCCESS"))
else else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>" 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") SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "FAIL"))
else else
if(objective.check_completion()) if(objective.check_completion())
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>" text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS") SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "SUCCESS"))
else else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>" text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL") SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "FAIL"))
wizardwin = 0 wizardwin = 0
=======
if(objective.check_completion())
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "SUCCESS"))
else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "FAIL"))
wizardwin = 0
>>>>>>> 8b19b49... JSON feedback (#32188)
count++ count++
if(wizard.current && wizard.current.stat!=2 && wizardwin) if(wizard.current && wizard.current.stat!=2 && wizardwin)