From b58c760ed9ca03f6ac7f0fac71e9fbc341d93969 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 4 Aug 2017 00:27:07 -0400
Subject: [PATCH] Fixes and vanilla

---
 src/npc/databases/ddSlavesDatabase.tw  | 5 +++++
 src/uncategorized/pRivalryActions.tw   | 4 ++--
 src/uncategorized/randomEventSelect.tw | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 72d3fb2c091..c3a104b7a01 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -179,6 +179,11 @@
 <<set _HS.slaveName = "'Udders' Erika", _HS.birthName = "Erika", _HS.genes = "XY", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.health = -10, _HS.devotion = 55, _HS.height = 145, _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.boobs = 1250, _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.butt = 2, _HS.buttTat = "bovine patterns", _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsTat = "bovine patterns", _HS.vagina = -1, _HS.vaginaTat = "bovine patterns", _HS.preg = -3, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.dick = 1, _HS.dickTat = "bovine patterns", _HS.prostate = 1, _HS.anusTat = "bovine patterns", _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 100, _HS.analSkill = 100, _HS.entertainSkill = 35, _HS.collar = "leather with cowbell", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customDesc = "Though her vocal cords have been altered to keep her from speaking, she is still capable of the occasional moo.">>
 <<set $heroSlaves.push(_HS)>>
 
+<<set _HS = {}>>
+<<set _HS.slaveName = "Danny 'The D'", _HS.slaveSurname = "Ildoe", _HS.birthName = "Danny 'The D'", _HS.birthSurname = "Ildoe", _HS.origin = "Born without limbs and abandoned by her parents, she was taken in by a posh family, given a massive cock and trained to be the wealthy lady's perfect living sex toy.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.visualAge = 28, _HS.physicalAge = 28, _HS.health = 100, _HS.amp = 1, _HS.devotion = 100, _HS.muscles = 50, _HS.height = 94, _HS.eyeColor = "blue", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.waist = 55, _HS.boobs = 50, _HS.hips = -1, _HS.butt = 0, _HS.face = 45, _HS.vagina = -1, _HS.preg = 0, _HS.dick = 6, _HS.balls = 10, _HS.scrotum = 7, _HS.prostate = 2, _HS.anusTat = "bleached", _HS.energy = 95, _HS.intelligenceImplant = 1, _HS.attrXX = 100, _HS.attrXY = 0, _HS.oralSkill = 95, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.behavioralQuirk = "advocate">>
+<<set $heroSlaves.push(_HS)>>
+/* needed an amputated slave for debug reasons -prndev */
+
 <</if>>
 
 /*
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index ab388e9f1c5..ab5ab7b17f2 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -7,9 +7,9 @@
 /* 000-250-006 */
 <<if $seeImages == 1>>
 <<if $imageChoice == 1>>
-    <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+    <div class="imageRef lrgVector"><<SlaveArt $hostage 2 0>></div>
 <<else>>
-    <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+    <div class="imageRef lrgRender"><<SlaveArt $hostage 2 0>></div>
 <</if>>
 <</if>>
 /* 000-250-006 */
diff --git a/src/uncategorized/randomEventSelect.tw b/src/uncategorized/randomEventSelect.tw
index 4a318d56ea1..49d648e5960 100644
--- a/src/uncategorized/randomEventSelect.tw
+++ b/src/uncategorized/randomEventSelect.tw
@@ -12,8 +12,13 @@
 <</if>>
 
 ''A random event would have been selected from the following:''
+<<set $RESSeventIndex = 0>>
 <<for $i = 0; $i < $events.length; $i++>>
 	<br>[[$events[$i]]]
+	<<if $events[$i] == "RESS">>
+	&ndash; $RESSevent[$RESSeventIndex]
+	<<set $RESSeventIndex += 1>>
+	<</if>>
 <</for>>
 <br><br>
 //RESS is an amalgamated Random Event, Single Slave that combines existing single slave random events//
-- 
GitLab