[changed] Uniforms split in to server and maid at G&M

[removed] Old attribute files for uniform and swimwear

locations/BDSM_Club.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 	elseif BDSMmeet = 1 and BDSMday ! daystart:
 		if money < 10000:
 			'You go to the Club entrance but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		elseif $clothingworntype ! 'gm_uniform' or PCloStyle2 ! 1:
+		elseif $clothingworntype ! 'gm_maid' or PCloStyle2 ! 1:
 			'You are not wearing a maid uniform and security refuse you entry.'
 		else
 			if $BDSMrole = 's':

locations/HotelHole.qsrc

@@ -154,7 +154,7 @@ if maidqw >= 1 and hour >= 16 and hour < 17:
 		end
 		act'Change into the maid costume':
 			*clr & cla
-			maid_cloth = 1
+			gs 'clothing', 'wear', 'gm_maid', 21
 			if pcs_inhib < 30: inhib_exp += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth'+rand(0,5)+'.jpg"></center>'
 			'You sit down in the locker room and look at the maid uniform. You run your hands over the delicate fabric while you think: "Hmm, it''s a bit skimpy. I bet that''s why the hotel manager thinks this is important, the guests probably love seeing the maids like this!"'

locations/HotelWork.qsrc

@@ -251,13 +251,13 @@ if $ARGS[0] = 'maid':
 		cleaning_exp += rand (5,15)
 		maidHotelCount += 1
 		if threesomewatched = 0 or threesometojoin = 2:
-			maid_cloth = 0
+			gs 'clothing', 'wear_last_worn'
 			maidtime += 1
 			'After several hours of hard work, you finish your maid shift. You return to the locker room and take off the skimpy maid uniform, putting your own clothes back on. Leaving the uniform in a neat pile on the table, you grab your things and go to the hotel lobby.'
 			act 'Continue': gt 'hotelhole'
 		end
 		if threesomewatched > 0 and threesometojoin = 1:
-			maid_cloth = 0
+			gs 'clothing', 'wear_last_worn'
 			maidtime += 1
 			'After several hours of hard work, you finish your maid shift. You walk past the room of the guys who took your money last time and are wondering if you should take them up on their offer.'
 			if slutty = 0 and money > 3000:
@@ -340,7 +340,7 @@ if $ARGS[0] = 'maid':
 		if threesomewatched > 0 and threesometojoin = 0:
 			threesometojoin = 1
 			threesomewatched = 0
-			maid_cloth = 0
+			gs 'clothing', 'wear_last_worn'
 			maidtime += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.corr.jpg"></center>'
 			'After several hours of hard work, you finish your maid shift. You return to the locker room and take off the skimpy maid uniform, putting your own clothes back on. Leaving the uniform in a neat pile on the table, you grab your things and make your way to the hotel lobby. On you way to the lobby you pass the room where the 2 men were enjoying themselves with a girl. You try to resist the urge to peep again.'

locations/MHall.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'foyer':
 	end
 	if $BDSMrole = 's':
 		act 'Go to Dressing room': gt 'MDressing'
