From e6fc0758da4ae9da33ee9f119c08ea24ed3c1736 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 16 Mar 2017 21:31:21 -0400
Subject: [PATCH] 0.9.10.2
---
src/events/intro/initNationalities.tw | 453 +++++++++---------
src/npc/startingGirls/startingGirls.tw | 2 +
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/clubReport.tw | 9 +-
src/uncategorized/dairyReport.tw | 224 +++++----
.../mod_BackwardsCompatibility.tw | 4 +-
src/uncategorized/neighborsDevelopment.tw | 2 +-
src/uncategorized/saGetMilked.tw | 26 +-
8 files changed, 374 insertions(+), 348 deletions(-)
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index d6de2c04c48..d3185069fc5 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -35,7 +35,7 @@
<<set $upgradeMultiplierArcology to 0.8>>
<<set $rep += 2000>>
<<elseif $PC.career is "escort">>
- <<set $trinkets.push("a copy the first porno you starred in")>>
+ <<set $trinkets.push("a copy of the first porno you starred in")>>
<<elseif $PC.career is "servant">>
<<set $trinkets.push("a framed picture of your late Master")>>
<<elseif $PC.career is "gang">>
@@ -82,233 +82,238 @@
/*Nationalities Setup*/
<<set $basenationalities = ["American", "Afghan", "Algerian","Argentinian", "Armenian", "Australian", "Austrian", "Bangladeshi", "Belarusian", "Belgian", "Bolivian", "Brazilian", "British", "Burmese", "Canadian", "Chilean", "Chinese", "Czech", "Colombian", "Congolese", "Cuban", "Danish", "Dominican", "Dutch", "Egyptian", "Emirati", "Estonian", "Ethiopian", "Filipina", "Finnish", "French", "German", "Ghanan", "Greek", "Guatemalan", "Haitian", "Hungarian", "Icelandic", "Indonesian", "Indian", "Iranian", "Iraqi", "Italian", "Irish", "Israeli", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Korean", "Lebanese", "Libyan", "Lithuanian", "Malaysian", "Malian", "Mexican", "Moroccan", "Nepalese", "a New Zealander", "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"]>>
-<<set $nationalities = clone($basenationalities)>>
+<<set $nationalities = []>>
-<<if $internationalTrade != 0>>
-<<if $internationalVariety == 0>>
- <<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
- <<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
- <<set $nationalities.push("American","American","American","American")>>
- <<set $nationalities.push("Indonesian","Indonesian","Indonesian","Indonesian")>>
- <<set $nationalities.push("Bangladeshi","Bangladeshi","Bangladeshi")>>
- <<set $nationalities.push("Russian","Russian","Russian")>>
- <<set $nationalities.push("Belarusian","Belarusian","Belarusian")>>
- <<set $nationalities.push("Nigerian","Nigerian","Nigerian")>>
- <<set $nationalities.push("South African","South African","South African")>>
- <<set $nationalities.push("Brazilian","Brazilian","Brazilian")>>
- <<set $nationalities.push("Mexican","Mexican","Mexican")>>
- <<set $nationalities.push("Dominican","Dominican","Dominican")>>
- <<set $nationalities.push("Argentinian","Argentinian")>>
- <<set $nationalities.push("Egyptian","Egyptian")>>
- <<set $nationalities.push("Pakistani","Pakistani")>>
- <<set $nationalities.push("Filipina","Filipina")>>
- <<set $nationalities.push("Vietnamese","Vietnamese")>>
- <<set $nationalities.push("Iranian","Iranian")>>
- <<set $nationalities.push("Korean","Korean")>>
- <<set $nationalities.push("Japanese","Japanese")>>
- <<set $nationalities.push("Thai","Thai")>>
- <<set $nationalities.push("Turkish","Turkish")>>
- <<set $nationalities.push("Ethiopian","Ethiopian")>>
- <<set $nationalities.push("Kenyan", "Kenyan")>>
- <<set $nationalities.push("Congolese","Congolese")>>
- <<set $nationalities.push("Colombian","Colombian")>>
- <<set $nationalities.push("Venezuelan","Venezuelan")>>
- <<set $nationalities.push("German","German")>>
- <<set $nationalities.push("French","French")>>
- <<set $nationalities.push("British","British")>>
- <<set $nationalities.push("Italian","Italian")>>
- <<set $nationalities.push("Spanish","Spanish")>>
- <<set $nationalities.push("Ukrainian","Ukrainian")>>
- <<set $nationalities.push("Polish","Polish")>>
- <<set $nationalities.push("Burmese","Burmese")>>
- <<set $nationalities.push("Algerian","Algerian")>>
- <<set $nationalities.push("Sudanese","Sudanese")>>
- <<set $nationalities.push("Lebanese")>>
- <<set $nationalities.push("Tunisian")>>
- <<set $nationalities.push("Emirati")>>
- <<set $nationalities.push("Libyan")>>
- <<set $nationalities.push("Jordanian")>>
- <<set $nationalities.push("Omani")>>
- <<set $nationalities.push("Malian")>>
- <<set $nationalities.push("Iraqi")>>
- <<set $nationalities.push("Uzbek")>>
- <<set $nationalities.push("Nepalese")>>
- <<set $nationalities.push("Afghan")>>
- <<set $nationalities.push("Yemeni")>>
- <<set $nationalities.push("Saudi")>>
- <<set $nationalities.push("Australian")>>
- <<set $nationalities.push("Ghanan")>>
- <<set $nationalities.push("Canadian")>>
- <<set $nationalities.push("Peruvian")>>
- <<set $nationalities.push("Chilean")>>
- <<set $nationalities.push("Guatemalan")>>
- <<set $nationalities.push("a New Zealander")>>
- <<set $nationalities.push("Irish")>>
- <<set $nationalities.push("Scottish")>>
- <<set $nationalities.push("Icelandic")>>
- <<set $nationalities.push("Finnish")>>
- <<set $nationalities.push("Israeli")>>
- <<set $nationalities.push("Armenian")>>
- <<set $nationalities.push("Greek")>>
- <<set $nationalities.push("Moroccan")>>
- <<set $nationalities.push("Zimbabwean")>>
- <<set $nationalities.push("Tanzanian")>>
- <<set $nationalities.push("Ugandan")>>
- <<set $nationalities.push("Romanian")>>
- <<set $nationalities.push("Swedish")>>
- <<set $nationalities.push("Belgian")>>
- <<set $nationalities.push("Danish")>>
- <<set $nationalities.push("Czech")>>
- <<set $nationalities.push("Serbian")>>
- <<set $nationalities.push("Slovak")>>
- <<set $nationalities.push("Norwegian")>>
- <<set $nationalities.push("Dutch")>>
- <<set $nationalities.push("Austrian")>>
- <<set $nationalities.push("Swiss")>>
- <<set $nationalities.push("Portuguese")>>
- <<set $nationalities.push("Hungarian")>>
- <<set $nationalities.push("Estonian")>>
- <<set $nationalities.push("Lithuanian")>>
- <<set $nationalities.push("Bolivian")>>
- <<set $nationalities.push("Haitian")>>
- <<set $nationalities.push("Puerto Rican")>>
- <<set $nationalities.push("Jamaican")>>
- <<set $nationalities.push("Cuban")>>
- <<set $nationalities.push("Kazakh")>>
- <<set $nationalities.push("Malaysian", "Malaysian")>>
+<<if $terrain == "oceanic">>
+ <<set $nationalities = clone($basenationalities)>>
+ <<set $arcologies[0].FSSupremacistRace to "white">>
+ <<set $arcologies[0].FSSubjugationistRace to "middle eastern">>
+<<else>>
+ <<switch $continent>>
+ <<case "North America">>
+ <<set $arcologies[0].FSSupremacistRace to "white">>
+ <<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<set $nationalities.push("American","American","American","American")>>
+ <<set $nationalities.push("Mexican","Mexican")>>
+ <<set $nationalities.push("Dominican","Dominican")>>
+ <<set $nationalities.push("Canadian")>>
+ <<set $nationalities.push("Haitian")>>
+ <<set $nationalities.push("Cuban")>>
+ <<set $nationalities.push("Puerto Rican")>>
+ <<set $nationalities.push("Jamaican")>>
+ <<case "South America">>
+ <<set $arcologies[0].FSSupremacistRace to "latina">>
+ <<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian")>>
+ <<set $nationalities.push("Argentinian","Argentinian")>>
+ <<set $nationalities.push("Colombian","Colombian")>>
+ <<set $nationalities.push("Peruvian")>>
+ <<set $nationalities.push("Venezuelan")>>
+ <<set $nationalities.push("Bolivian")>>
+ <<set $nationalities.push("Chilean")>>
+ <<set $nationalities.push("Guatemalan")>>
+ <<case "Brazil">>
+ <<set $arcologies[0].FSSupremacistRace to "white">>
+ <<set $arcologies[0].FSSubjugationistRace to "black">>
+ <<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian")>>
+ <<set $nationalities.push("Argentinian","Argentinian")>>
+ <<set $nationalities.push("Colombian","Colombian")>>
+ <<set $nationalities.push("Peruvian")>>
+ <<set $nationalities.push("Venezuelan")>>
+ <<set $nationalities.push("Bolivian")>>
+ <<set $nationalities.push("Chilean")>>
+ <<set $nationalities.push("Guatemalan")>>
+ <<case "the Middle East">>
+ <<set $arcologies[0].FSSupremacistRace to "middle eastern">>
+ <<set $arcologies[0].FSSubjugationistRace to "asian">>
+ <<set $nationalities.push("Egyptian", "Egyptian", "Egyptian")>>
+ <<set $nationalities.push("Iranian", "Iranian")>>
+ <<set $nationalities.push("Saudi", "Saudi")>>
+ <<set $nationalities.push("Turkish", "Turkish")>>
+ <<set $nationalities.push("Lebanese")>>
+ <<set $nationalities.push("Emirati")>>
+ <<set $nationalities.push("Jordanian")>>
+ <<set $nationalities.push("Omani")>>
+ <<set $nationalities.push("Israeli")>>
+ <<set $nationalities.push("Armenian")>>
+ <<set $nationalities.push("Iraqi")>>
+ <<set $nationalities.push("Afghan")>>
+ <<set $nationalities.push("Yemeni")>>
+ <<case "Africa">>
+ <<set $arcologies[0].FSSupremacistRace to "black">>
+ <<set $arcologies[0].FSSubjugationistRace to "white">>
+ <<set $nationalities.push("Nigerian", "Nigerian", "Nigerian")>>
+ <<set $nationalities.push("South African","South African","South African")>>
+ <<set $nationalities.push("Kenyan", "Kenyan")>>
+ <<set $nationalities.push("Congolese", "Congolese")>>
+ <<set $nationalities.push("Ethiopian", "Ethiopian")>>
+ <<set $nationalities.push("Algerian","Algerian")>>
+ <<set $nationalities.push("Sudanese","Sudanese")>>
+ <<set $nationalities.push("Moroccan")>>
+ <<set $nationalities.push("Ghanan")>>
+ <<set $nationalities.push("Tunisian")>>
+ <<set $nationalities.push("Malian")>>
+ <<set $nationalities.push("Libyan")>>
+ <<set $nationalities.push("Zimbabwean")>>
+ <<set $nationalities.push("Tanzanian")>>
+ <<set $nationalities.push("Ugandan")>>
+ <<case "Asia">>
+ <<set $arcologies[0].FSSupremacistRace to "asian">>
+ <<set $arcologies[0].FSSubjugationistRace to "indo-aryan">>
+ <<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
+ <<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
+ <<set $nationalities.push("Indonesian","Indonesian","Indonesian")>>
+ <<set $nationalities.push("Bangladeshi","Bangladeshi","Bangladeshi")>>
+ <<set $nationalities.push("Thai","Thai")>>
+ <<set $nationalities.push("Vietnamese","Vietnamese")>>
+ <<set $nationalities.push("Korean","Korean")>>
+ <<set $nationalities.push("Pakistani","Pakistani")>>
+ <<set $nationalities.push("Filipina","Filipina")>>
+ <<set $nationalities.push("Japanese","Japanese")>>
+ <<set $nationalities.push("Burmese","Burmese")>>
+ <<set $nationalities.push("Malaysian", "Malaysian")>>
+ <<set $nationalities.push("Uzbek")>>
+ <<set $nationalities.push("Nepalese")>>
+ <<set $nationalities.push("Kazakh")>>
+ <<case "Europe">>
+ <<set $arcologies[0].FSSupremacistRace to "white">>
+ <<set $arcologies[0].FSSubjugationistRace to "middle eastern">>
+ <<set $nationalities.push("Russian", "Russian", "Russian", "Russian")>>
+ <<set $nationalities.push("German", "German", "German")>>
+ <<set $nationalities.push("Belarusian","Belarusian")>>
+ <<set $nationalities.push("Ukrainian", "Ukrainian")>>
+ <<set $nationalities.push("French", "French")>>
+ <<set $nationalities.push("Italian", "Italian")>>
+ <<set $nationalities.push("Spanish", "Spanish")>>
+ <<set $nationalities.push("British", "British")>>
+ <<set $nationalities.push("Polish", "Polish")>>
+ <<set $nationalities.push("Romanian")>>
+ <<set $nationalities.push("Lithuanian")>>
+ <<set $nationalities.push("Irish")>>
+ <<set $nationalities.push("Scottish")>>
+ <<set $nationalities.push("Icelandic")>>
+ <<set $nationalities.push("Finnish")>>
+ <<set $nationalities.push("Greek")>>
+ <<set $nationalities.push("Belgian")>>
+ <<set $nationalities.push("Danish")>>
+ <<set $nationalities.push("Czech")>>
+ <<set $nationalities.push("Serbian")>>
+ <<set $nationalities.push("Slovak")>>
+ <<set $nationalities.push("Norwegian")>>
+ <<set $nationalities.push("Dutch")>>
+ <<set $nationalities.push("Austrian")>>
+ <<set $nationalities.push("Swiss")>>
+ <<set $nationalities.push("Portuguese")>>
+ <<set $nationalities.push("Hungarian")>>
+ <<set $nationalities.push("Estonian")>>
+ <<case "Australia">>
+ <<set $arcologies[0].FSSupremacistRace to "white">>
+ <<set $arcologies[0].FSSubjugationistRace to "asian">>
+ <<set $nationalities.push("Australian","Australian","Australian")>>
+ <<set $nationalities.push("a New Zealander")>>
+ <<case "Japan">>
+ <<set $arcologies[0].FSSupremacistRace to "asian">>
+ <<set $arcologies[0].FSSubjugationistRace to "asian">>
+ <<set $nationalities.push("Japanese","Japanese","Japanese")>>
+ <</switch>>
<</if>>
+
+<<if $internationalTrade != 0>>
+ <<set $nationalities = clone($basenationalities)>>
+ <<if $internationalVariety == 0>>
+ <<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
+ <<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
+ <<set $nationalities.push("American","American","American","American")>>
+ <<set $nationalities.push("Indonesian","Indonesian","Indonesian","Indonesian")>>
+ <<set $nationalities.push("Bangladeshi","Bangladeshi","Bangladeshi")>>
+ <<set $nationalities.push("Russian","Russian","Russian")>>
+ <<set $nationalities.push("Belarusian","Belarusian","Belarusian")>>
+ <<set $nationalities.push("Nigerian","Nigerian","Nigerian")>>
+ <<set $nationalities.push("South African","South African","South African")>>
+ <<set $nationalities.push("Brazilian","Brazilian","Brazilian")>>
+ <<set $nationalities.push("Mexican","Mexican","Mexican")>>
+ <<set $nationalities.push("Dominican","Dominican","Dominican")>>
+ <<set $nationalities.push("Argentinian","Argentinian")>>
+ <<set $nationalities.push("Egyptian","Egyptian")>>
+ <<set $nationalities.push("Pakistani","Pakistani")>>
+ <<set $nationalities.push("Filipina","Filipina")>>
+ <<set $nationalities.push("Vietnamese","Vietnamese")>>
+ <<set $nationalities.push("Iranian","Iranian")>>
+ <<set $nationalities.push("Korean","Korean")>>
+ <<set $nationalities.push("Japanese","Japanese")>>
+ <<set $nationalities.push("Thai","Thai")>>
+ <<set $nationalities.push("Turkish","Turkish")>>
+ <<set $nationalities.push("Ethiopian","Ethiopian")>>
+ <<set $nationalities.push("Kenyan", "Kenyan")>>
+ <<set $nationalities.push("Congolese","Congolese")>>
+ <<set $nationalities.push("Colombian","Colombian")>>
+ <<set $nationalities.push("Venezuelan","Venezuelan")>>
+ <<set $nationalities.push("German","German")>>
+ <<set $nationalities.push("French","French")>>
+ <<set $nationalities.push("British","British")>>
+ <<set $nationalities.push("Italian","Italian")>>
+ <<set $nationalities.push("Spanish","Spanish")>>
+ <<set $nationalities.push("Ukrainian","Ukrainian")>>
+ <<set $nationalities.push("Polish","Polish")>>
+ <<set $nationalities.push("Burmese","Burmese")>>
+ <<set $nationalities.push("Algerian","Algerian")>>
+ <<set $nationalities.push("Sudanese","Sudanese")>>
+ <<set $nationalities.push("Lebanese")>>
+ <<set $nationalities.push("Tunisian")>>
+ <<set $nationalities.push("Emirati")>>
+ <<set $nationalities.push("Libyan")>>
+ <<set $nationalities.push("Jordanian")>>
+ <<set $nationalities.push("Omani")>>
+ <<set $nationalities.push("Malian")>>
+ <<set $nationalities.push("Iraqi")>>
+ <<set $nationalities.push("Uzbek")>>
+ <<set $nationalities.push("Nepalese")>>
+ <<set $nationalities.push("Afghan")>>
+ <<set $nationalities.push("Yemeni")>>
+ <<set $nationalities.push("Saudi")>>
+ <<set $nationalities.push("Australian")>>
+ <<set $nationalities.push("Ghanan")>>
+ <<set $nationalities.push("Canadian")>>
+ <<set $nationalities.push("Peruvian")>>
+ <<set $nationalities.push("Chilean")>>
+ <<set $nationalities.push("Guatemalan")>>
+ <<set $nationalities.push("a New Zealander")>>
+ <<set $nationalities.push("Irish")>>
+ <<set $nationalities.push("Scottish")>>
+ <<set $nationalities.push("Icelandic")>>
+ <<set $nationalities.push("Finnish")>>
+ <<set $nationalities.push("Israeli")>>
+ <<set $nationalities.push("Armenian")>>
+ <<set $nationalities.push("Greek")>>
+ <<set $nationalities.push("Moroccan")>>
+ <<set $nationalities.push("Zimbabwean")>>
+ <<set $nationalities.push("Tanzanian")>>
+ <<set $nationalities.push("Ugandan")>>
+ <<set $nationalities.push("Romanian")>>
+ <<set $nationalities.push("Swedish")>>
+ <<set $nationalities.push("Belgian")>>
+ <<set $nationalities.push("Danish")>>
+ <<set $nationalities.push("Czech")>>
+ <<set $nationalities.push("Serbian")>>
+ <<set $nationalities.push("Slovak")>>
+ <<set $nationalities.push("Norwegian")>>
+ <<set $nationalities.push("Dutch")>>
+ <<set $nationalities.push("Austrian")>>
+ <<set $nationalities.push("Swiss")>>
+ <<set $nationalities.push("Portuguese")>>
+ <<set $nationalities.push("Hungarian")>>
+ <<set $nationalities.push("Estonian")>>
+ <<set $nationalities.push("Lithuanian")>>
+ <<set $nationalities.push("Bolivian")>>
+ <<set $nationalities.push("Haitian")>>
+ <<set $nationalities.push("Puerto Rican")>>
+ <<set $nationalities.push("Jamaican")>>
+ <<set $nationalities.push("Cuban")>>
+ <<set $nationalities.push("Kazakh")>>
+ <<set $nationalities.push("Malaysian", "Malaysian")>>
+ <</if>>
<</if>>
-<<switch $terrain>>
-<<case "oceanic">>
- <<set $arcologies[0].FSSupremacistRace to "white">>
- <<set $arcologies[0].FSSubjugationistRace to "middle eastern">>
-<<case "North America">>
- <<set $arcologies[0].FSSupremacistRace to "white">>
- <<set $arcologies[0].FSSubjugationistRace to "black">>
- <<set $nationalities.push("American","American","American","American")>>
- <<set $nationalities.push("Mexican","Mexican")>>
- <<set $nationalities.push("Dominican","Dominican")>>
- <<set $nationalities.push("Canadian")>>
- <<set $nationalities.push("Haitian")>>
- <<set $nationalities.push("Cuban")>>
- <<set $nationalities.push("Puerto Rican")>>
- <<set $nationalities.push("Jamaican")>>
-<<case "South America">>
- <<set $arcologies[0].FSSupremacistRace to "latina">>
- <<set $arcologies[0].FSSubjugationistRace to "black">>
- <<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian")>>
- <<set $nationalities.push("Argentinian","Argentinian")>>
- <<set $nationalities.push("Colombian","Colombian")>>
- <<set $nationalities.push("Peruvian")>>
- <<set $nationalities.push("Venezuelan")>>
- <<set $nationalities.push("Bolivian")>>
- <<set $nationalities.push("Chilean")>>
- <<set $nationalities.push("Guatemalan")>>
-<<case "Brazil">>
- <<set $arcologies[0].FSSupremacistRace to "white">>
- <<set $arcologies[0].FSSubjugationistRace to "black">>
- <<set $nationalities.push("Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian","Brazilian")>>
- <<set $nationalities.push("Argentinian","Argentinian")>>
- <<set $nationalities.push("Colombian","Colombian")>>
- <<set $nationalities.push("Peruvian")>>
- <<set $nationalities.push("Venezuelan")>>
- <<set $nationalities.push("Bolivian")>>
- <<set $nationalities.push("Chilean")>>
- <<set $nationalities.push("Guatemalan")>>
-<<case "the Middle East">>
- <<set $arcologies[0].FSSupremacistRace to "middle eastern">>
- <<set $arcologies[0].FSSubjugationistRace to "asian">>
- <<set $nationalities.push("Egyptian", "Egyptian", "Egyptian")>>
- <<set $nationalities.push("Iranian", "Iranian")>>
- <<set $nationalities.push("Saudi", "Saudi")>>
- <<set $nationalities.push("Turkish", "Turkish")>>
- <<set $nationalities.push("Lebanese")>>
- <<set $nationalities.push("Emirati")>>
- <<set $nationalities.push("Jordanian")>>
- <<set $nationalities.push("Omani")>>
- <<set $nationalities.push("Israeli")>>
- <<set $nationalities.push("Armenian")>>
- <<set $nationalities.push("Iraqi")>>
- <<set $nationalities.push("Afghan")>>
- <<set $nationalities.push("Yemeni")>>
-<<case "Africa">>
- <<set $arcologies[0].FSSupremacistRace to "black">>
- <<set $arcologies[0].FSSubjugationistRace to "white">>
- <<set $nationalities.push("Nigerian", "Nigerian", "Nigerian")>>
- <<set $nationalities.push("South African","South African","South African")>>
- <<set $nationalities.push("Kenyan", "Kenyan")>>
- <<set $nationalities.push("Congolese", "Congolese")>>
- <<set $nationalities.push("Ethiopian", "Ethiopian")>>
- <<set $nationalities.push("Algerian","Algerian")>>
- <<set $nationalities.push("Sudanese","Sudanese")>>
- <<set $nationalities.push("Moroccan")>>
- <<set $nationalities.push("Ghanan")>>
- <<set $nationalities.push("Tunisian")>>
- <<set $nationalities.push("Malian")>>
- <<set $nationalities.push("Libyan")>>
- <<set $nationalities.push("Zimbabwean")>>
- <<set $nationalities.push("Tanzanian")>>
- <<set $nationalities.push("Ugandan")>>
-<<case "Asia">>
- <<set $arcologies[0].FSSupremacistRace to "asian">>
- <<set $arcologies[0].FSSubjugationistRace to "indo-aryan">>
- <<set $nationalities.push("Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese","Chinese")>>
- <<set $nationalities.push("Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian","Indian")>>
- <<set $nationalities.push("Indonesian","Indonesian","Indonesian")>>
- <<set $nationalities.push("Bangladeshi","Bangladeshi","Bangladeshi")>>
- <<set $nationalities.push("Thai","Thai")>>
- <<set $nationalities.push("Vietnamese","Vietnamese")>>
- <<set $nationalities.push("Korean","Korean")>>
- <<set $nationalities.push("Pakistani","Pakistani")>>
- <<set $nationalities.push("Filipina","Filipina")>>
- <<set $nationalities.push("Japanese","Japanese")>>
- <<set $nationalities.push("Burmese","Burmese")>>
- <<set $nationalities.push("Malaysian", "Malaysian")>>
- <<set $nationalities.push("Uzbek")>>
- <<set $nationalities.push("Nepalese")>>
- <<set $nationalities.push("Kazakh")>>
-<<case "Europe">>
- <<set $arcologies[0].FSSupremacistRace to "white">>
- <<set $arcologies[0].FSSubjugationistRace to "middle eastern">>
- <<set $nationalities.push("Russian", "Russian", "Russian", "Russian")>>
- <<set $nationalities.push("German", "German", "German")>>
- <<set $nationalities.push("Belarusian","Belarusian")>>
- <<set $nationalities.push("Ukrainian", "Ukrainian")>>
- <<set $nationalities.push("French", "French")>>
- <<set $nationalities.push("Italian", "Italian")>>
- <<set $nationalities.push("Spanish", "Spanish")>>
- <<set $nationalities.push("British", "British")>>
- <<set $nationalities.push("Polish", "Polish")>>
- <<set $nationalities.push("Romanian")>>
- <<set $nationalities.push("Lithuanian")>>
- <<set $nationalities.push("Irish")>>
- <<set $nationalities.push("Scottish")>>
- <<set $nationalities.push("Icelandic")>>
- <<set $nationalities.push("Finnish")>>
- <<set $nationalities.push("Greek")>>
- <<set $nationalities.push("Belgian")>>
- <<set $nationalities.push("Danish")>>
- <<set $nationalities.push("Czech")>>
- <<set $nationalities.push("Serbian")>>
- <<set $nationalities.push("Slovak")>>
- <<set $nationalities.push("Norwegian")>>
- <<set $nationalities.push("Dutch")>>
- <<set $nationalities.push("Austrian")>>
- <<set $nationalities.push("Swiss")>>
- <<set $nationalities.push("Portuguese")>>
- <<set $nationalities.push("Hungarian")>>
- <<set $nationalities.push("Estonian")>>
-<<case "Australia">>
- <<set $arcologies[0].FSSupremacistRace to "white">>
- <<set $arcologies[0].FSSubjugationistRace to "asian">>
- <<set $nationalities.push("Australian","Australian","Australian")>>
- <<set $nationalities.push("a New Zealander")>>
-<<case "Japan">>
- <<set $arcologies[0].FSSupremacistRace to "asian">>
- <<set $arcologies[0].FSSubjugationistRace to "asian">>
- <<set $nationalities.push("Japanese","Japanese","Japanese")>>
-<</switch>>
<<set $customSlave.nationality to $nationalities.random()>>
<<set $huskSlave.nationality to $nationalities.random()>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index d3c478d8595..2a701b883db 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -54,6 +54,8 @@
<<set $activeSlave.relation = "mother">>
<<set $activeSlave.actualAge += random(16,24)>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
+ <<elseif _tempSlave.relation is "twin">>
+ <<set $activeSlave.relation = "twin">>
<</if>>
<<set $activeSlave.relationTarget = _tempSlave.ID>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 35cfe7b0006..70c7aa7b441 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1506,7 +1506,7 @@ Just as you're about to give <span id="name"><<print "[[$activeSlave.slaveName|L
<<elseif ($activeSlave.attrXX > 50) && ($PC.boobs == 1)>>
She finds your prominent breasts attractive, and her gaze rests most frequently <<if canSee($activeSlave)>>on<<else>>towards<</if>> them.
<<elseif $activeSlave.preg > 30 && $activeSlave.fetish == "pregnancy">>
- The combination of being hugely pregnant and a pregnancy fetishest keep her libido raging.
+ The combination of being hugely pregnant and a pregnancy fetishist keep her libido raging.
<<elseif $activeSlave.aphrodisiacs > 0>>
The aphrodisiacs she's on never let her libido rest for long.
<<elseif $activeSlave.energy > 95>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index b77480ae645..a7d8c7dd9a8 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -136,6 +136,7 @@ $DJ.slaveName is performing as the DJ.
<<elseif ($slaves[_i].health < 90)>>
<<set $slaves[_i].health += 7>>
<</if>>
+ <<set $i = _i>>
<<Beauty $slaves[_i]>> /% Temporarily added it so vars like $slim, $XX, $XY get used right %/
<<FResult $slaves[_i]>> /% Not sure if this has to be added as well or not at the moment. %/
<</for>>
@@ -145,13 +146,13 @@ $DJ.slaveName is performing as the DJ.
<<for _i = 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment is "serve the public")>>
<<set $slavesGettingHelp++>>
- <<if ($clubSlaves+$slavesGettingHelp < 5)>>
- <<Beauty $slaves[_DJ]>> /% Temporarily added it so vars like $slim, $XX, $XY get used right %/
- <<FResult $slaves[_DJ]>> /% Not sure if this has to be added as well or not at the moment. %/
- <</if>>
<</if>>
<</for>>
<</if>>
+ <<if ($clubSlaves+$slavesGettingHelp < 5)>>
+ <<Beauty $DJ>> /% Temporarily added it so vars like $slim, $XX, $XY get used right %/
+ <<FResult $DJ>> /% Not sure if this has to be added as well or not at the moment. %/
+ <</if>>
<</if>>
<<if $clubAdsSpending != 0>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 07db5479cb6..0098f8e879c 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1,11 +1,10 @@
:: Dairy Report [nobr]
-
-<<set $bioreactorPerfectedID = 0, $dairySlaves = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 0, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 0>>
+<<set $bioreactorPerfectedID = 0, $dairySlaves = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35>>
<<set _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _milkmaidFetish = 0, _milkmaidImpregnated = 0, _milkWeek = 0>>
-<<set _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _SL = $slaves.length, _MM = -1>>
+<<set _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _SL = $slaves.length, _MM = -1, _MMAttentionString = "">>
<<if ($Milkmaid != 0)>>
<<for _MM = 0; _MM < _SL; _MM++>>
@@ -17,60 +16,64 @@
<<if _MM != -1>>
<<set $i = _MM>>
+ <<if $slaves[_MM].health < 90>>
+ <<set $slaves[_MM].curatives to 2>>
+ <</if>>
+ <<if ($slaves[_MM].muscles > 50)>>
+ <<set ($slaves[_MM].diet to "healthy")>>
+ <<else>>
+ <<set ($slaves[_MM].diet to "muscle building")>>
+ <</if>>
<<silently>>
+ <<include "SA diet">>
<<include "SA long term effects">>
+ <<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
<</silently>>
- <<if ($slaves[_MM].health < -80)>>
- <<set $slaves[_MM].health += 20>>
- <<elseif ($slaves[_MM].health < -40)>>
- <<set $slaves[_MM].health += 15>>
- <<elseif ($slaves[_MM].health < 0)>>
- <<set $slaves[_MM].health += 10>>
- <<elseif ($slaves[_MM].health < 90)>>
- <<set $slaves[_MM].health += 7>>
- <</if>>
<<if $slaves[_MM].devotion <= 60>>
- <<set $slaves[_MM].devotion += 5>>
+ <<set $slaves[_MM].devotion += 5>>
<</if>>
<<if $slaves[_MM].trust < 60>>
- <<set $slaves[_MM].trust += 5>>
+ <<set $slaves[_MM].trust += 5>>
<</if>>
<<if $slaves[_MM].relationship is -3>>
- <<set $milkmaidDevotionBonus += 0.4, $milkmaidTrustBonus += 0.4>>
+ <<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
<</if>>
<<if ($slaves[_MM].sexualQuirk is "caring")>>
- <<set $milkmaidTrustBonus += 0.2>>
+ <<set $milkmaidTrustBonus += 1>>
<</if>>
<<if ($slaves[_MM].behavioralQuirk is "funny")>>
- <<set $milkmaidTrustBonus += 0.2>>
+ <<set $milkmaidTrustBonus += 1>>
<</if>>
<<if ($slaves[_MM].oralSkill > 0)>>
- <<set $milkmaidDevotionBonus += Math.trunc($slaves[_MM].oralSkill/30)>>
+ <<set $milkmaidDevotionBonus += Math.trunc($slaves[_MM].oralSkill/30)>>
<</if>>
<<if ($slaves[_MM].health >= 80)>>
- <<set $milkmaidHealthBonus += 0.3>>
+ <<set $milkmaidHealthBonus += 1>>
<</if>>
<<set $toSearch to $slaves[_MM].career>>
<<if $milkmaidCareers.contains($toSearch)>>
- <<set $milkmaidHealthBonus += 0.2>>
+ <<set $milkmaidHealthBonus += 1>>
<</if>>
<<if ($slaves[_MM].muscles > 30)>>
- <<set $milkmaidHealthBonus += 0.2>>
+ <<set $milkmaidHealthBonus += 1>>
<</if>>
+ <<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
+
<<if $slaves[_MM].fetishStrength <= 95>>
- <<if $slaves[_MM].fetish != "boobs">>
- <<fetishChangeChance $slaves[_MM]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _milkmaidFetish to 1, $slaves[_MM].fetishKnown to 1, $slaves[_MM].fetish to "boobs">>
+ <<if $slaves[_MM].fetish != "boobs">>
+ <<fetishChangeChance $slaves[_MM]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _milkmaidFetish to 1, $slaves[_MM].fetishKnown to 1, $slaves[_MM].fetish to "boobs">>
+ <</if>>
+ <<elseif $slaves[_MM].fetishKnown == 0>>
+ <<set _milkmaidFetish to 1, $slaves[_MM].fetishKnown to 1>>
+ <<else>>
+ <<set _milkmaidFetish to 2, $slaves[_MM].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_MM].fetishKnown == 0>>
- <<set _milkmaidFetish to 1, $slaves[_MM].fetishKnown to 1>>
- <<else>>
- <<set _milkmaidFetish to 2, $slaves[_MM].fetishStrength += 4>>
- <</if>>
<</if>>
+
<<set $Milkmaid = $slaves[_MM]>>
<</if>>
@@ -89,13 +92,18 @@
/* 000-250-006 */
<<set $dairySlaves++>>
- <<if ($legendaryCowID == 0) && ($slaves[_i].lactation > 0) && (($slaves[_i].boobs-$slaves[_i].boobsImplant) > 6000) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
- <<set $legendaryCowID to $slaves[_i].ID>>
- <</if>>
- <<if ($legendaryBallsID == 0) && ($slaves[_i].balls > 5) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
- <<set $legendaryBallsID to $slaves[_i].ID>>
- <</if>>
<<set $i = _i>>
+
+ /* Perform facility based rule changes */
+ <<if ($dairySlimMaintain == 0) && ($slaves[_i].weight <= 30)>>
+ <<set $slaves[_i].diet to "fattening">>
+ <<elseif ($slaves[_i].diet is "fattening") || ($dairyRestraintsSetting > 1)>>
+ <<set $slaves[_i].diet to "healthy">>
+ <<elseif ($slaves[_i].balls >0) && $cumProDiet == 1>>
+ <<set $slaves[_i].diet to "cum production">>
+ <</if>>
+
+ /* General End of Week effects */
<<silently>>
<<include "SA get milked">>
<<set _milkWeek += $milk, _cumWeek += $cum>>
@@ -104,10 +112,77 @@
<<set $slaves[_i].preg to 1, $slaves[_i].pregSource to $Milkmaid.ID, _milkmaidImpregnated++, $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>>
<</if>>
<</if>>
+ <<include "SA diet">>
<<include "SA long term effects">>
<<include "SA relationships">>
<<include "SA rivalries">>
<</silently>>
+
+ /* Special attention section */
+ <<if ($legendaryCowID == 0) && ($slaves[_i].lactation > 0) && (($slaves[_i].boobs-$slaves[_i].boobsImplant) > 6000) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
+ <<set $legendaryCowID to $slaves[_i].ID>>
+ <</if>>
+ <<if ($legendaryBallsID == 0) && ($slaves[_i].balls > 5) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
+ <<set $legendaryBallsID to $slaves[_i].ID>>
+ <</if>>
+ <<set $i = _i>>
+ <<if $familyTesting == 1>>
+ <<if $slaves[_i].mother == $Milkmaid.ID>>
+ <<set _MMAttentionString += "She pays special attention to her daughter, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].father == $Milkmaid.ID>>
+ <<set _MMAttentionString += "She pays special attention to her daughter, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].ID == $Milkmaid.father>>
+ <<set _MMAttentionString += "She pays special attention to her father, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].ID == $Milkmaid.mother>>
+ <<set _MMAttentionString += "She pays special attention to her mother, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if areSisters($slaves[_i], $Milkmaid) == 1>>
+ <<set _MMAttentionString += "She pays special attention to her twin sister, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Milkmaid) == 2>>
+ <<set _MMAttentionString += "She pays special attention to her sister, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Milkmaid) == 3>>
+ <<set _MMAttentionString += "She pays special attention to her half-sister, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<else>>
+ <<if $Milkmaid.relationTarget is $slaves[_i].ID>>
+ <<set _MMAttentionString += "She pays special attention to her $slaves["+_i+"].relation, $slaves["+_i+"].slaveName, making sure she is well kept and happy. ">>
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <</if>> /*closes family mode */
+ <<if $Milkmaid.relationshipTarget is $slaves[_i].ID>>
+ <<set _MMAttentionString += "She dotes over her <<if $Milkmaid.relationship == 1>>friend<<elseif $Milkmaid.relationship is 2>>best friend<<elseif $Milkmaid.relationship is 3>>friend with benefits<<elseif $Milkmaid.relationship is 4>>lover<<elseif $Milkmaid.relationship is 5>>slave wife<</if>>, $slaves["+_i+"].slaveName, making sure she is happy and comfortable. ">>
+ <<set $slaves[_i].devotion += 1>>
+ <</if>>
+ <<if $Milkmaid.rivalryTarget is $slaves[_i].ID>>
+ <<set _MMAttentionString += "She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry is 2>>rival<<elseif $Milkmaid.rivalry is 3>>bitter rival<</if>>, $slaves["+_i+"].slaveName, making sure she is unhappy and uncomfortable. ">>
+ <<set $slaves[_i].devotion -= 3, $slaves[_i].trust -= 3>>
+ <<if random(1,100) > 65>>
+ <<set $Milkmaid.rivalry += 1, $slaves[_MM].rivalry += 1, $slaves[_i].rivalry += 1>>
+ <</if>>
+ <</if>>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a dairy cow.">>
+ <<set _MMAttentionString += "She spends extra time with $slaves["+_i+"].slaveName, the well-known cow. $Milkmaid.slaveName is fascinated by her massive $slaves["+_i+"].boobs"+"cc breasts and spends extra time massaging and kneading them to maximize production. ">>
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <</if>>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a cockmilker.">>
+ <<set _MMAttentionString += "She spends extra time with $slaves["+_i+"].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them. ">>
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <</if>>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a breeder." && $slaves[_i].preg > 10>>
+ <<set _MMAttentionString += "She spends extra time with $slaves["+_i+"].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable. ">>
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <</if>>
+ /* Facility Specific End of Week effects */
<<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
<<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
<</if>>
@@ -137,14 +212,7 @@
<</if>>
<</if>>
<</if>>
- <<if ($dairySlimMaintain == 0) && ($slaves[_i].weight <= 30)>>
- <<set $slaves[_i].diet to "fattening">>
- <<elseif ($slaves[_i].diet is "fattening") || ($dairyRestraintsSetting > 1)>>
- <<set $slaves[_i].diet to "healthy">>
- <<elseif ($slaves[_i].balls >0) && $cumProDiet == 1>>
- <<set $slaves[_i].diet to "cum production">>
- <</if>>
- <<silently>><<include "SA diet">><</silently>>
+
<<if ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0)>>
<<if ($dairySlimMaintain == 0)>>
<<if ($slaves[_i].balls == 0)>>
@@ -485,10 +553,16 @@
<</if>>
<<if ($Milkmaid.muscles > 30)>>
Her muscles help her handle the fattest or most reluctant cow.
+ <<else>>
+ Her constant handling of cows causes her to @@color:lime;gain muscle.@@.
<</if>>
<<if ($Milkmaid.oralSkill > 30)>>
Her skilled tongue helps her keep her girls happy.
<</if>>
+ <<if ($Milkmaid.oralSkill < 90)>>
+ <<set $skillIncrease = 3>>
+ <<OralSkillIncrease $slaves[_MM]>>
+ <</if>>
<<if ($Milkmaid.sexualQuirk is "caring")>>
She's very caring, and does her best to get the cows to trust her.
<</if>>
@@ -499,65 +573,9 @@
<<if $milkmaidCareers.contains($toSearch)>>
She has career experience dealing with milk animals.
<</if>>
- <<for _i to 0; _i < _SL; _i++>>
- <<if $slaves[_i].assignment != "work in the dairy">><<continue>><</if>>
- <<if $familyTesting == 1>>
- <<if $slaves[_i].mother == $Milkmaid.ID>>
- She pays special attention to her daughter, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].father == $Milkmaid.ID>>
- She pays special attention to her daughter, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Milkmaid.father>>
- She pays special attention to her father, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Milkmaid.mother>>
- She pays special attention to her mother, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if areSisters($slaves[_i], $Milkmaid) == 1>>
- She pays special attention to her twin sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <<elseif areSisters($slaves[_i], $Milkmaid) == 2>>
- She pays special attention to her sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <<elseif areSisters($slaves[_i], $Milkmaid) == 3>>
- She pays special attention to her half-sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<else>>
- <<if $Milkmaid.relationTarget is $slaves[_i].ID>>
- She pays special attention to her $slaves[_i].relation, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <</if>> /*closes family mode */
- <<if $Milkmaid.relationshipTarget is $slaves[_i].ID>>
- She dotes over her <<if $Milkmaid.relationship == 1>>friend<<elseif $Milkmaid.relationship is 2>>best friend<<elseif $Milkmaid.relationship is 3>>friend with benefits<<elseif $Milkmaid.relationship is 4>>lover<<elseif $Milkmaid.relationship is 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she is happy and comfortable.
- <<set $slaves[_i].devotion += 1>>
- <</if>>
- <<if $Milkmaid.rivalryTarget is $slaves[_i].ID>>
- She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry is 2>>rival<<elseif $Milkmaid.rivalry is 3>>bitter rival<</if>>, $slaves[_i].slaveName, making sure she is unhappy and uncomfortable.
- <<set $slaves[_i].devotion -= 3, $slaves[_i].trust -= 3>>
- <<if random(1,100) > 65>>
- <<set $Milkmaid.rivalry += 1, $slaves[_MM].rivalry += 1, $slaves[_i].rivalry += 1>>
- <</if>>
- <</if>>
- <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a dairy cow.">>
- She spends extra time with $slaves[_i].slaveName, the well-known cow. $Milkmaid.slaveName is fascinated by her massive <<print $slaves[_i].boobs>>cc breasts and spends extra time massaging and kneading them to maximize production.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a cockmilker.">>
- She spends extra time with $slaves[_i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a breeder." && $slaves[_i].preg > 10>>
- She spends extra time with $slaves[_i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <</for>>
+
+ <<print _MMAttentionString>>
+
<<if (_cumWeek > 0) && ($dairyStimulatorsSetting < 2)>>
<<if ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
diff --git a/src/uncategorized/mod_BackwardsCompatibility.tw b/src/uncategorized/mod_BackwardsCompatibility.tw
index dbc74a4c23e..5bc7d5c70ba 100644
--- a/src/uncategorized/mod_BackwardsCompatibility.tw
+++ b/src/uncategorized/mod_BackwardsCompatibility.tw
@@ -784,9 +784,11 @@
<<elseif $PC.career is "arcology owner">>
<<set $trinkets.push("a miniature model of your first arcology")>>
<<elseif $PC.career is "escort">>
- <<set $trinkets.push("a copy the first porno you starred in")>>
+ <<set $trinkets.push("a copy of the first porno you starred in")>>
<<elseif $PC.career is "servant">>
<<set $trinkets.push("a framed picture of your late Master")>>
+ <<elseif $PC.career is "gang">>
+ <<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 190dbaf926d..76eb50215e4 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -444,7 +444,7 @@ has an estimated GSP of @@color:yellowgreen;¤<<print Math.trunc((0.1*$arcologie
<<if $arcologies[$i].direction != $arcologies[$j].direction>>
<<if $arcologies[$i].name is $arcologies[$j].name>>
<<set $arcologies[$i].name to "Arcology X-"+$i>>
- It resumes its original name, ''$arcologies[$i].name'', since the arcology to the $arcologies[$j].direction of yours is also named $arcologies[$j].name.
+ It resumes its original name, ''$arcologies[$i].name'', since the arcology to the $arcologies[$i].direction of yours is also named $arcologies[$j].name.
<<break>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 24fd642c2fe..8552a0e208a 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -1,9 +1,9 @@
:: SA get milked [nobr]
-
+
<<if ndef $slaves[$i].lactationAdaptation>>
<<set $slaves[$i].lactationAdaptation to 0>>
<</if>>
-
+
<<set $milk to 0>>
<<set $cum to 0>>
@@ -15,16 +15,14 @@ gets milked this week.
<<set $dairySpots -= 1>>
<<if ($Milkmaid != 0)>>
While there, she gets the benefit of $Milkmaid.slaveName's <<if ($Milkmaid.physicalAge < 21)>>youthful energy<<else>>care<</if>><<if ($Milkmaid.oralSkill >= 100)>>and talented tongue<<else>>.<</if>>
- <<if ($slaves[$i].devotion < 9+$milkmaidDevotionBonus)>>
- <<set $slaves[$i].devotion += 1+($milkmaidTrustBonus/20)>>
- <<elseif ($slaves[$i].devotion > 9+$milkmaidDevotionBonus)>>
- <<set $slaves[$i].devotion -= 2+($milkmaidTrustBonus/20)>>
+ <<if ($slaves[$i].devotion < $milkmaidDevotionThreshold)>>
+ <<set $slaves[$i].devotion += $milkmaidDevotionBonus>>
<</if>>
- <<if ($slaves[$i].trust < 7+$milkmaidTrustBonus)>>
- <<set $slaves[$i].trust += 1+($milkmaidTrustBonus/20)>>
+ <<if ($slaves[$i].trust < $milkmaidTrustThreshold)>>
+ <<set $slaves[$i].trust += $milkmaidTrustBonus>>
<</if>>
- <<if ($Milkmaid != 0) && ($slaves[$i].health < 100)>>
- <<set $slaves[$i].health += $milkmaidHealthBonus>>
+ <<if ($slaves[$i].health < 100)>>
+ <<set $slaves[$i].health += $milkmaidHealthBonus>>
<</if>>
<</if>>
<</if>>
@@ -34,7 +32,7 @@ gets milked this week.
<<if $slaves[$i].lactation > 0>>
<<set $milk = milkAmount($slaves[$i])>>
-
+
She produces from her <<print either("tits", "breasts", "mammaries", "udders", "boobs")>>, which have a combined volume of <<print $slaves[$i].boobs*2>> CCs;
<<if ($slaves[$i].lactation == 1)>>
she is lactating naturally and produces a healthy stream of milk.
@@ -107,7 +105,7 @@ gets milked this week.
Her body has gotten used to producing milk, making her very productive.
<</if>>
<</if>>
-
+
<<if $dairySlimMaintainUpgrade == 1>>
<<if $dairySlimMaintain == 1>>
<<if ($slaves[$i].boobs <= 700)>>
@@ -136,7 +134,7 @@ gets milked this week.
<<elseif ($slaves[$i].assignment is "be confined in the arcade")>>
<<set $milk *= 0.5>>
<</if>>
-
+
<<set $milk *= $servantMilkersMultiplier>>
<<set $milk = Math.trunc($milk)>>
@@ -449,7 +447,7 @@ gets milked this week.
<<case "Degradationist">>
<<set $arcologies[0].FSDegradationist += $seed>>
<<case "Repopulation Focus">>
- <<set $arcologies[0].FSRepopulationFocus += $seed>>
+ <<set $arcologies[0].FSRepopulationFocus += $seed>>
<<case "Eugenics">>
<<set $arcologies[0].FSRestart += $seed>>
<<case "Asset Expansionist">>
--
GitLab