Эх сурвалжийг харах

New dynamic for naming to avoid redundancy and code bloating, replacing redundant naming cycles, removing unused variables, also some naming fix

Malen 9 жил өмнө
parent
commit
854863eb21

+ 3 - 3
locations/Military

@@ -98,8 +98,8 @@ if $ARGS[0] = 'pro0':
 	act 'Refuse':gt 'Military', 'start'
 
 	act 'Agree':
-		$boy = 'Soldier'
-		$boy1 = 'Soldier'
+		dynamic $CatName, 'Soldier'
+		dynamic $CatName, 'Soldier', '$boy1'
 		cla
 		*clr
 		'<center><img src="images/img/military/pro0.jpg"></center>'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'pro1':
 end
 
 if $ARGS[0] = 'rape':
-	$boy = 'Rapist'
+	dynamic $CatName, 'Rapist'
 	cla
 	*clr
 	rape += 1

+ 3 - 9
locations/Palatka

@@ -26,14 +26,14 @@ end
 if $ARGS[0] = 'pal0':
 	cla
 	*clr
-	$boy = 'Soldier'
-	$boy1 = 'Soldier'
 	'<center><img src="images/img/military/pal0.jpg"></center>'
 	'Once you begin to change as the tent includes two soldiers and see you half-naked, running up to you with the members on the edge, you hvaete for their members, but what to do to squeeze harder and get them out of the tent or relax after a hard day.'
 
 	act 'Send':gt 'palatka', 'start'
 
 	act 'Post':
+		dynamic $CatName, 'Soldier'
+		dynamic $CatName, 'Soldier', $boy1
 		guy += 2
 		picrand = 22
 		xgt 'sexdvoe', 'var'
@@ -50,13 +50,7 @@ if $ARGS[0] = 'pal1':
 
 	act 'Repay in full':
 		sexpartkno = 1
-		$boy = 'Black soldier'
-		soldercount = 1
-		:soldiernaming
-			$boycount = '#<<soldercount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:soldercount += 1 & jump 'soldiernaming'
-		$boy=$boycount
+		dynamic $CatName, 'Black Soldier'
 		guy += 1
 		picrand = 43
 		gt 'sex', 'minet'

+ 1 - 10
locations/WorkHosp

@@ -120,15 +120,7 @@ if $ARGS[0] = '0':
 			lesbian += 1
 			picrand = 12
 			sexpartkno = 1
-			$boy = 'patient'
-			if arrpos('$cumarrnam',$boy) ! -1:
-				boycount = 2
-				:naming
-					$boycount = '#<<boycount>> '+$boy
-					arrmodtmp = arrpos('$cumarrnam',$boycount)
-				if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-				$boy = $boycount
-			end
+			dynamic $CatName, 'Patient'
 			gt 'podrsex', 'suck'
 		end
 	elseif katprorand = 2:
@@ -187,7 +179,6 @@ if $ARGS[0] = '1':
 			dynamic $randdoc
 			if $boy = $boy1:docfuck[randdoc] -= 1 & jump 'docloop'
 			if docfuck[randdoc] = 1:guy += 1
-			SkipNameCycle = 1
 			xgt 'sexdvoe', 'var'
 		end
 	end

+ 2 - 2
locations/bed

@@ -298,8 +298,8 @@ if $ARGS[0] = 'vor':
 				*clr
 				picrand = 38
 				orgasm += 1
-				$boy = 'Rapist'
-				$boy1 = 'Rapist'
+				dynamic $CatName, 'Rapist'
+				dynamic $CatName, 'Rapist', '$boy1'
 				'<center><img src="images/img/spaln/g2.jpg"></center>'
 				'You stand up and bend over, one of them stands behind you and stuffs his dick into your pussy. "Yes, it''s dripping wet, this bitch was just waiting for some cock" he says.'
 				'"Open your mouth" growls the second guy inserting his dick into your mouth. They proceeded to rape you from both sides, you are overwhelmed with desire, and sipt-roasted with your hands tied behind your back by two strangers.'

+ 2 - 2
locations/bouling

@@ -17,8 +17,8 @@ if hour >= 8 and hour <= 20:
 			boulingnav += rand(0, 3)
 			boulrand = rand(0, 9)
 
-			$boy = 'Bowling Competitor'
-			$boy1 = 'Bowling Competitor 2'
+			dynamic $CatName, 'Bowling Competitor'
+			dynamic $CatName, 'Bowling Competitor', '$boy1'
 			if boulrand = 0:
 				cla
 				'You see two guys and they challenge you to a game.'

