From 3c7814aa7d2cb15e8bcfa2b2450c062b96e68820 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 28 Aug 2018 04:24:52 -0400 Subject: [PATCH] cleaning and notes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++++ src/uncategorized/newGamePlus.tw | 21 ++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 3c8bb009d07..b5c31f2b578 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -3,6 +3,12 @@ 0.10.7.1-0.7.x 8/28/2018 + + 7 + -fixes and code cleanup + + 6 + -fixes 5 -fixes diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index c9f3ee02ad9..568ae43112b 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -1,26 +1,17 @@ :: New Game Plus [nobr] -<<set $ui = "start">> <<unset $Flag>> - -<<if ndef $slavesToImport>> <<set $slavesToImport = 0>> <</if>> -<<if ndef $slavesToImportMax>> <<set $slavesToImportMax = 5>> <</if>> - -<<silently>> <<include "Backwards Compatibility">> <</silently>> +<<set $ui = "start">> <<unset $Flag>> +<<if ndef $slavesToImport>><<set $slavesToImport = 0>><</if>> +<<if ndef $slavesToImportMax>><<set $slavesToImportMax = 5>><</if>> +<<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. <br><br> -You -<<if $cash >= _fee>> - have -<<else>> - 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. +You <<if $cash >= _fee>>have<<else>>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++]] @@ -73,7 +64,7 @@ Select up to $slavesToImportMax slaves to be imported into a new game and then c <</if>> <<if $slavesToImport >= $slavesToImportMax>> <<else>> - <<if $slaves.length > $slavesToImport>> <br><br> + <<if $slaves.length > $slavesToImport>> <br><br> ''These slaves are available to be imported into the new game:'' <<set $Flag = 0>> <<include "Slave Summary">> <</if>> -- GitLab