diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js index 9ac1d3fb0031cd790dab0e7b527f62a290286edc..6a317cc0df4d3bc36c50640bfa542d711afc0c04 100644 --- a/src/js/generateMarketSlave.js +++ b/src/js/generateMarketSlave.js @@ -19,7 +19,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } V.one_time_age_overrides_pedo_mode = 1; if (V.corpSpecRaces.length > 0) { - V.fixedRace = V.corpSpecRaces.random(); + V.fixedRace = jsEither([V.corpSpecRaces]); } if (V.corpSpecGender === 1) { r += `Slaves without pussies are not trained. `; @@ -71,10 +71,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { if (V.corpSpecRaces.length === 12) { r += `There is no racial element to trainee selection. `; } else if (V.corpSpecRaces.length === 1) { - const corpSpecRace = jsEither[V.corpSpecRaces]; + const corpSpecRace = jsEither([V.corpSpecRaces]); r += `The corporation specializes in ${corpSpecRace} slaves. `; } else { - r += `The corporation selects slaves based on race. /*getting into the specifics of which races exactly is a hellhole I'd rather not jump into*/ `; + r += `The corporation selects slaves based on race. `/*getting into the specifics of which races exactly is a hellhole I'd rather not jump into*/ ; } if (V.corpSpecTrust > 0) { V.activeSlave.trust = jsRandom(-105, -85) + V.corpSpecTrust * 20; @@ -204,7 +204,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { if ((V.activeSlave.voice === 1) && (V.activeSlave.voiceImplant === 0)) { V.activeSlave.voice += 1; V.activeSlave.voiceImplant += 1; - } V.activeSlave.waist = Math.trunc(V.activeSlave.waist, -100, -15); + } + V.activeSlave.waist = Math.trunc(V.activeSlave.waist, -100, -15); if (((V.activeSlave.boobShape === "saggy") || (V.activeSlave.boobShape === "downward-facing"))) { V.activeSlave.boobShape = "normal"; } @@ -287,7 +288,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if ((V.activeSlave.height > 180)) { V.activeSlave.height -= jsRandom(3, 6); - } V.activeSlave.devotion += jsRandom(5, 10); + } + V.activeSlave.devotion += jsRandom(5, 10); V.activeSlave.trust += jsRandom(5, 10); V.activeSlave.attrXY = Math.clamp(V.activeSlave.attrXY+jsRandom(5, 10), 0, 100); } else if (V.corpSpecHormones === 2) { @@ -306,7 +308,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if ((V.activeSlave.vagina > -1) && (V.activeSlave.vaginaLube > 0)) { V.activeSlave.vaginaLube = Math.clamp(V.activeSlave.vaginaLube-1, 0, 2); - } V.activeSlave.butt = Math.clamp(V.activeSlave.butt-1, 0, 10); + } + V.activeSlave.butt = Math.clamp(V.activeSlave.butt-1, 0, 10); V.activeSlave.boobs = Math.clamp(V.activeSlave.boobs-400, 0, 10000); if (V.activeSlave.face > 10) { V.activeSlave.face = Math.clamp(V.activeSlave.face-20, -100, 100); @@ -328,7 +331,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if ((V.activeSlave.height < 155)) { V.activeSlave.height += jsRandom(3, 6); - } V.activeSlave.devotion -= jsRandom(5, 10); + } + V.activeSlave.devotion -= jsRandom(5, 10); V.activeSlave.trust -= jsRandom(5, 10); V.activeSlave.attrXX = Math.clamp(V.activeSlave.attrXX+jsRandom(5, 10), 0, 100); } else { @@ -343,7 +347,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.nipples = jsEither(["cute", "tiny"]); if (V.activeSlave.dick > 0) { V.activeSlave.dick = jsRandom(1, 2); - } if (V.activeSlave.balls > 0) { + } + if (V.activeSlave.balls > 0) { V.activeSlave.balls = jsRandom(1, 2); } } else if (V.corpSpecInjection === 2) { @@ -354,7 +359,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.nipples = jsEither(["cute", "partially inverted"]); if (V.activeSlave.dick > 0) { V.activeSlave.dick = jsRandom(3, 4); - } if (V.activeSlave.balls > 0) { + } + if (V.activeSlave.balls > 0) { V.activeSlave.balls = jsRandom(3, 4); } } else if (V.corpSpecInjection === 3) { @@ -365,7 +371,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.nipples = jsEither(["cute", "partially inverted"]); if (V.activeSlave.dick > 0) { V.activeSlave.dick = jsRandom(4, 5); - } if (V.activeSlave.balls > 0) { + } + if (V.activeSlave.balls > 0) { V.activeSlave.balls = jsRandom(4, 5); } } else if (V.corpSpecInjection === 4) { @@ -376,7 +383,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.nipples = jsEither(["huge", "inverted"]); if (V.activeSlave.dick > 0) { V.activeSlave.dick = jsRandom(5, 6); - } if (V.activeSlave.balls > 0) { + } + if (V.activeSlave.balls > 0) { V.activeSlave.balls = jsRandom(5, 6); } } else if (V.corpSpecInjection === 5) { @@ -387,7 +395,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.nipples = jsEither(["huge", "inverted"]); if (V.activeSlave.dick > 0) { V.activeSlave.dick = jsRandom(6, 8); - } if (V.activeSlave.balls > 0) { + } + if (V.activeSlave.balls > 0) { V.activeSlave.balls = jsRandom(5, 7); } } @@ -442,7 +451,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { if (V.arcologies[market].FSSubjugationist > 20) { V.fixedRace = V.arcologies[market].FSSubjugationistRace; - } V.activeSlave = GenerateNewSlave(); + } + V.activeSlave = GenerateNewSlave(); V.activeSlave.origin = "You bought her from "; V.activeSlave.origin += V.arcologies[market].name; V.activeSlave.origin += "."; @@ -454,7 +464,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.anus > 0) { V.activeSlave.skill.anal += Math.clamp(V.arcologies[market].prosperity/2, 15, 100); - } V.activeSlave.skill.oral += Math.clamp(V.arcologies[market].prosperity/2, 15, 100); + } + V.activeSlave.skill.oral += Math.clamp(V.arcologies[market].prosperity/2, 15, 100); V.activeSlave.attrKnown = 1; V.activeSlave.fetishKnown = 1; if (V.activeSlave.accent >= 3) { @@ -488,8 +499,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.pregType = jsRandom(3, 8); V.activeSlave.pregAdaptation = 100; - } SetBellySize(V.activeSlave); - } V.activeSlave.lactation = jsRandom(0, 1); + } + SetBellySize(V.activeSlave); + } + V.activeSlave.lactation = jsRandom(0, 1); if (V.activeSlave.lactation > 0) { V.activeSlave.lactationDuration = 2; } @@ -505,9 +518,11 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { r += `Smart and attractive slaves are beginning to be a rarity lately. `; if (V.activeSlave.face >= 0) { V.activeSlave.face -= 100; - } if (V.activeSlave.intelligence >= 0) { + } + if (V.activeSlave.intelligence >= 0) { V.activeSlave.intelligence -= 100; - } V.activeSlave.chem = jsRandom(40, 100); + } + V.activeSlave.chem = jsRandom(40, 100); V.activeSlave.addict = jsEither([0, 0, 0, 0, 0, 0, 0, 0, 5, 20, 20, 50, 100]); } } @@ -553,15 +568,19 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.butt -= jsRandom(0, 1); if (V.activeSlave.hips > -2) { V.activeSlave.hips -= jsRandom(0, 1); - } if (V.activeSlave.shoulders < 2) { + } + if (V.activeSlave.shoulders < 2) { V.activeSlave.shoulders += jsRandom(0, 1); - } if (V.activeSlave.face >= -80) { + } + if (V.activeSlave.face >= -80) { V.activeSlave.face -= jsRandom(0, 20); - } if (V.activeSlave.faceShape !== "androgynous") { + } + if (V.activeSlave.faceShape !== "androgynous") { if (jsRandom(0, 1) === 0) { V.activeSlave.faceShape = "androgynous"; } - } V.activeSlave.clit += jsRandom(0, 2); + } + V.activeSlave.clit += jsRandom(0, 2); V.activeSlave.labia += jsRandom(0, 1); if (V.activeSlave.muscles <= 95) { V.activeSlave.muscles += jsRandom(0, 20); @@ -637,7 +656,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.ovaryAge = V.activeSlave.actualAge; if (V.activeSlave.boobs > 400) { V.activeSlave.boobs -= 100*jsRandom(0, 2); - } if (V.activeSlave.butt > 3) { + } + if (V.activeSlave.butt > 3) { V.activeSlave.butt -= jsRandom(0, 2); } } else if (V.arcologies[market].FSYouthPreferentialistResearch === 1) { @@ -662,7 +682,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.ovaryAge = V.activeSlave.actualAge; if (V.activeSlave.boobs < 400) { V.activeSlave.boobs += 100*jsRandom(0, 2); - } if (V.activeSlave.butt < 3) { + } + if (V.activeSlave.butt < 3) { V.activeSlave.butt += jsRandom(0, 2); } } @@ -720,7 +741,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { r += `They're usually very soft and rather laid back. `; V.activeSlave.weight = jsRandom(30, 180); - } r += `Though they often come with intense fetishes. `; + } + r += `Though they often come with intense fetishes. `; V.activeSlave.muscles = jsRandom(-50, 0); V.activeSlave.trust += jsRandom(5, 15); V.activeSlave.energy += jsRandom(0, 10); @@ -733,7 +755,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.fetish === "none") { V.activeSlave.fetish = jsEither(["boobs", "buttslut", "cumslut", "dom", "humiliation", "masochist", "pregnancy", "sadist", "submissive"]); - } V.activeSlave.fetishStrength = jsRandom(60, 90); + } + V.activeSlave.fetishStrength = jsRandom(60, 90); if (jsRandom(1, 100) <= 5 && V.activeSlave.fetish !== "mindbroken") { switch (V.activeSlave.fetish) { case "submissive": @@ -754,7 +777,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.sexualFlaw = "malicious"; break; case "masochist": V.activeSlave.sexualFlaw = "self hating"; - } V.activeSlave.fetishStrength = 100; + } + V.activeSlave.fetishStrength = 100; } } if (V.arcologies[market].FSPastoralist > 20) { @@ -780,7 +804,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.balls < 20) { V.activeSlave.balls += jsRandom(5, 20); - } V.activeSlave.scrotum = V.activeSlave.balls-5; + } + V.activeSlave.scrotum = V.activeSlave.balls-5; V.activeSlave.prostate = jsEither([1, 1, 1, 2, 2, 3]); if (V.activeSlave.muscles < 30) { V.activeSlave.muscles += jsRandom(0, 20); @@ -788,7 +813,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.arcologies[market].FSChattelReligionist > 20) { r += `They're rarely anything but devoted, and sometimes present interesting peccadilloes. `; - V.activeSlave.slaveName = setup.chattelReligionistSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.chattelReligionistSlaveNames]); if (V.activeSlave.devotion < 10) { V.activeSlave.devotion += jsRandom(0, 10); } @@ -801,24 +826,30 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.arcologies[market].FSRomanRevivalist > 20) { r += `They've often seen things that drive any squeamishness out of them. `; - V.activeSlave.slaveName = setup.romanSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.romanSlaveNames]); if (jsRandom(0, 1) === 0) { V.activeSlave.sexualQuirk = "unflinching"; } } else if (V.arcologies[market].FSAztecRevivalist > 20) { - r += `They've seen sights that will traumatize almost anyoneif (!canSee(V.activeSlave)>>, so to speak} V.activeSlave.slaveName = setup.aztecSlaveNames.random()) { `; + r += `They've seen sights that will traumatize almost anyone`; + if (!canSee(V.activeSlave)) { + r += ", so to speak. "; + } else { + r += ". "; + } + V.activeSlave.slaveName = jsEither([setup.aztecSlaveNames]); if (jsRandom(0, 1) === 0) { V.activeSlave.trust = -30; } } else if (V.arcologies[market].FSEgyptianRevivalist > 20) { r += `They've often done things that give them a distinct appetite for perversion. `; - V.activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.ancientEgyptianSlaveNames]); if (jsRandom(0, 1) === 0) { V.activeSlave.sexualQuirk = "perverted"; } } else if (V.arcologies[market].FSEdoRevivalist > 20) { r += `They have frequently absorbed much culture there. `; - V.activeSlave.slaveName = setup.edoSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.edoSlaveNames]); V.activeSlave.skill.entertainment = Math.clamp(V.activeSlave.skill.entertainment, 35, 100); } else if (V.arcologies[market].FSArabianRevivalist > 20) { r += `They've often been part of large harems in which selflessness is prized. `; @@ -864,7 +895,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else if (V.opinion < -2) { r += `Your arcology's very different culture from '' V.arcologies[market].name'''s makes its slaves unhappy with the prospect of life in your arcology, and afraid of what will happen to them there. `; } - } break; + } + break; case "heap": V.activeSlave = GenerateNewSlave(); V.activeSlave.origin = "You bought her from a body dump, completely broken."; @@ -882,23 +914,27 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.amp !== 1) { V.activeSlave.heels = jsEither([0, 0, 0, 0, 0, 1, 1]); - } V.activeSlave.voice = jsRandom(0, 2); + } + V.activeSlave.voice = jsRandom(0, 2); V.activeSlave.face = jsRandom(-100, 20); if (V.activeSlave.vagina > -1) { V.activeSlave.vagina = jsEither([1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10]); V.activeSlave.preg = jsRandom(-3, -1); V.activeSlave.belly = 0, V.activeSlave.bellyPreg = 0; V.activeSlave.counter.vaginal += jsRandom(0, 300); - } V.activeSlave.anus = jsEither([1, 2, 2, 3, 3, 3, 3, 4, 4, 4]); + } + V.activeSlave.anus = jsEither([1, 2, 2, 3, 3, 3, 3, 4, 4, 4]); if (V.activeSlave.balls > 1) { if (jsRandom(1, 100) > 50) { V.activeSlave.balls = 0; } - } V.activeSlave.counter.oral += jsRandom(0, 300); + } + V.activeSlave.counter.oral += jsRandom(0, 300); V.activeSlave.counter.anal += jsRandom(0, 300); if (V.activeSlave.boobs > 500) { V.activeSlave.counter.mammary += jsRandom(0, 300); - } V.activeSlave.skill.vaginal = 0; + } + V.activeSlave.skill.vaginal = 0; V.activeSlave.skill.oral = 0; V.activeSlave.skill.anal = 0; V.activeSlave.skill.whoring = 0; @@ -932,21 +968,25 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.amp !== 1) { V.activeSlave.heels = 1; - } V.activeSlave.voice = 0; + } + V.activeSlave.voice = 0; V.activeSlave.face = jsRandom(-100, -50); V.activeSlave.butt = 0; if (V.activeSlave.vagina > -1) { V.activeSlave.vagina = jsEither([1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 10]); V.activeSlave.preg = jsRandom(-3, -1); V.activeSlave.counter.vaginal += jsRandom(0, 300); - } V.activeSlave.anus = jsEither([1, 2, 2, 3, 3, 3, 3, 4, 4, 4]); + } + V.activeSlave.anus = jsEither([1, 2, 2, 3, 3, 3, 3, 4, 4, 4]); if (V.activeSlave.balls > 1 && jsRandom(1, 100) > 50) { V.activeSlave.balls = 0; - } V.activeSlave.counter.oral += jsRandom(0, 300); + } + V.activeSlave.counter.oral += jsRandom(0, 300); V.activeSlave.counter.anal += jsRandom(0, 300); if (V.activeSlave.boobs > 500) { V.activeSlave.counter.mammary += jsRandom(0, 300); - } V.activeSlave.skill.vaginal = jsRandom(50, 100); + } + V.activeSlave.skill.vaginal = jsRandom(50, 100); V.activeSlave.skill.oral = jsRandom(50, 100); V.activeSlave.skill.anal = jsRandom(50, 100); V.activeSlave.skill.whoring = jsRandom(50, 100); @@ -982,7 +1022,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.combat = 1; } else { V.activeSlave.skill.combat = 0; - } V.activeSlave.addict = jsEither([0, 0, 0, 10, 10, 20, 30]); + } + V.activeSlave.addict = jsEither([0, 0, 0, 10, 10, 20, 30]); V.activeSlave.chem = jsRandom(500, 1000); V.activeSlave.behavioralFlaw = "none"; V.activeSlave.behavioralQuirk = "none"; @@ -1002,7 +1043,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.preg = jsEither([-2, -1, -1, -1, -1, -1, -1, -1, 1, 20, 40]); if (V.activeSlave.preg > 0) { V.activeSlave.pregType = setPregType(V.activeSlave); - } SetBellySize(V.activeSlave); + } + SetBellySize(V.activeSlave); } break; case "indentures": @@ -1011,8 +1053,9 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.fixedRace = V.arcologies[0].FSSupremacistRace; } else if (V.arcologies[0].FSSubjugationistLawME === 1) { const races = setup.filterRacesLowercase.filter(race => race !== V.arcologies[0].FSSubjugationistRace); - V.fixedRace = races.random(); - } V.activeSlave = GenerateNewSlave(); + V.fixedRace = jsEither([races]); + } + V.activeSlave = GenerateNewSlave(); V.activeSlave.origin = "You purchased her indenture contract, making her yours for as long as it lasts."; V.activeSlave.indentureRestrictions = jsEither([0, 1, 1, 2, 2, 2, 2]); if (V.activeSlave.indentureRestrictions >= 2) { @@ -1024,7 +1067,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.devotion = jsRandom(-45, -25); V.activeSlave.trust = jsRandom(-75, -60); - } V.activeSlave.indenture = jsEither([26, 52, 104, 156, 208]); + } + V.activeSlave.indenture = jsEither([26, 52, 104, 156, 208]); break; case "hunters": @@ -1036,13 +1080,15 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.intelligenceImplant = 15; if (V.activeSlave.physicalAge >= 12) { V.activeSlave.teeth = "normal"; - } V.activeSlave.health = jsRandom(-10, 70); + } + V.activeSlave.health = jsRandom(-10, 70); if (V.activeSlave.vagina > -1) { V.activeSlave.preg = jsEither([-2, -1, -1, -1, -1, -1, -1, -1, 1, 1]); if (V.activeSlave.physicalAge < V.activeSlave.pubertyAgeXX) {V.activeSlave.preg = -1;} if (V.activeSlave.preg > 0) { V.activeSlave.pregType = setPregType(V.activeSlave); - } SetBellySize(V.activeSlave); + } + SetBellySize(V.activeSlave); V.activeSlave.skill.vaginal = jsRandom(15, 100); V.activeSlave.vagina = jsRandom(1, 3); } @@ -1050,7 +1096,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { if (jsRandom(1, 3) === 1) { V.activeSlave.balls = 0; } - } V.activeSlave.skill.combat = jsEither([0, 0, 0, 0, 0, 1]); + } + V.activeSlave.skill.combat = jsEither([0, 0, 0, 0, 0, 1]); V.activeSlave.skill.entertainment = jsRandom(15, 100); V.activeSlave.skill.whoring = jsRandom(15, 100); V.activeSlave.skill.oral = jsRandom(15, 100); @@ -1093,7 +1140,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.origin = "You bought her from the underage raiders' slave market."; V.activeSlave.trust -= 25; V.activeSlave.health += 20; - V.activeSlave.career = setup.veryYoungCareers.random(); + V.activeSlave.career = jsEither([setup.veryYoungCareers]); V.activeSlave.birthWeek = 0; if (V.activeSlave.vagina !== -1) { V.activeSlave.skill.vaginal = 0; @@ -1101,7 +1148,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.trueVirgin = 1; V.activeSlave.preg = 0; SetBellySize(V.activeSlave); - } V.activeSlave.skill.anal = 0; + } + V.activeSlave.skill.anal = 0; V.activeSlave.anus = 0; V.activeSlave.skill.oral = 0; V.activeSlave.skill.whoring = 0; @@ -1132,7 +1180,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (jsRandom(1, 2) === 1) { V.activeSlave.skill.oral = 0; - } V.activeSlave.skill.whoring = 0; + } + V.activeSlave.skill.whoring = 0; break; case "trainers": @@ -1153,7 +1202,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.anus === 0) { V.activeSlave.anus += 1; - } V.activeSlave.skill.oral += 15; + } + V.activeSlave.skill.oral += 15; V.activeSlave.skill.anal += 15; V.activeSlave.fetishKnown = 1; if (V.activeSlave.accent >= 3) { @@ -1171,7 +1221,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlaveOneTimeMinAge = 36; } else { V.activeSlaveOneTimeMaxAge = 18; - } V.oneTimeDisableDisability = 1; + } + V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave("XX"); V.activeSlave.career = "a slave"; V.activeSlave.butt = jsEither([1, 2, 2, 3]); @@ -1188,10 +1239,12 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.vagina = 0; V.activeSlave.trueVirgin = 1; V.activeSlave.birthWeek = 0; - } V.activeSlave.intelligenceImplant = 30; + } + V.activeSlave.intelligenceImplant = 30; if (V.activeSlave.physicalAge >= 12) { V.activeSlave.teeth = "normal"; - } V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [-20, 70]}); + } + V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [-20, 70]}); V.activeSlave.devotion = jsRandom(25, 45); V.activeSlave.trust = jsRandom(25, 45); V.activeSlave.health = jsRandom(50, 60); @@ -1212,11 +1265,12 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.anal = 15; V.activeSlave.skill.whoring = 15; V.activeSlave.skill.entertainment = 15; - } V.activeSlave.skill.combat = 0; + } + V.activeSlave.skill.combat = 0; V.activeSlave.pubicHStyle = "waxed"; V.activeSlave.underArmHStyle = "waxed"; - V.activeSlave.sexualFlaw = jsEither(["none"]); - V.activeSlave.behavioralFlaw = jsEither(["none"]); + V.activeSlave.sexualFlaw = "none"; + V.activeSlave.behavioralFlaw = "none"; V.activeSlave.hStyle = "tails"; V.activeSlave.custom.tattoo = "V.He has the simple logo of the corporation that operates The Slavegirl School tattooed on V.his left cheek."; @@ -1236,14 +1290,16 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.health = 200; } else { V.activeSlave.health = jsRandom(-80, 100); - } V.activeSlave.height = jsRandom(160, 210); + } + V.activeSlave.height = jsRandom(160, 210); V.activeSlave.butt = jsRandom(4, 10); if (V.GRI.schoolUpgrade === 2) { V.activeSlave.boobs = 200*jsRandom(15, 30); V.activeSlave.lactation = 2, V.activeSlave.lactationDuration = 2; } else { V.activeSlave.boobs = 200*jsRandom(4, 20); - } V.activeSlave.nipples = jsEither(["huge", "inverted"]); + } + V.activeSlave.nipples = jsEither(["huge", "inverted"]); V.activeSlave.areolae = jsEither([0, 1, 2, 3, 4]); V.activeSlave.clit = jsEither([0, 1, 2, 3]); V.activeSlave.lips = jsRandom(5, 85); @@ -1261,7 +1317,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.combat = 0; V.activeSlave.pubicHStyle = "waxed"; V.activeSlave.birthWeek = 0; - V.activeSlave.behavioralFlaw = jsEither(["odd"]); + V.activeSlave.behavioralFlaw = "odd"; V.activeSlave.hStyle = "shaved"; V.activeSlave.hLength = 0; V.activeSlave.custom.tattoo = "V.He has a barcode that identified V.his when she was a test subject at the Growth Research Institute tattooed on V.his left cheek."; @@ -1286,7 +1342,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [-30, 60]}); V.activeSlave.devotion = jsRandom(25, 45); V.activeSlave.trust = jsRandom(25, 45); - } V.activeSlave.health = 100; + } + V.activeSlave.health = 100; V.activeSlave.heightImplant = 1; V.activeSlave.height += 10; V.activeSlave.buttImplant = (4-V.activeSlave.butt); @@ -1319,12 +1376,13 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.anal = 0; V.activeSlave.skill.whoring = 0; V.activeSlave.skill.entertainment = 0; - } V.activeSlave.skill.combat = 0; + } + V.activeSlave.skill.combat = 0; V.activeSlave.pubicHStyle = "waxed"; V.activeSlave.underArmHStyle = "waxed"; V.activeSlave.birthWeek = 0; - V.activeSlave.sexualFlaw = jsEither(["none"]); - V.activeSlave.behavioralFlaw = jsEither(["none"]); + V.activeSlave.sexualFlaw = "none"; + V.activeSlave.behavioralFlaw = "none"; V.activeSlave.hStyle = "tails"; V.activeSlave.pubicHColor = "blonde"; V.activeSlave.underArmHColor = "blonde"; @@ -1355,7 +1413,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.devotion = jsRandom(60, 75); V.activeSlave.trust = jsRandom(55, 60); - } V.activeSlave.health = jsRandom(60, 80); + } + V.activeSlave.health = jsRandom(60, 80); V.activeSlave.muscles = 0; V.activeSlave.butt = jsEither([4, 5]); V.activeSlave.face = jsRandom(15, 55); @@ -1375,7 +1434,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { if (V.activeSlave.balls > 0) {V.activeSlave.scrotum = V.activeSlave.balls;} V.activeSlave.pubertyXY = 0; V.activeSlave.pubertyAgeXY = jsRandom(24, 50); - } V.activeSlave.anus = 2; + } + V.activeSlave.anus = 2; V.activeSlave.vagina = -1; V.activeSlave.preg = 0; SetBellySize(V.activeSlave); @@ -1416,7 +1476,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.devotion = jsRandom(25, 45); V.activeSlave.trust = jsRandom(25, 45); - } V.activeSlave.health = 100; + } + V.activeSlave.health = 100; V.activeSlave.muscles = jsEither([20, 50, 50]); V.activeSlave.butt = jsEither([2, 2, 3]); V.activeSlave.boobs = jsEither([100, 200]); @@ -1437,7 +1498,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.combat = 1; } else { V.activeSlave.skill.combat = 0; - } V.activeSlave.pubicHStyle = "waxed"; + } + V.activeSlave.pubicHStyle = "waxed"; V.activeSlave.underArmHStyle = "waxed"; V.activeSlave.birthWeek = 0; V.activeSlave.sexualFlaw = jsEither(["apathetic", "none"]); @@ -1455,7 +1517,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave = GenerateNewSlave("XX"); V.activeSlave.origin = "You bought her from The Cattle Ranch."; V.activeSlave.career = "a dairy slave"; - V.activeSlave.slaveName = setup.cowSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]); V.activeSlave.slaveSurname = 0; V.activeSlave.butt = jsEither([2, 2, 3, 3, 3, 4, 4]); V.activeSlave.boobs = ((V.activeSlave.physicalAge*100)*2)+jsEither([-100, -100, 0, 0, 100, 100, 200, 200, 300, 500]); @@ -1494,7 +1556,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.one_time_age_overrides_pedo_mode = 1; V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave("XY"); - V.activeSlave.slaveName = setup.cowSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]); V.activeSlave.slaveSurname = 0; V.activeSlave.origin = "You bought her from The Cattle Ranch."; V.activeSlave.career = "a breeding bull"; @@ -1528,10 +1590,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.fetish = "mindbroken"; V.activeSlave.fetishStrength = 10; V.activeSlave.fetishKnown = 1; - V.activeSlave.sexualFlaw = jsEither(["none"]); - V.activeSlave.behavioralFlaw = jsEither(["none"]); - V.activeSlave.sexualQuirk = jsEither(["none"]); - V.activeSlave.behavioralQuirk = jsEither(["none"]); + V.activeSlave.sexualFlaw = "none"; + V.activeSlave.behavioralFlaw = "none"; + V.activeSlave.sexualQuirk = "none"; + V.activeSlave.behavioralQuirk = "none"; V.activeSlave.hStyle = "neat"; V.activeSlave.custom.tattoo = "V.He has the logo of the Cattle Ranch branded on V.his thigh."; } else { @@ -1540,7 +1602,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.one_time_age_overrides_pedo_mode = 1; V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave("XX"); - V.activeSlave.slaveName = setup.cowSlaveNames.random(); + V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]); V.activeSlave.slaveSurname = 0; V.activeSlave.origin = "You bought her from The Cattle Ranch."; V.activeSlave.career = "a dairy cow"; @@ -1581,14 +1643,15 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.fetish = "mindbroken"; V.activeSlave.fetishStrength = 10; V.activeSlave.fetishKnown = 1; - V.activeSlave.sexualFlaw = jsEither(["none"]); - V.activeSlave.behavioralFlaw = jsEither(["none"]); - V.activeSlave.sexualQuirk = jsEither(["none"]); - V.activeSlave.behavioralQuirk = jsEither(["none"]); + V.activeSlave.sexualFlaw = "none"; + V.activeSlave.behavioralFlaw = "none"; + V.activeSlave.sexualQuirk = "none"; + V.activeSlave.behavioralQuirk = "none"; V.activeSlave.hStyle = "neat"; V.activeSlave.collar = "leather with cowbell"; V.activeSlave.custom.tattoo = "V.He has the logo of the Cattle Ranch branded on V.his thigh."; - } break; + } + break; case "TFS": V.activeSlaveOneTimeMinAge = 25; V.activeSlaveOneTimeMaxAge = 29; @@ -1598,7 +1661,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave = GenerateNewSlave(); } else { V.activeSlave = GenerateNewSlave("XY"); - } V.activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery."; + } + V.activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery."; V.activeSlave.career = "a Futanari Sister"; V.activeSlave.faceShape = jsEither(["exotic", "sensual"]); V.activeSlave.pubertyXY = 1; @@ -1624,7 +1688,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.balls = jsRandom(2, 3); V.activeSlave.scrotum = V.activeSlave.balls; - } V.activeSlave.lips = 10; + } + V.activeSlave.lips = 10; V.activeSlave.weight = 0; V.activeSlave.waist = jsRandom(-30, 10); V.activeSlave.actualAge = jsRandom(19, 24); @@ -1655,7 +1720,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.balls = jsRandom(2, 3); V.activeSlave.scrotum = V.activeSlave.balls; - } V.activeSlave.lips = 0; + } + V.activeSlave.lips = 0; V.activeSlave.weight = 0; V.activeSlave.waist = jsRandom(-30, 10); V.activeSlave.vagina = 2; @@ -1682,7 +1748,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.balls = jsRandom(3, 4); V.activeSlave.scrotum = V.activeSlave.balls; - } V.activeSlave.lips = jsRandom(15, 25); + } + V.activeSlave.lips = jsRandom(15, 25); V.activeSlave.weight = 20; V.activeSlave.waist = jsRandom(-30, 20); V.activeSlave.actualAge = jsRandom(30, 34); @@ -1713,7 +1780,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.balls = jsRandom(4, 5); V.activeSlave.scrotum = V.activeSlave.balls; - } V.activeSlave.lips = jsRandom(25, 55); + } + V.activeSlave.lips = jsRandom(25, 55); V.activeSlave.weight = 20; V.activeSlave.waist = jsRandom(-30, 20); V.activeSlave.actualAge = jsRandom(35, 39); @@ -1744,7 +1812,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.balls = jsRandom(5, 6); V.activeSlave.scrotum = V.activeSlave.balls; - } V.activeSlave.lips = jsRandom(25, 55); + } + V.activeSlave.lips = jsRandom(25, 55); V.activeSlave.weight = 50; V.activeSlave.waist = jsRandom(-50, 20); V.activeSlave.actualAge = jsRandom(40, 42); @@ -1754,7 +1823,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.vagina = 3; V.activeSlave.anus = 3; V.activeSlave.fetish = "dom"; - } V.activeSlave.chem = 100+(sisterAge*50); + } + V.activeSlave.chem = 100+(sisterAge*50); V.activeSlave.butt = sisterAge+jsRandom(2, 4); V.activeSlave.boobs = 50*((10*sisterAge)+jsRandom(10, 20)); V.activeSlave.dick = sisterAge+jsRandom(1, 2); @@ -1769,28 +1839,33 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.preg = jsRandom(1, (V.week - V.TFS.farmUpgradeAsked)); } else { V.activeSlave.preg = jsRandom(1, 40); - } if (V.TFS.farmUpgrade === 3) { + } + if (V.TFS.farmUpgrade === 3) { V.activeSlave.pregType = jsRandom(20, 40); V.activeSlave.pregAdaptation = 500; } else { V.activeSlave.pregType = 1; - } V.activeSlave.pregWeek = V.activeSlave.preg; + } + V.activeSlave.pregWeek = V.activeSlave.preg; V.activeSlave.pregSource = -9; } - } SetBellySize(V.activeSlave); + } + SetBellySize(V.activeSlave); V.activeSlave.intelligenceImplant = 30; V.activeSlave.teeth = "normal"; if (V.TFS.schoolUpgrade === 2) { V.activeSlave.energy = 100; } else { V.activeSlave.energy = V.activeSlave.physicalAge+jsRandom(20, 30); - } V.activeSlave.devotion = jsRandom(30, 40); + } + V.activeSlave.devotion = jsRandom(30, 40); V.activeSlave.trust = jsRandom(60, 75); V.activeSlave.health = jsRandom(60, 80); V.activeSlave.muscles = 20; if (V.activeSlave.genes === "XY") { V.activeSlave.shoulders = 1; - } V.activeSlave.skill.vaginal = 100; + } + V.activeSlave.skill.vaginal = 100; V.activeSlave.skill.oral = 100; V.activeSlave.skill.anal = 100; V.activeSlave.skill.whoring = 15; @@ -1800,7 +1875,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.underArmHStyle = "waxed"; if (V.TFS.schoolUpgrade === 1) { V.activeSlave.sexualQuirk = "caring"; - } V.activeSlave.sexualFlaw = jsEither(["hates women", "none"]); + } + V.activeSlave.sexualFlaw = jsEither(["hates women", "none"]); V.activeSlave.behavioralFlaw = jsEither(["arrogant", "none"]); V.activeSlave.fetishStrength = 100; V.activeSlave.fetishKnown = 0; @@ -1853,7 +1929,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlave.weight = -10; V.activeSlave.waist = jsRandom(-20, 10); - } V.activeSlave.shoulders = 0; + } + V.activeSlave.shoulders = 0; if (V.HA.schoolUpgrade === 1) { V.activeSlave.intelligence = Intelligence.random({limitIntelligence: [20, 70]}); V.activeSlave.skill.vaginal = jsEither([20, 20, 40]); @@ -1868,7 +1945,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.skill.anal = 10; V.activeSlave.skill.whoring = 10; V.activeSlave.skill.entertainment = jsEither([20, 40, 40, 60]); - } V.activeSlave.skill.combat = 1; + } + V.activeSlave.skill.combat = 1; V.activeSlave.pubicHStyle = "waxed"; V.activeSlave.underArmHStyle = "waxed"; V.activeSlave.sexualQuirk = jsEither(["caring", "none", "none", "unflinching"]); @@ -1895,10 +1973,11 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlaveOneTimeMaxAge = V.retirementAge-2; } - } V.oneTimeDisableDisability = 1; + } + V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave("XY"); - var criminal = setup.gangCriminalPool.random(); + var criminal = jsEither([setup.gangCriminalPool]); switch (criminal) { case "mule": @@ -2098,7 +2177,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.hLength = 0; V.activeSlave.intelligence = jsRandom(-100, 0); V.activeSlave.health = jsRandom(-40, 0); - } break; + } + break; case "military prison": if (V.pedo_mode === 1) { V.activeSlaveOneTimeMinAge = 12; @@ -2111,7 +2191,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlaveOneTimeMaxAge = V.retirementAge-2; } - } V.oneTimeDisableDisability = 1; + } + V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave(); /* @@ -2123,7 +2204,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } */ - criminal = setup.militaryCriminalPool.random(); + criminal = jsEither([setup.militaryCriminalPool]); switch (criminal) { case "spy": @@ -2276,7 +2357,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.waist = jsRandom(-10, 10); V.activeSlave.muscles = jsRandom(10, 40); V.activeSlave.skill.combat = 1; - } break; + } + break; case "white collar": if (V.pedo_mode === 1) { V.activeSlaveOneTimeMinAge = 16; @@ -2289,10 +2371,11 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlaveOneTimeMaxAge = V.retirementAge-2; } - } V.oneTimeDisableDisability = 1; + } + V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave(); - criminal = setup.whiteCollarCriminalPool.random(); + criminal = jsEither([setup.whiteCollarCriminalPool]); switch (criminal) { case "racketeering": @@ -2372,7 +2455,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { V.activeSlave.intelligenceImplant = 30; V.activeSlave.health = jsRandom(20, 60); V.activeSlave.behavioralFlaw = "arrogant"; - } break; + } + break; case "low tier criminals": if (V.pedo_mode === 1) { V.activeSlaveOneTimeMinAge = 6; @@ -2385,7 +2469,8 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } else { V.activeSlaveOneTimeMaxAge = V.retirementAge-2; } - } V.oneTimeDisableDisability = 1; + } + V.oneTimeDisableDisability = 1; V.activeSlave = GenerateNewSlave(); /* @@ -2394,9 +2479,10 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) { } if (V.activeSlave.vagina > -1) { V.activeSlave.chastityVagina = 1 - } */ + } +*/ - criminal = setup.pettyCriminalPool.random(); + criminal = jsEither([setup.pettyCriminalPool]); switch (criminal) { case "robbery": @@ -2435,7 +2521,8 @@ if (V.activeSlave.vagina > -1) { V.activeSlave.devotion = jsRandom(-50, -20); V.activeSlave.trust = jsRandom(-20, 60); V.activeSlave.health = jsRandom(-10, 20); - } V.prisonCrime = "is incarcerated for murder."; + } + V.prisonCrime = "is incarcerated for murder."; V.activeSlave.hStyle = "buzzcut"; V.activeSlave.hLength = 0; V.activeSlave.intelligence = jsRandom(-80, 70); @@ -2452,7 +2539,8 @@ if (V.activeSlave.vagina > -1) { V.activeSlave.devotion = jsRandom(-70, -50); V.activeSlave.trust = jsRandom(0, 60); V.activeSlave.health = jsRandom(-10, 20); - } V.prisonCrime = "is incarcerated for arson."; + } + V.prisonCrime = "is incarcerated for arson."; V.activeSlave.hStyle = "buzzcut"; V.activeSlave.hLength = 0; V.activeSlave.intelligence = jsRandom(-80, 70); @@ -2526,7 +2614,8 @@ if (V.activeSlave.vagina > -1) { V.activeSlave.devotion = jsRandom(-70, -50); V.activeSlave.trust = jsRandom(0, 60); V.activeSlave.health = jsRandom(-10, 20); - } V.prisonCrime = "is incarcerated for manslaughter."; + } + V.prisonCrime = "is incarcerated for manslaughter."; V.activeSlave.hStyle = "buzzcut"; V.activeSlave.hLength = 0; V.activeSlave.intelligence = jsRandom(-80, 70); @@ -2600,7 +2689,8 @@ if (V.activeSlave.vagina > -1) { } else { V.activeSlave.devotion = jsRandom(-50, -20); V.activeSlave.trust = jsRandom(-100, 0); - } V.activeSlave.hStyle = "buzzcut"; + } + V.activeSlave.hStyle = "buzzcut"; V.activeSlave.hLength = 0; V.activeSlave.health = jsRandom(-10, 40); V.activeSlave.muscles = jsRandom(10, 40); @@ -2616,7 +2706,8 @@ if (V.activeSlave.vagina > -1) { } else { V.activeSlave.devotion = jsRandom(-50, -20); V.activeSlave.trust = jsRandom(-50, 50); - } V.activeSlave.hStyle = "buzzcut"; + } + V.activeSlave.hStyle = "buzzcut"; V.activeSlave.hLength = 0; V.activeSlave.health = jsRandom(-10, 40); V.activeSlave.muscles = jsRandom(10, 40); @@ -2658,7 +2749,8 @@ if (V.activeSlave.vagina > -1) { if (V.activeSlave.ovaries === 1 && V.activeSlave.vagina > 0) { V.activeSlave.vagina = 4; V.activeSlave.bellySag += 5; - } V.activeSlave.anus = 4; + } + V.activeSlave.anus = 4; V.activeSlave.bellySag += 5; V.activeSlave.chem = 10 * jsRandom(1, 3); V.activeSlave.addict = 100;