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

Pregmod v1021-39

See merge request pregmodfan/fc-pregmod!830

src/uncategorized/RESS.tw

@@ -7370,21 +7370,21 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	  You load the injection gun you keep in your desk, and tap it repeatedly against the cooperative slave's
-	  <<if $seed == "boobs">>
+	  <<if _injection == "boobs">>
 		tits,
-	  <<elseif $seed == "butt">>
+	  <<elseif _injection == "butt">>
 		rear end,
-	  <<elseif $seed == "lips">>
+	  <<elseif _injection == "lips">>
 		lips,
-	  <<elseif $seed == "dick">>
+	  <<elseif _injection == "dick">>
 		cock,
-	  <<elseif $seed == "dickMinus">>
+	  <<elseif _injection == "dickMinus">>
 		girly dick,
 	  <</if>>
 	  producing a hiss each time as pressurized gas painlessly drives the drugs deep into her tissues. She leaves @@.hotpink;thanking@@ you profusely, massaging herself in anticipation.
 	  <<set $activeSlave.devotion += 2>>
 	  Before the end of the week, her
-	  <<if $seed == "boobs">>
+	  <<if _injection == "boobs">>
 		@@.lime;boobs have grown,@@ delighting her.
 		<<if ($activeSlave.markings == "freckles") || ($activeSlave.markings == "heavily freckled")>>
 		  She proudly shows your other slaves her breast growth by keeping track of the increasing distance between a couple of chosen freckles on the front of her boobs.
@@ -7392,17 +7392,17 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		<<set $activeSlave.boobs += 200>>
 		The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
 		<<set $activeSlave.health -= 10>>
-	  <<elseif $seed == "butt">>
+	  <<elseif _injection == "butt">>
 		@@.lime;buttocks have grown,@@ delighting her.
 		<<set $activeSlave.butt += 1>>
 		The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
 		<<set $activeSlave.health -= 10>>
-	  <<elseif $seed == "lips">>
+	  <<elseif _injection == "lips">>
 		@@.lime;lips have swelled,@@ delighting her.
 		<<set $activeSlave.lips += 10>>
 		The dose of growth hormones necessary to cause such rapid tissue changes left her feeling @@.red;rather ill,@@ but she is recovering normally.
 		<<set $activeSlave.health -= 10>>
-	  <<elseif $seed == "dick">>
+	  <<elseif _injection == "dick">>
 		@@.lime;cock has grown,@@ delighting her.
 		<<set $activeSlave.dick += 1>>
 		<<if $activeSlave.balls < 5>>
@@ -7413,7 +7413,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		<</if>>
 		The dose of growth hormones and male hormone treatment necessary to cause such rapid change left her feeling @@.red;rather ill,@@ but she is recovering normally.
 		<<set $activeSlave.health -= 10>>
-	  <<elseif $seed == "dickMinus">>
+	  <<elseif _injection == "dickMinus">>
 		@@.orange;dick has shrunk,@@ delighting her.
 		<<set $activeSlave.dick -= 1>>
 		<<if $activeSlave.balls > 1>>

src/uncategorized/fullReport.tw

@@ -89,9 +89,9 @@
 	<br>
 <</if>>
 
-<<for _i = 0; _i < $HGTrainSlavesIDs.length; _i++>>
-	<<if $slaves[$i].ID == $HGTrainSlavesIDs[_i].ID>>
-		<<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_i].training>>
+<<for _hgtsidx = 0; _hgtsidx < $HGTrainSlavesIDs.length; _hgtsidx++>>
+	<<if $slaves[$i].ID == $HGTrainSlavesIDs[_hgtsidx].ID>>
+		<<set $activeSlave = $slaves[$i], $HGtraining = $HGTrainSlavesIDs[_hgtsidx].training>>
 		<<include "HG Application">>
 		<br>
 	<</if>>