Przeglądaj źródła

Clothing updates / changes

KevinSmarts 7 lat temu
rodzic
commit
6b44b78cc6

+ 2 - 1
glife-notepad++

@@ -731,13 +731,14 @@
             <File name="locations\zoomagazine" />
             <File name="locations\zsoft_gopskverGorSlut" />
             <File name="locations\_attributes_average" />
+            <File name="locations\_attributes_burlesque" />
             <File name="locations\_attributes_cheap" />
             <File name="locations\_attributes_coat" />
             <File name="locations\_attributes_exercise" />
             <File name="locations\_attributes_exhibit" />
             <File name="locations\_attributes_expensive" />
+            <File name="locations\_attributes_fetish" />
             <File name="locations\_attributes_formal" />
-            <File name="locations\_attributes_naughty" />
             <File name="locations\_attributes_office" />
             <File name="locations\_attributes_school" />
             <File name="locations\_attributes_swimwear" />

+ 2 - 1
glife.qproj

@@ -33,11 +33,12 @@
       <Location name="$attributes_office"/>
       <Location name="$attributes_school"/>
       <Location name="$attributes_exercise"/>
-      <Location name="$attributes_naughty"/>
+      <Location name="$attributes_fetish"/>
       <Location name="$attributes_exhibit"/>
       <Location name="$attributes_uniform"/>
       <Location name="$attributes_coat"/>
       <Location name="$attributes_swimwear"/>
+      <Location name="$attributes_burlesque"/>
     </Folder>
     <Folder name="Stats">
       <Location name="body"/>

+ 1 - 1
locations/Prostitute

@@ -82,7 +82,7 @@ if $ARGS[0] = 'start':
 		elseif whoreQW = 2:
 			'The prostitutes look at you curiously for a moment, but quickly turn their attention back to trying to attract customers.'
 
-			if $clothingworntype = 'naughty' and PCloQuality < 4 and pcs_sleep > 0:
+			if PCloStyle = 4 and pcs_sleep > 0:
 				act 'Stand and wait for customers (0:16)':
 					cla
 					minut += 10

+ 6 - 7
locations/_attributes_naughty → locations/_attributes_burlesque

@@ -1,12 +1,11 @@
-# $attributes_naughty
+# $attributes_burlesque
 
-!Quality range is 2-6. 2 for cheap street hooker outfits, 4 for simple underwear (bra and panties), 5 for more complex lingerie. 6 is for one-of-a-kind unique outfits.
-!All underwear items should have the exhibitionist flag (CloStyle = 4)
+!Quality range is 2-6.
 if ARGS[1] = 1:
-	CloQuality = 2
-	CloThinness = 5
+	CloQuality = 4
+	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloSkirtShortness = 2
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 5
@@ -388,5 +387,5 @@ elseif ARGS[1] = 67:
 	CloSkirtShortness = 5
 end
 
---- $attributes_naughty ---------------------------------
+--- $attributes_burlesque ---------------------------------
 

+ 31 - 31
locations/_attributes_exhibit

@@ -1,123 +1,123 @@
 # $attributes_exhibit
 
-! All items must have the "CloStyle = 4" tag. Quality range is 3-6 or so.
+! Quality range is 3-6 or so.
 if ARGS[1] = 1:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 12:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 13:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 18:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 	CloBimbo = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 19:
@@ -126,13 +126,13 @@ elseif ARGS[1] = 19:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 	CloOnePiece = 1
 elseif ARGS[1] = 21:
 	CloQuality = 4
@@ -140,65 +140,65 @@ elseif ARGS[1] = 21:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 26:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 28:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 29:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 end
 
 --- $attributes_exhibit ---------------------------------

+ 6 - 6
locations/_attributes_expensive

@@ -61,7 +61,7 @@ elseif ARGS[1] = 11:
 	CloTopCut = 1
 	CloPantsShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 15
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 5
@@ -339,7 +339,7 @@ elseif ARGS[1] = 63:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 20
 elseif ARGS[1] = 64:
 	CloQuality = 5
 	CloThinness = 3
@@ -368,7 +368,7 @@ elseif ARGS[1] = 68:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 20
 elseif ARGS[1] = 69:
 	CloQuality = 5
 	CloThinness = 4
@@ -441,7 +441,7 @@ elseif ARGS[1] = 81:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 25
 elseif ARGS[1] = 82:
 	CloQuality = 5
 	CloThinness = 4
@@ -540,7 +540,7 @@ elseif ARGS[1] = 99:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 10
 elseif ARGS[1] = 100:
 	CloQuality = 5
 	CloThinness = 4
@@ -575,7 +575,7 @@ elseif ARGS[1] = 105:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 25
 elseif ARGS[1] = 106:
 	CloQuality = 5
 	CloThinness = 4

+ 294 - 0
locations/_attributes_fetish

