diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index dbf5c079e67c6dd34f5548a60781a24d72bfba25..bc3188d87dd74f62d8d1b61f579380008d0f6e47 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -5,8 +5,13 @@ Pregmod 0 -overhauled reputation tracking -reputation is now harder to build the higher it gets + -ear shaping surgeries + -horn implant surgeies + -tail socket cybernetics port and tails -fertility diet no longer blocked by chastity - -RA can now apply contracpetives to postpartum slaves + -RA can now apply contraceptives to postpartum slaves + -RA can now manage basic abortions + -added abortion tracking tattoos -fixes 0.10.7.1-2.1.x diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 03d24df789bdae9be49ef48e99aa51119a907151..8be0e9ecbdcf60f5d487c9c899570d090c7c713d 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -30,6 +30,8 @@ window.DefaultRules = (function() { ProcessBellyImplant(slave, rule); if (isFertile(slave) || slave.pregWeek < 0) ProcessContraceptives(slave, rule); + if (slave.preg > 0 && slave.pregKnown == 1 && slave.broodmother == 0) + ProcessAbortions(slave, rule); ProcessOtherDrugs(slave, rule); ProcessAssetGrowthDrugs(slave, rule); ProcessEnema(slave, rule); @@ -1023,6 +1025,83 @@ window.DefaultRules = (function() { } } } + + /** @param {App.Entity.SlaveState} slave */ + function ProcessAbortions(slave, rule) { + if ((rule.abortion !== undefined) && (rule.abortion !== "no default setting")) { + if (rule.abortion === "all") { + + if (slave.preg < 4 || (slave.fetish === "mindbroken" || slave.fuckdoll != 0)) { + r += `<br>${slave.slaveName}'s pregnancy has been terminated.`; + } else { + r += `<br>${slave.slaveName}'s pregnancy has been terminated; `; + if (slave.sexualFlaw === "breeder") { + r += `it broke her mind.`; + slave.fetish = "mindbroken", slave.behavioralQuirk = "none", slave.behavioralFlaw = "none", slave.sexualQuirk = "none", slave.sexualFlaw = "none", slave.devotion = 0, slave.trust = 0; + } else if (slave.devotion < -50) { + r += `she did not handle it well.`; + slave.trust -= 10, slave.devotion -= 25; + } else if (slave.devotion < -20) { + r += `she did not handle it well.`; + slave.trust -= 10, slave.devotion -= 10; + } else if (slave.fetish === "pregnancy") { + r += `she did not handle it well.`; + var fetishModifier = (slave.fetishStrength / 2); + slave.devotion -= (1 * fetishModifier), (slave.trust -= 1 * fetishModifier); + } else if (slave.devotion <= 20) { + r += `she did not handle it well.`; + slave.trust -= 10, slave.devotion -= 5; + } else if (slave.devotion <= 50) { + r += `she did not handle it well.`; + slave.trust -= 10; + } else { + r += `it had little mental effect.`; + } + } + + if (lastPregRule(slave, V.defaultRules)) { slave.preg = -1; } else { slave.preg = 0; } + if (slave.abortionTat > -1) { slave.abortionTat++, cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave); } + V.reservedChildren = FetusGlobalReserveCount("incubator"); + V.reservedChildrenNursery = FetusGlobalReserveCount("nursery"); + slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2; + WombFlush(slave); + } else if (rule.abortion === "male") { + if (slave.preg < 4) { + var WL = slave.womb.length; + for (var index = 0; index < WL; index++) { + if (slave.womb[index].genetics.gender === "XY") { + WombRemoveFetus(slave, index); + index--; + WL--; + } + } + if (WL === 0) { + slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2; + WombFlush(slave); + } + r += `<br>${slave.slaveName}'s male fetuses have been terminated.`; + } + } else if (rule.abortion === "female") { + if (slave.preg < 4) { + var WL = slave.womb.length; + for (var index = 0; index < WL; index++) { + if (slave.womb[index].genetics.gender === "XX") { + WombRemoveFetus(slave, index); + index--; + WL--; + } + } + if (WL === 0) { + slave.pregType = 0, slave.pregSource = 0, slave.pregKnown = 0, slave.pregWeek = -2; + WombFlush(slave); + + } + r += `<br>${slave.slaveName}'s female fetuses have been terminated.`; + } + } + SetBellySize(slave); + } + } /** @param {App.Entity.SlaveState} slave */ function ProcessAssetGrowthDrugs(slave, rule) { diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 717224238844c7c70fed9c4212b55b34b66d807f..db5443fe9898c5dc957038ae39f6cc4b88c16e4d 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -1811,6 +1811,13 @@ App.Entity.SlaveState = class SlaveState { * * "a butterfly" * @type {string|number} */ this.bellyTat = 0; + /** + * Slave has a series of tattoos to denote how many abortions she has had. + * * -1: no tattoo + * * 0: assigned to have tattoo, may not have one yet + * * 1+: number of abortion tattoos she has + */ + this.abortionTat = -1; /** Slave will give birth this week. * * 1: true; 0: false */ diff --git a/src/js/assayJS.js b/src/js/assayJS.js index 06829d257961ec6909d6caa6965d884baeaf14fb..8ad8b3d6e6f2be512947ed2b983b960ee397fd5a 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -170,6 +170,9 @@ window.TatScore = /** @param {App.Entity.SlaveState} slave */ function (slave) { } else if (slave.anusTat !== 0) { tatScore += 1.25; } + if (slave.abortionTat > 0 || (slave.abortionTat == 0 && slave.pregKnown == 1)) { + tatScore += 1; + } return tatScore; }; diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js index 4d5ea25dc89c9050cc7d8c989fba105ba48f5475..9566b01f61a7b23d2869694cfeed7a72ddcc295f 100644 --- a/src/js/rulesAssistant.js +++ b/src/js/rulesAssistant.js @@ -278,6 +278,7 @@ window.emptyDefaultRule = function emptyDefaultRule() { XX: "no default setting", gelding: "no default setting", preg: "no default setting", + abortion: "no default setting", growth_boobs: "no default setting", growth_butt: "no default setting", growth_lips: "no default setting", diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 786b37d15cbdf6a91f7e959ab765496a08286ca0..e93119c962c5bcab798e6d82efb42772f944e17f 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -938,6 +938,7 @@ window.rulesAssistantOptions = (function() { this.appendChild(new CurrativesList()); this.appendChild(new AphrodisiacList()); this.appendChild(new ContraceptiveList()); + this.appendChild(new AbortionList()); if (V.pregSpeedControl) this.appendChild(new PregDrugsList()); this.appendChild(new FemaleHormonesList()); @@ -1648,6 +1649,21 @@ window.rulesAssistantOptions = (function() { } } + class AbortionList extends List { + constructor() { + const pairs = [ + ["No default setting", "no default setting"], + ["Abort all", "all"], + ]; + if (V.pregnancyMonitoringUpgrade === 1 && V.geneticMappingUpgrade === 1) + pairs.push(["Abort boys", "male"]); + pairs.push(["Abort girls", "female"]); + super("Pregnancy termination", pairs); + this.setValue(current_rule.set.abortion); + this.onchange = (value) => current_rule.set.abortion = value; + } + } + class PregDrugsList extends List { constructor() { const pairs = [ diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 294764fd40e291b310f340a9a9c70cbd3e607893..688f7a4644d99c80a6f2f78763d1d2af5cc5cf3a 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -5026,17 +5026,17 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Spa": if (V.Flag == 0) { - if (V.spa <= V.spaSlaves) continue; + if (V.spa <= V.spaSlaves) { res.pop(); continue; } if ((_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none") { if (_Slave.devotion >= -20 || _Slave.fetish == "mindbroken") { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br><i>${_Slave.slaveName} cannot be trusted in the spa</i>`); + res.push(`<i>${_Slave.slaveName} cannot be trusted in the spa</i></div>`); continue; } } else { - res.push(`<br><i>${_Slave.slaveName} cannot benefit from the spa</i>`); + res.push(`<i>${_Slave.slaveName} cannot benefit from the spa</i></div>`); continue; } } else if (V.Flag == 1) { @@ -5053,12 +5053,12 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Nursery": if (V.Flag == 0) { - if (V.nurseryNannies <= V.nurserySlaves) continue; + if (V.nurseryNannies <= V.nurserySlaves) { res.pop(); continue; } if ((_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br><i>${_Slave.slaveName} must be either more fearful of you or devoted to you</i>`); + res.push(`<i>${_Slave.slaveName} must be either more fearful of you or devoted to you</i></div>`); continue; } } else if (V.Flag == 1) { @@ -5077,17 +5077,17 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Brothel": if (V.Flag == 0) { - if (V.brothel <= V.brothelSlaves) continue; + if (V.brothel <= V.brothelSlaves) { res.pop(); continue; } if (_Slave.breedingMark != 1 || V.propOutcome == 0) { if ((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br><i>${_Slave.slaveName} must be either more fearful of you or devoted to you</i>`); + res.push(`<i>${_Slave.slaveName} must be either more fearful of you or devoted to you</i></div>`); continue; } } else { - res.push(`<br><i>${_Slave.slaveName} is for private use only</i>`); + res.push(`<i>${_Slave.slaveName} is for private use only</i></div>`); continue; } } else if (V.Flag == 1) { @@ -5106,17 +5106,17 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Club": if (V.Flag == 0) { - if (V.club <= V.clubSlaves) continue; + if (V.club <= V.clubSlaves) { res.pop(); continue; } if (_Slave.breedingMark != 1 || V.propOutcome == 0) { if ((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} must be either more fearful of you or devoted to you//`); + res.push(`//${_Slave.slaveName} must be either more fearful of you or devoted to you//</div>`); continue; } } else { - res.push(`<br>//${_Slave.slaveName} is for private use only//`); + res.push(`//${_Slave.slaveName} is for private use only//</div>`); continue; } } else if (V.Flag == 1) { @@ -5133,12 +5133,12 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Clinic": if (V.Flag == 0) { - if (V.clinic <= V.clinicSlaves) continue; + if (V.clinic <= V.clinicSlaves) { res.pop(); continue; } if ((_Slave.health < 20) || (V.Nurse != 0 && ((_Slave.chem > 15 && V.clinicUpgradeFilters == 1) || (V.bellyImplants == 1 && _Slave.bellyImplant > -1) || (_Slave.pregKnown == 1 && (V.clinicSpeedGestation >= 0 || _Slave.pregControl == "speed up")) || (_Slave.pregAdaptation * 1000 < _Slave.bellyPreg || _Slave.preg > _Slave.pregData.normalBirth / 1.33)))) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} cannot benefit from the clinic//`); + res.push(`//${_Slave.slaveName} cannot benefit from the clinic//</div>`); continue; } } else if (V.Flag == 1) { @@ -5155,17 +5155,17 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Schoolroom": if (V.Flag == 0) { - if (V.schoolroom <= V.schoolroomSlaves) continue; + if (V.schoolroom <= V.schoolroomSlaves) { res.pop(); continue; } if ((_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)) { if ((_Slave.intelligenceImplant < 30) || (_Slave.voice != 0 && _Slave.accent + V.schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.whoreSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.entertainSkill <= 10 + V.schoolroomUpgradeSkills * 20) || (_Slave.analSkill < 10 + V.schoolroomUpgradeSkills * 20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10 + V.schoolroomUpgradeSkills * 20))) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} already has a basic education//`); + res.push(`//${_Slave.slaveName} already has a basic education//</div>`); continue; } } else { - res.push(`<br>//${_Slave.slaveName} is too resistant to learn//`); + res.push(`//${_Slave.slaveName} is too resistant to learn//</div>`); continue; } } else if (V.Flag == 1) { @@ -5183,19 +5183,19 @@ App.UI.slaveSummaryList = function (passageName) { case "Dairy": if (V.Flag == 0) { const _dairySeed = V.bioreactorsXY + V.bioreactorsXX + V.bioreactorsHerm + V.bioreactorsBarren; - if (_Slave.assignment == "work in the dairy") continue; - if (V.dairy <= V.dairySlaves + _dairySeed) continue; + if (_Slave.assignment == "work in the dairy") { res.pop(); continue; } + if (V.dairy <= V.dairySlaves + _dairySeed) { res.pop(); continue; } if ((_Slave.indentureRestrictions > 0) && (V.dairyRestraintsSetting > 1)) { - res.push(`<br>//${_Slave.slaveName}'s indenture forbids extractive Dairy service.//`); + res.push(`//${_Slave.slaveName}'s indenture forbids extractive Dairy service.//</div>`); continue; } else if ((_Slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) { - res.push(`<br>//${_Slave.slaveName}'s indenture allows only free range milking.//`); + res.push(`//${_Slave.slaveName}'s indenture allows only free range milking.//</div>`); continue; } else if (_Slave.breedingMark == 1 && V.propOutcome == 1 && V.dairyRestraintsSetting > 0) { - res.push(`<br>//${_Slave.slaveName} may only be a free range cow//`); + res.push(`//${_Slave.slaveName} may only be a free range cow//</div>`); continue; } else if ((V.dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother != 0))) { - res.push(`<br>//${_Slave.slaveName}'s womb cannot accommodate current machine settings//`); + res.push(`//${_Slave.slaveName}'s womb cannot accommodate current machine settings//</div>`); continue; } else { if ((_Slave.lactation > 0) || (_Slave.balls > 0) || ((V.dairySlimMaintainUpgrade == 0 || V.dairySlimMaintain == 0) && (_Slave.boobs > 300 || _Slave.balls == 0 || V.dairyImplantsSetting == 1) && V.dairyImplantsSetting != 2)) { @@ -5205,22 +5205,22 @@ App.UI.slaveSummaryList = function (passageName) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName}'s vagina cannot accommodate current machine settings//`); + res.push(`//${_Slave.slaveName}'s vagina cannot accommodate current machine settings//</div>`); continue; } } else { - res.push(`<br>//${_Slave.slaveName}'s anus cannot accommodate current machine settings//`); + res.push(`//${_Slave.slaveName}'s anus cannot accommodate current machine settings//</div>`); continue; } } else { - res.push(`<br>//${_Slave.slaveName} must be obedient in order to be milked here//`); + res.push(`//${_Slave.slaveName} must be obedient in order to be milked here//</div>`); continue; } } else if ((V.dairySlimMaintainUpgrade == 1 && V.dairySlimMaintain == 1) || (V.dairyImplantsSetting == 2) || (_Slave.boobs <= 300 && _Slave.balls > 0 && (V.dairyImplantsSetting == 0 || V.dairyImplantsSetting == 3))) { - res.push(`<br>//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + `and ${V.dairyName}'s current settings forbid the automatic implantation of lactation inducing drugs or manual stimulation to induce it, so she cannot be a cow//`); + res.push(`//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + `and ${V.dairyName}'s current settings forbid the automatic implantation of lactation inducing drugs or manual stimulation to induce it, so she cannot be a cow//</div>`); continue; } else { - res.push(`<br>//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + 'and cannot be a cow//'); + res.push(`//${_Slave.slaveName} is not lactating` + (V.seeDicks > 0) ? 'or producing semen' : '' + 'and cannot be a cow//</div>'); continue; } } @@ -5238,8 +5238,8 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Farmyard": if (V.Flag == 0) { - if (_Slave.assignment == "work as a farmhand") continue; - if (V.farmyard <= V.farmyardSlaves) continue; + if (_Slave.assignment == "work as a farmhand") { res.pop(); continue; } + if (V.farmyard <= V.farmyardSlaves){ res.pop(); continue; } res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else if (V.Flag == 1) { @@ -5256,12 +5256,12 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Servants' Quarters": if (V.Flag == 0) { - if (V.servantsQuarters <= V.servantsQuartersSlaves) continue; + if (V.servantsQuarters <= V.servantsQuartersSlaves) { res.pop(); continue; } if ((_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} must be either more fearful of you or devoted to you//`); + res.push(`//${_Slave.slaveName} must be either more fearful of you or devoted to you//</div>`); continue; } } else if (V.Flag == 1) { @@ -5278,12 +5278,12 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Master Suite": if (V.Flag == 0) { - if (V.masterSuite <= V.masterSuiteSlaves) continue; + if (V.masterSuite <= V.masterSuiteSlaves) { res.pop(); continue; } if ((_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} is not sufficiently broken for the master suite//`); + res.push(`//${_Slave.slaveName} is not sufficiently broken for the master suite//</div>`); continue; } } else if (V.Flag == 1) { @@ -5299,14 +5299,14 @@ App.UI.slaveSummaryList = function (passageName) { res.push(`[[${_slaveName}|Concubine Workaround][$i = ${_ssi}]]`); break; case "Cellblock": - if (_Slave.assignmentVisible != 1) continue; + if (_Slave.assignmentVisible != 1) { res.pop(); continue; } if (V.Flag == 0) { - if (V.cellblock <= V.cellblockSlaves) continue; + if (V.cellblock <= V.cellblockSlaves) { res.pop(); continue; } if ((_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName} is sufficiently broken in so that the cellblock would have no effect//`); + res.push(`//${_Slave.slaveName} is sufficiently broken in so that the cellblock would have no effect//</div>`); continue; } } else if (V.Flag == 1) { @@ -5323,18 +5323,18 @@ App.UI.slaveSummaryList = function (passageName) { break; case "Arcade": if (V.Flag == 0) { - if (_Slave.assignment == "be confined in the arcade") continue; - if (V.arcade <= V.arcadeSlaves && V.arcadeUpgradeFuckdolls != 1) continue; + if (_Slave.assignment == "be confined in the arcade") { res.pop(); continue; } + if (V.arcade <= V.arcadeSlaves && V.arcadeUpgradeFuckdolls != 1) { res.pop(); continue; } if ((_Slave.breedingMark != 1 || V.propOutcome == 0)) { if (_Slave.indentureRestrictions <= 0) { res.push(dividerAndImage(_Slave)); res.push(`[[${_slaveName}|Slave Interact][$activeSlave = $slaves[${_ssi}]]]`); } else { - res.push(`<br>//${_Slave.slaveName}'s indenture forbids arcade service.//`); + res.push(`//${_Slave.slaveName}'s indenture forbids arcade service.//</div>`); continue; } } else { - res.push(`<br>//${_Slave.slaveName} is for private use only//`); + res.push(`//${_Slave.slaveName} is for private use only//</div>`); continue; } } else { @@ -5345,13 +5345,13 @@ App.UI.slaveSummaryList = function (passageName) { case "Pit": if (V.Flag == 0) { if ((_Slave.indentureRestrictions > 0) && (V.pitLethal == 1)) { - res.push(`<br>//${_Slave.slaveName}'s indenture forbids lethal fights.//`); + res.push(`//${_Slave.slaveName}'s indenture forbids lethal fights.//</div>`); continue; } else if (_Slave.indentureRestrictions > 1) { - res.push(`<br>//${_Slave.slaveName}'s indenture forbids fighting.//`); + res.push(`//${_Slave.slaveName}'s indenture forbids fighting.//</div>`); continue; } else if (_Slave.breedingMark == 1 && V.propOutcome == 1) { - res.push(`<br>//${_Slave.slaveName} may not participate in combat//`); + res.push(`//${_Slave.slaveName} may not participate in combat//</div>`); continue; } else { res.push(dividerAndImage(_Slave)); diff --git a/src/npc/abort.tw b/src/npc/abort.tw index 2ae1ee1ed3c5c2598d7b52fee212ea512da1522f..2849719dfce626fbdc77e7c3102ff996b85f591a 100644 --- a/src/npc/abort.tw +++ b/src/npc/abort.tw @@ -3,31 +3,43 @@ <<set $nextButton = "Back", $nextLink = "Slave Interact">> <<run clearSummaryCache($activeSlave)>> -The remote surgery makes aborting a pregnancy quick and efficient. $activeSlave.slaveName is -<<if ($activeSlave.fuckdoll > 0) || ($activeSlave.fetish == "mindbroken")>> - completely unmoved by the development. -<<elseif $activeSlave.sexualFlaw == "breeder">> - @@.red;fundamentally broken.@@ $His entire concept of self and sexuality was wrapped up in the life growing within $him, and now it is gone. - <<set $activeSlave.fetish = "mindbroken", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualQuirk = "none", $activeSlave.sexualFlaw = "none", $activeSlave.devotion = 0, $activeSlave.trust = 0>> -<<elseif $activeSlave.devotion < -50>> - @@.mediumorchid;filled with violent, consuming hatred.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it and views you as its killer. $He is @@.gold;terrified of your power@@ over $his body. - <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 25>> -<<elseif $activeSlave.devotion < -20>> - @@.mediumorchid;afflicted by desperate, inconsolable sobbing.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it. $He is @@.gold;terrified of your power@@ over $his body. - <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>> -<<elseif $activeSlave.fetish == "pregnancy">> - @@.mediumorchid;filled with a deep sorrow.@@ To a pregnancy fetishist, having a pregnancy end like this hurts far worse than birth ever would. $He is @@.gold;terrified of a repeat performance.@@ - <<set _fetishModifier = $activeSlave.fetishStrength/2>> - <<set $activeSlave.devotion -= 1*_fetishModifier, $activeSlave.trust -= 1*_fetishModifier>> -<<elseif $activeSlave.devotion <= 20>> - @@.mediumorchid;consumed by muted weeping and enduring sorrow.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it. $He is @@.gold;terrified of your power@@ over $his body. - <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>> -<<elseif $activeSlave.devotion <= 50>> - dully obedient. $He has been broken to slave life so thoroughly that even this is neither surprising nor affecting. $He is @@.gold;terrified of your power@@ over $his body. - <<set $activeSlave.trust -= 10>> +The remote surgery makes aborting a pregnancy quick and efficient. + +<<if $activeSlave.preg < 4>> + It was so early in $his pregnancy that the potential mental effects are deminished. <<else>> - @@.hotpink;pleased by this stark development,@@ since $he is so attentive to your will. $He also expects $he'll be able to fuck better now. - <<set $activeSlave.devotion += 4>> + $activeSlave.slaveName is + <<if ($activeSlave.fuckdoll > 0) || ($activeSlave.fetish == "mindbroken")>> + completely unmoved by the development. + <<elseif $activeSlave.sexualFlaw == "breeder">> + @@.red;fundamentally broken.@@ $His entire concept of self and sexuality was wrapped up in the life growing within $him, and now it is gone. + <<set $activeSlave.fetish = "mindbroken", $activeSlave.behavioralQuirk = "none", $activeSlave.behavioralFlaw = "none", $activeSlave.sexualQuirk = "none", $activeSlave.sexualFlaw = "none", $activeSlave.devotion = 0, $activeSlave.trust = 0>> + <<elseif $activeSlave.devotion < -50>> + @@.mediumorchid;filled with violent, consuming hatred.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it and views you as its killer. $He is @@.gold;terrified of your power@@ over $his body. + <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 25>> + <<elseif $activeSlave.devotion < -20>> + @@.mediumorchid;afflicted by desperate, inconsolable sobbing.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it. $He is @@.gold;terrified of your power@@ over $his body. + <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>> + <<elseif $activeSlave.fetish == "pregnancy">> + @@.mediumorchid;filled with a deep sorrow.@@ To a pregnancy fetishist, having a pregnancy end like this hurts far worse than birth ever would. $He is @@.gold;terrified of a repeat performance.@@ + <<set _fetishModifier = $activeSlave.fetishStrength/2>> + <<set $activeSlave.devotion -= 1*_fetishModifier, $activeSlave.trust -= 1*_fetishModifier>> + <<elseif $activeSlave.devotion <= 20>> + @@.mediumorchid;consumed by muted weeping and enduring sorrow.@@ Even though $he knew $his baby was destined for a slave orphanage, it seems $he cared for it. $He is @@.gold;terrified of your power@@ over $his body. + <<set $activeSlave.trust -= 10, $activeSlave.devotion -= 5>> + <<elseif $activeSlave.devotion <= 50>> + dully obedient. $He has been broken to slave life so thoroughly that even this is neither surprising nor affecting. $He is @@.gold;terrified of your power@@ over $his body. + <<set $activeSlave.trust -= 10>> + <<else>> + @@.hotpink;pleased by this stark development,@@ since $he is so attentive to your will. $He also expects $he'll be able to fuck better now. + <<set $activeSlave.devotion += 4>> + <</if>> +<</if>> + +<<if $activeSlave.abortionTat > -1>> + The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($activeSlave.abortionTat)>> crossed out infant. + <<set $activeSlave.abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>> <</if>> <<if lastPregRule($activeSlave,$defaultRules)>><<set $activeSlave.preg = -1>><<else>><<set $activeSlave.preg = 0>><</if>> diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw index fa940b3a272f9f768d7d24dcd80f0d964d3d7b29..9007f8afc6eab14ecb1118473dcd70e0c8591e30 100644 --- a/src/npc/startingGirls/commitStartingGirl.tw +++ b/src/npc/startingGirls/commitStartingGirl.tw @@ -50,19 +50,23 @@ <br> [[Daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "mother", $startingGirlCopied = 1]] <</if>> + <</if>> + <<if $activeSlave.actualAge >= $potencyAge>> <<if $activeSlave.balls>> <br> [[Dick-daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "father", $startingGirlCopied = 1]] //A slave daughter carried and birthed by another woman, impregnated by $activeSlave.slaveName.// <</if>> - /% I'm aware this term is ridiculous. If anyone can come up with a better word to reconcile all slaves being female with the act of fatherhood and the masculine nature of the word father, I'm all ears. Wrote myself into a corner on this one. %/ <</if>> - <<if $activeSlave.actualAge <= ($retirementAge - $fertilityAge)>> - <<if $activeSlave.mother <= 0>> - <br> - [[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.mother = $IDNumber, $startingGirlRelation = "daughter", $startingGirlCopied = 1]] - <<else>> - //This slave already has a mother.// + /% I'm aware this term is ridiculous. If anyone can come up with a better word to reconcile all slaves being female with the act of fatherhood and the masculine nature of the word father, I'm all ears. Wrote myself into a corner on this one. %/ + <<if $seeDicks != 100>> + <<if $activeSlave.actualAge <= ($retirementAge - $fertilityAge)>> + <<if $activeSlave.mother <= 0>> + <br> + [[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.mother = $IDNumber, $startingGirlRelation = "daughter", $startingGirlCopied = 1]] + <<else>> + //This slave already has a mother.// + <</if>> <</if>> <</if>> <<if $seeDicks>> diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw index d474d8cdfbabc3cf173fa5a45ee925adf41297a8..515d07cb73ff053c23120e0d3c8f72f57aa9ae41 100644 --- a/src/pregmod/geneLab.tw +++ b/src/pregmod/geneLab.tw @@ -1,7 +1,7 @@ :: Gene Lab [nobr] <<set $HackingSkillMultiplier = HSM()>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> +<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> <br> The Gene Lab diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw index 676b49a83b92a7f8a3a2675a47a5d0b0aeefa04c..b6baed36ebfcb1c7c3f9b54d1b1ca52fc5b5cc31 100644 --- a/src/pregmod/implantManufactory.tw +++ b/src/pregmod/implantManufactory.tw @@ -1,7 +1,7 @@ :: Implant Manufactory [nobr] <<set $HackingSkillMultiplier = HSM()>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> +<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> <br> The Implant Manufactory diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw index f43e77264a925ffd92ceeb2394c0ae4f658a0c4c..6a5ceca75b438a5ee47c2a466916fe2101cec10e 100644 --- a/src/pregmod/organFarm.tw +++ b/src/pregmod/organFarm.tw @@ -1,7 +1,7 @@ :: Organ Farm [nobr] <<set $HackingSkillMultiplier = HSM()>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> +<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> <br> The Organ Farm diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw index 09c0d8520a3881ff95c0f785bcd7e31563c8ad98..3783bef62753b193fea9d6b19bcdbbf35038bdd5 100644 --- a/src/pregmod/saClothes.tw +++ b/src/pregmod/saClothes.tw @@ -457,6 +457,11 @@ <<set $slaves[$i].devotion += 4>> <</if>> <</if>> + <<if $slaves[$i].abortionTat > -1>> + The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. + <<set $slaves[$i].abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <</if>> <<else>> <<if $slaves[$i].waist <= -95>> $His waist is so absurd that $his extreme corsetage does not affect $him further. @@ -806,6 +811,11 @@ @@.hotpink;pleased by this stark development,@@ since $he is so attentive to your will. $He also expects $he'll be able to fuck better now. <<set $slaves[$i].devotion += 4>> <</if>> + <<if $slaves[$i].abortionTat > -1>> + The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. + <<set $slaves[$i].abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <</if>> <</if>> <</if>> <</if>> diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw index 509d0727be931e3d51c975ab68db1b6969b2260f..4c0c353591316d1638e32b8fd6b15cb79c109db2 100644 --- a/src/pregmod/widgets/bodyswapWidgets.tw +++ b/src/pregmod/widgets/bodyswapWidgets.tw @@ -184,6 +184,7 @@ <<set $args[0].buttplug = $args[1].buttplug>> <<set $args[0].customTat = $args[1].customTat>> <<set $args[0].bellyTat = $args[1].bellyTat>> +<<set $args[0].abortionTat = $args[1].abortionTat>> <<set $args[0].bellySag = $args[1].bellySag>> <<set $args[0].bellySagPreg = $args[1].bellySagPreg>> <<set $args[0].induce = $args[1].induce>> diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw index e24a9b8c60fefe6a9b343e5e05851761a8f9b37b..fd33644767f11f22c2b6b247fbb44d6cefca5aa1 100644 --- a/src/pregmod/widgets/playerDescriptionWidgets.tw +++ b/src/pregmod/widgets/playerDescriptionWidgets.tw @@ -358,7 +358,7 @@ Your dress and apron feel tight around your middle. <</if>> <<if $PC.preg >= 41>> - Your bab<<if $PC.pregType > 1>>ies are<<else>>y is<</if>> overdue and your master isn't here anymore to comfort your exhausted body. You try your best, <<if $PC.pregSource == -3>>drawing strength from the knowledge that you carry your late master's legacy within you<<else>>but deep down you are saddened that your child isn't his<</if>>.<<if $PC.pregMood == 1>> However, thanks to all your mothering, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your dicked slaves are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you try to fill the hole left by your late master.<</if>> + Your bab<<if $PC.pregType > 1>>ies are<<else>>y is<</if>> overdue and your master isn't here anymore to comfort your exhausted body. You try your best, <<if $PC.pregSource == -3>>drawing strength from the knowledge that you carry your late master's legacy within you<<else>>but deep down you are saddened that your child isn't his<</if>>.<<if $PC.pregMood == 1>> However, thanks to all your mothering, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your slaves<<if $seeDicks != 0>>, those with dicks especially,>>/if>> are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you try to fill the hole left by your late master.<</if>> <<elseif $PC.preg >= 39>> Every action you take is exhausting, and even though your slaves are more than capable of serving your every desire, you refuse to slow down with your duties.<<if $PC.pregMood == 1>> Though you definitely appreciate their aid.<<elseif $PC.pregMood == 2>> Your hormones practically rule you, leading you to demand your slaves to be prepared to pleasure you at a moments notice. Your needy cunt hungers for dick and you don't care what it is attached to right now.<</if>> <<elseif $PC.preg >= 36>> @@ -431,7 +431,7 @@ When you look down, you can't help but notice your belly sticking out a little. <</if>> <<if $PC.preg >= 41>> - You can barely pull yourself and your overdue child out of bed; every action is a chore, you keep bumping things, and your child just won't calm down.<<if $PC.pregMood == 1>> However, thanks to all your tenderness, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your slaves are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you satisfy your desires.<</if>> + You can barely pull yourself and your overdue child out of bed; every action is a chore, you keep bumping things, and your child just won't calm down.<<if $PC.pregMood == 1>> However, thanks to all your tenderness, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your slaves<<if $seeDicks != 0>>, those with dicks especially,>>/if>> are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you satisfy your desires.<</if>> <<elseif $PC.preg >= 39>> Every action you take is exhausting; though your slaves are more than capable of serving your every whim.<<if $PC.pregMood == 1>> Even in the final stages of pregnancy, you make sure the slaves attending you are treated as if the were your favorite clients.<<elseif $PC.pregMood == 2>> Your hormones practically rule you, leading you to demand your slaves to be prepared to pleasure you at a moments notice. Your needy cunt hungers for dick and you don't care what it is attached to right now.<</if>> <<elseif $PC.preg >= 36>> @@ -504,7 +504,7 @@ Your top feels oddly tight around your middle. <</if>> <<if $PC.preg >= 41>> - You can barely pull yourself and your overdue child out of bed; every action is a chore, you keep bumping things, and your child just won't calm down.<<if $PC.pregMood == 1>> However, thanks to all your mothering, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your dicked slaves are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you satisfy your desires.<</if>> + You can barely pull yourself and your overdue child out of bed; every action is a chore, you keep bumping things, and your child just won't calm down.<<if $PC.pregMood == 1>> However, thanks to all your mothering, your slaves are more than happy to do everything they can for you.<<elseif $PC.pregMood == 2>> Your slaves<<if $seeDicks != 0>>, those with dicks especially,>>/if>> are terrified of being seen by you, knowing full well that they will be bearing the full weight of your body as you satisfy your desires.<</if>> <<elseif $PC.preg >= 39>> <<if $PC.pregMood == 1>> Even in the final stages of pregnancy, you make sure the slaves attending you are treated as if they were your own children.<<elseif $PC.pregMood == 2>> Your hormones practically rule you, leading you to demand your slaves to be prepared to pleasure you at a moments notice. Your needy cunt hungers for dick and you don't care what it is attached to right now.<</if>> <<elseif $PC.preg >= 36>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 4115ba33d86e7481f22a1ecee01ad16287a89e4c..86eb64cc3e02042a23931657a99d97d858c48ed4 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -159,6 +159,9 @@ <<if ndef $args[0].clone>> <<set $args[0].clone = 0>> <</if>> +<<if ndef $args[0].abortionTat>> + <<set $args[0].abortionTat = -1>> +<</if>> <<if def $args[0].reservedChildren>> <<run delete $args[0].reservedChildren>> <</if>> diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw index ddb5ed4503ddca7eedd79e5545d37286745d1f14..568b8e24a869b1ec2fc56d055ddcd81babbb86a4 100644 --- a/src/uncategorized/PESS.tw +++ b/src/uncategorized/PESS.tw @@ -59,7 +59,7 @@ <</switch>> <<set _clothesTemp = $activeSlave.clothes>> -<<switch $RESSevent>> +<<switch $PESSevent>> /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/ <<case "tired collectrix" "tired milkmaid" "loving concubine" "bodyguard bedtime" "headgirl dickgirl">> <<set $activeSlave.clothes = "no clothing">> @@ -80,9 +80,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ @@ -519,7 +519,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> + <<set $activeSlave.clothes = _clothesTemp>> <<if $MixedMarriage == 1 && $activeSlave.relationship == -3 && $arcologies[0].FSPaternalist >= 60>> You instruct your slave-wife $activeSlave.slaveName to put on $his best dress and meet you at the door. You spend a nice night out with $him, taking in the sights before heading to a nice restaurant, where you receive the occasional @@.green;admiring glance@@ from your paternalistic citizens. Afterward, you attend a show at a venue known for its respectful plays acted out by talented slaves, and you conclude the evening by returning to your penthouse to have loving sex in your master bed. When you wake the next morning, you're greeted with a long kiss and @@.hotpink;an adoring look,@@ before $activeSlave.slaveName slides out of bed to begin $his morning duties. <<run repX(100, "event", $activeSlave)>> diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw index 137ccf05060ef666a76f132a4fa1ff3b8c271cda..420267a552d0d3120b86b1c359bafef60051e9ac 100644 --- a/src/uncategorized/PETS.tw +++ b/src/uncategorized/PETS.tw @@ -58,7 +58,7 @@ <<set _clothesTemp = $activeSlave.clothes>> <<set _clothesTemp2 = $subSlave.clothes>> -<<switch $RESSevent>> +<<switch $PETSevent>> /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/ <<case "comforting attendant">> <<set $activeSlave.clothes = "no clothing">> diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw index e070a79e80ee5b9088908950d7679c8d111b39b2..e52757b9a471eab27e5e2baea630a0864931c236 100644 --- a/src/uncategorized/RECI.tw +++ b/src/uncategorized/RECI.tw @@ -42,7 +42,7 @@ <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">> <<set _clothesTemp = $activeSlave.clothes>> -<<switch $RESSevent>> +<<switch $RECIevent>> /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/ <<case "butthole" "futa" "orientation" "MILF" "feminization" "ugly">> <<set $activeSlave.clothes = "no clothing">> @@ -51,9 +51,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ @@ -309,7 +309,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro <</if>> /* 000-250-006 */ <</replace>> - <<set $HeadGirl.clothes = _clothes2>> + <<set $HeadGirl.clothes = _clothesTemp2>> <<replace "#result">> You tell $him $he's got a nice asspussy, and grope $him thoroughly, cupping $his buttocks with one hand and squeezing a breast with the other. $activeSlave.slaveName looks <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>desperately eager<<else>>ready and willing<</if>>, and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>so ready to fuck $he can't quite think of what to say<<else>>not quite sure how to respond<</if>>, and before $he can figure it out, $HeadGirl.slaveName hurries in, responding to your summons. Of course, $activeSlave.slaveName is no stranger to $HeadGirl.slaveName, who takes in the situation at a glance and <<if $HeadGirl.dick > 0>>instantly achieves a painfully hard erection<<else>>immediately flushes with arousal<</if>>. $HeadGirl.slaveName<<if $HeadGirl.dick == 0>> dons a strap-on and<</if>> clambers up onto the (strongly built) bathroom counter. Since saliva is plenty of lube for $activeSlave.slaveName's experienced ass, _he2 points a meaningful finger at <<if $HeadGirl.dick == 0>>the phallus<<else>>_his2 cock<</if>>, and $activeSlave.slaveName begins to suck it enthusiastically, trying to get it as wet as possible for the sake of $his butt. @@ -356,7 +356,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro <</if>> /* 000-250-006 */ <</replace>> - <<set $Concubine.clothes = _clothes2>> + <<set $Concubine.clothes = _clothesTemp2>> <<replace "#result">> You tell $him $he's got a nice asspussy, and grope $him thoroughly, cupping $his buttocks with one hand and squeezing a breast with the other. $He looks <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>desperately eager<<else>>ready and willing<</if>>, and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>so ready to fuck $he can't quite think of what to say<<else>>not quite sure how to respond<</if>>, and before $he can figure it out, $Concubine.slaveName hurries in, responding to your summons. Of course, $activeSlave.slaveName is no stranger to $Concubine.slaveName, who takes in the situation at a glance and <<if $Concubine.dick > 0>>instantly achieves a painfully hard erection<<else>>immediately flushes with arousal<</if>>. $Concubine.slaveName<<if $Concubine.dick == 0>> dons a strap-on and<</if>> clambers up onto the (strongly built) bathroom counter. Since saliva is plenty of lube for $activeSlave.slaveName's experienced ass, _he2 points a meaningful finger at <<if $Concubine.dick == 0>>the phallus<<else>>_his2 cock<</if>>, and $activeSlave.slaveName begins to suck it enthusiastically, trying to get it as wet as possible for the sake of $his butt. @@ -594,7 +594,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> + <<set $activeSlave.clothes = _clothesTemp>> <<replace "#result">> You tell $him to head down to the wardrobe and put on the outfit that'll be laid out for $him there. $He obeys promptly, but does not return for some time, having gotten instructions from $assistantName along the way to put extra effort into $his grooming. When $he finally returns, the effect is striking. <<if $activeSlave.face > 10>>$He's a gorgeous girl with or without makeup, dressed up or naked, but $he's especially luscious tonight.<<else>>$His face is not flawless, but $he's conscious of $his transformation, and the new confidence in $his beauty adds a special glow that cannot be faked.<</if>> $His evening dress is elegant; it's quite slutty by old world standards, but according to Free Cities fashion, it's just about the most conservative gown a slave can be expected to wear, and quite daring in that it isn't immediately obvious whether $he's a slave or not. The tops of $his areolae are hardly even visible.<br><br> diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw index c6349925d5e76957f4c15d20c88227f71ad620a3..7cc5418b8f5b5c0b204188e3e5ecd7fd23369ae0 100644 --- a/src/uncategorized/REFI.tw +++ b/src/uncategorized/REFI.tw @@ -136,7 +136,7 @@ </div> <</if>> /* 000-250-006 */ -<<set $subSlave.clothes = _clothes>> +<<set $subSlave.clothes = _clothesTemp>> <<if $subSlave.belly >= 1500>> You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and _his2 masochistic streak at once. _He2 has _his2 body flat on the surface, but is unrestrained, and has been told that _he2 must not rise off it at all, nor tilt _his2 bulk to either side. You then tell _his2 to count strokes and begin to flog _his2 _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause _his2 pregnancy any lasting harm<</if>>. Before long _he2 is experiencing more pain than the human body can support without involuntary movement, and you tell _him2 to go back one count whenever _he2 does. At long last _he2 completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until _he2 stiffens again at the @@ -225,7 +225,7 @@ It seems $he passed by while you were beating $subSlave.slaveName and found the </div> <</if>> /* 000-250-006 */ -<<set $subSlave.clothes = _clothes>> +<<set $subSlave.clothes = _clothesTemp>> $subSlave.slaveName gets inspected more regularly than your other slaves, since _he2's quite pregnant. _His2 pregnancy is progressing acceptably, but having _his2 belly inspected gets _him2 <<if $subSlave.pregSource == -1>> @@ -378,7 +378,7 @@ It seems $he passed by while you were enjoying the heavily pregnant $subSlave.sl </div> <</if>> /* 000-250-006 */ -<<set $subSlave.clothes = _clothes>> +<<set $subSlave.clothes = _clothesTemp>> $subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, _he2 sits on the edge of your desk right next to you, so that <<if $subSlave.belly >= 100000>>a nipple is<<else>>_his2 nipples are<</if>> conveniently at mouth height. Whenever you feel thirsty, you lean over<<if $subSlave.nipples == "partially inverted" || $subSlave.nipples == "inverted">>, pop one out,<<elseif $subSlave.nipples == "fuckable">>, slip your tongue deep inside,<</if>> and take some of _his2 creamy, slightly vanilla-toned milk straight from the source. Every time you do, _he2 shudders convulsively, <<if canTalk($subSlave)>> @@ -541,7 +541,7 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found </div> <</if>> /* 000-250-006 */ -<<set $subSlave.clothes = _clothes>> +<<set $subSlave.clothes = _clothesTemp>> You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. _He2's industriously pumping _his2 mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: _he2 loves cum so much that _he2 mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get _his2 favorite treat into _his2 mouth quicker. Still, _his2 enthusiasm is nice and _he2 does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <<EventNameLink $activeSlave>> at the door to your bedroom. You call $him in. <br><br> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 033574171d1c2b5e7548bb01559d9a4978c97856..1988b067ca3225b4057d78fa0f249ae824b7e0b2 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -433,9 +433,9 @@ As $he staggers to a halt in front of your desk, <<elseif ($activeSlave.clit > 1)>> stimulating $his clit enough that it <<elseif $activeSlave.vagina == -1>> - a motion which flexes $his buttocks together just enough to clench $his sensitive asspussy, and + $his motion flexes $his buttocks together just enough to clench $his sensitive asspussy, and <<else>> - a motion which + $his motion <</if>> provides just enough stimulation that $he climaxes. $His hands ball into fists at $his sides and $his torso pitches forward involuntarily, <<if (($activeSlave.balls > 3) && ($activeSlave.hormoneBalance < -20)) || ($activeSlave.balls >= 10)>> @@ -10477,9 +10477,9 @@ You tell $him kindly that you understand, and that $he'll be trained to address /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ @@ -19141,7 +19141,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<if isFertile($activeSlave)>> <br><<link "Give $him an afternoon off for some quality time with a local Frat House">> <<EventNameDelink $activeSlave>> - <<set _clothes = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> + <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> <<replace "#artFrame">> /* 000-250-006 */ <<if $seeImages == 1>> @@ -19153,7 +19153,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> + <<set $activeSlave.clothes = _clothesTemp>> <<replace "#result">> You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local Frat House willing to 'host' a $woman of $his age and experience. Perhaps a group of virile college boys running a train on $activeSlave.slaveName might accustom $him to younger sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like a frumpy Old World MILF and is clearly skeptical about your age-play therapy. <br><br> @@ -19306,7 +19306,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<if isFertile($activeSlave)>> <br><<link "Give $him an afternoon off for some quality time with a local retirement community">> <<EventNameDelink $activeSlave>> - <<set _clothes = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> + <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> <<replace "#artFrame">> /* 000-250-006 */ <<if $seeImages == 1>> @@ -19318,7 +19318,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> + <<set $activeSlave.clothes = _clothesTemp>> <<replace "#result">> You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local retirement community willing to 'host' a $girl of $his age. Perhaps a group of venerable graybeards running a train on $activeSlave.slaveName might accustom $him to older sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like an Old World schoolgirl and is clearly skeptical about your age-play therapy. <br><br> @@ -20433,7 +20433,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <</link>> <br><<link "Put $him in a string bikini">> <<EventNameDelink $activeSlave>> - <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "a Fuckdoll suit">> + <<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "a string bikini">> <<replace "#artFrame">> /* 000-250-006 */ <<if $seeImages == 1>> diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw index 796b9e90c7d1bfaad2ed005195570cd15d87221b..73e7c03246eaf5bfa069f15413a18048f651587a 100644 --- a/src/uncategorized/RESSTR.tw +++ b/src/uncategorized/RESSTR.tw @@ -44,9 +44,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 251f8dfeae92cfeb2f7786ee55ceca6f2ea2728c..ebb90a1dc34bd4256fe56c0036a3f50d77ca4a1a 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -165,7 +165,7 @@ <<set _clothesTemp = $activeSlave.clothes>> <<set _clothesTemp2 = $subSlave.clothes, $subSlave.clothes = "no clothing">> -<<switch $RESSevent>> +<<switch $RETSevent>> /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/ <<case "taste test" "anal cowgirl" "boob collision" "if you enjoy it" "shower force" "repressed anal virgin" "top exhaustion" "cockmilk interception" "interslave begging" "incestuous nursing">> <<set $activeSlave.clothes = "no clothing">> @@ -188,7 +188,7 @@ /* 000-250-006 */ </span> <<set $activeSlave.clothes = _clothesTemp>> -<<set $subSlave.clothes = _clothes2>> +<<set $subSlave.clothes = _clothesTemp2>> <<setAssistantPronouns>> <<setLocalPronouns $activeSlave>> @@ -1153,8 +1153,8 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> - <<set $subSlave.clothes = _clothes2>> + <<set $activeSlave.clothes = _clothesTemp>> + <<set $subSlave.clothes = _clothesTemp2>> <<replace "#result">> <<set _attendantPronouns = getPronouns($Attendant)>> @@ -1187,8 +1187,8 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> - <<set $subSlave.clothes = _clothes2>> + <<set $activeSlave.clothes = _clothesTemp>> + <<set $subSlave.clothes = _clothesTemp2>> <<replace "#result">> Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He looks at you with happy anticipation, but this is nothing to $his gratitude when you tell $him that you'll arrange a date night for them. Trusted slaves are often seen unchaperoned in your arcology, and there are several establishments that cater to slaveowners who wish to bring their girls out or even send them out alone. You tell $him you've made a reservation for $him and $his <<if $activeSlave.relationship >= 5>>wife<<else>>girlfriend<</if>> at one of the less formal places, an ethnic restaurant that manages to add spice to liquid slave nutrition without ruining its good qualities. They're to spend the night out, and can wear what they like. $He hurries off to collect $his _girl2 and get dressed, but also tries to keep thanking you on $his way out, and almost runs into the door frame as $he goes. @@ -1563,8 +1563,8 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of <</if>> /* 000-250-006 */ <</replace>> - <<set $activeSlave.clothes = _clothes>> - <<set $subSlave.clothes = _clothes2>> + <<set $activeSlave.clothes = _clothesTemp>> + <<set $subSlave.clothes = _clothesTemp2>> <<replace "#result">> You approach and observe to $activeSlave.slaveName that it sounds like $he's speaking from experience. $He glances at you nervously, but agrees. You tell $him to go on, so $he turns to the mystified $subSlave.slaveName and mumbles, "It wa<<s>>n't ea<<s>>y for me the fir<<s>>t time either." diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index f5a749171aa9cf6fe52899e6a4d4c57748ca4fdd..a1342eced5a031dab1c29ea94104bb2542f77c17 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -764,6 +764,27 @@ Choose a tattoo style: $His middle isn't large enough to be a suitable canvas for a navel focused tattoo. <</if>> +<br> +<<if $activeSlave.abortionTat > 0>> + <<if $activeSlave.abortionTat > 1>> + $He has a series of numberToWords($activeSlave.abortionTat) crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach. + <<else>> + $He has a single crossed out baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach. + <</if>> + //[[Remove tattoos|Body Modification][$activeSlave.abortionTat = -1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]]// +<<elseif $activeSlave.abortionTat == 0>> + <<if $activeSlave.pregKnown == 1>> + $He has a single baby-shaped temporary tattoo adorning $his stomach. + //[[Remove it|Body Modification][$activeSlave.abortionTat = -1]]// + <<else>> + $He is scheduled to receive a tattoo each time $he gets an abortion or miscarries. + //[[Cancel|Body Modification][$activeSlave.abortionTat = -1]]// + <</if>> +<<else>> + Have $him receive a tattoo for each abortion or miscarriage $he has. + //[[Begin keeping track|Body Modification][$activeSlave.abortionTat = 0]]// +<</if>> + <br> <br> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index ee52fc5e3ac6b7a122e5c93437490e457b33117e..7b7b5cf9b9382224d6ad91de3fc77fc08c7af273 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -222,7 +222,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>> _corpRev += _corpDivLegalRev, $menialDemandFactor -= _corpDivLegalCapSlaves, $corpDivLegalSlaves = $corpDivLegalDev * 2>> - But it ran out of storage space and had to sell <<if _corpDivBreakCapSlaves > 1>>@@.red;<<print _corpDivBreakCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivLegalRev)>>.@@ + But it ran out of storage space and had to sell <<if _corpDivLegalCapSlaves > 1>>@@.red;<<print _corpDivLegalCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivLegalRev)>>.@@ <</if>> <</if>> <</if>> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 38a30a2b38006893648f956af6f1c334ed31d9e7..3e99655d894a21c15ef206da6486969aae3e98c4 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -1,7 +1,7 @@ :: Dispensary [nobr] <<set $HackingSkillMultiplier = HSM()>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> +<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> <br> The Dispensary diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw index d2851cf8c955f03d9d2f20476a452b6e20d38094..f3c33e9a14163b2604446e6b2ca240f82faf197b 100644 --- a/src/uncategorized/jeSlaveDispute.tw +++ b/src/uncategorized/jeSlaveDispute.tw @@ -162,9 +162,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw index 1ef253f6e453e7137a5cd314ffa41cfc65343918..149460957ebd304d0fb8069e10a2ff0102e436a4 100644 --- a/src/uncategorized/pRivalryActions.tw +++ b/src/uncategorized/pRivalryActions.tw @@ -6,9 +6,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $hostage 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $hostage 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $hostage 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $hostage 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw index 1fb8e860ec42453b65dc32b99aab65c8d4facae4..5560b333e54f3aac036afec5d74993e0bb0d9a4c 100644 --- a/src/uncategorized/peCombatTraining.tw +++ b/src/uncategorized/peCombatTraining.tw @@ -5,6 +5,18 @@ <<set $activeSlave = $Bodyguard>> <<setLocalPronouns $activeSlave>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + <<EventNameLink $activeSlave>> has many duties as a bodyguard, and $his schedule is carefully built to allow $him to complete them. When you're at your desk in your penthouse and there are no guests to intimidate, $his services are least needed, so $he typically uses these lulls to catch up on sleep or train. <br><br> The feed from the small armory next door shows $him doing the latter. $He has finished working with a heavy practice sword, and has moved to the tiny, one-shooter range. $He seems frustrated, hurrying $his shots and missing unnecessarily. diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw index 28aec7225b84520d366f8071db9bdd9688463fb0..02612f8cbde7d5ff730b274d87c2393d8cbd883b 100644 --- a/src/uncategorized/peConcubineInterview.tw +++ b/src/uncategorized/peConcubineInterview.tw @@ -12,6 +12,18 @@ <<setPlayerPronouns>> <<setSpokenPlayerPronouns $activeSlave>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + You receive an official communication from a popular talk show e-hosted in one of the old world's still-thriving first world countries. Your fame has become known even in the old world, and they'd like to interview <<EventNameLink $activeSlave>> about you. They frankly warn you that you'll have no right to review the interview and no ability to control what $he says, and that they'll be asking about anything the interviewer thinks is juicy. This could be great for your reputation, but it could be hazardous, too. <br><br> diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw index 210d59063dde47d2b91608f4f499a38872355958..14137e72b8faca5c31185e507c455a14cd49df30 100644 --- a/src/uncategorized/peHeadgirlConcubine.tw +++ b/src/uncategorized/peHeadgirlConcubine.tw @@ -10,6 +10,19 @@ <<set _bellyCon = bellyAdjective($Concubine)>> <<setAssistantPronouns>> +<span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $Concubine 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $HeadGirl 2 0>> + </div> + <</if>> + /* 000-250-006 */ +</span> + You wake up one morning to find $HeadGirl.slaveName and $Concubine.slaveName waiting next to your bed. It's immediately obvious that they both have a minor item of business for you, since nothing was urgent enough to wake you early, and they evidently both came in to catch you at your normal hour of rising. They're kneeling side by side next to the <<if $HeadGirl.boobs >= 10000 && $Concubine.boobs >= 10000>> bed (a position that smashes their massive breasts together on one side), diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw index a3bfa238a2b3d6f0854dbe53e4d80b8c05651642..28f11ac7b8fd4682838f3a46d13f1339ca4f1dda 100644 --- a/src/uncategorized/peLonelyBodyguard.tw +++ b/src/uncategorized/peLonelyBodyguard.tw @@ -13,6 +13,19 @@ <<setLocalPronouns $activeSlave>> <<setLocalPronouns $slaves[$j] 2>> +<span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $slaves[$j] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> + <</if>> + /* 000-250-006 */ +</span> + 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/pePitFight.tw b/src/uncategorized/pePitFight.tw index 3fd14326a01b6c35b4d604b5afeeac2d7231d1f1..f85f2a32f06c95c23fafcc1f677ced6e962a779a 100644 --- a/src/uncategorized/pePitFight.tw +++ b/src/uncategorized/pePitFight.tw @@ -9,6 +9,18 @@ <<set $PPit = 0>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + It's time for the fight. It will take place in a back room of a well respected club. There is a ring set into the floor, and space for a handful of spectators, but the setup is quite Spartan. The sport is just getting off the ground. <<EventNameLink $activeSlave>> is first to walk into the ring. $He's stark naked and is carrying a simple single-edged straight sword, identical to the one $his opponent will be using. The fight will be fair. <br><br> diff --git a/src/uncategorized/pePitFightInvite.tw b/src/uncategorized/pePitFightInvite.tw index e1f67110ad72caac7af1c653cb212c447080aa70..0f6b1dfbd8aa1ae15e1fb9493192be41db6e1b3d 100644 --- a/src/uncategorized/pePitFightInvite.tw +++ b/src/uncategorized/pePitFightInvite.tw @@ -5,6 +5,8 @@ <<set $PPit = 0>> <<setLocalPronouns $Bodyguard>> +<span id="artFrame"> +</span> Gladiatorial combat between slaves has not yet reached the level of social acceptability it once enjoyed in Rome, but it's growing in popularity. For now, most fights are discreet affairs limited to select guests. Displaying a slave bodyguard is an excellent way to get yourself invited to participate, and $assistantName has just passed on an invitation to a private fight next week, should you be willing to hazard a bodyguard. @@ -12,6 +14,19 @@ Gladiatorial combat between slaves has not yet reached the level of social accep <span id="result"> <<link "Enter your bodyguard as a gladiatrix">> + <<replace "#artFrame">> + <span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div> + <</if>> + <</if>> + /* 000-250-006 */ + </span> + <</replace>> <<replace "#result">> You receive a brief confirmation. It looks like $he's got a fight. <<set $PPit = 1>> diff --git a/src/uncategorized/reDevotedMotherDaughter.tw b/src/uncategorized/reDevotedMotherDaughter.tw index 9749887f6b302ad02c1acc65c6310596eb8cdeca..f3a0c68b5474b917ce79759cdea12e52e25497f8 100644 --- a/src/uncategorized/reDevotedMotherDaughter.tw +++ b/src/uncategorized/reDevotedMotherDaughter.tw @@ -5,6 +5,19 @@ <<set $i = $slaveIndices[$devMother]>> <<set $j = $slaveIndices[$devDaughter]>> +<span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $slaves[$j] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $slaves[$i] 2 0>> + </div> + <</if>> + /* 000-250-006 */ +</span> + $slaves[$i].slaveName and her daughter $slaves[$j].slaveName are both good slaves, devoted and obedient. They'd probably do anything you order them to do. By happenstance they come before you for inspection one after the other. They certainly see each other stark naked frequently enough. As you finish $slaves[$i].slaveName's inspection, her daughter waits patiently for her turn. It occurs to you that they probably would do //anything// you order them to do, and that they're so acclimated to sexual slavery that they might well enjoy it. <br><br> diff --git a/src/uncategorized/reDevotedTwins.tw b/src/uncategorized/reDevotedTwins.tw index 54502cac9dd0d037716deaf3a3cdba6a559427af..fd5f04309a3caa8dfa0ee4ba519f85267b68d43f 100644 --- a/src/uncategorized/reDevotedTwins.tw +++ b/src/uncategorized/reDevotedTwins.tw @@ -5,6 +5,19 @@ <<set $i = $slaveIndices[$alphaTwin]>> <<set $j = $slaveIndices[$betaTwin]>> +<span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $slaves[$j] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $slaves[$i] 2 0>> + </div> + <</if>> + /* 000-250-006 */ +</span> + $slaves[$i].slaveName and $slaves[$j].slaveName are such good and devoted slaves that they happily do everything together. They sleep in each other's arms, bathe together, work together whenever they can, and fuck together. For a while they masturbated together until they became so habituated to sexual slavery that they stopped seeing much distinction between masturbation and sex with one another. At the moment, they're getting ready for their day, chatting quietly and helping each other. <br><br> <span id="result"> diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw index c8b0795b43de5a4bd07329270f8ec98413543d8b..33af053c8f80b61bbd7dff37459114c4d1bc0e4d 100644 --- a/src/uncategorized/reHGReplacement.tw +++ b/src/uncategorized/reHGReplacement.tw @@ -6,6 +6,23 @@ <<setLocalPronouns $HeadGirl 2>> <<setSpokenLocalPronouns $activeSlave $HeadGirl>> +<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> +<<set _clothesTemp2 = $HeadGirl.clothes>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $HeadGirl 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> +<</if>> +/* 000-250-006 */ +</span> +<<set $activeSlave.clothes = _clothesTemp>> +<<set $HeadGirl.clothes = _clothesTemp2>> + There's a constant traffic of slaves in and out of your office as your chattel comes in and out for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink $activeSlave>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His $activeSlave.eyeColor eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl. When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>. diff --git a/src/uncategorized/reLegendaryBalls.tw b/src/uncategorized/reLegendaryBalls.tw index 4e532d94a5de6426baa600dc2378a2c4a4bffc66..53ef45f19556ae4d1d5a90c329f9cca89cb2004a 100644 --- a/src/uncategorized/reLegendaryBalls.tw +++ b/src/uncategorized/reLegendaryBalls.tw @@ -10,6 +10,18 @@ <<setLocalPronouns $activeSlave>> <<set $activeSlave.devotion += 4>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + <<EventNameLink $activeSlave>> is an incredible producer of cum. $He's producing in volumes that would have been unthinkable in the days when it was illegal to restrain a slave so that $he could have every drop of $his ejaculate milked out by a machine. A nascent slave stock organization will be holding a public livestock show tomorrow, and since they're aware you're experimenting with cockmilking, they've sent you an invitation to enter an especially productive slave to be judged. <br><br> diff --git a/src/uncategorized/reLegendaryCow.tw b/src/uncategorized/reLegendaryCow.tw index 0ca8b2611e7a6b79ee84608c91a4018997635be6..6ffb899c89dad5e037c3cc2f1418a1e3f4d7c4f6 100644 --- a/src/uncategorized/reLegendaryCow.tw +++ b/src/uncategorized/reLegendaryCow.tw @@ -10,6 +10,18 @@ <<setLocalPronouns $activeSlave>> <<set $activeSlave.devotion += 4>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + <<EventNameLink $activeSlave>> is an incredible producer of milk. $He's lactating in volumes that would have been unthinkable in the days when drug treatments were limited by consent. A nascent slave dairy trade organization will be holding a public stock show tomorrow, and since they're aware you keep cows, they've sent you an invitation to enter stock to be judged. <br><br> diff --git a/src/uncategorized/reLegendaryEntertainer.tw b/src/uncategorized/reLegendaryEntertainer.tw index 9595f3f95cb05443cc8367535783eaa1e776ccfc..968368f17cfeec1953581b58c94574f410bcdba0 100644 --- a/src/uncategorized/reLegendaryEntertainer.tw +++ b/src/uncategorized/reLegendaryEntertainer.tw @@ -10,6 +10,18 @@ <<setLocalPronouns $activeSlave>> <<set $activeSlave.devotion += 4>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + The Free Cities fashion scene extends to slave bodies, of course; stopping at mere clothes and behaviors is an old world conceit. This week, <<EventNameLink $activeSlave>> is in vogue. Such a crowd of gawkers and hangers-on follows $him around the club that the fine citizens who have a chance at an hour of $his time must shoulder their way through the throng. <br><br> diff --git a/src/uncategorized/reLegendaryWhore.tw b/src/uncategorized/reLegendaryWhore.tw index 0acddaaf3c44595156564011541461fe544be7d6..11ede00c1cca4ff22c3affe348fec48e23645263 100644 --- a/src/uncategorized/reLegendaryWhore.tw +++ b/src/uncategorized/reLegendaryWhore.tw @@ -10,6 +10,18 @@ <<setLocalPronouns $activeSlave>> <<set $activeSlave.devotion += 4>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + The Free Cities red light areas are so overcharged with cheap and easy sex that the fashion in whores is comically unstable. This week, <<EventNameLink $activeSlave>> is in vogue. So many customers are interested in renting $his body that it's necessary to assign other whores to take some of the load off $him by diverting less important customers away from $him. <br><br> diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw index 011ec782f9a24f5627ea8d40701fcd64c1820f50..c0f4c00fc43766a01db6316b821b6a4dfe6cbedf 100644 --- a/src/uncategorized/reMilfTourist.tw +++ b/src/uncategorized/reMilfTourist.tw @@ -41,7 +41,7 @@ <<else>> $assistantAppearance avatar <</if>> - appears on your desk in the middle of the day. "Something unusual for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is out doing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to fuck $him, but it turns out _he2 just wanted a tour guide. It was a reasonable mistake; _he2 seems wealthy. _milfSlave.slaveName has been showing _him2 around for the last half hour. Now _he2's asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave. Your personal assistant's avatar + appears on your desk in the middle of the day. "Something unusual for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is out doing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to fuck $him, but it turns out _he2 just wanted a tour guide. It was a reasonable mistake; _he2 seems wealthy. $He has been showing _him2 around for the last half hour. Now _he2's asked $him if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks your slave a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave. Your personal assistant's avatar <<switch $assistantAppearance>> <<case "monstergirl">> bares her fangs and makes pinching gestures at nipple height. @@ -72,12 +72,12 @@ <<case "witch">> blushes at the sight of those lovely curves. <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">> - swells itself to resemble her figure before twisting it arm into a cock and ramming it straight up its cunt. + swells itself to resemble her figure before twisting its arm into a cock and ramming it straight up its cunt. <<default>> reforms into an exaggerated female form before going back to its normal symbol shape. <</switch>> <<else>> - <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> gets your attention the middle of the day. "A minor matter for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. _milfSlave.slaveName has been acting as _his2 guide for the last half hour. The tourist has asked _milfSlave.slaveName if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks _milfSlave.slaveName a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave. + <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> gets your attention the middle of the day. "A minor matter for you, <<= properTitle()>>," she says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. $He has been acting as _his2 guide for the last half hour. The tourist has asked $him if _he2 can meet you." She displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks your slave a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave. <</if>> <br><br> @@ -96,13 +96,13 @@ <<replace "#result">> You have _milfSlave.slaveName bring the tourist up to meet you. _He2's full of questions about what it's like to be an arcology owner, and you finally tell _him2 that you can give _him2 a pretty good idea. Eagerly, _he2 asks you how, and you point at _milfSlave.slaveName, telling the tourist _he2 ought to bend the slave over the couch if _he2 wants to know what it's really like to be an oversexed oligarch. "I'm, um, not really a lesbian," the tourist responds hesitantly. <<if _milfSlave.dick > 0>> - "You don't have to be," _milfSlave.slaveName purrs. "I have a cock." $He slides in, just close enough to prove it. "Plea<<s>>e, + "You don't have to be," $he purrs. "I have a cock." $He slides in, just close enough to prove it. "Plea<<s>>e, <<else>> - "Having <<s>>e<<x>> with <<s>>lave<<s>> doe<<s>> not make you a le<<s>>bian," _milfSlave.slaveName purrs. "It'<<s>> different here. Plea<<s>>e, + "Having <<s>>e<<x>> with <<s>>lave<<s>> doe<<s>> not make you a le<<s>>bian," $he purrs. "It'<<s>> different here. Plea<<s>>e, <</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 $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. + 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 $him, 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 $him 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>> <<run repX(100, "event")>> @@ -115,9 +115,9 @@ <<setSpokenLocalPronouns _milfSlave $activeSlave>> You have _milfSlave.slaveName bring the tourist up to meet you, and exchange some minor pleasantries. You tell _him2 that if _he2 really wants to experience Free Cities life, though, _he2 really should enjoy _milfSlave.slaveName, pointing at the slave hovering behind _him2. _He2 blushes furiously, but before _he2 can stammer a refusal, the slave whispers something into _his2 ear. "I'm, um, not really a lesbian," the tourist responds hesitantly. <<if _milfSlave.dick > 0>> - "You don't have to be," _milfSlave.slaveName purrs. "I have a cock." $He slides in, just close enough to prove it. "Plea<<s>>e, + "You don't have to be," $he purrs. "I have a cock." $He slides in, just close enough to prove it. "Plea<<s>>e, <<else>> - "Having <<s>>e<<x>> with <<s>>lave<<s>> doe<<s>> not make you a le<<s>>bian," _milfSlave.slaveName purrs. "It'<<s>> different here. Plea<<s>>e, + "Having <<s>>e<<x>> with <<s>>lave<<s>> doe<<s>> not make you a le<<s>>bian," $he purrs. "It'<<s>> different here. Plea<<s>>e, <</if>> give me a try." The tourist turns to stare at $him, 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 takes the tourist's hand, and they leave your office together. <br><br> diff --git a/src/uncategorized/reNoEvent.tw b/src/uncategorized/reNoEvent.tw index f2081cbcd1737cfe6730c9137ecdd5972e0136c1..fb33fdcbc9c92a327f4531d33b5a5e124edb97a5 100644 --- a/src/uncategorized/reNoEvent.tw +++ b/src/uncategorized/reNoEvent.tw @@ -11,9 +11,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw index 09c12cc30f4249ed10de0586fb85b6068149bf7b..3e14c1f59611e5e69a0fc09c132e61d3929f4f2e 100644 --- a/src/uncategorized/reRelationshipAdvice.tw +++ b/src/uncategorized/reRelationshipAdvice.tw @@ -8,18 +8,20 @@ <<set $subSlave = $slaves[_i]>> <<setLocalPronouns $subSlave 2>> +<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> <span id="artFrame"> /* 000-250-006 */ <<if $seeImages == 1>> <div class="imageRef medImg"> - <<SlaveArt $activeSlave 2 0>> + <<SlaveArt $subSlave 2 0>> </div> <div class="imageRef medImg"> - <<SlaveArt $subSlave 2 0>> + <<SlaveArt $activeSlave 2 0>> </div> <</if>> /* 000-250-006 */ </span> +<<set $activeSlave.clothes = _clothesTemp>> <<EventNameLink $activeSlave>> is standing for an inspection. $He's a good $girl, and is cooperating, but $he seems preoccupied. After ignoring it for a while, you give in to curiosity and flatly ask $him what's going on. "I'm <<s>>orry, <<Master>>," $he <<if SlaveStatsChecker.checkForLisp($activeSlave)>>lisp<<else>>mutter<</if>>s, biting $his lip. "It'<<s>> $subSlave.slaveName." $He hesitates, so you prompt $him, asking if $he's having trouble with $his diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index a1a3fa2449a446f441d1dc79667d3100c7e5a1a3..32e7e4933efb27d737df16814ec93d71f747146d 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -11,9 +11,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $eventSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $eventSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ @@ -841,9 +841,9 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $eventSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $eventSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw index 49d0e4abb25b4b19479f1a78b3cdcea598f8a151..20e4fc973a3fa05604b5f1c039c5a0d0f2da00ab 100644 --- a/src/uncategorized/reStandardPunishment.tw +++ b/src/uncategorized/reStandardPunishment.tw @@ -7,9 +7,9 @@ /* 000-250-006 */ <<if $seeImages == 1>> <<if $imageChoice == 1>> - <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <<else>> - <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> <</if>> <</if>> /* 000-250-006 */ diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw index 587b435b0f97d8887a51bf37e37ab2dde3d1a04c..41743b972495e0a2575cfb932a760b827a44abff 100644 --- a/src/uncategorized/saBeYourHeadGirl.tw +++ b/src/uncategorized/saBeYourHeadGirl.tw @@ -1,6 +1,6 @@ :: SA be your Head Girl [nobr] -<<set $HGTimeInGrade += 1>> +<<set $HGTimeInGrade += 1, _fetishChangeChance = fetishChangeChance($slaves[$i])>> <<if $HGSuite == 1>> <<set $slaves[$i].livingRules = "luxurious">> @@ -79,11 +79,11 @@ <<else>> <<if $slaves[$i].relationshipTarget == $Concubine.ID>> <<if $slaves[$i].relationTarget == $Concubine.ID>> - Your Concubine is your Consort's $slaves[$i].relation-wife. Truly, $arcologies[0].name looks up to you @@.green;as children to a father.@@ - <<run repX(250, "headGirl", $slaves[$i])>> + Your Concubine is your Consort's $slaves[$i].relation-wife. Truly, $arcologies[0].name looks up to you @@.green;as children to a father.@@ + <<run repX(250, "headGirl", $slaves[$i])>> <<else>> - Your Consort and your Concubine are wives to each other and to Pharaoh. This is @@.green;as it should be.@@ - <<run repX(100, "headGirl", $slaves[$i])>> + Your Consort and your Concubine are wives to each other and to Pharaoh. This is @@.green;as it should be.@@ + <<run repX(100, "headGirl", $slaves[$i])>> <</if>> <<elseif $slaves[$i].relationshipTarget == $slaves[$i].relationTarget>> Your Consort has a $slaves[$i].relation-wife. This is @@.green;as it should be.@@ @@ -110,10 +110,10 @@ <<if ($personalAttention == "HG")>> You're cooperating with $him this week, working with $assistantName to free up some of $his time so $he can target more slaves in need of individual attention. <<if ($slaves[$i].trust > 95)>> - $He is so trusting of you that $he can act as your own right hand, allowing $him to oversee your slaves with remarkable efficiency. + $He is so trusting of you that $he can act as your own right hand, allowing $him to oversee your slaves with remarkable efficiency. <<else>> - This arrangement @@.mediumaquamarine;builds trust@@ between you. - <<set $slaves[$i].trust += 2>> + This arrangement @@.mediumaquamarine;builds trust@@ between you. + <<set $slaves[$i].trust += 2>> <</if>> <</if>> @@ -129,13 +129,11 @@ <<if $slaves[$i].fetishKnown == 1>> <<if $slaves[$i].fetish == "dom">> - <<if ($slaves[$i].fetishKnown == 1)>> - <<if ($slaves[$i].fetishStrength <= 95)>> + <<if ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength <= 95)>> Having all the slaves look up to and obey $him advances $his @@.lightcoral;dominant tendencies.@@ <<set $slaves[$i].fetishStrength += 4>> <</if>> - <</if>> - <<elseif $slaves[$i].fetishStrength < 20>> + <<elseif _fetishChangeChance > random(0,100)>> Having all the slaves look up to and obey $him affects $his sexuality, turning $him into a @@.lightcoral;bit of a dominatrix.@@ <<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 20, $slaves[$i].fetishKnown = 1>> <<elseif $slaves[$i].fetishStrength <= random(20,60)>> @@ -143,12 +141,24 @@ <<set $slaves[$i].fetishStrength -= 4>> <</if>> <<else>> - <<if random(1,3) == 1>> + <<if $slaves[$i].fetish == "dom">> + Having all the slaves look up to and obey $him clearly excites $him; @@.lightcoral;$he's a natural dom!@@ + <<elseif _fetishChangeChance > random(0,100)>> Having all the slaves look up to and obey $him affects $his sexuality, turning $him into a @@.lightcoral;bit of a dominatrix.@@ <<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 20, $slaves[$i].fetishKnown = 1>> <</if>> <</if>> +<<if $slaves[$i].lactationRules == "induce">> + $He works mammary stimulation into $his slave training regimen in an effort to bring in $his milk for you. + <<set $slaves[$i].induceLactation += 3>> + <<= induceLactation($slaves[$i])>> + <<if $slaves[$i].lactation == 1>><<set $slaves[$i].lactationRules = "maintain">><</if>> +<<elseif $slaves[$i].lactationRules == "maintain">> + Proper nursing and milking technique is a strong aspect of $his slave training regimen, both to keep $his milk flowing and to prevent the mounting pressure from distracting from $his work. + <<set $slaves[$i].lactationDuration = 2, $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>> +<</if>> + <<if ($slaves[$i].dick > 0) && ($universalRulesImpregnation == "HG") && canPenetrate($slaves[$i])>> $He finds $his duty to impregnate slaves at will sexually satisfying. <<set $slaves[$i].need = 0>> @@ -160,11 +170,11 @@ <</if>> <<if $slaves[$i].prestige == 0>> -<<if $HGTimeInGrade+(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)+($slaves[$i].devotion/10)+($slaves[$i].trust/10) > 50>> - $slaves[$i].slaveName has rendered such long and competent service as your Head Girl that many of your citizens have come to rely on $his word as an extension of yours, trusting that if $he does something, it's because you trust $him to. @@.green;$He has become prestigious on $his own merits, a remarkable achievement for a slave!@@ - <<set $slaves[$i].prestige += 1>> - <<set $slaves[$i].prestigeDesc = "Many citizens respect her long and able service as your Head Girl.">> -<</if>> + <<if $HGTimeInGrade+(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/10)+($slaves[$i].devotion/10)+($slaves[$i].trust/10) > 50>> + $slaves[$i].slaveName has rendered such long and competent service as your Head Girl that many of your citizens have come to rely on $his word as an extension of yours, trusting that if $he does something, it's because you trust $him to. @@.green;$He has become prestigious on $his own merits, a remarkable achievement for a slave!@@ + <<set $slaves[$i].prestige += 1>> + <<set $slaves[$i].prestigeDesc = "Many citizens respect her long and able service as your Head Girl.">> + <</if>> <</if>> <<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skillWA < $masteredXP>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 54eab54f4c706170d84721f6f676013e61c736cb..483c6985d72c84c899eda9a11561f78c2a8ef6da 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -1099,6 +1099,11 @@ <<set $slaves[$i].devotion += 4>> <</if>> <</if>> + <<if $slaves[$i].abortionTat > -1>> + The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. + <<set $slaves[$i].abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 0e41ab8e1d9234775441858cf46b5c8905eadb24..3ed1e993d964aca23c1bd711c1cc9542dff2ad9c 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4513,6 +4513,10 @@ Society is @@.red;disapproving@@ of $slaves[$i].slaveName's flat, unimpregnated stomach. <<= FSChangePorn("Repopulationist", -2)>> <</if>> + <<if $slaves[$i].abortionTat > 0>> + Society @@.red;is disgusted@@ by the tally of aborted children adorning $his skin. + <<= FSChangePorn("Repopulationist", -1)>> + <</if>> <<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 1>> <<if $slaves[$i].preg > 30>> Society @@.green;loves@@ $slaves[$i].slaveName's advanced pregnancy. It's very trendy. @@ -4535,6 +4539,10 @@ The Societal Elite @@.green;are pleased@@ your child is growing within $him. The mark covering $his lower belly, coupled with $his gravidity and blessing, @@.green;enamors@@ your populace. <<set $failedElite -= 5+$slaves[$i].pregType>> <<= FSChangePorn("Eugenics", 3)>> + <<if $slaves[$i].abortionTat > 0>> + The tally of aborted children adorning $his middle @@.red;is worrying,@@ however. + <<= FSChangePorn("Eugenics", -1)>> + <</if>> <</if>> <<else>> <<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33>> @@ -4555,6 +4563,10 @@ Society is @@.green;pleased@@ that $slaves[$i].slaveName is unable to become pregnant. <<= FSChangePorn("Eugenics", 2)>> <</if>> + <<if $slaves[$i].abortionTat > 0>> + The tally of aborted pregnancies adorning $his middle shows @@.green;just how responsible@@ of an owner $he has. + <<= FSChangePorn("Eugenics", 1)>> + <</if>> <<if $slaves[$i].pregKnown == 1 && $eugenicsFullControl != 1>> The Societal Elite @@.red;judge you@@ for keeping pregnant slaves. It falls to the slaveowner to deal with subhuman pregnancies and you are failing in your duties as a member of the Elite. <<set $failedElite += 5+$slaves[$i].pregType>> @@ -4665,6 +4677,14 @@ Society @@.green;approves@@ of $his many body modifications, which advances the public taste for such degradation of slave bodies. <<= FSChangePorn("Degradationist", 1)>> <</if>> + <<if $slaves[$i].abortionTat > 0 && $arcologies[0].FSRepopulationFocus == "unset">> + Society @@.green;<<if $arcologies[0].FSRestart != "unset">>greatly <</if>>approves@@ of $his tally of aborted children. + <<if $arcologies[0].FSRestart != "unset">> + <<= FSChangePorn("Degradationist", 2)>> + <<else>> + <<= FSChangePorn("Degradationist", 1)>> + <</if>> + <</if>> <<if $slaves[$i].voice != 0>> <<if $slaves[$i].lips > 95>> Society @@.green;approves@@ of the way $his mouth, with its useless ability to speak, has been replaced with an appealing hole. @@ -7339,6 +7359,11 @@ <<run SetBellySize($slaves[$i])>> <<run cashX(-100000, "fines", $slaves[$i])>> <<set $failedElite += 150>> + <<if $slaves[$i].abortionTat > -1>> + But hey, $he gets a tattoo signifying $his abortion. Was it worth it? + <<set $slaves[$i].abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <</if>> <</if>> <</if>> <</if>> @@ -7468,6 +7493,11 @@ <</if>> <</if>> <<set $slaves[$i].pregType = 0, WombFlush($slaves[$i]), $slaves[$i].pregKnown = 0, $slaves[$i].pregWeek = -4>> + <<if $slaves[$i].abortionTat > -1>> + The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($slaves[$i].abortionTat)>> crossed out infant. + <<set $slaves[$i].abortionTat++>> + <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>> + <</if>> <<run SetBellySize($slaves[$i])>> <<set _miscarriage = 1>> <</if>> diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw index f12ff29c049204effe1654e161f4793001b6321f..6d2407b862e1f3833ac6c326ff9e7eab884f2f89 100644 --- a/src/uncategorized/seCoursing.tw +++ b/src/uncategorized/seCoursing.tw @@ -6,6 +6,18 @@ <<setLocalPronouns $Lurcher>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $Lurcher 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $Lurcher 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + It's time to go coursing. You meet with fellow members of the Coursing Association while the automated maintenance drones clear the plaza and lay down the green, sharing a refine discussion of recent events over <<if $PC.refreshmentType == 0>>a $PC.refreshment<<elseif $PC.refreshmentType == 1>>glasses of $PC.refreshment<<elseif $PC.refreshmentType == 2>>plates of $PC.refreshment<<elseif $PC.refreshmentType == 3>>hits of $PC.refreshment<<elseif $PC.refreshmentType == 4>>shots of $PC.refreshment<<elseif $PC.refreshmentType == 5>>handfuls of $PC.refreshment<<elseif $PC.refreshmentType == 6>>tabs of $PC.refreshment<</if>>. Once the field is ready, the day's hares are led out and chained in a row along one side of the plaza, naked. You and the other members watch this process intently, since you won't get any more information on them than what you can learn by looking. <br><br> The rules have been explained to the hares: they're to be freed if they can reach the other side of the plaza without being caught and raped by the lurchers who will be released to chase them. diff --git a/src/uncategorized/seCoursingRace.tw b/src/uncategorized/seCoursingRace.tw index dc6c92c77e5af20801da2a821b6d316af1967dfd..db3d75736eb413b4e1b171dad7e4e0acd66661d6 100644 --- a/src/uncategorized/seCoursingRace.tw +++ b/src/uncategorized/seCoursingRace.tw @@ -3,6 +3,19 @@ <<setLocalPronouns $Lurcher>> <<setLocalPronouns $activeSlave 2>> +<span id="artFrame"> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $Lurcher 2 0>> + </div> + <</if>> + /* 000-250-006 */ +</span> + 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>> diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw index df1b65a47babf0c5aa1e5632c20478dc852ba816..ba11d2385185940f2da37974c31aeedbdf043cdd 100644 --- a/src/uncategorized/seExpiration.tw +++ b/src/uncategorized/seExpiration.tw @@ -9,6 +9,18 @@ <<run Enunciate($activeSlave)>> <<setLocalPronouns $activeSlave>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + $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/seLethalPit.tw b/src/uncategorized/seLethalPit.tw index ecf26de72e4392d38f7ab290623cc9dee3be7d8f..43662f2f5f85633c4adaee4c5e9e5df450236a2d 100644 --- a/src/uncategorized/seLethalPit.tw +++ b/src/uncategorized/seLethalPit.tw @@ -45,13 +45,15 @@ <<set _animal = $activeFeline>> <</switch>> <span id="artFrame"> - /* 000-250-006 */ - <<if $seeImages == 1>> - <div class="imageRef lrgVector"> - <<SlaveArt _fighterOne 2 0>> - </div> - <</if>> - /* 000-250-006 */ + /* 000-250-006 */ + <<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div> + <</if>> + <</if>> + /* 000-250-006 */ </span> <</if>> <</if>> diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index b8d32aa3e4d7a62fd0881cf14caacb2ac75c6e68..a89f25af085ef66ab0bf0b11294e2ef4daac7ca7 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -38,13 +38,15 @@ <<set _animal = $activeFeline>> <</switch>> <span id="artFrame"> - /* 000-250-006 */ - <<if $seeImages == 1>> - <div class="imageRef lrgVector"> - <<SlaveArt _fighterOne 2 0>> - </div> - <</if>> - /* 000-250-006 */ + /* 000-250-006 */ + <<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div> + <</if>> + <</if>> + /* 000-250-006 */ </span> <</if>> diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw index e25368c3312287f5d39f42e4b594e9faf1e9e3b4..bf415876fd0a5645a0fce5b365c9fdb257610442 100644 --- a/src/uncategorized/seRetirement.tw +++ b/src/uncategorized/seRetirement.tw @@ -15,8 +15,26 @@ <<if def _sr>> <<setLocalPronouns $slaves[_sr] 2>> <</if>> +<<if $CitizenRetirement == 1>> + <<set $activeSlave.clothes = "conservative clothing">> +<<elseif $BioreactorRetirement == 1>> + /* Scene starts in normal clothing */ +<<elseif $ArcadeRetirement == 1>> + /* Scene starts in normal clothing, previewing Fuckdolls doesn't seem to work. */ +<</if>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> -$activeSlave.slaveName is retiring from sexual slavery this week, +<<EventNameLink $activeSlave>> is retiring from sexual slavery this week, <<if $CitizenRetirement == 1>> @@ -186,6 +204,18 @@ Your arcology has gained a well-off citizen. <br /> <<if _clonedSlave.relationship >= 4>> <<link "Send $his _girl2 into retirement with $him">> + <<replace "#artFrame">> + /* 000-250-006 */ + <<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt $slaves[_sr] 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt $activeSlave 2 0>> + </div> + <</if>> + /* 000-250-006 */ + <</replace>> <<replace "#result">> <<set _sr = $slaveIndices[_clonedSlave.relationshipTarget]>> /* must be reset since $activeSlave may already be removed from $slaves */ $He doesn't get far before $he <<if canHear(_clonedSlave)>>hears a desperate pursuit behind $him<<else>>feels a gentle tap on $his shoulder<</if>>. It's $his <<if _clonedSlave.relationship >= 5>>wife<<else>>lover<</if>>, $slaves[_sr].slaveName, <<if canHear(_clonedSlave)>>hurrying to catch<<else>>finally catching<</if>> up. Watching on the monitors, you see _clonedSlave.slaveName's mixed pleasure and pain at seeing _him2 again so soon, followed by a tearful explanation and an embrace so heartfelt that the pair of ex-slaves collapse to the floor together, sobbing. diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw index 9da33aa37ba997f841778fbeda787ece06a004e2..fab6d5d9af9b8a0706a507c37cb11f0c205502a9 100644 --- a/src/uncategorized/seWeddingDouble.tw +++ b/src/uncategorized/seWeddingDouble.tw @@ -8,6 +8,17 @@ <<set _belly = bellyAdjective(_slave1)>> <<set _belly2 = bellyAdjective(_slave2)>> +/* 000-250-006 */ +<<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt _slave2 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _slave1 2 0>> + </div> +<</if>> +/* 000-250-006 */ + <<if _slave1.slaveName == _slave2.slaveName>> <</if>> diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw index 0097c10ae71f07e81e8740190e668c2fc9bb006a..e35fdce93f0c609f6d746db1949cf34fb846cff6 100644 --- a/src/uncategorized/seWeddingSingle.tw +++ b/src/uncategorized/seWeddingSingle.tw @@ -4,6 +4,18 @@ <<setLocalPronouns $slaves[_s]>> <<set _belly = bellyAdjective($slaves[_s])>> +<span id="artFrame"> +/* 000-250-006 */ +<<if $seeImages == 1>> + <<if $imageChoice == 1>> + <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $slaves[_s] 2 0>></div> + <<else>> + <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $slaves[_s] 2 0>></div> + <</if>> +<</if>> +/* 000-250-006 */ +</span> + <<if $slaves[_s].relationship != 0>> <<if $slaves[_s].relationship > 0>> <<set _m = $slaveIndices[$slaves[_s].relationshipTarget]>> diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw index 523dec4882018e3dec2dbb5bb7d15cbe87fa8448..c75be01bb4113656951dee62f0d3a33c8ed64b5d 100644 --- a/src/uncategorized/seWeddingTriple.tw +++ b/src/uncategorized/seWeddingTriple.tw @@ -12,6 +12,20 @@ <<setLocalPronouns _slave4 4>> <</if>> +/* 000-250-006 */ +<<if $seeImages == 1>> + <div class="imageRef medImg"> + <<SlaveArt _slave3 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _slave2 2 0>> + </div> + <div class="imageRef medImg"> + <<SlaveArt _slave1 2 0>> + </div> +<</if>> +/* 000-250-006 */ + /* TODO: not sure what to put here yet, this is mostly a placeholder */ In the days leading up to your wedding, your wives-to-be spent their time preparing to join you in matrimony. diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw index 4768e9d81c083ee48e04df2544b3aa6bcf2e270e..f01a5113996d1571067c6949891468bfe50d819c 100644 --- a/src/uncategorized/sellSlave.tw +++ b/src/uncategorized/sellSlave.tw @@ -1394,7 +1394,7 @@ __Bids Received__ <<if $activeSlave.dick > 0>> <<if $slaveCost > 10000>> <<if random(1,100) > 60>> - <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.1)/500))>>'' from a slave trainer that specializes in creating proper slave $women from raw material that falls short of that ideal but has potential anyway. + <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.1)/500))>>'' from a slave trainer that specializes in creating proper slave women from raw material that falls short of that ideal but has potential anyway. <<link "Accept bid" "Slave Sold">> <<set _Price = 500*Math.trunc(($slaveCost*1.1)/500)>> <<run cashX(_Price, "slaveTransfer", $activeSlave)>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 062648154ba038cbd0c47e577f5de75cd85531cc..aa99dc90595f78b0fffb2634eb9185992fdff65a 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -15379,6 +15379,15 @@ $He has $He has an unrecognizable tattoo scrunched around $his navel. <</if>> <</if>> + <<if $activeSlave.abortionTat > 0>> + <<if $activeSlave.abortionTat > 1>> + $He has a series of $activeSlave.abortionTat crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach; one for each pregnancy $he's failed to complete. + <<else>> + $He has a single crossed out, baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach. + <</if>> + <<elseif $activeSlave.abortionTat == 0 && $activeSlave.pregKnown == 1>> + $He has a single baby-shaped temporary tattoo adorning $his stomach. + <</if>> <<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "belly")>> $He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation. <</if>> @@ -18659,6 +18668,16 @@ $He has <</if>> <</if>> + <<if $activeSlave.abortionTat > 0>> + <<if $activeSlave.abortionTat > 1>> + $He has a series of $activeSlave.abortionTat crossed out baby-shaped tattoos<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach; one for each pregnancy $he's failed to complete. + <<else>> + $He has a single crossed out, baby-shaped tattoo<<if $activeSlave.pregKnown == 1>>, and one uncrossed one,<</if>> adorning $his stomach. + <</if>> + <<elseif $activeSlave.abortionTat == 0 && $activeSlave.pregKnown == 1>> + $He has a single baby-shaped temporary tattoo adorning $his stomach. + <</if>> + <<if ($activeSlave.brand != 0) && ($activeSlave.brandLocation == "belly")>> $He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation. <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index dfa27858dc9b5f6ab567d8eba4bddd3b55547c8c..e98a74c82cb924914776d979b60623e508acef06 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -637,7 +637,7 @@ $activeSlave.slaveName is <<if ($activeSlave.amp == 1)>> body. <<else>> - body, down to $his feet, which + body, down to $his feet, with <<footwearDescription>> <</if>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 6c02ccdd7c05644604f0d216a500da64b24e0fa1..54881cbd58f7fe9cdef7a7a9bea9560d78a0c9cd 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2483,6 +2483,11 @@ <<if random (1,100) > 90>> <<set $activeSlave.hears = -2>> <</if>> + <<if $arcologies[_market].FSRepopulationFocus == "unset" && $arcologies[_market].FSBodyPurist == "unset">> + <<if isFertile($activeSlave) && random(1,10) == 9>> + <<set $activeSlave.abortionTat = random(1, (Math.min($activeSlave.physicalAge-$fertilityAge, $activeSlave.physicalAge-$minimumSlaveAge))*2)>> + <</if>> + <</if>> <</if>> <<if $arcologies[_market].FSBodyPurist > 80>>