Merge remote-tracking branch 'rachels/master'

locations/gschool_chats1.qsrc

@@ -360,57 +360,6 @@ if $ARGS[0] = 'katja':
 	elseif pav_slut >= 250:
 		'"Oh hey, Kat. I was wondering if you had any recommendations for lipstick that won''t smear? Things can get kind of messy when I''m... y''know." You press your tongue against the inside of your cheek to imitate sucking cock.'
 		'She looks at you confused for a long moment before she gasps softly. "That... that''s gross!" she huffs. "How can you even ask me that?!"'
-
-    elseif npc_rel['A14'] >= 30 and pav_slut < 25 and pcs_grades >= 70 and pcs_makupskl >= 40 and hotcat >= 6 and meynoldQW = 0:
-		'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></td></table></center>' 
-		'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
-        '"Come on Katja! It will be fun! I will pay for the popcorn!"'
-        'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
-        '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
-        'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder what exactly to do when Vicky steps between the two and... Huh?!'
-        '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you and I am forced to be an incredibly young, pretty and cool aunt!"'
-        'WTF?! That, with some variations, is the reaction all the people present are experiencing at those angrily shouted words, but is enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
-        '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
-        'As Svyatoslav leaves, Katja releases a long-winded sigh.'
-         gs 'stat'
-		
-		act 'Talk with the twins':
-	        *clr & cla
-			'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></td></table></center>' 
-			'"Thanks Vicky. I don''t know how to tell him that I''m not interested... Sigh... But I don''t think that will make him relent... Oh <<$pcs_nickname>>! You heard us?!"'
-            'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
-            '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik; beyond paying Vitek to break his legs; you only need to hang around other people, tell him that you have a full schedule!"'
-
-			if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
-			    '"Thanks Vicky, but I don''t want to pester Vanya and you."'
-                'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
-                '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
-                'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. Well.... Yeah, you aren''t exactly friends... more like acquaintances really, but you don''t dislike getting to know her a litte better.'
-                '"Yeah Katja! If I have the time, we can hang around after school."'
-                '"Um... Thanks <<$pcs_nickname>>."'
-                'After this little scene, you chat with the twins until it is time to return to class.'
-			elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
-		        'Katja rest deflated against the lockers, her troubled eyes looking at you sideways.'
-                '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
-                'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
-                '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
-                'The twins proceed to give you puppy eyes... Of course by this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with all the class looking at their cute display... Damm... The shit these girls make you do...'
-                'After this little scene, you chat with the twins until it is time to return to class.'
-			else 
-			    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'    
-                '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'        
-                'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
-                '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
-                'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
-                'After this little scene, you chat with the twins until it is time to return to class.'												
-			end
-			meynoldQW = 1
-			npc_rel['A14'] += 1
-			npc_rel['A15'] += 1
-            gs 'stat'
-			
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'								
-		end
 	else 
 		npc_rel['A14'] += 1
 		'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
@@ -497,6 +446,65 @@ if $ARGS[0] = 'katja':
 	end	
 end
 
+
+if $ARGS[0] = 'Katjaproblems':
+	cls
+	menu_off = 1
+	gs 'stat'
+	'<center><table><tr><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></tr></td></table></center>'
+	'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
+    '"Come on Katja! It will be fun! I will pay for the popcorn!"'
+    'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
+    '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
+    'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder what exactly to do when Vicky steps between the two and... Huh?!'
+    '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you and I am forced to be an incredibly young, pretty and cool aunt!"'
+    'WTF?! That, with some variations, is the reaction all the people present are experiencing at those angrily shouted words, but is enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
+    '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
+    'As Svyatoslav leaves, Katja releases a long-winded sigh.'
+    gs 'stat'
+		
+	act 'Talk with the twins':
+	    *clr & cla
+		'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></td></table></center>' 
+		'"Thanks Vicky. I don''t know how to tell him that I''m not interested... Sigh... But I don''t think that will make him relent... Oh <<$pcs_nickname>>! You heard us?!"'
+        'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
+        '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik; beyond paying Vitek to break his legs; you only need to hang around other people, tell him that you have a full schedule!"'
+
+		if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
+		    '"Thanks Vicky, but I don''t want to pester Vanya and you."'
+            'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
+            '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
+            'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. Well.... Yeah, you aren''t exactly friends... more like acquaintances really, but you don''t dislike getting to know her a litte better.'
+            '"Yeah Katja! If I have the time, we can hang around after school."'
+            '"Um... Thanks <<$pcs_nickname>>."'
+            'After this little scene, you chat with the twins until it is time to return to class.'
+		elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
+		    'Katja rest deflated against the lockers, her troubled eyes looking at you sideways.'
+            '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
+            'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
+            '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
+            'The twins proceed to give you puppy eyes... Of course by this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with all the class looking at their cute display... Damm... The shit these girls make you do...'
+            'After this little scene, you chat with the twins until it is time to return to class.'
+		else 
+		    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'    
+            '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'        
+            'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
+            '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
+            'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
+            'After this little scene, you chat with the twins until it is time to return to class.'												
+		end
+		meynoldQW = 1
+		npc_rel['A14'] += 1
+		npc_rel['A15'] += 1
+        gs 'stat'
+			
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'								
+	end
+end
+
+
+
+
 if $ARGS[0] = 'albina':
 	*clr & cla
 	menu_off = 1

locations/gschool_lunch.qsrc

@@ -135,6 +135,8 @@ if $ARGS[0] = 'break':
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
+	if meynoldQW = 0 and npc_rel['A14'] >= 30 and pav_slut < 25 and pcs_grades >= 70 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
+
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 

locations/noticeboard.qsrc

@@ -30,14 +30,30 @@ if $ARGS[0] = 'look':
 	$noticeboardmap += '<area shape="rect" coords="<<$advert5>>" href="exec:gt ''noticeboard'', ''advert5''" alt="--5--">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert6>>" href="exec:gt ''noticeboard'', ''advert6''" alt="--6--">'
 	$noticeboardmap += '</map>'
-	$noticeboardmap += '<center><img <<$set_imgh>> src="images/locations/shared/notboard/noticeboard_<<$loc>>.jpg" USEMAP="#noticemap"></center>'
+
+	if $loc = 'pav_commercial':
+		$name_of_the_picure = 'noticeboard_pavcommercial'
+	elseif $loc = 'city_residential':
+		$name_of_the_picure = 'noticeboard_street'
+	elseif $loc = 'torgcentr':
+		$name_of_the_picure = 'noticeboard_torgcentr'
+	elseif $loc = 'city_industrial':
+		$name_of_the_picure = 'noticeboard_nord'
+	else
+		$name_of_the_picure = 'noticeboard'
+	end
+
+	$noticeboardmap += '<center><img <<$set_imgh>> src="images/locations/shared/notboard/<<$name_of_the_picure>>.jpg" USEMAP="#noticemap"></center>'
 
 	*pl $noticeboardmap
 	killvar '$noticeboardmap'
 	if NumberOfNewAdverts = 0: *nl 'There are no interesting adverts at the board.'
 	if NumberOfNewAdverts = 1: *nl 'There is one interesting advert at the board.'
 	if NumberOfNewAdverts > 1: *nl 'There are <<NumberOfNewAdverts>> interesting adverts at the board.'
-	act 'Leave the board': gt 'restoreposition'
+	act 'Leave the board': 
+		killvar '$noticeboardmap'
+		gt 'restoreposition'
+	end
 end