Prechádzať zdrojové kódy

remaining bugs squashed

Mona Lisa 6 rokov pred
rodič
commit
e056e0e251

+ 2 - 2
locations/billsvid

@@ -43,7 +43,7 @@ act 'Play':
 		else
 			gt 'billsvid', '3'
 		end
-	elseif telsobnr > 0:
+	elseif $telsob = $loverdesc[lover_number]:
 		!! date with girlfriend	
 		loverrelation[lover_number] += 1
 		
@@ -231,7 +231,7 @@ if $ARGS[0] = '3':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	if telsobnr > 0:
+	if $telsob = $loverdesc[lover_number]:
 		'When you have finished playing, <<$telsob>> looks at you and waits for your next move.'
 		act 'Say goodbye': gt 'torgcentr'
 		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'

+ 10 - 0
locations/din_npc

@@ -14,5 +14,15 @@ $go_home = {
 		gt 'street'
 		end
 }
+
+$go_straight_home = {
+		if curr_home = 1:
+		gt 'korrPar'
+		elseif curr_home = 2:
+		gt 'Gaddvor'
+		elseif curr_home = 3:
+		gt 'korr'
+		end
+}
 --- din_npc ---------------------------------
 

+ 2 - 2
locations/kafesvid

@@ -52,7 +52,7 @@ act 'Chat':
 		else
 			gt 'kafesvid', '3'
 		end
-	elseif telsobnr > 0:
+	elseif $telsob = $loverdesc[lover_number]:
 		!! date with girlfriend	
 		loverrelation[lover_number] += 1
 		
@@ -403,7 +403,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/0.jpg"></center>'
 
-	if telsobnr > 0:
+	if $telsob = $loverdesc[lover_number]:
 		'After your fun, <<$telsob>> looks at you and waits for your next move.'
 		act 'Say goodbye': gt 'down'
 		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'

+ 2 - 2
locations/kazinosvid

@@ -52,7 +52,7 @@ act 'Play':
 		else
 			gt 'kazinosvid', '3'
 		end
-	elseif telsobnr > 0:
+	elseif $telsob = $loverdesc[lover_number]:
 		!! date with girlfriend	
 		loverrelation[lover_number] += 1
 		
@@ -201,7 +201,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cards/0.jpg"></center>'
 
-	if telsobnr > 0:
+	if $telsob = $loverdesc[lover_number]:
 		'After your fun, <<$telsob>> looks at you and waits for your next move.'
 		act 'Say goodbye': gt 'down'
 		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'

+ 2 - 2
locations/kinosvid

@@ -43,7 +43,7 @@ act 'Watch the movie':
 		else
 			gt 'kinosvid', '3'
 		end
-	elseif telsobnr > 0:
+	elseif $telsob = $loverdesc[lober_number]:
 		!! date with girlfriend	
 		loverrelation[lover_number] += 1
 		
@@ -357,7 +357,7 @@ if $ARGS[0] = '3':
 	gs 'arousal', 'end'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
 
-	if telsobnr > 0:
+	if $telsob = $loverdesc[lober_number]:
 		'When the movie ends, <<$telsob>> looks at you and waits for your next move.'
 		act 'Kiss her and say goodbye': gt 'torgcentr'
 		act 'Kiss her and invite her to your home': gt 'lezbsex', 'startloverhome'

+ 67 - 58
locations/lezbsex

@@ -10,6 +10,12 @@ if $ARGS[0] = 'start':
 		tanznak = 2
 	end
 
+	if lezbsexhome = 1:
+		$lezbsexname = $loverdesc[lover_number]
+	else
+		$lezbsexname = 'the girl'
+	end
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/lezbsexstart.jpg"></center>'
 	xgt 'lezbsex', 'var'
 end
 
@@ -17,42 +23,42 @@ if $ARGS[0] = 'startloverhome':
 	lezbsexhome = 1
 	pcs_horny += 10
 	minut += 15
-	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/loversexhome.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/lezbsexhome.jpg"></center>'
 
-	'You spend some time with <<$loverdesc[lover_number]>> in the kitchen when she begins to get impatient and starts caressing you'
+	'You spend some time with <<$loverdesc[lover_number]>> in the kitchen when she begins to get impatient and starts caressing you.'
 	act 'Kiss her back and take her to the bedroom':
 		loverrelation[lover_number] += 2
 		gt 'lezbsex', 'start'
 	end
 	act 'Stop her and say goodbye':	
 		loverrelation[lover_number] -= 4