+ 45 - 0
locations/dinSex2

@@ -668,5 +668,50 @@ $stamina_npc = {
 	'<center>Stamina: <<$ind_npc>></center>'
 }
 
+!Call looks like: dynamic $CatName, 'Courier', '$boy1'
+!second argument ($ARGS[1]) can be left out, in that case it calls for '$boy'
+$CatName = {
+	if $ARGS[1] = '$boy1':
+		$boy1 = $ARGS[0]
+		if arrpos('$cumarrnam',$boy1) ! -1:
+			boycount = 2
+			:naming
+				$boyname = '#<<boycount>> '+$boy1
+				arrmodtmp = arrpos('$cumarrnam',$boyname)
+			if $cumarrnam[arrmodtmp] = $boyname:boycount += 1 & jump 'naming'
+			$boy1 = $boyname
+		end
+	elseif $ARGS[1] = '$boy2':
+		$boy2 = $ARGS[0]
+		if arrpos('$cumarrnam',$boy2) ! -1:
+			boycount = 2
+			:naming
+				$boyname = '#<<boycount>> '+$boy2
+				arrmodtmp = arrpos('$cumarrnam',$boyname)
+			if $cumarrnam[arrmodtmp] = $boyname:boycount += 1 & jump 'naming'
+			$boy2 = $boyname
+		end
+	elseif $ARGS[1] = '$boy3':
+		$boy3 = $ARGS[0]
+		if arrpos('$cumarrnam',$boy3) ! -1:
+			boycount = 2
+			:naming
+				$boyname = '#<<boycount>> '+$boy3
+				arrmodtmp = arrpos('$cumarrnam',$boyname)
+			if $cumarrnam[arrmodtmp] = $boyname:boycount += 1 & jump 'naming'
+			$boy3 = $boyname
+		end
+	else
+		$boy = $ARGS[0]
+		if arrpos('$cumarrnam',$boy) ! -1:
+			boycount = 2
+			:naming
+				$boyname = '#<<boycount>> '+$boy
+				arrmodtmp = arrpos('$cumarrnam',$boyname)
+			if $cumarrnam[arrmodtmp] = $boyname:boycount += 1 & jump 'naming'
+			$boy = $boyname
+		end
+	end
+}
 --- dinSex2 ---------------------------------
 

+ 4 - 4
locations/housezal

@@ -157,9 +157,9 @@ if week < 6 and hour > 8 and hour < 20:
 										cla
 										*clr
 										spafinloc = 12
-gs 'cum_manage'
+										gs 'cum_manage'
 										spafinloc = 4
-gs 'cum_manage'
+										gs 'cum_manage'
 										'<center><img src="images/img/centr/nikzal8.jpg"></center>'
 										'While you are going to continue to stand by cancer, Nicholas walked up to you and put in the ass twisted bill'
 
@@ -312,7 +312,7 @@ elseif hour > 17 and hour < 20 and housezalrand < 3 and nikslut = 1 and niksexda
 	'"Yeah, no, you do not understand how you her ass, though very best." says Nicholas baring your buttocks. "Short allowance and she gets up it." Nicholas continues. In the meantime you stand with your bare ass and smiling stupidly looking at the man, and Nicholas did not let up, "Want it show? <<$name>> And you do not mind to serve the host along with his guest?" gororit he puts a couple of bills on the table. A man looks at you and in his pants markedly increases bump in the groin area.'
 	'"With pleasure, " you reply, kneeling.'
 
-	act 'Start':SkipNameCycle = 1 & xgt 'sexdvoe', 'var'
+	act 'Start':xgt 'sexdvoe', 'var'
 elseif hour > 17 and hour < 20 and housezalrand > 8 and nikslut = 1 and niksexday ! daystart:
 	cla
 	*clr
@@ -338,7 +338,7 @@ elseif hour > 17 and hour < 20 and housezalrand > 8 and nikslut = 1 and niksexda
 		'<center><img src="images/img/th/s2.jpg"></center>'
 		'You lay on the floor and he lay down behind you, he smeared fingers slaver your pussy and slowly introduced dick in you. You were not excited and a couple of minutes you were hurt a little vagina until moistened. Entering into a little taste you started podmahivat him. Once you pick up the pace in the room returned Nicholas "Yes you already have everything in full swing, I seem almost too late, " he said, starting to undress.'
 
