Merge remote-tracking branch 'master/master'

locations/_attributes_cats_shoes.qsrc

@@ -222,25 +222,25 @@ elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
+	ShoHeels = 1
 	
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
+	ShoHeels = 1
 	
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
+	ShoHeels = 1
 	
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
+	ShoHeels = 1
 
 end
 

locations/_attributes_dolls_shoes.qsrc

@@ -6,7 +6,7 @@ if ARGS[1] = 1:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 2
+	ShoHeels = 1
 	
 elseif ARGS[1] = 2:
 	ShoStyle = 0
@@ -42,55 +42,55 @@ elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 9:
 	ShoStyle = 2
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 11:
 	ShoStyle = 2
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 3
 	
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 2
 	
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 3
 	
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 5
+	ShoHeels = 3
 	
 elseif ARGS[1] = 16:
 	ShoStyle = 0
@@ -120,49 +120,49 @@ elseif ARGS[1] = 20:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
+	ShoHeels = 3
 	
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
+	ShoHeels = 3
 	
 elseif ARGS[1] = 22:
 	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
+	ShoHeels = 3
 	
 elseif ARGS[1] = 23:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 24:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 25:
 	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 26:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 27:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 28:
 	ShoStyle = 3
@@ -342,55 +342,55 @@ elseif ARGS[1] = 57:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 5
+	ShoHeels = 2
 	
 elseif ARGS[1] = 58:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 
 elseif ARGS[1] = 59:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 60:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 3
+	ShoHeels = 1
 
 elseif ARGS[1] = 61:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 62:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 
 elseif ARGS[1] = 63:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
 	
 elseif ARGS[1] = 64:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 3
 
 elseif ARGS[1] = 65:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 3
 	
 elseif ARGS[1] = 66:
 	ShoStyle = 0
@@ -414,25 +414,25 @@ elseif ARGS[1] = 69:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 1
 	
 elseif ARGS[1] = 70:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 1
 
 elseif ARGS[1] = 71:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 1
 	
 elseif ARGS[1] = 72:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 2
 
 elseif ARGS[1] = 73:
 	ShoStyle = 3
@@ -444,25 +444,25 @@ elseif ARGS[1] = 74:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 3
 
 elseif ARGS[1] = 75:
 	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 3
 	
 elseif ARGS[1] = 76:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 2
 
 elseif ARGS[1] = 77:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 2
 	
 elseif ARGS[1] = 78:
 	ShoStyle = 0
@@ -492,19 +492,19 @@ elseif ARGS[1] = 82:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 3
 
 elseif ARGS[1] = 83:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 1
 	
 elseif ARGS[1] = 84:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 1
 
 elseif ARGS[1] = 85:
 	ShoStyle = 3
@@ -516,13 +516,13 @@ elseif ARGS[1] = 86:
 	ShoStyle = 3
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 3
 
 elseif ARGS[1] = 87:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
+	ShoHeels = 3
 	
 elseif ARGS[1] = 88:
 	ShoStyle = 0
@@ -546,25 +546,25 @@ elseif ARGS[1] = 91:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	
 elseif ARGS[1] = 92:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 1
 
 elseif ARGS[1] = 93:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	
 elseif ARGS[1] = 94:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 2
 
 elseif ARGS[1] = 95:
 	ShoStyle = 0
@@ -600,55 +600,55 @@ elseif ARGS[1] = 100:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
+	ShoHeels = 1
 
 elseif ARGS[1] = 101:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
+	ShoHeels = 1
 	
 elseif ARGS[1] = 102:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
+	ShoHeels = 1
 
 elseif ARGS[1] = 103:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 5
+	ShoHeels = 2
 	
 elseif ARGS[1] = 104:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 
 elseif ARGS[1] = 105:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 	
 elseif ARGS[1] = 106:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 
 elseif ARGS[1] = 107:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 	
 elseif ARGS[1] = 108:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 
 elseif ARGS[1] = 109:
 	ShoStyle = 3
@@ -672,19 +672,19 @@ elseif ARGS[1] = 112:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 4
+	ShoHeels = 2
 
 elseif ARGS[1] = 113:
 	ShoStyle = 3
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 5
+	ShoHeels = 2
 	
 elseif ARGS[1] = 114:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
 
 elseif ARGS[1] = 115:
 	ShoStyle = 3

locations/pav_disco_coolkids.qsrc

@@ -621,7 +621,7 @@ if $ARGS[0] = 'mefodiy':
 			elseif grupTipe = 4:
 				'You approach Mefodiy and he stares at you while shaking his head. It seems he''s not even going to talk to you, never mind dance.'
 			elseif grupTipe = 5:
-				'You approach Melfodiy expecting him to say something negative, but he''s a perfect gentleman and greets you like he would one of his friends.'
+				'You approach Mefodiy expecting him to say something negative, but he''s a perfect gentleman and greets you like he would one of his friends.'
 			end
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			if grupTipe ! 4:

locations/sex_ev_after.qsrc

@@ -13,13 +13,13 @@ if $ARGS[0] = 'quit':
 			!!	'<<$npc_firstname[$boy]>> glares daggers at you the whole time but you don''t care and the moment you have all your clothes on, you stalk out the door, giving him the finger as you slam it behind you.'
 			act'Slam the door':
 				cla & *nl
-				'The moment you''re fully dressed, you stalk out the door, giving <<$npc_firstname[$boy]>> the finger as you slam it behind you.'
+				'The moment you''re fully dressed, you stalk out the door slamming it behind you.'
 				act'Leave':gt'sex_ev_leave', 'exit'
 			end
 			
 			act'Give him the finger':
 				cla & *nl
-				'The moment you''re fully dressed, you stalk out the door, giving <<$npc_firstname[$boy]>> the finger as you slam it behind you.'
+				'The moment you''re fully dressed, you stalk out the door, giving <<$npc_firstname[$boy]>> the finger as the leave the room.'
 				act'Leave':gt'sex_ev_leave', 'exit'
 			end