[removed] double assignments; cleanup

locations/BDman.qsrc

@@ -2,14 +2,9 @@
 if $ARGS[0] = 'givi':
 	!!stopboy = 0
 	gs 'boyStat', 'A41'
-	$boydesc = $npc_usedname['A41']
 	$boybody = 'small'
 	$boybod = 'thick'
 	$boyface = 'bald'
-	!!long cock
-	dick = npc_dick['A41']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A41']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -30,14 +25,9 @@ end
 if $ARGS[0] = 'ashot':
 	!!stopboy = 0
 	gs 'boyStat', 'A42'
-	$boydesc = $npc_usedname['A42']
 	$boybody = 'average growth'
 	$boybod = 'muscular'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A42']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A42']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 1
 	!!check in appearance, a parameter pcs_apprnc
@@ -58,14 +48,9 @@ end
 if $ARGS[0] = 'arthur':
 	!!stopboy = 0
 	gs 'boyStat', 'A73'
-	$boydesc = $npc_usedname['A73']
 	$boybody = 'average growth'
 	$boybod = 'muscular'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A73']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A73']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -86,14 +71,9 @@ end
 if $ARGS[0] = 'abdula':
 	!!stopboy = 0
 	gs 'boyStat', 'A91'
-	$boydesc = $npc_usedname['A91']
 	$boybody = 'long'
 	$boybod = 'skinny'
 	$boyface = 'gray'
-	!!long cock
-	dick = npc_dick['A91']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A91']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -114,14 +94,9 @@ end
 if $ARGS[0] = 'hasan':
 	!!stopboy = 0
 	gs 'boyStat', 'A92'
-	$boydesc = $npc_usedname['A92']
 	$boybody = 'average growth'
 	$boybod = 'abdominous'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A92']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A92']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -142,14 +117,9 @@ end
 if $ARGS[0] = 'kamil':
 	!!stopboy = 0
 	gs 'boyStat', 'A97'
-	$boydesc = $npc_usedname['A97']
 	$boybody = 'average growth'
 	$boybod = 'thin'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A97']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A97']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -170,14 +140,9 @@ end
 if $ARGS[0] = 'aslan':
 	!!stopboy = 0
 	gs 'boyStat', 'A98'
-	$boydesc = $npc_usedname['A98']
 	$boybody = 'small'
 	$boybod = 'thin'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A98']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A98']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc
@@ -198,14 +163,9 @@ end
 if $ARGS[0] = 'muhtar':
 	!!stopboy = 0
 	gs 'boyStat', 'A99'
-	$boydesc = $npc_usedname['A99']
 	$boybody = 'small'
 	$boybod = 'thick'
 	$boyface = 'black-haired'
-	!!long cock
-	dick = npc_dick['A99']
-	!! sexual force of 0 prior_to 2
-	silaVag = npc_sexskill['A99']
 	!!security, is responsible for the money and requirements 0 beggar, 1 middle_peasant 2 rich
 	finance = 2
 	!!check in appearance, a parameter pcs_apprnc

locations/BDsex.qsrc

@@ -29,15 +29,13 @@ if $ARGS[0] = 'start':
 		'<<$boydesc>> skillfully caresses your breasts.'
 		gs 'arousal', 'foreplay', 5
 		gs 'stat'
-		brand = rand(0, 100)
 
-		if brand < 70:
+		if rand(0, 100) < 70:
 			'<<$boydesc>> strokes and caresses your pussy with his fingers.'
 			gs 'arousal', 'vaginal_finger', -5, 'sub'
 			gs 'stat'
-			trand = rand(0, 2)
 
-			if trand < 2:
+			if rand(0, 2) < 2:
 				'<<$boydesc>> moves to lay you down on your back.'
 
 				act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -59,15 +57,15 @@ if $ARGS[0] = 'start':
 		'<<$boydesc>> hugs you and passionately caress your breasts.'
 		gs 'arousal', 'foreplay', 5
 		gs 'stat'
-		brand = rand(0, 100)
+		tmpbrand = rand(0, 100)
 
-		if brand < 70:
+		if tmpbrand < 70:
 			'<<$boydesc>> caresses your pussy with his fingers.'
 			gs 'arousal', 'vaginal_finger', -5, 'sub'
 			gs 'stat'
-			trand = rand(0, 2)
+			killvar 'tmpbrand'
 
-			if trand < 2:
+			if rand(0, 2) < 2:
 				'<<$boydesc>> moves to lay you down on your back.'
 
 				act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -76,8 +74,9 @@ if $ARGS[0] = 'start':
 
 				act 'Go on all fours':gt 'BDsex', 'sex2'
 			end
-		elseif brand >= 70 and brand < 90:
+		elseif tmpbrand >= 70 and tmpbrand < 90:
 			'<<$boydesc>> grabs the back of your head and pulls you to face his penis.'
