Browse Source

[added] cleanup (+ small fixes)

slanon 4 years ago
parent
commit
cd6c7a3ce9

+ 1 - 8
locations/AnalPR.qsrc

@@ -60,14 +60,7 @@ if $ARGS[0] = '2':
 		gs 'stat'
 	end
 
-	picanRand = RAND(1,6)
-	if picanRand = 1:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl1.jpg"></center>'
-	if picanRand = 2:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl2.jpg"></center>'
-	if picanRand = 3:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl3.jpg"></center>'
-	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'
+	'<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', 'anal', 10, 'sub', 'unknown', 'prostitution'

+ 7 - 6
locations/Club2.qsrc

@@ -154,12 +154,13 @@ if $ARGS[0] = 'toilet2':
 					
 					gs 'arousal', 'bj', 10, 'sub', 'group'
 					
-					horand = rand(1, 100)
-
-					if horand > pcs_horny:pcs_horny += 10 & 'You were not satisfied.'
-					$orgasm_or = 'no'
-					if horand <= pcs_horny:pcs_horny = 0 & 'Orgasm washes over you.'
-					$orgasm_or = 'yes'
+					if rand(1, 100) > pcs_horny:
+						pcs_horny += 10 & 'You were not satisfied.'
+						$orgasm_or = 'no'
+					else
+						pcs_horny = 0 & 'Orgasm washes over you.'
+						$orgasm_or = 'yes'
+					end
 					gs 'stat'
 
 					act 'Continue':

+ 3 - 6
locations/Prostitute.qsrc

@@ -520,22 +520,19 @@ if $ARGS[0] = 'work2':
 
 							if prostRand <= 50:
 								pose = 1
-								picpRand = rand(1, 7)
-								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<picpRand>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<rand(1, 7)>>.jpg"></center>'
 								'You lean against the car and expose your bare ass to the man. He''s not wasting any time and immediately gets behind you, eagerly rubbing his cock against your vagina. The feeling of a rock hard erection rubbing on your pussy lips excites you. Your hips move involuntarily seeking out more friction. The man smiles at your eagerness to be fucked and grants your wish by slamming powerfully his hard member deep into your willing vagina. '
 								gs 'arousal', 'vaginal', 10, 'prostitution', 'unknown'
 								gs 'stat'
 							elseif prostRand <= 75:
 								pose = 1
-								picpRand = rand(8, 10)
-								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<picpRand>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<rand(8, 10)>>.jpg"></center>'
 								'You get down on your hands and knees like he wants you to, and brace yourself against the car when you feel him pressing his cock against your pussy in a none too gentle fashion, wasting no time as he roughly uses your tender vagina for his pleasure. You groan in pain, which only encourages the man to fuck you even harder. '
 								gs 'arousal', 'vaginal', 10, 'prostitution', 'unknown', 'rough'
 								gs 'stat'
 							else
 								pose = 0
-								picpRand = rand(11, 17)
-								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<picpRand>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<rand(11, 17)>>.jpg"></center>'
 								'He groans in your ear: "Get on the hood, on your back!"'
 								'You quickly do as he says, and let out a soft moan when he rubs his cock against your pussy lips.'
 								gs 'arousal', 'vaginal', 10, 'prostitution', 'unknown'

+ 1 - 2
locations/alex.qsrc

@@ -12,8 +12,7 @@ act 'Get on your knees and take it in your mouth':
 	*clr & cla
 	npc_sex[$boy] += 1
 	alexeySex += 1
-	picrand = rand(29, 41)
-	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<rand(29, 41)>>.jpg"></center>'
 	'Kneeling before him, you unbutton his pants and take a firm grasp of his erect cock.'
 	'Leaning in closer, you give it a quick kiss with your <<$liptalk>> before guiding it your mouth.'
 	'As you suck on his hard dick, Alexey relaxes in his chair letting you take care of his needs.'

+ 2 - 4
locations/alexgang.qsrc

@@ -22,8 +22,7 @@ act 'Get on your knees and give head':
 	*clr & cla
 	alexgangbang += 1
 	gs 'stat'