-		killvar lezbsexhome
-		dynamic $go_home
+		killvar 'lezbsexhome'
+		dynamic $go_straight_home
 	end
 end
 
 if $ARGS[0] = 'var':
 	gs 'stat'
 
-	if picrand ! 11:act 'Get Cooney':gt 'lezbsex', 'kuni'
+	if picrand ! 11:act 'Get eaten out':gt 'lezbsex', 'kuni'
 
-	act 'Give Cooney':gt 'lezbsex', 'ukuni'
+	act 'Eat her out':gt 'lezbsex', 'ukuni'
 
-	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Get Anilingus':gt 'lezbsex', 'anuli'
-	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Give anilingus':gt 'lezbsex', 'uanuli'
+	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Get a rimjob':gt 'lezbsex', 'anuli'
+	if picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Give her a rimjob':gt 'lezbsex', 'uanuli'
 	if strapon = 1 and picrand ! 11 and picrand ! 12 and picrand ! 13 and picrand ! 14 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 19 and picrand ! 20 and picrand ! 21 and picrand ! 22:
-		act 'Strap-on pussy':gt 'lezbsex', 'svag'
-		act 'Strap-on in the ass':gt 'lezbsex', 'sanal'
-		act 'Strap on your pussy':gt 'lezbsex', 'usvag'
-		act 'Strap you in the ass':gt 'lezbsex', 'usanal'
+		act 'Strapon-fuck her':gt 'lezbsex', 'svag'
+		act 'Strapon-fuck her in the ass':gt 'lezbsex', 'sanal'
+		act 'Get strapon-fucked':gt 'lezbsex', 'usvag'
+		act 'Get strapon-fucked in the ass':gt 'lezbsex', 'usanal'
 	end
 
 	if dildo = 1 and picrand ! 12 and picrand ! 19 and picrand ! 20 and picrand ! 22:
-		act 'Dildo in pussy':gt 'lezbsex', 'dvag'
+		act 'Play with the dildo':gt 'lezbsex', 'dvag'
 
-		if picrand ! 11 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Dildo in the ass':gt 'lezbsex', 'danal'
-		if picrand ! 11:act 'Dildo in the pussy you':gt 'lezbsex', 'udvag'
-		if picrand ! 11 and picrand ! 14 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Dildo you in the ass':gt 'lezbsex', 'udanal'
+		if picrand ! 11 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Anal play with the dildo':gt 'lezbsex', 'danal'
+		if picrand ! 11:act 'Let her play with the dildo':gt 'lezbsex', 'udvag'
+		if picrand ! 11 and picrand ! 14 and picrand ! 15 and picrand ! 16 and picrand ! 17 and picrand ! 18 and picrand ! 21:act 'Let her put the dildo in your ass':gt 'lezbsex', 'udanal'
 	end
 end
 
@@ -73,8 +79,8 @@ if $ARGS[0] = 'ukuni':
 	minut -=5
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'kuni':
@@ -92,8 +98,8 @@ if $ARGS[0] = 'kuni':
 	gs 'arousal', 'cuni', 5, 'lesbian'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'anuli':
@@ -111,8 +117,8 @@ if $ARGS[0] = 'anuli':
 	gs 'arousal', 'rimming', 5, 'lesbian'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'uanuli':
@@ -130,8 +136,8 @@ if $ARGS[0] = 'uanuli':
 	gs 'arousal', 'rimming_give', 5, 'lesbian'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'svag':
@@ -149,8 +155,8 @@ if $ARGS[0] = 'svag':
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'sanal':
@@ -163,13 +169,13 @@ if $ARGS[0] = 'sanal':
 	end
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/sanal<<picrand>>.jpg"></center>'
-	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into the girl''s anus, pressing into her slowly at first, and as she adjusts to the backdoor invasion you push in and out, faster and faster.'
+	'You suck on the shaft to get it well-lubed, then put on the strap-on and gently insert it into <<$lezbsexname>>''s anus, pressing into her slowly at first, and as she adjusts to the backdoor invasion you push in and out, faster and faster.'
 
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'usvag':
@@ -187,8 +193,8 @@ if $ARGS[0] = 'usvag':
 	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'usanal':
@@ -206,8 +212,8 @@ if $ARGS[0] = 'usanal':
 	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'dvag':
@@ -225,8 +231,8 @@ if $ARGS[0] = 'dvag':
 	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian', 'sub'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'danal':
