Browse Source

[fixed] Attributes for school skirts and some of the messages for them were wrong and needed re-evaluation

Kevin_Smarts 1 year ago
parent
commit
92dce707ec

+ 24 - 24
locations/_attributes_school.qsrc

@@ -20,14 +20,14 @@ elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 5:
@@ -90,14 +90,14 @@ elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 15:
@@ -112,21 +112,21 @@ elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 19:
@@ -140,14 +140,14 @@ elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 22:
@@ -161,7 +161,7 @@ elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 24:
@@ -189,7 +189,7 @@ elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 28:
@@ -238,7 +238,7 @@ elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 35:
@@ -253,7 +253,7 @@ elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 37:
@@ -297,14 +297,14 @@ elseif ARGS[1] = 42:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 
 elseif ARGS[1] = 43:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 44:
@@ -339,21 +339,21 @@ elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 51:
@@ -367,7 +367,7 @@ elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloStyle = 2
 	
@@ -389,14 +389,14 @@ elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	CloBimbo = 1
 	CloStyle = 4
@@ -419,21 +419,21 @@ elseif ARGS[1] = 59:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 62:

+ 6 - 2
locations/clothing.qsrc

@@ -1416,18 +1416,22 @@ if $ARGS[0] = 'view_clothing_item':
 		elseif CloSkirtShortness < 5 and CloThinness < 5 and CloBra = 0:
 			if CloInhibit >= 30 or CloTopCut = 4:
 				'<font color="red">This uniform, despite meeting the school uniform regulations, is too risqué. Everybody in school apart from the gopniks will think that you''re a slut but they will respect you for beating the school rules.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
 			elseif CloQuality >= 4:
 				'<font color="blue">This uniform complies with the regulations and is of good quality. It would certainly help you with your standing with the cool kids and jocks.</font>'
 			else
 				'<font color="blue">This uniform complies with the school regulations on skirt length. Nobody in school would be offended by you wearing it.</font>'
 			end
 		elseif CloSkirtShortness = 5 and CloThinness < 5 and CloBra = 0:
-			if CloInhibit >= 25:
+			if CloInhibit >= 35:
 				'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
 			elseif CloQuality >= 4:
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of good quality. Everybody apart from the nerds would approve of you wearing it.</font>'
 			else
-				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you wearing it but they will respect you for beating the school rules.</font>'
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you wearing it and they will respect you for beating the school rules.</font>'
 			end
 		else
 			'<font color="red">This uniform makes a mockery of the school uniform regulations. Everybody in school apart from the gopniks will think that you''re a slut.</font>'

+ 10 - 2
locations/clothing_QV.qsrc

@@ -1286,13 +1286,21 @@ if $ARGS[0] = 'change':
 		if CloInhibit <= 10:
 			'<font color="blue">This uniform is very conservative in style. Only the nerds would approve of you for wearing it.</font>'
 		elseif CloSkirtShortness < 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 30 or CloTopCut = 4:
+				'<font color="red">This uniform, despite meeting the school uniform regulations, is too risqué. Everybody in school apart from the gopniks will think that you''re a slut but they will respect you for beating the school rules.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform follows the school regulations and is of good quality. You would gain approval from both the cool kids and the jocks.</font>'
 			else
 				'<font color="blue">This uniform follows the school regulations on skirt length. Every student feels indifferent to you for wearing it.</font>'
 			end
 		elseif CloSkirtShortness = 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 30:
+				'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of good quality. Students are, at least, indifferent to you for wearing it, except the disapproving looks from the nerds.</font>'
 			else
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you for wearing it.</font>'

+ 9 - 3
locations/gschool_lessons.qsrc

@@ -72,14 +72,17 @@ if $ARGS[0] = 'uniform_check':
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
 		'<font color="blue">This uniform is very conservative.</font>'
-	elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0 or PCloTopCut = 4:
-		if PCloInhibit >= 30:
+	elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
+		if PCloInhibit >= 30 or PCloTopCut = 4:
 			grupvalue[1] -= 1
 			grupvalue[2] -= 1
 			grupvalue[3] -= 1
 			grupvalue[4] += 1
 			grupvalue[5] -= 1
 			'<font color="red">This uniform complies with the regulations but is too risqué.</font>'
+		elseif CloStyle = 2:
+			grupvalue[4] += 1
+			'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
@@ -88,13 +91,16 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="blue">This uniform complies with the school regulations on skirt length.</font>'
 		end
 	elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-		if PCloInhibit >= 30:
+		if PCloInhibit >= 35:
 			grupvalue[1] -= 1
 			grupvalue[2] -= 1
 			grupvalue[3] -= 1
 			grupvalue[4] += 1
 			grupvalue[5] -= 1
 			'<font color="red">This uniform slightly breaches the school regulations and it is too risqué.</font>'
+		elseif CloStyle = 2:
+			grupvalue[4] += 1
+			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1