create a file for the generic school stuff and move the schedule there

changes from 0_8_5 to 0_8_6.txt

@@ -0,0 +1,27 @@
+Locations:
+
+=== added locations ===
+
+npc							<- npc_age, npc_intro
+gschool						<- gschool_schedule
+
+=== deleted locations ===
+
+npc_age						-> func('npc','age',..)
+npc_intro					-> gs 'npc','intro',..,..
+gschool_schedule			-> gs 'gschool', 'schedule'
+
+Variables:
+
+=== Deleted variables ===
+
+[Numeric variables]
+
+[String variables]
+
+=== Added variables ===
+
+[Numeric variables]
+
+[String variables]
+

glife.qproj

@@ -651,6 +651,7 @@
 		<Location name="FedorMisc"/>
 	</Folder>
 	<Folder name="School">
+		<Location name="gschool"/>
 		<Location name="gschool_grounds"/>
 		<Location name="gschool_lessons"/>
 		<Location name="gschool_lessons1"/>
@@ -673,7 +674,6 @@
 		<Location name="gschool_randperson"/>
 		<Location name="gschool_socialchg"/>
 		<Location name="gschool_socialchg1"/>
-		<Location name="gschool_schedule"/>
 		<Location name="gschool_chats"/>
 		<Location name="gschool_chats1"/>
 		<Location name="gschool_chats2"/>

locations/gschool.qsrc

@@ -1,62 +1,65 @@
-# gschool_schedule
+# gschool
 
