Преглед изворни кода

Merge remote-tracking branch 'julzor/master'

KevinSmarts пре 6 година
родитељ
комит
72d9637898
3 измењених фајлова са 12 додато и 11 уклоњено
  1. 8 4
      locations/din_van.qsrc
  2. 1 1
      locations/mirror.qsrc
  3. 3 6
      locations/pod_ezd.qsrc

+ 8 - 4
locations/din_van.qsrc

@@ -928,14 +928,16 @@ if $ARGS[0] = 'private':
 			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 				knowpreg = 1
 				knowpreg = 1
 				thinkpreg = 1
 				thinkpreg = 1
-				'As you look at the test in your hand, you are?'
+				*nl
+				'The test shows two strips. You are pregnant. As you look at the test in your hand, you are?'
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
 				knowpreg = 1
 				knowpreg = 1
 				thinkpreg = 1
 				thinkpreg = 1
-				'As you look at the test in your hand, you are?'
+				*nl
+				'The test shows two strips. You are pregnant. As you look at the test in your hand, you are?'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 				act 'Aroused':gt 'din_van', 'ArousedReact1'
 				act 'Aroused':gt 'din_van', 'ArousedReact1'
 			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid = 0 and pregTalkPC = 0:
 			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid = 0 and pregTalkPC = 0:
@@ -947,10 +949,12 @@ if $ARGS[0] = 'private':
 				thinkpreg = 1
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact2'
 				gt 'din_van', 'WifeReact2'
 			elseif pregTalkPC = 1:
 			elseif pregTalkPC = 1:
-				'The test showed two strips. You are pregnant.'
+				*nl
+				'The test shows two strips. You are pregnant.'
 			else
 			else
 				knowpreg = 0
 				knowpreg = 0
-				'The test showed one band. Not pregnant.'
+				*nl
+				'The test shows one band. You are not pregnant.'
 			end
 			end
 
 
 			act 'Finish':gt $loc, $metka
 			act 'Finish':gt $loc, $metka

+ 1 - 1
locations/mirror.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 	if daystart  < 10 and StoryLine = 0 and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
 	if daystart  < 10 and StoryLine = 0 and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
-	'<<$hair>>. '
+	'<<$hair>>'
 	'<<$pcs_makeup>>. Your<<$pcdesc_eyesizeinsertive>> eyes are <<$pcdesc_eyecolour>> <<$pcs_lashes>>, and you have <<$pcdesc_fulllipswordy>>.'
 	'<<$pcs_makeup>>. Your<<$pcdesc_eyesizeinsertive>> eyes are <<$pcdesc_eyecolour>> <<$pcs_lashes>>, and you have <<$pcdesc_fulllipswordy>>.'
 	'<<$skin>>'
 	'<<$skin>>'
 	'<<$pcs_apprnc>>'
 	'<<$pcs_apprnc>>'

+ 3 - 6
locations/pod_ezd.qsrc

@@ -436,20 +436,17 @@ if $ARGS[0] = 'smoke_misha':
 				'"No problem <<$pcs_nickname>>, I''ll hold you to that!" he says as he gives you a lewd grin. "In that case, I better get going. I''ll talk to you later."'
 				'"No problem <<$pcs_nickname>>, I''ll hold you to that!" he says as he gives you a lewd grin. "In that case, I better get going. I''ll talk to you later."'
 				act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 				act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 			end
 			end
-		end
-		if misha_smoke_rnd = 2:
+		elseif misha_smoke_rnd = 2:
 			pcs_mood +=5
 			pcs_mood +=5
 			'You have a chat with uncle Misha, as he smokes his cigarette. Once he finishes it, he apologizes and says he has things to do now.'
 			'You have a chat with uncle Misha, as he smokes his cigarette. Once he finishes it, he apologizes and says he has things to do now.'
 			act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 			act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
-		end
-		if misha_smoke_rnd = 3:
+		elseif misha_smoke_rnd = 3:
 			pcs_mood +=5
 			pcs_mood +=5
 			'You have a chat with uncle Misha, as he smokes his cigarette. He talks about how his life has been much easier, ever since he retired.'
 			'You have a chat with uncle Misha, as he smokes his cigarette. He talks about how his life has been much easier, ever since he retired.'
 			act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 			act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 		end
 		end
 		killvar 'misha_smoke_rnd'
 		killvar 'misha_smoke_rnd'
-	end
-	if pav_slut < 75:
+	else
 		pcs_mood +=5
 		pcs_mood +=5
 		'While uncle Misha smokes his cigarette, you engage with him in some small talk. When he finishes the cigarette, he apologizes and says he has to go.'
 		'While uncle Misha smokes his cigarette, you engage with him in some small talk. When he finishes the cigarette, he apologizes and says he has to go.'
 		act 'Say goodbye': gt 'pod_ezd', 'etaj_2'
 		act 'Say goodbye': gt 'pod_ezd', 'etaj_2'