From 3d07a6bbc8c00649355e948373ce1961c52c5e00 Mon Sep 17 00:00:00 2001 From: turnop <17540-turnop@users.noreply.gitgud.io> Date: Sun, 20 Sep 2020 19:36:17 -0700 Subject: [PATCH] adds $imperialeventweek --- src/uncategorized/nonRandomEvent.tw | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index 2962921aeb1..d3719fe6662 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -32,6 +32,7 @@ <</if>> <<elseif (_effectiveWeek >= 15) && ($arcologies[0].FSNeoImperialistLaw1 == 1) && $assholeKnight != 1>> <<set $assholeKnight = 1>> + <<set $imperialEventweek = _effectiveWeek>> <<goto "SE assholeknight">> <<elseif (_effectiveWeek == 17)>> <<set $Event = "shoot invitation">> @@ -174,11 +175,13 @@ <<goto "P slave medic">> <<elseif ($eventResults.pit == 1) && ($BodyguardID != 0)>> <<goto "PE pit fight">> -<<elseif (_effectiveWeek >= 37) && ($arcologies[0].FSNeoImperialistLaw1 == 1) && ($arcologies[0].FSNeoImperialistLaw2 == 1) && $poorKnight != 1>> +<<elseif (_effectiveWeek >= 37) && ($arcologies[0].FSNeoImperialistLaw1 == 1) && ($arcologies[0].FSNeoImperialistLaw2 == 1) && $poorKnight != 1 _effectiveWeek >= $imperialEventWeek+3>> <<set $poorKnight = 1>> + <<set $imperialEventweek = _effectiveWeek>> <<goto "SE poorknight">> -<<elseif (_effectiveWeek >= 40) && ($arcologies[0].prosperity > 80) && ($arcologies[0].FSNeoImperialistLaw2 == 1) && $newBaron != 1>> +<<elseif (_effectiveWeek >= 40) && ($arcologies[0].prosperity > 80) && ($arcologies[0].FSNeoImperialistLaw2 == 1) && $newBaron != 1 && _effectiveWeek >= $imperialEventWeek+3> <<set $newBaron = 1>> + <<set $imperialEventweek = _effectiveWeek>> <<goto "SE newBaron">> <<elseif $rivalOwner == 0 && $secExpEnabled > 0 && (_effectiveWeek >= 74 && $SecExp.smilingMan.progress === 0 || _effectiveWeek >= 77 && $SecExp.smilingMan.progress === 1 || _effectiveWeek >= 82 && $SecExp.smilingMan.progress === 2 || $SecExp.smilingMan.progress === 3)>> <<goto "secExpSmilingMan">> -- GitLab