[fixes] errors; [added] cleanup

locations/AnalPR.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = '2':
 	if picanRand = 4:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl4.jpg"></center>'
 	if picanRand = 5:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl5.jpg"></center>'
 	if picanRand = 6:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl6.jpg"></center>'
+	killvar 'picanRand'
 
 	'As soon as you lie down on the hood of the car, the man parts your legs and eagerly presses the tip of his cock against your anus.'
 	gs 'arousal', 'anal', 10, 'sub', 'unknown', 'prostitution'
@@ -103,6 +104,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'anal', 10, 'sub', 'unknown', 'prostitution'
 		gs 'arousal', 'end'
 		gs 'stat'
+		killvar 'cumanalRand'
 	end
 end
 

locations/Prostitute.qsrc

@@ -97,8 +97,8 @@ if $ARGS[0] = 'start':
 									'You realize he''s not going to let you off the hook easily, and that he probably has enough connections to get you into serious trouble. It''s probably easiest to treat him as just another customer, maybe he''ll let you go if you do a good job...'
 
 									act 'Reach for his groin':
-											gs 'npcgeneratec', 0, 'Bandit', rand(18,45)
-											gs 'boyStat', $npclastgenerated
+										gs 'npcgeneratec', 0, 'Bandit', rand(18,45)
+										gs 'boyStat', $npclastgenerated
 										gt 'blowPR', 'start'
 									end
 								end
@@ -186,6 +186,7 @@ if $ARGS[0] = 'start':
 								end
 							end
 						end
+						killvar 'proseventrand'
 					end
 				end
 			end
@@ -258,7 +259,7 @@ if $ARGS[0] = 'work1':
 				if $ARGS[1] = 'anal':KlientMON = rand(5, 40)
 
 				if KlientMON >= ProsMoney:
-					gt 'prostitute', 'work2', $ARGS[1]
+					killvar 'KlientMON' & gt 'prostitute', 'work2', $ARGS[1]
 					exit
 				else
 					if rand(0, 1) = 1:
@@ -266,11 +267,12 @@ if $ARGS[0] = 'work1':
 
 						act 'Agree':
 							ProsMoney = KlientMON
+							killvar 'KlientMON'
 							gt 'prostitute', 'work2', $ARGS[1]
 							exit
 						end
 
-						act 'Refuse':gt 'prostitute', 'start'
+						act 'Refuse': killvar 'KlientMON' & gt 'prostitute', 'start'
 						exit
 					end
 				end
@@ -291,9 +293,9 @@ if $ARGS[0] = 'work2':
 		cla
 		clr
 		*clr
-		gs 'boy'
 		gs 'npcgeneratec', 0, '"John"', rand(18,45)
 		gs 'boyStat', $npclastgenerated
+		!! gs 'boy', 'details'    & !! does not seem to be needed for "Johns"
 		slutty += 1
 		guy += 1
 		if pcs_throat < dick: pcs_throat += 1
@@ -320,6 +322,7 @@ if $ARGS[0] = 'work2':
 				else
 					'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bjp<<picrand>>.jpg"></center>'
 				end
+				killvar 'picrand'
 				'You put a condom between your lips and slowly guide your mouth to his penis, you gently roll it down using only your lips. You can tell the guy is really impressed with your skills.'
 
 				if $ARGS[1] = 'blow job':
@@ -419,8 +422,7 @@ if $ARGS[0] = 'work2':
 				*clr
 				gs 'dinSex', 'std_trigger_oral'
 				gs 'stat'
-				picrand = rand(8, 13)
-				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bjp<<picrand>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bjp<<rand(8, 13)>>.jpg"></center>'
 				'You close your lips around his member and flick your tongue over the tip of his cock teasingly.'
 				gs 'arousal', 'bj', 5, 'prostitution', 'unknown'
 				gs 'stat'
@@ -498,6 +500,7 @@ if $ARGS[0] = 'work2':
 								gs 'stat'
 							end
 						end
+						killvar 'bjrand'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Get out of his car':gt 'prostitute', 'start'
@@ -538,6 +541,7 @@ if $ARGS[0] = 'work2':
 								gs 'arousal', 'vaginal', 10, 'prostitution', 'unknown'
 								gs 'stat'
 							end
