Merge branch 'master' of nyanobot/glife into master

locations/ParChurch.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'fillers':
 	elseif randtext = 8 and soniaPS = 0:
 		$safesub = 'your curfew on weekends'
 	elseif randtext = 9:
-		$safesub = 'your garandparents'
+		$safesub = 'your grandparents'
 	elseif randtext = 0:
 		moral += 1
 		$safesub = 'God and Jesus'

locations/bed1.qsrc

@@ -162,7 +162,7 @@ if $ARGS[0] = 'sog1':
 									*clr
 									swallow += 1
 									husband -= 40
-									gs 'cum_call', 'mounth', $namesob, 1, 0, -1, 60
+									gs 'cum_call', 'mouth', $namesob, 1, 0, -1, 60
 									'<center><img <<$set_imgh>> src="images/beast/zoo/z7.jpg"></center>'
 									'You lay the dog on the floor and take his cock in my mouth, your husband looks at you with disgust as you suck the dogs cock.'
 									'In a couple of minutes the dog cums in your mouth and you swallow his sperm.'

locations/gschool_lessons.qsrc

@@ -2711,7 +2711,7 @@ if $ARGS[0] = 'postphys':
 					zverevaQW = 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-					'You open the door and enter Mr. Pavlovich''s room. Christine is startled, jumping up from her kneeling position and desperately wiping her mouth while your teacher quickly stuffs his erection back into his shorts. "Miss <<$pcs_lastname>>, has no one taught you you should knock!? Me and Christina were just discussing some important matters!" he exclaims, pretending to be insulted by your sudden intrusion.'
+					'You open the door and enter Mr. Pavlovich''s room. Christina is startled, jumping up from her kneeling position and desperately wiping her mouth while your teacher quickly stuffs his erection back into his shorts. "Miss <<$pcs_lastname>>, has no one taught you you should knock!? Me and Christina were just discussing some important matters!" he exclaims, pretending to be insulted by your sudden intrusion.'
 					*nl
 					'You can''t believe he''s even trying! You tell him just that, "Christina was using her mouth, but it certainly wasn''t for talking! You''re letting her suck you off so she can go to the regional competition instead of me!"'
 					*nl

locations/gschool_socialchg.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'nerd':
 	cla & *clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
-	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Artem, Feofan, Petka, Gerasim, Zinadia, and Julia there. They give you friendly smiles. Artem speaks "Hey <<$pcs_nickname>>, we have been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
+	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Artem, Feofan, Petka, Gerasim, Zinaida, and Julia there. They give you friendly smiles. Artem speaks "Hey <<$pcs_nickname>>, we have been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
@@ -302,23 +302,23 @@ if $ARGS[0] = 'nerd game night':
 	'As you take your seat Feofan tells you this incredible background story as he builds up the game world so you can be fully immersed. You''re handed a handbook and a pencil as he continues on explaining what the game is all about.'
 	'You hear a couple of sighs as Feofan passionately continues on. "Why does it always end up like this? Let''s get on with the game already!" Petka exclaims.'
 
-	grupvalue[3] + 2
+	grupvalue[3] += 2
 	gs 'gschool_socialchg', 'group_rel_change','nerds', 1
 	gs 'stat'
 
 	act 'Pick a character':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/character.jpg"></center>'
-		'It seems that Feofan has created two different characters for you to pick. One is a rouge which uses her beautiful looks, charm, and agility to get what she wants, while the other one is a wizard character that uses her intelligence and mystical abilities to rain down death and destruction with magic.'
+		'It seems that Feofan has created two different characters for you to pick. One is a rogue which uses her beautiful looks, charm, and agility to get what she wants, while the other one is a wizard character that uses her intelligence and mystical abilities to rain down death and destruction with magic.'
 		'"Before we begin you need to pick out a character you want to use <<$pcs_nickname>>." Feofan tells you.'
-		'It doesn''t take long before the boys begin to argue for you to pick the rouge, "We''re currently missing a character that has lots of social skills so please pick her."'
+		'It doesn''t take long before the boys begin to argue for you to pick the rogue, "We''re currently missing a character that has lots of social skills so please pick her."'
 		'The girls sigh loudly, "Don''t listen to them, they just want a sexy character in their party. Pick the wizard instead and you''ll be of more help to the group."'
 		gs 'stat'
 
-		act 'Pick the rouge':
+		act 'Pick the rogue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/rogue.jpg"></center>'
-			'You fall under the guys pressure and decide on the rouge. "Great choice, <<$pcs_nickname>>!" Petka says. "If we''re ever short on gold we can use your character to earn us some money while in the town." Petka continues on while the other boys start to laugh.'
+			'You fall under the guys pressure and decide on the rogue. "Great choice, <<$pcs_nickname>>!" Petka says. "If we''re ever short on gold we can use your character to earn us some money while in the town." Petka continues on while the other boys start to laugh.'
 			gs 'stat'
 			npc_rel['A2'] += 1
 			npc_rel['A6'] += 1
