diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 00999d28960790b6428403407fa6d037841ce5e8..ee693405b00dea0e01b5815d0105ec309b036aa2 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,14 @@
0.10.7.1-0.1.x
+3/28/2018
+
+ 13
+ -PC cheat edit improvements
+ -twincest options for new voluntarily enslaved twins during recruitment
+ -various typos fixed
+ -more bugs squashed, most notably virgins claiming to have given birth before
+
3/27/2018
12
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 80283dc99cbb995ca7cb2992b5084fe3bb70f0f0..b63629805c2d15dfcb559b851bddf071ae4f84e5 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -1348,8 +1348,8 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 400) {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3]);
+ if(actor.hormoneBalance >= 200) {
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
if(actor.diet == "fertility") {
@@ -6861,11 +6861,11 @@ window.isRivalP = function isRivalP(slave, target) {
}
window.supremeRaceP = function supremeRaceP(slave) {
- return SugarCube.State.variables.arcologies[0].FSSupremacistRace === slave.race
+ return State.variables.arcologies[0].FSSupremacistRace === slave.race
}
window.inferiorRaceP = function inferiorRaceP(slave) {
- return SugarCube.State.variables.arcologies[0].FSSubjugationistRace === slave.race
+ return State.variables.arcologies[0].FSSubjugationistRace === slave.race
}
/*:: wombJS [script]*/
@@ -9178,3 +9178,30 @@ window.simpleWorldEconomyCheck = function() {
return n2;
}
}
+
+window.HSM = function() {
+ if (State.variables.PC.hacking <= -100)
+ return 1.5;
+ else if (State.variables.PC.hacking <= -75)
+ return 1.35;
+ else if (State.variables.PC.hacking <= -50)
+ return 1.25;
+ else if (State.variables.PC.hacking <= -25)
+ return 1.15;
+ else if (State.variables.PC.hacking < 0)
+ return 1.10;
+ else if (State.variables.PC.hacking === 0)
+ return 1;
+ else if (State.variables.PC.hacking <= 10)
+ return .97;
+ else if (State.variables.PC.hacking <= 25)
+ return .95;
+ else if (State.variables.PC.hacking <= 50)
+ return .90;
+ else if (State.variables.PC.hacking <= 75)
+ return .85;
+ else if (State.variables.PC.hacking < 100)
+ return .80;
+ else if (State.variables.PC.hacking >= 100)
+ return .75;
+ }
diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw
index 951bcacd79954065453659e28e45aaad5cb66e1e..9ddb37b75d8295c2843499cd4003f406faa858ab 100644
--- a/src/cheats/PCCheatMenu.tw
+++ b/src/cheats/PCCheatMenu.tw
@@ -2,7 +2,40 @@
<<set $showEncyclopedia = 0, $nextButton = "Back", $nextLink = "PCCheatMenuCheatDatatypeCleanup">>
+<<if $PC.title > 0>>
+ ''Master''.
+ [[Switch to Mistress|PCCheatMenu][$PC.title = 0]]
+<<else>>
+ ''Mistress''.
+ [[Switch to Master|PCCheatMenu][$PC.title = 1]]
+<</if>>
+
+<br>Nationality: ''$PC.nationality''.<<textbox "$PC.nationality" $PC.nationality "PCCheatMenu">>
+
+<br>Career: ''$PC.career''.
+ [[Wealth|PCCheatMenu][$PC.career = "wealth"]] |
+ [[Business|PCCheatMenu][$PC.career = "capitalist"]] |
+ [[PMC work|PCCheatMenu][$PC.career = "mercenary"]] |
+ [[Slaving|PCCheatMenu][$PC.career = "slaver"]] |
+ [[Engineering|PCCheatMenu][$PC.career = "engineer"]] |
+ [[Medicine|PCCheatMenu][$PC.career = "medicine"]] |
+ [[Celebrity|PCCheatMenu][$PC.career = "celebrity"]]
+
+<br>Method of acquiring the arcology: ''$PC.rumor''.
+ [[Wealth|PCCheatMenu][$PC.rumor = "wealth"]] |
+ [[Hard work|PCCheatMenu][$PC.rumor = "diligence"]] |
+ [[Force|PCCheatMenu][$PC.rumor = "force"]] |
+ [[Social engineering|PCCheatMenu][$PC.rumor = "social engineering"]] |
+ [[Luck|PCCheatMenu][$PC.rumor = "luck"]]
+
+<br>Preferred refreshment: <<textbox "$PC.refreshment" $PC.refreshment "PCCheatMenu">> [[Cigars|PCCheatMenu][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|PCCheatMenu][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
+<br>Preferred method of consumption: <<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<elseif $PC.refreshmentType == 4>>Injected<<elseif $PC.refreshmentType == 5>>Popped<<else>>Orally Dissolved<</if>>
+<br>[[Smoked|PCCheatMenu][$PC.refreshmentType = 0]] | [[Drank|PCCheatMenu][$PC.refreshmentType = 1]] | [[Eaten|PCCheatMenu][$PC.refreshmentType = 2]] | [[Snorted|PCCheatMenu][$PC.refreshmentType = 3]] | [[Injected|PCCheatMenu][$PC.refreshmentType = 4]] | [[Popped|PCCheatMenu][$PC.refreshmentType = 5]] | [[Orally Dissolved|PCCheatMenu][$PC.refreshmentType = 6]]
+
+''Name'': <<textbox "$PC.name" $PC.name "PCCheatMenu">>
''Surname'': <<textbox "$PC.surname" $PC.surname "PCCheatMenu">>
+''Custom title'': <<textbox "$PC.customTitle" $PC.customTitle "PCCheatMenu">>
+
<br>''Boobs'': <<textbox "$PC.boobs" $PC.boobs "PCCheatMenu">> //0 - masculine chest (if title = 1) or flat chested (if title = 0)(WIP) 1 - feminine bust//
<<if $PC.boobs > 0>>
<br>''BoobsBonus'': <<textbox "$PC.boobsBonus" $PC.boobsBonus "PCCheatMenu">> //breast size -1 - C-cup -0.5 - D-cup 0 - DD-cup 1 - F-cup 2 - G-cup 3 - H-cup//
@@ -44,3 +77,231 @@
<</if>>
<br>''PregMood'': <<textbox "$PC.pregMood" $PC.pregMood "PCCheatMenu">> //how you act when heavily pregnant. 0: no change 1: submissive and motherly 2: aggressive and dominant//
<</if>>
+
+<br><br>''Skills:''
+<br>Trading:
+''<<if $PC.trading >= 100>>
+ You are a master at economics and trading.
+<<elseif $PC.trading >= 80>>
+ You are an expert at economics and trading.
+<<elseif $PC.trading >= 60>>
+ You are skilled in economics and trading.
+<<elseif $PC.trading >= 40>>
+ You know some things about economics and trading.
+<<elseif $PC.trading >= 20>>
+ You are a beginner in economics.
+<<elseif $PC.trading >= 0>>
+ You know only the basics of trading.
+<<elseif $PC.trading >= -20>>
+ You know how to haggle a little.
+<<elseif $PC.trading >= -40>>
+ You know how to shop around.
+<<elseif $PC.trading >= -60>>
+ You know not to pay sticker price.
+<<elseif $PC.trading >= -80>>
+ People always give you discounts, but you never save any money.
+<<else>>
+ They said it was a bear market, so where are the bears?
+<</if>>''
+<br>
+<<radiobutton "$PC.trading" 100>> Economics master
+| <<radiobutton "$PC.trading" 90>> Economics expert
+| <<radiobutton "$PC.trading" 70>> Skilled in economics
+| <<radiobutton "$PC.trading" 50>> Amateur economist
+| <<radiobutton "$PC.trading" 30>> Economics beginner
+| <<radiobutton "$PC.trading" 0>> Basic trader
+| <<radiobutton "$PC.trading" -10>> Haggler
+| <<radiobutton "$PC.trading" -30>> Shopper
+| <<radiobutton "$PC.trading" -50>> Weak saver
+| <<radiobutton "$PC.trading" -70>> Money sieve
+| <<radiobutton "$PC.trading" -90>> What's a trading?
+
+<br>Warfare:
+''<<if $PC.warfare >= 100>>
+ You are a master of warfare.
+<<elseif $PC.warfare >= 80>>
+ You are an expert at tactics and strategy.
+<<elseif $PC.warfare >= 60>>
+ You are skilled in combat.
+<<elseif $PC.warfare >= 40>>
+ You know some things about combat.
+<<elseif $PC.warfare >= 20>>
+ You are a beginner in tactics and strategy.
+<<elseif $PC.warfare >= 0>>
+ You know only the basics of fighting.
+<<elseif $PC.warfare >= -20>>
+ You know how to hold a gun.
+<<elseif $PC.warfare >= -40>>
+ You know how to stab with a knife.
+<<elseif $PC.warfare >= -60>>
+ Go for the throat?
+<<elseif $PC.warfare >= -80>>
+ Just kick them in the balls, right?
+<<else>>
+ People like you are usually the first raped in a war.
+<</if>>''
+<br>
+<<radiobutton "$PC.warfare" 100>> Warfare master
+| <<radiobutton "$PC.warfare" 90>> Warfare expert
+| <<radiobutton "$PC.warfare" 70>> Skilled in warfare
+| <<radiobutton "$PC.warfare" 50>> Amateur combatant
+| <<radiobutton "$PC.warfare" 30>> Combat beginner
+| <<radiobutton "$PC.warfare" 0>> Basic fighter
+| <<radiobutton "$PC.warfare" -10>> Gun haver
+| <<radiobutton "$PC.warfare" -30>> Knife holder
+| <<radiobutton "$PC.warfare" -50>> Throat puncher
+| <<radiobutton "$PC.warfare" -70>> Groin kicker?
+| <<radiobutton "$PC.warfare" -90>> Most likely to be raped
+
+<br>Slaving:
+''<<if $PC.slaving >= 100>>
+ You are a master slaver.
+<<elseif $PC.slaving >= 80>>
+ You are an expert at enslaving.
+<<elseif $PC.slaving >= 60>>
+ You are skilled in slaving.
+<<elseif $PC.slaving >= 40>>
+ You know some things about getting slaves.
+<<elseif $PC.slaving >= 20>>
+ You are a beginner in slaving.
+<<elseif $PC.slaving >= 0>>
+ You know only the basics of slaving.
+<<elseif $PC.slaving >= -20>>
+ You know how to avoid becoming a slave.
+<<elseif $PC.slaving >= -40>>
+ You know to read contracts before you sign them.
+<<elseif $PC.slaving >= -60>>
+ You know to be careful.
+<<elseif $PC.slaving >= -80>>
+ You know better than to trust anyone.
+<<else>>
+ It would be easy to enslave you.
+<</if>>''
+<br>
+<<radiobutton "$PC.slaving" 100>> Master slaver
+| <<radiobutton "$PC.slaving" 90>> Expert slaver
+| <<radiobutton "$PC.slaving" 70>> Skilled in slaving
+| <<radiobutton "$PC.slaving" 50>> Amateur slaver
+| <<radiobutton "$PC.slaving" 30>> Slaving beginner
+| <<radiobutton "$PC.slaving" 0>> Basic slaver
+| <<radiobutton "$PC.slaving" -10>> Can't make me a slave
+| <<radiobutton "$PC.slaving" -30>> Can read contracts
+| <<radiobutton "$PC.slaving" -50>> Careful now
+| <<radiobutton "$PC.slaving" -70>> Don't trust that guy
+| <<radiobutton "$PC.slaving" -90>> Potential slave
+
+<br>Engineering:
+''<<if $PC.engineering >= 100>>
+ You are a master engineer.
+<<elseif $PC.engineering >= 80>>
+ You are an expert at engineering.
+<<elseif $PC.engineering >= 60>>
+ You are skilled in engineering.
+<<elseif $PC.engineering >= 40>>
+ You know some things about engineering.
+<<elseif $PC.engineering >= 20>>
+ You are a beginner in engineering.
+<<elseif $PC.engineering >= 0>>
+ You know only the basics of engineering.
+<<elseif $PC.engineering >= -20>>
+ You can build a gingerbread house that doesn't collapse.
+<<elseif $PC.engineering >= -40>>
+ You can tie a tight knot, does that count?
+<<elseif $PC.engineering >= -60>>
+ Glue is your friend; lots of it.
+<<elseif $PC.engineering >= -80>>
+ You know better than to even try to build something.
+<<else>>
+ You can cook; that's sort of like building something, right?
+<</if>>''
+<br>
+<<radiobutton "$PC.engineering" 100>> Master engineer
+| <<radiobutton "$PC.engineering" 90>> Expert engineer
+| <<radiobutton "$PC.engineering" 70>> Skilled in engineering
+| <<radiobutton "$PC.engineering" 50>> Amateur engineer
+| <<radiobutton "$PC.engineering" 30>> Engineering beginner
+| <<radiobutton "$PC.engineering" 0>> Basic engineer
+| <<radiobutton "$PC.engineering" -10>> Gingerbread house
+| <<radiobutton "$PC.engineering" -30>> Knot tyer
+| <<radiobutton "$PC.engineering" -50>> You can use glue
+| <<radiobutton "$PC.engineering" -70>> You aren't handy
+| <<radiobutton "$PC.engineering" -90>> My hovercraft is full of eels
+
+<br>Medicine:
+''<<if $PC.medicine >= 100>>
+ You are a master surgeon.
+<<elseif $PC.medicine >= 80>>
+ You are an expert at medicine and surgery.
+<<elseif $PC.medicine >= 60>>
+ You are skilled in surgery.
+<<elseif $PC.medicine >= 40>>
+ You know some things about medicine.
+<<elseif $PC.medicine >= 20>>
+ You are a beginner in medicine.
+<<elseif $PC.medicine >= 0>>
+ You know the basics of treating injuries.
+<<elseif $PC.medicine >= -20>>
+ You can stop a wound from getting infected.
+<<elseif $PC.medicine >= -40>>
+ Gauze is your friend. Just keep wrapping.
+<<elseif $PC.medicine >= -60>>
+ You know how to apply a bandaid.
+<<elseif $PC.medicine >= -80>>
+ Cure-alls are wonderful. Why aren't they sold in stores, though?
+<<else>>
+ Alcohol makes pain go away, right?
+<</if>>''
+<br>
+<<radiobutton "$PC.medicine" 100>> Master surgeon
+| <<radiobutton "$PC.medicine" 90>> Expert surgeon
+| <<radiobutton "$PC.medicine" 70>> Skilled in medicine
+| <<radiobutton "$PC.medicine" 50>> Amateur surgeon
+| <<radiobutton "$PC.medicine" 30>> Medical beginner
+| <<radiobutton "$PC.medicine" 0>> Basic medic
+| <<radiobutton "$PC.medicine" -10>> Can treat wounds
+| <<radiobutton "$PC.medicine" -30>> First-aid kit user
+| <<radiobutton "$PC.medicine" -50>> Band-aid applyer
+| <<radiobutton "$PC.medicine" -70>> MEDIC!
+| <<radiobutton "$PC.medicine" -90>> Give me another beer
+
+<br>Hacking:
+''<<if $PC.hacking >= 100>>
+ You are a master of hacking.
+<<elseif $PC.hacking >= 80>>
+ You are an expert at hacking.
+<<elseif $PC.hacking >= 60>>
+ You are skilled in hacking.
+<<elseif $PC.hacking >= 40>>
+ You know some things about hacking.
+<<elseif $PC.hacking >= 20>>
+ You are a beginner in hacking.
+<<elseif $PC.hacking >= 0>>
+ You know only the basics of hacking.
+<<elseif $PC.hacking >= -20>>
+ You know how to click a mouse.
+<<elseif $PC.hacking >= -40>>
+ Enter does something?
+<<elseif $PC.hacking >= -60>>
+ Where is the "any" key?
+<<elseif $PC.hacking >= -80>>
+ You can push the power button, good job.
+<<else>>
+ This black box thingy is magical.
+<</if>>''
+<br>
+<<radiobutton "$PC.hacking" 100>> Master hacker
+| <<radiobutton "$PC.hacking" 90>> Expert hacker
+| <<radiobutton "$PC.hacking" 70>> Skilled hacker
+| <<radiobutton "$PC.hacking" 50>> Amateur hacker
+| <<radiobutton "$PC.hacking" 30>> Hacking beginner
+| <<radiobutton "$PC.hacking" 0>> Basic hacker
+| <<radiobutton "$PC.hacking" -10>> Mouse clicker
+| <<radiobutton "$PC.hacking" -30>> You can press Enter
+| <<radiobutton "$PC.hacking" -50>> Where's the "any" key?
+| <<radiobutton "$PC.hacking" -70>> Main screen turn on?
+| <<radiobutton "$PC.hacking" -90>> Ooh, cool glowy thingy!
+
+<br>Your mother ID:
+<<textbox "$PC.mother" $PC.mother "PCCheatMenu">>
+<br>Your father ID:
+<<textbox "$PC.father" $PC.father "PCCheatMenu">>
\ No newline at end of file
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 56933e38cabc2ef84db48aaf57717eb3c4fd4bb5..ab1ed6b4dee335032149bb09fbee1a1d62a4313b 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -175,111 +175,6 @@ be mentioned.
<</if>>
<</nobr>>*/
-__Player Character__
-<br>Conversational title:
-<<if $PC.title > 0>>
- ''Master''.
- [[Switch to Mistress|MOD_Edit Arcology Cheat][$PC.title = 0]]
-<<else>>
- ''Mistress''.
- [[Switch to Master|MOD_Edit Arcology Cheat][$PC.title = 1]]
-<</if>>
-
-<br>Career: ''$PC.career''.
- [[Wealth|MOD_Edit Arcology Cheat][$PC.career = "wealth"]] |
- [[Business|MOD_Edit Arcology Cheat][$PC.career = "capitalist"]] |
- [[PMC work|MOD_Edit Arcology Cheat][$PC.career = "mercenary"]] |
- [[Slaving|MOD_Edit Arcology Cheat][$PC.career = "slaver"]] |
- [[Engineering|MOD_Edit Arcology Cheat][$PC.career = "engineer"]] |
- [[Medicine|MOD_Edit Arcology Cheat][$PC.career = "medicine"]] |
- [[Celebrity|MOD_Edit Arcology Cheat][$PC.career = "celebrity"]]
-
-<br>Method of acquiring the arcology: ''$PC.rumor''.
- [[Wealth|MOD_Edit Arcology Cheat][$PC.rumor = "wealth"]] |
- [[Hard work|MOD_Edit Arcology Cheat][$PC.rumor = "diligence"]] |
- [[Force|MOD_Edit Arcology Cheat][$PC.rumor = "force"]] |
- [[Social engineering|MOD_Edit Arcology Cheat][$PC.rumor = "social engineering"]] |
- [[Luck|MOD_Edit Arcology Cheat][$PC.rumor = "luck"]]
-
-<br>Genitalia:
-<<if $PC.dick > 0>>
- ''penis''. Standard sex scenes; easier reputation maintenance.
- [[Switch to vagina|MOD_Edit Arcology Cheat][$PC.dick = 0]]
-<<else>>
- ''vagina''. Sex scene variations; more difficult reputation maintenance.
- [[Switch to penis|MOD_Edit Arcology Cheat][$PC.dick = 1]]
-<</if>>
-
-<br>Chest:
-<<if $PC.boobs > 0>>
- ''breasts''. Sex scene variations; more difficult reputation maintenance.
- [[Remove breasts|MOD_Edit Arcology Cheat][$PC.boobs = 0]]
-<<else>>
- ''masculine''. Standard sex scenes; easier reputation maintenance.
- [[Add breasts|MOD_Edit Arcology Cheat][$PC.boobs = 1]]
-<</if>>
-
-<br>Age:
-<<if $PC.actualAge >= 65>>
- ''old''.
-<<elseif $PC.actualAge >= 50>>
- ''well into middle age''.
-<<elseif $PC.actualAge >= 35>>
- ''entering middle age''.
-<<else>>
- ''surprisingly young''.
-<</if>>
-<<textbox "$PC.actualAge" $PC.actualAge "MOD_Edit Arcology Cheat">>
-<<set $PC.physicalAge = $PC.actualAge, $PC.visualAge = $PC.actualAge>>
-<br>
-<<if $playerAging == 2>>
- You will ''age naturally.''
- [[Disable aging|MOD_Edit Arcology Cheat][$playerAging = 0]] |
- [[Semi aging|MOD_Edit Arcology Cheat][$playerAging = 1]]
-<<elseif $playerAging == 1>>
- You ''will'' celebrate birthdays, but ''not age.''
- [[Enable aging fully|MOD_Edit Arcology Cheat][$playerAging = 2]] |
- [[Disable aging|MOD_Edit Arcology Cheat][$playerAging = 0]]
-<<else>>
- You will ''not age,'' and not experience birthdays.
- [[Enable aging|MOD_Edit Arcology Cheat][$playerAging = 2]] |
- [[Semi aging|MOD_Edit Arcology Cheat][$playerAging = 1]]
-<</if>>
-//This option cannot be changed during the game//
-<br>Rename your character: (given name) <<textbox "$PC.name" $PC.name "MOD_Edit Arcology Cheat">> (surname) <<textbox "$PC.surname" $PC.surname "MOD_Edit Arcology Cheat">>
-<br>Nationality: ''$PC.nationality''.<<textbox "$PC.nationality" $PC.nationality "MOD_Edit Arcology Cheat">>
-<br>Race: ''$PC.race''.
- [[White|MOD_Edit Arcology Cheat][$PC.race = "white"]] |
- [[Asian|MOD_Edit Arcology Cheat][$PC.race = "asian"]] |
- [[Latina|MOD_Edit Arcology Cheat][$PC.race = "latina"]] |
- [[Middle Eastern|MOD_Edit Arcology Cheat][$PC.race = "middle eastern"]] |
- [[Black|MOD_Edit Arcology Cheat][$PC.race = "black"]] |
- [[Semitic|MOD_Edit Arcology Cheat][$PC.race = "semitic"]] |
- [[Southern European|MOD_Edit Arcology Cheat][$PC.race = "southern european"]] |
- [[Indo-aryan|MOD_Edit Arcology Cheat][$PC.race = "indo-aryan"]] |
- [[Amerindian|MOD_Edit Arcology Cheat][$PC.race = "amerindien"]] |
- [[Pacific Islander|MOD_Edit Arcology Cheat][$PC.race = "pacific islander"]] |
- [[Malay|MOD_Edit Arcology Cheat][$PC.race = "malay"]] |
- [[Mixed Race|MOD_Edit Arcology Cheat][$PC.race = "mixed race"]]
-<br>Skin: ''$PC.skin''.
- [[White|MOD_Edit Arcology Cheat][$PC.skin = "white"]] |
- [[Fair|MOD_Edit Arcology Cheat][$PC.skin = "fair"]] |
- [[Light|MOD_Edit Arcology Cheat][$PC.skin = "light"]] |
- [[Dark|MOD_Edit Arcology Cheat][$PC.skin = "dark"]] |
- [[Olive|MOD_Edit Arcology Cheat][$PC.skin = "olive"]] |
- [[Black|MOD_Edit Arcology Cheat][$PC.skin = "black"]] |
- [[Light Brown|MOD_Edit Arcology Cheat][$PC.skin = "light brown"]] |
- [[Brown|MOD_Edit Arcology Cheat][$PC.skin = "brown"]] |
- [[Pale|MOD_Edit Arcology Cheat][$PC.skin = "pale"]] |
- [[Extremely Pale|MOD_Edit Arcology Cheat][$PC.skin = "extremely pale"]]
-<br>Eye color: ''$PC.eyeColor''.
-<<textbox "$PC.eyeColor" $PC.eyeColor "MOD_Edit Arcology Cheat">>
-<br>Hair color: ''$PC.hColor''.
-<<textbox "$PC.hColor" $PC.hColor "MOD_Edit Arcology Cheat">>
-<br>Preferred refreshment: <<textbox "$PC.refreshment" $PC.refreshment "MOD_Edit Arcology Cheat">> [[Cigars|MOD_Edit Arcology Cheat][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|MOD_Edit Arcology Cheat][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
-<br>Preferred method of consumption: <<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<elseif $PC.refreshmentType == 4>>Injected<<elseif $PC.refreshmentType == 5>>Popped<<else>>Orally Dissolved<</if>>
-<br>[[Smoked|MOD_Edit Arcology Cheat][$PC.refreshmentType = 0]] | [[Drank|MOD_Edit Arcology Cheat][$PC.refreshmentType = 1]] | [[Eaten|MOD_Edit Arcology Cheat][$PC.refreshmentType = 2]] | [[Snorted|MOD_Edit Arcology Cheat][$PC.refreshmentType = 3]] | [[Injected|MOD_Edit Arcology Cheat][$PC.refreshmentType = 4]] | [[Popped|MOD_Edit Arcology Cheat][$PC.refreshmentType = 5]] | [[Orally Dissolved|MOD_Edit Arcology Cheat][$PC.refreshmentType = 6]]
-
<br><br>Arcology citizens: $ACitizens
<<textbox "$ACitizens" $ACitizens>>
<br>Arcology sex slaves: $ASlaves
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 45fdd0dff995417b0bd0a6137630d3ab1f688160..426b3af506b0db55e218639ba81027a2b108e16c 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -692,7 +692,7 @@
<<print " | ">>
<<NOptions "Moldovan" >>
<br>
- <<NOptions "Monégasque" >>
+ <<NOptions "Monégasque" >>
<<print " | ">>
<<NOptions "Montenegrin" >>
<<print " | ">>
@@ -842,7 +842,7 @@
<<print " | ">>
<<NOptions "Bissau-Guinean" >>
<<print " | ">>
- <<NOptions "Burkinabé" >>
+ <<NOptions "Burkinabé" >>
<<print " | ">>
<<NOptions "Burundian" >>
<<print " | ">>
@@ -910,7 +910,7 @@
<<print " | ">>
<<NOptions "Sahrawi" >>
<<print " | ">>
- <<NOptions "São Toméan" >>
+ <<NOptions "São Toméan" >>
<<print " | ">>
<<NOptions "Senegalese" >>
<br>
@@ -920,6 +920,8 @@
<<print " | ">>
<<NOptions "Somali" >>
<<print " | ">>
+ <<NOptions "South African" >>
+ <<print " | ">>
<<NOptions "South Sudanese" >>
<<print " | ">>
<<NOptions "Sudanese" >>
@@ -931,9 +933,9 @@
<<NOptions "Togolese" >>
<<print " | ">>
<<NOptions "Tunisian" >>
- <<print " | ">>
- <<NOptions "Ugandan" >>
<br>
+ <<NOptions "Ugandan" >>
+ <<print " | ">>
<<NOptions "Zairian" >>
<<print " | ">>
<<NOptions "Zambian" >>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 7adffeb4f481e195a0cd4686e43d2de1ae935df1..61893887e2ecd902a3b357f0788fb14f80dae6c5 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -269,27 +269,27 @@
<<set setup.modestClothes = ["conservative clothing", "a toga", "a huipil", "a slutty qipao", "restrictive latex", "cutoffs and a t-shirt", "battledress", "a penitent nuns habit", "a slave gown", "slutty business attire", "nice business attire", "a comfortable bodysuit", "a leotard", "a bunny outfit", "a nice nurse outfit", "a slutty nurse outfit", "a schoolgirl outfit", "a hijab and abaya", "a kimono", "a nice maid outfit", "a slutty maid outfit", "a ball gown", "a halter top dress", "a mini dress", "a latex catsuit", "a military uniform", "a maternity dress", "spats and a tank top"]>>
-<<set setup.veryYoungCareers = ["a babysitter", "a beggar", "a beggar", "a cheerleader", "a child actress", "a child prostitute", "a child prostitute", "a child soldier", "a child soldier", "a club recruiter", "a dropout", "a dropout", "a farmer's daughter", "a girl scout", "a girl scout", "a handmaiden", "a juvenile delinquent", "a juvenile delinquent", "a military brat", "a model", "a model-UN star", "a pageant star", "a paper girl", "a part-time farm laborer", "a pick-pocket", "a refugee", "a refugee", "a refugee", "a street thug", "a street urchin", "a street urchin", "a street urchin", "a student council president", "a student from a boarding school", "a student from a private school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "an orphan", "an orphan", "an orphan", "an orphan", "an orphan", "being homeschooled by her parents", "captain of the kendo club", "from a lower class family", "from a lower class family", "from a lower class family", "from a middle class family", "from a middle class family", "from an upper class family", "homeless", "homeless", "homeless", "a cum dump", "a meat toilet", "a shrine maiden"]>> /* pregmod */
+<<set setup.veryYoungCareers = ["a babysitter", "a beggar", "a beggar", "a cheerleader", "a child actress", "a child prostitute", "a child prostitute", "a child soldier", "a child soldier", "a club recruiter", "a cum dump", "a dropout", "a dropout", "a farmer's daughter", "a girl scout", "a girl scout", "a handmaiden", "a juvenile delinquent", "a juvenile delinquent", "a meat toilet", "a military brat", "a model-UN star", "a model", "a pageant star", "a paper girl", "a part-time farm laborer", "a pick-pocket", "a refugee", "a refugee", "a refugee", "a shrine maiden", "a street thug", "a street urchin", "a street urchin", "a street urchin", "a student council president", "a student from a boarding school", "a student from a private school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a student from a public school", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "a sweatshop worker", "an orphan", "an orphan", "an orphan", "an orphan", "an orphan", "being homeschooled by her parents", "captain of the kendo club", "from a lower class family", "from a lower class family", "from a lower class family", "from a middle class family", "from a middle class family", "from an upper class family", "homeless", "homeless", "homeless"]>> /* pregmod */
-<<set setup.youngCareers = ["a barista", "a bartender", "a camgirl", "a cheerleader", "a cook", "a courier", "a criminal", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a maid", "a model", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a soldier", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a waitress", "an air hostess", "an apprentice", "an arcade attendant", "an assassin", "an exotic dancer", "an office worker", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed", "a cum dump", "a meat toilet", "a shrine maiden"]>>
+<<set setup.youngCareers = ["a ballerina", "a barista", "a bartender", "a camgirl", "a cheerleader", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a maid", "a meat toilet", "a model", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a waitress", "an air hostess", "an apprentice", "an arcade attendant", "an assassin", "an escort", "an exotic dancer", "an office worker", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
-<<set setup.educatedCareers = ["a business owner", "a child actress", "a classical dancer", "a classical musician", "a college scout", "a counselor", "a criminal", "a cult leader", "a dispatch officer", "a doctor", "a journalist", "a journalist", "a lawyer", "a librarian", "a manager", "a mechanic", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a paramedic", "a pilot", "a political activist", "a politician", "a principal", "a private detective", "a private instructor", "a procuress", "a professional bartender", "a professor", "a programmer", "a psychologist", "a refugee", "a scholar", "a scientist", "a serial divorcee", "a shut-in", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "an MS pilot", "an actress", "an air hostess", "an assassin", "an engineer", "an estate agent", "an investor", "a producer"]>>
+<<set setup.educatedCareers = ["a ballerina", "a business owner", "a child actress", "a classical dancer", "a classical musician", "a college scout", "a counselor", "a criminal", "a cult leader", "a dispatch officer", "a doctor", "a journalist", "a journalist", "a lawyer", "a librarian", "a manager", "a mechanic", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a paramedic", "a pilot", "a political activist", "a politician", "a principal", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a psychologist", "a refugee", "a scholar", "a scientist", "a serial divorcee", "a shut-in", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "an actress", "an air hostess", "an assassin", "an astronaut", "an engineer", "an estate agent", "an investor", "an MS pilot"]>>
-<<set setup.uneducatedCareers = ["a barista", "a bartender", "a bodyguard", "a bouncer", "a bounty hunter", "a camgirl", "a camwhore", "a caregiver", "a charity worker", "a cheerleader", "a cocktail waitress", "a cook", "a criminal", "a dairy worker", "a dancer", "a factory worker", "a farm laborer", "a farmer's daughter", "a fisherwoman", "a handmaiden", "a house DJ", "a housewife", "a law enforcement officer", "a lifeguard", "a local news anchor", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a medic", "a medic", "a missionary", "a mistress", "a model", "a musician", "a nurse", "a paramedic", "a party girl", "a pimp", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a soldier", "a stripper", "a student", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an enforcer", "an enforcer", "an exotic dancer", "an office worker", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed", "a cum dump", "a meat toilet", "a shrine maiden", "an innkeeper"]>>
+<<set setup.uneducatedCareers = ["a barista", "a bartender", "a bodyguard", "a bouncer", "a bounty hunter", "a bus driver", "a camgirl", "a camwhore", "a caregiver", "a charity worker", "a cheerleader", "a cocktail waitress", "a cook", "a criminal", "a cum dump", "a dairy worker", "a dancer", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a fisherwoman", "a handmaiden", "a house DJ", "a housewife", "a law enforcement officer", "a lifeguard", "a local news anchor", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a milkmaid", "a missionary", "a mistress", "a model", "a musician", "a nurse", "a paramedic", "a party girl", "a pimp", "a pirate", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a stripper", "a student", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "an actress", "an arcade attendant", "an aspiring pop star", "an athlete", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an innkeeper", "an office worker", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
<<set setup.gratefulCareers = ["a beggar", "a child soldier", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
-<<set setup.menialCareers = ["a babysitter", "a cook", "a courier", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a programmer", "a ride attendant", "a service worker", "a student from a private school", "a student from a public school", "a student", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "being homeschooled by her parents", "from a middle class family", "from an upper class family", "a producer"]>>
+<<set setup.menialCareers = ["a babysitter", "a bus driver", "a cook", "a courier", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
<<set setup.entertainmentCareers = ["a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a party girl", "a racing driver", "a waitress", "a weathergirl", "a writer", "an actress"]>>
-<<set setup.whoreCareers = ["a Futanari Sister", "a child prostitute", "a criminal", "a juvenile delinquent", "a mistress", "a model", "a pageant star", "a porn star", "a prostitute", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an exotic dancer", "a cum dump", "a meat toilet"]>>
+<<set setup.whoreCareers = ["a child prostitute", "a criminal", "a cum dump", "a Futanari Sister", "a juvenile delinquent", "a meat toilet", "a mistress", "a model", "a pageant star", "a pirate", "a porn star", "a prostitute", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an escort", "an exotic dancer"]>>
-<<set setup.HGCareers = ["a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a student council president", "a Queen"]>>
+<<set setup.HGCareers = ["a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a politician", "a Queen", "a student council president"]>>
<<set setup.madamCareers = ["a business owner", "a manager", "a pimp", "a procuress", "an innkeeper"]>>
-<<set setup.DJCareers = ["a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star"]>>
+<<set setup.DJCareers = ["a ballerina", "a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star"]>>
<<set setup.bodyguardCareers = ["a bodyguard", "a child soldier", "a kunoichi", "a law enforcement officer", "a military brat", "a prince", "a revolutionary", "a soldier", "a transporter", "an assassin", "an MS pilot", "captain of the kendo club", "in a militia"]>>
@@ -299,7 +299,7 @@
<<set setup.attendantCareers = ["a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist"]>>
-<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a rancher", "a veterinarian"]>>
+<<set setup.milkmaidCareers = ["a dairy worker", "a farmer's daughter", "a farmer", "a milkmaid", "a rancher", "a veterinarian"]>>
<<set setup.stewardessCareers = ["a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker"]>>
@@ -308,7 +308,7 @@
<<set setup.recruiterCareers = ["a club recruiter", "a college scout", "a cult leader", "a girl scout", "a military recruiter", "a missionary", "a political activist", "a princess"]>> /* pregmod */
-<<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Andorran", "Angolan", "Antiguan", "Argentinian", "Armenian", "Aruban", "Australian", "Austrian", "Azerbaijani", "Bahamian", "Bahraini", "Bangladeshi", "Barbadian", "Belarusian", "Belgian", "Belizean", "Bermudian", "Bhutanese", "Bissau-Guinean", "Bolivian", "Bosnian", "Brazilian", "British", "Bruneian", "Bulgarian", "Burkinabé", "Burmese", "Burundian", "Cambodian", "Cameroonian", "Canadian", "Cape Verdean", "Catalan", "Central African", "Chadian", "Chilean", "Chinese", "Colombian", "Comorian", "Congolese", "a Cook Islander", "Costa Rican", "Croatian", "Cuban", "Cypriot", "Czech", "Danish", "Djiboutian", "Dominican", "Dominiquais", "Dutch", "East Timorese", "Ecuadorian", "Egyptian", "Emirati", "Equatoguinean", "Eritrean", "Estonian", "Ethiopian", "Fijian", "Filipina", "Finnish", "French Guianan", "French Polynesian", "French", "Gabonese", "Gambian", "Georgian", "German", "Ghanan", "Greek", "Greenlandic", "Grenadian", "Guatemalan", "Guinean", "Guyanese", "Haitian", "Honduran", "Hungarian", "I-Kiribati", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Ivorian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Kittitian", "Korean", "Kosovan", "Kurdish", "Kuwaiti", "Kyrgyz", "Laotian", "Latvian", "Lebanese", "Liberian", "Libyan", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Macedonian", "Malagasy", "Malawian", "Malaysian", "Maldivian", "Malian", "Maltese", "Marshallese", "Mauritanian", "Mauritian", "Mexican", "Micronesian", "Moldovan", "Monégasque", "Mongolian", "Montenegrin", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nauruan", "Nepalese", "a New Zealander", "Ni-Vanuatu", "Nicaraguan", "Nigerian", "Nigerien", "Niuean", "Norwegian", "Omani", "Pakistani", "Palauan", "Palestinian", "Panamanian", "Papua New Guinean", "Paraguayan", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Rwandan", "Sahrawi", "Saint Lucian", "Salvadoran", "Sammarinese", "Samoan", "São Toméan", "Saudi", "Scottish", "Senegalese", "Serbian", "Seychellois", "Sierra Leonean", "Singaporean", "Slovak", "Slovene", "a Solomon Islander", "Somali", "South African", "South Sudanese", "Spanish", "Sri Lankan", "Sudanese", "Surinamese", "Swazi", "Swedish", "Swiss", "Syrian", "Taiwanese", "Tajik", "Tanzanian", "Thai", "Tibetan", "Togolese", "Tongan", "Trinidadian", "Tunisian", "Turkish", "Turkmen", "Tuvaluan", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Vatican", "Venezuelan", "Vietnamese", "Vincentian", "Yemeni", "Zairian", "Zambian", "Zimbabwean"]>>
+<<set setup.baseNationalities = ["Afghan", "Albanian", "Algerian", "American", "Andorran", "Angolan", "Antiguan", "Argentinian", "Armenian", "Aruban", "Australian", "Austrian", "Azerbaijani", "Bahamian", "Bahraini", "Bangladeshi", "Barbadian", "Belarusian", "Belgian", "Belizean", "Beninese", "Bermudian", "Bhutanese", "Bissau-Guinean", "Bolivian", "Bosnian", "Brazilian", "British", "Bruneian", "Bulgarian", "Burkinabé", "Burmese", "Burundian", "Cambodian", "Cameroonian", "Canadian", "Cape Verdean", "Catalan", "Central African", "Chadian", "Chilean", "Chinese", "Colombian", "Comorian", "Congolese", "a Cook Islander", "Costa Rican", "Croatian", "Cuban", "Cypriot", "Czech", "Danish", "Djiboutian", "Dominican", "Dominiquais", "Dutch", "East Timorese", "Ecuadorian", "Egyptian", "Emirati", "Equatoguinean", "Eritrean", "Estonian", "Ethiopian", "Fijian", "Filipina", "Finnish", "French Guianan", "French Polynesian", "French", "Gabonese", "Gambian", "Georgian", "German", "Ghanan", "Greek", "Greenlandic", "Grenadian", "Guatemalan", "Guinean", "Guyanese", "Haitian", "Honduran", "Hungarian", "I-Kiribati", "Icelandic", "Indian", "Indonesian", "Iranian", "Iraqi", "Irish", "Israeli", "Italian", "Ivorian", "Jamaican", "Japanese", "Jordanian", "Kazakh", "Kenyan", "Kittitian", "Korean", "Kosovan", "Kurdish", "Kuwaiti", "Kyrgyz", "Laotian", "Latvian", "Lebanese", "Liberian", "Libyan", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Macedonian", "Malagasy", "Malawian", "Malaysian", "Maldivian", "Malian", "Maltese", "Marshallese", "Mauritanian", "Mauritian", "Mexican", "Micronesian", "Moldovan", "Monégasque", "Mongolian", "Montenegrin", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nauruan", "Nepalese", "a New Zealander", "Ni-Vanuatu", "Nicaraguan", "Nigerian", "Nigerien", "Niuean", "Norwegian", "Omani", "Pakistani", "Palauan", "Palestinian", "Panamanian", "Papua New Guinean", "Paraguayan", "Peruvian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Rwandan", "Sahrawi", "Saint Lucian", "Salvadoran", "Sammarinese", "Samoan", "São Toméan", "Saudi", "Scottish", "Senegalese", "Serbian", "Seychellois", "Sierra Leonean", "Singaporean", "Slovak", "Slovene", "a Solomon Islander", "Somali", "South African", "South Sudanese", "Spanish", "Sri Lankan", "Sudanese", "Surinamese", "Swazi", "Swedish", "Swiss", "Syrian", "Taiwanese", "Tajik", "Tanzanian", "Thai", "Tibetan", "Togolese", "Tongan", "Trinidadian", "Tunisian", "Turkish", "Turkmen", "Tuvaluan", "Ugandan", "Ukrainian", "Uruguayan", "Uzbek", "Vatican", "Venezuelan", "Vietnamese", "Vincentian", "Yemeni", "Zairian", "Zambian", "Zimbabwean"]>>
@@ -989,7 +989,7 @@
-<<set setup.chattelReligionistSlaveNames = ["Abundance", "Allegiance", "Amity", "Amnesty", "Ardour", "Beauty", "Belief", "Blessing", "Bliss", "Charisma", "Charity", "Charm", "Chastity", "Chastity", "Cheer", "Clarity", "Clemency", "Comfort", "Compassion", "Concord", "Condolence", "Constance", "Constancy", "Courage", "Credence", "Desire", "Destiny", "Discretion", "Empathy", "Endurance", "Esteem", "Eternity", "Evanescence", "Faith", "Favour", "Felicity", "Fidelity", "Fortune", "Gaiety", "Glory", "Grace", "Grace", "Gracious", "Gravitas", "Happiness", "Harmony", "Heaven", "Honesty", "Hope", "Hope", "Humility", "Innocent", "Integrity", "Joy", "Justice", "Kindness", "Laughter", "Love", "Loyalty", "Luck", "Mercy", "Merit", "Modesty", "Patience", "Peace", "Penance", "Perserverance", "Piety", "Pleasant", "Prosperity", "Prudence", "Prudence", "Purity", "Purity", "Radiance", "Remembrance", "Respect", "Reverence", "Salvation", "Sanctity", "Serendipity", "Serenity", "Silence", "Sincerity", "Solace", "Solemnity", "Success", "Sympathy", "Temperance", "Temperance", "Thankfulness", "Tolerance", "Tranquility", "Trinity", "Truth", "Unity", "Verity", "Virtue", "Wisdom", "Wonder"]>>
+<<set setup.chattelReligionistSlaveNames = ["Abundance", "Allegiance", "Amity", "Amnesty", "Ardour", "Beauty", "Belief", "Benevolence", "Blessing", "Bliss", "Care", "Charisma", "Charity", "Charm", "Chastity", "Cheer", "Clarity", "Clemency", "Comfort", "Compassion", "Concord", "Condolence", "Constance", "Constancy", "Courage", "Credence", "Desire", "Destiny", "Diligence", "Discretion", "Dutifulness", "Empathy", "Endurance", "Esteem", "Eternity", "Evanescence", "Faith", "Favour", "Felicity", "Fidelity", "Fortune", "Gaiety", "Glory", "Grace", "Gracious", "Gravitas", "Happiness", "Harmony", "Heaven", "Honesty", "Honor", "Hope", "Humanity", "Humility", "Innocent", "Integrity", "Joy", "Justice", "Kindness", "Laughter", "Love", "Loyalty", "Luck", "Mercy", "Merit", "Mindfulness", "Modesty", "Obedience", "Patience", "Peace", "Penance", "Perseverance", "Piety", "Pleasant", "Prosperity", "Prudence", "Purity", "Radiance", "Rectitude", "Remembrance", "Respect", "Reverence", "Salvation", "Sanctity", "Serendipity", "Serenity", "Silence", "Sincerity", "Solace", "Solemnity", "Success", "Sympathy", "Temperance", "Thankfulness", "Tolerance", "Tranquility", "Trinity", "Truth", "Unity", "Verity", "Virtue", "Wisdom", "Wonder"]>>
<<set setup.romanSlaveNames = ["Aconia", "Aelia", "Agricola", "Agrippa", "Agrippina", "Ahala", "Ahenobarba", "Alba", "Albina", "Ambusta", "Annalis", "Antistia", "Antonia", "Appia", "Aquila", "Aquilina", "Arria", "Arvina", "Asina", "Atella", "Atia", "Aula", "Aurela", "Avita", "Baebiana", "Balba", "Barba", "Barbata", "Bassa", "Bestia", "Bibacula", "Bibula", "Blaesa", "Broccha", "Bruta", "Bubulca", "Bulba", "Caeca", "Caecilia", "Caesonia", "Calida", "Calpurnia", "Calva", "Calvina", "Camilla", "Cana", "Canina", "Catilina", "Catula", "Celeris", "Celsa", "Cethega", "Cicurina", "Cincinnata", "Cinna", "Claudia", "Corda", "Cornelia", "Cornicen", "Cornuta", "Corva", "Corvina", "Cossa", "Costa", "Cotta", "Crassa", "Crassipes", "Crispa", "Crispina", "Crispina", "Curva", "Decima", "Dentata", "Dentra", "Diana", "Dives", "Dolabella", "Domitia", "Domitilla", "Drusa", "Drusilla", "Euphemia", "Eutropia", "Fabia", "Faustina", "Figula", "Fimbria", "Flacca", "Flava", "Flavia", "Flora", "Fusa", "Gaia", "Galeria", "Galla", "Gemella", "Gnaea", "Gnaea", "Graccha", "Gratidia", "Gurges", "Habita", "Helena", "Helva", "Helvia", "Herennia", "Honoria", "Hostia", "Imperiosa", "Iulla", "Julia", "Junia", "Justina", "Lactuca", "Laenas", "Laevina", "Lanata", "Laterensis", "Lentula", "Leontia", "Lepida", "Lepida", "Licina", "Licinia", "Livia", "Livilla", "Lollia", "Longa", "Lucia", "Lucilla", "Luculla", "Lupa", "Macra", "Macula", "Maecia", "Magia", "Malleola", "Mamerca", "Mania", "Manlia", "Marca", "Marcella", "Marcella", "Marcia", "Mellisa", "Merenda", "Merga", "Merula", "Messalina", "Messalla", "Metella", "Metella", "Minervina", "Munatia", "Murena", "Mus", "Musca", "Nasica", "Natta", "Nepos", "Nerva", "Nigra", "Novella", "Numeria", "Ocella", "Ocellina", "Octavia", "Orbiana", "Otacilia", "Paccia", "Pacila", "Paeta", "Pansa", "Papa", "Papianilla", "Patercula", "Paulina", "Paulla", "Pera", "Pictrix", "Placiaida", "Planca", "Plauta", "Plautia", "Plautilla", "Plotina", "Pompeia", "Popilla", "Poplicola", "Poppaea", "Porcia", "Postuma", "Potita", "Praeconina", "Praetextata", "Prisca", "Procula", "Publia", "Publicola", "Pulcheria", "Pulchra", "Pulla", "Pulvilla", "Quadrata", "Quinta", "Ralla", "Regilla", "Regula", "Risca", "Rufa", "Ruga", "Rulla", "Rutila", "Sabina", "Salinatrix", "Salonina", "Saturnina", "Scaeva", "Scaevola", "Scapula", "Scaura", "Scrofa", "Sempronia", "Seneca", "Servia", "Servilia", "Severa", "Severa", "Sexta", "Sila", "Silana", "Spuria", "Statilia", "Structa", "Sulla", "Sulpicia", "Sura", "Taura", "Terentia", "Theodora", "Tiberia", "Tita", "Titania", "Tranquillina", "Triaria", "Trigemina", "Tuberta", "Tubula", "Tuditana", "Tulla", "Tullia", "Turda", "Ulpia", "Urgulania", "Valeria", "Vara", "Vatia", "Verina", "Verres", "Vesta", "Vetus", "Vibia", "Vibia", "Violentilla", "Vipsania", "Vistilla", "Vitula", "Volusa"]>>
<<set setup.romanSlaveSurnames = ["Acilia", "Aebutia", "Aelia", "Aemilia", "Anicia", "Annia", "Antistia", "Antonia", "Appuleia", "Aquillia", "Ateia", "Atilia", "Atinia", "Attia", "Aufidia", "Aurelia", "Baebia", "Caecilia", "Caedicia", "Caelia", "Calpurnia", "Caninia", "Canuleia", "Carvilia", "Cassia", "Claudia", "Clodia", "Cloelia", "Cluvia", "Coelia", "Considia", "Cornelia", "Cosconia", "Curia", "Curiatia", "Curtia", "Decia", "Decimia", "Didia", "Domitia", "Duillia", "Egnatia", "Fabia", "Fabricia", "Fannia", "Flaminia", "Flavia", "Fonteia", "Fulvia", "Fundania", "Furia", "Gabinia", "Gegania", "Genucia", "Herennia", "Horatia", "Hortensia", "Hostilia", "Icilia", "Julia", "Junia", "Juventia", "Laelia", "Laetoria", "Licinia", "Livia", "Lollia", "Lucilia", "Lucretia", "Lutatia", "Maenia", "Mallia", "Mamilia", "Manilia", "Manlia", "Marcia", "Maria", "Matiena", "Memmia", "Menenia", "Minucia", "Mucia", "Mummia", "Munatia", "Naevia", "Nautia", "Nonia", "Octavia", "Ogulnia", "Opimia", "Oppia", "Otacilia", "Papia", "Papiria", "Peducaea", "Perperna", "Petellia", "Pinaria", "Plaetoria", "Plautia", "Plotia", "Poetelia", "Pompeia", "Pomponia", "Popillia", "Porcia", "Postumia", "Publicia", "Publilia", "Pupia", "Quinctia", "Quinctilia", "Quintia", "Roscia", "Rubria", "Rutilia", "Scribonia", "Sempronia", "Sergia", "Servilia", "Sestia", "Sextia", "Sextilia", "Sicinia", "Silia", "Sulpicia", "Terentia", "Titia", "Titinia", "Trebonia", "Tremellia", "Tullia", "Valeria", "Verginia", "Veturia", "Vibia", "Villia", "Voconia", "Volcatia", "Volumnia"]>>
@@ -1012,9 +1012,9 @@ Name pool selector based on nationality and race. Use as follows, given some sla
Then pick _namePool.random(), or display those names as possible choices, or do whatever else you do with name pools.
*/
<<set setup.namePoolSelector = {
- "Afghan": setup.afghanSlaveNames,
- "Albanian": setup.albanianSlaveNames,
- "Algerian": setup.algerianSlaveNames,
+ "Afghan": setup.afghanSlaveNames,
+ "Albanian": setup.albanianSlaveNames,
+ "Algerian": setup.algerianSlaveNames,
"Andorran": setup.andorranSlaveNames,
"Angolan": setup.angolanSlaveNames,
"Antiguan": setup.antiguanSlaveNames,
@@ -1482,11 +1482,11 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.ArcologyNamesChineseRevivalist = ["Feng Huang", "Fusang", "Huangquan", "Huokang", "Jin Shan", "Jiuquan", "Mingfu", "Qi Lin", "The Forbidden Palace", "The Middle Kingdom", "Xin Hua", "Yinfu", "Youdu", "Youming"]>>
/* pregmod FS */
-<<set setup.ArcologyNamesEugenics = ["Perfection", "Ascension", "Second Chance"]>>
-<<set setup.ArcologyNamesRepopulationist = ["Hope", "The Womb", "Holders of the Future", "Future", "Haven of the Pregnant", "Sacred Womb", "Glorious Mother"]>>
-<<set setup.ArcologyNamesHedonisticDecadence = ["Sloth", "Gluttony", "New Wisconsin", "Indulgence", "Stuffedtopia", "Plumpland", "Decadence", "All You Can Eat"]>>
-<<set setup.ArcologyNamesCummunism = ["Cumstantine", "Mother Cumtry", "Crusty Cummies", "Cummunist Russwhore", "Jizzington upon Wank", "Arscrotzka", "Free Slave Central", "Da Cumrade", "Cumstantinople"]>>
-<<set setup.ArcologyNamesIncestFetishist = ["Oedipal City", "Oeditropolis", "Sib City", "Incestral Home", "Family Fortunes", "Familial Embrace", "Pure Blood"]>>
+<<set setup.ArcologyNamesEugenics = ["Ascension", "Perfection", "Second Chance"]>>
+<<set setup.ArcologyNamesRepopulationist = ["Future", "Glorious Mother", "Haven of the Pregnant", "Holders of the Future", "Hope", "Sacred Womb", "The Womb"]>>
+<<set setup.ArcologyNamesHedonisticDecadence = ["All You Can Eat", "Decadence", "Gluttony", "Indulgence", "New Wisconsin", "Plumpland", "Sloth", "Stuffedtopia"]>>
+<<set setup.ArcologyNamesCummunism = ["Arscrotzka", "Crusty Cummies", "Cummunist Russwhore", "Cumstantine", "Cumstantinople", "Da Cumrade", "Free Slave Central", "Jizzington upon Wank", "Mother Cumtry"]>>
+<<set setup.ArcologyNamesIncestFetishist = ["Familial Embrace", "Family Fortunes", "Incestral Home", "Oedipal City", "Oeditropolis", "Pure Blood", "Sib City"]>>
<<set setup.badWords = ["ass", "bitch", "boob", "butt", "cock", "cum", "cunny", "cunt", "dick", "fuck", "junk", "piss", "pussy", "shit", "slave", "slut", "trash", "whore"]>>
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 3aa63c5df81ddaacdc6c79ad1dc4583ef1121c5d..c89035b3ab3dbe1bd53cf4d04a55ac339ad48509 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -208,9 +208,9 @@ window.isRivalP = function isRivalP(slave, target) {
}
window.supremeRaceP = function supremeRaceP(slave) {
- return SugarCube.State.variables.arcologies[0].FSSupremacistRace === slave.race
+ return State.variables.arcologies[0].FSSupremacistRace === slave.race
}
window.inferiorRaceP = function inferiorRaceP(slave) {
- return SugarCube.State.variables.arcologies[0].FSSubjugationistRace === slave.race
+ return State.variables.arcologies[0].FSSubjugationistRace === slave.race
}
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 6d29f4404b67c8a6a58e12e81e9571fec5a6d59c..cae3d56e2bcdde5c720e4615edc654978ced35cd 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -97,8 +97,8 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 400) {
- ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3]);
+ if(actor.hormoneBalance >= 200) {
+ ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
if(actor.diet == "fertility") {
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index 49b6946098011cd98ebbfaa25791ca2282702cad..67132c9b9aaa8c806a71ec0adbd39485c4e0f60d 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -35,15 +35,29 @@
<</if>>
<<if _one == _other >>
- /* two sisters / brothers: idenfy by age - no support for twins */
- <<if $sissy.actualAge > $activeSlave.actualAge >>
- <<set _one = "older "+_one >>
- <<set _other = "younger "+_other >>
- <<else>>
+/* two sisters / brothers: identify by age */
+ <<if $sissy.actualAge > $activeSlave.actualAge>>
+ <<set _onelong = "older "+_one >>
+ <<set _otherlong = "younger "+_other >>
+ <<elseif $sissy.actualAge < $activeSlave.actualAge>>
/* Note: this is never true (at least without extended family mode) */
- <<set _one = "younger "+_one >>
- <<set _other = "older "+_other >>
+ <<set _onelong = "younger "+_one >>
+ <<set _otherlong = "older "+_other >>
+ <<else>> /* twins, no real differentiation */
+ <<if $sissy.vagina == -1 >>
+ <<set _onelong = _one + " brother">>
+ <<else>>
+ <<set _onelong = _one + " sister">>
+ <</if>>
+ <<if $activeSlave.vagina == -1 >>
+ <<set _otherlong = _other + " brother" >>
+ <<else>>
+ <<set _otherlong = _other + " sister" >>
+ <</if>>
<</if>>
+<<else>>
+ <<set _onelong = _one>>
+ <<set _otherlong = _other>>
<</if>>
/* prepare some text passages based on options */
@@ -82,16 +96,16 @@ _othershe / _otherher <br/>
<span id="result">
<<link "Order them to demonstrate their love for each other">>
<<replace "#result">>
-Now that you own them, you want to see proof of their love for each other. You order them to perform mutual oral sex in front of you.
-Hesitantly they assume 69 position on your couch. They either never did this in front of a stranger or never had sex this way before. You remind them that they are sex slaves now. They need to follow all orders, especially sexual ones, so this is a comparatively gentle start.
+Now that you own them, you want to see proof of their love for each other. You order the <<if _one == "twin">>twins<<elseif _one == _other && _one == "brother">>brothers<<elseif _one == _other && _one == "sister">>sisters<<else>>_one and _other<</if>> to perform mutual oral sex in front of you.
+Hesitantly, they assume 69 position on your couch. They either never did this in front of a stranger or never had sex this way before. You remind them that they are sex slaves now. They need to follow all orders, especially sexual ones, so this is a comparatively gentle start.
<br/><br/>
-The _one shows more boldness as _oneshe lowers _oneher head towards _oneher _other's privates.
+<<if _one == "twin">>One _one<<else>>The _onelong<</if>> shows more boldness as _oneshe lowers _oneher head towards _oneher _otherlong's privates.
<<if $activeSlave.dick == 0 >>
-Carefully, _oneshe spreads _oneher _other's labia. Then _oneshe continues to give _oneher _other's exposed pussy a few experimental licks. At first, _oneher efforts seem to be futile, but after a while the _other's clit becomes engorged and _otherher juices start flowing.
+Carefully, _oneshe spreads _oneher _other's labia. Then _oneshe continues to give _oneher _other's exposed pussy a few experimental licks. At first, _oneher efforts seem to be futile, but after a while the _otherlong's clit becomes engorged and _otherher juices start flowing.
<<else>>
-Uncertain, _oneshe grabs _oneher _other's penis. Then _oneshe puts _oneher _other's flaccid member into _oneher mouth and gives it an experimental sucke. At first, _oneher efforts seem to be futile, but after a while the _other sports a nice, hard erection.
+Uncertain, _oneshe grabs _oneher <<if _other == "twin">>_other<<else>>_otherlong<</if>>'s penis. Then _oneshe puts _oneher _other's flaccid member into _oneher mouth and gives it an experimental sucke. At first, _oneher efforts seem to be futile, but after a while the _otherlong sports a nice, hard erection.
<</if>>
-As the _other's arousal grows, _othershe becomes more eager to please _otherher _one, too. Going down on _otherher's lover's genitals, _othershe starts to mimic _otherher ministrations.
+As the _other's arousal grows, _othershe becomes more eager to please _otherher _onelong, too. Going down on _otherher's lover's genitals, _othershe starts to mimic _otherher ministrations.
<<if ($sissy.dick == 0) != ($activeSlave.dick == 0) >>
Of course, _othershe has to adapt _otherher actions <<if $sissy.dick == 0 >>from the feelings on _otherher dick to the pussy pressed against _otherher lips.<<else>>from the feelings at _otherher pussy to the dick in _otherher mouth.<</if>>
<</if>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 79fa6735cb47481436242d761234127a08981845..655059df7cccaff801c5167ae5790ed5e44d617b 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -169,6 +169,7 @@
<<set $args[0].bellyFluid = $args[1].bellyFluid>>
<<set $args[0].readyOva = $args[1].readyOva>>
<<set $args[0].womb = $args[1].womb>> /* this is array assigned by reference, if slave body that is $args[1] will be stil used anywhere in code (not discarded) - it's WRONG (they now technicaly share one womb object). Please tell me about it then. But if old body $args[1] just discarded - it's no problem then.*/
+<<set $args[0].laborCount = $args[1].laborCount>>
<<set $args[0].canRecruit = 0>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 1117289abcb3f3706778c973466a75894a351d39..95e0e7d70d4114b5be45e8cb59f975f75c3257e7 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -194,6 +194,9 @@
<<if ndef $args[0].broodmotherCountDown>>
<<set $args[0].broodmotherCountDown = 0>>
<</if>>
+<<if ndef $args[0].laborCount>>
+ <<set $args[0].laborCount = $args[0].birthsTotal>>
+<</if>>
<<if ndef $args[0].pregKnown>>
<<if $args[0].preg > 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index be0f132fada4743fa20c885a2ce3891d95fdc415..514972b3890d5460aaeea36dbea7ac07fb17caad 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6114,7 +6114,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<set $activeSlave.trust += 4>>
<<AnalVCheck>>
<</replace>>
-<</link>>
+<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave))>> //This option will take anal virginity//<</if>>
<br><<link "Pound that ass">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -6172,7 +6172,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<set $activeSlave.devotion += 4>>
<<AnalVCheck>>
<</replace>>
-<</link>>
+<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave))>> //This option will take anal virginity//<</if>>
<</if>>
<<if canDoVaginal($activeSlave)>>
<br><<link "Pound that pussy">>
@@ -6230,7 +6230,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<set $activeSlave.devotion += 4>>
<<VaginalVCheck>>
<</replace>>
-<</link>>
+<</link>><<if ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>>
<</if>>
<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave)>>
<br><<link "Invite her 'in'">>
@@ -18124,12 +18124,18 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, 1)>>
<<set $activeSlave.fetish = "pregnancy", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 5>>
<<if $activeSlave.mpreg == 1>>
- <<AnalVCheck 10>>
+ <<set $activeSlave.analCount += 10, $analTotal += 10>>
+ <<if $activeSlave.anus == 0>>
+ <<set $activeSlave.anus++>>
+ <</if>>
<<else>>
- <<VaginalVCheck 10>>
+ <<set $activeSlave.vaginalCount += 10, $vaginalTotal += 10>>
+ <<if $activeSlave.vagina == 0>>
+ <<set $activeSlave.vagina++>>
+ <</if>>
<</if>>
<</replace>>
-<</link>> //This option will render $activeSlave.slaveName pregnant//
+<</link>> //This option will render $activeSlave.slaveName pregnant//<<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> // and take her virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //and take her anal virginity//<</if>>
<</if>>
<<case "old PC age difference">>
@@ -18137,7 +18143,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<link "Gently acclimate her to the age difference with some lovemaking">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- As you cross the breadth of your office to reach $activeSlave.slaveName, she presents herself for your sexual usage out of habit. However, you take her by surprise by drawing her into you arms, running the tips of your fingers through her $activeSlave.hColor hair, and looking into her $activeSlave.eyeColor eyes. <<if canSee($activeSlave)>>She meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years her senior you are<<else>>She seems to feel the intensity of your gaze despite her sightless eyes and blushes girlishly, as if forgetting how many years her senior you are<</if>> . In lieu of words, you lift her chin with a single beckoning finger and steal her breath from her lips with a firm kiss. Once she's recovered her wits she clings to you with almost animalistic attachment. After a few moments she moves to get down on her knees, clearly defaulting to her role as a sex slave in response to your unexpected intimacy.
+ As you cross the breadth of your office to reach $activeSlave.slaveName, she presents herself for your sexual usage out of habit. However, you take her by surprise by drawing her into you arms, running the tips of your fingers through her $activeSlave.hColor hair, and looking into her $activeSlave.eyeColor eyes. <<if canSee($activeSlave)>>She meets your gaze for a brief moment before blushing girlishly, as if forgetting how many years her senior you are<<else>>She seems to feel the intensity of your gaze despite her sightless eyes and blushes girlishly, as if forgetting how many years her senior you are<</if>> . In lieu of words, you lift her chin with a single beckoning finger and steal her breath from her lips with a firm kiss. Once she's recovered her wits she clings to you with almost animalistic attachment. After a few moments she moves to get down on her knees, clearly defaulting to her role as a sex slave in response to your unexpected intimacy.
Instead, you
<<if $activeSlave.belly >= 300000>>
help her to her feet and guide her to bed, aiding the
@@ -18270,12 +18276,18 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, 1)>>
<<set $activeSlave.fetish = "pregnancy", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 5>>
<<if $activeSlave.mpreg == 1>>
- <<AnalVCheck 10>>
+ <<set $activeSlave.analCount += 10, $analTotal += 10>>
+ <<if $activeSlave.anus == 0>>
+ <<set $activeSlave.anus++>>
+ <</if>>
<<else>>
- <<VaginalVCheck 10>>
+ <<set $activeSlave.vaginalCount += 10, $vaginalTotal += 10>>
+ <<if $activeSlave.vagina == 0>>
+ <<set $activeSlave.vagina++>>
+ <</if>>
<</if>>
<</replace>>
-<</link>> //This option will render $activeSlave.slaveName pregnant//
+<</link>> //This option will render $activeSlave.slaveName pregnant//<<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> // and take her virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //and take her anal virginity//<</if>>
<</if>>
<<case "devoted educated slave">>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index d6b59798edbb9b0a19a69b1f6500efb94640f021..2c102f263c45cd1bf948904700ee45562320c9c6 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -146,7 +146,7 @@ $brothelNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
-<br>It can support $brothel whores. Currently $brothelSlaves whore<<if $brothelSlaves == 1>>s<</if>> at $brothelNameCaps.
+<br>It can support $brothel whores. Currently there <<if $brothelSlaves == 1>>is<<else>>are<</if>> $brothelSlaves whore<<if $brothelSlaves != 1>>s<</if>> at $brothelNameCaps.
[[Expand the brothel|Brothel][$cash -= _Tmult0, $brothel += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<br>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index cf5c33eb47300532dbf88d52a341aa25941a0531..672ec9aa6dd7e585d2bd82664e7f616dbdd9af4f 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -71,7 +71,7 @@ $clinicNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
-<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slaves are reciving treatement.
+<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slave<<if $clinicSlaves == 1>> is<<else>>s are<</if>> reciving treatement.
[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index f814e838123ef9ffc78765ee8f011a08f156a9c9..e87656ad13f8974545168634bb84390253cc9330 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -307,7 +307,7 @@ $dairyNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
-<br>$dairyNameCaps can support $dairy milkers. There are currently $dairySlaves cow<<if $dairySlaves != 1>>s<</if>>. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<br>$dairyNameCaps can support $dairy milkers. There <<if $dairySlaves == 1>>is<<else>>are<</if>> currently $dairySlaves cow<<if $dairySlaves != 1>>s<</if>>. [[Expand the dairy|Dairy][$cash -= _Tmult0, $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
<br>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index b059e9403fedb7a49d7cd91ee84202a001d4e653..269403b85774b26c7d407fcc544a4769caad889e 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -294,7 +294,7 @@ $masterSuiteNameCaps is furnished
<</if>>
-<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There are currently $masterSuiteSlaves slave<<if $masterSuiteSlaves != 1>>s<</if>> in $masterSuiteNameCaps.
+<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There <<if $masterSuiteSlaves == 1>>is<<else>>are<</if>> currently $masterSuiteSlaves slave<<if $masterSuiteSlaves != 1>>s<</if>> in $masterSuiteNameCaps.
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<<if $Concubine == 0 && $masterSuiteSlaves == 0>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 2c4000860e915c40650a7857258f1fe330b6b99a..3e4fdcb9d39cceb24d7be344db63e5b635fa7426 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -649,7 +649,7 @@ You turn to the child clutching her mother's grotesque belly.
<<AddSlave $activeSlave>>
<<switch $RecETSevent>>
- <<case "incest mother son" "incest father daughter" "incest brother sister" "incest sister sister" "incest brother brother" "incest mother daughter" "incest father son">>
+ <<case "incest mother son" "incest father daughter" "incest brother sister" "incest sister sister" "incest brother brother" "incest mother daughter" "incest father son" "incest twin sister" "incest twins mixed" "incest twin brother">>
<<include "newSlaveIncestSex">>
<<default>>
/* do nothing */
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index d7bfe03b65f34a215459a01978a172a9492cb799..0343ba8e9c93d9256f8d4e62bab787a6dcddfe71 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -71,7 +71,7 @@ $spaNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-<br>$spaNameCaps can house $spa slaves while they recuperate here. Curretly $spaSlaves <<if $spaSlaves == 1>>is<<else>>are<</if>> recuperating.
+<br>$spaNameCaps can house $spa slaves while they recuperate here. Currently $spaSlaves <<if $spaSlaves == 1>>is<<else>>are<</if>> recuperating.
[[Expand the spa|Spa][$cash -= _Tmult0, $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
<br>