Merge remote-tracking branch 'Violet_Kitten/master'

# Conflicts:
#	locations/preSYS.qsrc

locations/NikoDates.qsrc

@@ -1483,7 +1483,7 @@ if $ARGS[0] = 'Sonia Block':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/soniaupset.jpg"></center>'
 	'Niko wraps his arm around your neck then leads you to the locker room. As you are both walking, you suddenly hear, "No walking in the halls until class is back in session!" You turn to see Sonia Ivanko holding a notepad. Niko responds, "What''s it to you?" Sonia replies, "I''m the school hall monitor and it''s my duty to stop students from breaking the rules. so get back to the lunch room before I report you to the principle."'
 	*nl
-	'Niko grunts, "Fine! You really need to lightly up sometime Sonia. Better yet, try getting laid. It will help you not being such an up tight bitch." Sonia scowls then points her pencil at Niko. "Lunch room, NOW!" You can hear Niko utter under his voice, "If only <font color=#FF00FF>Sonia wasn''t such a prude and got laid</font> then we could have had a good time." As you both walk back to the cafeteria.'
+	'Niko grunts, "Fine! You really need to lighten up sometime Sonia. Better yet, try getting laid. It will help you not being such an up tight bitch." Sonia scowls then points her pencil at Niko. "Lunch room, NOW!" You can hear Niko utter under his voice, "If only <font color=#FF00FF>Sonia wasn''t such a prude and got laid</font> then we could have had a good time." As you both walk back to the cafeteria.'
 
 	act 'Walk away':gt 'gschool_lunch', 'break'
 end

locations/gschool_grounds.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'main':
 	if InvitationToDimkaNYparty = 1 and day = 31 and day = nyp_day: act 'Follow Dimka to the New Year''s party at his home': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
 
 	if hour = 14 and week < 6 and kanikuli = 0:
-
+		gs 'gschool_socialchg', 'group_student_rel_change'
 		if NikoDate_Day ! daystart:
 			if week = 1 and NikoIntro = 0:
 				gt 'NikoEv', 'Intro'			

locations/gschool_socialchg.qsrc

@@ -2,30 +2,46 @@
 
  !!Changing social groups
 if $ARGS[0] = 'test':
-	if pav_slut >= 125 and grupTipe < 4: 
+	if pav_slut >= 125 and grupTipe < 4:
 		gt 'gschool_socialchg', 'Pavlovsk slut'
-	elseif pav_slut >= 150 and grupTipe = 4: 
+	elseif pav_slut >= 150 and grupTipe = 4:
 		gt 'gschool_socialchg', 'Pavlovsk slut'
-	elseif grupvalue[1] < 20 and grupTipe = 1: 
+	elseif grupvalue[1] < 200 and grupTipe = 1:
 		gt 'gschool_socialchg', 'coolkid outcast'
-	elseif grupvalue[2] < 20 and grupTipe = 2: 
+	elseif grupvalue[1] < 300 and grupTipe = 1 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'coolkid warn 1'
+	elseif grupvalue[1] < 400 and grupTipe = 1 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'coolkid warn 2'
+	elseif grupvalue[2] < 200 and grupTipe = 2:
 		gt 'gschool_socialchg', 'jock outcast'
-	elseif grupvalue[3] < 20 and grupTipe = 3: 
+	elseif grupvalue[2] < 300 and grupTipe = 2 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'jock warn 1'
+	elseif grupvalue[2] < 400 and grupTipe = 2 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'jock warn 2'
+	elseif grupvalue[3] < 200 and grupTipe = 3:
 		gt 'gschool_socialchg', 'nerd outcast'
-	elseif grupvalue[4] < 20 and grupTipe = 4: 
-		gt 'gschool_socialchg', 'gopnik outcast'		
+	elseif grupvalue[3] < 300 and grupTipe = 3 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'nerd warn 1'
+	elseif grupvalue[3] < 400 and grupTipe = 3 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'nerd warn 2'
+	elseif grupvalue[4] < 200 and grupTipe = 4:
+		gt 'gschool_socialchg', 'gopnik outcast'
+	elseif grupvalue[4] < 300 and grupTipe = 4 and NuttyLock = 100:
+		gt 'gschool_socialchg', 'gopnik warn 1'
+	elseif grupvalue[4] < 400 and grupTipe = 4 and NuttyLock = 100: 
+		gt 'gschool_socialchg', 'gopnik warn 2'
 	elseif pav_slut < 100:
-		if grupvalue[1] > 80 and grupTipe ! 1: 
+		if grupvalue[1] > 800 and grupTipe ! 1:
 			gt 'gschool_socialchg', 'coolkid'
-		elseif grupvalue[2] > 80 and grupTipe ! 2: 
+		elseif grupvalue[2] > 800 and grupTipe ! 2:
 			gt 'gschool_socialchg', 'jock'