+							killvar 'prostRand'
 
 							'He exerted himself a great deal while he was fucking you, and is slowly catching his breath while you straighten your clothes.'
 							'With a satisfied smile on his face, he gives you the money he owes you and drives off.'
@@ -560,9 +564,7 @@ if $ARGS[0] = 'work2':
 							if dickK < 1:dickK = 1
 							pcs_ass += dickK
 
-							!! the first cowl image is cowl, not cowl1
-							picrand = rand(1, 6)
-							'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl<<picrand>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl<<rand(1, 6)>>.jpg"></center>'
 							'As soon as you lie down on the hood of the car, the man parts your legs and eagerly presses the tip of his cock against your anus.'
 							gs 'arousal', 'foreplay', 1, 'prostitution', 'unknown'
 							gs 'stat'
@@ -677,6 +679,7 @@ if $ARGS[0] = 'work2':
 									'Suddenly the man groans loudly, and he holds still with his cock deep inside you. Then he very slowly pulls out, and a trickle of his sperm slowly runs out of your slightly gaping ass.'
 									'He admires his work for a moment, before giving the money he owes you with a satisfied smile on his face.'
 								end
+								killvar 'cumanalRand'
 
 								gs 'arousal', 'end'
 								gs 'stat'

locations/Snpc.qsrc

@@ -235,7 +235,7 @@ if numnpc = 23:
 end
 
 !!Chat
-if narkoman = 1 and npcnum = 1 and npc_rel['A1'] > 100:
+if narkoman = 1 and npcnum = 1 and npc_rel['A1'] >= 100:
 	'You don''t want to but the you feel miserable and everything hurts, you crave the rush that you''ve come to enjoy so much'
 	'"Please Dimka, can I have some pale lady?"'
 	if dimaRevenge = 0:

locations/abductionCustomer.qsrc

@@ -136,8 +136,6 @@ if $ARGS[0] = 'abdCustomer':
 		$charType = 'neutral'
 	elseif charTypeRand >= 5:
 		$charType = 'sadistic'
-	elseif charTypeRand < 999 and buyout = 1:
-		$charType = 'sadistic'
 	end
 
 	if bodyTypeRand <= 1:

locations/albinahome.qsrc

@@ -256,13 +256,11 @@ if $ARGS[0] = 'poledancing':
 	npc_rel['A23'] += 1
 	if pcs_stren >= 40 and pcs_dancero > 50:
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		timemult = 8
 		loopcount = 1
 		:timeloop1
 		gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp', 'dancpol_exp'
-		if loopcount < timemult: loopcount += 1 & jump 'timeloop1'
-		loopcount = 0
-		timemult = 0
+		if loopcount < 8: loopcount += 1 & jump 'timeloop1'
+		killvar 'loopcount'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/poledance.jpg"></center>'
 		'Albina taught you various acrobatic moves on the pole.'
@@ -274,13 +272,11 @@ if $ARGS[0] = 'poledancing':
 		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
 		act 'Develop strength (2:00)':
 			*clr & cla
-			timemult = 8
 			loopcount = 1
 			:timeloop2
 			gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop2'
-			loopcount = 0
-			timemult = 0
+			if loopcount < 8: loopcount += 1 & jump 'timeloop2'
+			killvar 'loopcount'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
@@ -503,6 +499,8 @@ if $ARGS[0] = 'game_bet':
 			'Although you tried your best, Albina is just simply outplays you at every turn. You really stand no chance and she easily beats you. Laughing like the villain of a theater play, she slaps you on the ass with the palm of her hand, saying "Show me your ass, <<$pcs_nickname>>! You are my bitch now!" Well a bets a bet, you start talking off your clothes as she start putting the harness on.'
 			act 'Get fucked by a strapon': gt 'albinahome', 'receive_strapon'
 		end
+		killvar 'gameresult'
+		killvar 'albplay'
 	end
 end
 

locations/anekdot.qsrc

@@ -126,6 +126,7 @@ elseif anrand = 38:
 elseif anrand = 39:
 	'I tried water polo but my horse drowned.'
 end
+killvar 'anrand'
 
 --- anekdot ---------------------------------
 

locations/annafrends.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'scene1':
 							end
 						end
 					elseif temprand = 1:
