Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1003-105

See merge request !174

slave variables documentation - Pregmod.txt

@@ -2257,13 +2257,15 @@ Making your slave; add their name to the following, then go down the documentati
 -if your slave's variable matches the default, you do not have to list it
 -strings MUST be in " or your slave will not compile properly
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "STANDARD", _HS.birthName = "STANDARD", _HS.ID = _i++>>
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-*Potential alternative syntax:
+
+*Potential alternative syntax: *may not work anymore
 <<set _HS = jQuery.extend(clone($activeSlave), {slaveName: "STANDARD", birthName: "STANDARD", ID: _i++})>> 
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
+
 
 Once finished, add it into "customSlavesDatabase".
 To test if your slave is functioning, start up a normal game, swap to cheat mode, max your rep, and view other slave owner's stock in the slave market. If you can not find your slave in the list, and you didn't start the game with your slave, you should double check your slave for errors. If a slave named "Blank" is present, then you likely messed up. Once you find your slave, check their description to make sure it is correct. If it is not, you messed up somewhere in setting them up.

src/events/intro/initNationalities.tw

@@ -65,6 +65,8 @@
 
 <<set $heroSlaves = []>>
 <<BaseSlave>>
+<<set $baseHeroSlave = clone($activeSlave)>>
+
 <<if ($seeDicks > 0) && ($seeDicks < 100)>>
 	<<include "D Slaves Database">>
 	<<include "DD Slaves Database">>
@@ -76,6 +78,7 @@
 	<<include "D Slaves Database">>
 	<<include "DF Slaves Database">>
 <</if>>
+
 <<set $customSlave = clone($activeSlave)>>
 <<set $customSlave.slaveName: "custom", $customSlave.birthName: "custom", $customSlave.skin: 0, $customSlave.boobs = 500>>
 <<set $activeSlave = 0>>

src/js/heroCreator.tw

+:: heroCreator.tw [script]
+
+window.getHeroSlave = function(heroSlave, baseHeroSlave) {
+    console.log("getHeroSlave for", heroSlave)
+    var newSlave = clone(baseHeroSlave);
+    for (var attrname in heroSlave) {
+        newSlave[attrname] = heroSlave[attrname];
+    };
+    console.log("returning ", newSlave);
+    return newSlave;
+
+}

src/npc/acquisition.tw

@@ -437,7 +437,7 @@ The previous owner seems to have left in something of a hurry.
 	<<if _valueOwed - _valueGiven <= 5000>>
 		<<break>>
 	<</if>>
-	<<set $activeSlave = $heroSlaves[$j]>>
+	<<set $activeSlave = getHeroSlave($heroSlaves[$j], $baseHeroSlave)>>
 	<<set $dump = $heroSlaves.pluck($j,$j)>>
 	<<slaveCost $activeSlave>>
 	<<if _valueGiven + $slaveCost < _valueOwed*2>>

src/npc/databases/dfSlavesDatabase.tw

 :: DF Slaves Database
 
 <<set _i = 700000>>
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Cherry", _HS.birthName = "Cherry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 75, _HS.pubicHColor = "black", _HS.skin = "white", _HS.hColor = "black", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Two cherries are tattooed in her right butt cheek and in her left cheek.">>
 	Vag implant, vibe nips
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Strawberry", _HS.birthName = "Strawberry", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 30, _HS.physicalAge = 30, _HS.visualAge = 30, _HS.health = 20, _HS.devotion = 40, _HS.height = 175, _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.buttImplant = 2, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.customTat = "Strawberries are tattooed on her right buttock and on her left cheek.">>
 	vibe nips, muscles
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Melon", _HS.birthName = "Melon", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 20, _HS.devotion = 30, _HS.height = 175, _HS.hColor = "red", _HS.pubicHColor = "red", _HS.skin = "tanned", _HS.hLength = 10, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 1800, _HS.boobsImplant = 800, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.lips = 35, _HS.lipsImplant = 10, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 100, _HS.analSkill = 15, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Watermelons are tattooed on her buttocks and on her face.">>
 	vibe nips, saliva implant
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Carambola", _HS.birthName = "Carambola", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.health = 20, _HS.devotion = 50, _HS.height = 175, _HS.hColor = "dark blonde", _HS.pubicHColor = "dark blonde", _HS.skin = "tanned", _HS.hLength = 60, _HS.hStyle = "curly and long, and in pigtails", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 8, _HS.buttImplant = 4, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 3, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 100, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "Carambolas – starfruits - are tattooed on her buttocks and on her face.">>
 	vibe nips, saliva implant lube
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Banana", _HS.birthName = "Banana", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.health = 20, _HS.devotion = 30, _HS.race = "latina", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 5, _HS.lips = 35, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 100, _HS.analSkill = 35, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Bananas are tattooed on her buttocks and on her face.">>
 	vibe nips, big pusslips+clit
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Green Grape", _HS.birthName = "Green Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 40, _HS.race = "pacific islander", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Green grapes are tattooed on her buttocks and on her face.", _HS.mother = -100000, _HS.father = -100000>>
 	vibe nips, implant link to sister
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Purple Grape", _HS.birthName = "Purple Grape", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.health = 20, _HS.devotion = 40, _HS.race = "pacific islander", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "light brown", _HS.hLength = 60, _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 650, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Purple grapes are tattooed on her buttocks and on her face.", _HS.mother = -100000, _HS.father = -100000>>
 	vibe nips, implant link to sister
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
-<<set _HS = clone($activeSlave)>>
+<<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.health = 20, _HS.devotion = 40, _HS.muscles = 20, _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 = 15, _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.">>
 	vibe nips, stupid, sensitive, no masturb implant
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 
 <<if $seeExtreme == 1>>