-	picrand = rand(29, 41)
-	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<rand(29, 41)>>.jpg"></center>'
 	'Kneeling before him, you pull Alexei''s pants all the way down and take a firm grasp of his erect cock.'
 	'Leaning in closer, you give it a quick kiss with your <<$liptalk>> before guiding it into your mouth.'
 	'As you suck on his hard dick, Alexei relaxes in his chair, letting you take care of his needs.'
@@ -45,8 +44,7 @@ act 'Get on your knees and give head':
 		gs 'cum_manage'
 		swallow += 1
 		gs 'stat'
-		picrand = rand(16, 25)
-		'<center><img <<$set_imgh>> src="images/shared/sex/group/gang<<picrand>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/group/gang<<rand(16, 25)>>.jpg"></center>'
 		'Standing on all fours, you start sucking Sasha''s limp cock. As you lick, suck and roll your tongue around his dick, you can feel it slowly stiffening in your mouth.'
 		gs 'dinSex', 'wear_condom'
 		'The position you''re in doesn''t make it easy for you to move your head the right way. However, with some determination you manage to keep Sasha''s cock in your mouth.'

+ 0 - 3
locations/arturHome.qsrc

@@ -14,9 +14,6 @@ act 'Go to his home':
 	minut += 60
 	gs 'drugs', 'alcohol', 'vodka', 2
 	gs 'boyStat', 'A73'
-	$boydesc = $npc_usedname['A73']
-	silavag = npc_sexskill['A73']
-	dick = npc_dick['A73']
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 	'Arthur has generously set the table with food and you eat meat wrapped in grape leaves and roasted on skewers. You drink strong Chacha with your food and quickly find yourself getting tipsy. Once you''re nearly done with your meal Arthur turns on some music before approaching, a look of lust on his face. "Come to me girl." He says authoritatively'

+ 1 - 0
locations/arturSex.qsrc

@@ -58,6 +58,7 @@ act 'Enjoy his touch':
 	if temp = 0:act 'Continue': gt 'arturdin', 'bed'
 	if temp = 1:act 'Continue': gt 'arturdin', 'bedmiss'
 	if temp = 2:act 'Continue': gt 'arturdin', 'facefuck'
+	killvar 'temp'
 end
 
 --- arturSex ---------------------------------

+ 9 - 31
locations/arturdin.qsrc

@@ -6,8 +6,7 @@ $location_type = 'event'
 if $ARGS[0] = 'facefuck':
 	artfacefucktimes += 1
 	artbj += 1
-	picrand = rand(0, 5)
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/sex/facefuck<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/sex/facefuck<<rand(0, 5)>>.jpg"></center>'
 	'<<$artbef>> You feel Arthur''s fingers lace tightly into your hair before he pushes his huge dick roughly into your mouth, stretching your lips.'
 
 	if pcs_throat < dick:
@@ -25,15 +24,9 @@ if $ARGS[0] = 'facefuck':
 	end
 
 	if artfacefucktimes < 2:
-		tipsexart = rand(0, 1)
-
-		if tipsexart = 0:act 'Continue': gt 'arturdin', 'artlick'
-		if tipsexart = 1:act 'Continue': gt 'arturdin', 'artchik'
+		act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'artlick', 'artchik')
 	elseif artfacefucktimes >= 2:
-		tipsexart = rand(0, 1)
-
-		if tipsexart = 0:act 'Continue': gt 'arturdin', 'bed'
-		if tipsexart = 1:act 'Continue': gt 'arturdin', 'bedmiss'
+		act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 	end
 end
 
@@ -87,6 +80,7 @@ if $ARGS[0] = 'bed':
 		if artrand = 1:act 'Continue': gt 'arturdin', 'cum'
 		if artrand = 2:act 'Continue': gt 'arturdin', 'anal_cum'
 	end
+	killvar 'artrand'
 end
 
 if $ARGS[0] = 'bedmiss':
@@ -99,10 +93,7 @@ if $ARGS[0] = 'bedmiss':
 	if artfucktimes < 2:
 		act 'Continue': gt 'arturdin', 'sexmiss'
 	elseif artfucktimes >= 2:
-		artrand = rand(0, 1)
-
-		if artrand = 0:act 'Continue': gt 'arturdin', 'sexmiss_cum'
-		if artrand = 1:act 'Continue': gt 'arturdin', 'cum'
+		act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'sexmiss_cum', 'cum')
 	end
 end
 
