[fixes] Several ends in the wrong place

locations/gopnew.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start0':
 	'Once they notice you walking into their alley, one of them steps towards you. He gives you a toothy grin as he says: "Hey babe! Want to come hang out with us? We have beer!"'
 
 	act 'Have a beer with them':gt 'gopnew', 'pivas'
-	
+
 	gs 'willpower', 'drink', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Decline and walk away (<<will_cost>> Willpower)':
@@ -43,64 +43,64 @@ if $ARGS[0] = 'start0':
 			gs 'stat'
 			'You wordlessly shake your head and keep walking, hoping he''ll get the message and leave you alone. He''s not giving up that easily though, and follows you.'
 			'"Come on, babe! Relax! We''re decent guys, you don''t have to be scared around us! We just want to have a good time!" he reassures you. He seems fairly genuine in his offer.'
-		end
-		
-		act 'Agree to have a beer with them':gt 'gopnew', 'pivas'
-		
-		gs 'willpower', 'drink', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Decline again, more clearly this time (<<will_cost>> Willpower)':
-				cla & *clr
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				'"I have no intentions of drinking beer with you. Leave me alone!" you snap at the guy.'
-				'He squints his eyes angrily and shouts: "What!? Are you one of those snobs who look down on us? What the fuck is your problem?"'
-				'The Gopniks are often looked down upon by others, and this guy is taking it very personally that you keep refusing his offer. He''s starting to get mad at you.'
-			end
-			
-			act 'Agree to have a beer after all':gt 'gopnew', 'pivas'
-			
+
+			act 'Agree to have a beer with them':gt 'gopnew', 'pivas'
+
 			gs 'willpower', 'drink', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
-				act 'Push him away and swear at him (<<will_cost>> Willpower)':
-					cla
+				act 'Decline again, more clearly this time (<<will_cost>> Willpower)':
+					cla & *clr
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					'"Leave me the fuck alone!" you scream at the hoodlum, and push him away. He won''t let you leave though, and blocks the exit while he grabs you by the arm.'
-					'"All I wanted to do was be nice, and you had to go and be a rude bitch! You''re coming with me, now!" he shouts angrily. All the kindness is gone from his eyes, and he looks like he won''t hesitate to use violence if you don''t do as he says.'
-					'His friends look at the two of you intently now, also upset that you won''t join them. They''ll definitely help their friend, if you try to fight him... there''s no way you can take all three of them on.'
-				end
-				
-				gs 'willpower', 'rape', 'resist', 'hard'
-				if will_cost <= pcs_willpwr:
-					act 'Try to squirm free and run away (<<will_cost>> Willpower)':
-						cla
-						gs 'pain', 6, 'head', 'hit'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						'You do your best to wrestle yourself free and run for it, but the guy doesn''t let you escape and gives you a resolving punch in the face. While you try to shake off the dizziness, he and his friends drag you further into the alley. At the back end, they roughly push you against a wall.'
-
-						act 'Ask what they want from you':gt 'gopnew', 'bazar'
+					'"I have no intentions of drinking beer with you. Leave me alone!" you snap at the guy.'
+					'He squints his eyes angrily and shouts: "What!? Are you one of those snobs who look down on us? What the fuck is your problem?"'
+					'The Gopniks are often looked down upon by others, and this guy is taking it very personally that you keep refusing his offer. He''s starting to get mad at you.'
+
+					act 'Agree to have a beer after all':gt 'gopnew', 'pivas'
+
+					gs 'willpower', 'drink', 'resist', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Push him away and swear at him (<<will_cost>> Willpower)':
+							cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							'"Leave me the fuck alone!" you scream at the hoodlum, and push him away. He won''t let you leave though, and blocks the exit while he grabs you by the arm.'
+							'"All I wanted to do was be nice, and you had to go and be a rude bitch! You''re coming with me, now!" he shouts angrily. All the kindness is gone from his eyes, and he looks like he won''t hesitate to use violence if you don''t do as he says.'
+							'His friends look at the two of you intently now, also upset that you won''t join them. They''ll definitely help their friend, if you try to fight him... there''s no way you can take all three of them on.'
+
+							gs 'willpower', 'rape', 'resist', 'hard'
+							if will_cost <= pcs_willpwr:
+								act 'Try to squirm free and run away (<<will_cost>> Willpower)':
+									cla
+									gs 'pain', 6, 'head', 'hit'
+									gs 'willpower', 'pay', 'resist'
+									gs 'stat'
+									'You do your best to wrestle yourself free and run for it, but the guy doesn''t let you escape and gives you a resolving punch in the face. While you try to shake off the dizziness, he and his friends drag you further into the alley. At the back end, they roughly push you against a wall.'
+
+									act 'Ask what they want from you':gt 'gopnew', 'bazar'
+								end
+							else
+								act 'Try to squirm free and run away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end
+						end
+
+						act 'Submit and let him take you into the alley':
+							cla
+							'Realizing you can''t take all of them on, you stop resisting and let the man take you further into the alley. At the back end, he pushes you against a wall roughly. His friends got up and followed the two of you, and are staring you down as well.'
+
+							act 'Ask what they want from you':gt 'gopnew', 'bazar'
+						end
+					else
+						act 'Push him away and swear at him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-				else
-					act 'Try to squirm free and run away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-
-				act 'Submit and let him take you into the alley':
-					cla
-					'Realizing you can''t take all of them on, you stop resisting and let the man take you further into the alley. At the back end, he pushes you against a wall roughly. His friends got up and followed the two of you, and are staring you down as well.'
-
-					act 'Ask what they want from you':gt 'gopnew', 'bazar'
 				end
 			else
