Skip to content
Snippets Groups Projects
Commit ef41ccfa authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'fix-ass' into 'pregmod-master' 

Fix ass

Closes #1476

See merge request pregmodfan/fc-pregmod!6259
parents d4f16177 1801ffe7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/personalAssistant/assistantEvents.tw
+ 1873
− 1873
View file @ ef41ccfa
Source diff could not be displayed: it is too large. Options to address this: view the blob.
src/uncategorized/nonRandomEvent.tw
+ 1
− 1
View file @ ef41ccfa
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<<goto "P peacekeepers intro">> <<goto "P peacekeepers intro">>
<<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$HA.schoolPresent+$TFS.schoolPresent+$TCR.schoolPresent+$NUL.schoolPresent == 0) && ($schoolSuggestion == 0)>> <<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$HA.schoolPresent+$TFS.schoolPresent+$TCR.schoolPresent+$NUL.schoolPresent == 0) && ($schoolSuggestion == 0)>>
<<goto "P school suggestion">> <<goto "P school suggestion">>
<<elseif (def $assistant.fsOptions) && $assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>> <<elseif ($assistant.fsOptions !== 1) && $assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
<<set $Event = "assistant FS">> <<set $Event = "assistant FS">>
<<goto "Assistant Events">> <<goto "Assistant Events">>
<<elseif $assistant.personality > 0 && !$assistant.announcedName && $assistant.power > 0>> <<elseif $assistant.personality > 0 && !$assistant.announcedName && $assistant.power > 0>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment