diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 7f149a3f279530888f05fb0dc56349e55b637ce7..86c991fe0dc3af3ebcca8709804e8c69dc417b48 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -454,7 +454,6 @@ App.Data.resetOnNGPlus = {
smilingManProgress: 0,
investedFunds: 0,
relationshipLM: 0,
- smilingManWeek: 0,
globalCrisisWeeks: 0,
smilingManFate: 4,
diff --git a/src/Mods/SecExp/SecExpBackwardCompatibility.tw b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
index 53c1c2916d1bba146d3b7706df9d559db663f165..eefe11c4748acb9f7c0356d2957f26820970a08d 100644
--- a/src/Mods/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
@@ -4,267 +4,36 @@
/* base stats */
<<run App.SecExp.Check.general()>>
-<<if ndef $attackType>>
- <<set $attackType = "none">>
-<</if>>
-<<if ndef $attackThisWeek>>
- <<set $attackThisWeek = 0>>
-<</if>>
-<<if ndef $lastAttackWeeks>>
- <<set $lastAttackWeeks = 0>>
-<</if>>
<<set $lastRebellionWeeks = Number($lastRebellionWeeks) || 0>>
-<<if ndef $majorBattle>>
- <<set $majorBattle = 0>>
-<</if>>
-<<if ndef $PCvictoryStreak>>
- <<set $PCvictoryStreak = 0>>
-<</if>>
-<<if ndef $PClossStreak>>
- <<set $PClossStreak = 0>>
-<</if>>
-<<if ndef $wasToggledBefore>>
- <<set $wasToggledBefore = 0>>
-<</if>>
-<<if ndef $foughtThisWeek>>
- <<set $foughtThisWeek = 0>>
-<</if>>
-/* edicts */
-<<if ndef $alternativeRents>>
- <<set $alternativeRents = 0>>
-<</if>>
-<<if ndef $enslavementRights>>
- <<set $enslavementRights = 0>>
-<</if>>
-<<if ndef $securityExemption>>
- <<set $securityExemption = 0>>
-<</if>>
-<<if ndef $sellData>>
- <<set $sellData = 0>>
-<</if>>
-<<if ndef $propCampaignBoost>>
- <<set $propCampaignBoost = 0>>
-<</if>>
-<<if ndef $slaveWatch>>
- <<set $slaveWatch = 0>>
-<</if>>
-<<if ndef $subsidyChurch>>
- <<set $subsidyChurch = 0>>
-<</if>>
-<<if ndef $limitImmigration>>
- <<set $limitImmigration = 0>>
-<</if>>
-<<if ndef $openBorders>>
- <<set $openBorders = 0>>
-<</if>>
-<<if ndef $slavesOfficers>>
- <<set $slavesOfficers = 0>>
-<</if>>
-<<if ndef $martialSchool>>
- <<set $martialSchool = 0>>
-<</if>>
-<<if ndef $discountMercenaries>>
- <<set $discountMercenaries = 0>>
-<</if>>
-<<if ndef $militiaFounded>>
- <<set $militiaFounded = 0>>
-<</if>>
-<<if ndef $recruitVolunteers>>
- <<set $recruitVolunteers = 0>>
-<</if>>
-<<if ndef $conscription>>
- <<set $conscription = 0>>
-<</if>>
-<<if ndef $militaryService>>
- <<set $militaryService = 0>>
-<</if>>
-<<if ndef $militarizedSociety>>
- <<set $militarizedSociety = 0>>
-<</if>>
-<<if ndef $militaryExemption>>
- <<set $militaryExemption = 0>>
-<</if>>
-<<if ndef $lowerRquirements>>
- <<set $lowerRquirements = 0>>
-<</if>>
-<<if ndef $noSubhumansInArmy>>
- <<set $noSubhumansInArmy = 0>>
-<</if>>
-<<if ndef $pregExemption>>
- <<set $pregExemption = 0>>
-<</if>>
-<<if ndef $eliteOfficers>>
- <<set $eliteOfficers = 0>>
-<</if>>
-<<if ndef $liveTargets>>
- <<set $liveTargets = 0>>
-<</if>>
-<<if ndef $legionTradition>>
- <<set $legionTradition = 0>>
-<</if>>
-<<if ndef $eagleWarriors>>
- <<set $eagleWarriors = 0>>
-<</if>>
-<<if ndef $ronin>>
- <<set $ronin = 0>>
-<</if>>
-<<if ndef $sunTzu>>
- <<set $sunTzu = 0>>
-<</if>>
-<<if ndef $mamluks>>
- <<set $mamluks = 0>>
-<</if>>
-<<if ndef $pharaonTradition>>
- <<set $pharaonTradition = 0>>
-<</if>>
-<<if ndef $weaponsLaw>>
- <<set $weaponsLaw = 3>>
-<</if>>
-<<if ndef $soldierWages>>
- <<set $soldierWages = 1>>
-<</if>>
-<<if ndef $militiaSoldierPrivilege>>
- <<set $militiaSoldierPrivilege = 0>>
-<</if>>
-<<if ndef $slaveSoldierPrivilege>>
- <<set $slaveSoldierPrivilege = 0>>
-<</if>>
-<<if ndef $mercSoldierPrivilege>>
- <<set $mercSoldierPrivilege = 0>>
-<</if>>
-<<if ndef $tradeLegalAid>>
- <<set $tradeLegalAid = 0>>
-<</if>>
-<<if ndef $taxTrade>>
- <<set $taxTrade = 0>>
-<</if>>
-
-/* buildings */
-<<if ndef $secHQ>>
- <<set $secHQ = 0>>
-<</if>>
-<<if ndef $secMenials>>
- <<set $secMenials = $secHelots || 0>>
- <<unset $secHelots>>
-<</if>>
-<<if ndef $secUpgrades >>
- <<set $secUpgrades = {
- nanoCams: 0,
- cyberBots: 0,
- eyeScan: 0,
- cryptoAnalyzer: 0,
- coldstorage: 0}>>
-<</if>>
-<<if ndef $crimeUpgrades>>
- <<set $crimeUpgrades = {
- autoTrial: 0,
- autoArchive: 0,
- worldProfiler: 0,
- advForensic: 0}>>
-<</if>>
-<<if ndef $intelUpgrades>>
- <<set $intelUpgrades = {
- sensors: 0,
- radar: 0,
- signalIntercept: 0}>>
-<</if>>
-<<if ndef $readinessUpgrades>>
- <<set $readinessUpgrades = {
- earlyWarn: 0,
- rapidPlatforms: 0,
- pathways: 0,
- rapidVehicles: 0}>>
-<</if>>
-<<if ndef $riotCenter>>
- <<set $riotCenter = 0>>
-<</if>>
-<<if ndef $riotUpgrades>>
- <<set $riotUpgrades = {
- freeMedia: 0,
- rapidUnit: 0,
- rapidUnitSpeed: 0}>>
-<</if>>
-<<if ndef $fort>>
- <<set $fort = {
- reactor: 0,
- waterway: 0,
- assistant: 0}>>
-<</if>>
-<<if ndef $sentUnitCooldown>>
- <<set $sentUnitCooldown = 0>>
-<</if>>
-<<if ndef $advancedRiotEquip>>
- <<set $advancedRiotEquip = 0>>
-<</if>>
-<<if ndef $brainImplant>>
- <<set $brainImplant = -1>>
-<</if>>
-<<if ndef $brainImplantProject>>
- <<set $brainImplantProject = 0>>
-<</if>>
-<<if def $weapHelots>>
- <<set $weapMenials = $weapHelots || 0>>
- <<unset $weapHelots>>
-<</if>>
-<<if ndef $weapManu>>
- <<set $weapManu = 0>>
-<</if>>
-<<if ndef $weapProductivity>>
- <<set $weapProductivity = 1>>
-<</if>>
-<<if ndef $weapLab>>
- <<set $weapLab = 1>>
-<</if>>
-<<if ndef $baseUpgradeTime>>
- <<set $baseUpgradeTime = 10>>
-<</if>>
-<<if ndef $weapUpgrades>>
- <<set $weapUpgrades = []>>
-<</if>>
-<<if ndef $currentUpgrade>>
- <<set $currentUpgrade = {
- ID: 0,
- name: " ",
- unit: 0,
- type: 0,
- time: 0,
- value: 0}>>
-<<else>>
- <<if ndef $currentUpgrade.ID>>
- <<if $currentUpgrade.name == "magnetic based ballistic weaponry">>
- <<set $currentUpgrade.ID = 0>>
- <<elseif $currentUpgrade.name == "ceramo-metallic alloys">>
- <<set $currentUpgrade.ID = 1>>
- <<elseif $currentUpgrade.name == "rapid action stimulants">>
- <<set $currentUpgrade.ID = 2>>
- <<elseif $currentUpgrade.name == "fast response neural stimulant">>
- <<set $currentUpgrade.ID = 3>>
- <<elseif $currentUpgrade.name == "universal cyber enhancements">>
- <<set $currentUpgrade.ID = 4>>
- <<elseif $currentUpgrade.name == "remote neural links">>
- <<set $currentUpgrade.ID = 5>>
- <<elseif $currentUpgrade.name == "combined training regimens with the special force">>
- <<set $currentUpgrade.ID = 6>>
- <<elseif $currentUpgrade.name == "a variant of the stimulant cocktail that the special force created">>
- <<set $currentUpgrade.ID = 7>>
- <<elseif $currentUpgrade.name == "a mesh network based off the custom network of the special force">>
- <<set $currentUpgrade.ID = 8>>
- <<elseif $currentUpgrade.name == "dynamic battle aware AI">>
- <<set $currentUpgrade.ID = -1>>
- <<elseif $currentUpgrade.name == "adaptive armored frames">>
- <<set $currentUpgrade.ID = -2>>
- <<elseif $currentUpgrade.name == "advanced synthetic alloys">>
- <<set $currentUpgrade.ID = -3>>
- <</if>>
- <</if>>
-<</if>>
-<<if ndef $droneUpgrades>>
- <<set $droneUpgrades = {
- attack: 0,
- defense: 0,
- hp:0}>>
-<<elseif $droneUpgrades == null>>
+<<if ndef $currentUpgrade.ID>>
+ <<if $currentUpgrade.name == "magnetic based ballistic weaponry">>
+ <<set $currentUpgrade.ID = 0>>
+ <<elseif $currentUpgrade.name == "ceramo-metallic alloys">>
+ <<set $currentUpgrade.ID = 1>>
+ <<elseif $currentUpgrade.name == "rapid action stimulants">>
+ <<set $currentUpgrade.ID = 2>>
+ <<elseif $currentUpgrade.name == "fast response neural stimulant">>
+ <<set $currentUpgrade.ID = 3>>
+ <<elseif $currentUpgrade.name == "universal cyber enhancements">>
+ <<set $currentUpgrade.ID = 4>>
+ <<elseif $currentUpgrade.name == "remote neural links">>
+ <<set $currentUpgrade.ID = 5>>
+ <<elseif $currentUpgrade.name == "combined training regimens with the special force">>
+ <<set $currentUpgrade.ID = 6>>
+ <<elseif $currentUpgrade.name == "a variant of the stimulant cocktail that the special force created">>
+ <<set $currentUpgrade.ID = 7>>
+ <<elseif $currentUpgrade.name == "a mesh network based off the custom network of the special force">>
+ <<set $currentUpgrade.ID = 8>>
+ <<elseif $currentUpgrade.name == "dynamic battle aware AI">>
+ <<set $currentUpgrade.ID = -1>>
+ <<elseif $currentUpgrade.name == "adaptive armored frames">>
+ <<set $currentUpgrade.ID = -2>>
+ <<elseif $currentUpgrade.name == "advanced synthetic alloys">>
+ <<set $currentUpgrade.ID = -3>>
+ <</if>>
+<</if>>
+<<if $droneUpgrades == null>>
<<set $droneUpgrades = {
attack: 0,
defense: 0,
@@ -287,13 +56,7 @@
<<set $droneUpgrades.hp = 0>>
<</if>>
<</if>>
-<<if ndef $humanUpgrade>>
- <<set $humanUpgrade = {
- attack: 0,
- defense: 0,
- hp:0,
- morale: 0}>>
-<<elseif $humanUpgrade == null>>
+<<if $humanUpgrade == null>>
<<set $humanUpgrade = {
attack: 0,
defense: 0,
@@ -321,262 +84,11 @@
<<set $humanUpgrade.morale = 0>>
<</if>>
<</if>>
-<<if ndef $sellTo>>
- <<set $sellTo = {
- citizen: 1,
- raiders: 1,
- oldWorld: 1,
- FC: 1}>>
-<</if>>
-<<if ndef $completedUpgrades>>
- <<set $completedUpgrades = []>>
-<</if>>
-<<if ndef $transportHub>>
- <<set $transportHub = 0>>
-<</if>>
-<<if ndef $airport>>
- <<set $airport = 1>>
-<</if>>
-<<if ndef $railway>>
- <<set $railway = 1>>
-<</if>>
-<<if ndef $docks>>
- <<set $docks = 1>>
-<</if>>
-<<if ndef $hubSecurity>>
- <<set $hubSecurity = 1>>
-<</if>>
-
-/* events */
-<<if ndef $smilingManProgress>>
- <<set $smilingManProgress = 0>>
-<</if>>
-<<if ndef $investedFunds>>
- <<set $investedFunds = 0>>
-<</if>>
-<<if ndef $relationshipLM>>
- <<set $relationshipLM = 0>>
-<</if>>
-<<if ndef $smilingManWeek>>
- <<set $smilingManWeek = 0>>
-<</if>>
-<<if ndef $globalCrisisWeeks>>
- <<set $globalCrisisWeeks = 0>>
-<</if>>
-<<if ndef $smilingManFate>>
- <<set $smilingManFate = 4>>
-<</if>>
-
-/* rebellions */
-<<if ndef $tension>>
- <<set $tension = 0>>
-<</if>>
-<<if ndef $slaveProgress>>
- <<set $slaveProgress = 0>>
-<</if>>
-<<if ndef $citizenProgress>>
- <<set $citizenProgress = 0>>
-<</if>>
-<<if ndef $slaveRebellionEventFires>>
- <<set $slaveRebellionEventFires = 0>>
-<</if>>
-<<if ndef $citizenRebellionEventFires>>
- <<set $citizenRebellionEventFires = 0>>
-<</if>>
-<<if ndef $slaveRebellion>>
- <<set $slaveRebellion = 0>>
-<</if>>
-<<if ndef $citizenRebellion>>
- <<set $citizenRebellion = 0>>
-<</if>>
-<<if ndef $engageRule>>
- <<set $engageRule = 0>>
-<</if>>
-<<if ndef $irregulars>>
- <<set $irregulars = 0>>
-<</if>>
-<<if ndef $repairTime>>
- <<set $repairTime = 3>>
-<</if>>
-<<if ndef $arcRepairTime>>
- <<set $arcRepairTime = 0>>
-<</if>>
-<<if ndef $garrison>>
- <<set $garrison = {
- penthouse: 0,
- reactor: 0,
- assistant: 0,
- waterway: 0,
- reactorTime: 0,
- assistantTime: 0,
- waterwayTime: 0}>>
-<<else>>
- <<if ndef $garrison.penthouse>>
- <<set $garrison.penthouse = 0>>
- <</if>>
- <<if ndef $garrison.reactor>>
- <<set $garrison.reactor = 0>>
- <</if>>
- <<if ndef $garrison.assistant>>
- <<set $garrison.assistant = 0>>
- <</if>>
- <<if ndef $garrison.waterway>>
- <<set $garrison.waterway = 0>>
- <</if>>
- <<if ndef $garrison.reactorTime>>
- <<set $garrison.reactorTime = 0>>
- <</if>>
- <<if ndef $garrison.assistantTime>>
- <<set $garrison.assistantTime = 0>>
- <</if>>
- <<if ndef $garrison.waterwayTime>>
- <<set $garrison.waterwayTime = 0>>
- <</if>>
-<</if>>
-<<if ndef $rebellionsCount>>
- <<set $rebellionsCount = 0>>
-<</if>>
-<<if ndef $PCrebWon>>
- <<set $PCrebWon = 0>>
-<</if>>
-<<if ndef $PCrebLoss>>
- <<set $PCrebLoss = 0>>
-<</if>>
-
-/* armed forces stats */
-<<if ndef $targetUnit>>
- <<set $targetUnit = 0>>
-<</if>>
-<<if ndef $targetIndex>>
- <<set $targetIndex = 0>>
-<</if>>
-<<if ndef $secBotsCost>>
- <<set $secBotsCost = 500>>
-<</if>>
-<<if ndef $secBotsUpgradeCost>>
- <<set $secBotsUpgradeCost = 250>>
-<</if>>
-<<if ndef $equipUpgradeCost>>
- <<set $equipUpgradeCost = 250>>
-<</if>>
-<<if ndef $maxTroops>>
- <<set $maxTroops = 30>>
-<</if>>
-<<if ndef $militiaFounded>>
- <<set $militiaFounded = 0>>
-<</if>>
-<<if ndef $militiaFreeManpower>>
- <<set $militiaFreeManpower = 0>>
-<</if>>
-<<if ndef $militiaTotalCasualties>>
- <<set $militiaTotalCasualties = 0>>
-<</if>>
-<<if ndef $slavesOfficers>>
- <<set $slavesOfficers = 0>>
-<</if>>
-<<if ndef $slavesTotalCasualties>>
- <<set $slavesTotalCasualties = 0>>
-<</if>>
-<<if ndef $slavesMaxTroops>>
- <<set $slavesMaxTroops = 30>>
-<</if>>
-<<if ndef $mercFreeManpower>>
- <<set $mercFreeManpower = 0>>
-<</if>>
-<<if ndef $mercTotalCasualties>>
- <<set $mercTotalCasualties = 0>>
-<</if>>
-<<if ndef $createdSlavesUnits>>
- <<set $createdSlavesUnits = 0>>
-<</if>>
-<<if ndef $createdMilitiaUnits>>
- <<set $createdMilitiaUnits = 0>>
-<</if>>
-<<if ndef $createdMercUnits>>
- <<set $createdMercUnits = 0>>
-<</if>>
-
-/* battle relevant vars */
-<<if ndef $slaveVictories>>
- <<set $slaveVictories = []>>
-<</if>>
-<<if ndef $totalKills>>
- <<set $totalKills = 0>>
-<</if>>
-<<if ndef $battlesCount>>
- <<set $battlesCount = 0>>
-<</if>>
-<<if ndef $majorBattlesCount>>
- <<set $majorBattlesCount = 0>>
-<</if>>
-<<if ndef $chosenTactic>>
- <<set $chosenTactic = "none">>
-<</if>>
-<<if ndef $leadingTroops>>
- <<set $leadingTroops = "none">>
-<</if>>
-<<if ndef $attackTroops>>
- <<set $attackTroops = 0>>
-<</if>>
-<<if ndef $attackEquip>>
- <<set $attackEquip = 0>>
-<</if>>
-<<if ndef $battleTerrain>>
- <<set $battleTerrain = "none">>
-<</if>>
-<<if ndef $maxTurns>>
- <<set $maxTurns = 10>>
-<</if>>
-<<if ndef $battleResult>>
- <<set $battleResult = 4>> /* sets $battleResult value outside accepted range (-3,3) to avoid evaluation problems */
-<</if>>
-<<if ndef $losses>>
- <<set $losses = 0>>
-<</if>>
-<<if ndef $enemyLosses>>
- <<set $enemyLosses = 0>>
-<</if>>
-<<if ndef $battleTurns>>
- <<set $battleTurns = 0>>
-<</if>>
-<<if ndef $tacticsSuccessful>>
- <<set $tacticsSuccessful = 0>>
-<</if>>
-<<if ndef $leaderWounded>>
- <<set $leaderWounded = 0>>
-<</if>>
-<<if ndef $gainedCombat>>
- <<set $gainedCombat = 0>>
-<</if>>
-<<if ndef $gainedWarfare>>
- <<set $gainedWarfare = 0>>
-<</if>>
-<<if ndef $SFIntervention>>
- <<set $SFIntervention = 0>>
-<</if>>
-<<if ndef $saveValid>>
- <<set $saveValid = 0>>
-<</if>>
-<<if ndef $lastSelection>>
- <<set $lastSelection = []>>
-<</if>>
/* SFanon additions */
-<<if ndef $SFSupportLevel>>
- <<set $SFSupportLevel = 0>>
-<</if>>
<<if ndef $secUpgrades.coldstorage>>
<<set $secUpgrades.coldstorage = 0>>
<</if>>
-<<if ndef $SFGear>>
- <<set $SFGear = 0>>
-<</if>>
-<<if ndef $SavedLeader>>
- <<set $SavedLeader = $leadingTroops>>
-<</if>>
-<<if ndef $SavedSFI>>
- <<set $SavedSFI = $SFIntervention>>
-<</if>>
/* init merc manpower if it wasn't done already */
<<if $wasToggledBefore == 0>>
diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw
index a153b6de275c59cd7de9db843a3ccbf5c0cea4a6..3ff49f92c06eb4a57b3df451c91b5473c0c75e1f 100644
--- a/src/Mods/SecExp/secExpSmilingMan.tw
+++ b/src/Mods/SecExp/secExpSmilingMan.tw
@@ -161,7 +161,6 @@
</p>
<<elseif $smilingManProgress == 2>>
<<set $fcnn.push("...my money safe the old-fashioned way: I store it all underneath my mattress...")>>
- <<set $smilingManWeek = $week>>
<p style="margin-bottom: 2em">
When $assistant.name violently wakes you up, _hisA worried expression can mean only one thing: the Smiling Man had been back. "We were anonymously sent a link to a new website: it's a very simple site, no visuals, no text; only a countdown ticking away. It will reach zero this evening." your assistant says.
This is troubling, yet somewhat exciting. The Smiling Man never failed to cause damage, but his ego had gotten the best of him this time — having time to prepare before their attack will give you a chance to find them. For the rest of the day you do your best to plan, prepare and focus.
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 5b5ce19c9cb8b31e288f0c49fe1f142e77e6e4e0..b34f9d8f003f924eaddb302bcae69b86d8dddcfe 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -27,7 +27,6 @@ App.Intro.initNationalities = function() {
pathways: 0,
rapidVehicles: 0
};
- V.riotCenter = 0;
V.riotUpgrades = {
freeMedia: 0,
rapidUnit: 0,