Преглед на файлове

[changed] $start_type variable migration for the ballet stuff (split off in case there are merge errors)

anjuna krokus преди 4 месеца
родител
ревизия
b16ca722e3
променени са 3 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 2 2
      locations/core_library.qsrc
  2. 1 1
      locations/journal_quests.qsrc
  3. 2 2
      locations/pushkin_ballet_init.qsrc

+ 2 - 2
locations/core_library.qsrc

@@ -14,8 +14,8 @@ if $ARGS[0] = 'init':
 
     !!  Summer School
     
-     !! alterstrtimg is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
-    if alterstrtimg = 13 or mod_ballet['beta'] = 1: 
+     !! $start_type['cat'] is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
+    if $start_type['cat'] = 'dancer' or mod_ballet['beta'] = 1: 
         if daystart = 1:
             mod_ballet['blocker'] = 1
         end    

+ 1 - 1
locations/journal_quests.qsrc

@@ -634,7 +634,7 @@ if yearstart > 1:
 	gs 'anushka_konstantinov_schedule', 'journal'
 end
 !! Ballet Content
-if alterstrtimg = 13 or (mod_ballet['letter'] > 0 or balletqw['school'] > 0):
+if $start_type['dancer'] or (mod_ballet['letter'] > 0 or balletqw['school'] > 0):
 	*nl
 	'<center><h3>Pushkin Ballet School</h3></center>'
 

+ 2 - 2
locations/pushkin_ballet_init.qsrc

@@ -33,7 +33,7 @@
 if $ARGS[0] = 'init':
     
     !! Start the School
-    if alterstrtimg = 13 or mod_ballet['beta'] = 1:
+    if $start_type['cat'] = 'dancer' or mod_ballet['beta'] = 1:
         
         !! School week
         
@@ -87,7 +87,7 @@ end
 if $ARGS[0] = 'start':
     ! Initial acceptance
 
-    if $loc = 'kuhrPar' and alterstrtimg = 13:
+    if $loc = 'kuhrPar' and $start_type['cat'] = 'dancer':
     
         if locat['Mother'] = 4 and mod_ballet['letter'] < 1 and daystart <= 14 :
             ! Trigger first act