diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw index b4ddcc7b62902b3cc598c05f20e0df91653723a1..9fb989e19bbb8889b6f223cfc3b70455cf32c447 100644 --- a/src/SecExp/rebellionOptions.tw +++ b/src/SecExp/rebellionOptions.tw @@ -192,10 +192,10 @@ <</if>> <</if>> <</for>> - <<if $securityForceActive == 1>>and $securityForceName, <<print num($securityForcePersonnel)>> strong<</if>> + <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.Squad.Troops)>> strong<</if>> are called to defend the arcology from this menace. <<else>> - <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, <<print num($securityForcePersonnel)>> strong<</if>><</if>> + <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print num($SF.Squad.Troops)>> strong<</if>><</if>> are called to defend the arcology from this menace. <</if>> <hr> diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index f24c2fca30fa0df7bc13823ffbc0ebbc7c7195ca..2961eae3ba9ad5a95c3f02203e39792e039fbe30 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -639,11 +639,6 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`) } text += ` [[Fine|Firebase][$SF.FS.Tension = 0]]\n <</replace>> <</link>>`; } else if (V.SF.FS.Tension < 100) { - for (let i = 0; i < FS_OPTIONS.length; i++) { - if (V.SF.FS[FS_OPTIONS[i]] === undefined) { - V.SF.FS[FS_OPTIONS[i]] = {lv: 0, vaildOption: 1, gift: 0}; - } - } text += `<<link "Chat with the Troops.">> <<replace "#result0">> \n\n`; text += `You walk past The Colonel and move towards the common area to meet with an exclusive group of her very influential officers that are currently relaxing at their favorite table. These men and women are known for their competence, popularity, and authority within in their respective divisions of the ${V.SF.Lower}, they are hard to replace, and they are always looking to earn more coin; they are the perfect weak link for trickling your Future Society influences down into the Firebase. As the officers make room at their table for you to sit and join them for discussion, you spot The Colonel staring at you from afar, and she does not look happy with you. As you are her employer, she cannot stop you from speaking with her soldiers or moving around as you please, but she can tell that you are up to no good:\nTension: ${V.SF.FS.Tension}%\n`; validityTester(); @@ -2743,6 +2738,17 @@ App.SF.Count = function() { T.SFSubsidy = 5000 * (1 + ((S.Troops / 100) + (V.SF.Size / 100))); App.SF.NameCapsCheck(); + if (V.SF.FS.Tension === -1) { + const Revivalisms = ['Roman_Revivalism', 'Aztec_Revivalism', 'Egyptian_Revivalism', 'Edo_Revivalism', 'Arabian_Revivalism', 'Chinese_Revivalism', 'Multiculturalism'], + let FS_OPTIONS = ['Repopulation', 'Eugenics', 'Gender_radicalism', 'Gender_traditionalism', 'Paternalism', 'Degradationism', 'Body_Purism', 'Transformation_Fetishism', 'Youth_Preferentialism', 'Maturity_Preferentialism', 'Slimness_Enthusiasm', 'Asset_Expansionism', 'Slave_Pastoralism', 'Physical_Idealism', 'Hedonistic_Decadence', 'Chattel_Religionism']; + FS_OPTIONS = FS_OPTIONS.concat(Revivalisms); + for (let i = 0; i < FS_OPTIONS.length; i++) { + if (V.SF.FS[FS_OPTIONS[i]] === undefined) { + V.SF.FS[FS_OPTIONS[i]] = {lv: 0, vaildOption: 1, gift: 0}; + } + } + } + if (E > 100) { T.Env = 4; } else if (E > 67) {