From 32914c79f2ab6df4cddc6950bf11e5c4c47843fd Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 17 Jun 2018 19:39:00 -0400
Subject: [PATCH] Recovery point before breaking everything.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +
src/pregmod/eliteSlave.tw | 213 +++++++++++++++++++
src/pregmod/seFCTVshows.tw | 2 +-
src/uncategorized/arcadeReport.tw | 4 +-
src/uncategorized/buySlaves.tw | 4 +
src/uncategorized/newSlaveIntro.tw | 11 +-
src/uncategorized/nextWeek.tw | 2 +-
7 files changed, 237 insertions(+), 6 deletions(-)
create mode 100644 src/pregmod/eliteSlave.tw
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 5991ec3eb46..2e0eefb44a1 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.3.x
+6/17/2018
+
+ 23
+ -typos fixed
+ -careless enactment of certain Subjugationist laws may now have consequences
+ -fixes
+
6/16/2018
22
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
new file mode 100644
index 00000000000..b5353827942
--- /dev/null
+++ b/src/pregmod/eliteSlave.tw
@@ -0,0 +1,213 @@
+:: Elite Slave[nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves">>
+<<set $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
+
+You check to see if any potential breeding slaves are on auction. <<if $eliteAuctioned == 1>>There are none available right now, but there probably will be next week.<<else>>
+
+<<set $eliteAuctioned = 1>>
+
+<<if $arcologies[0].FSMaturityPreferentialist > 20>>
+ <<set $activeSlaveOneTimeMinAge = 25>>
+<<else>>
+ <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+<</if>>
+<<if $arcologies[0].FSYouthPreferentialist > 20>>
+ <<set $activeSlaveOneTimeMaxAge = 23>>
+<<else>>
+ <<set $activeSlaveOneTimeMaxAge = 40>>
+<</if>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<if $arcologies[0].FSSupremacist > 20>>
+ <<set $fixedNationality = $arcologies[0].FSSupremacistRace>>
+<</if>>
+<<include "Generate XX Slave">>
+<<set $activeSlave.origin = "She was purchased from a member of the Elite.">>
+<<set $activeSlave.career = "a slave">>
+<<set $activeSlave.prestige = 1>>
+<<set $activeSlave.trust = random(60,100)>>
+<<set $activeSlave.devotion = random(60,100)>>
+<<if $arcologies[0].FSPaternalist > 20>>
+ <<set $activeSlave.health = 100>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+<<else>>
+ <<set $activeSlave.health = random(10,60)>>
+ <<set $activeSlave.intelligenceImplant = random(0,1,1)>>
+<</if>>
+<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ <<if $arcologies[0].FSHedonisticDecadence > 20 || $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<set _weightMax = 30>>
+ <<else>>
+ <<set _weightMax = 0>>
+ <</if>>
+<<elseif $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<set _weightMax = 30>>
+<<else>>
+ <<set _weightMax = 100>>
+<</if>>
+<<if $arcologies[0].FSHedonisticDecadence > 20>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ <<set _weightMin = 10>>
+ <<else>>
+ <<set _weightMin = 95>>
+ <</if>>
+<<else>>
+ <<set _weightMin = -70>>
+<</if>>
+<<set $activeSlave.weight = random(_weightMin, _weightMax)>>
+<<if $arcologies[0].FSPhysicalIdealist > 20>>
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<set _musclesMin = 20>>
+ <<set _musclesMax = 50>>
+ <<else>>
+ <<set _musclesMin = 95>>
+ <<set _musclesMax = 100>>
+ <</if>>
+<<elseif $arcologies[0].FSHedonisticDecadence > 20>>
+ <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>
+ <<set _musclesMin = 50>>
+ <<set _musclesMax = 100>>
+ <<else>>
+ <<set _musclesMin = -100>>
+ <<set _musclesMax = 50>>
+ <</if>>
+<<else>>
+ <<set _musclesMin = -50>>
+ <<set _musclesMax = 50>>
+<</if>>
+<<set $activeSlave.muscles = random(_musclesMin, _musclesMax)>>
+<<if $arcologies[0].FSPhysicalIdealist > 20>>
+ <<set $activeSlave.height += 5>>
+<</if>>
+<<set $activeSlave.eyes = 1>>
+<<if ($activeSlave.weight < -30)>>
+ <<set $activeSlave.waist = random(-55,0)>>
+<<elseif $activeSlave.physicalAge < 13>>
+ <<set $activeSlave.waist = random(-25,25)>>
+<<elseif ($activeSlave.weight <= 30)>>
+ <<set $activeSlave.waist = random(-45,5)>>
+<<elseif ($activeSlave.weight <= 160)>>
+ <<set $activeSlave.waist = random(-20,10)>>
+<</if>>
+<<if $activeSlave.voice < 2>>
+ <<set $activeSlave.voice++>>
+<</if>>
+<<if $activeSlave.accent > 1>>
+ <<set $activeSlave.accent = 1>>
+<</if>>
+<<if $activeSlave.shoulders > 0>>
+ <<set $activeSlave.shoulders -= 2>>
+<</if>>
+<<if $arcologies[0].FSAssetExpansionist > 20>>
+ <<set $activeSlave.boobs = (random(50,500) * 100)>>
+ <<set $activeSlave.butt = random(6,20)>>
+ <<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+ <<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+ <</if>>
+<<elseif $arcologies[0].FSSlimnessEnthusiast > 20>>
+ <<set $activeSlave.boobs = (random(3,5) * 100)>>
+ <<set $activeSlave.butt = random(0,2)>>
+ <<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<set $activeSlave.boobsImplant = $activeSlave.boobs-50>>
+ <<if $activeSlave.butt > 1>>
+ <<set $activeSlave.buttImplant = 1>>
+ <</if>>
+ <</if>>
+<<else>>
+ <<set $activeSlave.boobs = (random(5,10) * 100)>>
+ <<set $activeSlave.butt = random(3,7)>>
+ <<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<set $activeSlave.boobsImplant = $activeSlave.boobs-200>>
+ <<set $activeSlave.buttImplant = $activeSlave.butt-1>>
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<set $activeSlave.boobShape = "normal">>
+<<else>>
+ <<set $activeSlave.boobShape = either("perky", "perky", "torpedo-shaped", "wide-set")>>
+<</if>>
+<<if $activeSlave.nipples == "tiny">>
+ <<set $activeSlave.nipples = "puffy">>
+<</if>>
+<<set $activeSlave.face = 100>>
+<<set $activeSlave.faceShape = either("cute", "cute", "sensual", "sensual", "sensual", "normal", "normal", "exotic", "exotic")>>
+<<set $activeSlave.lips = random(45,75)>>
+<<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<set $activeSlave.lips += 25>>
+ <<set $activeSlave.lipsImplant = 25>>
+<</if>>
+<<if $activeSlave.teeth != "normal">>
+ <<set $activeSlave.teeth = "normal">>
+<</if>>
+<<if $activeSlave.vaginaLube == 0>>
+ <<set $activeSlave.vaginaLube++>>
+<</if>>
+<<set $activeSlave.preg = 0>>
+<<set $activeSlave.birthsTotal = either(0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,4)>>
+<<if $arcologies[0].FSPastoralist > 20 || $activeSlave.birthsTotal > 0>>
+ <<set $activeSlave.lactation = 1>>
+ <<if $arcologies[0].FSPastoralist > 20>>
+ <<set $activeSlave.lactationAdaptation = $arcologies[0].FSPastoralist>>
+ <<else>>
+ <<set $activeSlave.lactationAdaptation = Math.min($activeSlave.birthsTotal*10, 100)>>
+ <</if>>
+<<else>>
+ <<set $activeSlave.lactation = either(0, 0, 0 , 0, 1)>>
+<</if>>
+<<if $activeSlave.birthsTotal > 0>>
+ <<set $activeSlave.vagina = random(2,3)>>
+ <<set $activeSlave.pregWeek = either(-4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)>>
+<<else>>
+ <<set $activeSlave.vagina = random(0,3)>>
+ <<set $activeSlave.pregWeek = 0>>
+<</if>>
+<<if $activeSlave.hips <= 0>>
+ <<set $activeSlave.hips = 1>>
+<</if>>
+<<if $arcologies[0].FSGenderRadicalist > 20>>
+ <<set $activeSlave.dick = random(2,5)>>
+ <<set $activeSlave.balls = random(2,10)>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<set $activeSlave.prostate = random(1,3)>>
+<</if>>
+<<set $activeSlave.makeup = 2>>
+<<set $activeSlave.nails = 1>>
+<<if $activeSlave.vagina == 0>>
+ <<set $activeSlave.vaginalSkill = 30>>
+<<else>>
+ <<set $activeSlave.vaginalSkill = 100>>
+<</if>>
+<<if $activeSlave.anus == 0>>
+ <<set $activeSlave.analSkill = 10>>
+<<else>>
+ <<set $activeSlave.analSkill = 70>>
+<</if>>
+<<set $activeSlave.oralSkill = 100>>
+<<set $activeSlave.vaginalAccessory = "chastity belt">>
+<<set $activeSlave.intelligence = either(2,2,2,2,2,2,2,3)>>
+<<set $activeSlave.attrKnown = 1>>
+<<set $activeSlave.fetishKnown = 1>>
+<<set $activeSlave.behavioralQuirk = "confident">>
+<<set $activeSlave.SexualQuirk = either("gagfuck queen", "strugglefuck queen", "tease", "romantic", "romantic", "perverted", "caring", "caring", "unflinching")>>
+<<set $activeSlave.pubertyXX = 1>>
+<<set $activeSlave.breedingMark = 1>>
+
+<<slaveCost $activeSlave>>
+
+<br><br>
+
+It will take <<print cashFormat($slaveCost)>> to win the auction.
+
+<br><br>
+<<if $cash >= $slaveCost>>
+ [[Place that bid|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+<<else>>
+ //You lack the necessary funds to place a winning bid.//
+<</if>>
+
+<br><br>
+
+<<set $saleDescription = 1>><<include "Long Slave Description">>
+
+<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 589a0b18b20..4d9b4110558 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -602,7 +602,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
<<elseif $Concubine.boobs > 2000>>
$Concubine.slaveName massages her big breasts. <<if canTalk($Concubine)>>"I doubt it will work, but if you're looking for an excu<<s>>e, you don't need one!"<<else>>She scoffs at the commercial and clearly expresses her doubt before puffing out her chest at you.<</if>> She leans into you so her bust flops into your lap.
<<else>>
- $Concubine.slaveName cups her breasts. <<if canTalk($Concubine)>>"What a joke. I <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>She scoffs with doubt before proudly sticking out her chest.<</if>> She bounces her tits for you. You'll have to agree with her; not a bit of sag to them.
+ $Concubine.slaveName cups her breasts. <<if canTalk($Concubine)>>"What a joke. I'm <<s>>ure it doe<<s>>n't work, plu<<s>> don't you think they are lovely enough already, <<Master>>?"<<else>>She scoffs with doubt before proudly sticking out her chest.<</if>> She bounces her tits for you. You'll have to agree with her; not a bit of sag to them.
<</if>>
<<if $PC.boobsBonus > 2 && $PC.boobsImplant == 0>>
She slides closer to you, wraps an arm around your back and grabs your huge breasts. <<if canTalk($Concubine)>>"Oh <<Master>>! It feel<<s>> like YOU might need it!" She jiggles your boobs in her hands.<<else>>She jiggles your huge boobs in her hands. She's calling you saggy!<</if>> You take that as an open invitation and throw the covers over the two of you so you can have a little fun before bed.
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index a52a425ba36..e9ea3a90660 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -132,19 +132,19 @@
<</if>>
<<if $showEWD != 0>>
<br>
- <<include "SA drugs">>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
+ <<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<include "SA drugs">>
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
+ <<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 256348e5ec6..11536381a54 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -231,6 +231,10 @@ __Sex Slave Purchase Options__
<br>[[Attend an auction of a prestigious slave|Prestigious Slave]] | //Variable and expensive.//
<</if>>
+<<if ($propOutcome == 1)>>
+ <br>[[Attend an auction of other Elite's stock|Elite Slave]] | //Limited and very expensive.//
+<</if>>
+
<<if ($rep > 17000)>>
<br>[[Acquire other slaveowners' stock|Special Slave]] | //Variable and expensive.//
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 9a3da198f21..0558d5cf957 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -520,6 +520,12 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<</if>>
<</if>>
+<<if $activeSlave.breedingMark == 1>>
+ She knows her duty in life and playfully splays herself across your desk with her legs spread wide. Unfortunately, she must first be unwrapped before any breeding can begin, so for the time being, she rights herself and makes her way to your crotch to show you just how much she was worth the ¤.
+ <<set $activeSlave.oralCount++, $oralTotal++>>
+
+<<else>>
+
<<if $rulesAssistantAuto == 0>>
<br>
<span id="rules">
@@ -933,7 +939,6 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<br>
<</switch>>
-
<br>//Have her changed...//
<<if $activeSlave.health < -20>>
@@ -1872,4 +1877,6 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
</span>
-<<set $PC.slaving += .1, $PC.trading += .1>>
+<</if>>
+
+<<set $PC.trading += .1>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 96d9bb8e451..876ed4f8404 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -248,7 +248,7 @@
<<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
-<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
+<<set $coursed = 0, $eventDescription = 0, $pitFought = 0, $preOwnedViewed = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $repGain = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
--
GitLab