diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index a36697c5e3743db85a539532fd02825a965ced04..9be6bdbe6e86873df70ffbd9762d049d12be26b9 100644 --- a/src/pregmod/SecForceEX/securityForceTradeShow.tw +++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw @@ -1,4 +1,4 @@ -:: securityForceTradeShow +:: securityForceTradeShow [nobr] <<nobr>> <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">> @@ -14,23 +14,6 @@ <<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 before I joined $securityForceName. Me and a couple of colleagues went to a bi-yearly international security trade show, I would very much like to continue doing so. can I?<span id="choice1"> @@ -54,15 +37,16 @@ <<elseif $OverallTradeShowAttendance >= 1>> The (bi-yearly) security trade show has finally come around and even though you've already granted The Colonel permission to attend, she's decided to come and ask for the leave personally. -<br><br> <span id="choice2"> + <br><br> <<link "Grant leave">> <<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>> + <<set $CurrentTradeShowAttendanceGranted = 1, _TradeShowAttendes = 150, _BonusProviderPercentage = .15, _MenialSlavesPerAttendee = 15>> + + <<include "SpecialForceUpgradeTree">> <<if $arcologies[0].prosperity < 25>> <<set _TradingPower = 15>> @@ -88,6 +72,7 @@ The (bi-yearly) security trade show has finally come around and even though you' <<set _TradingPower = 16>> <</if>> + <<set _SuccesfulPersuationAttempt == 0>> <<if ($SFNO || $SFO) < 10 && random(0,100)+_TradingPower > 90>> <<set _SuccesfulPersuationAttempt = 1>> <<set _PersuationBonus = 1.05>> @@ -122,22 +107,23 @@ The (bi-yearly) security trade show has finally come around and even though you' <<set _SuccesfulPersuationAttempt = 1>> <<set _PersuationBonus = 1.10>> <</if>> + + <<if _SuccesfulPersuationAttempt == 0>> + <<set _PersuationBonus = 1>> + <</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)>> + <<set _MenialSlaves = Math.ceil(random(0,_TradeShowAttendes)*_BonusProviderPercentage*_MenialSlavesPerAttendee*_PersuationBonus)>> + <<set _Profit = Math.ceil($cash*.010*$SFNO || $SFO*$arcologies[0].prosperity*$Env)*_PersuationBonus>> <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 $helots = $helots+_MenialSlaves>> + <<set $TradeShowHelots += _MenialSlaves>> + <<set $TotalTradeShowHelots += _MenialSlaves>> - <<set $cash = $cash+_ProcessedProfit>> - <<set $TradeShowIncome += _ProcessedProfit>> - <<set $TotalTradeShowIncome += _ProcessedProfit>> + <<set $cash = $cash+_Profit>> + <<set $TradeShowIncome += _Profit>> + <<set $TotalTradeShowIncome += _Profit>> <</replace>> <</link>>