+			killvar 'tmpbrand'
 
 			act 'Take by mouth':gt 'BDsex', 'minet'
 			gs 'willpower', 'bj', 'resist', 'easy'
@@ -88,8 +87,8 @@ if $ARGS[0] = 'start':
 				act 'Lie on your back and spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				act 'Stand on all fours (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		elseif brand >= 90:
-
+		elseif tmpbrand >= 90:
+			killvar 'tmpbrand'
 			'<<$boydesc>> tells you that he wants to take you in the ass.'
 
 			act 'Do anal':gt 'BDsex', 'anal2'
@@ -141,10 +140,9 @@ if $ARGS[0] = 'sex':
 	gs 'arousal', 'vaginal', 10, 'sub'
 	gs 'stat'
 	gs 'BDsex', 'org'
-	givfinrand = rand(0, 10)
 
 	if harakBoy > 0:
-		if givfinrand >= 8:
+		if rand(0, 10) >= 8:
 			'Suddenly <<$boydesc>> pulls out of you and takes you by the shoulders, guiding you to your knees before him.'
 
 			act 'Take it on the face':gt 'BDsex', 'facial'
@@ -154,10 +152,8 @@ if $ARGS[0] = 'sex':
 		end
 	end
 
-	givfinrand = rand(0, 10)
-
 	if harakBoy = 2:
-		if givfinrand >= 8:
+		if rand(0, 10) >= 8:
 			'Suddenly <<$boydesc>> pulls his member out and begins to fondle your ass, preparing it for penetration.'
 
 			act 'Do anal':gt 'BDsex', 'anal2'
@@ -175,15 +171,13 @@ end
 if $ARGS[0] = 'sex2':
 	pose = 1
 	gs 'stat'
-	picrand = rand(1, 5)
-	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/vagdog<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/vagdog<<rand(1, 5)>>.jpg"></center>'
 	gs 'arousal', 'vaginal', 10, 'sub'
 	gs 'stat'
 	gs 'BDsex', 'org'
-	givfinrand = rand(0, 10)
 
 	if harakBoy > 0:
-		if givfinrand >= 8:
+		if rand(0, 10) >= 8:
 			'Suddenly <<$boydesc>> pulls out of you and takes you by the shoulders, guiding you to your knees before him.'
 
 			act 'Take it on the face':gt 'BDsex', 'facial'
@@ -193,10 +187,8 @@ if $ARGS[0] = 'sex2':
 		end
 	end
 
-	givfinrand = rand(0, 10)
-
 	if harakBoy = 2:
-		if givfinrand >= 8:
+		if rand(0, 10) >= 8:
 			'Suddenly <<$boydesc>> withdraws and begins to fondle your ass, preparing it for penetration.'
 
 			act 'Anal':gt 'BDsex', 'anal2'
@@ -214,8 +206,7 @@ end
 if $ARGS[0] = 'sex3':
 	pose = 0
 	gs 'stat'
-	picrand = rand(1, 5)
-	'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/vagcow<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/vagcow<<rand(1, 5)>>.jpg"></center>'
 	gs 'arousal', 'vaginal', 10, 'sub'
 	gs 'stat'
 	gs 'BDsex', 'org'
@@ -231,15 +222,13 @@ end
 
 
 if $ARGS[0] = 'anal2':
-	picrand = rand(1, 10)
-	'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal2<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal2<<rand(1, 10)>>.jpg"></center>'
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
 	gs 'bdsex', 'an'
-	givfinrand = rand(0, 10)
 
 	if harakBoy > 0:
-		if givfinrand >= 8:
+		if rand(0, 10) >= 8:
 			'Suddenly <<$boydesc>> pulls out of you and takes you by the shoulders, guiding you to your knees before him.'
 
 			act 'Take it on the face':gt 'BDsex', 'facial'
@@ -267,9 +256,8 @@ if $ARGS[0] = 'hj':
 	'You take his <<dick>> centimeter penis and begin to caress the shaft, moving the skin over the crimson head.'
 	gs 'arousal', 'hj', 5
 	gs 'stat'
-	bjrand = rand(0, 100)
 
-	if bjrand >= 75:
+	if rand(0, 100) >= 75:
 		if harakBoy = 0:
 			'<<$boydesc>> moans, "I''m going to come."'
 
@@ -313,15 +301,15 @@ if $ARGS[0] = 'hj':
 			act 'Take by mouth':gt 'BDsex', 'minet'
 			act 'Lie on your back and spread her legs ':gt 'BDsex', 'sex'
 		else
-			brand = rand(0, 100)
+			tmpbrand = rand(0, 100)
 
-			if brand < 70:
+			if tmpbrand < 70:
 				'<<$boydesc>> caresses your pussy with his fingers.'
 				gs 'arousal', 'vaginal_finger', -5, 'sub'
 				gs 'stat'
-				trand = rand(0, 2)
+				killvar 'tmpbrand'
 
-				if trand < 2:
+				if rand(0, 2) < 2:
 					'<<$boydesc>> attempts to lay you down on your back.'
 
 					act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -330,8 +318,9 @@ if $ARGS[0] = 'hj':
 
 					act 'Stand on all fours':gt 'BDsex', 'sex2'
 				end
-			elseif brand >= 70 and brand < 80:
+			elseif tmpbrand >= 70 and tmpbrand < 80:
 				'<<$boydesc>> tells you that he wants your ass.'
+				killvar 'tmpbrand'
 
 				act 'Anal':gt 'BDsex', 'anal2'
 
@@ -349,8 +338,9 @@ if $ARGS[0] = 'hj':
 				else
 					act 'Take him into your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			elseif brand >= 80:
+			elseif tmpbrand >= 80:
 				'<<$boydesc>> forces your face down on his member.'
+				killvar 'tmpbrand'
 
 				act 'Take by mouth':gt 'BDsex', 'minet'
 			end
@@ -365,14 +355,12 @@ end
 
 if $ARGS[0] = 'minet':
 	!!blowjob
-	picrand = rand(24, 28)
-	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<rand(24, 28)>>.jpg"></center>'
 	gs 'arousal', 'bj', 10, 'sub'
 	gs 'stat'
 	gs 'bdsex', 'autobj'
-	bjrand = rand(0, 100)
 
-	if bjrand >= 75:
+	if rand(0, 100) >= 75:
 		if harakBoy = 0:
 			'<<$boydesc>> moans, "I''m going to come."'
 
@@ -403,15 +391,12 @@ if $ARGS[0] = 'minet':
 
 			act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
 		else
-			brand = rand(0, 100)
-
-			if brand < 70:
+			if rand(0, 100) < 70:
 				'<<$boydesc>> caresses your pussy with his fingers.'
 				gs 'arousal', 'vaginal_finger', -10, 'sub'
 				gs 'stat'
-				trand = rand(0, 2)
 
-				if trand < 2:
+				if rand(0, 2) < 2:
 					'<<$boydesc>> tries to lay you down on your back.'
 
 					act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -420,7 +405,7 @@ if $ARGS[0] = 'minet':
 
 					act 'Stand on all fours':gt 'BDsex', 'sex2'
 				end
-			elseif brand >= 70:
+			else
 				'<<$boydesc>> tells you that he wants your ass.'
 
 				act 'Anal':gt 'BDsex', 'anal2'
@@ -469,8 +454,7 @@ end
 if $ARGS[0] = 'facial':
 	facial += 1
 	minut += 3
-	picrand = rand(11, 15)
-	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<rand(11, 15)>>.jpg"></center>'
 	if protect = 1:
 		'<<$boydesc>> finishes, filling the condom with his cum.'
 		protect = 0
@@ -487,8 +471,7 @@ end
 
 if $ARGS[0] = 'swallow':
 	minut += 3
-	picrand = rand(20, 29)
-	'<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(20, 29)>>.jpg"></center>'
 	if protect = 1:
 		'<<$boydesc>> finishes, and you feel the condom balloon up in your mouth.'
 		protect = 0
@@ -561,11 +544,11 @@ if $ARGS[0] = 'end':
 		act 'Leave':dynamic $brodilr
 	elseif GoToGuy = 0:
 		act 'Leave':
-			gorand = rand(0, 2)
+			tmpgorand = rand(0, 2)
 
-			if gorand = 0:dynamic $brodilr
-			if gorand = 1:gt 'down'
-			if gorand = 2:gt 'nord'
+			if tmpgorand = 0: killvar 'tmpgorand' & dynamic $brodilr
+			if tmpgorand = 1: killvar 'tmpgorand' & gt 'down'
+			if tmpgorand = 2: killvar 'tmpgorand' & gt 'nord'
 		end
 	else
 		act 'Leave':dynamic $brodilr
@@ -723,8 +706,7 @@ end
 if $ARGS[0] = 'cum':
 	if protect ! 1:
 	!!unprotected sex
-	finrand = rand(0, 1)
-		if finrand = 0:
+		if rand(0, 1) = 0:
 			!!inside
 			sexpartkno = 1
 			gs 'cum_manage'
@@ -733,7 +715,7 @@ if $ARGS[0] = 'cum':
 			gs 'stat'
 			pcs_mood -= 15
 			gs 'cuminsidereact'
-		elseif finrand = 1:
+		else
 			!!out
 			if pose = 0:
 				spafinloc = 14