diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index c6312b107a98665c51c0722b225899db6827b01a..95b68abe80333c7d1db1520a455b6e117cff0422 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2727,5 +2727,5 @@ App.Data.weather = {
{name: "Cat 6 Hurricane", severity: 4},
{name: "Abrasive Sandstorm", severity: 4},
{name: "Radiological Warning", severity: 4},
- ],
+ ]
};
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
deleted file mode 100644
index 571892fdc6b630aee2a8bc72fdf2734a03507bc2..0000000000000000000000000000000000000000
--- a/src/SecExp/secInit.tw
+++ /dev/null
@@ -1,282 +0,0 @@
-:: secInit [nobr]
-
-/* base vars */
-<<set $SecExp = SecExpBase()>>
-<<= App.SecExp.Check.general()>>
-<<set $secExp = SecExpBase()>>
-<<set $attackType = "none">>
-<<set $attackThisWeek = 0>>
-<<set $lastAttackWeeks = 0>>
-<<set $lastRebellionWeeks = 0>>
-<<set $hasFoughtOnce = 0>>
-<<set $hasFoughtMajorBattleOnce = 0>>
-<<set $hasRebelledOnce = 0>>
-<<set $majorBattle = 0>>
-<<set $PCvictoryStreak = 0>>
-<<set $PCvictories = 0>>
-<<set $PClossStreak = 0>>
-<<set $PClosses = 0>>
-<<set $foughtThisWeek = 0>>
-
-/* edicts */
-<<set $alternativeRents = 0>>
-<<set $enslavementRights = 0>>
-<<set $securityExemption = 0>>
-<<set $sellData = 0>>
-<<set $propCampaignBoost = 0>>
-<<set $slaveWatch = 0>>
-<<set $subsidyChurch = 0>>
-<<set $limitImmigration = 0>>
-<<set $openBorders = 0>>
-<<set $slavesOfficers = 0>>
-<<set $martialSchool = 0>>
-<<set $discountMercenaries = 0>>
-<<set $militiaFounded = 0>>
-<<set $recruitVolunteers = 0>>
-<<set $conscription = 0>>
-<<set $militaryService = 0>>
-<<set $militarizedSociety = 0>>
-<<set $militaryExemption = 0>>
-<<set $lowerRquirements = 0>>
-<<set $noSubhumansInArmy = 0>>
-<<set $pregExemption = 0>>
-<<set $eliteOfficers = 0>>
-<<set $liveTargets = 0>>
-<<set $legionTradition = 0>>
-<<set $eagleWarriors = 0>>
-<<set $ronin = 0>>
-<<set $sunTzu = 0>>
-<<set $mamluks = 0>>
-<<set $pharaonTradition = 0>>
-<<set $weaponsLaw = 3>>
-<<set $soldierWages = 1>>
-<<set $militiaSoldierPrivilege = 0>>
-<<set $slaveSoldierPrivilege = 0>>
-<<set $mercSoldierPrivilege = 0>>
-<<set $tradeLegalAid = 0>>
-<<set $taxTrade = 0>>
-
-/* buildings */
-<<set $secHQ = 0>>
-<<set $secMenials = 0>>
-<<set $secUpgrades = {
- nanoCams: 0,
- cyberBots: 0,
- eyeScan: 0,
- cryptoAnalyzer: 0,
- coldstorage: 0}>>
-<<set $crimeUpgrades = {
- autoTrial: 0,
- autoArchive: 0,
- worldProfiler: 0,
- advForensic: 0}>>
-<<set $intelUpgrades = {
- sensors: 0,
- radar: 0,
- signalIntercept: 0}>>
-<<set $readinessUpgrades = {
- earlyWarn: 0,
- rapidPlatforms: 0,
- pathways: 0,
- rapidVehicles: 0}>>
-<<set $riotCenter = 0>>
-<<set $riotUpgrades = {
- freeMedia: 0,
- rapidUnit: 0,
- rapidUnitSpeed: 0}>>
-<<set $fort = {
- reactor: 0,
- waterway: 0,
- assistant:0}>>
-<<set $sentUnitCooldown = 0>>
-<<set $advancedRiotEquip = 0>>
-<<set $brainImplant = -1>>
-<<set $brainImplantProject = 0>>
-<<set $weapManu = 0>>
-<<set $weapMenials = 0>>
-<<set $weapProductivity = 1>>
-<<set $weapLab = 1>>
-<<set $baseUpgradeTime = 10>>
-<<set $currentUpgrade = {
- name: " ",
- unit: 0,
- type: 0,
- time: 0}>>
-<<set $droneUpgrades = {
- attack: 0,
- defense: 0,
- hp:0}>>
-<<set $humanUpgrade = {
- attack: 0,
- defense: 0,
- hp:0,
- morale: 0}>>
-<<set $sellTo = {
- citizen: 1,
- raiders: 1,
- oldWorld: 1,
- FC: 1}>>
-<<set $completedUpgrades = []>>
-<<set $transportHub = 0>>
-<<set $airport = 0>>
-<<set $railway = 0>>
-<<set $docks = 0>>
-<<set $hubSecurity = 1>>
-
-/* events */
-<<set $smilingManProgress = 0>>
-<<set $investedFunds = 0>>
-<<set $relationshipLM = 0>>
-<<set $captureRoute = 0>>
-<<set $collaborationRoute = 0>>
-<<set $smilingManWeek = 0>>
-<<set $globalCrisisWeeks = 0>>
-<<set $smilingManFate = 4>>
-
-/* rebellions */
-<<set $tension = 0>>
-<<set $slaveProgress = 0>>
-<<set $citizenProgress = 0>>
-<<set $slaveRebellionEventFires = 0>>
-<<set $citizenRebellionEventFires = 0>>
-<<set $slaveRebellion = 0>>
-<<set $citizenRebellion = 0>>
-<<set $rebellingUnits = []>>
-<<set $irregulars = 0>>
-<<set $engageRule = 0>>
-<<set $rebellingMilitia = 0>>
-<<set $rebellingSlaves = 0>>
-<<set $rebellingMercs = 0>>
-<<set $repairTime = 3>>
-<<set $arcRepairTime = 0>>
-<<set $garrison = {
- penthouse: 0,
- reactor: 0,
- assistant: 0,
- waterway: 0,
- reactorTime: 0,
- assistantTime: 0,
- waterwayTime: 0 }>>
-<<set $rebellionsCount = 0>>
-<<set $PCrebWon = 0>>
-<<set $PCrebLoss = 0>>
-
-
-/* armed forces stats */
-<<set $targetUnit = 0>>
-<<set $targetIndex = 0>>
-<<set $secBotsCost = 500>>
-<<set $secBotsUpgradeCost = 250>>
-<<set $equipUpgradeCost = 250>>
-<<set $maxTroops = 30>>
-<<set $militiaTotalManpower = 0>>
-<<set $militiaFreeManpower = 0>>
-<<set $militiaEmployedManpower = 0>>
-<<set $militiaTotalCasualties = 0>>
-<<set $slavesOfficers = 0>>
-<<set $slavesEmployedManpower = 0>>
-<<set $slavesTotalCasualties = 0>>
-<<set $mercTotalManpower = 0>>
-<<set $mercEmployedManpower = 0>>
-<<set $mercTotalCasualties = 0>>
-<<set $mercLoyalty = 0>>
-<<set $createdSlavesUnits = 0>>
-<<set $createdMilitiaUnits = 0>>
-<<set $createdMercUnits = 0>>
-<<set $mercFreeManpower = 0>>
-<<if $wasToggledBefore == 0>>
- <<if $mercenaries == 1>>
- <<set $mercFreeManpower = random(5,20)>>
- <<elseif $mercenaries > 1>>
- <<set $mercFreeManpower = random(10,30)>>
- <</if>>
-<</if>>
-
-/* battle relevant variables */
-<<set $slaveVictories = []>>
-<<set $slaveIncreasedPrestige = 0>>
-<<set $totalKills = 0>>
-<<set $battlesCount = 0>>
-<<set $majorBattlesCount = 0>>
-<<set $chosenTactic = "none">>
-<<set $leadingTroops = "none">>
-<<set $attackTroops = 0>>
-<<set $attackEquip = 0>>
-<<set $battleTerrain = "none">>
-<<set $maxTurns = 10>>
-<<set $battleResult = 4>> /* sets $battleResult value outside accepted range (-3,3) to avoid evaluation problems */
-<<set $losses = 0>>
-<<set $enemyLosses = 0>>
-<<set $battleTurns = 0>>
-<<set $tacticsSuccessful = 0>>
-<<set $leaderWounded = 0>>
-<<set $woundType = 0>> /* 0=no wound, 1=mute, 2=blind, 3=amputee, 4<=health */
-<<set $gainedCombat = 0>>
-<<set $gainedWarfare = 0>>
-<<set $expectedEquip = 0>>
-<<set $estimatedMen = 0>>
-<<set $SFIntervention = 0>>
-<<set $carriableSoldiers = 0>>
-<<set $SFatk = 0>>
-<<set $SFdef = 0>>
-<<set $SFhp = 0>>
-<<set $rebellingID = []>>
-<<set $saveValid = 0>>
-<<set $lastSelection = []>>
-
-/* statistics */
-<<set $equipMod = 0.15>>
-<<set $secBotsBaseAttack = 7>>
-<<set $secBotsBaseDefense = 3>>
-<<set $secBotsMorale = 200>>
-<<set $secBotsBaseHp = 3>>
-<<set $militiaBaseAttack = 7>>
-<<set $militiaBaseDefense = 5>>
-<<set $militiaBaseMorale = 140>>
-<<set $militiaBaseHp = 3>>
-<<set $slaveBaseAttack = 8>>
-<<set $slaveBaseDefense = 3>>
-<<set $slaveBaseMorale = 110>>
-<<set $slaveBaseHp = 3>>
-<<set $mercBaseAttack = 8>>
-<<set $mercBaseDefense = 4>>
-<<set $mercBaseMorale = 125>>
-<<set $mercBaseHp = 4>>
-<<set $SFBaseAttack = 8>>
-<<set $SFBaseDefense = 4>>
-<<set $SFBaseMorale = 140>>
-<<set $SFBaseHp = 4>>
-
-<<set $raBaseAttack = 7>>
-<<set $raBaseDefense = 2>>
-<<set $raBaseMorale = 100>>
-<<set $raBaseHp = 2>>
-<<set $fcBaseAttack = 6>>
-<<set $fcBaseDefense = 4>>
-<<set $fcBaseMorale = 130>>
-<<set $fcBaseHp = 3>>
-<<set $owBaseAttack = 8>>
-<<set $owBaseDefense = 4>>
-<<set $owBaseMorale = 110>>
-<<set $owBaseHp = 2>>
-<<set $ffBaseAttack = 9>>
-<<set $ffBaseDefense = 2>>
-<<set $ffBaseMorale = 160>>
-<<set $ffBaseHp = 2>>
-
-<<set $secBots = {
- active: 0,
- ID: -1,
- isDeployed: 0,
- troops: 0,
- maxTroops: 0,
- equip: 0} >>
-<<set $militiaUnits = []>>
-<<set $slaveUnits = []>>
-<<set $mercUnits = []>>
-
-/* SFanon additions */
-<<set $SFSupportLevel = 0>>
-<<set $SFGear = 0>>
-<<set $SavedLeader = "none">>
-<<set $SavedSFI = 0>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 56162282874d390db14bc7b11e67c708cd1dbadf..c74149433bdc9e4157d036b498b56f4e262707fe 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -1,7 +1,82 @@
:: init Nationalities [silently]
<<if $secExpEnabled > 0>>
- <<include "secInit">>
+ /* base vars */
+ <<set $SecExp = SecExpBase()>>
+ <<= App.SecExp.Check.general()>>
+ <<set $secExp = SecExpBase()>>
+ <<set $secUpgrades = {
+ nanoCams: 0,
+ cyberBots: 0,
+ eyeScan: 0,
+ cryptoAnalyzer: 0,
+ coldstorage: 0}>>
+ <<set $crimeUpgrades = {
+ autoTrial: 0,
+ autoArchive: 0,
+ worldProfiler: 0,
+ advForensic: 0}>>
+ <<set $intelUpgrades = {
+ sensors: 0,
+ radar: 0,
+ signalIntercept: 0}>>
+ <<set $readinessUpgrades = {
+ earlyWarn: 0,
+ rapidPlatforms: 0,
+ pathways: 0,
+ rapidVehicles: 0}>>
+ <<set $riotCenter = 0>>
+ <<set $riotUpgrades = {
+ freeMedia: 0,
+ rapidUnit: 0,
+ rapidUnitSpeed: 0}>>
+ <<set $fort = {
+ reactor: 0,
+ waterway: 0,
+ assistant:0}>>
+ <<set $currentUpgrade = {
+ name: " ",
+ unit: 0,
+ type: 0,
+ time: 0}>>
+ <<set $droneUpgrades = {
+ attack: 0,
+ defense: 0,
+ hp:0}>>
+ <<set $humanUpgrade = {
+ attack: 0,
+ defense: 0,
+ hp:0,
+ morale: 0}>>
+ <<set $sellTo = {
+ citizen: 1,
+ raiders: 1,
+ oldWorld: 1,
+ FC: 1}>>
+ <<set $garrison = {
+ penthouse: 0,
+ reactor: 0,
+ assistant: 0,
+ waterway: 0,
+ reactorTime: 0,
+ assistantTime: 0,
+ waterwayTime: 0 }>>
+ <<if $wasToggledBefore == 0>>
+ <<if $mercenaries == 1>>
+ <<set $mercFreeManpower = random(5,20)>>
+ <<elseif $mercenaries > 1>>
+ <<set $mercFreeManpower = random(10,30)>>
+ <</if>>
+ <</if>>
+
+ /* battle relevant variables */
+ <<set $secBots = {
+ active: 0,
+ ID: -1,
+ isDeployed: 0,
+ troops: 0,
+ maxTroops: 0,
+ equip: 0} >>
<</if>>
<<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 3, 18, 18)>>
diff --git a/src/init/storyInit.js b/src/init/storyInit.js
index 082c7646bdb17e24ce62c8c78b7545b38a33ec4c..8b6c1a9dbd5b5eb16e9b0be54d84fafeb6ba974f 100644
--- a/src/init/storyInit.js
+++ b/src/init/storyInit.js
@@ -26,9 +26,315 @@ App.Data.defaultGameStateVariables = {
nextButton: "Continue",
nextLink: "Alpha disclaimer",
+
+
+
+ shelterGirlsIDs: [], // Only needed in endweek loop
+ PCTitle: "",
+ lastWeeksCashErrors: "",
+ Sweatshops: 0,
+ thisWeeksFSWares: 0,
+ thisWeeksIllegalWares : 0,
+ milkTap: 0,
+ corpSpecTimer: 0,
+ debugModeCustomFunction: 0,
+ active: 0,
+ recuriterOffice: 0,
+ campaign: 0,
+ miniTruth: 0,
+ secretService: 0,
+ fakeNews: 0,
+ controlLeaks: 0,
+ marketInfiltration: 0,
+ blackOps: 0,
+ focus: "social engineering",
+
+
+
+ militiaRecruitmen: 0,
+ corpSpecCosmetics: 0,
+ rivalID: 0,
+ coursed: 0,
+ eventDescription: 0,
+ pitFought: 0,
+ prestigeAuctioned: 0,
+ eliteAuctioned: 0,
+ shelterSlave: 0,
+ shelterSlaveBought: 0,
+ slaveMarketLimit: 0,
+ slavesSeen: 0,
+ slavesSacrificedThisWeek: 0,
+ subSlaves: 0,
+
+ PopCap: 0,
ver: 0,
pmodVer: 0,
releaseID: 0,
+ masturbationAllowed: 0,
+ HGtraining: "",
+ mercenariesTitle: "",
+ milk: 0,
+ cum: 0,
+ hormones: 0,
+ milkSale: 0,
+ FSReminder: 0,
+ facility: {},
+ boomerangStats: {},
+ FSNonconformist: "",
+ econAdvantage: 0,
+ attackType:"none",
+ attackThisWeek:0,
+ lastAttackWeeks:0,
+ lastRebellionWeeks: 0,
+ hasFoughtOnce:0,
+ hasFoughtMajorBattleOnce:0,
+ hasRebelledOnce:0,
+ majorBattle:0,
+ PCvictoryStreak:0,
+ PClossStreak:0,
+ wasToggledBefore:0,
+ foughtThisWeek:0,
+
+ /* edicts */
+ alternativeRents:0,
+ enslavementRights:0,
+ securityExemption:0,
+ sellData:0,
+ propCampaignBoost:0,
+ slaveWatch:0,
+ subsidyChurch:0,
+ limitImmigration:0,
+ openBorders:0,
+ slavesOfficers:0,
+ martialSchool:0,
+ discountMercenaries:0,
+ militiaFounded:0,
+ recruitVolunteers:0,
+ conscription:0,
+ militaryService:0,
+ militarizedSociety:0,
+ militaryExemption:0,
+ lowerRquirements:0,
+ noSubhumansInArmy:0,
+ pregExemption:0,
+ eliteOfficers:0,
+ liveTargets:0,
+ legionTradition:0,
+ eagleWarriors:0,
+ ronin:0,
+ sunTzu:0,
+ mamluks:0,
+ pharaonTradition:0,
+ weaponsLaw:3,
+ soldierWages:1,
+ militiaSoldierPrivilege:0,
+ slaveSoldierPrivilege:0,
+ mercSoldierPrivilege:0,
+ tradeLegalAid:0,
+ taxTrade:0,
+
+ /* buildings */
+ secHQ:0,
+ secMenials: 0,
+ secUpgrades:{},
+ crimeUpgrades:{},
+ intelUpgrades:{},
+ readinessUpgrades:{},
+ riotCenter:0,
+ riotUpgrades:{},
+ fort:{},
+ sentUnitCooldown:0,
+ advancedRiotEquip:0,
+ brainImplant:-1,
+ brainImplantProject:0,
+ weapMenials: 0,
+ weapManu:0,
+ weapProductivity:1,
+ weapLab:1,
+ baseUpgradeTime:10,
+ weapUpgrades:[],
+ currentUpgrade:{},
+ droneUpgrades:{},
+ humanUpgrade:{},
+ sellTo:{},
+ completedUpgrades:[],
+ transportHub:0,
+ airport:1,
+ railway:1,
+ docks:1,
+ hubSecurity:1,
+
+ /* events */
+ smilingManProgress:0,
+ investedFunds:0,
+ relationshipLM:0,
+ captureRoute:0,
+ collaborationRoute:0,
+ smilingManWeek:0,
+ globalCrisisWeeks:0,
+ smilingManFate:4,
+
+ /* rebellions */
+ tension:0,
+ slaveProgress:0,
+ citizenProgress:0,
+ slaveRebellionEventFires:0,
+ citizenRebellionEventFires:0,
+ slaveRebellion:0,
+ citizenRebellion:0,
+ rebellingUnits:[],
+ engageRule:0,
+ irregulars:0,
+ rebellingMilitia:0,
+ rebellingSlaves:0,
+ rebellingMercs:0,
+ repairTime:3,
+ arcRepairTime:0,
+ garrison:{},
+ rebellionsCount:0,
+ PCrebWon:0,
+ PCrebLoss:0,
+
+ /* armed forces stats */
+ targetUnit:0,
+ targetIndex:0,
+ secBotsCost:500,
+ secBotsUpgradeCost:250,
+ equipUpgradeCost:250,
+ maxTroops:30,
+ militiaTotalManpower:0,
+ militiaFreeManpower:0,
+ militiaEmployedManpower:0,
+ militiaTotalCasualties:0,
+ slavesEmployedManpower:0,
+ slavesTotalCasualties:0,
+ slavesMaxTroops:30,
+ mercTotalManpower:0,
+ mercFreeManpower:0,
+ mercEmployedManpower:0,
+ mercTotalCasualties:0,
+ militiaLoyalty:0,
+ slaveArmyLoyalty:0,
+ mercLoyalty:0,
+ createdSlavesUnits:0,
+ createdMilitiaUnits:0,
+ createdMercUnits:0,
+
+ /* battle relevant vars */
+ slaveVictories:[],
+ slaveIncreasedPrestige:0,
+ totalKills:0,
+ battlesCount:0,
+ majorBattlesCount:0,
+ chosenTactic:"none",
+ leadingTroops:"none",
+ attackTroops:0,
+ attackEquip:0,
+ battleTerrain:"none",
+ maxTurns:10,
+ battleResult:4, /* sets battleResult value outside accepted range (-3,3) to avoid evaluation problems */
+ losses:0,
+ enemyLosses:0,
+ battleTurns:0,
+ tacticsSuccessful:0,
+ leaderWounded:0, /* 0=no wound, 1=mute, 2=blind, 3=amputee, 4=health */
+ gainedCombat:0,
+ gainedWarfare:0,
+ expectedEquip:0,
+ estimatedMen:0,
+ SFIntervention:0,
+ carriableSoldiers:0,
+ SFatk:0,
+ SFdef:0,
+ SFhp:0,
+ rebellingID:[],
+ saveValid:0,
+ lastSelection:[],
+
+ /* statistics */
+ equipMod:0.15,
+ secBotsBaseAttack:7,
+ secBotsBaseDefense:3,
+ secBotsMorale:200,
+ secBotsBaseHp:3,
+ militiaBaseAttack: 0,
+ militiaBaseDefense: 0,
+ militiaBaseMorale: 0,
+ militiaBaseHp: 0,
+ slaveBaseAttack: 0,
+ slaveBaseDefense: 0,
+ slaveBaseMorale: 0,
+ slaveBaseHp: 0,
+ mercBaseAttack: 0,
+ mercBaseDefense: 0,
+ mercBaseMorale: 0,
+ mercBaseHp: 0,
+ SFBaseAttack: 0,
+ SFBaseDefense: 0,
+ SFBaseMorale: 0,
+ SFBaseHp: 0,
+
+ raBaseAttack:7,
+ raBaseDefense:2,
+ raBaseMorale:100,
+ raBaseHp:2,
+ fcBaseAttack:6,
+ fcBaseDefense:4,
+ fcBaseMorale:130,
+ fcBaseHp:3,
+ owBaseAttack:8,
+ owBaseDefense:4,
+ owBaseMorale:110,
+ owBaseHp:2,
+ ffBaseAttack:9,
+ ffBaseDefense:2,
+ ffBaseMorale:160,
+ ffBaseHp:2,
+
+ /* units */
+ secBots:{},
+
+ militiaUnits:[],
+ slaveUnits:[],
+ mercUnits:[],
+
+ /* SFanon additions */
+ SFSupportLevel:0,
+ SFGear:0,
+ SavedLeader:0,
+ SavedSFI:0,
+
+ /* base vars */
+ secExp: {},
+ PCvictories: 0,
+ PClosses: 0,
+
+ /* buildings */
+ woundType: 0, /* 0:no wound, 1:mute, 2:blind, 3:amputee, 4<:health */
+
+
+
+
+ showOne: 0,
+ showTwo: 0,
+ showThree: 0,
+ showFour: 0,
+ showFive: 0,
+ showSix: 0,
+ showSeven: 0,
+ showEight: 0,
+ showNine: 0,
+ showTen: 0,
+ showEleven: 0,
+ showTwelve: 0,
+ showThirteen: 0,
+ showFourteen: 0,
+ showFifteen: 0,
+ showSixteen: 0,
+ randShow: 0,
+ lastShow: -1,
+ reminderEntry: "",
+ reminderWeek: "",
lastWeeksCashIncome: {},
lastWeeksCashExpenses: {},
lastWeeksCashProfits: {},
@@ -46,19 +352,11 @@ App.Data.defaultGameStateVariables = {
eliteFail: 0,
eliteFailTimer: 0,
nurseryGrowthStimsSetting: 0,
- subsidyChurch: 0,
- liveTargets: 0,
- slaveWatch: 0,
- martialSchool: 0,
- pregExemption: 0,
- eliteOfficers: 0,
- noSubhumansInArmy: 0,
MadamIgnoresFlaws: 0,
farmyardBreeding: 0,
farmyardShows: 0,
DJignoresFlaws: 0,
slaveFightingBG: 0,
- secBots: {},
SecExp: {},
childSex: 0,
HGEnergy: 0,
@@ -134,7 +432,6 @@ App.Data.defaultGameStateVariables = {
PAPublic: 0,
CoursingAssociation: 0,
Lurcher: 0,
- coursed: 0,
MixedMarriage: 0,
retirementAge: 45,
customRetirementAge: 45,
@@ -629,7 +926,6 @@ App.Data.defaultGameStateVariables = {
pitAudience: "none",
pitLethal: 0,
pitVirginities: 0,
- pitFought: 0,
pit: 0,
pitName: "the Pit",
pitNameCaps: "The Pit",
@@ -699,8 +995,6 @@ App.Data.defaultGameStateVariables = {
publicFuckdolls: 0,
arcadePrice: 2,
clubSlaveSexAmount: 0,
- shelterSlave: 0,
- shelterSlaveBought: 0,
shelterAbuse: 0,
shelterSlaveGeneratedWeek: 0,
/* alternate clothing access variables */
@@ -786,8 +1080,6 @@ App.Data.defaultGameStateVariables = {
receiverAvailable: 0,
FCTVshow: 0,
FCTVremote: 0,
- lastShow: 0,
- randShow: 0,
FCNNstation: 0,
MercenariesMessageSent: 0,
SpecialForcesMessageSent: 0,
@@ -894,7 +1186,6 @@ App.Data.defaultGameStateVariables = {
geneticFlawLibrary: 0,
surgeryUpgrade: 0,
barracks: 0,
- mercenaries: 0,
mercenariesHelpCorp: 0,
personalArms: 0,
saleDescription: 0,
@@ -956,9 +1247,6 @@ App.Data.defaultGameStateVariables = {
menials: 0,
fuckdolls: 0,
menialBioreactors: 0,
- prestigeAuctioned: 0,
- slaveMarketLimit: 20,
- slavesSeen: 0,
slaveOrphanageTotal: 0,
citizenOrphanageTotal: 0,
privateOrphanageTotal: 0,
@@ -1025,9 +1313,6 @@ App.Data.defaultGameStateVariables = {
UterineRestraintMesh: 0,
PGHack: 0,
diversePronouns: 0,
- /* Security Expansion */
- wasToggledBefore: 0,
- /* moved first build to post toggle */
secExpEnabled: 0,
/* Career-skill gain */
masteredXP: 200,
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index ee92f954f3dd6ba04ddbf0b0688785bf17d0f662..fd94f788c5abc9fa6aff3eb4de9de7a6b528f95b 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -1,7 +1,6 @@
:: SE FCTV Install [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
-<<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $showEleven = 0, $showTwelve = 0, $showThirteen = 0, $showFourteen = 0, $randShow = 0, $lastShow = -1>>
You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistant.name speaks up. "<<= properTitle()>>, you have received an approval welcome packet from 8HGG Inc. in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
<br><br>
diff --git a/src/pregmod/seFCTVwatch.tw b/src/pregmod/seFCTVwatch.tw
index b694d865c09aa4d42ed54323598304bd7cccd357..56c351f1e75826ceb93b9d788160148860a58911 100644
--- a/src/pregmod/seFCTVwatch.tw
+++ b/src/pregmod/seFCTVwatch.tw
@@ -1,24 +1,7 @@
:: SE FCTV Watch [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $randShow = "", $FCTVshow = 0>>
-<<if ndef $showEleven>>
- <<set $showEleven = 0>>
-<</if>>
-<<if ndef $showTwelve>> /* Milkanon's channel */
- <<set $showTwelve = 0>>
-<</if>>
-<<if ndef $showThirteen>> /* Channel13's work */
- <<set $showThirteen = 0>>
-<</if>>
-<<if ndef $showFourteen>> /* anon's story channel */
- <<set $showFourteen = 0>>
-<</if>>
-<<if ndef $showFifteen>> /* the pirate channel */
- <<set $showFifteen = 0>>
-<</if>>
-<<if ndef $showSixteen>> /* Ages of Slavery channel */
- <<set $showSixteen = 0>>
-<</if>>
+
Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveName@@<<else>>$assistant.name<</if>> to turn on the TV and
<<if $cheatMode == 1 || $debugMode == 1 || $FCTVremote > 0>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 590f069749ede3135875b8fd24446b12f77ec39b..5595f0200ba1f28fd460cc89c1710c4069079a29 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -799,14 +799,14 @@ $menialBioreactors -= _expirationBR>>
<<if $arcologies[0].honeymoon > 0>>
<<set _honeymoon = 10 * $arcologies[0].honeymoon>>
<</if>>
-<<set $oldVisitors = $visitors,
+<<set _oldVisitors = $visitors,
$visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * ($localEcon / 100))>>
<<if $visitors < 50>>
<<set $visitors = normalRandInt(50, 2)>>
<</if>>
<<if isNaN($visitors)>>
<br>@@.red;Visitors is NaN, report this issue!@@
- <<set $visitors = $oldVisitors>>
+ <<set $visitors = _oldVisitors>>
<</if>>
<br>@@.green;<<print $visitors>> traders and tourists@@ visited your arcology this week.