ソースを参照

Fixes for comments to match new start

KevinSmarts 6 年 前
コミット
7fc8ddf22a
6 ファイル変更22 行追加17 行削除
  1. 3 3
      locations/TV
  2. 2 2
      locations/bed2
  3. 10 10
      locations/din_van
  4. 1 1
      locations/gameover
  5. 1 1
      locations/mirror
  6. 5 0
      locations/tanapartment

+ 3 - 3
locations/TV

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		act 'Watch TV (1:00)':gt 'TV', 'kable'
 	end
 
-	if daystart < 10 and StoryLine = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
 		gt 'TV', 'fin'
@@ -39,7 +39,7 @@ if $ARGS[0] = 'nokable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch the network channel, lying on the couch. It''s all repeats and cheesy infomercials.'
 
-	if daystart < 10 and StoryLine = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)':gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch':gt 'TV', 'fin'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'kable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch cable television., it''s really good these days.'
 
-	if daystart < 10 and StoryLine = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)':gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch':gt 'TV', 'fin'

+ 2 - 2
locations/bed2

@@ -237,8 +237,8 @@ if $args[0] = 'wake':
 	'<<$waketext>>'
 	gs 'stat'
 	
-	if daystart < 10 and StoryLine = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
-	if daystart >= 10 and daystart < 30 and StoryLine = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
+	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
 
 	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		act 'Get up out of bed and get dressed for school (0:15)':

+ 10 - 10
locations/din_van

@@ -79,10 +79,10 @@ $shower = {
 		'<center><video src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
 		'You undress and turn on the water in the shower. When it hits the right temperature you enter the shower and let the warm water rain down on you.'
-		if daystart < 10 and StoryLine = 0:
+		if daystart < 10 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(6,10)
 			'It''s really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips, and smooth legs. You begin to lather your body noticing how soft and tender it feels. Once you''re sure you didn''t miss a single spot on your feminine body you begin to wash yourself off, continuing to experience new and strange sensations.'
-		elseif daystart < 30 and StoryLine = 0:
+		elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(2,6)
 			'You have already gotten used to your feminine body and its softness doesn''t surprise you very much anymore. But you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
@@ -178,11 +178,11 @@ $bath = {
 		*nl
 		'While the bathtub fills up you get undressed and then dip a toe into the water. It has just the right temperature so you climb in and let yourself sink into the warm water.'
 
-		if daystart < 10 and StoryLine = 0:
+		if daystart < 10 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(6,10)
 			'You stare at those smooth, soft legs sticking out of the water. You''re still not used to this new body and the look of all this roundness.'
 			'Starting to soap yourself you unwittingly turn your attention to your breasts. They''re so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.'
-		elseif daystart < 30 and StoryLine = 0:
+		elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 			pcs_horny += rand(2,6)
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
@@ -269,10 +269,10 @@ $brit = {
 			end
 
 			*nl
-			if daystart < 10 and StoryLine = 0:
+			if daystart < 10 and StoryLine = 0 and ntstart = 0:
 				'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 				'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-			elseif daystart < 30 and StoryLine = 0:
+			elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 				pcs_mood += 10
 				'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 			else
@@ -294,10 +294,10 @@ $brit = {
 			stanok -= 1
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
 			*nl
-			if daystart < 10 and StoryLine = 0:
+			if daystart < 10 and StoryLine = 0 and ntstart = 0:
 				'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 				'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-			elseif daystart < 30 and StoryLine = 0:
+			elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 				pcs_mood += 10
 				'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 			else
@@ -773,10 +773,10 @@ if $ARGS[0] = 'private':
 
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
 			*nl
-			if daystart < 10 and StoryLine = 0:
+			if daystart < 10 and StoryLine = 0 and ntstart = 0:
 				'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 				'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
-			elseif daystart < 30 and StoryLine = 0:
+			elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 				pcs_mood += 10
 				'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 			else

+ 1 - 1
locations/gameover

@@ -6,7 +6,7 @@ if over = 1:
 	'You are dragged out by the morgue attendants, the pathologist noted that you died from a unknown cause. Soon your body was handed over to your parents...'
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over.jpg"></center>'
-	if StoryLine = 0:
+	if StoryLine = 0 and ntstart = 0:
 		'You went mad, and started running around town naked screaming, "I am a man!". The police were quickly alerted, and you were taken to a mental hospital. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family, and being a man again. But the delusions never became reality.'
 	else
 		'You went mad, and started to run around town naked screaming, "I am THE PLAYER!". The police were quickly alerted, and you were arrested. Your mother could only send you to a mental hospital, hoping you''d recover. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family. You can''t help but wonder, how different your life would have been, if you did not follow the whisper from the twisted mouse clicker?'

+ 1 - 1
locations/mirror

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	end
 
 	*nl
-	if daystart  < 10 and StoryLine = 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.'
 	'<<$hair>>. '
 	'<<$pcs_makeup>>. Your<<$pcdesc_eyesizeinsertive>> eyes are <<$pcdesc_eyecolour>> <<$pcs_lashes>>, and you have <<$pcdesc_fulllipswordy>>.'

+ 5 - 0
locations/tanapartment

@@ -38,6 +38,9 @@ if tanpred < 2:
 				elseif tan_apartment_rand = 2:
 					'Tanya talks about her mother, Gala.' 
 					'She used to be a housekeeper, cleaning and cooking for several different people over the years - Tanya suspects that one of them was her father but her mother doesn''t like to talk about it. She came to Nicholas as his employee a few years ago, when he was still building up his company, but she managed to wrap him around her finger and now, a few years later, she is living the life!'
+				elseif tan_apartment_rand = 3 and ntstart = 1:
+					'Tanya asks you about your family.' 
+					'You tell her how your Mum tried to run your life and that you haven''t talked to her since you left. You talk for a while about your former life but are still a bit cagey and gloss over many details.'
 				elseif tan_apartment_rand = 3 and storyline = 0:
 					'Tanya asks you about your family.' 
 					'Of course, you can''t tell her that, really, you are a married middle-aged man and father, trapped in the body of a young woman, so you say that you and your family are estranged, that you left home a while ago and have been avoiding thinking about them ever since. She seems to be buying your story, if her sympathetic look is any indication.'
@@ -97,6 +100,8 @@ if tanpred < 2:
 				elseif tan_apartment_rand = 2:
 					'Tanya talks about her mother, Gala.' 
 					'She used to be a housekeeper, cleaning and cooking for several different people over the years - Tanya suspects that one of them was her father but her mother doesn''t like to talk about it. She came to Nicholas as his employee a few years ago, when he was still building up his company, but she managed to wrap him around her finger and now, a few years later, she is living the life!'
+				elseif tan_apartment_rand = 3 and ntstart = 1:
+					'Tanya asks you about your family.' 
 				elseif tan_apartment_rand = 3 and storyline = 0:
 					'Tanya asks you about your family.' 
 					'Of course, you can''t tell her that, really, you are a married middle-aged man and father, trapped in the body of a young woman, so you say that you and your family are estranged, that you left home a while ago and have been avoiding thinking about them ever since. She seems to be buying your story, if her sympathetic look is any indication.'