|
@@ -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
|
|
|
|