diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index aaaef4d4c7f37a844505993d9ac10cb97f46f33b..c9f3ee02ad9576420d7a7057d292aa27bd00c952 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -1,21 +1,29 @@ :: New Game Plus [nobr] +<<set $ui = "start">> <<unset $Flag>> -<<set $ui = "start", $slavesToImport = 0>> +<<if ndef $slavesToImport>> <<set $slavesToImport = 0>> <</if>> -<<if ndef $slavesToImportMax>> - <<set $slavesToImportMax = 5>> -<</if>> +<<if ndef $slavesToImportMax>> <<set $slavesToImportMax = 5>> <</if>> + +<<silently>> <<include "Backwards Compatibility">> <</silently>> -<<silently>><<include "Backwards Compatibility">><</silently>> +<<set _fee = 50000+($slavesToImportMax*10000)>> + +You have decided to start over and will be able to take a few things with you: a few slaves, a small fraction of your current reserves of money, and possibly even your experience as an arcology owner, which will give you a very powerful career background. Many of your other customizations and settings will be carried over as the defaults for your new game, but can be revised freely. -You have decided to start over. You'll be able to take a few things with you: a few slaves, a small fraction of your current reserves of money, and possibly even your experience as an arcology owner, which will give you a very powerful career background. Many of your other customizations and settings will be carried over as the defaults for your new game, but can be revised freely. <br><br> -You have the funds to bring $slavesToImportMax slaves with you (or your equivalent) to a new arcology. -<<if $cash >= 50000+($slavesToImportMax*10000)>> - It will cost <<print cashFormat(50000+($slavesToImportMax*10000))>> to insure another slave's safe transfer. You have <<print cashFormat($cash)>> to spend. - <br>[[Increase minimum transferred slaves by 1.|New Game Plus][$cash -= (50000+($slavesToImportMax*10000)), $slavesToImportMax++]] + +You +<<if $cash >= _fee>> + have <<else>> - You lack the funds to bring more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It would cost <<print cashFormat(50000+($slavesToImportMax*10000))>> to guarantee another's safe transfer. + lack +<</if>> +the funds to bring more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. +It will cost @@.yellowgreen;<<print cashFormat(_fee)>>@@ to insure another slave's safe transfer. +<<if $cash >= _fee>> + You have @@.yellowgreen;<<print cashFormat($cash)>>@@ to spend. + <br>[[Increase slave import capacity by 1.|New Game Plus][$cash -= _fee, $slavesToImportMax++]] <</if>> <br> @@ -30,15 +38,17 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale <br>@@.lime;An eye for gingered slaves.@@ <br>@@.lime;An edge in all things data.@@ <br> - <<if $retainCareer == 1>> - [[Change career.|New Game Plus][$retainCareer = 0]] - <<elseif $retainCareer == 0>> - [[Don't change career.|New Game Plus][$retainCareer = 1]] + <<set $oldCareer = $PC.career>> + <<if $retainCareer === 1>> + [[Change career.|New Game Plus][$retainCareer = 0,$PC.career = "arcology owner"]] <</if>> <<else>> You lack the experience needed to qualify for a career change to "arcology owner". <</if>> <</if>> + <<if $retainCareer === 0 && $PC.career === "arcology owner">> + [[Don't change career.|New Game Plus][$retainCareer = 1,$PC.career = $oldCareer]] + <</if>> <br>[[Start over with a new player character.|New Game Plus][$freshPC = 1, $retainCareer = 1]] <<else>> [[Use existing player character.|New Game Plus][$freshPC = 0]] @@ -46,19 +56,25 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale <br><br> -<<if $cheatMode == 1>><<link "DEBUG: Add all slaves to import list">><<for _ngi = 0; _ngi < $slaves.length; _ngi++>><<= assignJob($slaves[_ngi], "be imported")>><</for>><<goto "New Game Plus">><</link>><br><</if>> - -Select up to $slavesToImportMax slaves to be imported into a new game and then [[click here.|init][$saveImported = 1]] -<br><br>''These slaves will be imported into the new game:'' -<<set $Flag = 1>> -<<include "Slave Summary">> +<<if $cheatMode == 1>> <<link "DEBUG: Add all slaves to import list" "New Game Plus">> <<for _ngi = 0; _ngi < $slaves.length; _ngi++>> <<= assignJob($slaves[_ngi], "be imported")>> <</link>> <br> <</if>> -<br><br> -<<if $slavesToImport >= $slavesToImportMax>> - //Maximum number of slaves for import selected.// -<<elseif ($slaves.length > $slavesToImport)>> - ''These slaves are available to be imported into the new game:'' - <<set $Flag = 0>> - <<include "Slave Summary">> +Select up to $slavesToImportMax slaves to be imported into a new game and then click [[here.|init][$saveImported = 1,$oldCareer = "undefined",$slavesToImport = 0]] +<<if $slavesToImport > 0>> <br><br>'' + <<if $slavesToImport === 1>> + This slave + <<else>> + These slaves + <</if>> + will be imported into the new game'': + <<if $slavesToImport >= $slavesToImportMax>> + //Current slave import capacity exceded.// + <</if>> + <<set $Flag = 1>> <<include "Slave Summary">> <</if>> -<<unset $Flag>> +<<if $slavesToImport >= $slavesToImportMax>> +<<else>> + <<if $slaves.length > $slavesToImport>> <br><br> + ''These slaves are available to be imported into the new game:'' + <<set $Flag = 0>> <<include "Slave Summary">> + <</if>> +<</if>> \ No newline at end of file diff --git a/src/uncategorized/ngpWorkaround.tw b/src/uncategorized/ngpWorkaround.tw deleted file mode 100644 index 41b7dc063d4fb24caad9b464fe0fdd8ee86d4b76..0000000000000000000000000000000000000000 --- a/src/uncategorized/ngpWorkaround.tw +++ /dev/null @@ -1,10 +0,0 @@ -:: NGP Workaround [silently] - -<<if $slavesToImport == 1>> - <<= assignJob($slaves[$i], "be imported")>> -<<else>> - <<= removeJob($slaves[$i], $slaves[$i].assignment)>> -<</if>> - -<<goto "New Game Plus">> - diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 6086e044fde5cbf4607fa69270c3e0c9af2d3949..f0ed7f0edfe5f6ca1ccb89074a631270f0228bd4 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -895,12 +895,17 @@ will <</if>> <<case "New Game Plus">> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>> - <<if $Flag == 0>> - [[Add to import list|NGP Workaround][$slavesToImport = 1, $i = _ssi]] - <<else>> - [[Remove from import list|NGP Workaround][$slavesToImport = 0, $i = _ssi]] - <<set $slavesToImport += 1>> - <</if>> + <<if $Flag === 0>> + <<link "Add to import list" "New Game Plus">> + <<set $slavesToImport += 1,$Flag = 1>> + <<= assignJob($slaves[_ssi], "be imported")>> + <</link>> +<<else>> + <<link "Remove from import list" "New Game Plus">> + <<set $slavesToImport -= 1,$Flag = 0>> + <<= removeJob($slaves[_ssi], $slaves[_ssi].assignment)>> + <</link>> +<</if>> <<case "Matchmaking">> <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>> [[Match them|Matchmaking][$subSlave = $slaves[_ssi]]]