Browse Source

[fixed] gschool_grounds, still able to go to school when schoolblock = 1
[changed] MartinTalk ParHomeBlock (old) to home_owned[2] = 1 (new)

3xpurt 5 years ago
parent
commit
fc36c72714
2 changed files with 4 additions and 4 deletions
  1. 1 1
      locations/MartinTalk.qsrc
  2. 3 3
      locations/gschool_grounds.qsrc

+ 1 - 1
locations/MartinTalk.qsrc

@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
 	
-	elseif StoryLine = 1 and ParHomeBlock = 0:
+	elseif StoryLine = 1 and home_owned[2] = 1:
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'

+ 3 - 3
locations/gschool_grounds.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'main':
 		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock ! 1:
+	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour = 14:
 			'All the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you, "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You didn''t pay the 1000 <b>₽</b> entry fee yet!"'
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
 		if $clothingworntype = 'school' or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'main':
 
 	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1:
+	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0:
 		act 'Go to detention': gt 'gschool_detention', 'start'
 	end