-		act 'Continue':SkipNameCycle = 1 & xgt 'sexdvoe', 'var'
+		act 'Continue':xgt 'sexdvoe', 'var'
 	end
 end
 

+ 2 - 2
locations/kafe

@@ -382,8 +382,8 @@ gs 'cum_manage'
 				elseif kaferand = 1:
 					cls
 					gs 'stat'
-					$boy = 'Customer'
-					$boy1 = 'Customer'
+					dynamic $CatName, 'Customer'
+					dynamic $CatName, 'Customer', '$boy1'
 					'<center><img src="images/img/spaln/kafe2.jpg"></center>'
 					'You serve a table in the attic, with two men. Each time you come by they strive to pinch or slap your butt, or run their hands under your skirt.'
 

+ 26 - 158
locations/office

@@ -103,15 +103,7 @@ if $ARGS[0] = 'work':
 				cla
 				*clr
 				sexpartkno = 1
-				$boy = 'Office Manager'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Office Manager'
 
 				'<center><img src="images/img/office/m0.jpg"></center>'
 				'You work somewhere zapropastilas <<$name>>, chef left. In the study includes one of the managers, "Hi <<$name>>, can you help me?"'
@@ -138,15 +130,8 @@ if $ARGS[0] = 'work':
 				cla
 				*clr
 				sexpartkno = 1
-				$boy = 'Office Manager'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				$boy = 'IT Guy'
+				
 				'<center><img src="images/img/office/m2.jpg"></center>'
 				'You work somewhere zapropastilas <<$name>>, chef and left as an evil broke konditseoner. You get too hot and you rastegivat couple top buttons of her blouse, so now your breasts almost falling out of her. In the study includes one of the managers, "Hi <<$name>>, chef at home?".'
 				'"No, I left." you answer and dive back into the paper.'
@@ -174,15 +159,8 @@ if $ARGS[0] = 'work':
 				cla
 				*clr
 				sexpartkno = 1
-				$boy = 'Office Manager'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Office Manager'
+				
 				'<center><img src="images/img/office/m4.jpg"></center>'
 				'You should make copies of the documents, and you went to the archive where there was a huge copier. While you copied, came into the office one of the managers, and began to search among stelozhey with folders, you do not pay any attention to him and continued to do their work. A minute later, you felt his hand on my ass. "She asks, tell the truth that you have the best ass and you''re always ready to prove it?" he said, and without waiting for your answer, he continued, "Now I will test it." With these words, his hands slid under your clothes.'
 
@@ -225,15 +203,8 @@ if $ARGS[0] = 'work':
 				cla
 				*clr
 				sexpartkno = 1
-				$boy = 'Office Manager'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Office Manager'
+				
 				'<center><img src="images/img/office/m8.jpg"></center>'
 				'You work somewhere zapropastilas <<$name>>, chef left. In the study includes one of the managers, "Hi <<$name>>, chef at home?".'
 				'"No, I left." you answer and dive back into the paper.'
@@ -332,7 +303,7 @@ if $ARGS[0] = 'work':
 
 			if officebolt = 0:'"Can you imagine, say, our bookkeeper at corporate which has 40, stuck to one of the managers trying to get him into office. He barely escaped." - Raskazala <<$name>>.'
 			if officebolt = 1:'"Imagine, in one corporate party so I typed that danced a striptease on the table at all, then I was so ashamed, all went finger poked, I even wanted to resign, but changed her mind, boss gave me even a premium, I said that office decoration, and if the rest of the finger poke, so this is what the show is nothing to them. " - Raskazala <<$name>>.'
-			if officebolt = 2:'"We had one girl, so she marketer at regular gatherings drunk and fell asleep in the common room, and woke up naked and covered in semen, around 20 prezikov used pieces lying around, I do not know how many people raped her there, but it two days later for Labour came vraskoryachku and could not sit down. " - Raskazala <<$name>>.'
+			if officebolt = 2:'"We had a girl on marketing who got really drunk at a corporate party. She woke up at the end of the party, naked and covered with semen, with about twenty used condoms scattering around her. I do not know how many guys fucked her, but when she came to work on monday, she could still not sit down", tells you <<$name>>.'
 			if officebolt = 3:'"Imagine, in one corporate party our sysadmin drunk and fell asleep in the toilet, so marketers girls opened his warehouse and typing older keyboards and there are boards that strapped it all to him with tape, turned knight in armor, so we all office in the morning the toilet waiting when he wakes up, he went out and only then realized that something strapped to it.''s laughter that was. " - Raskazala <<$name>>.'
 
 			act 'Finish':gt 'office', 'work'