-		if ($clothingworntype ! 'gm_uniform' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
+		if ($clothingworntype ! 'gm_maid' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
 	end
 	act 'Go upstairs to the west wing landing':gt 'MLanding', 'west'
 	act 'Go upstairs to the east wing landing':gt 'MLanding', 'east'

locations/_attributes_swimwear.qsrc

@@ -1,1378 +0,0 @@
-# $attributes_swimwear
-
-if ARGS[1] = 1:
-	CloQuality = 5
-	CloThinness = 4
-	CloTopCut = 4
-	CloPantsShortness = 6
-	CloInhibit = 15
-elseif ARGS[1] = 2:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 5
-elseif ARGS[1] = 3:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloPanties = 1
-	CloInhibit = 15
-elseif ARGS[1] = 4:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 0
-elseif ARGS[1] = 5:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 6:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 7:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 5
-elseif ARGS[1] = 8:
-	CloQuality = 2
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 9:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 5
-	CloInhibit = 15
-elseif ARGS[1] = 10:
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 35
-	CloQuality = 2
-	CloThinness = 5
-elseif ARGS[1] = 11:
-	CloQuality = 2
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 12:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 13:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 4
-	CloInhibit = 15
-elseif ARGS[1] = 14:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
-	CloPanties = 1
-	CloInhibit = 15
-elseif ARGS[1] = 15:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 16:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 17:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 18:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 19:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 20:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 21:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloBimbo = 1
-	CloPanties = 1
-elseif ARGS[1] = 22:
-	CloOnePiece = 1
-	CloInhibit = 20
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloBimbo = 1
-	CloPanties = 1
-elseif ARGS[1] = 23:
-	CloOnePiece = 1
-	CloInhibit = 25
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 4
-	CloPanties = 1
-elseif ARGS[1] = 24:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 25:
-	CloOnePiece = 1
-	CloInhibit = 20
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 26:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
-elseif ARGS[1] = 27:
-	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 28:
-	CloOnePiece = 1
-	CloInhibit = 10
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 29:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 30:
-	CloOnePiece = 1
-	CloInhibit = 30
-	CloQuality = 1
-	CloThinness = 3
-	CloTopCut = 4
-	CloBimbo = 1
-	CloPanties = 1
-elseif ARGS[1] = 31:
-	CloQuality = 6
-	CloThinness = 4
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 5
-elseif ARGS[1] = 32:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 33:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloBimbo = 1
-	CloInhibit = 15
-elseif ARGS[1] = 34:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloBimbo = 1
-	CloInhibit = 20
-elseif ARGS[1] = 35:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 36:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 37:
-	CloQuality = 6
-	CloThinness = 4
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 0
-elseif ARGS[1] = 38:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 39:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 20
-elseif ARGS[1] = 40:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 41:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 42:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 43:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 44:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 45:
-	CloQuality = 6
-	CloThinness = 4
-	CloTopCut = 1
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 0
-elseif ARGS[1] = 46:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-elseif ARGS[1] = 47:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 48:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 49:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 50:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 51:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 15
-elseif ARGS[1] = 52:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloPantsShortness = 5
-elseif ARGS[1] = 53:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 54:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 55:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 56:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 57:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 58:
-	CloQuality = 6
-	CloThinness = 4
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 10
-elseif ARGS[1] = 59:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 10
-elseif ARGS[1] = 60:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 61:
-	CloOnePiece = 1
-	CloInhibit = 25
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 62:
-	CloQuality = 6
-	CloThinness = 4
-	CloTopCut = 4
-	CloPanties = 1
-	CloOnePiece = 1
-	CloInhibit = 10
-elseif ARGS[1] = 63:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 25
-elseif ARGS[1] = 64:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 65:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 66:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 67:
-	CloOnePiece = 1
-	CloInhibit = 10
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 68:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 69:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 0
-	CloTopCut = 1
-	CloPantsShortness = 5
-elseif ARGS[1] = 70:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 71:
-	CloOnePiece = 1
-	CloInhibit = 20
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 72:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 73:
-	CloOnePiece = 1
-	CloInhibit = 10
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 74:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 75:
-	CloOnePiece = 1
-	CloInhibit = 10
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 76:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloBimbo = 1
-elseif ARGS[1] = 77:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 78:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 79:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 80:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 81:
-	CloQuality = 5
-	CloThinness = 6
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 50
-	CloBimbo = 1
-elseif ARGS[1] = 82:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 83:
-	CloQuality = 4
-	CloThinness = 3
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 84:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 85:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 86:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 87:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 88:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 89:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 90:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 91:
-	CloQuality = 4
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 92:
-	CloQuality = 4
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 25
-	CloBimbo = 1
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 93:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 5
-elseif ARGS[1] = 94:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 95:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 96:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 97:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 98:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 99:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 100:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 101:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 0
-	CloTopCut = 2
-elseif ARGS[1] = 102:
-	CloQuality = 3
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 103:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 104:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 105:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 106:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 107:
-	CloQuality = 4
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 15
-	CloBimbo = 1
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 108:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-elseif ARGS[1] = 109:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 110:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 3
-elseif ARGS[1] = 111:
-	CloQuality = 6
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 112:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 113:
-	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 114:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 115:
-	CloQuality = 4
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 4
-	CloOnePiece = 1
-elseif ARGS[1] = 116:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 117:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 118:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 119:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 120:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 121:
-	CloQuality = 2
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 122:
-	CloQuality = 3
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 123:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 124:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloBimbo = 1
-elseif ARGS[1] = 125:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 126:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 127:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 25
-elseif ARGS[1] = 128:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 129:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 130:
-	CloQuality = 5
-	CloThinness = 5
-	CloPanties = 1
-	CloInhibit = 15
-	CloBimbo = 1
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 131:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloBimbo = 1
-elseif ARGS[1] = 132:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 133:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 134:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 135:
-	CloQuality = 3
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 136:
-	CloQuality = 5
-	CloThinness = 3
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 137:
-	CloQuality = 5
-	CloThinness = 3
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 138:
-	CloQuality = 3
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 2
-	CloOnePiece = 1
-elseif ARGS[1] = 139:
-	CloQuality = 4
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 140:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 141:
-	CloQuality = 4
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 1
-	CloOnePiece = 1
-elseif ARGS[1] = 142:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 143:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 0
-	CloTopCut = 1
-	CloOnePiece = 1
-elseif ARGS[1] = 144:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
-elseif ARGS[1] = 145:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 146:
-	CloQuality = 5
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 3
-elseif ARGS[1] = 147:
-	CloQuality = 3
-	CloThinness = 4
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 4
-elseif ARGS[1] = 148:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-elseif ARGS[1] = 148:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 149:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 150:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 151:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 152:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 153:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 154:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 155:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 5
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 156:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 157:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 5
-	CloInhibit = 30
-elseif ARGS[1] = 158:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 159:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 160:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 161:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 162:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 163:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 164:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 25
-elseif ARGS[1] = 165:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 166:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 167:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 168:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 4
-	CloInhibit = 35
-elseif ARGS[1] = 169:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 170:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 171:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 172:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 173:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 174:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 2
-	CloInhibit = 20
-elseif ARGS[1] = 175:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 3
-	CloInhibit = 25
-elseif ARGS[1] = 176:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 4
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 177:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 3
-	CloInhibit = 30
-elseif ARGS[1] = 178:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 179:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 180:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 1
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 181:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 1
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 182:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 35
-elseif ARGS[1] = 183:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 184:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 2
-	CloInhibit = 20
-elseif ARGS[1] = 185:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 186:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 5
-	CloInhibit = 30
-elseif ARGS[1] = 187:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 3
-	CloInhibit = 25
-elseif ARGS[1] = 188:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 189:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 190:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 25
-elseif ARGS[1] = 191:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 1
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 192:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 193:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 194:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 195:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 196:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 20
-elseif ARGS[1] = 197:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 198:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 199:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 200:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 201:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 202:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 203:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 204:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 205:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 206:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 207:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 25
-elseif ARGS[1] = 208:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 30
-elseif ARGS[1] = 209:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 210:
-	cloBra = 1
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 211:
-	CloTopCut = 2
-	cloPanties = 1
-	CloQuality = 3
-	CloThinness = 4
-	CloInhibit = 25
-elseif ARGS[1] = 212:
-	CloTopCut = 2
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 30
-elseif ARGS[1] = 213:
-	CloTopCut = 2
-	cloPanties = 1
-	CloQuality = 2
-	CloThinness = 3
-	CloInhibit = 25
-end
-
---- $attributes_swimwear ---------------------------------
-

locations/_attributes_uniform.qsrc

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

locations/_body_image.qsrc

@@ -97,16 +97,13 @@ if $ARGS[0] = 'clothes':
 			end
 		end
 
-		if $clothingworntype = 'gm_uniform':
-			if PCloStyle2 = 1:
-				$body_image_msg += '<br>This outfit is considered to be a maid uniform.'
-			elseif PCloStyle2 = 3:
-				$body_image_msg += '<br>This is a stripper outfit.'
-			else
-				$body_image_msg += '<br>This outfit is a server uniform, suitable for jobs that require one.'
-			end
+		if $clothingworntype = 'gm_maid' or PCloStyle2 = 1:
+			$body_image_msg += '<br>This outfit is considered to be a maid uniform.'
+		elseif $clothingworntype = 'gm_server' or PCloStyle2 = 2:
+			$body_image_msg += '<br>This outfit is a server uniform, suitable for jobs that require one.'
+		elseif $clothingworntype = 'eroto_strip' or PCloStyle2 = 3:
+			$body_image_msg += '<br>This is a stripper outfit.'
 		end
-
 	end
 end
 

locations/_clothing_image.qsrc

@@ -39,8 +39,10 @@ elseif $ARGS[0] = 'eroto_strip':
 	$RESULT = 'images/pc/items/eroto/strip/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'exhibit':
 	$RESULT = 'images/pc/clothing/9exhibit/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'gm_uniform':
-	$RESULT = 'images/pc/clothing/10uniform/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'gm_maid':
+	$RESULT = 'images/pc/items/gm/maid/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'gm_server':
+	$RESULT = 'images/pc/items/gm/server/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'allure_swimsuit':
 	$RESULT = 'images/pc/items/allure/one/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'allure_bikinis':

locations/_short_description.qsrc

@@ -32,14 +32,12 @@ elseif $ARGS[0] = 'fetish':
 	$RESULT = 'Fetish outfit number '
 elseif $ARGS[0] = 'exhibit':
 	$RESULT = 'Revealing outfit number '
-elseif $ARGS[0] = 'uniform':
-	if ARGS[1] = 1:
-		$RESULT = 'Maid outfit number '
-	elseif ARGS[1] = 2:
-		$RESULT = 'Server uniform number '
-	elseif ARGS[1] = 3:
-		$RESULT = 'Stripper outfit number '
-	end
+elseif $ARGS[0] = 'gm_server':
+	$RESULT = 'Server uniform number '
+elseif $ARGS[0] = 'gm_maid':
+	$RESULT = 'Maid outfit number '
+elseif $ARGS[0] = 'eroto_strip':
+	$RESULT = 'Stripper outfit number '
 elseif $ARGS[0] = 'coat':
 	$RESULT = 'Coat number '
 elseif $ARGS[0] = 'danilovich_swimsuit':

locations/budgetclothes.qsrc

@@ -47,9 +47,14 @@ if $ARGS[0] = 'start':
 			gt 'budgetclothes', 'office'
 		end
 
-		act 'View uniforms':
+		act 'View maid outfits':
 			minut += 5
-			gt 'budgetclothes', 'uniform'
+			gt 'budgetclothes', 'gm_maid'
+		end
+
+		act 'View server uniforms':
+			minut += 5
+			gt 'budgetclothes', 'gm_server'
 		end
 
 		act 'View school uniforms':
@@ -253,15 +258,15 @@ if $ARGS[0] = 'officeclo':
 	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
 end
 
-if $ARGS[0] = 'uniform':
+if $ARGS[0] = 'gm_maid':
 	$menu_loc = 'budgetclothes'
-	$menu_arg = 'uniform'
+	$menu_arg = 'gm_maid'
 	menu_off = 0
 	$loc_arg = $ARGS[0]
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M uniforms</font></b></center>'
+	'<center><b><font color="maroon">Viewing G&M maid outfits</font></b></center>'
 	*nl
 
 	gs 'clothing_QV', 'shop_header'
@@ -273,41 +278,74 @@ if $ARGS[0] = 'uniform':
 	end
 
 	clothingfilter['qualitycheck'] = 7
-	:loopquality3
-		if Clothingstock > 15:
+	:loopquality_maid
+		if Clothingstock > 11:
 			i = 1
-		elseif Clothingstock > 7:
-			i = 2
 		else
-			i = 3
+			i = 2
 		end
 
-		:loopuniform
-			if gm_uniform[i] = 0:
-				gs 'clothing_attributes', 'gm_uniform', i
+		:loopgm_maid
+			if gm_maid[i] = 0:
+				gs 'clothing_attributes', 'gm_maid', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''uniformclo''"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
-			i += 3
-		if i <= 60:jump 'loopuniform'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+			i += 2
+		if i <= 40:jump 'loopgm_maid'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_maid'
 end
 
-if $ARGS[0] = 'uniformclo':
-	cla
-	menu_off = 1
-	if gm_uniform[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'uniform'
+if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_maid',i, 2000
+
+if $ARGS[0] = 'gm_server':
+	$menu_loc = 'budgetclothes'
+	$menu_arg = 'gm_server'
+	menu_off = 0
+	$loc_arg = $ARGS[0]
+	$loc = 'budgetclothes'
+	*clr & cla
+	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M server uniforms</font></b></center>'
+	*nl
+
+	gs 'clothing_QV', 'shop_header'
+
+	act 'Return':
+		cla
+		minut += 1
+		gt 'budgetclothes', 'start'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_uniform',i, 2000
+	clothingfilter['qualitycheck'] = 7
+	:loopquality_server
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
+
+		:loopgm_server
+			if gm_server[i] = 0:
+				gs 'clothing_attributes', 'gm_server', i
+				gs 'clothing_QV', 'shop_filter'
+
+				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
+				end
+			end
+			i += 2
+		if i <= 30:jump 'loopgm_server'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_server'
 end
 
+if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_server',i, 2000
+
 if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'
 	$menu_arg = 'school'

locations/clothing.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'view_clothing_list':
 		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
 	end
 
-	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
+	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_maid' or $ARGS[2] = 'gm_server':
 		!'<center><b><font color="maroon">Viewing clothes from G&M</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 	elseif $ARGS[2] = 'kats':
@@ -201,7 +201,9 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('gm_office') > 0:'<center><a href="exec:$ward_list_store = ''gm_office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
-		if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:$ward_list_store = ''gm_uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_uniform''"><img src="images/pc/items/gm/uniforms.png"></a></center>'
+		if ARRSIZE('gm_maid') > 0:'<center><a href="exec:$ward_list_store = ''gm_maid'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_maid''"><img src="images/pc/items/gm/gm_maid.png"></a></center>'
+
+		if ARRSIZE('gm_server') > 0:'<center><a href="exec:$ward_list_store = ''gm_server'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_server''"><img src="images/pc/items/gm/gm_server.png"></a></center>'
 
 		if ARRSIZE('misc_outfits') > 0:'<center><a href="exec:$ward_list_store = ''misc'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''misc''"><img src="images/pc/items/misc/misc.png"></a></center>'
 
@@ -300,13 +302,25 @@ if $ARGS[0] = 'view_clothing_list':
 			gs 'clothing', 'clothwidth'
 		end
 
-		if $ARGS[2] = 'gm_uniform':
+		if $ARGS[2] = 'gm_maid':
+			$ward_list_store = $ARGS[2]
+			i = 1
+			:loopgm_maid
+				if gm_maid[i] = 1 and gm_maid_s[i] = cloc and ($clothingworntype ! 'gm_maid' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_maid', i)
+				i += 1
+			if i <= ARRSIZE('gm_maid'):jump 'loopgm_maid'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_server':
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopuniform
-				if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'gm_uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_uniform', i)
+			:loopgm_server
+				if gm_server[i] = 1 and gm_server_s[i] = cloc and ($clothingworntype ! 'gm_server' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_server', i)
 				i += 1
-			if i <= ARRSIZE('gm_uniform'):jump 'loopuniform'
+			if i <= ARRSIZE('gm_server'):jump 'loopgm_server'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -632,15 +646,10 @@ if $ARGS[0] = 'view_clothing_item':
 		if CloInhibit + 10 > pcs_inhib and CloInhibit <= pcs_inhib: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 	end
 
-	if $ARGS[2] = 'gm_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
-	end
+!!CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School
+	if CloStyle2 = 1: 'This is a maid outfit.'
+	if CloStyle2 = 2: 'This outfit is a server uniform.'
+	if CloStyle2 = 3: 'This outfit is a stripper uniform, suitable for jobs that require one.'
 
 	if CloStyle2 = 4:
 		if CloInhibit <= 10:
@@ -878,7 +887,7 @@ if $ARGS[0] = 'view_clothing_item_buy':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 15 + <<h>>'
 	elseif $ARGS[2] = 'eroto_dress' or $ARGS[2] = 'eroto_outfits' or $ARGS[2] = 'eroto_strip' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'fancy_burlesque':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 35 + <<h>>'
-	elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
+	elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_maid' or $ARGS[2] = 'gm_server':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 120 + <<h>>'
 	elseif $ARGS[2] = 'danilovich':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 100 + <<h>>'

locations/clothing_QV.qsrc

@@ -31,7 +31,9 @@ if $ARGS[0] = 'list':
  
 	if ARRSIZE('gm_office'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
-	if ARRSIZE('gm_uniform'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''"><img src="images/pc/items/gm/uniforms.png"></a></center>'
+	if ARRSIZE('gm_maid'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
+
+	if ARRSIZE('gm_server'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
 
 	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
@@ -133,12 +135,12 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_uniform':
+	if $ARGS[1] = 'gm_maid':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/pc/items/gm/uniforms.png"></center>'
-		'<center>Uniforms from G&M</center>'
+		'<center><img src="images/pc/items/gm/maid.png"></center>'
+		'<center>Maid outfits from G&M</center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
@@ -147,15 +149,42 @@ if $ARGS[0] = 'list':
 
 		*nl
 		i = 1
-		:loopuniform
-		if gm_uniform[i] = 1:
-			gs 'clothing_attributes', 'gm_uniform', i
+		:loopgm_maid
+		if gm_maid[i] = 1:
+			gs 'clothing_attributes', 'gm_maid', i
 			if CloInhibit <= pcs_inhib:
-				if gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
+				if gm_maid_s[i] = 0 and gm_maid_h[i] > 0 and gm_maid_b[i] >= (pcs_hips - 8) and gm_maid_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_maid'', <<i>>"><img src="images/pc/clothing/gm/maid/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('gm_uniform'):jump 'loopuniform'
+		if i <= ARRSIZE('gm_maid'):jump 'loopgm_maid'
+
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_server':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/pc/items/gm/server.png"></center>'
+		'<center>Server uniforms from G&M</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
+
+		*nl
+		i = 1
+		:loopgm_server
+		if gm_server[i] = 1:
+			gs 'clothing_attributes', 'gm_server', i
+			if CloInhibit <= pcs_inhib:
+				if gm_server_s[i] = 0 and gm_server_h[i] > 0 and gm_server_b[i] >= (pcs_hips - 8) and gm_server_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_server'', <<i>>"><img src="images/pc/clothing/gm/server/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
+		i += 1
+		if i <= ARRSIZE('gm_server'):jump 'loopgm_server'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
@@ -754,15 +783,10 @@ if $ARGS[0] = 'change':
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 
-	if $ARGS[1] = '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
-	end
+!!CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School
+	if CloStyle2 = 1: 'This is a maid outfit.'
+	if CloStyle2 = 2: 'This outfit is a server uniform.'
+	if CloStyle2 = 3: 'This outfit is a stripper uniform, suitable for jobs that require one.'
 
 	if CloStyle2 = 4:
 		if CloInhibit <= 10:

locations/clothing_attributes.qsrc

@@ -124,8 +124,10 @@ elseif $ARGS[0] = 'eroto_strip':
 	*P FUNC('$attributes_eroto_strip', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exhibit':
 	*P FUNC('$attributes_exhibit', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'gm_uniform':
-	*P FUNC('$attributes_uniform', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm_maid':
+	*P FUNC('$attributes_gm_maid', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm_server':
+	*P FUNC('$attributes_gm_server', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coat':
 	*P FUNC('$attributes_coat', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'danilovich_swimsuit':

locations/nichApartment.qsrc

@@ -213,7 +213,7 @@ elseif $ARGS[0] = 'jobInterview':
 	'The adress you have been given leads you to a very expensive looking apartment building. A porter stands at the door, inspecting you while you come closer.'
 	'"Hello, I am here to apply for the job as live-in maid."'
 	
-	if $clothingworntype ! 'gm_uniform':
+	if $clothingworntype ! 'gm_maid':
 		'"I am afraid I am not allowed to let you pass dressed like this, Miss. Master Nicholas made it very clear that every applicant for this position has to be dressed in an appropriate outfit. Meaning you have to wear a maid uniform for the job interview. You can get one at the mall nearby."'
 		act 'Turn around': gt 'city_center'
 	else
@@ -428,7 +428,7 @@ elseif $ARGS[0] = 'visitTanya':
 		if nichTanyaFuckLast = daystart:
 			!! Tanya and PC just had sex because PC cant go to the job interview yet
 			'Now that the immediate lust is sated and you''re both enjoying your postcoital bliss, you rest naked in each other''s arms.'
-			if $clothingworntype = 'gm_uniform':
+			if $clothingworntype = 'gm_maid':
 				'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to quit your current job."'
 				'You promise her to do it as soon as possible before putting your uniform back on.'
 			else
@@ -436,7 +436,7 @@ elseif $ARGS[0] = 'visitTanya':
 				'You promise her to do so before putting your clothes back on.'
 			end
 			act 'Leave the apartment':gt 'city_center'
-		elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_uniform':
+		elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_maid':
 			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
 			act 'Great':
 				cla
@@ -452,7 +452,7 @@ elseif $ARGS[0] = 'visitTanya':
 				'"Come on now. My parents are waiting in the living room."'
 				act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
 			end
-		elseif $clothingworntype = 'gm_uniform':
+		elseif $clothingworntype = 'gm_maid':
 			'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. Are you ready to have your interview with my parents?"'
 			'"Not yet. I still have to quit my current job."'
 			'Tanya looks a little bit dissapointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'

locations/nichTanya.qsrc

@@ -1350,7 +1350,7 @@ elseif $ARGS[0] = 'shoppingUniform':
 	
 	:nichTanyaShopUniLoop
 	nichRand = rand(1,49)
-	if gm_uniform[nichRand] = 1 and nichLoopAttempt < 100: nichLoopAttempt += 1 & jump 'nichTanyaShopUniLoop'
+	if gm_maid[nichRand] = 1 and nichLoopAttempt < 100: nichLoopAttempt += 1 & jump 'nichTanyaShopUniLoop'
 	
 	gs 'clothing_attributes', 'uniform', nichRand
 	
@@ -1385,9 +1385,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 				'"Thank you, Tanya. That would be great."'
 				'Tanya smiles and hugs you. She heads to the cashier and pays your new uniform with her credit card.'
 				
-				gm_uniform[nichRand] = 1
-				gm_uniform_h[nichRand] = 50
-				gm_uniform_b[nichRand] = pcs_hips
+				gm_maid[nichRand] = 1
+				gm_maid_h[nichRand] = 50
+				gm_maid_b[nichRand] = pcs_hips
 				cla
 				act 'Return to her apartment':
 					gt 'nichTanya','prepareInterview'
@@ -1407,9 +1407,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 			'"That looks great. I will take it"'
 			'Tanya smiles and hugs you.'
 			money -= price
-			gm_uniform[nichRand] = 1
-			gm_uniform_h[nichRand] = 50
-			gm_uniform_b[nichRand] = pcs_hips
+			gm_maid[nichRand] = 1
+			gm_maid_h[nichRand] = 50
+			gm_maid_b[nichRand] = pcs_hips
 			
 			gs 'stat'
 			
@@ -1434,7 +1434,7 @@ elseif $ARGS[0] = 'shoppingUniform':
 		end
 	end
 elseif $ARGS[0] = 'prepareInterview':
-	$clothingworntype = 'gm_uniform'
+	$clothingworntype = 'gm_maid'
 	clothingwornnumber = nichRand
 	'The both of you return to Tanyas apartment. You change into your new uniform before Tanya starts to inspect you carefully.'
 	

locations/nichUtil.qsrc

@@ -442,7 +442,7 @@ if $ARGS[0] = 'updateNotice':
 end
 
 if $ARGS[0] = 'checkOutfit':
-	if $clothingworntype = 'gm_uniform':
+	if $clothingworntype = 'gm_maid':
 		nichOutfitState = 1
 	else
 		nichOutfitState = 0

locations/portnoi.qsrc

@@ -160,10 +160,16 @@ selltot = 0
 	if i <= ARRSIZE('exhibit'):jump 'exhibitmet'
 
 	i = 1
-	:uniformmet
-		if gm_uniform[i] = 1 and gm_uniform_s[i] = 2:dynamic($batch_sell, 'uniform', i)
+	:gm_maidmet
+		if gm_maid[i] = 1 and gm_maid_s[i] = 2:dynamic($batch_sell, 'gm_maid', i)
 		i += 1
-	if i <= ARRSIZE('uniform'):jump 'uniformmet'
+	if i <= ARRSIZE('gm_maid'):jump 'gm_maidmet'
+
+	i = 1
+	:gm_servermet
+		if gm_server[i] = 1 and gm_server_s[i] = 2:dynamic($batch_sell, 'gm_server', i)
+		i += 1
+	if i <= ARRSIZE('gm_server'):jump 'gm_servermet'
 
 	i = 1
 	:coatmet

locations/portnoi2.qsrc

@@ -93,10 +93,16 @@ i = 1
 if i <= ARRSIZE('exhibit'):jump 'yexhibitmet'
 
 i = 1
-:yuniformmet
-	if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):poshvalldrop += 1
+:ygm_servermet
+	if gm_server[i] = 1 and ((gm_server_b[i] > pcs_hips + 8) or (gm_server_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
+if i <= ARRSIZE('gm_server'):jump 'ygm_servermet'
+
+i = 1
+:ygm_maidmet
+	if gm_maid[i] = 1 and ((gm_maid_b[i] > pcs_hips + 8) or (gm_maid_b[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('gm_maid'):jump 'ygm_maidmet'
 
 i = 1
 :ydanilovich_swimsuitmet
@@ -271,10 +277,16 @@ elseif money >= poshvalldrop:
 	if i <= ARRSIZE('exhibit'):jump 'xexhibitmet'
 
 	i = 1
-	:xuniformmet
-		if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):gm_uniform_b[i] = pcs_hips
+	:xgm_servermet
+		if gm_server[i] = 1 and ((gm_server_b[i] > pcs_hips + 8) or (gm_server_b[i] < pcs_hips - 8)):gm_server_b[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('gm_server'):jump 'xgm_servermet'
+
+	i = 1
+	:xgm_maidmet
+		if gm_maid[i] = 1 and ((gm_maid_b[i] > pcs_hips + 8) or (gm_maid_b[i] < pcs_hips - 8)):gm_maid_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('gm_uniform'):jump 'xuniformmet'
+	if i <= ARRSIZE('gm_maid'):jump 'xgm_maidmet'
 
 	i = 1
 	:xdanilovich_swimsuitmet

locations/starenie.qsrc

@@ -4,41 +4,42 @@ $loc_clothestypes[1]='gm_outfits'
 $loc_clothestypes[2]='gm_dress'
 $loc_clothestypes[3]='gm_office'
 $loc_clothestypes[4]='gm_school'
-$loc_clothestypes[5]='gm_uniform'
-$loc_clothestypes[6]='misc_outfits'
-$loc_clothestypes[7]='cats_dress'
-$loc_clothestypes[8]='cats_outfits'
-$loc_clothestypes[9]='flamingos_dress'
-$loc_clothestypes[10]='flamingos_outfits'
-$loc_clothestypes[11]='gm_coats'
-$loc_clothestypes[12]='coco_dress'
-$loc_clothestypes[13]='coco_outfits'
-$loc_clothestypes[14]='fashionista'
-$loc_clothestypes[15]='moncheri'
-$loc_clothestypes[16]='scandalicious_dress'
-$loc_clothestypes[17]='scandalicious_outfits'
-$loc_clothestypes[18]='scandalicious_bikinis'
-$loc_clothestypes[19]='scandalicious_swimsuit'
-$loc_clothestypes[20]='exhibit'
-$loc_clothestypes[21]='eroto_dress'
-$loc_clothestypes[22]='fancy_burlesque'
-$loc_clothestypes[23]='dolls_outfits'
-$loc_clothestypes[24]='dolls_dress'
-$loc_clothestypes[25]='bomba_outfits'
-$loc_clothestypes[26]='bomba_dress'
-$loc_clothestypes[27]='danilovich'
-$loc_clothestypes[28]='swimwear'
-$loc_clothestypes[29]='cats_coats'
-$loc_clothestypes[30]='moncheri_coats'
-$loc_clothestypes[31]='dolls_coats'
-$loc_clothestypes[32]='bomba_coats'
-$loc_clothestypes[33]='danilovich_coats'
-$loc_clothestypes[34]='danilovich_swimsuit'
-$loc_clothestypes[35]='allure_bikinis'
-$loc_clothestypes[36]='allure_swimsuit'
-$loc_clothestypes[37]='market_outfits'
-$loc_clothestypes[38]='eroto_outfits'
-$loc_clothestypes[39]='eroto_strip'
+$loc_clothestypes[5]='gm_maid'
+$loc_clothestypes[6]='gm_server'
+$loc_clothestypes[7]='misc_outfits'
+$loc_clothestypes[8]='cats_dress'
+$loc_clothestypes[9]='cats_outfits'
+$loc_clothestypes[10]='flamingos_dress'
+$loc_clothestypes[11]='flamingos_outfits'
+$loc_clothestypes[12]='gm_coats'
+$loc_clothestypes[13]='coco_dress'
+$loc_clothestypes[14]='coco_outfits'
+$loc_clothestypes[15]='fashionista'
+$loc_clothestypes[16]='moncheri'
+$loc_clothestypes[17]='scandalicious_dress'
+$loc_clothestypes[18]='scandalicious_outfits'
+$loc_clothestypes[19]='scandalicious_bikinis'
+$loc_clothestypes[20]='scandalicious_swimsuit'
+$loc_clothestypes[21]='exhibit'
+$loc_clothestypes[22]='eroto_dress'
+$loc_clothestypes[23]='fancy_burlesque'
+$loc_clothestypes[24]='dolls_outfits'
+$loc_clothestypes[25]='dolls_dress'
+$loc_clothestypes[26]='bomba_outfits'
+$loc_clothestypes[27]='bomba_dress'
+$loc_clothestypes[28]='danilovich'
+$loc_clothestypes[29]='swimwear'
+$loc_clothestypes[30]='cats_coats'
+$loc_clothestypes[31]='moncheri_coats'
+$loc_clothestypes[32]='dolls_coats'
+$loc_clothestypes[33]='bomba_coats'
+$loc_clothestypes[34]='danilovich_coats'
+$loc_clothestypes[35]='danilovich_swimsuit'
+$loc_clothestypes[36]='allure_bikinis'
+$loc_clothestypes[37]='allure_swimsuit'
+$loc_clothestypes[38]='market_outfits'
+$loc_clothestypes[39]='eroto_outfits'
+$loc_clothestypes[40]='eroto_strip'
 
 ! disable wearing base school form
 schoolW[6] = 0

locations/succubus.qsrc

@@ -655,12 +655,22 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 185:jump 'loopmoncheri'
 
 	i = 1
-	:loopuniform
-		if gm_uniform[i] = 1 and gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):
-			$succlolistn[x] = 'gm_uniform' & succlolisti[x] = i & x += 1
+	:loopgm_server
+		if gm_server[i] = 1 and gm_server_s[i] = 0 and gm_server_h[i] > 0 and gm_server_b[i] >= (pcs_hips - 8) and gm_server_b[i] <= (pcs_hips + 8):
+			$succlolistn[x] = 'gm_server' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 60:jump 'loopuniform'
+	if i <= 60:jump 'loopgm_server'
+	killvar 'i'
+	x -= 1
+
+	i = 1
+	:loopgm_maid
+		if gm_maid[i] = 1 and gm_maid_s[i] = 0 and gm_maid_h[i] > 0 and gm_maid_b[i] >= (pcs_hips - 8) and gm_maid_b[i] <= (pcs_hips + 8):
+			$succlolistn[x] = 'gm_maid' & succlolisti[x] = i & x += 1
+		end
+		i += 1
+	if i <= 60:jump 'loopgm_maid'
 	killvar 'i'
 	x -= 1
 
@@ -691,7 +701,8 @@ if $args[0] = 'sucwalkinginit':
 		$succlocat[13] = 'gm_school'
 		$succlocat[14] = 'danilovich'
 		$succlocat[15] = 'moncheri'
-		$succlocat[16] = 'gm_uniform'
+		$succlocat[16] = 'gm_server'
+		$succlocat[16] = 'gm_maid'
 
 		scbimbochk = 1
 		y = 0 & z = 0