From cbb0e1204087cb0e1703cac1a457348a2b6b52a9 Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Mon, 13 Nov 2017 19:13:14 +0100 Subject: [PATCH] moved smiling man and fluff --- src/SecExp/rebellionEvents.tw | 28 ++++++++++++++-------------- src/uncategorized/nonRandomEvent.tw | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw index 2c82cd80a1e..e7d7a5f6c6a 100644 --- a/src/SecExp/rebellionEvents.tw +++ b/src/SecExp/rebellionEvents.tw @@ -77,41 +77,41 @@ <<elseif _rand == 2>> This week a citizen was caught giving refuge to other citizens, who would be liable to be enslaved because of their debts. The situation was quickly resolved, but the misplaced generosity of that citizen might have inflamed a few souls. <<elseif _rand == 3>> - + This week a citizen died in one of the factories. His death sparked some outrage, even some talk of protests against the owners of the factory, but things seem to have calmed down for now. <<elseif _rand == 4>> - + This week a citizen refused to be evicted from his house. After some negotiations the man was forcibly removed from the property by your security forces. Unfortunately the forced entry caused some damage to the building. <<elseif _rand == 5>> - + This week a citizen refused to be enslaved as his contract established. With an impressive display of his rethoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones. <<else>> - + This week a security drone was found disabled and stripped of important electronic components. It seems the act was not dictated by greed, as the most precious parts of the drone were left on the machine, but rather to cover up something that the drone saw. <</if>> <<set $tension += random(1,5)>> <<case 5>> <<set _rand = random(0,5)>> <<if _rand == 0>> - + This week a factory was subject to a strike by a group of citizens protesting against the owner. They were proptly arrested and the factory returned to its rightful proprietor by our security department. <<elseif _rand == 1>> - + This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by our forces. <<elseif _rand == 2>> - + This week the security department registered the formation of several assemblies of citizens, whose purpouse seems to be political in nature. For now no furhter steps were taken, but it's a worrying sign of further political opposition within the arcology. <<elseif _rand == 3>> - + Placeholder mini event for citizens. Medium tension. <<elseif _rand == 4>> - + Placeholder mini event for citizens. Medium tension. <<else>> - + Placeholder mini event for citizens. Medium tension. <</if>> <<set $tension += random(5,10)>> <<case 6>> <<set _rand = random(0,4)>> <<if _rand == 0>> - + Placeholder mini event for citizens. High tension. <<elseif _rand == 1>> - + Placeholder mini event for citizens. High tension. <<elseif _rand == 2>> - + Placeholder mini event for citizens. High tension. <<elseif _rand == 3>> - + Placeholder mini event for citizens. High tension. <</if>> <<set $tension += random(10,15)>> <</switch>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index a40d844f32d..359f569b709 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -92,14 +92,6 @@ <</if>> <<elseif (_effectiveWeek == 72)>> <<goto "P coup aftermath">> -<<elseif $smilingManProgress == 0 && _effectiveWeek >= 74>> - <<goto "secExpSmilingMan">> -<<elseif $smilingManProgress == 1 && _effectiveWeek >= 77>> - <<goto "secExpSmilingMan">> -<<elseif $smilingManProgress == 2 && _effectiveWeek >= 82>> - <<goto "secExpSmilingMan">> -<<elseif $smilingManProgress == 3>> - <<goto "secExpSmilingMan">> <<elseif (_effectiveWeek > 5) && ($rep > 3000) && ($FSAnnounced == 0)>> <<goto "P FS Announcement">> <<elseif (_effectiveWeek > 18) && ($assistant > 0) && ($assistantOptions == 0)>> @@ -156,6 +148,14 @@ <<goto "P slave medic">> <<elseif ($PPit == 1) && ($Bodyguard != 0)>> <<goto "PE pit fight">> +<<elseif $smilingManProgress == 0 && _effectiveWeek >= 74>> + <<goto "secExpSmilingMan">> +<<elseif $smilingManProgress == 1 && _effectiveWeek >= 77>> + <<goto "secExpSmilingMan">> +<<elseif $smilingManProgress == 2 && _effectiveWeek >= 82>> + <<goto "secExpSmilingMan">> +<<elseif $smilingManProgress == 3>> + <<goto "secExpSmilingMan">> <<else>> <<if random(1,100) > _effectiveWeek+25>> <<goto "RIE Eligibility Check">> -- GitLab