-						'Anya quips "And you''re just sad because you can''t get any girls Roma."'
+						'Anya quips "And you''re just sad because you can''t get any girls, Roma."'
 
 						if rand(0, 10) = 0:'Rex grins "Yeah, our eternal virgin Roma is truly able to enliven the conversation with the topic of anal gases."'
 					else
@@ -174,13 +174,13 @@ if $ARGS[0] = 'scene1':
 
 			if rand(0, 3) = 0:
 				'As Roma pours beer in the cups, they suddenly tip over and spill all the beer on the ground.'
-				temprand3 = rand(0, 2)
+				temprand = rand(0, 2)
 
-				if temprand3 = 0:
+				if temprand = 0:
 					'Outraged, Rex screams "You puny, armless ass! No one can trust you! Didn''t your mother ever tell you, ''Always pour with two hands!''"'
-				elseif temprand3 = 1:
+				elseif temprand = 1:
 					'Outraged, Rex says "How the fuck could you spill that?"'
-				elseif temprand3 = 2:
+				elseif temprand = 2:
 					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
 				end
 			end
@@ -211,6 +211,7 @@ if $ARGS[0] = 'scene1':
 			end
 		end
 	end
+	killvar 'temprand'
 
 	if npc_QW['A33'] = 1:
 		act 'Meet your sister''s boyfriend':
@@ -246,6 +247,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/community/rexpod<<rand(1,3)>>.jpg"></center>'
 					'You cross your foot over your leg, doing your best to appear seductive without being obvious.'
 					act 'Continue to drink beer':gt 'annafrends', 'scene2'
+					killvar 'temp'
 					exit
 				end
 			end
@@ -357,8 +359,8 @@ if $ARGS[0] = 'scene1':
 			else
 				'"<<$pcs_nickname>>, you should come to Rex''s party next week, we find out when they are held on Tuesday morning so ask me during the week so you don''t miss it."'
 				sisboyparty = -1
-			exit	
-			
+				killvar 'temp'
+				exit
 			end
 	
 			act 'Yes':
@@ -414,6 +416,7 @@ if $ARGS[0] = 'scene1':
 				end
 			end
 		end
+		killvar 'temp'
 	end
 end
 
@@ -429,13 +432,15 @@ if $ARGS[0] = 'scene2':
 
 		if gennpc = 0:
 			'Anya walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
+			act 'Go together':gt 'annafrends', 'scene3', 'Anya'
 		elseif gennpc = 1:
 			'Lena walks up to you and asks "<<$pcs_nickname>>, do you want to go to the toilet?"'
+			act 'Go together':gt 'annafrends', 'scene3', 'Lena'
 		elseif gennpc = 2:
 			'Ira walks up to you and asks "<<$pcs_nickname>>, do you want to go somewhere?"'
+			act 'Go together':gt 'annafrends', 'scene3', 'Ira'
 		end
-
-		act 'Go together':gt 'annafrends', 'scene3'
+		killvar 'gennpc'
 	else
 		'The boys went around the corner of the club to empty their bladder, leaving the girls alone.'
 	end
@@ -449,13 +454,9 @@ if $ARGS[0] = 'scene3':
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
 
-	if gennpc = 0:$annafrendname = 'Anya' & $annafrendname2 = 'Anya'
-	if gennpc = 1:$annafrendname = 'Lena' & $annafrendname2 = 'Lena'
-	if gennpc = 2:$annafrendname = 'Ira' & $annafrendname2 = 'Ira'
-
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/piss.jpg"></center>'
 	*nl
-	'You follow <<$annafrendname>> to the bushes behind the club. <<$annafrendname2>> looks around, lifts her skirt, pulls down her panties, squats and begins to pee.'
+	'You follow <<$ARGS[1]>> to the bushes behind the club. <<$ARGS[1]>> looks around, lifts her skirt, pulls down her panties, squats and begins to pee.'
 
 	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt'gdk'
 

locations/anushapt.qsrc

@@ -263,6 +263,7 @@ if $ARGS[0] = 'home':
 			act 'Leave': gt 'pavComplex','start'
 			act 'Enter': gt 'anushapt','hallway'
 		end
