From a1dd2dbf26484910b44e1f5ea60073870badd88b Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 11 Mar 2020 23:40:05 -0700
Subject: [PATCH] Fix a couple places where we set actualAge after generating a
slave to instead generate a slave *of* the appropriate age.
---
src/uncategorized/RESS.tw | 7 +++----
src/uncategorized/reFSEgyptianRevivalistAcquisition.tw | 6 ++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index aaa776a8397..5abb099e451 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -97,6 +97,9 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $fixedNationality = "American">>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<set $activeSlaveOneTimeMinAge = 16>>
+ <<set $activeSlaveOneTimeMaxAge = 19>>
<<set _meanGirl = GenerateNewSlave("XX")>>
<<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + getPronouns($eventSlave).pronoun + " was serving the public.">>
<<set _meanGirl.career = "a student">>
@@ -114,10 +117,6 @@
<<set _meanGirl.vagina = random(1,2)>>
<<set _meanGirl.anus = 1>>
<<set _meanGirl.face = random(20,60)>>
- <<set _meanGirl.actualAge = random(18,19)>>
- <<set _meanGirl.visualAge = _meanGirl.actualAge>>
- <<set _meanGirl.physicalAge = _meanGirl.actualAge>>
- <<set _meanGirl.ovaryAge = _meanGirl.actualAge>>
<<run setHealth(_meanGirl, jsRandom(30, 50), 0, 0, 0)>>
<<set _meanGirl.attrXY = random(60,90)>>
<<set _meanGirl.attrXX = random(10,20)>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index c361166f0e2..4d3ac01239d 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -7,14 +7,12 @@
<<set _contractCost = 3000>>
<<set $oneTimeDisableDisability = 1>>
+<<set $activeSlaveOneTimeMinAge = Math.max(16, $minimumSlaveAge + 3)>>
+<<set $activeSlaveOneTimeMaxAge = 29>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling.">>
<<set $activeSlave.devotion = random(5,15)>>
<<set $activeSlave.trust = random(-15,-5)>>
-<<set $activeSlave.actualAge = random(21,29)>>
-<<set $activeSlave.visualAge = $activeSlave.actualAge>>
-<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
-<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<run setHealth($activeSlave, jsRandom(-20, 0))>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<if $familyTesting == 1>>
--
GitLab