瀏覽代碼

[fixed] broken ballet doesnt compile

LinaHirata 6 月之前
父節點
當前提交
3887b4e900

+ 1 - 1
locations/ballet_npc.qsrc

@@ -76,7 +76,7 @@ npc_spermpot['A<<npctemp>>'] = 15000
 !! NPC temp: 3513 - Bronya 
 !! Residential Warden: Bronya Volkova and former violinist, strict but fair has two daughters with Nikita being the youngest training to be a ballet dancer and her eldest in Germany training to be a surgeon. 
 
-npc_temp 3513
+npc_temp = 3513
 $npc_firstname['A<<npctemp>>'] = 'Bronya'
 $npc_nickname['A<<npctemp>>'] = 'Bronya '
 $npc_lastname['A<<npctemp>>'] = 'Volkova'

+ 3 - 3
locations/core_library.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'stage_title':
 	end
     *clr & cla
 	'<center><h2><<$setloc[''StageTitle'']>></h2></center>'
-	'<center><img <<$set_imgh>> src="mod/img_ballet/<<><<$setloc[''StageImage>'']>.<<><<$setloc['temp_StageExt>>"></center>'
+	'<center><img <<$set_imgh>> src="mod/img_ballet/<<$setloc[''StageImage>'']>>.<<$setloc[''temp_StageExt>>'']>>"></center>'
 
     !! Clean up
     killvar '$setloc'
@@ -47,7 +47,7 @@ if $ARGS[0] = 'bathroom':
     !! Location facilities
     if $location_type = 'private':
         gs 'din_van', 'private'
-    elseif $location_type = 'public'  
+    elseif $location_type = 'public':
         act 'Take a shower':
             *clr & cla
             pcs_hairbsh = 0
@@ -84,7 +84,7 @@ end
 
 
 
-if $ARGS[0] = 'kitchen'
+if $ARGS[0] = 'kitchen':
     !! Location facilities
     if $location_type = 'private':
         !! Home or parents kitchen

+ 62 - 63
locations/pushkin_ballet_evt.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'starlets':
         AlbinaQW['StarletsJoined'] = -1
 
         act 'Leave': gt 'gdksport', 'start'
-    end    
+    end
 end
 
 if $ARGS[0] = 'pregnant':
@@ -106,51 +106,52 @@ if $ARGS[0] = 'dancebreak':
 end
 
 if $ARGS[0] = 'res_events':
+    !! Communal fixed events
+
+    if $ARGS[1] = 'introductions':
+        !! Sunday night meet some of your classmates.
+
+        'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Ms <<$npc_lastname[''A3513'']>> watching over the proceedings.'
+
+        killvar '$mod_student_table'
+        killvar 'mod_table_count'
+        i_student = 1
+
+        :student_meet_loop
+            if mod_table_count = 6:
+                $mod_student_table += '<tr>'
+                mod_table_count += 1
+                $mod_student_table += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><img  height="100" src="mod/img_ballet/pushkin/npc/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
+            end
+            if mod_table_count < 6:
+                $mod_student_table += '</td>'
+            elseif mod_table_count = 6:
+                $mod_student_table +='</td></tr><tr>' & mod_table_count = 0
+            end
+            i_student += 1
+        if i_student <= 9: jump 'student_meet_loop'
+
+        '<center><table cellspacing="3">'
+        '<<$mod_student_table>>'
+        '</table></center>'
+        killvar 'i_student'
+    end
 