-<<set _HS = clone($activeSlave)>>
+<<set _HS = {}>>
 <<set _HS.slaveName = "Plum", _HS.birthName = "Plum", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 28, _HS.physicalAge = 28, _HS.visualAge = 28, _HS.health = 20, _HS.devotion = 75, _HS.muscles = 20, _HS.hColor = "wavy brown", _HS.skin = "pale", _HS.hLength = 20, _HS.hStyle = "short", _HS.pubicHStyle = "waxed", _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.lips = 35, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.preg = -2, _HS.anus = 2, _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.vaginalAccessory = "large dildo", _HS.buttplug = "large plug", _HS.attrXY = 40, _HS.fetish = "mindbroken", _HS.fetishKnown = 1, _HS.customTat = "cored plums are tattooed on her buttocks and on her face.", _HS.customDesc = "She has massive C-clamp piercings in her back that allow her to act as furniture. Truly enormous vagina.">>
 	vibe nips, can act as furniture
-<<set $heroSlaves.push(clone(_HS))>>
+<<set $heroSlaves.push(_HS)>>
 <</if>>

src/uncategorized/completeCatalog.tw

@@ -7,7 +7,7 @@
 
 <<nobr>>
 <<for $i = 0; $i < $heroSlaves.length; $i++>>
-<<print "[[$heroSlaves[$i].slaveName|Complete Catalog][$activeSlave = $heroSlaves[" + $i + "]]]">> |
+<<print "[[$heroSlaves[$i].slaveName|Complete Catalog][$activeSlave = getHeroSlave($heroSlaves[" + $i + "], $baseHeroSlave)]]">> |
 <</for>>
 <</nobr>>
 

src/uncategorized/freeRangeDairyAssignmentScene.tw

@@ -32,9 +32,9 @@ While walking to her designated stall, she passes the other cows currently at th
         <</if>>
     <</if>>
 
-    <<for $i to 0; $i < $slaves.length; $i++>>
-        <<if $slaves[$i].assignment is "work in the dairy" && $slaves[$i].balls > 5 >>
-            <<set $aroused to true >>
+    <<for $i = 0; $i < $slaves.length; $i++>>
+        <<if $slaves[$i].assignment == "work in the dairy" && $slaves[$i].balls > 5 && $activeSlave.ID != $slaves[$i].ID>>
+            <<set $aroused = true >>
             The hyper-endowed cum-cow $slaves[$i].slaveName is the pride of $dairyName. $activeSlave.slaveName stops to watch her for a while. The constant suction on her dick has her panting. She is obviously nearing climax. Soon, her eyes bulge and her muscles tense.
             <<if  $dairyStimulatorsSetting == 1>>
 				<<if $slaves[$i].prostate != 0>>

src/uncategorized/slaveInteract.tw

@@ -498,7 +498,7 @@ __Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSla
 	<<else>>Spa<</if>>
 	<</if>>
 	<<if $clinic != 0>>|
-	<<if $clinic > $clinicSlaves && ($activeSlave.health < 20 || ($Nurse != 0 && ($activeSlave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && $activeSlave.bellyImplant > 100) || ($activeSlave.preg => 1 && ($clinicSpeedGestation >= 0 || $slaves[_i].pregControl == "speed up"))))>>
+	<<if $clinic > $clinicSlaves && ($activeSlave.health < 20 || ($Nurse != 0 && ($activeSlave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && $activeSlave.bellyImplant > 100) || ($activeSlave.preg >= 1 && ($clinicSpeedGestation >= 0 || $slaves[_i].pregControl == "speed up"))))>>
 		[[Clinic|Assign][$slaves[_i] = $activeSlave, $returnTo = "Clinic", $i = _i]]
 	<<else>>Clinic<</if>>
 	<</if>>

src/uncategorized/slaveSummary.tw

@@ -173,7 +173,7 @@
 <<if _Slave.fuckdoll > 0>><<continue>><</if>>
 <<if $Flag == 0>>
 	<<if _Slave.assignment == "get treatment in the clinic">><<continue>><</if>>
-	<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > 100) || (_Slave.preg => 1 && ($clinicSpeedGestation >= 0 || $slaves[_i].pregControl == "speed up")))>>
+	<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > 100) || (_Slave.preg >= 1 && ($clinicSpeedGestation >= 0 || $slaves[_i].pregControl == "speed up")))>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves["+_i+"]]]">>
 	<<else>>
 		<br>//_Slave.slaveName cannot benefit from the clinic//

src/uncategorized/specialSlave.tw

@@ -7,7 +7,7 @@
 \
 You review a piece of merchandise via video call, making a few lewd demands to gauge her obedience. The background of the video feed is luxurious and plush; somewhere offscreen someone is moaning rapturously.
 
-<<set $activeSlave = $heroSlaves.random()>>\
+<<set $activeSlave = getHeroSlave($heroSlaves.random(), $baseHeroSlave)>>\
 <<set $activeSlave.weekAcquired = $week>>\
 <<set $activeSlave.pubicHColor = $activeSlave.hColor>>\
 <<set $activeSlave.pubicHStyle = "waxed">>\