Browse Source

[Changed] Broke up social check and recorded grupvalue so now the grupvalue change limit should be exactly 30 for the whole school day.

VioletKitten 4 years ago
parent
commit
68e3308ca2

+ 3 - 3
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

+ 1 - 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.'

+ 9 - 4
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
@@ -690,4 +686,13 @@ if $ARGS[0] = 'group_student_rel_change':
 	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 ---------------------------------