diff --git a/game/base-clothing/clothing-sets.twee b/game/base-clothing/clothing-sets.twee index e23046127c7aa7510adde17ae3d06fae0e16d7d2..5b0cddb8335faa01bfcf7d19fbab4ca4cf9718a9 100644 --- a/game/base-clothing/clothing-sets.twee +++ b/game/base-clothing/clothing-sets.twee @@ -111,9 +111,7 @@ <span class="grey"><<print _outfit.name>> (Equipped)</span> <<else>> <<link [["Wear "+_outfit.name|$passage]]>> - <<if clothingInStorage(_store_location).length is 0>> - <<storesave _store_location>> - <</if>> + <<storesave _store_location>> <<set $wearoutfittext to _outfit.name>> <<set $eventskip to 1>> <<set $wear_outfit to _index>> diff --git a/game/base-clothing/storeActions.twee b/game/base-clothing/storeActions.twee index b00764a4abaedfacaebbf0fee2dc1adedf1671cb..b2d2c35fb84f9c9ed1b050dda782f3586e05cdfc 100644 --- a/game/base-clothing/storeActions.twee +++ b/game/base-clothing/storeActions.twee @@ -11,8 +11,7 @@ <<elseif _temp_strip is "wolfcave">> You remove your $worn.over_upper.name. They may be animals, but stripping in front of them makes a chill run through your spine. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.over_upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.over_upper.name. Despite being alone, doing this in a public space makes a chill run through your spine. @@ -28,8 +27,7 @@ <<elseif _temp_strip is "wolfcave">> You remove your $worn.over_upper.name. They may be animals, but stripping in front of them makes your <<nipples>> erect and your newly-exposed skin tingle. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.over_upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.over_upper.name. Despite being alone, doing this in a public space makes your <<nipples>> erect and your newly-exposed skin tingle. @@ -45,8 +43,7 @@ <<elseif _temp_strip is "wolfcave">> You remove your $worn.over_lower.name. They may be animals, but stripping in front of them makes you shiver delightfully. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.over_lower.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.over_lower.name. Despite being alone, doing this in a public space makes you shiver delightfully. @@ -60,8 +57,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.upper.name. They may be animals, but stripping in front of them makes a chill run through your spine. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.upper.name. Despite being alone, doing this in a public space makes a chill run through your spine. @@ -75,8 +71,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.upper.name. They may be animals, but stripping in front of them makes your <<nipples>> erect and your newly-exposed skin tingle. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.upper.name. Despite being alone, doing this in a public space makes your <<nipples>> erect and your newly-exposed skin tingle. @@ -90,8 +85,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.lower.name. They may be animals, but stripping in front of them makes you shiver delightfully. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.lower.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.lower.name. Despite being alone, doing this in a public space makes you shiver delightfully. @@ -105,8 +99,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.under_upper.name. They may be animals, but stripping in front of them makes a chill run through your spine. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.under_upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.under_upper.name. Despite being alone, doing this in a public space makes a chill run through your spine. @@ -120,8 +113,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.under_upper.name. They may be animals, but stripping in front of them makes your skin and <<genitals 1>> tingle. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.under_upper.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.under_upper.name. Despite being alone, doing this in a public space makes your skin and <<genitals 1>> tingle. @@ -135,8 +127,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.under_lower.name. They may be animals, but stripping in front of them makes your skin and <<genitals 1>> tingle. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.under_lower.name.<<if $bird.activity is "bathe">> The <<beasttype>> doesn't seem to mind your exposure.<</if>> <<else>> You check to make sure no one is around, then slowly remove your $worn.under_lower.name. Despite being alone, doing this in a public space makes your skin and <<genitals 1>> tingle. @@ -150,8 +141,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.legs.name. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.legs.name<<if $worn.feet.type.includes("naked")>> and dip your feet into the water<</if>>.<<if $bird.activity is "bathe">> The <<beasttype>> looks at your legs, then at <<bhis>> own quizically.<</if>> <<else>> You remove your $worn.legs.name. @@ -165,8 +155,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.feet.name. You're glad you aren't the only one barefoot here. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.feet.name<<if $worn.legs.type.includes("naked")>> and dip your feet into the water<</if>>.<<if $bird.activity is "bathe" and $monster is 1>> The <<beasttype>> almost looks envious of your ability to hide your "talons".<</if>> <<else>> You remove your $worn.feet.name. @@ -180,8 +169,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.neck.name. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.neck.name. <<else>> You remove your $worn.neck.name. @@ -195,8 +183,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.over_head.name. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.over_head.name. <<else>> You remove your $worn.over_head.name. @@ -210,8 +197,7 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.head.name. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> + <<elseif _temp_strip is "birdtower">> You remove your $worn.head.name. <<else>> You remove your $worn.head.name. @@ -222,16 +208,8 @@ <<if $action_unclad_face is 1>> <<unset $action_unclad_face>> - <<if _temp_strip is "wolfcave">> - You remove your $worn.face.name. - <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> - You remove your $worn.face.name. - <<else>> - You remove your $worn.face.name. - <br> - <</if>> + You remove your $worn.face.name. + <br> <<faceundress _temp_strip>> <</if>> @@ -240,9 +218,6 @@ <<if _temp_strip is "wolfcave">> You remove your $worn.hands.name. You try to think up a pun about being "bear handed", but then remember you're surrounded by wolves, not bears. <br> - <<elseif $location is "pool">> - <<elseif $location is "tower">> - You remove your $worn.hands.name. <<else>> You remove your $worn.hands.name. <br> @@ -258,7 +233,7 @@ <</for>> <</for>> -<<if _temp_clothes_present is 1>> +<<if _temp_clothes_present is 1 and _temp_strip isnot "lakeshore">> <br> <<link [[Get dressed|$passage]]>><<storeon _temp_strip "noreplace">><<set $eventskip to 1>><</link>> <br> @@ -296,7 +271,7 @@ <<if !$worn.over_lower.cursed and $worn.over_lower.name isnot "naked" and !_overOutfit>> <!-- over_lower can be stripped --> - <<if $exhibitionism gte 15 or _lower_protected or _under_lower_protected>> + <<if $exhibitionism gte 35 or _lower_protected or _under_lower_protected>> <<set _stripOptions[$worn.over_lower.name] to "stripOverLower">> <</if>> <</if>> @@ -314,7 +289,7 @@ <</if>> <<if !$worn.lower.cursed and $worn.lower.name isnot "naked" and !_middleOutfit>> - <<if $exhibitionism gte 15 or _over_lower_protected or _under_lower_protected>> + <<if $exhibitionism gte 35 or _over_lower_protected or _under_lower_protected>> <<set _stripOptions[$worn.lower.name] to "stripLower">> <</if>> <</if>> @@ -332,7 +307,7 @@ <</if>> <<if !$worn.under_lower.cursed and $worn.under_lower.name isnot "naked" and !_underOutfit>> - <<if $exhibitionism gte 15 or _over_lower_protected or _lower_protected>> + <<if $exhibitionism gte 35 or _over_lower_protected or _lower_protected>> <<set _stripOptions[$worn.under_lower.name] to "stripUnderLower">> <</if>> <</if>> @@ -366,7 +341,7 @@ <</if>> <<if Object.keys(_stripOptions).length gt 0>> - Remove<<if $location isnot "tower">> and hide<</if>> your... + Remove<<if _temp_strip isnot "birdtower">> and hide<</if>> your... <<listbox "$storeActions">> <<optionsfrom _stripOptions>> @@ -393,8 +368,8 @@ <<default>> <</switch>> <</link>> -<</if>> <br><br> +<</if>> <<exposure>> diff --git a/game/base-clothing/widgets.twee b/game/base-clothing/widgets.twee index 70e6a0d5ef12fb3e7e893130452de2d7f5fee136..921202ed9934eeca9018b7703f39e56a07e7bb4d 100644 --- a/game/base-clothing/widgets.twee +++ b/game/base-clothing/widgets.twee @@ -1208,6 +1208,8 @@ <</for>> <<run delete V.outfitTmp[_args[0]]>> <</if>> + <<elseif _args[0] isnot undefined and clothingInStorage(_args[0]).length gt 0>> + <<storeon _args[0] "noreplace">> <</if>> <</widget>> diff --git a/game/overworld-forest/loc-lake/main.twee b/game/overworld-forest/loc-lake/main.twee index e8d2fe0c7ea40c3cf94f3cb437ced036d9b4c420..eb586ae23747683c7afee3ce714a88ed75987c7b 100644 --- a/game/overworld-forest/loc-lake/main.twee +++ b/game/overworld-forest/loc-lake/main.twee @@ -60,8 +60,10 @@ You keep low and stay among the trees to keep your <<lewdness>> hidden. <<eventlakesafe>> <<lakereturnjourney>> -There's a rocky alcove where you could store your clothes. -<br> +<<if clothingInStorage("lakeshore").length lt 1>> + There's a rocky alcove where you could store your clothes. + <br> +<</if>> <<lakeclothes>> The lake shimmers with your reflection, diff --git a/game/overworld-forest/loc-lake/widgets.twee b/game/overworld-forest/loc-lake/widgets.twee index eb2e89af40830393f3e735465e794dfc1d673747..cef2d03033ec350ad4d743515fe41b1ce043f4cc 100644 --- a/game/overworld-forest/loc-lake/widgets.twee +++ b/game/overworld-forest/loc-lake/widgets.twee @@ -532,6 +532,8 @@ A pair of eyes stares at you from between the trees, then vanishes. <<widget "lakeclothes">> <<if !$possessed>> + <br> + <<storeactions "lakeshore">> <<wardrobeSelection true>> <<wearoutfit>> <<set _store_location to "lakeshore">> @@ -539,7 +541,6 @@ A pair of eyes stares at you from between the trees, then vanishes. <<if _store_check is 1>> <<set _clothes to clothingInStorage(_store_location)>> <<if _clothes.length gt 0>> - <br> <<if _clothes.length gt 2>> Your clothes are lying on the ground behind a rock. <br> @@ -551,10 +552,9 @@ A pair of eyes stares at you from between the trees, then vanishes. <br> <</if>> <<dressasyouwereicon>><<link [[Put on clothes|$passage]]>><<set $eventskip to 1>><<storeload _store_location>><</link>> - <br> + <br><br> <</if>> <</if>> - <br> //Swimming sets:// <br> <<listswimoutfits $wardrobe_location _store_location true>>