diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 57a0ec2383dec7a64b389b858135790ac2c1242f..b8edea253945495aa399a77d5a71effb03553f67 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -2410,14 +2410,24 @@ origSkin: Slave's original skin color. accepts string +vasectomy: +Has the slave had a vasectomy? +0 - no +1 - yes + +haircuts: + +Is the slave's hair under constant maintenace? +0 - no +1 - yes How to set up your own hero slave. -The default slave template used: - <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, buttplugAttachment: "none", slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white"}>> + <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, buttplugAttachment: "none", slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0}>> Making your slave; add their name to the following, then go down the documentation adding in your changes. -each variable must be seperated from the last by a comma followed by a space diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw index 99263a171f0faacc935b3250fb49c978e229945c..dd00793e62cd7b36f967ab97e6c7755fb69cb2c4 100644 --- a/src/cheats/mod_EditArcologyCheat.tw +++ b/src/cheats/mod_EditArcologyCheat.tw @@ -372,6 +372,22 @@ __Player Character__ <<radiobutton "$TGA.schoolAnnexed" 0>> 0 | <<radiobutton "$TGA.schoolAnnexed" 1>> 1 (Failed) +<br><br>''The Cattle Ranch:'' +<br>TCR Students Bought: <<textbox "$TCR.studentsBought" $TCR.studentsBought>> +<br>TCR Upgrades: ''$TCR.schoolUpgrade'' +<<radiobutton "$TCR.schoolUpgrade" 0>> 0 +| <<radiobutton "$TCR.schoolUpgrade" 1>> 1 +| <<radiobutton "$TCR.schoolUpgrade" 2>> 2 + +<br>TCR Moved to Arcology: ''$TCR.schoolPresent'' | +<<radiobutton "$TCR.schoolPresent" 0>> 0 +| <<radiobutton "$TCR.schoolPresent" 1>> 1 (Moved) + +<br>TCR Prosperity: <<textbox "$TCR.schoolProsperity" $TCR.schoolProsperity>> +<br>TCR Failed: ''$TCR.schoolAnnexed'' | +<<radiobutton "$TCR.schoolAnnexed" 0>> 0 +| <<radiobutton "$TCR.schoolAnnexed" 1>> 1 (Failed) + <br><br>''The Futanari Sisters:'' <br>TFS Students Bought: <<textbox "$TFS.studentsBought" $TFS.studentsBought>> <br>TFS Upgrades: ''$TFS.schoolUpgrade'' | diff --git a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw index b690d76c6fcde45f489dbb7bcb9b08f4d8034378..8019426b6069562e9365ceed2eae66607d9bd6fc 100644 --- a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw @@ -21,6 +21,9 @@ <<set $TGA.studentsBought = Number($TGA.studentsBought) || 0>> <<set $TGA.schoolProsperity = Number($TGA.schoolProsperity) || 0>> +<<set $TCR.studentsBought = Number($TCR.studentsBought) || 0>> +<<set $TCR.schoolProsperity = Number($TCR.schoolProsperity) || 0>> + <<set $TFS.studentsBought = Number($TFS.studentsBought) || 0>> <<set $TFS.schoolProsperity = Number($TFS.schoolProsperity) || 0>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 6089be042244bf06648b3f0fc55cf5025f642986..d863030650d291ac82a2ebabc9dee04fa21aff9e 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -700,6 +700,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $SCP = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <<set $LDE = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <<set $TGA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> +<<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <<set $TFS = {farmUpgrade: 0, schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <<set $futaAddiction = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b2536ff44976418e8dd34113d8536f71e214206b..02d3fe40fe8df72182c87e50d0b03e9f60589df4 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -308,6 +308,10 @@ <<set $arcologies[0].FSPhysicalIdealistLaw = 0>> <</if>> +<<if ndef $TCR>> + <<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> +<</if>> + <<if ndef $FSPromenade>> <<set $FSPromenade = {Subjugationist: 0, Supremacist: 0, GenderRadicalist: 0, GenderFundamentalist: 0, Paternalist: 0, Degradationist: 0, BodyPurist: 0, TransformationFetishist: 0, YouthPreferentialist: 0, MaturityPreferentialist: 0, SlimnessEnthusiast: 0, AssetExpansionist: 0, Pastoralist: 0, PhysicalIdealist: 0, ChattelReligionist: 0, RomanRevivalist: 0, AztecRevivalist: 0, EgyptianRevivalist: 0, EdoRevivalist: 0, ArabianRevivalist: 0, ChineseRevivalist: 0, Repopulationist: 0, Eugenics: 0, HedonisticDecadence: 0}>> <</if>> diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw index c8a46c9e444813e33690975d799d4d5ce0f46dee..d835e0dd58a9f14bd67a274a705bab9d16f4fadb 100644 --- a/src/uncategorized/recETS.tw +++ b/src/uncategorized/recETS.tw @@ -483,7 +483,7 @@ The other blurts out. "But we kinda got too into each other, in more ways than o <<set $activeSlave.ovaries = 1>> <<set $activeSlave.birthsTotal = 5>> <<set $activeSlave.face = 15>> -<<set $activeSlave.anus = 4>> +<<set $activeSlave.vagina = 4>> <<set $activeSlave.vaginalSkill = 45>> <<set $activeSlave.whoreSkill = 20>> <<set $activeSlave.analSkill = 10>> @@ -501,9 +501,6 @@ The other blurts out. "But we kinda got too into each other, in more ways than o <<set $activeSlave.vaginaLube = 1>> <<set $activeSlave.butt += 3>> <<set $activeSlave.tired = 1>> -<<set $activeSlave.fetish = "pregnancy">> -<<set $activeSlave.fetishStrength = 100>> -<<set $activeSlave.sexualFlaw = "breeder">> <<set $activeSlave.sexualQuirk = "caring">> <<set $activeSlave.bellySag = 20>> <<set $activeSlave.bellySagPreg = 20>> diff --git a/src/uncategorized/resMove.tw b/src/uncategorized/resMove.tw index 2f3ed43c3e946acd9c8bc4bb802843bf0546ff30..b6d8a4492d93819df33e3590de5bb09a8219f48d 100644 --- a/src/uncategorized/resMove.tw +++ b/src/uncategorized/resMove.tw @@ -146,7 +146,7 @@ as you suspected, <<case "incubus">> those amazing breasts; I can't wait to wrap them around my dick!" She exclaims, her hard-on twitching with anticipation. <<case "succubus">> - those saggy tits and fat asses, then compare them to MINE." She states, pushing out her perfectly perking M-cup bust before twirling around to show off her enormous, toned ass. + those saggy tits and fat asses, then compare them to MINE." She states, pushing out her perfectly perky M-cup bust before twirling around to show off her enormous, toned ass. <<case "imp">> those heavy tits," her avatar says, "I just want to tease them all day long!" <<case "witch">> @@ -263,7 +263,7 @@ as you suspected, <<case "witch">> <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "If you aren't careful with magic you can end up like that... Not that I have before!" She shouts, turning red. <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">> - <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses, its hips aand crotch splitting open to allow a massive phallic ovject to sag to the ground, "We are similar." + <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses, its hips and crotch splitting open to allow a massive phallic object to sag to the ground, "We are similar." <<case "schoolgirl">> <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They kind of make me want a cock." <<default>> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 5d7d76c976c86390e0992a87899fff331d586d6a..96d54954087bbfb83a3f2fd521ec7adf1eeccb59 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -371,12 +371,12 @@ <<continue>> <</if>> - <<if ($headGirlTrainsFlaws == 1 && _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia))>> + <<if ($headGirlTrainsFlaws == 1 && ((_Slave.behavioralFlaw != "none") || (_Slave.sexualFlaw != "none" && !_hasParaphilia)))>> <<set _HGPossibleSlaves[2].push({ID: _Slave.ID, training: "flaw"})>> <<continue>> <</if>> - <<if ($headGirlTrainsFlaws == 2 && _Slave.devotion > 20 && _Slave.behavioralFlaw != "none" || (_Slave.sexualFlaw != "none" && !_hasParaphilia))>> + <<if ($headGirlTrainsFlaws == 2 && _Slave.devotion > 20 && ((_Slave.behavioralFlaw != "none") || (_Slave.sexualFlaw != "none" && !_hasParaphilia)))>> <<if ((_Slave.behavioralFlaw != "none" && _Slave.behavioralQuirk == "none") || (_Slave.sexualFlaw != "none" && _Slave.sexualQuirk == "none"))>> <<set _HGPossibleSlaves[3].push({ID: _Slave.ID, training: "soften"})>> <<else>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 4c41e9ff2de538bd47b413472a5834f17d0265e2..5c40a49eac5af486bc40640f2f64b98e8c75503c 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -1019,6 +1019,11 @@ <<elseif $TGA.schoolPresent == 1>> <<set $schoolsPresent.push("The Gymnasium-Academy")>> <</if>> +<<if $TCR.schoolProsperity >= 10>> + <<set $schoolsPerfected.push("The Cattle Ranch")>> +<<elseif $TCR.schoolPresent == 1>> + <<set $schoolsPresent.push("The Cattle Ranch")>> +<</if>> <<if $schoolsPerfected.length > 0>> <<if $PC.title == 1>> <<set $schoolTitle = "Benefactor of ">>