Browse Source

add better dates for girlfriend

Mona Lisa 6 years ago
parent
commit
9da0fb9080
10 changed files with 305 additions and 64 deletions
  1. 22 4
      locations/billsvid
  2. 21 5
      locations/kafesvid
  3. 21 2
      locations/kazinosvid
  4. 20 4
      locations/kinosvid
  5. 22 0
      locations/lezbsex
  6. 101 21
      locations/lover_meet
  7. 26 12
      locations/parkivent
  8. 21 5
      locations/parksvid
  9. 2 2
      locations/poli
  10. 49 9
      locations/telefon

+ 22 - 4
locations/billsvid

@@ -43,6 +43,18 @@ act 'Play':
 		else
 			gt 'billsvid', '3'
 		end
+	elseif telsobnr > 0:
+		!! date with girlfriend	
+		loverrelation[lover_number] += 1
+		
+		if loverrelation[lover_number] >= 20:
+			bilrand = rand(0, 10)
+			if bilrand > 0 and bilrand < 3:gt 'billsvid', '1'
+			if bilrand > 2 and bilrand < 5:gt 'billsvid', '2'
+			if bilrand = 0 or bilrand > 4:gt 'billsvid', '3'
+		else
+			gt 'billsvid', '3'
+		end
 	end
 end
 
@@ -216,12 +228,18 @@ end
 if $ARGS[0] = '3':
 	cla
 	minut += 60
-	gs 'stat'
-	'When you have finished playing, <<$telsob>> says that she needs to run and leaves.'
-
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'torgcentr'
+
+	if telsobnr > 0:
+		'When you have finished playing, <<$telsob>> looks and you and waits for your next move.'
+		act 'Say goodbye': gt 'torgcentr'
+		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'
+	else
+		'When you have finished playing, <<$telsob>> says that she needs to run and leaves.'
+		act 'Leave': gt 'torgcentr'
+	end
+
 end
 
 --- billsvid ---------------------------------

+ 21 - 5
locations/kafesvid

@@ -52,6 +52,18 @@ act 'Chat':
 		else
 			gt 'kafesvid', '3'
 		end
+	elseif telsobnr > 0:
+		!! date with girlfriend	
+		loverrelation[lover_number] += 1
+		
+		if loverrelation[lover_number] >= 20:
+			kaferand = rand(0, 8)
+			if kaferand > 0 and kaferand < 3:gt 'kafesvid', '1'
+			if kaferand > 2 and kaferand < 5:gt 'kafesvid', '2'
+			if kaferand = 0 or kaferand > 4:gt 'kafesvid', '3'
+		else
+			gt 'kafesvid', '3'
+		end
 	end
 end
 
@@ -387,14 +399,18 @@ if $ARGS[0] = '3':
 	cls
 	kafesvidsex = 0
 	minut += 60
+	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/0.jpg"></center>'
-	'After your fun, <<$telsob>> says she has to go. She leaves you with a little kiss on the cheek.'
 
-	gs 'arousal', 'end'
-	gs 'stat'
-	
-	act 'Leave':gt 'down'
+	if telsobnr > 0:
+		'After your fun, <<$telsob>> looks and you and waits for your next move.'
+		act 'Say goodbye': gt 'down'
+		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'
+	else
+		'After your fun, <<$telsob>> says she has to go. She leaves you with a little kiss on the cheek.'
+		act 'Leave':gt 'down'
+	end
 end
 
 --- kafesvid ---------------------------------

+ 21 - 2
locations/kazinosvid

@@ -52,6 +52,18 @@ act 'Play':
 		else
 			gt 'kazinosvid', '3'
 		end
+	elseif telsobnr > 0:
+		!! date with girlfriend	
+		loverrelation[lover_number] += 1
+		
+		if loverrelation[lover_number] >= 20:
+			kisvrand = rand(0, 8)
+			if kisvrand > 0 and kisvrand < 3:gt 'kazinosvid', '1'
+			if kisvrand > 2 and kisvrand < 5:gt 'kazinosvid', '2'
+			if kisvrand = 0 or kisvrand > 4:gt 'kazinosvid', '3'
+		else
+			gt 'kazinosvid', '3'
+		end
 	end
 end
 
@@ -188,8 +200,15 @@ if $ARGS[0] = '3':
 	minut += 90
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cards/0.jpg"></center>'
-	'After your fun, <<$telsob>> says she has to go. She leaves you with a little kiss on the cheek.'
-	act 'Leave':gt 'nord'
+
+	if telsobnr > 0:
+		'After your fun, <<$telsob>> looks and you and waits for your next move.'
+		act 'Say goodbye': gt 'down'
+		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'
+	else
+		'After your fun, <<$telsob>> says she has to go. She leaves you with a little kiss on the cheek.'
+		act 'Leave':gt 'nord'
+	end
 end
 
 --- kazinosvid ---------------------------------

