Browse Source

Made the reading event flow better

KevinSmarts 6 years ago
parent
commit
3ad88ff65e
2 changed files with 12 additions and 9 deletions
  1. 2 9
      locations/gschool_lessons
  2. 10 0
      locations/gschool_lessonsev3

+ 2 - 9
locations/gschool_lessons

@@ -758,15 +758,8 @@ if $ARGS[0] = 'literature':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 		*nl
 		'Obediently, you open your textbook and start following along, even taking notes when you need to. Eventually, Ms. Braakman stops reading the passages herself and starts looking for volunteers to read.'
-		act 'Volunteer to read':
-			*clr & cla
-			pcs_grades += 1
-			grupvalue[3] +=3
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			*nl
-			'You raise your hand, and with a nod, Ms. Braakman lets you speak. You read the passage clearly without any mistakes, which earns you some praise from your teacher. "Very nice, Miss <<$PCs_lastname>>." She compliments with a small smile before continuing on with the lesson.'
-			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'reading'
-		end
+
+		act 'Volunteer to read':gt 'gschool_lessonsev3', 'reading'
 
 		act 'Avoid being chosen':
 			*clr & cla

+ 10 - 0
locations/gschool_lessonsev3

@@ -182,6 +182,13 @@ if $ARGS[0] = 'literature':
 end
 
 if $ARGS[0] = 'reading':
+	*clr & cla
+	pcs_grades += 1
+	grupvalue[3] +=3
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+	*nl
+	'You raise your hand, and with a nod, Ms. Braakman lets you speak. You read the passage clearly without any mistakes, which earns you some praise from your teacher. "Very nice, Miss <<$PCs_lastname>>." She compliments with a small smile before continuing on with the lesson.'
+
 	scooltiperand = RAND(1,4)
 	if scooltiperand = 1:
 		*clr & cla
@@ -252,7 +259,10 @@ if $ARGS[0] = 'reading':
 	elseif scooltiperand = 4:
 		*nl
 		'You sigh with relief when no one follows up the teacher''s compliment with a snide remark.'
+	else
+		act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 	end
+	act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'getphone':