From 169c70f644ee512cb0a69b4e65a934c42a1390af Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 9 May 2017 20:26:00 -0400
Subject: [PATCH] Vanilla pregmod content.
---
slave variables documentation - Pregmod.txt | 12 +++++---
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 12 +++++---
src/uncategorized/salon.tw | 31 +++++++++++++++------
src/utility/descriptionWidgets.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 2 +-
6 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 357a950dfe7..4bc3669b22a 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1363,8 +1363,10 @@ has makeup
2 - expensive, luxurious
3 - color-coordinated with hair
4 - heavy
-11 - metallic
-12 - color-cooridnated metallic
+5 - neon
+6 - color-cooridinated neon
+7 - metallic
+8 - color-coordinated metallic
nails:
@@ -1375,8 +1377,10 @@ nail type
3 - sharp and claw-like
4 - bright and glittery
5 - very long and garish
-11 - metallic
-12 - color-cooridnated metallic
+6 - neon
+7 - color-cooridinated neon
+8 - metallic
+9 - color-coordinated metallic
brand:
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 590b27bf547..5e48c0158df 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -913,7 +913,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''CornCobMan'' contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates.
''Klementine'' wrote the fertility goddess skin for the personal assistant.
''Wahn'' wrote numerous generic recruitment events.
-''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, better descriptive support for different refreshments, work on choosesOwnJob, and an expansion to the hostage corruption event chain.
+''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, and an expansion to the hostage corruption event chain.
''Lolimodder'' your loli expertise will be missed.
''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
''family mod anon'' for extending extended family mode.
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 439dd79f6b9..a6d210d0ed4 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2473,12 +2473,16 @@ Her scars make her look like she's in the right place.
Her nails are sharp and claw-like.
<<elseif $activeSlave.nails == 4>>
Her nails are bright and glittery.
- <<elseif $activeSlave.nails == 11>>
- Her nails are shiny and metallic.
- <<elseif $activeSlave.nails == 12>>
- Her nails are shiny and metallic-<<print $activeSlave.hColor>> to match her $activeSlave.hColor hair.
<<elseif $activeSlave.nails == 5>>
Her nails are long and garish, streetwalker-style.
+ <<elseif $activeSlave.nails == 6>>
+ Her nails are vivid and eye-catching.
+ <<elseif $activeSlave.nails == 7>>
+ Her nails are an eye-catching neon $activeSlave.hColor to match her $activeSlave.hColor hair.
+ <<elseif $activeSlave.nails == 8>>
+ Her nails are shiny and metallic.
+ <<elseif $activeSlave.nails == 9>>
+ Her nails are shiny and metallic-<<print $activeSlave.hColor>> to match her $activeSlave.hColor hair.
<</if>>
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 1f28e09873e..94d53200eb4 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -105,9 +105,13 @@ $activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your
$possessiveCap makeup is color-coordinated with $possessive $activeSlave.hColor hair.
<<elseif $activeSlave.makeup == 4>>
$pronounCap's wearing stereotypical, garish streetwalker makeup.
-<<elseif $activeSlave.makeup == 11>>
+<<elseif $activeSlave.makeup == 5>>
+ $pronounCap's wearing eye-catching neon makeup.
+<<elseif $activeSlave.makeup == 6>>
+ $possessiveCap neon makeup is color-coordinated with $possessive $activeSlave.hColor hair.
+<<elseif $activeSlave.makeup == 7>>
$pronounCap's wearing expensive, metallic makeup.
-<<elseif $activeSlave.makeup == 12>>
+<<elseif $activeSlave.makeup == 8>>
$possessiveCap metallic makeup is color-coordinated with $possessive $activeSlave.hColor hair.
<<elseif $activeSlave.lipsTat == "permanent makeup">>
$possessiveCap face appears to bear very heavy, slutty makeup, but on closer inspection, the makeup is actually tattooed on.
@@ -121,8 +125,10 @@ $activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your
| [[Nice makeup|Salon][$activeSlave.makeup = 1,$cash -= $modCost]]
| [[Gorgeous makeup|Salon][$activeSlave.makeup = 2,$cash -= $modCost]]
| [[Color-coordinate makeup with hair|Salon][$activeSlave.makeup = 3,$cash -= $modCost]]
-| [[Metallic makeup|Salon][$activeSlave.makeup = 11,$cash -= $modCost]]
-| [[Color-coordinate metallic makeup with hair|Salon][$activeSlave.makeup = 12,$cash -= $modCost]]
+| [[Neon makeup|Salon][$activeSlave.makeup = 5,$cash -= $modCost]]
+| [[Color-coordinate neon makeup with hair|Salon][$activeSlave.makeup = 6,$cash -= $modCost]]
+| [[Metallic makeup|Salon][$activeSlave.makeup = 7,$cash -= $modCost]]
+| [[Color-coordinate metallic makeup with hair|Salon][$activeSlave.makeup = 8,$cash -= $modCost]]
| [[Slutty makeup|Salon][$activeSlave.makeup = 4,$cash -= $modCost]]
@@ -138,12 +144,16 @@ $activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your
$possessiveCap nails are sharp and claw-like.
<<elseif $activeSlave.nails == 4>>
$possessiveCap nails are bright and glittery.
-<<elseif $activeSlave.nails == 11>>
- $possessiveCap nails are shiny and metallic.
-<<elseif $activeSlave.nails == 12>>
- $possessiveCap nails are shiny, mettalic and color-coordinated with $possessive $activeSlave.hColor hair.
<<elseif $activeSlave.nails == 5>>
$possessiveCap nails are long and garish, streetwalker-style.
+<<elseif $activeSlave.nails == 6>>
+ $possessiveCap nails are vivid and eye-catching.
+<<elseif $activeSlave.nails == 7>>
+ $possessiveCap nails are vivid, eye-catching and color-coordinated with $possessive $activeSlave.hColor hair.
+<<elseif $activeSlave.nails == 8>>
+ $possessiveCap nails are shiny and metallic.
+<<elseif $activeSlave.nails == 9>>
+ $possessiveCap nails are shiny, mettalic and color-coordinated with $possessive $activeSlave.hColor hair.
<<else>>
$possessiveCap nails are neatly clipped.
<</if>>
@@ -156,7 +166,10 @@ $activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your
| [[Color-coordinate nails with hair|Salon][$activeSlave.nails = 2,$cash -= $modCost]]
| [[Sharp, claw-like nails|Salon][$activeSlave.nails = 3,$cash -= $modCost]]
| [[Bright, glittery nails|Salon][$activeSlave.nails = 4,$cash -= $modCost]]
-| [[Shiny, metallic nails|Salon][$activeSlave.nails = 11,$cash -= $modCost]]
+| [[Vivid, neon nails|Salon][$activeSlave.nails = 6,$cash -= $modCost]]
+| [[Color-coordinate neon nails with hair|Salon][$activeSlave.nails = 7,$cash -= $modCost]
+| [[Shiny, metallic nails|Salon][$activeSlave.nails = 8,$cash -= $modCost]]
+| [[Color-coordinate metallic nails with hair|Salon][$activeSlave.nails = 9,$cash -= $modCost]
| [[Streetwalker-style nails|Salon][$activeSlave.nails = 5,$cash -= $modCost]]
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 44d3996d71c..aaf912332a1 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -4994,7 +4994,7 @@ $activeSlave.slaveName is
<<if ($activeSlave.amp == 1)>>
without arm or leg holes, so $possessive limbless torso is in a net.
<<else>>
- <<if (($activeSlave.nails == 2) || ($activeSlave.nails == 12)) && (($activeSlave.makeup == 3) || ($activeSlave.makeup == 12))>>
+ <<if (($activeSlave.nails == 2) || ($activeSlave.nails == 7) || ($activeSlave.nails == 9)) && (($activeSlave.makeup == 3) || ($activeSlave.makeup == 6) || ($activeSlave.nails == 8))>>
$activeSlave.hColor to match $possessive monocolor style,
<<elseif ($activeSlave.skin == "dark") || ($activeSlave.skin == "black")>>
in white to create a striking contrast with $possessive $activeSlave.skin skin,
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 96ee6173de5..6306ddd4e40 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -6,7 +6,7 @@
Called from Gen XX, Gen XY, CheatMode DB, InitNationalities.
%/
<<widget "BaseSlave">>
- <<set $activeSlave = {slaveName: "blank", birthName: "blank", 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: "", 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, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, prostateImplant: 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: "", customTitle: "", customTitleLisp: ""}>>
+ <<set $activeSlave = {slaveName: "blank", birthName: "blank", 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: "", 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, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, prostateImplant: 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: ""}>>
<</widget>>
/%
--
GitLab