+ 20 - 4
locations/kinosvid

@@ -37,6 +37,18 @@ act 'Watch the movie':
 		if npc_rel['A219'] >= 20:
 			kisvrand = rand(0, 10)
 
+			if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
+			if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
+			if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+		else
+			gt 'kinosvid', '3'
+		end
+	elseif telsobnr > 0:
+		!! date with girlfriend	
+		loverrelation[lover_number] += 1
+		
+		if loverrelation[lover_number] >= 20:
+			kisvrand = rand(0, 10)
 			if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
 			if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
 			if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
@@ -342,12 +354,16 @@ if $ARGS[0] = '3':
 	*clr
 	minut += 90
 	gs 'stat'
+	gs 'arousal', 'end'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
-	'When the movie ends, <<$telsob>> says she has get home. She leaves you with a deep kiss, leaving you wanting more.'
 
-	act 'Leave':
-		gs 'arousal', 'end'
-		gt 'torgcentr'
+	if telsobnr > 0:
+		'When the movie ends, <<$telsob>> looks and 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'
+	else
+		'When the movie ends, <<$telsob>> says she has get home. She leaves you with a deep kiss, leaving you wanting more.'
+		act 'Leave': gt 'torgcentr'
 	end
 end
 

+ 22 - 0
locations/lezbsex

@@ -13,6 +13,24 @@ if $ARGS[0] = 'start':
 	xgt 'lezbsex', 'var'
 end
 
+if $ARGS[0] = 'startloverhome':
+	lezbsexhome = 1
+	pcs_horny += 10
+	minut += 15
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/loversexhome.jpg"></center>'
+
+	'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
+	end
+end
+
 if $ARGS[0] = 'var':
 	gs 'stat'
 
@@ -275,6 +293,10 @@ if $ARGS[0] = 'end':
 		killvar 'gfsex'
 		gt 'dateF', $dateFType
 	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'

+ 101 - 21
locations/lover_meet

@@ -821,7 +821,7 @@ if $ARGS[0] = 'actions':
 						exit
 					end
 				end
-			elseif randchan = 1:
+			elseif randchan = 1 and loverGender[lover_number] = 0:
 				'<<$loverdesc[lover_number]>> suggest you and <<$tXem>> drink a beer in the stairwell.'
 				act 'Sorry, but I need to go':
 					cla
@@ -835,7 +835,7 @@ if $ARGS[0] = 'actions':
 
 				exit
 			
-			elseif randchan = 2:
+			elseif randchan = 2 or loverGender[lover_number] = 1:
 				'<<$loverdesc[lover_number]>> suggests that you take a walk in the park.'
 
 				act 'Sorry, but I need to go':
@@ -846,7 +846,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'parkM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'parkM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'parksvid'
+					end
+				end
 
 				exit
 			
@@ -1301,7 +1308,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'kinoM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'kinoM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'kinosvid'
+					end
+				end
 
 				exit
 			elseif randchan = 2:
@@ -1315,7 +1329,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'parkM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'parkM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'parksvid'
+					end
+				end
 
 				exit
 			elseif randchan = 3:
@@ -1327,7 +1348,15 @@ if $ARGS[0] = 'actions':
 					loverrelation[lover_number] -= (haraklover[lover_number] + 1)
 					dynamic $go_home	
 				end
-				act 'Go with <<$tXem>>':gt 'kafeM', 'start'
+
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'kafeM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'kafesvid'
+					end
+				end
 
 				exit
 			end
@@ -1851,7 +1880,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'kafeM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'kafeM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'kafesvid'
+					end
+				end
 
 				exit
 			elseif randchan = 2:
@@ -1865,7 +1901,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'restoranM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'restoranM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'kafesvid'
+					end
+				end
 
 				exit
 			elseif randchan = 3:
@@ -1879,7 +1922,14 @@ if $ARGS[0] = 'actions':
 					
 				end
 
-				act 'Go with <<$tXem>>':gt 'kinoM', 'start'
+				act 'Go with <<$tXem>>':
+					if loverGender[lover_number] = 0: gt 'kinoM', 'start'
+					if loverGender[lover_number] = 1: 
+						$telsob = $loverdesc[lover_number]
+						telsobnr = lover_number
+						gt 'kinosvid'
+					end
+				end
 
 				exit
 			end
@@ -1894,19 +1944,49 @@ if $ARGS[0] = 'actions':
 			pcs_dom += 1
 		end
 		'"What do you want to do?", <<$tXe>> asks'
