[added] second part of the new school files (still WIP) with a lot of fixes

locations/gschool_lessons.qsrc

@@ -34,10 +34,10 @@ if $ARGS[0] = 'morning':
 		act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
 
 		act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
-!!these options are new, after doing one then it should go back to the above options of going to first period or skipping. They should along with the ability to skip class be a option in every break below. Again not sure how that will be coded
-		act 'Use water cooler': gt 'gschool_break', 'watercooler'
-		act 'Go to the girls restroom': gt 'gschool_break', 'girls_restroom'
-		act 'Go to the boys restroom': gt 'gschool_break', 'boys_restroom'
+
+		act 'Use water cooler': $breaktype = 'short' & gt 'gschool_break', 'watercooler'
+		act 'Go to the girls restroom': gt 'gschool_break', 'restroom'
+		act 'Go to the boys restroom': gt 'gschool_break', 'restroom'
 	end
 end
 
@@ -81,6 +81,7 @@ end
 
 if $ARGS[0] = 'short_break':
 	menu_off = 1
+	watercooler_used = 0
 	gs 'stat'
 	if school_period = 1:
 		if hour = 6:
@@ -95,8 +96,7 @@ if $ARGS[0] = 'short_break':
 			school_period = 2
 			gt 'gschool_lessons', 'short_break'
 		end
-	end
-	if school_period = 2:
+	elseif school_period = 2:
 		if hour = 8:
 			minut += 95-minut
 		elseif hour = 9 and minut < 35:
@@ -107,8 +107,7 @@ if $ARGS[0] = 'short_break':
 			school_period = 4
 			gt 'gschool_lessons', 'short_break'
 		end
-	end
-	if school_period = 3:
+	elseif school_period = 3:
 		if $ARGS[1] = '':
 			if hour = 9 and minut < 55:
 				minut += 55-minut
@@ -122,8 +121,7 @@ if $ARGS[0] = 'short_break':
 				minut += 46-minut
 			end
 		end
-	end
-	if school_period = 4:
+	elseif school_period = 4:
 		if hour = 9:
 			minut += 100-minut
 		elseif hour = 10 and minut < 40:
@@ -134,8 +132,7 @@ if $ARGS[0] = 'short_break':
 			school_period = 5
 			gt 'gschool_lessons', 'short_break'
 		end
-	end
-	if school_period = 5:
+	elseif school_period = 5:
 		if hour = 10:
 			minut += 90-minut
 		elseif hour = 11 and minut < 30:
@@ -148,8 +145,7 @@ if $ARGS[0] = 'short_break':
 			gt 'gschool_lessons', 'short_break'
 		end
 		if NikoVolkovQW = 10 and NikoEv = 12: school_lunch = 1 & school_period = 6 & gt 'NikoDreams', 'Classroom Dream'
-	end
-	if school_period = 6:
+	elseif school_period = 6:
 		if $ARGS[1] = '':
 			if hour = 10:
 				minut += 145-minut
@@ -162,8 +158,7 @@ if $ARGS[0] = 'short_break':
 				gt 'gschool_lessons', 'short_break'
 			end
 		end
-	end
-	if school_period = 7:
+	elseif school_period = 7:
 		if hour = 11:
 			minut += 130-minut
 		elseif hour = 12:
@@ -176,11 +171,8 @@ if $ARGS[0] = 'short_break':
 			school_period = 8
 			gt 'gschool_lessons', 'short_break'
 		end
-	end
-	if school_period = 8:
-		if hour = 13:
-			minut += 60-minut
-		end
+	elseif school_period = 8:
+		if hour = 13: minut += 60-minut
 	end
 	gs 'stat'
 	if school_period = 2:
@@ -232,9 +224,8 @@ if $ARGS[0] = 'skip':
 	'You don''t feel like attending all of your classes this morning. Surely no one will miss you if you skip one of your three morning classes.'
 
 	act 'Go to girl''s bathroom': gt 'gschool_girls_bathroom', 'start'
-
 	act 'Go to boy''s bathroom': gt 'gschool_boys_bathroom', 'start'
-!!		act 'Go to old school building': gt
+!!	act 'Go to old school building': gt
 end
 
 if $ARGS[0] = 'schedule':

locations/gschool_lunch.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'break':
 	$menu_arg = 'break'
 	menu_off = 0
 	gs 'stat'
-	urand = rand(0, 8)
+	urand = rand(0,8)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
 	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
 	cla
@@ -148,7 +148,7 @@ if $ARGS[0] = 'break':
 	if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
 	if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
-	act 'Use water cooler': gt 'gschool_break', 'watercooler'
+	if watercooler_used = 0: act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
 	act 'Go to the girls restroom': gt 'gschool_break', 'Go to the girls restroom'
 	act 'Go to the boys restroom': gt 'gschool_break', 'Go to the boys restroom'