diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw index 5cb8b8f5f8585be6b5fe4dc5ce35a530ac5c5e20..e9e3a26c04356c97e9fae63775299278da8f7b86 100644 --- a/src/uncategorized/economics.tw +++ b/src/uncategorized/economics.tw @@ -20,10 +20,15 @@ <br><br> -<<include "Personal Business">> +<<include "Arcology Management">> <br><br> +<<if $FSAnnounced > 0>> + <br><br> + <<include "FS Developments">> +<</if>> + <<if $corpAnnounced == 1>> <br> <<if $corpIncorporated == 0>> @@ -35,7 +40,6 @@ <</if>> <br><br> <</if>> -<<include "Reputation">> <<if $secExp == 1>> <br><br> @@ -43,22 +47,19 @@ <</if>> <br><br> +<<if $secExp == 1>> +<<include "securityReport">> +<</if>> -<<include "Arcology Management">> +<<include "Reputation">> -<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>> <br><br> -<<include "Personal Notes">> -<</if>> -<<if $FSAnnounced > 0>> - <br><br> - <<include "FS Developments">> -<</if>> +<<include "Personal Business">> +<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>> <br><br> -<<if $secExp == 1>> -<<include "securityReport">> +<<include "Personal Notes">> <</if>> <<else>> @@ -66,24 +67,22 @@ <body> <div class="tab"> - <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button> - <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button> + <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button> + <button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button> + <<if $FSAnnounced > 0>> + <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button> + <</if>> <<if $corpAnnounced == 1>> - <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button> + <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button> <</if>> - <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button> <<if $secExp == 1>> - <button class="tablinks" onclick="opentab(event, 'Authority')">Authority</button> + <button class="tablinks" onclick="opentab(event, 'Authority')">Authority</button> + <button class="tablinks" onclick="opentab(event, 'securityReport')">Security</button> <</if>> - <button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button> + <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button> + <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button> <<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>> - <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button> - <</if>> - <<if $secExp == 1>> - <button class="tablinks" onclick="opentab(event, 'securityReport')">Security</button> + <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button> <</if>> </div> @@ -93,12 +92,20 @@ </div> </div> -<div id="Business" class="tabcontent"> +<div id="Management" class="tabcontent"> <div class="content"> -<<include "Personal Business">> +<<include "Arcology Management">> </div> </div> +<<if $FSAnnounced > 0>> +<div id="Societies" class="tabcontent"> +<div class="content"> +<<include "FS Developments">> +</div> +</div> +<</if>> + <<if $corpAnnounced == 1>> <div id="Corporation" class="tabcontent"> <div class="content"> @@ -113,45 +120,37 @@ You have not yet committed funds to create a publicly traded slave trading corpo </div> <</if>> -<div id="Reputation" class="tabcontent"> -<div class="content"> -<<include "Reputation">> -</div> -</div> - <div id="Authority" class="tabcontent"> <div class="content"> <<include "authorityReport">> </div> </div> -<div id="Management" class="tabcontent"> +<div id="securityReport" class="tabcontent"> <div class="content"> -<<include "Arcology Management">> +<<include "securityReport">> </div> </div> -<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>> -<div id="Personal" class="tabcontent"> +<div id="Reputation" class="tabcontent"> <div class="content"> -<<include "Personal Notes">> +<<include "Reputation">> </div> </div> -<</if>> -<<if $FSAnnounced > 0>> -<div id="Societies" class="tabcontent"> +<div id="Business" class="tabcontent"> <div class="content"> -<<include "FS Developments">> +<<include "Personal Business">> </div> </div> -<</if>> -<div id="securityReport" class="tabcontent"> +<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>> +<div id="Personal" class="tabcontent"> <div class="content"> -<<include "securityReport">> +<<include "Personal Notes">> </div> </div> +<</if>> <script> function opentab(evt, tabName) {