-				act 'Push him away and swear at him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
-		else
-			act 'Decline again, more clearly this time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+				act 'Decline again, more clearly this time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
 	else
 		act 'Decline and walk away (<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
 
 if $ARGS[0] = 'start1':
@@ -113,18 +113,18 @@ if $ARGS[0] = 'start1':
 		'"Come on, babe!" he tries. "Surely you can spare like 30 minutes and have a chat with me?"'
 
 		act 'Go drink beer with him':gt 'gopnew', 'pivas'
-			
+
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and leave (<<will_cost>> Willpower)': 
-				minut += 5 
+			act 'Decline and leave (<<will_cost>> Willpower)':
+				minut += 5
 				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	
+		end
 	end
 
 	act 'Go drink beer with him':gt 'gopnew', 'pivas'
@@ -140,18 +140,18 @@ if $ARGS[0] = 'start2':
 		'"Come on, babe!" he tries. "Surely you can spare like 30 minutes and have a chat with me?"'
 
 		act 'Go drink beer with him':gt 'gopnew', 'pivas'
-		
+
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and leave (<<will_cost>> Willpower)': 
-				minut += 5 
+			act 'Decline and leave (<<will_cost>> Willpower)':
+				minut += 5
 				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	
+		end
 	end
 
 	act 'Go drink beer with him':gt 'gopnew', 'pivas'
@@ -210,18 +210,18 @@ if $ARGS[0] = 'start4':
 		'"Come on, babe!" he tries. "Surely you can spare like 30 minutes and have a chat with me?"'
 
 		act 'Go drink beer with him':gt 'gopnew', 'pivas'
-		
+
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and leave (<<will_cost>> Willpower)': 
-				minut += 5 
+			act 'Decline and leave (<<will_cost>> Willpower)':
+				minut += 5
 				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	
+		end
 	end
 
 	act 'Go drink beer with him':gt 'gopnew', 'pivas'
@@ -348,18 +348,18 @@ if $ARGS[0] = 'start6':
 		'He rubs his groin awkwardly while he tells you: "How long has it been? I want you, now. Follow me."'
 
 		act 'Go with him':gt 'gopnew', 'sexstart'
-		
+
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Quickly leave (<<will_cost>> Willpower)': 
-				minut += 5 
+			act 'Quickly leave (<<will_cost>> Willpower)':
+				minut += 5
 				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	
+		end
 	else
 		'When you approach them, he gives you a dismissive nod, noticing you didn''t ignore him. "Good, you listened. Now get out of here, before we change our minds."'
 
@@ -603,7 +603,7 @@ if $ARGS[0] = 'bazar':
 					end
 				else
 					act 'Refuse to blow him (<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
 
 			act 'Say you don''t':
@@ -654,7 +654,7 @@ if $ARGS[0] = 'bazar':
 
 					act 'Ask him how much he wants':gt 'gopnew', 'dolg'
 				end
-				
+
 				gs 'willpower', 'misc', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to pay (<<will_cost>> Willpower)':
@@ -669,12 +669,12 @@ if $ARGS[0] = 'bazar':
 					end
 				else
 					act 'Refuse to pay (<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
 	else
 		act 'Say you don''t owe them anything (<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
 
 if $ARGS[0] = 'rapebj':
