diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 241238f6cf0d2df8face25cec09188f519c9d4ca..63c6056c02915467cd48eb2cd4b183d1713a6e74 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4822,4 +4822,18 @@ Pregmod 0.10.3.0
186
-fixes
- -SFanon's stuff
\ No newline at end of file
+ -SFanon's stuff
+
+ 187
+ -fixes
+ -SFanon's fixes
+
+ 12/06/17
+
+ 188
+ -fixes
+ -SFanon's fixes
+ -secEx tweaks
+
+ 189
+ -fixes and tweaks
\ No newline at end of file
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index 0b69f5c5cb6180df0978eaa336aa0f30cc08b258..3ee639f803ff010ce945534765d2165f8925cbd5 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -103,6 +103,12 @@
<<if ndef $allowPrestigeFromBattles>>
<<set $allowPrestigeFromBattles = 1>>
<</if>>
+<<if ndef $battleFrequency>>
+<<set $battleFrequency = 1>>
+<</if>>
+<<if ndef $rebellionSpeed>>
+<<set $rebellionSpeed = 1>>
+<</if>>
/* edicts */
<<if ndef $edictsUpkeep>>
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index e1ff70090df0406f800fc7cce49e4fbd2bc058b2..f8269dbb4f4eeb2734a1b61ebc662dd2cc830035 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -16,13 +16,15 @@
<<else>>
<<set _attackChance =20>>
<</if>>
- <<if $lastAttackWeeks >= 15>>
- <<set _attackChance += 5>>
- <</if>>
<<if $hasFoughtOnce == 1>>
<<set _attackChance = 25>>
<</if>>
+ <<if $lastAttackWeeks >= 10>>
+ <<set _attackChance += 5>>
+ <</if>>
<</if>>
+/* battle frequency */
+<<set _attackChance *= $battleFrequency>>
<<if $forceBattle == 1 && $forceRebellion != 1 && $foughtThisWeek == 0>>
<<set _attackChance = 100>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 8ee016fc43eb119051a4b0396b31adefb26b14f0..1d875c1b62672edb78f2b15d9ae268eba3a795f8 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -472,22 +472,9 @@ Offensive Tactics
<<goto "attackReport">>
<</link>>
<br>
-/* calculates bribe cost */
-<<if $week <= 30>>
- <<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
-<<elseif $week <= 30>>
- <<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
-<</if>>
-<<if $majorBattle == 1>>
- <<set $bribeCost *= 3>>
-<</if>>
+/* calculates bribe cost */
+<<calcBribe>>
<<link "Attempt to bribe">>
<<set $battleResult = 1>>
<<if $hasFoughtOnce == 0>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 4905a6cd146db452e0cf126ad730022ddc6be03b..3134e57c7064ce5e2f2c0ba88d5965af1d3da39c 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -132,9 +132,9 @@
<</if>>
<<set _roll = random(1,_slave + _citizen)>>
<<if $brainImplant == 106>>
- <<set _slave = Math.trunc(_slave * 0.2), _citizen = Math.trunc(_citizen * 0.2)>>
+ <<set _slave = Math.trunc(_slave * 0.5 * $rebellionSpeed), _citizen = Math.trunc(_citizen * 0.5 * $rebellionSpeed)>>
<<else>>
- <<set _slave = Math.trunc(_slave * 0.75), _citizen = Math.trunc(_citizen * 0.75)>>
+ <<set _slave = Math.trunc(_slave * $rebellionSpeed), _citizen = Math.trunc(_citizen * $rebellionSpeed)>>
<</if>>
<<if _roll <= _slave>>
<<if random(1,100) < _slave>>
diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw
index 46015b30d9a17a4c4fac2d33fd59d0484271991b..b0a5e5b885ae2347923cc117c2053487809fa8ff 100644
--- a/src/SecExp/secExpOptions.tw
+++ b/src/SecExp/secExpOptions.tw
@@ -185,7 +185,22 @@ __Rebellions__:
<</link>>
<</if>>
<br> //Enable/disable rebellions.//
+ <br>
<<if $rebellionsEnabled == 1>>
+ <<if $rebellionGameOver == 0>>
+ Rebellions can cause gameover is @@.red;FALSE@@.
+ <<link "Activate game loss in case of rebellions succeeding">>
+ <<set $rebellionGameOver = 1>>
+ <<goto "secExpOptions">>
+ <</link>>
+ <<elseif $rebellionGameOver == 1>>
+ Rebellions can cause gameover is @@.cyan;TRUE@@.
+ <<link "Deactivate game loss in case of rebellions succeeding">>
+ <<set $rebellionGameOver = 0>>
+ <<goto "secExpOptions">>
+ <</link>>
+ <</if>>
+ <br> //Determines wheter a total defeat in a rebellion will cause a gameover.//
<br>
<<if $forceRebellion == 0>>
Rebellions guaranteed this week is @@.red;FALSE@@.
@@ -201,21 +216,6 @@ __Rebellions__:
<</link>>
<</if>>
<br> //Will force rebellions to happen every week. Rebellions will take precedence over battles.//
- <br>
- <<if $rebellionGameOver == 0>>
- Rebellions can cause gameover is @@.red;FALSE@@.
- <<link "Activate game loss in case of rebellions succeeding">>
- <<set $rebellionGameOver = 1>>
- <<goto "secExpOptions">>
- <</link>>
- <<elseif $rebellionGameOver == 1>>
- Rebellions can cause gameover is @@.cyan;TRUE@@.
- <<link "Deactivate game loss in case of rebellions succeeding">>
- <<set $rebellionGameOver = 0>>
- <<goto "secExpOptions">>
- <</link>>
- <</if>>
- <br> //Determines wheter a total defeat in a rebellion will cause a gameover.//
<</if>>
<<if $showBattleStatistics == 0 &&($battlesEnabled == 1 || $rebellionsEnabled == 1)>>
@@ -304,6 +304,92 @@ __Battles/Rebellions Difficulty__:
@@.darkred;Very hard@@
<</replace>>
<</link>>
+<br>
+<br>
+__Battles frequency__:
+<br>Battle frequency is set to:<span id="battleFrequency">
+<<if $battleFrequency == 0.5>>
+ @@.green;Very infrequent@@
+<<elseif $battleFrequency == 0.75>>
+ @@.limegreen;Infrequent@@
+<<elseif $battleFrequency == 1>>
+ @@.yellow;Normal@@
+<<elseif $battleFrequency == 1.25>>
+ @@.red;Frequent@@
+<<else>>
+ @@.darkred;Very frequent@@
+<</if>>
+</span>
+<br>
+<<link "Very infrequent">>
+ <<set $battleFrequency = 0.5>>
+ <<replace "#battleFrequency">>
+ @@.green;Very infrequent@@
+ <</replace>>
+<</link>> | <<link "Infrequent">>
+ <<set $battleFrequency = 0.75>>
+ <<replace "#battleFrequency">>
+ @@.limegreen;Infrequent@@
+ <</replace>>
+<</link>> | <<link "Normal">>
+ <<set $battleFrequency = 1>>
+ <<replace "#battleFrequency">>
+ @@.yellow;Normal@@
+ <</replace>>
+<</link>> | <<link "Frequent">>
+ <<set $battleFrequency = 1.25>>
+ <<replace "#battleFrequency">>
+ @@.red;Frequent@@
+ <</replace>>
+<</link>> | <<link "Very frequent">>
+ <<set $battleFrequency = 1.5>>
+ <<replace "#battleFrequency">>
+ @@.darkred;Very frequent@@
+ <</replace>>
+<</link>>
+<br>
+<br>
+__Rebellions buildup speed__:
+<br>Rebellion speed is set to:<span id="rebellionSpeed">
+<<if $rebellionSpeed == 0.5>>
+ @@.green;Very slow@@
+<<elseif $rebellionSpeed == 0.75>>
+ @@.limegreen;Slow@@
+<<elseif $rebellionSpeed == 1>>
+ @@.yellow;Normal@@
+<<elseif $rebellionSpeed == 1.25>>
+ @@.red;Fast@@
+<<else>>
+ @@.darkred;Very fast@@
+<</if>>
+</span>
+<br>
+<<link "Very slow">>
+ <<set $rebellionSpeed = 0.5>>
+ <<replace "#rebellionSpeed">>
+ @@.green;Very slow@@
+ <</replace>>
+<</link>> | <<link "Slow">>
+ <<set $rebellionSpeed = 0.75>>
+ <<replace "#rebellionSpeed">>
+ @@.limegreen;Slow@@
+ <</replace>>
+<</link>> | <<link "Normal">>
+ <<set $rebellionSpeed = 1>>
+ <<replace "#rebellionSpeed">>
+ @@.yellow;Normal@@
+ <</replace>>
+<</link>> | <<link "Fast">>
+ <<set $rebellionSpeed = 1.25>>
+ <<replace "#rebellionSpeed">>
+ @@.red;Fast@@
+ <</replace>>
+<</link>> | <<link "Very fast">>
+ <<set $rebellionSpeed = 1.5>>
+ <<replace "#rebellionSpeed">>
+ @@.darkred;Very fast@@
+ <</replace>>
+<</link>>
<br>
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index 41db87c4a4208aa94bd0d6601bd768f2af781df1..489526b77d66d12ad6acc24d21e324f34acfb0b6 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -35,6 +35,8 @@
<<set $forceRebellion = 0>>
<<set $rebellionGameOver = 1>>
<<set $allowPrestigeFromBattles = 1>>
+<<set $battleFrequency = 1>>
+<<set $rebellionSpeed = 1>>
/* edicts */
<<set $edictsUpkeep = 0>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index aad8825bfde6c675012cb7a798f40fe0d2e017d8..230be15cbd9c7b86607eb0f56f58a433f4f72102 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -100,7 +100,7 @@
<</if>>
<<if $transportHub == 1>>
- <<if $terrain != "oceanic" || $terrain != "marine">>
+ <<if $terrain != "oceanic" && $terrain != "marine">>
<<set _secGrowth += ($airport + $railway - $hubSecurity * 3) / 2>>
<<else>>
<<set _secGrowth += ($airport + $docks - $hubSecurity * 3) / 2>>
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index d08c807307a1297fc93fa12e4af8b9ce10a5d2d5..16c308cc8821b594638822f3e3cb04f52d9f01a4 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -76,7 +76,7 @@
The arcology's airport is an incredible boon to the commercial development of the arcology.<<set _tradeChange += 3>>
<</if>>
- <<if $terrain != "oceanic" || $terrain != "marine">>
+ <<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
The railway network's age and limited extension limit commercial activity.
<<elseif $railway == 2>>
diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw
index f83f9aeb0427f147179c0416bfe72e175877b2c2..d813ed19796aa6b69c257826dd90343da6b003cf 100644
--- a/src/SecExp/transportHub.tw
+++ b/src/SecExp/transportHub.tw
@@ -4,7 +4,7 @@
<strong>The Transport Hub</strong>
<hr>
-You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" || $terrain != "marine">>the rail station.<<else>> the docks.<</if>>
+You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" && $terrain != "marine">>the rail station.<<else>> the docks.<</if>>
<<if $limitImmigration == 1 || $AntiImmigrationRep == 1>>
Due to your strict policies concerning immigration, very few new citizens arrive in the transport hub.
@@ -24,7 +24,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
The arcology's airport is huge and very well equipped. It can handle an impressive amount of traffic.
<</if>>
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
The railway network is old and limited. It can handle some traffic, but not sustain commercial activity.
<<elseif $railway == 2>>
@@ -107,7 +107,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
<</if>>
<br>
/* trainyard/dockyard */
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
<br>
<<link "Modernize the railway">>
diff --git a/src/SecExp/widgets/battleWidgets.tw b/src/SecExp/widgets/battleWidgets.tw
index 73cad8d8bc1caf27718aee83e82875b795e09edc..26edaff84521764dddd5cfd17038e8fdbf96ab8e 100644
--- a/src/SecExp/widgets/battleWidgets.tw
+++ b/src/SecExp/widgets/battleWidgets.tw
@@ -119,4 +119,22 @@
<<else>>
<br>@@.red;Error: widget called outside battle@@
<</if>>
+<</widget>>
+
+<<widget "calcBribe">>
+ <<if $week <= 30>>
+ <<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
+ <<elseif $week <= 30>>
+ <<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
+ <</if>>
+ <<if $majorBattle == 1>>
+ <<set $bribeCost *= 3>>
+ <</if>>
+ <<set $bribeCost = Math.trunc(Math.clamp($bribeCost,0,1000000))>>
<</widget>>
\ No newline at end of file
diff --git a/src/pregmod/securityForceTradeShow.tw b/src/pregmod/securityForceTradeShow.tw
new file mode 100644
index 0000000000000000000000000000000000000000..f2c1c5b8276c96a2785214ea1803f276ad666fca
--- /dev/null
+++ b/src/pregmod/securityForceTradeShow.tw
@@ -0,0 +1,152 @@
+:: securityForceTradeShow
+<<nobr>>
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
+
+<<set _N1 = 2>>
+<<set _N2 = 2>>
+<<set _N3 = 2>>
+
+<<if $economy == .5>>
+ <<set $Env = _N1>>
+<<elseif $economy == 1>>
+ <<set $Env = _N2>>
+<<elseif $economy == 1.5>>
+ <<set $Env = _N3>>
+<</if>>
+
+<<set _Barracks = $securityForceArcologyUpgrades>>
+<<set _Armoury = $securityForceInfantryPower>>
+<<set _StimulantLab = $securityForceStimulantPower>>
+<<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>>
+<<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>>
+<<set _DroneBay = $securityForceDronePower>>
+<<set _LaunchBayNO = $securityForceSatalitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
+<<set _LaunchBayO = $securityForceSatalitePower>>
+<<set _FacilitySupport = $FacilitySupport>>
+
+<<if $terrain != "oceanic" && $terrain != "marine">>
+ <<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>>
+<</if>>
+<<if $terrain == "oceanic" || $terrain == "marine">>
+ <<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>>
+<</if>>
+
+<<if $OverallTradeShowAttendance == 0>>
+ <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, back when I was a major there was a bi-yearly international security trade show that me and some of my colleagues went to. I would very much like to continue doing, can I?<span id="choice1">
+
+ <<link "Yes,">>
+ <<replace "#choice1">>
+ <br><br>"Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>."
+ <<set $OverallTradeShowAttendance += 1>>
+ <<set $CurrentTradeShowAttendanceGranted = 1>>
+ <<set $TradeShowAttendanceGranted = 1>>
+ <</replace>>
+ <</link>>
+
+ <<link "No">>
+ <<replace "#choice1">>
+ <br><br>"I understand <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>."
+ <</replace>>
+ <</link>>
+ </span>
+
+
+<<elseif $OverallTradeShowAttendance >= 1>>
+ <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, do you still need me back here?
+ <span id="choice2">
+
+ <<link "Yes">>
+ <<replace "#choice2">>
+ <br>The look of disappointement is bearly noticable on The Colonel's face.
+ <</replace>>
+ <</link>>
+
+ <<link "No,">>
+ <<replace "#choice2">><br>
+ <br>"Thanks <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>"
+
+ <<set $CurrentTradeShowAttendanceGranted = 1, _TradeShowAttendes = 150, _BonusProviderPercentage = .15>>
+ <<set _MenialSlavesPerAttendee = 15>>
+
+ <<if $arcologies[0].prosperity < 25>>
+ <<set _TradingPower = 15>>
+ <<elseif $arcologies[0].prosperity > 70>>
+ <<set _TradingPower = 25>>
+ <<elseif $arcologies[0].prosperity > 65>>
+ <<set _TradingPower = 24>>
+ <<elseif $arcologies[0].prosperity > 60>>
+ <<set _TradingPower = 23>>
+ <<elseif $arcologies[0].prosperity > 55>>
+ <<set _TradingPower = 22>>
+ <<elseif $arcologies[0].prosperity > 50>>
+ <<set _TradingPower = 21>>
+ <<elseif $arcologies[0].prosperity > 45>>
+ <<set _TradingPower = 20>>
+ <<elseif $arcologies[0].prosperity > 40>>
+ <<set _TradingPower = 19>>
+ <<elseif $arcologies[0].prosperity > 35>>
+ <<set _TradingPower = 18>>
+ <<elseif $arcologies[0].prosperity > 30>>
+ <<set _TradingPower = 17>>
+ <<elseif $arcologies[0].prosperity > 25>>
+ <<set _TradingPower = 16>>
+ <</if>>
+
+ <<if ($SFNO || $SFO) < 10 && random(0,100)+_TradingPower > 90>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.05>>
+ <<elseif ($SFNO || $SFO) >= 110 && random(0,100)+_TradingPower > 40>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.95>>
+ <<elseif ($SFNO || $SFO) >= 100 && random(0,100)+_TradingPower > 45>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.90>>
+ <<elseif ($SFNO || $SFO) >= 90 && random(0,100)+_TradingPower > 50>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.80>>
+ <<elseif ($SFNO || $SFO) >= 80 && random(0,100)+_TradingPower > 55>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.70>>
+ <<elseif ($SFNO || $SFO) >= 70 && random(0,100)+_TradingPower > 60>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.60>>
+ <<elseif ($SFNO || $SFO) >= 60 && random(0,100)+_TradingPower > 65>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.50>>
+ <<elseif ($SFNO || $SFO) >= 50 && random(0,100)+_TradingPower > 70>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.40>>
+ <<elseif ($SFNO || $SFO) >= 40 && random(0,100)+_TradingPower > 75>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.30>>
+ <<elseif ($SFNO || $SFO) >= 30 && random(0,100)+_TradingPower > 80>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.20>>
+ <<elseif ($SFNO || $SFO) >= 10 && random(0,100)+_TradingPower > 85>>
+ <<set _SuccesfulPersuationAttempt = 1>>
+ <<set _PersuationBonus = 1.10>>
+ <</if>>
+
+ <<set _RawMenialSlaves = random(0,_TradeShowAttendes)*_BonusProviderPercentage*_MenialSlavesPerAttendee*_PersuationBonus>>
+ <<set _SuccesfulPersuationAttempt = 0>>
+
+ <<set _RawProfit = ($cash*.010*$SFNO || $SFO*$arcologies[0].prosperity*$Env)*_PersuationBonus>>
+ <<set _ProcessedProfit = Math.trunc(_RawProfit)>>
+
+ <br>During a break, The Colonel manages to sell some generic scematics to the _TradeShowAttendes people peresent, some decided to also give her some menial slaves as a bonus.
+
+ <<set $helots = $helots+_RawMenialSlaves>>
+ <<set $TradeShowHelots += _RawMenialSlaves>>
+ <<set $TotalTradeShowHelots += _RawMenialSlaves>>
+
+ <<set $cash = $cash+_ProcessedProfit>>
+ <<set $TradeShowIncome += _ProcessedProfit>>
+ <<set $TotalTradeShowIncome += _ProcessedProfit>>
+
+ <</replace>>
+ <</link>>
+
+ </span>
+
+<</if>>
+<</nobr>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 9915643472ac942e40642c725a5f9050491b7aa7..007a817eab3b4f7f63b53d25a9881a399c024c0c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2388,8 +2388,10 @@ Setting missing slave variables:
<<set _Slave.health = 205>>
<</if>>
- <<set _Slave.devotion = (_Slave.devotion*5)>>
- <<set _Slave.trust = (_Slave.trust*5)>>
+ <<set _Slave.devotion = (_Slave.devotion*5)>>
+ <<set _Slave.oldDevotion = (_Slave.oldDevotion*5)>>
+ <<set _Slave.trust = (_Slave.trust*5)>>
+ <<set _Slave.oldTrust = (_Slave.oldTrust*5)>>
<<if _Slave.fetishStrength == 0>>
<<set _Slave.fetishStrength = random(0, 60)>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 12d87343066dfdf4009b7b93716b5e989f56fe33..124644242f62709d754abf71112648eea064f72c 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -158,6 +158,8 @@
<<goto "secExpSmilingMan">>
<<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>>
<<goto "secExpSmilingMan">>
+<<elseif (_effectiveWeek > 84) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>>
+ <<goto "securityForceTradeShow">>
<<else>>
<<if random(1,100) > _effectiveWeek+25>>
<<goto "RIE Eligibility Check">>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 9c3e7cb3cd0cf17a064252efba9d1c8da643ed65..7b0974296a22eb851e6c58abc0e6df3d86f27bc7 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -194,6 +194,8 @@
<<else>>
<<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
<</if>>
+<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel != 0 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>>
+ <<goto "securityForceTradeShow">>
<<elseif $plot == 1>>
<<goto "Nonrandom Event">>
<<else>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 777906bd25e67834ba11ae9bdf4a2452ffea61b4..654dfc809aff06c4d8336209d5657307e8c535b7 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -80,6 +80,9 @@
<<if $customSlave.analVirgin == 0>>
<<set $activeSlave.anus = $customSlave.analVirgin>>
<</if>>
+<<if $customSlave.voice != -1>>
+ <<set $activeSlave.voice = $customSlave.voice>>
+<</if>>
<<set $activeSlave.health = $customSlave.health>>
<<set $activeSlave.muscles = $customSlave.muscles>>
<<set $activeSlave.weight = $customSlave.weight>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 5965d4a3d8d1c760e655e2533efdea31b61c6361..93d686186a9275d4126df0d6bfb2a66e58a01d65 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -443,7 +443,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
- <span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
@@ -480,7 +480,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
- <span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
+ <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 5221186b90699a8b68b5b7adcee1f08ec81a325d..305b8d7da88f49065e242f314bf49cecbfd997e0 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -3598,7 +3598,7 @@ Your brand design is ''$brandDesign.''
<<if _combinedRule.growth.butt != "no default setting">>
<<if $args[0].butt < _combinedRule.growth.butt>>
<<set _priority = {drug: "butt injections", weight: (_combinedRule.growth.butt-$args[0].butt)/_combinedRule.growth.butt}, _priorities.push(_priority)>>
- <<elseif ($args[0].butt > _combinedRule.growth.butt) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
+ <<elseif ($args[0].butt > _combinedRule.growth.butt+.5) && $args[0].weight < 100 && ($arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
<<set _priority = {drug: "butt redistributors", weight: (1+(($args[0].butt-$args[0].buttImplant-_combinedRule.growth.butt)/_combinedRule.growth.butt))}, _priorities.push(_priority)>>
<</if>>
<</if>>