-		elseif grupvalue[3] > 80 and grupTipe ! 3: 
+		elseif grupvalue[3] > 800 and grupTipe ! 3:
 			gt 'gschool_socialchg', 'nerd'
-		elseif grupvalue[4] > 80 and grupTipe ! 4: 
+		elseif grupvalue[4] > 800 and grupTipe ! 4:
 			gt 'gschool_socialchg', 'gopnik'
 		end
-	elseif pav_slut < 125 and grupvalue[4] > 50 and grupTipe ! 4:
-		gt 'gschool_socialchg', 'gopnik'	
+	elseif pav_slut < 125 and grupvalue[4] > 500 and grupTipe ! 4:
+		gt 'gschool_socialchg', 'gopnik'
 	end
 	if gopnik_initiation = 1 and gopnik_initiation_day ! daystart:
 		killvar 'gopnik_initiation'
@@ -100,9 +116,9 @@ if $ARGS[0] = 'coolkid':
 		'You nod your head, "Yes I would love it, I love hanging out with you guys."'
 		'Albina gives you a hug, once she lets go Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on you are one of us." Stasya gives you a friendly smile, as the four of you walk to your next class.'
 		
-		grupvalue[2] -= 20
-		grupvalue[3] -= 40
-		grupvalue[4] -= 50
+		grupvalue[2] -= 200
+		grupvalue[3] -= 400
+		grupvalue[4] -= 500
 		
 		if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
 		if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
@@ -142,9 +158,9 @@ if $ARGS[0] = 'jock':
 		'You nod your head, "Yes I would love to, I love hanging out with you guys."'
 		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile, with that they walk you to your next class.'
 		
-		grupvalue[1] -= 20
-		grupvalue[3] -= 50
-		grupvalue[4] -= 30
+		grupvalue[1] -= 200
+		grupvalue[3] -= 500
+		grupvalue[4] -= 300
 		
 		if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
 		if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
@@ -183,9 +199,9 @@ if $ARGS[0] = 'nerd':
 		'You nod your head, "Yes I would love it, I love hanging out with you guys. A game night sounds like a lot of fun."'
 		'Most of them start talking at once, they seem as excited as you are about you joining them. You understand this means you are part of their group now. Finally Feofan talks loud enough the rest let him talk. "That''s great <<$pcs_nickname>> meet us at the community center library tonight at 20:00. See you then." With that they all start leaving and going to class, most saying they look forward to seeing you tonight.'
 		
-		grupvalue[1] -= 50
-		grupvalue[2] -= 40
-		grupvalue[4] -= 50
+		grupvalue[1] -= 500
+		grupvalue[2] -= 400
+		grupvalue[4] -= 500
 		
 		if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
 		if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
@@ -244,9 +260,9 @@ if $ARGS[0] = 'coolkid outcast':
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
 
 	grupvalue[1] = 0
-	grupvalue[2] -= 50
-	grupvalue[3] -= 30
-	grupvalue[4] -= 10
+	grupvalue[2] -= 500
+	grupvalue[3] -= 300
+	grupvalue[4] -= 100
 	
 	if grupvalue[2] < 0: grupvalue[2] = 0
 	if grupvalue[3] < 0: grupvalue[3] = 0
@@ -268,10 +284,10 @@ if $ARGS[0] = 'jock outcast':
 	'Christina, Lariska, and Lina walk up to you, Lariska and Lina are looking at you like you did something wrong, while Christina is smirking. She shoves you hard up against your locker. "What are you doing here bitch? You use to know whats what and be focused on what''s important. Now you just fuck off doing what ever. So you know what, we say fuck off to you." She says, mockingly laughing, Lariska, Lina and several other students nearby join in, openly mocking you. "Stay away from us and go hang out with the other losers." Then she leans in close "Or I will show you what happens to bitches that don''t know their place." With that they turn and walk away. Not being part of the jock clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
 	
-	grupvalue[1] -= 50
+	grupvalue[1] -= 500
 	grupvalue[2] = 0
-	grupvalue[3] -= 30
-	grupvalue[4] -= 20
+	grupvalue[3] -= 300
+	grupvalue[4] -= 200
 	
 	if grupvalue[1] < 0: grupvalue[1] = 0
 	if grupvalue[3] < 0: grupvalue[3] = 0
@@ -293,10 +309,10 @@ if $ARGS[0] = 'nerd outcast':
 	'A couple of students stand in front of you, wanting to get a better look at the slut based on what''s written on your locker, when you look at them they start laughing and then quickly hurry away from you as if you''ve been struck with the plague. You turn and try to find some of your friends, most seem to be hiding or when they see you coming hurry off. You finally manage to catch up to Gerasim. As you''re about to say something he turns to you. "Please go away, I don''t know what got into you." He shakes his head. "I''m sorry but I can''t be seen hanging out with you, I''ve got enough problems without you making it worse, no one in school wants to be around you anymore." When he notices the dejected look on your face as he''s told you off, ending with that you are an outcast he sighs a little. "I''m sorry I really am, but this is your own fault, but please leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you, as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
 	
