Merge remote-tracking branch 'upstream/master'

locations/Cheatmenu_din.qsrc

@@ -1174,7 +1174,7 @@ $cheatmenu['reputation'] = {
 			'<<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>>: <<npc_rel[''A14'']>>	<a href="exec:npc_rel[''A14''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A14''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>>: <<npc_rel[''A15'']>>	<a href="exec:npc_rel[''A15''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A15''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>>: <<npc_rel[''A17'']>>	<a href="exec:npc_rel[''A17''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A17''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-			'<<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>>: <<npc_rel[''A23'']>>	<a href="exec:npc_rel[''A23''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A23''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			'<<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>>: <<npc_rel[''A22'']>>	<a href="exec:npc_rel[''A22''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A22''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>>: <<npc_rel[''A146'']>>  <a href="exec:npc_rel[''A146''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A146''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>>: <<npc_rel[''A147'']>>  <a href="exec:npc_rel[''A147''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A147''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>>: <<npc_rel[''A148'']>>  <a href="exec:npc_rel[''A148''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A148''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
@@ -1195,7 +1195,7 @@ $cheatmenu['reputation'] = {
 			'<<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>>: <<npc_rel[''A13'']>>	<a href="exec:npc_rel[''A13''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A13''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			if zverRageQW = 0 or zverRageQW = 10:  '<<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>>: <<npc_rel[''A18'']>>	<a href="exec:npc_rel[''A18''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A18''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>>: <<npc_rel[''A19'']>>	<a href="exec:npc_rel[''A19''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A19''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-			'<<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>>: <<npc_rel[''A22'']>>	<a href="exec:npc_rel[''A22''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A22''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			'<<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>>: <<npc_rel[''A23'']>>	<a href="exec:npc_rel[''A23''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A23''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>>: <<npc_rel[''A149'']>>  <a href="exec:npc_rel[''A149''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A149''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>>: <<npc_rel[''A150'']>>  <a href="exec:npc_rel[''A150''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A150''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>>: <<npc_rel[''A141'']>>  <a href="exec:npc_rel[''A141''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A141''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'

locations/bedrPar.qsrc

@@ -12,6 +12,7 @@ menu_off = 0
 minut += 1
 gs 'stat'
 gs 'themes', 'indoors'
+gs 'family_schedule'
 
 if momloc = 26:
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'

locations/bedrPar2.qsrc

@@ -18,6 +18,7 @@ if $ARGS[0] = '':
 	*nl
 	'The room in which your parents live. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
 	gs 'family'
+	gs 'family_schedule'
 
 	act 'Return to the hallway':gt 'korrPar'
 

locations/gopnik_initiation.qsrc

@@ -1025,9 +1025,9 @@ if $ARGS[0] = 'gopnik slut':
 	minut += 10
 	gs 'stat'
 	gopnik_slut = 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

locations/gschool_grounds.qsrc

@@ -141,6 +141,7 @@ if $ARGS[0] = 'main':
 
 	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
 		if $clothingworntype = 'school' or Enable_sforma = 1:
+			gs 'group_student_rel_change_2'
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'

locations/gschool_socialchg.qsrc

@@ -574,10 +574,6 @@ 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
@@ -680,14 +676,23 @@ if $ARGS[0] = 'group_student_rel_change':
 	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] < (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	
 
+if $ARGS[0] = 'group_student_rel_change_2':
+	if grupvalue_2_student_day ! daystart:
+		dailycheck_grupvalue[1] = grupvalue[1]
+		dailycheck_grupvalue[2] = grupvalue[2]
+		dailycheck_grupvalue[3] = grupvalue[3]
+		dailycheck_grupvalue[4] = grupvalue[4]
+	end
+end	
+
 --- gschool_socialchg ---------------------------------