@@ -118,10 +109,7 @@ if $ARGS[0] = 'sexmiss':
 	gs 'stat'
 	
 	gs 'dinsex','vaginal_sex',10
-	tipsexart = rand(0, 1)
-
-	if tipsexart = 0:act 'Continue': gt 'arturdin', 'bed'
-	if tipsexart = 1:act 'Continue': gt 'arturdin', 'bedmiss'
+	act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 end
 
 if $ARGS[0] = 'sexmiss_cum':
@@ -152,10 +140,7 @@ if $ARGS[0] = 'sexdog':
 	gs 'stat'
 	
 	gs 'dinsex','vaginal_sex',10
-	tipsexart = rand(0, 1)
-
-	if tipsexart = 0:act 'Continue': gt 'arturdin', 'bed'
-	if tipsexart = 1:act 'Continue': gt 'arturdin', 'bedmiss'
+	act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 end
 
 if $ARGS[0] = 'sexdog_cum':
@@ -187,10 +172,7 @@ if $ARGS[0] = 'anal':
 	gs 'stat'
 	
 	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-	tipsexart = rand(0, 1)
-
-	if tipsexart = 0:act 'Continue': gt 'arturdin', 'bed'
-	if tipsexart = 1:act 'Continue': gt 'arturdin', 'bedmiss'
+	act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 end
 
 if $ARGS[0] = 'anal_cum':
@@ -281,11 +263,7 @@ if $ARGS[0] = 'fist':
 		gs 'arousal', 'anal_finger', 5, 'rough', 'sub'
 		gs 'stat'
 	end
-
-	tipsexart = rand(0, 1)
-
-	if tipsexart = 0:act 'Continue': gt 'arturdin', 'bed'
-	if tipsexart = 1:act 'Continue': gt 'arturdin', 'bedmiss'
+	act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 end
 
 --- arturdin ---------------------------------

+ 15 - 25
locations/autotraidF.qsrc

@@ -37,12 +37,12 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
 	gs 'avb'
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
 	
 	if cardrive = 9 and car > 0:
 		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
-		act 'No way, not at that price - Leave': minut += 5 & gt 'Nord'
+		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
 		
 		act 'Sell ​your car (<<bupay>> <b>₽</b>) (1:00)':
 			cla
@@ -54,7 +54,7 @@ if $ARGS[0] = 'manager1':
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you see something you like."'
 
-			act 'Leave': minut += 5 & gt 'Nord'
+			act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
 		end
 	elseif cardrive ! 9:
 		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
@@ -68,7 +68,7 @@ if $ARGS[0] = 'manager1':
 				money -= 3000
 				'You give him the money - certain that he''s ripping you off - and wait for an hour until the tow truck finally drives into the yard and your car.'
 
-				act 'Talk to the car salesman again':gt 'autotraidF', 'manager1'
+				act 'Talk to the car salesman again': killvar 'bupay' & gt 'autotraidF', 'manager1'
 			end
 		end
 	end	
@@ -90,7 +90,7 @@ if $ARGS[0] = 'car':
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
-	act 'Return': gt 'autotraidF', 'start'
+	act 'Return': killvar 'carT' & killvar 'bupay' & gt 'autotraidF', 'start'
 	
 	if hour <= 17:
 		act 'Inspect a 2107':
@@ -100,7 +100,6 @@ if $ARGS[0] = 'car':
 			'<center><b>2107</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
 			tehNT = 200
-			tehT = rand(10, tehNT)
 			carT = 1
 			gs 'avt'
 			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
@@ -120,7 +119,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'Nord'
 				end
 			end
@@ -132,8 +131,6 @@ if $ARGS[0] = 'car':
 			menu_off = 1
 			'<center><b>2107 (Broken engine)</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
-			tehNT = 200
-			tehT = rand(10, tehNT)
 			bupay = rand(10000, 50000)
 			'The car is basically a wreck. It doesn''t even start. When you ask the salesman how much it costs, he tells you "<<bupay>> <b>₽</b>" without hesitation.'
 
@@ -147,13 +144,13 @@ if $ARGS[0] = 'car':
 					car = 1
 					benz = 3
 					cardrive = 9
