From 95125711db7a44cf003f02438a244a8025286793 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 12 Aug 2020 20:50:20 -0700
Subject: [PATCH] SecExpBackport-SmilingMan
---
js/003-data/gameVariableData.js | 7 --
src/002-config/fc-version.js | 2 +-
.../SecExp/SecExpBackwardCompatibility.tw | 2 +-
src/Mods/SecExp/js/secExp.js | 8 +-
src/Mods/SecExp/js/secExpBC.js | 24 +++++
src/Mods/SecExp/secExpSmilingMan.tw | 87 +++++++++----------
src/Mods/SecExp/securityReport.tw | 2 +-
.../backwardsCompatibility.js | 2 +-
src/events/intro/initNationalities.js | 2 +-
src/uncategorized/arcmgmt.tw | 20 +++--
src/uncategorized/manageArcology.tw | 4 +-
src/uncategorized/nonRandomEvent.tw | 8 +-
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/reputation.tw | 2 +-
14 files changed, 88 insertions(+), 84 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 6e6c08eac62..29919395a4f 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -409,13 +409,6 @@ App.Data.resetOnNGPlus = {
docks: 1,
hubSecurity: 1,
- /* events */
- smilingManProgress: 0,
- investedFunds: 0,
- relationshipLM: 0,
- globalCrisisWeeks: 0,
- smilingManFate: 4,
-
/* rebellions */
tension: 0,
slaveProgress: 0,
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index e6ecb2184e9..1abc575f6fe 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "3.6.2",
commitHash: null,
- release: 1086
+ release: 1087
};
diff --git a/src/Mods/SecExp/SecExpBackwardCompatibility.tw b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
index eefe11c4748..514aa0743ee 100644
--- a/src/Mods/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/Mods/SecExp/SecExpBackwardCompatibility.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">>
/* base stats */
-<<run App.SecExp.Check.general()>>
+<<run App.SecExp.generalBC()>>
<<set $lastRebellionWeeks = Number($lastRebellionWeeks) || 0>>
<<if ndef $currentUpgrade.ID>>
diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index 79e93c44b04..baf01b7290e 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -48,6 +48,9 @@ App.SecExp.generalInit = function(){
pharaonTradition: 0,
}
},
+ smilingMan: {
+ progress : 0,
+ }
});
};
@@ -418,16 +421,11 @@ App.SecExp.battle = (function() {
App.SecExp.Check = (function() {
"use strict";
return {
- general:general,
secRestPoint:secRestPoint,
crimeCap:crimeCap,
reqMenials:reqMenials,
};
- function general() {
- App.SecExp.generalBC();
- } // Closes general check function.
-
function secRestPoint() {
let rest = 40;
diff --git a/src/Mods/SecExp/js/secExpBC.js b/src/Mods/SecExp/js/secExpBC.js
index dc1446e8858..5f70a78267e 100644
--- a/src/Mods/SecExp/js/secExpBC.js
+++ b/src/Mods/SecExp/js/secExpBC.js
@@ -83,6 +83,30 @@ App.SecExp.generalBC = function (){
troops: Math.max(V.secBots.troops, V.arcologyUpgrade.drones > 0 ? 30 : 0),
maxTroops: Math.max(V.secBots.maxTroops, V.arcologyUpgrade.drones > 0 ? 30 : 0)
});
+
+ V.SecExp.smilingMan = V.SecExp.smilingMan || {};
+ V.SecExp.smilingMan.progress = V.SecExp.smilingMan.progress || V.smilingManProgress || 0;
+ if (V.smilingManFate) {
+ if (V.smilingManFate === 0) { // Offer $him a new life
+ V.SecExp.smilingMan.progress = 10;
+ } else if (V.smilingManFate === 1) { // Make $him pay
+ V.SecExp.smilingMan.progress = 20;
+ } else if (V.smilingManFate === 2) { // Enslave $him
+ V.SecExp.smilingMan.progress = 30;
+ }
+ }
+
+ if (V.SecExp.smilingMan.progress < 4) {
+ if (V.SecExp.smilingMan.progress === 0 && V.investedFunds) {
+ V.SecExp.smilingMan.investedFunds = V.investedFunds;
+ }
+ if (V.relationshipLM) {
+ V.SecExp.smilingMan.relationship = V.relationshipLM;
+ }
+ if (V.globalCrisisWeeks) {
+ V.SecExp.smilingMan.globalCrisisWeeks = V.globalCrisisWeeks;
+ }
+ }
V.SecExp.core = V.SecExp.core || {};
diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw
index 3ff49f92c06..0aa02e6a594 100644
--- a/src/Mods/SecExp/secExpSmilingMan.tw
+++ b/src/Mods/SecExp/secExpSmilingMan.tw
@@ -1,9 +1,10 @@
:: secExpSmilingMan [nobr]
<h2>The Smiling Man</h2>
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", _effectiveWeek = $week-$nationHate>>
<<setAssistantPronouns>>
-<<if $smilingManProgress == 0>>
+<<if $SecExp.smilingMan.progress === 0 && _effectiveWeek >= 74>>
+ <<set $SecExp.smilingMan.relationship = 0>>
<<set $fcnn.push("...encryption techniques: how to protect you and your loved ones from hackers ...")>>
<p>
During your morning routine, a peculiar report appears: it's been several weeks since your arcology was the victim of a series of cyber-crimes conducted by a mysterious figure.
@@ -22,9 +23,8 @@
<div>
<<link "Devote funds to the search for this dangerous criminal">>
<<run cashX(-10000, "event")>>
- <<set $investedFunds = 1>>
- <<set $relationshipLM++>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.investedFunds = 1>>
+ <<set $SecExp.smilingMan.relationship++, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You devote funds to capture and neutralize the threat. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
@@ -33,9 +33,8 @@
<div>
<<link "Attempt to contact the mysterious figure">>
<<run cashX(-10000, "event")>>
- <<set $investedFunds = 1>>
- <<set $relationshipLM += 2>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.investedFunds = 1>>
+ <<set $SecExp.smilingMan.relationship += 2, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You devote funds to an attempt at communicating with the smiling man. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
@@ -44,9 +43,8 @@
<div>
<<link "Invest funds to increase the cyber-security of the arcology">>
<<run cashX(-10000, "event")>>
- <<set $investedFunds = 1>>
- <<set $relationshipLM += random(5,10)>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.investedFunds = 1>>
+ <<set $SecExp.smilingMan.relationship += random(5,10), $SecExp.smilingMan.progress++>>
<<replace "#result">>
You devote funds to the improvement of the cyber-security of your arcology. You cannot help but wonder what the end game of this "smiling man" is. Money? Fame? Or is he on an ideological crusade?
<</replace>>
@@ -59,14 +57,14 @@
<</if>>
<div>
<<link "Ignore the issue">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress++>>
<<replace "#result">>
You do not consider this individual a threat.
<</replace>>
<</link>>
</div>
</p>
-<<elseif $smilingManProgress == 1>>
+<<elseif $SecExp.smilingMan.progress === 1 && _effectiveWeek >= 77>>
<<set $fcnn.push("...cybersecurity market is booming thanks to a series of recent high-profile attacks...")>>
<p>
You have just reached your penthouse when your faithful assistant appears in front of you, evidently excited.
@@ -115,17 +113,17 @@
<<set _lostCash -= Math.min(30000, _lostCash)>>
The additional cyber defenses acquired and running in the security HQ <<if _lostCash < 200000>>further<</if>> limit the damage.
<</if>>
- <<if $investedFunds == 1>>
+ <<if $SecExp.smilingMan.investedFunds>>
<<set _lostCash -= Math.min(20000, _lostCash)>>
The funding you dedicated to the Smiling Man case saved some of the assets that would have been otherwise lost.
+ <<run delete $SecExp.smilingMan.investedFunds>>
<</if>>
</p>
<<run cashX(forceNeg(_lostCash), "event")>>
<p id="result">
<div>
<<link ""I want him dead. Now."">>
- <<set $relationshipLM-->>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship--, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to double down on the search and elimination of the threat.
<</replace>>
@@ -133,8 +131,7 @@
</div>
<div>
<<link ""I want him, dead or alive!"">>
- <<set $relationshipLM++>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship++, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to double down on the search and capture of the threat.
<</replace>>
@@ -142,8 +139,7 @@
</div>
<div>
<<link ""If we don't find him soon, we will regret it."">>
- <<set $relationshipLM += 2>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship += 2, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to double down on the search and neutralization of the threat.
<</replace>>
@@ -151,7 +147,7 @@
</div>
<div>
<<link ""He got what he wanted. Hopefully, we will be left in peace."">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress++>>
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<replace "#result">>
You take no further action. Hopefully this ordeal is over.
@@ -159,7 +155,7 @@
<</link>>
</div>
</p>
-<<elseif $smilingManProgress == 2>>
+<<elseif $SecExp.smilingMan.progress === 2 && _effectiveWeek >= 82>>
<<set $fcnn.push("...my money safe the old-fashioned way: I store it all underneath my mattress...")>>
<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.
@@ -202,7 +198,7 @@
<</if>>
<<run cashX(($cash * 0.2)-$cash, "event")>>
You are not the only one affected by this however. <span class="red">The economy of the entire world is severely affected</span> by the loss of vast quantities of currency. Who knows how long will it take for the global economy to recover.
- <<set $globalCrisisWeeks = random(8,16)>>
+ <<set $SecExp.smilingMan.globalCrisisWeeks = random(8,16)>>
Trade is <span class="red">severely affected.</span>
<<set $SecExp.core.trade *= 0.2>>
With the loss of so much information, most of your accomplishments are simply forgotten, so <span class="reputation.dec">your reputation suffers.</span>
@@ -234,8 +230,7 @@
<p id="result">
<div>
<<link ""Eliminate the threat, once and for all."">>
- <<set $relationshipLM-->>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship--, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to prepare for a manhunt.
<</replace>>
@@ -243,8 +238,7 @@
</div>
<div>
<<link ""Bring him to me."">>
- <<set $relationshipLM++>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship++, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to prepare for a manhunt.
<</replace>>
@@ -252,8 +246,7 @@
</div>
<div>
<<link ""Such skill on my side would be a great boon. Find him."">>
- <<set $relationshipLM += 2>>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.relationship += 2, $SecExp.smilingMan.progress++>>
<<replace "#result">>
You command your loyal operatives to prepare for a manhunt.
<</replace>>
@@ -261,7 +254,7 @@
</div>
<div>
<<link ""He finally got what he always wanted. Let him have his victory, we have better things to do."">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress++>>
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<replace "#result">>
You take no further action. Hopefully this ordeal is finally over.
@@ -269,7 +262,7 @@
<</link>>
</div>
</p>
-<<elseif $smilingManProgress == 3>>
+<<elseif $SecExp.smilingMan.progress === 3>>
<<set $nextButton = " ">>
<<set $fcnn.push("...sometimes high-tech problems have low-tech solutions. Back to you in the...")>>
@@ -300,8 +293,8 @@
<<set $activeSlave.birthSurname = "Yamadera">>
<<set $activeSlave.origSkin = "pale">>
<<run applyGeneticColor($activeSlave)>>
- <<set $activeSlave.devotion = 5 * $relationshipLM>>
- <<set $activeSlave.trust = 5 * $relationshipLM>>
+ <<set $activeSlave.devotion = 5 * $SecExp.smilingMan.relationship>>
+ <<set $activeSlave.trust = 5 * $SecExp.smilingMan.relationship>>
<<set $activeSlave.face = random(10,50)>>
<<run setHealth($activeSlave, 70, 0, 0, 0, 0)>>
<<set $activeSlave.teeth = "normal">>
@@ -347,7 +340,7 @@
<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
"So it was you to find me first.
- <<if $relationshipLM > 2>>
+ <<if $SecExp.smilingMan.relationship > 2>>
I was hoping you would be the one!
<<else>>
I expected you would be the one.
@@ -364,14 +357,13 @@
<p id="result">
<div>
<<link "Offer $him a new life">>
- <<set $smilingManFate = 0>>
<<replace "#result">>
<div>
You decide it would be criminally wasteful to throw away such talent. You offer $him a new life at your side. $His expertise will surely guarantee safety, if not supremacy, to your arcology in cyberspace, while $he will have safety and luxury in the physical world.
</div>
<div>
<<link "Continue">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress = 10>>
<<goto "secExpSmilingMan">>
<</link>>
</div>
@@ -380,14 +372,13 @@
</div>
<div>
<<link "Make $him pay">>
- <<set $smilingManFate = 1>>
<<replace "#result">>
<div>
You decide to end $his pitiful life. $He has crossed the wrong master of the new world $he worked so hard to create. No mercy was asked for and no mercy will be given.
</div>
<div>
<<link "Continue">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress = 20>>
<<goto "secExpSmilingMan">>
<</link>>
</div>
@@ -396,14 +387,13 @@
</div>
<div>
<<link "Enslave $him">>
- <<set $smilingManFate = 2>>
<<replace "#result">>
<div>
You decide to enslave the $girl. $His skill may be great, but $his crimes are equally so, which makes it all the sweeter to turn $him into an obedient little toy to play with.
</div>
<div>
<<link "Continue">>
- <<set $smilingManProgress++>>
+ <<set $SecExp.smilingMan.progress = 30>>
<<goto "secExpSmilingMan">>
<</link>>
</div>
@@ -415,17 +405,17 @@
<</link>>
</span> /* closes id="continue" */
</p>
-<<else>>
- <<if $smilingManFate < 2>>
+<<elseif $SecExp.smilingMan.progress > 3>>
+ <<if $SecExp.smilingMan.progress < 30>>
/* 000-250-006 */
<<if $seeImages == 1>>
<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
/* 000-250-006 */
- <<if $smilingManFate == 0>>
+ <<if $SecExp.smilingMan.progress === 10>>
<p>
The $girl asks for a few minutes to think about your offer,
- <<if $relationshipLM >= 4>>
+ <<if $SecExp.smilingMan.relationship >= 4>>
but $he quickly comes to terms with the situation and accepts.
<<else>>
and after some time $he reluctantly accepts.
@@ -436,7 +426,7 @@
<p>
The collaboration of the ex-Smiling Man permanently increases <span class="green">security and the rate of prosperity growth.</span> <span class="cash.inc">Cash will be also provided,</span> but you're better off not knowing the sources.
</p>
- <<elseif $smilingManFate == 1>>
+ <<elseif $SecExp.smilingMan.progress === 20>>
<<set $activeSlave.clothes = "no clothing">>
<p>
For such a criminal a simple execution is not enough. You order the $girl captured and crucified outside the city, with a mask resembling $his famous symbol. Your men quickly obey. $He never once shows sign of pain or fear, remaining stoic and proud to the end.
@@ -447,11 +437,11 @@
</p>
<<run repX(10000, "architecture")>>
<</if>>
- <<elseif $smilingManFate == 2>>
+ <<elseif $SecExp.smilingMan.progress === 30>>
<<set $activeSlave.clothes = "no clothing">>
<p style="margin-bottom: 2em">
Your men move to immobilize $him. Terror flashes through $his eyes for
- <<if $relationshipLM >= 4>>
+ <<if $SecExp.smilingMan.relationship >= 4>>
a second, but $he quickly recovers $his usual demeanor.
<<else>>
a second — $he barely manages to recover $his usual demeanor.
@@ -462,4 +452,5 @@
<<include "New Slave Intro">>
</p>
<</if>>
-<</if>>
+ <<run delete $SecExp.smilingMan.relationship>>
+<</if>>
\ No newline at end of file
diff --git a/src/Mods/SecExp/securityReport.tw b/src/Mods/SecExp/securityReport.tw
index 559e4b46c5f..6e28f4d8a21 100644
--- a/src/Mods/SecExp/securityReport.tw
+++ b/src/Mods/SecExp/securityReport.tw
@@ -41,7 +41,7 @@
Your past life as a mercenary makes it easier to manage the security of the arcology.
<<set _secGrowth += 1>>
<</if>>
-<<if $smilingManFate == 0>>
+<<if $SecExp.smilingMan.progress === 10>>
The ex-criminal known to the world as The Smiling Man puts their impressive skills to work, dramatically increasing the efficiency of your security measures.
<<set _secGrowth += 2>>
<</if>>
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 7664422fff3..31c60b45cfc 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -92,7 +92,7 @@ App.Update.backwardsCompatibility = function() {
div = document.createElement('div');
div.append(`Updating Security Expansion... `);
jQuery('#backwardsCompatibility').append(div);
- App.SecExp.Check.general();
+ App.SecExp.generalBC();
if (V.secExpEnabled > 0) {
div.append(App.UI.DOM.renderPassage("SecExpBackwardCompatibility"));
}
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index 62e5b3294ff..b6a93a5c228 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -2,7 +2,7 @@ App.Intro.initNationalities = function() {
function initSecExp() {
/* base vars */
V.SecExp = SecExpBase();
- App.SecExp.Check.general();
+ App.SecExp.generalBC();
V.secUpgrades = {
nanoCams: 0,
cyberBots: 0,
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 615763416de..ae9c6662483 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1393,7 +1393,7 @@ You own
<<set _AWeekGrowth += 5>>
<</if>>
- <<if $smilingManFate == 0>>
+ <<if $SecExp.smilingMan.progress === 10>>
The ex-criminal known to the world as The Smiling Man puts her impressive skills to work, improving the financial situation of the arcology with ease.
<<set _AWeekGrowth++>>
<</if>>
@@ -1553,13 +1553,17 @@ You own
The authenticity department prepares extremely accurate, but false financial reports, misleading many of your competitors, allowing your arcology more space to grow undisturbed.
<<set _AWeekGrowth++>>
<</if>>
- <<if $globalCrisisWeeks > 0>>
- The great global crisis ignited by The Smiling Man plan is a great weight on the shoulders of everyone, causing great harm to the prosperity of the arcology.
- <<set _AWeekGrowth -= random(2,4)>>
- <<set $globalCrisisWeeks-->>
- <<elseif $smilingManProgress >= 3>>
- With the global economy recovering from the great crisis unleashed by the Smiling Man, there is plenty of room to grow. Your arcology's prosperity benefits from this greatly.
- <<set _AWeekGrowth++>>
+ <<if $SecExp.smilingMan.progress >= 2>>
+ <<if def $SecExp.smilingMan.globalCrisisWeeks && $SecExp.smilingMan.globalCrisisWeeks > 0>>
+ The great global crisis ignited by The Smiling Man plan is a great weight on the shoulders of everyone, causing great harm to the prosperity of the arcology.
+ <<set _AWeekGrowth -= random(2,4), $SecExp.smilingMan.globalCrisisWeeks-->>
+ <<elseif $SecExp.smilingMan.progress >= 3>>
+ With the global economy recovering from the great crisis unleashed by the Smiling Man, there is plenty of room to grow. Your arcology's prosperity benefits from this greatly.
+ <<set _AWeekGrowth++>>
+ <</if>>
+ <<if def $SecExp.smilingMan.globalCrisisWeeks && $SecExp.smilingMan.globalCrisisWeeks === 0>>
+ <<run delete $SecExp.smilingMan.globalCrisisWeeks>>
+ <</if>>
<</if>>
<<if $garrison.reactorTime > 0>>
The damage to the reactor caused by the last rebellion is extensive. Businesses and private citizens struggle to operate with the unreliable and limited energy production offered by the auxiliary generators.
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 5583b4ce1a0..2a62ac0b99d 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -181,7 +181,7 @@
<p>
<div>
<<if $SecExp.buildings.propHub.active == 0>>
- [[Set up the propaganda Hub|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $SecExp.buildings.propHub.active = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1, App.SecExp.Check.general()]]
+ [[Set up the propaganda Hub|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $SecExp.buildings.propHub.active = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1, App.SecExp.generalBC()]]
<span class="detail">
Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)))>>.
<div class="indent">Building specialized in the management of authority.</div>
@@ -205,7 +205,7 @@
<div>
<<if $SecExp.buildings.barracks.active == 0>>
- [[Set up the barracks|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $SecExp.buildings.barracks.active = 1, $PC.skill.engineering += 1, App.SecExp.Check.general()]]
+ [[Set up the barracks|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $SecExp.buildings.barracks.active = 1, $PC.skill.engineering += 1, App.SecExp.generalBC()]]
<span class="detail">
Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>
<div class="indent">Building specialized in the management of armed forces.</div>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index dac47e0ef1c..a99b773fdf8 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -171,13 +171,7 @@
<<goto "P slave medic">>
<<elseif ($eventResults.pit == 1) && ($BodyguardID != 0)>>
<<goto "PE pit fight">>
-<<elseif $rivalOwner == 0 && $smilingManProgress == 0 && _effectiveWeek >= 74 && $secExpEnabled > 0>>
- <<goto "secExpSmilingMan">>
-<<elseif $rivalOwner == 0 && $smilingManProgress == 1 && _effectiveWeek >= 77 && $secExpEnabled > 0>>
- <<goto "secExpSmilingMan">>
-<<elseif $rivalOwner == 0 && $smilingManProgress == 2 && _effectiveWeek >= 82 && $secExpEnabled > 0>>
- <<goto "secExpSmilingMan">>
-<<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExpEnabled > 0>>
+<<elseif $rivalOwner == 0 && $secExpEnabled > 0 && between($SecExp.smilingMan.progress, 0, 3)>>
<<goto "secExpSmilingMan">>
<<elseif ($rivalOwner == 0) && ($seeFCNN == 1) && ($FCNNstation == 0) && ($week > 95) && ($cash > 200000) && ($rep > 7500)>>
<<goto "SE FCNN Station">>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index a62ed54904e..5c12c5d2a10 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -727,7 +727,7 @@
<</if>>
<<if $secExpEnabled > 0>>
- <<if $smilingManFate == 0 && random(1,100) >= 85>>
+ <<if $SecExp.smilingMan.progress === 10 && random(1,100) >= 85>>
This week one of the offside adventures of The Smiling Man produced a copious amount of money, of which @@.yellowgreen;you receive your share.@@
<<run cashX(random(10,20) * 1000, "personalBusiness")>>
<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 28c2caa694d..b3c547ad8c1 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -300,7 +300,7 @@ _enduringRep = $enduringRep>>
<</if>>
<<if $secExpEnabled > 0>>
- <<if $smilingManFate == 1>>
+ <<if $SecExp.smilingMan.progress === 20>>
The grim statue of the Smiling Man outside your arcology @@.green;reminds the world of who managed to eliminate such a threat.@@
<<run repX(100, "architecture")>>
<</if>>
--
GitLab