+		killvar 'nushdoor'
 	else
 		'You knock on the door several times but no one answers. There is probably no one home at the moment.'
 		act 'Move away from the door': gt 'pavComplex','start'
@@ -337,7 +338,7 @@ if $ARGS[0] = 'bathroom':
 		dynamic $showerdin
 		gs 'stat'
 		temp = rand(0,4)
-		if ((hour >= 20 and hour < 23) or (week > 5 and hour >= 8 and hour < 16) or (week > 5 and hour >= 18 and hour < 23)) and temp = 0:
+		if temp = 0 and ((hour >= 20 and hour < 23) or (week > 5 and hour >= 8 and hour < 16) or (week > 5 and hour >= 18 and hour < 23)):
 			inhib_exp += 1
 			'Despite the pattering noise of the running water, you hear the bathroom door open and you look past the shower curtain to see Eduard walking up to the toilet, unzipping his pants.'
 			act 'Uhm excuse me?':
@@ -389,6 +390,7 @@ if $ARGS[0] = 'bathroom':
 			end
 			act 'Get out of the shower': gt 'anushapt','bathroom'
 		end
+		killvar 'temp'
 	end
 	dynamic $bath
 	dynamic $bteeth
@@ -857,6 +859,7 @@ if $ARGS[0] = 'computer':
 							gs 'stat'
 							act 'Find something else to do':gt 'anushapt','anushroom'
 						end
+						killvar 'temp'
 					end
 				end
 			end
@@ -1062,7 +1065,7 @@ if $ARGS[0] = 'snack':
 	elseif snacktime <= 5 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		gs 'stat'
 		'As you walk into the kitchen you see Eduard standing at the counter making a sandwich, when the two of you walk in he looks up and gives you both a friendly smile. "So what are you girls up to?"'
-		'Anushka replies to him. "Getting some snacks to get our energy up, so we can go to a orgy later."'
+		'Anushka replies to him. "Getting some snacks to get our energy up, so we can go to an orgy later."'
 		'Her dad frowns at that. "That''s not funny, you shouldn''t even joke about stuff like that."'
 		'Anushka grins. "Oh come on it was a little funny."'
 		'He just sighs and shakes his head slightly in resignation of what his daughter is like. "So do you girls want a sandwich?"'
@@ -1174,6 +1177,7 @@ if $ARGS[0] = 'snack':
 		'While you are doing that, she grabs a couple of drinks from the fridge and once you both have your spoils from your raid on the kitchen you head back to her room.'
 		act 'Back to her room':AnushkaLoc=2&gt'anushapt','anushroom'
 	end
+	killvar 'snacktime'
 end
 	
 if $ARGS[0] = 'livingroom':
@@ -1197,6 +1201,7 @@ if $ARGS[0] = 'livingroom':
 		'As you start to walk into the living room you overhear some muffled voices that are getting louder and louder as they go on... You notice that the door being a bit ajar as you make sure to sneak towards it to overhear what is being said.'
 		act 'Leave':gt 'anushapt','hallway'
 		act 'Listen in':
+			cla & *nl
 			valedlisten = daystart
 			'You see Valeria standing in front of the tv, yelling at Eduard, "I want to see that little bitch punished, for real this time!!!"'
 			'Eduard sighs, clearly annoyed by Valeria being in the way, "What''s wrong now, Valeria? I just want to relax and watch the tv..."'
@@ -1410,7 +1415,7 @@ if $ARGS[0] = 'livingroom':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
 					'You smile to Eduard. "Hello Mr Konstantinov, is Anushka around?"'
 					'He turns and looks at you and gives you a friendly smile. "Call me Ed and I have no idea where that girl is, you can check her room if you want. If she''s not there, then there is no telling where she is." He says as he goes back to watching tv.'
-					'You nod. "Ok thanks sorry to have bothered you, I''ll be quiet so you can watch you show."'
+					'You nod. "Ok thanks sorry to have bothered you, I''ll be quiet so you can watch your show."'
 					*nl
 					'Eduard laughs at that, "We have three kids running ''round here, there''s no need for that. Besides if I see you trying to be quiet and sneaking around I would think you was up to something. Nush taught me long ago if you see a kid being quiet or suddenly going quiet it means they are up to something." He shakes his head with a fond smile. "But that does reminded me of a time when Nush was younger..." He trails off and looks up at you. "Don''t mind me, just reminiscing, I''m sure you''re not interested in hearing about that."'
 					act 'It''s fine, I would love to hear a story':gt 'anushapt', 'nushkidstory'
