From 5b06c6d7e4d5c3beb23fd8bef2b4ed4038b94a2a Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 24 Apr 2020 14:00:49 -0400 Subject: [PATCH] More SG tweaks --- src/npc/acquisition.tw | 1 + src/npc/startingGirls/startingGirls.tw | 49 +++++++++++++++----------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 438d1e09fe6..d6e8c0b430b 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -1,5 +1,6 @@ :: Acquisition [nobr] +<<unset $showSGNationalities>> <<set $showEncyclopedia = 0>> <<if $saveImported == 1>><<set _valueOwed = 5000>><<else>><<set _valueOwed = 50000>><</if>> diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index b6360144eb7..690376c62c7 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -117,33 +117,40 @@ <</replace>> <</link>> - | <<link "Start over by selecting a nationality">> - <<replace "#headerLinks">> - <div> - <<for _sg = 0; _sg < setup.baseNationalities.length; _sg++>> - <<set _nation = setup.baseNationalities[_sg]>> - <<capture _nation>> - <<link _nation "Starting Girls">> - <<set $activeSlave = App.StartingGirls.generate({ nationality: _nation })>> - <</link>> - <</capture>> - <<if _sg < setup.baseNationalities.length-1>> - | - <</if>> - <</for>> - </div> - - <div> - <<link "Back" "Starting Girls">> <</link>> - </div> - <</replace>> - <</link>> + <<if !$showSGNationalities>> + | <<link "Start over by selecting a nationality" "Starting Girls">> + <<set $showSGNationalities = 1>> + <</link>> + <</if>> | [[Take control of your arcology|Acquisition]] </span> <hr> </p> +<<if $showSGNationalities>> + <p> + <h3>Start over by selecting a nationality:</h3> + <div> + <<for _sg = 0; _sg < setup.baseNationalities.length; _sg++>> + <<set _nation = setup.baseNationalities[_sg]>> + <<capture _nation>> + <<link _nation "Starting Girls">> + <<set $activeSlave = App.StartingGirls.generate({ nationality: _nation })>> + <</link>> + <</capture>> + <<if _sg < setup.baseNationalities.length-1>> + | + <</if>> + <</for>> + </div> + <div> + <<link "Hide" "Starting Girls">><<set $showSGNationalities = 0>><</link>> + </div> + <hr> + </p> +<</if>> + <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.startingGirls)>> <<if !$activeSlave>> -- GitLab