[fixes] In school term calculates were being executed regardless of term time or not

locations/cikl.qsrc

@@ -1270,77 +1270,6 @@ if storyline = 1:
 
 
 	if SchoolAtestat = 0:
-		if kanikuli = 0 and week < 6:
-			if week = 1:
-				!!The start and end values for i have to be changed if more female schoolgirl npcs are added to the game
-				i = 11
-				
-				:hotcat_calc_jump
-				i += 1
-				
-				if hotcat_rating['A<<i>>'] = 0: jump 'hotcat_calc_jump'
-				
-				switch_rand = rand(1,100)
-				
-				if hotcat_movement['A<<i>>'] = 0 and switch_rand < 21:
-					hotcat_rating['A<<i>>'] -= 1
-					hotcat_movement['A<<i>>'] -= 1
-				elseif hotcat_movement['A<<i>>'] = 0 and switch_rand > 80:
-					hotcat_rating['A<<i>>'] += 1
-					hotcat_movement['A<<i>>'] += 1
-				elseif hotcat_movement['A<<i>>'] = 1 and switch_rand > 40:
-					hotcat_rating['A<<i>>'] -= 1
-					hotcat_movement['A<<i>>'] -= 1
-				elseif hotcat_movement['A<<i>>'] = -1 and switch_rand > 40:
-					hotcat_rating['A<<i>>'] += 1
-					hotcat_movement['A<<i>>'] += 1
-				end
-				if i < 145: jump 'hotcat_calc_jump'
-				killvar 'i'
-				killvar 'switch_rand'
-			end
-			
-			!!Maximum increase for grupvalues is 7/8
-			if oldgrupvalue_set = 0:
-				oldgrupvalue_set = 1
-				old_grupvalue[1] = grupvalue[1]
-				old_grupvalue[2] = grupvalue[2]
-				old_grupvalue[3] = grupvalue[3]
-				old_grupvalue[4] = grupvalue[4]
-			else
-				if old_grupvalue[1] + 8 < grupvalue[1]: grupvalue[1] = old_grupvalue[1] + 8
-				if old_grupvalue[2] + 8 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 8
-				if old_grupvalue[3] + 8 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 8
-				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
-			end
-
-			!!Decay for the school groups
-			if grupvalue[1] > 0:
-				grupvalue[1] -= rand(0,1)
-			else
-				grupvalue[1] = 0
-			end
-			if grupvalue[2] > 0:
-				grupvalue[2] -= rand(0,1)
-			else
-				grupvalue[2] = 0
-			end
-			if grupvalue[3] > 0:
-				grupvalue[3] -= rand(0,1)
-			else
-				grupvalue[3] = 0
-			end
-			if grupvalue[4] > 0:
-				grupvalue[4] -= rand(0,1)
-			else
-				grupvalue[4] = 0
-			end
-
-			old_grupvalue[1] = grupvalue[1]
-			old_grupvalue[2] = grupvalue[2]
-			old_grupvalue[3] = grupvalue[3]
-			old_grupvalue[4] = grupvalue[4]
-		end
 		if month = 12 and day > 25:
 			if day < 31:
 				$holyday = '<b>Winter Break in <<32-day>> days.</b>'
@@ -1418,6 +1347,77 @@ if storyline = 1:
 				$holyday = '<b>Last day of Autumn Break.</b>'
 			end
 		end
+		if kanikuli = 0 and week < 6:
+			if week = 1:
+				!!The start and end values for i have to be changed if more female schoolgirl npcs are added to the game
+				i = 11
+				
+				:hotcat_calc_jump
+				i += 1
+				
+				if hotcat_rating['A<<i>>'] = 0: jump 'hotcat_calc_jump'
+				
+				switch_rand = rand(1,100)
+				
+				if hotcat_movement['A<<i>>'] = 0 and switch_rand < 21:
+					hotcat_rating['A<<i>>'] -= 1
+					hotcat_movement['A<<i>>'] -= 1
+				elseif hotcat_movement['A<<i>>'] = 0 and switch_rand > 80:
+					hotcat_rating['A<<i>>'] += 1
+					hotcat_movement['A<<i>>'] += 1
+				elseif hotcat_movement['A<<i>>'] = 1 and switch_rand > 40:
+					hotcat_rating['A<<i>>'] -= 1
+					hotcat_movement['A<<i>>'] -= 1
+				elseif hotcat_movement['A<<i>>'] = -1 and switch_rand > 40:
+					hotcat_rating['A<<i>>'] += 1
+					hotcat_movement['A<<i>>'] += 1
+				end
+				if i < 145: jump 'hotcat_calc_jump'
+				killvar 'i'
+				killvar 'switch_rand'
+			end
+			
+			!!Maximum increase for grupvalues is 7/8
+			if oldgrupvalue_set = 0:
+				oldgrupvalue_set = 1
+				old_grupvalue[1] = grupvalue[1]
+				old_grupvalue[2] = grupvalue[2]
+				old_grupvalue[3] = grupvalue[3]
+				old_grupvalue[4] = grupvalue[4]
+			else
+				if old_grupvalue[1] + 8 < grupvalue[1]: grupvalue[1] = old_grupvalue[1] + 8
+				if old_grupvalue[2] + 8 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 8
+				if old_grupvalue[3] + 8 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 8
+				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
+			end
+
+			!!Decay for the school groups
+			if grupvalue[1] > 0:
+				grupvalue[1] -= rand(0,1)
+			else
+				grupvalue[1] = 0
+			end
+			if grupvalue[2] > 0:
+				grupvalue[2] -= rand(0,1)
+			else
+				grupvalue[2] = 0
+			end
+			if grupvalue[3] > 0:
+				grupvalue[3] -= rand(0,1)
+			else
+				grupvalue[3] = 0
+			end
+			if grupvalue[4] > 0:
+				grupvalue[4] -= rand(0,1)
+			else
+				grupvalue[4] = 0
+			end
+
+			old_grupvalue[1] = grupvalue[1]
+			old_grupvalue[2] = grupvalue[2]
+			old_grupvalue[3] = grupvalue[3]
+			old_grupvalue[4] = grupvalue[4]
+		end
 	elseif SchoolAtestat = -1:
 		if home_owned[2] = 0:
 			$holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'