@@ -525,7 +496,7 @@ if $ARGS[0] = 'boss':
 			'"Well, I agree." you reply.'
 			'"That''s good, well, then going to the city is just one solid client arrived, he is now in a hotel, go to it together. See how you can do it." he said.'
 
-			act 'Go':gt 'office', 'motiv0'
+			act 'Go':gt 'office', 'CatName'
 		end
 
 		act 'Refuse':
@@ -615,15 +586,7 @@ if $ARGS[0] = 'kuh':
 				cla
 				*clr
 				sexpartkno = 1
-				$boy = 'Office Manager'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Office Manager'
 				officeslut += 1
 				'<center><img src="images/img/office/m14.jpg"></center>'
 				'Second hand he unbuttoned his pants and unleashed his already standing member. The first hand has moved from the back of your head and continued to push down putting your mouth on his penis.'
@@ -691,6 +654,7 @@ if $ARGS[0] = 'boss1':
 			guy += 1
 			girl += 1
 			lesbian += 1
+			$boy = 'Office Boss'
 			'<center><img src="images/img/office/b3.jpg"></center>'
 			'You put the tea tray on the sofa and knelt down and start to fondle his scrotum language. Chef takes you behind the head and presses the stronger their balls, quickly realizing that he wants you pull his balls in her mouth and start to chew as he continues to fuck <<$name>>.'
 
@@ -950,15 +914,7 @@ if $ARGS[0] = 'dostavka':
 				picrand = 26
 				guy += 1
 				lesbian += 1
-				$boy = 'Courier'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Courtier'
 				gt 'podrsex', 'suck'
 			end
 		end
@@ -1010,15 +966,7 @@ if $ARGS[0] = 'boss2':
 	*clr
 	sexpartkno = 1
 	$boy = 'Office Boss'
-	$boy1 = 'Courier'
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
+	dynamic $CatName, 'Courier'
 	minut += 30
 	officeslut += 1
 	'<center><img src="images/img/office/b11.jpg"></center>'
@@ -1066,15 +1014,7 @@ if $ARGS[0] = 'boss3':
 	cla
 	*clr
 	$boy = 'Office Boss'
-	$boy1 = 'Client'
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
+	dynamic $CatName, 'Courier'
 	minut += 30
 	officeslut += 1
 	'<center><img src="images/img/office/b14.jpg"></center>'
@@ -1111,15 +1051,7 @@ if $ARGS[0] = 'boss4':
 	*clr
 	sexpartkno = 1
 	$boy = 'Office Boss'
-	$boy1 = 'Office Manager'
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
+	dynamic $CatName, 'Office Manager', '$boy1'
 	minut += 30
 	officeslut += 1
 	'<center><img src="images/img/office/b17.jpg"></center>'
@@ -1155,7 +1087,7 @@ if $ARGS[0] = 'gang':
 	officeslut += 1
 	gang += 1
 	boynum = 3
-	$boy = 'Office worker'
+	dynamic $CatName, 'Office worker', '$boy1'
 	
 	'<center><img src="images/img/office/g0.jpg"></center>'
 	'Going to the rest room you will see in it the three managers. "A <<$name>>, hello, we are just talking about you, do you want to ask something." said one of them coming to you.'
@@ -1246,15 +1178,7 @@ if $ARGS[0] = 'motiv0':
 	cla
 	*clr
 	$boy = 'Office Boss'
-	$boy1 = 'Client'
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
+	dynamic $CatName, 'Client', '$boy1'
 	minut += 180
 	'<center><img src="images/img/office/m15.jpg"></center>'
 	'You come with the head to the hotel and go up to the room to the client. While the chef with the client to discuss the contract you park yourself on the bed and pretend that something down. When it comes to controversial issues, chief transplanted to you on the bed and starts stroking you. His hands glide over your body then crept under her skirt then stroking his chest, soon your skirt is Zadran to the waist. Customer looks to you between the legs without taking his eyes, seeing this boss says "can make a little break to relax." and you vskhvativ crotch pulls up, you go and find yourself standing on all fours on the bed with a bare ass. "You''re like <<$name>> help us relax?" appeals to you boss.'
@@ -1277,15 +1201,7 @@ if $ARGS[0] = 'motiv1':
 	cla
 	*clr
 	sexpartkno = 0