-					teh = tehT
 					tehcar = 200
+					teh = rand(10, tehcar)
 					wrek = 1
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
-
+					killvar 'bupay'
 					act 'Leave': minut += 5 & gt 'Nord'
 				end
 			end
@@ -163,7 +160,6 @@ if $ARGS[0] = 'car':
 			*clr
 			menu_off = 1
 			tehNT = 300
-			tehT = RAND(10,tehNT)
 			carT = 1
 			'<center><b>VAZ 2115</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car2.jpg"></center>'
@@ -185,7 +181,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'Nord'
 				end
 			end
@@ -195,7 +191,6 @@ if $ARGS[0] = 'car':
 			*clr
 			menu_off = 1
 			tehNT = 290
-			tehT = RAND(10,tehNT)
 			carT = 1
 			'<center><b>VAZ 2113</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car3.jpg"></center>'
@@ -217,7 +212,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'Nord'
 				end
 			end
@@ -227,7 +222,6 @@ if $ARGS[0] = 'car':
 			*clr
 			menu_off = 1
 			tehNT = 300
-			tehT = RAND(10,tehNT)
 			carT = 1
 			'<center><b>VAZ 2114</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car4.jpg"></center>'
@@ -249,7 +243,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'Nord'
 				end
 			end
@@ -259,7 +253,6 @@ if $ARGS[0] = 'car':
 			*clr
 			menu_off = 1
 			tehNT = 350
-			tehT = RAND(10,tehNT)
 			carT = 1
 			'<center><b>VAZ 2110</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car5.jpg"></center>'
@@ -281,7 +274,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'Nord'
 				end
 			end
@@ -294,7 +287,6 @@ if $ARGS[0] = 'car':
 			'<center><b>3102 GAS</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car11.jpg"></center>'
 			tehNT = 1000
-			tehT = rand(10, tehNT)
 			carT = 2
 			gs 'avt'
 			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
@@ -314,7 +306,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'Nord'
 				end
 			end
@@ -327,7 +319,6 @@ if $ARGS[0] = 'car':
 			'<center><b>3110</b></center>'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car12.jpg"></center>'
 			tehNT = 800
-			tehT = rand(10, tehNT)
 			carT = 2
 			gs 'avt'
 			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
@@ -335,8 +326,7 @@ if $ARGS[0] = 'car':
 			act 'Look around some more':gt 'autotraidF', 'car'
 
 			if car = 0 and prava = 1 and money >= bupay:
-
-			act 'Buy (<<bupay>> <b>₽</b>)':
+				act 'Buy (<<bupay>> <b>₽</b>)':
 					cla
 					money -= bupay
 					$car = '3110'
@@ -348,7 +338,7 @@ if $ARGS[0] = 'car':
 					wrek = 0
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
-
+					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'Nord'
 				end
 			end

+ 4 - 2
locations/avt.qsrc

@@ -1,6 +1,6 @@
 # avt
-!!tehNT = 200
-!!tehT = rand(10, 200)
+if tehNT = 0: tehNT = 200
+tehT = rand(10, tehNT)
 
 if tehT >= tehNT * 75 / 100:$tehT = 'Machine in excellent condition.'
 if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When the engine has what is background noise'
@@ -18,6 +18,8 @@ elseif carT = 2:
 	if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:bupay = rand(30000, 60000)
 	if tehT < tehNT * 25 / 100:bupay = rand(15000, 40000)
 end
+killvar 'tehNT'
+killvar 'carT'
 
 --- avt ---------------------------------
 

+ 47 - 54
locations/club.qsrc

@@ -293,19 +293,16 @@ if $ARGS[0] = 'dance':
 
 					act 'Kiss':
 						cla
-
-						dansexclub = rand(0, 1)
-
-						if dansexclub = 1:
+						
+						if rand(0, 1) = 1:
 							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Why don''t we go to the VIP-Area. There we''ll have a bit more privacy.", he says inbetween kisses.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
-							gs 'stat'
-							picrand = 38
+							gs 'stat'							
 
 							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
-							act 'Go to Vip-room with the guy':$sexloc = 'vipclub' & xgt 'sex', 'var'
-						elseif dansexclub = 0:
+							act 'Go to Vip-room with the guy':picrand = 38 & $sexloc = 'vipclub' & xgt 'sex', 'var'
+						else
 							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
