From 2456ddd1e8f7233b9d11642202851857eb47700f Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sun, 20 Dec 2020 18:45:05 -0500 Subject: [PATCH] adjust range of exposure --- js/003-data/slaveWearData.js | 126 ++++++++++++++-------------- src/endWeek/saClothes.js | 4 +- src/interaction/siWardrobe.js | 4 +- src/js/statsChecker/statsChecker.js | 2 +- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js index c0007c6b29f..99bc1487b35 100644 --- a/js/003-data/slaveWearData.js +++ b/js/003-data/slaveWearData.js @@ -3,7 +3,7 @@ * @property {string} name * @property {FC.FutureSociety} [fs] Automatically unlocked with this FS. * @property {boolean} [requirements] - * @property {0|1|2} [exposure] 0: Modest, 1: Slutty, 2: Humiliating (exposes genitals) + * @property {0|1|2|3} [exposure] 0: Modest, 1: Normal, 2: Slutty, 3: Humiliating (exposes genitals) * @property {boolean} [harsh] */ @@ -16,7 +16,7 @@ App.Data.clothes = new Map([ name: "Maternity lingerie", fs: "FSRepopulationFocus", get requirements() { return V.boughtItem.clothing.maternityLingerie === 1; }, - exposure: 1 + exposure: 2 } ], ["a bunny outfit", @@ -32,7 +32,7 @@ App.Data.clothes = new Map([ name: "Body oil", fs: "FSPhysicalIdealist", get requirements() { return V.boughtItem.clothing.oil === 1; }, - exposure: 2 + exposure: 3 } ], ["a chattel habit", @@ -40,7 +40,7 @@ App.Data.clothes = new Map([ name: "Chattel habit", fs: "FSChattelReligionist", get requirements() { return V.boughtItem.clothing.habit === 1; }, - exposure: 2 + exposure: 3 } ], ["conservative clothing", @@ -56,7 +56,7 @@ App.Data.clothes = new Map([ name: "Harem gauze", fs: "FSArabianRevivalist", get requirements() { return V.boughtItem.clothing.harem === 1; }, - exposure: 2 + exposure: 3 } ], ["a huipil", @@ -88,7 +88,7 @@ App.Data.clothes = new Map([ name: "Qipao (slutty)", fs: "FSChineseRevivalist", get requirements() { return V.boughtItem.clothing.qipao === 1; }, - exposure: 1 + exposure: 2 } ], ["a long qipao", @@ -112,7 +112,7 @@ App.Data.clothes = new Map([ name: "Imperial Bodysuit", fs: "FSNeoImperialist", get requirements() { return V.boughtItem.clothing.imperialsuit === 1; }, - exposure: 1 + exposure: 2 } ], ["stretch pants and a crop-top", @@ -136,7 +136,7 @@ App.Data.clothes = new Map([ name: "Western clothing", fs: "FSPastoralist", get requirements() { return V.boughtItem.clothing.western === 1; }, - exposure: 2 + exposure: 3 } ], ["a courtesan dress", @@ -152,7 +152,7 @@ App.Data.clothes = new Map([ name: "Bimbo outfit", fs: "FSIntellectualDependency", get requirements() { return V.boughtItem.clothing.bimbo === 1; }, - exposure: 1 + exposure: 2 } ], ["petite admi outfit", @@ -258,7 +258,7 @@ App.Data.clothes = new Map([ { name: "Santa dress", get requirements() { return V.boughtItem.clothing.costume === 1; }, - exposure: 1 + exposure: 2 } ], @@ -273,7 +273,7 @@ App.Data.clothes = new Map([ { name: "Slutty klan robe", get requirements() { return V.boughtItem.clothing.pol === 1; }, - exposure: 1 + exposure: 2 } ], ["a schutzstaffel uniform", @@ -287,7 +287,7 @@ App.Data.clothes = new Map([ { name: "Slutty schutzstaffel uniform", get requirements() { return V.boughtItem.clothing.pol === 1; }, - exposure: 1 + exposure: 2 } ], @@ -351,14 +351,14 @@ App.Data.clothes = new Map([ { name: "Button-up shirt and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["a button-up shirt", { name: "Button-up shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 2 + exposure: 3 } ], ["cutoffs", @@ -372,7 +372,7 @@ App.Data.clothes = new Map([ { name: "Jeans", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["leather pants and a tube top", @@ -386,14 +386,14 @@ App.Data.clothes = new Map([ { name: "Leather pants", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["an oversized t-shirt", { name: "Oversized t-shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["a sweater and cutoffs", @@ -407,14 +407,14 @@ App.Data.clothes = new Map([ { name: "Sweater and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["a sweater", { name: "Sweater", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 2 + exposure: 3 } ], ["a t-shirt and jeans", @@ -428,105 +428,105 @@ App.Data.clothes = new Map([ { name: "T-shirt and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["a t-shirt", { name: "T-shirt", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 2 + exposure: 3 } ], ["a tank-top and panties", { name: "Tank-top and panties", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 1 + exposure: 2 } ], ["a tank-top", { name: "Tank-top", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 2 + exposure: 3 } ], ["a tube top", { name: "Tube top", get requirements() { return V.boughtItem.clothing.casual === 1; }, - exposure: 2 + exposure: 3 } ], ["boyshorts", { name: "Boyshorts", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 1 + exposure: 2 } ], ["a bra", { name: "Bra", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 2 + exposure: 3 } ], ["kitty lingerie", { name: "Kitty lingerie", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 1 + exposure: 2 } ], ["panties and pasties", { name: "Panties and pasties", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 1 + exposure: 2 } ], ["a skimpy loincloth", { name: "Skimpy loincloth", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 2 + exposure: 3 } ], ["a thong", { name: "Thong", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 2 + exposure: 3 } ], ["pasties", { name: "Pasties", get requirements() { return V.boughtItem.clothing.underwear === 1; }, - exposure: 2 + exposure: 3 } ], ["leather pants and pasties", { name: "Leather pants and pasties", get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }, - exposure: 1, + exposure: 2, } ], ["a t-shirt and thong", { name: "T-shirt and thong", get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }, - exposure: 1, + exposure: 2, } ], ["a tube top and thong", { name: "Tube top and thong", get requirements() { return V.boughtItem.clothing.underwear === 1 && V.boughtItem.clothing.casual === 1; }, - exposure: 1, + exposure: 2, } ], ["an oversized t-shirt and boyshorts", @@ -540,21 +540,21 @@ App.Data.clothes = new Map([ { name: "Sport shorts and a sports bra", get requirements() { return V.boughtItem.clothing.sports === 1; }, - exposure: 1, + exposure: 2, } ], ["sport shorts", { name: "Sport shorts", get requirements() { return V.boughtItem.clothing.sports === 1; }, - exposure: 1 + exposure: 2 } ], ["a sports bra", { name: "Sports bra", get requirements() { return V.boughtItem.clothing.sports === 1; }, - exposure: 2 + exposure: 3 } ], ["sport shorts and a t-shirt", @@ -575,14 +575,14 @@ App.Data.clothes = new Map([ { name: "Pony outfit (slutty)", get requirements() { return V.boughtItem.clothing.pony === 1; }, - exposure: 1 + exposure: 2 } ], ["a monokini", { name: "Monokini", get requirements() { return V.boughtItem.clothing.swimwear === 1; }, - exposure: 2 + exposure: 3 } ], ["a one-piece swimsuit", @@ -596,21 +596,21 @@ App.Data.clothes = new Map([ { name: "Striped bra", get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }, - exposure: 2 + exposure: 3 } ], ["striped panties", { name: "Striped panties", get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }, - exposure: 1, + exposure: 2, } ], ["striped underwear", { name: "Striped underwear", get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }, - exposure: 1, + exposure: 2, } ], @@ -618,19 +618,19 @@ App.Data.clothes = new Map([ ["an apron", { name: "Apron", - exposure: 1, + exposure: 2, } ], ["slutty jewelry", { name: "Bangles", - exposure: 2 + exposure: 3 } ], ["clubslut netting", { name: "Clubslut netting", - exposure: 2 + exposure: 3 } ], ["cutoffs and a t-shirt", @@ -648,13 +648,13 @@ App.Data.clothes = new Map([ ["a cheerleader outfit", { name: "Cheerleader", - exposure: 1 + exposure: 2 } ], ["a fallen nuns habit", { name: "Fallen nun", - exposure: 2 + exposure: 3 } ], ["a hijab and abaya", @@ -672,7 +672,7 @@ App.Data.clothes = new Map([ ["a slutty maid outfit", { name: "Maid (slutty)", - exposure: 1 + exposure: 2 } ], ["a mini dress", @@ -684,13 +684,13 @@ App.Data.clothes = new Map([ ["attractive lingerie", { name: "Nice lingerie", - exposure: 1 + exposure: 2 } ], ["a slutty nurse outfit", { name: "Nurse (slutty)", - exposure: 1 + exposure: 2 } ], ["overalls", @@ -702,25 +702,25 @@ App.Data.clothes = new Map([ ["panties", { name: "Panties", - exposure: 1 + exposure: 2 } ], ["a scalemail bikini", { name: "Scalemail bikini", - exposure: 1 + exposure: 2 } ], ["a schoolgirl outfit", { name: "Schoolgirl", - exposure: 1 + exposure: 2 } ], ["a slutty outfit", { name: "Slutty outfit", - exposure: 1 + exposure: 2 } ], ["spats and a tank top", @@ -732,19 +732,19 @@ App.Data.clothes = new Map([ ["a string bikini", { name: "String bikini", - exposure: 2 + exposure: 3 } ], ["a succubus outfit", { name: "Succubus costume", - exposure: 2 + exposure: 3 } ], ["slutty business attire", { name: "Suit (slutty)", - exposure: 1, + exposure: 2, } ], @@ -772,41 +772,41 @@ App.Data.clothes = new Map([ name: "Chains", fs: "FSDegradationist", get requirements() { return V.boughtItem.clothing.chains === 1; }, - exposure: 2, + exposure: 3, harsh: true } ], ["no clothing", { name: "Go naked", - exposure: 2, + exposure: 3, harsh: true } ], ["a penitent nuns habit", { name: "Penitent nun", - exposure: 1, + exposure: 2, harsh: true } ], ["restrictive latex", { name: "Restrictive latex", - exposure: 2 + exposure: 3 } ], ["shibari ropes", { name: "Shibari ropes", - exposure: 2, + exposure: 3, harsh: true } ], ["uncomfortable straps", { name: "Uncomfortable straps", - exposure: 2, + exposure: 3, harsh: true } ] diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js index 6c1e1da8432..8ab1e6d4839 100644 --- a/src/endWeek/saClothes.js +++ b/src/endWeek/saClothes.js @@ -287,7 +287,7 @@ App.SlaveAssignment.clothes = (function() { r.push(`${He} pretends to be embarrassed by ${his} clearly exposed breasts but <span class="hotpink">secretly gets off on it.</span>`); slave.devotion += 1; } - } else if (slave.fetish === "humiliation" && App.Data.clothes.get(slave.clothes).exposure === 2) { + } else if (slave.fetish === "humiliation" && App.Data.clothes.get(slave.clothes).exposure === 3) { if (slave.fetishKnown === 0) { r.push(`${He} pretends to be embarrassed by ${his} extremely revealing clothing but seems to get off on it. <span class="lightcoral">${He}'s into humiliation.</span>`); slave.fetishKnown = 1; @@ -324,7 +324,7 @@ App.SlaveAssignment.clothes = (function() { // humiliating clothing effects if (slave.fetishKnown === 0 || slave.fetish === "none") { - if (App.Data.clothes.get(slave.clothes).exposure === 2) { + if (App.Data.clothes.get(slave.clothes).exposure === 3) { if (fetishChangeChance(slave) > jsRandom(0, 100)) { r.push(`Surprisingly, ${he} takes to ${his} extremely revealing clothing, and gets an obvious thrill from it. <span class="lightcoral">${He}'s become a humiliation fetishist!</span>`); slave.fetish = "humiliation"; diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js index b1b24ec85bc..167dbaa3b3e 100644 --- a/src/interaction/siWardrobe.js +++ b/src/interaction/siWardrobe.js @@ -932,10 +932,10 @@ App.UI.SlaveInteract.wardrobe = function(slave) { /* which clothes have these is decided in miscData.js */ let clothTooltip = Cloth + ""; switch (App.Data.clothes.get(slave.clothes).exposure) { - case 2: + case 3: clothTooltip += ", it's humiliating"; break; - case 1: + case 2: clothTooltip += ", it's slutty"; break; case 0: diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js index 6abc730fc72..4c94e5f4086 100644 --- a/src/js/statsChecker/statsChecker.js +++ b/src/js/statsChecker/statsChecker.js @@ -472,7 +472,7 @@ globalThis.bimboScore = function(slave) { if (slave.skin === "sun tanned" || slave.skin === "spray tanned") { degree++; } - if (App.Data.clothes.get(slave.clothes).exposure === 1) { + if (App.Data.clothes.get(slave.clothes).exposure === 2) { degree++; } -- GitLab