diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index bc82681c8578b1c9c859a803e124b219ec4f3652..aefdee1a77ccb0b9f58e073a08aacdc52c6a0495 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,14 @@
0.10.7.1-1.3.x
+12/16/2018
+
+ 8
+ -fixes
+ -code cleanup
+ -custom shares removed from the corporation (too buggy)
+ -added faceShape to genetics
+
12/15/2018
7
@@ -5531,7 +5539,7 @@
10
-various bugfixes
-more rude names
- -you can now successfully buy the prince and princess and they will definitely be different people
+ -you can now successfully buy the prince and princess and they will definitely be different people
9
-several bugfixes
@@ -7509,7 +7517,7 @@
-yet more bug fixes including >>35400 and >>35291
0.8.8.2
- -A lot of rollbacks in 0.8.8.2 and as such some of the content added with 0.8.8.0 got lost. Also tons of conditional expressions changed back that I have a feeling are going to get swapped right back.
+ -A lot of rollbacks in 0.8.8.2 and as such some of the content added with 0.8.8.0 got lost. Also tons of conditional expressions changed back that I have a feeling are going to get swapped right back.
-Almost feels like all the content modders aren't on the same page.
10/14/16
@@ -7662,7 +7670,7 @@
0.8.2.2
-a new type of breast implant.
- -disabled the penitent nun's habit in the walk past code as it refused to not throw errors, traced it to <<case>> not tolerating '.
+ -disabled the penitent nun's habit in the walk past code as it refused to not throw errors, traced it to <<case>> not tolerating '.
08/21/16
@@ -7799,7 +7807,7 @@ PregmodBase v135
11/14/17
-PregmodBase v132
+PregmodBase v132
12.9
-fixes
@@ -8002,8 +8010,8 @@ last known lolimod merge - 08/30/16
08/16/16
0.8.1.3
- The "disable age penalties for jobs" submod now has a mechanical effect rather than just changing messages.
- - The long-standing change that allows slaves without balls but with artificial male hormone injections to experience erections has been added in some places where it was missing. In the process a vanilla bug in "SA serve your other slaves" where the wrong slave's attributes were being checked was corrected.
- - Fixed the "flaws her mouth" silliness that somehow snuck back in from the base game. (It should be "quirks her mouth" so it was probably the victim of Replace All.)
+ - The long-standing change that allows slaves without balls but with artificial male hormone injections to experience erections has been added in some places where it was missing. In the process a vanilla bug in "SA serve your other slaves" where the wrong slave's attributes were being checked was corrected.
+ - Fixed the "flaws her mouth" silliness that somehow snuck back in from the base game. (It should be "quirks her mouth" so it was probably the victim of Replace All.)
- Incorporates a fix posted on halfchan for the "force her to rape herself" option for new slaves not appearing.
- Fixed one place in the game where a slave could refer to young slave as a "teenager" although she might be preteen.
@@ -8026,7 +8034,7 @@ last known lolimod merge - 08/30/16
-Redesigned buying other FS clothing, it is now found under a new subsection of Manage Arcology.
-fixed bugs and typos
- - >>20506, >>20508 Okay, this bug should finally be fixed. Also tweaked loli nicknames a bit.
+ - >>20506, >>20508 Okay, this bug should finally be fixed. Also tweaked loli nicknames a bit.
0.7.10.0
-making the new recruitment events use the age settings.
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 848821e584a5e3a0d6393b87f4baabf948135954..5eb0ca58ae4533588d2f7c273a07e757f386f5e8 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4179,6 +4179,27 @@ window.induceLactation = function induceLactation(slave) {
return r;
}
+window.ResearchLabStockPile = function() {
+ return `__Stockpile__
+ Prosthetics interfaces: <<print commaNum($stockpile.basicPLimbInterface+
+ $stockpile.advPLimbInterface)>>
+ Basic : $stockpile.basicPLimbInterface
+ Advanced: $stockpile.advPLimbInterface
+ Limbs: <<print commaNum($stockpile.basicPLimb+$stockpile.advSexPLimb+
+ $stockpile.advGracePLimb+$stockpile.advCombatPLimb+$stockpile.cyberneticPLimb)>>
+ Basic: $stockpile.basicPLimb
+ Sex: $stockpile.advSexPLimb
+ Beauty: $stockpile.advGracePLimb
+ Combat: $stockpile.advCombatPLimb
+ Cybernetic: $stockpile.cyberneticPLimb
+ Implants: <<print commaNum($stockpile.ocularImplant+$stockpile.cochlearImplant
+ +$stockpile.erectileImplant)>>
+ Ocular: $stockpile.ocularImplant
+ Cochlear: $stockpile.cochlearImplant
+ // Erectile: $stockpile.erectileImplant
+ Electrolarynx: $stockpile.electrolarynx`
+}
+
/*:: Span Macro JS [script]*/
/*
@@ -10116,6 +10137,7 @@ window.generateGenetics = (function() {
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2);
+ genes.faceShape = setFaceShape(father, mother);
genes.eyeColor = setEyeColor(father, mother, actor2);
genes.hColor = setHColor(father, mother, actor2);
genes.underArmHStyle = setUnderArmHStyle(father, mother);
@@ -10553,6 +10575,21 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100);
}
+ // face shape
+ function setFaceShape(father, mother) {
+ let shape;
+ if (father !== 0) {
+ if (mother.faceShape == father.faceShape) {
+ shape = mother.faceShape;
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ return shape;
+ }
+
return generateGenetics;
})();
@@ -10677,7 +10714,10 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
@@ -10823,7 +10863,7 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
child.energy = 0;
child.anus = 0;
if (child.vagina > 0) {child.vagina = 0;}
@@ -10833,6 +10873,9 @@ window.generateChild = function(mother, ova, destination) {
child.balls = 1;
child.scrotum = 1;
}
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
@@ -34698,21 +34741,21 @@ window.GenerateNewSlave = (function(){
/*SecForceEX JS*/
window.SFC = function() {
const V = State.variables;
- if (V.SFTradeShow.CanAttend === -1) {return `The Colonel`;}
+ if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
else {
if (V.SF.Facility.LCActive > 0) {return `Lieutenant Colonel <<= SlaveFullName(V.SF.Facility.LC)>>`;}
else {return `a designated soldier`;}}
};
window.SFCR = function() {
- const V = State.variables, C = V.SFColonel;
+ const V = State.variables, C = V.SF.Colonel;
if (C.Status <= 19) {return `boss`;}
else if (C.Status <= 39) {return `friend`;}
else {return `fuckbuddy`;}
};
window.TroopDec = function() {
- const V = State.variables, commom = "the <<print commaNum($SFUnit.Troops)>> members of $SF.Lower", S = V.SFUnit;
+ const V = State.variables, commom = "the <<print commaNum($SF.Squad.Troops)>> members of $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`;}
@@ -34737,7 +34780,7 @@ window.HSM = function() {
};
window.Count = function() {
- const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SFUnit, E = V.economy;
+ const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SF.Squad, E = V.economy;
T.SFF = V.SF.Facility.Active;
T.SFFU = 1,T.SFF = C(T.SFF, 0, T.SFFU);
T.FU = 10,S.Firebase = C(S.Firebase, 0, T.FU);
@@ -34753,23 +34796,23 @@ window.Count = function() {
else {T.PGTU = 8,T.SPU = 8,T.GunSU = 8,T.SatU = 8,T.GRU = 8,T.MSU = 8,T.ACU = 8,T.SubU = 8,T.HATU = 8;}
S.PGT = C(S.PGT, 0, T.PGTU);
S.SpacePlane = C(S.SpacePlane, 0, T.SPU), S.GunS = C(S.GunS, 0, T.GunSU);
- S.Satellite = C(S.Satellite, 0, T.SatU), S.GiantRobot = C(S.GiantRobot, 0, T.GRU), S.MissileSilo = C(S.MissileSilo, 0, T.MSU);
+ S.Satellite.lv = C(S.Satellite.lv, 0, T.SatU), S.GiantRobot = C(S.GiantRobot, 0, T.GRU), S.MissileSilo = C(S.MissileSilo, 0, T.MSU);
S.AircraftCarrier = C(S.AircraftCarrier, 0, T.ACU),S.Sub = C(S.Sub, 0, T.SubU),S.HAT = C(S.HAT, 0, T.HATU);
T.GU = T.AVU+T.TVU+T.PGTU, T.G = S.AV+S.TV+S.PGT;
T.H = S.AA+S.TA+S.SpacePlane+S.GunS, T.HU = T.AAU+T.TAU+T.SPU+T.GunSU;
- T.LBU = T.SatU + T.MSU, T.LB = S.Satellite + S.MissileSilo;
+ T.LBU = T.SatU + T.MSU, T.LB = S.Satellite.lv + S.MissileSilo;
T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
T.max = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
if (V.SF.Facility.Toggle > 0) {
T.Base += T.SFF, T.max += T.SFFU;
}
-
+
if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.max += T.GU;
- T.max += T.LBU, T.Base += T.LB;}
+ T.max += T.LBU, T.Base += T.LB;}
if (V.terrain === "oceanic" || V.terrain === "marine") {
T.NY = S.AircraftCarrier + S.Sub + S.HAT, T.Base += T.NY;
T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;}
- V.SF.Units = T.Base, V.SF.Units = C(V.SF.Units, 0, T.max);
+ V.SF.Size = T.Base, V.SF.Size = C(V.SF.Size, 0, T.max);
if (E > 100) {T.Env = 4;}
else if (E > 67) {T.Env = 3;}
else {T.Env = 2;}
@@ -34779,7 +34822,7 @@ window.Count = function() {
};
window.Firebase = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var appear = `is currently constructed in a haphazard fashion.`, barracks = `Soldiers' cots are mixed in with weapons crates and ammunition.`, slave = `Cages for processing slaves lie off to one side,`, common = `and in the center is a common area with tables for soldiers to gather around for meals or rowdy conversations.`, garage = ``, drone = ``, hangar = ``, launch = ``, artillery = ``, comms = ``, training = ``;
if (S.Firebase >= 1) {appear = `has had some organization put into it.`, barracks = `The majority of weapons, armor, and ammunition have been separated from the soldiers' cots into their own armory.`, garage = `A section near the outer wall of the arcology has been converted to a garage with an adjoining vehicle maintenance bay`, drone = `.`;
@@ -34802,7 +34845,7 @@ window.Firebase = function() {
};
window.Armoury = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var weapons = `The weapons are mostly worn rifles that have already seen years of service before $SF.Lower acquired them.`, armor = `The body armor is enough to stop smaller calibers, but nothing serious.`, comms = ``, helmets = ``, ammo = ``, uniforms = ``, special = ``, exo = ``;
if (S.Armoury >= 1) comms = `Radios have been wired into the soldiers helmets`, helmets = `.`;
@@ -34820,9 +34863,9 @@ window.Armoury = function() {
};
window.Drugs = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var amphet = ``, phen = ``, steroid = ``, downer = ``, concen = ``, stimpack = ``, stabilizer = ``;
-
+
if (S.Drugs >= 1) amphet = `Amphetamines have been added to the cocktail at a low dosage to act as a stimulant, physical performance enhancer, cognition control enhancer. Some side-effects exist.`;
if (S.Drugs >= 2) phen = `Phencyclidine has been added to the cocktail at a low dosage as a dissociative psychotropic for soldiers in battle to introduce feelings of detachment, strength and invincibility, and aggression. Some side-effects reduce the tolerable dosage before soldiers go on uncontrollable violent outbreaks.`;
if (S.Drugs >= 3) steroid = `Testosterone is being produced for soldiers in training as a natural muscle growth stimulant and to invoke aggression.`;
@@ -34838,7 +34881,7 @@ window.Drugs = function() {
};
window.LUAV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `have been recommissioned for use by $SF.Lower`, b = `.`, c = ``, d = ``, e = ``, f = ``, g = ``, h = ``, i = ``, j = ``, k = ``;
if (S.Drones >= 2) a = `equipped with missiles are resting on one side of the drone bay`, b = `, as well as destroying the occasional target.`;
@@ -34855,7 +34898,7 @@ window.LUAV = function() {
};
window.AV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var b = `has been recommissioned for use by $SF.Lower. They`, c = `; mechanics are methodically checking the recent purchases for battle-readiness`, MG = `120 mm main gun is enough to handle the majority of opponents around the Free Cities.`, engine = ``, armor = ``, armor2 = ``, ammo = ``, mg = ``, fireC0 = ``, fireC1 = ``, fireC2 = ``, fireC3 = ``, turret = ``;
if (S.AV >= 2) engine = `The engine has been overhauled, allowing much faster maneuvering around the battlefield.`, b = ``, c = ``;
@@ -34872,7 +34915,7 @@ window.AV = function() {
};
window.TV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var B = `has been recommissioned for use by $SF.Lower. They`, C = `; mechanics are giving the new purchases a final tuneup`, squad = `a squad`, G1 = `20`, G2 = `in a firefight`, e0 = `The engine has been`, engine = ``, armor = ``, tires = ``, m1 = ``, m2 = ``, pod1 = ``, pod2 = ``;
if (S.TV >= 2) engine = `${e0} overhauled, allowing for higher mobility.`, C = ``, B = ``;
@@ -34889,7 +34932,7 @@ window.TV = function() {
};
window.PGT = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var b = `has been sold to $SF.Lower through back channels to support a failing Old World nation. The tank is so large it cannot fit inside the garage, and has`, c = ``, engines = `. Two engines power the left and right sides of the tank separately, leaving it underpowered and slow`, gun0 = ``, gun1 = ``, gun2 = `an undersized main gun and makeshift firing system from a standard battle tank`, armor1 = ``, armor0 = ``, cannon = ``, laser = ``, PGTframe = ``;
if (S.PGT >= 2) c = `rests in`, b = ``, engines = ` and powered by their own engine, allowing the tank to travel with an unsettling speed for its massive bulk`;
@@ -34906,7 +34949,7 @@ window.PGT = function() {
};
window.AA = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var W1 = `only armed`, W2 = `,`, W3 = `a poor weapon against flying targets, but enough to handle ground forces`, group = `A small group of attack VTOL have been recommissioned for use by $SF.Lower, enough to make up a squadron`, engines = ``, TAI = ``, lock = ``, support = ``, stealth = ``, scramble = ``, PAI = ``;
if (S.AA >= 2) W1 = `armed`, W2 = ` and air-to-air missiles,`, W3 = `a combination that can defend the arcology from enemy aircraft, as well as`, support = ` support ground troops`;
@@ -34923,7 +34966,7 @@ window.AA = function() {
};
window.TA = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var Num = `number`, type = `tiltrotor`, capacity = `small platoon or 15`, engines = ``, engines2 = ``, Radar = ``, Armor = ``, landing = ``, miniguns = ``, counter = ``;
if (S.TA >= 2) engines = `The tiltrotor engines have been replaced with a more powerful engine, allowing faster travel times.`;
@@ -34940,7 +34983,7 @@ window.TA = function() {
};
window.SP = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var engine = `ramjet engines in the atmosphere that can reach Mach 10`, b = `has been purchased from an insolvent Old World nation. It `, shield = ``, camera = ``, efficiency = ``, camera2 = ``, drag = ``, crew = ``, engine2 = ``, skin = ``;
if (S.SpacePlane >= 2) b = ``, shield = `The current heat shielding has been upgraded, reducing the likelihood of heat damage during reentry.`;
@@ -34957,7 +35000,7 @@ window.SP = function() {
};
window.GunS = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `has been recommissioned for use by $SF.Lower. Currently, it `, b = ``, c = ``, d = ``, e = `Miniguns and Gatling cannons line`, f = `, though the distance to ground targets renders the smaller calibers somewhat less useful`, g = ``, h = ``, i = ``, j = ``, k = ``;
if (S.GunS >= 2) b = `Infrared sensors have been added for the gunners to better pick targets.`, a = ``;
@@ -34974,26 +35017,26 @@ window.GunS = function() {
};
window.Sat = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var loc = `An unused science satellite has been purchased from an Old World nation. While currently useless, it holds potential to be a powerful tool.`, gyro = ``, telemetry = ``, thrusters = ``, solar = ``, surviv = ``, laser = ``, heat = ``, reactor = ``, lens = ``, kin = ``;
- if (S.Satellite >= 2) {
- if (V.SatLaunched < 1) {loc = `The satellite is being worked on in the Launch Bay.`;} else {loc = `The satellite is in geosynchronous orbit, far above the arcology.`;}
+ if (S.Satellite.lv >= 2) {
+ if (V.SF.Squad.Satellite.InOrbit < 1) {loc = `The satellite is being worked on in the Launch Bay.`;} else {loc = `The satellite is in geosynchronous orbit, far above the arcology.`;}
gyro = `A suite of sensors have been installed to ensure the satellite can detect attitude and orbital altitude.`;}
- if (S.Satellite >= 3) telemetry = `Telemetry systems have been installed to communicate with the satellite in orbit, with strong encryption measures.`;
- if (S.Satellite >= 4) thrusters = `Thrusters have been installed to control satellite attitude and orbit.`;
- if (S.Satellite >= 5) solar = `A massive folding solar panel array, combined with the latest in battery technology allow the satellite to store an enormous amount of energy relatively quickly.`, surviv = `Enough of the satellite has been finished that it can expect to survive for a significant period of time in space.`;
- if (S.Satellite >= 6) laser = `A laser cannon has been mounted facing the earth, capable of cutting through steel in seconds`, heat = ` while generating a large amount of heat.`;
- if (S.Satellite >= 7) heat = `. The installed heatsink allows the laser cannon to fire more frequently without damaging the satellite.`;
- if (S.Satellite >= 8) reactor = `A small, efficient nuclear reactor has been installed to continue generating energy while in the Earth's shadow.`;
- if (S.Satellite >= 9) lens = `A higher quality and adjustable lens has been installed on the laser, allowing scalpel precision on armor or wide-area blasts on unarmored targets.`;
- if (S.Satellite >= 10) kin = `A magazine of directable tungsten rods have been mounted to the exterior of the satellite, allowing for kinetic bombardment roughly equal to a series of nuclear blasts.`;
+ if (S.Satellite.lv >= 3) telemetry = `Telemetry systems have been installed to communicate with the satellite in orbit, with strong encryption measures.`;
+ if (S.Satellite.lv >= 4) thrusters = `Thrusters have been installed to control satellite attitude and orbit.`;
+ if (S.Satellite.lv >= 5) solar = `A massive folding solar panel array, combined with the latest in battery technology allow the satellite to store an enormous amount of energy relatively quickly.`, surviv = `Enough of the satellite has been finished that it can expect to survive for a significant period of time in space.`;
+ if (S.Satellite.lv >= 6) laser = `A laser cannon has been mounted facing the earth, capable of cutting through steel in seconds`, heat = ` while generating a large amount of heat.`;
+ if (S.Satellite.lv >= 7) heat = `. The installed heatsink allows the laser cannon to fire more frequently without damaging the satellite.`;
+ if (S.Satellite.lv >= 8) reactor = `A small, efficient nuclear reactor has been installed to continue generating energy while in the Earth's shadow.`;
+ if (S.Satellite.lv >= 9) lens = `A higher quality and adjustable lens has been installed on the laser, allowing scalpel precision on armor or wide-area blasts on unarmored targets.`;
+ if (S.Satellite.lv >= 10) kin = `A magazine of directable tungsten rods have been mounted to the exterior of the satellite, allowing for kinetic bombardment roughly equal to a series of nuclear blasts.`;
return `${loc} ${gyro} ${thrusters} ${telemetry} ${solar} ${reactor} ${surviv} ${laser}${heat} ${lens} ${kin}`;
};
window.GR = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var loc = `has been purchased from a crumbling Old World nation. It`, power = `Large batteries mounted in oversized shoulders power the robot for up to ten minutes of use, though they make for large targets.`, knife = `simply a 8.5 meter long knife, though additional weapons are under development.`, armor = ``, actuator = ``, cannon = ``, heatsink = ``, ammo = ``, missile = ``;
if (S.GiantRobot >= 2) loc = ``, armor = `Armor plating has been mounted over the majority of the robot.`;
@@ -35010,7 +35053,7 @@ window.GR = function() {
};
window.ms = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `A cruise missile launch site has been constructed near the base of`, b = `outdated, something quickly rigged together to give the launch site something to fire in the case of an attack`, c = ``, d = ``, e = ``, f = ``, g = ``, h = ``;
if (S.MissileSilo >= 2) b = `a modern missile`, c = `, tipped with a conventional warhead`;
@@ -35027,7 +35070,7 @@ window.ms = function() {
};
window.AC = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `has been recommisioned from the Old World for $SF.Lower. It`, jets = `Formerly mothballed strike jets`, loc = ``, radar = ``, AA = ``, prop = ``, torp = ``, armor = ``, power = ``, scramble = ``;
if (V.week % 6 === 0) { loc = `moored to the pier in the Naval Yard`; } else { loc = `patrolling the waters near $arcologies[0].name`; }
@@ -35045,7 +35088,7 @@ window.AC = function() {
};
window.Sub = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `has been recommissioned from the old world, and`, reactor = `Because diesel engines provide power and breathing oxygen is kept in pressurized canisters, the sub must frequently surface.`, reactor1 = ``, cal = ``, hull = ``, tubes = ``, torpedoes = ``, sonar = ``, control = ``, missiles = ``;
if (S.Sub >= 2) recom = ``, reactor = `A nuclear reactor provides power`, reactor1 = `, but because oxygen is still kept in pressurized canisters the sub must frequently surface to replenish its oxygen stocks.`;
@@ -35062,7 +35105,7 @@ window.Sub = function() {
};
window.HAT = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `, has been recommissioned for use by $SF.Lower. It`, tons = `200`, skirt = ``, guns = ``, guns2 = ``, fans = ``, speed = ``, turbines = ``, armor = ``, ramps = ``, HATframe = ``, loadout = ``;
if (S.HAT >= 2) skirt = `The skirt has been upgraded to increase durability and improve cushion when traveling over uneven terrain and waves.`, recom = `,`;
@@ -35079,34 +35122,34 @@ window.HAT = function() {
};
window.Interactions = function() {
- const V = State.variables, C = V.SFColonel, T = State.temporary;
+ const V = State.variables, C = V.SF.Colonel, T = State.temporary;
var choice = ``, time = ``;
-
- if (V.SF.WG > 0){
+
+ if (V.SF.Gift > 0){
if (V.choice == 1){
choice = `$SF.Caps is turning over spare capital in tribute this week. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I think I can find @@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ for you, boss."`;}
- else {
+ else {
choice += `"We can spare@@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ in tribute this week, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 2){
choice = `$SF.Caps will be throwing a military parade this week. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I expect the @@.green;public to enjoy@@ the parade, boss."`;}
- else {
+ else {
choice += `"I'll have plans for an @@.green;popular parade@@ on your desk, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 3){
choice = `$SF.Caps will be conducting corporate sabotage on rival arcologies' businesses. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"Our interests should see a @@.yellowgreen;big boost,@@ boss."`;}
- else {
+ else {
choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, <<= properTitle()>>.`;
}}}
if (C.Talk + C.Fun > 0) time = `The Colonel is busy for the rest of the week, so the Lieutenant Colonel will assist you.`;
-
+
return `${time} <br>${choice}`;
};
@@ -35117,7 +35160,7 @@ window.ColonelQuarters = function() {
out = `raises a hand in greeting and nods. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture, the result of her excitation, are visible, and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, <<print SFCR()>>?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"`;
}else if (R > 50){
out = `is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, <<print SFCR()>>," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, <<print SFCR()>>," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "Excellent", she laughs. "I have to say; it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"`;
- }else if (R > 70 && V.SF.Depravity >= 1.5 && V.SFColonel.Core == "cruel"){
+ }else if (R > 70 && V.SF.Depravity >= 1.5 && V.SF.Colonel.Core == "cruel"){
out = `is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, <<print SFCR()>>, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that <<print SFCR()>>," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem - you're here to talk business. So, what's up?"`;
}else{
out = `is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey <<print SFCR()>>," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"`;}
@@ -35128,7 +35171,7 @@ window.progress = function(x,max) {
var out = `â`, z, i;
if (max === undefined) {
Math.clamp(x,0,10);
- if (State.variables.SF.Units < 30) {
+ if (State.variables.SF.Size < 30) {
z = 5 - x;
for (i=0;i<x;i++) out += `â–ˆâ`;
for (i=0;i<z;i++) out += `<span style=\"opacity: 0;\">â–ˆ</span>â`;
@@ -35148,14 +35191,244 @@ window.progress = function(x,max) {
window.SFInit = function() {
const V = State.variables;
- V.SF = {Active:1, Bonus:0, Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
- V.SFUnit = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.SFColonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SFTradeShow = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
- V.SatLaunched = 0, V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
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:[]};
};
+window.SFBC = function() {
+ const V = State.variables;
+ function Init() {
+ delete V.SFMODToggle;
+ delete V.securityForceActive;
+ delete V.securityForceCreate;
+ delete V.securityForceEventSeen;
+ }
+ function Main() {
+ delete V.securityForceActive;
+ delete V.securityForceRecruit;
+ delete V.securityForceTrade;
+ delete V.securityForceBooty;
+ delete V.securityForceIncome;
+ delete V.securityForceMissionEfficiency;
+ delete V.securityForceProfitable;
+ delete V.TierTwoUnlock;
+ delete V.securityForceDepravity;
+ delete V.SFAO;
+ delete V.securityForceUpgradeTokenReset;
+ delete V.securityForceUpgradeToken;
+ delete V.securityForceGiftToken;
+ delete V.securityForceRulesOfEngagement;
+ delete V.securityForceFocus;
+ delete V.securityForceAccountability;
+ delete V.securityForceName;
+ delete V.SubsidyActive;
+ }
+ function Colonel() {
+ delete V.SubsidyActive;
+ delete V.ColonelCore;
+ delete V.securityForceColonelToken;
+ delete V.securityForceColonelSexed;
+ delete V.ColonelRelationship;
+ }
+ function TradeShow() {
+ delete V.OverallTradeShowAttendance;
+ delete V.CurrentTradeShowAttendance;
+ delete V.TradeShowIncome;
+ delete V.TotalTradeShowIncome;
+ delete V.TradeShowHelots;
+ delete V.TotalTradeShowHelots;
+ }
+ function Units() {
+ delete V.securityForcePersonnel;
+ delete V.securityForceInfantryPower;
+ delete V.securityForceArcologyUpgrades;
+ delete V.securityForceVehiclePower;
+ delete V.securityForceDronePower;
+ delete V.securityForceStimulantPower;
+ delete V.securityForceHeavyBattleTank;
+ delete V.securityForceAircraftPower;
+ delete V.securityForceSpacePlanePower;
+ delete V.securityForceAC130;
+ delete V.securityForceSatellitePower;
+ delete V.securityForceGiantRobot;
+ delete V.securityForceMissileSilo;
+ delete V.securityForceAircraftCarrier;
+ delete V.securityForceSubmarine;
+ delete V.securityForceHeavyAmphibiousTransport;
+ }
+
+ if (V.SF == undefined) {
+ if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
+ V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; Init();
+ if (V.securityForceName === undefined) V.securityForceName = "the special force";
+ if (V.SF.Active >= 1) {
+ Object.assign(V.SF, {
+ Depravity:V.securityForceDepravity,
+ Size:V.SFAO,
+ Upgrade:V.securityForceUpgradeToken,
+ Gift:V.securityForceGiftToken,
+ UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock},
+ ROE:V.securityForceRulesOfEngagement,
+ Target:V.securityForceFocus,
+ Regs:V.securityForceAccountability,
+ Caps:"The Special Force",
+ Lower:V.securityForceName,
+ Subsidy:V.SubsidyActive}); Main();
+ if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
+
+ if (V.ColonelCore === undefined) V.ColonelCore = "";
+ if (V.ColonelDiscussion === undefined) V.ColonelDiscussion = 0;
+ if (V.ColonelSexed === undefined) V.ColonelSexed = 0;
+ V.SF.Colonel = {
+ Core:V.ColonelCore,
+ Talk:V.securityForceColonelToken,
+ Fun:V.securityForceColonelSexed,
+ Status:V.ColonelRelationship}; Colonel();
+
+ if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0;
+ if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
+ if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0;
+ if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0;
+ V.SF.MercCon = {
+ History:V.OverallTradeShowAttendance,
+ CanAttend:V.CurrentTradeShowAttendance,
+ Income:V.TradeShowIncome,
+ Revenue:V.TotalTradeShowIncome,
+ Helots:V.TradeShowHelots,
+ TotalHelots:V.TotalTradeShowHelots,
+ Mercs:0,
+ TotalMercs:0}; TradeShow();
+ if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1;
+
+ if (V.securityForceHeavyBattleTank === undefined) V.securityForceHeavyBattleTank = 0;
+ if (V.securityForceSpacePlanePower === undefined) V.securityForceSpacePlanePower = 0;
+ if (V.securityForceAC130 === undefined) V.securityForceAC130 = 0;
+ if (V.securityForceSatellitePower === undefined) V.securityForceSatellitePower = 0;
+ if (V.securityForceGiantRobot === undefined) V.securityForceGiantRobot = 0;
+ if (V.securityForceMissileSilo === undefined) V.securityForceMissileSilo = 0;
+ if (V.securityForceAircraftCarrier === undefined) V.securityForceAircraftCarrier = 0;
+ if (V.securityForceSubmarine === undefined) V.securityForceSubmarine = 0;
+ if (V.securityForceHeavyAmphibiousTransport === undefined) V.securityForceHeavyAmphibiousTransport = 0;
+ V.SF.Squad = {
+ Troops:V.securityForcePersonnel,
+ Armoury:V.securityForceInfantryPower,
+ Firebase:V.securityForceArcologyUpgrades,
+ AV:V.securityForceVehiclePower,
+ TV:V.securityForceVehiclePower,
+ Drones:V.securityForceDronePower,
+ Drugs:V.securityForceStimulantPower,
+ PGT:V.securityForceHeavyBattleTank,
+ AA:V.securityForceAircraftPower,
+ TA:V.securityForceAircraftPower,
+ SpacePlane:V.securityForceSpacePlanePower,
+ GunS:V.securityForceAC130,
+ Satellite:{lv:V.securityForceSatellitePower, InOrbit:0},
+ GiantRobot:V.securityForceGiantRobot,
+ MissileSilo:V.securityForceMissileSilo,
+ AircraftCarrier:V.securityForceAircraftCarrier,
+ Sub:V.securityForceSubmarine,
+ HAT:V.securityForceHeavyAmphibiousTransport}; Units();
+ } else {
+ V.SF = {Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ if (V.securityForceName) {
+ Init(); Main(); Colonel(); TradeShow(); Units();
+ }
+ }
+ 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:[]};
+ } else {
+ if (V.SF.MWU) {
+ delete V.SF.MWU;
+ }
+ if (V.SpecOpsLock != undefined) {
+ V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
+ }
+ if (V.SF.UC == undefined) {
+ V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
+ delete V.SF.SpecOpsLock;
+ }
+ if (V.SF.U != undefined) {
+ V.SF.Upgrade = V.SF.U; delete V.SF.U;
+ }
+ if (V.SF.WG != undefined) {
+ V.SF.Gift = V.SF.WG; delete V.SF.WG;
+ }
+ if (V.SF.Facility == undefined) {
+ 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:[]};
+ }
+ if (V.SF.Bonus == undefined) {
+ V.SF.Bonus = 0;
+ }
+ if (V.SF.Depravity < 0) {
+ V.SF.Depravity = 0;
+ }
+ if (V.SF.Size == undefined) {
+ V.SF.Size = V.SF.Units; delete V.SF.Units;
+ }
+ if (V.SFUnit != undefined) {
+ if (V.SFUnit.AT != undefined) {
+ delete V.SFUnit.AT; V.SFUnitTA = 0;
+ }
+ V.SF.Squad = V.SFUnit;
+ delete V.SFUnit;
+ V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched};
+ delete V.SatLaunched;
+ V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ }
+ if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
+ if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
+ if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
+ if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
+ }
+};
+
+window.BadOutcome = function() {
+ const V = State.variables,t = `The Colonel's`; var r =``;V.SF.Active = -2;
+ switch(V.SF.Colonel.Core) {
+ case "Shell-Shocked":
+ V.SF.BadOutcome = "lockdown",V.trinkets.push("${t} explosives detonator");
+ r +=`Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at Midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`;
+ r+=`<br>The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You receive no money from their exploits, and their total defiance and independance of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rouge. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your Arcology and good name.`;
+ break;
+ case "Cruel":
+ V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0,
+ V.cash -= 10000,V,arcologies[0].prosperity -= 50,V.ASlaves = 49,
+ V.ACitizens = 751,V.helots = 0, V.researchLab.menials = 0,
+ V.researchLab.hired = 0, V.fuckdolls = 0,V.menialBioreactors = 0,
+ V.activeUnits = 0,V.secBots.troops = 0, V.createdSlavesUnits = 0,
+ V.createdMilitiaUnits = 0, V.createdMercUnits = 0;
+ r += `<br>Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for an utterly ferocious rebellion. The promises of rape and plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves) are all thats needed to give the selfish lot of them a nearly unshakable resolve in the task of delivering their overlord Her most coveted prize: You.`;
+ r += `<br>It is now Midnight. The lights are the first thing they disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Things like this were never supposed to happen again. You had promised them that you'd create an army that would protect them...`;
+ r += `<br>Her army vanguard strikes fast and hard throughout the main Plaza, cutting through your security personnel, defensive platoons, and drones with an ease that stinks of months of careful planning and study. Your defensive platoons, veterans of many Battles, are outmanuvered at every turn; their hidden ammunition caches are found empty, their communications networks are mysteriously scrambled, and key chokepoints are found to be booby-trapped before your men can even get to them; their well-rehearsed arcology defense routines have gone to ash. Assuming you ever get a chance to speak to The Colonel again, you would ask if her betrayal was actually inevitable rather than something you triggered.`;
+ r += `<br>You watch with immense dissappointment as the very APC's and IFV's that you paid for now charge into resisting storefronts to storm the armed civillians inside with heavy infantry at point blank range. Battle Tanks trample wounded civillians in the streets as they maneuver to blast your citizens' hastily-made holdouts to pieces, burying dozens of civillian loyalists under mountains of rubble while hundreds more are gunned down in the streets for want of adequate cover. The Plaza is lost; the enemy vanguard has gained access to the Residential Sectors upstairs. Enticed, entire platoons of her vanguard decide to become bandits, ignoring their Colonel's orders and scattering off from the main force to kick down many apartment doors and help themselves to whatever desirable goods or inhabitants they find within.`;
+ r += `<br>Outside, her many aircraft swarm the local airspace to patrol the Arcology outskirts, conduct recon scans of the upper levels, or monitor your sealed penthouse outside the range of your SAM turrets, while shooting down any other fleeing VTOL's. You will not be escaping by air today. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for later enslavement, as the remainder of her army begins to pour into the bloody Plaza. This is your Arcology's darkest hour.`;
+ r += `<br>And yet your Mercenaries stand ready. On security feeds throughout the Residential Sectors and Garrison you see your elite sellswords charging out of their lodgings in full kit. They are few, but this is their home, and you are their Patron and Commander. They hold firm, fighting like legends of old in some places, and fighting like animals in others. The Mercenaries trapped downstairs near The Garrison take to the Markets, pinning down most of The Colonel's reinforcements from various shopping outlets using towed quad anti-aircraft guns, and ultimately cutting off many of the assets needed for The Colonel's ongoing assault upstairs. Enemy troop carriers laden with heavy infantry breach the shopping centers in order to dislodge them, only to have their inhabitants cooked alive before they can disembark in time or shot to pieces even when they do. Keeping these Mercenaries alive are the roving exosuit-clad tank hunter duos that frag entire armour platoons en route to these shopping outlets, resorting to carving open enemy AFV's up close with their powered CQB weapons once they've run out of missiles. Back in the Residencies upstairs, in the still-evacuating streets and atriums, your actively-camoflauged snipers take up choice positions on various balconies and overpasses, sowing panic among the advancing traitors with their impressive anti-material rifles with one explosive headshot after another, sometimes even hitting them through walls and buildings. In large indoor parks leading up to the main Residential courtyard, Mercenary fireteams force enemy flankers to flee every single footpath they walk through, harrassing constantly and preventing any hostile reconnaisance or infiltration from being done.`;
+ r += `<br>The main Residential courtyard features the Residential Sectors' massive elevator complex, which will give The Colonel's forces rapid access to the Promenade, and ultimately, You. In front of it, your Mercenary Captain stands atop one of the many metres-thick sandbag walls his men just assembled there, leading the raging defensive blockade in bringing the vangaurd's assault to a gory halt. ${V.SF.Lower}'s bodies and bits and debris pile up in small walls on the outskirts under the burning heat of hundreds of flying autocannon rounds and dozens of screeching missiles. Before the vanguard's morale can break however, The Colonel shows up in person behind her own lines, kitted in a customized power armour and dragging, of all things, a hydraulic trebucket loaded with a crudely-welded large metal box. She launches the box from beyond your Merceneries' line of sight, sending it reeling towards them and predicting that they will try to shoot it out of the sky. They do, not wanting the slow but strange projectile to hit them directly, only learning of their folly when the metal 'box' detonates midair and releases a dense cloud of cluster bombs over their position. The munitions themselves disable some of the exosuits, but they don't kill too many on their own. However, the bomblets do succeed in detonating the various ammo dumps that were feeding your Mercenaries' blazing guns. The chain explosions, resulting fires, destroyed cover, and widespread casualties and confusion all create the perfect opportunity for The Colonel to storm the previously implacable barricade at the head of her troops, with her followers rushing the merc lines and blasting off the heavy armour plating of your disoriented Mercenaries themselves before stabbing them to death, or in some cases, hauling off the dis-armoured and defeated female Mercenaries they discover for immediate use. As the few intact Mercenaries remaining desperately struggle to hold off the advancing horde with their remaining ammo, The Colonel takes on your dazed Mercenary Captain in single combat. When their ammunition runs dry, and their blasted battlesuits break down, they both eject, and then the knives come out. Minutes later, she stabs him in the side of his skull after she dodges yet another attempt to land a killing blow on her. With the source of Mercenary command and control gone, The Colonel stauches her own bleeding, yanks a trooper out of a near-pristine battlesuit that she now claims for herself, and directly organizes the isolation and extermination of the smaller teams of Mercenaries that are bleeding her troops everywhere else. She routs your Mercenaries for good with the razing of their Garrison structure. The ${V.SF.Lower} now enjoys absolute air and ground superiority. Soon the surviving rear of her army is brought upstairs from the killing floors down in the Markets, and the many elevators and cargo lifts of the elevator complex are boarded, with your executive override codes to remotely shut down the elevators somehow being manually bypassed by her combat engineers. It won't be long now.`;
+ r += `<br>Dawn has broken over the Free City. Only five hours into the slaughter (of which your Mercenaries no doubt bought you at least three), it becomes very clear to you that the only way to save your arcology is to destroy it. Everything and Everyone will burn before you let this crazy bitch and her rabid dogs get thier dirty hands on you or your slaves. On your order, your most loyal subordinates, the ones who were with you since the early days to patrol your Arcology before you even had drones to protect it, fight their way to through the carnage of your panicking civillians on The Promenade to get to the exact hidden elevators that your Personal Assistant specifies for them. Their destination is the arcology's reactor complex, of course. Following the PA's instructions precisely, they arm their many high-yield explosive charges on your now-exposed and de-stabilized reactor, and in one final service to you, detonate them, creating a collosal explosion. The rapidly ascending heretics quite literally have the rug pulled from under them, as the blast takes out nearly all of the arcology's lesser foundational support beams, thus collapsing many thousands of metric tons of concrete, steel, plastic, and plaster out from underneath the upward bound Colonel and her men... And everyone else, unforteunately. With no foundation any longer, all of your arcology's interior Sectors are utterly gutted from the bottom-up by gravity itself, and everything beneath your ration-stocked, backup-powered Penthouse crumbles to the earth. The massive cloud of dust created by the widespread fires and interior collapse ends up covering the entire Free City for hours. Her aircraft, now berift of their logistical support and command structure, immediately fly off to neighboring arcologies to offer their services to the various employers there, seeing as the coup has failed and they have nowhere else to go. The skies are free for You to travel as you please, but You aren't going anywhere.`;
+ r += `<br>It is Eveningtime when the tremors finally stop. Everything below your Penthouse is ruin, and your arcology, its population, and your reputation are now essentially dust. However, the arcology did not fall. It. Is. Still. Yours. You shall rise again, not flee this tragedy in shame. Of course, no one will ever know that you sacrificed the arcology delibrately in order to save yourself; it is all too easy to claim that The Colonel carelessly damaged the reactor complex during her assault, ironically causing her own defeat. Frankly, sacrificing most of your tenants doesn't bother you as much as it probably should; maybe its because you know that if The Colonel and her men had won, all those people were as good as dead anyway.`;
+ r += `<br>You know that if you want to survive, you'll need to sorround yourself with workers and allies to rebuild fast, else your rivals gobble you up. It costs you a horrific sum to clear and process the wreckage and rebuild the basic Sector superstructures and infrastructure for your arcology on such short notice, even after liqidating everything your workers salvage. Your powerful friends still residing in the Old World or other Free Cities have lent you a suprising amount of aid too, with quite a few lended super-heavy contruction assets getting huge amounts of work done quickly. Even then, what you've been able to rebuild is very little. After a nearly sleepless, sexless week of immense toil, you've successfully organized tens of thousands of people in restoring the arcology to a barely functional condition (along with rudimentary imitations of all your upgrades), and you've even got some new Garrison Mercenaries in by week's end too... But its just not the same. If it weren't for your bruised weather-plating your arcology would look like a giant skeleton. Inside, it feels like a concrete boneyard; everything has been built cheap and utilitarian, and the walls aren't even painted. With only a few operational services staffed by commuters from neighboring arcologies, there is just an eerie silence just about everywhere. With few amenities for relief, there are going to be many long days ahead for your few tenants, most of them being wealthy but distraught returning travellers who left before the attack. Maybe your slaves can help entertain them. A lot of these people are VIP's it seems.`;
+ r += `<br>It is now Midnight. In a rare moment of reflection, you contemplate that what The Colonel just did to your arcology was exactly what you were all too happy to have her do to dozens, if not hundreds of innocent villages and townships under your shadow during her 'Raiding and Slaving' operations. Nevertheless, You have hard work ahead of you, especially now that your enemies see that you are now much weaker than you have ever been.`;
+ r += `<br>The Colonel's body was never found.`;
+ break;
+ case "Kind":
+ V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"),
+ V.Cash += 55000,V.helots += 73;
+ r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`;
+ r += `<br>At Midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`;
+ r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavillion, you see a white gift card standing upright.`;
+ r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her dissappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavours.`;
+ r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
+ break;
+ }
+}
+
/*:: DebugJS [script]*/
/*
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index d9dfa28274ef4faf28ece6802bbdd4f6fa85b4e6..e8e2437b88d2e50397e200672bb4c65b4e57859c 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -2378,7 +2378,7 @@ how addict to aphrodisiacs slave is
0 - not
1-2 - new addict
3-9 - confirmed addict
-10+ - dependant
+10+ - dependent
fuckdoll:
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 22286e0bb5d237ceac581ad2f0ebbedee3522dd6..a7979840bf7ed3385e49d7bee0625ad692beb82b 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -345,12 +345,12 @@
<<set _dishRating -= 1>>
<</if>>
<<if $activeSlave.lipsImplant > 0>>
- All of sudden one of your guest's face turns red, then purple. It is clear he is choking on something. You leap out of your seat, rush over to him and start the Heimlich maneuver. On your third thrust into his abdominal, a piece of lip implants flies out of his mouth and hits another guest square in the face. You apologize profusely for your carelessness in selecting the meat. The rest of your guests had a great laugh at your @@.red;expense@@.
+ All of sudden one of your guests' face turns red, then purple. It is clear he is choking on something. You leap out of your seat, rush over to him and start the Heimlich maneuver. On your third thrust into his abdominal, a piece of lip implants flies out of his mouth and hits another guest square in the face. You apologize profusely for your carelessness in selecting the meat. The rest of your guests had a great laugh at your @@.red;expense@@.
<<set _dishRating -= 5>>
<<set $rep -= 500>>
<</if>>
<<if $activeSlave.buttImplant > 0>>
- All of sudden one of your guest clutches his chest. His face turns pale as a ghost, foaming at the mouth falls over onto the table. You rush over to him, it is clear he is not breathing. You don't know what's wrong with him. It could not have been poison, since any toxins in the food would have been detected by your virtual assistant. You order your slave to rush the man to the nearest emergency clinic. You were informed later that he had died from ingesting a silicone butt implant. Your reputation @@.red;suffers@@ greatly due to this incident.
+ All of sudden one of your guests clutches his chest. His face turns pale as a ghost, foaming at the mouth falls over onto the table. You rush over to him, it is clear he is not breathing. You don't know what's wrong with him. It could not have been poison, since any toxins in the food would have been detected by your virtual assistant. You order your slave to rush the man to the nearest emergency clinic. You were informed later that he had died from ingesting a silicone butt implant. Your reputation @@.red;suffers@@ greatly due to this incident.
<<set _dishRating -= 10>>
<<set $rep -= 5000>>
<</if>>
diff --git a/src/Mods/DinnerParty/dinnerPartyPreparations.tw b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
index 018bb5fd4e6c4c2f93e6b3dcd5c07e3965e69004..1032e3f551b1dc9b3ebc0f927ef5b7bdfbc17f05 100644
--- a/src/Mods/DinnerParty/dinnerPartyPreparations.tw
+++ b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
@@ -2,12 +2,12 @@
<<set $nextButton = "Cancel The Event", $nextLink = "Main">>
-Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station. Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host. The success of the evening is judged by how well the human offering is prepared. Guests to these events are encouraged to rate the dishes and special dishes are expected. If the host receives 5 stars on all the dishes, they will receive the coveted title "<<if $PC.title == 1>>Master<<else>>Mistress<</if>> of The Culinary Arts". You ask $assistantName to show you a list of cooking instructions for those dishes.
+Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station. Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host. The success of the evening is judged by how well the human offering is prepared. Guests to these events are encouraged to rate the dishes and special dishes are expected. If the host receives 5 stars on all the dishes, they will receive the coveted title "<<if $PC.title == 1>>Master<<else>>Mistress<</if>> of The Culinary Arts". You ask $assistantName to show you a list of cooking instructions for those dishes.
<h1>Cooking Instructions and Recipes:</h1>
-''Roast Long Pig'' – Made with the meat of a human roasted on a spit. Young meat is better than old meat. There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy. Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember you can't eat silicone, and virgin meat is highly sought after. If the human is pregnant a veal dish can also be made from the fetus.
+''Roast Long Pig'' – Made with the meat of a human roasted on a spit. Young meat is better than old meat. There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy. Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember you can't eat silicone, and virgin meat is highly sought after. <<if $seePreg != 0>>If the human is pregnant a veal dish can also be made from the fetus.<</if>>
<br><br>
''Dicky Roll'' – An erect penis made into a spring roll. For best results harvest the penis at the moment of ejaculation. The size of the penis and the amount of accumulated ejaculate all affect the quality of the dish. Too big of a dick and too thin of semen can both ruin a dish.
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 281cdf4c1915602a013f2d368875327efa5f66ae..92b56410fdb85fa1cf5e5b307f72aad6878d7b15 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -98,21 +98,20 @@
<<set _SFMod = 1.5>>
<<set _turns = $maxTurns * 2>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <<if $SFUnit.Firebase >= 7>>
- <<set _atkMod += ($SFUnit.Firebase - 6) * 0.05>>
+ <<if $SF.Squad.Firebase >= 7>>
+ <<set _atkMod += ($SF.Squad.Firebase - 6) * 0.05>>
<</if>>
- <<if $SFUnit.GunS >= 1>>
- <<set _defMod += $SFUnit.GunS * 0.05>>
+ <<if $SF.Squad.GunS >= 1>>
+ <<set _defMod += $SF.Squad.GunS * 0.05>>
<</if>>
- <<if $SFUnit.Satellite >= 5 && $SatLaunched > 0>>
- <<set _atkMod += ($SFUnit.Satellite - 5) * 0.05>>
+ <<if $SF.Squad.Satellite.lv >= 5 && $SF.Squad.Satellite.InOrbit > 0>>
+ <<set _atkMod += ($SF.Squad.Satellite.lv - 5) * 0.05>>
<</if>>
- <<if $SFUnit.GiantRobot >= 6>>
- <<set _defMod += ($SFUnit.GiantRobot - 5) * 0.05>>
+ <<if $SF.Squad.GiantRobot >= 6>>
+ <<set _defMod += ($SF.Squad.GiantRobot - 5) * 0.05>>
<</if>>
- <<if $SFUnit.MissileSilo >= 1 && $SatLaunched > 0>>
- <<set _atkMod += $SFUnit.MissileSilo * 0.05>>
- <<set _defMod += $SFUnit.MissileSilo * 0.05>>
+ <<if $SF.Squad.MissileSilo >= 1>>
+ <<set _atkMod += $SF.Squad.MissileSilo * 0.05>>
<</if>>
<</if>>
<</if>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 608ba9aeeef25e3c1f99a762504cb4548e7d3110..ee754659331ad6dc875fb7fec9d03b554ae5d8e4 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -247,7 +247,7 @@ __Battle Plan__:
<<replace "#leader">><strong><<print _leader>></strong><</replace>>
<</link>>
<</if>>
- <<if $SF.Toggle && $SF.Active >= 1 && $SFTradeShow.CanAttend === -1>>
+ <<if $SF.Toggle && $SF.Active >= 1 && $SF.MercCon.CanAttend === -1>>
|
<<link "Let The Colonel lead the troops">>
<<set $leadingTroops = "colonel">>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 5782d88a8ba7364ad71f91e95cccc123ae35841a..f6b2b2b3885275f6e0b23e50e86fd2611a78ac02 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -1509,21 +1509,21 @@
<br>
<<include "unitsBattleReport">>
- <<if $SF.Toggle && $SF.Active >= 1 && ($SFUnit.Firebase >= 7 || $SFUnit.GunS >= 1 || $SFUnit.Satellite >= 5 || $SFUnit.GiantRobot >= 6 || $SFUnit.MissileSilo >= 1)>>
+ <<if $SF.Toggle && $SF.Active >= 1 && ($SF.Squad.Firebase >= 7 || $SF.Squad.GunS >= 1 || $SF.Squad.Satellite.lv >= 5 || $SF.Squad.GiantRobot >= 6 || $SF.Squad.MissileSilo >= 1)>>
/* SF upgrades effects */ <br><br>
- <<if $SFUnit.Firebase >= 7>>
+ <<if $SF.Squad.Firebase >= 7>>
The artillery pieces installed around the $SF.Lower firebase provided vital fire support to the troops in the field.
<</if>>
- <<if $SFUnit.GunS >= 1>>
+ <<if $SF.Squad.GunS >= 1>>
The gunship gave our troops an undeniable advantage in recon capabilities, air superiority and fire support.
<</if>>
- <<if $SFUnit.Satellite >= 5 && $SatLaunched > 0>>
+ <<if $SF.Squad.Satellite.lv >= 5 && $SF.Squad.Satellite.InOrbit > 0>>
The $SF.Lower satellite's devastating power was employed with great efficiency against the enemy.
<</if>>
- <<if $SFUnit.GiantRobot >= 6>>
+ <<if $SF.Squad.GiantRobot >= 6>>
The giant robot of the $SF.Lower proved to be a great boon to our troops, shielding many from the worst the enemy had to offer.
<</if>>
- <<if $SFUnit.MissileSilo >= 1>>
+ <<if $SF.Squad.MissileSilo >= 1>>
The missile silo exterminated many enemy soldiers even before the battle would begin.
<</if>>
<</if>>
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index 6c274f0a9b62d08ee06d7d07d9fa5275933aae5f..e53db47327e6988c42c0dc8ba26d30e7c9c05ad8 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -106,9 +106,9 @@ Your authority is
<<set _authGrowth += 12 * $activeUnits>>
<</if>>
-<<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
+<<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>>
Having a powerful special force, increases your authority.
- <<set _authGrowth += $SF.Units/10>>
+ <<set _authGrowth += $SF.Size/10>>
<</if>>
<<if $arcologies[0].FSChattelReligionist >= 90>>
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index bbf21ceca64745f03da68c99ab192f3fb5acef13..e4d33710c7006521ec6d003c9b272c8ca2dbd49e 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -317,7 +317,7 @@
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.//
- <<elseif $SFSupportLevel && $SFUnit.Firebase >= 4 && $reqHelots > 5>>
+ <<elseif $SFSupportLevel && $SF.Squad.Firebase >= 4 && $reqHelots > 5>>
<br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 2000, $reqHelots -= 5]]
@@ -325,7 +325,7 @@
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 2 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
+ <<elseif $SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && $reqHelots > 5>>
<br>''Troops detachment:'' $SF.Caps will provide troops to the security department.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
@@ -333,7 +333,7 @@
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 3 && $SFUnit.Firebase >= 6 && $reqHelots > 5>>
+ <<elseif $SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && $reqHelots > 5>>
<br>''Full Support:'' $SF.Caps will give the security department its full support.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]]
@@ -341,7 +341,7 @@
<br>//Not enough Authority.//
<</if>>
<br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.//
- <<elseif $SFSupportLevel === 4 && $SFUnit.Firebase === 10 && $reqHelots > 5>>
+ <<elseif $SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && $reqHelots > 5>>
<br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network.
<<if $authority >= 1000>>
[[Implement|edicts][$SFSupportLevel++, $cash -=50000, $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqHelots -= 5]]
diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw
index 91c470b22cd01b36d61caa6d88360e80de86d8c2..0935bf038e6bcefac27c8a998cd1b56a623d45b9 100644
--- a/src/SecExp/rebellionOptions.tw
+++ b/src/SecExp/rebellionOptions.tw
@@ -97,10 +97,10 @@
<</if>>
<</if>>
<</for>>
- <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>>
+ <<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong<</if>>
are called to defend the arcology from this menace.
<<else>>
- <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SFUnit.Troops)>> strong<</if>> <</if>>
+ <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $SF.Toggle && $SF.Active >= 1>>and $SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong<</if>> <</if>>
are called to defend the arcology from this menace.
<</if>>
<hr>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 60da4c3b81557d20c516e45bea2e8ac9b31436f2..afc4a39e388bc0757c5980e86834a9c9ddc3860d 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -116,7 +116,7 @@
<<elseif $battleResult == -2>>
The fight was long and hard. Our men in the end had to yield to the rebelling slaves, which were fortunately unable to capitalize on their victory.
<<elseif $battleResult == -1>>
- You gave your troops the order to surrender, obediently they stand down.
+ You gave your troops the order to surrender; they obediently stand down.
<</if>>
/* effects */
@@ -572,6 +572,7 @@
The garrison assigned to the facility housing $assistantName's mainframe prevented any sabotage attempt.
<</if>>
<<if $garrison.penthouse == 1 && $Bodyguard != 0>>
+ <<setLocalPronouns $Bodyguard 2>>
The garrison assigned to the penthouse together with your loyal bodyguard stopped all assaults against your penthouse with ease.
<<elseif $Bodyguard != 0>>
<<if random(1,100) <= 75>>
@@ -612,6 +613,7 @@
Fortunately you managed to avoid injury.
<</if>>
<<if $Concubine != 0>>
+ <<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
<<if $Concubine.combatSkill == 1>>
<<set _woundChance -= 2>>
@@ -640,7 +642,7 @@
<<if $Concubine.butt >= 6>>
<<set _woundChance += 1>>
<</if>>
- <<if $Concubine.belly >= 10000>>
+ <<if $Concubine.belly >= 10000>>
<<set _woundChance += 1>>
<</if>>
<<if $Concubine.dick >= 8>>
@@ -657,16 +659,16 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced $his throat, severing $his vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit $his face, severely damaging $his eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
- an explosion near her caused the loss of all her limbs.
+ an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
<<elseif $woundType >= 4>>
- a stray shot severely wounded her.
+ a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
@@ -720,16 +722,16 @@
During one of the assaults your bodyguard was hit.
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- A splinter pierced her throat, severing her vocal cords.
+ A splinter pierced _his2 throat, severing _his2 vocal cords.
<<set $Bodyguard.voice = 0>>
<<elseif $woundType == 2>>
- A splinter hit her face, severely damaging her eyes.
+ A splinter hit _his2 face, severely damaging _his2 eyes.
<<set $Bodyguard.eyes = -2>>
<<elseif $woundType == 3>>
- An explosion near her caused the loss of all her limbs.
+ An explosion near _him2 caused the loss of all _his2 limbs.
<<set $Bodyguard.amp = 1>>
<<elseif $woundType >= 4>>
- A stray shot severely wounded her.
+ A stray shot severely wounded _him2.
<<if $Bodyguard.health >= -60>>
<<set $Bodyguard.health -= 30>>
<<else>>
@@ -782,6 +784,7 @@
Fortunately you managed to avoid injury.
<</if>>
<<if $Concubine != 0>>
+ <<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
<<if $Concubine.combatSkill == 1>>
<<set _woundChance -= 2>>
@@ -827,16 +830,16 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced $his throat, severing $his vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit $his face, severely damaging $his eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
- an explosion near her caused the loss of all her limbs.
+ an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
<<elseif $woundType >= 4>>
- a stray shot severely wounded her.
+ a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
@@ -890,6 +893,7 @@
Fortunately you managed to avoid injury.
<</if>>
<<if $Concubine != 0>>
+ <<setLocalPronouns $Concubine>>
<<set _woundChance = 0>>
<<if $Concubine.combatSkill == 1>>
<<set _woundChance -= 2>>
@@ -935,16 +939,16 @@
Your concubine was unfortunately caught in the crossfire and
<<set $woundType = random(1,10)>>
<<if $woundType == 1>>
- a splinter pierced her throat, severing her vocal cords.
+ a splinter pierced $his throat, severing $his vocal cords.
<<set $Concubine.voice = 0>>
<<elseif $woundType == 2>>
- a splinter hit her face, severely damaging her eyes.
+ a splinter hit $his face, severely damaging $his eyes.
<<set $Concubine.eyes = -2>>
<<elseif $woundType == 3>>
- an explosion near her caused the loss of all her limbs.
+ an explosion near $him caused the loss of all $his limbs.
<<set $Concubine.amp = 1>>
<<elseif $woundType >= 4>>
- a stray shot severely wounded her.
+ a stray shot severely wounded $him.
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 5385f0867edb4c89acca05b09c7bda32eb693ce0..6d81ae9f9e84b68ff573028cd9edb17c334ea331 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -208,9 +208,9 @@ The riot control center opens its guarded doors to you. The great chamber inside
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <<if $SFSupportLevel >= 4 && !$SFGear && $SFUnit.Armoury >= 8>> <<= Count()>>
- <br><br> <<link "Give the riot unit access to the combat armor suits of $SF.Lower.""riotControlCenter">> <<set $SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10)))>> <</link>>
- <br>//Costs <<print cashFormat(Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10))))>>
+ <<if $SFSupportLevel >= 4 && !$SFGear && $SF.Squad.Armoury >= 8>> <<= Count()>>
+ <br><br> <<link "Give the riot unit access to the combat armor suits of $SF.Lower.""riotControlCenter">> <<set $SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(500000*_Env*(1.15+($SF.Squad.Armoury/10)))>> <</link>>
+ <br>//Costs <<print cashFormat(Math.ceil(500000*_Env*(1.15+($SF.Squad.Armoury/10))))>>
<<else>>
<br><br>//You have given the riot unit access to the combat armor suits of $SF.Lower.//
<</if>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index fddf8c26bc805f7717ce97b176749bb1da304835..09dac9c8841802f1ad7f21d09bcb03a0225c530a 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -199,15 +199,15 @@ You have <span id="secHel"> <<print commaNum($secHelots)>> </span> slaves workin
/* security level and upgrades */
Your security level (@@.deepskyblue;<<print $security>>@@)
<<if $security <= 20>>
- is dangerously low.
+ is dangerously low.
<<elseif $security <= 40>>
- is low.
+ is low.
<<elseif $security <= 60>>
- is decent.
+ is decent.
<<elseif $security <= 80>>
- is good.
+ is good.
<<else>>
- is great.
+ is great.
<</if>>
Considering the current upgrades the resting level for security is <<print $secRestPoint>>, while the effective maximum level is <<print Math.trunc($secRestPoint * (Math.clamp($secHelots,0,$reqHelots) / $reqHelots))>>.
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index aa6e0755196db7c29ee86e24c517ddb06ee328a0..a871d048792b9229a3dde7a10e7781a2e43001b7 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -284,9 +284,9 @@
<<if $militiaFounded == 1 || $activeUnits >= 1>>
<br>
<strong> Military</strong>: /* militia */
- <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
+ <<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>>
Having a powerful special force attracts a lot of citizens, hopeful that they may be able to fight along side it.
- <<set _recruits += random(0,(Math.round($SF.Units/10)))>>
+ <<set _recruits += random(0,(Math.round($SF.Size/10)))>>
<</if>>
<<if $propCampaign >= 1 && $propFocus == "recruitment">>
<<if $RecuriterOffice == 0 || $Recruiter == 0>>
@@ -436,9 +436,9 @@
<<if $crime > 60>>
The powerful crime organizations that nested themselves in the arcology have an unending need for cheap guns for hire, many mercenaries flock to your free city in search of employment.<<set _newMercs += random(1,2)>>
<</if>>
- <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
+ <<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>>
Having a powerful special force attracts a lot of mercenaries, hopeful that they may be able to fight along side it.
- <<set _newMercs += random(0,Math.round($SF.Units/10))>>
+ <<set _newMercs += random(0,Math.round($SF.Size/10))>>
<</if>>
<<if $discountMercenaries > 0>>
More mercenaries are attracted to your archology as a result of the reduced rent.
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index a57f7ca877111497fbc0f33f68ab783c26f371c9..b5df9dfc6694ec0093c6070dfdf4d9a8da3e66fe 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -99,9 +99,9 @@
<</if>>
<</if>>
-<<if $SF.Toggle && $SF.Active >= 1 && $SF.Units > 10>>
+<<if $SF.Toggle && $SF.Active >= 1 && $SF.Size > 10>>
Having a powerful special force, increases trade security.
- <<set _tradeChange += $SF.Units/10>>
+ <<set _tradeChange += $SF.Size/10>>
<</if>>
<<if _tradeChange > 0>>
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index c30475e2cf0eb5bcc1f6c0869ce12686fb435561..3c110c598440b6784ce0ae354fa5dfb07d377e10 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -7,7 +7,7 @@
<</if>>
<<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br>
- <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
+ <<print commaNum($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle: no casualties suffered.
<</if>>
<<if $deployingMilitia == 1>>
<<for _j = 0; _j < $militiaUnits.length; _j++>>
@@ -125,8 +125,8 @@
<<if $SF.Toggle && $SF.Active >= 1 && $SFIntervention>>
<br>
<<set _loss = _lossesList.pluck()>>
- <<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
- <<print commaNum($SFUnit.Troops)>> soldiers from $SF.Lower joined the battle:
+ <<set _loss = Math.clamp(_loss,0,$SF.Squad.Troops)>>
+ <<print commaNum($SF.Squad.Troops)>> soldiers from $SF.Lower joined the battle:
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
@@ -139,7 +139,7 @@
catastrophic casualties
<</if>>
suffered.
- <<set $SFUnit.Troops -= _loss>>
+ <<set $SF.Squad.Troops -= _loss>>
<br>
<</if>>
<<if $deployingMilitia == 1>>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 979398ff8e3657ce2fd4cd7d0057fdaaaf10474f..9ab83927154c3cd9e56ee41d5dbc3a7761aaaf2e 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -9,7 +9,7 @@
Security drones: no casualties suffered.
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br>$SF.Lower, <<print commaNum($SFUnit.Troops)>> strong, was called to join the battle: no casualties suffered.
+ <br>$SF.Lower, <<print commaNum($SF.Squad.Troops)>> strong, was called to join the battle: no casualties suffered.
<</if>>
<<set _count = 0>>
<<if $loyalID.length > 0>>
@@ -370,9 +370,9 @@
<br>
<br>
<<set _loss = _lossesList.pluck()>>
- <<set _loss = Math.clamp(_loss,0,$SFUnit.Troops)>>
- $SF.Lower, $SFUnit.Troops strong, is called to join the battle:
- <<set $SFUnit.Troops -= _loss>>
+ <<set _loss = Math.clamp(_loss,0,$SF.Squad.Troops)>>
+ $SF.Lower, $SF.Squad.Troops strong, is called to join the battle:
+ <<set $SF.Squad.Troops -= _loss>>
<<if _loss <= 0>>
no casualties
<<elseif _loss <= 10>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index b0d8d4b7476967441ebab733f62405fc105044d5..93056c5c5823b4a0ce7559d14a34ca4c70534912 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -325,7 +325,7 @@ __Upgrades__:
<</if>>
<br>
<<if $SF.Toggle && $SF.Active >= 1>>
- <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SFUnit.Firebase >= 7>>
+ <<if !$completedUpgrades.includes(6) && $weapLab >= 2 && $SFSupportLevel >= 2 && $SF.Squad.Firebase >= 7>>
<br>
<<link "Develop combined training regimens with $SF.Lower">>
<<set $currentUpgrade = {
@@ -338,7 +338,7 @@ __Upgrades__:
<</link>>
<br>//Will take _time weeks, and will increase the base attack and defense values of human troops.//
<</if>>
- <<if !$completedUpgrades.includes(7) && $weapLab >= 2 && $SFSupportLevel >= 4 && $SFUnit.Drugs >= 8>>
+ <<if !$completedUpgrades.includes(7) && $weapLab >= 2 && $SFSupportLevel >= 4 && $SF.Squad.Drugs >= 8>>
<br>
<<link "Develop a variant of the stimulant cocktail that $SF.Lower created">>
<<set $currentUpgrade = {
@@ -371,7 +371,7 @@ __Upgrades__:
You have fully upgraded your human troops.
<<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>>
You have fully upgraded your human troops.
- <<if $SF.Toggle && $SF.Active >= 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SFUnit.Firebase >= 7) || ($SFSupportLevel >= 4 && $SFUnit.Drugs >= 8) || ($SFSupportLevel >= 5))>>
+ <<if $SF.Toggle && $SF.Active >= 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $SF.Squad.Firebase >= 7) || ($SFSupportLevel >= 4 && $SF.Squad.Drugs >= 8) || ($SFSupportLevel >= 5))>>
With support from $SF.Lower, however, we may be able to further upgrade our troops.
<</if>>
<<elseif $weapLab < 3>>
diff --git a/src/SecExp/widgets/battleWidgets.tw b/src/SecExp/widgets/battleWidgets.tw
index af41b8843d7e8cd8cd849e62446089e47bd1013d..fbf36b41b7c4a108e98bdceab28245703f3049f7 100644
--- a/src/SecExp/widgets/battleWidgets.tw
+++ b/src/SecExp/widgets/battleWidgets.tw
@@ -3,33 +3,33 @@
<<widget "calcSFStatistics">>
<<if $slaveRebellion != 1 || $citizenRebellion != 1>>
/* atk, def */
- <<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + ($SFUnit.AA+$SFUnit.TA < 1) + ($SFUnit.AV+$SFUnit.TV)>>
+ <<set _upgradesSum = $SF.Squad.Armoury + $SF.Squad.Drugs + ($SF.Squad.AA+$SF.Squad.TA < 1) + ($SF.Squad.AV+$SF.Squad.TV)>>
<<if !isInt(_upgradesSum)>>
<<set _upgradesSum = random(10,15)>>
<</if>>
<<set $SFatk = Math.trunc(0.65 * _upgradesSum)>>
<<set $SFdef = Math.trunc(0.40 * _upgradesSum)>>
/* hp */
- <<set $carriableSoldiers = 125 * ($securityForceAC130 + $securityForceVehiclePower)>>
+ <<set $carriableSoldiers = 125 * ($SF.Squad.GunS + (($SF.Squad.AV + $SF.Squad.TV)/2))>>
<<if !isInt($carriableSoldiers)>>
- <<set $carriableSoldiers = $SFUnit.Troops / 10>>
+ <<set $carriableSoldiers = $SF.Squad.Troops / 10>>
<</if>>
- <<if $SFUnit.Troops > $carriableSoldiers>>
+ <<if $SF.Squad.Troops > $carriableSoldiers>>
<<set $SFhp = $carriableSoldiers * $SFBaseHp>>
<<else>>
- <<set $carriableSoldiers = $SFUnit.Troops>>
+ <<set $carriableSoldiers = $SF.Squad.Troops>>
<<set $SFhp = $carriableSoldiers * $SFBaseHp>>
<</if>>
<<else>>
/* atk, def */
- <<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + ($SFUnit.AA+$SFUnit.TA < 1) + ($SFUnit.AV+$SFUnit.TV)>>
+ <<set _upgradesSum = $SF.Squad.Armoury + $SF.Squad.Drugs + ($SF.Squad.AA+$SF.Squad.TA < 1) + ($SF.Squad.AV+$SF.Squad.TV)>>
<<if !isInt(_upgradesSum)>>
<<set _upgradesSum = random(10,15)>>
<</if>>
<<set $SFatk = Math.trunc(0.75 * _upgradesSum)>>
<<set $SFdef = Math.trunc(0.50 * _upgradesSum)>>
/* hp */
- <<set $SFhp = $SFUnit.Troops * $SFBaseHp>>
+ <<set $SFhp = $SF.Squad.Troops * $SFBaseHp>>
<</if>>
<</widget>>
@@ -111,7 +111,7 @@
<<set _troops += $mercUnits[_i].troops>>
<</if>>
<</for>>
- <<if $securityForceCreate == 1>>
+ <<if $SF.Toggle && $SF.Active >= 1>>
<<set _troops += $carriableSoldiers>>
<</if>>
<<set $troopCount = _troops>>
diff --git a/src/SpecialForce/CheatEdit.tw b/src/SpecialForce/CheatEdit.tw
index 87cc4d5207063e78128eadfa604eea22082a5b4c..d580017421444f1c4d2ca660b34504c553beb23f 100644
--- a/src/SpecialForce/CheatEdit.tw
+++ b/src/SpecialForce/CheatEdit.tw
@@ -1,35 +1,35 @@
:: CheatEdit [nobr]
<<set $nextButton = "Back to $SF.Lower's Firebase", $nextLink = "Firebase", $returnTo = "Firebase">>
-<<= Count()>>__Upgrades__: $SF.Units/_max
-<<if $SF.Units >= 30>><<set _T1 = 1>><<else>><<set _T1 = 0>><</if>>
-<br><br>''Firebase:'' <<textbox "$SFUnit.Firebase" $SFUnit.Firebase "CheatEdit">>/_FU
-<br>''Armory:'' <<textbox "$SFUnit.Armoury" $SFUnit.Armoury "CheatEdit">>/_AU
-<br>''Drug Lab:'' <<textbox "$SFUnit.Drugs" $SFUnit.Drugs "CheatEdit">>/_DrugsU
-<<if $SFUnit.Firebase >= 2>>
-<br>''Drone Bay:'' <<textbox "$SFUnit.Drones" $SFUnit.Drones "CheatEdit">>/_DU<</if>>
+<<= Count()>>__Upgrades__: $SF.Size/_max
+<<if $SF.Size >= 30>><<set _T1 = 1>><<else>><<set _T1 = 0>><</if>>
+<br><br>''Firebase:'' <<textbox "$SF.Squad.Firebase" $SF.Squad.Firebase "CheatEdit">>/_FU
+<br>''Armory:'' <<textbox "$SF.Squad.Armoury" $SF.Squad.Armoury "CheatEdit">>/_AU
+<br>''Drug Lab:'' <<textbox "$SF.Squad.Drugs" $SF.Squad.Drugs "CheatEdit">>/_DrugsU
+<<if $SF.Squad.Firebase >= 2>>
+<br>''Drone Bay:'' <<textbox "$SF.Squad.Drones" $SF.Squad.Drones "CheatEdit">>/_DU<</if>>
-<<if $SFUnit.Firebase >= 1 && $terrain !== "oceanic">> <br><br>''Garage:''
+<<if $SF.Squad.Firebase >= 1 && $terrain !== "oceanic">> <br><br>''Garage:''
<br> ''Vehicles:''
- <br> ''Attack:'' <<textbox "$SFUnit.AV" $SFUnit.AV "CheatEdit">>/_AVU
- <br> ''Transport:'' <<textbox "$SFUnit.TV" $SFUnit.TV "CheatEdit">>/_TVU
+ <br> ''Attack:'' <<textbox "$SF.Squad.AV" $SF.Squad.AV "CheatEdit">>/_AVU
+ <br> ''Transport:'' <<textbox "$SF.Squad.TV" $SF.Squad.TV "CheatEdit">>/_TVU
<<if _T1>>
- <br> ''Prototype Goliath Tank:'' <<textbox "$SFUnit.PGT" $SFUnit.PGT "CheatEdit">>/_PGTU<</if>>
+ <br> ''Prototype Goliath Tank:'' <<textbox "$SF.Squad.PGT" $SF.Squad.PGT "CheatEdit">>/_PGTU<</if>>
<</if>>
-<<if $SFUnit.Firebase >= 4>> <br><br>''Hangar:''
+<<if $SF.Squad.Firebase >= 4>> <br><br>''Hangar:''
<br> ''Aircraft:''
- <br> ''Attack:'' <<textbox "$SFUnit.AA" $SFUnit.AA "CheatEdit">>/_AAU
- <br> ''Transport:'' <<textbox "$SFUnit.TA" $SFUnit.TA "CheatEdit">>/_TAU
+ <br> ''Attack:'' <<textbox "$SF.Squad.AA" $SF.Squad.AA "CheatEdit">>/_AAU
+ <br> ''Transport:'' <<textbox "$SF.Squad.TA" $SF.Squad.TA "CheatEdit">>/_TAU
<<if _T1>>
- <br> ''Spaceplane'': <<textbox "$SFUnit.SpacePlane" $SFUnit.SpacePlane "CheatEdit">>/_SPU
- <br> ''Gunship:'' <<textbox "$SFUnit.GunS" $SFUnit.GunS "CheatEdit">>/_GunSU
+ <br> ''Spaceplane'': <<textbox "$SF.Squad.SpacePlane" $SF.Squad.SpacePlane "CheatEdit">>/_SPU
+ <br> ''Gunship:'' <<textbox "$SF.Squad.GunS" $SF.Squad.GunS "CheatEdit">>/_GunSU
<br><br>''Launch Bay:''
- <br> ''Satellite:'' <<textbox "$SFUnit.Satellite" $SFUnit.Satellite "CheatEdit">>/_SatU
+ <br> ''Satellite:'' <<textbox "$SF.Squad.Satellite.lv" $SF.Squad.Satellite.lv "CheatEdit">>/_SatU
<<if $terrain !== "oceanic">>
- <br> ''Giant Robot:'' <<textbox "$SFUnit.GiantRobot" $SFUnit.GiantRobot "CheatEdit">>/_GRU<</if>>
- <br> ''Cruise Missile:'' <<textbox "$SFUnit.MissileSilo" $SFUnit.MissileSilo "CheatEdit">>/_MSU
+ <br> ''Giant Robot:'' <<textbox "$SF.Squad.GiantRobot" $SF.Squad.GiantRobot "CheatEdit">>/_GRU<</if>>
+ <br> ''Cruise Missile:'' <<textbox "$SF.Squad.MissileSilo" $SF.Squad.MissileSilo "CheatEdit">>/_MSU
<<if $terrain === "oceanic" || $terrain === "marine">> <br><br>''Naval Yard:''
- <br> ''Aircraft Carrier:'' <<textbox "$SFUnit.AircraftCarrier" $SFUnit.AircraftCarrier "CheatEdit">>/_ACU
- <br> ''Submarine:'' <<textbox "$SFUnit.Sub" $SFUnit.Sub "CheatEdit">>/_SubU
- <br> ''Amphibious Transport:'' <<textbox "$SFUnit.HAT" $SFUnit.HAT "CheatEdit">>/_HATU
+ <br> ''Aircraft Carrier:'' <<textbox "$SF.Squad.AircraftCarrier" $SF.Squad.AircraftCarrier "CheatEdit">>/_ACU
+ <br> ''Submarine:'' <<textbox "$SF.Squad.Sub" $SF.Squad.Sub "CheatEdit">>/_SubU
+ <br> ''Amphibious Transport:'' <<textbox "$SF.Squad.HAT" $SF.Squad.HAT "CheatEdit">>/_HATU
<</if>><</if>><</if>>
\ No newline at end of file
diff --git a/src/SpecialForce/ColonelSexDec.tw b/src/SpecialForce/ColonelSexDec.tw
index 8f47023524fa86c33bfc3ae3d553f78436f07faa..df4875dcef8d4a1980e87f9c4da11e4bcd6d1de0 100644
--- a/src/SpecialForce/ColonelSexDec.tw
+++ b/src/SpecialForce/ColonelSexDec.tw
@@ -1,5 +1,5 @@
-:: SFColonelSexDec
-<<switch $SFColonel.Core>>
+:: SF.ColonelSexDec
+<<switch $SF.Colonel.Core>>
<<case "shell shocked">>
<span id="result7">
The entire time it is obvious that The Colonel is reliving a horrible event.
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index b65689b9be87aabb83caf6f92264d805768da92a..3eac4577a335c36c6820a2eadd6a6ed317a7f2e3 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -26,9 +26,9 @@
The firebase of $arcologies[0].name's <<textbox "$SF.Lower" $SF.Lower "Firebase">> is located in the lower levels, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armor manning the entry checkpoint tense before recognizing their Marshal and stepping aside with a sharp salute.
- <br><br><<if $SFTradeShow.CanAttend === 1 || ($SFColonel.Fun + $SFColonel.Talk >= 1)>>
+ <br><br><<if $SF.MercCon.CanAttend === 1 || ($SF.Colonel.Fun + $SF.Colonel.Talk >= 1)>>
- You make your way to the operations center, <<print SFC()>> is handling a minor issue. As you enter, she salutes. <<if $SFTradeShow.CanAttend == 1>> The Colonel is away at her merc meetup, so <<print SFC()>> will assist you.<</if>>
+ You make your way to the operations center, <<print SFC()>> is handling a minor issue. As you enter, she salutes. <<if $SF.MercCon.CanAttend == 1>> The Colonel is away at her merc meetup, so <<print SFC()>> will assist you.<</if>>
<<elseif random(1,100) > 5>>
@@ -38,9 +38,9 @@
<<else>>examining a table with a map of the surrounding area, planning maneuvers in the event of an attack.<</if>>
- She notices your entrance and turns her attention to you.
+ She notices your entrance and turns her attention to you.
- <<if $SFColonel.Core == "brazen">>
+ <<if $SF.Colonel.Core == "brazen">>
She gives a textbook salute. "<<= properTitle()>>, how can I help you?"
@@ -54,31 +54,31 @@
<</if>>
- <<if ndef $SFTradeShow.View && ($SFColonel.Fun + $SFColonel.Talk < 1)>>
+ <<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>>
- <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
+ <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
- <br>[[Grant leave|Firebase][$SFTradeShow.CanAttend = 1,$SFTradeShow.View = 1]]
+ <br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1,$SF.MercCon.View = 1]]
- <br>[[Request she remain on base|Firebase][$SFTradeShow.CanAttend = -2,$SFTradeShow.View = 0]]<br>
+ <br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2,$SF.MercCon.View = 0]]<br>
<</if>>
- <<if $SFTradeShow.History >= 1 && (Math.trunc($week/24) === ($week/24)) && $SFTradeShow.CanAttend === -1>>
+ <<if $SF.MercCon.History >= 1 && (Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1>>
- <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SFColonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
+ <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
- <br>[[Grant leave.|Firebase][$SFTradeShow.CanAttend = 1]]
+ <br>[[Grant leave.|Firebase][$SF.MercCon.CanAttend = 1]]
- <br>[[Request she remain on site.|Firebase][$SFTradeShow.CanAttend = -1]]<br>
+ <br>[[Request she remain on site.|Firebase][$SF.MercCon.CanAttend = -1]]<br>
<</if>>
- <<if $SFTradeShow.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
+ <<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
- While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SFTradeShow.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SFTradeShow.Helots)>> menial slaves were won in a poker game, and <<print commaNum($SFTradeShow.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
+ While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Helots)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SFTradeShow.Revenue))>>@@ in income, <<print commaNum($SFTradeShow.TotalHelots)>> menial slaves and <<print commaNum($SFTradeShow.Mercs)>> mercenaries joined across $SFTradeShow.History meetups.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalHelots)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>>
@@ -86,41 +86,41 @@
<<include "WC">>
- <<if $SF.SpecOpsLock < 1>>
- <br><<switch $SF.SpecOps>>
+ <<if $SF.UC.Lock < 1>>
+ <br><<switch $SF.UC.Assign>>
<<case 0>>
- <br>No soldiers are working undercover. [[Full time assignement|Firebase][$SF.SpecOpsLock = 1]]
- <br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+ <br>No soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]]
+ <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<case 1>>
- <br>A small section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.SpecOpsLock = 1]]
- <br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+ <br>A small section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]]
+ <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<case 2>>
- <br>A large section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.SpecOpsLock = 1]]
- <br>[[Reassign soldiers|Firebase][$SF.SpecOps = -1]]
+ <br>A large section of soldiers are working undercover. [[Full time assignement|Firebase][$SF.UC.Lock = 1]]
+ <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<default>>
<br>Would you like to assign soldiers to undercover duty?
- <br>[[Do not assign soldiers to work undercover|Firebase][$SF.SpecOps = 0]]
+ <br>[[Do not assign soldiers to work undercover|Firebase][$SF.UC.Assign = 0]]
- <br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.SpecOps = 1]]
+ <br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.UC.Assign = 1]]
- <br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.SpecOps = 2]]
+ <br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.UC.Assign = 2]]
<</switch>>
<<else>>
- <br> <<if $SF.SpecOps < 1>>''Zero''<<elseif $SF.SpecOps < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Re-alloclate the units|Firebase][$SF.SpecOpsLock = 0]]
+ <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Re-alloclate the units|Firebase][$SF.UC.Lock = 0]]
<</if>>
- <<if $SFUnit.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>>
+ <<if $SF.Squad.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>>
- <br><br>[[Provide the security force with their own section.|Firebase][$maxUnits += 4,$readiness = 10,$cash -= Math.ceil((750000*(1.15+($SF.Units/1000))*(1.15+($SFUnit.Firebase/10)))*_Env)]]
+ <br><br>[[Provide the security force with their own section.|Firebase][$maxUnits += 4,$readiness = 10,$cash -= Math.ceil((750000*(1.15+($SF.Size/1000))*(1.15+($SF.Squad.Firebase/10)))*_Env)]]
- @@.yellowgreen;<<print cashFormat(Math.ceil((750000*(1.15+($SF.Units/1000))*(1.15+($SFUnit.Firebase/10)))*_Env))>>@@
+ @@.yellowgreen;<<print cashFormat(Math.ceil((750000*(1.15+($SF.Size/1000))*(1.15+($SF.Squad.Firebase/10)))*_Env))>>@@
<</if>>
diff --git a/src/SpecialForce/FlavourText.tw b/src/SpecialForce/FlavourText.tw
index 7c65158fce2af640499bd1d85b9c0e3b3fc04547..3c2a7607d6cc7b8492673845bb1f56d078a4e485 100644
--- a/src/SpecialForce/FlavourText.tw
+++ b/src/SpecialForce/FlavourText.tw
@@ -145,22 +145,22 @@
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
either naked or wearing transparent gauzes
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
- wearing traditional housewfie clothes
+ wearing traditional housewife clothes
<<elseif $arcologies[0].FSDegradationist != "unset">>
completely nude with only scars and derogatory tattoos covering their bodies
<<elseif $arcologies[0].FSPaternalist != "unset">>
wearing plain jumpsuits and slim identification collars to set them apart from the soldiers, and look resigned but not fearful.
<</if>>
<<else>>
- <<if $SF.Depravity <= 0.3 && $SFColonel.Core === "kind">>
+ <<if $SF.Depravity <= 0.3 && $SF.Colonel.Core === "kind">>
wearing plain jumpsuits and slim identification collars to set them apart from the soldiers, and look resigned but not fearful. The soldiers themselves socialize at the bars, in small groups around tables, and in the gambling parlors. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired. Laughter from the carousing soldiers can be heard at all times. Small groups of slaves move freely between the plaza and their basic accommodations attached to the firebase.
- <<elseif $SF.Depravity <= 0.6 && $SFColonel.Core === "kind">>
+ <<elseif $SF.Depravity <= 0.6 && $SF.Colonel.Core === "kind">>
topless, wearing only utilitarian pants and leather collars to set them apart from the soldiers, and occasionally shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge only partially dressed, sometimes pulling half-naked slaves out with them.
<<elseif $SF.Depravity <= 0.9>>
topless, wearing only utilitarian shorts and steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers themselves socialize at the bars, or in large groups around tables, leering at and heavily groping slaves of interest as they pass by. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired, and often emerge stark naked, sometimes pulling naked slaves out with them for one last servicing in public. A few soldiers stagger around in drunken hazes or drugged-out stupors.
<<elseif $SF.Depravity <= 1.2>>
topless, wearing only a single undergarment and heavy steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers occupy themselves primarily with sex, pulling slaves onto benches and fucking them hard in public. Many soldiers stagger around or lie passed out from drug and alcohol abuse.
- <<elseif $SF.Depravity >= 1.5 && ($SFColonel.Core === "Warmonger" || $SFColonel.Core != "Shell Shocked")>>
+ <<elseif $SF.Depravity >= 1.5 && ($SF.Colonel.Core === "Warmonger" || $SF.Colonel.Core != "Shell Shocked")>>
To a one, they are naked, and are wearing heavy shock collars to force obedience. Most are wild-eyed with fear or dull-eyed from mental collapse, and many others bear marks of abuse. Few of the slaves are here long-term, the depraved pleasures of the soldiers resulting in enormous turnover and loss of 'damaged' stock. The extreme libations of the soldiers are ever-present. Drunken soldiers stagger around everywhere, beating slaves too slow to get out of their way. Others lie sprawled out on the ground, rendered senseless from heavy drug abuse. Some walk around naked, and hold slaves down on the benches scattered around, raping or sodomizing them with their cocks or their personal strap-ons as they desire. In alcoves, some soldier-lover pairs fuck loudly, moaning in pleasure.
<<if random(1,100) > 50>>
Off to the side, a group of soldiers brutally gangbang a very young slave girl, with one soldier buried balls-deep in her ass, another brutally sawing a barbed strap-on in and out of her pussy, and a third with his cock forced deep down her throat. The slave girl struggles and gags, desperate for breath or relief.
@@ -181,12 +181,12 @@
raises a hand in greeting and nods. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture, the result of her excitation, are visible, and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, <<print SFCR()>>?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"
<<elseif random(0,100) > 50>>
is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, <<print SFCR()>>," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, <<print SFCR()>>," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "Excellent", she laughs. "I have to say; it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"
- <<elseif random(0,100) > 70 && $SF.Depravity >= 1.5 && $SFColonel.Core == "cruel">>
+ <<elseif random(0,100) > 70 && $SF.Depravity >= 1.5 && $SF.Colonel.Core == "cruel">>
is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, <<print SFCR()>>, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that <<print SFCR()>>," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem - you're here to talk business. So, what's up?"
<<else>>
is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey <<print SFCR()>>," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"
<</if>> </div>
- <<if $SFUnit.Firebase === 10>>
+ <<if $SF.Squad.Firebase === 10>>
<br>The echo of simulated gun fire and explosions can be heard from the state of the art killhouse.
The quite hum of fans keeping the faster and much more efficient custom network operational can be heard throughout the firebase.<br>
<</if>>
@@ -197,36 +197,36 @@
<br> The large dormitories are <<print TroopDec()>>.
<br><br>''Armory:'' <<print Armoury()>>
<br><br>''Drug Lab:'' <<print Drugs()>>
-<<if $SFUnit.Firebase >= 2 && $SFUnit.Drones > 0>> <br><br>''Drone Bay:'' <<print LUAV()>> <</if>>
+<<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones > 0>> <br><br>''Drone Bay:'' <<print LUAV()>> <</if>>
-<<if _G > 0 && $SFUnit.Firebase >= 1>> <br><br>''Garage:''
- <<if $SFUnit.AV+$SFUnit.TV > 0>> <br> ''Vehicles:''
- <<if $SFUnit.AV > 0>> <br> ''Assault:'' <<print AV()>> <</if>>
- <<if $SFUnit.TV > 0>> <br> ''Transport:'' <<print TV()>> <</if>>
+<<if _G > 0 && $SF.Squad.Firebase >= 1>> <br><br>''Garage:''
+ <<if $SF.Squad.AV+$SF.Squad.TV > 0>> <br> ''Vehicles:''
+ <<if $SF.Squad.AV > 0>> <br> ''Assault:'' <<print AV()>> <</if>>
+ <<if $SF.Squad.TV > 0>> <br> ''Transport:'' <<print TV()>> <</if>>
<</if>>
- <<if $SFUnit.PGT > 0>> <br> ''Prototype Goliath Tank:'' <<print PGT()>> <</if>>
+ <<if $SF.Squad.PGT > 0>> <br> ''Prototype Goliath Tank:'' <<print PGT()>> <</if>>
<</if>>
-<<if $SFUnit.Firebase >= 4>>
+<<if $SF.Squad.Firebase >= 4>>
<<if _H > 0>> <br><br>''Hangar:''
- <<if $SFUnit.AA+$SFUnit.TA > 0>> <br> ''Airforce:''
- <<if $SFUnit.AA > 0>> <br> ''Assault:'' <<print AA()>> <</if>>
- <<if $SFUnit.TA > 0>> <br> ''Transport:'' <<print TA()>> <</if>>
+ <<if $SF.Squad.AA+$SF.Squad.TA > 0>> <br> ''Airforce:''
+ <<if $SF.Squad.AA > 0>> <br> ''Assault:'' <<print AA()>> <</if>>
+ <<if $SF.Squad.TA > 0>> <br> ''Transport:'' <<print TA()>> <</if>>
<</if>>
- <<if $SFUnit.SpacePlane > 0>> <br> ''Spaceplane:'' <<print SP()>> <</if>>
- <<if $SFUnit.GunS > 0>> <br> ''Gunship:'' <<print GunS()>> <</if>>
+ <<if $SF.Squad.SpacePlane > 0>> <br> ''Spaceplane:'' <<print SP()>> <</if>>
+ <<if $SF.Squad.GunS > 0>> <br> ''Gunship:'' <<print GunS()>> <</if>>
<</if>>
<<if _LB> 0>> <br><br>''Launch Bay:''
- <<if $SFUnit.Satellite > 0>> <br> ''Satellite:'' <<print Sat()>> <<if $SatLaunched < 1>><br> [[Launch it into geostationary orbit|Firebase][$SatLaunched = 1]]<br> //You cannot upgrade the satellite once it has been launched.//<</if>><</if>>
- <<if $SFUnit.GiantRobot > 0>> <br> ''Giant Robot'': <<print GR()>> <</if>>
- <<if $SFUnit.MissileSilo > 0>> <br> ''Cruise Missile:'' <<print ms()>> <</if>>
+ <<if $SF.Squad.Satellite.lv > 0>> <br> ''Satellite:'' <<print Sat()>> <<if $SF.Squad.Satellite.InOrbit < 1>><br> [[Launch it into geostationary orbit|Firebase][$SF.Squad.Satellite.InOrbit = 1]]<br> //You cannot upgrade the satellite once it has been launched.//<</if>><</if>>
+ <<if $SF.Squad.GiantRobot > 0>> <br> ''Giant Robot'': <<print GR()>> <</if>>
+ <<if $SF.Squad.MissileSilo > 0>> <br> ''Cruise Missile:'' <<print ms()>> <</if>>
<</if>>
<</if>>
<<if _NY > 0>> <br><br>''Naval Yard:''
- <<if $SFUnit.AircraftCarrier > 0>> <br> ''Aircraft Carrier:'' <<print AC()>> <</if>>
- <<if $SFUnit.Sub > 0>> <br> ''Submarine:'' <<print Sub()>> <</if>>
- <<if $SFUnit.HAT > 0>> <br> ''Amphibious Transport:'' <<print HAT()>> <</if>>
+ <<if $SF.Squad.AircraftCarrier > 0>> <br> ''Aircraft Carrier:'' <<print AC()>> <</if>>
+ <<if $SF.Squad.Sub > 0>> <br> ''Submarine:'' <<print Sub()>> <</if>>
+ <<if $SF.Squad.HAT > 0>> <br> ''Amphibious Transport:'' <<print HAT()>> <</if>>
<</if>>
/*<<if $SF.Facility.Toggle > 0 && $SF.Facility.Active > 0>> <br><br>''$SF.Facility.Caps:''
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index 420f66b1de01adcd8d59e715dabdae27ab755a66..160971a94cc94a1bde28c15c3749308013685594 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -1,21 +1,21 @@
/*SecForceEX JS*/
window.SFC = function() {
const V = State.variables;
- if (V.SFTradeShow.CanAttend === -1) {return `The Colonel`;}
+ if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
else {
if (V.SF.Facility.LCActive > 0) {return `Lieutenant Colonel <<= SlaveFullName(V.SF.Facility.LC)>>`;}
else {return `a designated soldier`;}}
};
window.SFCR = function() {
- const V = State.variables, C = V.SFColonel;
+ const V = State.variables, C = V.SF.Colonel;
if (C.Status <= 19) {return `boss`;}
else if (C.Status <= 39) {return `friend`;}
else {return `fuckbuddy`;}
};
window.TroopDec = function() {
- const V = State.variables, commom = "the <<print commaNum($SFUnit.Troops)>> members of $SF.Lower", S = V.SFUnit;
+ const V = State.variables, commom = "the <<print commaNum($SF.Squad.Troops)>> members of $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`;}
@@ -40,7 +40,7 @@ window.HSM = function() {
};
window.Count = function() {
- const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SFUnit, E = V.economy;
+ const V = State.variables, T = State.temporary, C = Math.clamp, S = V.SF.Squad, E = V.economy;
T.SFF = V.SF.Facility.Active;
T.SFFU = 1,T.SFF = C(T.SFF, 0, T.SFFU);
T.FU = 10,S.Firebase = C(S.Firebase, 0, T.FU);
@@ -56,11 +56,11 @@ window.Count = function() {
else {T.PGTU = 8,T.SPU = 8,T.GunSU = 8,T.SatU = 8,T.GRU = 8,T.MSU = 8,T.ACU = 8,T.SubU = 8,T.HATU = 8;}
S.PGT = C(S.PGT, 0, T.PGTU);
S.SpacePlane = C(S.SpacePlane, 0, T.SPU), S.GunS = C(S.GunS, 0, T.GunSU);
- S.Satellite = C(S.Satellite, 0, T.SatU), S.GiantRobot = C(S.GiantRobot, 0, T.GRU), S.MissileSilo = C(S.MissileSilo, 0, T.MSU);
+ S.Satellite.lv = C(S.Satellite.lv, 0, T.SatU), S.GiantRobot = C(S.GiantRobot, 0, T.GRU), S.MissileSilo = C(S.MissileSilo, 0, T.MSU);
S.AircraftCarrier = C(S.AircraftCarrier, 0, T.ACU),S.Sub = C(S.Sub, 0, T.SubU),S.HAT = C(S.HAT, 0, T.HATU);
T.GU = T.AVU+T.TVU+T.PGTU, T.G = S.AV+S.TV+S.PGT;
T.H = S.AA+S.TA+S.SpacePlane+S.GunS, T.HU = T.AAU+T.TAU+T.SPU+T.GunSU;
- T.LBU = T.SatU + T.MSU, T.LB = S.Satellite + S.MissileSilo;
+ T.LBU = T.SatU + T.MSU, T.LB = S.Satellite.lv + S.MissileSilo;
T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H;
T.max = T.FU + T.AU + T.DrugsU + T.DU + T.HU;
if (V.SF.Facility.Toggle > 0) {
@@ -72,7 +72,7 @@ window.Count = function() {
if (V.terrain === "oceanic" || V.terrain === "marine") {
T.NY = S.AircraftCarrier + S.Sub + S.HAT, T.Base += T.NY;
T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;}
- V.SF.Units = T.Base, V.SF.Units = C(V.SF.Units, 0, T.max);
+ V.SF.Size = T.Base, V.SF.Size = C(V.SF.Size, 0, T.max);
if (E > 100) {T.Env = 4;}
else if (E > 67) {T.Env = 3;}
else {T.Env = 2;}
@@ -82,7 +82,7 @@ window.Count = function() {
};
window.Firebase = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var appear = `is currently constructed in a haphazard fashion.`, barracks = `Soldiers' cots are mixed in with weapons crates and ammunition.`, slave = `Cages for processing slaves lie off to one side,`, common = `and in the center is a common area with tables for soldiers to gather around for meals or rowdy conversations.`, garage = ``, drone = ``, hangar = ``, launch = ``, artillery = ``, comms = ``, training = ``;
if (S.Firebase >= 1) {appear = `has had some organization put into it.`, barracks = `The majority of weapons, armor, and ammunition have been separated from the soldiers' cots into their own armory.`, garage = `A section near the outer wall of the arcology has been converted to a garage with an adjoining vehicle maintenance bay`, drone = `.`;
@@ -105,7 +105,7 @@ window.Firebase = function() {
};
window.Armoury = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var weapons = `The weapons are mostly worn rifles that have already seen years of service before $SF.Lower acquired them.`, armor = `The body armor is enough to stop smaller calibers, but nothing serious.`, comms = ``, helmets = ``, ammo = ``, uniforms = ``, special = ``, exo = ``;
if (S.Armoury >= 1) comms = `Radios have been wired into the soldiers helmets`, helmets = `.`;
@@ -123,7 +123,7 @@ window.Armoury = function() {
};
window.Drugs = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var amphet = ``, phen = ``, steroid = ``, downer = ``, concen = ``, stimpack = ``, stabilizer = ``;
if (S.Drugs >= 1) amphet = `Amphetamines have been added to the cocktail at a low dosage to act as a stimulant, physical performance enhancer, cognition control enhancer. Some side-effects exist.`;
@@ -141,7 +141,7 @@ window.Drugs = function() {
};
window.LUAV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `have been recommissioned for use by $SF.Lower`, b = `.`, c = ``, d = ``, e = ``, f = ``, g = ``, h = ``, i = ``, j = ``, k = ``;
if (S.Drones >= 2) a = `equipped with missiles are resting on one side of the drone bay`, b = `, as well as destroying the occasional target.`;
@@ -158,7 +158,7 @@ window.LUAV = function() {
};
window.AV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var b = `has been recommissioned for use by $SF.Lower. They`, c = `; mechanics are methodically checking the recent purchases for battle-readiness`, MG = `120 mm main gun is enough to handle the majority of opponents around the Free Cities.`, engine = ``, armor = ``, armor2 = ``, ammo = ``, mg = ``, fireC0 = ``, fireC1 = ``, fireC2 = ``, fireC3 = ``, turret = ``;
if (S.AV >= 2) engine = `The engine has been overhauled, allowing much faster maneuvering around the battlefield.`, b = ``, c = ``;
@@ -175,7 +175,7 @@ window.AV = function() {
};
window.TV = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var B = `has been recommissioned for use by $SF.Lower. They`, C = `; mechanics are giving the new purchases a final tuneup`, squad = `a squad`, G1 = `20`, G2 = `in a firefight`, e0 = `The engine has been`, engine = ``, armor = ``, tires = ``, m1 = ``, m2 = ``, pod1 = ``, pod2 = ``;
if (S.TV >= 2) engine = `${e0} overhauled, allowing for higher mobility.`, C = ``, B = ``;
@@ -192,7 +192,7 @@ window.TV = function() {
};
window.PGT = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var b = `has been sold to $SF.Lower through back channels to support a failing Old World nation. The tank is so large it cannot fit inside the garage, and has`, c = ``, engines = `. Two engines power the left and right sides of the tank separately, leaving it underpowered and slow`, gun0 = ``, gun1 = ``, gun2 = `an undersized main gun and makeshift firing system from a standard battle tank`, armor1 = ``, armor0 = ``, cannon = ``, laser = ``, PGTframe = ``;
if (S.PGT >= 2) c = `rests in`, b = ``, engines = ` and powered by their own engine, allowing the tank to travel with an unsettling speed for its massive bulk`;
@@ -209,7 +209,7 @@ window.PGT = function() {
};
window.AA = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var W1 = `only armed`, W2 = `,`, W3 = `a poor weapon against flying targets, but enough to handle ground forces`, group = `A small group of attack VTOL have been recommissioned for use by $SF.Lower, enough to make up a squadron`, engines = ``, TAI = ``, lock = ``, support = ``, stealth = ``, scramble = ``, PAI = ``;
if (S.AA >= 2) W1 = `armed`, W2 = ` and air-to-air missiles,`, W3 = `a combination that can defend the arcology from enemy aircraft, as well as`, support = ` support ground troops`;
@@ -226,7 +226,7 @@ window.AA = function() {
};
window.TA = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var Num = `number`, type = `tiltrotor`, capacity = `small platoon or 15`, engines = ``, engines2 = ``, Radar = ``, Armor = ``, landing = ``, miniguns = ``, counter = ``;
if (S.TA >= 2) engines = `The tiltrotor engines have been replaced with a more powerful engine, allowing faster travel times.`;
@@ -243,7 +243,7 @@ window.TA = function() {
};
window.SP = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var engine = `ramjet engines in the atmosphere that can reach Mach 10`, b = `has been purchased from an insolvent Old World nation. It `, shield = ``, camera = ``, efficiency = ``, camera2 = ``, drag = ``, crew = ``, engine2 = ``, skin = ``;
if (S.SpacePlane >= 2) b = ``, shield = `The current heat shielding has been upgraded, reducing the likelihood of heat damage during reentry.`;
@@ -260,7 +260,7 @@ window.SP = function() {
};
window.GunS = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `has been recommissioned for use by $SF.Lower. Currently, it `, b = ``, c = ``, d = ``, e = `Miniguns and Gatling cannons line`, f = `, though the distance to ground targets renders the smaller calibers somewhat less useful`, g = ``, h = ``, i = ``, j = ``, k = ``;
if (S.GunS >= 2) b = `Infrared sensors have been added for the gunners to better pick targets.`, a = ``;
@@ -277,26 +277,26 @@ window.GunS = function() {
};
window.Sat = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var loc = `An unused science satellite has been purchased from an Old World nation. While currently useless, it holds potential to be a powerful tool.`, gyro = ``, telemetry = ``, thrusters = ``, solar = ``, surviv = ``, laser = ``, heat = ``, reactor = ``, lens = ``, kin = ``;
- if (S.Satellite >= 2) {
- if (V.SatLaunched < 1) {loc = `The satellite is being worked on in the Launch Bay.`;} else {loc = `The satellite is in geosynchronous orbit, far above the arcology.`;}
+ if (S.Satellite.lv >= 2) {
+ if (V.SF.Squad.Satellite.InOrbit < 1) {loc = `The satellite is being worked on in the Launch Bay.`;} else {loc = `The satellite is in geosynchronous orbit, far above the arcology.`;}
gyro = `A suite of sensors have been installed to ensure the satellite can detect attitude and orbital altitude.`;}
- if (S.Satellite >= 3) telemetry = `Telemetry systems have been installed to communicate with the satellite in orbit, with strong encryption measures.`;
- if (S.Satellite >= 4) thrusters = `Thrusters have been installed to control satellite attitude and orbit.`;
- if (S.Satellite >= 5) solar = `A massive folding solar panel array, combined with the latest in battery technology allow the satellite to store an enormous amount of energy relatively quickly.`, surviv = `Enough of the satellite has been finished that it can expect to survive for a significant period of time in space.`;
- if (S.Satellite >= 6) laser = `A laser cannon has been mounted facing the earth, capable of cutting through steel in seconds`, heat = ` while generating a large amount of heat.`;
- if (S.Satellite >= 7) heat = `. The installed heatsink allows the laser cannon to fire more frequently without damaging the satellite.`;
- if (S.Satellite >= 8) reactor = `A small, efficient nuclear reactor has been installed to continue generating energy while in the Earth's shadow.`;
- if (S.Satellite >= 9) lens = `A higher quality and adjustable lens has been installed on the laser, allowing scalpel precision on armor or wide-area blasts on unarmored targets.`;
- if (S.Satellite >= 10) kin = `A magazine of directable tungsten rods have been mounted to the exterior of the satellite, allowing for kinetic bombardment roughly equal to a series of nuclear blasts.`;
+ if (S.Satellite.lv >= 3) telemetry = `Telemetry systems have been installed to communicate with the satellite in orbit, with strong encryption measures.`;
+ if (S.Satellite.lv >= 4) thrusters = `Thrusters have been installed to control satellite attitude and orbit.`;
+ if (S.Satellite.lv >= 5) solar = `A massive folding solar panel array, combined with the latest in battery technology allow the satellite to store an enormous amount of energy relatively quickly.`, surviv = `Enough of the satellite has been finished that it can expect to survive for a significant period of time in space.`;
+ if (S.Satellite.lv >= 6) laser = `A laser cannon has been mounted facing the earth, capable of cutting through steel in seconds`, heat = ` while generating a large amount of heat.`;
+ if (S.Satellite.lv >= 7) heat = `. The installed heatsink allows the laser cannon to fire more frequently without damaging the satellite.`;
+ if (S.Satellite.lv >= 8) reactor = `A small, efficient nuclear reactor has been installed to continue generating energy while in the Earth's shadow.`;
+ if (S.Satellite.lv >= 9) lens = `A higher quality and adjustable lens has been installed on the laser, allowing scalpel precision on armor or wide-area blasts on unarmored targets.`;
+ if (S.Satellite.lv >= 10) kin = `A magazine of directable tungsten rods have been mounted to the exterior of the satellite, allowing for kinetic bombardment roughly equal to a series of nuclear blasts.`;
return `${loc} ${gyro} ${thrusters} ${telemetry} ${solar} ${reactor} ${surviv} ${laser}${heat} ${lens} ${kin}`;
};
window.GR = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var loc = `has been purchased from a crumbling Old World nation. It`, power = `Large batteries mounted in oversized shoulders power the robot for up to ten minutes of use, though they make for large targets.`, knife = `simply a 8.5 meter long knife, though additional weapons are under development.`, armor = ``, actuator = ``, cannon = ``, heatsink = ``, ammo = ``, missile = ``;
if (S.GiantRobot >= 2) loc = ``, armor = `Armor plating has been mounted over the majority of the robot.`;
@@ -313,7 +313,7 @@ window.GR = function() {
};
window.ms = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var a = `A cruise missile launch site has been constructed near the base of`, b = `outdated, something quickly rigged together to give the launch site something to fire in the case of an attack`, c = ``, d = ``, e = ``, f = ``, g = ``, h = ``;
if (S.MissileSilo >= 2) b = `a modern missile`, c = `, tipped with a conventional warhead`;
@@ -330,7 +330,7 @@ window.ms = function() {
};
window.AC = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `has been recommisioned from the Old World for $SF.Lower. It`, jets = `Formerly mothballed strike jets`, loc = ``, radar = ``, AA = ``, prop = ``, torp = ``, armor = ``, power = ``, scramble = ``;
if (V.week % 6 === 0) { loc = `moored to the pier in the Naval Yard`; } else { loc = `patrolling the waters near $arcologies[0].name`; }
@@ -348,7 +348,7 @@ window.AC = function() {
};
window.Sub = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `has been recommissioned from the old world, and`, reactor = `Because diesel engines provide power and breathing oxygen is kept in pressurized canisters, the sub must frequently surface.`, reactor1 = ``, cal = ``, hull = ``, tubes = ``, torpedoes = ``, sonar = ``, control = ``, missiles = ``;
if (S.Sub >= 2) recom = ``, reactor = `A nuclear reactor provides power`, reactor1 = `, but because oxygen is still kept in pressurized canisters the sub must frequently surface to replenish its oxygen stocks.`;
@@ -365,7 +365,7 @@ window.Sub = function() {
};
window.HAT = function() {
- const V = State.variables, S = V.SFUnit;
+ const V = State.variables, S = V.SF.Squad;
var recom = `, has been recommissioned for use by $SF.Lower. It`, tons = `200`, skirt = ``, guns = ``, guns2 = ``, fans = ``, speed = ``, turbines = ``, armor = ``, ramps = ``, HATframe = ``, loadout = ``;
if (S.HAT >= 2) skirt = `The skirt has been upgraded to increase durability and improve cushion when traveling over uneven terrain and waves.`, recom = `,`;
@@ -382,27 +382,27 @@ window.HAT = function() {
};
window.Interactions = function() {
- const V = State.variables, C = V.SFColonel, T = State.temporary;
+ const V = State.variables, C = V.SF.Colonel, T = State.temporary;
var choice = ``, time = ``;
- if (V.SF.WG > 0){
+ if (V.SF.Gift > 0){
if (V.choice == 1){
choice = `$SF.Caps is turning over spare capital in tribute this week. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I think I can find @@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ for you, boss."`;}
else {
choice += `"We can spare@@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ in tribute this week, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 2){
choice = `$SF.Caps will be throwing a military parade this week. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I expect the @@.green;public to enjoy@@ the parade, boss."`;}
else {
choice += `"I'll have plans for an @@.green;popular parade@@ on your desk, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 3){
choice = `$SF.Caps will be conducting corporate sabotage on rival arcologies' businesses. `;
- if (V.SFTradeShow.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
+ if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"Our interests should see a @@.yellowgreen;big boost,@@ boss."`;}
else {
choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, <<= properTitle()>>.`;
@@ -420,7 +420,7 @@ window.ColonelQuarters = function() {
out = `raises a hand in greeting and nods. She is sprawled on a couch, wearing only her combat suit tank top and fingerless gloves. She's holding a near-empty bottle of strong liquor in her hand and you can see a naked slave girl kneeling on the floor between her legs. The Colonel has her legs wrapped tightly around the girl's head, forcing the girl to service her if she wants to breathe. The Colonel is close to her climax then suddenly tenses her lower body thus gripping the girl even tighter and throws her head back in ecstasy as she orgasms. She lets out a long breath finally releasing the girl, giving her a hard smack and shouting at her to fuck off.<br><br> The Colonel finishes off her bottle, tossing it over her shoulder then leaning back on the couch and spreading her legs wide. You look down briefly, falling into your habits of inspection. Her pussy is completely devoid of hair with heavy labia in with a very large and hard clit peaking out. Beads of moisture, the result of her excitation, are visible, and you can tell from long experience that she would be tight as a vise. You return your gaze to her face to find her smirking at you. "Like what you see, <<print SFCR()>>?" She waves her hand at the plaza around her, "So do they. But you're not here for pussy. You're here to talk business. So, what's up?"`;
}else if (R > 50){
out = `is in no condition initially to greet you. She's naked except for one sock that gives you a very good view of her muscled, taut body while lunging with her feet on the table and the rest on her couch. She is face down in a drugged-out stupor in the middle of a wide variety of powders and pills. Perhaps sensing your approach, her head suddenly shoots up and looks at you with unfocused, bloodshot eyes. "Sorry, <<print SFCR()>>," she slurs, wiping her face and weakly holding up a hand. "Hold on a second, I need something to help me out here. Long fucking night." She struggles to sit on the couch and bending over the table, loudly snorts up some of the white powder on it. "Ahhh, fuck," she says, breathing heavily.<br><br> She shakes her head powerfully now looking at you, her eyes once again alert and piercing. "That's better," she says, leaning back on the couch and giving you another good view of her assets. "So, <<print SFCR()>>," she begins, "what brings you down here to our little clubhouse? I trust you're happy with how we've been handling things out there?" You nod. "Excellent", she laughs. "I have to say; it's nice to have a place like this while having some top-end gear and to be able to have fun out there without worrying about anyone coming back on us. Good fucking times." She laughs again. "So - I'm assuming you want something?"`;
- }else if (R > 70 && V.SF.Depravity >= 1.5 && V.SFColonel.Core == "cruel"){
+ }else if (R > 70 && V.SF.Depravity >= 1.5 && V.SF.Colonel.Core == "cruel"){
out = `is relaxing on her couch stark naked, greeting you with a raised hand. Between her tightly clenched legs is a slave girl being forced to eat her out. "Hey, <<print SFCR()>>, what's -" she breaks off as a flash of pain crosses her features. "Fucking bitch!" she exclaims, pulling her legs away and punching the slave girl in the face. She pushes the girl to the ground, straddling her then begins hitting. You hear one crunch after another as The Colonel's powerful blows shatter the girl's face. She hisses from between clenched teeth, each word accompanied by a brutal punch. "How. Many. Fucking. Times. Have. I. Told. You. To. Watch. Your. Fucking. Teeth. On. My. Fucking. Clit!" She leans back, exhaling heavily. Before leaning back down to grip apply pressure onto the girl's neck with her powerful hands. Wordlessly, she increases the pressure and soon the girl begins to turn blue as she struggles to draw breath. Eventually her struggles weaken and then finally, end.<br><br> The Colonel relaxes her grip then wipes her brow, clearing away the sweat from her exertion. Finally rising from the girl's body, relaxing back on the couch and putting her feet back up on the table. "Sorry about that <<print SFCR()>>," she says, shrugging. "So many of these bitches we pick up from the outside don't understand that they have to behave." Shaking her head in frustration, "Now I need to find another one. But that's not your problem - you're here to talk business. So, what's up?"`;
}else{
out = `is topless while reviewing the particulars of her unit on a tablet as you approach. She raises a hand in greeting. "Hey <<print SFCR()>>," she says, noticing you looking at her chest. She laughs. "Nice, aren't they? But they're not for you or them." She throws a thumb at the plaza around her. "You're down here for a reason, though. What can I do for you?"`;}
@@ -431,7 +431,7 @@ window.progress = function(x,max) {
var out = `â`, z, i;
if (max === undefined) {
Math.clamp(x,0,10);
- if (State.variables.SF.Units < 30) {
+ if (State.variables.SF.Size < 30) {
z = 5 - x;
for (i=0;i<x;i++) out += `â–ˆâ`;
for (i=0;i<z;i++) out += `<span style=\"opacity: 0;\">â–ˆ</span>â`;
@@ -451,10 +451,244 @@ window.progress = function(x,max) {
window.SFInit = function() {
const V = State.variables;
- V.SF = {Active:1, Bonus:0, Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
- V.SFUnit = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
- V.SFColonel = {Core:"", Talk:0, Fun:0, Status:0};
- V.SFTradeShow = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
- V.SatLaunched = 0, V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+ V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
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:[]};
-};
\ No newline at end of file
+};
+
+window.SFBC = function() {
+ const V = State.variables;
+ function Init() {
+ delete V.SFMODToggle;
+ delete V.securityForceActive;
+ delete V.securityForceCreate;
+ delete V.securityForceEventSeen;
+ }
+ function Main() {
+ delete V.securityForceActive;
+ delete V.securityForceRecruit;
+ delete V.securityForceTrade;
+ delete V.securityForceBooty;
+ delete V.securityForceIncome;
+ delete V.securityForceMissionEfficiency;
+ delete V.securityForceProfitable;
+ delete V.TierTwoUnlock;
+ delete V.securityForceDepravity;
+ delete V.SFAO;
+ delete V.securityForceUpgradeTokenReset;
+ delete V.securityForceUpgradeToken;
+ delete V.securityForceGiftToken;
+ delete V.securityForceRulesOfEngagement;
+ delete V.securityForceFocus;
+ delete V.securityForceAccountability;
+ delete V.securityForceName;
+ delete V.SubsidyActive;
+ }
+ function Colonel() {
+ delete V.SubsidyActive;
+ delete V.ColonelCore;
+ delete V.securityForceColonelToken;
+ delete V.securityForceColonelSexed;
+ delete V.ColonelRelationship;
+ }
+ function TradeShow() {
+ delete V.OverallTradeShowAttendance;
+ delete V.CurrentTradeShowAttendance;
+ delete V.TradeShowIncome;
+ delete V.TotalTradeShowIncome;
+ delete V.TradeShowHelots;
+ delete V.TotalTradeShowHelots;
+ }
+ function Units() {
+ delete V.securityForcePersonnel;
+ delete V.securityForceInfantryPower;
+ delete V.securityForceArcologyUpgrades;
+ delete V.securityForceVehiclePower;
+ delete V.securityForceDronePower;
+ delete V.securityForceStimulantPower;
+ delete V.securityForceHeavyBattleTank;
+ delete V.securityForceAircraftPower;
+ delete V.securityForceSpacePlanePower;
+ delete V.securityForceAC130;
+ delete V.securityForceSatellitePower;
+ delete V.securityForceGiantRobot;
+ delete V.securityForceMissileSilo;
+ delete V.securityForceAircraftCarrier;
+ delete V.securityForceSubmarine;
+ delete V.securityForceHeavyAmphibiousTransport;
+ }
+
+ if (V.SF == undefined) {
+ if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
+ V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; Init();
+ if (V.securityForceName === undefined) V.securityForceName = "the special force";
+ if (V.SF.Active >= 1) {
+ Object.assign(V.SF, {
+ Depravity:V.securityForceDepravity,
+ Size:V.SFAO,
+ Upgrade:V.securityForceUpgradeToken,
+ Gift:V.securityForceGiftToken,
+ UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock},
+ ROE:V.securityForceRulesOfEngagement,
+ Target:V.securityForceFocus,
+ Regs:V.securityForceAccountability,
+ Caps:"The Special Force",
+ Lower:V.securityForceName,
+ Subsidy:V.SubsidyActive}); Main();
+ if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
+
+ if (V.ColonelCore === undefined) V.ColonelCore = "";
+ if (V.ColonelDiscussion === undefined) V.ColonelDiscussion = 0;
+ if (V.ColonelSexed === undefined) V.ColonelSexed = 0;
+ V.SF.Colonel = {
+ Core:V.ColonelCore,
+ Talk:V.securityForceColonelToken,
+ Fun:V.securityForceColonelSexed,
+ Status:V.ColonelRelationship}; Colonel();
+
+ if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0;
+ if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0;
+ if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0;
+ if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0;
+ V.SF.MercCon = {
+ History:V.OverallTradeShowAttendance,
+ CanAttend:V.CurrentTradeShowAttendance,
+ Income:V.TradeShowIncome,
+ Revenue:V.TotalTradeShowIncome,
+ Helots:V.TradeShowHelots,
+ TotalHelots:V.TotalTradeShowHelots,
+ Mercs:0,
+ TotalMercs:0}; TradeShow();
+ if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1;
+
+ if (V.securityForceHeavyBattleTank === undefined) V.securityForceHeavyBattleTank = 0;
+ if (V.securityForceSpacePlanePower === undefined) V.securityForceSpacePlanePower = 0;
+ if (V.securityForceAC130 === undefined) V.securityForceAC130 = 0;
+ if (V.securityForceSatellitePower === undefined) V.securityForceSatellitePower = 0;
+ if (V.securityForceGiantRobot === undefined) V.securityForceGiantRobot = 0;
+ if (V.securityForceMissileSilo === undefined) V.securityForceMissileSilo = 0;
+ if (V.securityForceAircraftCarrier === undefined) V.securityForceAircraftCarrier = 0;
+ if (V.securityForceSubmarine === undefined) V.securityForceSubmarine = 0;
+ if (V.securityForceHeavyAmphibiousTransport === undefined) V.securityForceHeavyAmphibiousTransport = 0;
+ V.SF.Squad = {
+ Troops:V.securityForcePersonnel,
+ Armoury:V.securityForceInfantryPower,
+ Firebase:V.securityForceArcologyUpgrades,
+ AV:V.securityForceVehiclePower,
+ TV:V.securityForceVehiclePower,
+ Drones:V.securityForceDronePower,
+ Drugs:V.securityForceStimulantPower,
+ PGT:V.securityForceHeavyBattleTank,
+ AA:V.securityForceAircraftPower,
+ TA:V.securityForceAircraftPower,
+ SpacePlane:V.securityForceSpacePlanePower,
+ GunS:V.securityForceAC130,
+ Satellite:{lv:V.securityForceSatellitePower, InOrbit:0},
+ GiantRobot:V.securityForceGiantRobot,
+ MissileSilo:V.securityForceMissileSilo,
+ AircraftCarrier:V.securityForceAircraftCarrier,
+ Sub:V.securityForceSubmarine,
+ HAT:V.securityForceHeavyAmphibiousTransport}; Units();
+ } else {
+ V.SF = {Depravity:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1};
+ V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0};
+ V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1;
+ V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0};
+ V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0};
+ if (V.securityForceName) {
+ Init(); Main(); Colonel(); TradeShow(); Units();
+ }
+ }
+ 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:[]};
+ } else {
+ if (V.SF.MWU) {
+ delete V.SF.MWU;
+ }
+ if (V.SpecOpsLock != undefined) {
+ V.SF.SpecOpsLock = V.SpecOpsLock; delete V.SpecOpsLock;
+ }
+ if (V.SF.UC == undefined) {
+ V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock}; delete V.SF.SpecOps;
+ delete V.SF.SpecOpsLock;
+ }
+ if (V.SF.U != undefined) {
+ V.SF.Upgrade = V.SF.U; delete V.SF.U;
+ }
+ if (V.SF.WG != undefined) {
+ V.SF.Gift = V.SF.WG; delete V.SF.WG;
+ }
+ if (V.SF.Facility == undefined) {
+ 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:[]};
+ }
+ if (V.SF.Bonus == undefined) {
+ V.SF.Bonus = 0;
+ }
+ if (V.SF.Depravity < 0) {
+ V.SF.Depravity = 0;
+ }
+ if (V.SF.Size == undefined) {
+ V.SF.Size = V.SF.Units; delete V.SF.Units;
+ }
+ if (V.SFUnit != undefined) {
+ if (V.SFUnit.AT != undefined) {
+ delete V.SFUnit.AT; V.SFUnitTA = 0;
+ }
+ V.SF.Squad = V.SFUnit;
+ delete V.SFUnit;
+ V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched};
+ delete V.SatLaunched;
+ V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
+ }
+ if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
+ if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
+ if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units();
+ if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = "";
+ }
+};
+
+window.BadOutcome = function() {
+ const V = State.variables,t = `The Colonel's`; var r =``;V.SF.Active = -2;
+ switch(V.SF.Colonel.Core) {
+ case "Shell-Shocked":
+ V.SF.BadOutcome = "lockdown",V.trinkets.push("${t} explosives detonator");
+ r +=`Unnerved by your ever-increasing influence over your men and undercutting of her authority, The Colonel uses heavy explosives at Midnight to seal off The Firebase from your access. When you step off of your express elevator, you are met not with two guards, but several armed proximity mines next to an incredibly thick wall of smoking rubble. No doubt there are machine gun nests, anti-tank nests, and lots more proximity mines just waiting for you on the other side, should you somehow get through the wall of debris.`;
+ r+=`<br>The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You receive no money from their exploits, and their total defiance and independance of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rouge. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your Arcology and good name.`;
+ break;
+ case "Cruel":
+ V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0,
+ V.cash -= 10000,V,arcologies[0].prosperity -= 50,V.ASlaves = 49,
+ V.ACitizens = 751,V.helots = 0, V.researchLab.menials = 0,
+ V.researchLab.hired = 0, V.fuckdolls = 0,V.menialBioreactors = 0,
+ V.activeUnits = 0,V.secBots.troops = 0, V.createdSlavesUnits = 0,
+ V.createdMilitiaUnits = 0, V.createdMercUnits = 0;
+ r+=`<br>The ${V.SF.Lower} still deploys into the old world to plunder as it pleases, but no longer for you. You recieve no money from their exploits, and their total defiance and independance of you is a permanent stain on your reputation. Of course, you'll never have the needed military power to dislodge them, especially with all the redundant fortifications, crossfire envelopes, and myriad traps that paranoid bitch had built around each entrance ever since she went rouge. Trying to sabotage certain support beams from above to make the Firebase facility collapse in on itself could easily cause enough damage to topple other parts of the arcology too, and such a thing would be very difficult to cover up. In other words, you're stuck with them. The Firebase has become a permanent tumor on your Arcology and good name.`;
+ break;
+ case "Cruel and Psychopathic":
+ V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0;
+ r += `<br>Finally fed up with your constant intrusions into her territory and crew, The Colonel riles up her people for an utterly ferocious rebellion. The promises of rape and plunder and dominion over some of the wealthiest tenants in the entire Free City (and their world-class slaves) are all thats needed to give the selfish lot of them a nearly unshakable resolve in the task of delivering their overlord Her most coveted prize: You.`;
+ r += `<br>It is now Midnight. The lights are the first thing they disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens start panicking almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Things like this were never supposed to happen again. You had promised them that you'd create an army that would protect them...`;
+ r += `<br>Her army vanguard strikes fast and hard throughout the main Plaza, cutting through your security personnel, defensive platoons, and drones with an ease that stinks of months of careful planning and study. Your defensive platoons, veterans of many Battles, are outmanuvered at every turn; their hidden ammunition caches are found empty, their communications networks are mysteriously scrambled, and key chokepoints are found to be booby-trapped before your men can even get to them; their well-rehearsed arcology defense routines have gone to ash. Assuming you ever get a chance to speak to The Colonel again, you would ask if her betrayal was actually inevitable rather than something you triggered.`;
+ r += `<br>You watch with immense dissappointment as the very APC's and IFV's that you paid for now charge into resisting storefronts to storm the armed civillians inside with heavy infantry at point blank range. Battle Tanks trample wounded civillians in the streets as they maneuver to blast your citizens' hastily-made holdouts to pieces, burying dozens of civillian loyalists under mountains of rubble while hundreds more are gunned down in the streets for want of adequate cover. The Plaza is lost; the enemy vanguard has gained access to the Residential Sectors upstairs. Enticed, entire platoons of her vanguard decide to become bandits, ignoring their Colonel's orders and scattering off from the main force to kick down many apartment doors and help themselves to whatever desirable goods or inhabitants they find within.`;
+ r += `<br>Outside, her many aircraft swarm the local airspace to patrol the Arcology outskirts, conduct recon scans of the upper levels, or monitor your sealed penthouse outside the range of your SAM turrets, while shooting down any other fleeing VTOL's. You will not be escaping by air today. No one will. No escaping by land either: Swarms of her drones are tasing fleeing noncombatants by the hundreds for later enslavement, as the remainder of her army begins to pour into the bloody Plaza. This is your Arcology's darkest hour.`;
+ r += `<br>And yet your Mercenaries stand ready. On security feeds throughout the Residential Sectors and Garrison you see your elite sellswords charging out of their lodgings in full kit. They are few, but this is their home, and you are their Patron and Commander. They hold firm, fighting like legends of old in some places, and fighting like animals in others. The Mercenaries trapped downstairs near The Garrison take to the Markets, pinning down most of The Colonel's reinforcements from various shopping outlets using towed quad anti-aircraft guns, and ultimately cutting off many of the assets needed for The Colonel's ongoing assault upstairs. Enemy troop carriers laden with heavy infantry breach the shopping centers in order to dislodge them, only to have their inhabitants cooked alive before they can disembark in time or shot to pieces even when they do. Keeping these Mercenaries alive are the roving exosuit-clad tank hunter duos that frag entire armour platoons en route to these shopping outlets, resorting to carving open enemy AFV's up close with their powered CQB weapons once they've run out of missiles. Back in the Residencies upstairs, in the still-evacuating streets and atriums, your actively-camoflauged snipers take up choice positions on various balconies and overpasses, sowing panic among the advancing traitors with their impressive anti-material rifles with one explosive headshot after another, sometimes even hitting them through walls and buildings. In large indoor parks leading up to the main Residential courtyard, Mercenary fireteams force enemy flankers to flee every single footpath they walk through, harrassing constantly and preventing any hostile reconnaisance or infiltration from being done.`;
+ r += `<br>The main Residential courtyard features the Residential Sectors' massive elevator complex, which will give The Colonel's forces rapid access to the Promenade, and ultimately, You. In front of it, your Mercenary Captain stands atop one of the many metres-thick sandbag walls his men just assembled there, leading the raging defensive blockade in bringing the vangaurd's assault to a gory halt. ${V.SF.Lower}'s bodies and bits and debris pile up in small walls on the outskirts under the burning heat of hundreds of flying autocannon rounds and dozens of screeching missiles. Before the vanguard's morale can break however, The Colonel shows up in person behind her own lines, kitted in a customized power armour and dragging, of all things, a hydraulic trebucket loaded with a crudely-welded large metal box. She launches the box from beyond your Merceneries' line of sight, sending it reeling towards them and predicting that they will try to shoot it out of the sky. They do, not wanting the slow but strange projectile to hit them directly, only learning of their folly when the metal 'box' detonates midair and releases a dense cloud of cluster bombs over their position. The munitions themselves disable some of the exosuits, but they don't kill too many on their own. However, the bomblets do succeed in detonating the various ammo dumps that were feeding your Mercenaries' blazing guns. The chain explosions, resulting fires, destroyed cover, and widespread casualties and confusion all create the perfect opportunity for The Colonel to storm the previously implacable barricade at the head of her troops, with her followers rushing the merc lines and blasting off the heavy armour plating of your disoriented Mercenaries themselves before stabbing them to death, or in some cases, hauling off the dis-armoured and defeated female Mercenaries they discover for immediate use. As the few intact Mercenaries remaining desperately struggle to hold off the advancing horde with their remaining ammo, The Colonel takes on your dazed Mercenary Captain in single combat. When their ammunition runs dry, and their blasted battlesuits break down, they both eject, and then the knives come out. Minutes later, she stabs him in the side of his skull after she dodges yet another attempt to land a killing blow on her. With the source of Mercenary command and control gone, The Colonel stauches her own bleeding, yanks a trooper out of a near-pristine battlesuit that she now claims for herself, and directly organizes the isolation and extermination of the smaller teams of Mercenaries that are bleeding her troops everywhere else. She routs your Mercenaries for good with the razing of their Garrison structure. The ${V.SF.Lower} now enjoys absolute air and ground superiority. Soon the surviving rear of her army is brought upstairs from the killing floors down in the Markets, and the many elevators and cargo lifts of the elevator complex are boarded, with your executive override codes to remotely shut down the elevators somehow being manually bypassed by her combat engineers. It won't be long now.`;
+ r += `<br>Dawn has broken over the Free City. Only five hours into the slaughter (of which your Mercenaries no doubt bought you at least three), it becomes very clear to you that the only way to save your arcology is to destroy it. Everything and Everyone will burn before you let this crazy bitch and her rabid dogs get thier dirty hands on you or your slaves. On your order, your most loyal subordinates, the ones who were with you since the early days to patrol your Arcology before you even had drones to protect it, fight their way to through the carnage of your panicking civillians on The Promenade to get to the exact hidden elevators that your Personal Assistant specifies for them. Their destination is the arcology's reactor complex, of course. Following the PA's instructions precisely, they arm their many high-yield explosive charges on your now-exposed and de-stabilized reactor, and in one final service to you, detonate them, creating a collosal explosion. The rapidly ascending heretics quite literally have the rug pulled from under them, as the blast takes out nearly all of the arcology's lesser foundational support beams, thus collapsing many thousands of metric tons of concrete, steel, plastic, and plaster out from underneath the upward bound Colonel and her men... And everyone else, unforteunately. With no foundation any longer, all of your arcology's interior Sectors are utterly gutted from the bottom-up by gravity itself, and everything beneath your ration-stocked, backup-powered Penthouse crumbles to the earth. The massive cloud of dust created by the widespread fires and interior collapse ends up covering the entire Free City for hours. Her aircraft, now berift of their logistical support and command structure, immediately fly off to neighboring arcologies to offer their services to the various employers there, seeing as the coup has failed and they have nowhere else to go. The skies are free for You to travel as you please, but You aren't going anywhere.`;
+ r += `<br>It is Eveningtime when the tremors finally stop. Everything below your Penthouse is ruin, and your arcology, its population, and your reputation are now essentially dust. However, the arcology did not fall. It. Is. Still. Yours. You shall rise again, not flee this tragedy in shame. Of course, no one will ever know that you sacrificed the arcology delibrately in order to save yourself; it is all too easy to claim that The Colonel carelessly damaged the reactor complex during her assault, ironically causing her own defeat. Frankly, sacrificing most of your tenants doesn't bother you as much as it probably should; maybe its because you know that if The Colonel and her men had won, all those people were as good as dead anyway.`;
+ r += `<br>You know that if you want to survive, you'll need to sorround yourself with workers and allies to rebuild fast, else your rivals gobble you up. It costs you a horrific sum to clear and process the wreckage and rebuild the basic Sector superstructures and infrastructure for your arcology on such short notice, even after liqidating everything your workers salvage. Your powerful friends still residing in the Old World or other Free Cities have lent you a suprising amount of aid too, with quite a few lended super-heavy contruction assets getting huge amounts of work done quickly. Even then, what you've been able to rebuild is very little. After a nearly sleepless, sexless week of immense toil, you've successfully organized tens of thousands of people in restoring the arcology to a barely functional condition (along with rudimentary imitations of all your upgrades), and you've even got some new Garrison Mercenaries in by week's end too... But its just not the same. If it weren't for your bruised weather-plating your arcology would look like a giant skeleton. Inside, it feels like a concrete boneyard; everything has been built cheap and utilitarian, and the walls aren't even painted. With only a few operational services staffed by commuters from neighboring arcologies, there is just an eerie silence just about everywhere. With few amenities for relief, there are going to be many long days ahead for your few tenants, most of them being wealthy but distraught returning travellers who left before the attack. Maybe your slaves can help entertain them. A lot of these people are VIP's it seems.`;
+ r += `<br>It is now Midnight. In a rare moment of reflection, you contemplate that what The Colonel just did to your arcology was exactly what you were all too happy to have her do to dozens, if not hundreds of innocent villages and townships under your shadow during her 'Raiding and Slaving' operations. Nevertheless, You have hard work ahead of you, especially now that your enemies see that you are now much weaker than you have ever been.`;
+ r += `<br>The Colonel's body was never found.`;
+ break;
+ case "Kind":
+ V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"),
+ V.Cash += 55000,V.helots += 73;
+ r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`;
+ r += `<br>At Midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`;
+ r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavillion, you see a white gift card standing upright.`;
+ r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her dissappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavours.`;
+ r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
+ break;
+ }
+}
\ No newline at end of file
diff --git a/src/SpecialForce/NamingColonel.tw b/src/SpecialForce/NamingColonel.tw
index 12d3e95c9c48b768c946a28397a956f057115685..2c76f6b885f8791c8b3da87fabd91bc242511b99 100644
--- a/src/SpecialForce/NamingColonel.tw
+++ b/src/SpecialForce/NamingColonel.tw
@@ -1,6 +1,8 @@
:: Security Force Naming-Colonel [nobr]
-<<set $nextButton = " ">> <<if ndef $NamingColonel>> <<set $NamingColonel = 0>> <</if>>
-<<if $NamingColonel === 0>>
+<<set $nextButton = " ">> <<if ndef $NamingColonel>> <<set $NamingColonel = -1>> <</if>>
+<<if $NamingColonel < 0>>
+ You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
+
It's been a short while since you told your citizens that you were going to talk to them about their security, and by all accounts, they've turned out in force to watch your address over the arcology's internal communications system. You wake up early, relieve your frustrations on a few slaves woken out of deep sleep, and take position behind your desk. You also call over a slave and push her under your desk. The unspoken instruction is clear, and she begins enthusiastically
<<if $PC.dick == 1>>
sucking your cock, taking it as deep as she can without gagging.
@@ -14,26 +16,26 @@
<br><br>As you speak, you carefully monitor the citizens' opinions as indicated on their communication devices. It is uniformly positive - they know whom they have to thank for their continued survival and dominance. You also monitor your arousal given the ministrations of your slave. A few small movements on your part communicate to your citizens what is happening without being too obvious. Free Cities business etiquette respects business conducted while being subtly serviced (and your doing so during such a public and important broadcast signals how seriously you are taking it), but a climax would be seen as a serious lack of discipline.
- <br><br>You finally wrap up your speech, declaring yourself Marshal of the newly-formed <<textbox "$SF.Lower" $SF.Lower>>
+ <br><br>You finally wrap up your speech, declaring yourself Marshal of the newly-formed <<textbox "$SF.Lower" $SF.Lower "Security Force Naming-Colonel">>
<br><br>You close the link to the communication system and read a message from your assistant that appeared during the last moments of your address. In consultation with major figures in the mercenary community, a suitable candidate for day-to-day command of the new unit has been found. Your instructions were to keep you in the dark about them so as to avoid prejudgment. They are waiting outside your office.
<br><br>[[Invite them inside|Security Force Naming-Colonel][$NamingColonel = 1]]
-<</if>>
-<<if $NamingColonel === 1>>
+<<elseif $NamingColonel < 2>>
+ <<if $SF.Lower != "the special force">> <<set $SF.Caps = $SF.Lower.replace("the ", "The ")>> <</if>>
The figure that enters is not what you were expecting, given your previous experiences with the mercenary groups that work with the arcology owners of the Free Cities. Most mercenaries you've worked with have been grizzled stout men, veterans of the Old World militaries that finally had too much and went private. Instead, a woman walks in.
- <<if $SFColonel.Core == "">>
+ <<if $SF.Colonel.Core == "">>
She strikes you as someone who is likely to be:
- <br><br>[[Kind|Security Force Naming-Colonel][$SFColonel.Core = "kind"]]
- <br>[[Cruel and psychopathic|Security Force Naming-Colonel][$SFColonel.Core = "cruel"]]
- <br>[[A brazen warmonger|Security Force Naming-Colonel][$SFColonel.Core = "brazen"]]
- <br>[[Jaded|Security Force Naming-Colonel][$SFColonel.Core = "jaded"]]
- <br>[[Shell-shocked|Security Force Naming-Colonel][$SFColonel.Core = "shell shocked"]]
+ <br><br>[[Kind|Security Force Naming-Colonel][$SF.Colonel.Core = "kind"]]
+ <br>[[Cruel and psychopathic|Security Force Naming-Colonel][$SF.Colonel.Core = "cruel"]]
+ <br>[[A brazen warmonger|Security Force Naming-Colonel][$SF.Colonel.Core = "brazen"]]
+ <br>[[Jaded|Security Force Naming-Colonel][$SF.Colonel.Core = "jaded"]]
+ <br>[[Shell-shocked|Security Force Naming-Colonel][$SF.Colonel.Core = "shell shocked"]]
<</if>>
- <<if $SFColonel.Core !== "">>
- She is likely to be ''$SFColonel.Core''.
+ <<if $SF.Colonel.Core !== "">>
+ She is likely to be ''$SF.Colonel.Core''.
<br><br>She strides in, stopping in front of your desk,
- <<switch $SFColonel.Core>>
+ <<switch $SF.Colonel.Core>>
<<case "kind">>
pulling off a laid-back salute with an easy grin.
<<case "cruel">>
@@ -48,7 +50,7 @@
<br><br>Returning your gaze to her face, she crosses her arms underneath her chest, pressing her breasts up and forward. You have her measure. Given the generally patriarchal nature of both the mercenary community, and the same nature combined with the heavily sexualized lifestyle of the Free Cities, she's decided to embrace her position rather than fight it.
<br><br>"So," she begins, "you're the boss." You invite her to sit down. "No thanks, boss. Besides,"
- <<switch $SFColonel.Core>>
+ <<switch $SF.Colonel.Core>>
<<case "kind">>
she playfully
<<case "shell shocked">>
@@ -63,7 +65,7 @@
eaten out,
<</if>>
but I've never seen anyone actually do it. Hell, most of you people don't want to have to have too much to do with a merc like me. I usually get my instructions remotely."
- <<switch $SFColonel.Core>>
+ <<switch $SF.Colonel.Core>>
<<case "jaded" "brazen">>
A short, harsh laugh escapes her. "But I guess it keeps you focused. Can't have the entire arcology seeing you cum."
<<case "kind">>
@@ -71,8 +73,8 @@
<<case "cruel">>
She frowns. "The client always seems to be happier that way."
<</switch>>
- <br><br>She moves a step closer. "Your computer-helper-thing told me you wanted me to be a surprise, so I guess I'll tell you why you want me to run the $SF.Lower for you. I'm a killer, pure and simple,<<if $SFColonel.Core === "cruel">>" she smiles, "<</if>>and you need that. I looked into those attacks you've suffered. Nasty business. I'll make sure that an attack like that never happens again. I was a soldier out there, in charge of about a thousand men when the Free Cities first started going up, and I knew they were the future. Eventually I deserted, found the first refugee convoy I could, killed the moron protecting it, sold the girls off to slavers, and bought enough gear to start killing for people like you. Ran my own merc crew, did well till we tried to take on a bigger one and everyone died."
- <<switch $SFColonel.Core>>
+ <br><br>She moves a step closer. "Your computer-helper-thing told me you wanted me to be a surprise, so I guess I'll tell you why you want me to run the $SF.Lower for you. I'm a killer, pure and simple,<<if $SF.Colonel.Core === "cruel">>" she smiles, "<</if>>and you need that. I looked into those attacks you've suffered. Nasty business. I'll make sure that an attack like that never happens again. I was a soldier out there, in charge of about a thousand men when the Free Cities first started going up, and I knew they were the future. Eventually I deserted, found the first refugee convoy I could, killed the moron protecting it, sold the girls off to slavers, and bought enough gear to start killing for people like you. Ran my own merc crew, did well till we tried to take on a bigger one and everyone died."
+ <<switch $SF.Colonel.Core>>
<<case "shell shocked">>
She looks away, caught in her own memories. It takes a solid minute before she starts again.
<<case "cruel">>
@@ -90,13 +92,13 @@
<</if>>
<br><br>
- <<if $SFColonel.Core === "shell shocked">>
+ <<if $SF.Colonel.Core === "shell shocked">>
The merc looks away again, letting the girl settle down before continuing.
<<else>>
The merc laughs again. "I could get used to a place like this."
<</if>>
- She waves her hand around the office. "I bet you want to know why I'd be trustworthy for something like this." You don't correct her. "Thought so." Her demeanor softens, and you can detect a hit of nervousness. "I would say that I've never turned on a client and leave it at that, but this is different. It's getting worse out there. I'm sure you know that." You give her a slight nod. "Four times now I've woken up in the middle of the night and had to kill someone.<<if $SFColonel.Core === "shell shocked">>"<<else>> Two of them were the people I'd taken to bed. You can't even trust your drunken fucks anymore.
- <<switch $SFColonel.Core>>
+ She waves her hand around the office. "I bet you want to know why I'd be trustworthy for something like this." You don't correct her. "Thought so." Her demeanor softens, and you can detect a hit of nervousness. "I would say that I've never turned on a client and leave it at that, but this is different. It's getting worse out there. I'm sure you know that." You give her a slight nod. "Four times now I've woken up in the middle of the night and had to kill someone.<<if $SF.Colonel.Core === "shell shocked">>"<<else>> Two of them were the people I'd taken to bed. You can't even trust your drunken fucks anymore.
+ <<switch $SF.Colonel.Core>>
<<case "kind">>
It's a shame, but that's the world we live in."
<<case "cruel">>
@@ -106,13 +108,13 @@
<</switch>><</if>>
<br><br>
- <<if $SFColonel.Core === "jaded" || $SFColonel.Core === "shell shocked">>
+ <<if $SF.Colonel.Core === "jaded" || $SF.Colonel.Core === "shell shocked">>
"All I know how to do at this point is fight, and that's kept me alive this far.
<<else>>
"I like fighting, but I want to live somewhere where I can relax from life out there.
<</if>>
You give me the job and a place to live, let me hang up the uncertainty of being a merc, and I'll die for you if it comes to that. I promise the people I recruit will feel the same. Besides," she grins, "I could get used to
- <<switch $SFColonel.Core>>
+ <<switch $SF.Colonel.Core>>
<<case "brazen">>
crushing any enemy that looks our way."
<<case "cruel">>
@@ -128,17 +130,16 @@
<br><br>[[Let her leave|Security Force Naming-Colonel][$NamingColonel = 2]]
<</if>>
-<</if>>
-<<if $NamingColonel === 2>>
- <<set $nextLink = "Next Week",$nextButton = "Continue">> <<unset $NamingColonel>>
+<<elseif $NamingColonel < 3>>
+ <<set $nextLink = "RIE Eligibility Check",$nextButton = "Continue">> <<unset $NamingColonel>>
She turns and leaves, and you chase the slave out after her. A few minutes later, a soft chime announces the arrival of a message. It's from the Colonel.
- <br><br>//Hey boss, just wanted to mention something else. In your speech you said that you were going to be paying for $SF.Lower. In my mind that means it's yours, no matter what anyone else here might think. I do what you tell me to do. I make sure the troops behave as you want them to behave. I've worked for some 'nice guys' in the past, and I can do that job if you want. It's boring, but sustainable, and I'll have the $SF.Lower turning a profit and supporting the arcology in good order. But if you let me <<if $SFColonel.Core === "cruel">>off the leash<<else>>do what I do<</if>> and throw any Old World complaints in the trash where they belong, I promise you'll have money pouring into your coffers, even accounting for the good amounts me and my boys will pocket along the way. You'll have an empire in short order.
+ <br><br>//Hey boss, just wanted to mention something else. In your speech you said that you were going to be paying for $SF.Lower. In my mind that means it's yours, no matter what anyone else here might think. I do what you tell me to do. I make sure the troops behave as you want them to behave. I've worked for some 'nice guys' in the past, and I can do that job if you want. It's boring, but sustainable, and I'll have the $SF.Lower turning a profit and supporting the arcology in good order. But if you let me <<if $SF.Colonel.Core === "cruel">>off the leash<<else>>do what I do<</if>> and throw any Old World complaints in the trash where they belong, I promise you'll have money pouring into your coffers, even accounting for the good amounts me and my boys will pocket along the way. You'll have an empire in short order.
<<if $mercenaries > 1>>
Either way, I'll keep my hands off those mercs you've already installed. I figure that you've reasons for having two different death squads under contract.
<</if>>
<br><br>Oh, one last thing. I know you've got some kind of grand social experiment going on up there like all the other arco owners, and that's your own deal, but I'd appreciate it if you could keep that stuff out of the new barracks. I'll have a hard time approaching potential recruits and telling them they should come live in a Roman apartment, an Egyptian temple, a goddamn Japanese teahouse, or some of the other crazy shit I've seen in the past. They're hard, nasty people, and trust me, I can tell you from experience that changing that is just not going to happen. Like I said, though, I can hold them back a bit if you like.
- <br><br>Talk to you later, boss.// <<set $SF.Active = 2>>
+ <br><br>Talk to you later, boss.//
<</if>>
\ No newline at end of file
diff --git a/src/SpecialForce/Proposal.tw b/src/SpecialForce/Proposal.tw
index b9acd01fc5eeaa4566fd64b79ba931c99c7307c1..307368db34bce27694e31fb164e239aea5c27109 100644
--- a/src/SpecialForce/Proposal.tw
+++ b/src/SpecialForce/Proposal.tw
@@ -1,26 +1,20 @@
:: Security Force Proposal [nobr]
-<<if $SF.Active === -1 && passage() !== "New Game Plus">>
- <span id="result">
+<<set $nextButton = " ">> <span id="result">
+The Free Cities were founded on the principles of unrestrained anarcho-capitalism. To those with such beliefs, the very idea of possessing an armed force, a key tool of government control, or weapons at all, was anathema.
- The Free Cities were founded on the principles of unrestrained anarcho-capitalism. To those with such beliefs, the very idea of possessing an armed force, a key tool of government control, or weapons at all, was anathema.
+<br><br>In the period since, however, your citizens have seen the value in weaponry. They watched on their news-feed as some Free Cities were sacked by the armies and mobs of the Old World, driven by their hatred of the citizens' luxurious lifestyles. They've seen other Cities toppled from within, by slave conspiracies or infighting among citizen groupings with differing beliefs. They've witnessed the distressingly rapid rise of fanatical anti-slavery organizations, who would like nothing more than to see them slowly bled by their own chattel. They are learned people, and they know what happens to slaveowners who lose their power.
- <br><br>In the period since, however, your citizens have seen the value in weaponry. They watched on their news-feed as some Free Cities were sacked by the armies and mobs of the Old World, driven by their hatred of the citizens' luxurious lifestyles. They've seen other Cities toppled from within, by slave conspiracies or infighting among citizen groupings with differing beliefs. They've witnessed the distressingly rapid rise of fanatical anti-slavery organizations, who would like nothing more than to see them slowly bled by their own chattel. They are learned people, and they know what happens to slaveowners who lose their power.
+<br><br>They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the Old World came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'special' force for the arcology, many would support you and, more importantly, nobody of note would object.
- <br><br>They've also seen the results of your policies. Your actions towards the arming of both yourself and the arcology proved critical, and ensured their safety when the Old World came for them. And your victory over the Daughters of Liberty, who the citizens know would have executed every single one of them, has created an opportunity. If you insisted upon the creation of a standing 'special' force for the arcology, many would support you and, more importantly, nobody of note would object.
+<br><br>Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the Old World militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the Old World itself.
- <br><br>Such a force would solve many problems. More soldiers would mean more control, which is very good for you. More soldiers would mean more security for the arcology and the approaches to it, which is very good for business. More soldiers would mean more obedience from rebellious slaves who can see how powerless they truly are, which is very good for everybody. The force would be tiny compared to the Old World militaries that still exist, but money and technology can, of course, overcome massive numerical inferiority. This being the Free Cities, they would have other uses besides security. Perhaps, in time, you could exert some manner of influence on the Old World itself.
+<br><br>''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade,and you will not be able to raise the matter again.
- <br><br>''This is a unique and very important opportunity'', and is possible only because of your recent victory over the Daughters. If you do not seize it, the memories and fears of your citizens will fade,and you will not be able to raise the matter again.
+<<set _price = 20000>> <<if $PC.warfare >= 100>> <<set _price = _price*.5>>
+<<elseif $PC.warfare >= 50||$PC.career === "arcology owner">>
+<<set _price = _price*.75>> <</if>>
+<br><<link "Prepare for an announcement.""Security Force Naming-Colonel">> <<replace "#result">>
+ <<= SFInit()>> <<set $cash -= _price,$SF.Active += 2>>
+<</replace>> <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
- <<set _price = 20000>> <<if $PC.warfare >= 100>> <<set _price = _price*.5>>
- <<elseif $PC.warfare >= 50||$PC.career === "arcology owner">>
- <<set _price = _price*.75>> <</if>>
- <br><<link "Prepare for an announcement.""Security Force Proposal">> <<replace "#result">>
- You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
- <<set $cash -= _price>> <<= SFInit()>>
- <</replace>> <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
-
- <br><<link "The current measures are enough.""Next Week">> <<replace "#result">> <<run Object.assign(, $SF, {Active:0})>> <</replace>> <</link>> </span>
-<<elseif $SF.Active === 1>>
- <<include "Security Force Naming-Colonel">>
-<</if>>
\ No newline at end of file
+<br><<link "The current measures are enough.""RIE Eligibility Check">> <<replace "#result">> <<run Object.assign(, $SF, {Active:0})>> <</replace>> <</link>> </span>
\ No newline at end of file
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index 352ad3ba4d11d8d4b2021d346d53b895bb66135f..3ac1fd5c98baa6b749a33dad7d883412ec4c88f6 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -1,89 +1,89 @@
:: SF_Report [nobr]
-<<silently>> <<= Count()>>
- <<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>>
- <<if $SFUnit.Troops < 100>> <<set $SFUnit.Troops += Math.ceil(random(2,5))>>
- <<elseif $SFUnit.Troops < 2000>>
+<<silently>> <<= Count()>> <<set _target = 100000>>
+ <<if $SF.Squad.Troops > 2000>> <<set $SF.Squad.Troops = random(1955,1999)>> <</if>>
+ <<if $SF.Squad.Troops < 100>> <<set $SF.Squad.Troops += Math.ceil(random(2,5))>>
+ <<elseif $SF.Squad.Troops < 2000>>
<<if $SF.Target == "recruit">>
- <<set $SFUnit.Troops += Math.ceil(random(-1*$SFUnit.Troops/100,0))>>
+ <<set $SF.Squad.Troops += Math.ceil(random(-1*$SF.Squad.Troops/100,0))>>
<<elseif $SF.Target == "raiding">>
- <<set $SFUnit.Troops += Math.ceil(random(-3*$SFUnit.Troops/100,-4*$SFUnit.Troops/100))>>
+ <<set $SF.Squad.Troops += Math.ceil(random(-3*$SF.Squad.Troops/100,-4*$SF.Squad.Troops/100))>>
<<else>>
- <<set $SFUnit.Troops += Math.ceil(random(-2*$SFUnit.Troops/100,-3*$SFUnit.Troops/100))>>
+ <<set $SF.Squad.Troops += Math.ceil(random(-2*$SF.Squad.Troops/100,-3*$SF.Squad.Troops/100))>>
<</if>>
<</if>>
<<set _SFIncome = 75000,_actionMultiplier = 1,_troopMultiplier = 1,_unitMultiplier = 1,_depravityMultiplier = 1,_SFupkeep = 0,_FNGs = 10,_Trade = 0.025>>
- <<if $SF.SpecOps > 0>>
- <<if $SF.SpecOps === 1>> <<set $SFUC = Math.ceil($SFUnit.Troops*.1),$SFUnit.Troops-$SFUC>>
- <<else>> <<set $SFUC = Math.ceil($SFUnit.Troops*.25),$SFUnit.Troops-$SFUC>> <</if>>
+ <<if $SF.UC.Assign > 0>>
+ <<if $SF.UC.Assign === 1>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.1),$SF.Squad.Troops-$SFUC>>
+ <<else>> <<set $SFUC = Math.ceil($SF.Squad.Troops*.25),$SF.Squad.Troops-$SFUC>> <</if>>
<</if>>
- <<if $SFUnit.Troops > 200>> <<set _Trade += 0.05*(Math.ceil($SFUnit.Troops/100))>>
- <<set _troopMultiplier = $SFUnit.Troops/200, _SFupkeep += $SFUnit.Troops*25>>
+ <<if $SF.Squad.Troops > 200>> <<set _Trade += 0.05*(Math.ceil($SF.Squad.Troops/100))>>
+ <<set _troopMultiplier = $SF.Squad.Troops/200, _SFupkeep += $SF.Squad.Troops*25>>
<<if $secExp > 0>>
- <<set $authority += 25*(Math.ceil($SFUnit.Troops/200)),$authority = Math.clamp($authority, 0, 20000)>>
+ <<set $authority += 25*(Math.ceil($SF.Squad.Troops/200)),$authority = Math.clamp($authority, 0, 20000)>>
<</if>>
<</if>>
- <<if $SFUnit.Firebase > 0>>
- <<set _FNGs += $SFUnit.Firebase,_Trade += 0.5*$SFUnit.Firebase,_unitMultiplier += 7.5*$SFUnit.Firebase+2*Math.pow($SFUnit.Firebase,2),_SFupkeep += 500*(10+$SFUnit.Firebase)>>
+ <<if $SF.Squad.Firebase > 0>>
+ <<set _FNGs += $SF.Squad.Firebase,_Trade += 0.5*$SF.Squad.Firebase,_unitMultiplier += 7.5*$SF.Squad.Firebase+2*Math.pow($SF.Squad.Firebase,2),_SFupkeep += 95*(10+$SF.Squad.Firebase)>>
<</if>>
- <<if $SFUnit.Armoury > 0>>
- <<set _FNGs += (2*$SFUnit.Armoury),_Trade += 0.25*$SFUnit.Armoury,_unitMultiplier += 7.5*$SFUnit.Armoury+2*Math.pow($SFUnit.Armoury,2), _SFupkeep += 100*$SFUnit.Armoury>>
+ <<if $SF.Squad.Armoury > 0>>
+ <<set _FNGs += (2*$SF.Squad.Armoury),_Trade += 0.25*$SF.Squad.Armoury,_unitMultiplier += 7.5*$SF.Squad.Armoury+2*Math.pow($SF.Squad.Armoury,2), _SFupkeep += 55*$SF.Squad.Armoury>>
<</if>>
- <<if $SFUnit.Drugs > 0>>
- <<set _FNGs += $SFUnit.Drugs,_Trade += 0.25*$SFUnit.Drugs,_unitMultiplier += 7.5*$SFUnit.Drugs+2*Math.pow($SFUnit.Drugs,2),_SFupkeep += 300*$SFUnit.Drugs>>
+ <<if $SF.Squad.Drugs > 0>>
+ <<set _FNGs += $SF.Squad.Drugs,_Trade += 0.25*$SF.Squad.Drugs,_unitMultiplier += 7.5*$SF.Squad.Drugs+2*Math.pow($SF.Squad.Drugs,2),_SFupkeep += 35*$SF.Squad.Drugs>>
<</if>>
- <<if $SFUnit.Firebase >= 1>>
- <<if $SFUnit.AV > 0>>
- <<set _FNGs += $SFUnit.AV,_Trade += 0.25*$SFUnit.AV,_unitMultiplier += 7.5*$SFUnit.AV+2*Math.pow($SFUnit.AV,2),_SFupkeep += 1000*$SFUnit.AV>>
+ <<if $SF.Squad.Firebase >= 1>>
+ <<if $SF.Squad.AV > 0>>
+ <<set _FNGs += $SF.Squad.AV,_Trade += 0.25*$SF.Squad.AV,_unitMultiplier += 7.5*$SF.Squad.AV+2*Math.pow($SF.Squad.AV,2),_SFupkeep += 89*$SF.Squad.AV>>
<</if>>
- <<if $SFUnit.TV > 0>>
- <<set _FNGs += $SFUnit.TV,_Trade += 0.25*$SFUnit.TV,_unitMultiplier += 7.5*$SFUnit.TV+2*Math.pow($SFUnit.TV,2), _SFupkeep += 800*$SFUnit.TV>>
+ <<if $SF.Squad.TV > 0>>
+ <<set _FNGs += $SF.Squad.TV,_Trade += 0.25*$SF.Squad.TV,_unitMultiplier += 7.5*$SF.Squad.TV+2*Math.pow($SF.Squad.TV,2), _SFupkeep += 89*$SF.Squad.TV>>
<</if>>
- <<if $SFUnit.PGT > 0>>
- <<set _Trade += 0.25*($SFUnit.PGT),_unitMultiplier += 15*$SFUnit.PGT+3*Math.pow($SFUnit.PGT,2),_SFupkeep += 5000+1000*$SFUnit.PGT>>
+ <<if $SF.Squad.PGT > 0>>
+ <<set _Trade += 0.25*($SF.Squad.PGT),_unitMultiplier += 15*$SF.Squad.PGT+3*Math.pow($SF.Squad.PGT,2),_SFupkeep += 100*$SF.Squad.PGT>>
<</if>>
<</if>>
- <<if $SFUnit.Firebase >= 2 && $SFUnit.Drones > 0>>
- <<set _FNGs += $SFUnit.Drones,_Trade += 0.5*$SFUnit.Drones,_unitMultiplier += 7.5*$SFUnit.Drones+2*Math.pow($SFUnit.Drones,2),_SFupkeep += 500*$SFUnit.Drones>>
+ <<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones > 0>>
+ <<set _FNGs += $SF.Squad.Drones,_Trade += 0.5*$SF.Squad.Drones,_unitMultiplier += 7.5*$SF.Squad.Drones+2*Math.pow($SF.Squad.Drones,2),_SFupkeep += 50*$SF.Squad.Drones>>
<</if>>
- <<if $SFUnit.Firebase >= 4>>
- <<if $SFUnit.AA > 0>>
- <<set _FNGs += $SFUnit.AA,_Trade += 0.25*$SFUnit.AA,_unitMultiplier += 7.5*$SFUnit.AA+2*Math.pow($SFUnit.AA,2),_SFupkeep += 1000*$SFUnit.AA>>
+ <<if $SF.Squad.Firebase >= 4>>
+ <<if $SF.Squad.AA > 0>>
+ <<set _FNGs += $SF.Squad.AA,_Trade += 0.25*$SF.Squad.AA,_unitMultiplier += 7.5*$SF.Squad.AA+2*Math.pow($SF.Squad.AA,2),_SFupkeep += 100*$SF.Squad.AA>>
<</if>>
- <<if $SFUnit.TA > 0>>
- <<set _FNGs += $SFUnit.TA,_Trade += 0.25*$SFUnit.TA,_unitMultiplier += 7.5*$SFUnit.TA+2*Math.pow($SFUnit.TA,2),_SFupkeep += 800*$SFUnit.TA>>
+ <<if $SF.Squad.TA > 0>>
+ <<set _FNGs += $SF.Squad.TA,_Trade += 0.25*$SF.Squad.TA,_unitMultiplier += 7.5*$SF.Squad.TA+2*Math.pow($SF.Squad.TA,2),_SFupkeep += 80*$SF.Squad.TA>>
<</if>>
- <<if $SFUnit.SpacePlane > 0>>
- <<set _FNGs += $SFUnit.SpacePlane,_Trade += 0.25*$SFUnit.SpacePlane,_unitMultiplier += 7.5*$SFUnit.SpacePlane+2*Math.pow($SFUnit.SpacePlane,2),_SFupkeep += 1000*$SFUnit.SpacePlane>>
+ <<if $SF.Squad.SpacePlane > 0>>
+ <<set _FNGs += $SF.Squad.SpacePlane,_Trade += 0.25*$SF.Squad.SpacePlane,_unitMultiplier += 7.5*$SF.Squad.SpacePlane+2*Math.pow($SF.Squad.SpacePlane,2),_SFupkeep += 100*$SF.Squad.SpacePlane>>
<</if>>
- <<if $SFUnit.GunS > 0>>
- <<set _FNGs += $SFUnit.GunS,_Trade += 0.25*$SFUnit.GunS,_unitMultiplier += 12*$SFUnit.GunS+3*Math.pow($SFUnit.GunS,2),_SFupkeep += 3000+700*$SFUnit.GunS>>
+ <<if $SF.Squad.GunS > 0>>
+ <<set _FNGs += $SF.Squad.GunS,_Trade += 0.25*$SF.Squad.GunS,_unitMultiplier += 12*$SF.Squad.GunS+3*Math.pow($SF.Squad.GunS,2),_SFupkeep += 70*$SF.Squad.GunS>>
<</if>>
- <<if $SFUnit.Satellite > 0>>
- <<set _FNGs += $SFUnit.Satellite,_Trade += 0.25*$SFUnit.Satellite,_unitMultiplier += 15*$SFUnit.Satellite+5*Math.pow($SFUnit.Satellite,2)>>
+ <<if $SF.Squad.Satellite.lv > 0 && $SF.Squad.Satellite.InOrbit > 0>>
+ <<set _FNGs += $SF.Squad.Satellite.lv,_Trade += 0.25*$SF.Squad.Satellite.lv,_unitMultiplier += 15*$SF.Squad.Satellite.lv+5*Math.pow($SF.Squad.Satellite.lv,2),_SFupkeep += 85*$SF.Squad.Satellite.lv>>
<</if>>
- <<if $SFUnit.GiantRobot > 0>>
- <<set _FNGs += $SFUnit.GiantRobot,_Trade += 0.25*$SFUnit.GiantRobot,_unitMultiplier += 15*$SFUnit.GiantRobot+5*Math.pow($SFUnit.GiantRobot,2),_SFupkeep += 10000+1500*$SFUnit.GiantRobot>>
+ <<if $SF.Squad.GiantRobot > 0>>
+ <<set _FNGs += $SF.Squad.GiantRobot,_Trade += 0.25*$SF.Squad.GiantRobot,_unitMultiplier += 15*$SF.Squad.GiantRobot+5*Math.pow($SF.Squad.GiantRobot,2),_SFupkeep += 95*$SF.Squad.GiantRobot>>
<</if>>
- <<if $SFUnit.MissileSilo > 0>>
- <<set _Trade += 0.25*$SFUnit.MissileSilo,_unitMultiplier += 15*$SFUnit.MissileSilo+5*Math.pow($SFUnit.MissileSilo,2),_SFupkeep += 1000*$SFUnit.MissileSilo>>
+ <<if $SF.Squad.MissileSilo > 0>>
+ <<set _Trade += 0.25*$SF.Squad.MissileSilo,_unitMultiplier += 15*$SF.Squad.MissileSilo+5*Math.pow($SF.Squad.MissileSilo,2),_SFupkeep += 100*$SF.Squad.MissileSilo>>
<</if>>
<</if>>
- <<if $SFUnit.AircraftCarrier > 0>>
- <<set _FNGs += $SFUnit.AircraftCarrier,_Trade += 0.25*$SFUnit.AircraftCarrier,_unitMultiplier += 9*$SFUnit.AircraftCarrier+3*Math.pow($SFUnit.AircraftCarrier,2),_SFupkeep += 800*$SFUnit.AircraftCarrier>>
+ <<if $SF.Squad.AircraftCarrier > 0>>
+ <<set _FNGs += $SF.Squad.AircraftCarrier,_Trade += 0.25*$SF.Squad.AircraftCarrier,_unitMultiplier += 9*$SF.Squad.AircraftCarrier+3*Math.pow($SF.Squad.AircraftCarrier,2),_SFupkeep += 80*$SF.Squad.AircraftCarrier>>
<</if>>
- <<if $SFUnit.Sub > 0>>
- <<set _FNGs += $SFUnit.Sub,_Trade += 0.25*$SFUnit.Sub,_unitMultiplier += 7.5*$SFUnit.Sub+2*Math.pow($SFUnit.Sub,2),_SFupkeep += 900*$SFUnit.Sub>>
+ <<if $SF.Squad.Sub > 0>>
+ <<set _FNGs += $SF.Squad.Sub,_Trade += 0.25*$SF.Squad.Sub,_unitMultiplier += 7.5*$SF.Squad.Sub+2*Math.pow($SF.Squad.Sub,2),_SFupkeep += 90*$SF.Squad.Sub>>
<</if>>
- <<if $SFUnit.HAT > 0>>
- <<set _Trade += 0.25*$SFUnit.HAT,_unitMultiplier += 7.5*$SFUnit.HAT+2*Math.pow($SFUnit.HAT,2),_SFupkeep += 700*$SFUnit.HAT>>
+ <<if $SF.Squad.HAT > 0>>
+ <<set _Trade += 0.25*$SF.Squad.HAT,_unitMultiplier += 7.5*$SF.Squad.HAT+2*Math.pow($SF.Squad.HAT,2),_SFupkeep += 70*$SF.Squad.HAT>>
<</if>>
<<set _SFD = $SF.Depravity>>
- <<switch $SFColonel.Core>>
+ <<switch $SF.Colonel.Core>>
<<case "kind">>
<<set _FNGs += 10,_Trade += 0.15,_SFD -= 0.15>>
<<case "cruel">>
@@ -112,29 +112,29 @@
<<else>> <<set $rep += Math.ceil($rep*((_Trade/100)*.25))>>
<<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.25))>>
<</if>>
- <<if $secExp > 0>> <<set $authority += $SF.Units*10,$authority = Math.clamp($authority, 0, 20000)>> <</if>>
+ <<if $secExp > 0>> <<set $authority += $SF.Size*10,$authority = Math.clamp($authority, 0, 20000)>> <</if>>
- <<set _SFIncome = Math.ceil((_SFIncome*_troopMultiplier/10*_unitMultiplier/10*_actionMultiplier/10*_depravityMultiplier)-_SFupkeep),$SFUnit.Troops += Math.round(_FNGs/2)>>
+ <<set _SFIncome += Math.ceil((_SFIncome*(_troopMultiplier/5*_unitMultiplier/5*_actionMultiplier/5*_depravityMultiplier))-_SFupkeep),$SF.Squad.Troops += Math.round(_FNGs/2)>>
/*Remove below line if hard mode ever gets fixed*/
<<if $economy < 100>> <<set _SFIncome = Math.ceil(_SFIncome*(1+($week/100)))>> <</if>>
- <<if $SFUnit.Troops > 2000>> <<set $SFUnit.Troops = random(1955,1999)>> <</if>>
+ <<if $SF.Squad.Troops > 2000>> <<set $SF.Squad.Troops = random(1955,1999)>> <</if>>
<<if $rep > 20000>> <<set $rep = 20000>> <</if>>
<<if $arcologies[0].prosperity > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>> <</if>>
- <<if _SFIncome >= 100000>>
+ <<if _SFIncome >= _target>>
<<set _Profitable = 1,$SF.Subsidy = 0,$cash += _SFIncome>>
<<else>> <<set _Profitable = 0>> <</if>>
- <<if $SFUnit.Drugs >= 8 || $SFUnit.Drugs >= 10>> <<set _Deaths = 0,_SurvivalChance = 50>>
- <<if $SFUnit.Drugs >= 8>> <<set _SurvivalChance -= 5>> <<elseif $SFUnit.Drugs >= 10>>
+ <<if $SF.Squad.Drugs >= 8 || $SF.Squad.Drugs >= 10>> <<set _Deaths = 0,_SurvivalChance = 50>>
+ <<if $SF.Squad.Drugs >= 8>> <<set _SurvivalChance -= 5>> <<elseif $SF.Squad.Drugs >= 10>>
<<set _SurvivalChance += 5>> <</if>>
<<if random(0,100) > _SurvivalChance>>
- <<set _Deaths = random(0,(($SFUnit.Drugs*2)+4))>> <</if>>
- <<if _Deaths > 0>> <<set $SFUnit.Troops -= _Deaths>> <</if>>
+ <<set _Deaths = random(0,(($SF.Squad.Drugs*2)+4))>> <</if>>
+ <<if _Deaths > 0>> <<set $SF.Squad.Troops -= _Deaths>> <</if>>
<</if>>
<</silently>>
<br><br>__Status and Activities of $SF.Lower __:
-<br>This week, $SF.Lower focused their <<print commaNum($SFUnit.Troops)>> troops on
+<br>This week, $SF.Lower focused their <<print commaNum($SF.Squad.Troops)>> troops on
<<if $SF.Target === "recruit">>
recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.
<<elseif $SF.Target === "secure">>
@@ -142,11 +142,11 @@
<<else>>
locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.
<</if>>
-<<if $SF.SpecOps > 0>> <br>A <<if $SF.SpecOps <2>>small<<else>>large<</if>> portion of the force was assigned as <<if $SF.SpecOps <2>>part<<else>>full<</if>> time undercover officers.<</if>>
+<<if $SF.UC.Assign > 0>> <br>A <<if $SF.UC.Assign <2>>small<<else>>large<</if>> portion of the force was assigned as <<if $SF.UC.Assign <2>>part<<else>>full<</if>> time undercover officers.<</if>>
<<if _Deaths > 0>>
<<print (_Deaths)>> soldiers fatally overdosed on the drug cocktail
- <<if $SFTradeShow.CanAttend === -1>>
+ <<if $SF.MercCon.CanAttend === -1>>
, The Colonel's much heavier than average drug use saves her from this side effect
<</if>>.
<</if>>
@@ -156,6 +156,7 @@ The goods procured by the $SF.Lower this week, after accounting for the spoils r
@@.green;more than sufficient@@ to cover expenses. Excess material and human assets totaling @@.yellowgreen;<<print cashFormat(_SFIncome)>>@@ (after liquidation) were transferred to your accounts.
<<else>>
@@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.
+ <<print SFC()>> estimates that an additional @@.yellowgreen;<<print cashFormat(_target-_SFIncome)>>@@ is required to sufficiently cover operating expenses.
<</if>>
$SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week, and your reputation has @@.green;increased@@ through the improvement of trade security.
@@ -184,20 +185,20 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
<<replace "#accountability">> ''Some Accountability'' <</replace>> <</link>>
| <<link "No Accountability">> <<set $SF.Regs = "none">>
<<replace "#accountability">> ''No Accountability'' <</replace>> <</link>>
-<<if $SFTradeShow.View > 0 && $SFTradeShow.CanAttend === 1>> <br>''TradeShow'':
- <<set $SFTradeShow.Income = 0,$SFTradeShow.Helots = 0>>
+<<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'':
+ <<set $SF.MercCon.Income = 0,$SF.MercCon.Helots = 0>>
<<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>>
<<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>>
- <<set _TSProfit = Math.ceil(500000*(1+($SF.Units/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
+ <<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendes, some decided to also give her some menial slaves as a bonus.<br>
<<set $helots += _MenialSlaves>>
- <<set $SFTradeShow.Helots += _MenialSlaves,$SFTradeShow.TotalHelots += _MenialSlaves>>
- <<set $cash += _TSProfit,$SFTradeShow.Income += _TSProfit>>
- <<set $SFTradeShow.Revenue += _TSProfit>>
- <<if $secExp > 0 && $mercenaries > 0>> <<set $SFTradeShow.Mercs = 0>>
+ <<set $SF.MercCon.Helots += _MenialSlaves,$SF.MercCon.TotalHelots += _MenialSlaves>>
+ <<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>>
+ <<set $SF.MercCon.Revenue += _TSProfit>>
+ <<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>
<<set _NewMercs = random(1,(_TradeShowAttendes/10))>>
- <<set $mercFreeManpower += _NewMercs,$SFTradeShow.TotalMercs += _NewMercs>>
- <<set $SFTradeShow.Mercs += _NewMercs>>
- <</if>> <<set $SFTradeShow.History += 1>>
-<</if>> <<if $SF.SpecOps === 1 && !$SF.SpecOpsLock>> <<set $SF.SpecOps = 0>> <</if>>
-<<set $SF.U = 0,$SF.WG = 0,$SFColonel.Talk = 0,$SFColonel.Fun = 0>>
\ No newline at end of file
+ <<set $mercFreeManpower += _NewMercs,$SF.MercCon.TotalMercs += _NewMercs>>
+ <<set $SF.MercCon.Mercs += _NewMercs>>
+ <</if>> <<set $SF.MercCon.History += 1>>
+<</if>> <<if $SF.UC.Assign === 1 && !$SF.UC.Lock>> <<set $SF.UC.Assign = 0>> <</if>>
+<<set $SF.Upgrade = 0,$SF.Gift = 0,$SF.Colonel.Talk = 0,$SF.Colonel.Fun = 0>>
\ No newline at end of file
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index 49b647132d3cd03099c714fc0c62757faa786f95..9f9858fade6b6afe794fd139f1d9243f88e5625f 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -1,323 +1,321 @@
:: Upgrades [nobr]
- <br><br>Total upgrade progress: <<print progress($SF.Units,_max)>>
+ <br><br>Total upgrade progress: <<print progress($SF.Size,_max)>>
- <<if $SF.MWU >= 1>> <br>Total multi week $SF.Lower upgrades: $SF.MWU <</if>>
+ <<if $SF.Upgrade > 0 && ($SF.Size !== _max)>>
+ <<set _cost = Math.ceil(Math.abs($cash*.05*(1.25+($SF.Size/1000))))>>
+ <br>[[Re-unlock upgrading.|Firebase][$SF.Upgrade = 0,$cash -= _cost]] @@.yellowgreen;<<print cashFormat(_cost)>> <</if>>
- <<if $SF.U > 0 && $SF.MWU >= 0 && ($SF.Units !== _max)>>
-
- <br>[[Re-unlock upgrading.|Firebase][$SF.U = 0,$SF.MWU += 1,$cash -= Math.ceil(Math.abs($cash*.05*(1.25+($SF.Units/1000))))]] @@.yellowgreen;<<print cashFormat(Math.ceil(Math.abs($cash*.05*(1.25+($SF.Units/1000)))))>><</if>>
-
- <<if ($SF.Units < 30 || $SF.Units !== _max) && $SF.U < 1>> <<set _T1 = $SF.Units >= 30>>
+ <<if ($SF.Size < 30 || $SF.Size !== _max) && $SF.Upgrade < 1>> <<set _T1 = $SF.Size >= 30>>
<br>Which facility or equipment do you wish to upgrade this week? <br><br>
- <<if $SFUnit.Firebase < 5||_T1 && $SFUnit.Firebase < _FU>>
-
- <<set _cF = Math.ceil(100000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Firebase/100)))>>
-
+ <<if $SF.Squad.Firebase < 5||_T1 && $SF.Squad.Firebase < _FU>>
+
+ <<set _cF = Math.ceil(100000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Firebase/100)))>>
+
<<if $cash >= _cF>>
-
- <<link "Upgrade Firebase">> <<set $SF.U = 1, $SFUnit.Firebase++, $cash -= _cF>><<goto "Firebase">><</link>>
-
+
+ <<link "Upgrade Firebase">> <<set $SF.Upgrade = 1, $SF.Squad.Firebase++, $cash -= _cF>><<goto "Firebase">><</link>>
+
<<else>>//Cannot afford to upgrade the Firebase.//<</if>>
-
- //Costs @@.yellowgreen;<<print cashFormat(_cF)>>@@ //
-
- <<elseif $SFUnit.Firebase == _FU>>//The Firebase has been fully upgraded.//
-
+
+ //Costs @@.yellowgreen;<<print cashFormat(_cF)>>@@ //
+
+ <<elseif $SF.Squad.Firebase == _FU>>//The Firebase has been fully upgraded.//
+
<<else>>//More upgrades are required to unlock the next tier.//
-
- <</if>> <span style="float:right;"> <<print progress($SFUnit.Firebase)>> </span><br>
+
+ <</if>> <span style="float:right;"> <<print progress($SF.Squad.Firebase)>> </span><br>
- <<if $SFUnit.Armoury < 5||_T1 && $SFUnit.Armoury < _AU>>
+ <<if $SF.Squad.Armoury < 5||_T1 && $SF.Squad.Armoury < _AU>>
- <<set _cA = Math.ceil(40000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Armoury/100)))>>
+ <<set _cA = Math.ceil(40000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Armoury/100)))>>
<<if $cash >= _cA>>
- <<link "Upgrade Armory">> <<set $SF.U = 1, $SFUnit.Armoury++, $cash -= _cA>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Armory">> <<set $SF.Upgrade = 1, $SF.Squad.Armoury++, $cash -= _cA>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Armory.//<</if>>
//Costs @@.yellowgreen;<<print cashFormat(_cA)>>@@ //
- <<elseif $SFUnit.Armoury == _AU>>//The Armory has been fully upgraded.//
+ <<elseif $SF.Squad.Armoury == _AU>>//The Armory has been fully upgraded.//
<<else>>//More upgrades are required to unlock the next tier.//
- <</if>> <span style="float:right;"> <<print progress($SFUnit.Armoury)>> </span><br>
+ <</if>> <span style="float:right;"> <<print progress($SF.Squad.Armoury)>> </span><br>
- <<if $SFUnit.Drugs < 5||_T1 && $SFUnit.Drugs < _DrugsU>>
+ <<if $SF.Squad.Drugs < 5||_T1 && $SF.Squad.Drugs < _DrugsU>>
- <<set _cDrugs = Math.ceil(40000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Drugs/100)))>>
+ <<set _cDrugs = Math.ceil(40000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Drugs/100)))>>
<<if $cash >= _cDrugs>>
- <<link "Upgrade Drug Lab">><<set $SF.U = 1, $SFUnit.Drugs++, $cash -= _cDrugs>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Drug Lab">><<set $SF.Upgrade = 1, $SF.Squad.Drugs++, $cash -= _cDrugs>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Drug Lab.//<</if>>
//Costs @@.yellowgreen;<<print cashFormat(_cDrugs)>>@@ //
- <<elseif $SFUnit.Drugs == _DrugsU>>//The Drug Lab has been fully upgraded.//
+ <<elseif $SF.Squad.Drugs == _DrugsU>>//The Drug Lab has been fully upgraded.//
<<else>>//More upgrades are required to unlock the next tier.//
- <</if>> <span style="float:right;"> <<print progress($SFUnit.Drugs)>> </span><br>
+ <</if>> <span style="float:right;"> <<print progress($SF.Squad.Drugs)>> </span><br>
- <<if $SFUnit.Firebase >= 2 && ($SFUnit.Drones < 5 ||_T1 && $SFUnit.Drones < _DU)>>
+ <<if $SF.Squad.Firebase >= 2 && ($SF.Squad.Drones < 5 ||_T1 && $SF.Squad.Drones < _DU)>>
- <<set _cDrones = Math.ceil(45000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Drones/100))*HSM())>>
+ <<set _cDrones = Math.ceil(45000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Drones/100))*HSM())>>
<<if $cash >= _cDrones>>
- <<link "Upgrade Drone Bay">><<set $SF.U = 1, $SFUnit.Drones++, $cash -= _cDrones>> <<goto "Firebase">> <</link>>
+ <<link "Upgrade Drone Bay">><<set $SF.Upgrade = 1, $SF.Squad.Drones++, $cash -= _cDrones>> <<goto "Firebase">> <</link>>
<<else>>//Cannot afford to upgrade the Drone Bay.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(45000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Drones/100))*HSM()))>>@@ // <span style="float:right;"> <<print progress($SFUnit.Drones)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(45000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Drones/100))*HSM()))>>@@ // <span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span>
- <<elseif $SFUnit.Drones == _DU>>//The Drone Bay has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.Drones)>> </span>
+ <<elseif $SF.Squad.Drones == _DU>>//The Drone Bay has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span>
- <<elseif _T1 && $SFUnit.Drones == 5>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SFUnit.Drones)>> </span><</if>>
+ <<elseif _T1 && $SF.Squad.Drones == 5>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SF.Squad.Drones)>> </span><</if>>
- <<if $SFUnit.Firebase >= 1 && $terrain !== "oceanic">><br>''Garage''
+ <<if $SF.Squad.Firebase >= 1 && $terrain !== "oceanic">><br>''Garage''
- <div style="margin-left:2em"><<if ($SFUnit.AV < 5||_T1 && $SFUnit.AV < _AVU)>>
+ <div style="margin-left:2em"><<if ($SF.Squad.AV < 5||_T1 && $SF.Squad.AV < _AVU)>>
- <<set _cAV = Math.ceil(60000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.AV/100)))>>
+ <<set _cAV = Math.ceil(60000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AV/100)))>>
<<if $cash >= _cAV>>
- <<link "Upgrade Attack Vehicle Fleet">><<set $SF.U = 1, $SFUnit.AV++, $cash -= _cAV>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Attack Vehicle Fleet">><<set $SF.Upgrade = 1, $SF.Squad.AV++, $cash -= _cAV>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Attack Vehicle Fleet.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cAV)>>@@//<span style="float:right;"><<print progress($SFUnit.AV)>></span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cAV)>>@@//<span style="float:right;"><<print progress($SF.Squad.AV)>></span>
- <<elseif $SFUnit.AV == _AVU>>//The Attack Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SFUnit.AV)>></span>
+ <<elseif $SF.Squad.AV == _AVU>>//The Attack Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.AV)>></span>
- <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"><<print progress($SFUnit.AV)>></span>
+ <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"><<print progress($SF.Squad.AV)>></span>
<</if>></div>
- <div style="margin-left:2em"><<if ($SFUnit.TV < 5||_T1 && $SFUnit.TV < _TVU)>>
+ <div style="margin-left:2em"><<if ($SF.Squad.TV < 5||_T1 && $SF.Squad.TV < _TVU)>>
- <<set _cTV = Math.ceil(60000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.TV/100)))>>
+ <<set _cTV = Math.ceil(60000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.TV/100)))>>
<<if $cash >= _cTV>>
- <<link "Upgrade Transport Vehicle Fleet">><<set $SF.U = 1, $SFUnit.TV++, $cash -= _cTV>><<goto "Firebase">><</link>>
+ <<link "Upgrade Transport Vehicle Fleet">><<set $SF.Upgrade = 1, $SF.Squad.TV++, $cash -= _cTV>><<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Transport Vehicle Fleet.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SFUnit.TV)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cTV)>>@@//<span style="float:right;"><<print progress($SF.Squad.TV)>> </span>
- <<elseif $SFUnit.TV == _TVU>>//The Transport Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SFUnit.TV)>></span>
+ <<elseif $SF.Squad.TV == _TVU>>//The Transport Vehicle Fleet has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.TV)>></span>
- <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SFUnit.TV)>> </span><</if>></div>
+ <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SF.Squad.TV)>> </span><</if>></div>
- <div style="margin-left:2em"><<if _T1 && $SFUnit.PGT < _PGTU>>
+ <div style="margin-left:2em"><<if _T1 && $SF.Squad.PGT < _PGTU>>
- <<set _cPGT = Math.ceil(735000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.PGT/100)))>>
+ <<set _cPGT = Math.ceil(735000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.PGT/100)))>>
<<if $cash >= _cPGT>>
- <<link "Upgrade Prototype Goliath tank">><<set $SF.U = 1, $SFUnit.PGT++, $cash -= _cPGT>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Prototype Goliath tank">><<set $SF.Upgrade = 1, $SF.Squad.PGT++, $cash -= _cPGT>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Prototype Goliath Tank.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cPGT)>>@@ //<span style="float:right;"> <<print progress($SFUnit.PGT)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cPGT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span>
- <<elseif $SFUnit.PGT == _PGTU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.PGT)>> </span>
+ <<elseif $SF.Squad.PGT == _PGTU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span>
- <<elseif $SFUnit.PGT == _PGTU>>//The Prototype Goliath Tank has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.PGT)>> </span><</if>></div><</if>>
+ <<elseif $SF.Squad.PGT == _PGTU>>//The Prototype Goliath Tank has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.PGT)>> </span><</if>></div><</if>>
- <<if $SFUnit.Firebase >= 4>>''Hangar''
+ <<if $SF.Squad.Firebase >= 4>>''Hangar''
- <div style="margin-left:2em"><<if $SFUnit.AA < 5||_T1 && $SFUnit.AA < _AAU>>
+ <div style="margin-left:2em"><<if $SF.Squad.AA < 5||_T1 && $SF.Squad.AA < _AAU>>
- <<set _cAA = Math.ceil(70000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.AA/100)))>>
+ <<set _cAA = Math.ceil(70000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AA/100)))>>
<<if $cash >= _cAA>>
- <<link "Upgrade Attack Aircraft Fleet">><<set $SF.U = 1, $SFUnit.AA++, $cash -= _cAA>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Attack Aircraft Fleet">><<set $SF.Upgrade = 1, $SF.Squad.AA++, $cash -= _cAA>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Attack Aircraft Fleet.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cAA)>>@@ //<span style="float:right;"> <<print progress($SFUnit.AA)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cAA)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span>
- <<elseif $SFUnit.AA == _AAU>>//The Attack Aircraft Fleet has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.AA)>> </span>
+ <<elseif $SF.Squad.AA == _AAU>>//The Attack Aircraft Fleet has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span>
- <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SFUnit.AA)>> </span><</if>></div>
+ <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SF.Squad.AA)>> </span><</if>></div>
- <div style="margin-left:2em"><<if $SFUnit.TA < 5||_T1 && $SFUnit.TA < _TAU>>
+ <div style="margin-left:2em"><<if $SF.Squad.TA < 5||_T1 && $SF.Squad.TA < _TAU>>
- <<set _cTA = Math.ceil(70000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.TA/100)))>>
+ <<set _cTA = Math.ceil(70000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.TA/100)))>>
<<if $cash >= _cTA>>
- <<link "Upgrade Transport Aircraft Fleet">><<set $SF.U = 1, $SFUnit.TA++, $cash -= _cTA>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Transport Aircraft Fleet">><<set $SF.Upgrade = 1, $SF.Squad.TA++, $cash -= _cTA>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Transport Aircraft Fleet.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cTA)>>@@ //<span style="float:right;"> <<print progress($SFUnit.TA)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cTA)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.TA)>> </span>
- <<elseif $SFUnit.TA == _TAU>>//The Transport Aircraft Fleet has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.TA)>> </span>
+ <<elseif $SF.Squad.TA == _TAU>>//The Transport Aircraft Fleet has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.TA)>> </span>
- <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SFUnit.TA)>> </span><</if>></div>
+ <<else>>//More upgrades are required to unlock the next tier.//<span style="float:right;"> <<print progress($SF.Squad.TA)>> </span><</if>></div>
- <div style="margin-left:2em"><<if _T1 && $SFUnit.SpacePlane < _SPU>>
+ <div style="margin-left:2em"><<if _T1 && $SF.Squad.SpacePlane < _SPU>>
- <<set _cSP = Math.ceil(250000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.SpacePlane/100))*HSM())>>
+ <<set _cSP = Math.ceil(250000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.SpacePlane/100))*HSM())>>
<<if $cash >= _cSP>>
- <<link "Upgrade Spaceplane">><<set $SF.U = 1, $SFUnit.SpacePlane++, $cash -= _cSP>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Spaceplane">><<set $SF.Upgrade = 1, $SF.Squad.SpacePlane++, $cash -= _cSP>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Spaceplane.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cSP)>>@@//<span style="float:right;"><<print progress($SFUnit.SpacePlane)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cSP)>>@@//<span style="float:right;"><<print progress($SF.Squad.SpacePlane)>> </span>
- <<elseif $SFUnit.SpacePlane == _SPU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.SpacePlane)>> </span>
+ <<elseif $SF.Squad.SpacePlane == _SPU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.SpacePlane)>> </span>
- <<elseif $SFUnit.SpacePlane == _SPU>>//The Spaceplane has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.SpacePlane)>> </span><</if>></div>
+ <<elseif $SF.Squad.SpacePlane == _SPU>>//The Spaceplane has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.SpacePlane)>> </span><</if>></div>
- <div style="margin-left:2em"><<if _T1 && $SFUnit.GunS < _GunSU>>
+ <div style="margin-left:2em"><<if _T1 && $SF.Squad.GunS < _GunSU>>
- <<set _cGunS = Math.ceil(350000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.GunS/100))*HSM())>>
+ <<set _cGunS = Math.ceil(350000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.GunS/100))*HSM())>>
<<if $cash >= _cGunS>>
- <<link "Upgrade Gunship">><<set $SF.U = 1, $SFUnit.GunS++, $cash -= _cGunS>><<goto "Firebase">><</link>>
+ <<link "Upgrade Gunship">><<set $SF.Upgrade = 1, $SF.Squad.GunS++, $cash -= _cGunS>><<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Gunship.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cGunS)>>@@ //<span style="float:right;"> <<print progress($SFUnit.GunS)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cGunS)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span>
- <<elseif $SFUnit.GunS == _GunSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.GunS)>> </span>
+ <<elseif $SF.Squad.GunS == _GunSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span>
- <<elseif $SFUnit.GunS == _GunSU>>//The Gunship has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.GunS)>> </span><</if>></div><</if>>
+ <<elseif $SF.Squad.GunS == _GunSU>>//The Gunship has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.GunS)>> </span><</if>></div><</if>>
<<if _T1>>''Launch Bay''
- <div style="margin-left:2em"><<if $SFUnit.Satellite < _SatU && $SatLaunched < 1>>
+ <div style="margin-left:2em"><<if $SF.Squad.Satellite.lv < _SatU && $SF.Squad.Satellite.InOrbit < 1>>
- <<set _cSat = Math.ceil(525000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Satellite/100))*HSM())>>
+ <<set _cSat = Math.ceil(525000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Satellite.lv/100))*HSM())>>
<<if $cash >= _cSat>>
- <<link "Upgrade Satellite">><<set $SF.U = 1, $SFUnit.Satellite++, $cash -= _cSat>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Satellite">><<set $SF.Upgrade = 1, $SF.Squad.Satellite.lv++, $cash -= _cSat>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Satellite.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cSat)>>@@//<span style="float:right;"><<print progress($SFUnit.Satellite)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cSat)>>@@//<span style="float:right;"><<print progress($SF.Squad.Satellite.lv)>> </span>
- <<elseif $SFUnit.Satellite == _SatU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.Satellite)>> </span>
+ <<elseif $SF.Squad.Satellite.lv == _SatU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Satellite.lv)>> </span>
- <<else>>//The Satellite has been fully upgraded.//<span style="float:right;"><<print progress($SFUnit.Satellite)>></span><</if>></div>
+ <<else>>//The Satellite has been fully upgraded.//<span style="float:right;"><<print progress($SF.Squad.Satellite.lv)>></span><</if>></div>
<<if $terrain !== "oceanic">>
- <div style="margin-left:2em"><<if $SFUnit.GiantRobot < _GRU>>
+ <div style="margin-left:2em"><<if $SF.Squad.GiantRobot < _GRU>>
- <<set _cGR = Math.ceil(550000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.GiantRobot/100))*HSM())>>
+ <<set _cGR = Math.ceil(550000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.GiantRobot/100))*HSM())>>
<<if $cash >= _cGR>>
- <<link "Upgrade Giant Robot">><<set $SF.U = 1, $SFUnit.GiantRobot++, $cash -= _cGR>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Giant Robot">><<set $SF.Upgrade = 1, $SF.Squad.GiantRobot++, $cash -= _cGR>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade the Giant Robot.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cGR)>>@@//<span style="float:right;"><<print progress($SFUnit.GiantRobot)>></span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cGR)>>@@//<span style="float:right;"><<print progress($SF.Squad.GiantRobot)>></span>
- <<elseif $SFUnit.GiantRobot == _GRU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.GiantRobot)>> </span>
+ <<elseif $SF.Squad.GiantRobot == _GRU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.GiantRobot)>> </span>
- <<else>>//The Giant Robot has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.GiantRobot)>> </span><</if>></div><</if>>
+ <<else>>//The Giant Robot has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.GiantRobot)>> </span><</if>></div><</if>>
- <div style="margin-left:2em"><<if $SFUnit.MissileSilo < _MSU>>
+ <div style="margin-left:2em"><<if $SF.Squad.MissileSilo < _MSU>>
- <<set _cMS = Math.ceil(565000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.MissileSilo/100))*HSM())>>
+ <<set _cMS = Math.ceil(565000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.MissileSilo/100))*HSM())>>
<<if $cash >= _cMS>>
- <<link "Upgrade Cruise Missile">><<set $SF.U = 1, $SFUnit.MissileSilo++, $cash -= _cMS>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Cruise Missile">><<set $SF.Upgrade = 1, $SF.Squad.MissileSilo++, $cash -= _cMS>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Cruise Missile.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cMS)>>@@ //<span style="float:right;"><<print progress($SFUnit.MissileSilo)>></span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cMS)>>@@ //<span style="float:right;"><<print progress($SF.Squad.MissileSilo)>></span>
- <<elseif $SFUnit.MissileSilo == _MSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.MissileSilo)>> </span>
+ <<elseif $SF.Squad.MissileSilo == _MSU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.MissileSilo)>> </span>
- <<else>>//The Cruise Missile has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.MissileSilo)>> </span><</if>></div><</if>>
+ <<else>>//The Cruise Missile has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.MissileSilo)>> </span><</if>></div><</if>>
<<if _T1 && ($terrain == "oceanic" || $terrain == "marine")>>''Naval Yard''
- <div style="margin-left:2em"><<if $SFUnit.AircraftCarrier < _ACU>>
+ <div style="margin-left:2em"><<if $SF.Squad.AircraftCarrier < _ACU>>
- <<set _cAC = Math.ceil(650000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.AircraftCarrier/100))*HSM())>>
+ <<set _cAC = Math.ceil(650000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AircraftCarrier/100))*HSM())>>
<<if $cash >= _cAC>>
- <<link "Upgrade Aircraft Carrier">><<set $SF.U = 1, $SFUnit.AircraftCarrier++, $cash -= _cAC>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Aircraft Carrier">><<set $SF.Upgrade = 1, $SF.Squad.AircraftCarrier++, $cash -= _cAC>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Aircraft Carrier.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(650000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.AircraftCarrier/100))*HSM()))>>@@ //<span style="float:right;"> <<print progress($SFUnit.AircraftCarrier)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(Math.ceil(650000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.AircraftCarrier/100))*HSM()))>>@@ //<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span>
- <<elseif $SFUnit.AircraftCarrier == _ACU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.AircraftCarrier)>> </span>
+ <<elseif $SF.Squad.AircraftCarrier == _ACU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span>
- <<else>>//The Aircraft Carrier has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.AircraftCarrier)>> </span><</if>></div>
+ <<else>>//The Aircraft Carrier has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.AircraftCarrier)>> </span><</if>></div>
- <div style="margin-left:2em"><<if $SFUnit.Sub < _SubU>>
+ <div style="margin-left:2em"><<if $SF.Squad.Sub < _SubU>>
- <<set _cSub = Math.ceil(700000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.Sub/100))*HSM())>>
+ <<set _cSub = Math.ceil(700000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.Sub/100))*HSM())>>
<<if $cash >= _cSub>>
- <<link "Upgrade Submarine">><<set $SF.U = 1, $SFUnit.Sub++, $cash -= _cSub>> <<goto "Firebase">><</link>>
+ <<link "Upgrade Submarine">><<set $SF.Upgrade = 1, $SF.Squad.Sub++, $cash -= _cSub>> <<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Submarine//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cSub)>>@@ //<span style="float:right;"> <<print progress($SFUnit.Sub)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cSub)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
- <<elseif $SFUnit.Sub == _SubU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.Sub)>> </span>
+ <<elseif $SF.Squad.Sub == _SubU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span>
- <<else>>//The Submarine has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.Sub)>> </span><</if>></div>
+ <<else>>//The Submarine has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.Sub)>> </span><</if>></div>
- <div style="margin-left:2em"><<if $SFUnit.HAT < _HATU>>
+ <div style="margin-left:2em"><<if $SF.Squad.HAT < _HATU>>
- <<set _cHAT = Math.ceil(665000*_Env*(1.15+($SF.Units/10))*(1.15+($SFUnit.HAT/100)))>>
+ <<set _cHAT = Math.ceil(665000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Squad.HAT/100)))>>
<<if $cash >= _cHAT>>
- <<link "Upgrade Amphibious Transport">><<set $SF.U = 1, $SFUnit.HAT++, $cash -= _cHAT>><<goto "Firebase">><</link>>
+ <<link "Upgrade Amphibious Transport">><<set $SF.Upgrade = 1, $SF.Squad.HAT++, $cash -= _cHAT>><<goto "Firebase">><</link>>
<<else>>//Cannot afford to upgrade Amphibious Transport.//<</if>>
- //Costs @@.yellowgreen;<<print cashFormat(_cHAT)>>@@ //<span style="float:right;"> <<print progress($SFUnit.HAT)>> </span>
+ //Costs @@.yellowgreen;<<print cashFormat(_cHAT)>>@@ //<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span>
- <<elseif $SFUnit.HAT == _HATU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SFUnit.HAT)>> </span>
+ <<elseif $SF.Squad.HAT == _HATU && $PC.warfare < 75>>//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span>
- <<else>>//The Amphibious Transport has been fully upgraded.//<span style="float:right;"> <<print progress($SFUnit.HAT)>> </span><</if>></div>
+ <<else>>//The Amphibious Transport has been fully upgraded.//<span style="float:right;"> <<print progress($SF.Squad.HAT)>> </span><</if>></div>
<</if>>
@@ -327,11 +325,11 @@
/* <div style="margin-left:2em"><<if _T1 && $SF.Facility.Toggle > 0 && $SF.Facility.Active < 1>>
- <<set _cSFF = Math.ceil(735000*_Env*(1.15+($SF.Units/10))*(1.15+($SF.Facility.Active/100)))>>
+ <<set _cSFF = Math.ceil(735000*_Env*(1.15+($SF.Size/10))*(1.15+($SF.Facility.Active/100)))>>
<<if $cash >= _cSFF>>
- <<link "Build $SF.Lower's support facility">><<set $SF.U = 1, $SF.Facility.Active++, $cash -= _cSFF>><<goto "Firebase">><</link>>
+ <<link "Build $SF.Lower's support facility">><<set $SF.Upgrade = 1, $SF.Facility.Active++, $cash -= _cSFF>><<goto "Firebase">><</link>>
<<else>>//Cannot afford to build $SF.Lower's support facility.//<</if>>
diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw
index d13b4777e6fb10d947aaf936cff961898bedaa58..7f554aead7e6851340d31dcd8ee58abd9b44a56c 100644
--- a/src/SpecialForce/WeeklyChoices.tw
+++ b/src/SpecialForce/WeeklyChoices.tw
@@ -1,53 +1,53 @@
:: WC [nobr]
-<<if $SF.WG === 0 && $SFTradeShow.CanAttend === -1 && ($SFColonel.Talk + $SFColonel.Fun !== 1)>>
+<<if $SF.Gift === 0 && $SF.MercCon.CanAttend === -1 && ($SF.Colonel.Talk + $SF.Colonel.Fun !== 1)>>
The Colonel looks down a list on her tablet. "There's some things we can do to help you out, boss.
<br>We've had some good prizes turn up, that's made us some extra money we could turn over. | <<link "Request cash""Firebase">>
- /*<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SF.Units))))*($arcologies[0].prosperity/100))*_Env>> OLD*/
- <<set $CashGift = Math.ceil(25000*($SF.Units/10)*_Env),$SF.WG = 1,$choice = 1>>
+ /*<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SF.Size))))*($arcologies[0].prosperity/100))*_Env>> OLD*/
+ <<set $CashGift = Math.ceil(25000*($SF.Size/10)*_Env),$SF.Gift = 1,$choice = 1>>
<<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000),$cash += $CashGift>>
<</link>>
<<if $rep < 20000>>
<br>If you want we could throw a quick military parade, get the people feeling extra patriotic. | <<link "Request military parade""Firebase">>
- <<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
- <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
+ <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>>
+ <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>>
<<set $rep += $GoodWords1,$choice = 2>>
<</link>>
<</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we could hit some businesses that rival the ones in $arcologies[0].name with some sabotage. | <<link "Request sabotage""Firebase">>
- <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
+ <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
<<else>> <<set $arcologies[0].prosperity += $GoodWords2>> <</if>> <</link>>
<</if>>
-<<elseif $SF.WG == 0 && ($SFTradeShow.CanAttend > -1 || ($SFColonel.Talk + $SFColonel.Fun > 0))>>
+<<elseif $SF.Gift == 0 && ($SF.MercCon.CanAttend > -1 || ($SF.Colonel.Talk + $SF.Colonel.Fun > 0))>>
<br>He looks down a list on his tablet. "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, how can $SF.Lower help you this week?
<br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash""Firebase">>
- <<set $CashGift = 25000*($SF.Units/10)*_Env,$SF.WG = 1,$choice = 1>>
+ <<set $CashGift = 25000*($SF.Size/10)*_Env,$SF.Gift = 1,$choice = 1>>
<<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000),$cash += Math.ceil($CashGift * 0.8)>>
<</link>>
<<if $rep < 20000>>
<br>We can set some units aside for a ceremonial march through the arcology. | <<link "Request a parade""Firebase">>
- <<set $GoodWords1 += 50*(Math.ceil($SF.Units*0.03*_Env))>>
- <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.WG = 1>>
+ <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>>
+ <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>>
<<set $rep += Math.ceil($GoodWords1*0.8),$choice = 2>>
<</link>>
<</if>>
<<if $arcologies[0].prosperity < $AProsperityCap>>
<br>Or we can target rival businesses for sabotage. | <<link "Request sabotage""Firebase">>
- <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Units/100*_Env)),$SF.WG = 1,$choice = 3>>
+ <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>>
<<if $arcologies[0].prosperity + $GoodWords2 * 0.8 > $AProsperityCap>>
<<set $arcologies[0].prosperity = $AProsperityCap>>
<<else>> <<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>> <</if>> <</link>>
<</if>>
<</if>>
-<<if $SFColonel.Talk === 0 && $SFColonel.Fun === 0 && $SFTradeShow.CanAttend === -1>> <span id="result0">
+<<if $SF.Colonel.Talk === 0 && $SF.Colonel.Fun === 0 && $SF.MercCon.CanAttend === -1>> <span id="result0">
<br><br>If you need me for anything else, let me know."<br>
- <<if $SFColonel.Status >= 25>>
+ <<if $SF.Colonel.Status >= 25>>
<<link "Walk with the Colonel on the surface.">> <<replace "#result0">>
- <<set $SFColonel.Talk = 1>>
+ <<set $SF.Colonel.Talk = 1>>
<br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree.
<<if $PC.warfare >= 100 && $PC.career == "mercenary">>
Your mastery of wet work and prior experience in a PMC satisfies the Colonel that between you<<if $Bodyguard != 0>>, $Bodyguard.slaveName,<</if>> and her, there should be little threat to walking around the arcology. Being able to see and interact with the arcology owner directly maintains the false idea that you're just like one of them while also giving them an increased opportunity to try gaining your favor.
@@ -65,7 +65,7 @@
Your complete lack of combat skill convinces the Colonel that <<if $Bodyguard != 0>>in addition to $Bodyguard.slaveName, <</if>>you need two full squads of armed soldiers, an armored car escort, and a sniper overwatch for a simple walk around the arcology.
<</if>> <br>As you make your way through the arcology you stop at a
<<if $arcologies[0].FSPaternalist != "unset">>
- paternalist shop, <<if $SFColonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
+ paternalist shop, <<if $SF.Colonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>>
<<elseif $arcologies[0].FSPastoralist != "unset">>
pastoralist shop, helping the Colonel select a more comfortable breast pump.
<<else>>shop that catches the Colonel's eye. <</if>>
@@ -104,14 +104,14 @@
Your total lack of surgical skill causes the death of the citizen through repeated medical blunders.
<<set $arcologies[0].prosperity -= .25>><</if>>
<</if>>
- <<set $SFColonel.Status += 2>> <</replace>> <</link>>
+ <<set $SF.Colonel.Status += 2>> <</replace>> <</link>>
<</if>>
<br> <<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1">
<br><br>What do you want to do with the Colonel in the HQ?
<br> <<link "Talk">><<replace "#result1">>
<br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her.
- <<set $SFColonel.Status +=3>>
+ <<set $SF.Colonel.Status +=3>>
<<switch random(1,6)>>
<<case 1>>
<<set $PC.medicine += 1>><<set $PC.trading += 1>><<set $PC.slaving += 1>>
@@ -129,7 +129,7 @@
<</replace>><</link>>
<br> <<link "Learn">> <<replace "#result1">>
- <<set $SFColonel.Talk = 1,$SFColonel.Status += 1>>
+ <<set $SF.Colonel.Talk = 1,$SF.Colonel.Status += 1>>
<br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she
<<switch random(1,6)>>
<<case 1>>
@@ -153,49 +153,49 @@
<</switch>>
<</replace>> <</link>>
- <<if $SFColonel.Status >= 45>> <br> <<link "Have some fun.">> <<replace "#result1">> <span id="result4">
- <<set $SFColonel.Fun = 1,$SFColonel.Talk = 1,$SFColonel.Status += 3>>
+ <<if $SF.Colonel.Status >= 45>> <br> <<link "Have some fun.">> <<replace "#result1">> <span id="result4">
+ <<set $SF.Colonel.Fun = 1,$SF.Colonel.Talk = 1,$SF.Colonel.Status += 3>>
<br>Where should this fun take place? <<link "Go back""Firebase">>
- <<set $SFColonel.Fun = 0, $SFColonel.Talk = 0,$SFColonel.Status -= 3>>
+ <<set $SF.Colonel.Fun = 0, $SF.Colonel.Talk = 0,$SF.Colonel.Status -= 3>>
<</link>>
<br> <<link "In private">> <<replace "#result4">> <span id="result6">
<br>Which orifice do you wish to target?
<<link "Go back""Firebase">> <</link>>
<br> <<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 2>> <</link>>
<br> <<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 3>> <</link>>
</span> <</replace>> <</link>>
<br> <<link "On The Colonel's throne.">> <<replace "#result4">> <span id="result6">
<br>Which orifice do you wish to target?
<<link "Go back""Firebase">> <</link>>
<br> <<link "Pussy">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "Ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "Both pussy and ass">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 2>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 2>> <</link>>
<br> <<link "Mouth">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 1>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>>
<br> <<link "All three holes">> <<replace "#result6">>
- <<include "SFColonelSexDec">>
- <</replace>> <<set $SFColonel.Fun += 3>> <</link>>
+ <<include "SF.ColonelSexDec">>
+ <</replace>> <<set $SF.Colonel.Fun += 3>> <</link>>
</span> <</replace>> </span> <</link>>
</span> <</replace>> <</link>> <</if>> /*Closes fun*/
</span> <</replace>> <</link>> /*Closes talk*/
diff --git a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
index 2b15dff2498a7ff7abf70ca16577a9b68c2cb238..f2f7da1aa021f06f852ddf91d06acf2860a4b4cf 100644
--- a/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditNeighborArcologyCheatDatatypeCleanup.tw
@@ -13,14 +13,14 @@
<<if $arcologies[_i].FSSupremacist != "unset">>
<<set $arcologies[_i].FSSupremacist = Number($arcologies[_i].FSSupremacist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSupremacist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSupremacistRace)>>
- <<set $arcologies[_i].FSSupremacistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <<if $arcologies[_i].FSSupremacist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSupremacistRace)>>
+ <<set $arcologies[_i].FSSupremacistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
<</if>>
<<if $arcologies[_i].FSSubjugationist != "unset">>
<<set $arcologies[_i].FSSubjugationist = Number($arcologies[_i].FSSubjugationist) || "unset">>
<</if>>
- <<if $arcologies[_i].FSSubjugationist != "unset" && !["white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race"].includes($arcologies[_i].FSSubjugationistRace)>>
- <<set $arcologies[_i].FSSubjugationistRace = either("white", "asian", "latina", "middle eastern", "black", "indo-aryan", "pacific islander", "malay", "amerindian", "southern european", "semitic", "mixed race")>>
+ <<if $arcologies[_i].FSSubjugationist != "unset" && !["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"].includes($arcologies[_i].FSSubjugationistRace)>>
+ <<set $arcologies[_i].FSSubjugationistRace = either("amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white")>>
<</if>>
<<if $arcologies[_i].FSGenderRadicalist != "unset">>
<<set $arcologies[_i].FSGenderRadicalist = Number($arcologies[_i].FSGenderRadicalist) || "unset">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index accb3288ca1a616df595734c363801a69b77a667..96956b0af4ab6aa762c62fbad5a8372f9e3cef12 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -679,6 +679,14 @@ __''Player Character''__
<br>Your eyes are <<textbox "$PC.eyeColor" $PC.eyeColor "Intro Summary">>
and hair is <<textbox "$PC.hColor" $PC.hColor "Intro Summary">>.
+
+ <br>Your face is ''$PC.faceShape''.
+ [[Normal|Intro Summary][$PC.faceShape = "normal"]] |
+ [[Androgynous|Intro Summary][$PC.faceShape = "androgynous"]] |
+ [[Masculine|Intro Summary][$PC.faceShape = "masculine"]] |
+ [[Cute|Intro Summary][$PC.faceShape = "cute"]] |
+ [[Sensual|Intro Summary][$PC.faceShape = "sensual"]] |
+ [[Exotic|Intro Summary][$PC.faceShape = "exotic"]]
<br>
Your preferred refreshment is <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
@@ -883,7 +891,7 @@ __''Player Character''__
//Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.//
<br>
- You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and $PC.eyeColor eyes.
+ You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and $PC.eyeColor eyes. You have a $PC.faceShape face.
<br>
Your preferred refreshment is <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 2e083f4cbbd4c163c6ed6fe92fc205211f25a3a8..e6f936c9b95de21e5eeab2076791d8c62698924b 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -121,15 +121,8 @@ is
$activeSlave.birthSurname.
<<elseif $activeSlave.birthSurname === "">>
$activeSlave.birthName.
- <<elseif $surnameOrder != 1>>
- <<switch $activeSlave.nationality>>
- <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
- <<if $activeSlave.birthSurname>>$activeSlave.birthSurname <</if>>$activeSlave.birthName.
- <<default>>
- $activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
- <</switch>>
<<else>>
- $activeSlave.birthName<<if $activeSlave.birthSurname>> $activeSlave.birthSurname<</if>>.
+ <<= SlaveFullBirthName($activeSlave)>>.
<</if>>
<</if>>
<<if $activeSlave.slaveSurname == 0>>
@@ -484,7 +477,7 @@ $he's
<<elseif ($activeSlave.devotion <= 20)>>
$He strongly believes that @@.red;slavery is wrong,@@ and rarely misses a chance to complain about it.
<<else>>
- $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to herself.
+ $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to $himself.
<</if>>
<<elseif ($activeSlave.behavioralFlaw == "devout")>>
$He is @@.red;devoutly religious,@@
@@ -493,7 +486,7 @@ $he's
<<elseif ($activeSlave.devotion < -20)>>
and uses $his faith as a place of refuge.
<<elseif ($activeSlave.devotion <= 20)>>
- and uses $his faith as a private place within herself.
+ and uses $his faith as a private place within $himself.
<<else>>
but has learned to keep $his faith private.
<</if>>
@@ -527,7 +520,7 @@ $he's
<<case "confident">>
$He's @@.green;confident,@@ and believes that $he has something of value to offer, even as a slave.
<<case "cutting">>
- $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to herself.
+ $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to $himself.
<<case "funny">>
$He's @@.green;funny,@@ often providing a little comic relief.
<<case "adores women">>
@@ -582,7 +575,7 @@ $he's
<<case "self hating">>
$He's filled with @@.yellow;self hatred,@@ and is disturbingly willing to comply with things that might hurt $him.
<<case "neglectful">>
- $He's sexually @@.yellow;self neglectful,@@ and often shows no interest in getting off herself.
+ $He's sexually @@.yellow;self neglectful,@@ and often shows no interest in getting off $himself.
<<case "breeder">>
$He's @@.yellow;obsessed with being bred@@ to the point of fetishizing pregnancy itself as much as any act that leads to it.
<</switch>>
@@ -595,13 +588,13 @@ $he's
<<case "strugglefuck queen">>
$He's a @@.green;strugglefuck queen:@@ $he can gauge exactly how much resistance $his partners want.
<<case "tease">>
- $He's a @@.green;tease,@@ and often displays a little flash of herself followed by a blush.
+ $He's a @@.green;tease,@@ and often displays a little flash of $himself followed by a blush.
<<case "romantic">>
$He's a @@.green;romantic,@@ and persists in innocent pleasure in the closeness of sex.
<<case "perverted">>
$He's @@.green;perverted,@@ and enjoys breaking sexual boundaries.
<<case "caring">>
- $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off herself.
+ $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off $himself.
<<case "unflinching">>
$He's @@.green;unflinching,@@ willing to do anything, even by the standards of sex slaves.
<<case "size queen">>
@@ -634,7 +627,7 @@ $he's
<</if>>
<<case "humiliation">>
<<if ($activeSlave.behavioralFlaw == "bitchy")>>
- $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ herself.
+ $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ $himself.
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
$His shame is genuine, and it is with real self-loathing that $he @@.lightcoral;gets off on humiliation.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
@@ -672,7 +665,7 @@ $he's
<</if>>
<<case "dom">>
<<if ($activeSlave.sexualFlaw == "apathetic")>>
- $He is at war with herself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
+ $He is at war with $himself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
$He is a @@.lightcoral;complete dom;@@ with other slaves this is expressed as a strong preference to top, and with $his betters $he's an almost competitive lover.
<<elseif ($activeSlave.fetishStrength > 60)>>
@@ -684,7 +677,7 @@ $he's
<<if ($activeSlave.fetishStrength > 95)>>
$He is an @@.lightcoral;aggressive sadist@@; $he's constantly plotting to control, abuse, and hurt other slaves.
<<elseif ($activeSlave.fetishStrength > 60)>>
- $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain herself.
+ $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain $himself.
<<else>>
$He gets off on @@.lightcoral;the suffering of others@@; $he enjoys watching other slaves in pain.
<</if>>
@@ -1166,7 +1159,7 @@ $he's
<<elseif $activeSlave.career == "a slave since birth">>
$He's been your slave $his entire life.
<<elseif $activeSlave.career == "a meat toilet" || $activeSlave.career == "a cum dump">>
- $He sees herself as a cum receptacle.
+ $He sees $himself as a cum receptacle.
<<elseif $activeSlave.career == "a dairy cow">>
$He's been broken into the belief that $he is nothing more than a cow to be milked and bred.
<<elseif $activeSlave.career == "a breeding bull">>
@@ -1526,7 +1519,7 @@ $He is
<<elseif $activeSlave.muscles > -96>>
@@.pink;very weak;@@ $he struggles with day-to-day tasks.
<<else>>
- @@.red;frail;@@ $he can barely hold herself up.
+ @@.red;frail;@@ $he can barely hold $himself up.
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0 && $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadenceStrongFat == 0>>
@@ -1686,8 +1679,9 @@ $He is
<</if>>
<</if>>
- <<if ($activeSlave.physicalAge < 11)>>
- $He is too young to have armpit hair.
+ <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
+ <<if ($activeSlave.physicalAge < _pubertyAge-2)>>
+ $He is too sexually immature to have armpit hair.
<<elseif $activeSlave.underArmHStyle == "hairless">>
$His armpits are perfectly smooth and naturally hairless.
<<elseif $activeSlave.underArmHStyle == "bald">>
@@ -1698,10 +1692,10 @@ $He is
<<else>>
$His armpits are waxed and smooth.
<</if>>
- <<elseif ($activeSlave.physicalAge < 12)>>
+ <<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
$He has a few $activeSlave.underArmHColor wisps of armpit hair.
- <<elseif ($activeSlave.physicalAge < 13)>>
- Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair.
+ <<elseif ($activeSlave.physicalAge < _pubertyAge)>>
+ $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair.
<<elseif $activeSlave.underArmHStyle == "shaved">>
$His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble.
<<elseif $activeSlave.underArmHStyle == "neat">>
@@ -1871,9 +1865,9 @@ $He is
<<if $activeSlave.inflationType == "aphrodisiacs">>
$He's literally full of
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>> $His frantic masturbation forces $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -1881,7 +1875,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<</if>>
@@ -1897,9 +1891,9 @@ $He is
<<elseif $activeSlave.aphrodisiacs > 1>>
$He's swimming in
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -1907,7 +1901,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass.
<</if>>
@@ -1922,9 +1916,9 @@ $He is
<</if>>
<<else>>
<<if ($activeSlave.amp == 1)>>
- $He's on aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with sexual frustration.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with sexual frustration.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his shaft with one hand while the other pinches a nipple.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index d6b5fbebeb1206e6a9c168920fa72ffc5ba49bea..66f6c0ab62fcb9ff281d5d148a62c55bb4427d9f 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1419,7 +1419,7 @@ SLAVE PARAPHILIAS
<<case "Maliciousness">>
Sexual ''maliciousness'' is a paraphilia, an intense form of sexual [[flaw|Encyclopedia][$encyclopedia = "Flaws"]] that cannot be softened.
- <br><br>[[Sadists|Encyclopedia][$encyclopedia = "Sadists"]] serving as [[wardeness|Encyclopedia][$encyclopedia = "Wardeness"]] may become sexually malicious. They can be satisfied by work as the [[head girl|Encyclopedia][$encyclopedia = "Head Girl"]] or wardeness. Sexually malicious wardenesses break slaves very quickly but damage their sex drives doing so.
+ <br><br>[[Sadists|Encyclopedia][$encyclopedia = "Sadists"]] serving as [[Wardeness|Encyclopedia][$encyclopedia = "Wardeness"]] may become sexually malicious. They can be satisfied by work as the [[head girl|Encyclopedia][$encyclopedia = "Head Girl"]] or wardeness. Sexually malicious wardenesses break slaves very quickly but damage their sex drives doing so.
<<case "Self Hatred">>
@@ -2000,7 +2000,7 @@ LORE: THE FREE CITIES TODAY
<br><br>Different Cities have taken different approaches to the obvious problem of dealing with criminal conduct, which in the old world breaks no traditional contract. The most common approach is to require everyone to sign contracts with the owners of their homes and workplaces to commit no crimes while there. In this way, what would be murder in the old world is a breach of the contract with one's landlord not to murder on his property.
- <br><br>Penalties for such conduct are usually left to the imagination of the property owner. With the traditional roles of judge, jury and jailer concentrated into the hands of a single wealthy person, rich potentates of the Cities hold more personal power over their tenants than anyone since the great feudal lords seven centuries ago.
+ <br><br>Penalties for such conduct are usually left to the imagination of the property owner. With the traditional roles of judge, jury, and jailer concentrated into the hands of a single wealthy person, rich potentates of the Cities hold more personal power over their tenants than anyone since the great feudal lords seven centuries ago.
<br><br>-- Torstein, Jens Learned, //The Modern Libertarian Paradise, March 25, 2032////
@@ -2094,7 +2094,7 @@ LORE: FREE CITIES CULTURE TOMORROW
<<case "Naked, Barefoot, and Pregnant">>
- //...and helpless, and illiterate, and dependant...
+ //...and helpless, and illiterate, and dependent...
<br> -- Anonymous slaveowner, on the ideal woman
<br><br>It must be admitted that some of the boldest statements of early 21st century social justice advocates are now receiving some justification in the Free Cities. A tourist visiting some of the more notorious arcologies is given a public, in-person lesson in precisely what some men are willing to do with women they own. For every misogynist credo there is a Free Cities slaveowner putting it into practice.
diff --git a/src/gui/Encyclopedia/encyclopediaWidgets.tw b/src/gui/Encyclopedia/encyclopediaWidgets.tw
index b45b05b1d44a83d80dcdc435ac44f6e4b52eccde..d8c63b5e0b05649a00674d2ef878b88a8ccccac4 100644
--- a/src/gui/Encyclopedia/encyclopediaWidgets.tw
+++ b/src/gui/Encyclopedia/encyclopediaWidgets.tw
@@ -1,7 +1,7 @@
:: Encyclopedia Widgets [nobr widget]
<<widget "encyclopediaEntryAttendingClasses">>
-''Attending classes'' is an assignment which educates the slave, raising intelligence if possible. Being educated raises value and is useful for some jobs and leadership positions.
+''Attending classes'' is an assignment which educates the slave, raising intelligence if possible. Being educated raises value and is useful for some jobs and leadership positions.
<</widget>>
<<widget "encyclopediaEntryConfinement">>
@@ -25,7 +25,7 @@
<</widget>>
<<widget "encyclopediaEntryPublicService">>
-''Public Service'' is an assignment which increases reputation based on a slave's beauty, sexual appeal, and skills. Very similar to whoring, but for reputation rather than money.
+''Public Service'' is an assignment which increases reputation based on a slave's beauty, sexual appeal, and skills. Very similar to whoring, but for reputation rather than money.
<</widget>>
<<widget "encyclopediaEntryRest">>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index f820ed1211b4159563bf6fc6ebe45c798b882b85..cc5417ebcd6d1430c7e7925e7c8c7fe372c62e03 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -23,7 +23,5 @@ $PC.origRace, $PC.origSkin
$isReady, $fatherID,
$servantsQuartersSpots
$sEnunciate, $SEnunciate, $ssEnunciate, $cEnunciate, $ccEnunciate, $zEnunciate, $shEnunciate, $ShEnunciate, $xEnunciate
-$Girl,
-$securityForceRecruit, $securityForceTrade,$securityForceBooty, $securityForceIncome, $securityForceMissionEfficiency,$securityForceProfitable, $TierTwoUnlock
-$farmyardSpots
+$Girl, $farmyardSpots
*/
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index a61a58e0d8527eec120556f17b80a744a65f34a9..3df88d9b0aac23d6c184d2e3003aa078c155da17 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -24,7 +24,7 @@ pig: {type: "pig", normalOvaMin:8, normalOvaMax: 12, normalBirth: 16, minLiveBir
equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, drugsEffect: 0.05, fetusWeek: [0, 5.7, 8.5, 11.4, 14.2, 21.4, 25.7, 34.2, 38.5, 45.7, 48, 192, 99999], fetusSize: [0, 14.1, 28.3, 56.7, 453, 2721, 11339, 20411, 34019, 54431, 57000, 600000, 600000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1}
}>> /* Source data for canine include CTR (not head to toe size), so CTR do not apply anywhere, always 1.*/
-/* sizeType: control of source data type 0 - length in centimeters for fetusSize and CTR for fetusRate, 1 - weight in gramms and womb to fetus rate, 2 - direct volume in cc, fetusRate not used*/
+/* sizeType: control of source data type 0 - length in centimeters for fetusSize and CTR for fetusRate, 1 - weight in grams and womb to fetus rate, 2 - direct volume in cc, fetusRate not used*/
/* equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, fetusWeek: [0, 4, 7, 9, 10, 12, 17, 21, 25, 34, 38, 48, 192, 99999], fetusSize: [0, 2.5, 3, 4, 6.3, 14, 17.7, 30, 61, 76.2, 92, 121, 235, 235], fetusRate: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] sizeType: 0} */
@@ -1974,7 +1974,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"Roman Revivalist": setup.romanMaleSurnames
}>>
-<<set setup.FutureSocieties = ["FSSupremacist", "FSSubjugationist", "FSRepopulationFocus", "FSRestart", "FSSubjugationist", "FSGenderRadicalist", "FSGenderFundamentalist", "FSPaternalist", "FSDegradationist", "FSBodyPurist", "FSTransformationFetishist", "FSYouthPreferentialist", "FSMaturityPreferentialist", "FSSlimnessEnthusiast", "FSAssetExpansionist", "FSPastoralist", "FSPhysicalIdealist", "FSHedonisticDecadence", "FSChattelReligionist", "FSRomanRevivalist", "FSAztecRevivalist", "FSEgyptianRevivalist", "FSEdoRevivalist", "FSArabianRevivalist", "FSChineseRevivalist", "FSNull"]>>
+<<set setup.FutureSocieties = ["FSSupremacist", "FSSubjugationist", "FSRepopulationFocus", "FSRestart", "FSGenderRadicalist", "FSGenderFundamentalist", "FSPaternalist", "FSDegradationist", "FSBodyPurist", "FSTransformationFetishist", "FSYouthPreferentialist", "FSMaturityPreferentialist", "FSSlimnessEnthusiast", "FSAssetExpansionist", "FSPastoralist", "FSPhysicalIdealist", "FSHedonisticDecadence", "FSChattelReligionist", "FSRomanRevivalist", "FSAztecRevivalist", "FSEgyptianRevivalist", "FSEdoRevivalist", "FSArabianRevivalist", "FSChineseRevivalist", "FSNull"]>>
<<set setup.ArcologyNamesSupremacistAmerindian = ["Akilineq", "Amerindia", "Aquadoctan", "Cahokia", "Caral", "Chicora", "Cusco", "Indigenismo", "Norumbega", "Paititi", "Porcupine", "Red Power", "Saguenay", "The Confederated Tribes"]>>
<<set setup.ArcologyNamesSupremacistAsian = ["Eastern Sun", "Jade Empire", "Kalapa", "Mahoroba", "Penglai", "Shambhala", "Shangri-La", "Sinosphere", "The Celestial Temple", "Tian", "Zhonghua Minzu"]>>
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index 09a5cc2f0c7f4cdfdf9cbd2d8e2ce8138e19980a..af980ed1a51b094abdfbed1d61f381da1c0fc37f 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -150,9 +150,9 @@
<<if $researchLab.electrolarynx == 0 && $stockpile.electrolarynx > 0>><br>
[[Reverse engineer electrolarynx|Research Lab][$stockpile.electrolarynx -= 1,$researchLab.productionTime = 80,$researchLab.research = "Electrolarynx"]]
<</if>>
- <<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
+ /*<<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
[[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime = 100,$researchLab.research = "Erectile implant"]]
- <</if>>
+ <</if>>*/
<</if>>
<br><br>
@@ -195,11 +195,15 @@
<<if $researchLab.electrolarynx == 1>><br>
[[Build electrolarynx|Research Lab][$researchLab.productionTime = 60,$researchLab.manufacture = "Electrolarynx"]] // Currently have: $stockpile.electrolarynx//
<</if>>
- <<if $researchLab.erectileImplant == 1>><br>
+ /*<<if $researchLab.erectileImplant == 1>><br>
[[Build erectile implant|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Erectile implant"]] // Costs <<print cashFormat(25000)>>. Currently have: $stockpile.erectileImplant//
- <</if>>
+ <</if>>*/
<</if>>
+<<if $researchLab.manufacture != "none"||$researchLab.research != "none">>
+ <br><br> <<= ResearchLabStockPile()>>
+<</if>>
+
<<case 1>>
<<set $temp = 0>>
<<set $nextLink = "Research Lab">>
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index b909b9d3b6ae950b6e804c864d83fff5c128fc1f..62175285b478fcff3b7d449e476e06111e37dab0 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -736,6 +736,20 @@ window.PCTitle = function PCTitle() {
}
}
+ if (V.SF.Active < -1) {
+ switch(V.SF.BadOutcome) {
+ case "lockdown":
+ titles.push("The War Host");
+ break;
+ case "Revolt":
+ titles.push("The Betrayed");
+ break;
+ case "Exodus":
+ titles.push("The Abandoned");
+ break;
+ }
+ }
+
if (V.mercenaries >= 5) {
if (V.mercenariesTitle === "Evocati") {
titles.push("Princeps of the " + V.mercenariesTitle);
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index b3c0705bcc8087deb76c6cacb49c1221253d0f2d..7ee8f3bed3ef9388129a6699c12351144b94008d 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -1230,8 +1230,8 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
V.GDP = Math.max(+V.GDP, 1) || 278.6;
V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0;
V.helots = Math.max(+V.helots, 0) || 0;
- V.fuckdolls = Math.max(+V.fuckdolls , 0) || 0;
- V.menialBioreactors = Math.max(+V.menialBioreactors , 0) || 0;
+ V.fuckdolls = Math.max(+V.fuckdolls , 0) || 0;
+ V.menialBioreactors = Math.max(+V.menialBioreactors , 0) || 0;
V.foodCost = Math.trunc(2500/V.economy);
V.drugsCost = Math.trunc(10000/V.economy);
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 9b375c4d5e4f8ba1c0b25494cbef5a20998f9864..6ef2b127b9da8acf0e296ae72fda8a0c543fd247 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -327,7 +327,7 @@ window.getCost = function(array) {
if(State.variables.SF.Toggle && State.variables.SF.Active >= 1) {
if(State.variables.SF.Subsidy) {
- costs += Math.ceil( (10000*(State.variables.SFUnit.Troops/10))+(1+(State.variables.arcologies[0].prosperity/100))+(1+(State.variables.SF.Units/100)) );
+ costs += Math.ceil( (10000*(State.variables.SF.Squad.Troops/10))+(1+(State.variables.arcologies[0].prosperity/100))+(1+(State.variables.SF.Size/100)) );
}
if(State.variables.SF.Bonus) {
const T = State.temporary;
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 33079725627307a888e2efc625c70e74e8fdf73d..87987638965a41da15fdd0d97fd67cd9fba03392 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -68,6 +68,7 @@ window.generateGenetics = (function() {
genes.race = setRace(father, mother, actor2);
genes.intelligence = setIntelligence(father, mother, activeMother, actor2);
genes.face = setFace(father, mother, activeMother, actor2);
+ genes.faceShape = setFaceShape(father, mother);
genes.eyeColor = setEyeColor(father, mother, actor2);
genes.hColor = setHColor(father, mother, actor2);
genes.underArmHStyle = setUnderArmHStyle(father, mother);
@@ -505,6 +506,21 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100);
}
+ // face shape
+ function setFaceShape(father, mother) {
+ let shape;
+ if (father !== 0) {
+ if (mother.faceShape == father.faceShape) {
+ shape = mother.faceShape;
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ } else {
+ shape = jsEither(["androgynous", "androgynous", "cute", "cute", "exotic", "normal", "normal", "sensual", mother.faceShape, mother.faceShape]);
+ }
+ return shape;
+ }
+
return generateGenetics;
})();
@@ -629,7 +645,10 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
@@ -775,7 +794,7 @@ window.generateChild = function(mother, ova, destination) {
child.pubicHColor = child.hColor;
child.underArmHColor = child.hColor;
child.eyebrowHColor = child.hColor;
- child.birthWeek = child.birthWeek;
+ child.birthWeek = 0;
child.energy = 0;
child.anus = 0;
if (child.vagina > 0) {child.vagina = 0;}
@@ -785,6 +804,9 @@ window.generateChild = function(mother, ova, destination) {
child.balls = 1;
child.scrotum = 1;
}
+ if (genes.faceShape !== undefined) {
+ child.faceShape = genes.faceShape;
+ }
if (mother.addict > 0) {
child.addict = Math.trunc(mother.addict/2);
}
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 2c05fc54bb5f4ac126c650b6ec628c29c2f912b8..59655e0c63c72be8a6088be6b47f752ad7007acd 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -1054,4 +1054,25 @@ window.induceLactation = function induceLactation(slave) {
}
}
return r;
+}
+
+window.ResearchLabStockPile = function() {
+ return `__Stockpile__
+ Prosthetics interfaces: <<print commaNum($stockpile.basicPLimbInterface+
+ $stockpile.advPLimbInterface)>>
+ Basic : $stockpile.basicPLimbInterface
+ Advanced: $stockpile.advPLimbInterface
+ Limbs: <<print commaNum($stockpile.basicPLimb+$stockpile.advSexPLimb+
+ $stockpile.advGracePLimb+$stockpile.advCombatPLimb+$stockpile.cyberneticPLimb)>>
+ Basic: $stockpile.basicPLimb
+ Sex: $stockpile.advSexPLimb
+ Beauty: $stockpile.advGracePLimb
+ Combat: $stockpile.advCombatPLimb
+ Cybernetic: $stockpile.cyberneticPLimb
+ Implants: <<print commaNum($stockpile.ocularImplant+$stockpile.cochlearImplant
+ +$stockpile.erectileImplant)>>
+ Ocular: $stockpile.ocularImplant
+ Cochlear: $stockpile.cochlearImplant
+ // Erectile: $stockpile.erectileImplant
+ Electrolarynx: $stockpile.electrolarynx`
}
\ No newline at end of file
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index e40627a9171d4a2efdab6e8cc7f5f812a4041fad..ee4f803ac55a0da88d07f8217985d68083649c04 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -108,7 +108,7 @@
/*wide dick*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Selene", _HS.birthName = "Selene", _HS.genes = "XY", _HS.origin = "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 32, _HS.physicalAge = 32, _HS.visualAge = 32, _HS.ovaryAge = 32, _HS.health = 20, _HS.devotion = 40, _HS.muscles = 20, _HS.height = 175, _HS.race = "latina", _HS.eyeColor = "ice blue", _HS.hColor = "ashen with black streaks", _HS.pubicHColor = "ashen", _HS.skin = "brown", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.waist = -55, _HS.boobs = 1400, _HS.butt = 1, _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 2, _HS.dickPiercing = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.addict = 50, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customDesc = "She has large police badge made of polished silver pinned right to the skin with several barbell-piercing several inches above her left nipple. She wears two pairs of handcuffs as bracelets (one pair on each wrist); the handcuff keyholes are welded, so they cannot be unlocked and removed in normal way.", _HS.career = "a security guard">>
+<<set _HS.slaveName = "Selene", _HS.birthName = "Selene", _HS.genes = "XY", _HS.origin = "Once she was an arcology security officer, lured to aphrodisiacs addiction and feminized by her boss (and former wife), to whom she was sold as a slave to satisfy her spousal maintenance after divorce.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 32, _HS.physicalAge = 32, _HS.visualAge = 32, _HS.ovaryAge = 32, _HS.health = 20, _HS.devotion = 40, _HS.muscles = 20, _HS.height = 175, _HS.race = "latina", _HS.eyeColor = "ice blue", _HS.hColor = "ashen with black streaks", _HS.pubicHColor = "ashen", _HS.skin = "brown", _HS.hLength = 30, _HS.hStyle = "shoulder length", _HS.waist = -55, _HS.boobs = 1400, _HS.butt = 1, _HS.face = 55, _HS.lips = 35, _HS.vagina = -1, _HS.preg = -2, _HS.dick = 5, _HS.anus = 2, _HS.dickPiercing = 1, _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusTat = "bleached", _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.analSkill = 100, _HS.combatSkill = 1, _HS.addict = 50, _HS.intelligence = 20, _HS.intelligenceImplant = 30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customDesc = "She has a large police badge made of polished silver pinned right to the skin with several barbell piercings just above her left nipple. She wears two pairs of handcuffs as bracelets (one pair on each wrist); the handcuff keyholes are welded, so they cannot be unlocked and removed in any normal way.", _HS.career = "a security guard">>
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index 509a45f1a6504d75b9116b449e655e0294f3f6ff..e4a7ce0210149908d13d4b1b2ccf80819bb28afd 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -17,7 +17,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas – starfruits - are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
+<<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.ovaryAge = 25, _HS.health = 20, _HS.devotion = 90, _HS.height = 175, _HS.eyeColor = "light green", _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas — starfruits - are tattooed on her buttocks and on her face.", _HS.clitPiercing = 2, _HS.tonguePiercing = 1, _HS.clothes = "no clothing", _HS.collar = "bell collar", _HS.heels = 1>>
/*vibe nips, saliva implant lube*/
<<set $heroSlaves.push(_HS)>>
diff --git a/src/npc/descriptions/fAssistedSex.tw b/src/npc/descriptions/fAssistedSex.tw
index 333e24ac1536274f31d72cb7232d04dace8c2ec3..ad04bf3785ece9cd93ad297e497612ad94121bfc 100644
--- a/src/npc/descriptions/fAssistedSex.tw
+++ b/src/npc/descriptions/fAssistedSex.tw
@@ -47,9 +47,9 @@ You remove your clothes and lie back on the office couch,
<<else>>
Smiling fakely,
<</if>>
-$he draws toward you, half-floating on a river of silent, groping hands. When $he is inches away from you, $his servants lift $him higher, and $he
+$he draws toward you, half-floating on a river of silent, groping hands. When $he is mere <<if $showInches == 2>>inches<<else>>centimeters<</if>> away from you, $his servants lift $him higher, and $he
<<if $PC.dick == 1>>
- teases your dick with a series of masterful--and carefully balanced--belly isolations, rubbing the thick nub of $his belly button in small semicircles around your oozing cockhead as $he does so. Right when you feel ready to explode, $he rotates around, bringing
+ teases your dick with a series of masterful — and carefully balanced — belly isolations, rubbing the thick nub of $his belly button in small semicircles around your oozing cockhead as $he does so. Right when you feel ready to explode, $he rotates around, bringing
<<if $activeSlave.butt > 11>>
$his overgrown, wobbling ass cheeks
<<elseif $activeSlave.butt > 5>>
@@ -68,7 +68,7 @@ $he draws toward you, half-floating on a river of silent, groping hands. When $h
When you feel your own orgasm approaching, you pull out, ejaculating
<<elseif canDoAnal($activeSlave)>>
When you feel the tension within you reaching its apex, you signal to $his servants to hold $him in place. With $his silent menials, still as statues, anchoring $his bloated body at the perfect angle for fucking while contorting their anonymous bodies to frame $him in a manner that maximizes $his visual attractiveness, you grab hold of $his flanks and ram into $his asshole, driving $him to the first of many orgasms with just a few casual thrusts.
- <<= AnalVCheck()>>
+ <<= AnalVCheck()>>
When you feel your own orgasm approaching, you pull out, ejaculating
<<else>>
When you feel the tension with your reaching its apex, you signal to $his servants and they pull him forward. You ejaculate
diff --git a/src/npc/descriptions/fBellyFuck.tw b/src/npc/descriptions/fBellyFuck.tw
index d1c57cf3100d3d46db76cf8b476d572cba7f30cd..c0077c46cd0924f7d6726cb794353c33bf860eaa 100644
--- a/src/npc/descriptions/fBellyFuck.tw
+++ b/src/npc/descriptions/fBellyFuck.tw
@@ -82,7 +82,7 @@ When you get to $his rear, you slap $his
<<else>>
pert ass,
<</if>>
-and then spread $his cheeks for easier access to $his <<if canDoVaginal($activeSlave)>>cunt. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Heaving upward, you push $him fully onto $his belly, then lean into $him, fucking $him in a unique spin on the wheelbarrow position<<if $PC.dick == 0>> with your strapon<</if>> and setting $his tightly packed gut to jiggling. $He moans in mixed pain and pleasure as you bring $him over the edge and, by the time you finish with $him and allow $him to return to $his duties, it's clear
+and then spread $his cheeks for easier access to $his <<if canDoVaginal($activeSlave)>>cunt. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Heaving upward, you push $him fully onto $his belly, then lean into $him, fucking $him in a unique spin on the wheelbarrow position<<if $PC.dick == 0>> with your strap-on<</if>> and setting $his tightly packed gut to jiggling. $He moans in mixed pain and pleasure as you bring $him over the edge and, by the time you finish with $him and allow $him to return to $his duties, it's clear
<<if $activeSlave.belly > $activeSlave.pregAdaptation*2000>>
that your recent escapades @@.red;have done lasting damage to $his body.@@
<<set $activeSlave.health -= 10>>
diff --git a/src/npc/descriptions/fMaternitySwing.tw b/src/npc/descriptions/fMaternitySwing.tw
index fda4d66008fa611b55aad9c218f63de8629b3280..7d550ee2847ec9ee7426ecbe91a447613f795a17 100644
--- a/src/npc/descriptions/fMaternitySwing.tw
+++ b/src/npc/descriptions/fMaternitySwing.tw
@@ -35,7 +35,7 @@ hanging above the floor of your office, you turn your attention to molesting $hi
<<else>>
groans in lust and terror.
<</if>>
-You strap into your own customized version of the device, then elevate your body so that <<if $PC.dick == 1>>your dick<<else>>the device's built-in strapon<</if>> is at the perfect angle to drive yourself and your
+You strap into your own customized version of the device, then elevate your body so that <<if $PC.dick == 1>>your dick<<else>>the device's built-in strap-on<</if>> is at the perfect angle to drive yourself and your
<<if $activeSlave.bellyPreg >= 600000>>
brood-slave
<<else>>
diff --git a/src/npc/descriptions/fPoolSex.tw b/src/npc/descriptions/fPoolSex.tw
index 9d0c485874eeef7efd58bdcfadf5f323a938bbf5..37c81a9311671729f7b415285a71b1930675495f 100644
--- a/src/npc/descriptions/fPoolSex.tw
+++ b/src/npc/descriptions/fPoolSex.tw
@@ -57,7 +57,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
rolls sideways and rubs your vulva as best $he can.
<</if>>
<<if $activeSlave.dick >= 1>>
- When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strapon to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
+ When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strap-on to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
<<else>>
When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that your pussies are level. Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your lower lips to $hers, you rub your clits together, driving the both of you to repeated orgasm.
<<set $activeSlave.vaginalCount++, $vaginalTotal++>>
@@ -106,7 +106,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
rolls sideways and rubs your vulva as best $he can.
<</if>>
<<if $activeSlave.dick >= 1>>
- When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strapon to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
+ When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strap-on to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
<<else>>
When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that your pussies are level. Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your lower lips to $hers, you rub your clits together, driving the both of you to repeated orgasm.
<<set $activeSlave.vaginalCount++, $vaginalTotal++>>
@@ -160,7 +160,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
set $him to rubbing your vulva with $his belly button.
<</if>>
<<if $activeSlave.dick >= 1>>
- When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strapon to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
+ When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that you can don a dildo and ream $his <<if canDoVaginal($activeSlave)>>pussy. <<= VaginalVCheck()>><<else>>asshole. <<= AnalVCheck()>><</if>> Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your strap-on to his needy hole, you tease $him for a moment before ramming home, driving the both of you to repeated orgasm.
<<= AnalVCheck()>>
<<else>>
When you feel yourself at the edge of orgasm, you have the pool's mobility aids rotate $him into a position level with the pool's edge, then hop up on that ledge yourself so that your pussies are level. Satisfied that the angles are right, you grab hold of $his hips and slide half on top of $him, resting your lower half on the rear swell of $his obscenely bloated belly. Pressing your lower lips to $hers, you rub your clits together, driving the both of you to repeated orgasm.
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 5a09e2fd13b22aecf821674af82ea31a0a8920b6..0cefb34c5db7eb7a8a20d65322f9ec84cf919bc5 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1124,7 +1124,7 @@ My favorite part of my body i<<s>>
<<elseif ($activeSlave.relation != 0) && ($slaves[_partner].ID == $activeSlave.relationTarget)>>
I - I'm fucking my <<if ($activeSlave.relation == "mother")>>daughter<<elseif ($activeSlave.relation == "daughter")>>mother<<else>>$activeSlave.relation<</if>>," $he bursts out, blushing even harder. "It'<<s>> <<s>>o fucking wrong, but <<if ($activeSlave.relation == "mother")>><<he 2>> ha<<s>> <<s>>uch a hot little body<<elseif ($activeSlave.relation == "daughter")>><<he 2>>'<<s>> <<s>>uch a hot MILF<<else>><<he 2>>'<<s>> <<s>>o hot<</if>>, I can't <<s>>top.
<<elseif ($activeSlave.actualAge + 14) < $slaves[_partner].actualAge>>
- <<He 2>>'<<s>> old enough to be my mother." $He looks down, blushing a little harder. "But I'm lucky, <<he 2>>'<<s>> <<s>>uch a hot MILF.
+ <<He 2>>'<<s>> old enough to be my mother." $He looks down, blushing a little harder. "But I'm lucky, <<he 2>>'<<s>> <<s>>uch a hot MILF.
<<elseif ($activeSlave.actualAge - 14) > $slaves[_partner].actualAge>>
<<He 2>>'<<s>> young enough to be my daughter." $He looks down, blushing a little harder. "But I love <<his 2>> hot young body.
<</if>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index 6affda51e71212a1a904956e778e450dee56e0e1..498883065b516802ad69a9f61df2c183ae0ee3df 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -198,21 +198,21 @@ Next, you see to $activeSlave.slaveName.
<</if>>
<<else>>
<<if canDoVaginal($impregnatrix)>>
- Pulling back, you flip them again so that $impregnatrix.slaveName is on top and don a strapon. You begin stimulating _his2 <<if $impregnatrix.prostate != 0>>prostate<<else>>internals<</if>> with a good fucking until _he2 blows _his2 load into $activeSlave.slaveName's fertile <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
+ Pulling back, you flip them again so that $impregnatrix.slaveName is on top and don a strap-on. You begin stimulating _his2 <<if $impregnatrix.prostate != 0>>prostate<<else>>internals<</if>> with a good fucking until _he2 blows _his2 load into $activeSlave.slaveName's fertile <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
<<if ($impregnatrix.vagina == 0)>>
$impregnatrix.slaveName will certainly remember this @@.hotpink;very special@@ day for many reasons, including it being _his2 @@.lime;first time@@ as _he2 inseminated $activeSlave.slaveName.
<<set $impregnatrix.devotion += 4, $impregnatrix.vagina = 1>>
<</if>>
<<set $impregnatrix.vaginalCount += _penCountBonus, $vaginalTotal += _penCountBonus>>
<<elseif canDoAnal($impregnatrix)>>
- Pulling back, you flip them again so that $impregnatrix.slaveName is on top and don a strapon. You begin stimulating _his2 <<if $impregnatrix.prostate != 0>>prostate<<else>>internals<</if>> with a good assfuck until _he2 blows _his2 load into $activeSlave.slaveName's fertile <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
+ Pulling back, you flip them again so that $impregnatrix.slaveName is on top and don a strap-on. You begin stimulating _his2 <<if $impregnatrix.prostate != 0>>prostate<<else>>internals<</if>> with a good assfuck until _he2 blows _his2 load into $activeSlave.slaveName's fertile <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
<<set $impregnatrix.analCount += _penCountBonus, $analTotal += _penCountBonus>>
<<if ($impregnatrix.anus == 0)>>
$impregnatrix.slaveName will certainly remember this @@.hotpink;very special@@ day for many reasons, including taking _his2 @@.lime;first buttfuck@@ as _he2 inseminated $activeSlave.slaveName.
<<set $impregnatrix.devotion += 4, $impregnatrix.anus = 1>>
<</if>>
<<else>>
- The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
+ The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
<</if>>
<</if>>
<<set $impregnatrix.oralCount += _penCountBonus, $oralTotal += _penCountBonus>>
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index 5ff739646303bc0b143b3e4c8d7e76f4a387fc5a..5f68eee12a207b1c736ebb51bf6cbbe6bcc84666 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -52,7 +52,7 @@ You call $him over so you can fondle $his
<<if ($activeSlave.amp == 1)>>
$His limbless <<if $seeRace == 1>>$activeSlave.race <</if>>torso is a sight to behold. You place your hands on $his breasts and you gently massage
<<if ($activeSlave.boobs >= 20000)>>
- $his colossal tits, doing your best to not miss an inch of their immense size,
+ $his colossal tits, doing your best to not miss <<if $showInches == 2>>an inch<<else>>a centimeter<</if>> of their immense size,
<<elseif ($activeSlave.boobs >= 10000)>>
$his massive tits, your hands sinking deep into their soft flesh,
<<elseif ($activeSlave.boobs >= 5000)>>
diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw
index fd3da668f25b73d6763b2b9321d24013ddda88fa..a70dd26910171287cc9e37edb49c464603f330ed 100644
--- a/src/pregmod/FSuckle.tw
+++ b/src/pregmod/FSuckle.tw
@@ -210,7 +210,7 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
<</if>>
<<elseif $activeSlave.nipples == "inverted">>
<<if _mood == 2>>
- poking it with your finger as deep as you can. The inviting hole keeps all the delicious milk locked up, your instincts insisting that you pry out the flavor for yourself. The kicking in your middle settles it, you're taking a drink whether or not $his nipples agree.
+ poking it with your finger as deep as you can. The inviting hole keeps all the delicious milk locked up, your instincts insisting that you pry out the flavor for yourself. The kicking in your middle settles it, you're taking a drink whether or not $his nipples agree.
<<else>>
the inviting hole keeping all the delicious milk locked up, your instincts insisting that you pry out the flavor for yourself.
<</if>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index eaa5c784785b64739986caab05af93a662b5b6e7..afc9dc490662c30fb62262bdcd963b46fba82baf 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -161,7 +161,7 @@
<</if>>
You have $him <<if ($activeSlave.clothing != "naked") && (_sexAct != "oral")>>take off $his clothing, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
<<else>>
- and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "split lip", "bruise")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothing != "naked")>>force $him to take off $his $activeSlave.clothing and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> -- all the while ignoring $his screams and pleas for mercy --
+ and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "split lip", "bruise")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothing != "naked")>>force $him to take off $his $activeSlave.clothing and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> — all the while ignoring $his screams and pleas for mercy —
<</if>>
<<else>>
but $he knows $he is powerless to stop you. You <<if ($activeSlave.clothing != "naked")>>take off $his clothes and <</if>><<if _sexAct == "oral">>place a ring gag in $his mouth, then<</if>>place $him on the ground with a cushion under $his hips <<if _sexAct != "oral">>, $his ass in the air,<</if>>
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 8b369c63e7513933e87c9fa757476c16c68c8531..be72518eb06a933e4a1b6d49574f35618c20b926 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -3,7 +3,7 @@
You arrive at your favorite plastic surgeon for your appointment to find them as busy as ever, but you find yourself quickly hurried into an exam room by their cute assistant. She wastes no time in hurrying you into her office, stripping you down, measuring you and making sure you are healthy enough for surgery, all the while not so subtly running her hands across every part of you. "So, what can I help you with?"
<br><br>
-"You sure you want to mess with that lovely face?" She teases, caressing your cheek. "@@.yellowgreen;<<print cashFormat(5000)>>@@. Also wouldn't recommend changing you eyes or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you, give us some credit."
+"You sure you want to mess with that lovely face?" She teases, caressing your cheek. "@@.yellowgreen;<<print cashFormat(5000)>>@@. Also wouldn't recommend changing your eyes, face shape or skin color; some security systems get real uppity over things like that. Though I s'pose race and hair can fall under that as well, but hey, we don't handle racial surgery and this isn't a hair salon, so nothing to worry about, right? Yes, I'm certain your systems will recognize you after we finish working on you, give us some credit."
<br>
You're @@.orange;$PC.actualAge years old.@@
<<if $PC.actualAge >= 65>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index dd187bfd70a8019bef2d55bd01806f3f3d438782..dd8508e6dcf9a4cd7c27c6ac24cb2ad4680951ba 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -91,11 +91,11 @@
<</replace>>
<</link>>
</span>
- <<if $SFTradeShow.CanAttend === -1>>
- <<switch $ColonelCore>>
+ <<if $SF.MercCon.CanAttend === -1>>
+ <<switch $SF.Colonel.Core>>
<<case "kind">>
The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
- <<case "warmonger" "cruel" "sociopathic" "jaded" "brazen" "psychopathic" "mischievous">>
+ <<case "brazen""jaded""cruel">>
The Colonel is grateful that you let her troops let off some steam. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
<</switch>>
<</if>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index bc10c86451019f47b8730e1b1d9eb52e1b0e9862..997b05153f8c86b9e6625cd3c01ad87c100bfbdc 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -80,7 +80,7 @@
<<else>>
monstrous
<</if>>
- balls,
+ balls,
<<else>>
soft perineum,
<</if>>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 3e7aee7d0196de4142aae41fc1d8e2ebe2891dd6..6401a1debb7c264e19e4482817a8430c4daeea66 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -178,7 +178,7 @@ with your fingertips. You move your hand to the side of your slave's head, strok
<<elseif $activeSlave.devotion >= -20>>
This causes $him to shiver unconsciously.
<<elseif $activeSlave.trust <= -50>>
- This forces $his back rigid, in an effort not to move an inch, out of fear.
+ This forces $his back rigid, in an effort not to move <<if $showInches == 2>>an inch<<else>>a centimeter<</if>>, out of fear.
<<elseif $activeSlave <= -21>>
This would cause $him to shiver with delight, but $his distaste for the situation makes that impossible.
<</if>>
diff --git a/src/pregmod/fSlaveSelfImpreg.tw b/src/pregmod/fSlaveSelfImpreg.tw
index d38809329478197ab587f6058875942772148447..a02a702e950a6f5c12f41958e600f4a8b1541ab6 100644
--- a/src/pregmod/fSlaveSelfImpreg.tw
+++ b/src/pregmod/fSlaveSelfImpreg.tw
@@ -11,7 +11,7 @@
<<else>>
<<if ($activeSlave.devotion <= 20)>>
<<if ($activeSlave.devotion < -20)>>
- $activeSlave.slaveName despises you, and tends to resent everything you do on principle,
+ $activeSlave.slaveName despises you, and tends to resent everything you do on principle,
<<elseif ($activeSlave.devotion <= 20)>>
$activeSlave.slaveName dislikes you,
<</if>>
@@ -157,7 +157,7 @@
<<set $activeSlave.vagina = 1>>
<</if>>
<<else>>
- You instruct $him to fuck $himself; by this point, $he's too far gone to object. $His hands shake as $he lines $his cock up with $his own opening; $he lets out a sound halfway between a sob and a moan as $he penetrates $himself.
+ You instruct $him to fuck $himself; by this point, $he's too far gone to object. $His hands shake as $he lines $his cock up with $his own opening; $he lets out a sound halfway between a sob and a moan as $he penetrates $himself.
<</if>>
Without another partner to thrust against, $activeSlave.slaveName has to use $his remarkable shaft like a dildo, sliding it in and out of $his increasingly dripping sex. The potent mix of shame and arousal drives $him to orgasm quickly, and only a couple of minutes pass before you see $his shaft throbbing as $he fucks a baby into $his own belly.
<<else>>
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index 1c8b67c25bea7cb6f2623d132976f499e315ef7a..8ef4572798be43d66fd412ba2e7e05abef0010a0 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -42,7 +42,7 @@ You take a look at the bound cock toy.
<<elseif ($activeSlave.devotion > 20)>>
$activeSlave.slaveName is obedient but not devoted, so $his restraints are firm for $his own good.
<<else>>
- $activeSlave.slaveName is unlikely to comply willingly, and is tied down tight, unable to budge more than an inch.
+ $activeSlave.slaveName is unlikely to comply willingly, and is tied down tight, unable to budge more than <<if $showInches == 2>>an inch<<else>>a centimeter<</if>>.
<</if>>
<<if ($activeSlave.amp == 1)>>
diff --git a/src/pregmod/fillUpButt.tw b/src/pregmod/fillUpButt.tw
index fe2cb25dff3318e2828d5bd28abb5b411b8a943a..e79ddeeefeaf574ecd14beb326ce06534f5379e2 100644
--- a/src/pregmod/fillUpButt.tw
+++ b/src/pregmod/fillUpButt.tw
@@ -37,7 +37,7 @@ before calling $him over so you can play with $his
<<elseif $activeSlave.butt <= 20>>
couch-like, super jiggly ass cheeks
<</if>>
- before shoving the equipment into $his
+before shoving the equipment into $his
<<if ($activeSlave.anus > 3)>>
gaping anus.
<<elseif ($activeSlave.anus == 3)>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 5ff0cdfd4b24cbca0891cdab60e9c79f1848a6f5..2eb7db2d2e747b4dbfc65e017eb7817d0de56280 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -398,7 +398,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<else>>
<br>$His growth is currently being accelerated. $He will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
<</if>>
- <br>The tank is imprinting $his with basic life and sexual skills, though $he will still be very naive and inexperienced on release.
+ <br>The tank is imprinting $his with basic life and sexual skills, though $he will still be very naïve and inexperienced on release.
<<if $tanks[$i].tankBaby == 2>>
The majority of $his indoctrination involves painting the world as a terrible place where only horror awaits $him should $he not obey $his owner.
<<else>>
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index e4064c59ec4c8df136ec87a67f6150d39d979d42..0b8cfc489351cc009f1d8c291531d8f58a8c1cd5 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -152,9 +152,9 @@ Slave demand is
@@.yellow;''strong''@@
<</if>>
<<if $deltaDemand > 0>>
- and @@.green;''improving''@@
+ and @@.green;''improving''@@
<<elseif $deltaDemand < 0>>
- and @@.red;''decreasing''@@
+ and @@.red;''decreasing''@@
<</if>>
<<if $deltaDemand != 0>>
<<if $demandTimer - $elapsedDemandTimer < 3>>
@@ -192,13 +192,13 @@ Slave supply is
@@.yellow;''strong''@@
<</if>>
<<if $deltaSupply > 0>>
- and @@.red;''improving''@@
+ and @@.red;''improving''@@
<<elseif $deltaSupply < 0>>
- and @@.green;''decreasing''@@
+ and @@.green;''decreasing''@@
<</if>>
<<if $deltaSupply != 0>>
<<if $supplyTimer - $elapsedDemandTimer < 3>>
- but it might change soon
+ but it might change soon
<</if>>
<</if>>
<<if ($cheatMode) && ($cheatModeM)>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 0ab725263f94246dd1700612ca5c0ece1c860f10..df0e3a73b1e7268c0b5293ca64aa6f6073057c74 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -8,7 +8,7 @@
<</if>>
You pause for a moment from your busy day to day life to return to <<if $masterSuite != 0>>$masterSuiteName<<else>>your room<</if>> to consider some things about yourself.
-<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair and $PC.eyeColor eyes.
+<br>You take yourself in a full length mirror. You are <<if $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan" || $activeSlave.race == "amerindian">>an<<else>>a<</if>> $PC.race <<if $PC.dick == 1 && $PC.vagina == 1>>futanari<<elseif $PC.dick == 1>>man<<else>>woman<</if>> with<<if $PC.markings == "freckles">> freckled<<elseif $PC.markings == "heavily freckled">> heavily freckled<</if>> <<print $PC.skin>> skin, $PC.hColor hair, $PC.eyeColor eyes and a perfect $PC.faceShape face.
<<if $PC.actualAge >= 65>>
You're @@.orange;$PC.actualAge@@ and definitely feeling it.<<if $PC.visualAge > $PC.actualAge>> You've taken measures to @@.lime;look an older $PC.visualAge,@@ though perhaps it might be time to undo it.<<elseif $PC.visualAge < $PC.actualAge>> You've taken measures to @@.lime;look a younger $PC.visualAge,@@ now if only your body agreed with your looks.<</if>>
<<elseif $PC.actualAge >= 50>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 7dde340f47760f0e1209d6a3c42ece78bfdad17d..d91e567f24e7fea7a88eb2600552ec734fdd44fc 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -560,7 +560,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<</if>>
<<if $activeSlave.accent >= 3>>
- $He barely understands $language at all, and scarcely understands what's happening to $him. This leaves $him @@.mediumaquamarine;blissfully unaware of what awaits $him,@@ since $he's too naive to know better.
+ $He barely understands $language at all, and scarcely understands what's happening to $him. This leaves $him @@.mediumaquamarine;blissfully unaware of what awaits $him,@@ since $he's too naïve to know better.
<<set $activeSlave.trust += 25>>
<</if>>
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 57d1d931387885c9dcde91b9f8abc14d9705b28a..2782e386996a27c5b790e6459e2b48da8c2f6350 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -5,7 +5,7 @@
<<switch $surgeryType>>
<<case "skinTone">>
- After a few hours, you awaken in the recovery wing to find every inch of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["tanned", "lightened", "pale", "fair", "white", "dark", "light olive", "black", "brown", "dark olive", "light", "extremely pale"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every inch of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
+ After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "extremely pale", "pale", "extremely fair", "very fair", "fair", "white", "light", "lightened", "light olive", "olive", "natural", "tanned", "bronzed", "dark olive", "dark", "light brown", "brown", "dark brown", "ebony", "black", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers her mouth to hide her giggle a the sight of you<<else>>The surgeon's assistant carefully seats herself besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick == 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" She spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. Her touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." She winks at you. You doubt the validity of that claim but understand exactly what she means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
<<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.belly >= 10000 || $PC.boobsBonus == 3>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index ce4c3c28096d16ad4ba019282fe2934bc03fefb6..5530ee926583c057ea8df11ec086ec106c76e3f5 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -42,7 +42,7 @@
blushes and wiggles $his stumps, looking down.
<</if>>
<<if canTalk($activeSlave)>>
- "<<Master>>," $he <<say>>s, "I love being your hyper-pregnant brood <<s>>lave. My poor <<if $eventSlave.mpreg == 1>>a<<ss>><</if>>pu<<ss>>y weep<<s>> every time a baby pa<<ss>>e<<s>> through it, and <<s>>o many have pa<<ss>>ed through—and, <<Master>>, it hurt<<s>>, <<s>>ometime<<s>>, but I love the feeling of my body <<s>>tretching fuller and fuller with life every day. There'<<s>> nothing I want more than to be your
+ "<<Master>>," $he <<say>>s, "I love being your hyper-pregnant brood <<s>>lave. My poor <<if $eventSlave.mpreg == 1>>a<<ss>><</if>>pu<<ss>>y weep<<s>> every time a baby pa<<ss>>e<<s>> through it, and <<s>>o many have pa<<ss>>ed through — and, <<Master>>, it hurt<<s>>, <<s>>ometime<<s>>, but I love the feeling of my body <<s>>tretching fuller and fuller with life every day. There'<<s>> nothing I want more than to be your
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
<<= lispReplace(SlaveTitle($activeSlave))>>
<<else>>
@@ -233,7 +233,7 @@
<<else>>
your pussy dripping with need in short order
<</if>>
- and, as the description continues, you move around behind your broodmother, pushing $him up onto $his tremendous womb so that you can fuck $him against it. $His belly squashes down slightly under your weight, but less than you'd expect—$he's so packed full of children that $his stomach resists changing shape. $He wiggles $his hips as you
+ and, as the description continues, you move around behind your broodmother, pushing $him up onto $his tremendous womb so that you can fuck $him against it. $His belly squashes down slightly under your weight, but less than you'd expect — $he's so packed full of children that $his stomach resists changing shape. $He wiggles $his hips as you
<<if $activeSlave.butt > 11>>
sink face first into $his warm, room filling ass cleavage
<<elseif $activeSlave.butt > 5>>
@@ -325,7 +325,7 @@
<br><br><span id="result2">
<<link "Insult $him and halt all further training.">>
<<replace "#result2">>
- As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to herself, then arrange to have $his "discoveries" disposed of.
+ As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to $himself, then arrange to have $his "discoveries" disposed of.
<<if $activeSlave.trust < -95>>
The look of pride and accomplishment on $his face transforms into a look of crushing disappointment. You slap $him on the ass and then have your menials escort $him back to $his duties. The next time you see $him, the spark of life and vitality that drove $him has been fully extinguished. @@.red;$activeSlave.slaveName has broken.@@ Anything $he might have learned from this experience is lost in $his empty mind. $He will never question $his place, or anything else, again.
<<set $activeSlave.fetish = "mindbroken">>
@@ -515,7 +515,7 @@
<br><br><span id="result2">
<<link "Insult $him and halt all further training.">>
<<replace "#result2">>
- As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to herself, then arrange to have $his "discoveries" disposed of.
+ As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to $himself, then arrange to have $his "discoveries" disposed of.
<<if $activeSlave.trust < -95>>
The look of pride and accomplishment on $his face transforms into a look of crushing disappointment. You slap $him on the ass and then have your menials escort $him back to $his duties. The next time you see $him, the spark of life and vitality that drove $him has been fully extinguished. @@.red;$activeSlave.slaveName has broken.@@ Anything $he might have learned from this experience is lost in $his empty mind. $He will never question $his place, or anything else, again.
<<set $activeSlave.fetish = "mindbroken">>
@@ -734,7 +734,7 @@
<br><br><span id="result2">
<<link "Insult $him and halt all further training.">>
<<replace "#result2">>
- As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to herself, then arrange to have $his "discoveries" disposed of.
+ As much as $his antics amused you, it's clear that $activeSlave.slaveName wasted your money. You calmly explain to $him that the next time $he has a "brilliant" idea, $he should keep it to $himself, then arrange to have $his "discoveries" disposed of.
<<if $activeSlave.trust < -95>>
The look of pride and accomplishment on $his face transforms into a look of crushing disappointment. You slap $him on the ass and then have your menials escort $him back to $his duties. The next time you see $him, the spark of life and vitality that drove $him has been fully extinguished. @@.red;$activeSlave.slaveName has broken.@@ Anything $he might have learned from this experience is lost in $his empty mind. $He will never question $his place, or anything else, again.
<<set $activeSlave.fetish = "mindbroken">>
diff --git a/src/pregmod/rePregInventorText.tw b/src/pregmod/rePregInventorText.tw
index b907c76ae8040cc514b42c3410acdfc41619be01..1a8cd45141cc89d54778d41c0bec2ee543fa3ac7 100644
--- a/src/pregmod/rePregInventorText.tw
+++ b/src/pregmod/rePregInventorText.tw
@@ -159,7 +159,7 @@
<br><br>
"That's quite something," Millie whispers. "I don't know about you, $activeSlave.slaveName, but I think I speak for everyone watching today when I say that now seems like a //really good time// to try out that other invention of yours."
<br><br>
- They both exit the pool, dripping clear, slippery gel onto the wood floor of "Husbandry With Millie"'s set. Without a thorough rinsing, your slave's slathered up belly will be dripping for an hour or more, and $he seems to know that as $he motions to stop $his assistants from wiping $him off before strapping $him into $his aerial gymnastics maternity swing. As a result, when the two visibly panting preggos are strapped into the machine and elevated several feet above the now-visible studio audience, your slave drips a steady stream of goop onto their craning heads.
+ They both exit the pool, dripping clear, slippery gel onto the wood floor of "Husbandry With Millie"'s set. Without a thorough rinsing, your slave's slathered up belly will be dripping for an hour or more, and $he seems to know that as $he motions to stop $his assistants from wiping $him off before strapping $him into $his aerial gymnastics maternity swing. As a result, when the two visibly panting preggos are strapped into the machine and elevated several <<if $showInches == 2>>feet<<else>>meters<</if>> above the now-visible studio audience, your slave drips a steady stream of goop onto their craning heads.
<br><br>
"Oops!" Millie says. "Looks like we should have warned our audience about a wet zone for this episode. So, $activeSlave.slaveName, why don't we show off all the things this advanced maternity swing of yours can do?"
<br><br>
@@ -171,7 +171,7 @@
The mute, limbless slave can only moan inchoately in response, but it's clear $he's more than ready.
<</if>>
<br><br>
- The two then approach each other in mid air, settling into heavy petting and making out before transition into mechanically assisted scissoring. Your hyperbroodmother's unfathomable belly is hanging sideways and down, jiggling madly mere inches above the heads of the studio audience. One particularly adventurous audience member reaches up to place a hand on the slave's stomach to feel it bounce in their hands as $he gets fucked, and soon other members of the audience are also reaching up to feel the massive organ. The swing slowly rotates the coupling lovers back and forth over the length of the audience's seats, in a circle, and a wave of eager hands reach up as it does so, caressing your breeder's shaking belly as $he gets fucked by the show's moaning host. When Millie and your slave finally convulse in mutual orgasm, the camera zooms in on Millie's face for a close up. She seems exhausted, but she smiles for it anyway.
+ The two then approach each other in mid air, settling into heavy petting and making out before transition into mechanically assisted scissoring. Your hyperbroodmother's unfathomable belly is hanging sideways and down, jiggling madly mere <<if $showInches == 2>>inches<<else>>centimeters<</if>> above the heads of the studio audience. One particularly adventurous audience member reaches up to place a hand on the slave's stomach to feel it bounce in their hands as $he gets fucked, and soon other members of the audience are also reaching up to feel the massive organ. The swing slowly rotates the coupling lovers back and forth over the length of the audience's seats, in a circle, and a wave of eager hands reach up as it does so, caressing your breeder's shaking belly as $he gets fucked by the show's moaning host. When Millie and your slave finally convulse in mutual orgasm, the camera zooms in on Millie's face for a close up. She seems exhausted, but she smiles for it anyway.
<<set $activeSlave.vaginalCount++>>
<br><br>
"That was //fantastic//. I'm going to remember that experience for quite some time, and I'm sure our viewers here and at home will, too! Any last things you would like to say before we cut for break?"
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index 6d9f55a923f0022d8bd13156d823a8c1161bf6d8..edfef4b45b0a752fce5bc3328638f75aaeb591fb 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -1193,7 +1193,7 @@
<<case "humiliating">>
<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed her humiliating herself.">>
<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
- $him humiliating herself,
+ $him humiliating $himself,
<<case "breast">>
<<set $slaves[$i].pornPrestigeDesc = "She has a following in slave pornography. Thousands have enjoyed the sight of her breasts.">>
<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index 72c0d1b31f7217990bfd4bab95d5b826073ac2ae..c1dcfc794892af91cc32cfb8c961234eb9504748 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -7,7 +7,7 @@
<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "TCR", $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
-//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the ranch, you also receive a discount on them.<</if>>//
+//The Cattle Ranch is a controversial slave school operating primarily out of Pastoralistic Free Cities. Its business model is to offer the ideal free range dairy cow; one whose tits and belly reach the floor when she is on all fours. All cattle come optimized for milking, with big breasts and gravid middles. Slave orphans have their heels clipped shortly after birth and are conditioned to believe they are actual livestock, resulting in a mindbreak-like state. Between their wide hips and big butts and their heavy, milky breasts, they are often popular breeding slaves. They rarely display their stock over video call, instead favoring a more hands-on approach. Buyers can visit their local shops to view grazing cattle available for sale. Alternatively, they can watch the calves frolic among their mothers or enjoy the sight of a breeding bull impregnating an empty womb. Cows are also specially trained to respond to spectators banging on the fence; oral awaits if you drop trou for them! <<if $TCR.schoolUpgrade != 0>><br><br>You have endowed <<if $TCR.schoolUpgrade == 1>>a healthy sum of credits to make their breeding bulls available for sale.<<else>>a healthy sum of credits to encourage the sale of heifers.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the ranch, you also receive a discount on them.<</if>>//
<br><br>The Cattle Ranch parades a choice selection of cows for your viewing pleasure. You're free to do as you please to the slaves, as long as you don't cause lasting harm to them.<<if isPlayerFertile($PC)>> You can't help but notice the number of bulls lining up along the fence sniffing at you.<</if>>
@@ -20,7 +20,6 @@
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index c86ccb2be1681c6df8b4342d408462f2dd38ac4d..1d32b662f8ff776d6a08d83c3bfeab0517d3e0f1 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -29,7 +29,6 @@ The Hippolyta Academy is one of the most famous slave bodyguarding schools in al
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
index 7b4ec421d4a36f9bf533846e7e6840914cf4872c..c07f9580516f7903fcc4b9b626947bd910bc6497 100644
--- a/src/pregmod/wetwareCPUs.tw
+++ b/src/pregmod/wetwareCPUs.tw
@@ -15,7 +15,6 @@
<<slaveCost $activeSlave>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 16e0a48b14c07180b6ae9d90988e9ef568e24cb5..679771d3b62c1811e946dfe59d7f85d157fb334f 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -400,7 +400,7 @@
<<else>>
eight babies
<</if>>
- in your belly.
+ in your belly.
<<elseif $PC.belly >= 75000>>
Your belly is starting to become worrying to you. You're positively gigantic and quite tired of it. The last thing on peoples' minds these days is fucking you too.
<<elseif $PC.belly >= 60000>>
@@ -821,7 +821,7 @@
Your slutty skirt is strained by your big butt.
<</if>>
<<else>>
- <<if $PC.butt > 2>>
+ <<if $PC.butt > 2>>
<<if $PC.buttImplant == 1>>
You had to get your slutty pants let out to contain your enormous rear. It still feels really tight, however, thanks to the implants.
<<else>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 410d72898196f4c5c83e5ae7e5f3f87925bdc54c..73fd353e12c1e66a72fb54d6d3f46f662130cced 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,7 +1,7 @@
:: pregmod widgets [nobr widget]
<<widget "initPC">>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, lactation: 0, lactationDuration: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, birthLab: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, faceShape: "normal", actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
<<set WombInit($PC)>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index c3b939e1134badd5b56e9999de71266a4e047edf..23535ec3bdcd98e0cd36e4d0b026144bfdccd45a 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -542,7 +542,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
$He had exceedingly narrow hips, completely unsuitable for childbirth. As $he struggled on $his <<if _curBabies > 1>>first<</if>> child, $his pelvic bone strained under the pressure until it could no longer hold together and @@.red;agonizingly snapped.@@
<<if $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].fetish == "masochist")>>
- <<if $slaves[$i].fetishKnown == 0>>What would have made most girls blackout from pain sent $him into the lewdest orgasm you've seen today. $He @@.lightcoral;must get off to pain.@@.<<set $slaves[$i].fetishKnown = 1>><<else>> $He claims to have never climaxed so hard and @@.hotpink;wishes her hips could have stayed that narrow for next time.@@<</if>>
+ <<if $slaves[$i].fetishKnown == 0>>What would have made most girls blackout from pain sent $him into the lewdest orgasm you've seen today. $He @@.lightcoral;must get off to pain.@@.<<set $slaves[$i].fetishKnown = 1>><<else>> $He claims to have never climaxed so hard and @@.hotpink;wishes her hips could have stayed that narrow for next time.@@<</if>>
<<set $slaves[$i].devotion += 5>>
<<elseif $slaves[$i].devotion > 70>>
When $he comes to, $his pelvis has already been patched up. $He is just glad that $he managed to finish giving birth despite the hindrance.
@@ -818,7 +818,7 @@ All in all,
<<elseif $slaves[$i].fetish == "none" || $slaves[$i].fetishStrength <= 60>>
and a curious experience to $him. <<if random(1,5) == 1>>@@.lightcoral;$He has developed a humiliation fetish.@@<<set $slaves[$i].fetish = "humiliation">><<else>>$He hopes to never repeat it.<</if>>
<<elseif $slaves[$i].devotion <= 20>>
- and completely devastating to $his image of herself. The experience @@.hotpink;habituates $him@@ to cruelties of slavery.
+ and completely devastating to $his image of $himself. The experience @@.hotpink;habituates $him@@ to cruelties of slavery.
<<set $slaves[$i].devotion += 5>>
<<else>>
and $he hopes to never undergo it again.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 9d50eb673d1dfa9f3b99312177dce0bd03849f30..38d97b0ba24e087458561c2f0259a9033947d08c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -70,6 +70,9 @@
<<if ndef $PC.surname>>
<<set $PC.surname = 0>>
<</if>>
+<<if ndef $PC.faceShape>>
+ <<set $PC.faceShape = "normal">>
+<</if>>
<<if ndef $bodyguardTrains>>
<<set $bodyguardTrains = 1>>
<</if>>
@@ -212,6 +215,9 @@
<<if def $minimumChildAge>>
<<unset $minimumChildAge>>
<</if>>
+<<if def $customValue>>
+ <<unset $customValue>>
+<</if>>
/* pregmod stuff */
@@ -1114,121 +1120,9 @@
<<set $drugAssetPrice = 10>>
<</if>>
-/*SFVAR*/
-<<if ndef $SF>>
- <<if $securityForceEventSeen < 1>> <<set $securityForceActive = -1>> <<else>> <<set $securityForceActive = 2>> <</if>>
-
- <<set $SF = {Toggle:$SFMODToggle, Active:$securityForceActive}>>
- <<unset $SFMODToggle, $securityForceActive, $securityForceCreate, $securityForceEventSeen>>
- <<if ndef $securityForceName>><<set $securityForceName = "the special force">><</if>>
- <<if $SF.Active >= 1>>
- <<run Object.assign($SF, {
- Depravity:$securityForceDepravity,
- Units:$SFAO,
- MWU:$securityForceUpgradeTokenReset,
- U:$securityForceUpgradeToken,
- WG:$securityForceGiftToken,
- SpecOps:0,
- SpecOpsLock:0,
- ROE:$securityForceRulesOfEngagement,
- Target:$securityForceFocus,
- Regs:$securityForceAccountability,
- Caps:"The Special Force",
- Lower:$securityForceName,
- Subsidy:$SubsidyActive})>>
- <<unset $securityForceActive, $securityForceRecruit, $securityForceTrade, $securityForceBooty, $securityForceIncome, $securityForceMissionEfficiency, $securityForceProfitable, $TierTwoUnlock, $securityForceDepravity, $SFAO, $securityForceUpgradeTokenReset, $securityForceUpgradeToken, $securityForceGiftToken, $securityForceRulesOfEngagement, $securityForceFocus, $securityForceAccountability, $securityForceName, $SubsidyActive>>
- <<if $SF.Lower != "the special force">><<set $SF.Caps = $SF.Lower.replace("the ", "The ")>><</if>>
-
- <<if ndef $ColonelCore>><<set $ColonelCore = "">><</if>>
- <<if ndef $ColonelDiscussion>><<set $ColonelDiscussion = 0>><</if>>
- <<if ndef $ColonelSexed>><<set $ColonelSexed = 0>><</if>>
- <<set $SFColonel = {
- Core:$ColonelCore,
- Talk:$securityForceColonelToken,
- Fun:$securityForceColonelSexed,
- Status:$ColonelRelationship}>>
- <<unset $ColonelCore, $securityForceColonelToken, $securityForceColonelSexed, $ColonelRelationship>>
-
- <<if ndef $TradeShowIncome>><<set $TradeShowIncome = 0>><</if>>
- <<if ndef $TotalTradeShowIncome>><<set $TotalTradeShowIncome = 0>><</if>>
- <<if ndef $TradeShowHelots>><<set $TradeShowHelots = 0>><</if>>
- <<if ndef $TotalTradeShowHelots>><<set $TotalTradeShowHelots = 0>><</if>>
- <<set $SFTradeShow = {
- History:$OverallTradeShowAttendance,
- CanAttend:$CurrentTradeShowAttendance,
- Income:$TradeShowIncome,
- Revenue:$TotalTradeShowIncome,
- Helots:$TradeShowHelots,
- TotalHelots:$TotalTradeShowHelots,
- Mercs:0,
- TotalMercs:0}>>
- <<unset $OverallTradeShowAttendance, $CurrentTradeShowAttendance, $TradeShowIncome, $TotalTradeShowIncome, $TradeShowHelots, $TotalTradeShowHelots>>
- <<if $SFTradeShow.History > 0>> <<set $SFTradeShow.View = 1>> <</if>>
-
- <<if ndef $securityForceHeavyBattleTank>><<set $securityForceHeavyBattleTank = 0>><</if>>
- <<if ndef $securityForceSpacePlanePower>><<set $securityForceSpacePlanePower = 0>><</if>>
- <<if ndef $securityForceAC130>><<set $securityForceAC130 = 0>><</if>>
- <<if ndef $securityForceSatellitePower>><<set $securityForceSatellitePower = 0>><</if>>
- <<if ndef $securityForceGiantRobot>><<set $securityForceGiantRobot = 0>><</if>>
- <<if ndef $securityForceMissileSilo>><<set $securityForceMissileSilo = 0>><</if>>
- <<if ndef $securityForceAircraftCarrier>><<set $securityForceAircraftCarrier = 0>><</if>>
- <<if ndef $securityForceSubmarine>><<set $securityForceSubmarine = 0>><</if>>
- <<if ndef $securityForceHeavyAmphibiousTransport>><<set $securityForceHeavyAmphibiousTransport = 0>><</if>>
- <<set $SFUnit = {
- Troops:$securityForcePersonnel,
- Armoury:$securityForceInfantryPower,
- Firebase:$securityForceArcologyUpgrades,
- AV:$securityForceVehiclePower,
- TV:$securityForceVehiclePower,
- Drones:$securityForceDronePower,
- Drugs:$securityForceStimulantPower,
- PGT:$securityForceHeavyBattleTank,
- AA:$securityForceAircraftPower,
- TA:$securityForceAircraftPower,
- SpacePlane:$securityForceSpacePlanePower,
- GunS:$securityForceAC130,
- Satellite:$securityForceSatellitePower,
- GiantRobot:$securityForceGiantRobot,
- MissileSilo:$securityForceMissileSilo,
- AircraftCarrier:$securityForceAircraftCarrier,
- Sub:$securityForceSubmarine,
- HAT:$securityForceHeavyAmphibiousTransport}>>
- <<set $SatLaunched = 0>>
- <<unset $securityForcePersonnel, $securityForceInfantryPower, $securityForceArcologyUpgrades, $securityForceVehiclePower, $securityForceDronePower, $securityForceStimulantPower, $securityForceHeavyBattleTank, $securityForceAircraftPower, $securityForceSpacePlanePower,$securityForceAC130, $securityForceSatellitePower, $securityForceGiantRobot, $securityForceMissileSilo, $securityForceAircraftCarrier, $securityForceSubmarine, $securityForceHeavyAmphibiousTransport>>
- <<else>>
- <<run Object.assign($SF, {Depravity:0, Units:0, MWU:0, U:0, WG:0, SpecOps:0, SpecOpsLock:0, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1})>>
- <<set $SFUnit = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:0, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}>>
- <<set $SatLaunched = 0>>
- <<set $arcologies[0].SFRaid = 1,$arcologies[0].SFRaidTarget = -1>>
- <<set $SFColonel = {Core:"", Talk:0, Fun:0, Status:0}>>
- <<set $SFTradeShow = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}>>
- <</if>>
- <<set $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:[]}>>
-<</if>>
-<<if def $SF>>
- <<if def $SpecOpsLock>>
- <<set $SF.SpecOpsLock = $SpecOpsLock>>
- <<unset $SpecOpsLock>>
- <</if>>
- <<if $SF.Active >= 0 && passage() === "New Game Plus">>
- <<= SFInit()>>
- <<run Object.assign($SF, {Active:-1})>>
- <</if>>
- <<if ndef $SF.Facility>>
- <<set $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:[]}>>
- <</if>>
- <<if ndef $SF.Bonus>>
- <<set $SF.Bonus = 0>>
- <</if>>
- <<if $SF.Depravity < 0>>
- <<set $SF.Depravity = 0>>
- <</if>>
-<</if>>
-<<if def $SFUnit>>
- <<if def $SFUnit.AT>>
- <<run delete $SFUnit.AT>>
- <<set $SFUnit.TA = 0>>
- <</if>>
+<<= SFBC()>>
+<<if def $SF && $SF.Active >= 0 && passage() === "New Game Plus">>
+ <<= SFInit()>>
<</if>>
<<if ndef $useSlaveSummaryTabs>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 04468c4a27a6210eb20c3f77184520ab07b1d8e3..35197ee9cdb4d627ba1eb881bb8a5068a2e138cc 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -260,7 +260,7 @@ I try to be a good <<s>>lave girl for you, <<Master>>. Can I - can I be a good <
<<EventNameLink $activeSlave>> comes in for an inspection. You have a relaxed day scheduled, so you take the time to do an unusually thorough job. On a whim, you pull up $his complete file, flipping the virtual pages out across your desk. The induction pictures are particularly striking. $He doesn't look much like that, anymore, and that's a good thing. $He was not a pretty girl when you got here, though $he's pretty enough now. With a desk control gesture you flip a full frontal shot of $him on the day of $his enslavement up onto a wallscreen.
<br><br>
-$His $activeSlave.eyeColor eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few meters away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
+$His $activeSlave.eyeColor eyes track your sudden motion, of course, and $he follows it to the screen. Suddenly, the $desc is eye to eye with a life-size picture of who $he used to be, just a few <<if $showInches == 2>>feet<<else>>meters<</if>> away. $He gasps with recognition, and then $his face clouds inscrutably. $He takes a couple of hesitant steps forward, and then reaches out to touch the cheek of the $girl in the picture. As $his fingertips brush the smooth surface of the wallscreen, $his other hand ghosts along $his own face. $His expression is not sad, so it's surprising when a single tear rolls down $his cheek. You order $him to tell you how the picture makes $him feel.
<br><br>
$He looks pensive, and goes through two false starts before $he clears $his throat, wrenches $his gaze away from $his picture, and <<say>>s introspectively, "<<Master>>, it'<<s>> <<s>>trange. We - we don't have picture<<s>> of our<<s>>elve<<s>>, from before we were en<<s>>laved. I didn't really reali<<z>>e how much I'd changed. <<S>>ome day<<s>> being a <<s>>lave i<<s>> hard. But <<s>>eeing that picture, it make<<s>> me feel better about it. You - you're really <<if $PC.title == 1>>handsome<<else>>pretty<</if>>, <<Master>>. I bet you alway<<s>> were." $He inclines $his head towards the homely $girl on the screen. "It'<<s>> hard to be ugly, <<Master>>. Really hard. I feel <<s>>orry for that $girl, and I'm glad I don't look like $him anymore." $He laughs suddenly, a little self-consciously. "The cra<<z>>y thing i<<s>>, if you'd told that $girl that
<<if $activeSlave.assignment == "whore">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 5fe28fb781b75d3a32df43b92c21390dc753b61c..eb59e881211d023d25167b2c142e49e30873e422 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -3218,7 +3218,7 @@ As you watch $activeSlave.slaveName unpleasantly retch as $he<<if $cockFeeder ==
<<case "subjugation blues">>
-It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <<EventNameLink $activeSlave>> as your slave. Since then $he has been nothing but trouble. $He has been ungrateful, rebellious and particularly hateful toward you since you acquired $him. $He often needs to be confined or forced to perform $his assignments, and has little regard for your power or authority. You bring $him in for inspection and $he whines and squirms in resistance as you feel up $his $activeSlave.nipples nipples<<if $activeSlave.belly >= 5000>>, rub $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<elseif $activeSlave.bellyPreg >= 150>>, feel the curve of $his new pregnancy<</if>>, and grope $his <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising $his potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>$He is very young, only $activeSlave.actualAge years old, and is still very naive. $His smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of $him.<<else>>At $activeSlave.actualAge years old, $he should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>> Eventually, of course, even the most headstrong <<print $girl>>s will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut. $He is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
+It's been <<print $week-$activeSlave.weekAcquired>> week<<if $week-$activeSlave.weekAcquired > 1>>s<</if>> since you acquired <<EventNameLink $activeSlave>> as your slave. Since then $he has been nothing but trouble. $He has been ungrateful, rebellious and particularly hateful toward you since you acquired $him. $He often needs to be confined or forced to perform $his assignments, and has little regard for your power or authority. You bring $him in for inspection and $he whines and squirms in resistance as you feel up $his $activeSlave.nipples nipples<<if $activeSlave.belly >= 5000>>, rub $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<elseif $activeSlave.bellyPreg >= 150>>, feel the curve of $his new pregnancy<</if>>, and grope $his <<if $activeSlave.butt < 2>>narrow <<elseif $activeSlave.butt < 5>>average <<elseif $activeSlave.butt < 8>>plump <<else>>impressive <</if>>butt, coldly appraising $his potential worth as a sexual service provider. <<if $activeSlave.actualAge < 21>>$He is very young, only $activeSlave.actualAge years old, and is still very naïve. $His smooth, $activeSlave.skin skin has yet to experience the hard years of relentless sexual abuse that lie ahead of $him.<<else>>At $activeSlave.actualAge years old, $he should know by now how the world works, but some slaves are just too stubborn for their own good.<</if>> Eventually, of course, even the most headstrong <<print $girl>>s will bend to your will, but the unique social mores of your arcology and the wonders of modern surgical technology offer a prime opportunity to make a potent example of this <<if $activeSlave.actualAge < 21>>young <<else>>obstinate <</if>>slut. $He is $activeSlave.race, and therefore not considered racially inferior or subject to extreme inequities or neglect, but like most slave characteristics, that can change.
<<case "too thin for cum diet">>
@@ -3863,7 +3863,7 @@ $activeSlave.slaveName is doing $his job, standing in an area of the arcology th
$activeSlave.clothes
<</switch>>
<</if>>
-and flirting with passersby. Or $he would be, if $he weren't surrounded by a group of shame-faced college boys. They're very obviously rich, naive, and inexperienced with both sex and the Free Cities, and their complete lack of confidence in approaching $activeSlave.slaveName make that clear.
+and flirting with passersby. Or $he would be, if $he weren't surrounded by a group of shame-faced college boys. They're very obviously rich, naïve, and inexperienced with both sex and the Free Cities, and their complete lack of confidence in approaching $activeSlave.slaveName make that clear.
<br><br>
"Can we just walk up to $him and ask $him out?" says one.
<br><br>
@@ -7622,13 +7622,13 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<replace "#result">>
You tell $him that you understand, and that you will get her some new clothing. $He is thrilled, but her pleasure turns to horror when $he sees that the new clothes are a version of the same slave bondage gear, just with inward-facing dildos for her <<if $activeSlave.vagina > -1>>pussy and <</if>> asshole.
<<if $activeSlave.anus == 0 || $activeSlave.vagina == 0>>
- You pause before getting her dressed; there's little reason to waste virginities on plugs. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strapon<</if>> and bend her over, opting to start with her tight pussy.
+ You pause before getting her dressed; there's little reason to waste virginities on plugs. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend her over, opting to start with her tight pussy.
<<= BothVCheck()>>
<<elseif $activeSlave.anus == 0>>
- You pause before getting her dressed; there's little reason to waste her anal virginity on a plug. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strapon<</if>> and bend her over before working your way into her tight anus.
+ You pause before getting her dressed; there's little reason to waste her anal virginity on a plug. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend her over before working your way into her tight anus.
<<= AnalVCheck()>>
<<elseif $activeSlave.vagina == 0>>
- You pause before getting her dressed; there's little reason to waste her virginity on a plug. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strapon<</if>> and bend her over before working your way into her tight pussy.
+ You pause before getting her dressed; there's little reason to waste her virginity on a plug. You <<if $PC.dick == 1>>stroke yourself to erection<<else>>don a strap-on<</if>> and bend her over before working your way into her tight pussy.
<<= VaginalVCheck()>>
<</if>>
For the rest of the week, $he walks around awkwardly, unable to find a comfortable position <<if $activeSlave.belly >= 1500>>between<<else>>since<</if>> her <<if $seeRace == 1>>$activeSlave.race <</if>>body <<if $activeSlave.belly >= 1500>>is<</if>> being penetrated by her own clothing<<if $activeSlave.belly >= 1500>> and the straps digging into her _belly rounded belly<</if>>. @@.hotpink;$He has become more submissive.@@
@@ -8033,7 +8033,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<case "goddess" "hypergoddess">>
calming voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax and accept what you deserve, $girl."
<<case "loli">>
- young, naive voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, it'll get better."
+ young, naïve voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, it'll get better."
<<case "preggololi">>
young voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, you know it'll be fun!"
<<case "angel">>
@@ -8358,7 +8358,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<set $activeSlave.fetishKnown = 1>>
<</if>>
<<else>>
- $He does so diligently, making sure to not miss an inch while keeping your enjoyment above all else.
+ $He does so diligently, making sure to not miss <<if $showInches == 2>>an inch<<else>>a centimeter<</if>> while keeping your enjoyment above all else.
<</if>>
<<elseif $PC.dick == 1>>
your erect dick and commenting on how it could use a good cleaning. $He carefully takes your cock into $his mouth, doing her best to bring you to a quick orgasm so $he can escape your gaze. After downing your cum, $he attempts to pull back, but you hold her down, clearly $he has more work to do here.
@@ -8467,10 +8467,10 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<replace "#result">>
You scoop her up, eliciting whimpers of joy at the impending relief. $He moans with disappointment, however, to find $himself laid unceremoniously across your desk as you return to your work. You surreptitiously set your desk to monitor her vital signs and gauge her closeness to orgasm. Whenever you can do so without tipping her over, you gently run your fingers across a helpless nipple, across her <<if $activeSlave.vagina == -1>>groin<<else>>moist lips<</if>>,<<if $activeSlave.belly >= 10000>> around the edge of her <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly,<<elseif $activeSlave.belly >= 1500>> over the peak of her <<if $activeSlave.bellyPreg >= 1500>>pregnant <</if>>belly,<</if>> or along her surgical scars.
<<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
- After so much of this that $he's clearly ready to orgasm at the slightest further touch, you gently massage her nether lips with a single finger and $he comes spastically, abdominal muscles quivering. $His pussy relaxes and opens naturally; taking the cue, you pick her up and lower $him, inch by moaning inch, onto <<if $PC.dick == 0>>a strap-on you put on while playing with her<<else>>your cock<</if>>.
+ After so much of this that $he's clearly ready to orgasm at the slightest further touch, you gently massage her nether lips with a single finger and $he comes spastically, abdominal muscles quivering. $His pussy relaxes and opens naturally; taking the cue, you pick her up and lower $him, <<if $showInches == 2>>inch<<else>>centimeter<</if>> by moaning <<if $showInches == 2>>inch<<else>>centimeter<</if>>, onto <<if $PC.dick == 0>>a strap-on you put on while playing with her<<else>>your cock<</if>>.
<<= VaginalVCheck()>>
<<else>>
- After so much of this that $he's clearly ready to orgasm at the slightest further touch, you gently massage $his anus with a single finger and $he comes spastically, abdominal muscles quivering. $His sphincter relaxes and opens naturally; taking the cue, you pick her up and lower $his rectum, inch by sobbing inch, onto <<if $PC.dick == 0>>a strap-on you put on while playing with her<<else>>your cock<</if>>.
+ After so much of this that $he's clearly ready to orgasm at the slightest further touch, you gently massage $his anus with a single finger and $he comes spastically, abdominal muscles quivering. $His sphincter relaxes and opens naturally; taking the cue, you pick her up and lower $his rectum, <<if $showInches == 2>>inch<<else>>centimeter<</if>> by sobbing <<if $showInches == 2>>inch<<else>>centimeter<</if>>, onto <<if $PC.dick == 0>>a strap-on you put on while playing with her<<else>>your cock<</if>>.
<<= AnalVCheck()>>
<</if>>
After pumping her helpless torso up and down with your arms, a parody of masturbation with her helpless body, you carry your toy to the shower to wash $him. @@.mediumaquamarine;$He has become more trusting of you.@@
@@ -15951,7 +15951,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<case "goddess" "hypergoddess">>
"Oh, lovely," the goddess says beatifically,
<<case "loli">>
- "K-kay," the loli says naively,
+ "K-kay," the loli says naïvely,
<<case "preggololi">>
"Okay," the loli says excitedly,
<<case "angel">>
@@ -17054,7 +17054,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<else>>
soft body straining to twist
<</if>>
- on the sheet despite her limblessness. When the gleaming halves of the attachment are a few millimeters apart, the magnetic seals take over and pull them into perfect alignment. Acting out of pure habit, $he actuates all the muscle group equivalents on the arm, one by one, testing function.
+ on the sheet despite her limblessness. When the gleaming halves of the attachment are <<if $showInches == 2>>half an inch<<else>>a few millimeters<</if>> apart, the magnetic seals take over and pull them into perfect alignment. Acting out of pure habit, $he actuates all the muscle group equivalents on the arm, one by one, testing function.
<br><br>
With one arm and the remaining three limbs within reach, $he can take care of $himself, but $he reaches out to touch your leg lightly from her place on the ground. <<if ($activeSlave.amp == -3) || ($activeSlave.amp == -5)>>The hand is just as soft and warm as her original would have been.<<else>>$His hand is smooth and cool.<</if>>
<<if !canTalk($activeSlave)>>
@@ -20413,7 +20413,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
With a groan of effort, the broodmother manages to pull $his belly slightly further out through the doorway, but, in the effort, only really manages to wedge it more firmly. It bulges ominously from the added pressure.
<<else>>
- The massively pregnant slave's belly clutches in a false contraction and $he pulls several inches further out through the door frame before it expands again, leaving her even more hopelessly stuck
+ The massively pregnant slave's belly clutches in a false contraction and $he pulls several <<if $showInches == 2>>inches<<else>>centimeters<</if>> further out through the door frame before it expands again, leaving her even more hopelessly stuck
<</if>>
<br><br>
<<if !canTalk($activeSlave)>>
@@ -20550,7 +20550,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<</if>>
for the sake of "being thorough." You then move forward, covering the parts of $his belly you can reach from behind and taking special care to
<<if ($activeSlave.boobs >= 20000)>>
- massage the soft butter into every inch of $his colossal tits, noting with satisfaction $his distant nipples, stuck on the other side of the doorway with the bulk of $his room filling breasts, harden with arousal.
+ massage the soft butter into every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his colossal tits, noting with satisfaction $his distant nipples, stuck on the other side of the doorway with the bulk of $his room filling breasts, harden with arousal.
<<elseif ($activeSlave.boobs >= 12000)>>
massage the soft butter into $his massive tits as they push up between the arch of the doorway and $his bulging belly. You note with satisfaction $his nipples harden with arousal.
<<elseif ($activeSlave.boobs >= 7000)>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 65dd14ad803c9cd39076e88c737ac134abf5c547..fecc206070fdd9592e6c055454e58a9d4679c42e 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -314,7 +314,7 @@ asks if $he can beg a favor. Absurd though it sounds, $he does exactly that, say
<<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 meters 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.
+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:
<<if canPenetrate($activeSlave)>>
@@ -1861,7 +1861,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<if $activeSlave.trust > 20>>
$He runs $his <<if $activeSlave.tonguePiercing>>pierced<<else>>pink<</if>> tongue over $his lips hungrily, staring meaningfully at the cockhead <<if $showInches == 2>>inches<<else>>centimeters<</if>> in front of $his face. "I'm <<s>>o happy, <<Master>>," $he purrs. "You have the be<<s>>t cum.<<if $PC.balls > 1>> I'll never go hungry with you either.<</if>>" $He's still right up against $subSlave.slaveName, and $he reaches back to pat $subSlave.slaveName's butt reassuringly. "Your<<s>> is ni<<c>>e, but there'<<s>> only one <<Master>>." Then $he starts sucking your dick.
<<else>>
- "Thank you, <<Master>>," $he <<say>>s dutifully. "Your, um, your cum i<<s>> the be<<s>>t.<<if $PC.balls > 1>> I'll never go hungry with you either.<</if>>" Momentarily unsure of herself, $he blushes, and decides to take refuge in dicksucking.
+ "Thank you, <<Master>>," $he <<say>>s dutifully. "Your, um, your cum i<<s>> the be<<s>>t.<<if $PC.balls > 1>> I'll never go hungry with you either.<</if>>" Momentarily unsure of $himself, $he blushes, and decides to take refuge in dicksucking.
<</if>>
<<if $activeSlave.oralSkill > 60>>
$He's a well-trained cocksucker, and as the suction and $his active tongue go to work, $he reaches up and <<if $PC.vagina>>begins to lavish attention on your pussy with both hands. $He fingers your labia lovingly before starting to dip $his fingers inside you in time with $his oral strokes at your shaft.<<else>>cups your<<if $PC.ballsImplant > 3>>monstrous balls<<elseif $PC.ballsImplant == 3>>hand-filling <<elseif $PC.ballsImplant == 2>>huge <<elseif $PC.ballsImplant == 1>>big <</if>>balls lovingly. A testicular massage during a blowjob might not actually increase ejaculation volume, but the care $he shows suggests that the hungry slut might believe it does.<</if>>
@@ -2168,7 +2168,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<elseif $activeSlave.sexualQuirk == "perverted">>"I c-can't h-help it," $he gasps. "You're <<s>>o h-hot, <<s>>weetie. I d-dream about you."
<<else>>"W-we're f-fuck<<s>>slaves, <<s>>weetie," $he gasps. "I h-have to."
<</if>>
- $He pulls herself together and continues. "And I think we're going t-to be b-both. Both _mother and daughter, and lover<<s>>." $He pulls $subSlave.slaveName up into an embrace and kisses _him2 hungrily. "My pretty little _mother lover." $subSlave.slaveName @@.hotpink;giggles and kisses@@ $activeSlave.slaveName back. The older slave is suffused with lust, any lingering shriek of revulsion inside $his head @@.hotpink;drowned out@@ by <<if $activeSlave.sexualQuirk == "perverted">>sexual perversion<<else>>the urge to satisfy $his needs<</if>>. "Come here," $he moans,
+ $He pulls $himself together and continues. "And I think we're going t-to be b-both. Both _mother and daughter, and lover<<s>>." $He pulls $subSlave.slaveName up into an embrace and kisses _him2 hungrily. "My pretty little _mother lover." $subSlave.slaveName @@.hotpink;giggles and kisses@@ $activeSlave.slaveName back. The older slave is suffused with lust, any lingering shriek of revulsion inside $his head @@.hotpink;drowned out@@ by <<if $activeSlave.sexualQuirk == "perverted">>sexual perversion<<else>>the urge to satisfy $his needs<</if>>. "Come here," $he moans,
<<if $activeSlave.fetishKnown>>
<<switch _Slave.fetish>>
<<case "submissive">>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index fbb0e73ece8dbce882d136ab1cd0b7d317807dd9..eb67268338ab27f0477eae851b6a592130ddd19c 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -5,7 +5,7 @@ __'' $arcologies[0].name''__, your arcology, is located in a Free City in <<if $
<<if $weatherCladding == 1>>
Much of its beautiful exterior is now hidden behind dull panels of weather cladding<<if $arcologyUpgrade.spire == 1>>, though its highest point is capped by tall, elegant spire<</if>>.
<<elseif $weatherCladding == 2>>
- The entirety of its once dull exterior has been retrofitted with breathtaking golden sheets in eye catching designs<<if $arcologyUpgrade.spire == 1>>; its highest point capped by a tall, magnificent spire<</if>>.
+ The entirety of its once dull exterior has been retrofitted with breathtaking golden sheets in eye catching designs<<if $arcologyUpgrade.spire == 1>>, its highest point capped by a tall, magnificent spire<</if>>.
<</if>>
Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<elseif $arcologyUpgrade.apron == 1>> shining<</if>> bulk
<<if $terrain == "urban">>
diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw
index 7495c6dba98ab06ad88a28dff399919491477abd..010b2780402d22934d07dd212e15204e619d5f5c 100644
--- a/src/uncategorized/arcologyOpinion.tw
+++ b/src/uncategorized/arcologyOpinion.tw
@@ -182,57 +182,57 @@
<<set $opinion -= $targetArcology.FSNull>>
<</if>>
<<elseif $activeArcology.FSNull != "unset">>
- <<if $targetArcology.FSNull != "unset">>
- <<set $opinion += $activeArcology.FSNull>>
- <<set $opinion += $targetArcology.FSNull>>
- <<elseif $targetArcology.FSChattelReligionist != "unset">>
- <<set $opinion -= $activeArcology.FSNull>>
- <<set $opinion -= $targetArcology.FSChattelReligionist>>
- <<else>>
- <<set $opinion += $activeArcology.FSNull>>
- <</if>>
+ <<if $targetArcology.FSNull != "unset">>
+ <<set $opinion += $activeArcology.FSNull>>
+ <<set $opinion += $targetArcology.FSNull>>
+ <<elseif $targetArcology.FSChattelReligionist != "unset">>
+ <<set $opinion -= $activeArcology.FSNull>>
+ <<set $opinion -= $targetArcology.FSChattelReligionist>>
+ <<else>>
+ <<set $opinion += $activeArcology.FSNull>>
+ <</if>>
<<elseif $targetArcology.FSNull != "unset">>
- <<set $opinion += $targetArcology.FSNull>>
+ <<set $opinion += $targetArcology.FSNull>>
<</if>>
<<if $activeArcology.FSRomanRevivalist != "unset">>
<<if $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSRomanRevivalist>>
- <<set $opinion += $targetArcology.FSRomanRevivalist>>
+ <<set $opinion += $activeArcology.FSRomanRevivalist>>
+ <<set $opinion += $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSAztecRevivalist != "unset">>
<<if $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSAztecRevivalist>>
- <<set $opinion += $targetArcology.FSAztecRevivalist>>
+ <<set $opinion += $activeArcology.FSAztecRevivalist>>
+ <<set $opinion += $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSEgyptianRevivalist != "unset">>
<<if $targetArcology.FSEgyptianRevivalist != "unset">>
@@ -260,63 +260,63 @@
<</if>>
<<elseif $activeArcology.FSEdoRevivalist != "unset">>
<<if $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSEdoRevivalist>>
- <<set $opinion += $targetArcology.FSEdoRevivalist>>
+ <<set $opinion += $activeArcology.FSEdoRevivalist>>
+ <<set $opinion += $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSArabianRevivalist != "unset">>
<<if $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSArabianRevivalist>>
- <<set $opinion += $targetArcology.FSArabianRevivalist>>
+ <<set $opinion += $activeArcology.FSArabianRevivalist>>
+ <<set $opinion += $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSChineseRevivalist != "unset">>
<<if $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSChineseRevivalist>>
- <<set $opinion += $targetArcology.FSChineseRevivalist>>
+ <<set $opinion += $activeArcology.FSChineseRevivalist>>
+ <<set $opinion += $targetArcology.FSChineseRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<</if>>
<</if>>
<<if $activeArcology.FSIncestFetishist != "unset">>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index fafe1d9f27edf42affc29b61cf8aa75379a2c8cf..08b8c40dcbf1e886d378111dda795d00dadceaa4 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1537,9 +1537,9 @@ __Personal Assistant and Market Assistant relationship styles:__
<<case "imp">>
an mischievous friend. $assistantName grabs her hands and shakes them excitedly. "You got to see this girl I found! Her ass is huuuuuuuuge! I need an extra set of hands to spank that booty, you in?" The market assistant smirks, "Hell yes!"
<<case "witch">>
- a model student and dear friend. "Hey, wanna learn some magic?" $assistantName asks. "'Course! I know you'll be an amazing teacher, I can't wait to work with you!" The market assistant cheerfully replies, perfectly naive of what awaits her.
+ a model student and dear friend. "Hey, wanna learn some magic?" $assistantName asks. "'Course! I know you'll be an amazing teacher, I can't wait to work with you!" The market assistant cheerfully replies, perfectly naïve of what awaits her.
<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
- a girl insistent on befriending a monster. $assistantName promptly twists and bears down upon the new girl, but she stands firm. "You're so cool! What else can you do?" $assistantName reforms into its human figure, an attempt at a questioning expression on its face. "That's neat too! You don't mind me being around, right? I'll bring you food! You'd like that, wouldn't you?" The market assistant blushes sharply, "I'll, make you feel good, in ways only someone you trust can!" $assistantName's chest splits open and its inner tendrils begin to grope at the naive girl, probing her. Accepting her offer, $assistantName pulls her close and heads back to its lair.
+ a girl insistent on befriending a monster. $assistantName promptly twists and bears down upon the new girl, but she stands firm. "You're so cool! What else can you do?" $assistantName reforms into its human figure, an attempt at a questioning expression on its face. "That's neat too! You don't mind me being around, right? I'll bring you food! You'd like that, wouldn't you?" The market assistant blushes sharply, "I'll, make you feel good, in ways only someone you trust can!" $assistantName's chest splits open and its inner tendrils begin to grope at the naïve girl, probing her. Accepting her offer, $assistantName pulls her close and heads back to its lair.
<</switch>>
<<set $marketAssistantRelationship = "cute">>
<</replace>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index ce117df8876392b3a1b58ef7ff2d8b19ebff88be..fae31a4943710a121a668a73e84effbc6f98db6d 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -53,7 +53,7 @@
<<set $madamCashBonus += 0.25>>
<</if>>
<<if (_FLsFetish == 1)>>
- $He isn't above sampling the merchandise herself; before long it's obvious to $his girls that $he @@.lightcoral;really likes fucking them.@@
+ $He isn't above sampling the merchandise $himself; before long it's obvious to $his girls that $he @@.lightcoral;really likes fucking them.@@
<<elseif (_FLsFetish == 2)>>
$He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he @@.lightsalmon;becomes more dominant.@@
<</if>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 2c0fca1a9a0358cc7045715fdd7fcf397e2c5ce0..64133a24acacddee0a04199802782977fa3b8ed3 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -264,7 +264,7 @@
<<set $slaves[$i].chem = Math.max($slaves[$i].chem, 0)>>
<</if>>
<<if $slaves[$i].lactation == 1>>
- <<set $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
+ <<set $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
<</if>>
<</if>>
<<if ($slaves[$i].health <= 40)>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 522e0a6a79e485747c9efb6d16f72da38e9575b9..24b3a01ee5e0092606e8d4e537dc1564ca0abbba 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -131,7 +131,8 @@ $clubNameCaps
<<elseif $clubSlaves > 0>>
There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
<<elseif $DJ != 0>>
- $clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. $DJ.slaveName is alone in $clubName, and can accomplish little by herself.
+ <<setLocalPronouns $DJ>>
+ $clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. $DJ.slaveName is alone in $clubName, and can accomplish little by $himself.
<<else>>
$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
<<link "Decommission the club" "Main">>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 46bcab1e9afb5aec573e12e98c685665537e451e..ef840b07efbfe3db5cdce9195485ef6dfe5ea1c4 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -21,19 +21,19 @@
<<set $corpCash = Math.trunc($corpCash + $corpProfit)>>
Your corporation was valued at @@.yellowgreen;<<print cashFormat($corpValue)>>@@ and made a profit of @@.yellowgreen;<<print cashFormat($corpProfit)>>@@ last week.
<<set _addedSlaves = Math.ceil(Math.log($captureAssets+$entrapmentAssets))>>
-<<if $mercenariesHelpCorp > 0 || ($SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4)>>
+<<if $mercenariesHelpCorp > 0 || ($SF.Toggle && $SF.Active >= 1 && $SF.Size >= 10 && $SFSupportLevel >= 4)>>
<<if $mercenariesHelpCorp > 0>>
The $mercenariesTitle
<<set _addedSlaves += Math.ceil(_addedSlaves * (1.04*$mercenaries))>> /* increase by 12-20% ($mercenaries == 3 - 5) */
<</if>>
- <<if $mercenariesHelpCorp > 0 && $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>>
+ <<if $mercenariesHelpCorp > 0 && $SF.Toggle && $SF.Active >= 1 && $SF.Size >= 10 && $SFSupportLevel >= 4>>
and a
- <<elseif $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>>
+ <<elseif $SF.Toggle && $SF.Active >= 1 && $SF.Size >= 10 && $SFSupportLevel >= 4>>
A
<</if>>
- <<if $SF.Toggle && $SF.Active >= 1 && $SF.Units >= 10 && $SFSupportLevel >= 4>>
+ <<if $SF.Toggle && $SF.Active >= 1 && $SF.Size >= 10 && $SFSupportLevel >= 4>>
small portion of $SF.Lower
- <<set _addedSlaves += Math.ceil(_addedSlaves * (1.04*($SF.Units/10)))>>
+ <<set _addedSlaves += Math.ceil(_addedSlaves * (1.04*($SF.Size/10)))>>
<</if>>
assist it with difficult enslavement targets. Otherwise, it
<<else>>
@@ -166,13 +166,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/_totalShares)*100)>>
<<set _PublicOwnershipPercentage = Math.trunc(($publicShares/_totalShares)*100)>>
-<<if $personalShares-20000 > $publicShares || $personalShares-20000 > $publicShares || $cash > $sharePrice*20000 || ($publicShares > 20000 && $cash >= $sharePrice*20000)>>
- <<if ndef $customValue>>
- <<set $customValue = 21000>>
- <</if>>
- <br><br>Custom amount:<<textbox "$customValue" $customValue "Corporation Developments">> <<print commaNum($customValue)>>
-<</if>>
-
<span id="CorpAction"> <br><br>
<<if _PrivateOwnershipPercentage < 51>>//You cannot give up majority control.//
@@ -233,17 +226,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $personalShares-$customValue > $publicShares>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $personalShares -= $customValue>>
- <<set $publicShares += $customValue>>
- <<set $cash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>>
- <<replace "#CorpAction">>
- <br>You sold <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You cannot give up majority control.//
<</if>>
@@ -298,16 +280,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $personalShares-$customValue > $publicShares>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $publicShares += $customValue>>
- <<set $corpCash += Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
- <<replace "#CorpAction">>
- <br>The corporation issued <<print commaNum($customValue)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@ driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You cannot give up majority control.//
<</if>>
@@ -371,17 +343,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $cash > $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $personalShares += $customValue>>
- <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $corpCash += Math.ceil(($sharePrice*20000)*$customValue/10)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>>
- <<replace "#CorpAction">>
- <br>You purchased <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ from the corporation driving the share price down significantly.
- <</replace>>
- <</link>>
- <</if>>
<<else>>
//You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<</if>>
@@ -437,16 +398,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $publicShares > $customValue && $cash >= $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">> <<set $personalShares += $customValue>>
- <<set $publicShares -= $customValue>>
- <<set $cash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>>
- <<replace "#CorpAction">>
- <br>You bought <<print commaNum($customValue)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price up significantly.
- <</replace>>
- <</link>>
- <</if>>
<<elseif $publicShares > 1000>>
//You are unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<<else>>
@@ -503,16 +454,6 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p
<</replace>>
<</link>>
<</if>>
- <<if $publicShares > $customValue && $corpCash >= $sharePrice*$customValue>>
- | <<link "<<print commaNum($customValue)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>@@">>
- <<set $publicShares -= $customValue>>
- <<set $corpCash -= Math.ceil(($sharePrice*$customValue)*$customValue/100)>>
- <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>>
- <<replace "#CorpAction">>
- <br>The corporation bought back <<print commaNum($customValue)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*$customValue)*$customValue/100))>>,@@ driving the share price up significantly.
- <</replace>>
- <</link>>
- <</if>>
<<elseif $publicShares > 1000>>
//The corporation is unable to purchase <<print commaNum(1000)>> shares at the current share price, valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@.//
<<else>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d8423cf34f7a9770182e52acdaf2743f0e1ac276..db8b8fe239992d28a6cfd833af8b5f677b4c828e 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -80,14 +80,14 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<<if $SF.Toggle && $SF.Active >= 1>>
<<if $SF.Subsidy>>
- <br>__Finacinally supporting $SF.Lower unitll self sufficiency:__ <<print cashFormat(Math.ceil( (10000*($SFUnit.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Units/100)) ))>>
- <<set _archologyCosts += Math.ceil( (10000*($SFUnit.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Units/100)) )>>
+ <br>__Finacinally supporting $SF.Lower unitll self sufficiency:__ <<print cashFormat(Math.ceil( (10000*($SF.Squad.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Size/100)) ))>>
+ <<set _archologyCosts += Math.ceil( (10000*($SF.Squad.Troops/10))+(1+($arcologies[0].prosperity/100))+(1+($SF.Size/100)) )>>
<</if>>
<<if $SF.Bonus>>
<<= Count()>>
<br>__Bonuses for basic FS acceptance amongst $SF.Lower:__ <<print cashFormat(Math.ceil(_SFCashBonus))>>
<br> Colonel <<print cashFormat(_ColonelCashBonus*_Env)>>.
- Troop size: <<print commaNum($SFUnit.Troops)>> and each solider recives <<print cashFormat(_inviTroop*_Env)>>, totalling <<print cashFormat(Math.ceil(_TroopCashBonus*_Env))>>.
+ Troop size: <<print commaNum($SF.Squad.Troops)>> and each solider recives <<print cashFormat(_inviTroop*_Env)>>, totalling <<print cashFormat(Math.ceil(_TroopCashBonus*_Env))>>.
<<set _archologyCosts += _SFCashBonus>>
<</if>>
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index d247951cfe9a28a8d332b0939cb4d65cd9f9c734..706c14cef6d17023f3de8c3ac251318eba317f7a 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1067,7 +1067,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<<if ($dairySlimMaintainUpgrade == 1 && $dairySlimMaintain == 1)>>
<br>
<<if $arcologies[0].FSSlimnessEnthusiast > 80>>
- Because of your arcology's great enthusiasm for small breasted slaves, the dairy's milking systems have been carefully overhauled and optimized for maximum milk extraction from slaves with smaller endowments--providing a significant boost to their otherwise modest output. This also prevents unfashionable breast expansion of already slim slaves through the milking process.
+ Because of your arcology's great enthusiasm for small breasted slaves, the dairy's milking systems have been carefully overhauled and optimized for maximum milk extraction from slaves with smaller endowments — providing a significant boost to their otherwise modest output. This also prevents unfashionable breast expansion of already slim slaves through the milking process.
<<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
In keeping with your arcology's ideals, $dairyName has been modified to handle slim slaves with minimal impact to their body shapes. This limits potential profitability, but prevents unfashionable breast expansion of already slim slaves through the milking process.
<<else>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 2b889aebe3702d272550b31c413418bf2067d887..e1261d48b8b7463887a2577f340503bbbbb0489e 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -83,8 +83,8 @@
</div>
<div id="Arcologies" class="tabcontent">
- <div class="content">
- <<include "Neighbors Development">>
+ <div class="content">
+ <<include "Neighbors Development">>
</div>
</div>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 5e7069f9bfa6b1c4558141ca82b03fce272490f3..3f93ad7a7fcead1557993f96f3ab4caaa1fb33d9 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -94,8 +94,8 @@
/* Spending, terrain, rep effects */
<<set _broadProgress = 0>>
-<<if $SF.Toggle && $SF.Active >= 1 && $SF.SpecOps > 0>>
- Assigning a <<if $SF.SpecOps === 1>>small<<else>>large<</if>> portion of $SF.Lower to under cover work helps forward your goals for the arcology's future.
+<<if $SF.Toggle && $SF.Active >= 1 && $SF.UC.Assign > 0>>
+ Assigning a <<if $SF.UC.Assign === 1>>small<<else>>large<</if>> portion of $SF.Lower to undercover work helps forward your goals for your arcology's future.
<<set _broadProgress += $SFUC/10>> <br>
<</if>>
<<if $FSSpending > 1>>
@@ -310,16 +310,16 @@
/* Promenade effects */
<<for _i = 5; _i <= 7; _i++>>
-<<if $sectors[_i].type != "Shops">>
-<<if $sectors[_i].type != "Brothel">>
-<<if $sectors[_i].type != "Club">>
- The $sectors[_i].type establishments on the Promenade help develop society.
- <<set _changed_fs = $sectors[_i].type.replace(" ","")>>
- <<= FSChange(_changed_fs, 4)>>
- <<continue>>
-<</if>>
-<</if>>
-<</if>>
+ <<if $sectors[_i].type != "Shops">>
+ <<if $sectors[_i].type != "Brothel">>
+ <<if $sectors[_i].type != "Club">>
+ The $sectors[_i].type establishments on the Promenade help develop society.
+ <<set _changed_fs = $sectors[_i].type.replace(" ","")>>
+ <<= FSChange(_changed_fs, 4)>>
+ <<continue>>
+ <</if>>
+ <</if>>
+ <</if>>
<</for>>
/* PA FS bonuses */
@@ -328,192 +328,192 @@
<<set _seed1 = 0, _seed2 = 0>>
<<if $arcologies[0].FSSupremacist != "unset">>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>>
- <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "supremacist")>>
- <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
- <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "subjugationist")>>
- <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist != "unset">>
<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "gender radicalist")>>
- <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "repopulation focus")>>
- <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
- <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "eugenics")>>
- <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSGenderFundamentalist != "unset">>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "gender fundamentalist")>>
- <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist != "unset">>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>>
- <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "paternalist")>>
- <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>>
- <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "degradationist")>>
- <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "body purist")>>
- <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSTransformationFetishist != "unset">>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
- <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "transformation fetishist")>>
- <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>>
- <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "maturity preferentialist")>>
- <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist != "unset">>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "youth preferentialist")>>
- <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "slimness enthusiast")>>
- <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist != "unset">>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "asset expansionist")>>
- <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
<<if ($assistantAppearance == "shemale") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "pastoralist")>>
- <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "physical idealist")>>
- <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "hedonistic decadence")>>
- <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>>
- <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "chattel religionist")>>
- <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed1 = 1>>
+ <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed1 = 1>>
<</if>>
<<if ($assistantFSAppearance == "roman revivalist")>>
- <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
- <<set _seed2 = 2>>
+ <<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
+ <<set _seed2 = 2>>
<</if>>
<</if>>
<<if $arcologies[0].FSAztecRevivalist != "unset">>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 89c8558be004f033631d17e510979bd4027efc1b..dce68deebd60a1795f78c21e17b61f78f3674453 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1204,7 +1204,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlave.fetishStrength = 60>>
<<set $activeSlave.behavioralFlaw = "anorexic">>
<<set $activeSlave.sexualFlaw = "idealistic">>
- You decide to stop the wide-hipped $loli struggling to run, and easily place your taser slug in $his broad rear. $He goes stiff and falls flat on $his face. Your taser slug is linked to $assistantName, but since the $girl can't manage to flip over, let alone stand, shocking $him more is unneeded. Fury glints from $his eyes, but $he fully realizes it's over for $him. By the time you approach $him, $he's hoisted $his overly wide rear upwards, presenting herself, moisture beginning to ooze from $his virgin cunt. It looks like $he was being groomed to be a breeding slave, and $he seems to understand $his role quite well, judging by the way $he rocks $his hips back and forth for you. You thoroughly enjoy $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of $his virgin butthole.
+ You decide to stop the wide-hipped $loli struggling to run, and easily place your taser slug in $his broad rear. $He goes stiff and falls flat on $his face. Your taser slug is linked to $assistantName, but since the $girl can't manage to flip over, let alone stand, shocking $him more is unneeded. Fury glints from $his eyes, but $he fully realizes it's over for $him. By the time you approach $him, $he's hoisted $his overly wide rear upwards, presenting $himself, moisture beginning to ooze from $his virgin cunt. It looks like $he was being groomed to be a breeding slave, and $he seems to understand $his role quite well, judging by the way $he rocks $his hips back and forth for you. You thoroughly enjoy $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of $his virgin butthole.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index fdc7ba1c57ce84483f252ff7871c9a2244c987e3..343ad860003a66ae60d4349179ee4c47cc05f23e 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -70,7 +70,7 @@ _HGName
<<set $HGCum = 2+Math.trunc(($HeadGirl.balls/5)+($HeadGirl.energy/95)+($HeadGirl.health/95)+($HeadGirl.devotion/95)+($reproductionFormula*5))>>
<<if canPenetrate($HeadGirl) && $HeadGirl.pubertyXY == 1>>
To maximize the chances of impregnation, $he will fuck fertile pussies frequently during the week. $HeadGirl.slaveName can service $HGCum slaves this way.
- <<if $HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive herself to get hard and service one more.<</if>>
+ <<if $HeadGirl.devotion > 95>>$He loves you so much $he'll fuck them until $he's sore.<<else>>If $he were more devoted to you, $he might be able to drive $himself to get hard and service one more.<</if>>
<<if $HeadGirl.balls >= 120>>$His unreal balls produce nearly an endless supply of semen; $his ability to impregnate is almost limitless.<<elseif $HeadGirl.balls >= 80>>$His inhuman balls produce so much semen $he can easily impregnate twenty girls in one sitting.<<elseif $HeadGirl.balls >= 50>>$His giant balls produce so much semen $he can easily impregnate twelve girls in one sitting.<<elseif $HeadGirl.balls >= 25>>$His oversized balls produce so much semen $he can cum repeatedly in a single session.<<elseif $HeadGirl.balls >= 5>>$His big balls produce so much semen $he can cum more before $he's drained.<<else>>Bigger balls would let $him cum more before $he's drained.<</if>>
<<if $HeadGirl.health > 95>>$His wonderful health lets $him get hard and stay hard all the time.<<else>>If $his health were perfect, $he might be able to get hard more often.<</if>>
<<if $HeadGirl.energy > 95>>$His nymphomania drives $him to go above and beyond in this.<<else>>A more powerful sex drive could reduce $his refractory period.<</if>>
diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw
index 07e4898fd099c5b4d069b9478a12bf94e8409469..c5c1f6b5ce2daeb767c012c8bfc12964a667d613 100644
--- a/src/uncategorized/labReport.tw
+++ b/src/uncategorized/labReport.tw
@@ -9,7 +9,7 @@
<<elseif $researchLab.research != "none">>
<<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>>
<<if $researchLab.productionTime <= 0>>
- Your lab staff have @@.green;completed@@ their research project, and
+ Your lab staff have @@.green;completed@@ their $researchLab.research research project, and
<<switch $researchLab.research>>
<<case "Basic prosthetics interface">>
<<set $researchLab.basicPLimbInterface = 1>>
@@ -31,18 +31,19 @@
<<set $researchLab.cochlearImplant = 1>>
<<case "Electrolarynx">>
<<set $researchLab.electrolarynx = 1>>
- <<case "Erectile implant">>
- <<set $researchLab.erectileImplant = 1>>
+ /*<<case "Erectile implant">>
+ <<set $researchLab.erectileImplant = 1>>*/
<</switch>>
they are awaiting your next instruction.
<<set $researchLab.productionTime = 0, $researchLab.research = "none">>
<<else>>
Your lab staff are currently researching @@.yellow;$researchLab.research@@.
<</if>>
+ <br><br> <<= ResearchLabStockPile()>>
<<elseif $researchLab.manufacture != "none">>
<<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>>
<<if $researchLab.productionTime <= 0>>
- Your lab staff have @@.green;completed@@ their project, and
+ Your lab staff have @@.green;completed@@ their $researchLab.manufacture project, and
<<switch $researchLab.manufacture>>
<<case "Basic prosthetics interface">>
<<set $stockpile.basicPLimbInterface += 1, $researchLab.productionTime = 50>>
@@ -64,8 +65,8 @@
<<set $stockpile.cochlearImplant += 1, $researchLab.productionTime = 60>>
<<case "Electrolarynx">>
<<set $stockpile.electrolarynx += 1, $researchLab.productionTime = 100>>
- <<case "Erectile implant">>
- <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>>
+ /*<<case "Erectile implant">>
+ <<set $stockpile.erectileImplant += 1, $researchLab.productionTime = 50>>*/
<</switch>>
<span id="haltproduction">
they are starting work on another unit.
@@ -79,5 +80,6 @@
<<else>>
Your lab staff are currently working on @@.yellow;$researchLab.manufacture@@.
<</if>>
+ <br><br> <<= ResearchLabStockPile()>>
<</if>>
<</if>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index 98b05a47dd1379ca381bed2d0ec0666afc6e4cc6..5f9d806230d5f7881ca5714bbbaf06da73cdc060 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -452,7 +452,7 @@ As soon as $he arrived in the slave market, $he was subjected to a battery of te
<</if>>
a physical exam, and more.
<<if _eugenicsMarketTest == 0>>
- $He failed, and only then learned that by failing $he placed herself under the merciless dictates of eugenic theory.
+ $He failed, and only then learned that by failing $he placed $himself under the merciless dictates of eugenic theory.
<<if $activeSlave.balls > 0 && (isFertile($activeSlave) || $activeSlave.preg > 0)>>
$His balls were promptly
<<if $seeExtreme == 1>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index c55eb2c2d72610f3c2bbca67b148083d25089836..e49cd5814818c44825280ff8a01edd7ff726860d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -108,7 +108,7 @@ is
<<case "whore">>
between customers.
<<case "serve the public">>
- from where $he was offering herself publicly.
+ from where $he was offering $himself publicly.
<<case "work a glory hole">>
straight from confinement in a glory hole.
<<case "get milked">>
@@ -120,7 +120,7 @@ is
<<case "work as a nanny">>
from where $he was <<if $nurseryBabies > 0>>taking care of children<<else>>keeping $nurseryName clean<</if>>.
<<case "please you">>
- from where $he was offering herself to you.
+ from where $he was offering $himself to you.
<<case "be a subordinate slave">>
straight from orally servicing another slave.
<<case "be a servant">>
@@ -366,7 +366,7 @@ is
<</if>>
<</if>>
<<else>>
- $activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not its original name: it was once called
+ $activeSlave.slaveName<<if $activeSlave.slaveSurname>> $activeSlave.slaveSurname<</if>> is not $his original name: $he was once called
<<if $surnameOrder != 1>>
<<switch $activeSlave.nationality>>
<<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
@@ -590,7 +590,7 @@ is
<<elseif ($activeSlave.devotion <= 20)>>
$He strongly believes that @@.red;slavery is wrong,@@ and rarely misses a chance to complain about it.
<<else>>
- $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to herself.
+ $He strongly believes that @@.red;slavery is wrong,@@ but has learned to keep it to $himself.
<</if>>
<<elseif ($activeSlave.behavioralFlaw == "devout")>>
$He is @@.red;devoutly religious,@@
@@ -599,7 +599,7 @@ is
<<elseif ($activeSlave.devotion < -20)>>
and uses $his faith as a place of refuge.
<<elseif ($activeSlave.devotion <= 20)>>
- and uses $his faith as a private place within herself.
+ and uses $his faith as a private place within $himself.
<<else>>
but has learned to keep $his faith private.
<</if>>
@@ -633,7 +633,7 @@ is
<<case "confident">>
$He's @@.green;confident,@@ and believes that $he has something of value to offer, even as a slave.
<<case "cutting">>
- $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to herself.
+ $He often has a witty or @@.green;cutting@@ remark ready, but knows when to keep them to $himself.
<<case "funny">>
$He's @@.green;funny,@@ often providing a little comic relief.
<<case "adores women">>
@@ -688,7 +688,7 @@ is
<<case "self hating">>
$He's filled with @@.yellow;self hatred,@@ and is disturbingly willing to comply with things that might hurt $him.
<<case "neglectful">>
- $He's sexually @@.yellow;self neglectful,@@ and often shows no interest in getting off herself.
+ $He's sexually @@.yellow;self neglectful,@@ and often shows no interest in getting off $himself.
<<case "breeder">>
$He's @@.yellow;obsessed with being bred@@ to the point of fetishizing pregnancy itself as much as any act that leads to it.
<</switch>>
@@ -701,13 +701,13 @@ is
<<case "strugglefuck queen">>
$He's a @@.green;strugglefuck queen:@@ $he can gauge exactly how much resistance $his partners want.
<<case "tease">>
- $He's a @@.green;tease,@@ and often displays a little flash of herself followed by a blush.
+ $He's a @@.green;tease,@@ and often displays a little flash of $himself followed by a blush.
<<case "romantic">>
$He's a @@.green;romantic,@@ and persists in innocent pleasure in the closeness of sex.
<<case "perverted">>
$He's @@.green;perverted,@@ and enjoys breaking sexual boundaries.
<<case "caring">>
- $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off herself.
+ $He's @@.green;caring,@@ and enjoys bringing partners pleasure more than getting off $himself.
<<case "unflinching">>
$He's @@.green;unflinching,@@ willing to do anything, even by the standards of sex slaves.
<<case "size queen">>
@@ -740,7 +740,7 @@ is
<</if>>
<<case "humiliation">>
<<if ($activeSlave.behavioralFlaw == "bitchy")>>
- $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ herself.
+ $His bitchiness is really just an expression of $his deep need to be @@.lightcoral;humiliated@@ $himself.
<<elseif ($activeSlave.sexualFlaw == "shamefast")>>
$His shame is genuine, and it is with real self-loathing that $he @@.lightcoral;gets off on humiliation.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
@@ -778,7 +778,7 @@ is
<</if>>
<<case "dom">>
<<if ($activeSlave.sexualFlaw == "apathetic")>>
- $He is at war with herself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
+ $He is at war with $himself, since $his habitual apathy during sex barely masks a desire to @@.lightcoral;dominate.@@
<<elseif ($activeSlave.fetishStrength > 95)>>
$He is a @@.lightcoral;complete dom;@@ with other slaves this is expressed as a strong preference to top, and with $his betters $he's an almost competitive lover.
<<elseif ($activeSlave.fetishStrength > 60)>>
@@ -790,7 +790,7 @@ is
<<if ($activeSlave.fetishStrength > 95)>>
$He is an @@.lightcoral;aggressive sadist@@; $he's constantly plotting to control, abuse, and hurt other slaves.
<<elseif ($activeSlave.fetishStrength > 60)>>
- $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain herself.
+ $He has @@.lightcoral;sadistic tendencies@@; $he enjoys watching other slaves in pain, but truly loves causing pain $himself.
<<else>>
$He gets off on @@.lightcoral;the suffering of others@@; $he enjoys watching other slaves in pain.
<</if>>
@@ -1270,7 +1270,7 @@ is
<<elseif $activeSlave.career == "a slave since birth">>
$He's been your slave $his entire life.
<<elseif $activeSlave.career == "a meat toilet" || $activeSlave.career == "a cum dump">>
- $He sees herself as a cum receptacle.
+ $He sees $himself as a cum receptacle.
<<elseif $activeSlave.career == "a dairy cow">>
$He's been broken into the belief that $he is nothing more than a cow to be milked and bred.
<<elseif $activeSlave.career == "a breeding bull">>
@@ -1859,7 +1859,7 @@ $He is
<<elseif $activeSlave.muscles > -96>>
@@.pink;very weak;@@ $he struggles with day-to-day tasks.
<<else>>
- @@.red;frail;@@ $he can barely hold herself up.
+ @@.red;frail;@@ $he can barely hold $himself up.
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0 && $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadenceStrongFat == 0>>
@@ -2071,8 +2071,9 @@ $He is
<</if>>
<</if>>
- <<if ($activeSlave.physicalAge < 11)>>
- $He is too young to have armpit hair.
+ <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
+ <<if ($activeSlave.physicalAge < _pubertyAge-2)>>
+ $He is too sexually immature to have armpit hair.
<<elseif $activeSlave.underArmHStyle == "hairless">>
$His armpits are perfectly smooth and naturally hairless.
<<elseif $activeSlave.underArmHStyle == "bald">>
@@ -2083,10 +2084,10 @@ $He is
<<else>>
$His armpits are waxed and smooth.
<</if>>
- <<elseif ($activeSlave.physicalAge < 12)>>
+ <<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
$He has a few $activeSlave.underArmHColor wisps of armpit hair.
- <<elseif ($activeSlave.physicalAge < 13)>>
- Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair.
+ <<elseif ($activeSlave.physicalAge < _pubertyAge)>>
+ $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair.
<<elseif $activeSlave.underArmHStyle == "shaved">>
$His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble.
<<elseif $activeSlave.underArmHStyle == "neat">>
@@ -2256,9 +2257,9 @@ $He is
<<if $activeSlave.inflationType == "aphrodisiacs">>
$He's literally full of
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself, but only managing to stir up the aphrodisiacs contained in $his gut, strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>> $His frantic masturbation forces $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -2266,7 +2267,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass. $His frantic attempts force $his distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in $his gut and strengthening their effects even more.
<</if>>
@@ -2282,9 +2283,9 @@ $He is
<<elseif $activeSlave.aphrodisiacs > 1>>
$He's swimming in
<<if ($activeSlave.amp == 1)>>
- aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
+ aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with extreme sexual frustration, desperately trying to relieve $himself.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
@@ -2292,7 +2293,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
- plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get herself off.
+ plays with a nipple with one hand while furiously rubbing $his virgin anus and the sensitive perineum beneath it with the other, desperately trying to get $himself off.
<<else>>
<<if $activeSlave.anus > 2>>$his entire hand, formed into a beak shape,<<elseif $activeSlave.anus > 1>>two fingers<<else>>a finger<</if>> to fuck $his own ass.
<</if>>
@@ -2307,9 +2308,9 @@ $He is
<</if>>
<<else>>
<<if ($activeSlave.amp == 1)>>
- $He's on aphrodisiacs, but is an amputee, so $he cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is an amputee, so $he cannot touch $himself. $He writhes with sexual frustration.
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
- $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with sexual frustration.
+ $He's on aphrodisiacs, but is wearing a chastity belt and cannot touch $himself. $He writhes with sexual frustration.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
$He's on aphrodisiacs and is allowed to masturbate, so as $he obeys your commands $he idly rubs $his shaft with one hand while the other pinches a nipple.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 4a4fa1d7ae2381491a660bdbbf536d23f1d56236..2aca5e09a8a18e246901e10935274669eed49d1e 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -276,7 +276,7 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<<if $SF.Toggle === 0||$SF.Active === 0>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<elseif $SF.Toggle && $SF.Active >= 1>>
- Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the special force command and the rest under your direct control.
+ Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SF.Squad.Troops)>> total soldiers of which <<print commaNum($SF.Squad.Troops)>> under the special force command and the rest under your direct control.
<</if>>
<<if $hasFoughtOnce == 1>>
Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> were major engagements. You won
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 43bb2cc0de0dc149c28e4e3b87f02492d7878a1a..e6a14cfa6a9b38740e151e09931141020fca4837 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -15,6 +15,13 @@
<br><br>
+<<if $SF.Toggle && $SF.Active >= 1>>
+ <<link "Take your express elevator down to $SF.Lower""Firebase">> <</link>>
+ <br><br>
+<<elseif $SF.BadOutcome === "lockdown">>>
+ The thick wall of rubble in front of the entrance to $SF.Lower's firebase would make the trip worthless.
+<</if>>
+
__Penthouse Capacity__
<br>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 18b9924226b8a67e803ef52f28104351c6aaad39..e1ee625620a0c5b616c98f7ec30a5011acd20be5 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -52,7 +52,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "@@.gold;racial Subjugationism,@@ and is ">>
+ <<set $desc = $desc + "@@.gold;Racial Subjugationism,@@ and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "the home of an advanced project to create a subservient race of ">>
<<set $desc = $desc + $arcologies[$i].FSSubjugationistRace>>
@@ -76,7 +76,7 @@ its neighbors.
<<else>>
<<set $desc = "just establishing ">>
<</if>>
- <<set $desc = $desc + "@@.gold;racial Supremacy,@@ and is ">>
+ <<set $desc = $desc + "@@.gold;Racial Supremacism,@@ and is ">>
<<if $arcologies[$i].FSSubjugationist > 95>>
<<set $desc = $desc + "a global magnet for ">>
<<set $desc = $desc + $arcologies[$i].FSSupremacistRace>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index fdf403477ba9eb7192a903d7532f81277db2b133..7af7da2cd4df2e3da5b976bbd928abe40afbe5e6 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -511,7 +511,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberEconomic)>>
<<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, $rep -= random(100,200), _redHanded = 1>>
<<if $secExp == 1>>
- <<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>>
+ <<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>>
<</if>>
<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>>
<</if>>
@@ -552,7 +552,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>>
<<set $arcologies[0].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>>
<<if $secExp == 1>>
- <<set $authority -= random(100,500)*$arcologies[0].CyberReputation, $crime += random(10,25)>>
+ <<set $authority -= random(100,500)*$arcologies[0].CyberReputation, $crime += random(10,25)>>
<</if>>
<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index c929ee9953cecdf2c36ec592b434a9c804c81c73..49855a5ddbbbb817e0ab0bea06ec81cf1b4b4c32 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -484,7 +484,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $arcologies[0].FSChattelReligionist >= 50>>
<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant < -50>>
- $His dimwitted mind naturally takes to being told $his role as a slave is righteous, and $he naively @@.mediumaquamarine;hopes@@ your arcology's religion will protect $him from harm.
+ $His dimwitted mind naturally takes to being told $his role as a slave is righteous, and $he naïvely @@.mediumaquamarine;hopes@@ your arcology's religion will protect $him from harm.
<<set $activeSlave.trust += 2>>
<<elseif $activeSlave.intelligence+$activeSlave.intelligenceImplant > 50>>
$His intelligent mind @@.gold;fears@@ the consequences of living in an arcology in which slavery has taken on religious significance.
@@ -693,7 +693,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<br>
-<<case "She asked to be enslaved out of naive infatuation with you.">>
+<<case "She asked to be enslaved out of naïve infatuation with you.">>
//and since $he is already infatuated with you...//
<br>
<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 0d8e9c9fa5db0513a3646c380f67b5eedb181785..4ca2f28d4744f924a369b2d2bff45a40421cee69 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -404,8 +404,8 @@
<<script>>Save.autosave.save("Week Start Autosave")<</script>>
<</if>>
-<<if $SF.Toggle && $SF.Active >= 1 && $SFTradeShow.CanAttend > -1 && $SFTradeShow.CanAttend > -2>>
- <<set $SFTradeShow.CanAttend = -1>>
+<<if $SF.Toggle && $SF.Active >= 1 && $SF.MercCon.CanAttend > -1 && $SF.MercCon.CanAttend > -2>>
+ <<set $SF.MercCon.CanAttend = -1>>
<</if>>
<<set $NaNArray = findNaN()>>
<<goto "Main">>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 0f8951e500f475362b77595bc2d90ab29efb19fe..a4b89600a7a927ae8e888094f314e63b44d4817a 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -161,7 +161,7 @@
slim assets.
<</if>>
<<case "body purist">>
- she's depicted striking a sexy pose that shows off every flawless inch of her body.
+ she's depicted striking a sexy pose that shows off every flawless <<if $showInches == 2>>inch<<else>>centimeter<</if>> of her body.
<</switch>>
<<case "imp">>
a pinup of herself to its plating: she's depicted straddling a trident; pussy juices running down its shaft.
@@ -194,7 +194,7 @@ There's a display case behind your desk,
<</if>>
A small mirror resides on your desk, facing you.
-A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, densely freckled<</if>> face stares back at you.
+A $PC.visualAge year old<<if $PC.markings == "freckles">>, freckled<<elseif $PC.markings == "heavily freckled">>, densely freckled<</if>> $PC.faceShape face stares back at you.
<<if ($playerAging != 0) && $PC.birthWeek == 51>>You'll be turning <<print $PC.actualAge+1>> next week.<</if>>
<<PlayerBoobs>>
<<PlayerBelly>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 58e812c58e11c57b8d46c64aec936d032e9585ad..6dbb76ba4b53d12a28d86209cf1307b0f83aa976 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -314,7 +314,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "This one's got quite some spunk in her, you better ready yourself. We're coming in now."
Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she stands her ground. After several steps, she shouts "Stay away from me, you sick fuck! I've seen what you do to your girls! Filling them up with growth drugs! Don't you ever THINK abou-"
- The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful. Please be careful when you unbind her, she may try to do something stupid." He says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future, given her hatred for huge assets.
+ The mercenary captain quickly gags her. "My apologies, I did warn you she was a handful. Please be careful when you unbind her, she may try to do something stupid," he says. He and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future, given her hatred for huge assets.
<</if>>
<<case "Pastoralism">>
<<set $activeSlave.health = 60>>
@@ -347,7 +347,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "We got a problem sir. $He, um, isn't going to fit... We could try bringing her in through the penthouse balcony, but I'd worry about breaking things."
Once $activeSlave.slaveName's immense form is safely in the penthouse, you finally get a good look at her. Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she begins to let out a low growl. After several steps, she shouts "Stay away from me, you sick fuck! Fit girls are trash! Real men like big soft bodies! You're sick! SICK! Don't you-"
- The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful." He pats her grotesque breast, "least she won't be going anywhere." He says, before he and his group exit your penthouse, leaving you with the enraged and struggling $activeSlave.slaveName. You sigh at the amount of motion running through her absurd tits, mountainous ass, and obese body. The girl you used to know is barely recognizable under all that flesh and she certainly doesn't think the same anymore. Odds are high that she'll cause problems for you in the future, once her body sheds the weight. Or you could leave her as an immobile ornament, though assets of that size are definitely out of style.
+ The mercenary captain quickly gags $him. "My apologies, I did warn you she was a handful," he says as he pats her grotesque breast, "Least $he won't be going anywhere." He and his group exit your penthouse, leaving you with the enraged and struggling $activeSlave.slaveName. You sigh at the amount of motion running through her absurd tits, mountainous ass, and obese body. The girl you used to know is barely recognizable under all that flesh and she certainly doesn't think the same anymore. Odds are high that she'll cause problems for you in the future, once her body sheds the weight. Or you could leave her as an immobile ornament, though assets of that size are definitely out of style.
<</if>>
<<case "Physical Idealism">>
<<if $rivalryDuration <= 5>>
@@ -366,7 +366,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "We got a problem sir. $He, um, is rather heavy and can't walk well... We're working our way up, but, do you have a freight elevator by chance?"
Once $activeSlave.slaveName's hugely fat ass is safely in the penthouse, you finally get a good look at her. Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she begins to let out a low growl. After several steps, she shouts "Stay away from me, you sick fuck! Fit girls are trash! Real men like big soft bodies! You're sick! SICK! Don't you-"
- The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful." He pats her fat coated shoulder, to which she immediately sits down. Several mercs join their captain in trying to pull her back to her feet. A load crack and a groan of pain escapes the captain as he drops to the ground clutching his back. His comrades quickly help him from the penthouse, leaving you to deal with the scowling blob of fat and flesh. $He is intent on not budging from that spot and you aren't interested in breaking anything, though you're certain she'll be begging for food within an hour and easily manipulated. $He is massively fat, a stark difference from the fit, thin girl you used to know; she certainly doesn't think the same anymore, either. Odds are high that she'll cause problems for you in the future, be it breaking furniture or getting stuck in doors, though given her rather laid back life up until this point, she is likely to be quite malleable. Though she is wheezing quite a lot considering she is just sitting there.
+ The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful." He pats her fat coated shoulder, to which she immediately sits down. Several mercs join their captain in trying to pull her back to her feet. A load crack and a groan of pain escapes the captain as he drops to the ground clutching his back. His comrades quickly help him from the penthouse, leaving you to deal with the scowling blob of fat and flesh. $He is intent on not budging from that spot and you aren't interested in breaking anything, though you're certain $he'll be begging for food within an hour and easily manipulated. $He is massively fat, a stark difference from the fit, thin $girl you used to know; she certainly doesn't think the same anymore, either. Odds are high that $he'll cause problems for you in the future, be it breaking furniture or getting stuck in doors, though given her rather laid back life up until this point, she is likely to be quite malleable. Though she is wheezing quite a lot considering she is just sitting there.
<<set $activeSlave.health = -80>>
<</if>>
<<case "Hedonistic Decadence">>
@@ -381,9 +381,9 @@ Your hired mercenaries are en route now with your precious cargo.
Upon seeing you, $activeSlave.slaveName shifts her weight back and forth, unsure of what to make of you. As you step forward, she quickly steps back. After several steps, she screams "Keep away from me! I don't want ever want to be a fat sow again!". $He is thin and extremely muscular, a stark difference from the soft, chubby girl you used to know; she certainly doesn't think the same anymore, either.
<<else>>
<<set $activeSlave.trust = 100>>
- Your mercenaries radio you upon arrival. "We have a problem, sir. This one is a fighter, she already broke one of our guy's jaw. We think she is tranq'd and restrained enough to bring in. Please be ready."
+ Your mercenaries radio you upon arrival. "We have a problem, sir. This one is a fighter, $he already broke one of our guy's jaw. We think $he is tranq'd and restrained enough to bring in. Please be ready."
Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she stands her ground. After several steps, she shouts "Stay away from me, you sick fuck! I'll never be a cow again. DON'T YOU DARE TOUCH ME!"
- The mercenary captain is thrown back as she explodes her restraints, having been preparing to gag her. The rest of the troop center their weapons on her, forcing her to back down. $He glares at you as the captain picks himself up and exits your penthouse, leaving you with the enraged $activeSlave.slaveName. She grunts as she exits the office for the slave quarters, stopping in the doorway. "I'll be your slave, but you're going to be sorry.". With a hand on each door frame, she rips it out of the wall. $He lets out a single laugh while scowling at you. $He is thin and extremely muscular, a stark difference from the soft, chubby girl you used to know; she certainly doesn't think the same anymore, either. Odds are high that she'll cause problems for you in the future, given her hatred for you and her frightening strength.
+ The mercenary captain is thrown back as $he explodes her restraints, having been preparing to gag her. The rest of the troop center their weapons on her, forcing her to back down. $He glares at you as the captain picks himself up and exits your penthouse, leaving you with the enraged $activeSlave.slaveName. $He grunts as she exits the office for the slave quarters, stopping in the doorway. "I'll be your slave, but you're going to be sorry." With a hand on each door frame, she rips it out of the wall. $He lets out a single laugh while scowling at you. $He is thin and extremely muscular, a stark difference from the soft, chubby girl you used to know; she certainly doesn't think the same anymore, either. Odds are high that she'll cause problems for you in the future, given her hatred for you and her frightening strength.
<</if>>
<<case "Chattel Religionism">>
<<set $activeSlave.health = 50>>
@@ -399,7 +399,7 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "This one's got quite some spunk in her, you better ready yourself. We're coming in now."
Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she stands her ground. After several steps, she shouts "Stay away from me, you crazy psycho! Making your own religion, blasphemous! You think yourself a proph-"
- The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful. Please be careful when you unbind her, she may try to do something stupid." He says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future.
+ The mercenary captain quickly gags her. "My apologies, I did warn you she was a handful. Please be careful when you unbind her, she may try to do something stupid.", he says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future.
<</if>>
<<case "Multiculturalism">>
<<set $activeSlave.health = 60>>
@@ -416,23 +416,23 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "This one's got quite a mouth on her, you better ready yourself. We're coming in now."
Upon seeing you, $activeSlave.slaveName's eyes fill with a mercy. As you step forward, she stands her ground. After several steps, she shouts "Be still, I'll lead your arcology to salvation. Place your faith in me and be sav-"
- The mercenary captain quickly gags her, "My apologies, I did warn you about that mouth. Please be careful when you unbind her, she may try to do something stupid." He says, as he and his group exit your penthouse, leaving you with the disappointed $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future, trying to preach her new faith.
+ The mercenary captain quickly gags $him. "My apologies, I did warn you about that mouth. Please be careful when you unbind her, she may try to do something stupid.", he says, as he and his group exit your penthouse, leaving you with the disappointed $activeSlave.slaveName. $He looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future, trying to preach her new faith.
<</if>>
<<default>>
<<set $activeSlave.health = 40>>
<<if $rivalryDuration <= 5>>
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs == 1>>ample bust<<else>>chest<</if>> sobbing "They told me such horrible things about you!". You gently wrap your arms around her in a comforting embrace. $He's exactly as you remember.
<<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if she should. You pull her into your <<if $PC.boobs == 1>>ample bust<<else>>chest<</if>> as she breaks down in tears. "You aren't trying to make some crazy old timey society, are you?". While she looks the same as you remember, she certainly doesn't think the same anymore.
+ Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull her into your <<if $PC.boobs == 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "You aren't trying to make some crazy old-timey society, are you?". While $he looks the same as you remember, $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 15>>
- Upon seeing you, $activeSlave.slaveName shifts her weight back and forth, unsure of what to make of you. As you step forward, she hesitatingly approaches. Once she is close enough she says "Please don't make me play along...". While she looks the same as you remember, she certainly doesn't think the same anymore.
+ Upon seeing you, $activeSlave.slaveName shifts her weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "Please don't make me play along...". While $he looks the same as you remember, $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
- Upon seeing you, $activeSlave.slaveName shifts her weight back and forth, unsure of what to make of you. As you step forward, she quickly steps back. After several steps, $he screams "Keep away from me! I don't want to be part of your crazy society!". While she looks the same as you remember, she definitely doesn't think the same anymore.
+ Upon seeing you, $activeSlave.slaveName shifts her weight back and forth, unsure of what to make of you. As you step forward, $he quickly steps back. After several steps, $he screams "Keep away from me! I don't want to be part of your crazy society!". While $he looks the same as you remember, $he definitely doesn't think the same anymore.
<<else>>
<<set $activeSlave.trust = 80>>
Your mercenaries radio you upon arrival. "This one's got quite some spunk in her, you better ready yourself. We're coming in now."
- Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, she stands her ground. After several steps, she shouts "Stay away from me, you crazy psycho! Remaking a fallen empire, madness! You think yourself a king-"
- The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful. Please be careful when you unbind her, she may try to do something stupid." He says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that she'll cause problems for you in the future.
+ Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands her ground. After several steps, $he shouts "Stay away from me, you crazy psycho! Remaking a fallen empire, madness! You think yourself a king-"
+ The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind her, $he may try to do something stupid." He says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future.
<</if>>
<</switch>>
diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw
index 5c6a7f43fd9706210d8d6dfe7669d426a494a6e2..8986a3c0a9bce04af40e60aa83c6920ec195995a 100644
--- a/src/uncategorized/pRivalInitiation.tw
+++ b/src/uncategorized/pRivalInitiation.tw
@@ -11,52 +11,57 @@
<<else>>
-This is a special week, the week of your victory. <<EventNameLink $activeSlave>> awaits your pleasure. You could certainly do to her anything and everything you usually do to your chattel. You could also do something special to mark the occasion.
+<<setLocalPronouns $activeSlave>>
+
+This is a special week, the week of your victory. <<EventNameLink $activeSlave>> awaits your pleasure. You could certainly do to $him anything and everything you usually do to your chattel. You could also do something special to mark the occasion.
<br><br>
<span id="result">
-<<link "Force her to do a public relations tour with you">>
+<<link "Force $him to do a public relations tour with you">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- Though she hates you with all her heart, she knows better than most what happens to slaves who disobey. So, when you describe your public relations plans to her, she promises to obey before you even get to the threats. She finds herself accompanying you to the arcology's finest establishment in a lovely evening dress. The two of you share an understandably quiet meal, with a growing crowd coming to leer at the defeated slaveowner-cum-slave. At a prearranged signal from you, she stands, quickly strips naked, gets down on her knees, and <<if $PC.dick == 1>>sucks you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eats you out<</if>>. Such public humiliation starts her down the path of @@.hotpink;obedience,@@ and is the @@.green;talk of the Free Cities.@@
+ Though $he hates you with all $his heart, $he knows better than most what happens to slaves who disobey. So, when you describe your public relations plans to $him, $he promises to obey before you even get to the threats. $He finds $himself accompanying you to the arcology's finest establishment in a lovely evening dress. The two of you share an understandably quiet meal, with a growing crowd coming to leer at the defeated slaveowner-cum-slave. At a prearranged signal from you, $he stands, quickly strips naked, gets down on $his knees, and <<if $PC.dick == 1>>sucks you off<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>eats you out<</if>>. Such public humiliation starts $him down the path of @@.hotpink;obedience,@@ and is the @@.green;talk of the Free Cities.@@
<<set $rep += 500, $activeSlave.devotion += 4, $activeSlave.oralCount += 1, $oralTotal += 1>>
<<set $rivalID = 0>>
<</replace>>
<</link>>
-<br><<link "Make her orally service your other slaves in public">>
+<br><<link "Make $him orally service your other slaves in public">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $slaves[0].slaveName leads her out into the arcology's largest atrium, forces her to her knees, and in full view of the whole arcology, orally rapes someone who was until this week a slaveowner herself. Behind her, $slaves[1].slaveName is standing ready for her turn, and all your other slaves are behind. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
+ <<setLocalPronouns $slaves[1] 2>>
+ $slaves[0].slaveName leads $him out into the arcology's largest atrium, forces $him to $his knees, and in full view of the whole arcology, orally rapes someone who was until this week a slaveowner $himself. Behind them, $slaves[1].slaveName is standing ready for _his2 turn, and all your other slaves stand behind _him2. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
<<set $activeSlave.oralCount += $slaves.length*2, $oralTotal += $slaves.length*2>>
<<run $slaves.forEach(function(s) { s.devotion += 10; })>>
<<set $rivalID = 0>>
<</replace>>
<</link>>
<<if $activeSlave.anus == 0>>
- <br><<link "Break her ass and then let the public use it">>
+ <br><<link "Break $his ass and then let the public use it">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- $activeSlave.slaveName, who has been fairly dignified up to this point, breaks down when she's placed in stocks with her ass in the air. Her sobs become screams when, for the first time in her life, she feels the burning sensation of a well-lubricated <<if $PC.dick == 1>>cockhead<<else>>strap-on<</if>> forcing its way past her virgin sphincter. Raping a virgin anus is not a new pleasure for you, but the usual shrieking, struggling and spasming is all the sweeter this time. @@.green;Half the arcology@@ has used her @@.red;poor injured butthole@@ by the end of the day, she @@.gold;is learning to fear you,@@ and hates you @@.mediumorchid;even more@@ if possible.
+ $activeSlave.slaveName, who has been fairly dignified up to this point, breaks down when $he's placed in stocks with $his ass in the air. $His sobs become screams when, for the first time in $his life, $he feels the burning sensation of a well-lubricated <<if $PC.dick == 1>>cockhead<<else>>strap-on<</if>> forcing its way past $his virgin sphincter. Raping a virgin anus is not a new pleasure for you, but the usual shrieking, struggling and spasming is all the sweeter this time. @@.green;Half the arcology@@ has used $his @@.red;poor injured butthole@@ by the end of the day, $he @@.gold;is learning to fear you,@@ and hates you @@.mediumorchid;even more@@ if possible.
<<set $rep += 500, $activeSlave.devotion -= 4, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.anus = 3, $activeSlave.analCount += 47, $analTotal += 47>>
<<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>>
<<set $rivalID = 0>>
<</replace>>
<</link>>
-<<elseif ($activeSlave.balls > 0) && ($seeExtreme == 1)>>
- <br><<link "Publicly geld her">>
+<</if>>
+<<if ($activeSlave.balls > 0) && ($seeExtreme == 1)>>
+ <br><<link "Publicly geld $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You announce that since $activeSlave.slaveName has spent so much money and effort turning herself into a girl with expensive hormones, you'll take a lower-tech step to bring her further in that regard. An auto surgery is set up in public and the populace is treated to the edifying spectacle of a very large pair of testicles being efficiently removed by the modern surgical art. Unusually, she was not given general anesthesia, but instead given local painkillers and made to watch on a monitor, to her @@.gold;rage@@ and @@.mediumorchid;horror.@@ There is @@.green;applause@@ as the cauterizer seals the surgical site where her massive scrotum used to hang. Her cock looks softer already.
+ You announce that since $activeSlave.slaveName has spent so much money and effort turning $himself into a girl with expensive hormones, you'll take a lower-tech step to bring $him further in that regard. An auto surgery is set up in public and the populace is treated to the edifying spectacle of a very large pair of testicles being efficiently removed by the modern surgical art. Unusually, $he was not given general anesthesia, but instead given local painkillers and made to watch on a monitor, to $his @@.gold;rage@@ and @@.mediumorchid;horror.@@ There is @@.green;applause@@ as the cauterizer seals the surgical site where $his massive scrotum used to hang. $His cock looks softer already.
<<set $rep += 500, $activeSlave.devotion -= 50, $activeSlave.trust -= 50, $activeSlave.health -= 10, $activeSlave.balls = 0>>
<<set $rivalID = 0>>
<</replace>>
<</link>>
-<<elseif isFertile($activeSlave)>>
- <br><<link "Let the public impregnate her">>
+<</if>>
+<<if (isFertile($activeSlave)) && ($seePreg == 1)>>
+ <br><<link "Let the public impregnate $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You announce that since $activeSlave.slaveName damaged the arcology, she will be taking a leading role in the reconstruction. She will be doing this by replacing one of the residents killed in the violence - by bearing a new slave, to be conceived collectively. The shame and @@.mediumorchid;horror@@ of her future as breeding stock comes home to her as she's restrained in a chair with her legs spread. Soon, the stream of fluids is running down her thoroughly-fucked pussy and over her virgin anus to pool on the floor beneath her. Modern medical imaging reveals her fertile ovum's last, losing battle against a legion of sperm in real time, and the images are projected on large screens.
+ You announce that since $activeSlave.slaveName damaged the arcology, $he will be taking a leading role in the reconstruction. $He will be doing this by replacing one of the residents killed in the violence - by bearing a new slave, to be conceived collectively. The shame and @@.mediumorchid;horror@@ of $his future as breeding stock comes home to $him as $he's restrained in a chair with $his legs spread. Soon, the stream of fluids is running down $his thoroughly-fucked pussy and over $his anus to pool on the floor beneath $him. Modern medical imaging reveals $his fertile ovum's last, losing battle against a legion of sperm in real time, and the images are projected on large screens.
<<set $rep += 500, $activeSlave.preg = 1, $activeSlave.pregSource = -2, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.devotion -= 15>>
<<set $activeSlave.pregType = setPregType($activeSlave)>>
<<set WombImpregnate($activeSlave, $activeSlave.pregType, -2, 1)>>
@@ -68,4 +73,3 @@ This is a special week, the week of your victory. <<EventNameLink $activeSlave>>
</span>
<</if>> /* def $activeSlave */
-
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index c57f89398d474131362980f4aca4a556faa83243..5071d2bcdd49a75bcb536ff36d8c85e85e4c8b62 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -181,7 +181,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.butt = 4>>
<<set $hostage.behavioralFlaw = "anorexic">>
<<set $hostage.sexualFlaw = "crude">>
- screaming as she watches $his breasts swell from the intense amount of A-HGH being pumped into them.
+ screaming as $he watches $his breasts swell from the intense amount of A-HGH being pumped into them.
<<case "Asset Expansionism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -216,7 +216,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.butt = 2>>
<<set $hostage.behavioralFlaw = "anorexic">>
<<set $hostage.sexualFlaw = "hates penetration">>
- struggling with a feeding tube down $his throat, $his belly heavily bloated with fattening slave food, $his body already looking a little soft. She is being forcibly fucked, $his middle jiggling with each thrust; 28 tallies are already drawn over $his pussy.
+ struggling with a feeding tube down $his throat, $his belly heavily bloated with fattening slave food, $his body already looking a little soft. $He is being forcibly fucked, $his middle jiggling with each thrust; 28 tallies are already drawn over $his pussy.
<<case "Hedonistic Decadence">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -368,14 +368,14 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.boobsImplant += 2000>>
<<set $hostage.fetish = "boobs">>
<<set $hostage.fetishStrength = 10>>
- blushing as she attempts to get dressed with $his massive <<print $hostage.boobs>>cc fake tits getting in the way.
+ blushing as $he attempts to get dressed with $his massive <<print $hostage.boobs>>cc fake tits getting in the way.
<<case "Transformation Fetishism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.vaginalCount += 1>>
<<set $hostage.fetish = "submissive">>
<<set $hostage.fetishStrength = 10>>
- blushing as she recollects all the compliments $his pure body has received so far.
+ blushing as $he recollects all the compliments $his pure body has received so far.
<<case "Youth Preferentialism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -384,7 +384,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.analCount += 5>>
<<set $hostage.fetish = "submissive">>
<<set $hostage.fetishStrength = 10>>
- blushing as she thinks about being dominated by that MILF.
+ blushing as $he thinks about being dominated by that MILF.
<<case "Maturity Preferentialism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -393,7 +393,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.analCount += 5>>
<<set $hostage.fetish = "dom">>
<<set $hostage.fetishStrength = 10>>
- blushing as she thinks about possibly dominating $his energetic harasser.
+ blushing as $he thinks about possibly dominating $his energetic harasser.
<<case "Slimness Enthusiasm">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -402,12 +402,12 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.butt = 5>>
<<set $hostage.fetish = "boobs">>
<<set $hostage.fetishStrength = 10>>
- blushing as she attempts to get dressed with $his massive <<print $hostage.boobs>>cc tits getting in the way.
+ blushing as $he attempts to get dressed with $his massive <<print $hostage.boobs>>cc tits getting in the way.
<<case "Asset Expansionism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.vaginalCount += 1>>
- blushing as she recollects all the compliments $his slim body has received so far.
+ blushing as $he recollects all the compliments $his slim body has received so far.
<<case "Pastoralism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -417,7 +417,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 1>>
<<set $hostage.fetish = "dom">>
<<set $hostage.fetishStrength = 10>>
- crashing into $his bed, exhausted from all $his exercise. As she massages $his sore body, she can't help gasp at the weight she has lost.
+ crashing into $his bed, exhausted from all $his exercise. As $he massages $his sore body, $he can't help gasp at the weight $he has lost.
<<case "Cummunism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -425,7 +425,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.boobs += 1000>>
<<set $hostage.fetish = "boobs">>
<<set $hostage.fetishStrength = 10>>
- groaning as she lowers $his growing body onto $his cot. She shoves a massive <<print $hostage.boobs>>cc milky breast aside so she can massage $his hugely distended belly. She moans in pain under the massive amount of high-caloric fluid within $his gut.
+ groaning as $he lowers $his growing body onto $his cot. $He shoves a massive <<print $hostage.boobs>>cc milky breast aside so $he can massage $his hugely distended belly. $He moans in pain under the massive amount of high-caloric fluid within $his gut.
<<case "Physical Idealism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -436,7 +436,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vagina = 3>>
<<set $hostage.behavioralFlaw = "anorexic">>
<<set $hostage.sexualFlaw = "hates penetration">>
- groaning as $his taut belly is measured and $his weight is taken; 140 tallies adorn $his lower belly. "88 kilos, a good start, but nowhere near the end. Now about that fetish of yours..." She responds with a meek
+ groaning as $his taut belly is measured and $his weight is taken; 140 tallies adorn $his lower belly. "88 kilos, a good start, but nowhere near the end. Now about that fetish of yours..." $He responds with a meek
<<set $hostageFetish = either("submissive", "cumslut", "humiliation", "buttslut", "boobs", "sadist", "masochist", "dom", "pregnancy")>>
<<switch $hostageFetish>>
<<case "submissive">>
@@ -773,7 +773,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.behavioralQuirk = "fitness">>
<<set $hostage.sexualQuirk = "romantic">>
<<set $hostage.fetishStrength = 65>>
- stepping onto a scale and gawking out how much weight she has lost. She flexes, giggling to herself, before picking up a weight.
+ stepping onto a scale and gawking out how much weight $he has lost. $He flexes, giggling to $himself, before picking up a weight.
<<case "Cummunism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -783,7 +783,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.fetishStrength = 65>>
<<set $hostage.behavioralFlaw = "gluttonous">>
<<set $hostage.sexualFlaw = "crude">>
- getting out of bed and immediately falling to the floor under the weight of $his immense <<print $hostage.boobs>>cc breasts. As $his meaty body jiggles and a veritable flood of milk escapes $his breasts; she calls out, not for help, but for a dick in $him to celebrate this occasion.
+ getting out of bed and immediately falling to the floor under the weight of $his immense <<print $hostage.boobs>>cc breasts. As $his meaty body jiggles and a veritable flood of milk escapes $his breasts; $he calls out, not for help, but for a dick in $him to celebrate this occasion.
<<case "Physical Idealism">>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -2041,7 +2041,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.pregWeek++>>
<<run SetBellySize($hostage)>>
<</switch>>
- relaxing in $his comfy bed surrounded by mountains of molded slave food. She is greedily shoving handfuls of the fattening treats into $his mouth as fast as she can. She has grown enormously fat and $his belly is jiggling oddly. When she repositions herself, you catch sight of a quartet of large vibrating dildos crammed into $his stretched cunt.
+ relaxing in $his comfy bed surrounded by mountains of molded slave food. She is greedily shoving handfuls of the fattening treats into $his mouth as fast as she can. She has grown enormously fat and $his belly is jiggling oddly. When she repositions $himself, you catch sight of a quartet of large vibrating dildos crammed into $his stretched cunt.
<</if>>
<<case "Hedonistic Decadence">>
<<if $rivalryDuration <= 5>>
@@ -2857,7 +2857,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.weight -= 5>>
<<set $hostage.muscles += 5>>
<<set $hostage.fetishStrength += 5>>
- checking $himself out in the mirror, gawking at how much weight she lost.
+ checking $himself out in the mirror, gawking at how much weight $he's lost.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -2870,10 +2870,10 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.weight -= 5>>
<<set $hostage.muscles += 5>>
- massaging body oil into $his abs and checking herself out in a mirror.
+ massaging body oil into $his abs and checking $himself out in a mirror.
<<else>>
<<set $hostage.vaginalCount += 1>>
- massaging body oil into $his abs and posing in front of the mirror. She is proud to have gone from a fat cow to a ripped goddess.
+ massaging body oil into $his abs and posing in front of the mirror. $He is proud to have gone from a fat cow to a ripped goddess.
<</if>>
<<case "Chattel Religionism">>
<<if $rivalryDuration <= 5>>
@@ -2911,7 +2911,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.fetishStrength += 5>>
<<set $hostage.vaginalCount += 1>>
- questioning why she is made to pray for your arcology's salvation.
+ questioning why $he is made to pray for your arcology's salvation.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3088,7 +3088,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 50>>
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
- sobbing as she tries to coax the cum out of $his womb.
+ sobbing as $he tries to coax the cum out of $his womb.
<<elseif $rivalryDuration <= 10>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3097,7 +3097,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 50>>
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
- crying as she cradles $his unwelcome pregnancy.
+ crying as $he cradles $his unwelcome pregnancy.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3132,7 +3132,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 50>>
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
- sobbing as she tries to coax the cum out of $his womb.
+ sobbing as $he tries to coax the cum out of $his womb.
<<elseif $rivalryDuration <= 10>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3142,7 +3142,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 50>>
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
- crying as she cradles $his full-sized pregnancy.
+ crying as $he cradles $his full-sized pregnancy.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3249,7 +3249,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 50>>
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
- panicking as she attempts to mime a plea to not get cut by $his aggressor.
+ panicking as $he attempts to mime a plea to not get cut by $his aggressor.
<<elseif $rivalryDuration <= 20>>
<<set $hostage.trust += 5>>
<<set $hostage.devotion += 5>>
@@ -3345,7 +3345,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
admiring how pure $his body is in the mirror.
<<else>>
<<set $hostage.vaginalCount += 1>>
- admiring $his pure body from every angle she can.
+ admiring $his pure body from every angle $he can.
<</if>>
<<case "Youth Preferentialism">>
<<if $rivalryDuration <= 5>>
@@ -3441,13 +3441,13 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.weight += 5>>
<<set $hostage.fetishStrength += 5>>
<<set $hostage.boobs += 1000>>
- smiling as the breast injections swell $his breasts to <<print $hostage.boobs>>ccs. She runs $his hand across $his huge butt and softening body.
+ smiling as the breast injections swell $his breasts to <<print $hostage.boobs>>ccs. $He runs $his hand across $his huge butt and softening body.
<<elseif $rivalryDuration <= 20>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.weight += 5>>
<<set $hostage.boobs += 1000>>
- practically orgasming as the breast injections swell $his breasts to <<print $hostage.boobs>>ccs. She sinks $his hands into $his enormous butt and fat belly.
+ practically orgasming as the breast injections swell $his breasts to <<print $hostage.boobs>>ccs. $He sinks $his hands into $his enormous butt and fat belly.
<<else>>
shouting at a plastic surgeon to make $his <<print $hostage.boobs>>cc tits even larger.
<</if>>
@@ -3522,20 +3522,20 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.weight += 5>>
<<set $hostage.fetishStrength += 5>>
<<set $hostage.boobs += 1000>>
- sighing as the milkers drain $his big <<print $hostage.boobs>>cc udders while she massages $his softening belly.
+ sighing as the milkers drain $his big <<print $hostage.boobs>>cc udders while $he massages $his softening belly.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.weight += 5>>
<<set $hostage.fetishStrength += 5>>
<<set $hostage.boobs += 1000>>
- sighing with relief as the milkers drain $his huge <<print $hostage.boobs>>cc udders while she massages $his jiggly belly.
+ sighing with relief as the milkers drain $his huge <<print $hostage.boobs>>cc udders while $he massages $his jiggly belly.
<<elseif $rivalryDuration <= 20>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.weight += 5>>
<<set $hostage.boobs += 1000>>
- happily humming as the milkers drain $his giant <<print $hostage.boobs>>cc udders while she plays with $his fat belly and breasts.
+ happily humming as the milkers drain $his giant <<print $hostage.boobs>>cc udders while $he plays with $his fat belly and breasts.
<<else>>
moaning loudly as the milkers drain $his massive <<print $hostage.boobs>>cc udders.
<</if>>
@@ -3546,7 +3546,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.weight += 5>>
<<set $hostage.boobs += 50>>
<<set $hostage.vaginalCount += 28>>
- sobbing as she is forced is experience all manner of perversion in an effort to reveal $his fetishes.
+ sobbing as $he is forced is experience all manner of perversion in an effort to reveal $his fetishes.
<<elseif $rivalryDuration <= 10>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
@@ -3556,12 +3556,12 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.vaginalCount += 28>>
<<switch $hostageFetish>>
<<case "submissive">>
- struggling to hold back $his joy as she is forced to eat out another slave.
+ struggling to hold back $his joy as $he is forced to eat out another slave.
<<case "cumslut">>
struggling to hold back $his joy as a hot load spurts across $his face.
<<set $hostage.oralCount += 70>>
<<case "humiliation">>
- struggling to hold back $his joy as she is paraded, naked, through the arcology.
+ struggling to hold back $his joy as $he is paraded, naked, through the arcology.
<<case "buttslut">>
struggling to hold back $his joy as $his ass is roughly fucked.
<<set $hostage.analCount += 21>>
@@ -3569,13 +3569,13 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "boobs">>
<<set $hostage.boobs += 100>>
<<set $hostage.boobsImplant += 100>>
- struggling to hold back $his joy as she checks out $his new <<print $hostage.boobsImplant>>cc implants.
+ struggling to hold back $his joy as $he checks out $his new <<print $hostage.boobsImplant>>cc implants.
<<case "sadist">>
- struggling to hold back $his joy as she is encouraged to beat a slave that spilled a cup of food on the clean floor.
+ struggling to hold back $his joy as $he is encouraged to beat a slave that spilled a cup of food on the clean floor.
<<case "masochist">>
struggling to hold back $his joy as $his nipples are cruelly pinched and twisted.
<<case "dom">>
- struggling to hold back $his joy as she is told to order a waiting slave to do whatever she wants.
+ struggling to hold back $his joy as $he is told to order a waiting slave to do whatever $he wants.
<<case "pregnancy">>
struggling to hold back $his joy as another huge load shoots into $his fertile womb.
<<set $hostage.preg++>>
@@ -3644,11 +3644,11 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "sadist">>
cumming hard as the slave mounting $him writhes in pain at _hisU torment.
<<case "masochist">>
- cumming hard as she is beaten during sex.
+ cumming hard as $he is beaten during sex.
<<case "dom">>
sitting on a slave that displeased $him and forcing the struggling _girlU to eat $him out.
<<case "pregnancy">>
- puffing out $his already large belly pretending to be even more pregnant than she already is.
+ puffing out $his already large belly pretending to be even more pregnant than $he already is.
<<set $hostage.preg++>>
<<set $hostage.pregKnown = 1>>
<<set $hostage.pregWeek++>>
@@ -3662,7 +3662,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "submissive">>
going out of $his way to bring $his partner to orgasm with no interest in $his own.
<<case "cumslut">>
- greedily sucking cocks, desperate to fill herself with cum.
+ greedily sucking cocks, desperate to fill $himself with cum.
<<set $hostage.oralCount += 70>>
<<case "humiliation">>
in the center of a gangbang $he started in the middle of one of the arcology's shopping malls.
@@ -3677,7 +3677,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<case "sadist">>
laughing maniacally as $he beats a slave viciously as $he rides _himU. $He keeps going even after the poor _girlU's dick breaks from penetrating $him at a bad angle.
<<case "masochist">>
- going out of $his way to find the most undesirable men in the arcology to offer herself to.
+ going out of $his way to find the most undesirable men in the arcology to offer $himself to.
<<case "dom">>
mercilessly beating the unfortunate slave servicing $him as punishment for knocking over $his tray of snacks.
<<case "pregnancy">>
@@ -3758,7 +3758,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.devotion -= 5>>
<<set $hostage.fetishStrength += 5>>
<<set $hostage.vaginalCount += 1>>
- crying as she is forced to service three dicks at once.
+ crying as $he is forced to service three dicks at once.
<<elseif $rivalryDuration <= 15>>
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index e0912c5f32d77cf056d8ac9c4bf2412af9dd2e79..17b902bb167bc60c729fac119ef93b49343cec32 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -22,16 +22,9 @@
<</if>>
<</if>>
<<set _rivalType = _rivalType.random()>>
-Your
-<<if passage() == "P rivalry actions">>
- target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
-<<else>>
- bounty is quickly claimed, and you are treated to
-<</if>>
-the delicious moment of finding your rival on her knees in front of you with a black bag over her head and her hands cuffed behind her. She's one of your slaves now, fundamentally no different than any other. Looking her over, the causes of her downfall are
+
<<switch _rivalType>>
<<case "expansionist shemale">>
- immediately apparent: she's obviously been indulging in self-transformation to excess.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -68,7 +61,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "luxurious">>
<<set $activeSlave.hLength = 80>>
<<case "cum addict">>
- immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -104,7 +96,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 20>>
<<case "hung shota">>
- not immediately apparent: she's young, in good shape, and not lacking down there at all.
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
@@ -138,7 +129,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.sexualQuirk = "perverted">>
<<set $activeSlave.hLength = 20>>
<<case "masculine">>
- not immediately apparent: she's in good shape, if quite masculine.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -170,7 +160,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 5>>
<<case "micropenis">>
- immediately apparent: she's got a slavegirl's cock and balls, not an arcology owner's.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -202,7 +191,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 5>>
<<case "bull dyke">>
- not immediately apparent: though female, she's obviously no stranger to taking a dominant sexual role, to put it politely.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -239,7 +227,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 5>>
<<case "breeder">>
- immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.
<<if $pedo_mode == 1>>
<<set $activeSlaveOneTimeMinAge = ($fertilityAge + 6)>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have been pregnant many times. %/
@@ -294,7 +281,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "luxurious">>
<<set $activeSlave.hLength = 80>>
<<case "oppai loli">>
- immediately apparent: she's young, inexperienced, and extremely top heavy.
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
@@ -327,7 +313,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "twin tails">>
<<set $activeSlave.hLength = 40>>
<<case "cow">>
- immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -361,7 +346,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "neat">>
<<set $activeSlave.hLength = 5>>
<<case "bimbo">>
- immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -396,7 +380,6 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hLength = 80>>
<<default>>
- immediately apparent: she seems to have recently fallen into serious aphrodisiac addiction.
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
@@ -443,6 +426,41 @@ the delicious moment of finding your rival on her knees in front of you with a b
<<if $activeSlave.physicalAge > 35>><<set $activeSlave.ageImplant = 1>><<AgeImplantAdjustment $activeSlave>><</if>>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
+
+<<setLocalPronouns $activeSlave>>
+
+Your
+<<if passage() == "P rivalry actions">>
+ target is quickly delivered. Politely dismissing the head of your <<if $mercenariesTitle != "mercenaries">> $mercenariesTitle<<else>> mercenaries<</if>>, you savor
+<<else>>
+ bounty is quickly claimed, and you are treated to
+<</if>>
+the delicious moment of finding your rival on $his knees in front of you with a black bag over $his head and $his hands cuffed behind $him. $He's one of your slaves now, fundamentally no different than any other. Looking $him over, the causes of $his downfall are
+<<switch _rivalType>>
+<<case "expansionist shemale">>
+ immediately apparent: $he's obviously been indulging in self-transformation to excess.
+<<case "cum addict">>
+ immediately apparent: there's nothing wrong with having cumflation and ball expansion fetishes, but applying them to oneself can be addictive.
+<<case "hung shota">>
+ not immediately apparent: $he's young, in good shape, and not lacking down there at all.
+<<case "masculine">>
+ not immediately apparent: $he's in good shape, if quite masculine.
+<<case "micropenis">>
+ immediately apparent: $he's got a slavegirl's cock and balls, not an arcology owner's.
+<<case "bull dyke">>
+ not immediately apparent: though female, $he's obviously no stranger to taking a dominant sexual role, to put it politely.
+<<case "breeder">>
+ immediately apparent: there's nothing wrong with having a pregnancy fetish, but applying it to oneself is ill-fitting for an arcology owner.
+<<case "oppai loli">>
+ immediately apparent: $he's young, inexperienced, and extremely top heavy.
+<<case "cow">>
+ immediately apparent: there's nothing wrong with having lactation and breast expansion fetishes, but applying them to oneself can be addictive.
+<<case "bimbo">>
+ immediately apparent: there's nothing wrong with having a bimbo fetish, but applying it to oneself can be addictive.
+<<default>>
+ immediately apparent: $he seems to have recently fallen into serious aphrodisiac addiction.
+<</switch>>
+
<<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */
<<set $rivalRace = 0>>
<<include "New Slave Intro">>
\ No newline at end of file
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 23cf49ff7c2da081232223ceadece51e06b956b8..101570a7c79c22b1205334519be0cd20043384f9 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -214,7 +214,7 @@ Only a few days into your inter-arcology war, you receive a video message from y
<<case "gang">>
time as a gang leader. $He was one of your best, yet you never got close enough,
<<case "BlackHat">>
- time as a hacker for hire. $He supported you on jobs, even sent some choice pictures of herself, but you were never really close,
+ time as a hacker for hire. $He supported you on jobs, even sent some choice pictures of $himself, but you were never really close,
<<case "capitalist">>
career in venture capital. $He was a rising manager, young, attractive, and bright. You never worked particularly closely with her,
<<case "mercenary">>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index af30bb4d9613479a98089f141aa654aec945351b..6cb09a1a2672bed91c943f9304e1bc2b17022d2a 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -106,7 +106,7 @@ You make a habit of dropping in on your mercenaries whenever you get the chance.
When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName bending over a mercenary with most of his armor stripped off. $He's the <<if $activeSlave.nationality == "a Cook Islander">>Cook Islander<<elseif $activeSlave.nationality == "a Liechtensteiner">>Liechtensteiner<<elseif $activeSlave.nationality == "a New Zealander">>New Zealander<<elseif $activeSlave.nationality == "a Solomon Islander">>Solomon Islander<<else>>$activeSlave.nationality<</if>> nurse they captured and enslaved, and $he seems to be doing pretty well in $his new life. $He seems to be checking the sutures on a minor wound to the man's flank.
-"Don't squirm," $he says quietly. "I'll get you off when I've checked this." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his fatigue pants. $He's no longer young, but $his $activeSlave.skin legs are pretty enough. As $he swings one leg across the seated mercenary, $he continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using a hand, $he guides herself down onto his stiff prick, eliciting a grunt. $He's a strong $girl, and rides him without letting any of $his weight rest on his hips at all. When he climaxes, $he kneels to clean him with $his mouth and then heads off to wash.
+"Don't squirm," $he says quietly. "I'll get you off when I've checked this." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his fatigue pants. $He's no longer young, but $his $activeSlave.skin legs are pretty enough. As $he swings one leg across the seated mercenary, $he continues, "Please sit still and let me do the work. You need to take it easy for a day or two or you'll pop those sutures." Using a hand, $he guides $himself down onto his stiff prick, eliciting a grunt. $He's a strong $girl, and rides him without letting any of $his weight rest on his hips at all. When he climaxes, $he kneels to clean him with $his mouth and then heads off to wash.
<</if>>
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index efe7816d5dd74855c864276b1aeb292161746973..ba53946154ab6944ff9102f3e22fa3ed20cae97b 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -3,22 +3,23 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">>
<<set $activeSlave = $Bodyguard>>
+<<setLocalPronouns $activeSlave>>
-<<EventNameLink $activeSlave>> has many duties as a bodyguard, and her schedule is carefully built to allow her to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, her services are least needed, so she typically uses these lulls to catch up on sleep or train.
+<<EventNameLink $activeSlave>> has many duties as a bodyguard, and $his schedule is carefully built to allow her to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, her services are least needed, so she typically uses these lulls to catch up on sleep or train.
<br><br>
The feed from the small armory next door shows her doing the latter. She has finished working with a heavy practice sword, and has moved to the tiny, one-shooter range. She seems frustrated, hurrying her shots and missing unnecessarily.
<br><br>
<span id="result">
-<<link "Instruct her">>
+<<link "Instruct $him">>
<<replace "#result">>
- $activeSlave.slaveName starts as you enter the range and don ear protection. She is distracted by your body against hers as you come in close to correct her stance, but she concentrates hard for you. You take whatever time you can spare over the week for serious lessons. She @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
+ $activeSlave.slaveName starts as you enter the range and don ear protection. $He is distracted by your body against $hers as you come in close to correct her stance, but she concentrates hard for you. You take whatever time you can spare over the week for serious lessons. She @@.green;is diligent and learns well,@@ and @@.mediumaquamarine;places greater trust@@ in your judgment.
<<set $activeSlave.trust += 4>>
<<set $activeSlave.combatSkill = 1>>
<</replace>>
<</link>>
-<br><<link "Promise her a sexual reward if she improves">>
+<br><<link "Promise $him a sexual reward if $he improves">>
<<replace "#result">>
Over the feed, you tell $activeSlave.slaveName that she can have her choice of sexual release if she scores well on the next set of targets. She concentrates desperately, trying to ignore her mounting arousal as she imagines enjoying <<if $activeSlave.fetish == "none">>passionate sexual<<elseif $activeSlave.fetish == "boobs">>breast<<else>>$activeSlave.fetish<</if>> play. She barely makes the stated score, and hurries smiling in for her reward. She feels @@.hotpink;closer to you,@@ but is distracted from any real learning and does not become a better fighter.
<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index c20e9b87e588dbf13cfd490365b36dc02142a8a3..364956f40f63d91f0bb8246122cbd06de4a87be5 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -397,7 +397,7 @@ You receive an official communication from a popular talk show e-hosted in one o
$activeSlave.slaveName even manages to @@.green;respond well@@ to a probing question about your gender.
$He <<if _lisps>>lisps<<else>>explains<</if>>, "You have to under<<s>>tand that all that non<<s>>en<<s>>e about men and women mean<<s>> le<<ss>> to u<<s>> in the Free Citie<<s>>. My <<Master>> i<<s>> a <<s>>u<<cc>>e<<ss>>ful and powerful woman.
<<if $PC.dick == 0>>
- We ju<<s>>t pay the right amount of attention to the <<s>>u<<cc>>e<<ss>> and the power." $He quirks a corner of her mouth. "I know //I// do."
+ We ju<<s>>t pay the right amount of attention to the <<s>>u<<cc>>e<<ss>> and the power." $He quirks a corner of her mouth. "I know //I// do."
<<else>>
$He quirks a corner of her mouth. "And <<heP>> ha<<s>> a //wonderful// cock."
<</if>>
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index b9f38308685642acaa38cefadc46221725bf137a..da31d02d236a3bdb67366a20a0f668b938bde4e2 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -10,8 +10,9 @@
<</for>>
<<set $j = _targetSlaveIndex.random()>>
<<run Enunciate($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
-You take an unusually close interest in $activeSlave.slaveName's health and mental well-being, since your health and mental well-being may rely on her combat effectiveness. She performs her duties acceptably, difficult though they are. Hers is a life of long hours and constant vigilance, and she has very little time to herself. The daily wear hasn't really affected her yet, but it may.
+You take an unusually close interest in $activeSlave.slaveName's health and mental well-being, since your health and mental well-being may rely on $his combat effectiveness. $He performs $his duties acceptably, difficult though they are. $Hers is a life of long hours and constant vigilance, and $he has very little time to $himself. The daily wear hasn't really affected $him yet, but it may.
<br><br>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index d9696a8b2412776c37fe49179fcb35ecfaf11b2c..e556eb5cb0ee6f9300f37c8adf74e60b8459da88 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1181,7 +1181,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
<<case "degradationist">>
She has replaced her loincloth with a chastity belt containing an immense dildo; it is clearly seen distending her belly. Countless scars line her back and ass from the frequent lashings she enjoys.
<<case "supremacist">>
- She's taken to carrying a cat o' nine tails whip at all times so that she's ready to lash a <<if $arcologies[0].FSSupremacistRace == "mixed">>pureblooded<<else>>non-$arcologies[0].FSSupremacistRace<</if>> slave at a moment's notice.
+ She's taken to carrying a cat o' nine tails whip at all times so that she's ready to lash a <<if $arcologies[0].FSSupremacistRace == "mixed race">>pureblooded<<else>>non-$arcologies[0].FSSupremacistRace<</if>> slave at a moment's notice.
<<case "subjugationist">>
Her cartoonishly exaggerated $arcologies[0].FSSubjugationistRace body is just begging for a whipping, even when she isn't doing something mischievous and sneaky, which is rare.
<<case "roman revivalist">>
@@ -1266,7 +1266,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
<<case "degradationist">>
She still hasn't managed to undo the spell; her face, hands and every surface of her body are completely covered in tattoos. It is especially noticeable when she talks that her tongue is tattooed too; wonder what decorates the surfaces of her body you can't see?
<<case "supremacist">>
- She's managed to correct the spell, and even succeed in it. She is now <<if $arcologies[0].FSSupremacistRace == "mixed">>the perfect blend of every ethnicity, with all of their best qualities and none of their flaws<<else>>ethnically 100% pure $arcologies[0].FSSupremacistRace<</if>>. If she were real, she would make the perfect breeding stock for the next generation of the master race.
+ She's managed to correct the spell, and even succeed in it. She is now <<if $arcologies[0].FSSupremacistRace == "mixed race">>the perfect blend of every ethnicity, with all of their best qualities and none of their flaws<<else>>ethnically 100% pure $arcologies[0].FSSupremacistRace<</if>>. If she were real, she would make the perfect breeding stock for the next generation of the master race.
<<case "subjugationist">>
She still hasn't managed to undo the spell; she looks like a racist caricature of a $arcologies[0].FSSubjugationistRace girl, and has an appropiately demeaning accent to match. What's worse, the spell also seems to have stripped most of her literacy in $language, making reading her tomes an arduous task for her.
<<case "roman revivalist">>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index ef55fa5c32140c9a5c8d05c888d4f0507fc80a82..74a1baacf6767121f78841275501da03bfeb2890 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -258,7 +258,7 @@
is shamefast. You do your best to train her out of this, but carefully retain the essential core of embarrassment, aiming for a slave that can use her body to titillate the viewer and then offer an authentic blush at herself.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<case "idealistic">>
- still sees sex in a naive light, hoping to be romanced, teased to arousal, and asked permission. Training her directly out of this would shatter the poor girl's world, so you work with her carefully, doing your best to keep sex special for her.
+ still sees sex in a naïve light, hoping to be romanced, teased to arousal, and asked permission. Training her directly out of this would shatter the poor girl's world, so you work with her carefully, doing your best to keep sex special for her.
<<case "repressed">>
is repressed. You strike a delicate balance with her, doing your best to train her to fuck as a sex slave should, but trying to retain the rush of doing the forbidden that makes her flush, shiver, and moan.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
@@ -365,7 +365,7 @@
She is already a skilled anal bitch, but her skills can be polished further. You train her in the basics of urine play, massage, pet play, needle play, and many other niche skills. You also expand her knowledge of sexual positions. She learns to balance herself on tiptoe for the challenge of standing anal sex without support. @@.lime;Her sexual skills have improved.@@
<<AnalSkillIncrease $activeSlave>>
<<elseif $activeSlave.whoreSkill <= 10>>
- Since she's dangerously naive about selling sex, you teach her the basics of self protection and business. @@.lime;Her prostitution skills have improved.@@
+ Since she's dangerously naïve about selling sex, you teach her the basics of self protection and business. @@.lime;Her prostitution skills have improved.@@
<<WhoreSkillIncrease $activeSlave>>
<<elseif $activeSlave.entertainSkill <= 10>>
Since she's rough and unskilled at entertainment, you teach her the basics of polite conversation, music, and dance. @@.lime;Her entertainment skills have improved.@@
@@ -621,7 +621,7 @@
Fortunately, shamefastness is a simple problem to break. Whenever you feel the inclination, you strip $activeSlave.slaveName naked, drag her out into whatever public space catches your fancy, and force her to <<if $PC.dick != 0>>suck your dick<<else>>eat you out<</if>>. To make sure she's really working over her shame despite having her face buried against you, you force her to spread her buttocks to show off her asshole while she <<if $PC.dick != 0>>sucks<<else>>licks you<</if>>.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<case "idealistic">>
- $activeSlave.slaveName still sees sex in a naive light, hoping to be romanced, teased to arousal, and asked permission. This might be an annoyingly ignorant outlook if it wasn't so amusing to break. By the tenth time you slap her $activeSlave.skin face at the slightest hesitation to <<if $PC.dick != 0>>suck your cock<<else>>eat your pussy<</if>>, her illusions are guttering low.
+ $activeSlave.slaveName still sees sex in a naïve light, hoping to be romanced, teased to arousal, and asked permission. This might be an annoyingly ignorant outlook if it wasn't so amusing to break. By the tenth time you slap her $activeSlave.skin face at the slightest hesitation to <<if $PC.dick != 0>>suck your cock<<else>>eat your pussy<</if>>, her illusions are guttering low.
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
<<case "repressed">>
$activeSlave.slaveName's innocence and hesitations about sex are unlikely to survive much longer, but you decide to hurry the process along by making her <<if $PC.dick != 0>>eat dick<<else>>eat your pussy<</if>> while masturbating. She's repressed enough that masturbation is still a partial punishment for her, but she usually gets herself off anyway, shaking with release and sobbing with crushed illusions.
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index f8eeb83212ae0024922cde9cc9371baf5da53c8e..0e341fd9ee33599955b12911dc9f2b51c1195260 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -36,7 +36,7 @@ You have a mature, well-trained household of slaves. $slaves[_red1].slaveName, $
<</link>>
<br><<link "Visit a casino in good company">>
<<replace "#result">>
- The croupiers, bouncers and regulars down at the nearest casino hardly know what to think when you appear with a chit full of cash and twice as many girls as you have arms. You live the night big, starting at the poker table with so many tits and asses on display behind you that, @@.yellowgreen;baby, you make a killing.@@ $slaves[_red1].slaveName, $slaves[_red2].slaveName, $slaves[_red3].slaveName, and $slaves[_red4].slaveName quickly catch the rhythm of the place: slaves can get away with a little more in the smoky, whiskey soaked, money tinted atmosphere, and they @@.hotpink;enjoy themselves immensely.@@ They flirt, flash, giggle, kiss each other, and generally destroy the concentration of everyone within twenty yards - except you. Ring-a-ding-ding.
+ The croupiers, bouncers and regulars down at the nearest casino hardly know what to think when you appear with a chit full of cash and twice as many girls as you have arms. You live the night big, starting at the poker table with so many tits and asses on display behind you that, @@.yellowgreen;baby, you make a killing.@@ $slaves[_red1].slaveName, $slaves[_red2].slaveName, $slaves[_red3].slaveName, and $slaves[_red4].slaveName quickly catch the rhythm of the place: slaves can get away with a little more in the smoky, whiskey soaked, money tinted atmosphere, and they @@.hotpink;enjoy themselves immensely.@@ They flirt, flash, giggle, kiss each other, and generally destroy the concentration of everyone within twenty <<if $showInches == 2>>yards<<else>>meters<</if>> — except you. Ring-a-ding-ding.
<<set $slaves[_red1].devotion += 4>>
<<set $slaves[_red2].devotion += 4>>
<<set $slaves[_red3].devotion += 4>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index ac12bc0479f86264ce0d669823c3dec481ffb0db..f6a4fbe9e0af6a4d5c4d3ebb49b4251fae98e9b3 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -996,7 +996,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate New Slave">>
-<<set $activeSlave.origin = "She offered herself to you for enslavement because she had a disgustingly naive view of medieval Japanese culture.">>
+<<set $activeSlave.origin = "She offered herself to you for enslavement because she had a disgustingly naïve view of medieval Japanese culture.">>
<<set $activeSlave.devotion = random(-15,-5)>>
<<set $activeSlave.trust = random(5,15)>>
<<set $activeSlave.career = "a student">>
@@ -1313,7 +1313,7 @@ The caller is a young woman who struggles to stop $himself from peppering $his s
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from an old world university. The caller, surprisingly, is a beautiful woman in $his thirties who speaks with a richly lilting accent and a literary vocabulary. "I'm afraid," $he says sadly, "it's come to slavery, for me. I am no longer a girl, but I can make some claim to beauty. I know many stories and can tell them cleverly; I can sing and dance well. I know you are not looking for a Scheherazade, but I could play her part. Nor am I naive; I know the Sultan enjoyed her body as well as her wit, and I am not unskilled in those respects, either." $He looks you straight in the eye. "May I come into your harem? I will do my best to brighten it."
+The call comes in from an old world university. The caller, surprisingly, is a beautiful woman in $his thirties who speaks with a richly lilting accent and a literary vocabulary. "I'm afraid," $he says sadly, "it's come to slavery, for me. I am no longer a girl, but I can make some claim to beauty. I know many stories and can tell them cleverly; I can sing and dance well. I know you are not looking for a Scheherazade, but I could play her part. Nor am I naïve; I know the Sultan enjoyed her body as well as her wit, and I am not unskilled in those respects, either." $He looks you straight in the eye. "May I come into your harem? I will do my best to brighten it."
<<case "Chinese Revivalist">>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 124df56b947622de3dac64bf9ac1b359c36596c2..012e5e288deb146ee9c3cbeb453baec0675a8059 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -2,7 +2,9 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check", $showEncyclopedia = 1, $encyclopedia = "Free Cities Justice", $applyLaw = 0>>
-<<if $malefactor == "addict">>
+<<switch $malefactor>>
+
+<<case "addict">>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for attempted burglary.">>
@@ -31,9 +33,7 @@
<<set $activeSlave.clitPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "odd">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. She's now lying in a pool of her own urine with a taser round stuck in her ass; the drone responsible is hovering helpfully nearby, hitting her with another shock whenever she does more than twitch.
-
-<<elseif $malefactor == "escapee">>
+<<case "escapee">>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate New Slave">>
@@ -63,9 +63,7 @@
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.behavioralFlaw = "odd">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. The criminal is anything but usual, however. She bears signs of extreme hormone manipulation over a long period, and has had her Achilles tendons clipped. Camera records show her crawling in with a cargo shipment. She's clad in rags, and you cannot find any record of her anywhere. The growing crowd is convinced she's an escaped slave, and is growing ugly.
-
-<<elseif $malefactor == "anchorBaby">>
+<<case "anchorBaby">>
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
<<set $activeSlaveOneTimeMaxAge = 42>>
@@ -95,9 +93,7 @@
<<set $activeSlave.sexualFlaw = "crude">>
<<set $activeSlave.behavioralFlaw = "bitchy">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and is waiting detainment. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is likely another case of attempted escape by a slave or potentially a smuggling operation. The cause of detection is a steady stream of moaning emanating from a cargo container recently deposited into the arcology's cargo depot and has attracted a crowd of curious onlookers. Video feeds show the container being open and a heavily pregnant <<if $activeSlave.physicalAge > 30>>woman<<elseif $activeSlave.physicalAge > 19>>young woman<<elseif $activeSlave.physicalAge > 12>>teenager<<else>>little girl<</if>> staggering out while clutching a newborn to her breast and struggling to hold back her second child from being born. From what little language she knows, she seems to think that just giving birth in your arcology is enough to become a proper citizen; as expected, she squats and pushes out the other brat as you arrive. The growing crowd is becoming unruly, and her inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
-
-<<elseif $malefactor == "orphanloli">>
+<<case "orphanloli">>
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 12>>
@@ -135,9 +131,7 @@
<<set $activeSlave.sexualFlaw = "apathetic">>
<<set $activeSlave.behavioralFlaw = "gluttonous">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. Several reports of petty theft were made in the area recently as well. The criminal is anything but usual, however. She is very young, emaciated, and desperate. Camera records show her crawling in through an air vent. She's clad in rags, clutching a presumably stolen apple, and you cannot find any record of her anywhere. The growing crowd is convinced she's an escaped slave, and her inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
-
-<<elseif $malefactor == "businesswoman">>
+<<case "businesswoman">>
<<set $activeSlaveOneTimeMinAge = 35>>
<<set $activeSlaveOneTimeMaxAge = 43>>
@@ -169,9 +163,7 @@
<<set $activeSlave.hStyle = "fashionable for a Free Cities businesswoman, up in a tight bun">>
<<set $activeSlave.customTat = "She has a pretty floral tattoo along her collarbone.">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a hitherto well-respected businesswoman, has left the straight and narrow. It seems her business affairs took a decisive turn for the worse, so she attempted to drain her clients' funds and leave your arcology before anyone was the wiser. Unfortunately for her, your security drones, controlled by $assistantName, were very much the wiser. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled the completest proofs of corporate malfeasance you have ever seen. Your wretched tenant signed a contract with you that included provisions forbidding theft. She is entirely at your mercy.
-
-<<elseif $malefactor == "whore">>
+<<case "whore">>
<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>>
@@ -214,9 +206,7 @@
<<set $activeSlave.hStyle = "strip">>
<<set $activeSlave.customTat = "She has a tear tattooed under each eye.">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a free whore, has been systematically stealing from clients. She was furtive enough to get away with it for a time, but has now been caught red-handed. The john who caught her attempted to stop her, and she fought him: like many prostitutes she carried a weapon in her handbag, and the man is severely wounded. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled a staggering dossier of video logs and personal testimony from previous customers who now understand where their personal belongings went, as well as appalling footage of today's victim's injuries. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. She is entirely at your mercy.
-
-<<elseif $malefactor == "rapist">>
+<<case "rapist">>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $oneTimeDisableDisability = 1>>
@@ -240,9 +230,7 @@
<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.sexualFlaw = "hates men">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants saw fit to rape a free woman. Within ten minutes, the inhuman efficiency of $assistantName has compiled video recordings, physical evidence, and even the victim's testimony, which is quite consistent with the first two. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. He is entirely at your mercy.
-
-<<elseif $malefactor == "mule">>
+<<case "mule">>
<<set $activeSlaveOneTimeMinAge = 13>>
<<if $pedo_mode == 1>>
@@ -280,15 +268,7 @@
<<set $activeSlave.behavioralFlaw = "shamefast">>
<<set $activeSlave.accent = 0>>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a potential criminal has been detected by your security systems and is now being tailed by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems, but some individuals still make attempts to fool them. In this case, the cameras are fixed on a clearly pregnant, and hugely at that, woman as she works her way through the crowded market sectors. You watch as she repeatedly bumps into other patrons and stalls, pausing to apologize before proceeding on her way, as if she wasn't familiar with her gravid swell. Her body is also clearly underdeveloped for someone ready to drop quadruplets at any moment; thin, with barely any hips to speak of and a pert bust clearly not swollen with milk. She even walks like a woman not burdened with nine months of gestating multiples, let alone a single. As she stumbles under her own weight, her shirt rides up, giving you a clear view of the deep red stretch marks of a belly that grew far faster than it could handle. You've seen enough and order the drones to corral her until security arrives. Her expression shifts from fear as they encircle her to panic as a groan escapes her lips. She grabs her stomach as a capsule falls to the floor. As another contraction hits her, she drops to the ground and begins to "give birth" to her illegal cargo.
-<<if $bellyImplants == 1>>
- She likely has belly implant designed to carry foreign objects inside her womb and, having lost her composure, is now vacating its contents.
-<<else>>
- You have no idea what you are witnessing until <<if $assistantName == "your personal assistant">>your personal assistant pulls up an advertisement for a fillable womb located implant<<else>>$assistantName introduces you to a fillable womb located implant<</if>> that she likely has installed.
-<</if>>
-She is easily taken into custody and her contraband confiscated once the jeering crowd is dispersed enough to reach her.
-
-<<else>>
+<<case "liberator">>
<<set $activeSlaveOneTimeMinAge = random(12,28)>>
<<set $activeSlaveOneTimeMaxAge = 43>>
@@ -314,9 +294,55 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<set $activeSlave.hStyle = "shaved into a mohawk">>
<<set $activeSlave.customTat = "She seems to have had slave tattoos at one time, but has had them cheaply removed.">>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, but this is a special case. A well-muscled, well-armed woman was caught attempting to smuggle a slave owned by one of your tenants out of the arcology. Though the slave surrendered immediately (and will be dealt with by her owner), the would-be liberatrix was caught by your security drones. She destroyed two of them and caused @@.red;other minor damage@@<<set $cash -= 1000>> that will require a small sum to repair, but was eventually subdued. The drones had to expend a great deal of nonlethal ordnance to bring her down and keep her down, but she is now entirely at your mercy.
+<</switch>>
+
+<<setLocalPronouns $activeSlave>>
+
+<<switch $malefactor>>
+
+<<case "addict">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. $He's now lying in a pool of her own urine with a taser round stuck in her ass; the drone responsible is hovering helpfully nearby, hitting her with another shock whenever she does more than twitch.
+
+<<case "escapee">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. The criminal is anything but usual, however. She bears signs of extreme hormone manipulation over a long period, and has had her Achilles tendons clipped. Camera records show her crawling in with a cargo shipment. She's clad in rags, and you cannot find any record of her anywhere. The growing crowd is convinced she's an escaped slave, and is growing ugly.
+
+<<case "anchorBaby">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and is waiting detainment. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is likely another case of attempted escape by a slave or potentially a smuggling operation. The cause of detection is a steady stream of moaning emanating from a cargo container recently deposited into the arcology's cargo depot and has attracted a crowd of curious onlookers. Video feeds show the container being open and a heavily pregnant <<if $activeSlave.physicalAge > 30>>woman<<elseif $activeSlave.physicalAge > 19>>young woman<<elseif $activeSlave.physicalAge > 12>>teenager<<else>>little girl<</if>> staggering out while clutching a newborn to her breast and struggling to hold back her second child from being born. From what little language she knows, she seems to think that just giving birth in your arcology is enough to become a proper citizen; as expected, she squats and pushes out the other brat as you arrive. The growing crowd is becoming unruly, and her inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
+
+<<case "orphanloli">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. Several reports of petty theft were made in the area recently as well. The criminal is anything but usual, however. She is very young, emaciated, and desperate. Camera records show her crawling in through an air vent. She's clad in rags, clutching a presumably stolen apple, and you cannot find any record of her anywhere. The growing crowd is convinced she's an escaped slave, and her inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
+
+<<case "businesswoman">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a hitherto well-respected businesswoman, has left the straight and narrow. It seems her business affairs took a decisive turn for the worse, so she attempted to drain her clients' funds and leave your arcology before anyone was the wiser. Unfortunately for her, your security drones, controlled by $assistantName, were very much the wiser. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled the completest proofs of corporate malfeasance you have ever seen. Your wretched tenant signed a contract with you that included provisions forbidding theft. She is entirely at your mercy.
+
+<<case "whore">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a free whore, has been systematically stealing from clients. $He was furtive enough to get away with it for a time, but has now been caught red-handed. The john who caught $him attempted to stop $him, and she fought him: like many prostitutes she carried a weapon in $his handbag, and the man is severely wounded. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled a staggering dossier of video logs and personal testimony from previous customers who now understand where their personal belongings went, as well as appalling footage of today's victim's injuries. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
+
+<<case "rapist">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants saw fit to rape a free woman. Within ten minutes, the inhuman efficiency of $assistantName has compiled video recordings, physical evidence, and even the victim's testimony, which is quite consistent with the first two. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
+<<case "mule">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a potential criminal has been detected by your security systems and is now being tailed by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems, but some individuals still make attempts to fool them. In this case, the cameras are fixed on a clearly pregnant, and hugely at that, woman as she works her way through the crowded market sectors. You watch as she repeatedly bumps into other patrons and stalls, pausing to apologize before proceeding on her way, as if she wasn't familiar with her gravid swell. Her body is also clearly underdeveloped for someone ready to drop quadruplets at any moment; thin, with barely any hips to speak of and a pert bust clearly not swollen with milk. She even walks like a woman not burdened with nine months of gestating multiples, let alone a single. As she stumbles under her own weight, her shirt rides up, giving you a clear view of the deep red stretch marks of a belly that grew far faster than it could handle. You've seen enough and order the drones to corral her until security arrives. Her expression shifts from fear as they encircle her to panic as a groan escapes her lips. She grabs her stomach as a capsule falls to the floor. As another contraction hits her, she drops to the ground and begins to "give birth" to her illegal cargo.
+<<if $bellyImplants == 1>>
+ She likely has belly implant designed to carry foreign objects inside her womb and, having lost her composure, is now vacating its contents.
+<<else>>
+ You have no idea what you are witnessing until <<if $assistantName == "your personal assistant">>your personal assistant pulls up an advertisement for a fillable womb located implant<<else>>$assistantName introduces you to a fillable womb located implant<</if>> that she likely has installed.
<</if>>
+She is easily taken into custody and her contraband confiscated once the jeering crowd is dispersed enough to reach her.
+
+<<case "liberator">>
+
+<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, but this is a special case. A well-muscled, well-armed woman was caught attempting to smuggle a slaveowned by one of your tenants out of the arcology. Though the slave surrendered immediately (and will be dealt with by her owner), the would-be liberatrix was caught by your security drones. She destroyed two of them and caused @@.red;other minor damage@@<<set $cash -= 1000>> that will require a small sum to repair, but was eventually subdued. The drones had to expend a great deal of nonlethal ordnance to bring her down and keep her down, but she is now entirely at your mercy.
+
+<</switch>>
<br><br>
@@ -324,7 +350,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<slaveCost $activeSlave>>
<<set $slaveCost -= 1000>>
-//Applying enslavement as punishment will cost <<print cashFormat($contractCost)>>. Doing so and then selling her immediately will bring in approximately <<print cashFormat($slaveCost)>>.//
+//Applying enslavement as punishment will cost <<print cashFormat($contractCost)>>. Doing so and then selling $him immediately will bring in approximately <<print cashFormat($slaveCost)>>.//
<br><br>
@@ -334,7 +360,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<span id="result">
<<if $cash >= $contractCost>>
- <<link "Enslave her">>
+ <<link "Enslave $him">>
<<set $cash -= $contractCost>>
<<replace "#result">>
<<switch $malefactor>>
@@ -346,15 +372,15 @@ She is easily taken into custody and her contraband confiscated once the jeering
You complete the legalities and biometric scanning quickly and without fuss. She sobs throughout the process, though stops once she realizes being a slave means free food.
<<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and without fuss. She doesn't stop screaming "citizenship" until her children are taken from her and she is shoved off to the penthouse for basic slave induction.
- <<case "whore" "rapist" "businesswoman" "mule">>
+ <<case "businesswoman" "mule" "rapist" "whore">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction.
- <<default>>
+ <<case "liberator">>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does.
<</switch>>
<<include "New Slave Intro">>
<</replace>>
<</link>>
- <br><<link "Sentence her to a day in the stocks, then enslave her">>
+ <br><<link "Sentence $him to a day in the stocks, then enslave $him">>
<<set $activeSlave.health -= 10>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.sexualFlaw = "hates penetration">>
@@ -377,33 +403,34 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<if $activeSlave.publicCount>><<set $activeSlave.publicCount += _fuckCount>><<else>><<set $activeSlave.publicCount = _fuckCount>><</if>>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $malefactor == "addict">>
- You declare her holes fair game for the entire arcology, since she must somehow repay her debt to society. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "escapee">>
- You declare her holes fair game for the entire arcology, so that all free citizens can own her for a moment, if they wish. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "orphanloli">>
+ <<switch $malefactor>>
+ <<case "addict">>
+ You declare $his holes fair game for the entire arcology, since she must somehow repay her debt to society. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
+ <<case "escapee">>
+ You declare $his holes fair game for the entire arcology, so that all free citizens can own her for a moment, if they wish. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
+ <<case "orphanloli">>
You declare her holes fair game for the entire arcology, so that all free citizens can own her for a moment, if they wish. She spends a torturous day in the stocks before being hauled in for enslavement, @@.red;completely broken@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
<<set $activeSlave.fetish = "mindbroken">>
- <<elseif $malefactor == "anchorBaby">>
- You declare her holes fair game for the entire arcology; since she wants to produce future slaves, your arcology might as well have the privilege of fathering them. She spends a torturous day in the stocks after her children are taken to a slave orphanage before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "businesswoman">>
+ <<case "anchorBaby">>
+ You declare her holes fair game for the entire arcology; since she wants to produce future slaves, your arcology might as well have the privilege of fathering them. She spends a torturous day in the stocks after $his children are taken to a slave orphanage before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
+ <<case "businesswoman">>
You declare her holes fair game for the entire arcology, in payment for her crimes. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "whore">>
+ <<case "whore">>
You declare her holes fair game for the entire arcology, to repay her thefts. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "rapist">>
+ <<case "rapist">>
You declare her holes fair game for the entire arcology. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<elseif $malefactor == "mule">>
+ <<case "mule">>
You declare her holes fair game for the entire arcology as punishment for trying to smuggle in a load instead of taking one. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
- <<else>>
- Slaveownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. Her holes are thus fair game for the entire arcology. She spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to her ordeal, bruises all over her body, cum leaking from her @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun,@@ and small slaveholders are @@.green;encouraged to do business with your arcology@@ after word of the incident gets around.
- <</if>>
+ <<case "liberator">>
+ Slaveownership is the cornerstone of the society you're building in your arcology, and this $woman attempted to undermine it. $His holes are thus fair game for the entire arcology. $He spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to $his ordeal, bruises all over $his body, cum leaking from $his @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun,@@ and small slaveholders are @@.green;encouraged to do business with your arcology@@ after word of the incident gets around.
+ <</switch>>
<<set $rep += 100>>
<<set $arcologies[0].prosperity += 2>>
<<include "New Slave Intro">>
<</replace>>
<</link>>
<<if $arcade > 0>>
- <br><<link "Enslave her and sentence her to a month in the arcade">>
+ <br><<link "Enslave $him and sentence $him to a month in the arcade">>
<<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.sentence = 4>>
@@ -416,9 +443,9 @@ She is easily taken into custody and her contraband confiscated once the jeering
You complete the legalities and biometric scanning quickly, and tell the crowd that her holes will be available at the arcade within the hour. The public @@.green;looks forward@@ to seeing her there, angrily suspecting her of being an escapee and glad that they'll be able to take part in her punishment.
<<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and have her children taken away. The condemned screeches her displeasure throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there and vying to see who gets to fill her womb with another child.
- <<case "whore" "rapist" "mule" "businesswoman">>
+ <<case "businesswoman" "mule" "rapist" "whore">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned sobs and begs throughout the process until you grow tired of the whining and sedate her for immurement in the arcade. The public @@.green;looks forward@@ to seeing her there and getting some of their own back.
- <<default>>
+ <<case "liberator">>
You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. It would be best to have her restrained for public use in the arcade first. The public @@.green;looks forward@@ to seeing her there.
<</switch>>
<<set $rep += 50>>
@@ -429,27 +456,28 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<if $malefactor != "mule">>
<<if $dairy > 0>>
<<if $dairyRestraintsSetting > 1>>
- <br><<link "Enslave her and send her straight to the industrial dairy">>
+ <br><<link "Enslave $him and send $him straight to the industrial dairy">>
<<= assignJob($activeSlave, "work in the dairy")>>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned accepts a sedative, thinking it's aphrodisiacs, and her unconscious body is installed in $dairyName. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the addict's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<else>>breasts as they are roughly milked<</if>>, together with a lengthy report on the experimental detox process used to ensure that the milk she produces will be untainted.
- <<elseif $malefactor == "escapee">>
+ <<case "escapee">>
You complete the legalities and biometric scanning quickly. The condemned is too far gone to resist as she is installed in $dairyName. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<else>>breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "orphanloli">>
+ <<case "orphanloli">>
You complete the legalities and biometric scanning quickly. The condemned is too weak to resist as she is installed in $dairyName but she weeps the entire time. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>agony as her once tight pussy adapts to industrial reproduction<<else>>budding breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and cautiously before having her children taken away. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her next batch of slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "businesswoman">>
+ <<case "businesswoman">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her first slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "whore">>
+ <<case "whore">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her well-traveled pussy adapts to industrial reproduction<<elseif $dairyStimulatorsSetting > 1>>discomfort as her well-traveled anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "rapist">>
+ <<case "rapist">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the rapist's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>newly growing breasts as they are roughly milked<</if>>.
- <<else>>
+ <<case "liberator">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<elseif $dairyStimulatorsSetting > 1>>discomfort as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>, together with a report on the likely productivity of such a fit body capable of withstanding the stress of high throughput.
- <</if>>
+ <</switch>>
<<set $rep += 50>>
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
@@ -458,45 +486,46 @@ She is easily taken into custody and her contraband confiscated once the jeering
<</if>> /* closes dairy > 0 */
<</if>>
<<if $seeExtreme > 0>>
- <br><<link "Punitively amputate her limbs, and then enslave her">>
+ <br><<link "Punitively amputate $his limbs, and then enslave $him">>
<<set $activeSlave.health -= 20>>
<<set $activeSlave.amp = 1>>
<<set $activeSlave.heels = 0>>
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $cash -= $contractCost>>
<<replace "#result">>
- <<if $malefactor == "addict">>
+ <<switch $malefactor>>
+ <<case "addict">>
An example must be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs for a fix until she realizes what's coming, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "escapee">>
+ <<case "escapee">>
An example must be made. If she escaped once with her tendons clipped, she must be rather talented at it. It remains to be seen if she can manage to escape with nor arms and legs, so you announce her sentence to the crowd and send her unconscious form for reduction. Of course, @@.red;her health is affected.@@ The public @@.green;approves of this harshness,@@ believing that you have taken strong measures against escapees.
- <<elseif $malefactor == "orphanloli">>
+ <<case "orphanloli">>
An example must be made. If she thinks she can escape captivity and steal to survive, lets see her try without arms and legs, so you announce her sentence to the crowd and send her unconscious form for reduction. Of course, @@.red;her health is affected.@@ The public @@.green;approves of this harshness,@@ believing that you have taken strong measures against escapees.
- <<elseif $malefactor == "anchorBaby">>
+ <<case "anchorBaby">>
An example must be made. Potential immigrants must understand that attempting to circumvent the process will result in severe fines and proportional punishment when they are incapable of paying them. The protesting mother is stripped, both of clothing and children, and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly attempt to smuggle things into your arcology without the ability to move.
- <<elseif $malefactor == "businesswoman">>
+ <<case "businesswoman">>
An example must be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness.@@
- <<elseif $malefactor == "whore">>
+ <<case "whore">>
An example must be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly attempt to steal anything without hands.
- <<elseif $malefactor == "rapist">>
+ <<case "rapist">>
An example must be made. Rape is rare in your arcology, since citizens are so generously provided with means of sexual outlet. When the price of renting a slave that's impossible to rape is as low as it is, sexual assault of a free woman is doubly unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since even if she cheers up and ever manages an erection again, she's not likely to rape anyone without arms or legs.
- <<elseif $malefactor == "mule">>
- An example must be made. With the quantity of drugs consumed in the arcology, quality is everything and attempting to undermine that is unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she can hardly haul contraband into your arcology without the ability to move herself.
- <<else>>
- An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since she will scarcely be able to liberate anyone without arms or legs.
- <</if>>
+ <<case "mule">>
+ An example must be made. With the quantity of drugs consumed in the arcology, quality is everything and attempting to undermine that is unforgivable. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. She begs and pleads until she sees her doom in the form of the surgical machinery, at which point she switches to fighting vainly to escape. Of course, @@.red;her health is affected@@ and the horrible experience has left her @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since $he can hardly haul contraband into your arcology without the ability to move $himself.
+ <<case "liberator">>
+ An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this $woman attempted to undermine it. The protesting malefactor is stripped and stuffed into your remote surgery on public video feed. $He begs and pleads until $he sees $his doom in the form of the surgical machinery, at which point $he switches to fighting vainly to escape. Of course, @@.red;$his health is affected@@ and the horrible experience has left $him @@.red;acting oddly.@@ Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ since $he will scarcely be able to liberate anyone without arms or legs.
+ <</switch>>
<<set $rep += 100>>
<<include "New Slave Intro">>
<</replace>>
<</link>>
<<if $malefactor == "rapist" && $activeSlave.balls > 0>>
- <br><<link "Enslave the criminal and geld her">>
+ <br><<link "Enslave the criminal and geld $him">>
<<set $activeSlave.health -= 20>>
<<set $activeSlave.balls = 0>>
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.trust -= 25>>
<<set $cash -= $contractCost>>
<<replace "#result">>
- Video feeds from your remote surgery are made public as the protesting criminal is strapped down and gelded. She is so utterly broken by this turn of events that you complete the legalities and biometric scanning without fuss. The condemned sobs weakly throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ which increases your arcology's prosperity by @@.green;giving it a reputation for swift and terrible justice.@@
+ Video feeds from your remote surgery are made public as the protesting criminal is strapped down and gelded. $He is so utterly broken by this turn of events that you complete the legalities and biometric scanning without fuss. The condemned sobs weakly throughout the process until you grow tired of the whining and apply punishment. Then it's off to the penthouse for basic slave induction. The public @@.green;approves of this harshness,@@ which increases your arcology's prosperity by @@.green;giving it a reputation for swift and terrible justice.@@
<<set $rep += 100>>
<<set $arcologies[0].prosperity += 10>>
<<include "New Slave Intro">>
@@ -505,7 +534,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<</if>>
<</if>> /* closes seeExtreme */
<<if $malefactor == "orphanloli">>
- <br><<link "'Adopt' her">>
+ <br><<link "'Adopt' $him">>
<<set $activeSlave.devotion = 25>>
<<set $activeSlave.trust = 25>>
<<set $cash -= $contractCost>>
@@ -527,7 +556,7 @@ She is easily taken into custody and her contraband confiscated once the jeering
<</if>>
<<if $malefactor == "anchorBaby">>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
- <br><<link "Grant her citizenship">>
+ <br><<link "Grant $him citizenship">>
<<replace "#result">>
You help the exhausted mother to her feet and hand her her second newborn. She watches you, uncertain of your motives, until you have her escorted to the proper welcoming facility and put in a good word for having her added to your arcology's free population. You announce to the public that such a fertile <<if $activeSlave.physicalAge > 30>>milf<<elseif $activeSlave.physicalAge > 19>>woman<<elseif $activeSlave.physicalAge > 12>>teen<<else>>youth<</if>> will be a boon to Repopulationism, and that the contract she is signing mandates she be on powerful fertility agents whenever she isn't pregnant. During her residency, free or not, she will provide society with dozens of future children. The public @@.green;approves of breeders, free or not,@@ and word spreads that any and all mothers are welcome into your arcology @@.green;adding to its prosperity.@@
<<set $rep += 10>>
@@ -546,27 +575,27 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<case "orphanloli">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The crying girl is flogged on the promenade before being dragged bleeding and broken out of the arcology. The public @@.green;approves of this harshness.@@
<<case "anchorBaby">>
- Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The screaming breeder is flogged on the promenade before being dragged bleeding and broken out of the arcology sans her children; they are destined for the slave orphanage. The public @@.green;approves of this harshness.@@
+ Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The screaming breeder is flogged on the promenade before being dragged bleeding and broken out of the arcology sans $his children; they are destined for the slave orphanage. The public @@.green;approves of this harshness.@@
<<case "businesswoman">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <<case "whore" "mule" "rapist">>
+ <<case "mule" "rapist" "whore">>
Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
- <<default>>
- An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
+ <<case "liberator">>
+ An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this $woman attempted to undermine it. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
<</switch>>
<<set $rep += 100>>
<</replace>>
<</link>>
<<if $malefactor == "liberator">>
-<br><<link "Permit the slaveowner she tried to steal from to flog her">>
+<br><<link "Permit the slaveowner $he tried to steal from to flog $him">>
<<replace "#result">>
- An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this woman attempted to undermine it. She is stripped and the slaveowner whose property she tried to free is handed the leathern instrument. It seems the escapee was a favorite he does not wish to mangle, so he flogs the criminal mercilessly instead. She is flung out of the arcology, nearly dead. The public @@.green;approves of this harshness,@@ and small slaveholders are @@.green;encouraged to do business with your arcology@@ after word of the incident gets around.
+ An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this $woman attempted to undermine it. $He is stripped and the slaveowner whose property $he tried to free is handed the leathern instrument. It seems the escapee was a favorite he does not wish to mangle, so he flogs the criminal mercilessly instead. $He is flung out of the arcology, nearly dead. The public @@.green;approves of this harshness,@@ and small slaveholders are @@.green;encouraged to do business with your arcology@@ after word of the incident gets around.
<<set $rep += 100>>
<<set $arcologies[0].prosperity += 10>>
<</replace>>
<</link>>
<</if>>
-<br><<link "Sell her immediately">>
+<br><<link "Sell $him immediately">>
<<set $cash += $slaveCost>>
<<if $cash4Babies == 1 && $malefactor == "anchorBaby">>
<<set $cash += random(20,30)>>
@@ -576,15 +605,15 @@ She is easily taken into custody and her contraband confiscated once the jeering
<<case "addict">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned recovers enough by the end of the process to start masturbating weakly, even as she begins begging for a fix. Then it's off to slave markets for sale.
<<case "escapee">>
- You complete the legalities and biometric scanning quickly and without fuss. She remains limp throughout the process, only recovering enough to barely grasp the situation as she is enslaved and heading to the slave markets.
+ You complete the legalities and biometric scanning quickly and without fuss. She remains limp throughout the process, only recovering enough to barely grasp the situation as she is enslaved and heading to the slave markets.
<<case "orphanloli">>
You complete the legalities and biometric scanning quickly and without fuss. She sobs throughout the process, though stops once she realizes being a slave means free food. She starts crying again once she realizes she is heading for the slave markets.
<<case "anchorBaby">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale. Her children <<if $cash4Babies == 1>>head off to be sold as well<<else>>will be sent to a slave orphanage for future sale<</if>>.
- <<case "businesswoman" "whore" "rapist" "mule">>
+ <<case "businesswoman" "mule" "rapist" "whore">>
You complete the legalities and biometric scanning quickly and without fuss. The condemned sobs and begs throughout the process until you grow tired of the whining and apply punishment. Then it's off to slave markets for sale.
- <<default>>
- You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does. You make sure that she isn't going to get loose as she is sent off to the slave market; the public would not be pleased if she went on another rampage.
+ <<case "liberator">>
+ You complete the legalities and biometric scanning quickly and cautiously. Though the would-be liberator is of course restrained, disarmed, and still sedated, she could awake at any time. Based on the drone logs, she is likely to be violent when she does. You make sure that she isn't going to get loose as $he is sent off to the slave market; the public would not be pleased if she went on another rampage.
<</switch>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 44531ceeb046ace6256994002618ec69cd4a7d57..6524956b007e213901139f52aa5157ca032a6a14 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -103,7 +103,7 @@
<</if>>
fuck me. It'll be fun!" The tourist turns to stare at _him2, and _he2 offers just the right kind of plaintive expression. "O-okay," the tourist says in a tiny voice, and _milfSlave.slaveName giggles, hugging _him2 from behind. $He cups one of the tourist's breasts, and snakes $his other hand down the front of _his2 pants. "Here!?" the tourist gasps, staring straight at you and blushing even harder. You tell _him2 that that's how you do things in the Free Cities: enjoying a slave is nothing to be ashamed of. _He2 looks doubtful, but _he2 doesn't try to escape from _milfSlave.slaveName's roving hands, either. Your presence continues to bother _him2 until _milfSlave.slaveName distracts _him2 by getting _him2 to cuddle on the couch and make out, providing enough of a distraction that _he2 gets over _his2 inhibitions and orgasms rather immodestly.
<br><br>
- You offer _him2 some liquid courage as _he2 recovers, but _he2's rapidly getting over _his2 hesitation. As the alcohol suffuses _him2, _he2 starts stealing glances at _milfSlave.slaveName, who for $his part is being as seductive as humanly possible. Finally, the tourist mouths 'fuck it' silently, reaches over, and openly gropes the slave's ass. _milfSlave.slaveName giggles and shifts lewdly, ensuring that the tourist's hand makes a thorough tour of everything the slave has. The tourist tentatively sinks a couple of fingers into _milfSlave.slaveName, and the slave shamelessly slides herself onto the invading digits, begging to be fucked. You make a party of it, with the various slaves who come and go over the course of the evening treated to the sight of _milfSlave.slaveName getting fucked by the tourist. _He2 drunkenly promises you to @@.green;tell all _his2 friends@@ how awesome your arcology is at one point, though _he2 has to take _his2 mouth off one of _milfSlave.slaveName's nipples to do so.
+ You offer _him2 some liquid courage as _he2 recovers, but _he2's rapidly getting over _his2 hesitation. As the alcohol suffuses _him2, _he2 starts stealing glances at _milfSlave.slaveName, who for $his part is being as seductive as humanly possible. Finally, the tourist mouths 'fuck it' silently, reaches over, and openly gropes the slave's ass. _milfSlave.slaveName giggles and shifts lewdly, ensuring that the tourist's hand makes a thorough tour of everything the slave has. The tourist tentatively sinks a couple of fingers into _milfSlave.slaveName, and the slave shamelessly slides $himself onto the invading digits, begging to be fucked. You make a party of it, with the various slaves who come and go over the course of the evening treated to the sight of _milfSlave.slaveName getting fucked by the tourist. _He2 drunkenly promises you to @@.green;tell all _his2 friends@@ how awesome your arcology is at one point, though _he2 has to take _his2 mouth off one of _milfSlave.slaveName's nipples to do so.
<<set $slaves[_milfed].trust += 4, $slaves[_milfed].oralCount += 3, $slaves[_milfed].analCount += 3>>
<<set $oralTotal += 3, $analTotal += 3>>
<<set $rep += 100>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 6ba7b5841f8dfbd956dcb1a1b40f08b13f5a814b..7ded12dd4149ab518e6ae93d1df1122e5144c40c 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1003,7 +1003,7 @@
<<case "server">>
<<set $nickname = either("'Bedwarmer'", "'Bottom'", "'Girltoy'", "'House Slave'", "'Lovergirl'", "'Please No'", "'Server'", "'Slave Slut'", "'Sub'", "'Submissive'")>>
<<set $situationDesc = "holds a place in the hierarchy of your penthouse that almost demands a nickname. $He is the lowest of the low, below even your other slaves. $He is a pitiable creature, living with a large number of sexually charged people, slave and free, all of whom have the right to demand any sexual service they wish of $him.">>
- <<set $applyDesc = "has become almost proud of $his strange, exhausting situation. Hers is not the struggle of slaves to know their place, for $he knows $hers. It is on the bottom.">>
+ <<set $applyDesc = "has become almost proud of $his strange, exhausting situation. $Hers is not the struggle of slaves to know their place, for $he knows $hers. It is on the bottom.">>
<<set $notApplyDesc = "begins to hope a little that maybe $he can rise beyond $his current station.">>
<<case "nipples">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 5397c7425cd488af1859fa7922df41e45badb2cb..3af67c31bfedd68c187dcad80a9d49dc2d059102 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -412,7 +412,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<include "Generate XX Slave">>
-<<set $activeSlave.origin = "She asked to be enslaved out of naive infatuation with you.">>
+<<set $activeSlave.origin = "She asked to be enslaved out of naïve infatuation with you.">>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = random(-15,-10)>>
<<set $activeSlave.health = random(0,20)>>
@@ -2034,7 +2034,7 @@
Your head girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers a girl into your office. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
<br><br>
-"<<= properTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so graceful and beautiful and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks and stuff." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
+"<<= properTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so graceful and beautiful and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks and stuff." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
<<case "male recruit">>
@@ -2042,7 +2042,7 @@ Your head girl sends you a discreet message that _he2 may have found a slave for
Your head girl sends you a discreet message that _he2 may have found a slave for you. $HeadGirl.slaveName duly ushers an androgynous young person into your office. $He's dressed as a girl and acts like one. $He looks very young, like a dissolute party girl. $He bites $his lip nervously when $he sees you, and looks to $HeadGirl.slaveName for guidance. $HeadGirl.slaveName nods at $him reassuringly, so $he explains $himself.
<br><br>
-"<<= properTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so beautiful and has a dick like me and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks." $He seems to be a little naive about sexual slavery, but there's no need to tell $him that.
+"<<= properTitle()>>, my name is $activeSlave.slaveName. I'm, um, bored, I guess. I go to clubs and get drunk and fuck guys and it's just kinda boring. I thought it would be different when I turned <<print $activeSlave.actualAge>>, but that was a couple months ago and, well, nothing's different. I saw $HeadGirl.slaveName and _he2 was just so beautiful and has a dick like me and _he2 seemed so confident in what _he2 was doing and who _he2 was and I talked to _him2 and _he2 said _he2 was your head girl and... I want to be like _him2. Can I be your slave? I'd be good, I'm good at sucking dicks." $He seems to be a little naïve about sexual slavery, but there's no need to tell $him that.
<<case "whore recruit">>
@@ -2346,7 +2346,7 @@ Knowing what's coming, the teachers in the facility do train their pupils accord
<<case "captured teen">>
-You've been kept busy until late at night. The warm blue glow of your desk screen illuminates your work. Suddenly, your assistant flags an incoming vidcall as urgent. The call had decent encryption, but could be traced to a rural location several miles away from your arcology. The callers only specified that they had a good deal to offer.
+You've been kept busy until late at night. The warm blue glow of your desk screen illuminates your work. Suddenly, your assistant flags an incoming vidcall as urgent. The call had decent encryption, but could be traced to a rural location several <<if $showInches == 2>>miles<<else>>kilometers<</if>> away from your arcology. The callers only specified that they had a good deal to offer.
<br><br>
With apprehension, you decide to let the call through. The screen switches from your work to the vidcall. Several armed men, cloaked in black, are standing around a pretty young $girl. $He's gagged and bound to a chair.
<br><br>
@@ -2803,7 +2803,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<<if $PC.dick == 1>>
grab $his wiggling hips, and hilt your dick in $his tight ass. $He's clueless when it comes to anal, so the experience isn't too enjoyable for you. You leave $him with a <<print cashFormat(1)>> tip, a load of cum in $his butt, and a smile on $his face over getting any money at all.
<<else>>
- pull out a strapon you carry for just such an occasion, grab $his wiggling hips, and hilt yourself in $his tight ass. $He's clueless when it comes to anal, so the experience isn't too enjoyable for you. You leave $him with a <<print cashFormat(1)>> tip, a sore rear, and a smile on $his face over getting any money at all.
+ pull out a strap-on you carry for just such an occasion, grab $his wiggling hips, and hilt yourself in $his tight ass. $He's clueless when it comes to anal, so the experience isn't too enjoyable for you. You leave $him with a <<print cashFormat(1)>> tip, a sore rear, and a smile on $his face over getting any money at all.
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index e3215f38f544cce459d5857c81c2a71677619626..f63f1f71cb027269f111a58a90c4a72d2e3d560d 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -674,6 +674,11 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<</if>>
+<<if $SF.BadOutcome === "lockdown">>
+ Your citizens are @@.red;very displeased@@ that you are hosting a legion of heavily armed squatters in your basement.
+ <<set $rep -= $SF.Troops+$SF.Size>>
+<</if>>
+
<<if $secExp == 1>>
<<if $fakeNews == 1>>
The authenticity department produces and distributes copious amounts of plausible enough news and reports, @@.green;increasing your reputation.@@
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 1c298ceb16a17a888c9c8a11852e9d416bd583aa..c17dc6710c6b9851c523f1a64b77cfc8906e624e 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -770,7 +770,7 @@
<<elseif $RESFailure == "TCR">>
You receive a personal call from a senior representative of the Cattle Ranch, as you've been expecting since their second missed rent payment. "I apologize," he says with some embarrassment, "but it seems our expansion into your arcology was a mistake. It's strange - the business climate seemed excellent, and other corporations are doing well." He sighs. "Nevertheless, nothing ever seemed to go as planned. We'll be shutting our farm down immediately. In fact, it should be shut down within the hour. However, we lack the funds to remove some of our finest cattle and since we still owe you a little... We'd like to you to have them; we'll even have them delivered to your penthouse with the last of our credits." He hurriedly ends the call.
<<else>>
- The senior Sister of the community of Futanari Sisters in your arcology appears at your penthouse, as you've been expecting since their second missed rent payment. This is quite the occasion, since they never leave their little nest. $He's delightfully nude, and it occurs to you that the Sisters probably do not own clothing at all. $He has obviously been crying; puffy eyes and a sniffling nose mar $his gorgeous face. $He must have caused quite the sensation as $he made $his way here, in tears, gigantic tits and huge cock bouncing around. To your surprise, $he flings herself at your feet, $his dick making a painful-sounding slap against the floor and $his breasts squashing out to either side of $him.
+ The senior Sister of the community of Futanari Sisters in your arcology appears at your penthouse, as you've been expecting since their second missed rent payment. This is quite the occasion, since they never leave their little nest. $He's delightfully nude, and it occurs to you that the Sisters probably do not own clothing at all. $He has obviously been crying; puffy eyes and a sniffling nose mar $his gorgeous face. $He must have caused quite the sensation as $he made $his way here, in tears, gigantic tits and huge cock bouncing around. To your surprise, $he flings $himself at your feet, $his dick making a painful-sounding slap against the floor and $his breasts squashing out to either side of $him.
<br><br>
"Please," $he cries to your feet. "Please take us as slaves. We're indebted, and we'll all be enslaved. You're our friend, you'll treat us better than anyone." Then $he whispers, "Please, <<if $PC.surname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>>,<<else>><<print $PC.name>>,<</if>> don't make me beg." You tell the prostrate futa you accept. $His mood does not improve: $he scrabbles around to face away from you, plush body jiggling submissively, and raises $his buttocks to spread $his pussy and anus for you. "Thank you," $he weeps. "Now please rape me, <<Master>>. I deserve it. My mismanagement stole my Sisters' years of idyll from them. Please, rape me."
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 3e45f06d4830175a2ae884e862cdaff1c1923abb..cd8fbc42cc421b42e0af561ad85d87a550237347 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6274,7 +6274,7 @@
<<elseif $slaves[$i].fetish == "mindbroken">>
$He tries $his best to stay still to minimize the amount of discomfort $he's in.
<<else>>
- This is @@.mediumorchid;very worrying@@ to $him. $He moans in discomfort
+ This is @@.mediumorchid;very worrying@@ to $him. $He moans in discomfort
<<if $slaves[$i].bellyPreg > 100>>
with each movement within $him.
<<else>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 7e553ea66af2414bed62e77b4cecd22b7aa7b96f..3235207e566cfea0c43eed2cec6ec5d1d65a8b2e 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -51,7 +51,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _vaginalUse = random(3,7)>>
- on occasion.
+ on occasion.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
$He doesn't react, even if $his body does.
@@ -66,7 +66,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _vaginalUse = random(3,7)>>
- on occasion; the threat of
+ on occasion; the threat of
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
rape fills $him with @@.mediumorchid;revulsion@@ and @@.gold;fear.@@
@@ -88,7 +88,7 @@ serves you this week.
<<else>>
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _vaginalUse = random(21,40)>>
- several times a day; constant,
+ several times a day; constant,
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<elseif ($fuckSlaves <= $PC.sexualEnergy)>>
<<set _vaginalUse = random(7,14)>>
@@ -710,7 +710,7 @@ serves you this week.
on occasion;
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust += 3>>
<</if>>
- getting to dominantly fuck $his '<<= WrittenMaster($slaves[$i])>>' @@.mediumorchid;builds $his self-confidence,@@ yet @@.mediumaquamarine;makes $his more trusting@@ of you.
+ getting to dominantly fuck $his '<<= WrittenMaster($slaves[$i])>>' @@.mediumorchid;builds $his self-confidence,@@ yet @@.mediumaquamarine;makes $his more trusting@@ of you.
<<else>>
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _penetrativeUse = random(21,40)>>
@@ -1003,7 +1003,7 @@ serves you this week.
<<else>>
mouth<<if $PC.dick == 1 && $slaves[$i].nipples == "fuckable">>and nipples<</if>>
<</if>>
- to save herself from worse treatment than mere rape.
+ to save $himself from worse treatment than mere rape.
<<if ($slaves[$i].dick != 0) && canAchieveErection($slaves[$i]) && $slaves[$i].dickAccessory != "chastity" && $slaves[$i].dickAccessory != "combined chastity">>
By the end of the week $he gets a hardon when you use $him.
<</if>>
@@ -1276,7 +1276,7 @@ Keeping $him as nothing but your personal
$slaves[$i].slaveName @@.mediumaquamarine;confidently enjoys@@ the prestige within the slave hierarchy that comes with being your fucktoy.
<<set $slaves[$i].trust += 1>>
<<elseif ($slaves[$i].behavioralQuirk == "insecure")>>
- $slaves[$i].slaveName @@.mediumaquamarine;constantly reassures herself@@ that $he must be pretty, since you keep $him as a fucktoy.
+ $slaves[$i].slaveName @@.mediumaquamarine;constantly reassures $himself@@ that $he must be pretty, since you keep $him as a fucktoy.
<<set $slaves[$i].trust += 1>>
<</if>>
<<if ($slaves[$i].behavioralQuirk == "adores men")>>
@@ -1305,7 +1305,7 @@ Keeping $him as nothing but your personal
<<set $slaves[$i].fetishStrength += 4>>
<</if>>
<<elseif _fetishChangeChance > random(0,100) && ($PC.preg >= 20 || ($PC.preg >= 16 && $PC.career == "escort"))>>
- At first $he found the prospect of being used by $his increasingly pregnant <<= WrittenMaster($slaves[$i])>> a turn off, but being so close to your gravid form serves to be more erotic than $he anticipated. Soon $he finds herself aroused less from the prospect of sex and more @@.lightcoral;the chance to be near your child laden belly.@@
+ At first $he found the prospect of being used by $his increasingly pregnant <<= WrittenMaster($slaves[$i])>> a turn off, but being so close to your gravid form serves to be more erotic than $he anticipated. Soon $he finds $himself aroused less from the prospect of sex and more @@.lightcoral;the chance to be near your child laden belly.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index da57b71eb264ba34e2764ad5ab322a387dd1cb1a..0589962ccc3ad7caa68a6f517e9658d33795ff42 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -775,7 +775,7 @@
<<if $arcologies[0].FSGenderRadicalist != "unset">>
<<if $slaves[$i].dick > 0 && ($slaves[$i].balls < 1 || $slaves[$i].boobs > 400)>>
<<if $slaves[$i].anus > 0>>
- $His public demonstrations of just how hard feminized sissies can orgasm with buttsex – at a different interior balcony each day – draw plenty of attention.
+ $His public demonstrations of just how hard feminized sissies can orgasm with buttsex — at a different interior balcony each day — draw plenty of attention.
<<else>>
$He attracts a little attention by gaily showing off $his <<if $slaves[$i].balls < 1>>soft bitch-clit<<else>>intersex anatomy<</if>> on the public thoroughfares of your arcology, being careful not to risk $his virgin backdoor.
<</if>>
diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw
index 18644819444dc1cfe43e226193b1f73b7bc8abf9..31c1fff60b596cecd3c5c32104bffc9e05b5fc92 100644
--- a/src/uncategorized/saServeYourOtherSlaves.tw
+++ b/src/uncategorized/saServeYourOtherSlaves.tw
@@ -150,7 +150,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<if ($slaves[$i].devotion < -20)>>
Since $slaves[_dom].slaveName loves anal, $slaves[$i].slaveName finds $himself forced to use $his stiff prick to please $slaves[_dom].slaveName's insatiable ass. $He spends the week trying to avoid $slaves[_dom].slaveName, because $slaves[_dom].slaveName won't stop forcing $him to get $his _subRace dick hard so $slaves[_dom].slaveName can ride _his2 _domRace butt up and down on it. @@.hotpink;$slaves[_dom].slaveName enjoys having _his2 own personal cock for the week,@@ even if it does have to be persuaded.
<<elseif ($slaves[$i].devotion <= 50)>>
- Since $slaves[_dom].slaveName loves anal, $slaves[$i].slaveName finds $himself constantly asked to use $his stiff prick to please $slaves[_dom].slaveName's insatiable ass. $He spends the week desperately trying to keep herself hard, because $slaves[_dom].slaveName constantly expects $his _subRace dick to be hard so $slaves[_dom].slaveName can ride _his2 _domRace butt up and down on it. @@.hotpink;$slaves[_dom].slaveName enjoys having _his2 own personal cock for the week.@@
+ Since $slaves[_dom].slaveName loves anal, $slaves[$i].slaveName finds $himself constantly asked to use $his stiff prick to please $slaves[_dom].slaveName's insatiable ass. $He spends the week desperately trying to keep $himself hard, because $slaves[_dom].slaveName constantly expects $his _subRace dick to be hard so $slaves[_dom].slaveName can ride _his2 _domRace butt up and down on it. @@.hotpink;$slaves[_dom].slaveName enjoys having _his2 own personal cock for the week.@@
<<else>>
$slaves[_dom].slaveName loves anal and $slaves[$i].slaveName has a stiff prick. The two of them have good fun together.
<<if $slaves[_dom].amp != 1>>
@@ -193,7 +193,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<set _penetrativeUse = random(9,12)>>
<<if $slaves[$i].amp == 1>>
<<if canDoVaginal($slaves[_dom]) && $slaves[_dom].vagina != 0>>
- $slaves[_dom].slaveName finds herself under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace slit accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing pussy.
+ $slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace slit accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing pussy.
<<set $slaves[_dom].vaginalCount += _penetrativeUse, $vaginalTotal += _penetrativeUse>>
<<if canImpreg($slaves[_dom], $slaves[$i])>>
<<= knockMeUp($slaves[_dom], 30, 0, $slaves[$i].ID, 1)>>
@@ -202,7 +202,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<</if>>
<<elseif canDoAnal($slaves[_dom]) && $slaves[_dom].anus != 0>>
- $slaves[_dom].slaveName finds herself under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace ass accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
+ $slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace ass accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
<<set $slaves[_dom].analCount += _penetrativeUse, $analTotal += _penetrativeUse>>
<<if canImpreg($slaves[_dom], $slaves[$i])>>
<<= knockMeUp($slaves[_dom], 30, 1, $slaves[$i].ID, 1)>>
@@ -216,7 +216,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<else>>
<<if canDoVaginal($slaves[_dom]) && $slaves[_dom].vagina != 0>>
- $slaves[_dom].slaveName finds herself with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace slit accommodating $slaves[$i].slaveName's eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing pussy.
+ $slaves[_dom].slaveName finds _himself2 with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace slit accommodating $slaves[$i].slaveName's eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing pussy.
<<set $slaves[_dom].vaginalCount += _penetrativeUse, $vaginalTotal += _penetrativeUse>>
<<if canImpreg($slaves[_dom], $slaves[$i])>>
<<= knockMeUp($slaves[_dom], 30, 0, $slaves[$i].ID)>>
@@ -225,7 +225,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<</if>>
<<elseif canDoAnal($slaves[_dom]) && $slaves[_dom].anus != 0>>
- $slaves[_dom].slaveName finds herself with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace ass accommodating $slaves[$i].slaveName's eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
+ $slaves[_dom].slaveName finds _himself2 with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace ass accommodating $slaves[$i].slaveName's eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
<<set $slaves[_dom].analCount += _penetrativeUse, $analTotal += _penetrativeUse>>
<<if canImpreg($slaves[_dom], $slaves[$i])>>
<<= knockMeUp($slaves[_dom], 30, 1, $slaves[$i].ID)>>
@@ -234,7 +234,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<</if>>
<<else>>
- $slaves[_dom].slaveName finds herself with _his2 face pushed firmly into $slaves[$i].slaveName's crotch and _his2 _domRace face accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
+ $slaves[_dom].slaveName finds _himself2 with _his2 face pushed firmly into $slaves[$i].slaveName's crotch and _his2 _domRace face accommodating an eager _subRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to fuck a willing asshole.
<<set $slaves[_dom].oralCount += _penetrativeUse, $oralTotal += _penetrativeUse>>
<</if>>
<</if>>
@@ -242,7 +242,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<if $slaves[$i].amp == 1>>
$slaves[_dom].slaveName finds _himself2 pinned by the weight of $slaves[$i].slaveName's limbless body and the quickly hardening _subRace clit being pushed eagerly into _his2 _domRace mouth. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts.
<<else>>
- $slaves[_dom].slaveName finds herself with _his2 back pushed firmly into _his2 bedsheets and $slaves[$i].slaveName's quickly hardening clit being pushed eagerly into _his2 mouth. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top.
+ $slaves[_dom].slaveName finds _himself2 with _his2 back pushed firmly into _his2 bedsheets and $slaves[$i].slaveName's quickly hardening clit being pushed eagerly into _his2 mouth. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top.
<</if>>
$slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ constant oral attention.
<<set _penetrativeUse = random(9,12)>>
@@ -250,15 +250,15 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
<<if $slaves[$i].amp == 1>>
<<if canDoVaginal($slaves[_dom])>>
- $slaves[_dom].slaveName finds herself under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace slit molested by an eager tongue. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to torment a willing pussy.
+ $slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and _his2 _domRace slit molested by an eager tongue. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to torment a willing pussy.
<<set _oralUse = random(9,12)>>
<<set $slaves[_dom].vaginalCount += _oralUse, $vaginalTotal += _oralUse>>
<<elseif !["chastity", "combined chastity"].includes($slaves[_dom].dickAccessory) && $slaves[_dom].dick > 0>>
- $slaves[_dom].slaveName finds herself under the weight of $slaves[$i].slaveName's limbless body with the tight embrace of _subRace lips around _his2 _domRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to torment a willing dick.
+ $slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body with the tight embrace of _subRace lips around _his2 _domRace cock. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top for $his efforts. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind@@ being expected to torment a willing dick.
<<set _oralUse = random(9,12)>>
<<set $slaves[_dom].penetrativeCount += _oralUse, $penetrativeTotal += _oralUse>>
<<else>>
- $slaves[_dom].slaveName finds herself under the weight of $slaves[$i].slaveName's limbless body and
+ $slaves[_dom].slaveName finds _himself2 under the weight of $slaves[$i].slaveName's limbless body and
<<if $slaves[_dom].boobs >= 300>>
_his2 _domRace tits
<<else>>
@@ -270,11 +270,11 @@ is serving ''$slaves[_dom].slaveName'' this week.
<</if>>
<<else>>
<<if canDoVaginal($slaves[_dom]) && $slaves[_dom].vagina != 0>>
- $slaves[_dom].slaveName finds herself with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace slit accommodating $slaves[$i].slaveName's thrusting _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
+ $slaves[_dom].slaveName finds _himself2 with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace slit accommodating $slaves[$i].slaveName's thrusting _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
<<set _fingerBang = random(9,12)>>
<<set $slaves[_dom].vaginalCount += _fingerBang, $vaginalTotal += _fingerBang>>
<<elseif canDoAnal($slaves[_dom]) && $slaves[_dom].anus != 0>>
- $slaves[_dom].slaveName finds herself with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace ass accommodating $slaves[$i].slaveName's thrusting _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
+ $slaves[_dom].slaveName finds _himself2 with _his2 face pushed firmly into _his2 bedsheets and _his2 _domRace ass accommodating $slaves[$i].slaveName's thrusting _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
<<set _fingerBang = random(9,12)>>
<<set $slaves[_dom].analCount += _fingerBang, $analTotal += _fingerBang>>
<<else>>
@@ -284,8 +284,8 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<else>>
<<print nippleColor($slaves[_dom])>> nipples
<</if>>
- being roughly handled by $slaves[$i].slaveName's _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
- <<set _fingerBang = random(9,12)>>
+ being roughly handled by $slaves[$i].slaveName's _subRace fingers. Afterward, $slaves[_dom].slaveName lavishes kisses on _his2 satisfactory top. $slaves[_dom].slaveName @@.hotpink;enjoys a week of constant submission,@@ and even though $he's technically being used, $slaves[$i].slaveName @@.hotpink;doesn't mind the fun.@@
+ <<set _fingerBang = random(9,12)>>
<<set $slaves[_dom].mammaryCount += _fingerBang, $mammaryTotal += _fingerBang>>
<</if>>
<</if>>
@@ -294,7 +294,7 @@ is serving ''$slaves[_dom].slaveName'' this week.
<<elseif ($slaves[$i].devotion >= -20) && ($slaves[_dom].fetishKnown == 1) && ($slaves[_dom].fetishStrength > 60) && ($slaves[_dom].fetish == "dom") && canWalk($slaves[_dom])>>
$slaves[_dom].slaveName loves to dominate, and the first indication $slaves[$i].slaveName gets of what $he's in for this week is when $slaves[_dom].slaveName ambushes $him in the dormitory, tackles $him from behind, and
<<if $slaves[$i].amp == 1>>
- bursts out <<if canTalk($slaves[_dom])>>laughing<<else>>in silent laughter<</if>> at $his inability to right herself without limbs.
+ bursts out <<if canTalk($slaves[_dom])>>laughing<<else>>in silent laughter<</if>> at $his inability to right $himself without limbs.
<<else>>
hogties $him with sheets.
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 9c6ff30524a68452c9029516426824986d9931b0..12dd0adc662c4951ce410a23258475eb16779f7d 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -209,8 +209,6 @@
<<set $nicaeaAchievement = either("devotion", "trust", "slaves")>>
<<goto "SE nicaea council">>
-<<elseif (Math.trunc($week/24) == ($week/24)) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>
- <<goto "securityForceTradeShow">>
<<else>>
<<goto "Nonrandom Event">>
<</if>>
diff --git a/src/uncategorized/seCoursingRace.tw b/src/uncategorized/seCoursingRace.tw
index 04657c8a3d58a4526e2c70d723d19173f27190a3..9cac4fd60d951fb42953f6e68cca788bf7315bed 100644
--- a/src/uncategorized/seCoursingRace.tw
+++ b/src/uncategorized/seCoursingRace.tw
@@ -3,7 +3,7 @@
<<setLocalPronouns $Lurcher>>
<<setLocalPronouns $activeSlave 2>>
-You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whisper your direction into $his ear without letting the other competitors or their lurchers hear<<else>>gently point $him towards the target hare without letting the other competitors or their lurchers see<</if>>. Then, you gently push $him down into $his starting crouch. The umpire trips the hares' releases, a few yards in front of you and $Lurcher.slaveName, and you instantly let your lurcher off $his leash.
+You place your hand on the leash's quick release and <<if canHear($Lurcher)>>whisper your direction into $his ear without letting the other competitors or their lurchers hear<<else>>gently point $him towards the target hare without letting the other competitors or their lurchers see<</if>>. Then, you gently push $him down into $his starting crouch. The umpire trips the hares' releases, a few <<if $showInches == 2>>yards<<else>>meters<</if>> in front of you and $Lurcher.slaveName, and you instantly let your lurcher off $his leash.
<<set _LurcherSpeed = 10>>
<<if $Lurcher.devotion > 50>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index f09e3817ecffbba1c8dac8413efa276994da2c22..96092a885197f13834a69b633ab272b85fdd1868 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -7,6 +7,7 @@
<<set $activeSlave = getSlave($expiree)>>
<<run Enunciate($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
$activeSlave.slaveName's indentured servitude is ending this week, meaning that your arcology is gaining a citizen.
<<set $lowerClass += 1>>
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 03bfdfa360a43df12b9ea52b491ef88face4266f..5e358e0b91f6760a7ad550fbc74de4fab627df56 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -333,49 +333,49 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
<<if $SF.Toggle && $SF.Active >= 1>> <span id="result3">
<br><<link "Host a parade">>
<<replace "#result3">><br><br>
- <<if $SFUnit.Troops < 100>>
+ <<if $SF.Squad.Troops < 100>>
The tiny size of $SF.Lower does not inspire confidence in your citizens.
<<set $rep -= 200>>
- <<elseif $SFUnit.Troops < 2000>>
+ <<elseif $SF.Squad.Troops < 2000>>
The almost full size of $SF.Lower inspires confidence in your citizens.
<<set $rep += 250>>
<</if>>
- <<if $SFUnit.Armoury === 0>>
+ <<if $SF.Squad.Armoury === 0>>
Seeing the soldiers of $SF.Lower with high-quality personal weapons and light armor, but little in the way of exceptional armament, provides little confidence in $SF.Lower.
<<set $rep -= 200>>
<<else>>
The citizens of $arcologies[0].name are relieved to see that $SF.Lower's troops are out fitted the absolutely latest in gear.
<<set $rep += 250>>
<</if>>
- <<if $SFUnit.Drugs === 0>>
+ <<if $SF.Squad.Drugs === 0>>
Seeing $SF.Lower being relaxed inspires confidence that they are unlikely to
<<set $rep += 250>>
<<else>>
The slight twitchiness and high-end alertness of $SF.Lower's troops makes your citizens afraid that they may
<<set $rep -= 200>>
<</if>> get a face full of lead.
- <<if $SFUnit.AV < 1 && $SFUnit.TV < 1>>
+ <<if $SF.Squad.AV < 1 && $SF.Squad.TV < 1>>
The use of basic, unarmored mainly high-end civilian vehicles with jury-rigged crew-served weapons by $SF.Lower does not
<<set $rep -= 200>>
- <<elseif $SFUnit.AV < 11 && $SFUnit.TV < 11>>
+ <<elseif $SF.Squad.AV < 11 && $SF.Squad.TV < 11>>
$SF.Lower's use of the most advanced heavy armored and support vehicles possible
<<set $rep += 250>>
<</if>> inspires confidence in your citizens.
- <<if $SFUnit.AA < 1 && $SFUnit.TA < 1>>
+ <<if $SF.Squad.AA < 1 && $SF.Squad.TA < 1>>
Seeing $SF.Lower's air force only number enough to be a squadron and armed with just a Gatling cannon does not assure your citizens.
<<set $rep -= 200>>
- <<elseif $SFUnit.AA < 11 && $SFUnit.TA < 11>>
+ <<elseif $SF.Squad.AA < 11 && $SF.Squad.TA < 11>>
Seeing $SF.Lower's air force using more advanced equipment assures your citizens that they are safe from the air.
<<set $rep += 250>>
<</if>>
- <<if $SFUnit.Drones === 0>>
+ <<if $SF.Squad.Drones === 0>>
Seeing "re-purposed" non-military drones from the arcology's original contingent flying around, does not inspire confidence in your citizens.
<<set $rep -= 200>>
<<else>>
Seeing the latest and greatest drones buzzing over head assures your citizens that they are unmatched.
<<set $rep += 250>>
<</if>>
- <<if $SFUnit.GiantRobot === 1>>
+ <<if $SF.Squad.GiantRobot === 1>>
Seeing a basic old world rusted looking Giant Robot, doesn't provide your citizens with much assurance that they are protected.
<<set $rep -= 200>>
<<else>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index affef0f5aeb09025bce34fa8cb49f006e2cc2384..6a2febbb957ab1fc6912aeef9cdcda96ac1b11f5 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -3,19 +3,19 @@
<<set $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $nextButton = "Continue", $raided = $week>>
The leader of your $mercenariesTitle has contacted you from the world outside your arcology. It seems that your $mercenariesTitle have enjoyed a profitable series of raids in their time outside the arcology and have decided to push their luck by plundering one last location on their way back to the arcology. As their nominal leader, they ask your opinion of a small number of potential targets. Given the distance from the arcology and the time sensitivity of conducting such a mission, you have little to base your decision on besides a brief description.
-<<if $SF.Toggle && $SF.Active >= 1 && (($SFUnit.Satellite >= 1 && $SatLaunched > 0) || $SFUnit.SpacePlane >= 1)>>
+<<if $SF.Toggle && $SF.Active >= 1 && (($SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0) || $SF.Squad.SpacePlane >= 1)>>
By having access to the use of $SF.Lower's
- <<if $SFUnit.Satellite >= 1 && $SatLaunched > 0>>
+ <<if $SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0>>
satellite
<</if>>
- <<if $SFUnit.SpacePlane >= 1>>
+ <<if $SF.Squad.SpacePlane >= 1>>
space plane
<</if>>
- <<if ($SFUnit.Satellite >= 1 && $SatLaunched > 0) && $SFUnit.SpacePlane >= 1>>
+ <<if ($SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0) && $SF.Squad.SpacePlane >= 1>>
satellite and space plane
<</if>>
it is
- <<if $SFUnit.Satellite >= 1 && $SatLaunched > 0 && $SFUnit.SpacePlane >= 1>>
+ <<if ($SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0) && $SF.Squad.SpacePlane >= 1>>
even
<</if>>
less likely that the target will escape.
@@ -552,7 +552,7 @@ target
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.weight = random(-50,50)>>
- is a research lab operating on the lawless fringe between the Old World and the Free Cities. Here, scientists push the boundaries of the known world without the burden of governmental oversight or moral restrictions. Their defacto leader is a fellow scientist, one of the first to leave the Old World behind in pursuit of knowledge.
+ is a research lab operating on the lawless fringe between the Old World and the Free Cities. Here, scientists push the boundaries of the known world without the burden of governmental oversight or moral restrictions. Their de facto leader is a fellow scientist, one of the first to leave the Old World behind in pursuit of knowledge.
<<case "lawyer">>
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = 55>>
diff --git a/src/uncategorized/seRaidingAssault.tw b/src/uncategorized/seRaidingAssault.tw
index f8bb20a657fcaa243200c3aafbd26ccdbd9d4b58..1b3f3134c1bb8089c261d6bd98d505cd1101e44b 100644
--- a/src/uncategorized/seRaidingAssault.tw
+++ b/src/uncategorized/seRaidingAssault.tw
@@ -6,11 +6,11 @@ You make your selection and direct your $mercenariesTitle to attack the target.
<<set _raidescapeL = 1,_raidescapeU = 3>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <<if $SFUnit.Satellite >= 1 && $SatLaunched > 0>>
+ <<if $SF.Squad.Satellite.lv >= 1 && $SF.Squad.Satellite.InOrbit > 0>>
<<set _MercCaptureL += 1,_MercCaptureU +1>>
<<set _raidescapeL -= 1,_raidescapeU -= 1>>
<</if>>
- <<if $SFUnit.SpacePlane >= 1>>
+ <<if $SF.Squad.SpacePlane >= 1>>
<<set _MercCaptureL += 1,_MercCaptureU +1>>
<<set _raidescapeL -= 1>>
<</if>>
@@ -86,7 +86,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
The hospital's security staff alone would prove little match for your mercenaries, but they are joined by an uneasy coalition of rival gangster and criminals who had been committed as patients. Though your $mercenariesTitle prevail, they discover to their chagrin that the doctors and their staff were slain during the wanton exchange of fire.
<<else>>
The security staff of the hospital is easily overpowered and surrender rapidly, allowing your $mercenariesTitle to take the doctors and their staff into custody with little fuss.
- The distinguished doctor spends the VTOL ride looking on at her colleagues and peers being raped by your mercenaries. She naively hopes that she has been spared from that fate out of a desire for her medical knowledge rather than her body.
+ The distinguished doctor spends the VTOL ride looking on at her colleagues and peers being raped by your mercenaries. She naïvely hopes that she has been spared from that fate out of a desire for her medical knowledge rather than her body.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "nun">>
@@ -96,7 +96,7 @@ You make your selection and direct your $mercenariesTitle to attack the target.
The nuns flee into their inner sanctum as your $mercenariesTitle approach and bar the doors behind them as they go. When the last barrier is pried open, your $mercenariesTitle discover the nuns have committed suicide as a group rather than be taken prisoner.
<<else>>
Unarmed and defenseless, the nuns are easily cowed by your $mercenariesTitle and taken away one by one to the VTOLs. The most pious sister prays vehemently until she is dragged out of the inner sanctum in cuffs.
- The pious nun spends the VTOL ride engaged in fervent prayer as her sisters are raped by your mercenaries. She naively believes that her devotion and piety will see her spared from the same fate as her sisters.
+ The pious nun spends the VTOL ride engaged in fervent prayer as her sisters are raped by your mercenaries. She naïvely believes that her devotion and piety will see her spared from the same fate as her sisters.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</if>>
<<case "journalist">>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 7e4cb9d16f1de21f0380c2d3699b86c06badcf66..1803976f02728e88bc006dfa330509d423486454 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -33,7 +33,7 @@ in a way that will fill the rest of your property with envy and @@.mediumaquamar
$He is retiring into citizenship, with a substantial annuity that will provide $him with a secure if not luxurious life.
<<if $activeSlave.relationship == -3>>
<<if $activeSlave.fetish == "mindbroken">>
- Sadly, $he is not mentally equipped to look after herself, but the arcology hosts several fine institutions capable of caring for $him. They'll have someone check in on $him daily. $Him being your wife is ultimately irrelevant; $he never realized it in the first place.
+ Sadly, $he is not mentally equipped to look after $himself, but the arcology hosts several fine institutions capable of caring for $him. They'll have someone check in on $him daily. $Him being your wife is ultimately irrelevant; $he never realized it in the first place.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He wishes $he could continue to be your slave wife, but $he understands that marriages between slaves and slaveowners are predicated on the slave relationship. $He knows that $his retirement has come, meaning that $his slave relationship to you is ending. $He's had a long time to get used to the idea, and gets through the process with dignity, doing $his best to avoid embarrassing you.
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
@@ -44,9 +44,9 @@ $He is retiring into citizenship, with a substantial annuity that will provide $
$He is glad $he no longer has to be your slave wife, as $he never wanted to be in the first place. $He understands that marriages between slaves and slaveowners are predicated on the slave relationship. $He knows that $his retirement has come, meaning that $his slave relationship to you is ending. $He's had a long time to get used to the idea, and gets through the process dutifully, doing $his best to avoid embarrassing you.
<</if>>
<<elseif $activeSlave.fetish == "mindbroken">>
- Sadly, $he is not mentally equipped to look after herself, but the arcology hosts several fine institutions capable of caring for $him. They'll have someone check in on $him daily.
+ Sadly, $he is not mentally equipped to look after $himself, but the arcology hosts several fine institutions capable of caring for $him. They'll have someone check in on $him daily.
<<elseif $activeSlave.devotion > 95>>
- $He desperately wishes $he could continue to be your sex slave, but $he understands that $his retirement has come. More importantly, $he's had a long time to get used to the idea, and gets through the process with resolution, doing $his best to avoid embarrassing herself or you.
+ $He desperately wishes $he could continue to be your sex slave, but $he understands that $his retirement has come. More importantly, $he's had a long time to get used to the idea, and gets through the process with resolution, doing $his best to avoid embarrassing $himself or you.
<<elseif $activeSlave.devotion > 20>>
$He is very happy to be a free person again, though $he does $his best to do you the favor of not being too ostentatious about this.
<<else>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 3e26fb8f8da1015ef8a88668b1c2361d783f05a4..4dc3351e4a88107dea22438286502a294bea6eb8 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -206,41 +206,41 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<if $activeSlave.career != 0>>
<<if setup.bodyguardCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Bodyguard; that's valuable.
+ $His background would help make $him a good Bodyguard; that's valuable.
<<elseif setup.wardenessCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Wardeness; that's valuable.
+ $His background would help make $him a good Wardeness; that's valuable.
<<elseif setup.attendantCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Attendant; that's valuable.
+ $His background would help make $him a good Attendant; that's valuable.
<<elseif setup.matronCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Matron; that's valuable.
+ $His background would help make $him a good Matron; that's valuable.
<<elseif setup.schoolteacherCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Schoolteacher; that's valuable.
+ $His background would help make $him a good Schoolteacher; that's valuable.
<<elseif setup.stewardessCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Stewardess; that's valuable.
+ $His background would help make $him a good Stewardess; that's valuable.
<<elseif setup.milkmaidCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Milkmaid; that's valuable.
+ $His background would help make $him a good Milkmaid; that's valuable.
<<elseif setup.farmerCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Farmer; that's valuable.
+ $His background would help make $him a good Farmer; that's valuable.
<<elseif setup.madamCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Madam; that's valuable.
+ $His background would help make $him a good Madam; that's valuable.
<<elseif setup.DJCareers.includes($activeSlave.career)>>
- $His background would help make $him a good DJ; that's valuable.
+ $His background would help make $him a good DJ; that's valuable.
<<elseif setup.HGCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Head Girl; that's valuable.
+ $His background would help make $him a good Head Girl; that's valuable.
<<elseif setup.recruiterCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Recruiter; that's valuable.
+ $His background would help make $him a good Recruiter; that's valuable.
<<elseif setup.matronCareers.includes($activeSlave.career)>>
- $His background would help make $him a good Matron; that's valuable.
+ $His background would help make $him a good Matron; that's valuable.
<<elseif setup.entertainmentCareers.includes($activeSlave.career)>>
- $His background should help $his flirting a little.
+ $His background should help $his flirting a little.
<<elseif setup.whoreCareers.includes($activeSlave.career)>>
- $His background should help $his fucking a little.
+ $His background should help $his fucking a little.
<<elseif setup.gratefulCareers.includes($activeSlave.career)>>
- $His background should make $him a bit more trusting.
+ $His background should make $him a bit more trusting.
<<elseif setup.menialCareers.includes($activeSlave.career)>>
- $His background should make $him a bit more tractable.
+ $His background should make $him a bit more tractable.
<<elseif setup.servantCareers.includes($activeSlave.career)>>
- $His background should make $him a good servant.
+ $His background should make $him a good servant.
<</if>>
<</if>>
<<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.entertainSkill >= 100)>>
@@ -420,7 +420,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<</if>>
<<if $activeSlave.mpreg == 1>>
- What's this strange organ listed here? She can become anally pregnant? That will certainly interest some buyers.
+ What's this strange organ listed here? $He can become anally pregnant? That will certainly interest some buyers.
<</if>>
<<if $activeSlave.pregWeek < 0>>
$He seems a little uncomfortable with $his holes being touched. By the feel of it, $he is a new mother, no? A lack of receptivity will not go over well with buyers; it may more profitable to let $him recover first.
@@ -481,7 +481,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<elseif $activeSlave.pornPrestige == 2>>
$He's gained quite the following in $activeSlave.pornFameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
<<elseif $activeSlave.pornPrestige == 1>>
- $He's got a small fanbase in $activeSlave.pornFameType smut. Who knows? Maybe one of them will want $him all to herself?
+ $He's got a small fanbase in $activeSlave.pornFameType smut. Who knows? Maybe one of them will want $him all to themselves?
<</if>>
<<if $activeSlave.devotion > 95>>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 164c7ed81cbe137b42ee519e048e1856322d8c09..b20670cdbd79934401f75ca5d8b5409b25bc6d8d 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -60,7 +60,7 @@ This is a section of the promenade
dedicated to Egyptian Revivalism. There are a bewildering multiplicity of shops here; ancient Egypt is wonderfully fertile of linen fashion, fine jewelry, perfumes, incense, and other luxury goods. Beautiful warm-skinned slavegirls of all races have wares in hand to offer citizens who pass by, and they seem well-treated.
<span id="result"><<link "Shop around">><<replace "#result">>You decide to tour the shops; with so much fine merchandise on offer, it's possible that someone's selling something that even you haven't heard of, and it's always good to see and be seen. The slave salesgirls are welcoming, and most are so well-trained that despite knowing who you are, they treat you with the same friendly courtesy that they offer everyone. They all offer you the peculiar straight-down curtsey that allows them to keep their necks straight, since they're all wearing gradually melting perfume cakes atop their hair, making them glisten with beguiling scent.<</replace>><</link>></span>
<<case "Edo Revivalist">>
- dedicated to Edo Revivalism. There are strict restrictions on the establishments' decor here, so //tatami// mats and paper partitions are ubiquitous. There are handsome //sake// shops and tea rooms offering the traditional ceremony, and //kabuki// theaters offering the traditional performance, with modern plots and themes.
+ dedicated to Edo Revivalism. There are strict restrictions on the establishments' décor here, so //tatami// mats and paper partitions are ubiquitous. There are handsome //sake// shops and tea rooms offering the traditional ceremony, and //kabuki// theaters offering the traditional performance, with modern plots and themes.
<span id="result"><<link "See a show">><<replace "#result">>As soon as you enter a theater, the play stops, and refined slave attendants usher you forward to the place of honor. None of the citizens present resent the interruption; having you here is a great addition to the performance. The actors bow deeply to you and resume. The classical dance drama is almost impenetrable to outsiders, and the modernity of the characters and events would not be at all decipherable. Once you catch the thread, though, the richness of the allegory towards Free Cities personages and events is quite enjoyable.<</replace>><</link>></span>
<<case "Arabian Revivalist">>
dedicated to Arabian Revivalism. The thriving mercantilism isn't limited to the slave markets, so many floors below; there are a bewildering variety of shops and stalls here, in no discernible order. Particolored cloth awnings, stacked goods, and bustling menial slaves constantly obscure your view, as pretty slavegirls hawking luxurious goods do their best to catch your eye.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 7080524bb61a913f18141a8f859fcfefc708e98c..81c155c869af8ff3ece2a44b34ab3ebcf310a084 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1502,7 +1502,7 @@ Hormones: <strong><span id="hormones">
<br>Diet: <strong><span id="diet">$activeSlave.diet</span></strong>.
<<link "Healthy">><<set $activeSlave.diet = "healthy">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
-<<if ($activeSlave.health < 90) && ($activeSlave.chem >= 10) && ($dietCleanse == 1)>>
+<<if ($activeSlave.health < 90 || $activeSlave.chem >= 10) && ($dietCleanse == 1)>>
| <<link "Cleanse">><<set $activeSlave.diet = "cleansing">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<<elseif ($dietCleanse == 1)>>
| //$He is already healthy//
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index 85328a79883399232d08fd56c206966cbbbc2167..e769202977a25c4cfd9c5aacbc8713b302ac6607 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -50,13 +50,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _kidnappers = random(1,4)>>
There's more merchandise out of sight in the holding areas. To go by what you can hear,
<<if (_kidnappers == 1) && (random(1,100) <= $seeDicks)>>
- muffled insistence that the speaker is not a girl followed by struggling and then shrieks as a resistant dickgirl takes anal rape,
+ muffled insistence that the speaker is not a girl followed by struggling and then shrieks as a resistant dickgirl takes anal rape,
<<elseif (_kidnappers == 2) && (random(0,99) >= $seeDicks)>>
- muffled begging followed by struggling and then crying as a new slave learns how it feels to have a slave's cunt,
+ muffled begging followed by struggling and then crying as a new slave learns how it feels to have a slave's cunt,
<<elseif (_kidnappers == 3)>>
- muffled gagging followed gasping and sobbing as a new slave tries to get her breath back after oral rape,
+ muffled gagging followed gasping and sobbing as a new slave tries to get her breath back after oral rape,
<<else>>
- the unmistakable slap of flesh on flesh,
+ the unmistakable slap of flesh on flesh,
<</if>>
at least one of the slavers is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
@@ -71,13 +71,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _indentures = random(1,4)>>
The area is crowded, and more indentured servants are packed together in the holding areas. To go by what you can hear,
<<if (_indentures == 1) && (random(1,100) <= $seeDicks)>>
- the unmistakable mixed shrieks, sobs, and slaps of anal rape,
+ the unmistakable mixed shrieks, sobs, and slaps of anal rape,
<<elseif (_indentures == 2) && (random(0,99) >= $seeDicks)>>
- the characteristic crying and gasping of an unwilling girl giving up her cunt,
+ the characteristic crying and gasping of an unwilling girl giving up her cunt,
<<elseif (_indentures == 3)>>
- the gagging and expectoration of someone who has just gotten a mouthful of unwelcome cum,
+ the gagging and expectoration of someone who has just gotten a mouthful of unwelcome cum,
<<else>>
- disconsolate sobbing interrupted by a gasp as something is stuffed inside someone's mouth, and followed by muffled screams,
+ disconsolate sobbing interrupted by a gasp as something is stuffed inside someone's mouth, and followed by muffled screams,
<</if>>
one of them is learning exactly what her indenture allows.
<</if>>
@@ -92,13 +92,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _hunters = random(1,4)>>
The slave catchers consider their catches fair game, though they usually confine their amusements to the holding areas out of sight. Not out of earshot, though; to go by what you can hear,
<<if (_hunters == 1) && (random(1,100) <= $seeDicks)>>
- vehement insistence that the speaker is not a girl followed by a beating and then shrieks as a rebellious dickgirl takes anal rape,
+ vehement insistence that the speaker is not a girl followed by a beating and then shrieks as a rebellious dickgirl takes anal rape,
<<elseif (_hunters == 2) && (random(0,99) >= $seeDicks)>>
- vehement protestations followed by a beating and then crying as a slave's cunt takes her punishment for her,
+ vehement protestations followed by a beating and then crying as a slave's cunt takes her punishment for her,
<<elseif (_hunters == 3)>>
- struggling and gagging followed gasping and angry swearing as a rebellious slave tries to get her breath back after oral rape,
+ struggling and gagging followed gasping and angry swearing as a rebellious slave tries to get her breath back after oral rape,
<<else>>
- struggling followed by the slap of flesh on flesh,
+ struggling followed by the slap of flesh on flesh,
<</if>>
at least one of the runaway hunters is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
@@ -113,13 +113,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _ur = random(1,4)>>
though they restrain themselves from reducing the value of their captures by taking virginities. They do have their fun, though; to go by what you can hear from the holding area where they keep underage girls who can be sold,
<<if (_ur == 1) && (random(1,100) <= $seeDicks)>>
- a muffled but obviously sadistic description of feminization, and the desperate sobbing in response,
+ a muffled but obviously sadistic description of feminization, and the desperate sobbing in response,
<<elseif (_ur == 2) && (random(0,99) >= $seeDicks)>>
- a muffled but obviously sadistic description of breeding, and the desperate sobbing in response,
+ a muffled but obviously sadistic description of breeding, and the desperate sobbing in response,
<<elseif (_ur == 3)>>
- faint struggling and crying that suggests that someone is being thoroughly groped and pinched,
+ faint struggling and crying that suggests that someone is being thoroughly groped and pinched,
<<else>>
- the lewd, lubricated noise of someone giving a reluctant handjob,
+ the lewd, lubricated noise of someone giving a reluctant handjob,
<</if>>
at least one of the raiders is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
@@ -134,13 +134,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _raiders = random(1,4)>>
though they restrain themselves from reducing the value of their captures by taking virginities. They do have their fun, though; to go by what you can hear from the holding area where they keep slaves of age who can be sold,
<<if (_raiders == 1) && (random(1,100) <= $seeDicks)>>
- a muffled but obviously sadistic description of feminization, and the desperate sobbing in response,
+ a muffled but obviously sadistic description of feminization, and the desperate sobbing in response,
<<elseif (_raiders == 2) && (random(0,99) >= $seeDicks)>>
- a muffled but obviously sadistic description of breeding, and the desperate sobbing in response,
+ a muffled but obviously sadistic description of breeding, and the desperate sobbing in response,
<<elseif (_raiders == 3)>>
- faint struggling and crying that suggests that someone is being thoroughly groped and pinched,
+ faint struggling and crying that suggests that someone is being thoroughly groped and pinched,
<<else>>
- the lewd, lubricated noise of someone giving a reluctant handjob,
+ the lewd, lubricated noise of someone giving a reluctant handjob,
<</if>>
at least one of the raiders is amusing himself<<if $arcologies[0].FSGenderFundamentalist == "unset">> (or herself)<</if>> back there.
<</if>>
@@ -160,13 +160,13 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set _trainers = random(1,4)>>
The trainers are a competitive bunch, and to go by what you can hear,
<<if (_trainers == 1) && (random(1,100) <= $seeDicks)>>
- moaning interspersed with lewd, well-lubricated noises coming from both anal sex and vigorous masturbation,
+ moaning interspersed with lewd, well-lubricated noises coming from both anal sex and vigorous masturbation,
<<elseif (_trainers == 2) && (random(0,99) >= $seeDicks)>>
- moaning and the distinctive slap of feminine buttocks on thighs beneath them as a girl rides a dick,
+ moaning and the distinctive slap of feminine buttocks on thighs beneath them as a girl rides a dick,
<<elseif (_trainers == 3)>>
- the lush, lewd sounds of diligent oral sex,
+ the lush, lewd sounds of diligent oral sex,
<<else>>
- the call-and-response of a trainer and a slave running through a memorized obedience exercise,
+ the call-and-response of a trainer and a slave running through a memorized obedience exercise,
<</if>>
at least one of them is applying some last-minute training to a slave in the holding pens nearby.
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 93f840418174207350c4b98446e55281064b1662..e9d0db35f06d078ed41832b93d52d31bcbdbda56 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -402,7 +402,7 @@
<</if>>
<<case "dom fetishist">>
- $activeSlave.slaveName wins herself a leadership position with $his new master, who repays $his hard work by allowing her to use his slaves at will.
+ $activeSlave.slaveName wins $himself a leadership position with $his new master, who repays $his hard work by allowing her to use his slaves at will.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetish == "dom")>>
<<if ($slaves[_ss].fetishKnown == 1)>>
@@ -894,7 +894,7 @@
<</if>>
<<case "broadening trainer">>
- $activeSlave.slaveName is only rarely seen around the arcology, since $his new owners force her to spend most of $his time sleeping, eating and looking after herself. But $his belly, painfully distended with food, makes $his situation obvious.
+ $activeSlave.slaveName is only rarely seen around the arcology, since $his new owners force her to spend most of $his time sleeping, eating and looking after $himself. But $his belly, painfully distended with food, makes $his situation obvious.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].weight > 10)>>
<<run clearSummaryCache($slaves[_ss])>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 24806ae00944f774c40655437e51bf28be24d909..70200a14739e20759985ecbe2fc9be7b5196f5e0 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -519,7 +519,7 @@
<</if>>
<br>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's Firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<<else>>
@@ -545,7 +545,7 @@
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's Firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br>
@@ -587,7 +587,7 @@
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's Firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br>
@@ -635,7 +635,7 @@
<br>[[Manage Research Lab|Research Lab][$temp = 0]]
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's Firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
<</if>>
<br>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 317724691a7a9b8ef7d1ab1e7e431ae85b7fb51f..50fef1f068e773d58c2b19ad43d7e5c907ee02d7 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -20,7 +20,6 @@
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
<<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/toychest.tw b/src/uncategorized/toychest.tw
index f7e2acf4fe4a161b68685db99bd69e2e49b2d8cb..a0bd93b2086a2ccca6e9b9bc6299b3c03dbc9062 100644
--- a/src/uncategorized/toychest.tw
+++ b/src/uncategorized/toychest.tw
@@ -1,5 +1,7 @@
:: Toychest [nobr]
+<<setLocalPronouns $slaves[$i]>>
+
//$slaves[$i].slaveName
<<if $slaves[$i].fuckdoll > 0>>
@@ -12,25 +14,25 @@
<</if>>
<<elseif $slaves[$i].devotion > 50>>
<<if $slaves[$i].toyHole == "mouth">>
- has positioned herself nearby with her mouth conveniently <<if $PC.dick == 1>>at cock level<<else>>level with your pussy<</if>>.
+ has positioned $himself nearby with $his mouth conveniently <<if $PC.dick == 1>>at cock level<<else>>level with your pussy<</if>>.
<<elseif $slaves[$i].toyHole == "boobs">>
- is kneeling nearby with her chest thrust out as far as it will go.
+ is kneeling nearby with $his chest thrust out as far as it will go.
<<elseif ($slaves[$i].toyHole == "pussy") && ($slaves[$i].amp != 1)>>
- is kneeling on the couch with legs apart to present her pussy.
+ is kneeling on the couch with legs apart to present $his pussy.
<<elseif $slaves[$i].toyHole == "pussy">>
- is lying on the couch with her pussy ready for you.
+ is lying on the couch with $his pussy ready for you.
<<elseif ($slaves[$i].toyHole == "ass") && ($slaves[$i].amp != 1)>>
- is lying on the couch with her legs up and back to present her butthole.
+ is lying on the couch with $his legs up and back to present $his butthole.
<<elseif $slaves[$i].toyHole == "ass">>
- is lying on the couch with her butt ready for you.
+ is lying on the couch with $his butt ready for you.
/*check*/
<<elseif $slaves[$i].toyHole == "dick">>
- is lying on the couch with her dick at the ready for you.
+ is lying on the couch with $his dick at the ready for you.
<<else>>
- is nearby, eagerly presenting herself.
+ is nearby, eagerly presenting $himself.
<</if>>
<<elseif $slaves[$i].trust < -20>>
- is waiting nearby in terror, hoping obedience will save her from punishment.
+ is waiting nearby in terror, hoping obedience will save $him from punishment.
<<elseif $slaves[$i].devotion < -90>>
is hogtied nearby for sexual abuse.
<<elseif $slaves[$i].devotion < -50>>
@@ -40,186 +42,186 @@
<<elseif $slaves[$i].devotion <= 20>>
is obediently waiting nearby for sexual use.
<<elseif $slaves[$i].devotion <= 50>>
- has positioned herself nearby to offer you her body.
+ has positioned $himself nearby to offer you $his body.
<</if>>
<<set _pose = random(1,100)>>
<<if $slaves[$i].fuckdoll > 0>>
- Its holes are, as always, available.
+ $His holes are, as always, available.
<<elseif $slaves[$i].fetish == "mindbroken">>
- She ignores her clothing, regarding it as an impediment to her purpose.
+ $He ignores $his clothing, regarding it as an impediment to $his purpose.
<<else>>
<<switch $slaves[$i].clothes>>
<<case "shibari ropes">>
- You've tied her shibari bindings so that she's forced to thrust out her chest.
+ You've tied $his shibari bindings so that $he's forced to thrust out $his chest.
<<case "uncomfortable straps">>
<<if _pose > 75>>
- Her leather straps are forcing her to thrust out her tits.
+ $His leather straps are forcing $him to thrust out $his tits.
<<elseif _pose > 50>>
- Her leather straps are uncomfortably pressing her breasts and asscrack.
+ $His leather straps are uncomfortably pressing $his breasts and asscrack.
<<elseif _pose > 25>>
- The rings in her leather straps over each nipple and hole make her look like a perfect fucktoy.
+ The rings in $his leather straps over each nipple and hole make $him look like a perfect fucktoy.
<<else>>
- Her uncomfortable straps force her to constantly present her holes.
+ $His uncomfortable straps force $him to constantly present $his holes.
<</if>>
<<case "restrictive latex" "a latex catsuit">>
- Her complete suit of latex makes her a nice, artistic display, a plastic work of art in the shape of a female form.
+ $His complete suit of latex makes $him a nice, artistic display, a plastic work of art in the shape of a female form.
<<case "a military uniform">>
- Her uniformed presence lends your office the air of a military command center.
+ $His uniformed presence lends your office the air of a military command center.
<<case "a schutzstaffel uniform">>
- Her uniformed presence lends your office the air of a military command center.
+ $His uniformed presence lends your office the air of a military command center.
<<case "a slutty schutzstaffel uniform">>
- Her uniformed presence lends your office the air of a military command center.
+ $His uniformed presence lends your office the air of a military command center.
<<case "a red army uniform">>
- Her uniformed presence lends your office the air of a military command center.
+ $His uniformed presence lends your office the air of a military command center.
<<case "a long qipao">>
- Her elegant qipao lends your office an air of traditional opulence and prestige.
+ $His elegant qipao lends your office an air of traditional opulence and prestige.
<<case "battlearmor">>
- Her armored presence lends your office the air of a battlefield command center.
+ $His armored presence lends your office the air of a battlefield command center.
<<case "a mounty outfit">>
- Her uniformed presence lends your office the air of a police command center.
+ $His uniformed presence lends your office the air of a police command center.
<<case "a dirndl">>
- Her dirndl lends a traditional atmosphere to your office.
+ $His dirndl lends a traditional atmosphere to your office.
<<case "lederhosen">>
- Her lederhosen lends a traditional atmosphere to your office.
+ $His lederhosen lends a traditional atmosphere to your office.
<<case "a biyelgee costume">>
- Her biyelgee costume lends a festive atmosphere to your office.
+ $His biyelgee costume lends a festive atmosphere to your office.
<<case "a mini skirt">>
- Her flattering mini dress makes her the perfect office ornament for the modern captain of industry.
+ $His flattering mini dress makes $him the perfect office ornament for the modern captain of industry.
<<case "a nice nurse outfit">>
- Her proper nurse's outfit gives the office a clinical air.
+ $His proper nurse's outfit gives the office a clinical air.
<<case "a fallen nuns habit">>
- Her latex parody of a nuns habit gives the office a sacrilegious air.
+ $His latex parody of a nuns habit gives the office a sacrilegious air.
<<case "a chattel habit">>
- Her chattel habit makes the office look like what it is: the inner sanctum of a new and deeply sensual faith.
+ $His chattel habit makes the office look like what it is: the inner sanctum of a new and deeply sensual faith.
<<case "a penitent nuns habit">>
- Her sackcloth habit gives the office a somber air.
+ $His sackcloth habit gives the office a somber air.
<<case "attractive lingerie">>
- She's wearing classy lingerie, making her an unusually refined ornament to the office.
+ $He's wearing classy lingerie, making $him an unusually refined ornament to the office.
<<case "kitty lingerie">>
- Her cat-themed lingerie gives the office a bizarrely innocent air of perversion.
+ $His cat-themed lingerie gives the office a bizarrely innocent air of perversion.
<<case "a succubus outfit">>
- She's dressed to look like a succubus. There is a <<if $PC.title == 1>>demon in this office, and she serves him<<else>>demoness in this office, and she serves her<</if>>.
+ $He's dressed to look like a succubus. There is a <<if $PC.title == 1>>demon in this office, and $he serves him<<else>>demoness in this office, and $he serves her<</if>>.
<<case "spats and a tank top">>
- She's wearing spats and a tank top, giving the office the active air of a gym.
+ $He's wearing spats and a tank top, giving the office the active air of a gym.
<<case "a string bikini">>
- She's wearing a string bikini, making her a sexy, enticing office ornament.
+ $He's wearing a string bikini, making $him a sexy, enticing office ornament.
<<case "a scalemail bikini">>
- Her scalemail bikini gives the office a medieval air.
+ $His scalemail bikini gives the office a medieval air.
<<case "striped panties" "a striped bra" "striped underwear">>
- She's wearing cute underwear, making her a sexy, innocent-looking office ornament.
+ $He's wearing cute underwear, making $him a sexy, innocent-looking office ornament.
<<case "attractive lingerie for a pregnant woman">>
- Her breasts gently spill out of her slightly to small top.
+ $His breasts gently spill out of $his slightly too small top.
<<if $slaves[$i].lactation > 0>>
- Her leaking nipples have rendered her top see-through.
+ $His leaking nipples have rendered $his top see-through.
<</if>>
<<case "a maternity dress">>
- Her low cut dress reveals ample cleavage.
+ $His low cut dress reveals ample cleavage.
<<case "stretch pants and a crop-top">>
- Her comfortable clothes give your office a laid back air and are easy to slip off when the mood strikes.
+ $His comfortable clothes give your office a laid back air and are easy to slip off when the mood strikes.
<<case "a cheerleader outfit">>
- She's wearing a slutty cheerleader outfit, making it look like she's here to fuck before team practice.
+ $He's wearing a slutty cheerleader outfit, making it look like $he's here to fuck before team practice.
<<case "clubslut netting">>
- She's wearing slutty netting and headphones so she can dance to music without annoying visitors.
+ $He's wearing slutty netting and headphones so $he can dance to music without annoying visitors.
<<case "cutoffs and a t-shirt">>
- She's wearing cutoffs and a t-shirt, making her a fun, clean office ornament.
+ $He's wearing cutoffs and a t-shirt, making $him a fun, clean office ornament.
<<case "a slutty nurse outfit">>
- She's wearing a slutty nurse outfit, and looks more than ready to minister to any patient's needs.
+ $He's wearing a slutty nurse outfit, and looks more than ready to minister to any patient's needs.
<<case "a schoolgirl outfit">>
- She's wearing a slutty schoolgirl outfit, and looks ready to do whatever it takes to improve her grades.
+ $He's wearing a slutty schoolgirl outfit, and looks ready to do whatever it takes to improve $his grades.
<<case "a kimono">>
- She's wearing a kimono, lending your office an air of elegance, though she lacks some of the air of the true yamato nadeshiko.
+ $He's wearing a kimono, lending your office an air of elegance, though $he lacks some of the air of the true yamato nadeshiko.
<<case "a burkini">>
- She's wearing a colorful burkini, lending your office a vague air of conservatism.
+ $He's wearing a colorful burkini, lending your office a vague air of conservatism.
<<case "a hijab and blouse">>
- She's wearing a modest hijab and blouse, lending your office a certain air of conservatism.
+ $He's wearing a modest hijab and blouse, lending your office a certain air of conservatism.
<<case "a hijab and abaya">>
- She's wearing a modest hijab and abaya, lending your office a certain air of conservatism.
+ $He's wearing a modest hijab and abaya, lending your office a certain air of conservatism.
<<case "a niqab and abaya">>
- She's wearing a niqab and abaya, lending your office an air of conservatism.
+ $He's wearing a niqab and abaya, lending your office an air of conservatism.
<<case "a klan robe" "a slutty klan robe">>
- She's wearing a ku klux klan robe, lending your office an air of conservatism.
+ $He's wearing a ku klux klan robe, lending your office an air of conservatism.
<<case "a burqa">>
- She's wearing an all-concealing burqa, lending your office an intense air of conservatism.
+ $He's wearing an all-concealing burqa, lending your office an intense air of conservatism.
<<case "battledress">>
- She's wearing skimpy battledress, making your office seem a little like the ideal bunker for a survivalist.
+ $He's wearing skimpy battledress, making your office seem a little like the ideal bunker for a survivalist.
<<case "a slutty outfit">>
<<if $slaves[$i].actualAge < 21>>
- She's wearing a schoolgirl uniform and sucking on hard candy, giving her a delectably youthful appearance.
+ $He's wearing a schoolgirl uniform and sucking on hard candy, giving $him a delectably youthful appearance.
<<elseif $slaves[$i].actualAge < 30>>
- She's chosen to wear a slutty nurse outfit, and looks more than ready to minister to any patient's needs.
+ $He's chosen to wear a slutty nurse outfit, and looks more than ready to minister to any patient's needs.
<<elseif $slaves[$i].actualAge < 40>>
- She's wearing a schoolgirl uniform and sucking on hard candy, a delightfully perverse outfit for a slave in her thirties.
+ $He's wearing a schoolgirl uniform and sucking on hard candy, a delightfully perverse outfit for a slave in $his thirties.
<<else>>
- She's wearing a wifely apron that covers her front, but leaves her backside bare, an appropriate outfit for a slave in her forties.
+ $He's wearing a wifely apron that covers $his front, but leaves $his backside bare, an appropriate outfit for a slave in $his forties.
<</if>>
<<case "a halter top dress">>
- The gorgeous halter top dress she's wearing is almost a work of art.
+ The gorgeous halter top dress $he's wearing is almost a work of art.
<<case "a ball gown">>
- The fabulous silken ball gown she's wearing lifts the entire atmosphere.
+ The fabulous silken ball gown $he's wearing lifts the entire atmosphere.
<<case "a slave gown">>
- The gorgeous gown she's wearing lends an air of class to the office.
+ The gorgeous gown $he's wearing lends an air of class to the office.
<<case "slutty business attire">>
- The suit she's wearing would make it look like she's here to do business, if not for the extreme shortness of the skirt and her acre of cleavage.
+ The suit $he's wearing would make it look like $he's here to do business, if not for the extreme shortness of the skirt and $his acre of cleavage.
<<case "nice business attire">>
- The suit she's wearing makes it look like she's here to do business, not fuck.
+ The suit $he's wearing makes it look like $he's here to do business, not fuck.
<<case "a comfortable bodysuit">>
- The bodysuit she's wearing displays her every fuckable curve.
+ The bodysuit $he's wearing displays $his every fuckable curve.
<<case "a leotard">>
- The leotard she's wearing is tight enough to advertise every detail.
+ The leotard $he's wearing is tight enough to advertise every detail.
<<case "a monokini">>
- Her topless swimsuit gives the office a perverted yet cultured aura.
+ $His topless swimsuit gives the office a perverted yet cultured aura.
<<case "an apron">>
- Her apron makes the office an intimate air, especially since she's nude underneath it.
+ $His apron makes the office an intimate air, especially since $he's nude underneath it.
<<case "a cybersuit">>
- Her cybersuit lends to an impersonal but sexual atmosphere, as her delicious curves are prominently displayed.
+ $His cybersuit lends to an impersonal but sexual atmosphere, as $his delicious curves are prominently displayed.
<<case "a bunny outfit">>
- The bunny outfit she's wearing makes her look ready to serve drinks and suck dick.
+ The bunny outfit $he's wearing makes $him look ready to serve drinks and suck dick.
<<case "a slutty maid outfit">>
- Her maid outfit makes her look useful and sexually easy.
+ $His maid outfit makes $him look useful and sexually easy.
<<case "a nice maid outfit">>
- Her maid outfit makes her servitude obvious while not looking too lewd.
+ $His maid outfit makes $his servitude obvious while not looking too lewd.
<<case "harem gauze">>
- Her harem girl outfit lends her corner of your office an Eastern opulence.
+ $His harem girl outfit lends $his corner of your office an Eastern opulence.
<<case "slutty jewelry">>
- The bangles she's wearing make little noises every time she moves, serving as a constant reminder of her sexual availability.
+ The bangles $he's wearing make little noises every time $he moves, serving as a constant reminder of $his sexual availability.
<<case "conservative clothing">>
- Her clothes make it look like she's here for some other purpose than sexual slavery.
+ $His clothes make it look like $he's here for some other purpose than sexual slavery.
<<case "chains">>
- Her chains make it obvious that she's here as an office sex toy.
+ $His chains make it obvious that $he's here as an office sex toy.
<<case "Western clothing">>
- Her Western clothing is comically out of place in a modern office.
+ $His Western clothing is comically out of place in a modern office.
<<case "body oil">>
- Her body oil makes her muscles a lovely ornament to the office, and makes all her holes nice and inviting.
+ $His body oil makes $his muscles a lovely ornament to the office, and makes all $his holes nice and inviting.
<<case "a toga" "a hanbok">>
- Her toga lends an air of antiquity to the office.
+ $His toga lends an air of antiquity to the office.
<<case "a huipil">>
- Her revealing huipil is a delightfully exotic novelty in your office.
+ $His revealing huipil is a delightfully exotic novelty in your office.
<<case "a slutty qipao">>
- Her lovely qipao is a delicious contradiction of conservative silk patterns and scandalously high cuts.
- <<case "a tube top and thong" "a button-up shirt and panties" "a bra" "a button-up shirt" "a sweater" "a tank-top" "a thong" "a tube top" "a t-shirt" "a sweater and panties" "a tank-top and panties" "a t-shirt and thong" "an oversized t-shirt and boyshorts" "an oversized t-shirt" "a t-shirt and jeans" "boyshorts" "cutoffs" "panties" "leather pants and pasties" "leather pants" "a t-shirt and panties" "panties and pasties" "jeans" "a sweater and cutoffs" "leather pants and a tube top">>
- Her purpose as your office sex toy is prominently displayed by her revealing outfit.
+ $His lovely qipao is a delicious contradiction of conservative silk patterns and scandalously high cuts.
+ <<case "a bra" "a button-up shirt" "a button-up shirt and panties" "a sweater" "a sweater and cutoffs" "a sweater and panties" "a t-shirt" "a t-shirt and jeans" "a t-shirt and panties" "a t-shirt and thong" "a tank-top" "a tank-top and panties" "a thong" "a tube top" "a tube top and thong" "an oversized t-shirt" "an oversized t-shirt and boyshorts" "boyshorts" "cutoffs" "jeans" "leather pants" "leather pants and a tube top" "leather pants and pasties" "panties" "panties and pasties">>
+ $His purpose as your office sex toy is prominently displayed by $his revealing outfit.
<<case "a gothic lolita dress">>
- Her gothic lolita dress lends a cute but dark old world charm to your office.
+ $His gothic lolita dress lends a cute but dark old world charm to your office.
<<case "a police uniform">>
- Her police uniform lends an air of security and authority to your office.
+ $His police uniform lends an air of security and authority to your office.
<<case "a one-piece swimsuit">>
- Her one-piece swimsuit lends your office a more casual atmosphere.
+ $His one-piece swimsuit lends your office a more casual atmosphere.
<<case "a nice pony outfit" "a slutty pony outfit">>
- Her bondage pony outfit reinforces the atmosphere of submission to your will.
+ $His bondage pony outfit reinforces the atmosphere of submission to your will.
<<case "a sports bra" "sport shorts and a t-shirt" "sport shorts and a sports bra" "sport shorts">>
- Her athletlic clothing gives the office a more youthful vibe.
+ $His athletic clothing gives the office a more youthful vibe.
<<case "a skimpy loincloth">>
- Her skimpy loincloth gives the office a more barbaric and raw atmosphere.
+ $His skimpy loincloth gives the office a more barbaric and raw atmosphere.
<<default>>
<<if ($slaves[$i].vaginalAccessory == "chastity belt")>>
- Her chastity belt covers and protects her, but leaves her breasts naked, her mouth available, and her asshole vulnerable.
+ $His chastity belt covers and protects $his pussy, but leaves $his breasts naked, $his mouth available, and $his asshole vulnerable.
<<elseif ($slaves[$i].vaginalAccessory == "anal chastity")>>
- Her chastity belt covers and protects her anus, but leaves her breasts naked, her mouth available, and her pussy vulnerable.
+ $His chastity belt covers and protects $his anus, but leaves $his breasts naked, $his mouth available, and $his pussy vulnerable.
<<elseif ($slaves[$i].vaginalAccessory == "combined chastity")>>
- Her chastity belt covers and protects both her vagina and anus, but leaves her breasts naked and her mouth available.
+ $His chastity belt covers and protects both $his vagina and anus, but leaves $his breasts naked and $his mouth available.
<<else>>
- She's nude and ready to be fucked.
+ $He's nude and ready to be fucked.
<</if>>
<</switch>>
<</if>>//
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 81ff69161206be3a9009ed663ebc49d8c368319a..e883b051024d5891523ca9feb51bcc4207b9d13c 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -6,7 +6,7 @@
''__Slave Wardrobe__''
<br>
//
-The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should she be allowed to dress herself. The selection includes
+The room containing all the clothes and accessories you have available to dress your slaves in, as well as the supplies and tools your tailor needs to resize them to better fit your slaves. Several mirrors are set up for a slave to try on outfits should they be allowed to dress themselves. The selection includes
<<if ($cheatMode == 1) || (isItemAccessible("a bunny outfit") && isItemAccessible("chains") && isItemAccessible("conservative clothing") && isItemAccessible("Western clothing") && isItemAccessible("body oil") && isItemAccessible("a chattel habit") && isItemAccessible("a toga") && isItemAccessible("a huipil") && isItemAccessible("a kimono") && isItemAccessible("harem gauze") && isItemAccessible("a slutty qipao") && isItemAccessible("ancient Egyptian") && isItemAccessible("a maternity dress") && isItemAccessible("attractive lingerie for a pregnant woman") && isItemAccessible("a small empathy belly") && isItemAccessible("stretch pants and a crop-top") && isItemAccessible("shimapan panties") && isItemAccessible("a schutzstaffel uniform") && isItemAccessible("a burqa") && isItemAccessible("a dirndl") && isItemAccessible("battlearmor") && isItemAccessible("a police uniform") && isItemAccessible("a gothic lolita dress") && isItemAccessible("a cybersuit") && isItemAccessible("jeans") && isItemAccessible("boyshorts") && isItemAccessible("sport shorts and a sports bra") && isItemAccessible("a monokini") && isItemAccessible("a nice pony outfit"))>>
outfits from all manner of cultures and societies; not a single style eludes you.
<<else>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index aa491cef1ea1a41bc9613e960b6ac4cda5554ee3..cf066ff01bd8572544ac0c6f5664eac3b35737ad 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -477,9 +477,57 @@
"She considered herself ugly and wished to stay out of your gene pool."
"She offered herself to you for enslavement because she was swept up in the romanticism of a revival of Rome."
"She offered herself to you for enslavement because she needs to feel a higher call."
- "She offered herself to you for enslavement because she had a disgustingly naive view of medieval Japanese culture."
+ "She offered herself to you for enslavement because she had a disgustingly naïve view of medieval Japanese culture."
"She offered herself to you for enslavement because she thought your harem her best hope for good treatment."
"She offered herself to you for enslavement because she thought she would have prospects of advancement among your slaves."
+ /*reRecruit
+ "She offered herself to you as a slave to escape a life of boredom."
+ "She offered herself to you as a slave to escape the hard life of a free whore."
+ "She was enslaved after she fell into debt to you."
+ "You turned her into a slave girl after she fell into debt to you."
+ "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy."
+ "She offered herself as a slave to escape the horrors a blind girl faces on the streets."
+ "She came to you to escape being sold to a cruel master after her producer informed her of her debt."
+ "She sold herself into slavery to escape life on the streets."
+ "You tricked her into enslavement, manipulating her based on her surgical addiction."
+ "She was raised in a radical slave school that treated her with drugs and surgery from a very young age."
+ "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty."
+ "She asked to be enslaved out of naïve infatuation with you."
+ "She asked to be enslaved in the hope you'd treat a fellow woman well."
+ "She asked to be enslaved since she felt you were her only hope of becoming a prettier woman."
+ "She got into debt for damaging someone's property during a student protest and you bought out her debt."
+ "She enslaved herself to be with a man she loved, only to be sold to you afterward."
+ "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward."
+ "She was given to you by criminals as 'tribute', after which you transformed the overthrown (male) leader of their rival gang."
+ "She was a runaway slave captured by a gang outside your arcology. You bought her cheap after she was harshly used by them."
+ "She was the private slave of a con artist cult leader before he had to abandon her and flee."
+ "She was a dickgirl chaser in the slave races before being sold to you."
+ "She was a virgin runner in the slave races before being sold to you."
+ "She was a famous virgin runner in the slave races before being sold to you."
+ "She was the housekeeper and fucktoy of a frat house before being collected by repo-men and sold to you."
+ "She was a nanny before being sold to you."
+ "She was a milk cow in the stable of a slaveholding farmer before being sold to you."
+ "She was a breeding bull in the stable of a slaveholding farmer before being sold to you."
+ "She was a virgin cow in the stable of a slaveholding farmer before being sold to you."
+ "She was in an orphanage until reaching maturity, at which point she was sold to you."
+ "She was captured in a raid on a gated community and quickly sold off."
+ "She sold herself into slavery to pay for her children's education."
+ "She sold herself into slavery to spite her father."
+ "She offered herself to you for enslavement out of devotion to her artistic 'craft'."
+ "She sold herself into slavery to pay her immigration costs."
+ "She offered to sell you her body and you graciously accepted."
+ "You helped her give birth, leaving her deeply indebted to you."
+ "She sold herself into slavery to feed herself and her growing brood."
+ "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you."
+ "Her womb held a baby you desired."
+ "She is an unsuccessful cyborg experiment that was set free."
+ "She was the virgin figurehead of a new religion and 'blessed' by their Lord."
+ "She was the holy vessel of a new religion and 'blessed' by their Lord to bring forth His servants."
+ "You purchased her in order to pave the way for her brother to take the throne."
+ "You purchased her as a favor to her father."
+ "You purchased her from a King after his son put an illegitimate heir in her womb."
+ "You purchased her from a King after she expressed knowledge of the prince's affair with another servant."
+ */
%/
<<default>>
<<print $args[0].origin>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 238ff270e08d483b585d72098091160419a16f6d..27e7047b4a6b866a4d2340305d08b6de740f5295 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -119,7 +119,7 @@
<<case "shibari ropes">>
$activeSlave.slaveName's
<<if $activeSlave.boobs > 12000>>
- breasts are restrained by yards and yards of rope.
+ breasts are restrained by <<if $showInches == 2>>yards and yards<<else>>meters and meters<</if>> of rope.
<<elseif $activeSlave.boobs > 2000>>
boobs are tightly bound with rope, soft flesh pushing out from between them.
<<elseif $activeSlave.boobs < 300>>
@@ -1271,7 +1271,7 @@ $His
<<case "partially inverted">>
_nipColor, partially inverted nipples are causing $him some discomfort as the milkers haul against them.
<<case "inverted">>
- _nipColor, inverted nipples are being kept painfully protruded by the milkers' powerful suction.
+ _nipColor, inverted nipples are being kept painfully protruded by the milkers' powerful suction.
<<case "huge">>
huge _nipColor nipples fill the milkers completely.
<<case "fuckable">>
@@ -1352,7 +1352,7 @@ $His
<<case "a monokini")>>
Since $he is topless, they're plainly visible.
<<default>>
- <<if !["tiny", "inverted", "partially inverted", "fuckable"].includes($activeSlave.nipples)>>
+ <<if !["fuckable", "inverted", "partially inverted", "tiny"].includes($activeSlave.nipples)>>
<<switch $activeSlave.clothes>>
<<case "cutoffs and a t-shirt")>>
Since $he isn't wearing a bra, they tent the front of $his t-shirt.
@@ -3034,7 +3034,7 @@ $He's got a
<<else>>
pussy is concealed by $his beautiful halter top dress.
<</if>>
- <<case "a ball gown">>
+ <<case "a ball gown">>
$activeSlave.slaveName's
<<if $activeSlave.dick > 3>>
cock tents the front of $his fabulous silken ball gown.
@@ -4881,8 +4881,9 @@ $He's got a
Society looks fondly on $his complete inability to reproduce.
<</if>>
-<<if ($activeSlave.physicalAge < 11)>>
- $He is too young to have pubic hair.
+<<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
+<<if ($activeSlave.physicalAge < _pubertyAge-2)>>
+ $He is too sexually immature to have pubic hair.
<<elseif ($activeSlave.pubicHStyle == "hairless")>>
$He's naturally smooth and hairless.
<<elseif ($activeSlave.pubicHStyle == "bald")>>
@@ -4895,10 +4896,10 @@ $He's got a
<<else>>
$He's waxed and smooth.
<</if>>
-<<elseif ($activeSlave.physicalAge < 12)>>
+<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
$He has a few wisps of pubic hair.
-<<elseif ($activeSlave.physicalAge < 13)>>
- Because of $his young age $he has barely any pubic hair.
+<<elseif ($activeSlave.physicalAge < _pubertyAge)>>
+ $He is on the verge of puberty and has a small patch of $activeSlave.pubicHColor pubic hair above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
<<elseif ($activeSlave.pubicHStyle == "in a strip")>>
$His $activeSlave.pubicHColor pubic hair is waxed into a narrow strip above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
<<elseif ($activeSlave.pubicHStyle == "neat")>>
@@ -4931,14 +4932,14 @@ $He's got a
<<else>>
$His clit is quite large.
<</if>>
- $His lack of hood makes it even more prominent.
+ $His lack of hood makes it even more prominent.
<<elseif ($activeSlave.clit == 2)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is huge and visibly erect.
<<else>>
$His clit is huge.
<</if>>
- Lack of hood combined with its size means $he can't wear any clothes without being constantly stimulated.
+ Lack of hood combined with its size means $he can't wear any clothes without being constantly stimulated.
<<elseif ($activeSlave.clit == 3)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is enormous, and since it's erect with arousal, it juts out proudly.
@@ -4965,35 +4966,35 @@ $He's got a
<<else>>
$His clit is quite large.
<</if>>
- $His clitoral hood is stretched thin trying to cover it.
+ $His clitoral hood is stretched thin trying to cover it.
<<elseif ($activeSlave.clit == 2)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is huge and visibly erect.
<<else>>
$His clit is huge.
<</if>>
- $His small hood is no longer able to cover it completely and large part of $his clitoris is always exposed.
+ $His small hood is no longer able to cover it completely and large part of $his clitoris is always exposed.
<<elseif ($activeSlave.clit == 3)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is enormous, and since it's erect with arousal, it juts out proudly.
<<else>>
$His clit is enormous, almost a pseudophallus.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<<elseif ($activeSlave.clit == 4)>>
<<if ($activeSlave.devotion > 50)>>
$His clit has reached the size of an average penis, it stands at attention but due to lack of erectile tissues it can't reach the same hardness a penis would.
<<else>>
$His clit has reached the size of an average penis.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<<else>>
<<if ($activeSlave.devotion > 50)>>
$His clit is massive, having reached the size of a large penis. It is semi-erect since lack of erectile tissues means it can never become fully erect.
<<else>>
$His clit is massive, having reached the size of a large penis.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<</if>>
<<elseif ($activeSlave.foreskin == 2)>>
<<if ($activeSlave.clit == 1)>>
@@ -5002,35 +5003,35 @@ $He's got a
<<else>>
$His clit is quite large.
<</if>>
- It is completely covered by its hood.
+ It is completely covered by its hood.
<<elseif ($activeSlave.clit == 2)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is huge and visibly erect.
<<else>>
$His clit is huge.
<</if>>
- Its hood is stretched thin trying to cover it.
+ Its hood is stretched thin trying to cover it.
<<elseif ($activeSlave.clit == 3)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is enormous, and since it's erect with arousal, it juts out proudly.
<<else>>
$His clit is enormous, almost a pseudophallus.
<</if>>
- It's large enough that the hood can cover only half of it.
+ It's large enough that the hood can cover only half of it.
<<elseif ($activeSlave.clit == 4)>>
<<if ($activeSlave.devotion > 50)>>
$His clit has reached the size of an average penis, it stands at attention but due to lack of erectile tissues it can't reach the same hardness a penis would.
<<else>>
$His clit has reached the size of an average penis.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<<else>>
<<if ($activeSlave.devotion > 50)>>
$His clit is massive, having reached the size of a large penis. It is semi-erect since lack of erectile tissues means it can never become fully erect.
<<else>>
$His clit is massive, having reached the size of a large penis.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<</if>>
<<elseif ($activeSlave.foreskin == 3)>>
<<if ($activeSlave.clit == 1)>>
@@ -5039,35 +5040,35 @@ $He's got a
<<else>>
$His clit is quite large.
<</if>>
- The hood covering it is quite large making stimulation difficult.
+ The hood covering it is quite large making stimulation difficult.
<<elseif ($activeSlave.clit == 2)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is huge and visibly erect.
<<else>>
$His clit is huge.
<</if>>
- $His large hood completely covers it.
+ $His large hood completely covers it.
<<elseif ($activeSlave.clit == 3)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is enormous, and since it's erect with arousal, it juts out proudly.
<<else>>
$His clit is enormous, almost a pseudophallus.
<</if>>
- $His large hood covers all but the tip of $his clit even when aroused.
+ $His large hood covers all but the tip of $his clit even when aroused.
<<elseif ($activeSlave.clit == 4)>>
<<if ($activeSlave.devotion > 50)>>
$His clit has reached the size of an average penis, it stands at attention but due to lack of erectile tissues it can't reach the same hardness a penis would.
<<else>>
$His clit has reached the size of an average penis.
<</if>>
- Even $his large hood can't cover it, leaving over half of the clit exposed.
+ Even $his large hood can't cover it, leaving over half of the clit exposed.
<<else>>
<<if ($activeSlave.devotion > 50)>>
$His clit is massive, having reached the size of a large penis. It is semi-erect since lack of erectile tissues means it can never become fully erect.
<<else>>
$His clit is massive, having reached the size of a large penis.
<</if>>
- $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
+ $His hood can no longer contain it and has slid back causing $his clitoris to be always exposed.
<</if>>
<<else>>
<<if ($activeSlave.clit == 1)>>
@@ -5076,35 +5077,35 @@ $He's got a
<<else>>
$His clit is quite large.
<</if>>
- $His large thick hood covering it makes any stimulation difficult.
+ $His large thick hood covering it makes any stimulation difficult.
<<elseif ($activeSlave.clit == 2)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is huge and visibly erect.
<<else>>
$His clit is huge.
<</if>>
- $His large thick hood covering it makes any stimulation difficult.
+ $His large thick hood covering it makes any stimulation difficult.
<<elseif ($activeSlave.clit == 3)>>
<<if ($activeSlave.devotion > 50)>>
$His clit is enormous, and since it's erect with arousal, it juts out proudly.
<<else>>
$His clit is enormous, almost a pseudophallus.
<</if>>
- Matching its size is the thick hood covering it.
+ Matching its size is the thick hood covering it.
<<elseif ($activeSlave.clit == 4)>>
<<if ($activeSlave.devotion > 50)>>
$His clit has reached the size of an average penis, it stands at attention but due to lack of erectile tissues it can't reach the same hardness a penis would.
<<else>>
$His clit has reached the size of an average penis.
<</if>>
- $His large hood covering over half of it adds to its penis-like appearance.
+ $His large hood covering over half of it adds to its penis-like appearance.
<<else>>
<<if ($activeSlave.devotion > 50)>>
$His clit is massive, having reached the size of a large penis. It is semi-erect, since lack of erectile tissues means it can never reach full erection.
<<else>>
$His clit is massive, having reached the size of a large penis.
<</if>>
- Not even its large hood can contain it, leaving over half of it exposed.
+ Not even its large hood can contain it, leaving over half of it exposed.
<</if>>
<</if>>
<</if>>
@@ -5764,7 +5765,7 @@ $He has
<<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
threatens to burst out of $his body.
<<else>>
- fills $his body.
+ fills $his body.
<</if>>
<<if $activeSlave.amp == 0>> $He requires multiple slaves to get to $his feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $his middle when $he must walk anywhere<</if>>.<</if>>
<<elseif $activeSlave.height >= 185>>
@@ -5774,7 +5775,7 @@ $He has
<<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
threatens to burst out of $his body.
<<else>>
- fills $his body.
+ fills $his body.
<</if>>
<<if $activeSlave.amp == 0>> $He requires multiple slaves to get to $his feet<<if $saleDescription == 0>>, and uses a wheeled stand to support $his middle when $he must walk anywhere<</if>>.<</if>>
<<elseif $activeSlave.muscles > 90>>
@@ -5819,7 +5820,7 @@ $He has
<<if $activeSlave.weight > 190>>
$His massively fat belly is stretched to the limit, so much so $his folds are pulled flat and $his softness, firm. Despite being so taut, $his belly visibly bulges and squirms from all the babies writhing within $him. $His womb is so full you can see the babies forced up against $his uterus, <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>$he is at risk of rupturing should $he grow larger<<else>>though $his body shows little sign of being troubled by this<</if>>.
<<else>>
- Despite being stretched taut, $his belly visibly bulges and squirms from all the babies writhing within $him. $His womb is so full you can see the babies forced up against $his uterus, <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>$he is at risk of rupturing should $he grow larger<<else>>though $his body shows little sign of being troubled by this<</if>>.
+ Despite being stretched taut, $his belly visibly bulges and squirms from all the babies writhing within $him. $His womb is so full you can see the babies forced up against $his uterus, <<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>$he is at risk of rupturing should $he grow larger<<else>>though $his body shows little sign of being troubled by this<</if>>.
<</if>>
<<if $activeSlave.preg < 30>>
Given how far along $he is, $he is clearly having an obscene number of children.
@@ -5884,7 +5885,7 @@ $He has
<<if $activeSlave.weight > 190>>
$His massively fat belly is stretched to the limit, so much so $his folds are pulled flat. $His pregnancy is covered in an ever thinning layer of fat, save for the bulging upper portion where $his fat is thinnest. In that, rather large, area, you can just make out the many babies bulging $his stomach.
<<else>>
- $He is so pregnant you can just make out the many babies bulging $his stomach.
+ $He is so pregnant you can just make out the many babies bulging $his stomach.
<</if>>
<<if $activeSlave.preg < 30>>
Given how far along $he is, $he is clearly having an obscene number of children.
@@ -5914,7 +5915,7 @@ $He has
<<if $activeSlave.weight > 190>>
$His massively fat belly is stretched to the limit, so much so $his folds are pulled flat. $His middle is covered in an ever thinning layer of fat, save for the bulging upper portion where $his fat is thinnest. In that, rather large, area, you can just make out the implant bulging $his stomach.
<<else>>
- $He is so full you can nearly make out the implant within $his body through $his skin.
+ $He is so full you can nearly make out the implant within $his body through $his skin.
<</if>>
<<if $activeSlave.bellyFluid >= 1500>>
<<if $activeSlave.inflationMethod == 2>>
@@ -15089,7 +15090,7 @@ $He has
<<elseif $activeSlave.weight > 160>>
Your sleek, slim society finds $his disgustingly bloated body repulsive.
<<elseif $activeSlave.weight > 130>>
- Your sleek, slim society finds $his hugely bloated body disgusting.
+ Your sleek, slim society finds $his hugely bloated body disgusting.
<<elseif $activeSlave.weight > 95>>
Your sleek, slim society finds $his bloated body disgusting.
<<elseif $activeSlave.weight > 30>>
@@ -15100,7 +15101,7 @@ $He has
<<if $activeSlave.belly >= 1000000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
- Your breeding focused society finds $his unfathomable, hyper-swollen, implant-filled belly near the pinacle of fashion despite $his inability to have children.
+ Your breeding focused society finds $his unfathomable, hyper-swollen, implant-filled belly near the pinnacle of fashion despite $his inability to have children.
<<else>>
Your breeding focused society finds $his unfathomable, hyper-swollen pregnant belly the perfect realization of the fashionable ideal.
<</if>>
@@ -15375,7 +15376,7 @@ $He has
<<if $activeSlave.belly > ($activeSlave.pregAdaptation*1000)>>
@@.red;on the brink of bursting!@@ $His belly is painfully stretched and $his womb packed to capacity; the slightest provocation could cause $him to rupture.
<<else>>
- @@.pink;unbelievably pregnant@@ with $activeSlave.pregType babies.
+ @@.pink;unbelievably pregnant@@ with $activeSlave.pregType babies.
<</if>>
<<if $activeSlave.preg >= $activeSlave.pregData.normalBirth*1.375>>
$He is horrifically overdue; $he should have given birth a staggering <<print ($activeSlave.preg-$activeSlave.pregData.normalBirth)>> weeks ago.
@@ -16522,7 +16523,7 @@ $He has
$activeSlave.actualAge years old<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<</if>>
<<elseif $activeSlave.actualAge < 20>>
- in $his final year as a teenager at age 19<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ in $his final year as a teenager at age 19<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<<elseif $activeSlave.actualAge < 26>>
a young woman,
<<if $showAgeDetail == 1>>
@@ -17374,7 +17375,7 @@ $He has
<<case "slutty jewelry">>
$activeSlave.slaveName's bangles include a long thin chain that looks ready to snap as in encircles $his titanic implant-filled belly.
<<case "a leotard">>
- $activeSlave.slaveName's tight leotard shows off every inch of $his titanic implant-filled belly. $His immense stomach slightly protrudes from the various rips and tears that have begun appearing in the fabric.
+ $activeSlave.slaveName's tight leotard shows off every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his titanic implant-filled belly. $His immense stomach slightly protrudes from the various rips and tears that have begun appearing in the fabric.
<<case "a monokini">>
$activeSlave.slaveName's titanic implant-filled belly has pushed down the front of $his monokini, leaving $his belly mostly bare.
<<case "an apron">>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 4ddc212125467bc8d57fb52f695458e65d2b1fa4..9520e03461c6505241190d23032b139d804d9b70 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -42,7 +42,7 @@ $activeSlave.slaveName is
<</if>>
<<case "body oil">>
- rubbed into every inch of exposed skin to show off $his body.
+ rubbed into every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of exposed skin to show off $his body.
<<if ($activeSlave.amp == 1)>>
/* no description yet */
<<else>>
@@ -114,7 +114,7 @@ $activeSlave.slaveName is
<</if>>
<<case "a latex catsuit">>
- shiny and supple latex hugging every inch of $his body below the neck.
+ shiny and supple latex hugging every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his body below the neck.
<<if ($activeSlave.amp == 1)>>
/* no description yet */
<<else>>
@@ -3682,7 +3682,7 @@ $His
<<case "flats">>
a pair of leather sandals with a mirror image of the words "FUCK ME" embossed into the soles, so that if $he walks on sand the message will be visible in $his footprints.
<<case "boots">>
- high leather boot sandals that remain comfortable after walking 25 miles in one day.
+ high leather boot sandals that remain comfortable after walking <<if $showInches == 2>>25 miles<<else>>40 kilometers<</if>> in one day.
<<case "heels">>
heeled sandals with a mirror image of the words "POUND ME" embossed into the soles, so that if $he walks on sand the message will be visible in $his footprints.
<<case "pumps">>
@@ -4357,7 +4357,7 @@ $His
<<case "flats">>
white flat shoes.
<<case "boots">>
- white leather boots that come up $his thighs to an inch below the hem of $his skirt.
+ white leather boots that come up $his thighs to <<if $showInches == 2>>an inch<<else>>three centimeters<</if>> below the hem of $his skirt.
<<case "heels">>
white fuck-me heels.
<<case "pumps">>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 2b25a01a68ec1cc71f69c50787becf4b00cd11ad..386f0b6139457da293561dcb60742bcce7b55c44 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -238,7 +238,7 @@
<<case "advertisements">>
$He has an ad for the arcology itself tattooed across $his back.
<<case "rude words">>
- 'Sex Slave' is tattooed across $his back; the tattoo uses the broad space to make each letter six inches tall, so that $his identity can be read from hundreds of <<if $showInches == 2>>yards<<else>>meter<</if>> off.
+ 'Sex Slave' is tattooed across $his back; the tattoo uses the broad space to make each letter <<if $showInches == 2>>six inches<<else>>fifteen centimeters<</if>> tall, so that $his identity can be read from hundreds of <<if $showInches == 2>>yards<<else>>meter<</if>> off.
<<case "degradation">>
$He has
<<if $activeSlave.dick > 0>>
@@ -269,15 +269,15 @@
An Asian dragon is tattooed in a circle across $his back; the dragon has subtle features that, according to traditional meanings, relate it to $his personality.
<<case "scenes">>
<<if $activeSlave.vagina == -1>>
- A line-art rendition of $activeSlave.slaveName herself cumming copiously while riding a dick is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself cumming copiously while riding a dick is tattooed across $his entire back.
<<elseif $activeSlave.lactation > 0>>
- A line-art rendition of $activeSlave.slaveName herself nursing a pair of $his fellow slaves is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself nursing a pair of $his fellow slaves is tattooed across $his entire back.
<<elseif $activeSlave.vaginalSkill >= 100>>
- A line-art rendition of $activeSlave.slaveName herself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
<<elseif $PC.vagina == 1>>
- A line-art rendition of $activeSlave.slaveName herself eating pussy is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself eating pussy is tattooed across $his entire back.
<<else>>
- A line-art rendition of $activeSlave.slaveName herself deepthroating a cock is tattooed across $his entire back.
+ A line-art rendition of $activeSlave.slaveName $himself deepthroating a cock is tattooed across $his entire back.
<</if>>
<<case "bovine patterns">>
$His back is tattooed to resemble the dappled flank of a cow.
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index b132ad24b429789cd9dbadfe8fe7d3cda41794a6..d72d329e915a65111cd466f1f19b37f86fc87319 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4681,6 +4681,9 @@
<<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>>
<<set $activeSlave.trust = 80, $activeSlave.devotion = 80>>
<<set $activeSlave.health = random(80,95)>>
+ <<set $activeSlave.origin = "The Job Fulfillment Center offered her contract to fill your request for a ">>
+ <<set $activeSlave.origin += $Role>>
+ <<set $activeSlave.origin += ".">>
<<switch $Role>>
/* Opens security */
<<case "Lieutenant Colonel">>