@@ -692,7 +692,7 @@ if $ARGS[0] = 'rapebj':
 		'You stare it down for another while, but realize they''re not going to let you go until they''re satisfied.'
 		'You hesitantly part your lips a little, and take the bulbous purple head of his cock between your lips. You suck on it a little without much enthusiasm, which he notices immediately.'
 		'"What is this garbage? Put some effort into it, slut! Or else..." he grunts.'
-		
+
 		gs 'arousal', 'bj', 3, 'rape', 'sub', 'humiliation'
 		gs 'stat'
 
@@ -710,16 +710,16 @@ if $ARGS[0] = 'rapebj':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/rapebj2.jpg"></center>'
 		'You open your mouth but don''t take his cock in your mouth. Instead you run your tongue up and down his shaft repeatedly, without much enthusiasm.'
 		'"What is this garbage? Put some effort into it, slut! Or else..." he grunts.'
-		
+
 		gs 'arousal', 'foreplay', 3, 'rape', 'sub', 'humiliation'
 		gs 'stat'
 
 		act 'Start sucking':gt 'gopnew', 'tf'
 		act 'Keep licking':gt 'gopnew', 'tf'
 	end
-		
+
 	gs 'willpower', 'bj', 'resist', 'hard'
-	if will_cost <= pcs_willpwr:	
+	if will_cost <= pcs_willpwr:
 		act 'Keep your lips tightly together (<<will_cost>> Willpower)':
 			cla & *clr
 			gs 'willpower', 'pay', 'self'
@@ -729,7 +729,7 @@ if $ARGS[0] = 'rapebj':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/rapebj3.jpg"></center>'
 			'Vasan puts one hand over your throat, slowly choking you out while he rubs his cock against your lips impatiently. His other hand goes behind your head, and he thrusts his cock into your mouth when you try to gasp for breath.'
 			'"That''s right, whore... all you need is a little encouragement!" he laughs, and begins to fuck your mouth while he keeps choking you."'
-		
+
 			gs 'arousal', 'bj', 3, 'rape', 'sub', 'humiliation', 'rough'
 			gs 'stat'
 
@@ -737,14 +737,14 @@ if $ARGS[0] = 'rapebj':
 		end
 	else
 		act 'Keep your lips tightly together (<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
 
 if $ARGS[0] = 'tf':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/rapebjt2.jpg"></center>'
 	'Vasan grabs a fistful of your hair and begins to fuck your mouth in earnest. His cock causes a gag reflex every time he hits the back of your throat, and your eyes are tearing up quickly.'
 	'He''s not giving you much chance to breathe, and you''re gasping for breath every time he gives you a bit of a break to breathe. They never last long.'
-	
+
 	gs 'arousal', 'bj', 3, 'rape', 'sub', 'humiliation', 'rough', 'deepthroat'
 	gs 'stat'
 
@@ -754,7 +754,7 @@ if $ARGS[0] = 'tf':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/rapebjt.jpg"></center>'
 		'Suddenly Vasan thrusts his cock deeper down your throat, and holds your head firmly against his groin once he bottoms out in you.'
 		'You feel like you''re going to throw up!'
-		
+
 		gs 'arousal', 'bj', 3, 'rape', 'sub', 'humiliation', 'rough', 'deepthroat'
 		gs 'stat'
 
@@ -797,7 +797,7 @@ if $ARGS[0] = 'tf':
 					'Then he grins to his friends: "She''s all yours, guys. Have fun."'
 					'Just when they came closer to you pulling their cocks out of their pants, you hear shouting at the end of the alley. Someone spotted you!'
 					'The Gopniks quickly run away, leaving you alone on the pavement covered in cum, saliva and tears. "Remember, whore... 2,000 <b>₽</b>! Tomorrow!" Vasan shouts, before he disappears around a corner.'
-					
+
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -1012,7 +1012,7 @@ if $ARGS[0] = '1':
 	end
 
 	'<<$boydesc>> wipes his cock on your ass cheeks and tucks it back into his pants. After that, he goes back to drinking beer with his friends, not paying any more attention to you.'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -1026,7 +1026,7 @@ if $ARGS[0] = '11':
 	picrand = rand(13, 22)
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<picrand>>.jpg"></center>'
 	'<<$boydesc>> guides you to a quiet area, and waits impatiently for you to pull his cock out of his pants. He groans contently when you begin to suck him off diligently. A few minutes later, he groans that he''s about to cum.'
-	
+
 	gs 'arousal', 'bj', 15, 'sub', 'humiliation'
 	gs 'stat'
 
