Merge remote-tracking branch 'sovietmercader/master'

locations/HotelWork.qsrc

@@ -392,7 +392,7 @@ if $ARGS[0] = 'maid':
 						totalmon = totalmon + montake
 						mongiveback = totalmon - 1000
 						! if total money paid is over 1000 then jump to fire the event below instead
-						! for example paying 500 rubles twice will cause the quest to continue even though each individual time Sveta didn't have 1000 rubles on her
+						! for example paying 500 rubles twice will cause the quest to continue even though each individual time Sveta does not have 1000 rubles on her
 						if totalmon => 1000:
 							money = money + mongiveback
 							jump 'enoughmoney'

locations/Katlake.qsrc

@@ -8,19 +8,18 @@ gs 'stat'
 
 act 'Ignore her':gt 'Nudelake'
 
-	gs 'willpower', 'misc', 'self', 'easy'
-	if will_cost <= pcs_willpwr:
-		act 'Approach her (<<will_cost>> Willpower)':
-			cla
-			gs 'willpower', 'pay', 'self'
-			gs 'stat'
-			'You decide to walk up to the girl, and try to start a conversation with her.'
-
-			act 'Greet':gt 'Katlake', 'znakomstvo'
-		end
-	else
-		act 'Approach her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+gs 'willpower', 'misc', 'self', 'easy'
+if will_cost <= pcs_willpwr:
+	act 'Approach her (<<will_cost>> Willpower)':
+		cla
+		gs 'willpower', 'pay', 'self'
+		gs 'stat'
+		'You decide to walk up to the girl, and try to start a conversation with her.'
+
+		act 'Greet':gt 'Katlake', 'znakomstvo'
 	end
+else
+	act 'Approach her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 end
 
 if $ARGS[0] = 'znakomstvo':

locations/Military.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'pro0':
 	cla
 	'You met two soldiers whom ask you to help them out with a war game, in the role of a captive spy.'
 	
-	gs 'willpower' 'gangbang', 'resist'
+	gs 'willpower', 'gangbang', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			gs 'willpower', 'gangbang', 'resist'

locations/RynokHoz.qsrc

@@ -132,7 +132,8 @@ if $ARGS[0] = 'the_beginning':
 					end
 				else
 					act 'Agree to gangbang (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
+			end
 		end
 
 		act 'Suck':

locations/Snpc.qsrc

@@ -607,10 +607,10 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
-			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
-			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result. Finally after about 30 seconds of thought she responds "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
+			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
+			'<<$npc_firstname[''A<<numnpc>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result. Finally after about 30 seconds of thought she responds "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
 			'"That is no problem at all" you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -625,10 +625,10 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
-			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
-			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get sick with whatever you had and miss school as well."'
+			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
+			'<<$npc_firstname[''A<<numnpc>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get sick with whatever you had and miss school as well."'
 			'You giggle a little bit and reply "Nah, I got over my sickness so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -643,14 +643,14 @@ if numnpc = 231:
 			npc_QW['A231'] = 5
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
-			'As you walk to up <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
+			'As you walk to up <<$npc_firstname[''A<<numnpc>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
 			'After about a minute or so of eye contact, you finally develop enough courage to speak first.'
-			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>...." You say in a nervous and defeated voice.'
+			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>...." You say in a nervous and defeated voice.'
 			'"Hi <<$pcs_nickname>>...." she replies in an equally nervous voice.'
 			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately. Can we meet after school to talk about it?"'
-			'<<$npc_nickname[''<<''A<<numnpc>>''>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
+			'<<$npc_nickname[''A<<numnpc>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
 			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
-			'Looking a little releaved, <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
+			'Looking a little releaved, <<$npc_firstname[''A<<numnpc>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -664,7 +664,7 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
-			'As you see <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s house, so you pretend to not see her and carry on your way.'
+			'As you see <<$npc_firstname[''A<<numnpc>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s house, so you pretend to not see her and carry on your way.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -672,7 +672,7 @@ if numnpc = 231:
 			end
 		end
 	elseif npc_QW['A<<numnpc>>'] > 5:
-		'Ever since you asked <<$npc_nickname[''<<''A<<numnpc>>''>>'']>> to be your girlfriend, she has come out of her shell a bit more. She even kisses you while at school!'
+		'Ever since you asked <<$npc_nickname[''A<<numnpc>>'']>> to be your girlfriend, she has come out of her shell a bit more. She even kisses you while at school!'
 		act 'Kiss her':
 			*clr & cla
 			minut += 5
@@ -683,7 +683,7 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 !!Image needed			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'
-			'You lean in to kiss <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
+			'You lean in to kiss <<$npc_firstname[''A<<numnpc>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
 			'You eventually break off the kiss and say "See you later cutie" and head on your way.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'

locations/dimaRevenge.qsrc

@@ -1001,7 +1001,7 @@ if dimaRevChoice = 5:
 			'You sit on the train listening to Petia''s terrible pickup lines. You do your best to ignore him and play with your phone.
 			He is wearing the same outfit as usual but now his hair is combed back in an attempt to look nice. He is absolutely covered in cologne as if he just decided to use a whole bottle of the stuff rather than take a bath.
 			When he opens his mouth, you see that he brushed his teeth, but you smell that he ate something rank before meeting up with you. He makes inappropriate remarks about your body every chance he can get and keeps brushing against you on "accident."
