Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/fight.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'applyDamage':
 			if <<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] > 0:
 				<<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] = 0
 				if $fightAppDam['TargetName'] = 'you':
-					""<<$fightAppDam['TargetName']>> losse <<fightAppDam['Shield']>> defense.""
+					""<<$fightAppDam['TargetName']>> lose <<fightAppDam['Shield']>> defense.""
 				else
 					""<<$fightAppDam['TargetName']>> losses <<fightAppDam['Shield']>> defense.""
 				end

locations/katja_dorm.qsrc

@@ -389,7 +389,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 		if katjaQW['QWstage'] < 6 and katjaQW['anal_quest'] < 3:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'"You know, <<$pcs_nickname>>, meeting Lazar at the café got me thinking," Katja says.'
-			if katjaQW['QWstage'] = 4:
+			if katjaQW['QWstage'] <= 4:
 				'"We talked about how I would like to try having... sex... with a guy," Katja says with some pause. "I know you said you didn''t want to arrange it, but I''m sure with Lazar that you wouldn''t have to arrange anything; just call him and I''m sure he''ll agree," she continues before you can say anything.'
 				act 'Agree':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5

locations/natalia_pavlova.qsrc

@@ -12,7 +12,6 @@ if $ARGS[0] = 'first_chat':
 		'You giggle. "Actually, I get that, and I''m not offended. Anyway, hello and welcome to our school. Maybe we''ll chat again at some point."'
 		'"Yes, I''d like that", Natalia answers. "See you later, <<$pcs_nickname>>."'
 	elseif grupTipe = 1:
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/240.jpg"></center>'
 		'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and smiles.'
 		'You smile back at her. "Hi Natalia, you''re new here, so I thought I''d come and say hello. I''m <<$pcs_nickname>>."'
 		'Natalia looks at you and responds in a quiet voice, "Umm... Hi <<$pcs_nickname>>. I thought you were one of the cool kids, so I''m surprised you''re here."'

locations/pav_disco_gopniks.qsrc

@@ -662,7 +662,7 @@ if $ARGS[0] = 'roman':
 					grupvalue[4] -= 1
 					gs 'npc_relationship', 'modify', 'A157', 'loathe', 1, 'pav_disco2'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
 					'He forces the bottle against your lips. "Fucking drink, you cunt!"'
 					'You pull away from him. "What the fuck are you doing?"'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'lavrenti':
 					*clr & cla
 					minut += 15
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big155.jpg"></center>'
 					'"Want to dance?" you ask with a smile.'
 					'He pauses before nodding. "Sure, why not." Lavrenti leads you out onto the dance floor and you start dancing together.'
 					act 'Go and dance': gt 'pav_disco_gopniks', 'lavrenti_dance'

locations/shop.qsrc

@@ -180,7 +180,7 @@ if $shoplocation = 'ATM':
 				end
 
 				gs 'stat'
-				act 'Move away': gt 'shop'
+				act 'Move away': gt 'shop', 'start'
 			end
 		else
 			'<br>★ Processing deposit of <<atmDeposit>> <b>₽</b> in <<atmDepositDate - daystart>> days.'
@@ -207,7 +207,7 @@ if $shoplocation = 'ATM':
 				end
 
 				gs 'stat'
-				act 'Move away': gt 'shop'
+				act 'Move away': gt 'shop', 'start'
 			end
 		else
 			'You have maxed out your overdraft.'

locations/version.qsrc

@@ -12,7 +12,7 @@ act 'Return': gt 'start'
 '- New scenes for Ksenya in her shop and rewrite of her exhibitionist events by Hidden Flame'
 '- NPC preferences set by nutluck for reactions written by GregWayland and some others and coded by bgkjdgbizgblzdgbr. Only a couple of npc seeded atm but it will work for all'
 '- Sonia prefall home chat by nutluck.'
-'- Encounter with Nat and Nat at the Coffeee Hole when hanging out with Katja by BBZ01'
+'- Encounter with Nat and Nat at the Coffee Hole when hanging out with Katja by BBZ01'
 '- Some schol girls can give you tampons or pads if you need them by hornguy6'
 '- Can fight against park rapist now thanks to Hornguy6'
 '- "Kev made me do it" from Vengenace_11'