-        !! Communal fixed events
-
-        if $ARGS[1] = 'introductions':
-            !! Sunday night meet some of your classmates.
-
-            'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Ms <<$npc_lastname[''A3513'']>> watching over the proceedings.'
-           
-            killvar '$mod_student_table'
-            killvar 'mod_table_count'
-            i_student = 1
-         
-            :student_meet_loop            
-                if mod_table_count = 6 : $mod_student_table += '<tr>'
-                    mod_table_count += 1
-                    $mod_student_table += '' + '<td><table bgcolor=<<$bcolor2>>><tr><td align="center"><img  height="100" src="mod/img_ballet/pushkin/npc/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
-                end
-                if mod_table_count< 6 :
-                    $mod_student_table += '</td>'
-                elseif mod_table_count = 6:
-                    $mod_student_table +='</td></tr><tr>' & mod_table_count = 0
-                end
-                i_student += 1
-        if i_student <= 9 :jump 'student_meet_loop'
-
-            '<center><table cellspacing="3">'
-             '<<$mod_student_table>>'
-            '</table></center>'
-            killvar 'i_student'
-        end
-        if $ARGS[1] = 'birthday':
-            ! Birthday night for Gasha, develops homesickness, Bronya/Nikita baked her a cake.
-   
-            if $ARGS[2] = 1:   
-                'You enter the halls after classes, and Nikita sees you, grabbing your arm and looking around. "Sveta, do you have a moment?"'
-                '"Sure?" you reply.'
-                '"It''s Gasha''s birthday today, and I''ve got her a card. Can you sign it, please, to cheer her up?"'
-                '"No problem, Nikita. What''s wrong with her?"'
-                '"She''s not used to city life and adapting to this school is challenging. She''s missing home and not being there for her birthday. My mother is baking a cake for her, and I''m about to prepare some buffet food in the kitchen for a little party later."'
-                '"Where is she? She can''t miss all this bustle?"'
-                '"Don''t worry about it; Galina is taking her out to Pushkin under the pretense of showing her the local sights."'
-                'You raise your eyebrow; Galina would have been the last person you''d have thought would help, being so introverted and rarely saying anything. "Yes, she surprised me as well when I asked her. She''s also looking forward to the surprise party planned."'
-                'Nikita hands you the card and a pen to sign, and you quickly scribble your wishes and name into it. You briefly consider putting some cash in it as a present.'
-                
-               if money >= 500:
+    if $ARGS[1] = 'birthday':
+        ! Birthday night for Gasha, develops homesickness, Bronya/Nikita baked her a cake.
+
+        if $ARGS[2] = 1:
+            'You enter the halls after classes, and Nikita sees you, grabbing your arm and looking around. "Sveta, do you have a moment?"'
+            '"Sure?" you reply.'
+            '"It''s Gasha''s birthday today, and I''ve got her a card. Can you sign it, please, to cheer her up?"'
+            '"No problem, Nikita. What''s wrong with her?"'
+            '"She''s not used to city life and adapting to this school is challenging. She''s missing home and not being there for her birthday. My mother is baking a cake for her, and I''m about to prepare some buffet food in the kitchen for a little party later."'
+            '"Where is she? She can''t miss all this bustle?"'
+            '"Don''t worry about it; Galina is taking her out to Pushkin under the pretense of showing her the local sights."'
+            'You raise your eyebrow; Galina would have been the last person you''d have thought would help, being so introverted and rarely saying anything. "Yes, she surprised me as well when I asked her. She''s also looking forward to the surprise party planned."'
+            'Nikita hands you the card and a pen to sign, and you quickly scribble your wishes and name into it. You briefly consider putting some cash in it as a present.'
+
+            if money >= 500:
                 act 'Gift 500 <b>₽</b>':
                     money -= 500
                     gs 'npc_relationship', 'modify', 'A3507', 'like'
@@ -165,22 +166,21 @@ if $ARGS[0] = 'res_events':
                     '"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at 18:30. Don''t miss it!"'
                     act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
                 end
-                
-                act 'Hand card back':
-                    'You hand the card back to Nikita, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
-                    '"Think nothing of it, Nikita. If it makes her feel better, that''s great," you say.'
-                    '"Yeah, look, I need to start baking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
-                    act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
-                end
-                             
-                end
-            elseif $ARGS[2] = 2:
-               !! Communal Party
-               'WIP - tbc'
-           end
-       end
-   
-       if $ARGS[1] = 'homesick':
+            end
+
+            act 'Hand card back':
+                'You hand the card back to Nikita, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
+                '"Think nothing of it, Nikita. If it makes her feel better, that''s great," you say.'
+                '"Yeah, look, I need to start baking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
+                act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
+            end
+        elseif $ARGS[2] = 2:
+            !! Communal Party
+            'WIP - tbc'
+        end
+    end
+
+    if $ARGS[1] = 'homesick':
 
         'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
         'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
@@ -198,7 +198,6 @@ if $ARGS[0] = 'res_events':
     if $ARGS[1] = 'tanis_bully':
         ! Tanis tries to bully Sveta
         'WIP - tbc'
-        
     end
 
     if $ARGS[1] = 'tanis_gasha':
@@ -216,7 +215,7 @@ if $ARGS[0] = 'res_events':
         'WIP - tbc'
     end
     
-    !! Communal random events 
+    !! Communal random events
 
     if $ARGS[1] = '1':
          ! Chess game between Calina and Ruza

+ 2 - 2
locations/pushkin_ballet_init.qsrc

@@ -102,11 +102,11 @@ if $ARGS[0] = 'daily_assessment':
         !! Three score levels, fail, pass and merit. Fail is one route for corruption path, pass is either low or no pay, merit is low to low +10%. 
         if final_score <= 40:
              balletqw[school] = 5
-        elseif final_score >=41 & final_score < 60:
+        elseif final_score >=41 and final_score < 60:
             !! Interim pass until quest lines are created for Maya/Rudolph
             balletqw[school] = 1
             balletqw[rank] = 1
-        elseif final_score >= 61 & final_score <= 90:
+        elseif final_score >= 61 and final_score <= 90:
              balletqw[school] = 1
              balletqw[rank] = 1
         elseif final_score >= 91:

+ 1 - 1
locations/pushkin_ballet_res.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'hallway':
             end
         end
     end
-    
+end
 
 if $ARGS[0] = 'warden':
     !! residential buzzer logic statements