-		act '"Lets go just relax in the stairwell and drink some beer."':
-			act 'Go with <<$tXem>>':gt 'podezdM', 'start'
-		end
-		act '"Lets take a walk in the park"':
-			act 'Go with <<$tXem>>':gt 'parkM', 'start'
-		end
-		act '"Lets go see a movie"':
-			act 'Go with <<$tXem>>':gt 'kinoM', 'start'
-		end
-		act '"Lets go to the cafe."':
-			act 'Go with <<$tXem>>':gt 'kafeM', 'start'
+		if loverGender[lover_number] = 0:
+			act '"Lets go just relax in the stairwell and drink some beer."':
+				act 'Go with <<$tXem>>':gt 'podezdM', 'start'
+			end
+			act '"Lets take a walk in the park"':
+				act 'Go with <<$tXem>>':gt 'parkM', 'start'
+			end
+			act '"Lets go see a movie"':
+				act 'Go with <<$tXem>>':gt 'kinoM', 'start'
+			end
+			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
+			if month > 5 and temper > 20 and sunWeather = 1:
+				act 'Invite to the park':
+					'"Let''s go for a walk in the park."'
+					act 'Go': gt 'parksvid'
+				end
+			end
+
+			act 'Invite to a movie':
+				'"Want to go see a movie?"'
+				act 'Go': gt 'kinosvid'
+			end
+
+			act 'Invite to the pool hall':
+				'"Let''s play pool."'
+				act 'Go': gt 'billsvid'
+			end
+
+			act 'Invite to the cafe':
+				'"Let''s go to the cafe."'
+				act 'Go': gt 'kafesvid'
+			end
+
+			act 'Invite to the casino':
+				'"Let''s go to the casino."'
+				act 'Go': gt 'kazinosvid'
+			end
 		end
-		
 		act 'Never mind...':
 			gt 'lover_meet', 'actions'
 			exit

+ 26 - 12
locations/parkivent

@@ -782,35 +782,49 @@ end
 if $ARGS[0] = '9':
 	gs 'stat'
 
-	if pcs_lover >= 1:
+	if arrsize('pcs_lovers') >= 1:
+		lover_number = rand(0, arrsize('pcs_lovers') - 1)
 		cls
-		'You walk through the park and you notice how the meeting goes your man <<$loverdesc[lover_number]>>'
+		'You walk through the park and you notice <<$loverdesc[lover_number]>> walking towards you'
 
-		act 'Leave':loverrelation[lover_number]-= 1 & gt 'park', 'start'
+		act 'Leave': loverrelation[lover_number]-= 1 & gt 'park', 'start'
 
 		if boyonce[lover_number] = 0 or SUB = 0 and pcs_dom = 0:
 			act 'Nice to talk':
 				cla
 				loverrelation[lover_number] += 2
 				minut += 15
-				'<<$loverdesc[lover_number]>> bradovalsya your chance meeting and hugged you. You nice talk and kiss goodbye to split each according to his deeds.'
+				'<<$loverdesc[lover_number]>> is happy about your random meeting and hugs you. You have a nice short talk and kiss goodbye to part ways again.'
 
 				act 'Complete walk':gt 'park', 'start'
 			end
 		elseif boyonce[lover_number] = 1 and SUB > 0:
-			'<<$loverdesc[lover_number]>> glad you and taking you by the hand led to a deeper into the park.'
-
-			act 'Go with the guy.':gt 'event', 'park'
+			'<<$loverdesc[lover_number]>> is happy to meet you and takes you by the hand leading to a deeper area into the park.'
+
+			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
+					gt 'parksvid'
+				end	
+			end
 		elseif boyonce[lover_number] = 1 and pcs_dom > 0:
-			'<<$loverdesc[lover_number]>> glad you and taking you by the hand led to a deeper into the park.'
-
-			act 'Offer to sit on the bench. (You decide to have sex with a guy.)':gt 'event', 'park'
-
+			'<<$loverdesc[lover_number]>> is happy to meet you and takes you by the hand leading to a deeper area into the park.'
+
+			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
+					gt 'parksvid'
+				end	
+			end
 			act 'Nice to talk':
 				cla
 				loverrelation[lover_number] += 5
 				minut += 15
-				'<<$loverdesc[lover_number]>> bradovalsya your chance meeting and hugged you. You nice talk and kiss goodbye to split each according to his deeds.'
+				'<<$loverdesc[lover_number]>> is happy about your random meeting and hugs you. You have a nice short talk and kiss goodbye to part ways again.'
 
 				act 'Complete walk':gt 'park', 'start'
 			end

+ 21 - 5
locations/parksvid

@@ -5,7 +5,7 @@ pcs_mood += 10
 gs 'stat'
 '<center><b>Park</b></center>'
 '<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/park//0.jpg"></center>'
-'You <<$telsob>> met near the park'
+'You go to the park with <<$telsob>>.'
 
 act 'Go for a walk':
 	if $telsob = 'Alla':
