Merge branch 'fixes' into 'pregmod-master'

reDevotees Fix

Closes #161

See merge request !2124

src/art/vector_revamp/Vector_Revamped_Control_.tw

@@ -26,8 +26,8 @@
 <<set _boob_outfit_art_transform = _revampedVectorArtControl.boobOutfitArtTransform>>
 
 <<set _art_pussy_tattoo_text = _revampedVectorArtControl.pubicTattooText >>
-<<for _i = 0; _i < _revampedArtLayers.length; _i++>>
-	<<include _revampedArtLayers[_i]>>
+<<for _vrc = 0; _vrc < _revampedArtLayers.length; _vrc++>>
+	<<include _revampedArtLayers[_vrc]>>
 <</for>>
 
 <<unset _art_transform>>
\ No newline at end of file

src/uncategorized/reDevotees.tw

@@ -2,45 +2,45 @@
 
 <<set $nextButton = "Continue">>
 <<set $nextLink = "RIE Eligibility Check">>
-<<set _i = $slaveIndices[$devotedSlaves[0]]>>
-<<set _j = $slaveIndices[$devotedSlaves[1]]>>
-<<set _k = $slaveIndices[$devotedSlaves[2]]>>
-<<set _l = $slaveIndices[$devotedSlaves[3]]>>
+<<set _red1 = $slaveIndices[$devotedSlaves[0]]>>
+<<set _red2 = $slaveIndices[$devotedSlaves[1]]>>
+<<set _red3 = $slaveIndices[$devotedSlaves[2]]>>
+<<set _red4 = $slaveIndices[$devotedSlaves[3]]>>
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
     <div class="imageRef medImg">
-        <<SlaveArt $slaves[_i] 2 0>>
+        <<SlaveArt $slaves[_red1] 2 0>>
     </div>
     <div class="imageRef medImg">
-        <<SlaveArt $slaves[_j] 2 0>>
+        <<SlaveArt $slaves[_red2] 2 0>>
     </div>
     <div class="imageRef medImg">
-        <<SlaveArt $slaves[_k] 2 0>>
+        <<SlaveArt $slaves[_red3] 2 0>>
     </div>
     <div class="imageRef medImg">
-        <<SlaveArt $slaves[_l] 2 0>>
+        <<SlaveArt $slaves[_red4] 2 0>>
     </div>
 <</if>>
 /* 000-250-006 */
 
-You have a mature, well-trained household of slaves. $slaves[_i].slaveName, $slaves[_j].slaveName, $slaves[_k].slaveName, and $slaves[_l].slaveName are all devoted to you. There are all manner of ways you could display this coterie of loyal sex slaves to show off your wealth and power.
+You have a mature, well-trained household of slaves. $slaves[_red1].slaveName, $slaves[_red2].slaveName, $slaves[_red3].slaveName, and $slaves[_red4].slaveName are all devoted to you. There are all manner of ways you could display this coterie of loyal sex slaves to show off your wealth and power.
 <br><br>
 <span id="result">
 <<link "See an operetta with four attendants">>
 	<<replace "#result">>
 	<<PCTitle>>
-	You reserve a box at an upcoming operetta; classical Italian music is enjoying a renaissance these days. The doormen at the fashionable opera house promptly widen the velvet ropes so that you and your party may proceed unimpeded. Their quick thinking is necessary, since there are five of you walking sedately up the steps: you in the middle, impeccable in <<if $PC.title == 1>>gentleman's evening wear, complete with gloves and cane<<else>>a fine and noble lady's tuxedo<</if>>; and $slaves[_i].slaveName, $slaves[_j].slaveName, $slaves[_k].slaveName, and $slaves[_l].slaveName, all dressed in the gorgeous fashion of the seventeenth century, all plunging necklines, piled hair, and ruffled petticoats. The splendid master of ceremonies clears his throat and announces in a sonorous voice, "$PCTitle." The ostentation @@.green;turns every head and catches every eye.@@
+	You reserve a box at an upcoming operetta; classical Italian music is enjoying a renaissance these days. The doormen at the fashionable opera house promptly widen the velvet ropes so that you and your party may proceed unimpeded. Their quick thinking is necessary, since there are five of you walking sedately up the steps: you in the middle, impeccable in <<if $PC.title == 1>>gentleman's evening wear, complete with gloves and cane<<else>>a fine and noble lady's tuxedo<</if>>; and $slaves[_red1].slaveName, $slaves[_red2].slaveName, $slaves[_red3].slaveName, and $slaves[_red4].slaveName, all dressed in the gorgeous fashion of the seventeenth century, all plunging necklines, piled hair, and ruffled petticoats. The splendid master of ceremonies clears his throat and announces in a sonorous voice, "$PCTitle." The ostentation @@.green;turns every head and catches every eye.@@
 	<<set $rep += 500>>
 	<</replace>>
 <</link>>
 <br><<link "Visit a casino in good company">>
 	<<replace "#result">>
-	The croupiers, bouncers and regulars down at the nearest casino hardly know what to think when you appear with a chit full of cash and twice as many girls as you have arms. You live the night big, starting at the poker table with so many tits and asses on display behind you that, @@.yellowgreen;baby, you make a killing.@@ $slaves[_i].slaveName, $slaves[_j].slaveName, $slaves[_k].slaveName, and $slaves[_l].slaveName quickly catch the rhythm of the place: slaves can get away with a little more in the smoky, whiskey soaked, money tinted atmosphere, and they @@.hotpink;enjoy themselves immensely.@@ They flirt, flash, giggle, kiss each other, and generally destroy the concentration of everyone within twenty yards - except you. Ring-a-ding-ding.
-	<<set $slaves[_i].devotion += 4>>
-	<<set $slaves[_j].devotion += 4>>
-	<<set $slaves[_k].devotion += 4>>
-	<<set $slaves[_l].devotion += 4>>
+	The croupiers, bouncers and regulars down at the nearest casino hardly know what to think when you appear with a chit full of cash and twice as many girls as you have arms. You live the night big, starting at the poker table with so many tits and asses on display behind you that, @@.yellowgreen;baby, you make a killing.@@ $slaves[_red1].slaveName, $slaves[_red2].slaveName, $slaves[_red3].slaveName, and $slaves[_red4].slaveName quickly catch the rhythm of the place: slaves can get away with a little more in the smoky, whiskey soaked, money tinted atmosphere, and they @@.hotpink;enjoy themselves immensely.@@ They flirt, flash, giggle, kiss each other, and generally destroy the concentration of everyone within twenty yards - except you. Ring-a-ding-ding.
+	<<set $slaves[_red1].devotion += 4>>
+	<<set $slaves[_red2].devotion += 4>>
+	<<set $slaves[_red3].devotion += 4>>
+	<<set $slaves[_red4].devotion += 4>>
 	<<set $cash += random(30,100)*10>>
 	<</replace>>
 <</link>>