@@ -239,13 +245,13 @@ if $ARGS[0] = 'danal':
 	end
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/danal<<picrand>>.jpg"></center>'
-	'You take a dildo, making sure she''s watching you as you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into the girl''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
+	'You take a dildo, making sure she''s watching you as you slowly lick it, trying to cover it with the maximum amount of your thick saliva, and gently insert it into <<$lezbsexname>>''s anus.  At first, you ease it in slowly, getting her used to the invasion, then push it deeper, stroking it into her faster and faster.'
 
 	gs 'arousal', 'anal_dildo_give', 5, 'lesbian', 'sub'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'udvag':
@@ -260,10 +266,10 @@ if $ARGS[0] = 'udvag':
 	end
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udvag<<picrand>>.jpg"></center>'
-	'The  girl inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible with it.'
+	'<<$lezbsexname>> inserts the dildo into your wet pussy, moving it in and out while constantly twisting and turning it in her hands to stimulate your love hole as much as possible with it.'
 
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 
@@ -277,32 +283,35 @@ if $ARGS[0] = 'udanal':
 	end
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/udanal<<picrand>>.jpg"></center>'
-	'The girl spits in the crack of your ass, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole at it pushes farther and farther inside, bringing you that unique back-door pleasure.'
+	'<<$lezbsexname>> spits in the crack of your ass, watching it slowly glide down to your pucker as she collects some of the saliva and rubs it all around the tip of the dildo before pressing it against your anus. You feel it stretching your puckered hole at it pushes farther and farther inside, bringing you that unique back-door pleasure.'
 
 	gs 'arousal', 'anal_dildo', 5, 'lesbian', 'sub'
 	gs 'stat'
 	
-	act 'More':xgt 'lezbsex', 'var'
-	act 'Leave':gt 'lezbsex', 'end'
+	act 'Continue': xgt 'lezbsex', 'var'
+	act 'Finish': gt 'lezbsex', 'end'
 end
 
 if $ARGS[0] = 'end':
 	cla
-
-	if gfsex = 1:
-		killvar 'gfsex'
-		gt 'dateF', $dateFType
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/lezbsexstart.jpg"></center>'
+	'When you have finished playing, <<$lezbsexname>> thanks you for the good time and leaves.'
+	act 'Leave':
+		if gfsex = 1:
+			killvar 'gfsex'
+			gt 'dateF', $dateFType
+		end
+		if lezbsexhome = 1:
+			killvar 'lezbsexhome'
+			dynamic $go_straight_home
+		end
+		if picrand = 22:gt 'down'
+		if picrand = 21:gt 'vann', 'start'
+		if picrand = 19 or picrand = 20:gt 'office', 'work'
+		if tanznak = 2:gt 'fit', 'dressing room'
+
+		gt $sexloc, 'start'
 	end
-	if lezbsexhome = 1:
-		killvar lezbsexhome
-		dynamic $go_home
-	end
-	if picrand = 22:gt 'down'
-	if picrand = 21:gt 'vann', 'start'
-	if picrand = 19 or picrand = 20:gt 'office', 'work'
-	if tanznak = 2:gt 'fit', 'dressing room'
-
-	gt $sexloc, 'start'
 end
 
 --- lezbsex ---------------------------------

+ 21 - 21
locations/lover_meet

@@ -849,8 +849,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'parkM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'parksvid'
 					end
 				end
@@ -1311,8 +1311,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'kinoM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'kinosvid'
 					end
 				end
@@ -1332,8 +1332,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'parkM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'parksvid'
 					end
 				end
@@ -1352,8 +1352,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'kafeM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'kafesvid'
 					end
 				end
@@ -1883,8 +1883,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'kafeM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'kafesvid'
 					end
 				end
@@ -1904,8 +1904,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'restoranM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'kafesvid'
 					end
 				end
@@ -1925,8 +1925,8 @@ if $ARGS[0] = 'actions':
 				act 'Go with <<$tXem>>':
 					if loverGender[lover_number] = 0: gt 'kinoM', 'start'
 					if loverGender[lover_number] = 1: 
-						$telsob = $loverdesc[lover_number]
-						telsobnr = lover_number
+						$telsob = '<<$loverdesc[lover_number]>>'
+						
 						gt 'kinosvid'
 					end
 				end
@@ -1957,9 +1957,9 @@ if $ARGS[0] = 'actions':
 			act '"Lets go to the cafe."':
 				act 'Go with <<$tXem>>':gt 'kafeM', 'start'
 			end