@@ -50,8 +50,19 @@ act 'Go for a walk':
 		else
 			gt 'parksvid', '3'
 		end
+	elseif telsobnr > 0:
+		!! date with girlfriend	
+		loverrelation[lover_number] += 1
+		
+		if loverrelation[lover_number] >= 20:
+			parksvidrand = rand(0, 10)
+			if parksvidrand > 0 and parksvidrand < 3:gt 'parksvid', '1'
+			if parksvidrand > 2 and parksvidrand < 5:gt 'parksvid', '2'
+			if parksvidrand = 0 or parksvidrand > 4:gt 'parksvid', '3'
+		else
+			gt 'parksvid', '3'
+		end
 	end
-end
 
 if $ARGS[0] = '1':
 	cla
@@ -144,9 +155,14 @@ if $ARGS[0] = '3':
 	pcs_horny = 0
 	minut += 90
 	gs 'stat'
-	'After you finish your walk, <<$telsob>> says she needs to go, she gives you a kiss on the cheek and leaves.'
-
-	act 'Leave':gt 'park', 'start'
+	if telsobnr > 0:
+		'When the movie ends, <<$telsob>> looks and 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'
+	else
+		'After you finish your walk, <<$telsob>> says she needs to go, she gives you a kiss on the cheek and leaves.'
+		act 'Leave': gt 'park', 'start'
+	end
 end
 
 --- parksvid ---------------------------------

+ 2 - 2
locations/poli

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	''
 	'Near the entrance is an advertisement for cosmetic surgeon and directions to his office.'
 
-	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Exit to replace':gt 'poli', 'beginwork'
+	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Get dressed for work':gt 'poli', 'beginwork'
 
 	act 'Leave Clinic':gt 'street'
 	act 'See cosmetic surgeon':gt 'poli','cosmetic1'
@@ -1248,7 +1248,7 @@ if $ARGS[0] = 'beginwork':
 	*clr
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
-	'You have replaced the clinic.'
+	'You have changed into your work clothes.'
 
 	act 'Start work':
 		smena += 1

+ 49 - 9
locations/telefon

@@ -105,7 +105,9 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 	cla
 	gs'din_bad'
 	lover_number = ARGS[1]
-	$caller = '<<$loverdesc[lover_number]>>'
+	$caller = 'kino'
+	$telsob = $caller
+	telsobnr = lover_number
 	$callerid = 'images/characters/shared/'+lover_picture[lover_number]+'.jpg'
 	gs 'telefon','phone_balance'
 	gs 'telefon','phone_call_receive'
@@ -118,25 +120,63 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 1:
 			'"Let''s go for a walk in the park."'
 
 			if willAgree:
-				'<<$loverdesc[lover_number]>>, "See you in the park in an hour."'
+				'<<$telsob>>, "See you in the park in an hour."'
 
-				act 'Go':gt 'dateF', 'datepark'
+				act 'Go': gt 'parksvid'
 			else
-				gs 'telefon','telotkaz',$loverdesc[lover_number]
+				gs 'telefon','telotkaz',$telsob
 			end
 		end
 	end
 
-	act 'Invite to the bar':
+	act 'Invite to a movie':
 		cla
-		'"Let''s go to the bar."'
+		'"Want to go see a movie?"'
 
 		if willAgree:
-			'<<$loverdesc[lover_number]>>, "See you at the cafe in an hour."'
+			'<<$telsob>>, "See you at the movie theater in an hour."'
+			act 'Go': gt 'kinosvid'
+		else
+			gs 'telefon','telotkaz',$telsob
+		end
+	end
+
+	act 'Invite to the pool hall':
+		cla
+		'"Let''s play pool."'
 
-			act 'Go':gt 'dateF', 'bartalk'
+		if willAgree:
+			'<<$telsob>>, "See you at the pool hall in an hour."'
+
+			act 'Go': gt 'billsvid'
 		else
-			gs 'telefon','telotkaz',$loverdesc[lover_number]
+			gs 'telefon','telotkaz',$telsob
+		end
+	end
+
+	act 'Invite to the cafe':
+		cla
+		'"Let''s go to the cafe."'
+
+		if willAgree:
+			'<<$telsob>>, "See you at the cafe in an hour."'
+
+			act 'Go': gt 'kafesvid'
+		else
+			gs 'telefon','telotkaz',$telsob
+		end
+	end
+
+	act 'Invite to the casino':
+		cla
+		'"Let''s go to the casino."'
+
+		if willAgree:
+			'<<$telsob>>, "See you in the casino in an hour."'
+
+			act 'Go': gt 'kazinosvid'
+		else
+			gs 'telefon','telotkaz',$telsob
 		end
 	end