@@ -321,20 +318,17 @@ if $ARGS[0] = 'dance':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/dancelezb.jpg"></center>'
 					'While you''re dancing you a hand groping your ass. You turn around to see who touched your butt, but you''re surprised to see a woman smiling at you, she is seductively biting her lip.'
-					dansexclub = rand(0, 1)
-
+					
 					act 'Stop dancing':gt 'club', 'inside'
 					
-					if dansexclub = 0:
+					if rand(0, 1) = 0:
 						act '"Let''s go to the toilet, to have fun."':gt 'club', 'lezbsort'
-					elseif dansexclub = 1:
-						picrand = rand(13, 17)
-
-						act '"Let''s go to VIP-Room, to have fun."':$sexloc = 'vipclub' & xgt 'lezbsex', 'var'
+					else
+						act '"Let''s go to VIP-Room, to have fun."': picrand = rand(13, 17) & $sexloc = 'vipclub' & xgt 'lezbsex', 'var'
 					end
 				end
 			end
-
+			killvar 'clrand'
 			act 'Go away':gt 'club', 'dance'
 		end
 
@@ -375,8 +369,7 @@ if $ARGS[0] = 'dance':
 							alexeySex += 1
 							alexeyClubSex += 1
 							gs 'stat'
-							picrand = rand(29, 41)
-							'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<picrand>>.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<rand(29, 41)>>.jpg"></center>'
 							'You kneel down and wrap your <<$liptalk>> around his cock and you begin to suck on it. Alexei helped by moving his hips back and forth, you notice his moving is in sync to the beat of the music he''s playing. After a few minutes he groans, "You better swallow it all, I don''t want anyone to clean up our mess."'
 
 							gs 'arousal', 'bj', 10, 'sub'
@@ -392,8 +385,7 @@ if $ARGS[0] = 'dance':
 								spafinloc = 12
 								gs 'cum_manage'
 								gs 'stat'
-								picrand = rand(34, 47)
-								'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<picrand>>.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<rand(34, 47)>>.jpg"></center>'
 								'Streams of sperm hit you in the mouth and began to run down your <<$liptalk>>. Alexei wiped his dick on your <<$liptalk>> and put it away in his pants.'
 								'You began greedily to swallow his warm cum and use your finger to collect the drips, that escaped your mouth, then lick your finger clean. Once you''ve swallowed every last drop, you stand up again and thank him for this tasty snack.'
 
@@ -427,9 +419,12 @@ if $ARGS[0] = 'bar':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club10.jpg"></center>'
 	'You have to squeeze yourself through the crowd to get to the bar. On your way, random guys try to lay their hands around you, try to convince you into dancing or drinking with them, some even try to grope your tits or ass and some play the white knight and try to get your attention by protecting you.'
 
-	if pcs_apprnc > 56:barsexrand = rand(0, 10)
-	if barsexrand = 1:gt 'club', 'bar0'
-	if barsexrand = 2:gt 'club', 'bar1'
+	if pcs_apprnc > 56:
+		barsexrand = rand(0, 10)
+		if barsexrand = 1: killvar 'barsexrand' & gt 'club', 'bar0'
+		if barsexrand = 2: killvar 'barsexrand' & gt 'club', 'bar1'
+		killvar 'barsexrand'
+	end
 
 	act 'Go back':gt 'club', 'inside'
 
@@ -445,7 +440,7 @@ if $ARGS[0] = 'bar':
 			'You''re so drunk, you can barely remember where you live.'
 
 			act 'Try to go home':gt 'street'
-
+			killvar 'temp'
 			exit
 		elseif temp = 6:
 			gs 'stat'
@@ -463,7 +458,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 7:
 			gs 'stat'
@@ -480,7 +475,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 8:
 			pcs_horny += 5
@@ -490,7 +485,7 @@ if $ARGS[0] = 'bar':
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 9:
 			gs 'stat'
@@ -503,7 +498,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 10:
 			gs 'stat'
@@ -516,7 +511,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 11:
 			gs 'stat'
@@ -529,7 +524,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 12:
 			gs 'stat'
@@ -542,7 +537,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 13:
 			gs 'stat'
