diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 98e7c10df6a14f87ca524515a19007b57eeda6e4..3c990ca0ac703885fd07e07c9f31a2b7d280d0d8 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -344,4 +344,6 @@ UtilJS [script]
ordinalSuffix(i) - takes a value as an input and then appends the appropriate suffix. e.g.$Day === 1 "today is the <<print ordinalSuffix($Day)>> of the month"
would print "today is the 1st of the month"
- removeDuplicates() - Takes an array and returns a new array without duplicate entries
\ No newline at end of file
+ removeDuplicates() - Takes an array and returns a new array without duplicate entries
+
+ HSM() - outputs a value based off of the PC's hacking skill.
\ No newline at end of file
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 18ee3665cab71e3f781896070b8e24b3a07080f7..0e74c4bd45ab5e664f358282b40a2d8bcd17dfe8 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@ Pregmod
0.10.7.1-2.1.x
+02/06/2019
+
+ 5
+ -fixes
+ -nox/deepmurk vector art now reflects basic height
+
02/04/2019
4
diff --git a/devTools/sugarcube.d.ts b/devTools/sugarcube.d.ts
index e24730b925d5e1512cd86b7d6cba86169c7ed0c5..644ea40581dde3220c8516d4e4653c353bdfd9a8 100644
--- a/devTools/sugarcube.d.ts
+++ b/devTools/sugarcube.d.ts
@@ -1310,6 +1310,7 @@ declare namespace SugarCubeLib {
declare interface ISugarCube {
Config: Config;
Macro: Macro;
+ Save: Save;
State: State;
Story: Story;
/**
diff --git a/src/002-config/fc-js-init.js b/src/002-config/fc-js-init.js
index ec07dba98be3edcd26bfbcce88e9f63aeb14728a..3966b6a6838ea330e47c7d820179af8e68340f75 100644
--- a/src/002-config/fc-js-init.js
+++ b/src/002-config/fc-js-init.js
@@ -5,6 +5,7 @@
*/
window.App = { };
// the same declaration for code parsers that don't line the line above
-var App = App || {};
+var App = window.App || {};
+App.Debug = {};
App.Entity = {};
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index be593a973cacd16d11330ea703ef6e0744e125a4..65fa49c2d45f9b2616604938ba6bb90ac2cc61ce 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -131,90 +131,90 @@
<<if $attackType == "raiders">>
<<set $attackTroops = random(40,80)>>
<<if $week < 30>>
- <<set $attackTroops *= random(1,2)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(.15+($week/203))), (2*(1+($week/149))) ))>>
<<elseif $week < 60>>
- <<set $attackTroops *= random(1,3)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(1.25+($week/135))), (3*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackTroops *= random(2,3)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.35+($week/90))), (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackTroops *= random(2,4)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.5+($week/60))), (4*(3+($week/45))) ))>>
<<else>>
- <<set $attackTroops *= random(3,5)>>
+ <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))), (5*(4+($week/30))) ))>>
<</if>>
<<if $week < 60>>
- <<set $attackEquip = random(0,1)>>
+ <<set $attackEquip = Math.ceil(random( (0, (1*(4+($week/99))>>
<<elseif $week < 90>>
- <<set $attackEquip = random(0,2)>>
+ <<set $attackEquip = Math.ceil(random( (0, (2*(4+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackEquip = random(0,3)>>
+ <<set $attackEquip = Math.ceil(random( (0, (3*(3+($week/45))) ))>>
<<else>>
- <<set $attackEquip = random(1,3)>>
+ <<set $attackEquip = Math.ceil(random( (1*(2+($week/40))), (3*(4+($week/30))) ))>>
<</if>>
<<elseif $attackType == "free city">>
<<set $attackTroops = random(20,40)>>
<<if $week < 30>>
- <<set $attackTroops *= random(1,2)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(.15+($week/203))), (2*(1+($week/149))) ))>>
<<elseif $week < 60>>
- <<set $attackTroops *= random(1,3)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(1.25+($week/135))), (3*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackTroops *= random(2,3)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.35+($week/90))), (3*(2+($week/66)))) )>>
<<elseif $week < 120>>
- <<set $attackTroops *= random(2,4)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.5+($week/60))), (4*(3+($week/45)))) )>>
<<else>>
- <<set $attackTroops *= random(3,5)>>
+ <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))), (5*(4+($week/30))) ))>>
<</if>>
<<if $week < 60>>
- <<set $attackEquip = random(0,1)>>
+ <<set $attackEquip = Math.ceil(random( (0, (1*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackEquip = random(0,3)>>
+ <<set $attackEquip = Math.ceil(random( (0, (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackEquip = random(1,3)>>
+ <<set $attackEquip = Math.ceil(random( (1*(1+($week/60))), (3*(3+($week/45))) ))>>
<<else>>
- <<set $attackEquip = random(2,4)>>
+ <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))), (4*(4+($week/30))) ))>>
<</if>>
<<elseif $attackType == "old world">>
<<set $attackTroops = random(25,50)>>
<<if $week < 30>>
- <<set $attackTroops *= random(1,2)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(.15+($week/203))), (2*(1+($week/149))) ))>>
<<elseif $week < 60>>
- <<set $attackTroops *= random(1,3)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(1.25+($week/135))), (3*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackTroops *= random(2,3)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.35+($week/90))), (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackTroops *= random(2,4)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.5+($week/60))), (4*(3+($week/45))) ))>>
<<else>>
- <<set $attackTroops *= random(3,5)>>
+ <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))), (5*(4+($week/30))) ))>>
<</if>>
<<if $week < 60>>
- <<set $attackEquip = random(0,1)>>
+ <<set $attackEquip = Math.ceil(random( (0, (1*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackEquip = random(0,3)>>
+ <<set $attackEquip = Math.ceil(random( (0, (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackEquip = random(1,3)>>
+ <<set $attackEquip = Math.ceil(random( (1,3*(3+($week/45))) ))>>
<<else>>
- <<set $attackEquip = random(2,4)>>
+ <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))), (4*(4+($week/30))) ))>>
<</if>>
<<elseif $attackType == "freedom fighters">>
<<set $attackTroops = random(30,60)>>
<<if $week < 30>>
- <<set $attackTroops *= random(1,2)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(.15+($week/203))), (2*(1+($week/149))) ))>>
<<elseif $week < 60>>
- <<set $attackTroops *= random(1,3)>>
+ <<set $attackTroops *= Math.ceil(random( (1*(1.25+($week/135))), (3*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackTroops *= random(2,3)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.35+($week/90))), (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackTroops *= random(2,4)>>
+ <<set $attackTroops *= Math.ceil(random( (2*(1.5+($week/60))), (4*(3+($week/45))) ))>>
<<else>>
- <<set $attackTroops *= random(3,5)>>
+ <<set $attackTroops *= Math.ceil(random( (3*(2+($week/40))), (5*(4+($week/30))) ))>>
<</if>>
<<if $week < 60>>
- <<set $attackEquip = random(0,1)>>
+ <<set $attackEquip = Math.ceil(random( (0, (1*(1.5+($week/99))) ))>>
<<elseif $week < 90>>
- <<set $attackEquip = random(0,3)>>
+ <<set $attackEquip = Math.ceil(random( (0, (3*(2+($week/66))) ))>>
<<elseif $week < 120>>
- <<set $attackEquip = random(1,3)>>
+ <<set $attackEquip = Math.ceil(random( (1*(1+($week/60))), (3*(3+($week/45))) ))>>
<<else>>
- <<set $attackEquip = random(2,4)>>
+ <<set $attackEquip = Math.ceil(random( (2*(2+($week/40))), (4*(4+($week/30))) ))>>
<</if>>
<</if>>
<<set $estimatedMen = Math.round($attackTroops * (1 + either(-1,1) * (random(3,4) - $recon) * 0.1))>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 7fef4f15e5f97037ea0e1b29ab24ccf122db7c6a..66255ca0f8c10134ed103d4e6c099426b5d6a944 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -235,15 +235,15 @@
<<set _weekMod = 0.50>>
<<if $week <= 30>>
- <<set _weekMod = 0.75>>
+ <<set _weekMod = 0.75 * Math.round(1+$week/10)>>
<<elseif $week <= 60>>
- <<set _weekMod = 1>>
+ <<set _weekMod = 1 * Math.round(1+$week/10)>>
<<elseif $week <= 90>>
- <<set _weekMod = 1.25>>
+ <<set _weekMod = 1.25 * Math.round(1+$week/10)>>
<<elseif $week <= 120>>
- <<set _weekMod = 1.50>>
+ <<set _weekMod = 1.50 * Math.round(1+$week/10)>>
<<else>>
- <<set _weekMod = 1.75>>
+ <<set _weekMod = 1.75 * Math.round(1+$week/10)>>
<</if>>
/* resetting ID list */
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index fb3230c27ba8515cc145178f6f9c0b844e77ba98..62e03082e5d10bb2642a73e572a3e844e04d83fb 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -118,7 +118,7 @@
<br><<link "Dissolve the units">>
<<removeUnits _slaveRebelledID>>
<<set $menials += _slaveManpower>>
- <<for _i = 0; _i < $militiaUnits.length; _i++>>
+ <<for _i = 0; _i < $slaveUnits.length; _i++>>
<<if $slaveUnits[_i].active == 1>>
<<set $slaveUnits[_i].loyalty = Math.clamp($slaveUnits[_i].loyalty - random(10,40),0,100)>>
<</if>>
@@ -171,7 +171,7 @@
<br><<link "Dissolve the units">>
<<removeUnits _mercRebelledID>>
<<set $mercFreeManpower += _mercManpower>>
- <<for _i = 0; _i < $militiaUnits.length; _i++>>
+ <<for _i = 0; _i < $mercUnits.length; _i++>>
<<if $mercUnits[_i].active == 1>>
<<set $mercUnits[_i].loyalty = Math.clamp($mercUnits[_i].loyalty - random(10,40),0,100)>>
<</if>>
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 9e1ab3ce9604c23b82200c5697d04932832ff575..21c8c2a6d9b30389dad887aeca7793a2f044ed42 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -20,12 +20,12 @@ window.SFCR = function() {
};
window.TroopDec = function() {
- const V=State.variables, commom="the ${commaNum(V.SF.Squad.Troops)} members of ${V.SF.Lower}", S=V.SF.Squad;
- if (S.Troops < 100) {return `sparsely occupied, ${commom} residing within them concentrating together in a corner. The hundreds of empty beds and lockers visibly herald the future`;}
- else if (S.Troops < 400) {return `lightly occupied, with ${commom} starting to spread out across them`;}
- else if (S.Troops < 800) {return `moderately occupied, though ${commom} residing within have a considerable amount of extra room`;}
- else if (S.Troops < 1500) {return `well-occupied, and ${commom} residing within have started to form small cliques based on section and row`;}
- else {return `near capacity, and ${commom} often barter their personal loot, whether it be monetary or human, for the choicest bunks`;}
+ const V=State.variables, common=`the ${commaNum(V.SF.Squad.Troops)} members of ${V.SF.Lower}`, S=V.SF.Squad;
+ if (S.Troops < 100) {return `sparsely occupied, ${common} residing within them concentrating together in a corner. The hundreds of empty beds and lockers visibly herald the future`;}
+ else if (S.Troops < 400) {return `lightly occupied, with ${common} starting to spread out across them`;}
+ else if (S.Troops < 800) {return `moderately occupied, though ${common} residing within have a considerable amount of extra room`;}
+ else if (S.Troops < 1500) {return `well-occupied, and ${common} residing within have started to form small cliques based on section and row`;}
+ else {return `near capacity, and ${common} often barter their personal loot, whether it be monetary or human, for the choicest bunks`;}
};
window.SFUpgradeCost = function(cost,unit) {
@@ -36,23 +36,6 @@ window.SFUpgradeCost = function(cost,unit) {
return Math.ceil(value);
};
-window.HSM = function() {
- switch(State.variables.PC.hacking) {
- case '<= -100': return `1.5`;
- case '<= -75': return `1.35`;
- case '<= -50': return `1.25`;
- case '<= -25': return `1.15`;
- case '< 0': return `1.10`;
- case '=== 0': return `1`;
- case '<= 10': return `.97`;
- case '<= 25': return `.95`;
- case '<= 50': return `.90`;
- case '<= 75': return `.85`;
- case '<= 100': return `.80`;
- case '> 100': return `.75`;
- }
-};
-
window.Count = function() {
const V=State.variables, T=State.temporary, C=Math.clamp, S=V.SF.Squad, E=V.economy;
T.SFF=V.SF.Facility.Active;
@@ -460,7 +443,7 @@ window.MercCon = function() {
};
window.Facility = function() {
const V=State.variables;
- V.SF.Facility={Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ V.SF.Facility={Toggle:V.SF.Facility.Toggle, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
window.SFInit = function() {
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index 92acbee0134e55306108388c403ae794030e6d0d..1941d31f79db460ca9bf16e9415f148315bf5620 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -75,11 +75,11 @@
pastoralist shop, helping the Colonel select a more comfortable breast pump.
<<else>>shop that catches the Colonel's eye. <</if>>
<<if $PC.slaving >= 100 && $PC.career == "slaver">>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ Your mastery and extensive history of slaving allows you to assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
<<if $arcologies[0].prosperity < $AProsperityCap>>
<<set $arcologies[0].prosperity++>> <</if>>
<<elseif $PC.slaving >= 100>>
- Your mastery and extensive history of slaving allows you assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
+ Your mastery and extensive history of slaving allows you to assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers.
<<if $arcologies[0].prosperity < $AProsperityCap>>
<<set $arcologies[0].prosperity++>> <</if>>
<<elseif $PC.slaving >= 60>>
diff --git a/src/debugging/debugJS.js b/src/debugging/debugJS.js
index 7f1a9650c8aa8a80997420bc6d522bd6068ad8c4..5e94aaa4a4461bcd9317eedf485eac465eb606ad 100644
--- a/src/debugging/debugJS.js
+++ b/src/debugging/debugJS.js
@@ -80,3 +80,34 @@ window.findNaN = function findNan() {
}
return result;
};
+
+/**
+ * Dumps game save as a readable JSON to the browser for saving in a file
+ */
+App.Debug.dumpGameState = function () {
+ // helper to download a blob
+ // borrowed from stackexchange
+ function downloadToFile(content, fileName, contentType) {
+ var a = document.createElement("a");
+ var file = new Blob([content], {
+ type: contentType
+ });
+ a.href = URL.createObjectURL(file);
+ a.download = fileName;
+ a.click();
+ }
+
+ // we will replace SugarCube onSave handler
+ let oldHandler = SugarCube.Config.saves.onSave;
+ try {
+ SugarCube.Config.saves.onSave = function (save) {
+ if (oldHandler) {
+ oldHandler(save);
+ }
+ downloadToFile(JSON.stringify(save, null, 2), save.id + ".json", "text/plain");
+ }
+ SugarCube.Save.serialize();
+ } finally {
+ SugarCube.Config.saves.onSave = oldHandler;
+ }
+};
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d09e90e711fb822a3c5fcd005620f9115fbdb960..41d2e6ed3b4ce82a0384b4e7f605bd02a8b41c86 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1050,16 +1050,17 @@ Currently
@@.cyan;ENABLED.@@ [[Disable|Intro Summary][$seeVectorArtHighlights = 0]]
<<else>>
@@.red;DISABLED.@@ [[Enable|Intro Summary][$seeVectorArtHighlights = 1]]
- <</if>><br>
+ <</if>>
+ <br>
Height scaling
<<if $seeHeight == 1>>
- @@.yellow;ENABLED@@ on small images. [[Disable|Options][$seeHeight = 0]] | [[Enable for all images|Options][$seeHeight = 2]]
+ @@.yellow;ENABLED@@ on small images. [[Disable|Intro Summary][$seeHeight = 0]] | [[Enable for all images|Intro Summary][$seeHeight = 2]]
<<elseif $seeHeight == 2>>
- @@.cyan;ENABLED@@ on all images. [[Disable|Options][$seeHeight = 0]] | [[Enable only for small images|Options][$seeHeight = 1]]
+ @@.cyan;ENABLED@@ on all images. [[Disable|Intro Summary][$seeHeight = 0]] | [[Enable only for small images|Intro Summary][$seeHeight = 1]]
<<else>>
- @@.red;DISABLED.@@ [[Enable only for small images|Options][$seeHeight = 1]] | [[Enable for all images|Options][$seeHeight = 2]]
+ @@.red;DISABLED.@@ [[Enable only for small images|Intro Summary][$seeHeight = 1]] | [[Enable for all images|Intro Summary][$seeHeight = 2]]
<</if>>
- <br>@@.red;Git compiled only, no exceptions.@@
+ <br> @@.red;Git compiled only, no exceptions.@@
<<elseif $imageChoice == 2>>
''Vector art by NoX/Deepmurk — non-embed version'' is selected. [[Switch to rendered imagepack|Intro Summary][$imageChoice = 0]] | [[Switch to embedded vector art|Intro Summary][$imageChoice = 1]] | [[Switch to revamped embedded vector art|Intro Summary][$imageChoice = 3]]
<<elseif $imageChoice == 3>>
@@ -1111,12 +1112,12 @@ Currently
__''Mods''__
<br>The Special Force Mod is
-<<if $SF.Toggle === 0>>
+<<if $SF.Toggle < 1>>
''disabled.'' [[Enable|Intro Summary][$SF.Toggle = 1]]
<<else>>
''enabled.'' [[Disable|Intro Summary][$SF.Toggle = 0]]
<br> The support facility is
- <<if ($SF.Facility.Toggle === 0)>>
+ <<if $SF.Facility.Toggle < 1>>
@@.red;DISABLED.@@ [[Enable|Intro Summary][$SF.Facility.Toggle = 1]]
<<else>>
@@.cyan;ENABLED.@@ [[Disable|Intro Summary][$SF.Facility.Toggle = 0]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d05c527d10d7384124afc2a22b29dfcf7abd9a5e..cd7abe21264bff968b8da619d4771e5d0403ca45 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1496,9 +1496,10 @@ erectileImplant: 0
<<set $abbreviateHormoneBalance = 2>>
<<if def $SF.Toggle>>
- <<set $SF = {Toggle:$SF.Toggle,Active:-1}>>
+ <<set $SF = {Toggle:$SF.Toggle, Facility:{Toggle:$SF.Facility.Toggle}}>>
<<else>>
- <<set $SF = {Toggle:0,Active:-1}>>
+ <<set $SF = {Toggle:0, Facility:{Toggle:0}}>>
<</if>>
+<<set $SF.Active = -1>>
<<goto "Alpha disclaimer">>
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 0e9ed708c54704484c003c24619aca8f1efafbd7..da8d72d23ba55adcbc08992c9d922ccbae42646e 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1257,3 +1257,19 @@ window.originPronounReplace = /** @param {App.Entity.SlaveState} slave */ functi
return r;
}
};
+
+window.HSM = function() {
+ const V = State.variables;
+ if (V.PC.hacking <= -100) {return 1.5;}
+ else if (V.PC.hacking <= -75) {return 1.35;}
+ else if (V.PC.hacking <= -50) {return 1.25;}
+ else if (V.PC.hacking <= -25) {return 1.15;}
+ else if (V.PC.hacking < 0) {return 1.10;}
+ else if (V.PC.hacking === 0) {return 1;}
+ else if (V.PC.hacking <= 10) {return 0.97;}
+ else if (V.PC.hacking <= 25) {return 0.95;}
+ else if (V.PC.hacking <= 50) {return 0.90;}
+ else if (V.PC.hacking <= 75) {return 0.85;}
+ else if (V.PC.hacking <= 100) {return 0.80;}
+ else {return 0.75;}
+};
\ No newline at end of file
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index c7f8d6be09f7ca9a23974b6689255c289bdf79b1..9bdfc8868143357f1c876f9e6fe5a239750c4289 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -4,7 +4,7 @@
<<if ndef $newSlaves>><<set $newSlaves = []>><</if>>
<<if $newSlaves.length > 0>>
- <<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $returnTo = "Main", $newSlaveIndex = 0>>
+ <<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = $weeklyMarket, $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
You board the transport to
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 2f530ac527d5572e63460d89a45e368f1c371988..2f7cc92bd7237d623f48397b15e2f4e47f32f32b 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -31,7 +31,7 @@
<br>You send a quick message to the leader of your $mercenariesTitle, about your situation, then you pick up the revolver and quickly take aim.
<<set $MercenariesMessageSent = 1>>
<<case "SF">>
- <br>You send a quick message to <<print SFC()> about your situation, then you pick up the revolver and quickly take aim.
+ <br>You send a quick message to <<print SFC()>> about your situation, then you pick up the revolver and quickly take aim.
<<set $SpecialForcesMessageSent = 1>>
<<case "enrage">>
<<if $PC.career != "wealth" && $PC.career != "engineer" && $PC.career != "medicine">>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 2439602d80748bb9dfc66837846f6aaf927352fd..87de7cbf022a917d2406480a52e9799fa5a68a82 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -27,8 +27,8 @@
Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveName@@<<else>>$assistantName<</if>> to turn on the TV and set FCTV to random show. Your larger-than-life screen flashes on, and is soon playing a random show from the popular streaming service.
/* we need to check for pansy no-extreme squick stuff */
-<<if $minimumSlaveAge > 13 && $randShow == 14>>
- <<set $randShow = either(0,1,2,3,4,5,6,7,8,9,10,11,12,13)>>
+<<if $minimumSlaveAge > 13 && ($randShow == 12 || $randShow == 14)>>
+ <<set $randShow = either(0,1,2,3,4,5,6,7,8,9,10,11,13)>>
There is an audible tone from your screen, which then displays a message: <i>Actor not vintage enough, changing program.</i>
<</if>>
<<if $seeExtreme == 0 && $randShow == 10>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 6a6e19eeda9574a71f30a3d2f41b73290ce19083..b9b64b4dec2834b8781965729777d2e9450e87eb 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -227,7 +227,7 @@ $activeSlave.slaveName
<</if>>
<br><br>
<<run Enunciate($subSlave)>>
-"Oh," says $subSlave.slaveName. "Um, can I try <<s>>ome?"
+"Oh," says <<EventNameLink $subSlave>>. "Um, can I try <<s>>ome?"
<br><br>
$activeSlave.slaveName smiles and murmurs, "Mm hm." There is a distinct <<if canSee($activeSlave)>>glint in $his eye<<else>>look on $his face<</if>>. $He's got a healthy libido, to put it mildly. Like all slaves, $subSlave.slaveName sleeps nude and hasn't gotten dressed yet, and $activeSlave.slaveName has
<<if canSee($activeSlave)>>
@@ -311,13 +311,13 @@ After you complete your weekly inspection of <<EventNameLink $activeSlave>>, the
$desc
asks if $he can beg a favor. Absurd though it sounds, $he does exactly that, saying in $his <<if $activeSlave.voice > 2>>high<<elseif $activeSlave.voice > 1>>feminine<<else>>bimbo<</if>> voice, "<<Master>>, may I a<<s>>k a favor?" You take a moment to look at $him, standing there in front of your desk. $He's devoted to you, willing to please you for the sake of pleasing you, rather than to avoid punishment or make $his own life easier. And $he's very trusting, confident that $he can say such an odd thing without fear. So, you hear $him out.
<br><br>
-"Thank you, <<Master>>," $he <<say>>s. "I would like to do <<s>>omething for $subSlave.slaveName." You ask if $he's worried about $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>> for some reason. "Oh no, <<Master>>," $he answers hurriedly. "No, no, that came out wrong. It'<<s>> ju<<s>>t that I love _him2 and I want to, you know, get _him2 <<s>>omething or do <<s>>omething <<s>>pe<<c>>ial for _him2. We don't really have <<s>>tuff of our own, <<s>>o I can't give _him2 a pre<<s>>ent, and we already do everything either one of u<<s>> want<<s>> in bed, <<s>>o I can't really think of anything." $He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you hopefully.
+"Thank you, <<Master>>," $he <<say>>s. "I would like to do <<s>>omething for <<EventNameLink $subSlave>>." You ask if $he's worried about $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>> for some reason. "Oh no, <<Master>>," $he answers hurriedly. "No, no, that came out wrong. It'<<s>> ju<<s>>t that I love _him2 and I want to, you know, get _him2 <<s>>omething or do <<s>>omething <<s>>pe<<c>>ial for _him2. We don't really have <<s>>tuff of our own, <<s>>o I can't give _him2 a pre<<s>>ent, and we already do everything either one of u<<s>> want<<s>> in bed, <<s>>o I can't really think of anything." $He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you hopefully.
<<case "anal cowgirl">>
As you approach your office as you return from an unexpected but minor matter, you hear the unmistakable sounds of sexual congress. Reviewing your schedule as you cover the last few <<if $showInches == 2>>feet<<else>>meters<</if>> on your way there, you see that indeed, <<EventNameLink $activeSlave>> is due to be inspected. It seems likely that while waiting for your return, $he called a fellow slave who was passing your office in to keep $him company. And as you enter, you see that this is true.
<br><br>
-$He's sitting on the end of the couch, though only $his legs, crotch and hands are immediately visible. This is because $he has $subSlave.slaveName on top of $him, impaled on <<if canPenetrate($activeSlave)>>$his cock<<else>>a strap-on $he's wearing<</if>>. $subSlave.slaveName is bent almost double. $activeSlave.slaveName has $his $activeSlave.skin hands up on the backs of $subSlave.slaveName's $subSlave.skin knees, holding _his2 legs<<if $activeSlave.belly >= 5000>> to either side of _his2 <<if ($activeSlave.preg > $activeSlave.pregData.normalBirth/8)>>pregnancy<<else>>belly<</if>>,<</if>> up against _his2 <<if $subSlave.boobs > 2000>>inconveniently big boobs<<else>>shoulders<</if>>. $subSlave.slaveName is completely helpless, and _he2's being fucked hard:
+$He's sitting on the end of the couch, though only $his legs, crotch and hands are immediately visible. This is because $he has <<EventNameLink $subSlave>> on top of $him, impaled on <<if canPenetrate($activeSlave)>>$his cock<<else>>a strap-on $he's wearing<</if>>. $subSlave.slaveName is bent almost double. $activeSlave.slaveName has $his $activeSlave.skin hands up on the backs of $subSlave.slaveName's $subSlave.skin knees, holding _his2 legs<<if $activeSlave.belly >= 5000>> to either side of _his2 <<if ($activeSlave.preg > $activeSlave.pregData.normalBirth/8)>>pregnancy<<else>>belly<</if>>,<</if>> up against _his2 <<if $subSlave.boobs > 2000>>inconveniently big boobs<<else>>shoulders<</if>>. $subSlave.slaveName is completely helpless, and _he2's being fucked hard:
<<if canPenetrate($activeSlave)>>
<<if ($activeSlave.dick - $subSlave.anus > 2)>>
$activeSlave.slaveName's cock is very big, <<if $subSlave.anus > 2>>even for $subSlave.slaveName's loose anus<<elseif $subSlave.anus > 1>>even for $subSlave.slaveName's experienced anus<<else>>especially for $subSlave.slaveName's tight anus<</if>>, so $activeSlave.slaveName is bouncing $his anal bottom up and down only a little way, allowing $him to do so fast.
@@ -395,7 +395,7 @@ $He clearly held off on climaxing in case you wanted $his libido undiminished fo
<<set _headGirlPresent = 0>>
<</if>>
<</if>>
-You pass by the slave quarters during a busy time. Girls are hurrying back and forth, rushing to bathe, eat, and get dressed. <<EventNameLink $activeSlave>> is in a particular hurry, $his <<if $activeSlave.belly >= 10000>><<if $activeSlave.bellyPreg >= 8000>>heavy pregnancy<<else>>heavy belly<</if>> and <</if>><<if $activeSlave.boobs > 8000>>gargantuan tits hampering $him badly<<else>>huge boobs getting in the way<</if>> as $he rushes around. Returning from the shower to the sleeping area, $he turns a corner and runs hard into $subSlave.slaveName. Both slaves are nude, and the collision of their massive breasts makes an audibly painful smack. $activeSlave.slaveName has enough momentum that $he overbears the top-heavy $subSlave.slaveName entirely. The poor <<if $subSlave.physicalAge > 30>>_woman2<<else>>_girl2<</if>> crashes backwards, _his2 <<if $subSlave.butt > 8>>monstrous bottom<<elseif $subSlave.butt > 4>>big behind<<else>>hind end<</if>> hitting the floor with a slap. $activeSlave.slaveName lands on top of _him2, the fall and the sudden weight of $activeSlave.slaveName on top of _him2 driving the wind out of $subSlave.slaveName with a whoosh.
+You pass by the slave quarters during a busy time. Girls are hurrying back and forth, rushing to bathe, eat, and get dressed. <<EventNameLink $activeSlave>> is in a particular hurry, $his <<if $activeSlave.belly >= 10000>><<if $activeSlave.bellyPreg >= 8000>>heavy pregnancy<<else>>heavy belly<</if>> and <</if>><<if $activeSlave.boobs > 8000>>gargantuan tits hampering $him badly<<else>>huge boobs getting in the way<</if>> as $he rushes around. Returning from the shower to the sleeping area, $he turns a corner and runs hard into <<EventNameLink $subSlave>>. Both slaves are nude, and the collision of their massive breasts makes an audibly painful smack. $activeSlave.slaveName has enough momentum that $he overbears the top-heavy $subSlave.slaveName entirely. The poor <<if $subSlave.physicalAge > 30>>_woman2<<else>>_girl2<</if>> crashes backwards, _his2 <<if $subSlave.butt > 8>>monstrous bottom<<elseif $subSlave.butt > 4>>big behind<<else>>hind end<</if>> hitting the floor with a slap. $activeSlave.slaveName lands on top of _him2, the fall and the sudden weight of $activeSlave.slaveName on top of _him2 driving the wind out of $subSlave.slaveName with a whoosh.
<br><br>
"<<S>>orry! I'm <<s>>o <<s>>orry," apologizes $activeSlave.slaveName. $He starts to try to disentangle $himself as $subSlave.slaveName struggles to get _his2 breath back, but you see $activeSlave.slaveName's back stiffen. $He stops trying to get up. As the discomfort of the collision fades, $he notices the warmth of $subSlave.slaveName underneath $him, and the way their nipples are pressed against one another. Impulsively, $he kisses $subSlave.slaveName full on the lips,
<<if $activeSlave.boobs+$subSlave.boobs > 20000>>
@@ -528,7 +528,7 @@ Once $he's gotten $himself positioned, $subSlave.slaveName reaches around $activ
The distinctive sounds of a sexual encounter in which exactly one of the participants is enjoying $himself are coming from the dormitory. This is by no means uncommon, but this particular nonconsensual assignation sounds interesting, so you stick your head in on your way by. You're treated to the sight of <<EventNameLink $activeSlave>>'s $activeSlave.skin back and <<if ($activeSlave.butt > 4)>>massive ass<<elseif ($activeSlave.butt > 2)>>plush rear<<else>>cute butt<</if>> as $he kneels on one of the bedrolls. It isn't immediately clear what's going on, but $he's doing something with $his <<if canPenetrate($activeSlave)>>dick<<else>>hands<</if>>, and there are a pair of $subSlave.skin feet visible on either side of $him. $He's clearly got someone shoved down into the bedroll in front of $him, doggy style. That's the source of the whining.
<br><br>
-Advancing to get a better view, you identify the bottom as <<if $subSlave.bellyPreg >= 5000>>the pregnant <</if>>$subSlave.slaveName. $activeSlave.slaveName has
+Advancing to get a better view, you identify the bottom as <<if $subSlave.bellyPreg >= 5000>>the pregnant <</if>><<EventNameLink $subslave>>. $activeSlave.slaveName has
<<if canPenetrate($activeSlave)>>
<<if $activeSlave.dick > 4>>
$his gigantic dick up $subSlave.slaveName's
@@ -563,7 +563,7 @@ $activeSlave.slaveName isn't fucking $subSlave.slaveName at all: $he's just <<if
<<set $subSlave.analCount++, $analTotal++>>
<<set _belly = bellyAdjective($subSlave)>>
<<setPlayerPronouns>>
-You look in on your slaves as a group of them heads for bed. $subSlave.slaveName finds <<EventNameLink $activeSlave>> blocking the way to _hers2. Poor $subSlave.slaveName cringes at $activeSlave.slaveName's predatory expression, but the horny slave doesn't pounce at once. Instead, $he starts to walk around $subSlave.slaveName, whose $subSlave.skin body is nude for bed, groping and prodding _him2 as $subSlave.slaveName shivers with fear. Finally $activeSlave.slaveName sidles up behind $subSlave.slaveName<<if $activeSlave.belly >= 5000>>, until $his bulging belly pushes into $his back, before<</if>> snaking $his arms around $subSlave.slaveName's
+You look in on your slaves as a group of them heads for bed. <<EventNameLink $subSlave>> finds <<EventNameLink $activeSlave>> blocking the way to _hers2. Poor $subSlave.slaveName cringes at $activeSlave.slaveName's predatory expression, but the horny slave doesn't pounce at once. Instead, $he starts to walk around $subSlave.slaveName, whose $subSlave.skin body is nude for bed, groping and prodding _him2 as $subSlave.slaveName shivers with fear. Finally $activeSlave.slaveName sidles up behind $subSlave.slaveName<<if $activeSlave.belly >= 5000>>, until $his bulging belly pushes into $his back, before<</if>> snaking $his arms around $subSlave.slaveName's
<<if $subSlave.bellyPreg >= 10000>>
pregnant
<<elseif $subSlave.weight > 95>>
@@ -629,13 +629,13 @@ $subSlave.slaveName keeps _his2 eyes clamped shut and _his2 hands down at _his2
<<set $subSlave.analCount++, $analTotal++>>
<<set _belly = bellyAdjective($subSlave)>>
-As you pass the showers, you hear what sounds like a muffled altercation over the noise of the showers running. You look in to see $subSlave.slaveName's $subSlave.skin body facing you, pressed hard up against the glass wall of one of the showers. _His2 <<if $subSlave.face > 95>>gorgeous<<elseif $subSlave.face > 40>>beautiful<<elseif $subSlave.face > 10>>pretty<<elseif $subSlave.face >= -10>>attractive<<else>>homely<</if>> face<<if $subSlave.belly >= 5000>> and <<if $subSlave.bellyPreg >= 5000>>pregnant<<else>>_belly<</if>> belly are<<else>> is<</if>> smashed against the glass, <<if $subSlave.belly >= 5000>>_his2 face <</if>>contorted in pain and fear. The apparent mystery is solved when you notice that there are four legs visible: there's a pair of <<if ($activeSlave.muscles > 95)>>ripped<<elseif ($activeSlave.muscles > 30)>>muscular<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> $activeSlave.skin calves behind $subSlave.slaveName's. <<EventNameLink $activeSlave>>'s face appears at $subSlave.slaveName's ear, and though you can't hear exactly what $he says, it's something along the lines of "Take it, you whiny little bitch." $He's clearly got <<if canPenetrate($activeSlave)>>$his cock<<else>>a couple of fingers<</if>> up $subSlave.slaveName's asshole.
+As you pass the showers, you hear what sounds like a muffled altercation over the noise of the showers running. You look in to see <<EventNameLink $subSlave>>'s $subSlave.skin body facing you, pressed hard up against the glass wall of one of the showers. _His2 <<if $subSlave.face > 95>>gorgeous<<elseif $subSlave.face > 40>>beautiful<<elseif $subSlave.face > 10>>pretty<<elseif $subSlave.face >= -10>>attractive<<else>>homely<</if>> face<<if $subSlave.belly >= 5000>> and <<if $subSlave.bellyPreg >= 5000>>pregnant<<else>>_belly<</if>> belly are<<else>> is<</if>> smashed against the glass, <<if $subSlave.belly >= 5000>>_his2 face <</if>>contorted in pain and fear. The apparent mystery is solved when you notice that there are four legs visible: there's a pair of <<if ($activeSlave.muscles > 95)>>ripped<<elseif ($activeSlave.muscles > 30)>>muscular<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> $activeSlave.skin calves behind $subSlave.slaveName's. <<EventNameLink $activeSlave>>'s face appears at $subSlave.slaveName's ear, and though you can't hear exactly what $he says, it's something along the lines of "Take it, you whiny little bitch." $He's clearly got <<if canPenetrate($activeSlave)>>$his cock<<else>>a couple of fingers<</if>> up $subSlave.slaveName's asshole.
<br><br>
Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>>$subSlave.eyeColor eyes widen<<else>>face lights up<</if>>, but _his2 momentary look of hope is snuffed out when _he2 remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow $him to fuck your other slaves, but $he isn't quite sure what the right thing to do is, since $he isn't the most dominant force in the showers any more.
<<case "repressed anal virgin">>
-$subSlave.slaveName has been a very good _girl2 this week, so when _his2 <<if $subSlave.anus > 2>>loose asshole<<elseif $subSlave.anus > 1>>big butthole<<else>>tight anus<</if>> catches your eye near the start of a long inspection, you decide to be kind to _him2 as you conduct the rest of your inspection with <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>. <<EventNameLink $activeSlave>> is next on the inspection schedule, and when $he comes into your office, it's to the <<if canSee($activeSlave)>>sight of $subSlave.slaveName's back and rear<<else>>sound of $subSlave.slaveName<</if>> as _he2 lazily rides _his2 <<= WrittenMaster($subSlave)>>. You've been sitting on the couch, making out with the compliant _girl2 as _he2 rides you, for a good half hour. Poor $subSlave.slaveName was pent up when you started, and _he2's climaxed already; _he2's feeling very devoted and relaxed at the moment, and is doing _his2 best to get you off, too. When you finally come, _he2 moans _his2 thanks into your mouth nonverbally, breaks your lip lock, gives you a peck on the nose, and climbs off you. As _he2 does, _he2 lifts _his2 ass off your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>>, _his2 <<if $subSlave.anus > 2>>gaping anus dripping <<if $PC.dick == 1>>cum<<else>>lube<</if>> all over _his2 $subSlave.skin legs<<elseif $subSlave.anus > 1>>well-fucked backdoor taking a few seconds to recover from its gape, dripping a little <<if $PC.dick == 1>>cum<<else>>lube<</if>> down _his2 $subSlave.skin legs<<else>>still-tight backdoor sliding quickly off you, visibly slick with <<if $PC.dick == 1>>cum<<else>>lube<</if>><</if>>. You didn't fuck _him2 too hard, but <<if $PC.dick == 1>>you're not small<<else>>your strap-ons are not small<</if>>, and _he2 walks a little gingerly as _he2 heads for the bathroom. $activeSlave.slaveName, standing there nude for inspection, stares openmouthed at $subSlave.slaveName as _he2 goes. $He's obviously unfamiliar with anal sex.
+<<EventNameLink $subSlave>> has been a very good _girl2 this week, so when _his2 <<if $subSlave.anus > 2>>loose asshole<<elseif $subSlave.anus > 1>>big butthole<<else>>tight anus<</if>> catches your eye near the start of a long inspection, you decide to be kind to _him2 as you conduct the rest of your inspection with <<if $PC.dick == 1>>your cock<<else>>a strap-on<</if>>. <<EventNameLink $activeSlave>> is next on the inspection schedule, and when $he comes into your office, it's to the <<if canSee($activeSlave)>>sight of $subSlave.slaveName's back and rear<<else>>sound of $subSlave.slaveName<</if>> as _he2 lazily rides _his2 <<= WrittenMaster($subSlave)>>. You've been sitting on the couch, making out with the compliant _girl2 as _he2 rides you, for a good half hour. Poor $subSlave.slaveName was pent up when you started, and _he2's climaxed already; _he2's feeling very devoted and relaxed at the moment, and is doing _his2 best to get you off, too. When you finally come, _he2 moans _his2 thanks into your mouth nonverbally, breaks your lip lock, gives you a peck on the nose, and climbs off you. As _he2 does, _he2 lifts _his2 ass off your <<if $PC.dick == 1>>cock<<else>>strap-on<</if>>, _his2 <<if $subSlave.anus > 2>>gaping anus dripping <<if $PC.dick == 1>>cum<<else>>lube<</if>> all over _his2 $subSlave.skin legs<<elseif $subSlave.anus > 1>>well-fucked backdoor taking a few seconds to recover from its gape, dripping a little <<if $PC.dick == 1>>cum<<else>>lube<</if>> down _his2 $subSlave.skin legs<<else>>still-tight backdoor sliding quickly off you, visibly slick with <<if $PC.dick == 1>>cum<<else>>lube<</if>><</if>>. You didn't fuck _him2 too hard, but <<if $PC.dick == 1>>you're not small<<else>>your strap-ons are not small<</if>>, and _he2 walks a little gingerly as _he2 heads for the bathroom. $activeSlave.slaveName, standing there nude for inspection, stares openmouthed at $subSlave.slaveName as _he2 goes. $He's obviously unfamiliar with anal sex.
<br><br>
$activeSlave.slaveName coughs and looks doubtful, like $he's mulling over a question. You let the poor repressed $girl chew on it for a while, and eventually $he bursts out, "<<Master $activeSlave>>, what were you doing with $subSlave.slaveName?" The absurdity gives you a moment's pause, but you answer gamely that you were fucking _his2 ass. $activeSlave.slaveName blushes furiously but plunges on, "I'm <<s>>-<<s>>orry, <<Master>>, but I <<s>>till don't under<<s>>tand. I thought <<s>>e<<x>> happened in a v-vagina. I d-didn't think b-butt<<s>> were — were for, you know, that."
<<set $subSlave.analCount++, $analTotal++>>
@@ -652,7 +652,7 @@ $activeSlave.slaveName coughs and looks doubtful, like $he's mulling over a ques
<<set _notVirgin = 0>>
<</if>>
<<set _belly = bellyAdjective($activeSlave)>>
-As you stroll past the best part of the slave living area one evening, you hear a lewd slap, slap, slap coming from the room <<EventNameLink $activeSlave>> and $subSlave.slaveName share. It's quite obvious what they're up to, but you look in anyway. $activeSlave.slaveName has clearly had a long day, and is tired, but $he's being a good <<if $activeSlave.relationship > 4>>wife<<else>>lover<</if>> and letting $subSlave.slaveName use $his body. $activeSlave.slaveName is lying face-down on their bed, arms crossed under $his head, looking quite relaxed. $He has a couple of pillows tucked under $his hips to raise them so that $his <<if $activeSlave.relationship > 4>>wife<<else>>sweetheart<</if>> can fuck $him comfortably<<if $activeSlave.belly >= 5000>> and to give $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room beneath $him<</if>>. They've obviously been at this for a while. $subSlave.slaveName likes to top and is not gentle at it, and _he2's pounding $activeSlave.slaveName as hard as _he2 can. _He2's <<if $subSlave.muscles > 30>>a very strong girl, and _his2 muscles work noticeably<<elseif $subSlave.muscles > 5>>physically fit, but even so, _he2's showing signs of fatigue<<else>>not very fit, and _he2's gasping tiredly<</if>> as _he2 pistons <<if canPenetrate($subSlave)>>_his2 penis<<else>>the strap-on _he2's wearing<</if>> in and out of the <<if _notVirgin == 1>>asshole<<else>>pussy<</if>> beneath _him2.
+As you stroll past the best part of the slave living area one evening, you hear a lewd slap, slap, slap coming from the room <<EventNameLink $activeSlave>> and <<EventNameLink $subSlave>> share. It's quite obvious what they're up to, but you look in anyway. $activeSlave.slaveName has clearly had a long day, and is tired, but $he's being a good <<if $activeSlave.relationship > 4>>wife<<else>>lover<</if>> and letting $subSlave.slaveName use $his body. $activeSlave.slaveName is lying face-down on their bed, arms crossed under $his head, looking quite relaxed. $He has a couple of pillows tucked under $his hips to raise them so that $his <<if $activeSlave.relationship > 4>>wife<<else>>sweetheart<</if>> can fuck $him comfortably<<if $activeSlave.belly >= 5000>> and to give $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room beneath $him<</if>>. They've obviously been at this for a while. $subSlave.slaveName likes to top and is not gentle at it, and _he2's pounding $activeSlave.slaveName as hard as _he2 can. _He2's <<if $subSlave.muscles > 30>>a very strong girl, and _his2 muscles work noticeably<<elseif $subSlave.muscles > 5>>physically fit, but even so, _he2's showing signs of fatigue<<else>>not very fit, and _he2's gasping tiredly<</if>> as _he2 pistons <<if canPenetrate($subSlave)>>_his2 penis<<else>>the strap-on _he2's wearing<</if>> in and out of the <<if _notVirgin == 1>>asshole<<else>>pussy<</if>> beneath _him2.
<br><br>
@@ -730,7 +730,7 @@ Mere moments after you absorb this arresting scene, $subSlave.slaveName thrusts
<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<set _vaginal = 0>>
<<if $subSlave.vagina != 0 && canDoVaginal($subSlave)>><<set _vaginal = 1>><</if>>
-You round a corner and almost trip over <<EventNameLink $activeSlave>>. $He's on top of another slave, humping away; $his <<if $activeSlave.butt > 8>>monstrous, naked ass jiggles lewdly<<elseif $activeSlave.anus > 2>>loose asspussy winks lewdly<<elseif $activeSlave.muscles > 30>>heavily muscled butt flexes powerfully<<elseif $activeSlave.butt > 3>>big butt pumps energetically<<else>>nice little butt flexes cutely<</if>> as $he thrusts. You can't see much of the slave <<if _vaginal>>lying on _his2 back<<else>>face-down<</if>> underneath $activeSlave.slaveName, but you recognize _him2 as $subSlave.slaveName by _his2 sobbing. _He2's struggling a little, but $activeSlave.slaveName has _him2 pinned to the floor by _his2 wrists, and $activeSlave.slaveName is quickly raping the resistance out of the <<print SlaveTitle($subSlave)>>.
+You round a corner and almost trip over <<EventNameLink $activeSlave>>. $He's on top of another slave, humping away; $his <<if $activeSlave.butt > 8>>monstrous, naked ass jiggles lewdly<<elseif $activeSlave.anus > 2>>loose asspussy winks lewdly<<elseif $activeSlave.muscles > 30>>heavily muscled butt flexes powerfully<<elseif $activeSlave.butt > 3>>big butt pumps energetically<<else>>nice little butt flexes cutely<</if>> as $he thrusts. You can't see much of the slave <<if _vaginal>>lying on _his2 back<<else>>face-down<</if>> underneath $activeSlave.slaveName, but you recognize _him2 as <<EventNameLink $subSlave>> by _his2 sobbing. _He2's struggling a little, but $activeSlave.slaveName has _him2 pinned to the floor by _his2 wrists, and $activeSlave.slaveName is quickly raping the resistance out of the <<print SlaveTitle($subSlave)>>.
<br><br>
$activeSlave.slaveName senses your presence above and behind $him, and twists $his $activeSlave.hColor head around to <<if canSee($activeSlave)>>see who it is. $He sees that it's you<<else>>discern who it is. $He realizes that it's you<</if>>, and greets you cheerfully. "Hi, <<Master>>," $he trills.
<<if $activeSlave.fetishKnown && $activeSlave.fetish == "sadist">>
@@ -748,7 +748,7 @@ $activeSlave.slaveName senses your presence above and behind $him, and twists $h
<</if>>
<br><br>
<<run Enunciate($subSlave)>>
-$subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<else>>turns _his2 head<</if>> and <<if canSee($subSlave)>>looks at<<else>>faces<</if>> you too. "<<Master $subSlave>>, plea<<s>>e," _he2 begs. "P-plea<<s>>e, make $him <<s>>-<<s>>top — mhhh —" $activeSlave.slaveName shuts _him2 up by <<if _vaginal>>kissing _his2 unwilling mouth<<else>>shoving _his2 face back against the floor<</if>>. Once $he has $subSlave.slaveName back under control, $activeSlave.slaveName slows $his thrusting, reaches around behind $himself, and <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>>spreads $his futa pussy for you.<<else>>pulls one asscheek aside to offer you $his anus. To make the offer extra clear, $he starts winking it lewdly.<</if>>
+<<EventNameLink $subSlave>> <<if _vaginal>>looks out from under $activeSlave.slaveName<<else>>turns _his2 head<</if>> and <<if canSee($subSlave)>>looks at<<else>>faces<</if>> you too. "<<Master $subSlave>>, plea<<s>>e," _he2 begs. "P-plea<<s>>e, make $him <<s>>-<<s>>top — mhhh —" $activeSlave.slaveName shuts _him2 up by <<if _vaginal>>kissing _his2 unwilling mouth<<else>>shoving _his2 face back against the floor<</if>>. Once $he has $subSlave.slaveName back under control, $activeSlave.slaveName slows $his thrusting, reaches around behind $himself, and <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>>spreads $his futa pussy for you.<<else>>pulls one asscheek aside to offer you $his anus. To make the offer extra clear, $he starts winking it lewdly.<</if>>
<br><br>
<<run Enunciate($activeSlave)>>
"Plea<<s>>e fuck me while I rape _him2, <<Master>>," $activeSlave.slaveName <<say>>s in a mockery of $subSlave.slaveName's <<if $subSlave.voice > 2>>high-pitched whining<<elseif $subSlave.voice > 1>>begging<<else>>deep-voiced begging<</if>>. "Ooh, or, plea<<s>>e, <<Master>>, may I flip _him2 over? I'd love to feel <<if $PC.dick>>your cock in<<s>>ide _him2 along<<s>>ide mine<<else>>that <<s>>trap-on you u<<s>>e in<<s>>ide _him2 along<<s>>ide my cock<</if>>!"
@@ -760,7 +760,7 @@ $subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<
<<set $subSlave.oralCount++, $oralTotal++>>
<<set $activeSlave.oralCount++, $oralTotal++>>
-Early in the morning, you run across $subSlave.slaveName using one of the penthouse milking machines. This isn't surprising;
+Early in the morning, you run across <<EventNameLink $subSlave>> using one of the penthouse milking machines. This isn't surprising;
<<if $subSlave.lactation == 0>>
_he2's not lactating, but _he2's a good semen producer and when _he2 wakes up, _he2's usually very ready to have one of the machines drain _his2 balls for _him2.
<<else>>
@@ -831,7 +831,7 @@ Passing the slave quarters late at night, you hear <<EventNameLink $activeSlave>
<<elseif $activeSlave.voice < $subSlave.voice>>another, higher,
<<else>><<if $activeSlave.voice > 2>>high-pitched<<elseif $activeSlave.voice > 1>>soft<<else>>harsh<</if>>
<</if>>
-voice. It's $subSlave.slaveName.
+voice. It's <<EventNameLink $subSlave>>.
<<if $subSlave.belly >= 120000 && $activeSlave.dick > 3>>
<<if $subSlave.bellyPreg >= 2000>>
"I'm way too pregnant; there'<<s>> ju<<s>>t no room for a big cock like your<<s>> in<<s>>ide me anymore. Plu<<s>> you'll wake them up and they'll be kicking all night again."
@@ -945,7 +945,7 @@ $activeSlave.slaveName is almost in tears.
<<set _mother = "father">>
<<set _mommy = "Daddy">>
<</if>>
-<<if _meal == "breakfast">>At the beginning<<elseif _meal == "lunch">>At the midpoint<<else>>Near the end<</if>> of $subSlave.slaveName's scheduled day, you come across _him2 curled up in _his2 _mother <<EventNameLink $activeSlave>>'s lap, face buried in $his bosom. $activeSlave.slaveName is running a gentle hand <<if $activeSlave.hLength > 5>>through $subSlave.slaveName's hair<<else>>across $subSlave.slaveName's scalp<</if>>, and is softly <<say>>ing something to _him2. As you approach, you catch the end of it.
+<<if _meal == "breakfast">>At the beginning<<elseif _meal == "lunch">>At the midpoint<<else>>Near the end<</if>> of <<EventNameLink $subSlave>>'s scheduled day, you come across _him2 curled up in _his2 _mother <<EventNameLink $activeSlave>>'s lap, face buried in $his bosom. $activeSlave.slaveName is running a gentle hand <<if $activeSlave.hLength > 5>>through $subSlave.slaveName's hair<<else>>across $subSlave.slaveName's scalp<</if>>, and is softly <<say>>ing something to _him2. As you approach, you catch the end of it.
<<if $activeSlave.genes == "XX" && $subSlave.tankBaby < 1>>
"I mi<<ss>>ed doing thi<<s>> for you <<s>>o much," $he murmurs. "It'<<s>> <<s>>o ni<<c>>e to do it again."
<<elseif $activeSlave.genes == "XY">>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index a974f36f7375510557f63b2d6223fd48f2fc4f73..60cfd411a8366e4a1f0ac62ca9d937115ca4c423 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -158,11 +158,11 @@ $His $activeSlave.faceShape face is
<br>
$He has
<<if $activeSlave.earShape == "normal">>
- normal shaped ears.
+ normal ears.
[[Elongate ears|Surgery Degradation][$activeSlave.earShape = "elfin", cashX(forceNeg($surgeryCost), "slaveSurgery"), $activeSlave.health -= 10, $surgeryType = "earShape"]]
<<elseif $activeSlave.earShape == "elfin">>
elfin shaped ears.
- [[Purge ears|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), "slaveSurgery"), $activeSlave.health -= 10, $surgeryType = "earShape"]]
+ [[Revert ears|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), "slaveSurgery"), $activeSlave.health -= 10, $surgeryType = "earShape"]]
<</if>>
<<if $activeSlave.earImplant == 1>>
@@ -179,7 +179,7 @@ $He has
<<if ($activeSlave.earImplant != 1)>>
[[Correct hearing|Surgery Degradation][$activeSlave.hears = 0, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earFix"]]
<</if>>
- <<elseif $activeSlave.hears == 0>>
+ <<else>>
ears and good hearing.
<<if ($seeExtreme == 1) && ($activeSlave.earImplant != 1) && $activeSlave.indentureRestrictions < 1>>
[[Muffle hearing|Surgery Degradation][$activeSlave.hears = -1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMuffle"]]
@@ -187,14 +187,12 @@ $He has
<</if>>
<</if>>
-<<if ($seeExtreme == 1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- <<if $activeSlave.earImplant != 1>>
- <<if ($activeSlave.hears > -2)>>
- | [[Deafen|Surgery Degradation][$activeSlave.hears = -2,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "deafen"]]
- <</if>>
+<<if ($seeExtreme == 1) && $activeSlave.indentureRestrictions < 1>>
+ <<if $activeSlave.earImplant != 1>>
+ <<if ($activeSlave.hears > -2)>>
+ | [[Deafen|Surgery Degradation][$activeSlave.hears = -2,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "deafen"]]
<</if>>
- <<if ($cyberMod == 1) && ($stockpile.cochlearImplant > 0) && ($activeSlave.earImplant != 1)>>
+ <<if ($cyberMod == 1) && ($stockpile.cochlearImplant > 0)>>
| [["Give " + $him + " cochlear implants"|Surgery Degradation][$activeSlave.earImplant = 1, $stockpile.cochlearImplant--,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "cochlear implant"]]
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 2e16cc2e383b7d17d6ce58a87e51ee5cf45173d7..33830128e00ba3b1008538929b44f48f7675386b 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6675,7 +6675,11 @@
<<set $slaves[$i].boobs -= $slaves[$i].boobsMilk>>
<<set $slaves[$i].boobsMilk = 0, $slaves[$i].lactationDuration = 2>>
<<else>>
- but without regular use, $his lactation finally @@.orange;dries up@@ and $he can be drained without encouraging it.
+ <<if $slaves[$i].boobsMilk > 0>>
+ but without regular use, $his lactation finally @@.orange;dries up@@ and $he can be drained without encouraging it.
+ <<else>>
+ Without regular use, $his lactation naturally @@.orange;come to an end.@@
+ <</if>>
<<set $slaves[$i].boobs -= $slaves[$i].boobsMilk>>
<<set $slaves[$i].boobsMilk = 0, $slaves[$i].lactation = 0>>
<</if>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index dbe5875cc3ea563fbf37ff96a06057e4180fd180..13f02201620e81b3d07ba737b2385ae81822d26f 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -187,6 +187,7 @@ Your arcology has gained a well-off citizen.
<<if _clonedSlave.relationship >= 4>>
<<link "Send $his _girl2 into retirement with $him">>
<<replace "#result">>
+ <<set _sr = $slaveIndices[_clonedSlave.relationshipTarget]>> /* must be reset since $activeSlave may already be removed from $slaves */
$He doesn't get far before $he <<if canHear(_clonedSlave)>>hears a desperate pursuit behind $him<<else>>feels a gentle tap on $his shoulder<</if>>. It's $his <<if _clonedSlave.relationship >= 5>>wife<<else>>lover<</if>>, $slaves[_sr].slaveName, <<if canHear(_clonedSlave)>>hurrying to catch<<else>>finally catching<</if>> up. Watching on the monitors, you see _clonedSlave.slaveName's mixed pleasure and pain at seeing _him2 again so soon, followed by a tearful explanation and an embrace so heartfelt that the pair of ex-slaves collapse to the floor together, sobbing.
<<set $activeSlave = $slaves[_sr]>>
<<include "Remove activeSlave">>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index c917e139b5646b4e52a822ef2f2154ee60112e93..4768e9d81c083ee48e04df2544b3aa6bcf2e270e 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -575,15 +575,10 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
Since $he has a mere _TimeBeforeAgeRetirement weeks left until the local retirement age for sex slaves, buyers will be willing to offer much less for $him.
<</if>>
-<<if $arcologies[0].FSSupremacistLawME != 0>>
- <<if $activeSlave.race != $arcologies[0].FSSupremacistRace>>
- Your supremacism has pushed a lot of subhumans like $him into the market, so $his race is a negative.
- <</if>>
-<</if>>
-<<if $arcologies[0].FSSubjugationistLawME != 0>>
- <<if $activeSlave.race == $arcologies[0].FSSubjugationistRace>>
- Your subjugationism has pushed a lot of animals like $him into the market, so $his race is a negative.
- <</if>>
+<<if $arcologies[0].FSSupremacistLawME != 0 && $activeSlave.race != $arcologies[0].FSSupremacistRace>>
+ Your supremacism has pushed a lot of subhumans like $him into the market, so offers will be low.
+<<elseif $arcologies[0].FSSubjugationistLawME != 0 && $activeSlave.race == $arcologies[0].FSSubjugationistRace>>
+ Your subjugationism has pushed a lot of animals like $him into the market, so $his race marks $him as low quality.
<</if>>
<<if $arcologies[0].FSRepopulationFocusSMR != 0>>
<<if $activeSlave.pregKnown == 1>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a0256f5a148ce5b902d9d2d246d73eee871f44f0..ee53c2e5c8d130c6ffe2c2a629a9be2efba7fe01 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -688,7 +688,7 @@
<br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0)>>@@.yellow;[!]@@<</if>></span><</if>>
+ <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
<<if $secExp == 1>>
<<if $propHub == 1>>
<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
@@ -830,6 +830,8 @@
<</if>>
<<goto _Pass>>
<</link>>
+ <br>
+ <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
<</if>>
<</nobr>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index d3fc05ec607c1a0ae220beeb3667075e50791288..b2680b2b7aba839c6d71df3d048ba07684f7b0d6 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -417,7 +417,7 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.hears = 0>>
<<case "earShape">>
- The implant surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his ears are removed, $he initially believes nothing has changed, but soon discovers $his hearing is no longer technologically enhanced.
+ The ear surgery is @@.red;invasive@@ and $he spends some time in the autosurgery recovering. As soon as the bandages around $his head are removed, $he initially believes nothing has changed, but soon discovers $his ears have been reshaped.
<<case "boobs">>
<<if ($activeSlave.areolae < 2) && (random(1,100) > 70)>>
@@ -2603,7 +2603,7 @@ As the remote surgery's long recovery cycle completes,
<<if $activeSlave.fetish == "mindbroken">>
$He doesn't seem to comprehend what this means for $him.
<<elseif $activeSlave.devotion > 20>>
- $He is @@.hotpink;happy@@ with how young $his body has become<<if $activeSlave.visualAge > 26>>and is excited about the process continuing<</if>>. $He is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $him.
+ $He is @@.hotpink;happy@@ with how young $his body has become<<if $activeSlave.visualAge > 26>> and is excited about the process continuing<</if>>. $He is already @@.mediumaquamarine;wondering@@ what new kinky things you have planned for $him.
<<set $activeSlave.trust += 5, $activeSlave.devotion += 5>>
<<if $activeSlave.visualAge > 26>><<set $activeSlave.devotion += 5>><</if>>
<<elseif $activeSlave.devotion >= -20>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index e9501c47710327dce9c04065778a54e0b80df60a..c0142030588866cfd9e65e64138a05e17bbdb173 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4890,7 +4890,7 @@
<br>[["Decline to purchase " + $him + " and check out another " + $args[1]|passage()][$slavesSeen += 1]]
<<if $cash >= $slaveCost>>
<<set _schoolToBuyFrom = $args[0]>>
- <br>[["Buy " + $him + " and check out other " + $args[2] + "s to order"|passage()][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other " + $args[2] + " to order"|passage()][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>