@@ -329,7 +329,7 @@ if $ARGS[0] = 'nerd game night':
 		act 'Pick the wizard':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/wizard.jpg"></center>'
-			'You decide to follow the girls advice and pick the wizard. "I''m glad you decided to listen to us." Julia happily says. "We can build your character to be a wreck stuff." she continues on while Zinadia nods approvingly.'
+			'You decide to follow the girls advice and pick the wizard. "I''m glad you decided to listen to us." Julia happily says. "We can build your character to be a wreck stuff." she continues on while Zinaida nods approvingly.'
 			minut += 30
 			gs 'stat'
 			npc_rel['A142'] += 1
@@ -345,7 +345,7 @@ if $ARGS[0] = 'nerd game night':
 		killvar '$Game_on'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/playing.jpg"></center>'
-		'Feofan clears his throat, "Now then, the last time we stopped at the event where Zinadia was supposed to make her move."'
+		'Feofan clears his throat, "Now then, the last time we stopped at the event where Zinaida was supposed to make her move."'
 		'Artem sighs deeply, "Do we need to have this discussion again? It''s obvious that we should attack the dragon. After all she is the mighty warrior and our tank."'
 		'Gerasim looks a bit irritated, "We should buff the warrior first before taking on the dragon. It''s a more sound strategy."'
 		'The whole room erupts in a frenzy, everyone is talking over each other to get their point across... Feofan tries to calm everyone down but it''s futile, the situation is out of control. After a while they decide that they should vote on what to do next.'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'nerd game night':
 		act 'Side with no one':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/gamenight.jpg"></center>'
-			'You excuse yourself as you explain that it wouldn''t be fair for you to take this kind of decision as you''re new at this and don''t even know how tought a dragon is, though it sounds dangerous.'
+			'You excuse yourself as you explain that it wouldn''t be fair for you to take this kind of decision as you''re new at this and don''t even know how tough a dragon is, though it sounds dangerous.'
 			'The rest of the group seem to accept that as they go back to bickering about what to do next.'
 			minut += 30
 			gs 'stat'

locations/nyp_school.qsrc

@@ -348,7 +348,7 @@ if $ARGS[0] = 'nerds':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/nerds.jpg"></center>'
 			'You stop and begin thinking about the right strategy, "I feel that we should approach this fight very carefully. The undead king seems kind of strong and should not be underestimated."'
-			'Zinadia nods, "I agree, remember the last time we went heads on with that dragon and almost got wiped out? That was such a bad decision by us... The game master nearly got us all killed there."'
+			'Zinaida nods, "I agree, remember the last time we went heads on with that dragon and almost got wiped out? That was such a bad decision by us... The game master nearly got us all killed there."'
 			'Feofan grins, "It''s not fault you decided to run into that fight without any plan. The blame is completely on you all. But I have to admit it was fun seeing you all sweat for a while."'
 			'"Well if you put that way then we really need to be careful." you reply. You continue on discussing the game, immersing yourself into the game world. All while Natasha shakes her head, "You guys are really the worst kind of nerds..."'
 			minut += 5
@@ -434,7 +434,7 @@ if $ARGS[0] = 'nerds':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/nerds.jpg"></center>'
 		'As you pass by the nerds table you hear Natasha sighing deeply, "All you guys always talk about is that damn game. Do we really have to talk about it all the fricking time? It''s so annoying."'
-		'Julia and Zinadia look at her confused, "But it''s really fun. You have an immersive world where there is lots of stuff happening. You can fight dragons, undead. You get to make decisions that in the end can affect the whole party. And the best of all you get to hang out with your friends in peace."'
+		'Julia and Zinaida look at her confused, "But it''s really fun. You have an immersive world where there is lots of stuff happening. You can fight dragons, undead. You get to make decisions that in the end can affect the whole party. And the best of all you get to hang out with your friends in peace."'
 		minut += 10
 		gs 'stat'
 

locations/preSYS2.qsrc

@@ -735,7 +735,7 @@ end
 
 if $ARGS[0] = 'modrel_out':
 	$metka = 'modrel_out'
-	'<center><b>Popular kids relationship levels</b></center>'
+	'<center><b>Outcast kids relationship levels</b></center>'
 	*nl
 	*nl
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
@@ -749,7 +749,7 @@ end
 
 if $ARGS[0] = 'modrel_tea':
 	$metka = 'modrel_tea'
-	'<center><b>Popular kids relationship levels</b></center>'
+	'<center><b>Teacher relationship levels</b></center>'
 	*nl
 	*nl
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'