1
0
Переглянути джерело

[added] gs 'school_schedule' for hornyguy. Will now state what lesson is coming up next while in the school hallway.
[changed] fixed names of morning break and lunch break to be more English.

3xpurt 6 роки тому
батько
коміт
cbf84b4d4b
3 змінених файлів з 73 додано та 2 видалено
  1. 1 0
      glife.qproj
  2. 10 2
      locations/gschool_lessons
  3. 62 0
      locations/gschool_schedule

+ 1 - 0
glife.qproj

@@ -558,6 +558,7 @@
       <Location name="gschool_detention"/>
       <Location name="gschool_randperson"/>
       <Location name="gschool_socialchg"/>
+      <Location name="gschool_schedule"/>
       <Location name="Sgrup1"/>
       <Location name="Sgrup2"/>
       <Location name="Sgrup3"/>

+ 10 - 2
locations/gschool_lessons

@@ -25,6 +25,8 @@ if $ARGS[0] = 'morning':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to.'
 		gs 'gschool_gossip', 'morning'
+		nl
+		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'
@@ -138,19 +140,25 @@ if $ARGS[0] = 'short_break':
 		if $ARGS[1] ! 'nopict':
 			'<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'
 		end
-		act 'Long break now': gt 'gschool_lessons', 'schedule'
+		act 'Time for morning break': gt 'gschool_lessons', 'schedule'
 	elseif school_period = 5:
 		if $ARGS[1] ! 'nopict':
 			'<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'
 		end
-		act 'Time for lunch now': gt 'gschool_lessons', 'schedule'
+		act 'Time for lunch break': gt 'gschool_lessons', 'schedule'
 	elseif (school_period < 8):
 		if $ARGS[1] ! 'nopict':
 			'<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>'
 			gs 'gschool_gossip', 'gossip'
+			nl
+			gs 'gschool_schedule'
 		end
 
 		act 'Move to next class': gt 'gschool_lessons', 'schedule'

+ 62 - 0
locations/gschool_schedule

@@ -0,0 +1,62 @@
+# gschool_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
+
+--- gschool_lessons ---------------------------------
+