diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index bed3287f8569dc142e7eb439b1d858a5c2b85baa..89ca3686b26810b462a513e385bdf6aa97bb8ee7 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -957,40 +957,40 @@ App.Data.resetOnNGPlus = {
boughtItem: {
clothing: {
// alternate clothing access variables
- Bunny: 0,
- Conservative: 0,
- Chains: 0,
- Western: 0,
- Oil: 0,
- Habit: 0,
- Toga: 0,
- Huipil: 0,
- Kimono: 0,
- Harem: 0,
- Qipao: 0,
- Egypt: 0,
- Belly: 0,
- MaternityDress: 0,
- MaternityLingerie: 0,
- LazyClothes: 0,
- Bimbo: 0,
- Courtesan: 0,
- Petite: 0,
+ bunny: 0,
+ conservative: 0,
+ chains: 0,
+ western: 0,
+ oil: 0,
+ habit: 0,
+ toga: 0,
+ huipil: 0,
+ kimono: 0,
+ harem: 0,
+ qipao: 0,
+ egypt: 0,
+ belly: 0,
+ maternityDress: 0,
+ maternityLingerie: 0,
+ lazyClothes: 0,
+ bimbo: 0,
+ courtesan: 0,
+ petite: 0,
// non-fs
- Military: 0,
- Cultural: 0,
- MiddleEastern: 0,
- Pol: 0,
- Costume: 0,
- Pantsu: 0,
- Career: 0,
- Dresses: 0,
- Bodysuits: 0,
- Casual: 0,
- Underwear: 0,
- Sports: 0,
- Pony: 0,
- Swimwear: 0,
+ military: 0,
+ cultural: 0,
+ middleEastern: 0,
+ pol: 0,
+ costume: 0,
+ pantsu: 0,
+ career: 0,
+ dresses: 0,
+ bodysuits: 0,
+ casual: 0,
+ underwear: 0,
+ sports: 0,
+ pony: 0,
+ swimwear: 0,
},
shoes: {
heels: 0,
@@ -999,12 +999,12 @@ App.Data.resetOnNGPlus = {
enema: 0,
medicalEnema: 0,
buckets: 0,
- toysBoughtDildos: 0,
- toysBoughtGags: 0,
- toysBoughtVaginalAttachments: 0,
- toysBoughtButtPlugs: 0,
- toysBoughtButtPlugTails: 0,
- toysBoughtSmartVibes: 0,
+ dildos: 0,
+ gags: 0,
+ vaginalAttachments: 0,
+ buttPlugs: 0,
+ buttPlugTails: 0,
+ smartVibes: 0,
},
},
dairyPiping: 0,
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index e374f4c248d073b7d7b783cb847eb4699dca596f..d8f2ee10ad02e65648b01ac0cb7e39d990cb26c3 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -761,7 +761,7 @@ FIXME:
<<set $activeChild.buttplugAttachment = "none">>
<<replace "#buttplugAttach">>$activeChild.buttplugAttachment<</replace>>
<</link>>
- <<if $toysBoughtButtPlugTails>>
+ <<if $boughtItem.clothing.buttPlugTails>>
<<link "Tail">>
<<set $activeChild.buttplugAttachment = "tail">>
<<replace "#buttplugAttach">>$activeChild.buttplugAttachment<</replace>>
@@ -824,13 +824,13 @@ FIXME:
<<set $activeChild.dickAccessory = "none">>
<<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>>
<</link>>
- <<if isItemAccessible.entry("bullet vibrator", "dickAccessory") && $toysBoughtVaginalAttachments>>
+ <<if isItemAccessible.entry("bullet vibrator", "dickAccessory") && $boughtItem.clothing.vaginalAttachments>>
| <<link "Bullet vibrator">>
<<set $activeChild.dickAccessory = "bullet vibrator">>
<<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>>
<</link>>
<</if>>
- <<if isItemAccessible.entry("smart bullet vibrator", "dickAccessory") && $toysBoughtVaginalAttachments>>
+ <<if isItemAccessible.entry("smart bullet vibrator", "dickAccessory") && $boughtItem.clothing.vaginalAttachments>>
| <<link "Smart bullet vibrator">>
<<set $activeChild.dickAccessory = "smart bullet vibrator">>
<<replace "#dickAccessory">>$activeChild.dickAccessory<</replace>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index ff5dbe546c0dc1bd54ae24c54fccb64cb3dc6796..25d769f6a9346d034538987cf5044c95759cc533 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -24,9 +24,9 @@ The room containing all the clothes and accessories you have available to dress
<<if $shoesBoughtHeels == 1>>
A large variety of shoes are available to select from.
<</if>>
-<<if $toysBoughtDildos == 1 && $toysBoughtGags == 1 && $toysBoughtButtPlugs == 1>>
+<<if $boughtItem.clothing.dildos == 1 && $toysBoughtGags == 1 && $boughtItem.clothing.buttPlugs == 1>>
Sex toys of all kinds and shapes line the shelves.
-<<elseif $toysBoughtDildos == 1 || $toysBoughtGags == 1 || $toysBoughtButtPlugs == 1 || $toysBoughtButtPlugTails == 1 || $toysBoughtVaginalAttachments == 1>>
+<<elseif $boughtItem.clothing.dildos == 1 || $toysBoughtGags == 1 || $boughtItem.clothing.buttPlugs == 1 || $boughtItem.clothing.buttPlugTails == 1 || $boughtItem.clothing.vaginalAttachments == 1>>
Some sex toys line the shelves.
<</if>>
<<if $buckets == 1>>
@@ -572,14 +572,14 @@ The room containing all the clothes and accessories you have available to dress
<p>
<div>
- <<if $toysBoughtDildos == 0>>
- [[Order a shipment of extra long dildos and bullet vibes|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtDildos = 1]]
+ <<if $boughtItem.clothing.dildos == 0>>
+ [[Order a shipment of extra long dildos and bullet vibes|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.clothing.dildos = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are well stocked with extra long dildos in a variety of sizes, as well as a good amount of bullet vibrators.
- <<if $toysBoughtSmartVibes == 0>>
+ <<if $boughtItem.clothing.smartVibes == 0>>
<div class="indent">
- [[Order the "smart" variant of the bullet vibrators|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtSmartVibes = 1]]
+ [[Order the "smart" variant of the bullet vibrators|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.clothing.smartVibes = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierTrade))>></span>
</div>
<<else>>
@@ -589,8 +589,8 @@ The room containing all the clothes and accessories you have available to dress
</div>
<div>
- <<if $toysBoughtVaginalAttachments == 0>>
- [[Order a shipment of vibrating dildo attachments|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtVaginalAttachments = 1]]
+ <<if $boughtItem.clothing.vaginalAttachments == 0>>
+ [[Order a shipment of vibrating dildo attachments|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.clothing.vaginalAttachments = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are well stocked with attachments that allow dildos to vibrate.
@@ -598,8 +598,8 @@ The room containing all the clothes and accessories you have available to dress
</div>
<div>
- <<if $toysBoughtButtPlugs == 0>>
- [[Order a shipment of extra long buttplugs|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtButtPlugs = 1]]
+ <<if $boughtItem.clothing.buttPlugs == 0>>
+ [[Order a shipment of extra long buttplugs|Wardrobe][cashX(forceNeg(Math.trunc(10000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.clothing.buttPlugs = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are well stocked with extra long buttplugs in a variety of sizes.
@@ -607,8 +607,8 @@ The room containing all the clothes and accessories you have available to dress
</div>
<div>
- <<if $toysBoughtButtPlugTails == 0>>
- [[Order a shipment of attachable tails|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $toysBoughtButtPlugTails = 1]]
+ <<if $boughtItem.clothing.buttPlugTails == 0>>
+ [[Order a shipment of attachable tails|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.clothing.buttPlugTails = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are well stocked with tails to attach to your buttplugs.