-	$boy = 'Client'
-	if arrpos('$cumarrnam',$boy) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy = $boycount
-	end
+	dynamic $CatName, 'Client'
 	minut += 120
 	picrand = rand(65, 68)
 
@@ -1303,19 +1219,11 @@ if $ARGS[0] = 'motiv2':
 	cla
 	*clr
 	sexpartkno = 0
-	$boy = 'Client'
-	if arrpos('$cumarrnam',$boy) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy = $boycount
-	end
+	
 	officerand2 = rand(1, 4)
-
 	if officerand2 = 1:gt 'office', 'motiv4'
 
+	dynamic $CatName, 'Client'
 	picrand = rand(69, 73)
 	minut += 240
 	swallow += 2
@@ -1351,29 +1259,13 @@ if $ARGS[0] = 'motiv3':
 	cla
 	*clr
 	sexpartkno = 0
-	$boy = 'Client'
-	$boy1 = 'Client'
-	if arrpos('$cumarrnam',$boy) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy = $boycount
-	end
-	boycount = 2
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
 	picrand = rand(30, 33)
-	officerand2 = rand(1, 4)
 
+	officerand2 = rand(1, 4)
 	if officerand2 = 1:gt 'office', 'motiv5'
 
+	dynamic $CatName, 'Client'
+	dynamic $CatName, 'Client', '$boy1'
 	minut += 240
 	swallow += 2
 	bj += 2
@@ -1408,15 +1300,7 @@ if $ARGS[0] = 'motiv4':
 	cla
 	*clr
 	sexpartkno = 0
-	$boy = 'Client'
-	if arrpos('$cumarrnam',$boy) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy = $boycount
-	end
+	dynamic $CatName, 'Client'
 	picrand = 29
 	minut += 180
 	guy += 1
@@ -1449,24 +1333,8 @@ if $ARGS[0] = 'motiv5':
 	cla
 	*clr
 	sexpartkno = 0
-	$boy = 'Client'
-	$boy1 = 'Client'
-	if arrpos('$cumarrnam',$boy) ! -1:
-		boycount = 2
-		:naming
-			$boycount = '#<<boycount>> '+$boy
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy = $boycount
-	end
-	boycount = 2
-	if arrpos('$cumarrnam',$boy1) ! -1:
-		:naming
-			$boycount = '#<<boycount>> '+$boy1
-			arrmodtmp = arrpos('$cumarrnam',$boycount)
-		if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-		$boy1 = $boycount
-	end
+	dynamic $CatName, 'Client'
+	dynamic $CatName, 'Client', '$boy1'
 	picrand = 34
 	minut += 180
 	guy += 2

+ 5 - 3
locations/poli

@@ -1069,6 +1069,7 @@ if $ARGS[0] = '0':
 	act 'Have some fun':
 		picrand = 11
 		guy += 1
+		dynamic $CatName, 'Doctor'
 		xgt 'sex', 'var'
 	end
 end
@@ -1082,8 +1083,8 @@ if $ARGS[0] = '1':
 	act 'Storm out':gt 'poli', 'start'
 
 	act 'Have some fun':
-		$boy = 'Doctor'
-		$boy1 = 'Doctor'
+		dynamic $CatName, 'Doctor'
+		dynamic $CatName, 'Doctor', '$boy1'
 		picrand = 11
 		guy += 2
 		xgt 'sexdvoe', 'var'
@@ -1109,6 +1110,7 @@ if $ARGS[0] = '2':
 		act 'Let her':
 			cla
 			*clr
+			dynamic $CatName, 'Doctor'
 			guy += 1
 			girl += 1
 			lesbian += 1
@@ -1121,7 +1123,7 @@ if $ARGS[0] = '2':
 				'<center><img src="images/img/spaln/hospsex6.jpg"></center>'
 				'You lay her on the couch and sink your lips into her pussy, the smell of her sex drives you crazy, you could not put her down and lick her pussy to put your tongue inside her pussy and ass, in this state you are found by the returning doctor.'
 
-				act 'Threesome':gs 'sex' & picrand = 11 & gt 'podrsex', 'suck'
+				act 'Threesome':picrand = 11 & gt 'podrsex', 'suck'
 			end
 		end
 	end

+ 7 - 55
locations/qjob

@@ -50,15 +50,7 @@ if $ARGS[0] = 'var1':
 
 				act 'Agree':
 					picrand = 30