@@ -555,7 +550,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 14:
 			gs 'stat'
@@ -568,7 +563,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 15:
 			gs 'stat'
@@ -581,7 +576,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 16:
 			gs 'stat'
@@ -594,7 +589,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 17:
 			gs 'stat'
@@ -607,7 +602,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 18:
 			gs 'stat'
@@ -620,7 +615,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 19:
 			gs 'stat'
@@ -633,7 +628,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 20:
 			gs 'stat'
@@ -646,7 +641,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 21:
 			gs 'stat'
@@ -659,7 +654,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 22:
 			gs 'stat'
@@ -672,7 +667,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 23:
 			gs 'stat'
@@ -685,7 +680,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp = 24:
 			gs 'stat'
@@ -698,7 +693,7 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		elseif temp > 24:
 			gs 'stat'
@@ -711,9 +706,10 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave':gt 'down'
-
+			killvar 'temp'
 			exit
 		end
+		killvar 'temp'
 	end
 
 	if money >= 300:
@@ -1049,6 +1045,7 @@ if $ARGS[0] = 'bar3':
 		spafinloc = 4
 		'You remove your panties and sit down sideways on one of the stools. The guy unzips his cock and quickly enters your pussy. Both of you start to moan in pleasure and he kisses your neck gently. About ten minutes later of rough fucking he cums on your ass check and you pull up your panties, still breathing heavy.'
 	end
+	killvar 't'
 
 	gs 'cum_manage'
 
@@ -1065,10 +1062,9 @@ if $ARGS[0] = 'rape':
 	SUB += 5
 	rape += 1
 	'<center><b><font color="maroon">Bar</font></b></center>'
-	barraperand = rand(0, 1)
 	gs 'npcgeneratec', 0, 'rapist in the club', rand(18,26)
 	gs 'boyStat', $npclastgenerated
-	if barraperand = 0:
+	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/barminet.jpg"></center>'
 		'The guy notices you being heavily drunk and you couldn''t resits anything right now. He orders you to unbutton his pants, take out his cock and begin to suck on it. He grabs your hair and forces your to deepthroat it.'
 
@@ -1076,9 +1072,7 @@ if $ARGS[0] = 'rape':
 		gs 'stat'
 
 		act 'Further':
-			barraperand1 = rand(0, 1)
-
-			if barraperand1 = 0:
+			if rand(0, 1) = 0:
 				cla
 				*clr
 				spafinloc = 12
@@ -1092,7 +1086,7 @@ if $ARGS[0] = 'rape':
 				gs 'stat'
 
 				act 'Leave':gt 'club', 'inside'
-			elseif barraperand1 = 1:
+			else
 				cla
 				*clr
 				cumprecheck = 1
@@ -1111,7 +1105,7 @@ if $ARGS[0] = 'rape':
 				act 'Leave':gt 'club', 'inside'
 			end
 		end
-	elseif barraperand = 1:
+	else
 		gs 'cum_manage'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/barsex.jpg"></center>'
 		'You are trying to send it, but your tongue drunk guy is braided and seeing that you are not able to resist, pulls out his cock turns you on a stool and saliva-moistened member enters your vagina, it tears you to force shoving his dick as deep as possible, and finally finishing the leaves.'
@@ -1195,7 +1189,6 @@ if $ARGS[0] = 'vip':
 	elseif vipcart > 0 and vipday ! daystart:
 		act 'Go to the VIP-Area':
 			vipcart -= 1
-			vipday = 1
 			vipday = daystart
 			gt 'vipclub', 'start'
 		end
@@ -1242,8 +1235,8 @@ if $ARGS[0] = 'work':
 				if hour < 1 or hour >= 18:
 					act 'Get another job from Erik':gt 'club', 'work'
 				end
+				
 				act 'Go to dancefloor':gt 'club', 'inside'
-
 			end
 		end
 	elseif clubr = 1:
@@ -1266,7 +1259,6 @@ if $ARGS[0] = 'work':
 				end
 
 			act 'Go to dancefloor':gt 'club', 'inside'
-
 			end
 		end
 	elseif clubr = 2:
@@ -1294,6 +1286,7 @@ if $ARGS[0] = 'work':
 			act 'Go to dancefloor':gt 'club', 'inside'
 		end
 	end
