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

Fix custom slaves

See merge request pregmodfan/fc-pregmod!5631

src/init/storyInit.tw

@@ -1365,7 +1365,7 @@ You should have received a copy of the GNU General Public License along with thi
 <<set $weatherToday = $niceWeather.random()>>
 
 <<set $customSlaveOrdered = 0>>
-<<set $customSlave = {age: 19, health: {}, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", leg: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, arm: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, eye: new App.Entity.EyeState(), hears: 0}>>
+<<set $customSlave = {age: 19, health: 1, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: "left natural", boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, skill: {whore: 15, combat: 0}, intelligence: 0, intelligenceImplant: 0, nationality: "Stateless", leg: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, arm: {left: new App.Entity.LimbState(), right: new App.Entity.LimbState()}, eye: new App.Entity.EyeState(), hears: 0}>>
 
 <<set $huskSlaveOrdered = 0>>
 <<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>

src/uncategorized/customSlave.tw

@@ -266,26 +266,19 @@
 <br>
 
 <span id = "health">
-<<if $customSlave.health.condition == 0>>Healthy.
+<<if $customSlave.health == 0>>Healthy.
 <<else>>Extremely healthy.
 <</if>>
 </span>
 <<link "Healthy">>
-	<<set $customSlave.health.condition = 0>>
-	<<set $customSlave.health.health = $customSlave.health.condition>>
+	<<set $customSlave.health = 0>>
 	<<CustomSlaveHealth>>
 <</link>>
 |
 <<link "Extremely healthy">>
-	<<set $customSlave.health.condition = 80>>
-	<<set $customSlave.health.health = $customSlave.health.condition>>
+	<<set $customSlave.health = 1>>
 	<<CustomSlaveHealth>>
 <</link>>
-<<set $customSlave.health.shortDamage = 0>>
-<<set $customSlave.health.longDamage = 0>>
-<<set $customSlave.health.illness = 0>>
-<<set $customSlave.health.tired = 0>>
-<<set $customSlave.health.health = $customSlave.health.condition>>
 
 <br>
 

src/uncategorized/seCustomSlaveDelivery.tw

@@ -176,7 +176,7 @@
 <<else>>
 	<<set $activeSlave.voice = random(0,3)>>
 <</if>>
-<<run setHealth($activeSlave, $customSlave.health.condition, $customSlave.health.shortDamage, $customSlave.health.longDamage, $customSlave.health.illness, $customSlave.health.tired)>>
+<<run setHealth($activeSlave, $customSlave.health * 80, 0, 0, 0, 0)>>
 <<set $activeSlave.muscles = $customSlave.muscles>>
 <<set $activeSlave.weight = $customSlave.weight>>
 <<set $activeSlave.face = $customSlave.face>>