From be48fa741915f9d0fac530826d6a68e4f50a8dce Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 23 May 2018 12:18:35 -0400 Subject: [PATCH] tweaks --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 ++ src/pregmod/slaveSlaveSwap.tw | 118 +------------------ src/pregmod/widgets/bodyswapWidgets.tw | 61 ++++++++++ 3 files changed, 71 insertions(+), 115 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 5c5ff70b705..ead75e8d405 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,13 @@ 0.10.7.1-0.2.x +5/23/2018 + + 3 + -slave slave bodyswapping added + -fixes + -many text corrections + 5/21/2018 2 diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw index bc9bb16fc60..5599c26827a 100644 --- a/src/pregmod/slaveSlaveSwap.tw +++ b/src/pregmod/slaveSlaveSwap.tw @@ -47,122 +47,10 @@ In the neighboring bed, <</if>> <</if>> -/* now to handle who's body it is */ - -<<if $slaves[_ss2].bodySwap == 0>> - <<if $slaves[_ss2].birthSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss2].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<if $slaves[_ss2].birthName !== "">> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthSurname + " " + $slaves[_ss2].birthName>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthSurname + " " + $slaves[_ss2].slaveName>> - <</if>> - <<default>> - <<if $slaves[_ss2].birthName !== "">> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthName + " " + $slaves[_ss2].birthSurname>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveName + " " + $slaves[_ss2].birthSurname>> - <</if>> - <</switch>> - <<else>> - <<if $slaves[_ss2].birthName !== "">> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthName + " " + $slaves[_ss2].birthSurname>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveName + " " + $slaves[_ss2].birthSurname>> - <</if>> - <</if>> - <<elseif $slaves[_ss2].birthName>> - <<if $slaves[_ss2].slaveSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss2].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveSurname + " " + $slaves[_ss2].birthName>> - <<default>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthName + " " + $slaves[_ss2].slaveSurname>> - <</switch>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthName + " " + $slaves[_ss2].slaveSurname>> - <</if>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].birthName>> - <</if>> - <<elseif $slaves[_ss2].slaveSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss2].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveSurname + " " + $slaves[_ss2].slaveName>> - <<default>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveName + " " + $slaves[_ss2].slaveSurname>> - <</switch>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveName + " " + $slaves[_ss2].slaveSurname>> - <</if>> - <<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].slaveName>> - <</if>> -<<else>> - <<set $slaves[_ss1].origBodyOwner = $slaves[_ss2].origBodyOwner>> -<</if>> - -<<if $slaves[_ss1].bodySwap == 0>> - <<if $slaves[_ss1].birthSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss1].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<if $slaves[_ss1].birthName !== "">> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthSurname + " " + $slaves[_ss1].birthName>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthSurname + " " + $slaves[_ss1].slaveName>> - <</if>> - <<default>> - <<if $slaves[_ss1].birthName !== "">> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthName + " " + $slaves[_ss1].birthSurname>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveName + " " + $slaves[_ss1].birthSurname>> - <</if>> - <</switch>> - <<else>> - <<if $slaves[_ss1].birthName !== "">> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthName + " " + $slaves[_ss1].birthSurname>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveName + " " + $slaves[_ss1].birthSurname>> - <</if>> - <</if>> - <<elseif $slaves[_ss1].birthName>> - <<if $slaves[_ss1].slaveSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss1].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveSurname + " " + $slaves[_ss1].birthName>> - <<default>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthName + " " + $slaves[_ss1].slaveSurname>> - <</switch>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthName + " " + $slaves[_ss1].slaveSurname>> - <</if>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].birthName>> - <</if>> - <<elseif $slaves[_ss1].slaveSurname>> - <<if $surnameOrder != 1>> - <<switch $slaves[_ss2].nationality>> - <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveSurname + " " + $slaves[_ss1].slaveName>> - <<default>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveName + " " + $slaves[_ss1].slaveSurname>> - <</switch>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveName + " " + $slaves[_ss1].slaveSurname>> - <</if>> - <<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].slaveName>> - <</if>> -<<else>> - <<set $slaves[_ss2].origBodyOwner = $slaves[_ss1].origBodyOwner>> -<</if>> +/* now to handle who's body it is, name-wise */ +<<BodySwapName $slaves[_ss1] $slaves[_ss2]>> +<<BodySwapName $slaves[_ss2] $slaves[_ss1]>> <<if _ss1Clone.bodySwap > 0>> <<if $slaves[_ss1].origBodyOwnerID == $slaves[_ss1].ID>> diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index 2dd5925cd28..765d6a216c1 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -169,4 +169,65 @@ <<set $args[0].canRecruit = 0>> <<assignJob $args[0] "rest">> +<</widget>> + +<<widget "BodySwapName">> + +<<if $args[1].bodySwap == 0>> + <<if $args[1].birthSurname>> + <<if $surnameOrder != 1>> + <<switch $args[1].nationality>> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> + <<if $args[1].birthName !== "">> + <<set $args[0].origBodyOwner = $args[1].birthSurname + " " + $args[1].birthName>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].birthSurname + " " + $args[1].slaveName>> + <</if>> + <<default>> + <<if $args[1].birthName !== "">> + <<set $args[0].origBodyOwner = $args[1].birthName + " " + $args[1].birthSurname>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].slaveName + " " + $args[1].birthSurname>> + <</if>> + <</switch>> + <<else>> + <<if $args[1].birthName !== "">> + <<set $args[0].origBodyOwner = $args[1].birthName + " " + $args[1].birthSurname>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].slaveName + " " + $args[1].birthSurname>> + <</if>> + <</if>> + <<elseif $args[1].birthName>> + <<if $args[1].slaveSurname>> + <<if $surnameOrder != 1>> + <<switch $args[1].nationality>> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> + <<set $args[0].origBodyOwner = $args[1].slaveSurname + " " + $args[1].birthName>> + <<default>> + <<set $args[0].origBodyOwner = $args[1].birthName + " " + $args[1].slaveSurname>> + <</switch>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].birthName + " " + $args[1].slaveSurname>> + <</if>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].birthName>> + <</if>> + <<elseif $args[1].slaveSurname>> + <<if $surnameOrder != 1>> + <<switch $args[1].nationality>> + <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">> + <<set $args[0].origBodyOwner = $args[1].slaveSurname + " " + $args[1].slaveName>> + <<default>> + <<set $args[0].origBodyOwner = $args[1].slaveName + " " + $args[1].slaveSurname>> + <</switch>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].slaveName + " " + $args[1].slaveSurname>> + <</if>> + <<else>> + <<set $args[0].origBodyOwner = $args[1].slaveName>> + <</if>> +<<else>> + <<set $args[0].origBodyOwner = $args[1].origBodyOwner>> +<</if>> + <</widget>> \ No newline at end of file -- GitLab