+	killvar 'clubr'
 end
 
 --- club ---------------------------------

+ 4 - 8
locations/dinSex.qsrc

@@ -34,11 +34,9 @@ $penis_desc = $dick_girth + ', ' + $penis_desc
 if ARGS[0] = 'std_trigger':
 	tipvenerarand = rand(0, 10)
 	if protect = 1:
-		venrand = rand(0, 1000)
-		if venrand = 1000: gs 'dinSex', 'disease_picker'
+		if rand(0, 1000) = 1000: gs 'dinSex', 'disease_picker'
 	else
-		venrand = rand(0, 100)
-		if venrand >= 80:gs 'dinSex', 'disease_picker'
+		if rand(0, 100) >= 80: gs 'dinSex', 'disease_picker'
 	end
 end
 
@@ -84,11 +82,9 @@ end
 if ARGS[0] = 'std_trigger_oral':
 	tipvenerarand = rand(0, 10)
 	if protect = 1:
-		venrand = rand(0, 1000)
-		if venrand = 1000: gs 'dinSex', 'disease_picker_oral'
+		if rand(0, 1000) = 1000: gs 'dinSex', 'disease_picker_oral'
 	else
-		venrand = rand(0, 100)
-		if venrand >= 80: gs 'dinSex', 'disease_picker_oral'
+		if rand(0, 100) >= 80: gs 'dinSex', 'disease_picker_oral'
 	end
 end
 

+ 1 - 1
locations/preSYS.qsrc

@@ -467,7 +467,7 @@ if $ARGS[0] = 'charselect':
 	act 'Random personality':
 !! This allows the player to select a random personality.
 		*clr & cla
-		persrand = rand(0, 18)
+		persrand = rand(0, 17)
 		if persrand <= 3:
 		!! Nerd
 			gs 'preSYS', 'nerdinfo'

+ 12 - 11
locations/sex.qsrc

@@ -269,23 +269,22 @@ if $ARGS[0] = 'end':
 		orgasm += 1
 		'You feel so horny after bringing him to orgasm, you''re very close to having an orgasm also! You close your eyes and surrender yourself to the moment, quickly rubbing yourself to completion.'
 	end
-	pos = 0
 	if cuminside = 1: gs 'cuminsidereact'
 
 	gs 'arousal', 'end'
 
 	gs 'stat'
 	act 'Leave':
-		if picrand >= 54 and picrand <= 73:gt 'office', 'work'
-		if picrand >= 74 and picrand <= 76:gt 'vann', 'start'
-		if picrand >= 77 and picrand <= 80:gt 'tanhouse'
-		if picrand >= 81 and picrand <= 82:gt 'down'
-		if picrand >= 83 and picrand <= 84:dynamic $brodila
-		if picrand >= 85 and picrand <= 86:gt'down'
-		if picrand = 87 or picrand = 90:dynamic $brodilk
-		if picrand = 88:dynamic $brodils
-		if picrand = 89:gt 'bed', 'start'
-
+		if picrand >= 54 and picrand <= 73: killvar 'picrand' & gt 'office', 'work'
+		if picrand >= 74 and picrand <= 76: killvar 'picrand' & gt 'vann', 'start'
+		if picrand >= 77 and picrand <= 80: killvar 'picrand' & gt 'tanhouse'
+		if picrand >= 81 and picrand <= 82: killvar 'picrand' & gt 'down'
+		if picrand >= 83 and picrand <= 84: killvar 'picrand' & dynamic $brodila
+		if picrand >= 85 and picrand <= 86: killvar 'picrand' & gt'down'
+		if picrand = 87 or picrand = 90: killvar 'picrand' & dynamic $brodilk
+		if picrand = 88: killvar 'picrand' & dynamic $brodils
+		if picrand = 89: killvar 'picrand' & gt 'bed', 'start'
+		killvar 'picrand'
 		if svidboysex = 1:
 			svidboysex = 0
 			gt $svidboy_home, $svidboy_home_arg
@@ -293,6 +292,8 @@ if $ARGS[0] = 'end':
 
 		gt $sexloc, 'start'
 	end
+	killvar 'pos'
+	killvar 'textrand'
 end
 
 --- sex ---------------------------------