From e17250de0f01f08da9d3e32afcd8d3d865af5622 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Fri, 30 Mar 2018 23:29:58 -0500 Subject: [PATCH] Fix --- src/uncategorized/hgSelect.tw | 2 +- src/uncategorized/longSlaveDescription.tw | 4 ++-- src/uncategorized/randomIndividualEvent.tw | 2 +- src/uncategorized/randomNonindividualEvent.tw | 2 +- src/uncategorized/rename.tw | 2 +- src/utility/descriptionWidgetsFlesh.tw | 4 ++-- src/utility/miscWidgets.tw | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw index 9d25131cc5b..64b7af1253d 100644 --- a/src/uncategorized/hgSelect.tw +++ b/src/uncategorized/hgSelect.tw @@ -11,7 +11,7 @@ <<set $HeadGirl = $slaves[_i]>> <<if $surnameOrder != 1>> <<switch $HeadGirl.nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $HeadGirl.slaveSurname>> <<set _HGName = $HeadGirl.slaveSurname + " " + $HeadGirl.slaveName>> <<else>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 13fc2ab145f..9979c43a661 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -337,7 +337,7 @@ She comes to you for an inspection $activeSlave.birthName. <<elseif $surnameOrder != 1>>>> <<switch $activeSlave.nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName. <<default>> $activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>. @@ -360,7 +360,7 @@ She comes to you for an inspection $activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not its original name: it was once called <<if $surnameOrder != 1>> <<switch $activeSlave.nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName. <<default>> $activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>. diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 23e7f3d06a6..239c04aa9fb 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -11,7 +11,7 @@ <<if $eligibleSlaves[$i].slaveSurname>> <<if $surnameOrder != 1>> <<switch $eligibleSlaves[$i].nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<set _slaveName = $eligibleSlaves[$i].slaveSurname + " " + $eligibleSlaves[$i].slaveName>> <<default>> <<set _slaveName = $eligibleSlaves[$i].slaveName + " " + $eligibleSlaves[$i].slaveSurname>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 56e0efdc0b6..0191dfa364b 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -11,7 +11,7 @@ <<if $slaves[$i].slaveSurname>> <<if $surnameOrder != 1>> <<switch $slaves[$i].nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<set _slaveName = $slaves[$i].slaveSurname + " " + $slaves[$i].slaveName>> <<default>> <<set _slaveName = $slaves[$i].slaveName + " " + $slaves[$i].slaveSurname>> diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw index aa9087ae2b4..473d4809395 100644 --- a/src/uncategorized/rename.tw +++ b/src/uncategorized/rename.tw @@ -19,7 +19,7 @@ angrily tries to resist her new name, insisting that her name is <<if $surnameOrder != 1>> <<switch $activeSlave.nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName. <<default>> $activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>. diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 03c77f56eee..42f89561ff2 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -610,7 +610,7 @@ <<case "a hijab and abaya">> $activeSlave.slaveName's abaya <<if $activeSlave.boobs > 12000>> - modestly covers $possessive breasts, although the fabric struggles to cover the enitrirety of $possessive breasts. + modestly covers $possessive breasts, although the fabric struggles to ensure they are entirely covered. <<elseif $activeSlave.boobs > 4000>> modestly covers $possessive breasts. It has been let out a great deal in order to cover the size of $possessive chest. <<elseif $activeSlave.boobs > 2000>> @@ -8695,7 +8695,7 @@ $pronounCap has <<if _lsd != -1>> <<if $surnameOrder != 1>> <<switch $slaves[_lsd].nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $slaves[_lsd].slaveSurname>><<set _daddy = $slaves[_lsd].slaveSurname>><<set _daddy += " " + $slaves[_lsd].slaveName>><<else>><<set _daddy = $slaves[_lsd].slaveName>><</if>> <<default>> <<set _daddy = $slaves[_lsd].slaveName>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 0283dae673b..d42161ab717 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -885,7 +885,7 @@ <<if $surnameOrder != 1>> <<switch $PC.nationality>> - <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> <<if $PC.surname>><<set $PCTitle = $PC.surname>><<set $PCTitle += " " + $PC.name>><<else>><<set $PCTitle = $PC.name>><</if>> <<default>> <<set $PCTitle = $PC.name>> @@ -2531,9 +2531,9 @@ This experience <</widget>> /* see how they are on a single line? This permits "."s and other things to be appended directly onto the widget result */ -<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>> +<<widget "PlayerName">><<if $surnameOrder != 1>><<switch $PC.nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $PC.surname>>$PC.surname <</if>>$PC.name<<default>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</switch>><<else>>$PC.name<<if $PC.surname>> $PC.surname<</if>><</if>><</widget>> -<<widget "SlaveFullName">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><<else>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</if>><</widget>> +<<widget "SlaveFullName">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><<else>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</if>><</widget>> <<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<if $PC.surname>><<print $PC.surname>><<else>><<print $PC.name>><<s>>an<</if>><</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].intelligence > 1>><<if $PC.title > 0>>Ma<<s>>ther<<else>>Mi<<s>>tre<<ss>><</if>><<elseif $args[0].trust > 0>>$PC.name<<else>><<if $PC.surname>>$PC.surname<<else>>$PC.name<</if>><</if>><</switch>><</widget>> @@ -2541,7 +2541,7 @@ This experience Call as <<EventNameLink>> $args[0]: Slave. */ -<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>> +<<widget "EventNameLink">><<if $surnameOrder != 1>><<switch $args[0].nationality>><<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><<else>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</if>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>> /* Call as <<EventNameDelink>> -- GitLab