ソースを参照

[fixes] brother reacting to pregnancy

julzor 5 年 前
コミット
cc0f0a5c76
2 ファイル変更25 行追加28 行削除
  1. 24 27
      locations/brother.qsrc
  2. 1 1
      locations/exercise.qsrc

+ 24 - 27
locations/brother.qsrc

@@ -1529,7 +1529,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 end
 
 if $ARGS[0] = 'pregreact':
-	if pregTalkbrother = 0 and knowpreg = 1:
+	if pregTalkbrother = 0 and knowpreg = 1 and kid = 0:
 		if $clothingworntype = 'nude' and pregchem > 2000 and brotherSex < 7 and kid = 0:
 			'Surprised, your brother looks at your tummy. "<<$pcs_nickname>>, are you pregnant? <<$npc_nickname[''A29'']>> and dad are going to be pissed!" After a moments pause he adds "You do still look good pregnant, though."'
 			pregTalkbrother = 1
@@ -1542,7 +1542,7 @@ if $ARGS[0] = 'pregreact':
 			pregTalkbrother = 1
 
 			act 'Continue' :gt 'sitrPar'
-		exit
+			exit
 
 		elseif brotherSex >= 7 and kid = 0 and pregTalkMom = 0 and (($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460) or ($clothingworntype = 'nude' and pregchem < 2000) or ($clothingworntype ! 'nude' and pregchem < 3460)):
 			cla
@@ -1557,31 +1557,28 @@ if $ARGS[0] = 'pregreact':
 			else
 				act 'No':gt 'brother', 'brotherknows5'
 			end
-		exit
-
-
-		elseif ($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460) and brotherSex < 7 and kid > 0:
-			'"You''re already pregnant again? This is starting to look like a new hobby," he laughs.'
-			'"You know what? Maybe it is," you joke back. "Some girls play sports; I get serially impregnated."'
-			'"Well, congratulations on taking home the gold in getting knocked up."'
-			'"Thanks, I''m glad someone is proud of me," you reply.'
-			'Kolka takes a serious tone. "<<$pcs_nickname>>, I am always proud of you. You''re my sister and I''ll love you no matter what."'
-			'You''re briefly taken aback by his uncharacteristic sincerity. "Thanks, really. I love you, too."'
-			'You leave your brother to what he was doing before, glad that the two of you have the relationship that you do.'
-
-			act 'Continue' :pregTalkbrother = 1 & gt 'sitrPar'
-
-		elseif brotherSex >= 7 and pregTalkMom = 0 and kid > 0 and (($clothingworntype = 'nude' and pregchem >= 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460) or ($clothingworntype = 'nude' and pregchem < 2000) or ($clothingworntype ! 'nude' and pregchem < 3460)):
-			cla
-			'"Wow, you''re pregnant again? Is it mine this time?"'
-			*nl
-			if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
-				act 'Yes':gt 'brother', 'brotherknows6'
-			elseif $wombthfath = '':
-				act 'Maybe':gt 'brother', 'brotherknows7'
-			else
-				act 'No':gt 'brother', 'brotherknows8'
-			end
+			exit
+		end
+	elseif brotherSex < 7 and kid > 0 and ($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem > 3460):
+		'"You''re already pregnant again? This is starting to look like a new hobby," he laughs.'
+		'"You know what? Maybe it is," you joke back. "Some girls play sports; I get serially impregnated."'
+		'"Well, congratulations on taking home the gold in getting knocked up."'
+		'"Thanks, I''m glad someone is proud of me," you reply.'
+		'Kolka takes a serious tone. "<<$pcs_nickname>>, I am always proud of you. You''re my sister and I''ll love you no matter what."'
+		'You''re briefly taken aback by his uncharacteristic sincerity. "Thanks, really. I love you, too."'
+		'You leave your brother to what he was doing before, glad that the two of you have the relationship that you do.'
+
+		act 'Continue' :pregTalkbrother = 1 & gt 'sitrPar'
+	elseif brotherSex >= 7 and kid > 0 and pregTalkMom = 0 and (($clothingworntype = 'nude' and pregchem >= 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460)):
+		cla
+		'"Wow, you''re pregnant again? Is it mine?"'
+		*nl
+		if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+			act 'Yes':gt 'brother', 'brotherknows6'
+		elseif $wombthfath = '':
+			act 'Maybe':gt 'brother', 'brotherknows7'
+		else
+			act 'No':gt 'brother', 'brotherknows8'
 		end
 	end
 end

+ 1 - 1
locations/exercise.qsrc

@@ -128,7 +128,7 @@ end
 
 if $ARGS[0] = 'manual':
 	$menu_loc = 'exercise'
-	$menu_arg = 'manual':
+	$menu_arg = 'manual'
 	menu_off = 0
 	cla
 	act 'Return':gt 'exercise', 'workout'