From ea1dd3641aecbdbae9213466ff7eba035389d567 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 29 Aug 2018 14:22:45 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +++++
src/npc/databases/dSlavesDatabase.tw | 2 +-
src/npc/databases/dfSlavesDatabase.tw | 2 +-
src/pregmod/theBlackMarket.tw | 4 ++--
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/newGamePlus.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 16 ++++++++++++++--
7 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index b5c31f2b578..47ed9aa8a9d 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.1-0.7.x
+8/29/2018
+
+ 8
+ -fixes
+
8/28/2018
7
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 1a27ee325a7..2dd0d12b673 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -145,7 +145,7 @@
/*Tweaked face upwards, changed eye color, changed health from 20 to 6 -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, she quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.pubicHColor = "black", _HS.skin = "white", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.hStyle = "long", _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her breasts are tattooed with her implant history, showing repeated additions.", _HS.sexualFlaw = "crude">
+<<set _HS.slaveName = "Belle", _HS.birthName = "Belle", _HS.origin = "Formerly used solely for titfucking, she quickly became a nymphomaniac after experiencing 'proper' sex.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 20, _HS.devotion = -75, _HS.height = 155, _HS.race = "white", _HS.pubicHColor = "black", _HS.skin = "white", _HS.eyeColor = "blue", _HS.hColor = "black", _HS.hStyle = "long", _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.butt = 4, _HS.buttImplant = 3, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.anusTat = "tribal patterns", _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.intelligence = -1, _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "odd", _HS.customTat = "Her breasts are tattooed with her implant history, showing repeated additions.", _HS.sexualFlaw = "crude">>
<<set $heroSlaves.push(_HS)>>
/*rapey implant addict*/
/*Is 'rapey' a quirk? Guess so. Added odd. Changed eye color, added nympho, added origin. -BoneyM*/
diff --git a/src/npc/databases/dfSlavesDatabase.tw b/src/npc/databases/dfSlavesDatabase.tw
index fa05685ec57..6caf2662cf9 100644
--- a/src/npc/databases/dfSlavesDatabase.tw
+++ b/src/npc/databases/dfSlavesDatabase.tw
@@ -37,7 +37,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Apple", _HS.birthName = "Apple", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 20, _HS.eyeColor = "dark brown", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 55, _HS.lipsTat = "permanent makeup", _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Cored apples are tattooed on her buttocks and on her face.", _HS.intelligence = -2, _HS.clitPiercing = 2">>
+<<set _HS.slaveName = "Apple", _HS.birthName = "Apple", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.ovaryAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 20, _HS.eyeColor = "dark brown", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 55, _HS.lipsTat = "permanent makeup", _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 35, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Cored apples are tattooed on her buttocks and on her face.", _HS.intelligence = -2, _HS.clitPiercing = 2>>
/*vibe nips, stupid, sensitive, no masturb implant*/
<<set $heroSlaves.push(_HS)>>
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 400fc12cc62..9c22b6fdd07 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -157,9 +157,9 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<dd>
<<if $minimumSlaveAge > 8>>
Illegal information for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
- "I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws had a lower minimum age for slaves, I could sell this to anyone interested."
+ "I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked it up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws had a lower minimum age for slaves, I could sell this to anyone interested."
While the minimum slave age is greater than 8, you cannot purchase this illegal technology for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
- He notices your interest and lets you read the information [[Childhood Fertility @@.orange;Induced NCS@@|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
+ He notices your interest and lets you read the information [[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]].
<<else>>
<<if $arcologies[0].FSYouthPreferentialist > 0>>
<<set _match = "Knowing your arcology, I think you could be happy with the results!">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 235d8a3cce7..011a238c802 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5219,7 +5219,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look.
<</if>>
down onto the stiff rod with a moan, drawing back up almost immediately and starting an intense
<<if canDoVaginal($activeSlave)>>
- <<if $activeSlave.vagina == 0)>>
+ <<if $activeSlave.vagina == 0>>
pace, despite having been a @@.lime;virgin@@ moments before.
<<else>>
pace.
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 568ae43112b..fbb2f8cd051 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -47,7 +47,7 @@ You <<if $cash >= _fee>>have<<else>>lack<</if>> the funds to bring more than $s
<br><br>
-<<if $cheatMode == 1>> <<link "DEBUG: Add all slaves to import list" "New Game Plus">> <<for _ngi = 0; _ngi < $slaves.length; _ngi++>> <<= assignJob($slaves[_ngi], "be imported")>> <</link>> <br> <</if>>
+<<if $cheatMode == 1>> <<link "DEBUG: Add all slaves to import list" "New Game Plus">> <<for _ngi = 0; _ngi < $slaves.length; _ngi++>> <<= assignJob($slaves[_ngi], "be imported")>> <</for>> <</link>> <br> <</if>>
Select up to $slavesToImportMax slaves to be imported into a new game and then click [[here.|init][$saveImported = 1,$oldCareer = "undefined",$slavesToImport = 0]]
<<if $slavesToImport > 0>> <br><br>''
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 1f7d488ba71..07761352b52 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -106,6 +106,12 @@
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<</if>>
+<<set $activeSlave.origRace = $activeSlave.race>>
+<<set $activeSlave.origSkin = $activeSlave.skin>>
+<<set $activeSlave.origEye = $activeSlave.eyeColor>>
+<<set $activeSlave.origHColor = $activeSlave.hColor>>
+<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
+<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
<<set $activeSlave.origin = "She was captured and enslaved in a conflict zone and fenced to you by a mercenary group.">>
<<set $activeSlave.devotion -= 40>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -152,6 +158,12 @@
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<</if>>
+<<set $activeSlave.origRace = $activeSlave.race>>
+<<set $activeSlave.origSkin = $activeSlave.skin>>
+<<set $activeSlave.origEye = $activeSlave.eyeColor>>
+<<set $activeSlave.origHColor = $activeSlave.hColor>>
+<<set $activeSlave.pubicHColor = $activeSlave.hColor>>
+<<set $activeSlave.underArmHColor = $activeSlave.hColor>>
<<set $activeSlave.origin = "She made the mistake of marrying into a $arcologies[0].FSSupremacistRace neighborhood and was kidnapped then sold to you.">>
<<set $activeSlave.devotion -= 40>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -164,9 +176,9 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
+<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was beaten, sexually assaulted, and finally enslaved for being stupid enough to visit an arcology that doesn't like her kind.">>
-<<set $activeSlave.race = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave.health = random(-80,-60)>>
<<set $activeSlave.trust = random(-45,-25)>>
<<set $activeSlave.devotion = random(-75,-65)>>
@@ -179,9 +191,9 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
+<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She came to your arcology to be enslaved out of a sense of self-loathing for her kind.">>
-<<set $activeSlave.race = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave.health = random(-80,-60)>>
<<set $activeSlave.trust = random(-25,-15)>>
<<set $activeSlave.devotion = random(-45,-25)>>
--
GitLab