-	grupvalue[1] -= 50
-	grupvalue[2] -= 30
+	grupvalue[1] -= 500
+	grupvalue[2] -= 300
 	grupvalue[3] = 0
-	grupvalue[4] -= 40
+	grupvalue[4] -= 400
 	
 	if grupvalue[1] < 0: grupvalue[1] = 0
 	if grupvalue[2] < 0: grupvalue[2] = 0
@@ -318,9 +334,9 @@ if $ARGS[0] = 'gopnik outcast':
 	'Paulina, Lera, and Lena are standing next to you. Paulina looks annoyed, just like she''s preparing to beat you up while Lera looks at you with disgust. Paulina shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. No you had to become a spinless cunt afraid of her own shadow, so stay the fuck away from us or I will beat the shit out of you." With that Paulina shoves you against you locker and walks away. Lena gives you a final look of disgust and shoves you once again while Lera gives you a few parting words before walking away. "Your so pathetic even the nerds will kick your ass now." Not being part of the gopnik clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
 	
-	grupvalue[1] -= 40
-	grupvalue[2] -= 30
-	grupvalue[3] -= 50
+	grupvalue[1] -= 400
+	grupvalue[2] -= 300
+	grupvalue[3] -= 500
 	grupvalue[4] = 0
 	
 	if grupvalue[1] < 0: grupvalue[1] = 0
@@ -532,9 +548,9 @@ end
 if $ARGS[0] = 'gopnik party':
 	*clr & cla
 	menu_off = 1
-	grupvalue[1] -= 50
-	grupvalue[2] -= 30
-	grupvalue[3] -= 50
+	grupvalue[1] -= 500
+	grupvalue[2] -= 300
+	grupvalue[3] -= 500
 		
 	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
 	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
@@ -624,7 +640,7 @@ if $ARGS[0] = 'explore':
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/party.jpg"></center>'
 	'Once your story has been told and everyone took a drink or more of the vodka, the large crowd scatters around and smaller cliques have formed instead. Those left in the main office are <a href="exec:gt ''gschool_socialchg'', ''tVitek''">Vitek</a> and <a href="exec:gt ''gschool_socialchg'', ''tLavrenti''">Lavrenti</a> who are discussing something, while <a href="exec:gt ''gschool_socialchg'', ''tDan''">Dan</a> is sitting on the sofa with a drink in his hand carefully listening to the discussion.'
-	'<a href="exec:gt ''gschool_socialchg'', ''tVasily''">Vasily</a> is standing nearby pouring himself a drink. <a href="exec:gt ''gschool_socialchg'', ''tLena''">Lena</a> and <a href="exec:gt ''gschool_socialchg'', ''tLera''">Lera</a> are standing a bit farther away talking to each other while, <a href="exec:gt ''gschool_socialchg'', ''tPauline''">Pauline</a> is standing by the window smoking a cigarette.'
+	'You can see <a href="exec:gt ''gschool_socialchg'', ''Niko''">Niko</a> leaning against a wall, chatting with Roman. <a href="exec:gt ''gschool_socialchg'', ''tVasily''">Vasily</a> is standing nearby pouring himself a drink. <a href="exec:gt ''gschool_socialchg'', ''tLena''">Lena</a> and <a href="exec:gt ''gschool_socialchg'', ''tLera''">Lera</a> are standing a bit farther away talking to each other while, <a href="exec:gt ''gschool_socialchg'', ''tPauline''">Pauline</a> is standing by the window smoking a cigarette.'
 	gs 'stat'
 
 	act 'Leave': gt 'gschool_grounds', 'main'
@@ -1015,10 +1031,8 @@ end
 if $ARGS[0] = 'Niko':
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	gs 'stat'
-
 	if NikoGOPParty = 0:
 		NikoGOPParty = 1
-
 		if NikoFightDay = daystart and NikoPayback > 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'
 			'As you approach Niko, he slowly turns to you and says, "What? Did you come here to gloat? Why don''t you just celebrate somewhere else?" And before you can say anything, Niko grabs two vodka bottles then walks to the other side of the room.'
