From f8f7233bec3306e6855e5974d7c9c689601d2357 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 1 Sep 2018 19:39:48 -0400
Subject: [PATCH] Fixes
---
src/art/vector/Feet.tw | 2 +-
src/uncategorized/generateXXSlave.tw | 7 ++++---
src/uncategorized/generateXYSlave.tw | 7 ++++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
index 1286d04a014..b0fb37f9276 100644
--- a/src/art/vector/Feet.tw
+++ b/src/art/vector/Feet.tw
@@ -106,7 +106,7 @@
<<unset _art_outfit >> /* clean up variable possibly already set by prior widget run */
<<switch _artSlave.clothes>> /* select available clothes */
- <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a toga" "an apron" "attractive lingerie" "battlearmor" "battledress" "body oil" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
+ <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a toga" "an apron" "attractive lingerie" "battlearmor" "battledress" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "stretch pants and a crop-top" "Western clothing">>
<<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >>
<</switch>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 3656576519c..74e4b096325 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -109,8 +109,9 @@
<<else>>
<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
- <<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
- <<set _capNation = _capUpgradeCheck[_u]>>
+ <<set _keys = Object.keys(_capUpgradeCheck)>>
+ <<for _u = 0; _u < _keys.length; _u++>>
+ <<set _capNation = _keys[_u]>>
<<if _capNation in $nationalities>>
<<set _capUpgradeNationalities.push(_capNation)>>
<</if>>
@@ -118,7 +119,7 @@
<<if _capUpgradeNationalities.length > 0>>
<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
<<else>>
- <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+ <<set $activeSlave.nationality = _keys.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
<<if $activeSlave.race != $captureUpgradeRace>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 737d6f80d4a..53c7849f43b 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -116,8 +116,9 @@
<<else>>
<<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
- <<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
- <<set _capNation = _capUpgradeCheck[_u]>>
+ <<set _keys = Object.keys(_capUpgradeCheck)>>
+ <<for _u = 0; _u < _keys.length; _u++>>
+ <<set _capNation = _keys[_u]>>
<<if _capNation in $nationalities>>
<<set _capUpgradeNationalities.push(_capNation)>>
<</if>>
@@ -125,7 +126,7 @@
<<if _capUpgradeNationalities.length > 0>>
<<set $activeSlave.nationality = _capUpgradeNationalities.random(), $activeSlave.race = $captureUpgradeRace>>
<<else>>
- <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
+ <<set $activeSlave.nationality = _keys.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
<<if $activeSlave.race != $captureUpgradeRace>>
--
GitLab