diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index 1e92894883d85befb0ae52c40c3bbcfd9abcd25e..97c4d085fa3a401e042243eb0d3ff6881f49c6e6 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -122,9 +122,9 @@ A choice doesn't need to have a specific effect. If your event has an immediate
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 221ef3abb8e7e765122143b61b2f0816c9481778..01d06563b3813d16d72c379e63e043d5cf30f47c 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -13,10 +13,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index cbf3ecafb7456f1a9a3133888fdf603eace3c97a..bc9a7c5025f688030cf75a642b55a4c28784e634 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -312,9 +312,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -381,9 +381,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -400,9 +400,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index e841286d46b12c36120ec904347871fc62b73796..c857faa4afc2689c8fa82bcee6563291100b5eb1 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -106,9 +106,9 @@ Despite your direct elevator, interaction with the majority of your security for
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -129,9 +129,9 @@ Despite your direct elevator, interaction with the majority of your security for
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/art/artJS.js b/src/art/artJS.js
index 4f23c9685416bc224a52fd41ecc6df8df8e0be26..79b2227aa903171ccb3056c654f8ad2ee38112d2 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -1,21 +1,15 @@
/* eslint-disable no-console */
/* eslint-disable no-undef */
-/*
-Call as <<= SlaveArt(...)>> or <<print SlaveArt(...)>>
-Displays slave images. Currently passage-based.
-artSlave: Slave.
-artSize: Image size/center.
- 3: Large, right. Example: long slave description.
- 2: Medium, right. Example: random events.
- 1: Small, left. Example: lists.
- 0: Tiny, left. Example: facilities
-UIDisplay (optional, only used by legacy art): icon UI Display for vector art, 1 for on.
-*/
/**
- * @param {App.Entity.SlaveState} artSlave
- * @param {number} artSize
- * @param {number} UIDisplay
- * @returns {object} // TODO: I think
+ * Call as <<= SlaveArt(...)>> or <<print SlaveArt(...)>>Displays slave images. Currently passage-based.
+ * @param {App.Entity.SlaveState} artSlave Slave
+ * @param {number} artSize Image size/center:
+ * * 3: Large, right. Example: long slave description.
+ * * 2: Medium, right. Example: random events.
+ * * 1: Small, left. Example: lists.
+ * * 0: Tiny, left. Example: facilities
+ * @param {number} [UIDisplay] (optional, only used by legacy art): icon UI Display for vector art, 1 for on
+ * @returns {string}
*/
window.SlaveArt = function(artSlave, artSize, UIDisplay) {
const imageChoice = State.variables.imageChoice;
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index 5c7529bfef3b141d4977db18f21ec21c8046bff9..b247e2f8ac5b8068ada94913a7209eb5ffaddae2 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -1,23 +1,6 @@
:: art widgets [nobr widget]
-/%
-Call as <<SlaveArt>>
-Displays slave images. Currently passage-based.
-$args[0]: Slave.
-$args[1]: Image size/center.
- 3: Large, right. Example: long slave description.
- 2: Medium, right. Example: random events.
- 1: Small, left. Example: lists.
- 0: Tiny, left. Example: facilities
-$args[2]: icon UI Display for vector art, 1 for on.
-%/
-<<widget "SlaveArt">>
-
-<<= SlaveArt($args[0], $args[1], $args[2])>>
-
-<</widget>>
-
<<widget "SlaveArtById">>
<<set _s = getSlave($args[0])>>
- <<SlaveArt _s $args[1]>>
+ <<= SlaveArt(_s, $args[1])>>
<</widget>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 8ff72a505523406d1f1f5a618b398b2f99fda8e1..1189556739d53aafe5293f7caba0144f3124b80f 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1188,7 +1188,7 @@ __''Player Character''__
<<if $imageChoice == 1>>
<br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
- <<SlaveArt _exampleSlave 0 0>>
+ <<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
<br>
<<options $seeFaces>>
@@ -1219,12 +1219,12 @@ __''Player Character''__
<<elseif $imageChoice == 2>>
<br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
- <<SlaveArt _exampleSlave 0 0>>
+ <<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
<<elseif $imageChoice == 3>>
<br>
<div style="position:relative;width:200px;height:200px;margin:0 auto;">
- <<SlaveArt _exampleSlave 0 0>>
+ <<= SlaveArt(_exampleSlave, 0, 0)>>
</div>
<br>
<<options $seeVectorArtHighlights>>
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index 87224360d83511f2bfd1c186df129f245189f5bd..3a589a4e3ee9ac1a22aa014bff8816144d98dfb2 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -8,9 +8,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index cb3ac738b904513bd4fb0c08ad53391662c03fbf..411652d0455edcbd18e75a25afb8b3a101b8a071 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -170,7 +170,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -241,7 +241,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index 35f8efbff88e59a4646bb1cb06c6631e30e7a496..1afa46531d55cb22ec4d3b620b35287244a07f04 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -100,7 +100,7 @@
<<set _chosenClothes = saChoosesOwnClothes(_Child)>>
<<set $cribs[_csi].devotion = _oldDevotion, _Child = $cribs[_csi]>> /* restore devotion value so repeatedly changing clothes isn't an exploit */
<</if>>
- <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Child 1>></div><</if>>
+ <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<= SlaveArt(_Child, 1)>></div><</if>>
<<if "be your Head Girl" == _Child.assignment>>''@@.lightcoral;HG@@''
<<elseif "recruit girls" == _Child.assignment>>''@@.lightcoral;RC@@''
<<elseif "guard you" == _Child.assignment>>''@@.lightcoral;BG@@''
@@ -110,7 +110,7 @@
/* TODO: will the PC be able to give children PA? */
<<case "Personal Attention Select">>
- <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Child 1>></div><</if>>
+ <br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<= SlaveArt(_Child, 1)>></div><</if>>
<<link _childName>>
<<if !Array.isArray($personalAttention)>> /* first PA target */
<<set $personalAttention = [{ID: $cribs[_csi].ID, trainingRegimen: "undecided"}]>>
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index f1cc1ff88d26c7bc3f73628bd72df5a64c047f87..4a1ebb19e48f6c9c71db572756ea21e1b447ccd2 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -7,9 +7,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeChild 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeChild, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeChild 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeChild, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/facilities/nursery/nurseryReport.tw b/src/facilities/nursery/nurseryReport.tw
index 625ee08ab13cd3a2515b1dd454ce48227cc1430a..a4d54f6e347e6ff5faf84ebc2ac6329380bc3d0d 100644
--- a/src/facilities/nursery/nurseryReport.tw
+++ b/src/facilities/nursery/nurseryReport.tw
@@ -106,7 +106,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef smlImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -161,7 +161,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef smlImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index fa53aedbd68dfd3b9b96445bfe34359919d961ae..39fe487f1add01ddfffbd0853792fc675b57e480 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -10,10 +10,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $relative 2 0>>
+ <<= SlaveArt($relative, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $relative2 2 0>>
+ <<= SlaveArt($relative2, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index fa9d3cc10f8eeecc48056aae99b41f54552c4001..8193745de4b10d40ea5ed1dc498f43723bcf0d75 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -13,10 +13,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $milkTap 2 0>>
+ <<= SlaveArt($milkTap, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 78e4cc98f042df73cb7327856d35efc977dec3ba..2365cd794db9cfa705787567d7ada51224296683 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -10,9 +10,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index 0ef43e7c1790daa0f85381229df10fa1cf450a45..e20c54071c97e29d9f9bea178f225a2f5fe5e996 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -44,9 +44,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -93,10 +93,10 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _ssb 2 0>>
+ <<= SlaveArt(_ssb, 2, 0)>>
</div>
</div>
<</if>>
@@ -121,9 +121,9 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -141,9 +141,9 @@ Several weeks have passed since you gained the musical prodigy and you couldn't
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index c30647cfb19c0b7b85e6ee7f9699f0e7e2e4c6d6..e6e093ed45acfbd34c9178df1abd4d68272d25f9 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -47,9 +47,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -145,7 +145,7 @@ You finger your new TV remote, as well as a second remote designed for... <i>oth
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _customer 2 0>>
+ <<= SlaveArt(_customer, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 53971b625445df1da43f4b4c3bd1a2cca399da88..78eddb9e752b8e8508253c733790ddaa3c77fc04 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -93,10 +93,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _kirk 2 0>>
+ <<= SlaveArt(_kirk, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _jules 2 0>>
+ <<= SlaveArt(_jules, 2, 0)>>
</div>
</div>
<</if>>
@@ -128,7 +128,7 @@
<<set _model.shoes = "flats">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -143,10 +143,10 @@
<<set _jules.vaginalAccessory = "large dildo">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _kirk 2 0>>
+ <<= SlaveArt(_kirk, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _jules 2 0>>
+ <<= SlaveArt(_jules, 2, 0)>>
</div>
</div>
<</if>>
@@ -191,10 +191,10 @@
<<set _model.boobShape = "perky">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -570,7 +570,7 @@
<<set _model.clothes = "a maternity dress">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -613,7 +613,7 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _millie 2 0>>
+ <<= SlaveArt(_millie, 2, 0)>>
</div>
</div>
<</if>>
@@ -700,7 +700,7 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _millie 2 0>>
+ <<= SlaveArt(_millie, 2, 0)>>
</div>
</div>
<</if>>
@@ -735,7 +735,7 @@
<<set _model.shoes = "none">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -753,7 +753,7 @@
<<set _model.boobs = 750>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -773,7 +773,7 @@
<<set _model.dick = 2>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -804,10 +804,10 @@
<<set _model2.shoes = "heels">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _model2 2 0>>
+ <<= SlaveArt(_model2, 2, 0)>>
</div>
</div>
<</if>>
@@ -823,7 +823,7 @@
<<set _model.clothes = "a slave gown">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -856,10 +856,10 @@
<<set _model2.shoes = "flats">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _model2 2 0>>
+ <<= SlaveArt(_model2, 2, 0)>>
</div>
</div>
<</if>>
@@ -876,7 +876,7 @@
<<set _model2.hColor = "grey">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -891,7 +891,7 @@
<<set _model.shoes = "none">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _model 2 0>>
+ <<= SlaveArt(_model, 2, 0)>>
</div>
</div>
<</if>>
@@ -931,10 +931,10 @@
<<set _mike.clothes = "sport shorts">>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _mindy 2 0>>
+ <<= SlaveArt(_mindy, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _mike 2 0>>
+ <<= SlaveArt(_mike, 2, 0)>>
</div>
</div>
<</if>>
@@ -1509,13 +1509,13 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _hostess 2 0>>
+ <<= SlaveArt(_hostess, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _scientist 2 0>>
+ <<= SlaveArt(_scientist, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _nun 2 0>>
+ <<= SlaveArt(_nun, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw
index f1a1672739bd898e7fdf5379f61603922251bb00..9a5fdb72c2a2f8f4a70bf36b5eec842635c92863 100644
--- a/src/pregmod/widgets/deathWidgets.tw
+++ b/src/pregmod/widgets/deathWidgets.tw
@@ -5,7 +5,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $args[0] 0 0>>
+ <<= SlaveArt($args[0], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -25,7 +25,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $args[0] 0 0>>
+ <<= SlaveArt($args[0], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -76,7 +76,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $args[0] 0 0>>
+ <<= SlaveArt($args[0], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -111,7 +111,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $args[0] 0 0>>
+ <<= SlaveArt($args[0], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 35c96098e63cdcb97cccb38c8c324c645c6d3b14..efbf8022009397c6e078d04d180372396b195daf 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -200,7 +200,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index bbb98ce884c9954821045f9f8d201e55df4e33a2..6b2cb78fbf63fdd99468af70838bb9e19aa6f44c 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -70,10 +70,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
@@ -82,9 +82,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -529,9 +529,9 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -566,10 +566,10 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 944bc9fa23f163bc645f6d698589b7a3eb0d5618..f8e82b6d26f57d529b5c0b4f09ffda54c4725fe8 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -72,10 +72,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 15a875f45eaf92fc04c9ef752c1e9ba08af5871d..e62844fbcb6db8b1bfc3299e43e65801d29d8ee2 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -51,9 +51,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -299,10 +299,10 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <<= SlaveArt($HeadGirl, 2, 0)>>
</div>
</div>
<</if>>
@@ -347,10 +347,10 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $Concubine 2 0>>
+ <<= SlaveArt($Concubine, 2, 0)>>
</div>
</div>
<</if>>
@@ -588,9 +588,9 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 57fbefd70bb0ad44da1c545873bfe5c54c2f5432..73c4a2c31523d8fe022c9c848c0a9ad590d9700e 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -139,10 +139,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -195,10 +195,10 @@ It seems $he passed by while $subSlave.slaveName was beating the girl and found
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -483,10 +483,10 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -540,10 +540,10 @@ It seems $he passed by while $subSlave.slaveName was dominating the other slave<
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -597,10 +597,10 @@ It seems $he passed by while you were dominating $subSlave.slaveName. <<if $acti
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -647,10 +647,10 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -701,10 +701,10 @@ It seems $he passed by while $subSlave.slaveName was <<if $PC.dick == 0>>in the
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 2e8489ca342d12d3b75f42db6d02bd3a78cf976e..94af53ff265e3fdeee4b77a3e6f89f3497f2d2f5 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -212,9 +212,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -301,9 +301,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -338,9 +338,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -513,9 +513,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -564,9 +564,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 49acd960b368cdbf5fe7c2087300795bb505fdcc..f55b6e32cc474df8922efaa78d151c44ef53429b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -106,16 +106,16 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
+ <<= SlaveArt(_newSlaves[0], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
+ <<= SlaveArt(_newSlaves[1], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
+ <<= SlaveArt(_newSlaves[2], 2, 0)>>
</div>
</div>
<</if>>
@@ -127,7 +127,7 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<<= assistantArt(2)>>
</div>
@@ -139,9 +139,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -10811,9 +10811,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -17597,16 +17597,16 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
+ <<= SlaveArt(_newSlaves[0], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
+ <<= SlaveArt(_newSlaves[1], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
+ <<= SlaveArt(_newSlaves[2], 2, 0)>>
</div>
</div>
<</if>>
@@ -19269,9 +19269,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -19462,9 +19462,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -19627,9 +19627,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -20573,9 +20573,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -20757,9 +20757,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -20803,9 +20803,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index e506e8024681131786e7666134a1289a29f3d2aa..66593fdf738d1dc740be785b84edf53041b5d79f 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -44,9 +44,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index fd6d7f4e9e573a1f7c7f546ba007cf8e332f21f0..dde0c44856645a2a6cb22bb060c120490325d2f7 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -180,10 +180,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -1123,10 +1123,10 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -1152,10 +1152,10 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -1186,10 +1186,10 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -1564,10 +1564,10 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw
index d884abad69eb0bf5c571870d009b6284ae97af05..75465e46a5e6de5c4d511855db54255d78dd4a93 100644
--- a/src/uncategorized/REresistantmotherdaughter.tw
+++ b/src/uncategorized/REresistantmotherdaughter.tw
@@ -14,10 +14,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<= SlaveArt($slaves[$i], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index b5ff0cb465bd3b1b011ed379f90d4b05063ff4f2..240283537fa3219241566a9a99fa204396674443 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -66,7 +66,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 2b5077d71187b2f4dbcb001625291f2690f3a2f1..6576bed211f86db65055b4827171d58c24507c66 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -323,9 +323,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index c4b6871199f4114c2448fa7c9a8e48afe60082c8..887041cbec0465556639170c5f0c8e504bb1ef0a 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -218,7 +218,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -332,7 +332,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 314e720f293c14c699db74618757005f0ed55df3..738c9baf75e6c4a0da0bc26d316d4b56fe9fd569 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -131,7 +131,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -249,7 +249,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index b64ea5bea6ce80d7d21f46a4c9803886ab608bc4..43590ad2ad20bcd565e5bf1c0324e05ae1f8142b 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -200,7 +200,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -284,7 +284,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 43bf2fb2bbcb8513fafdcb169af3e47024fa816b..96bab4b98989e2cbef4cb63bd8267f0db7a26128 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -122,7 +122,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -223,7 +223,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 913ebef4125afb98c149cb5d7ca3f245f3ee4d20..5e5f4c29aa98112175ced7475e0cf347b18b7c60 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -285,7 +285,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -386,7 +386,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index 82cd23ccd10f8a9a87a4ee0a4261193872b0d79d..36ca1e09dd460eb841628555ee68b1fcad820512 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -3,7 +3,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<= SlaveArt($slaves[$i], 2, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 6a380abd27ca0e3d6da82e647be393b5712b538d..a668c4f8fe7c33ee22f6d78d47c84f4199b4768f 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1166,9 +1166,9 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -1224,9 +1224,9 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -1275,9 +1275,9 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -1332,9 +1332,9 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 94b2632331848ee8ffacf89f24ad4ac51ac6d9ab..3ca3955659edb9caebdcdf6bc7200edc16862625 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -9,9 +9,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 8bbb5dd240b98372b68d57ccdcb86f767c3cd55f..768d733da0b1eba98a90acfe20852f9c95b4967a 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -162,9 +162,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 26817391f76258931ab91eda1202ce1298dbc56f..fe3fc68c274b6a23926892df6aaba644b6f4ac02 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -7,9 +7,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 79a977d9d0441792e9e8a0b6580dd4a5e5ea9e1b..35c3e2c886e6d9e58619dd34e30a826ff99f5ba8 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -102,7 +102,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 11d7ff4ebabdeb9fa286cceccca1b43f372d4913..4d74afbc1aece7e9d68a35b81b633f5f8deb7534 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -13,7 +13,7 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
+ <<= SlaveArt($eventSlave, 2, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -395,10 +395,10 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
+ <<= SlaveArt($eventSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index 34d421f2873936292394c3232eaa78c46720caf4..ac6ab8a82b8502cf60a398b789eb667b14f04bd5 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -9,9 +9,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($Bodyguard, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($Bodyguard, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 99e50a1c3367637b0c31e904c4298e6d32f840d9..00bedc971b12fe000cbd4797cc114dbeb6883649 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -13,9 +13,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 5fbc3eadc953f02609919f622bcc2c68c5f78e7f..fff8672ddeb931902ba4f964678ddcb72f14d911 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -6,9 +6,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $hostage 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($hostage, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $hostage 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($hostage, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index f9d6e82a0c08e8aaebf531881d73da9381c771e2..97d2a3d8e74cddbaa7acca6fd4d2b207246601c5 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -434,9 +434,9 @@
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef medImg"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index d3404d6b1b505fb2fa9d728ad38316fcfb4d72d7..1a6533765b6baddf660803514d0043cfc2f372d4 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -231,9 +231,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index f5cf21a7206b4ef706e1243d8685f6481ba24adb..feb6d5971be84e05a423ae9604c7b81a50d459cb 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -64,9 +64,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/peCombatTraining.tw b/src/uncategorized/peCombatTraining.tw
index c10641ee1c182b992ee4c00cdb077f063cc9de68..9bb6e7fc46c834377a87f8ed62e540008b60b0fc 100644
--- a/src/uncategorized/peCombatTraining.tw
+++ b/src/uncategorized/peCombatTraining.tw
@@ -9,9 +9,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index 33579c9c83e1bbd3410958119b932b1ebe03434b..7c5ccfb33bc12aa6c01087b10a608dce95b476f7 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -16,9 +16,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index a947402f4ff1af2161858b09011dfb104ceb4aad..8888bd1197f22bdef08fa9e37183385b3bf27334 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -15,10 +15,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <<= SlaveArt($HeadGirl, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $Concubine 2 0>>
+ <<= SlaveArt($Concubine, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index 817390f78a50fee29957e689a26c8980940f732f..6f3feea03c622f7674a5fc75064030ecc9c4ae98 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -18,10 +18,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index b12a3d94a69687ac4426a20c4d3fd3e97cb6530f..007a173b650129b3060b36618074853e69128f55 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -13,9 +13,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/pePitFightInvite.tw b/src/uncategorized/pePitFightInvite.tw
index 0f6b1dfbd8aa1ae15e1fb9493192be41db6e1b3d..d6568c78a62a65fa089c0d637d371a7fd34bec2d 100644
--- a/src/uncategorized/pePitFightInvite.tw
+++ b/src/uncategorized/pePitFightInvite.tw
@@ -19,9 +19,9 @@ Gladiatorial combat between slaves has not yet reached the level of social accep
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($Bodyguard, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($Bodyguard, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index e0ec54f7eabf8236aea07dd2d617bada071c74cd..8be35ca1d2174440fa9a170b59fb78c14a97c54b 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -47,9 +47,9 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<<= assistantArt(3)>>
</div>
@@ -145,9 +145,9 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<set $activeSlave.clothes = "chains">>
<div class="imageColumn">
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<<= assistantArt(3)>>
</div>
@@ -225,9 +225,9 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<set $activeSlave.clothes = "chains">>
<div class="imageColumn">
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<<= assistantArt(3)>>
</div>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index c3b1132101e76299ab47b0772359f20994353262..cddbcc8d87fd436dcb40a8a7e07c2308296495df 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -15,10 +15,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <<= SlaveArt($HeadGirl, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reDevotedMotherDaughter.tw b/src/uncategorized/reDevotedMotherDaughter.tw
index bd1f883915b9cfd64ed114f04b4a996e82cafbfc..70d82b2469f2af37085508f6fb1920567ed11421 100644
--- a/src/uncategorized/reDevotedMotherDaughter.tw
+++ b/src/uncategorized/reDevotedMotherDaughter.tw
@@ -12,10 +12,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<= SlaveArt($slaves[$i], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reDevotedTwins.tw b/src/uncategorized/reDevotedTwins.tw
index 9aa6edc8aeefa6d1fc5879085743eb8e3ab17482..ca52ba11fec69f8767c871622e1be2d87586196e 100644
--- a/src/uncategorized/reDevotedTwins.tw
+++ b/src/uncategorized/reDevotedTwins.tw
@@ -10,10 +10,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<= SlaveArt($slaves[$i], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index c9c85f4d105c4ab11835948e3eb71bb3fccddf92..b38013428b2ffa8e42e5e619555618b32ca31b15 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -11,16 +11,16 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[_red1] 2 0>>
+ <<= SlaveArt($slaves[_red1], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_red2] 2 0>>
+ <<= SlaveArt($slaves[_red2], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_red3] 2 0>>
+ <<= SlaveArt($slaves[_red3], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_red4] 2 0>>
+ <<= SlaveArt($slaves[_red4], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index 93016b4edab79e61658b86f01b58a27df362e763..6b040561bb64f7ce538849d3c69914a72e76de71 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -9,10 +9,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[_bedSlaveOne] 2 0>>
+ <<= SlaveArt($slaves[_bedSlaveOne], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_bedSlaveTwo] 2 0>>
+ <<= SlaveArt($slaves[_bedSlaveTwo], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index 463423c7f687fd718734045fecc1e355dd7338ae..9da872340020757056844b46f61ddd1252f14c81 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -13,10 +13,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <<= SlaveArt($HeadGirl, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reLegendaryBalls.tw b/src/uncategorized/reLegendaryBalls.tw
index cf7fe42749b699f129c7c412a88c880e6a9e16ac..48ef0cd35a1866feb5f947226456771bda96555d 100644
--- a/src/uncategorized/reLegendaryBalls.tw
+++ b/src/uncategorized/reLegendaryBalls.tw
@@ -14,9 +14,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reLegendaryCow.tw b/src/uncategorized/reLegendaryCow.tw
index 0c32bfa891cc629b3cd0e452781dc3d5dd998706..e0a63351b07ea98f7aa25f96274eee355f777087 100644
--- a/src/uncategorized/reLegendaryCow.tw
+++ b/src/uncategorized/reLegendaryCow.tw
@@ -14,9 +14,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reLegendaryEntertainer.tw b/src/uncategorized/reLegendaryEntertainer.tw
index 71e6816774640202fdb7904b9cf49a28afc61c46..27c4c7448ddb27fa03db13f66bb389257da5cf88 100644
--- a/src/uncategorized/reLegendaryEntertainer.tw
+++ b/src/uncategorized/reLegendaryEntertainer.tw
@@ -14,9 +14,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reLegendaryWhore.tw b/src/uncategorized/reLegendaryWhore.tw
index 12d6e806325b69b56ec2dc1551998b44334f0582..419dbb46d93e27c5b9f05b7582ce9f53f55cb631 100644
--- a/src/uncategorized/reLegendaryWhore.tw
+++ b/src/uncategorized/reLegendaryWhore.tw
@@ -14,9 +14,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 2f07fc5bb51338173fe0a02824b5704b1866572d..4488ed77f95b09703e805bdf4a56e8184072ccf5 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -37,10 +37,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _milfSlave 2 0>>
+ <<= SlaveArt(_milfSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -154,10 +154,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _milfSlave 2 0>>
+ <<= SlaveArt(_milfSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 792167594d5c17c82bd473e1ba2a3c7c370b9370..2bc380fea18a9fbfc030a480789a8eb33f83337a 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1243,9 +1243,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reNoEvent.tw b/src/uncategorized/reNoEvent.tw
index 11c5d36ffa0dc1981e3c01bca27d80fa26258a60..08f3254c33a5502bbf58239fba0d852cef88fcc6 100644
--- a/src/uncategorized/reNoEvent.tw
+++ b/src/uncategorized/reNoEvent.tw
@@ -11,9 +11,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index f572eb4f426189388e511e5cd10efb8b7abef6b9..a9eeda33d63eddf2ddc5543d4f1266aae3715b8e 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -96,9 +96,9 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -119,9 +119,9 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw
index 915143a86e4cfcb905d2f8828be3d454f4370275..893de4b63eedc52d07b4d47e611240548d896587 100644
--- a/src/uncategorized/reRebels.tw
+++ b/src/uncategorized/reRebels.tw
@@ -15,10 +15,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[_i] 2 0>>
+ <<= SlaveArt($slaves[_i], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_j] 2 0>>
+ <<= SlaveArt($slaves[_j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw
index a3505eb4995057532dc17893b3572173ad38b8b6..6afd89a6254a4723474c79cf0bcd87d3b9b4bb40 100644
--- a/src/uncategorized/reRelationshipAdvice.tw
+++ b/src/uncategorized/reRelationshipAdvice.tw
@@ -14,10 +14,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <<= SlaveArt($subSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 9d37f1c215d2adea9db7b55e63a457f6f047322a..ed084cb20601318e59412c25db51b36c0ff32bbc 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -13,9 +13,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -837,10 +837,10 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
+ <<= SlaveArt($eventSlave, 2, 0)>>
</div>
</div>
<</if>>
@@ -869,9 +869,9 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $eventSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($eventSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index fd7c3c9a16e7d3e8d84ed9f22f06651a2de5c980..53a21373a7ce1359f99f1218f512dafedfff0efc 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -63,10 +63,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _Inspectee 2 0>>
+ <<= SlaveArt(_Inspectee, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 925909016882acecef14f2d03b08c745286f2a94..3387ddb1067f2b543f34ff2c872a14914a4f8aba 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -15,10 +15,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <<= SlaveArt($HeadGirl, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reSiblingRevenge.tw b/src/uncategorized/reSiblingRevenge.tw
index 61c5d4ea6b1377104ed18e23f6fb16a5f1315530..bb1c2eab6a65833d1f28ebd3c192059391a662fd 100644
--- a/src/uncategorized/reSiblingRevenge.tw
+++ b/src/uncategorized/reSiblingRevenge.tw
@@ -14,10 +14,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<= SlaveArt($slaves[$i], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
+ <<= SlaveArt($slaves[$j], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reSlaveMarriage.tw b/src/uncategorized/reSlaveMarriage.tw
index a2c1b694784418799c66b096407a84641286fc17..dc358d345a7bdaa81e3c0918d6d572ca2aa48a59 100644
--- a/src/uncategorized/reSlaveMarriage.tw
+++ b/src/uncategorized/reSlaveMarriage.tw
@@ -19,10 +19,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $groomSlave 2 0>>
+ <<= SlaveArt($groomSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $brideSlave 2 0>>
+ <<= SlaveArt($brideSlave, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reStaffedMorning.tw b/src/uncategorized/reStaffedMorning.tw
index 547aa23d2bf0b5fa74bdc1a405160eef5b59c170..a3e35624fc5641767a35b212955931a4cd4977b9 100644
--- a/src/uncategorized/reStaffedMorning.tw
+++ b/src/uncategorized/reStaffedMorning.tw
@@ -19,10 +19,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _bedSlaves[0] 2 0>>
+ <<= SlaveArt(_bedSlaves[0], 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _bedSlaves[1] 2 0>>
+ <<= SlaveArt(_bedSlaves[1], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 5bfdedd66ea58fdbc39edb9c5416e5244e49ab5d..2fa44071562ac4b43d63ffa7c1cac5b0ef17b4e5 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -7,9 +7,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 8ecf60d36cbda4931941ed104a55dc30c4162c4c..93adc33bb2e13d1b52244432a01f25137dbb143f 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -25,9 +25,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 848a7c564a16465e4de631c19e0d00fb3d13d481..d23f2c9860f0bb46113b7c1e2f0ce59014abfd2f 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -46,9 +46,9 @@
<<set $activeSlave.devotion = 100>>
<div class="imageColumn">
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<<= assistantArt(3)>>
</div>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 12a20cebe4d9b443bed028233f483fb473741f39..1bfcb1ad06906fb48d362ebabc64c219f7f21f68 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -16,9 +16,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 1dfc4daafb2763f844d7d4c41b45457515bf38d6..d64142e59d0e4a6368c695526134679e15108cf1 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -114,7 +114,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -190,7 +190,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 8e38b0d0b59c2ca6c09c4519119133ef4be24dd7..487c4d140fd5abc0a1cf3b560981eca2ba73d607 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -12,9 +12,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeLurcher 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeLurcher, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeLurcher 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeLurcher, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -230,7 +230,7 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $activeSlave 0 0>>
+ <<= SlaveArt($activeSlave, 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -249,11 +249,11 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeLurcher 2 0>>
+ <<= SlaveArt($activeLurcher, 2, 0)>>
</div>
<<if $activeSlave != 0>>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<</if>>
</div>
@@ -282,11 +282,11 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeLurcher 2 0>>
+ <<= SlaveArt($activeLurcher, 2, 0)>>
</div>
<<if $activeSlave != 0>>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<</if>>
</div>
@@ -315,11 +315,11 @@ You lead your lurcher $activeLurcher.slaveName out on a leash, naked just like t
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeLurcher 2 0>>
+ <<= SlaveArt($activeLurcher, 2, 0)>>
</div>
<<if $activeSlave != 0>>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<= SlaveArt($activeSlave, 2, 0)>>
</div>
<</if>>
</div>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index d0e80f1c6633ee1643d412e8e54d4cab8f79f976..66501ed441d352949d6f7aa28e93fb8e35a00c05 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -13,9 +13,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 4a24d2265f78304bf6ebfbfd85cd3d65a78e7374..d101e745970d77b614388850af038ca0d4007673 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -28,10 +28,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _fighterOne 2 0>>
+ <<= SlaveArt(_fighterOne, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _fighterTwo 2 0>>
+ <<= SlaveArt(_fighterTwo, 2, 0)>>
</div>
</div>
<</if>>
@@ -50,9 +50,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt(_fighterOne, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt(_fighterOne, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 0c4b6464854e5ab7e5419d6da3dbe9aee8953282..2df2b3e606d03bffad56776284665804a006e941 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -21,10 +21,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _fighterOne 2 0>>
+ <<= SlaveArt(_fighterOne, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _fighterTwo 2 0>>
+ <<= SlaveArt(_fighterTwo, 2, 0)>>
</div>
</div>
<</if>>
@@ -43,9 +43,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt(_fighterOne, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt _fighterOne 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt(_fighterOne, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 3839c55cd4093a5e06fd9862303bf419f9cf7fbf..f7d609cb622e1e2d68776f8a3b798390e75719d4 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -26,9 +26,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
@@ -219,10 +219,10 @@ Your arcology has gained a well-off citizen.
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _clonedSlave 2 0>>
+ <<= SlaveArt(_clonedSlave, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $slaves[_sr] 2 0>>
+ <<= SlaveArt($slaves[_sr], 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index f8386ee015e2270b53e209d4e66a1acffa25911d..cefd8f8a176bf6cdec064dfc4f629b026d4b4fe5 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -12,10 +12,10 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _slave1 2 0>>
+ <<= SlaveArt(_slave1, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _slave2 2 0>>
+ <<= SlaveArt(_slave2, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index 3978b2c03b8b7160d62fa3f71fe94fb51cc60e97..91840b5fc22f69779d6382395f347b9be96fb515 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -8,9 +8,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $slaves[_wedS] 2 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($slaves[_wedS], 2, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $slaves[_wedS] 2 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($slaves[_wedS], 2, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 2c686931cfe0270ffecd598e3b1ac55df6ecb161..65f0e59ec6904f01ab451c68fb84ccc8116288f0 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -16,13 +16,13 @@
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _slave1 2 0>>
+ <<= SlaveArt(_slave1, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _slave2 2 0>>
+ <<= SlaveArt(_slave2, 2, 0)>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _slave3 2 0>>
+ <<= SlaveArt(_slave3, 2, 0)>>
</div>
</div>
<</if>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 8dcbe5ea3e339a6008111869035455cb7b40f1bc..498421c9dc1debe918c2a31684575ba940180404 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -187,7 +187,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -273,7 +273,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 267169bf5f06da93ecbf86bac57f655d5d572366..afee47b5987607f9d1f54089ed6117ba943d21ef 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -227,7 +227,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef smlImg">
- <<SlaveArt $slaves[_FLs] 0 0>>
+ <<= SlaveArt($slaves[_FLs], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
@@ -289,7 +289,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef smlImg">
- <<SlaveArt $slaves[$i] 0 0>>
+ <<= SlaveArt($slaves[$i], 0, 0)>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 3691494b8ea2f3f8ab7b2e12343c56f231bebcbb..4f56c7e101e7a58ad0880a55f4ac7ce26724e4d3 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -54,7 +54,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a bunny outfit">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a bunny outfit")>>
@@ -69,7 +69,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "conservative clothing">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("conservative clothing")>>
@@ -86,7 +86,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "chains">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("chains")>>
@@ -101,7 +101,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "Western clothing">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("Western clothing")>>
@@ -118,7 +118,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "body oil">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("body oil")>>
@@ -133,7 +133,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "stretch pants and a crop-top">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("stretch pants and a crop-top")>>
@@ -150,7 +150,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a chattel habit">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a chattel habit")>>
@@ -164,7 +164,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a maternity dress">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a maternity dress")>>
@@ -181,7 +181,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "attractive lingerie for a pregnant woman">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("attractive lingerie for a pregnant woman")>>
@@ -201,7 +201,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.collar = "ancient Egyptian">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<set _model.collar = "none">>
@@ -217,7 +217,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a toga">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a toga")>>
@@ -234,7 +234,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a huipil">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a huipil")>>
@@ -249,7 +249,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a kimono">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a kimono")>>
@@ -266,7 +266,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "harem gauze">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("harem gauze")>>
@@ -281,7 +281,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a slutty qipao">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a slutty qipao")>>
@@ -300,7 +300,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a military uniform", "a red army uniform", "battlearmor", "battledress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("battlearmor")>>
@@ -315,7 +315,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a biyelgee costume", "a dirndl", "a hanbok", "a mounty outfit", "lederhosen")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a dirndl")>>
@@ -332,7 +332,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a burqa", "a niqab and abaya")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a burqa")>>
@@ -347,7 +347,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a button-up shirt and panties", "a button-up shirt", "a sweater and cutoffs", "a sweater and panties", "a sweater", "a t-shirt and jeans", "a t-shirt and panties", "a t-shirt", "a tank-top and panties", "a tank-top", "a tube top", "an oversized t-shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("jeans")>>
@@ -364,7 +364,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a nice nurse outfit", "a police uniform", "nice business attire")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a police uniform")>>
@@ -379,7 +379,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a ball gown", "a gothic lolita dress")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a gothic lolita dress")>>
@@ -396,7 +396,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a cybersuit", "a latex catsuit")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a cybersuit")>>
@@ -411,7 +411,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a bra", "a skimpy loincloth", "a thong", "boyshorts", "kitty lingerie", "panties and pasties", "pasties")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("boyshorts")>>
@@ -428,7 +428,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a sports bra", "sport shorts and a sports bra", "sport shorts")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("sport shorts and a sports bra")>>
@@ -443,7 +443,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a monokini", "a one-piece swimsuit")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a one-piece swimsuit")>>
@@ -460,7 +460,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a nice pony outfit", "a slutty pony outfit")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a nice pony outfit")>>
@@ -475,7 +475,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a klan robe", "a schutzstaffel uniform", "a slutty klan robe", "a slutty schutzstaffel uniform")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a schutzstaffel uniform")>>
@@ -492,7 +492,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = "a Santa dress">>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("a Santa dress")>>
@@ -507,7 +507,7 @@ The room containing all the clothes and accessories you have available to dress
<<set _model.clothes = either("a striped bra", "striped panties", "striped underwear")>>
<<if $seeImages == 1>>
<div class= "imageRef smlImg">
- <<SlaveArt _model 1 0>>
+ <<= SlaveArt(_model, 1, 0)>>
</div>
<</if>>
<<if !isItemAccessible("striped panties")>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index e72cf8cd6339400158c57aea7d8b457548cb589f..6f8310b32a2b8a39b3be975525cefbe8f6eb140c 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -17,9 +17,9 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
- <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 3 0>></div>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
/* 000-250-006 */