@@ -0,0 +1,294 @@
+# $attributes_fetish
+
+!!Quality range is 2-6.
+if ARGS[1] = 1:
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 2
+elseif ARGS[1] = 2:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	ClopantsShortness = 1
+elseif ARGS[1] = 3:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 2
+elseif ARGS[1] = 4:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 1
+elseif ARGS[1] = 5:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 6:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	ClopantsShortness = 2
+elseif ARGS[1] = 7:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+elseif ARGS[1] = 8:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	ClopantsShortness = 6
+elseif ARGS[1] = 9:
+	CloQuality = 5
+	CloThinness = 6
+	CloTopCut = 3
+	CloSkirtShortness = 5
+elseif ARGS[1] = 10:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 11:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 12:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 13:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+elseif ARGS[1] = 14:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 15:
+	CloQuality = 5
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+elseif ARGS[1] = 16:
+	CloQuality = 5
+	CloThinness = 6
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 17:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 18:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 2
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 19:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 4
+elseif ARGS[1] = 20:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 21:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 22:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 5
+elseif ARGS[1] = 23:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 2
+elseif ARGS[1] = 24:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+elseif ARGS[1] = 25:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 4
+	CloPantsShortness = 2
+elseif ARGS[1] = 26:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 27:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 28:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 29:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+elseif ARGS[1] = 30:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 31:
+	CloQuality = 4
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 32:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 33:
+	CloQuality = 6
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 34:
+	CloQuality = 5
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 4
+elseif ARGS[1] = 35:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+elseif ARGS[1] = 36:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 37:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 5
+elseif ARGS[1] = 38:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+elseif ARGS[1] = 39:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+elseif ARGS[1] = 40:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 5
+elseif ARGS[1] = 41:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 42:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 4
+elseif ARGS[1] = 43:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 44:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 45:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 46:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 47:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 48:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 49:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
+elseif ARGS[1] = 50:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 4
+	CloPantsShortness = 1
+elseif ARGS[1] = 51:
+	CloQuality = 6
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 52:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 1
+	CloOnePiece = 1
+elseif ARGS[1] = 53:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 1
+	CloStyle = 2
+elseif ARGS[1] = 54:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 1
+end
+
+--- $attributes_fetish ---------------------------------
+

+ 4 - 4
locations/_attributes_office

@@ -73,9 +73,9 @@ elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 6
+	CloPanties = 1
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 30
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 4
@@ -154,13 +154,13 @@ elseif ARGS[1] = 29:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 35
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 6
-	CloStyle = 4
+	CloExibit = 25
 end
 
 --- $attributes_office ---------------------------------

+ 4 - 4
locations/_attributes_school

@@ -29,7 +29,7 @@ elseif ARGS[1] = 5:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 30
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
@@ -47,21 +47,21 @@ elseif ARGS[1] = 8:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 35
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 30
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 40
 elseif ARGS[1] = 11:
 	CloQuality = 3
 	CloThinness = 5

+ 17 - 6
locations/_attributes_uniform

@@ -13,7 +13,7 @@ elseif ARGS[1] = 2:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 50
 	CloStyle2 = 1
 elseif ARGS[1] = 3:
 	CloQuality = 4
@@ -21,7 +21,7 @@ elseif ARGS[1] = 3:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 50
 	CloStyle2 = 1
 elseif ARGS[1] = 4:
 	CloQuality = 4
@@ -29,15 +29,14 @@ elseif ARGS[1] = 4:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 35
 	CloStyle2 = 1
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 25
 	CloStyle2 = 1
 elseif ARGS[1] = 6:
 	CloQuality = 5
@@ -45,7 +44,7 @@ elseif ARGS[1] = 6:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloStyle = 4
+	CloExibit = 20
 	CloStyle2 = 1
 elseif ARGS[1] = 7:
 	CloQuality = 4
@@ -194,6 +193,18 @@ elseif ARGS[1] = 30:
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle2 = 3
+elseif ARGS[1] = 31:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloPanties = 1
+	CloStyle2 = 3
+elseif ARGS[1] = 32:
+	CloQuality = 2
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 5
+	CloStyle2 = 3
 end
 
 --- $attributes_uniform ---------------------------------

+ 5 - 3
locations/_clothing_image

@@ -17,8 +17,8 @@ elseif $ARGS[0] = 'school':
 	$RESULT = 'images/pc/clothing/6school/school<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'exercise':
 	$RESULT = 'images/pc/clothing/7exercise/exercise<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'naughty':
-	$RESULT = 'images/pc/clothing/8naughty/naughty<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'fetish':
+	$RESULT = 'images/pc/clothing/8fetish/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'exhibit':
 	$RESULT = 'images/pc/clothing/9exhibit/exhibit<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'uniform':
@@ -26,7 +26,9 @@ elseif $ARGS[0] = 'uniform':
 elseif $ARGS[0] = 'coat':
 	$RESULT = 'images/pc/clothing/11coat/coat<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'swimwear':
-	$RESULT = 'images/pc/clothing/12swimwear/swimwear<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/clothing/12swimwear/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'burlesque':
+	$RESULT = 'images/pc/clothing/12burlesque/<<ARGS[1]>>.jpg'
 end
 
 --- $clothing_image ---------------------------------

+ 6 - 2
locations/_short_description

