diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index b444044b0d5b90b82002f9b341eae172e66cd550..86b2e42b16241c3f45deb09e7c5b3b82c90eee5e 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 4/02/2018 + 22 + -fixes, typos and code improvements + -even more (git) vector art + 21 -more nicknames -more names then you'll ever want diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 73d587adb15e07a2c6a013ec50988f4d16d11233..3b522a6d77a537e87c3f2a1111a0a8b8ab10f121 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -147,6 +147,13 @@ __''General slave settings''__ [[Enable mentions of nationality|Intro Summary][$seeNationality = 1]] <</if>> +<br> +<<if $surnameOrder != 1>> + Order names ''based on country of origin''. [[Force name surname|Intro Summary][$surnameOrder = 1]] +<<else>> + Names will always be ''Name Surname''. [[Allow nationality name order|Intro Summary][$surnameOrder = 0]] +<</if>> + <br> <<if $familyTesting == 1>> Slaves ''can'' have extended families instead of just a single relative. //May cause lag.// @@ -464,20 +471,21 @@ __''Player Character''__ [[feminine Mistress|Intro Summary][$PC.title = 0, $PCCreationSex = "feminine ''Mistress''"]] <</if>> - <br>Everyone calls you ''<<textbox "$PC.name" $PC.name>>'' <<if $PC.surname>> ''<<textbox "$PC.surname" $PC.surname>>'' <</if>> + <br>Everyone calls you ''<<PlayerName>>.'' <br> + With ''<<textbox "$PC.name" $PC.name>>'' as your given name and <<if $PC.surname == 0>> - <<link "Add a surname">> - <<set $PC.surname = "Anon">> - <<goto "Intro Summary">> - <</link>> //Surnames cannot be changed during the game outside of special circumstances.// - <</if>> - - <<if $PC.surname != 0>> - <<link "Go by a single name">> - <<set $PC.surname = 0, $PC.surname = "">> - <<goto "Intro Summary">> - <</link>> + no surname. + <<link "Add a surname">> + <<set $PC.surname = "Anon">> + <<goto "Intro Summary">> + <</link>> //Surnames cannot be changed during the game outside of special circumstances.// + <<else>> + ''<<textbox "$PC.surname" $PC.surname>>'' as your surname. + <<link "Go by a single name">> + <<set $PC.surname = 0, $PC.surname = "">> + <<goto "Intro Summary">> + <</link>> <</if>> <br> @@ -901,7 +909,7 @@ Currently ''enabled.'' [[Disable|Intro Summary][$seeImages = 0]] <br> <<if $imageChoice == 1>> - ''Vector art by NoX'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to non-embedded vector art|Intro Summary][$imageChoice = 2]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]] + ''Vector art by NoX/Deepmurk'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to non-embedded vector art|Intro Summary][$imageChoice = 2]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]] <br> Highlights on shiny clothing <<if $seeVectorArtHighlights == 1>> @@ -911,7 +919,7 @@ Currently <</if>> <br>@@.red;Git compiled only, no exceptions.@@ <<elseif $imageChoice == 2>> - ''Vector art by NoX - non-embed version'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to embedded vector art|Intro Summary][$imageChoice = 1]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]] + ''Vector art by NoX/Deepmurk - non-embed version'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to embedded vector art|Intro Summary][$imageChoice = 1]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]] <<elseif $imageChoice == 3>> ''Vector art revamp'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to embedded vector art|Intro Summary][$imageChoice = 1]] | [[Switch to non-embedded vector art|Intro Summary][$imageChoice = 2]] <br> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index dd3fdb056948dc96313993efad4326c896a68d78..b8166af4ddcd5df52cc5fc9c24ef680a32ea734a 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -52,7 +52,7 @@ Image display @@.cyan;ENABLED@@. [[Disable|Options][$seeImages = 0]] <br> <<if $imageChoice == 1>> - @@.yellow;Vector art by NoX@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]] | [[Switch to non-embedded vector art|Options][$imageChoice = 2]] | [[Switch to revamped embedded vector art|Options][$imageChoice = 3]] + @@.yellow;Vector art by NoX/Deepmurk@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]] | [[Switch to non-embedded vector art|Options][$imageChoice = 2]] | [[Switch to revamped embedded vector art|Options][$imageChoice = 3]] <br> Highlights on shiny clothing <<if $seeVectorArtHighlights == 1>> @@ -62,7 +62,7 @@ Image display <</if>> <br>@@.red;Git compiled only, no exceptions.@@ <<elseif $imageChoice == 2>> - @@.yellow;Vector art by NoX - non-embed version@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]] | [[Switch to embedded vector art|Options][$imageChoice = 1]] | [[Switch to revamped embedded vector art|Options][$imageChoice = 3]] + @@.yellow;Vector art by NoX/Deepmurk - non-embed version@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]] | [[Switch to embedded vector art|Options][$imageChoice = 1]] | [[Switch to revamped embedded vector art|Options][$imageChoice = 3]] <<elseif $imageChoice == 3>> @@.yellow;Vector art revamp@@ is selected. [[Switch to rendered imagepack|Options][$imageChoice = 0]] | [[Switch to embedded vector art|Options][$imageChoice = 1]] | [[Switch to non-embedded vector art|Options][$imageChoice = 2]] <br>