-			He is offensive to four of your five sense, and you don''t want to find out about the fifth one. You feel uncomfortable and wish for the train to go faster so you don''t have to sit so close to this guy. Soon you arrive at in the city center, and, after leaving the station, head to Diner Bystroeshka.'
+			He is offensive to four of your five senses, and you don''t want to find out about the fifth one. You feel uncomfortable and wish for the train to go faster so you don''t have to sit so close to this guy. Soon you arrive at in the city center, and, after leaving the station, head to Diner Bystroeshka.'
 			act 'Go inside the diner':
 				*clr & cla
 				minut += 30
@@ -1097,7 +1097,7 @@ if dimaRevChoice = 5:
 						'As you walk through the halls leaving school, things seem to be back to normal. No one is talking about you anymore, and you are back to being mostly unnoticed and occasionally picked on.
 						You still feel bad about almost choking that girl, and about punching that other girl, but not about Petia. He had it coming. Now that you think about it, where is Petia? He didn''t come to school today. Oh well, you''re sure he''s fine.
 						And if he isn''t. Fuck him. That is one kid who deserves to be picked on.'
-						act 'leave school': gt 'gschool_grounds', 'main'
+						act 'Leave school': gt 'gschool_grounds', 'main'
 						!!normal end of school
 					end
 				end

locations/gLakeNudeForest.qsrc

@@ -35,6 +35,7 @@ if temper >= 20 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 				gs 'willpower', 'pay', 'self'
 				gs 'gLakeNudeEvent','gLakeNude_nudist'
 				act 'Look': gt 'gLakeNudeForest'
+			end
 		else
 			act 'Spy on nudists (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end

locations/gopnew.qsrc

@@ -121,6 +121,7 @@ if $ARGS[0] = 'start1':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gt 'street'
+			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
@@ -147,6 +148,7 @@ if $ARGS[0] = 'start2':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gt 'street'
+			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
@@ -216,6 +218,7 @@ if $ARGS[0] = 'start4':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gt 'street'
+			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
@@ -353,6 +356,7 @@ if $ARGS[0] = 'start6':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gt 'street'
+			end
 		else
 			act 'Quickly leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	

locations/gopskver.qsrc

@@ -1049,8 +1049,7 @@ if $ARGS[0] = 'BjBeerAnal':
 
 			act 'Clean him up':
 				Suckrand=rand(1,2)
-				cla
-				cls-
+				*clr & cla
 				minut +=5
 				pcs_mood -= 3
 				gs 'stat'

locations/hotel_resep.qsrc

@@ -526,7 +526,7 @@ if $ARGS[0] = 'pavgenpros':
 						pavprosnofemales = 1
 						custrand = 9
 						gs 'willpower', 'prostitution', 'resist', 'hard'
-						gs 'willpower', 'pay' 'resist'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'"I-I''m sorry... That just won''t work for me." You start stammering trying to convince him. "She''ll notice right away."'
 						'He looks at you angrily and sighs. "Damn it <<$pcs_nickname>>, I don''t appreciate you fucking up my schedule. Fine. There''s a guy coming over to the room next door. I''ll get my girl in there to switch with you. Come with me.'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'pavgenprosmf':
 			else
 				act 'It feels a lot better without a condom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Let him to use a condom'
+			act 'Let him to use a condom':
 				cla
 				'"Well, I don''t fuck without one, good thing I brought some." He tells you as he grabs a condom from his pocket.'
 				gs 'dinsex', 'boy_puts_his_condom'
@@ -758,7 +758,7 @@ if $ARGS[0] = 'pavgenprosmf':
 					if will_cost <= pcs_willpwr:
 						act 'Fight back (<<will_cost>> Willpower)':
 							cla
-							gs 'willpower' 'sex', 'resist'
+							gs 'willpower', 'sex', 'resist'
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							!TODO: Maybe add actual fight once the fighting system rework is finished

locations/katalkinSex.qsrc

@@ -47,7 +47,6 @@ if $ARGS[0] = 'sex':
 			
 		act 'Put your hand on his groin':gt 'katalkinSex','sexgo'
 		act 'Close your eyes': gt 'katalkinSex','d_katsub'
-		end
 	end
 end
 

locations/kazinosvid.qsrc

@@ -176,9 +176,10 @@ if $ARGS[0] = '2':
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Take <<$telsob>> and leave (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'self'
-			gs 'stat'
-			gt 'kazinosvid', '3'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'kazinosvid', '3'
+			end
 		else
 			act 'Take <<$telsob>> and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	

locations/pavtrain.qsrc

@@ -28,7 +28,7 @@ gs 'stat'
 *nl
 'Pavlovsk''s only and rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. Always on the look out for maids among the local young girls.'
 
-if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0: dimaRevenge += 1 & gt 'dimaRevenge', dimaRevenge
+if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0: gt 'dimaRevenge', dimaRevenge
 
 if kidaloa = 0:
 	podrand = rand(0, 5)