1
0

2 Commits 7464909ded ... 6c8bc90809

Autor SHA1 Nachricht Datum
  Sicaa 6c8bc90809 Merging updates since I made an oopsie and comitted before updating to the repo. Sry. vor 4 Jahren
  Sicaa 2ab7167616 [changed] fuck or not events into gossip (so they no longer only appear in the morning), [added] specific gossip category for during lessons & replaced old calls with these where appropriate vor 4 Jahren

+ 29 - 0
locations/gschool_gossip.qsrc

@@ -31,6 +31,11 @@ if $ARGS[0] = 'gym':
 	gs 'gschool_gossip', 'girls'
 end
 
+if $ARGS[0] = 'lesson':
+	'You''re curious about what your classmates behind you are talking about. You shift back in your seat a little, take a quick peek and listen in.'
+	gs 'gschool_gossip', 'gossip'
+end
+
 if $ARGS[0] = 'gossip':
 	if soniaPS > 0 and soniaPS < 4 and rand(0,1+SoniaPS)= 0:
 		if soniaPS = 1:
@@ -53,6 +58,30 @@ if $ARGS[0] = 'gossip':
 			'"What do you mean, such a shame? Why do you even care?"'
 			'"Oh it''s nothing. I used to like her a lot, but back in the ninth grade she was such a prude, she wouldn''t even go on a date with me!"'
 		end
+	elseif fuckornot = 0:
+		fuckornot = 1
+		fuckornot_day = daystart
+		'Several boys are snickering and looking at something on a tablet computer. "Have you guys checked out this site?"'
+		'"Which site?" one of the boys asks.'
+		'"Fuckable or not. Some nerds made a web site listing all the girls where you can rate them on how fuckable they are," he says with a laugh.'
+		'A third boys almost grabs the tablet "What!? Let me see that!" After that the descend into talking about which of the girls they think should be rated higher or lower.'
+	elseif fuckornot = 1 and fuckornot_day < daystart - 2:
+		fuckornot = 2
+		fuckornot_day = daystart
+		'A group of girls is clustered around a laptop. "Oh my god that is so disgusting, boys are such pigs," the first one says.'
+		'The second girl nods "I know right? And the name, so disgusting, they could have at least called it Hot or not."'
+		'A third one responds "I heard some of the nerds made it and it was called Hot or not, but then some of the other guys found out about it and made them rename it," she says in disgust.'
+		'They are silent for a few moments when the second one asks "Where did I get rated?" Then they all start talking about where they were rated and where they should have been rated, and of course how disgusting boys are.'
+	elseif hotornot = 0 and fuckornot_day < daystart - 9:
+		hotornot = 1
+		fuckornot_day = daystart
+		'A group of girls are looking at their phones. "Can you believe these ratings?" one of them says.'
+		'Another responds "Boys are such pigs."'
+		'"We should return the favor and rate <i>them</i>." a third one says, the rest all stop and look at her, then to each other and smile.'
+	elseif hotornot = 1 and fuckornot_day < daystart - 11:
+		hotornot = 2
+		fuckornot_day = daystart
+		'Several of the cool girls are talking to Zinaida. At first you think they might be bullying her, but instead it sounds like they are asking her a bunch of questions. What ever it is, they seem to come to an agreement.'
 	else
 		if rand(0,1) = 0:
 			gs 'gschool_gossip', 'mixed'

+ 0 - 68
locations/gschool_lessons.qsrc

@@ -37,74 +37,6 @@ if $ARGS[0] = 'morning':
 			gs 'gschool_lessons', 'uniform_check'
 
 			act 'Follow': gt 'gschool_office', 'principal'