-if school_period = 0:
-	*nl
-	if week = 1: '<b>Next period</b>: Math'
-	if week = 2: '<b>Next period</b>: English'
-	if week = 3: '<b>Next period</b>: Math'
-	if week = 4: '<b>Next period</b>: English'
-	if week = 5: '<b>Next period</b>: Math'
-	!'8.00 - 8.45'
-elseif school_period = 1:
-	*nl
-	if week = 1: '<b>Next period</b>: Russian'
-	if week = 2: '<b>Next period</b>: Geography'
-	if week = 3: '<b>Next period</b>: Russian'
-	if week = 4: '<b>Next period</b>: Geography'
-	if week = 5: '<b>Next period</b>: Russian'
-	!'8.50 - 9.35'
-elseif school_period = 2:
-	*nl
-	'<b>Next</b>: Morning break'
-	!'9.35 - 9.55'
-elseif school_period = 3:
-	*nl
-	if week = 1: '<b>Next period</b>: Literature'
-	if week = 2: '<b>Next period</b>: Science'
-	if week = 3: '<b>Next period</b>: Biology'
-	if week = 4: '<b>Next period</b>: Science'
-	if week = 5: '<b>Next period</b>: Literature'
-	!'9.55 - 10.40'
-elseif school_period = 4:
-	*nl
-	if week = 1: '<b>Next period</b>: Art'
-	if week = 2: '<b>Next period</b>: Shop'
-	if week = 3: '<b>Next period</b>: History'
-	if week = 4: '<b>Next period</b>: Shop'
-	if week = 5: '<b>Next period</b>: Art'
-	!'10.45 - 11.30'
-elseif school_period = 5:
-	*nl
-	'<b>Next</b>: Lunch break'
-	!'11.30 - 12.25'
-elseif school_period = 6:
-	*nl
-	if week = 1: '<b>Next period</b>: Biology'
-	if week = 2: '<b>Next period</b>: Computer'
-	if week = 3: '<b>Next period</b>: Computer'
-	if week = 4: '<b>Next period</b>: Computer'
-	if week = 5: '<b>Next period</b>: History'
-	!'12.25 - 13.10'
-elseif school_period = 7:
-	*nl
-	if week = 1: '<b>Next period</b>: P.E.'
-	if week = 2: '<b>Next period</b>: Music'
-	if week = 3: '<b>Next period</b>: P.E.'
-	if week = 4: '<b>Next period</b>: Music'
-	if week = 5: '<b>Next period</b>: P.E.'
-	!'13.15 - 15.00'
+
+if $ARGS[0] = 'schedule':
+	if school_period = 0:
+		*nl
+		if week = 1: '<b>Next period</b>: Math'
+		if week = 2: '<b>Next period</b>: English'
+		if week = 3: '<b>Next period</b>: Math'
+		if week = 4: '<b>Next period</b>: English'
+		if week = 5: '<b>Next period</b>: Math'
+		!'8.00 - 8.45'
+	elseif school_period = 1:
+		*nl
+		if week = 1: '<b>Next period</b>: Russian'
+		if week = 2: '<b>Next period</b>: Geography'
+		if week = 3: '<b>Next period</b>: Russian'
+		if week = 4: '<b>Next period</b>: Geography'
+		if week = 5: '<b>Next period</b>: Russian'
+		!'8.50 - 9.35'
+	elseif school_period = 2:
+		*nl
+		'<b>Next</b>: Morning break'
+		!'9.35 - 9.55'
+	elseif school_period = 3:
+		*nl
+		if week = 1: '<b>Next period</b>: Literature'
+		if week = 2: '<b>Next period</b>: Science'
+		if week = 3: '<b>Next period</b>: Biology'
+		if week = 4: '<b>Next period</b>: Science'
+		if week = 5: '<b>Next period</b>: Literature'
+		!'9.55 - 10.40'
+	elseif school_period = 4:
+		*nl
+		if week = 1: '<b>Next period</b>: Art'
+		if week = 2: '<b>Next period</b>: Shop'
+		if week = 3: '<b>Next period</b>: History'
+		if week = 4: '<b>Next period</b>: Shop'
+		if week = 5: '<b>Next period</b>: Art'
+		!'10.45 - 11.30'
+	elseif school_period = 5:
+		*nl
+		'<b>Next</b>: Lunch break'
+		!'11.30 - 12.25'
+	elseif school_period = 6:
+		*nl
+		if week = 1: '<b>Next period</b>: Biology'
+		if week = 2: '<b>Next period</b>: Computer'
+		if week = 3: '<b>Next period</b>: Computer'
+		if week = 4: '<b>Next period</b>: Computer'
+		if week = 5: '<b>Next period</b>: History'
+		!'12.25 - 13.10'
+	elseif school_period = 7:
+		*nl
+		if week = 1: '<b>Next period</b>: P.E.'
+		if week = 2: '<b>Next period</b>: Music'
+		if week = 3: '<b>Next period</b>: P.E.'
+		if week = 4: '<b>Next period</b>: Music'
+		if week = 5: '<b>Next period</b>: P.E.'
+		!'13.15 - 15.00'
+	end
 end
 
---- gschool_schedule ---------------------------------
+--- gschool ---------------------------------
 

locations/gschool_lessons.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'morning':
 			gs 'gschool_gossip', 'morning'
 			*nl
 			gs 'gschool_lessons', 'uniform_check'
-			gs 'gschool_schedule'
+			gs 'gschool', 'schedule'
 			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
 			act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
 
@@ -205,7 +205,7 @@ if $ARGS[0] = 'short_break':
 			'<center><b><font color="maroon">School Hallway</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 			nl
-			gs 'gschool_schedule'
+			gs 'gschool', 'schedule'
 		end
 		act 'Time for morning break': gt 'gschool_lessons', 'schedule'
 	elseif school_period = 5:
@@ -213,7 +213,7 @@ if $ARGS[0] = 'short_break':
 			'<center><b><font color="maroon">School Hallway</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 			nl
-			gs 'gschool_schedule'
+			gs 'gschool', 'schedule'
 		end
 		act 'Time for lunch break': gt 'gschool_lessons', 'schedule'
 	elseif (school_period < 8):
@@ -222,7 +222,7 @@ if $ARGS[0] = 'short_break':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 			gs 'gschool_gossip', 'gossip'
 			nl
-			gs 'gschool_schedule'
+			gs 'gschool', 'schedule'
 		end
 		
 		if christinaphotos > 4: gt 'gschool_events', 'christinaphotos'