From ae3d6515f618c8b1ec0b5286c8d276b405b035d1 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 29 Dec 2017 21:45:58 +1300 Subject: [PATCH] bug fix and rework. --- .../SecForceEX/securityForceTradeShow.tw | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index a36697c5e37..d5fa523b7fb 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,17 @@ <<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>> + + <<include "SpecialForceUpgradeTree">> <<if $arcologies[0].prosperity < 25>> <<set _TradingPower = 15>> -- GitLab