@@ -14,8 +14,8 @@ elseif $ARGS[0] = 'school':
 	$RESULT = 'School uniform number '
 elseif $ARGS[0] = 'exercise':
 	$RESULT = 'Exercise outfit number '
-elseif $ARGS[0] = 'naughty':
-	$RESULT = 'Erotic clothing number '
+elseif $ARGS[0] = 'fetish':
+	$RESULT = 'Fetish outfit number '
 elseif $ARGS[0] = 'exhibit':
 	$RESULT = 'Revealing outfit number '
 elseif $ARGS[0] = 'uniform':
@@ -23,11 +23,15 @@ elseif $ARGS[0] = 'uniform':
 		$RESULT = 'Maid outfit number '
 	elseif $ARGS[1] = 2:
 		$RESULT = 'Server uniform number '
+	elseif $ARGS[1] = 3:
+		$RESULT = 'Stripper outfit number '
 	end
 elseif $ARGS[0] = 'coat':
 	$RESULT = 'Coat number '
 elseif $ARGS[0] = 'swimwear':
 	$RESULT = 'Swimwear number '
+elseif $ARGS[0] = 'burlesque':
+	$RESULT = 'Burlesque outfit number '
 end
 
 --- $short_description ---------------------------------

+ 2 - 2
locations/bordel

@@ -33,7 +33,7 @@ if $ARGS[0] = 'brothel':
 	'In the middle is a huge bed, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
 
 	act 'Leave':
-		if ($clothingworntype ! 'naughty' or CloQuality ! 2) and $clothingworntype ! 'nude':
+		if $clothingworntype ! 'burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
 			gt 'down'
 		else
 			cla
@@ -50,7 +50,7 @@ if $ARGS[0] = 'brothel':
 			'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
 
 			act 'Go to the bathroom':gt 'bordel', 'dysh'
-		elseif ($clothingworntype ! 'naughty' or CloQuality ! 2) and $clothingworntype ! 'nude':
+		elseif $clothingworntype ! 'burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
 			cla
 			'You need to wear an outfit that can be used for prostitution. if you haven''t got anything suitable and you are desperate, you could work naked but you will get paid less and might get treated badly.'
 			'You can change your clothes in the bathroom.'

+ 2 - 2
locations/boy

@@ -316,7 +316,7 @@ vneshBoy = npc_app[$npclastgenerated]
 
 !!This is for clothing type preference
 !! If you notice how rare it is to get a preference that is intentional
-!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - naughty.
+!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 randchan = rand(0, 4)
 
 if randchan = 4:
@@ -362,7 +362,7 @@ end
 
 
 !!This is for the quality of clothing
-!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if naughty is chosen)
+!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 randchan = rand(0, 5)
 if randchan = 5:
 	if finance = 0:

+ 5 - 5
locations/boy_likes

@@ -34,11 +34,11 @@ husbAge = boyage
 pervConstant = izvrat
 
 !!This is for clothing type preference
-!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - naughty.
+!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 clotTypePref = clotTypePrefA
 
 !!This is for the quality of clothing
-!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if naughty is chosen)
+!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 clotQualPref = clotQualPrefA
 
 !!Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
@@ -102,7 +102,7 @@ IQPref = IQPrefA
 !!Putting his preferences into words
 
 
-!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - naughty.
+!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 if clotTypePref = 0:
 	$clotTypePref = ''
 elseif clotTypePref = 1:
@@ -112,10 +112,10 @@ elseif clotTypePref = 2:
 elseif clotTypePref = 3:
 	$clotTypePref = 'formal'
 elseif clotTypePref = 4:
-	$clotTypePref = 'naughty'
+	$clotTypePref = 'fetish'
 end
 
-!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if naughty is chosen)
+!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 if clotQualPref = 0:
 	$clotQualPref = 'any type of'
 elseif clotQualPref = 1:

+ 15 - 6
locations/clothing

