Browse Source

[fixed] Stepdad leaves the kitchen if you pester him there long enough instead of moving on to his living room status

Kevin_Smarts 10 months ago
parent
commit
2314d63c03
2 changed files with 10 additions and 2 deletions
  1. 6 0
      locations/father.qsrc
  2. 4 2
      locations/kuhrPar.qsrc

+ 6 - 0
locations/father.qsrc

@@ -5,6 +5,7 @@
 fatherAge = year - ((npc_dob['A28'] - (npc_dob['A28'] mod 10000)) / 10000)
 gs 'family_schedule'
 gs 'stat'
+if $ARGS[0] = 'kit': $kit_dad = 1
 
 $location_type = 'event'
 
@@ -32,6 +33,11 @@ dynamic $fatherRep
 
 act 'Move away':gt $loc, $loc_arg
 
+if $kit_dad = 1 and locat['Stepdad'] ! 4:
+	'Your stepdad folds up his paper and leaves the kitchen.'
+	exit
+end
+
 !--------------------------------father comments on appearance changes------------------------------------------------
 ! hair color
 if hcolfronce = 0:

+ 4 - 2
locations/kuhrPar.qsrc

@@ -71,8 +71,10 @@ elseif locat['Mother'] = 13:
 end
 if locat['Mother'] = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
-if locat['Stepdad'] = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
-if locat['Stepdad'] = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
+!! Clean up of code to ensure stepdad doesn't warp you to the living room
+killvar '$kit_dad'
+if locat['Stepdad'] = 4: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here reading the paper.'
+if locat['Stepdad'] = 7: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here setting the table for dinner.'
 
 if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12 and $home['current'] = 'parents_home':'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'