Browse Source

[fixed] missing $, wrong events in the morning break

julzor 5 years ago
parent
commit
564b570506
3 changed files with 18 additions and 9 deletions
  1. 1 0
      locations/gschool_lessons.qsrc
  2. 3 2
      locations/gschool_lessons2.qsrc
  3. 14 7
      locations/gschool_lunch.qsrc

+ 1 - 0
locations/gschool_lessons.qsrc

@@ -239,6 +239,7 @@ if $ARGS[0] = 'skip':
 end
 
 if $ARGS[0] = 'schedule':
+	killvar '$breaktype'
 	gs 'stat'
 	if school_period = 0:
 		school_period = 1

+ 3 - 2
locations/gschool_lessons2.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'postphys':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
 				'You crack the door open slightly and peek in. You''re flabbergasted by what you see: Christina is on her knees in front of Mr. Pavlovich, and is sucking him off like her life depended on it.'
-				gs 'arousal', 'voyeur', 5, 'unkown'
+				gs 'arousal', 'voyeur', 5
 				gs 'stat'
 				gs 'willpower', 'misc'
 				if will_cost <= pcs_willpwr:
@@ -1529,13 +1529,14 @@ if $ARGS[0] = 'dress':
 				act 'Return': gt 'gschool_lessons2', 'post_dress'
 			end
 		end
-	exit
+		exit
 	elseif rand(0,10) = 3:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,3)>>.jpg"></center>'
 		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		'You can choose another outfit while you''re here.'
+		act 'Continue': gt 'gschool_lessons2', 'post_dress'
 	else
 		*clr & cla
 		gs 'stat'

+ 14 - 7
locations/gschool_lunch.qsrc

@@ -146,13 +146,20 @@ if $ARGS[0] = 'break':
 			gt 'gschool_lunch', 'events'
 		end
 		
-		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.'
+		if school_period = 6:
+			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': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
-		act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom_events'
-		act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom_events'
+			act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom_events'
+			act 'Go to the boys restroom': $breaktype = 'long' & gt 'gschool_break', 'boys_restroom_events'
+		else
+			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': $breaktype = 'short' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
+			act 'Go to the boys restroom': $breaktype = 'short' &  & gt 'gschool_break', 'restroom'
+		end
 	end
 
 	act 'Relax in a classroom': gt 'gschool_chats', 'nerds'
@@ -423,7 +430,7 @@ if $ARGS[0] = 'events':
 		cla
 		gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 0, 0, 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/lunchsleep.jpg"></center>'
-		'While in the cafeteria you notice <<rand_girl>> is laying down on her back on one of the benches. Her eyes are closed, her chest raises up slowly as she breathes. You think she has fallen asleep, despite all the noise around her. She must really be tired.'
+		'While in the cafeteria you notice <<$rand_girl>> is laying down on her back on one of the benches. Her eyes are closed, her chest raises up slowly as she breathes. You think she has fallen asleep, despite all the noise around her. She must really be tired.'
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	elseif rand(1,100) < 3:
 		cla