Browse Source

[fixes] Removed WIP blocks from clique slut warn scenes and made sure they do not spam the player.

VioletKitten 4 years ago
parent
commit
c7be7dc7f5
1 changed files with 12 additions and 4 deletions
  1. 12 4
      locations/gschool_socialchg.qsrc

+ 12 - 4
locations/gschool_socialchg.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'test':
 		gt 'gschool_socialchg', 'coolkid warn 1'
 	elseif grupvalue[1] < 300 and grupTipe = 1 and grupwarning[1] >= 0:
 		gt 'gschool_socialchg', 'coolkid warn 2'
-	elseif pav_slut > 150 and grupTipe = 1:
+	elseif pav_slut > 150 and grupTipe = 1 and grupslutwarning[1] = 0:
 		gt 'gschool_socialchg', 'coolkid slut warn'
 	elseif grupvalue[2] < 200 and grupTipe = 2:
 		gt 'gschool_socialchg', 'jock outcast'
@@ -41,7 +41,7 @@ if $ARGS[0] = 'test':
 		gt 'gschool_socialchg', 'jock warn 1'
 	elseif grupvalue[2] < 300 and grupTipe = 2 and grupwarning[2] >= 0:
 		gt 'gschool_socialchg', 'jock warn 2'
-	elseif pav_slut > 175 and grupTipe = 2 and NuttyLock = 100:
+	elseif pav_slut > 175 and grupTipe = 2 and grupslutwarning[2] = 0:
 		gt 'gschool_socialchg', 'jock slut warn'
 	elseif grupvalue[3] < 200 and grupTipe = 3:
 		gt 'gschool_socialchg', 'nerd outcast'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'test':
 		gt 'gschool_socialchg', 'nerd warn 1'
 	elseif grupvalue[3] < 300 and grupTipe = 3 and grupwarning[3] >= 0:
 		gt 'gschool_socialchg', 'nerd warn 2'
-	elseif pav_slut > 100 and grupTipe = 3:
+	elseif pav_slut > 100 and grupTipe = 3 and grupslutwarning[3] = 0:
 		gt 'gschool_socialchg', 'nerd slut warn'
 	elseif grupvalue[4] < 200 and grupTipe = 4:
 		gt 'gschool_socialchg', 'gopnik outcast'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'test':
 		gt 'gschool_socialchg', 'gopnik warn 1'
 	elseif grupvalue[4] < 300 and grupTipe = 4 and grupwarning[4] >= 0: 
 		gt 'gschool_socialchg', 'gopnik warn 2'
-	elseif pav_slut > 250 and grupTipe = 4 and NuttyLock = 100:
+	elseif pav_slut > 250 and grupTipe = 4 and grupslutwarning[4] = 0:
 		gt 'gschool_socialchg', 'gopnik slut warn'
 	elseif pav_slut < 175 and grupvalue[1] > 800 and grupTipe ! 1:
 		gt 'gschool_socialchg', 'coolkid'
@@ -86,6 +86,10 @@ if $ARGS[0] = 'Pavlovsk slut':
 	grupvalue[2] = 0
 	grupvalue[3] = 0
 	grupvalue[4] = 0
+	grupslutwarning[1] = 0
+	grupslutwarning[2] = 0
+	grupslutwarning[3] = 0
+	grupslutwarning[4] = 0
 	
 	gs 'gschool_socialchg', 'group_rel_change','cool kids', -20
 	gs 'gschool_socialchg', 'group_rel_change','jocks', -20
@@ -192,6 +196,7 @@ end
 
 if $ARGS[0] = 'coolkid slut warn':
 	cla & *clr
+	grupslutwarning[1] = 1
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
@@ -273,6 +278,7 @@ end
 
 if $ARGS[0] = 'jock slut warn':
 	cla & *clr
+	grupslutwarning[2] = 1
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
@@ -351,6 +357,7 @@ end
 
 if $ARGS[0] = 'nerd slut warn':
 	cla & *clr
+	grupslutwarning[3] = 1
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
@@ -415,6 +422,7 @@ end
 
 if $ARGS[0] = 'gopnik slut warn':
 	cla & *clr
+	grupslutwarning[4] = 1
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'