From 5109c17183f44ea99d1b51f2b9d8990a21a753c0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 15 Mar 2017 19:17:03 -0400
Subject: [PATCH] Brazil start mod and some bugfixes.
---
slave variables documentation - Pregmod.txt | 13 +++++++++++-
src/events/intro/initNationalities.tw | 11 +++++++++++
src/events/intro/introSummary.tw | 16 +++++++--------
src/events/intro/locationIntro.tw | 1 +
src/events/intro/terrainIntro.tw | 1 +
src/gui/Encyclopedia/encyclopedia.tw | 1 +
src/init/storyInit.tw | 2 +-
src/uncategorized/RESS.tw | 8 ++++----
src/uncategorized/changeLanguage.tw | 22 +++++++++++++++++++++
src/uncategorized/dairy.tw | 10 +++++-----
src/uncategorized/newGamePlus.tw | 6 +++++-
src/uncategorized/reNickname.tw | 16 +++++++--------
src/uncategorized/saRivalries.tw | 2 +-
src/uncategorized/schoolroomReport.tw | 1 +
src/uncategorized/slaveGenerationWidgets.tw | 8 ++++----
15 files changed, 85 insertions(+), 33 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 1d00b3a78ef..4dadaf6809a 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2177,13 +2177,24 @@ Eugenics variable. Is the slave allowed to choose to wear chastity.
0 - no
1 - yes
+pregControl:
+
+Is she on gestation altering drugs?
+"none"
+"slow gestation"
+"speed up"
+"labor supressors"
+
+readyLimbs:
+
+Array that holds an amputee's constructed limbs for anon's hotswap mod.
How to set up your own hero slave.
-The default slave template used:
-<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnClothes: 0}>>
+<<set $activeSlave to {slaveName: "blank", birthName: "blank", weekAcquired: 1, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", eyewear: "none", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules:"restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: 0, inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: []}>>
Making your slave; add their name to the following, then go down the documentation adding in your changes.
-each variable must be seperated from the last by a comma followed by a space
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 34505502a17..d6de2c04c48 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -205,6 +205,17 @@
<<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">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 302371b3ac1..c46e27baa97 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -2,7 +2,7 @@
<<set $neighboringArcologies to Math.clamp($neighboringArcologies, 0, 8)>>
<<set $FSCreditCount to Math.clamp($FSCreditCount, 4, 7)>>
-<<set $PC.actualAge to Math.clamp($PC.actualAge, 18, 80)>>
+<<set $PC.actualAge to Math.clamp($PC.actualAge, 14, 80)>>
<<set $PC.birthWeek to Math.clamp($PC.birthWeek, 0, 51)>>
<<silently>>
@@ -308,7 +308,7 @@ Girls will not be able to impregnate others if their age is under <<textbox "$po
/* Accordion 000-250-006 */
<br>
- Accordion effects on weekly reports are
+ Accordion effects on weekly reports are
<<if $useAccordion == 0>>
@@color:red;DISABLED@@. [[Enable|Intro Summary][$useAccordion to 1]]
<<else>>
@@ -359,7 +359,7 @@ The Free City is located on ''$terrain'' terrain.
<<if $terrain != "oceanic">>
<br>
The Free City is located in ''$continent''.
-[[North America|Intro Summary][$continent to "North America", $language to "English"]] | [[South America|Intro Summary][$continent to "South America", $language to "Spanish"]] | [[Europe|Intro Summary][$continent to "Europe", $language to "English"]] | [[the Middle East|Intro Summary][$continent to "the Middle East", $language to "Arabic"]] | [[Africa|Intro Summary][$continent to "Africa", $language to "Arabic"]] | [[Asia|Intro Summary][$continent to "Asia", $language to "Chinese"]] | [[Australia|Intro Summary][$continent to "Australia", $language to "English"]] | [[Japan|Intro Summary][$continent to "Japan", $language to "Japanese", $PC.race to "asian", $PC.nationality to "Japanese", $PC.hColor to "black", $PC.eyeColor to "brown"]]
+[[North America|Intro Summary][$continent to "North America", $language to "English"]] | [[South America|Intro Summary][$continent to "South America", $language to "Spanish"]] | [[Brazil|Intro Summary][$continent to "Brazil", $language to "Portuguese"]] | [[Europe|Intro Summary][$continent to "Europe", $language to "English"]] | [[the Middle East|Intro Summary][$continent to "the Middle East", $language to "Arabic"]] | [[Africa|Intro Summary][$continent to "Africa", $language to "Arabic"]] | [[Asia|Intro Summary][$continent to "Asia", $language to "Chinese"]] | [[Australia|Intro Summary][$continent to "Australia", $language to "English"]] | [[Japan|Intro Summary][$continent to "Japan", $language to "Japanese", $PC.race to "asian", $PC.nationality to "Japanese", $PC.hColor to "black", $PC.eyeColor to "brown"]]
<</if>>
<</if>>
@@ -446,7 +446,7 @@ Career: ''$PC.career''.
[[Servant|Intro Summary][$PC.career to "servant"]] |
[[Gang Leader|Intro Summary][$PC.career to "gang"]]
<</if>>
-
+
<br>
Method of acquiring your arcology: ''$PC.rumor''.
@@ -609,7 +609,7 @@ Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif
<</if>>
<<else>>
-
+
<br>
Method of acquiring your arcology: ''$PC.rumor''.
<br>
@@ -653,11 +653,11 @@ Genitalia:
<br>
<<if $PC.boobs > 0>>
Chest:
- <<if $PC.boobsBonus = 1>>
+ <<if $PC.boobsBonus == 1>>
''big breasts''.
- <<elseif $PC.boobsBonus = 2>>
+ <<elseif $PC.boobsBonus == 2>>
''huge breasts''.
- <<elseif $PC.boobsBonus = 3>>
+ <<elseif $PC.boobsBonus == 3>>
''cow tits''.
<<else>>
''breasts''.
diff --git a/src/events/intro/locationIntro.tw b/src/events/intro/locationIntro.tw
index 980c4d5715f..0906acc8fff 100644
--- a/src/events/intro/locationIntro.tw
+++ b/src/events/intro/locationIntro.tw
@@ -4,6 +4,7 @@ As the old countries crumble and technology stagnates, the gap between rich and
[[North America|Intro Summary][$continent to "North America", $language to "English"]]
[[South America|Intro Summary][$continent to "South America", $language to "Spanish"]]
+[[Brazil|Intro Summary][$continent to "Brazil", $language to "Portuguese"]]
[[Europe|Intro Summary][$continent to "Europe", $language to "German"]]
[[the Middle East|Intro Summary][$continent to "the Middle East", $language to "Arabic"]]
[[Africa|Intro Summary][$continent to "Africa", $language to "Arabic"]]
diff --git a/src/events/intro/terrainIntro.tw b/src/events/intro/terrainIntro.tw
index aa06d548a12..d2334d1b8c0 100644
--- a/src/events/intro/terrainIntro.tw
+++ b/src/events/intro/terrainIntro.tw
@@ -13,6 +13,7 @@
<<switch $terrain>>
<<case "oceanic" "North America" "Australia">><<set $language = "English">>
<<case "South America">><<set $language = "Spanish">>
+ <<case "Brazil">><<set $language = "Portuguese">>
<<case "the Middle East" "Africa">><<set $language = "Arabic">>
<<case "Asia">><<set $language = "Chinese">>
<<case "Europe">><<set $language = "German">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 35a78550f2b..2ad22f3574f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -931,6 +931,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''anon'' for putting up with my javascript incompetence.
''anon'' for player family listing.
''anon'' for interchangable prosthetics and advanced facial surgeries.
+''brpregmodfan'' for Brazilian start and slave gen.
''Bane70'' optimized huge swaths of code with notable professionalism.
''Circle Tritagonist'' provided several new collars and outfits.
''Qotsafan'' submitted bugfixes.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1d4cc826388..780bbde6663 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1082,7 +1082,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $egyptianSlaveNames to ["Shaimaa", "Fatma", "Maha", "Farida", "Aya", "Shahd", "Ashraqat", "Sahar", "Fatin", "Dalal", "Doha", "Suha", "Rowan", "Hosniya", "Hasnaa", "Hosna", "Gamila", "Gamalat", "Habiba", "Aya", "Rania", "Sarah", "Reem", "Hoda", "Marwa", "Fatima", "Eisha", "Nesreen", "Fatoumata", "Mariam", "Aminata", "Hawa", "Awa", "Oumou", "Djeneba", "Bintou", "Fanta", "Kadiatou", "Fatima", "Khadija", "Aicha", "Malika", "Naima", "Rachida", "Nadia", "Karima", "Saida", "Mariam", "Shayma", "Khawla"]>>
-<<set $brazilianSlaveNames to ["Ana", "Amanda", "Fernanda", "Julia", "Mariana", "Camila", "Leticia", "Larissa", "Beatriz", "Natália", "Thais", "Juliana", "Vitoria", "Jessica", "Luana", "Laura", "Bruna", "Rafaela", "Maria", "Isabela", "Barbara", "Carolina", "Aline", "Anna", "Brenda", "LÃvia", "Victória", "Gabrielle", "Andressa", "Maria", "Clara", "Raquel", "Daniela", "Ana", "Clara", "Marcela", "Luiza", "Giovanna", "Stephanie", "Caroline", "Raissa", "Aléxia", "Milena", "Nathalia", "Clara", "Taynara", "Sabrina", "Ana", "Luiza", "Yasmin", "Carla", "Helena"]>>
+<<set $brazilianSlaveNames to ["Ana", "Amanda", "Fernanda", "Julia", "Mariana", "Camila", "Leticia", "Larissa", "Beatriz", "Natália", "ThaÃs", "Juliana", "Vitória", "Jéssica", "Luana", "Laura", "Bruna", "Rafaela", "Maria", "Isabela", "Barbara", "Carolina", "Aline", "Ana", "Brenda", "LÃvia", "Gabriela", "Andressa", "Clara", "Raquel", "Daniela", "Clara", "Marcela", "LuÃza", "Giovana", "Stéfani", "Caroline", "Raissa", "Aléxia", "Milena", "Natália", "Tayná", "Sabrina", "Ana", "Luiza", "Yasmin", "Carla", "Helena", "Carmen", "Agripina", "Marta", "Mercedes", "Neuza", "Joana", "Janete"]>>
<<set $chineseSlaveNames to ["Ah", "Ai", "An", "Bai", "Bao", "Bi", "Bo", "Cai", "Chang", "Chao", "Chen", "Cheng", "Chin", "Chun", "Da", "Dan", "Fang", "Fen", "Fu", "Guanting", "Guanyu", "Guiying", "Guo", "Hai", "He", "Heng", "Hong", "Hua", "Huan", "Huang", "Hui", "Jia", "Jian", "Jiang", "Jie", "Jin", "Jing", "Jingyi", "Ju", "Juan", "Jun", "Kun", "Lan", "Lei", "Li", "Lian", "Lili", "Lim", "Lin", "Ling", "Mei", "Min", "Ming", "Mu", "Na", "Ni", "Ning", "Nuan", "Ping", "Qian", "Qing", "Qiong", "Qiu", "Rong", "Ru", "Shan", "Shi", "Shu", "Shufen", "Shui", "Shun", "Su", "Tai", "Ting", "Tingting", "Tu", "Wei", "Wen", "Wu", "Xia", "Xian", "Xiang", "Xiaomei", "Xiaoyan", "Xinyi", "Xiu", "Xiulan", "Xiuying", "Xue", "Xun", "Ya", "Yahui", "Yaling", "Yan", "Yang", "Yating", "Yawen", "Yazhu", "Yi", "Yijun", "Yin", "Ying", "Yong", "Yu", "Yun", "Zan", "Zedong", "Zhen", "Zheng", "Zhi", "Zhihao", "Zhong", "Zhou"]>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 59623434fab..25eb1104134 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -8123,13 +8123,13 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
<<replace "#result">>
You grab her by the scruff of her neck and drag her down to $dairyName. She tries to control herself, but breaks down in tears when you haul her to a stop, forcing her to get a good <<if canSee($activeSlave)>>look at the rows of bodies being<<else>>listen at the sounds of rows of bodies being<</if>> mercilessly milked. You explain that if she continues to fail to control herself, your patience with her will eventually expire, and you'll be forced to immure her here. <<if canSee($activeSlave)>>Indicating<<else>>facing her to<</if>> a slave who's being
<<if ($activeSlave.balls > 0) && ($dairyStimulatorsSetting == 2)>>
- cockmilked by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm slides in and out of the slave's rectum, pounding it harder and harder until the slave stiffens and the transparent tubing coming off its cockhead whitens with cum. As the slave relaxes slightly in the restrains, the powerful milkers continue their relentless tugging at her gigantic udders. You tell $activeSlave.slaveName that unless she wants her ass ruined by constant machine rape and her tits turned into immobilizing milk factories,
+ cockmilked by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm slides in and out of the slave's rectum, pounding it harder and harder until the slave stiffens and the transparent tubing coming off its cockhead whitens with cum. As the slave relaxes slightly in the restrains, the powerful milkers continue their relentless tugging at her gigantic udders.<if !canSee($activeSlave)>> As the dildo begins its efforts to loose a second cumming, you grab the horrified slave's hands and push them to the cow's throbbing dick just in time for her to feel the ejaculate forced out by its unwilling orgasm.<</if>> You run a hand down to $activeSlave.slaveName's own balls and, squeezing them slightly, tell her that unless she wants her ass ruined by constant machine rape, her tits turned into immobilizing milk factories and her balls drained of every last drop of seed,
<<elseif ($activeSlave.vagina > -1) && ($dairyPregSetting == 2)>>
- used for reproduction by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm fucks the slave's enormous cunt, keeping it as gaped as possible to ease birth and constantly ejaculating preparatory drugs against her cervix. The slave is gigantically pregnant. You tell $activeSlave.slaveName that this is the vaginal treatment she can expect when pregnant; when impregnation is required, the dildos ejaculate more than a liter of cum a minute. Unless she wants her womb converted into an industrial component,
+ used for reproduction by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm fucks the slave's enormous cunt, keeping it as gaped as possible to ease birth and constantly ejaculating preparatory drugs against her cervix. The slave is gigantically pregnant. You tell $activeSlave.slaveName that this is the vaginal treatment she can expect when pregnant; when impregnation is required, the dildos ejaculate more than a liter of cum a minute.<if !canSee($activeSlave)>> As the dildo retracts from the cow's gaping cunt, you grab the horrified slave's hands and push them to its gravid middle just in time for her to feel a massive contraction.<</if>> You run a hand down to $activeSlave.slaveName's own middle and, patting it gently, tell her that unless she wants her womb converted into an industrial component,
<<elseif ($activeSlave.vagina > -1) && ($dairyPregSetting == 3)>>
- used for mass reproduction by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm fucks the slave's cavernous cunt, keeping it as gaped as possible to ease birth and constantly ejaculating preparatory drugs against her tortured cervix. The slave is absolutely enormous, more a taut sphere of a belly than a person, so pregnant that the children within her are visibly forced to bulge the skin covering her straining womb by their sisters. You tell $activeSlave.slaveName that this is the treatment she can expect when pregnant here; when impregnation is required, the dildos ejaculate more than a liter of cum a minute. Unless she wants to be converted into an industrial breeder,
+ used for mass reproduction by the machines, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as a dildo the size of her forearm fucks the slave's cavernous cunt, keeping it as gaped as possible to ease birth and constantly ejaculating preparatory drugs against her tortured cervix. The slave is absolutely enormous, more a taut sphere of a belly than a person, so pregnant that the children within her are visibly forced to bulge the skin covering her straining womb by their sisters. You tell $activeSlave.slaveName that this is the treatment she can expect when pregnant here; when impregnation is required, the dildos ejaculate more than a liter of cum a minute.<if !canSee($activeSlave)>> As the cow takes the huge dildo absentmindedly, you grab the horrified slave's hands and push them to its gravid middle forcing her to feel the children squirming within its packed womb. She squeels in terror at the feeling of so many babies moving under her fingers.<</if>> You run a hand down to $activeSlave.slaveName's own middle and, patting it gently, tell her that unless she wants to become an industrial breeder,
<<else>>
- drained of her milk, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as the slave's gigantic breasts are massaged and squeezed, while the milkers attached to her absurd nipples tug and pull with industrial power. She can't <<if canSee($activeSlave)>>look away; the orbs of jiggling flesh being manipulated are each as big as the slave's torso<<else>>shut out the sound of those enormous jiggling orbs of flesh being so roughly manipulated<</if>>. It's good for milk production to drain slaves completely on occasion, and the machine doesn't stop until every drop is wrung from both udders. You tell $activeSlave.slaveName that unless she wants to experience that twice a day,
+ drained of her milk, you tell $activeSlave.slaveName to pay close attention. She <<if canSee($activeSlave)>>watches<<else>>listens<</if>> in horror as the slave's gigantic breasts are massaged and squeezed, while the milkers attached to her absurd nipples tug and pull with industrial power. She can't <<if canSee($activeSlave)>>look away; the orbs of jiggling flesh being manipulated are each as big as the slave's torso<<else>>shut out the sound of those enormous jiggling orbs of flesh being so roughly manipulated<</if>>. It's good for milk production to drain slaves completely on occasion, and the machine doesn't stop until every drop is wrung from both udders.<if !canSee($activeSlave)>> You force the horrified slave's hands onto its beasts so that she may get a good sense of just how big and swollen they are and how hard the milker is pulling at them.<</if>> You run a hand over to $activeSlave.slaveName's own breast and, teasing her nipple, tell her that unless she wants to experience that twice a day,
<</if>>
she had better behave herself. She nods furiously, @@color:gold;terrified beyond the ability to speak.@@
<<set $activeSlave.trust -= 8>>
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index 0c720a87b7c..a7858d1c7bb 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -83,6 +83,28 @@ Select a custom language to be applied: <<textbox "$seed" $seed "Change Language
<</replace>>
<</link>>
<</if>>
+<<if $language != "Portuguese">>
+ <br><<link "Portuguese">>
+ <<replace "#result">>
+ <<set $language to "Portuguese">>
+ <<set $arcologies[0].prosperity = Math.trunc(0.9*$arcologies[0].prosperity)>>
+ <<for $i to 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].fetish != "mindbroken">>
+ <<NationalityToAccent $slaves[$i]>>
+ <<if ($slaves[$i].intelligenceImplant == 1)>>
+ <<if ($slaves[$i].accent >= 3)>>
+ <<if (3+$slaves[$i].intelligence) > random(0,6)>>
+ <<set $slaves[$i].accent -= 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $cash -= 500>>
+ <</if>>
+ <</for>>
+ <br><br>//Language changed.//
+ <</replace>>
+ <</link>>
+<</if>>
<<if $language != "Arabic">>
<br><<link "Arabic">>
<<replace "#result">>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index d3b390885d4..59984faa6e4 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -42,13 +42,13 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<for _i to 0; _i < $slaves.length; _i++>>
- <<if $dairyPregSetting > 0>>
+ <<if ($slaves[_i].assignment is "work in the dairy") && ($dairyPregSetting > 0)>>
<<set $reservedChildren -= $slaves[_i].reservedChildren>>
<<set $slaves[_i].reservedChildren = 0>>
- <</if>>
- <<if ($slaves[_i].assignment is "work in the dairy") && ($dairyPregSetting > 0) && (($slaves[_i].pregType >= 50) || ($slaves[_i].bellyImplant != 0))>>
- <<set $slaves[_i].assignment to "rest", $slaves[_i].assignmentVisible to 1>>
- $slaves[_i].slaveName's milking machine ejects her, since it detected a foreign body in her womb blocking its required functions.
+ <<if (($slaves[_i].pregType >= 50) || ($slaves[_i].bellyImplant != 0))>>
+ <<set $slaves[_i].assignment to "rest", $slaves[_i].assignmentVisible to 1>>
+ $slaves[_i].slaveName's milking machine ejects her, since it detected a foreign body in her womb blocking its required functions.
+ <</if>>
<</if>>
<</for>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index a69e811d78a..107fdb42c4f 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -24,7 +24,11 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale
<<if $freshPC == 0>>
<<if $retainCareer == 1 && $PC.career != "arcology owner">>
<<if $week > 52>>
- You have acquired a fair amount of knowledge regarding arcologies and their day-to-day management in your time spent as one's owner qualifying you as an @@color:orange;"arcology owner"!@@
+ You have acquired a fair amount of knowledge regarding arcologies and their day-to-day management in your time spent as one's owner qualifying you as an @@color:orange;"arcology owner"!@@ Benefits include:
+ @@color:lime;20% reduced cost of construction.@@
+ @@color:lime;Free additional starting rep.@@
+ @@color:lime;Reduced mercenary costs.@@
+ @@color:lime;An eye for gingered slaves.@@
<<if $retainCareer == 1>>
[[Change career.|New Game Plus][$retainCareer to 0]]
<<elseif $retainCareer == 0>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 7f9f7e09e75..88ead6c5d12 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1,5 +1,5 @@
:: RE nickname
-
+
<<nobr>>
<<set $nextButton to "Continue">>
@@ -248,11 +248,11 @@
<<elseif ($activeSlave.nationality is "French")>>
<<set $nickname to either("'Mademoiselle'", "'Belle'", "'Fille de Joie'", "'Surrender Monkey'", "'Paris'", "'Marseille'", "'Charlie Hebdo'")>>
<<elseif ($activeSlave.nationality is "Scottish")>>
- <<set $nickname to either("'Endinburg'", "'Ned'", "'Hadrian'", "'Unicorn'", "'Lass'")>>
+ <<set $nickname to either("'Endinburg'", "'Ned'", "'Hadrian'", "'Unicorn'", "'Lass'")>>
<<elseif ($activeSlave.nationality is "German")>>
<<set $nickname to either("'Bratwurst'", "'Valkyrie'", "'Fraulein'", "'Oktoberfest'", "'Dresden'", "'Berlin'", "'Prussian'", "'Bavarian'", "'Nazi'", "'Saupreiß'", "'Piefke'", "'Kraut'")>>
<<elseif ($activeSlave.nationality is "Brazilian")>>
- <<set $nickname to either("'Ipanema'", "'Hue'", "'Dago'", "'Monkey'", "'Bunda'", "'7-1'", "'Favelada'", "'Zika'", "'São Paulo'")>>
+ <<set $nickname to either("'Ipanema'", "'Hue'", "'Dago'", "'Monkey'", "'Bunda'", "'7-1'", "'Favelada'", "'Zika'", "'São Paulo'", "'Bauru'","'Carmen Miranda'")>>
<<elseif ($activeSlave.nationality is "Egyptian")>>
<<set $nickname to either("'Cleopatra'", "'Sinai'", "'Cairo'", "'Sphinx'", "'Misirlou'", "'Suez'")>>
<<elseif ($activeSlave.nationality is "Colombian")>>
@@ -349,7 +349,7 @@
<<set $nickname to either("'Bushbaby'", "'Cannibal'", "'Kampala'")>>
<<elseif ($activeSlave.nationality is "Tanzanian")>>
<<set $nickname to either("'Wilderness'", "'Zanzibar'")>>
-<<elseif ($activeSlave.nationality is "Ghanan")>>
+<<elseif ($activeSlave.nationality is "Ghanan")>>
<<set $nickname to either("'Warrior Queen'", "'Shaman Queen'", "'Akan'", "'Gold Coast'")>>
<<elseif ($activeSlave.nationality is "Chilean")>>
<<set $nickname to either("'Chela'", "'Toya'", "'Santiago'", "'Pinochet'")>>
@@ -521,19 +521,19 @@
<<set $situationDesc to "is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: She's a plastic slut, and the other slaves never tire of letting her know it.">>
<<set $applyDesc to "accepts the implicit mockery, knowing that her bimbo-esque body is what appeals to <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title isnot 0>>her master<<else>>her mistress<</if>>.">>
<<set $notApplyDesc to "is relieved to be protected from the other slaves' mockery over her implants, though she's also a little sad she can't take them as a kind of trademark.">>
-
+
<<elseif ($nickname is "bimbo")>>
<<set $nickname to either("'Silicone'", "'Plastique'", "'Plastic'", "'Bimbo'", "'Barbie'", "'Blowup Doll'", "'Fuck Toy'", "'Fuckmeat'", "'Brain Dead'")>>
<<set $situationDesc to "is full of implants, and stupid beyond stupid. It's obvious she's fake, and her idiocy only confirms it: She's a bimbo slut, and the other slaves never tire of mocking her for it, not caring that she doesn't notice.">>
<<set $applyDesc to "doesn't notice the mockery, only that she now has a cute little nickname.">>
<<set $notApplyDesc to "would be thankful for this protection from the other slaves' mockery if she saw it as such, or was smart enough to notice it.">>
-
+
<<elseif ($nickname is "stupid")>>
<<set $nickname to either("'Dumb'", "'Dumbass'", "'Idiot'", "'Brain Dead'", "'Retard'", "'Retarded'", "'Straight F Grades'", "'Intellectually Challenged'", "'Stupid'")>>
<<set $situationDesc to "is, quite simply, an uneducated dullard. Numerous slaves are a bit dumb, which makes it easier to break them, but she takes the cake and throws it in the trash. Some of the other, smarter slaves, see fit to tease her for it.">>
<<set $applyDesc to "accepts this mockery happily, as if she doesn't recognise it for what it is.">>
<<set $notApplyDesc to "would be thankful for this protection from the other slaves' mockery if she saw it as such, or was smart enough to notice it.">>
-
+
<<elseif ($nickname is "smart")>>
<<set $nickname to either("'Brainiac'", "'Nerd'", "'Smart'", "'Smarty'", "'Prodigy'", "'Einstein'", "'Genius'", "'Geek'", "'Whiz'", "'Professor'", "'Straight A Grades'")>>
<<set $situationDesc to "is particularly brainy. A significant number of quality slaves are smart, but she is especially so, and it shows. She learns skills quicker, performs her duties better, and can carry intellectual conversation if allowed. Other slaves deem this enough to mock her.">>
@@ -731,7 +731,7 @@
<<set $situationDesc to "is old. Really old. Old enough to be a grandmother. This, naturally, makes her one of the most experienced sluts in the arcology, a desirable quality in and of itself. Many of the younger slaves mock her relentlessly for her age.">>
<<set $applyDesc to "accepts her new nickname with pride. This acknowledgement of her age has her ready to show these young sluts a thing or two.">>
<<set $notApplyDesc to "understands that she must do her best to fuck like the teenager she once was. ">>
-
+
<<elseif ($nickname is "young")>>
<<set $nickname to either("'Precocious'", "'Jailbait'", "'Pedobait'", "'Pocket Pussy'", "'Underage'", "'Lolita'", "'Loli'", "'Juliet'", "'Baby'", "'Babycakes'", "'Party Van'", "'PTHC'", "'POMF'", "'Candydoll'", "'Imouto'")>>
<<if random(1, 1500) <= 100>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 4cdefd3b139..960ef3e4a57 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -46,7 +46,7 @@
<<if $slaves[$i].fetish is "mindbroken">>
Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any meaningful rivalry with _SlaveJ.slaveName.
- <<set_SlaveJ.rivalry to 0,_SlaveJ.rivalryTarget to 0>>
+ <<set _SlaveJ.rivalry to 0,_SlaveJ.rivalryTarget to 0>>
<<set $slaves[$i].rivalry to 0, $slaves[$i].rivalryTarget to 0>>
<<else>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index cdd754ea7e9..d1cf19e7f24 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -139,6 +139,7 @@
She makes sure to spend extra time teaching her $slaves[_i].relation, $slaves[_i].slaveName.
<<set $slaves[_i].trust += 1>>
<</if>>
+ <</if>> /*closes extended family mode */
<<if $Schoolteacher.relationshipTarget is $slaves[_i].ID>>
She dedicates most of her attention to her <<if $Schoolteacher.relationship == 1>>friend<<elseif $Schoolteacher.relationship is 2>>best friend<<elseif $Schoolteacher.relationship is 3>>friend with benefits<<elseif $Schoolteacher.relationship is 4>>lover<<elseif $Schoolteacher.relationship is 5>>slave wife<</if>>, $slaves[_i].slaveName making sure she understands that day's lesson.
<<set $slaves[_i].devotion += 2, $slaves[_i].trust += 2>>
diff --git a/src/uncategorized/slaveGenerationWidgets.tw b/src/uncategorized/slaveGenerationWidgets.tw
index ad4a56953f8..89574e8d75c 100644
--- a/src/uncategorized/slaveGenerationWidgets.tw
+++ b/src/uncategorized/slaveGenerationWidgets.tw
@@ -28,7 +28,7 @@
<<case "Guatemalan">>
<<set $args[0].race to either("latina", "amerindian")>>
<<case "Brazilian">>
- <<set $args[0].race to either("black", "latina", "mixed race", "mixed race", "amerindian", "white")>>
+ <<set $args[0].race to either("black", "latina", "mixed race", "mixed race", "amerindian", "white", "white", "asian")>>
<<case "Argentinian">>
<<set $args[0].race to either("white", "latina", "latina")>>
<<case "Chilean">>
@@ -618,8 +618,8 @@
<<case "Polish">>
<<set $args[0].accent to $seed>>
<<case "Brazilian">>
- <<if $language is "Spanish">>
- <<set $args[0].accent to either(0,1,2,3)>>
+ <<if $language is "Portuguese">>
+ <<set $args[0].accent to 0>>
<<else>>
<<set $args[0].accent to $seed>>
<</if>>
@@ -883,4 +883,4 @@
<<set $args[0].accent to 0>>
<</if>>
-<</widget>>
\ No newline at end of file
+<</widget>>
--
GitLab