diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 826336b85b7bf743f5e2d44340f3fedffb50acd8..766b3f11036f636f221b92eea3e9753a43ea2bd5 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1310,6 +1310,8 @@ erectileImplant: 0 /* Career-skill gain */ <<set $masteredXP = 200>> +<<set $ViewSocietyImpact = 1>> +<<set $ViewCorp = 1>> <<include "secInit">> <<goto "Alpha disclaimer">> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 83efb9eb52a578af86c334c0da8a633d087b992f..2fcf0f3214d4708ac47e4e342100d584d8d7f512 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3005,3 +3005,10 @@ Done! <<if ndef $masteredXP>> <<set $masteredXP = 200>> <</if>> + +<<if ndef $ViewSocietyImpact>> + <<set $ViewSocietyImpact = 1>> +<</if>> +<<if ndef $ViewCorp>> + <<set $ViewCorp = 1>> +<</if>> diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw index addeef16f6ec1eba263910d6eb0fe045120d2e29..086fd880b6499dd956a44e14dde5fd123d713721 100644 --- a/src/uncategorized/buySlaves.tw +++ b/src/uncategorized/buySlaves.tw @@ -24,7 +24,7 @@ __Sex Slave Purchase Options__ <br> -<<if $corpMarket != 0>> +<<if $corpMarket != 0 && $ViewCorp == 1>> <br>[[Corporate Market][$slavesSeen += 1]] | //Slaves from your corporation purchased at a discounted rate.// <<if $cash > _minimumFive>> [[(x5)|Bulk Slave Generate][$slaveMarket = "corporate", $introType = "bulk", $numSlaves = 5]] | diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw index e7bc37a315d36c76d11a2fcdaad9bb2f16e7198a..c65b25eebefc94179a58d9c3213f02a6d166e481 100644 --- a/src/uncategorized/economics.tw +++ b/src/uncategorized/economics.tw @@ -24,7 +24,7 @@ <br><br> -<<if $corpAnnounced == 1>> +<<if $corpAnnounced == 1 && $ViewCorp == 1>> <br> <<if $corpIncorporated == 0>> <span id="incorporate"> @@ -51,7 +51,7 @@ <<include "Personal Notes">> <</if>> -<<if $FSAnnounced > 0>> +<<if $FSAnnounced > 0 && $ViewSocietyImpact == 1>> <br><br> <<include "FS Developments">> <</if>> @@ -68,7 +68,7 @@ <div class="tab"> <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button> <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button> - <<if $corpAnnounced == 1>> + <<if $corpAnnounced == 1 && $ViewCorp == 1>> <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button> <</if>> <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button> @@ -79,7 +79,7 @@ <<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>> <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button> <</if>> - <<if $FSAnnounced > 0>> + <<if $FSAnnounced > 0 && $ViewSocietyImpact == 1>> <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button> <</if>> <<if $secExp == 1>> @@ -99,7 +99,7 @@ </div> </div> -<<if $corpAnnounced == 1>> +<<if $corpAnnounced == 1 && $ViewCorp == 1>> <div id="Corporation" class="tabcontent"> <div class="content"> <<if $corpIncorporated == 0>> @@ -139,7 +139,7 @@ You have not yet committed funds to create a publicly traded slave trading corpo </div> <</if>> -<<if $FSAnnounced > 0>> +<<if $FSAnnounced > 0 && $ViewCorp == 1>> <div id="Societies" class="tabcontent"> <div class="content"> <<include "FS Developments">> diff --git a/src/uncategorized/markets.tw b/src/uncategorized/markets.tw index 691e36dc0f5d2e3379e512ccb7221717f6d50e08..5bdd06de9bf4e03b26ab9e3fa527691f45f3679e 100644 --- a/src/uncategorized/markets.tw +++ b/src/uncategorized/markets.tw @@ -24,7 +24,7 @@ This is an area of the concourse occupied by large stores and markets, many of w //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// <</if>> -<<if $corpMarket == 0 && $corpIncorporated == 1>> +<<if $corpMarket == 0 && $corpIncorporated == 1 && $ViewCorp == 1>> <br> [[Create a flagship slave market for your corporation here|Main][$corpCash -= Math.trunc(10000*$upgradeMultiplierArcology), $corpMarket = 1, $sectors[$AS].type = "CorporateMarket"]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> of the corporation's money// diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index 41ae17073296494ffa270de7e975e23e5ba86da7..26d999edd8c8b0cbf552387b0d8d25342be7d917 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -130,7 +130,7 @@ <<goto "Security Force Proposal">> <<elseif ($securityForceCreate == 1) && ($securityForceActive == 0)>> <<goto "Security Force Naming-Colonel">> -<<elseif ($cash > 30000) && ($rep > 4000) && ($corpAnnounced == 0)>> +<<elseif ($cash > 30000) && ($rep > 4000) && ($corpAnnounced == 0 && $ViewCorp == 1)>> <<goto "P Corp Announcement">> <<elseif ($rivalOwner > 0)>> <<if $hostageAnnounced == -1 && $rivalSet != 0>> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index c162ef1f847005099d5d6db5e3169bb1f09af4a9..06d4ff97f55f5a68ee05a94d58fdc12ea6b169d6 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -225,6 +225,24 @@ Master Suite report details such as slave changes are <br> +Viewing society impact is +<<if $ViewSocietyImpact == 0>> +@@.red;DISABLED@@. [[Enable|Options][$ViewSocietyImpact = 1]] +<<else>> +@@.cyan;ENABLED@@. [[Disable|Options][$ViewSocietyImpact = 0]] +<</if>> + +<br> + +The corporation <<if $corpMarket == 1>> and the associated market are <<else>> is <</if>> +<<if $ViewCorp == 0>> +@@.red;DISABLED@@. [[Enable|Options][$ViewCorp = 1]] +<<else>> +@@.cyan;ENABLED@@. [[Disable|Options][$ViewCorp = 0]] +<</if>> //Will not change any settings only visability// + +<br> + Detailed corporation controls are <<if ($detailedCorpControls == 1)>> @@.cyan;ENABLED@@. [[Disable|Options][$detailedCorpControls = 0]]