From fb440eac81abc47f11c16f07e9ba10a3eda4078f Mon Sep 17 00:00:00 2001
From: fcanon <fcanon@nowhere.na>
Date: Mon, 29 May 2017 13:32:12 -0400
Subject: [PATCH] standardize capitalization of "southern european" race (14
out of 23 files used different capitalization) - added to backwards
compatibility
---
src/cheats/mod_EditSlaveCheat.tw | 2 +-
src/npc/startingGirls/startingGirls.tw | 2 +-
src/pregmod/pcAppearanceIntro.tw | 2 +-
src/pregmod/seHuskSlaveDelivery.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 4 ++++
src/uncategorized/corporationDevelopments.tw | 2 +-
src/uncategorized/customSlave.tw | 2 +-
src/uncategorized/degradingName.tw | 2 +-
src/uncategorized/generateXXSlave.tw | 2 +-
src/uncategorized/generateXYSlave.tw | 2 +-
src/uncategorized/personalAssistantAppearance.tw | 4 ++--
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/seCustomSlaveDelivery.tw | 2 +-
src/uncategorized/slaveGenerationWidgets.tw | 8 ++++----
src/uncategorized/slaveSummary.tw | 4 ++--
15 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 3f2bb80a13f..0b6286728bd 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -95,7 +95,7 @@
<<radiobutton "$activeSlave.race" "middle eastern">> Middle eastern
<<radiobutton "$activeSlave.race" "black">> Black
<<radiobutton "$activeSlave.race" "semitic">> Semitic
-<<radiobutton "$activeSlave.race" "southern European">> Southern European
+<<radiobutton "$activeSlave.race" "southern european">> Southern European
<<radiobutton "$activeSlave.race" "indo-aryan">> Indo-aryan
<<radiobutton "$activeSlave.race" "amerindian">> Amerindian
<<radiobutton "$activeSlave.race" "pacific islander">> Pacific Islander
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 280df6f8b84..d1debd1da3d 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -558,7 +558,7 @@ Her nationality is $activeSlave.nationality.
<<link "Asian">><<set $activeSlave.race = "asian">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Middle Eastern">><<set $activeSlave.race = "middle eastern">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Amerindian">><<set $activeSlave.race = "amerindian">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
-<<link "Southern European">><<set $activeSlave.race = "southern European">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
+<<link "Southern European">><<set $activeSlave.race = "southern european">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Semitic">><<set $activeSlave.race = "semitic">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Malay">><<set $activeSlave.race = "malay">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
<<link "Indo-aryan">><<set $activeSlave.race = "indo-aryan">><<replace "#ethnicity">><<textbox "$activeSlave.race" $activeSlave.race "Starting Girls">><</replace>><<StartingGirlsCost>><</link>> |
diff --git a/src/pregmod/pcAppearanceIntro.tw b/src/pregmod/pcAppearanceIntro.tw
index 641dfb2a816..cf71946993d 100644
--- a/src/pregmod/pcAppearanceIntro.tw
+++ b/src/pregmod/pcAppearanceIntro.tw
@@ -49,7 +49,7 @@ I'm $PC.race.
<</link>>
|
<<link "Southern European">>
- <<set $PC.race = "southern European">>
+ <<set $PC.race = "southern european">>
<<PlayerRace>>
<</link>>
|
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index bc65db6ca03..3cc82f1221f 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -42,7 +42,7 @@
<<set $activeSlave.skin = either("pale", "dark", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
-<<elseif ($activeSlave.race == "middle eastern") || ($activeSlave.race == "semitic") || ($activeSlave.race == "southern European")>>
+<<elseif ($activeSlave.race == "middle eastern") || ($activeSlave.race == "semitic") || ($activeSlave.race == "southern european")>>
<<set $activeSlave.skin = either("pale", "dark", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c9fb09501e7..0cd411b20e4 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1283,6 +1283,10 @@ Setting missing slave variables:
<<PMODinit _Slave>>
+<<if _Slave.race == "southern European">>
+ <<set _Slave.race = "southern european">>
+<</if>>
+
<<if ndef _Slave.aphrodisiacs>>
<<set _Slave.aphrodisiacs = 0>>
<</if>>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index bd5868fd8b9..cdd23a0c412 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -873,7 +873,7 @@ You hold $personalShares shares personally while $publicShares are publicly held
| <<link "Malay">><<set $captureUpgradeRace = "malay">><<replace "#direction">><br><<print "You directed the corporation to retain malay slaves for training.">><</replace>><</link>>
| <<link "Amerindian">><<set $captureUpgradeRace = "amerindian">><<replace "#direction">><br><<print "You directed the corporation to retain amerindian slaves for training.">><</replace>><</link>>
| <<link "Semitic">><<set $captureUpgradeRace = "semitic">><<replace "#direction">><br><<print "You directed the corporation to retain semitic slaves for training.">><</replace>><</link>>
- | <<link "Southern European">><<set $captureUpgradeRace = "southern European">><<replace "#direction">><br><<print "You directed the corporation to retain southern European slaves for training.">><</replace>><</link>>
+ | <<link "Southern European">><<set $captureUpgradeRace = "southern european">><<replace "#direction">><br><<print "You directed the corporation to retain southern european slaves for training.">><</replace>><</link>>
| <<link "Mixed Race">><<set $captureUpgradeRace = "mixed race">><<replace "#direction">><br><<print "You directed the corporation to retain mixed race slaves for training.">><</replace>><</link>>
| <<link "No focus">><<set $captureUpgradeRace = "none">><<replace "#direction">><br><<print "You directed the corporation to retain any promising slave for training.">><</replace>><</link>>
<</if>>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index b5faf1a3b1e..1a4b392007d 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -267,7 +267,7 @@
<</link>>
|
<<link "Southern European">>
- <<set $customSlave.race = "southern European">>
+ <<set $customSlave.race = "southern european">>
<<CustomSlaveRace>>
<</link>>
|
diff --git a/src/uncategorized/degradingName.tw b/src/uncategorized/degradingName.tw
index 9fa9d5990d4..1836e06ceaa 100644
--- a/src/uncategorized/degradingName.tw
+++ b/src/uncategorized/degradingName.tw
@@ -23,7 +23,7 @@
<<set $prefixes.push("Islander", "Sea")>>
<<elseif ($activeSlave.race == "malay")>>
<<set $prefixes.push("Spice", "Cinnamon", "Pinoy")>>
-<<elseif ($activeSlave.race == "southern European")>>
+<<elseif ($activeSlave.race == "southern european")>>
<<set $prefixes.push("Mediterranean", "Olive")>>
<<elseif ($activeSlave.race == "amerindian")>>
<<set $prefixes.push("Indian", "Reservation")>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 80858db9d22..3dcc3ad4c4d 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -453,7 +453,7 @@
<<set $activeSlave.skin = either("pale", "dark", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = "neat">>
-<<case "middle eastern" "semitic" "southern European">>
+<<case "middle eastern" "semitic" "southern european">>
<<set $activeSlave.butt = either(1, 2, 2, 3, 3)>>
<<set $activeSlave.boobs = BoobGenerator.rollBreast(0)>>
<<set $activeSlave.lips = random(5,25)>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 0c09a5f3b64..68ed1eb19e2 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -452,7 +452,7 @@
<<set $activeSlave.skin = either("pale", "dark", "light")>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = "neat">>
-<<case "middle eastern" "semitic" "southern European">>
+<<case "middle eastern" "semitic" "southern european">>
<<set $activeSlave.butt = either(1, 1, 2, 3)>>
<<set $activeSlave.boobs = either(100, 200, 200, 300, 300, 400, 500)>>
<<set $activeSlave.lips = random(5,25)>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 523b4b6c898..c5d8d747081 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -3,7 +3,7 @@
<<set $seed = random(1,8)>>
<<switch $assistantAppearance>>
<<case "monstergirl">>
-She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace is "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "white">><<print either("pale", "tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace is "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "indo-aryan" or $arcologies[0].FSSupremacistRace is "malay" or $arcologies[0].FSSupremacistRace is "pacific islander" or $arcologies[0].FSSupremacistRace is "amerindian">><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace is "asian">><<print either("pale", "dark", "light")>><<elseif $arcologies[0].FSSupremacistRace is "middle eastern" or $arcologies[0].FSSupremacistRace is "semitic" or $arcologies[0].FSSupremacistRace is "southern European">><<print either("pale", "dark", "light")>><</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. Her eyes are large, expressive, and surprisingly innocent.
+She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>monstergirl with <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace is "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "white">><<print either("pale", "tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace is "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "indo-aryan" or $arcologies[0].FSSupremacistRace is "malay" or $arcologies[0].FSSupremacistRace is "pacific islander" or $arcologies[0].FSSupremacistRace is "amerindian">><<print either("dark", "light")>><<elseif $arcologies[0].FSSupremacistRace is "asian">><<print either("pale", "dark", "light")>><<elseif $arcologies[0].FSSupremacistRace is "middle eastern" or $arcologies[0].FSSupremacistRace is "semitic" or $arcologies[0].FSSupremacistRace is "southern european">><<print either("pale", "dark", "light")>><</if>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. Her eyes are large, expressive, and surprisingly innocent.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
@@ -78,7 +78,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<</if>>
<<case "shemale">>
-She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>bimbo shemale with blonde hair, <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace is "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "white">><<print either("tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace is "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "indo-aryan" or $arcologies[0].FSSupremacistRace is "malay" or $arcologies[0].FSSupremacistRace is "pacific islander" or $arcologies[0].FSSupremacistRace is "amerindian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "asian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "middle eastern" or $arcologies[0].FSSupremacistRace is "semitic" or $arcologies[0].FSSupremacistRace is "southern European">><<print either("dark", "tanned")>><</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. Her cock hangs past her knees when limp.
+She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>>bimbo shemale with blonde hair, <<if $arcologies[0].FSSupremacist != "unset">><<if $arcologies[0].FSSupremacistRace is "black">><<print either("black", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "white">><<print either("tanned", "fair")>><<elseif $arcologies[0].FSSupremacistRace is "latina">><<print either("olive", "brown", "light brown")>><<elseif $arcologies[0].FSSupremacistRace is "indo-aryan" or $arcologies[0].FSSupremacistRace is "malay" or $arcologies[0].FSSupremacistRace is "pacific islander" or $arcologies[0].FSSupremacistRace is "amerindian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "asian">><<print either("dark", "tanned")>><<elseif $arcologies[0].FSSupremacistRace is "middle eastern" or $arcologies[0].FSSupremacistRace is "semitic" or $arcologies[0].FSSupremacistRace is "southern european">><<print either("dark", "tanned")>><</if>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. Her cock hangs past her knees when limp.
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index f3cac1a1b76..1b5c85ac55a 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -28,7 +28,7 @@
<<set $qualifiedNicknames.push("black")>>
<<elseif ($activeSlave.race == "pacific islander")>>
<<set $qualifiedNicknames.push("pacific islander")>>
-<<elseif ($activeSlave.race == "southern European")>>
+<<elseif ($activeSlave.race == "southern european")>>
<<set $qualifiedNicknames.push("southern european")>>
<<elseif ($activeSlave.race == "amerindian")>>
<<set $qualifiedNicknames.push("amerindian")>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 4256a3301d0..024b85f6194 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -49,7 +49,7 @@
<<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
-<<elseif ($activeSlave.race == "middle eastern") || ($activeSlave.race == "semitic") || ($activeSlave.race == "southern European")>>
+<<elseif ($activeSlave.race == "middle eastern") || ($activeSlave.race == "semitic") || ($activeSlave.race == "southern european")>>
<<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
diff --git a/src/uncategorized/slaveGenerationWidgets.tw b/src/uncategorized/slaveGenerationWidgets.tw
index e6364745ba8..7ebd3696043 100644
--- a/src/uncategorized/slaveGenerationWidgets.tw
+++ b/src/uncategorized/slaveGenerationWidgets.tw
@@ -168,13 +168,13 @@
<<case "Swedish">>
<<set $args[0].race = either("middle eastern", "white", "white", "white", "white")>>
<<case "French">>
- <<set $args[0].race = either("black", "middle eastern", "white", "white", "white", "white", "white", "southern European")>>
+ <<set $args[0].race = either("black", "middle eastern", "white", "white", "white", "white", "white", "southern european")>>
<<case "Italian">>
- <<set $args[0].race = either("middle eastern", "southern European", "southern European", "white", "white")>>
+ <<set $args[0].race = either("middle eastern", "southern european", "southern european", "white", "white")>>
<<case "Greek">>
- <<set $args[0].race = either("southern European")>>
+ <<set $args[0].race = either("southern european")>>
<<case "Spanish">>
- <<set $args[0].race = either("semitic", "southern European", "southern European")>>
+ <<set $args[0].race = either("semitic", "southern european", "southern european")>>
<<case "British">>
<<set $args[0].race = either("indo-aryan", "white", "white", "white", "white", "white", "white", "white", "white", "white")>>
<<case "Scottish">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 5c7b5eacd0c..54cad8cf868 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1145,7 +1145,7 @@ Release rules: _Slave.releaseRules.
AI
<<case "semitic">>
S
-<<case "southern European">>
+<<case "southern european">>
SE
<<case "mixed race">>
MR
@@ -1174,7 +1174,7 @@ Release rules: _Slave.releaseRules.
Amerindian.
<<case "semitic">>
Semitic.
-<<case "southern European">>
+<<case "southern european">>
Southern European.
<<case "mixed race">>
Mixed race.
--
GitLab