-		elseif late = 0 and fuckornot = 0:
-			fuckornot = 1
-			fuckornot_day = daystart
-			'<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>'
-			'You walk past several boys snickering and looking at something on a tablet computer. "Have you guys checked out this site?"'
-			'"Which site." one of the boys asks.'
-			'"Fuckable or not. Some nerds made a web site listing all the girls where you can rate them on how fuckable they are." he says with a laugh.'
-			'A third boys almost grabs the tablet. "What!? Let me see that!" After that the descend into talking about which of the girls they think should be rated higher or lower.'
-			*nl			
-			gs 'gschool_lessons', 'uniform_check'
-			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'
-
-			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
-			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
-		elseif late = 0 and fuckornot = 1 and fuckornot_day < daystart - 2:
-			fuckornot = 2
-			fuckornot_day = daystart
-			'<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>'
-			'You see a group of girls clustered around a laptop. "Oh my god that is so disgusting, boys are such pigs." the first one says.'
-			'A second girl nods. "I know right? And the name, so disgusting, they could have at least called it Hot or not."'
-			'A third one responds. "I heard some of the nerds made it and it was called Hot or not, but then some of the other guys found out about it and made them rename it." she says in disgust.'
-			'They are silent for a few moments when the second one asks. "Where did I get rated?" Then they all start talking about where they were rated and where they should have been rated, and of course how disgusting boys are.'
-			*nl			
-			gs 'gschool_lessons', 'uniform_check'
-			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'
-
-			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
-			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
-		elseif late = 0 and hotornot = 0 and fuckornot_day < daystart - 9:
-			hotornot = 1
-			fuckornot_day = daystart
-			'<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>'
-			'You walk past a group of guys looking at there phone. "Can you believe these ratings?" One of them says.'
-			'Another responds. "Boys are such pigs."'
-			'"We should return the favor and rate <i>them</i>." A third one says, the rest all stop and look at her, then to each other and smile.'
-			*nl			
-			gs 'gschool_lessons', 'uniform_check'
-			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'
-
-			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
-			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
-		elseif late = 0 and hotornot = 1 and fuckornot_day < daystart - 11:
-			hotornot = 2
-			fuckornot_day = daystart
-			'<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>'
-			'You see several of the cool guys talking to Zinaida. At first you think they might be bullying her, but instead it sounds like they are asking her a bunch of questions. What ever it is, they seem to come to an agreement.'
-			*nl			
-			gs 'gschool_lessons', 'uniform_check'
-			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'
-
-			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
-			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
-			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
 		elseif late = 0 and cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
 			gs 'gschool_cheerleading', 'skipped_ev'
 			act 'Continue down the hall': gt 'gschool_lessons', 'morning'

+ 4 - 8
locations/gschool_lessonsev1.qsrc

@@ -478,8 +478,7 @@ if $ARGS[0] = 'biology':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -669,8 +668,7 @@ if $ARGS[0] = 'science':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -1148,8 +1146,7 @@ if $ARGS[0] = 'computer':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -1516,8 +1513,7 @@ if $ARGS[0] = 'russian':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates behind you are talking about. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end

+ 4 - 9
locations/gschool_lessonsev2.qsrc

@@ -245,8 +245,7 @@ if $ARGS[0] = 'geography':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -534,9 +533,7 @@ if $ARGS[0] = 'math':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'Curious about what your classmates are talking about, you listen closely but can''t make out much of what they''re saying, but you do manage to hear...'
-				*nl
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -939,8 +936,7 @@ if $ARGS[0] = 'history':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -1283,8 +1279,7 @@ if $ARGS[0] = 'shop':
 			act 'Eavesdrop':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end

+ 4 - 6
locations/gschool_lessonsev3.qsrc

@@ -1214,9 +1214,8 @@ if $ARGS[0] = 'music':
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			act 'Eavesdrop':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok<<rand(0, 12)>>.jpg"></center>'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -1503,9 +1502,8 @@ if $ARGS[0] = 'art':
 			act 'Ignore them and wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			act 'Eavesdrop':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
-				'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
-				gs 'gschool_gossip', 'gossip'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok<<rand(0, 12)>>.jpg"></center>'
+				gs 'gschool_gossip', 'lesson'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end