@@ -1432,8 +1437,7 @@ if $ARGS[0] = 'livingroom':
 				menu_off = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
-				livingroomsneak = rand(1,2)
-				if livingroomsneak = 1:
+				if rand(1,2) = 1:
 					'You turn and carefully tread out of the living room while Eduard is busy watching the tv, you make quietly make it to the door way to the hallway, with a final glance back he is still sitting there watching tv, obviously having not noticed you coming in at all.'
 					act 'Leave':gt 'anushapt','hallway'
 				else
@@ -1493,6 +1497,7 @@ if $ARGS[0] = 'livingroom':
 			'Nobody''s here right now.'
 		end
 	end
+	killvar 'livingev'
 end
 
 if $ARGS[0] = 'kitchen':
@@ -1536,6 +1541,7 @@ if $ARGS[0] = 'kitchen':
 		dynamic $fill_bottle
 		dynamic $driwater
 	end
+	killvar 'kitchenev'
 end
 
 if $ARGS[0] = 'fridge':
@@ -1653,7 +1659,6 @@ if $ARGS[0] = 'anushparents':
 	CLOSE ALL
 	*clr & cla
 	minut += 1
-	temp = rand(0,1)
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/parroom.jpg"></center>'
@@ -1661,7 +1666,7 @@ if $ARGS[0] = 'anushparents':
 	if hour < 7:
 		'You look into the bedroom and see Anushka''s parents asleep, they are sleeping as far apart as the bed allows. Not wanting to disturb them you close the door and leave.'
 		act 'Leave':gt 'anushapt','hallway'
-	elseif valeriaIntroduced = 1 and temp = 0:
+	elseif valeriaIntroduced = 1 and rand(0,1) = 0:
 		menu_off = 1
 		gs 'stat'
 		'As you walk inside the parents bedroom you see Valeria laying down on the bed watching some drama TV show while snacking on something.'
@@ -2012,6 +2017,7 @@ if $ARGS[0] = 'nushkidstory':
         'You continue on talking for a while about Anushka''s adventures while she was younger, "This makes so much sense to why she''s like that now..." you comment.'
         '"Yeah, anyways the little free spirited wild child looking for trouble my Nush..." Eduard responds.'
 	end
+	killvar 'nushkidstory'
 	act 'Leave': gt 'anushapt', 'hallway'
 end
 

locations/anushaptbr.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'brotherroom':
 					end
 				end	
 			end
-		elseif brotherroom = 3 and maksimQW = 2: 
+		elseif brotherroom = 3 and maksimQW = 2:
 			gs 'stat'
 			'You open the door and look in the brothers'' room. You see Maksim in there alone playing some first person shooter on the play station.'
 			act 'Ask where Timofey is':
@@ -305,6 +305,7 @@ if $ARGS[0] = 'brotherroom':
 			'Timofey looks over and adds. "Yeah get lost, no girls allowed." After that they just ignore you.'
 			act 'Leave': gt 'anushapt', 'hallway'
 		end
+		killvar 'brotherroom'
 	end
 end 
 
@@ -314,12 +315,11 @@ if $ARGS[0] = 'rematch':
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
-	rematch = rand(1,2)
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-	if rematch = 1:
+	if rand(1,2) = 1:
 		'The two of you enter her brothers room. They immediately stop doing what they were doing. The older one gathers some courage; "What do you want?" Then he notices you and starts staring at your tits. "I see you brought you groupie with you again."'
 		'Anushka quickly replies; "I just wanted to see if you were up for a rematch" indicating the gaming console in their room.'
 		'Maksim glances at his brother a moment then back to Anushka. "Ok fine."'

locations/cikl.qsrc

@@ -975,7 +975,7 @@ klismaday1 = 0
 !! Resetting relationships that go over the max
 
 :toptemprel
-if temprel < 250:
+if temprel < aarraynumber:
 	temprel +=1
 	if npc_rel['A'+'<<temprel>>'] > 100:npc_rel['A'+'<<temprel>>'] = 100
 	jump 'toptemprel'