diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 8d65abcefaa71bb9582b81feaa94bb0c793a859d..80e7afc3accfa408a284ecfeb9a9c71a7a3b65c2 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -703,6 +703,14 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $FCTVshow = 0>> <<set $lastShow = 0>> <<set $randShow = 0>> +<<set $MercenariesMessageSent = 0>> +<<set $SpecialForcesMessageSent = 0>> +<<set $BodyguardHasSucessfullyRecivedSignal = 0>> +<<set $finalChoice = "none">> +<<set $eliteTotal = 12>> +<<set $eliteDead = 0>> +<<set $eliteVegetable = 0>> +<<set $eliteFate = 0>> <<set $schoolSuggestion = 0>> <<set $TSS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> @@ -1140,27 +1148,27 @@ FertilityAge($fertilityAge) /* Special Force Variables [SFVAR] */ /* Extra content enabling */ -<<set $SFMODToggle = 0>> /* Does the player want to see the SF module at all? */ +<<set $SFMODToggle = 0>> /* Does the player want to see the SF module at all? */ /* Initial events and presentation logic */ -<<set $securityForceCreate = 0>> /* Has the player chosen to create the SF? Used for initial events */ -<<set $securityForceEventSeen = 0>> /* Has the player seen the SF event? Used to avoid re-event */ -<<set $securityForceName = "Special Force">> /* What is the SF called? */ -<<set $securityForceActive = 0>> /* SF is active - activates end of turn screen logic */ +<<set $securityForceCreate = 0>> /* Has the player chosen to create the SF? Used for initial events */ +<<set $securityForceEventSeen = 0>> /* Has the player seen the SF event? Used to avoid re-event */ +<<set $securityForceName = "Special Force">> /* What is the SF called? */ +<<set $securityForceActive = 0>> /* SF is active - activates end of turn screen logic */ /* SF control panel and logic */ <<set $securityForceSubsidyActive = 0>> /* Is the player having to subsidize the SF? */ -<<set $securityForceRecruit = 0>> /* How many recruits has the SF attracted this week? Used in recruitment calcs */ -<<set $securityForceTrade = 0>> /* How much trade has the SF encouraged this week? Used for rep calcs */ -<<set $securityForceBooty = 0>> /* How much money has the SF made this week? Used in money calcs */ -<<set $securityForceIncome = 0>> /* What was the final, adjusted take for the SF this week? Used for EOW text */ +<<set $securityForceRecruit = 0>> /* How many recruits has the SF attracted this week? Used in recruitment calcs */ +<<set $securityForceTrade = 0>> /* How much trade has the SF encouraged this week? Used for rep calcs */ +<<set $securityForceBooty = 0>> /* How much money has the SF made this week? Used in money calcs */ +<<set $securityForceIncome = 0>> /* What was the final, adjusted take for the SF this week? Used for EOW text */ <<set $securityForceProfitable = 0>> /* Is the SF profitable? Used for EOW text */ <<set $securityForceFocus = "recruit">> /* What is the SF's assigned job? */ -<<set $securityForceRulesOfEngagement = "hold">> /* What are the SF's ROE outside the arcology? */ -<<set $securityForceAccountability = "strict">> /* Is the SF being held accountable for its actions outside the arcology? */ -<<set $securityForceDepravity = 0>> /* How depraved has the SF become? Used for flavor text injections. */ +<<set $securityForceRulesOfEngagement = "hold">> /* What are the SF's ROE outside the arcology? */ +<<set $securityForceAccountability = "strict">> /* Is the SF being held accountable for its actions outside the arcology? */ +<<set $securityForceDepravity = 0>> /* How depraved has the SF become? Used for flavor text injections. */ <<set $securityForceUpgradeToken = 0>> /* Flag to keep track of single upgrade/week. */ -<<set $securityForceGiftToken = 0>> /* Flag to keep track of single gift/week. */ +<<set $securityForceGiftToken = 0>> /* Flag to keep track of single gift/week. */ /* Personnel/Gear */ <<set $securityForceArcologyUpgrades = 0>> /* How many militarized arcology upgrades has the player bought? */ @@ -1172,25 +1180,25 @@ FertilityAge($fertilityAge) <<set $securityForceAircraftPower = 0>> /* How many aircraft upgrades has the player bought? */ <<set $securityForceSpacePlanePower = 0>> /* Has the SF found a busted down spaceplane begging for work? */ <<set $securityForceFortressZeppelin = 0>> /* Has the SF found a busted down fortress zeppelin begging for work? */ -<<set $securityForceAC130 = 0>> /* Has the SF found a busted down AC-130 begging for work? */ +<<set $securityForceAC130 = 0>> /* Has the SF found a busted down AC-130 begging for work? */ <<set $securityForceDronePower = 0>> /* How many drone upgrades has the player bought? */ <<set $securityForceSatalitePower = 0>> /* Has the SF commendeered a satellite relay? */ <<set $securityForceGiantRobot = 0>> /* Has the player assembled a makeshift giant robot */ <<set $securityForceMissileSilo = 0>> /* Has the SF found a disused missile silo in need of reassignement?*/ <<set $securityForceAircraftCarrier = 0>> /* Has the SF found a busted down aircraft carrier begging for work? */ -<<set $securityForceSubmarine = 0>> /* Has the SF found a busted down submarine begging for work? */ -<<set $securityForceHeavyAmphibiousTransport = 0>> /* Has the SF found a busted down heavy amphibious transport begging for work? */ +<<set $securityForceSubmarine = 0>> /* Has the SF found a busted down submarine begging for work? */ +<<set $securityForceHeavyAmphibiousTransport = 0>> /* Has the SF found a busted down heavy amphibious transport begging for work? */ <<set $securityForceMissionEfficiency = 1>> /* How efficient is the SF at completing its assigned task? (Upgrades*Drug Multiplier) */ /* FacilitySupport */ -<<set $Lieutenantcolonel = 0>> -<<set $FacilitySupportSlaves = 0>> -<<set $FacilitySupportfficiency = 0>> -<<set $FacilitySupportUpgrade = 0>> +<<set $Lieutenantcolonel = 0>> /* Has a slave been selected to be a Lieutenant colonel? */ +<<set $FacilitySupportSlaves = 0>> /* How many slaves are assiting in the facility support? */ +<<set $FacilitySupportfficiency = 0>> /* How efficent is the support facility? */ +<<set $FacilitySupportUpgrade = 0>> /* How many support facility upgrades has the play brought? */ /* Colonel */ <<set $securityForceSexedColonelToken = 0>> /* Has the player sexed The colonel this week? */ -<<set $ColonelCore = 0>> /* What is the core of The Colonel? */ +<<set $ColonelCore = 0>> /* What is the core of The Colonel? */ <<set $securityForceColonelToken = 0>> /* Flag to keep track of talking to the colonel. */ <<set $securityForceColonelSexed = 0>> /* Has the player sexed The colonel this week? */ @@ -1198,10 +1206,10 @@ FertilityAge($fertilityAge) <<set $TradeShowAttendanceGranted = 0>> /* Has The Colonel been allowed to go the TradeShow? */ <<set $OverallTradeShowAttendance = 0>> /* how many times has The Colonel gone to the TradeShow */ <<set $CurrentTradeShowAttendance = 0>> /* Has the Colonel attended the current TradeShow? */ -<<set $TradeShowIncome = 0>> /* How much was The Colonel able to make at the TradeShow selling generic scematics? */ -<<set $TotalTradeShowIncome = 0>> /* Total TradeShowIncome */ -<<set $TradeShowHelots = 0>> /* How many menail slaves were sent as a bonus from generic scematic sales during the current TradeShow? -<<set $TotalTradeShowHelots = 0>> /* Total number of menail slaves acquired via the Trade Show */ +<<set $TradeShowIncome = 0>> /* How much was The Colonel able to make at the TradeShow selling generic scematics? */ +<<set $TotalTradeShowIncome = 0>> /* Total TradeShowIncome */ +<<set $TradeShowHelots = 0>> /* How many menail slaves were sent as a bonus from generic scematic sales during the current TradeShow? +<<set $TotalTradeShowHelots = 0>> /* Total number of menail slaves acquired via the Trade Show */ /* Misc mod variables */ diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 0bd16bde9360ae6470ec96d530d4c33b0940ba36..6ec2a45c28e822854b0b1f85c3a678b828d044a3 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -571,12 +571,34 @@ <</if>> <<if ndef $cheatModeM>> <<set $cheatModeM = 1>> +<</if>> +<<if ndef $MercenariesMessageSent>> +<<set $MercenariesMessageSent = 0>> +<</if>> +<<if ndef $SpecialForcesMessageSent>> +<<set $SpecialForcesMessageSent = 0>> +<</if>> +<<if ndef $BodyguardHasSucessfullyRecivedSignal>> +<<set $BodyguardHasSucessfullyRecivedSignal = 0>> +<</if>> +<<if ndef $finalChoice>> +<<set $finalChoice = "none">> +<</if>> +<<if ndef $eliteTotal>> +<<set $eliteTotal = 12>> +<</if>> +<<if ndef $eliteDead>> +<<set $eliteDead = 0>> +<</if>> +<<if ndef $eliteVegetable>> +<<set $eliteVegetable = 0>> +<</if>> +<<if ndef $eliteFate>> +<<set $eliteFate = 0>> +<</if>> /* SF anon additional Special Force Variables [SFVAR] */ -/* SF control panel and logic */ - - /* Personnel/Gear */ <</if>> <<if ndef $securityForceHeavyBattleTank>> @@ -613,7 +635,6 @@ <</if>> /* FacilitySupport */ - <<if ndef $FacSupIDs>> <<set $FacSupIDs = []>> <</if>>