@@ -1045,10 +1045,10 @@ if $ARGS[0] = '11':
 			gs 'cum_manage'
 			swallow += 1
 			'You swallow <<$boydesc>>''s sperm diligently after which he wipes his dick on your lips, making you lick the last remains off. Once he''s satisfied, he pulls his pants up again and returns to his friends.'
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-	
+
 			act 'Leave': minut += 5 & gt 'street'
 		end
 
@@ -1058,10 +1058,10 @@ if $ARGS[0] = '11':
 			sexvolume = 7
 			gs 'cum_manage'
 			'You wait for <<$boydesc>> to turn his back on you, and discreetly spit the semen onto the ground. He doesn''t seem to care what you do with it, he''s already walking away from you.'
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	end
@@ -1107,11 +1107,11 @@ if $ARGS[0] = '12':
 	end
 
 	'<<$boydesc>> pulls out right before he orgasms, and ends up spraying his sperm all over your ass cheeks. He wipes his cock clean on an unsoiled spot on your ass and tucks it back into his pants, returning to his friends for another beer. He no longer cares what you do or where you go next.'
-	
+
 	gs 'arousal', 'anal', 15, 'sub', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Leave': minut += 5 & gt 'street'
 end
 
@@ -1146,7 +1146,7 @@ if $ARGS[0] = '2':
 		'<<$namgop[0]>>. The guys make you kneel before them, and begin to slap their cocks against your face impatiently. You do your best to pay attention to all of them, sucking them off one by one and jerking off those you can''t put in your mouth.'
 
 		'They cum all over your face and in your mouth, and your face looks like a mess by the time they finally let you go.'
-		
+
 		gs 'arousal', 'bj', 15, 'sub', 'humiliation', 'gangbang'
 		gs 'arousal', 'hj', 15, 'sub', 'humiliation', 'gangbang'
 		minut -= 15
@@ -1154,7 +1154,7 @@ if $ARGS[0] = '2':
 		gs 'stat'
 
 		act 'Leave': minut += 5 & gt 'street'
-		
+
 	elseif tiprand = 1 or GLust = 2:
 		pcs_vag += 1
 		pcs_ass += 5
@@ -1202,14 +1202,14 @@ if $ARGS[0] = '2':
 		end
 
 		'The guys just cum wherever they feel like while they''re fucking you, giving you no warning. By the time they all finish, you''re a mess. You should probably go take a shower...'
-		
+
 		gs 'arousal', 'bj', 15, 'sub', 'humiliation', 'gangbang'
 		gs 'arousal', 'vaginal', 15, 'sub', 'humiliation', 'gangbang'
 		gs 'arousal', 'anal', 15, 'sub', 'humiliation', 'gangbang'
 		minut -= 15
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Leave': minut += 5 & gt 'street'
 	end
 end
@@ -1241,7 +1241,7 @@ if $ARGS[0] = '3':
 		GLust -= 1
 		if GLust > 0: jump 'goptipr2loop'
 	end
-	
+
 	gs 'stat'
 	picrand = rand(1, 15)
 	'<center><img <<$set_imgh>> src="images/shared/sex/group/gang<<picrand>>.jpg"></center>'
@@ -1256,7 +1256,7 @@ if $ARGS[0] = '3':
 		$orgasm_or = 'yes'
 		'You orgasm during their relentless pounding, holding your hand over your mouth to stop yourself from crying out loud.'
 	end
-	
+
 	gs 'arousal', 'bj', 15, 'sub', 'humiliation', 'gangbang'
 	gs 'arousal', 'vaginal', 15, 'sub', 'humiliation', 'gangbang'
 	gs 'arousal', 'anal', 15, 'sub', 'humiliation', 'gangbang'
@@ -1286,7 +1286,7 @@ if $ARGS[0] = 'degrading':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/deg'+rand(1, 9)+'.jpg"></center>'
 	'The guys drive you to a nearby building and drag you inside, forcing you to undress. They spend the next two hours degrading you in every way imaginable: they slap your face and tits, they spit in your face, but most of the time they try to force large objects into your vagina and ass. By the time you''re exhausted, they pick you up and dump you in the back yard with your clothes. When you catch your breath again, you slowly put your clothes on and try to find your way back to the main streets.'
-	
+
 	gs 'arousal', 'vaginal', 120, 'sub', 'humiliation', 'gangbang', 'rape'
 	gs 'arousal', 'anal', 120, 'sub', 'humiliation', 'gangbang', 'rape'
 	minut -= 15