From 3ab36cdc28d70d545669a6fdfe20e7cb4ebc796f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 24 Oct 2017 00:51:07 -0400
Subject: [PATCH] Vanilla tweaks, fixes, and eugenics bad end file moving.
---
src/gui/Encyclopedia/encyclopedia.tw | 3 +-
.../eliteTakeOver.tw | 16 +-
.../eliteTakeOverFight.tw | 0
.../eliteTakeOverResult.tw | 0
.../widgets/slaveTradePresetWidgets.tw | 403 +++++++++++++++++-
src/uncategorized/longSlaveDescription.tw | 9 +-
src/uncategorized/nextWeek.tw | 2 +-
src/uncategorized/pRivalInitiation.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 11 +-
src/utility/descriptionWidgetsStyle.tw | 8 +-
src/utility/slaveCreationWidgets.tw | 2 +-
12 files changed, 418 insertions(+), 40 deletions(-)
rename src/{uncategorized => pregmod}/eliteTakeOver.tw (91%)
rename src/{uncategorized => pregmod}/eliteTakeOverFight.tw (100%)
rename src/{uncategorized => pregmod}/eliteTakeOverResult.tw (100%)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 172cddf3de9..0a4ae7d876f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2581,8 +2581,9 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''onithyr'' for various little tweaks and additions.
<br>''anonNeo'' for spellchecking.
<br>''Utopia'' for dirty dealings gang leader focus and updates to it.
-<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, and the Security Expansion Mod (not yet added).
+<br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework, and the Security Expansion Mod (not yet added).
<br>''laziestman'' for sexy spats.
+<br>''SFanon (blank)'' for SF related work and the joint Eugenics bad end rework.
<br>''anon'' for extending FCGudder's economy reports to the other facilities.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
diff --git a/src/uncategorized/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
similarity index 91%
rename from src/uncategorized/eliteTakeOver.tw
rename to src/pregmod/eliteTakeOver.tw
index c8aa1d90644..419e0e416ec 100644
--- a/src/uncategorized/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -8,21 +8,21 @@ You look up from your desk as the locked door to your office unseals, and a doze
<br>
<<if $PC.pregSource == -1>>
<<if $PC.refreshmentType == 0>>
- Taking a drag from a fresh $PC.refreshment
+ Taking a drag from a fresh $PC.refreshment,
<<elseif $PC.refreshmentType == 1>>
- Taking a drink of a fresh glass of $PC.refreshment
+ Taking a drink of a fresh glass of $PC.refreshment,
<<elseif $PC.refreshmentType == 2>>
- Taking a bite of a fresh $PC.refreshment
+ Taking a bite of a fresh $PC.refreshment,
<<elseif $PC.refreshmentType == 3>>
- Doing a line of $PC.refreshment
+ Doing a line of $PC.refreshment,
<<elseif $PC.refreshmentType == 4>>
- Injecting a hit of $PC.refreshment into your arm
+ Injecting a hit of $PC.refreshment into your arm,
<<elseif $PC.refreshmentType == 5>>
- Swallowing a $PC.refreshment
+ Swallowing a $PC.refreshment,
<<elseif $PC.refreshmentType == 6>>
- Placing a tab of $PC.refreshment under your tongue
+ Placing a tab of $PC.refreshment under your tongue,
<</if>>
- , you greet your rather unwelcome guests.
+ you greet your rather unwelcome guests.
<br><br>
"You are no longer worthy of being a part of our society. But you carry within you one of our heirs. A conundrum for some, but we have already solved that problem."
<br>
diff --git a/src/uncategorized/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
similarity index 100%
rename from src/uncategorized/eliteTakeOverFight.tw
rename to src/pregmod/eliteTakeOverFight.tw
diff --git a/src/uncategorized/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
similarity index 100%
rename from src/uncategorized/eliteTakeOverResult.tw
rename to src/pregmod/eliteTakeOverResult.tw
diff --git a/src/pregmod/widgets/slaveTradePresetWidgets.tw b/src/pregmod/widgets/slaveTradePresetWidgets.tw
index 8524533935b..8b49c7d8fcb 100644
--- a/src/pregmod/widgets/slaveTradePresetWidgets.tw
+++ b/src/pregmod/widgets/slaveTradePresetWidgets.tw
@@ -1,59 +1,434 @@
:: slave trade preset widgets [widget nobr]
-/* To add presets, add <<widget "NationalityPresetName">> and define it as [[Name|passage()][$nationalities = [nationalities go here]]] */
+/* To add presets, add <<widget "NationalityPresetName">> and define it as [[Name|passage()][$nationalities = [nationalities go here]]] (old method)*/
+/* Presets are weighted according to the number of times the player has incremented that nationality. */
<<widget "NationalityPresetVanillaGlobal">>
-[[Vanilla Global|passage()] [$nationalities = ["Afghan", "Afghan", "Albanian", "Algerian", "Algerian", "Algerian", "American", "American", "American", "American", "American", "Andorran", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Armenian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belarusian", "Belarusian", "Belgian", "Belgian", "Belizean", "Bolivian", "Bolivian", "Bosnian", "Bulgarian", "Bulgarian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "Bruneian", "Burmese", "Burmese", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Canadian", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Colombian", "Colombian", "Colombian", "Congolese", "Congolese", "Congolese", "Costa Rican", "Croatian", "Cuban", "Cuban", "Czech", "Czech", "Danish", "Danish", "Djiboutian", "Dominican", "Dominican", "Dominican", "Dominican", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Finnish", "Finnish", "French", "French", "French", "Gabonese", "German", "German", "German", "Ghanan", "Ghanan", "Greek", "Greek", "Grenadian", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Honduran", "Hungarian", "Hungarian", "Icelandic", "Icelandic", "I-Kiribati", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Irish", "Irish", "Israeli", "Israeli", "Italian", "Italian", "Italian", "Jamaican", "Jamaican", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Kosovan", "Laotian", "Lebanese", "Lebanese", "Libyan", "Libyan", "Lithuanian", "Lithuanian", "Luxembourgian", "Macedonian", "Malagasy", "Malaysian", "Malaysian", "Malaysian", "Maldivian", "Malian", "Malian", "Maltese", "Marshallese", "Mexican", "Mexican", "Mexican", "Mexican", "Monégasque", "Micronesian", "Moldovan", "Mongolian", "Montenegrin", "Moroccan", "Moroccan", "Nauruan", "Nepalese", "Nepalese", "Nicaraguan", "Nicaraguan", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Nigerien", "Nigerien", "Norwegian", "Norwegian", "Omani", "Omani", "Pakistani", "Pakistani", "Pakistani", "Panamanian", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Puerto Rican", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Salvadoran", "Salvadoran", "Sammarinese", "Saudi", "Saudi", "Scottish", "Scottish", "Serbian", "Serbian", "Singaporean", "Slovak", "Slovak", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Syrian", "Taiwanese", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Tuvaluan", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Uruguayan", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Zambian", "Zimbabwean", "Zimbabwean", "a New Zealander", "a New Zealander"]]]
+<<link "Vanilla Global">>
+ <<set $nationalities = weightedArray({
+ Afghan: 2,
+ Albanian: 1,
+ Algerian: 3,
+ American: 5,
+ Andorran: 1,
+ Argentinian: 3,
+ Armenian: 2,
+ Australian: 2,
+ Austrian: 2,
+ Bangladeshi: 4,
+ Belarusian: 1,
+ Belgian: 2,
+ Belizean: 1,
+ Bolivian: 2,
+ Bosnian: 1,
+ Bulgarian: 2,
+ Brazilian: 4,
+ British: 3,
+ Bruneian: 1,
+ Burmese: 3,
+ Cambodian: 1,
+ Cameroonian: 1,
+ Canadian: 2,
+ Chilean: 2,
+ Chinese: 15,
+ Colombian: 3,
+ Congolese: 3,
+ "Costa Rican": 1,
+ Croatian: 1,
+ Cuban: 2,
+ Czech: 2,
+ Danish: 2,
+ Djiboutian: 1,
+ Dominican: 2,
+ Dutch: 2,
+ Egyptian: 3,
+ Emirati: 2,
+ Estonian: 2,
+ Ethiopian: 3,
+ Filipina: 3,
+ Finnish: 2,
+ French: 3,
+ Gabonese: 1,
+ German: 3,
+ Ghanan: 2,
+ Greek: 2,
+ Grenadian: 1,
+ Guatemalan: 2,
+ Haitian: 2,
+ Honduran: 1,
+ Hungarian: 2,
+ Icelandic: 2,
+ "I-Kiribati": 1,
+ Indian: 11,
+ Indonesian: 5,
+ Iranian: 3,
+ Iraqi: 2,
+ Irish: 2,
+ Israeli: 2,
+ Italian: 3,
+ Jamaican: 2,
+ Japanese: 3,
+ Jordanian: 2,
+ Kazakh: 2,
+ Kenyan: 3,
+ Korean: 1,
+ Kosovan: 1,
+ Laotian: 1,
+ Lebanese: 2,
+ Libyan: 2,
+ Lithuanian: 2,
+ Luxembourgian: 1,
+ Macedonian: 1,
+ Malagasy: 1,
+ Malaysian: 3,
+ Maldivian: 1,
+ Malian: 2,
+ Maltese: 1,
+ Marshallese: 1,
+ Mexican: 4,
+ Monégasque: 1,
+ Micronesian: 1,
+ Moldovan: 1,
+ Mongolian: 1,
+ Montenegrin: 1,
+ Moroccan: 2,
+ Nauruan: 1,
+ Nepalese: 2,
+ Nicaraguan: 2,
+ Nigerian: 4,
+ Nigerien: 2,
+ Norwegian: 2,
+ Omani: 2,
+ Pakistani: 3,
+ Panamanian: 1,
+ Peruvian: 2,
+ Polish: 3,
+ Portuguese: 2,
+ "Puerto Rican": 1,
+ Romanian: 2,
+ Russian: 4,
+ Salvadoran: 2,
+ Sammarinese: 1,
+ Saudi: 2,
+ Scottish: 1,
+ Serbian: 2,
+ Singaporean: 1,
+ Slovak: 2,
+ "South African": 4,
+ Spanish: 3,
+ Sudanese: 3,
+ Swedish: 2,
+ Swiss: 2,
+ Syrian: 1,
+ Taiwanese: 1,
+ Tanzanian: 2,
+ Thai: 3,
+ Tunisian: 2,
+ Turkish: 3,
+ Tuvaluan: 1,
+ Ugandan: 2,
+ Ukrainian: 3,
+ Uruguayan: 1,
+ Uzbek: 2,
+ Venezuelan: 3,
+ Vietnamese: 3,
+ Yemeni: 2,
+ Zambian: 1,
+ Zimbabwean: 2,
+ "a New Zealander": 2
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaNA">>
-[[Vanilla North America|passage()] [$nationalities = ["American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Dominican", "Dominican", "Haitian", "Cuban", "Puerto Rican", "Jamaican", "Guatemalan", "Bermudian", "Greenlandic"]]]
+<<link "Vanilla North America">>
+ <<set $nationalities = weightedArray({
+ American: 5,
+ Canadian: 1,
+ Mexican: 2,
+ Dominican: 2,
+ Haitian: 1,
+ Cuban: 1,
+ "Puerto Rican": 1,
+ Jamaican: 1,
+ Guatemalan: 1,
+ Bermudian: 1,
+ Greenlandic: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaSA">>
-[[Vanilla South America|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan", "Uruguayan", "Belizean", "Grenadian", "Honduran", "Costa Rican", "Salvadoran", "Nicaraguan", "Panamanian"]]]
+<<link "Vanilla South America">>
+ <<set $nationalities = weightedArray({
+ Brazilian: 4,
+ Argentinian: 2,
+ Colombian: 2,
+ Peruvian: 1,
+ Venezuelan: 1,
+ Bolivian: 1,
+ Chilean: 1,
+ Guatemalan: 1,
+ Uruguayan: 1,
+ Belizean: 1,
+ Grenadian: 1,
+ Honduran: 1,
+ "Costa Rican": 1,
+ Salvadoran: 1,
+ Nicaraguan: 1,
+ Panamanian: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaME">>
-[[Vanilla Middle East|passage()] [$nationalities = ["Egyptian", "Egyptian", "Egyptian", "Iranian", "Iranian", "Saudi", "Saudi", "Turkish", "Turkish", "Lebanese", "Emirati", "Jordanian", "Omani", "Israeli", "Armenian", "Iraqi", "Afghan", "Yemeni", "Syrian"]]]
+<<link "Vanilla Middle East">>
+ <<set $nationalities = weightedArray({
+ Egyptian: 3,
+ Iranian: 2,
+ Saudi: 2,
+ Turkish: 2,
+ Lebanese: 1,
+ Emirati: 1,
+ Jordanian: 1,
+ Omani: 1,
+ Israeli: 1,
+ Armenian: 1,
+ Iraqi: 1,
+ Afghan: 1,
+ Yemeni: 1,
+ Syrian: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaAfrica">>
-[[Vanilla Africa|passage()] [$nationalities = ["Nigerian", "Nigerian", "Nigerian", "South African", "South African", "South African", "Kenyan", "Kenyan", "Congolese", "Congolese", "Ethiopian", "Ethiopian", "Algerian", "Algerian", "Sudanese", "Sudanese", "Moroccan", "Ghanan", "Tunisian", "Malian", "Libyan", "Zimbabwean", "Tanzanian", "Ugandan", "Cameroonian", "Gabonese", "Djiboutian", "Zambian", "Malagasy", "Nigerien"]]]
+<<link "Vanilla Africa">>
+ <<set $nationalities = weightedArray({
+ Nigerian: 3,
+ "South African": 3,
+ Kenyan: 2,
+ Congolese: 2,
+ Ethiopian: 2,
+ Algerian: 2,
+ Sudanese: 2,
+ Moroccan: 1,
+ Ghanan: 1,
+ Tunisian: 1,
+ Malian: 1,
+ Libyan: 1,
+ Zimbabwean: 1,
+ Tanzanian: 1,
+ Ugandan: 1,
+ Cameroonian: 1,
+ Gabonese: 1,
+ Djiboutian: 1,
+ Zambian: 1,
+ Malagasy: 1,
+ Nigerien: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaAsia">>
-[[Vanilla Asia|passage()] [$nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indonesian", "Indonesian", "Indonesian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Thai", "Thai", "Vietnamese", "Vietnamese", "Korean", "Korean", "Pakistani", "Pakistani", "Filipina", "Filipina", "Japanese", "Japanese", "Burmese", "Burmese", "Malaysian", "Malaysian", "Uzbek", "Nepalese", "Kazakh", "Cambodian", "Bruneian", "Singaporean", "Laotian", "Mongolian", "Taiwanese", "Maldivian"]]]
+<<link "Vanilla Asia">>
+ <<set $nationalities = weightedArray({
+ Chinese: 14,
+ Indian: 10,
+ Bangladeshi: 3,
+ Thai: 2,
+ Vietnamese: 2,
+ Korean: 2,
+ Pakistani: 2,
+ Filipina: 2,
+ Japanese: 2,
+ Burmese: 2,
+ Malaysian: 2,
+ Uzbek: 1,
+ Nepalese: 1,
+ Kazakh: 1,
+ Cambodian: 1,
+ Bruneian: 1,
+ Singaporean: 1,
+ Laotian: 1,
+ Mongolian: 1,
+ Taiwanese: 1,
+ Maldivian: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaEU">>
-[[Vanilla Europe|passage()] [$nationalities = ["Russian", "Russian", "Russian", "Russian", "German", "German", "German", "Belarusian", "Belarusian", "Ukrainian", "Ukrainian", "French", "French", "Italian", "Italian", "Spanish", "Spanish", "British", "British", "Polish", "Polish", "Romanian", "Lithuanian", "Irish", "Scottish", "Icelandic", "Finnish", "Greek", "Belgian", "Danish", "Czech", "Serbian", "Slovak", "Norwegian", "Dutch", "Austrian", "Swiss", "Portuguese", "Hungarian", "Estonian", "Sammarinese", "Monégasque", "Montenegrin", "Albanian", "Bosnian", "Croatian", "Kosovan", "Macedonian", "Maltese", "Andorran", "Bulgarian", "Luxembourgian", "Moldovan"]]]
+<<link "Vanilla Europe">>
+ <<set $nationalities = weightedArray({
+ Russian: 4,
+ German: 3,
+ Belarusian: 2,
+ Ukrainian: 2,
+ French: 2,
+ Italian: 2,
+ Spanish: 2,
+ British: 2,
+ Polish: 2,
+ Romanian: 1,
+ Lithuanian: 1,
+ Irish: 1,
+ Scottish: 1,
+ Icelandic: 1,
+ Finnish: 1,
+ Greek: 1,
+ Belgian: 1,
+ Danish: 1,
+ Czech: 1,
+ Serbian: 1,
+ Slovak: 1,
+ Norwegian: 1,
+ Dutch: 1,
+ Austrian: 1,
+ Swiss: 1,
+ Portuguese: 1,
+ Hungarian: 1,
+ Estonian: 1,
+ Sammarinese: 1,
+ Monégasque: 1,
+ Montenegrin: 1,
+ Albanian: 1,
+ Bosnian: 1,
+ Croatian: 1,
+ Kosovan: 1,
+ Macedonian: 1,
+ Maltese: 1,
+ Andorran: 1,
+ Bulgarian: 1,
+ Luxembourgian: 1,
+ Moldovan: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetVanillaAU">>
-[[Vanilla Australia|passage()] [$nationalities = ["Australian", "Australian", "Australian", "a New Zealander", "Marshallese", "Tuvaluan", "I-Kiribati", "Nauruan", "Micronesian"]]]
+<<link "Vanilla Australia">>
+ <<set $nationalities = weightedArray({
+ Australian: 3,
+ "a New Zealander": 1,
+ Marshallese: 1,
+ Tuvaluan: 1,
+ "I-Kiribati": 1,
+ Nauruan: 1,
+ Micronesian: 1
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
+/* I need reweighting and possibly country additions */
<<widget "NationalityPresetModEurope">>
-[[Europe|passage()] [$nationalities = ["Albanian", "Austrian", "Austrian", "Austrian", "Belgian", "Belgian", "Belgian", "Belgian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Danish", "Danish", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Dutch", "Finnish", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Greek", "Greek", "Greek", "Greek", "Hungarian", "Hungarian", "Hungarian", "Irish", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Kazakh", "Lithuanian", "Monégasque", "Montenegrin", "Norwegian", "Norwegian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Portuguese", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Sammarinese", "Scottish", "Scottish", "Serbian", "Serbian", "Slovak", "Slovak", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Swedish", "Swedish", "Swedish", "Swiss", "Swiss", "Swiss", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Bosnian", "Croatian", "Kosovan", "Macedonian", "Maltese", "Andorran", "Bulgarian", "Luxembourgian", "Moldovan"]]]
+<<link "Europe">>
+ <<set $nationalities = weightedArray({
+ Albanian: 1,
+ Andorran: 1,
+ Austrian: 3,
+ Belgian: 4,
+ Bosnian: 1,
+ British: 20,
+ Bulgarian: 1,
+ Croatian: 1,
+ Danish: 2,
+ Dutch: 6,
+ Finnish: 2,
+ French: 22,
+ German: 27,
+ Greek: 4,
+ Hungarian: 3,
+ Irish: 1,
+ Italian: 20,
+ Kazakh: 5,
+ Kosovan: 1,
+ Lithuanian: 1,
+ Luxembourgian: 1,
+ Macedonian: 1,
+ Maltese: 1,
+ Moldovan: 1,
+ Monégasque: 1,
+ Montenegrin: 1,
+ Norwegian: 2,
+ Polish: 13,
+ Portuguese: 3,
+ Romanian: 7,
+ Russian: 48,
+ Sammarinese: 1,
+ Scottish: 2,
+ Serbian: 2,
+ Slovak: 2,
+ Spanish: 16,
+ Swedish: 3,
+ Swiss: 3,
+ Turkish: 26,
+ Ukrainian: 15
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetModEastAsia">>
-[[East Asia|passage()] [$nationalities = ["Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Japanese", "Japanese", "Korean"]]]
+<<link "East Asia">>
+ <<set $nationalities = weightedArray({Chinese: 21, Japanese: 2, Korean: 1})>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetModUSA">>
-[[USA|passage()] [$nationalities = ["American", "American", "American", "American", "American", "American", "American", "American", "Canadian", "Mexican", "Mexican", "Mexican"]]]
+<<link USA>>
+ <<set $nationalities = weightedArray({American: 8, Canadian: 1, Mexican: 3})>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetModJapan">>
-[[Japan|passage()] [$nationalities = ["Japanese", "Japanese", "Japanese"]]]
+<<link Japan>>
+ <<set $nationalities = weightedArray({Japanese: 3})>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
<<widget "NationalityPresetModBrazil">>
-[[Brazil|passage()] [$nationalities = ["Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Argentinian", "Argentinian", "Colombian", "Colombian", "Peruvian", "Venezuelan", "Bolivian", "Chilean", "Guatemalan", "Uruguayan"]]]
+<<link Brazil>>
+ <<set $nationalities = weightedArray({
+ Brazilian: 30,
+ Argentinian: 4,
+ Colombian: 3,
+ Peruvian: 2,
+ Venezuelan: 2,
+ Bolivian: 2,
+ Chilean: 2,
+ Guatemalan: 2,
+ Uruguayan: 2
+ })>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
<</widget>>
+/* I need reweighting */
<<widget "NationalityPresetModGlobalRealism">>
[[Global Realism|passage()] [$nationalities = ["American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "American", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Afghan", "Albanian", "Albanian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Algerian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Argentinian", "Armenian", "Australian", "Australian", "Australian", "Australian", "Austrian", "Austrian", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi", "Belarusian", "Belarusian", "Belgian", "Belgian", "Bermudian", "Bolivian", "Bolivian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "British", "British", "British", "British", "British", "British", "British", "British", "British", "British", "Bruneian", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Burmese", "Cambodian", "Cameroonian", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Canadian", "Chilean", "Chilean", "Chilean", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Czech", "Czech", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Colombian", "Congolese", "Cuban", "Cuban", "Danish", "Djiboutian", "Dominican", "Dominican", "Dutch", "Dutch", "Dutch", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Egyptian", "Emirati", "Emirati", "Estonian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Ethiopian", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Filipina", "Finnish", "French", "French", "French", "French", "French", "French", "French", "French", "French", "French", "Guatemalan", "Gabonese", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "German", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Ghanan", "Greek", "Greek", "Greenlandic", "Guatemalan", "Guatemalan", "Guatemalan", "Haitian", "Haitian", "Hungarian", "Hungarian", "Icelandic", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iranian", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Iraqi", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Italian", "Irish", "Israeli", "Israeli", "Jamaican", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Japanese", "Jordanian", "Jordanian", "Kazakh", "Kazakh", "Kazakh", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Kenyan", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malaysian", "Malian", "Malian", "Malian", "Marshallese", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Mexican", "Monégasque", "Montenegrin", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Moroccan", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "Nepalese", "a New Zealander", "Nigerian", "Nigerian", "Nigerian", "Nigerian", "Norwegian", "Omani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Pakistani", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Peruvian", "Polish", "Polish", "Polish", "Polish", "Polish", "Polish", "Portuguese", "Portuguese", "Puerto Rican", "Romanian", "Romanian", "Romanian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Russian", "Sammarinese", "Saudi", "Saudi", "Saudi", "Saudi", "Saudi", "Scottish", "Serbian", "Serbian", "Singaporean", "Singaporean", "Slovak", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "South African", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Spanish", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Sudanese", "Swedish", "Swedish", "Swiss", "Swiss", "Syrian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Tanzanian", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Thai", "Tunisian", "Tunisian", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Turkish", "Tuvaluan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ugandan", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Ukrainian", "Uruguayan", "Uruguayan", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Uzbek", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Venezuelan", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Vietnamese", "Yemeni", "Yemeni", "Yemeni", "Yemeni", "Zambian", "Zimbabwean", "Zimbabwean", "Zimbabwean", "Laotian", "Mongolian", "Taiwanese", "Belizean", "Grenadian", "I-Kiribati", "Malagasy", "Maldivian", "Bosnian", "Croatian", "Kosovan", "Macedonian", "Honduran", "Maltese", "Nauruan", "Micronesian", "Costa Rican", "Salvadoran", "Nicaraguan", "Panamanian", "Nigerien", "Andorran", "Bulgarian", "Luxembourgian", "Moldovan"]]]
<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index aded6be6588..6338fdc92fd 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1848,10 +1848,16 @@ Her scars make her look like she's in the right place.
<<BoobsDescription>>
<<boobsShapeDescription>>
<<boobsExtraDescription>>
+<<if $showBodyMods == 1>>
+ <<boobsTatDescription>>
+<</if>>
+<<boobBrandDescription>>
<<shouldersDescription>>
<<nipplesDescription>>
+<<if $showBodyMods == 1>>
+ <<nipplesPiercingDescription>>
+<</if>>
<<areolaeDescription>>
-<<boobModDescription>>
<<if $activeSlave.inflation > 0>>
<<BellyInflationDescription>>
@@ -1872,6 +1878,7 @@ Her scars make her look like she's in the right place.
<<AnusDescription>>
<<if $activeSlave.fuckdoll == 0>>
+ <br>
<<switch $activeSlave.drugs>>
<<case "super fertility drugs">>
<<if isFertile($activeSlave) && $activeSlave.preg == 0>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 025ada049bd..189a2d57ac0 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -31,7 +31,7 @@
<<if $seeAge == 1>>
<<set $slaves[_i].physicalAge += 1, $slaves[_i].actualAge += 1, $slaves[_i].visualAge += 1>>
<<set $slaves[_i].ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>> /*Hopefully this works. It is intended, over a slave's lifetime, to cause her menopause to shift.*/
- <<if $slaves[_i].physicalAge <= 18 && $loliGrow == 1>>
+ <<if $slaves[_i].physicalAge <= 18 && $loliGrow == 0>>
<<PhysicalDevelopment $slaves[_i]>>
<</if>>
<</if>>
diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw
index 07556ce587e..c7e52d5e31d 100644
--- a/src/uncategorized/pRivalInitiation.tw
+++ b/src/uncategorized/pRivalInitiation.tw
@@ -51,7 +51,7 @@ This is a special week, the week of your victory. <<EventNameLink $activeSlave>>
<br><<link "Let the public impregnate her">>
<<replace "#result">>
You announce that since $activeSlave.slaveName damaged the arcology, she will be taking a leading role in the reconstruction. She will be doing this by replacing one of the residents killed in the violence - by bearing a new slave, to be conceived collectively. The shame and @@.mediumorchid;horror@@ of her future as breeding stock comes home to her as she's restrained in a chair with her legs spread. Soon, the stream of fluids is running down her thoroughly-fucked pussy and over her virgin anus to pool on the floor beneath her. Modern medical imaging reveals her fertile ovum's last, losing battle against a legion of sperm in real time, and the images are projected on large screens.
- <<set $rep += 500, $activeSlave.preg = 1, $activeSlave.pregSource = -2, , $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.devotion -= 15>>
+ <<set $rep += 500, $activeSlave.preg = 1, $activeSlave.pregSource = -2, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.devotion -= 15>>
<<SetPregType $activeSlave>>
<<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>>
<</replace>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 623ea555053..b87544dc426 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3402,7 +3402,7 @@
<</if>>
/* PUBERTY EFFECTS + GROWTH*/
-<<if $precociousPuberty == 1 && $seeAge == 1 && $loliGrow == 1 && $slaves[$i].physicalAge < 19>>
+<<if $precociousPuberty == 1 && $seeAge == 1 && $loliGrow == 0 && $slaves[$i].physicalAge < 19>>
<<if $slaves[$i].diet == "XX">>
<<set $slaves[$i].hormoneBalance += 1>>
<<elseif $slaves[$i].diet == "XXY">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 072ba3d9b98..2a8464f3a4e 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -851,14 +851,9 @@ $possessiveCap
<</widget>>
-<<widget "boobModDescription">>
+<<widget "boobBrandDescription">>
<<if $showBodyMods == 1>>
-
- <<nipplesPiercingDescription>>
-
- <<boobsTatDescription>>
-
<<if $activeSlave.fuckdoll == 0>>
<<if ($activeSlave.brand != 0) && (($activeSlave.brandLocation == "left breast") || ($activeSlave.brandLocation == "right breast") || ($activeSlave.brandLocation == "breasts"))>>
<<brandDescription>>
@@ -3212,6 +3207,7 @@ $pronounCap's got a
<<if $activeSlave.fuckdoll == 0>>
<<if $showBodyMods == 1>>
<<dickTatDescription>>
+ <<dickPiercingDescription>>
<</if>>
<</if>>
@@ -3650,7 +3646,6 @@ $pronounCap's got a
<<if $activeSlave.fuckdoll == 0>>
<<vaginaTatDescription>>
<</if>>
- <<dickPiercingDescription>>
<</if>>
<<if $activeSlave.fuckdoll == 0>>
@@ -6217,7 +6212,7 @@ $pronounCap has
<</if>>
<</if>>
<<else>>
- <<if $activeSlave.navelPiercing > 0>>
+ <<if $activeSlave.navelPiercing > 0 && $showBodyMods == 1>>
<<if $activeSlave.belly >= 10000>>
<<if $activeSlave.navelPiercing == 1>>
$possessiveCap popped navel bears a simple stud.
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index c5a66f20429..23e6fad6cd9 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -3605,9 +3605,9 @@ $possessiveCap
<<if $activeSlave.anus < 2>>
agonizingly stretched
<<elseif $activeSlave.anus < 3>>
- uncomfortably
+ uncomfortably stretched
<<else>>
- comfortably
+ comfortably stretched
<</if>>
by a large buttplug.
<<if $activeSlave.buttplugAttachment == "tail">>
@@ -3618,9 +3618,9 @@ $possessiveCap
<<if $activeSlave.anus < 2>>
agonizingly stretched
<<elseif $activeSlave.anus < 3>>
- uncomfortably
+ uncomfortably stretched
<<else>>
- comfortably
+ comfortably stretched
<</if>>
by a large and long buttplug. It causes a noticeable bulge in $possessive belly.
<<if $activeSlave.buttplugAttachment == "tail">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 7b21c06fb0e..61b5b3dc373 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2627,7 +2627,7 @@
<<case "kidnappers">>
<<include "Generate New Slave">>
- <<set $activeSlave.origin = "You bought her from the kidnappers' slave market, and was probably forced into slavery.">>
+ <<set $activeSlave.origin = "You bought her from the kidnappers' slave market, so she was probably forced into slavery.">>
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust = random(-45,-25)>>
<<set $activeSlave.intelligence = either(-2, -1, -1, 0, 0, 0, 1)>>
--
GitLab