@@ -45,7 +45,7 @@ $clothing_list_line = {
 		$RESULT += '<TD>No</TD>'
 	end
 
-	if $ARGS[1] = 'naughty' and CloQuality < 4:
+	if CloStyle = 4:
 		$RESULT += '<TD>Yes</TD>'
 	else
 		$RESULT += '<TD>No</TD>'
@@ -178,10 +178,10 @@ if $ARGS[0] = 'view_clothing_list':
 	if i <= 26:jump 'loopexercise'
 
 	i = 1
-	:loopnaughty
-		if naughty[i] = 1 and naughtyS[i] = cloc and ($clothingworntype ! 'naughty' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'naughty', i)
+	:loopfetish
+		if fetish[i] = 1 and fetishS[i] = cloc and ($clothingworntype ! 'fetish' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fetish', i)
 		i += 1
-	if i <= 67:jump 'loopnaughty'
+	if i <= 67:jump 'loopfetish'
 
 	i = 1
 	:loopexhibit
@@ -195,6 +195,12 @@ if $ARGS[0] = 'view_clothing_list':
 		i += 1
 	if i <= 24:jump 'loopuniform'
 
+	i = 1
+	:loopburlesque
+		if burlesque[i] = 1 and burlesqueS[i] = cloc and ($clothingworntype ! 'burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'burlesque', i)
+		i += 1
+	if i <= 24:jump 'loopburlesque'
+
 	i = 1
 	:loopswimwear
 		if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
@@ -226,10 +232,13 @@ if $ARGS[0] = 'view_clothing_item':
 
 	if CloBimbo = 1:'This item is considered bimbo clothing.'
 
-	if $ARGS[2] = 'naughty' and CloQuality < 4:'This outfit can be used for prostitution.'
+	if CloStyle = 4:'This outfit can be used for prostitution.'
+
 	if $ARGS[2] = 'uniform':
 		if CloStyle2 = 1:
 			'This outfit is considered to be a maid uniform.'
+		elseif CloStyle2 = 3:
+			'This is a stripper outfit.'
 		else
 			'This outfit is a server uniform, suitable for jobs that require one.'
 		end
@@ -283,7 +292,7 @@ if $ARGS[0] = 'view_clothing_item':
 						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
 					elseif $ARGS[2] = 'formal':
 						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'
-					elseif $ARGS[2] = 'naughty' or $ARGS[2] = 'exhibit':
+					elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'burlesque':
 						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 35 + <<h>>'
 					elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
 						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 120 + <<h>>'

+ 10 - 4
locations/clothing_QV

@@ -88,10 +88,10 @@ if $ARGS[0] = 'list':
 	if i <= 26:jump 'loopexercise'
 
 	i = 1
-	:loopnaughty
-		if naughty[i] = 1 and naughtyS[i] = 0 and naughtyH[i] > 0 and naughtyB[i] >= (pcs_hips - 8) and naughtyB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''naughty'', <<i>>"><img src="images/pc/clothing/8naughty/naughty<<i>>.jpg" 	height="250" /></a>'
+	:loopfetish
+		if fetish[i] = 1 and fetishS[i] = 0 and fetishH[i] > 0 and fetishB[i] >= (pcs_hips - 8) and fetishB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fetish'', <<i>>"><img src="images/pc/clothing/8fetish/<<i>>.jpg" 	height="250" /></a>'
 		i += 1
-	if i <= 67:jump 'loopnaughty'
+	if i <= 54:jump 'loopfetish'
 
 	i = 1
 	:loopexhibit
@@ -104,6 +104,12 @@ if $ARGS[0] = 'list':
 		if uniform[i] = 1 and uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] >= (pcs_hips - 8) and uniformB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/uniform<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 24:jump 'loopuniform'
+
+	i = 1
+	:loopburlesque
+		if burlesque[i] = 1 and burlesqueS[i] = 0 and burlesqueH[i] > 0 and burlesqueB[i] >= (pcs_hips - 8) and burlesqueB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''burlesque'', <<i>>"><img src="images/pc/clothing/13burlesque/<<i>>.jpg" 	height="250" /></a>'
+		i += 1
+	if i <= 24:jump 'loopburlesque'
 end
 
 if $ARGS[0] = 'cloak':
@@ -148,7 +154,7 @@ if $ARGS[0] = 'change':
 
 	if CloBimbo = 1:'This item is considered bimbo clothing.'
 
-	if $ARGS[1] = 'naughty' and CloQuality < 4:'This outfit can be used for prostitution.'
+	if PCloStyle = 4:'This outfit can be used for prostitution.'
 	if $ARGS[1] = 'uniform':
 		if CloStyle2 = 1:
 			'This outfit is considered to be a maid uniform.'

+ 12 - 10
locations/clothing_attributes

@@ -1,16 +1,16 @@
 # clothing_attributes
 
 !! **Clothing Organization
-!! CloCategory: 1 Cheap, 2 Average, 3 Expensive, 4 Formal, 5 Office, 6 School, 7 Exercise, 8 Naughty, 9 Exhibit, 10 Uniform, 11 Coat, 12 Swimwear
-!!		Notes: 1-3 are general purpose clothing, 4-7 are self-explanitory, 8 is basically all the stuff youd get at a lingere and sex shop (fetishwear, latex, underwear), 9 is more extreme stuff than 8 that would get you arrested on sight for indecent exposure. 10 is waitress and maid uniforms.
-!! CloStyle: 1 Girly, 2 Rebel, 3 Wealthy, 4 [unused], 5 is Loosefit
-!!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for sterotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff only worn only by exhibitionists (exposes privates, etc). 5 is formless clothing that doesnt requiring refitting.
+!! CloCategory: 1 Cheap, 2 Average, 3 Expensive, 4 Formal, 5 Office, 6 School, 7 Exercise, 8 Fetish, 9 Exhibit, 10 Uniform, 11 Coat, 12 Swimwear, 13 Burlesque
+!!		Notes: 1-3 are general purpose clothing, 4-7 are self-explanatory, 8 is fetish wear, latex and leather. 9 is extreme clothing that exposes your body and likely to get you arrested . 10 is waitress, maid and stripper uniforms. 13 is for burlesque shows or a bordello
+!! CloStyle: 1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
+!!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff only worn only by exhibitionists (exposes privates, etc). 5 is formless clothing that doesnt requiring refitting.
 !! CloStyle2: 1 Maid, 2 Server, 3 Stripper
 !!		Notes: Used to distinguish between the main types of uniform.
 !! CloExibit: 0-100 Exhibitionism value required to wear the outfit
 !!
 !! **Clothing Variables
-!! Scales use a 1-5 ramge. with 6 being a special case thats esssentialy nudity.
+!! Scales use a 1-5 range. with 6 being a special case thats essentially nudity.
 !!
 !! CloQuality = 1-7 scale, based on the general expensiveness of the clothing. Higher is more expensive.
 !!		Notes: 7 is reserved for ballroom gowns, and other clothing that might only be found on celebrities or millionaires at red carpet events.
@@ -38,13 +38,13 @@
 !! CloSkirtShortness = 1-6 scale. Higher values are shorter.
 !!		Notes: 	 Loose skirts sometimes rank higher than tight skirts of the same length, since they are more likely to flash others.
 !!		Ex: 	6 is short enough to reveal pubic areas at all times 
-!!				5 is ~20% thigh length or less (microskirt), and can reveal underwear frequently 
+!!				5 is ~20% thigh length or less (micro-skirt), and can reveal underwear frequently 
 !!				4 is ~40% thigh length (miniskirt) and may show underwear if bending over 
 !!				3 is up to ~60% thigh length (skirt) and normally never reveals underwear 
 !!				2 is ending immediately above, at or below the knees (knee-length) 
 !!				1 is ankle-length.
 !! CloPantsShortness = 1-6 scale. Higher values are shorter.
-!!		Notes: 	 Intentionally seperate variable from skirt length to prevent wording confusion during events (e.g., lifting a dress or skirt versus pulling down pants or shorts)
+!!		Notes: 	 Intentionally separate variable from skirt length to prevent wording confusion during events (e.g., lifting a dress or skirt versus pulling down pants or shorts)
 !!		Ex: 	6 are high-cut shorts (legs end significantly above the crotch, usually reveals a large amount of the ass cheek)
 !!				5 is mini shorts (legs do not reach below the crotch)
 !!				4 are shorts (close to mid thigh)
@@ -52,7 +52,7 @@
 !!				2 is calf length
 !!				1 is ankle length
 !! CloPanties = 1 for yes
-!!		Ex:		1 The bottoms of this outfit are no more than panties and it will replace your panties (if worn)
+!!		Ex:		1 The bottom of this outfit offers no more coverage than panties and it will replace your panties (if worn)
 !! CloOnePiece = 1
 !!		Notes:	 Flag for event writing; excludes skirted/dress outfits. Denotes that in order to have sex, the clothing must be pulled to the side, unlike shorts which can be pulled down, or skirts which may be lifted. 
 !! CloBimbo = 1
@@ -80,8 +80,8 @@ elseif $ARGS[0] = 'school':
 	*P FUNC('$attributes_school', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exercise':
 	*P FUNC('$attributes_exercise', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'naughty':
-	*P FUNC('$attributes_naughty', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'fetish':
+	*P FUNC('$attributes_fetish', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exhibit':
 	*P FUNC('$attributes_exhibit', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'uniform':
@@ -90,6 +90,8 @@ elseif $ARGS[0] = 'coat':
 	*P FUNC('$attributes_coat', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'swimwear':
 	*P FUNC('$attributes_swimwear', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'burlesque':
+	*P FUNC('$attributes_burlesque', $ARGS[0], ARGS[1])
 end
 
 --- clothing_attributes ---------------------------------

+ 1 - 0
locations/clothing_descriptions

@@ -80,6 +80,7 @@ if CloSkirtShortness > 0:
       $description = $description + ' and a microskirt not even long enough to hide your privates'
    end
 end
+if CloPanties = 1:$description += 'the bottom of which is so skimpy it replaces your panties.'
 
 --- clothing_descriptions ---------------------------------
 

+ 2 - 2
locations/club

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 				minut += 5
 				'He nods and says something into his walkie-talkie. A couple of minutes later you meet Erik in the foyer.'
 				act 'Talk to him':gt 'club', 'work'
-			elseif $clothingworntype = 'naughty' and PCloQuality < 4:
+			elseif PCloStyle = 4:
 				'He shakes his head, if you''re looking for paying clients, try the road by the park this is not a brothel.'
 				act 'Continue':gt 'club', 'start'
 			elseif pcs_sweat >= 30:
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 				money -= 250
 				frost = 0
 				gt 'club', 'inside'
-			elseif $clothingworntype = 'naughty' and PCloQuality < 4:
+			elseif PCloStyle = 4:
 				cla
 				'He shakes his head, if you''re looking for paying clients, try the road by the park this is not a brothel.'
 				act 'Continue':gt 'club', 'start'

+ 3 - 3
locations/gopsex

@@ -998,9 +998,9 @@ if $ARGS[0] = 'gopsex_select':
 	gop_groupsex_lubri = 0
 	gs 'gopsex', 'settings'
 	gs'stat'
-	if pcs_horny <50 and ($clothingworntype ! 'naughty' or CloQuality ! 2): '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/b'+rand(1,17)+'.jpg"></center> <br> You want sex.'
-	if pcs_horny >=50 and ($clothingworntype ! 'naughty' or CloQuality ! 2): '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg"></center> <br> You overexcited and strongly want to fuck.'
-	if $clothingworntype = 'naughty' and CloQuality = 2: '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/h'+rand(1,17)+'.jpg"></center>'
+	if pcs_horny <50 and PCloStyle ! 4: '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/b'+rand(1,17)+'.jpg"></center> <br> You want sex.'
+	if pcs_horny >=50 and PCloStyle ! 4: '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg"></center> <br> You overexcited and strongly want to fuck.'
+	if PCloStyle = 4: '<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/gopsex/body/h'+rand(1,17)+'.jpg"></center>'
 	act 'Have sex with Vaska': 
 		if shgopsex_vasya_count <= 0:
 			cla

+ 5 - 5
locations/meet

@@ -80,11 +80,11 @@ if $ARGS[0] = 'start':
 	pervConstant = izvrat
 	
 	!!This is for clothing type preference
-	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - naughty.
+	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 	clotTypePref = clotTypePrefA
 	
 	!!This is for the quality of clothing
-	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if naughty is chosen)
+	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 	clotQualPref = clotQualPrefA
 	
 	!!Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
@@ -354,7 +354,7 @@ if $ARGS[0] = 'start':
 	!!I WILL START HERE!
 	
 
-	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - naughty.
+	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 	if clotTypePref = 0:
 		$clotTypePref = ''
 	elseif clotTypePref = 1:
@@ -364,10 +364,10 @@ if $ARGS[0] = 'start':
 	elseif clotTypePref = 3:
 		$clotTypePref = 'formal'
 	elseif clotTypePref = 4:
-		$clotTypePref = 'naughty'
+		$clotTypePref = 'fetish'
 	end
 	
-	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if naughty is chosen)
+	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 	if clotQualPref = 0:
 		$clotQualPref = 'any type of'
 	elseif clotQualPref = 1:

+ 1 - 1
locations/park

@@ -486,7 +486,7 @@ if $ARGS[0] = 'prost':
 			gt 'fight', 'start'
 		end
 	end
-	if whoreQW > 1 and $clothingworntype = 'naughty' and CloQuality = 2:
+	if whoreQW > 1 and PCloStyle = 4:
 		act 'Search client (0:15)':
 			cla
 			*clr

+ 1 - 1
locations/placer_man

@@ -70,7 +70,7 @@ if mass_ver_zn > 0:
 		if know_status = 2:$text_znak = 'Hi honey!'
 	end
 
-	if $clothingworntype = 'naughty' and PCloQuality < 4:
+	if PCloStyle = 4:
 		randtext = rand(0, 5)
 
 		if randtext = 0:$txt_a = 'Nice clothes, slut!'

+ 2 - 2
locations/pod_whore

@@ -33,9 +33,9 @@ if pcs_hairbsh = 1: money_hapri = 50
 !glamorous clothes
 money_glamur = 0
 if $clothingworntype = 'formal' or $clothingworntype = 'expensive': money_glamur = 150
-!naughty clothing
+!!hooker clothing
 money_odethooker = 0
-if $clothingworntype = 'naughty': money_odethooker = 50
+if PCloStyle = 4: money_odethooker = 50
 !smooth and clean skin
 money_skin = 0
 if pcs_skin >= 60: money_skin = 50

+ 9 - 3
locations/portnoi

@@ -76,10 +76,10 @@ selltot = 0
 	if i <= 26:jump 'exercisemet'
 
 	i = 1
-	:naughtymet
-		if naughty[i] = 1 and naughtyS[i] = 2:dynamic($batch_sell, 'naughty', i)
+	:fetishmet
+		if fetish[i] = 1 and fetishS[i] = 2:dynamic($batch_sell, 'fetish', i)
 		i += 1
-	if i <= 67:jump 'naughtymet'
+	if i <= 54:jump 'fetishmet'
 
 	i = 1
 	:exhibitmet
@@ -105,6 +105,12 @@ selltot = 0
 		i += 1
 	if i <= 30:jump 'swimwearmet'
 
+	i = 1
+	:burlesquemet
+		if burlesque[i] = 1 and burlesqueS[i] = 2:dynamic($batch_sell, 'burlesque', i)
+		i += 1
+	if i <= 30:jump 'burlesquemet'
+
 killvar 'batch_sell'
 
 'You sold <<poshvalldrop>> items of unwanted clothing for a total of <<selltot>> <b>₽</b>.'

+ 36 - 24
locations/portnoi2

@@ -2,65 +2,71 @@
 poshvalldrop = 0
 
 i = 1
-:cheapmet
+:ycheapmet
 	if cheap[i] = 1 and ((cheapB[i] > pcs_hips + 8) or (cheapB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 85:jump 'cheapmet'
+if i <= 85:jump 'ycheapmet'
 
 i = 1
-:averagemet
+:yaveragemet
 	if average[i] = 1 and ((averageB[i] > pcs_hips + 8) or (averageB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 125:jump 'averagemet'
+if i <= 125:jump 'yaveragemet'
 
 i = 1
-:expensivemet
+:yexpensivemet
 	if expensive[i] = 1 and ((expensiveB[i] > pcs_hips + 8) or (expensiveB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 147:jump 'expensivemet'
+if i <= 147:jump 'yexpensivemet'
 
 i = 1
-:formalmet
+:yformalmet
 	if formal[i] = 1 and ((formalB[i] > pcs_hips + 8) or (formalB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 14:jump 'formalmet'
+if i <= 14:jump 'yformalmet'
 
 i = 1
-:officemet
+:yofficemet
 	if office[i] = 1 and ((officeB[i] > pcs_hips + 8) or (officeB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 30:jump 'officemet'
+if i <= 30:jump 'yofficemet'
 
 i = 1
-:schoolmet
+:yschoolmet
 	if school[i] = 1 and ((schoolB[i] > pcs_hips + 8) or (schoolB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
-if i <= 35:jump 'schoolmet'
+if i <= 35:jump 'yschoolmet'
 
 i = 1
-:naughtymet
-	if naughty[i] = 1 and ((naughtyB[i] > pcs_hips + 8) or (naughtyB[i] < pcs_hips - 8)):poshvalldrop += 1
+:yfetishmet
+	if fetish[i] = 1 and ((fetishB[i] > pcs_hips + 8) or (fetishB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 67:jump 'naughtymet'
+if i <= 54:jump 'yfetishmet'
 
 i = 1
-:exhibitmet
+:yexhibitmet
 	if exhibit[i] = 1 and ((exhibitB[i] > pcs_hips + 8) or (exhibitB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 30:jump 'exhibitmet'
+if i <= 30:jump 'yexhibitmet'
 
 i = 1
-:uniformmet
+:yuniformmet
 	if uniform[i] = 1 and ((uniformB[i] > pcs_hips + 8) or (uniformB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 24:jump 'uniformmet'
+if i <= 24:jump 'yuniformmet'
 
 i = 1
-:swimwearmet
+:yswimwearmet
 	if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= 30:jump 'swimwearmet'
+if i <= 30:jump 'yswimwearmet'
+
+i = 1
+:yburlesquemet
+	if burlesque[i] = 1 and ((burlesqueB[i] > pcs_hips + 8) or (burlesqueB[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= 30:jump 'yburlesquemet'
 
 poshvalldrop *= 500
 
@@ -115,10 +121,10 @@ elseif money >= poshvalldrop:
 	if i <= 35:jump 'xschoolmet'
 
 	i = 1
-	:xnaughtymet
-		if naughty[i] = 1 and ((naughtyB[i] > pcs_hips + 8) or (naughtyB[i] < pcs_hips - 8)):naughtyB[i] = pcs_hips
+	:xfetishmet
+		if fetish[i] = 1 and ((fetishB[i] > pcs_hips + 8) or (fetishB[i] < pcs_hips - 8)):fetishB[i] = pcs_hips
 		i += 1
-	if i <= 67:jump 'xnaughtymet'
+	if i <= 54:jump 'xfetishmet'
 
 	i = 1
 	:xexhibitmet
@@ -138,6 +144,12 @@ elseif money >= poshvalldrop:
 		i += 1
 	if i <= 30:jump 'xswimwearmet'
 
+	i = 1
+	:xburlesquemet
+		if burlesque[i] = 1 and ((burlesqueB[i] > pcs_hips + 8) or (burlesqueB[i] < pcs_hips - 8)):burlesqueB[i] = pcs_hips
+		i += 1
+	if i <= 30:jump 'xburlesquemet'
+
 	'You resize all clothing for <<poshvalldrop>> <b>₽</b>.'
 
 	if $loc = 'Gshveyfab':

+ 7 - 7
locations/sexshop

@@ -342,7 +342,7 @@ if $ARGS[0] = 'clo':
 	$loc = $CURLOC
 	cls
 	gs'stat'
-	'Sexy clothing - 1000 <b>₽</b> per outfit.'
+	'Fetish clothing - for all your personal needs.'
 
 	act 'Return':
 		cla
@@ -360,21 +360,21 @@ if $ARGS[0] = 'clo':
 		i -= 6
 	end
 
-	:loopnaughty
-		if naughty[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''naughty''"><img src="images/pc/clothing/8naughty/naughty<<i>>.jpg" 	height="250" /></a>'
+	:loopfetish
+		if fetish[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''fetish''"><img src="images/pc/clothing/8fetish/<<i>>.jpg" 	height="250" /></a>'
 		i += 6
-	if i <= 67:jump 'loopnaughty'
+	if i <= 67:jump 'loopfetish'
 end
 
-if $ARGS[0] = 'naughty':
+if $ARGS[0] = 'fetish':
 	cla
 	
-	if naughty[i] ! 0:
+	if fetish[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'sexshop', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'naughty',i, 1000
+	gt 'clothing', 'view_clothing_item', 'shop', 'fetish',i, 1000
 end
 
 if $ARGS[0] = 'podval':

+ 3 - 3
locations/shulga_room

@@ -147,13 +147,13 @@ if $ARGS[0] = 'start':
 	end
 
 	!If you came in dressed as a prostitute
-	if $clothingworntype = 'naughty' and sh_hooker_count > 0 and week < 6 and hour >= 0 and hour <= 2:
+	if PCloStyle = 4 and sh_hooker_count > 0 and week < 6 and hour >= 0 and hour <= 2:
 	 gt 'shulga_room', 'sh_hooker'
 	end 
-	if $clothingworntype = 'naughty' and sh_hooker_count > 0 and week >= 6 and hour >= 0 and hour <= 2:
+	if PCloStyle = 4 and sh_hooker_count > 0 and week >= 6 and hour >= 0 and hour <= 2:
 	 gt 'shulga_room', 'sh_hooker'
 	end 
-	if $clothingworntype = 'naughty' and sh_hooker_count > 0 and hour >= 10 and hour <= 16:
+	if PCloStyle = 4 and sh_hooker_count > 0 and hour >= 10 and hour <= 16:
 	 gt 'shulga_room', 'sh_hooker'
 	end 
 end

+ 14 - 5
locations/starenie

@@ -64,12 +64,12 @@ if exerciseW[i] = 1:
 end
 
 i = 1
-:loopnaughty
-if naughtyW[i] = 1:
-	dynamic 'naughtyH[<<i>>] -= 1'
+:loopfetish
+if fetishW[i] = 1:
+	dynamic 'fetishH[<<i>>] -= 1'
 	i += 1
-	if i <= 67:jump 'loopnaughty'
-	killvar 'naughtyW'
+	if i <= 54:jump 'loopfetish'
+	killvar 'fetishW'
 end
 
 i = 1
@@ -108,5 +108,14 @@ if swimwearW[i] = 1:
 	killvar 'swimwearW'
 end
 
+i = 1
+:loopburlesque
+if burlesqueW[i] = 1:
+	dynamic 'burlesqueH[<<i>>] -= 1'
+	i += 1
+	if i <= 30:jump 'loopburlesque'
+	killvar 'burlesqueW'
+end
+
 --- starenie ---------------------------------
 

+ 1 - 1
locations/stat_display

@@ -954,7 +954,7 @@ if tanga = 1 and $clothingworntype = 'nude':
 elseif tanga= 1 and PCloBimbo = 1:
 	$stat_msg += '<BR><b><font color = #FF00FF>You are dressed as a bimbo</font></b>'
 elseif tanga = 0:
-	if $clothingworntype = 'naughty' and CloQuality = 2:
+	if CloStyle = 4:
 		$stat_msg += '<BR><b><font color="red">you are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.</font></b>'
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3:
 		$stat_msg += '<BR><b><font color = #FF00FF>You like, totally forgot to put on any panties. You are such a bimbo.</font></b>'

+ 5 - 5
locations/succubus

@@ -445,12 +445,12 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 30:jump 'loopexhibit'
 
 	i = 1
-	:loopnaughty
-		if naughty[i] = 1 and naughtyS[i] = 0 and naughtyH[i] > 0 and naughtyB[i] >= (pcs_hips - 8) and naughtyB[i] <= (pcs_hips + 8):
-			$succlolistn[x] = 'naughty' & succlolisti[x] = i & x += 1
+	:loopfetish
+		if fetish[i] = 1 and fetishS[i] = 0 and fetishH[i] > 0 and fetishB[i] >= (pcs_hips - 8) and fetishB[i] <= (pcs_hips + 8):
+			$succlolistn[x] = 'fetish' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 67:jump 'loopnaughty'
+	if i <= 67:jump 'loopfetish'
 
 	i = 1
 	:loopexpensive
@@ -544,7 +544,7 @@ if $args[0] = 'sucwalkinginit':
 	else
 !!	This picks a random outfit by "looks"
 		$succlocat[0] = 'exhibit'
-		$succlocat[1] = 'naughty'
+		$succlocat[1] = 'fetish'
 		$succlocat[2] = 'expensive'
 		$succlocat[3] = 'average'
 		$succlocat[4] = 'cheap'

+ 2 - 2
locations/zaprFWash

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 		'The gas station worker chases you away: "Go at least wash yourself, whore!"'
 		act 'Leave':gt 'zaprF', 'start'
 	else
-		if (CloBimbo = 1 or $clothingworntype = 'naughty' and PCloQuality < 4) and pcs_apprnc >= 60:
+		if (CloBimbo = 1 or PCloStyle = 4) and pcs_apprnc >= 60:
 			minut += 60
 			pcs_sweat += 2
 			money += 120
@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'wash':
-	if CloBimbo = 1 or $clothingworntype = 'naughty' and PCloQuality < 4:
+	if CloBimbo = 1 or PCloStyle = 4:
 		i = rand(1, 4)
 		'<center><img src="images\locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
 	else