diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 013947089938706cfddaf1628793c31a6dca47c3..01fdb88226a8824755a19eacf098a30fb5bebaa2 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -70,7 +70,7 @@ You are using standardized slave trading channels. [[Customize the slave trade|C <</if>> <</if>> <<else>> -Current nationality distributions are [[Adjust the slave trade|Customize Slave Trade][$customWA = 0]] | [[Stop customizing|Intro Summary][delete $customVariety]] +Current nationality distributions are [[Adjust the slave trade|Customize Slave Trade][$customWA = 0, $customVariety to 1]] | [[Stop customizing|Intro Summary][delete $customVariety]] <br style="clear:both" /><hr style="margin:0"> <<for _i = 0; _i < $nationalitiescheck.length; _i++>> <<set _nation to $nationalitiescheck[_i]>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 04e4b34e62cc2422b49c75686339bc0eea9db38c..7388f00a1e0108aad9f151f2205b666fe1e86977 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1057,7 +1057,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $latinaNationalities = ["American", "Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Cuban", "Guatemalan", "Mexican", "Peruvian", "Puerto Rican", "Venezuelan"]>> -<<set $middleEasternNationalities = ["Afghan", "Algerian", "American", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Tunisian", "Turkish", "Yemeni"]>> +<<set $middleeasternNationalities = ["Afghan", "Algerian", "American", "Egyptian", "Emirati", "Ethiopian", "French", "German", "Iraqi", "Israeli", "Italian", "Jordanian", "Lebanese", "Libyan", "Malian", "Moroccan", "Omani", "Saudi", "Sudanese", "Swedish", "Tunisian", "Turkish", "Yemeni"]>> <<set $blackNationalities = ["American", "Australian", "Brazilian", "Congolese", "Cuban", "Dominican", "Egyptian", "Ethiopian", "French", "German", "Ghanan", "Haitian", "Jamaican", "Kenyan", "Malian", "Moroccan", "Nigerian", "Saudi", "South African", "Sudanese", "Swedish", "Tanzanian", "Ugandan", "Yemeni", "Zimbabwean"]>> @@ -1069,7 +1069,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $amerindianNationalities = ["American", "Bolivian", "Brazilian", "Canadian", "Guatemalan", "Mexican", "Peruvian"]>> -<<set $southernEuropeanNationalities = ["French", "Greek", "Italian", "Spanish"]>> +<<set $southerneuropeanNationalities = ["French", "Greek", "Italian", "Spanish"]>> <<set $semiticNationalities = ["Armenian", "Egyptian", "Ethiopian", "Ghanan", "Iranian", "Iraqi", "Israeli", "Jordanian", "Kazakh", "Lebanese", "Pakistani", "Romanian", "Spanish", "Tanzanian", "Turkish", "Yemeni"]>> @@ -1078,7 +1078,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $southamericaNationalities = ["Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Guatemalan", "Peruvian", "Venezuelan"]>> -<<set $europeNationalities = ["Austrian", "Belarusian", "Belgian", "British", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Greek", "Hungarian", "Icelandic", "Irish", "Italian", "Lithuanian", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Scottish", "Serbian", "Slovak", "Spanish", "Swiss", "Ukrainian"]>> +<<set $europeNationalities = ["Austrian", "Belarusian", "Belgian", "British", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Greek", "Hungarian", "Icelandic", "Irish", "Italian", "Lithuanian", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Scottish", "Serbian", "Slovak", "Spanish", "Swedish", "Swiss", "Ukrainian"]>> <<set $asiaNationalities = ["Bangladeshi", "Burmese", "Chinese", "Filipina", "Indian", "Indonesian", "Japanese", "Kazakh", "Korean", "Malaysian", "Nepalese", "Pakistani", "Thai", "Uzbek", "Vietnamese"]>> diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw index 9655885ec9287ec4ae5a5b36a173e4335e7b3c12..bbf3ad6cd5335f16646ffa9447d4d1cdd3ab6c8b 100644 --- a/src/npc/rgASDump.tw +++ b/src/npc/rgASDump.tw @@ -52,7 +52,7 @@ <<elseif $PC.career is "gang">> <<set $activeSlave.health += 5>> <<if $activeSlave.combatSkill < 1>> - <<set activeSlave.combatSkill += 1>> + <<set $activeSlave.combatSkill += 1>> <</if>> <<elseif $PC.career is "escort">> <<if $activeSlave.entertainSkill < 60>> diff --git a/src/pregmod/customizeSlaveTrade.tw b/src/pregmod/customizeSlaveTrade.tw index b5cc65a7abef01db9ab36a9bd16b667fb4b40ed5..d09a880ded9eaba17096f74f02a4b24160718376 100644 --- a/src/pregmod/customizeSlaveTrade.tw +++ b/src/pregmod/customizeSlaveTrade.tw @@ -1,7 +1,7 @@ :: Customize Slave Trade [nobr] <<set $basenationalities = ["Afghan", "Algerian", "American", "Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Colombian", "Congolese", "Cuban", "Czech", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "Nigerian", "Norwegian", "Omani", "Pakistani", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Romanian", "Russian", "Saudi", "Scottish", "Serbian", "Slovak", "South African", "Spanish", "Sudanese", "Swedish", "Swiss", "Tanzanian", "Thai", "Tunisian", "Turkish", "Ugandan", "Ukrainian", "Uzbek", "Venezuelan", "Vietnamese", "Yemeni", "Zimbabwean", "a New Zealander"]>> -<<set $filterRaces = ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Pacific Islander", "Semitic", "Southern European", "White"]>> +<<set $filterRaces = ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Pacific Islander", "Semitic", "Southern European", "White"]>> <<set $filterRegions = ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"]>> <<if ndef $nationalities>> <<set $nationalities = []>> diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw index fae3aefe7ed667dc65a584c0fd13f9280b1961c2..89d5296ebcc5b85374fdae15954ae277e1822c05 100644 --- a/src/pregmod/pregmodWidgets.tw +++ b/src/pregmod/pregmodWidgets.tw @@ -1401,7 +1401,7 @@ $daddy's virile cock and balls. <br> $possessiveCap's child had extra time to grow @@color:red;greatly complicating childbirth@@. <</if>> -<<if (($slaves[$i].vagina >= 2 or $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) or $slaves[$i].births > 0 or $slaves[$i].hips > 0 or $nurseCareers.contains($slaves[$i].career) or $slaves[$i].intelligenceImplant > 0>> +<<if (($slaves[$i].vagina >= 2 or $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) or $slaves[$i].births > 0 or $slaves[$i].hips > 0 or $nurseCareers.includes($slaves[$i].career) or $slaves[$i].intelligenceImplant > 0>> <br>However: <<if $slaves[$i].mpreg == 1>> <<if $slaves[$i].anus >= 2>> @@ -1426,7 +1426,7 @@ $daddy's virile cock and balls. <br> $possessiveCap @@color:green;wide hips@@ greatly aided childbirth. <</if>> -<<if $nurseCareers.contains($slaves[$i].career)>> +<<if $nurseCareers.includes($slaves[$i].career)>> <br> Thanks to $possessive @@color:green;previous career@@, childbirth went smoothly. <</if>> diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw index 4a663096502425a101b53f8e4444a9d0c5ab533d..a90dc3f5e401c23a8a0b796f55f41b809319b6cf 100644 --- a/src/uncategorized/economics.tw +++ b/src/uncategorized/economics.tw @@ -648,7 +648,7 @@ On formal occasions, you are announced as $PCTitle. <<elseif $PC.career is "servant">> Your reputation is so strong that society has accepted your previous vocation despite how unusual it is for a prominent slaveowner to have once been nothing more than a lowly servant. <</if>> -<<if $PC.career is "gang" && rep < 15000>> +<<if $PC.career is "gang" && $rep < 15000>> Society @@color:red;frowns@@ over being run by an ex-gang leader, no matter how strong they might have been. <<set $rep -= ($rep*0.1)>> <<elseif $PC.career is "gang">> diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index b02e51c0a0f5115574388de93d2b66eb74d9a08a..b4b3cea14156f7425a572c7eff4317a8b8632572 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -268,10 +268,6 @@ She waits anxiously for your decision. <<set $activeSlave.boobs = (random(5,6)*100)>> <<set $activeSlave.butt = random(4,6)>> <<set $activeSlave.actualAge = ($eventSlave.actualAge+random(15,20))>> - <<set $activeSlaveOneTimeMaxAge to Math.max($minimumSlaveAge, Math.min(18, ($activeSlave.actualAge - Math.min(11, $potencyAge))))>> - <<set $activeSlaveOneTimeMinAge to Math.max($minimumSlaveAge, Math.min(14, $activeSlaveOneTimeMaxAge))>> - <<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge to $minimumSlaveAge>><</if>> - <<set $activeSlave.actualAge to random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>> <<set $activeSlave.birthWeek to 0>> <<case "daughter">> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index 36f5252d9e8e91246c84859e09b479a837188718..3f247ec545c9f1cc6448e1d8cbc2dfe4e19c2909 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -406,6 +406,8 @@ serves you this week. $PC.pregSource = $slaves[$i].ID; <</if>> <</if>> + Rumors spread that you @@color:red;enjoy taking it from slaves.@@ + <<set $PC.degeneracy += 2>> <</if>> <<else>>