Browse Source

[fixed] updated condition when enable_tablemap is false to match condition when enable_tablemap is true after confirming with Kevin_Smarts and Rachels that this is the correct condition. also removed "relationship above 30 and hour between 14 and 23 on a weekday" condition because there is also a "hour between 14 and 23 on a weekday" condition that it is OR'd with so it is redundant

Spackled Lanturn 3 years ago
parent
commit
91d93380a0
1 changed files with 2 additions and 2 deletions
  1. 2 2
      locations/pav_complex.qsrc

+ 2 - 2
locations/pav_complex.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 	if pavComplex_met_dealer >= 3 and hour > 20: '<br>You can see the <a href="exec:minut += 3 & gt ''pav_aptcourtev'', ''dealer''">boy</a> who sells weed in the courtyard.'
 	
 	if Enable_tablemap = 0:
-		if storyline = 1:'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'
+		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'
 		if ArtemBeInHome > 0 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
 		if BeInJulMilHome = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
@@ -97,7 +97,7 @@ if $ARGS[0] = 'start':
 		if anushkaFirstvisit ! 0: '<a href="exec:minut += 10 & gt ''anushapt'', ''home''">Anushka Konstantinov</a>, a classmate, lives in one of the other apartment blocks here.'
 	else
 		st_count=0 & $show_table=''
-		if (npc_rel['A112'] >=70) or (npc_rel['A112'] >=30 and week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (week < 6 and hour >= 14 and hour <= 23) or (hour >= 0 and hour < 2):
+		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):
 			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & gt ''shulgahome''" >Shulgin</a>.','3'
 		else
 			gs'show_table','Apartment of Uncle Shulgin.','3'