-		elseif loverGender[lover_number] = 1
-			$telsob = $loverdesc[lover_number]
-			telsobnr = lover_number
+		elseif loverGender[lover_number] = 1:
+			$telsob = '<<$loverdesc[lover_number]>>'
+			
 			if month > 5 and temper > 20 and sunWeather = 1:
 				act 'Invite to the park':
 					'"Let''s go for a walk in the park."'
@@ -1969,22 +1969,22 @@ if $ARGS[0] = 'actions':
 
 			act 'Invite to a movie':
 				'"Want to go see a movie?"'
-				act 'Go': gt 'kinosvid'
+				act 'Go to the movies': gt 'kinosvid'
 			end
 
 			act 'Invite to the pool hall':
 				'"Let''s play pool."'
-				act 'Go': gt 'billsvid'
+				act 'Go play pool': gt 'billsvid'
 			end
 
 			act 'Invite to the cafe':
 				'"Let''s go to the cafe."'
-				act 'Go': gt 'kafesvid'
+				act 'Go to the cafe': gt 'kafesvid'
 			end
 
 			act 'Invite to the casino':
 				'"Let''s go to the casino."'
-				act 'Go': gt 'kazinosvid'
+				act 'Go to the casino': gt 'kazinosvid'
 			end
 		end
 		act 'Never mind...':

+ 2 - 4
locations/parkivent

@@ -804,8 +804,7 @@ if $ARGS[0] = '9':
 			act 'Go with <<$loverdesc[lover_number]>>.':
 				if loverGender[lover_number] = 0: gt 'event', 'park'
 				if loverGender[lover_number] = 1: 
-					$telsob = $loverdesc[lover_number]
-					telsobnr = lover_number
+					$telsob = '<<$loverdesc[lover_number]>>'
 					gt 'parksvid'
 				end	
 			end
@@ -815,8 +814,7 @@ if $ARGS[0] = '9':
 			act 'Offer to sit on the bench.':			
 				if loverGender[lover_number] = 0: gt 'event', 'park'
 				if loverGender[lover_number] = 1: 
-					$telsob = $loverdesc[lover_number]
-					telsobnr = lover_number
+					$telsob = '<<$loverdesc[lover_number]>>'
 					gt 'parksvid'
 				end	
 			end

+ 2 - 2
locations/parksvid

@@ -50,7 +50,7 @@ act 'Go for a walk':
 		else
 			gt 'parksvid', '3'
 		end
-	elseif telsobnr > 0:
+	elseif $telsob = $loverdesc[lover_number]:
 		!! date with girlfriend	
 		loverrelation[lover_number] += 1
 		
@@ -156,7 +156,7 @@ if $ARGS[0] = '3':
 	pcs_horny = 0
 	minut += 90
 	gs 'stat'
-	if telsobnr > 0:
+	if $telsob = $loverdesc[lover_number]:
 		'When the movie ends, <<$telsob>> looks at you and waits for your next move.'
 		act 'Kiss her and say goodbye': gt 'park', 'start'
 		act 'Kiss her and invite her to your home': gt 'lezbsex', 'startloverhome'

+ 3 - 3
locations/street_event

@@ -110,13 +110,13 @@ if $ARGS[1] = 'extras':
 		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your building and standing beside it you notice Vladimir</a>.'
 
 		if hour = meethour[0]:
-			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> waits <<$streetev_home>>.</b>'
+			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting <<$streetev_home>>.</b>'
 		end
 		if hour = meethour[1]:
-			if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> waits <<$streetev_home>>.</b>'
+			if svidanie[1] = 1:'<b><a href="exec:lover_number = 1 & gt ''lover_meet'', ''start''"><<$loverdesc[1]>></a> is waiting <<$streetev_home>>.</b>'
 		end
 		if hour = meethour[2]:
-			if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> waits <<$streetev_home>>.</b>'
+			if svidanie[2] = 1:'<b><a href="exec:lover_number = 2 & gt ''lover_meet'', ''start''"><<$loverdesc[2]>></a> is waiting <<$streetev_home>>.</b>'
 		end
 	end
 end

+ 0 - 1
locations/telefon

@@ -107,7 +107,6 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 	lover_number = ARGS[1]
 	$caller = '<<$loverdesc[lover_number]>>'
 	$telsob = $caller
-	telsobnr = lover_number
 	$callerid = 'images/characters/shared/'+lover_picture[lover_number]+'.jpg'
 	gs 'telefon','phone_balance'
 	gs 'telefon','phone_call_receive'