@@ -1032,7 +1046,7 @@ if $ARGS[0] = 'Niko':
 			act 'Have a drink':
 				cla & *clr
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/caress.mp4"></center>'
-				'You begin drinking as a few drops fall down your chin onto your shirt. Niko leans forward then begins licking the vodka off of your neck while caressing your breasts while you continue drinking. After you finish the vodka, you place the bottle down just as Niko gives you a passionate kiss before saying, "How about we slip away for some private time..." Just as he says that dan Accidentally knocks over an open bottle, causing some vodka to spill on Niko''s leg. Niko shouts, "Watch what your fucking doing you shithead!" dan flips off Niko before they both begin shoving each other, as you slip away, not wanting to get involved.'
+				'As you begin drinking, a few drops fall down your chin and onto your shirt. Niko leans forward then begins licking the vodka off of your neck while caressing your breasts while you continue drinking. After you finish the vodka, you place the bottle down just as Niko gives you a passionate kiss before saying, "How about we slip away for some private time..." Just as he says that dan Accidentally knocks over an open bottle, causing some vodka to spill on Niko''s leg. Niko shouts, "Watch what your fucking doing you shithead!" dan flips off Niko before they both begin shoving each other, as you slip away, not wanting to get involved.'
 				gs 'stat'
 
 				act 'Head back': gt 'gschool_socialchg', 'explore'
@@ -1045,27 +1059,26 @@ if $ARGS[0] = 'Niko':
 				cla & *clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-				'You begin drinking as a few drops fall down your chin onto your shirt. Niko quickly grabs a napkin then begin slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
+				'As you begin drinking, a few drops fall down your chin and onto your shirt. Niko quickly grabs a napkin then begins slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to ruin that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
 				act 'Head back': gt 'gschool_socialchg', 'explore'
 			end
 		else
 			gs 'drugs', 'alcohol', 'vodka', 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'As you approach Niko, he slowly turns to you and says, "Hello there, <<$pcs_firstname>> is your name right? Welcome to the party. Here, have a drink." Niko then presses a bottle of vodka against the table then slams his hand down on it, popping the top off the bottle before handing it to you.'
-		end
-		if NikoVolkovQW = 0 and NikoEv = 0 and NikoPayback = 0:
+			
 			act 'Have a drink':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-				'You begin drinking as a few drops fall down your chin onto your shirt. Niko quickly grabs a napkin then begin slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to ruin that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
 				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
+				'As you begin drinking, a few drops fall down your chin and onto your shirt. Niko quickly grabs a napkin then begins slowly whipping the drops off of your shirt as he says, "Careful there, we wouldn''t want to ruin that lovely shirt you''re wearing." You pause drinking to give him a light smile before saying, "Charmer are we?" Niko replies, "Only for one as beautiful as you." You shake your head before getting up and saying, "Well maybe we can do this again sometime." Niko gives you a wink before replying, "I''m looking forward to it."'
 
 				act 'Head back': gt 'gschool_socialchg', 'explore'
 			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/upset.jpg"></center>'
-		'Niko seems to be resting while having a smoke, You take a look at him then think to yourself, <font color=#FF00CC>It''s probably best not to disturb him</font>.'
+		'Niko seems to be resting while having a smoke, You take a look at him then think to yourself, <font color=#FF00FF>It''s probably best not to disturb him</font>.'
 	end
 	if NikoGOPParty = 0:
 		act 'Wave and walk away':gt 'gschool_socialchg', 'explore'
@@ -1669,4 +1682,122 @@ if $ARGS[0] = 'group_rel_change':
 	killvar 'gtemp' & killvar 'ntemp'
 end
 