-					$boy = 'Photographer'
-					if arrpos('$cumarrnam',$boy) ! -1:
-						boycount = 2
-						:naming
-							$boycount = '#<<boycount>> '+$boy
-							arrmodtmp = arrpos('$cumarrnam',$boycount)
-						if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-						$boy = $boycount
-					end
+					dynamic $CatName, 'Photographer'
 					gt 'podrsex', 'suck'
 				end
 			end
@@ -165,15 +157,7 @@ if $ARGS[0] = 'var3':
 
 			act 'Start':
 				picrand = 81
-				$boy = 'Shy painter'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Shy painter'
 				xgt 'sex', 'var'
 			end
 		end
@@ -198,15 +182,7 @@ if $ARGS[0] = 'var3':
 
 			act 'Start':
 				picrand = 82
-				$boy = 'Dejected painter'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Dejected painter'
 				xgt 'sex', 'var'
 			end
 		end
@@ -232,15 +208,7 @@ if $ARGS[0] = 'var3':
 
 			act 'Allow':
 				picrand = 85
-				$boy = 'Painter'
-				if arrpos('$cumarrnam',$boy) ! -1:
-					boycount = 2
-					:naming
-						$boycount = '#<<boycount>> '+$boy
-						arrmodtmp = arrpos('$cumarrnam',$boycount)
-					if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-					$boy = $boycount
-				end
+				dynamic $CatName, 'Painter'
 				gt 'sex', 'kuni'
 			end
 		end
@@ -272,15 +240,7 @@ if $ARGS[0] = 'var3':
 
 				act 'Continue':
 					picrand = 31
-					$boy = 'Painter'
-					if arrpos('$cumarrnam',$boy) ! -1:
-						boycount = 2
-						:naming
-							$boycount = '#<<boycount>> '+$boy
-							arrmodtmp = arrpos('$cumarrnam',$boycount)
-						if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-						$boy = $boycount
-					end
+					dynamic $CatName, 'Painter'
 					gt 'podrsex', 'suck'
 				end
 			end
@@ -314,15 +274,7 @@ if $ARGS[0] = 'var3':
 
 				act 'Continue':
 					picrand = 32
-					$boy = 'Painter''s husband'
-					if arrpos('$cumarrnam',$boy) ! -1:
-						boycount = 2
-						:naming
-							$boycount = '#<<boycount>> '+$boy
-							arrmodtmp = arrpos('$cumarrnam',$boycount)
-						if $cumarrnam[arrmodtmp] = $boycount:boycount += 1 & jump 'naming'
-						$boy = $boycount
-					end
+					dynamic $CatName, 'Painter''s husband'
 					gt 'podrsex', 'suck'
 				end
 			end
@@ -336,12 +288,12 @@ if $ARGS[0] = 'var3':
 		act 'Leave':gt 'down'
 
 		act 'Covet':
+			dynamic $CatName, 'Painter'
 			picrand = 86
 			gt 'sex', 'minet'
 		end
 	end
 end
 
-
 --- qjob ---------------------------------
 

+ 0 - 1
locations/sexdvoe

@@ -226,7 +226,6 @@ if $ARGS[0] = 'end':
 	dvsxanal = 0
 	sexvar = 0
 	sameboy = 0
-	SkipNameCycle = 0
 	sexstart = 0
 	temp1 = rand(2,9)
 	temp2 = rand(2,9)

+ 4 - 4
locations/young_shop

@@ -693,8 +693,8 @@ if $ARGS[0] = '3':
 		act 'Lay back room':
 			cla
 			*clr
-			$boy = 'Worker'
-			$boy1 = 'Worker'
+			dynamic $CatName, 'Worker'
+			dynamic $CatName, 'Worker', '$boy1'
 			guy += 2
 			'<center><img src="images/img/centr/mag4.jpg"></center>'
 			'You make the guys in the back room they despise pants pulling its members, and you are blindfolded and you start trying every member of the taste, but you have not tried and could not guess which is which, two white guys win, the rest come from the back room.'
@@ -718,8 +718,8 @@ if $ARGS[0] = '4':
 	end
 
 	act 'Give them':
-		$boy = 'Worker'
-		$boy1 = 'Worker 1'
+		dynamic $CatName, 'Worker'
+		dynamic $CatName, 'Worker', '$boy1'
 		guy += 2
 		picrand = 16
 		xgt 'sexdvoe', 'var'