+if $ARGS[0] = 'group_student_rel_change':
+	if grupvalue_student_day ! daystart:
+		dailycheck_grupvalue[1] = <<grupvalue[1]>>
+		dailycheck_grupvalue[2] = <<grupvalue[2]>>
+		dailycheck_grupvalue[3] = <<grupvalue[3]>>
+		dailycheck_grupvalue[4] = <<grupvalue[4]>>
+		if npc_rel['A1'] >= 80: grupvalue[1] += 1
+		if npc_rel['A1'] <= 20: grupvalue[1] -= 1 
+		if npc_rel['A2'] >= 80: grupvalue[3] += 1
+		if npc_rel['A2'] <= 20: grupvalue[3] -= 1
+		if npc_rel['A3'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A3'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A4'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A4'] <= 20: grupvalue[1] -= 1   
+		if fedormasha = 0 and npc_rel['A5'] >= 80: grupvalue[3] += 1     
+		if fedormasha = 0 and npc_rel['A5'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A6'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A6'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A7'] >= 80: grupvalue[5] += 1     
+		if npc_rel['A7'] <= 20: grupvalue[5] -= 1   
+		if npc_rel['A8'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A8'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A9'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A9'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A10'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A10'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A11'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A11'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A12'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A12'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A13'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A13'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A14'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A14'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A15'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A15'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A16'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A16'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A17'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A17'] <= 20: grupvalue[1] -= 1   
+		if zverSlutQW < 2 and npc_rel['A18'] >= 80: grupvalue[3] += 1     
+		if zverSlutQW < 2 and npc_rel['A18'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A19'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A19'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A200'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A200'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A21'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A21'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A22'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A22'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A23'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A23'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A24'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A24'] >= 80: grupvalue[4] += 1     
+		if soniaPS = 0 and npc_rel['A25'] >= 80: grupvalue[1] += 1     
+		if soniaPS = 0 and npc_rel['A25'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A139'] >= 80: grupvalue[1] += 1  
+		if npc_rel['A139'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A140'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A140'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A141'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A141'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A142'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A142'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A143'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A143'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A144'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A144'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A145'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A145'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A146'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A146'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A147'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A147'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A148'] >= 80: grupvalue[1] += 1     
+		if npc_rel['A148'] <= 20: grupvalue[1] -= 1   
+		if npc_rel['A149'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A149'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A150'] >= 80: grupvalue[2] += 1     
+		if npc_rel['A150'] <= 20: grupvalue[2] -= 1   
+		if npc_rel['A151'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A151'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A152'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A152'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A153'] >= 80: grupvalue[3] += 1     
+		if npc_rel['A153'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A154'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A154'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A155'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A155'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A156'] >= 80: grupvalue[4] += 1     
+		if npc_rel['A156'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A157'] >= 80: grupvalue[4] += 1
+		if npc_rel['A157'] <= 20: grupvalue[4] -= 1
+		if npc_rel['A158'] >= 80: grupvalue[4] += 1
+		if npc_rel['A158'] <= 20: grupvalue[4] -= 1
+		if npc_rel['A159'] >= 80: grupvalue[5] += 1
+		if npc_rel['A159'] <= 20: grupvalue[5] -= 1
+		if npc_rel['A165'] >= 80: grupvalue[2] += 1
+		if npc_rel['A165'] <= 20: grupvalue[2] -= 1
+		if grupTipe[61] = 4 and npc_rel['A189'] >= 80: grupvalue[4] += 1
+		if grupTipe[61] = 4 and npc_rel['A189'] <= 20: grupvalue[4] -= 1
+		grupvalue_student_day = daystart
+	end
+	if grupvalue[1] > (dailycheck_grupvalue[1] + 30): grupvalue[1] = (dailycheck_grupvalue[1] + 30)
+	if grupvalue[2] > (dailycheck_grupvalue[2] + 30): grupvalue[2] = (dailycheck_grupvalue[2] + 30)
+	if grupvalue[3] > (dailycheck_grupvalue[3] + 30): grupvalue[3] = (dailycheck_grupvalue[3] + 30)
+	if grupvalue[4] > (dailycheck_grupvalue[4] + 30): grupvalue[4] = (dailycheck_grupvalue[4] + 30)
+	if grupvalue[1] > (dailycheck_grupvalue[1] - 30): grupvalue[1] = (dailycheck_grupvalue[1] - 30)
+	if grupvalue[2] > (dailycheck_grupvalue[2] - 30): grupvalue[2] = (dailycheck_grupvalue[2] - 30)
+	if grupvalue[3] > (dailycheck_grupvalue[3] - 30): grupvalue[3] = (dailycheck_grupvalue[3] - 30)
+	if grupvalue[4] > (dailycheck_grupvalue[4] - 30): grupvalue[4] = (dailycheck_grupvalue[4] - 30)	
+	if grupvalue[1] < 0: grupvalue[1] = 0
+	if grupvalue[2] < 0: grupvalue[2] = 0
+	if grupvalue[3] < 0: grupvalue[3] = 0
+	if grupvalue[4] < 0: grupvalue[4] = 0
+end	
+
 --- gschool_socialchg ---------------------------------

locations/preSYS.qsrc

@@ -585,14 +585,14 @@ if $ARGS[0] = 'nerd':
 	end
 	pcs_skin = 20
 	pcs_inhib = 10
-	pcs_heels = 10
 	gs 'npc_relationship', 'socialgroup_setting', -10, 0, 25, 0, 0, 0
 	npc_rel['A129'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A29'] += 10
-	grupvalue[3] = 50
-	grupvalue[6] = 10
+	grupvalue[3] = 600
+	grupvalue[6] = 100
 	genbsize = 22
+	salo = 100
 	traits['nerd_points'] = 60
 	traits['nerd_status'] = 2
 	traits['nerd_lernHome'] = 5
@@ -615,8 +615,8 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_humint = 10
 		pcs_persuas = 10
 		pcs_makupskl = 30
-		pcs_inhib = 20
-		pcs_heels = 25
+		pcs_inhib = 15
+		pcs_heels = 10
 		pirsC = 2
 		PirsC2_owned = 1
 		$currentpursetype = 'fashionista'
@@ -624,8 +624,8 @@ if $ARGS[0] = 'nerdqueen':
 		fashionista_purses[13] = 1
 		bag = 1
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 10, 5, 5, 0
-		grupvalue[3] = 65
-		grupvalue[1] = 20
+		grupvalue[3] = 750
+		grupvalue[1] = 200
 		kosmetica = 10
 		stanok = 10
 		if player_avatar = 0:
@@ -634,9 +634,9 @@ if $ARGS[0] = 'nerdqueen':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
-		pcs_skin = 50
+		pcs_skin = 80
 		genbsize = 17
-		salo = 103
+		salo = 60
 		willpowermax = 90
 		gt 'preCUST', 'SGStart'
 	end
@@ -659,9 +659,7 @@ if $ARGS[0] = 'goodstudent':
 		pcs_artskls = 10
 		pcs_makupskl = 20
 		money += 2000
-		pcs_skin = 20
-		salo = 161
-		grupvalue[6] = 30
+		grupvalue[6] = 300
 		npc_rel['A29'] += 20
 		if player_avatar ! 1: pcs_hairlng = 200
 		willpowermax = 80
@@ -685,9 +683,6 @@ if $ARGS[0] = 'computergeek':
 		pcs_gaming = 30
 		pcs_makupskl = 20
 		internet = 20
-		pcs_skin = 30
-		salo = 132
-		pcs_inhib = 20
 		grupvalue[3] = 60
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
@@ -714,10 +709,7 @@ if $ARGS[0] = 'chessplayer':
 		pcs_grades = 80
 		pcs_chess = 40
 		pcs_makupskl = 10
-		pcs_skin = 35
-		salo = 40
-		pcs_inhib = 15
-		grupvalue[3] = 55
+		grupvalue[3] = 650
 		chessyear = year
 		chessmonth = month
 		npc_rel['A151'] += 20
@@ -747,7 +739,6 @@ if $ARGS[0] = 'jock':
 	pcs_icesktng = 20
 	pcs_humint = 10
 	pcs_makupskl = 30
-	pcs_heels = 20
 	pcs_inhib = 20
 	swim_start = 69
 	pirsC = 1
@@ -758,7 +749,9 @@ if $ARGS[0] = 'jock':
 	bag = 1
 	gs 'npc_relationship', 'socialgroup_setting', 10, 25, 0, 0, -5, 0
 	npc_rel['A129'] -= 10
-	grupvalue[2] = 50
+	grupvalue[1] = 300
+	grupvalue[2] = 600
+	grupvalue[1] = 200
 	hscrunch = 10
 	hscrunchw = 0
 	pcs_tan = 20
@@ -770,6 +763,7 @@ if $ARGS[0] = 'jock':
 		pcs_lip = 2
 		pcs_lashes = 1
 	end
+	pcs_skin = 60
 	npc_rel['A34'] += 10
 	grupTipe=2
 end
@@ -786,13 +780,12 @@ if $ARGS[0] = 'volleyball':
 		pcs_vital = 50
 		pcs_stren = 45
 		pcs_agil = 50
-		pcs_skin = 50
-		salo = 75
+		salo = 60
 		pcs_vball = 50
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
 		npc_rel['A69'] += 10
-		grupvalue[2] = 60
+		grupvalue[2] = 700
 		willpowermax = 140
 		gt 'preCUST', 'SGStart'
 	end
@@ -815,7 +808,7 @@ if $ARGS[0] = 'dancer':
 		pcs_makupskl = 30
 		pcs_skin = 80
 		pcs_tan = 5
-		salo = 55
+		salo = 40
 		genbsize = 12
 		if player_avatar = 0:
 			pcs_hairlng = 200
@@ -823,14 +816,14 @@ if $ARGS[0] = 'dancer':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
-		pcs_skin = 60
+		pcs_skin = 80
 		pcs_danc = 50
-		pcs_heels = 30
+		pcs_heels = 10
 		pcs_inhib = 25
 		pcs_makupskl = 35
 		gsAboDance += 30
 		npc_rel['A23'] += 20
-		grupvalue[1] = 20
+		grupvalue[1] = 300
 		willpowermax = 140
 		gt 'preCUST', 'SGStart'
 	end
@@ -847,9 +840,7 @@ if $ARGS[0] = 'runner':
 		pcs_vital = 60
 		pcs_agil = 50
 		pcs_stren = 45
-		pcs_inhib = 25
-		salo = 51
-		pcs_skin = 40
+		salo = 40
 		genbsize = 12
 		pcs_run = 50
 		gsAboBeg += 30
@@ -874,14 +865,13 @@ if $ARGS[0] = 'football':
 		pcs_stren = 50
 		pcs_react = 50
 		pcs_vital = 50
-		salo = 80
-		pcs_skin = 50
+		salo = 60
 		pcs_kick = 20
 		pcs_ftbll = 50
 		npc_rel['A131'] += 10
 		npc_rel['A149'] += 10
 		npc_rel['A34'] += 10
-		grupvalue[2] = 65
+		grupvalue[2] = 650
 		willpowermax = 140
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 11
@@ -908,7 +898,7 @@ if $ARGS[0] = 'cool':
 	money += 1000
 	gs 'npc_relationship', 'socialgroup_setting', 25, 15, 0, -10, -20, 0
 	npc_rel['A129'] -= 20
-	grupvalue[1] = 60
+	grupvalue[1] = 600
 	if player_avatar ! 1: pcs_haircol = 2
 	if player_avatar ! 1: pcs_eyecol = 2
 	pcs_tan = 30
@@ -917,7 +907,7 @@ if $ARGS[0] = 'cool':
 		pcs_lip = 2
 		pcs_lashes = 1
 	end
-	pcs_skin = 50
+	pcs_skin = 80
 	pcs_tan = 5
 	npc_rel['A33'] += 10
 	grupTipe=1
@@ -935,7 +925,7 @@ if $ARGS[0] = 'socialite':
 		genbsize = 32
 		pcs_humint = 40
 		pcs_makupskl = 40
-		pcs_heels = 30
+		pcs_heels = 10
 		pcs_perform = 20
 		pirsC = 1
 		PirsC1_owned = 1
@@ -947,8 +937,8 @@ if $ARGS[0] = 'socialite':
 		if player_avatar ! 1: pcs_hairlng = 200
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 0, 0, 0, 0
 		npc_rel['A140'] += 10
-		grupvalue[2] = 10
-		grupvalue[3] = 10
+		grupvalue[2] = 100
+		grupvalue[3] = 100
 		salo = 80
 		willpowermax = 110
 		gt 'preCUST', 'SGStart'
@@ -965,7 +955,7 @@ if $ARGS[0] = 'beautiful':
 		alterstrtimg = 17
 		pcs_humint = 20
 		pcs_makupskl = 50
-		pcs_heels = 40
+		pcs_heels = 20
 		if player_avatar = 0:
 			pcs_hairlng = 300
 			pcs_eyesize = 2
@@ -973,7 +963,7 @@ if $ARGS[0] = 'beautiful':
 			pcs_lashes = 2
 		end
 		school_clothing = 6
-		pcs_skin = 70
+		pcs_skin = 100
 		pcs_tan = 50
 		genbsize = 37
 		pcs_inhib = 25
@@ -991,10 +981,11 @@ if $ARGS[0] = 'beautiful':
 		pirsC = 2
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 20, 20, 20, 20, 20, 0
-		salo = 65
-		grupvalue[1] = 65
-		grupvalue[2] = 20
-		grupvalue[4] = 10
+		salo = 60
+		grupvalue[1] = 700
+		grupvalue[2] = 200
+		grupvalue[3] = 200
+		grupvalue[4] = 100
 		pav_sex = 20
 		willpowermax = 110
 		gt 'preCUST', 'SGStart'
@@ -1010,7 +1001,6 @@ if $ARGS[0] = 'gopnik':
 	genbsize = 22
 	pcs_grades = 40
 	pcs_inhib = 25
-	pcs_heels = 10
 	kosmetica = 10
 	shampoo = 20
 	stanok = 10
@@ -1021,7 +1011,8 @@ if $ARGS[0] = 'gopnik':
 	gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 25, 0, 0
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
-	grupvalue[4] = 50
+	grupvalue[2] = 200
+	grupvalue[4] = 600
 	tampon = 20
 	pcs_run = 20
 	pcs_humint = 10
@@ -1073,8 +1064,7 @@ if $ARGS[0] = 'gopnikstart':
 		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
-		grupvalue[4] = 65
-		grupvalue[2] = 10
+		grupvalue[4] = 700
 		willpowermax = 130
 		gt 'preCUST', 'SGStart'
 	end
@@ -1099,7 +1089,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_humint = 10
 		pcs_persuas = 10
 		pcs_makupskl = 25
-		pcs_skin = 40
+		pcs_skin = 50
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1118,7 +1108,7 @@ if $ARGS[0] = 'troublemaker':
 		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
-		grupvalue[4] = 60
+		grupvalue[4] = 650
 		willpowermax = 120
 		gt 'preCUST', 'SGStart'
 	end
@@ -1143,7 +1133,7 @@ if $ARGS[0] = 'vitekgf':
 		genbsize = 32
 		pcs_humint = 20
 		pcs_makupskl = 40
-		pcs_heels = 30
+		pcs_heels = 10
 		pcs_jab = 10
 		pcs_punch = 10
 		pcs_kick = 10
@@ -1169,7 +1159,7 @@ if $ARGS[0] = 'vitekgf':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
-		pcs_skin = 50
+		pcs_skin = 60
 		pcs_tan = 5
 		pcs_vag = 1
 		pcs_throat = 1
@@ -1209,7 +1199,7 @@ if $ARGS[0] = 'alternative':
 		pcs_persuas = 10
 		pcs_makupskl = 40
 		pcs_danc = 20
-		pcs_heels = 20
+		pcs_heels = 10
 		falselashesplain = 5
 		kosmetica = 20
 		pirsD = 5
@@ -1226,9 +1216,9 @@ if $ARGS[0] = 'alternative':
 			pcs_lashes = 1
 		end
 		school_clothing = 4
-		pcs_skin = 60
+		pcs_skin = 80
 		pcs_tan = 5
-		pcs_inhib = 35
+		pcs_inhib = 40
 		pcs_vag = 1
 		pcs_ass = 1
 		pcs_throat = 5
@@ -1251,15 +1241,15 @@ if $ARGS[0] = 'alternative':
 		npc_rel['A28'] -= 10
 		npc_rel['A29'] -= 10
 		npc_rel['A33'] += 10
-		grupvalue[4] = 55
-		grupvalue[1] = 10
-		grupvalue[2] = 10
+		grupvalue[1] = 200
+		grupvalue[2] = 100
 		willpowermax = 120
 		gt 'preCUST', 'SGStart'
 	end
 end
 		
 if $ARGS[0] = 'outcast':
+	salo = 100
 	pcs_prcptn = 35
 	pcs_grades = 40
 	pcs_inhib = 10
@@ -1298,7 +1288,6 @@ if $ARGS[0] = 'friendless':
 		pcs_makupskl = 10
 		npc_rel['A11'] -= 20
 		willpowermax = 80
-		salo = 104
 		gt 'preCUST', 'SGStart'
 	end
 end
@@ -1316,15 +1305,15 @@ if $ARGS[0] = 'uglyduckling':
 		alterstrtimg = 23
 		if glass < 1 : glass = 1
 		genbsize = 2
-		pcs_inhib = 0
-		pcs_skin = 1
+		pcs_inhib = 10
+		pcs_skin = 0
 		if player_avatar = 0:
 			pcs_eyesize = 0
 			pcs_lip = 0
 			pcs_lashes = 2
 		end
 		school_clothing = 3
-		salo = 220
+		salo = 20
 		willpowermax = 70
 		gt 'preCUST', 'SGStart'
 	end
@@ -1344,7 +1333,7 @@ if $ARGS[0] = 'goodgirl':
 		alterstrtimg = 24
 		pcs_intel = 35
 		pcs_sprt = 60
-		pcs_inhib = 0
+		pcs_inhib = 10
 		pcs_makupskl = 10
 		money += 1000
 		shampoo = 10
@@ -1360,13 +1349,13 @@ if $ARGS[0] = 'goodgirl':
 			pcs_lashes = 1
 		end
 		school_clothing = 3
-		salo = 104
+		salo = 80
 		genbsize = 17
 		npc_rel['A25'] -= 5
 		npc_rel['A28'] += 10
 		npc_rel['A29'] += 10
 		npc_rel['A11'] -= 20
-		grupvalue[3] = 20
+		grupvalue[3] = 200
 		willpowermax = 150
 		gt 'preCUST', 'SGStart'
 	end
@@ -1387,7 +1376,7 @@ if $ARGS[0] = 'slut':
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 0, 20, 0, 0
 		alterstrtimg = 25
 		pcs_makupskl = 40
-		pcs_heels = 50
+		pcs_heels = 30
 		genbsize = 32
 		kosmetica = 30
 		falselashesplain = 20
@@ -1411,7 +1400,7 @@ if $ARGS[0] = 'slut':
 		npc_rel['A34'] -= 10
 		motherKnowSpravka = 1
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 0, 10, 0, 0
-		grupvalue[4] = 10
+		grupvalue[4] = 100
 		if player_avatar = 0:
 			pcs_hairlng = 120
 			pcs_eyesize = 2
@@ -1420,12 +1409,12 @@ if $ARGS[0] = 'slut':
 		end
 		school_clothing = 2
 		pcs_perform = 20
-		pcs_skin = 60
+		pcs_skin = 80
 		pcs_tan = 20
 		pcs_vag = 10
 		pcs_ass = 10
 		pcs_throat = 10
-		pcs_inhib = 60
+		pcs_inhib = 50
 		pav_sex = 150
 		GspravkaT = 2
 		motherKnowSpravka = 2
@@ -1479,11 +1468,11 @@ if $ARGS[0] = 'goth':
 		pcs_intel = 35
 		pcs_sprt = 45
 		pcs_observ = 5
-		pcs_heels = 30
+		pcs_heels = 10
 		pcs_makupskl = 40
 		pcs_artskls = 10
 		pcs_sewng = 20
-		pcs_skin = 50
+		pcs_skin = 60
 		pcs_grades = 60
 	    pcs_inhib = 25
 		willpowermax = 100
@@ -1498,6 +1487,7 @@ if $ARGS[0] = 'goth':
         kosmetica = 25
 		stanok = 20
 		tampon = 10
+		grupvalue[4] = 300
         $currentpursetype = 'dolls'
 		currentpursenumber = 18
 		dolls_purses[18] = 1