Browse Source

[Feature Update, code fixes] Now restored the ability to actually attend the dance school from the residence. Residence, Class and Journal code refactored. Numerous bug fixes including image paths fixed. Fixed minor display discrepancy for makeQSP.

Hooded Silence 4 months ago
parent
commit
59258a862b

+ 1 - 1
MakeQSP.bat

@@ -69,7 +69,7 @@ if defined NOT_FOUND (
 )
 
 echo.
-echo ACTIONS: (B)uild  (R)un  (F)ull  (Q)Gen (V) Validate (E)xit
+echo ACTIONS: (B)uild  (R)un  (F)ull  (Q)Gen (V)alidate (E)xit
 echo.
 set /p action=Choose an action:
 

+ 1 - 6
locations/core_library.qsrc

@@ -86,18 +86,13 @@ if $ARGS[0] = 'stage_title':
     '<center><img <<$set_imgh>> src="images/<<$setloc[''StageImage'']>>.<<$temp_StageExt>>"></center>'
 
     !! Clean up
-    killvar '$setloc'
     killvar '$temp_StageExt'
 
     !! set indoor or outdoor location specific variables
 
-    !!
-
     !! set standardised location variables such as kitchen, bathroom, personal bedroom
     
-    !! npc location tracker - if tracking npc locations add them here.
-
-    
+    !! npc location tracker - if tracking npc locations add them here.    
 end
     
 if $ARGS[0] = 'corridor':

+ 1 - 1
locations/emp_functions.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'gen_schedule':
 				elseif function_sw = 2:
                     flag_active  = 1
                     j_id = emp_rota_week[i_day +  '_' + i_hour]
-                    if emp_rota_week[i_day +  '_' + i_hour] ! '0':							
+                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
                         $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
                     else
                         $transient_tb  = 'Free'

+ 0 - 1
locations/journal.qsrc

@@ -49,7 +49,6 @@ if $ARGS[0]='journalmenu':
 	$tablebody += '<th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th>'
 	$tablebody += '<th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th>'
 	$tablebody += '<th><a href="exec:menutrack = 7 & gs ''journal'', ''notification_log''">Notifications</a></th>'
-	if alterstrtimg = 13 or mod_ballet['letter'] > 0 or balletqw['school'] > 0: $tablebody += '<th><a href="exec:menutrack = 8 & gs ''journal'', ''ballet''">Ballet</a></th>'
 	$tablebody += '</tr>'
 
 	!display the table here.

+ 7 - 6
locations/journal_quests.qsrc

@@ -4,10 +4,10 @@
 !! Game Character Quest section. This is the container file for all quest roles in game. Used to provide player feedback on how to proceed in quests.
 !! All quest information should be in a guidance or hint style fashion to encourage exploration.
 
-! V .01 added lines 14 and 15 to integrate into the new journal menu system. Changed headers from H1 to H2 or H3 to fit design style of other sections.
-! v .02 Added Mira Maximova  - Three Wishes events to journal under new Gadukino group - courtesy of Derryth_Love
-! v.03 Added new Natasha Belova content.
-
+!! V .01 added lines 14 and 15 to integrate into the new journal menu system. Changed headers from H1 to H2 or H3 to fit design style of other sections.
+!! v .02 Added Mira Maximova  - Three Wishes events to journal under new Gadukino group - courtesy of Derryth_Love
+!! v.03 Added new Natasha Belova content.
+!! v.04 Added ballet questline
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -61,7 +61,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		'<center><h3>Cheerleading</h3></center>'
@@ -636,9 +635,11 @@ if yearstart > 1:
 end
 !! Ballet Content
 if alterstrtimg = 13 or (mod_ballet['letter'] > 0 or balletqw['school'] > 0):
+	*nl
+	'<center><h3>Pushkin Ballet School</h3></center>'
 
 	if mod_ballet['letter'] ! 1 and balletqw['school'] < 1:
-		'You have been a ballerina since a child and you have excelled in your dance class. Your name was put for the yearly entrance assessments which are being held during the summer and you are hoping for a invitation to the prestigious Pushkin Ballet Academy.'
+		'You have been a ballerina since a child and you have excelled in your dance class. Your name was put forward for the yearly entrance assessments for the Pushkin Ballet School which are being held during the summer and you are hoping for a invitation to the prestigious Pushkin Ballet Academy to your dream of being a ballerina.'
 	end
 	if 	mod_ballet['letter'] = 1 and balletqw['school'] < 1:
 		'You have accepted the opportunity at the Pushkin Ballet Academy. Transport is provided for the week long course from the Pavlosk Community Centre. '

+ 1 - 2
locations/npc_3501_init.qsrc

@@ -41,8 +41,7 @@ if $ARGS[0] = 'scheduler':
 
 	!! Uni years
 	!! Corp De Ballet
-
-	
+	end	
 end
 !! Init first event - triggered from pushkin_ballet_res, bedroom
 

+ 28 - 25
locations/pushkin_ballet_class.qsrc

@@ -19,14 +19,16 @@
 !! ballet_day - Sets which day of the course you are on
 !! nclass - tracks next lesson (used for shower scene change)
 
+$default_img_path = 'locations/pushkin/'
 if $ARGS[0] = 'start':
     *clr & cla
     $location_type = 'public_indoors'
     $setloc['StageTitle'] = 'Terpsichore Wing'
-	$setloc['StageImage'] =  'pushkin/school/daily/hall'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall'
 
-    !! carried over from res kitchen
+    !! clear switch vars
     killvar 'sharedmeal' 
+    $balletEv['trigger'] = ''
 
     $location_type = 'public_indoors'
     gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0] 
@@ -80,7 +82,7 @@ if $ARGS[0] = 'pilates':
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
     $setloc['StageTitle'] = 'Pilates'
-	$setloc['StageImage'] =  'pushkin/school/daily/pilates_2'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/pilates_2'
     nclass = 1
     if ballet_day = 1:
 
@@ -151,7 +153,7 @@ if $ARGS[0] = 'first_lesson':
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
     $setloc['StageTitle'] = 'Dance Class'
-	$setloc['StageImage'] =  'pushkin/school/daily/ballet_class_002'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_002'
     nclass = 2
     gs 'stat'
 
@@ -209,7 +211,7 @@ if $ARGS[0] = 'first_lesson':
         gs 'sweat', 'add', 30
         gs 'pushkin_ballet_init', 'daily_assessment'
         gs 'stat'
-        $setloc['StageImage'] =  'pushkin/school/daily/ballet_teach_003'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_003'
         gs 'core_library', 'stage_title'
 
         'As you enter the classroom, there''s an air of excitement this morning. You''re halfway through the week, and anticipation and nervousness are creeping in for the upcoming assessment.'
@@ -264,21 +266,21 @@ if $ARGS[0] = 'first_lesson':
         gs 'sweat', 'add', 30
         gs 'pushkin_ballet_init', 'daily_assessment'
         gs 'stat'
-        '<center><h2>Dance Class</h2></center>'
-        '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/ballet_class_005.jpg"></center>'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_005'
+        gs 'core_library', 'stage_title'
         'You''ve just finished the Pilates class, and enter your classroom dressed in Ballet Blanc. It''s the first time you''ve seen the group dressed as if you''re part of the Corp, which brings a sense of pride for being here.'
         '<<$npc_firstname[''A3501'']>> grabs your attention, "Hey, <<$pcs_nickname>>, let''s check you over quickly.". <<$npc_firstname[''A3501'']>> quickly goes over your outfit and hair, ensuring that your presentation is perfect and you do the same for her.'
         'You sit down, put on your toe socks, and powder your feet before putting on your ballet shoes. You notice they''re slightly damaged; they should be fine for the lesson, but you make a note to get your new shoes ready.'
         'It''s not ideal, but you have no choice. As you finish tying the ribbons, you see Biserka enter the room and start to inspect you all, trying to find faults. Still, your class passes with only minor criticisms.'
         act 'Continue lesson':
-            '<center><h2>Dance Class</h2></center>'
-             *clr & cla
-             '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/ballet_class_005.jpg"></center>'
+            gs 'core_library', 'stage_title'
             '"Well done, class, you have done me proud. You have done exactly what I asked." It was rare praise from Biserka. "Now I want you to give me your best. I want you to dance like you never danced."'
             'With that, she claps her hands. "Take your positions." Sofia starts to play. You lose yourself in the performance of all the lessons coming together from the last week, and you flow through the performance.'
             'Biserka watches all the girls'' performances critically, taking notes as she goes. The minutes fly by, and before you know it, the first rehearsal is over. "And again," she calls out.'
              act 'Continue rehearsals':
                 *clr & cla
+                $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_1'
+                gs 'core_library', 'stage_title'
                 '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/ballet_teach_1.jpg"></center>'
                 'You rehearse several times before she''s happy, and then she hands critique notes to all the girls. When she gives you yours, she compliments you before gathering Maya and Kima aside for a private talk.'
                 '"Tomorrow your assessment will start at 09:00. You will enter the room in First Position and wait for the examiners'' instructions. Once you have performed the Entrance of the Swans, you will be asked to perform a Pas de Deux with your dance partner."'
@@ -286,7 +288,8 @@ if $ARGS[0] = 'first_lesson':
                 '"Any questions? If you have any tonight or need assistance, contact Bronya, and she will advise or help as needed."'
                     act 'Reverence':        
                         *clr & cla
-                        '<center><h2>Dance Class</h2></center>'
+                        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/reverance'
+                        gs 'core_library', 'stage_title'
                         '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/events/reverence.jpg"></center>'
                         'You and the girls all look at each other and start to perform a deep curtsy as part of the great reverence you agreed to the previous evening with the girls to pay respect to Biserka and Sofia for their teaching this week. '
                         'Both teachers look taken aback and have a smile on their faces. "Thank you, class. It''s been a pleasure to teach you this week," Biserka says, with Sofia nodding her agreement and repeating her words.'                           
@@ -303,17 +306,17 @@ if $ARGS[0] = 'shower':
     gs 'stat'
     *nl
     $setloc['StageTitle'] = 'School Showers'
-	$setloc['StageImage'] =  'locations/pushkin/school/daily/shower_1'
-    if nclass > 1:
+	$setloc['StageImage'] =  'images/locations/pushkin/ballet_school/daily/shower_1'
+    if nclass > 1:      
+        $location_type = 'public'
+        gs 'themes', 'indoors'
+        gs 'stat'
+        gs 'core_library', 'stage_title'
         if nclass = 2:
             act 'Go to next lesson' : gt 'pushkin_ballet_class', 'makeup'
         elseif nclass = 4:
             act 'Go to next lesson' : gt 'pushkin_ballet_class', 'music_theory'
         end
-        $location_type = 'public'
-        gs 'themes', 'indoors'
-        gs 'stat'
-        gs 'core_library', 'stage_title'
         gs 'core_library', 'bathroom'
              
         'You enter the school showers after your lesson. You and your classmates don''t have much time to talk to each other, with you having little time until your next lesson.'
@@ -325,7 +328,6 @@ if $ARGS[0] = 'shower':
         gs 'themes', 'indoors'
         gs 'stat'    
         gs 'core_library', 'stage_title'
-		gs 'core_library', 'bathroom'  
         act 'Return to the hallway' : 
             if $clothingworntype = 'nude':
                 msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
@@ -334,8 +336,9 @@ if $ARGS[0] = 'shower':
                 gt 'pushkin_ballet_res', 'hallway' 
             end
         end
+		gs 'core_library', 'bathroom'  
+
     end
-   
 end
 
 if $ARGS[0] = 'makeup':
@@ -347,7 +350,7 @@ if $ARGS[0] = 'makeup':
         minut = 0
     end
     $setloc['StageTitle'] = 'Theatre Make Up'
-	$setloc['StageImage'] =  'pushkin/school/daily/first_mua'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/first_mua'
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
     ! set stats for make up gain - makupskl_lvl
@@ -367,7 +370,7 @@ if $ARGS[0] = 'makeup':
         '<<$npc_firstname[''A3501'']>> slides in beside you and whispers, "A lot to take in?" You nod your head in agreement. She gives a quick wink before turning back to listen to the lesson.'
     
     elseif ballet_day = 2:
-        $setloc['StageImage'] =  'pushkin/school/daily/second_mua'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/second_mua'
         gs 'core_library', 'stage_title'
         'Another day and your teacher still hasn''t introduced herself, instead telling the students to focus. "Did you read through the books I gave you last night?" she asks.'
         'Everyone in the class looks at each other. "But Miss, you never told us to," Gasha replies.'
@@ -402,7 +405,7 @@ if $ARGS[0] = 'lunch':
     *clr & cla
     gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0]
     $setloc['StageTitle'] = 'School Cafeteria'
-	$setloc['StageImage'] =  'pushkin/school/daily/cafeteria'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/cafeteria'
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
     ! gs lunch events
@@ -513,7 +516,7 @@ if $ARGS[0] = 'music_theory':
         minut = 0
     end
     $setloc['StageTitle'] = 'Music Theory'
-	$setloc['StageImage'] =  'pushkin/school/daily/ballet_class_004'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_004'
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
     killvar 'nclass'
@@ -638,8 +641,8 @@ if $ARGS[0] = 'assessment':
         	    gs 'stat'
                 '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/exams/solo_2.jpg"></center>'
                 'Back outside, you and <<$npc_firstname[''A3501'']>> do checks on your outfits. You notice a small tear on <<$npc_firstname[''A3501'']>>''s tights and get your needle and thread out to repair it. You then check each other''s hair and makeup, with <<$npc_firstname[''A3501'']>> applying some hairspray to tame your flyaway hairs.'
-                'There''s some fruit juice and some snacks on a table to eat whilst you wait for your lesson. Then, you start doing light exercises with <<$npc_firstname[''A3501'']>> to remain supple.'
-                'Shortly after you finish your snack, you''re called in before <<$npc_firstname[''A3501'']>> .'
+                'There''s some fruit juice and some snacks on a table to eat whilst you wait for your examination performance. Then, you start doing some light exercises with <<$npc_firstname[''A3501'']>> to remain supple.'
+                'Shortly after you finish your snacks and stretches, you''re called in before <<$npc_firstname[''A3501'']>> .'
                 *nl
                 '"<<$pcs_firstname>> <<$pcs_lastname>>, this is your solo performance. You understand what is required of you?" You realise it''s the school''s Ballet Mistress attending the solo performances. Thankfully, <<$npc_firstname[''A3502'']>> isn''t assessing the solo exams.'
                 'You curtsy and reply, "Yes, Mistress, I''m ready."'

+ 3 - 3
locations/pushkin_ballet_evt.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'letter':
             'Your <<$npc_nickname[''A29'']>> pulls you into her arms. "I knew you could do it, <<$pcs_nickname>>. Well done!"'
             'Hearing the commotion, your stepdad and brother step into the kitchen and ask, "What''s all the commotion?" You excitedly tell your family the news. "Well done, sis," your brother tells you. Your stepfather gives you a proud smile.'
             '"When do you go?" your <<$npc_nickname[''A29'']>> asks.'
-            '"The first week of July. I''ve got to catch the school bus from the community center on Sunday, between 1600 and 1700." You look through the other information, providing details on what you need to pack and other relevant course information.'
+            '"The first week of July. I''ve got to catch the school bus from the community center on Sunday, 3rd July between 1600 and 1700." You look through the other information, providing details on what you need to pack and other relevant course information.'
         
             act 'Continue': gt 'kuhrPar'
         end
@@ -141,7 +141,7 @@ if $ARGS[0] = 'res_events':
     if $ARGS[1] = 'birthday':
         ! Birthday night for Gasha, develops homesickness, Bronya/Nikita baked her a cake.
 
-        if $ARGS[2] = 1:
+        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?"'
@@ -175,7 +175,7 @@ if $ARGS[0] = 'res_events':
                 '"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:
+        elseif $ARGS[2] = '2':
             !! Communal Party
             'WIP - tbc'
         end

+ 158 - 106
locations/pushkin_ballet_res.qsrc

@@ -37,10 +37,8 @@ if $ARGS[0] = 'start':
 
 end
 
-
 if $ARGS[0] = 'bedroom':
 	*clr & cla
-	!! Init    
 	$location_type = 'private'    
 	$setloc['StageTitle'] = 'Residental Bedroom'
 	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/bedroom'
@@ -67,8 +65,14 @@ if $ARGS[0] = 'bedroom':
         if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'
         '<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
         
-       !  act 'Enter Shop': gt 'pushkin_ballet_shop', 'init'
-        act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+        if $clothingworntype ! 'nude':
+            act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+        else
+            act 'Go to the hallway':
+                msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself Bronya would likely have a few choice words about your behaviour.</font></b>'
+                gt $loc, $loc_arg
+            end
+        end
 
         !! Default actions
         gs 'core_library', 'bedroom'
@@ -77,70 +81,26 @@ if $ARGS[0] = 'bedroom':
         if  hour >= 16 and week ! 7:         
             act 'Barre Practice (60m)': gt 'pushkin_ballet_evt', 'barre_exercise' 
             act 'Study (60m)':  gt 'pushkin_ballet_res', 'study'
-            ! act 'Practice make up' : gt 'pushkin_ballet_evt', 'make_up' 
+            if  mc_inventory['cosmetics'] >= 9:
+                act 'Practice make-up' : gt 'pushkin_ballet_res', 'make_up' 
+            end
             if feet_track ! daystart: act 'Take care of your feet': gt 'pushkin_ballet_res', 'feetcare'     
         end 
         act 'Listen to the radio (30m)': gt 'pushkin_ballet_res', 'radio'
         act 'Read the rules': gt 'pushkin_ballet_res', 'rules'
+
         !!act 'Debug data': gs 'pushkin_ballet_init', 'score_debug'
     end
 
-    ! First Maya event
+    !! First Maya event
 
     if ballet_day = 3 and mayaqw['grave'] = 0:
-        act 'Answer the knock  <<$mod_ballet[''icon_green'']>>' : gt 'npc_3501_init','grave'
+        act 'Answer the knock' : gt 'npc_3501_init','grave'
     elseif ballet_day = 3 and hour > 19 and mayaqw['grave'] = 1:
         act 'Another knock': gt 'npc_3501_init', 'post_grave' 
     end
 end
 
-if $ARGS[0] = 'rules':
-    *clr & cla
-	minut += 5
-	gs 'stat'
-    *pl '<center><h2>Residence Rules</h2></center>'
-    *pl 'You look at the rules on the wall.'
-
-    *pl 'Whilst you stay in this accommodation, you will follow these rules:'
-
-    '1) No males are allowed in the accommodation block.'
-
-    '2) All residents must return to the block by 21:00. No exceptions. If you are late, you will have to report to the duty warden.'
-    
-    '3) No smoking, drinking, or drug use is allowed in the accommodation. If you are caught, you will face immediate dismissal from the school.'
-    
-    '4) Breakfast is from 06:00 to 07:00.'
-    
-    '5) All rooms must be kept clean and tidy.'
-    
-    '6) Valuables can be left with the duty warden if required. All thefts or problems are to be reported immediately.'
-    
-    '7) You are to follow the duty warden''s instructions in an emergency.'
-
-    act 'Look away': gt 'pushkin_ballet_res', 'bedroom'
-end
-
-if $ARGS[0] = 'radio':
-	*clr & cla
-	minut += 30
-	pcs_mood += rand(1,5)  
-    pcs_sleep -= rand(1,10)
-    if ballet_day >= 1 and week ! 7:
-        instrmusic_exp += rand(1,3)
-        pcs_perform += rand(1,3) 
-        mod_homework[week] += 1 
-        mod_daily_score[week] += 1
-    end
-    $setloc['StageTitle'] = 'Radio'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/radio'
-	gs 'stat'
-    gs 'core_library', 'stage_title'
-
-    'You start to listen to the radio for half an hour, taking notes of the performance with the ideas from your earlier lesson. Then, you close your eyes and start humming along to the familiar music after a while. '
-
-    act 'Turn the radio off': gt 'pushkin_ballet_res', 'bedroom'
-end
-
 if $ARGS[0] = 'hallway':    
 	*clr & cla
     $setloc['StageTitle'] = 'Residental Hallway'
@@ -152,21 +112,35 @@ if $ARGS[0] = 'hallway':
 	gs 'stat'
     
     gs 'core_library', 'stage_title'
-    ! Visit NPCs 
+    !! Visit NPCs 
     ballet_awol = 0
     if ballet_day ! week :
         ballet_day = week
     end
     nclass = 0
-    act 'Leave building': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
+
+    if $clothingworntype ! 'nude':
+        if hour = 6 or (hour  = 7 and minut <=  30):
+            act 'Attend Ballet Classes': gt 'pushkin_ballet_class', 'start'
+        elseif hour = 7 and (minut > 30 and minut <= 59):
+            $balletEv['trigger'] = 'late'
+            gs 'npc_init_3501', 'summer_school'
+        else
+            act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
+        end
+    else       
+        msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself off Bronya would likely have a few choice words about your behaviour.</font></b>'
+        gt $loc, $loc_arg    
+    end
+
     act 'Go to your room':  minut += 5 & gt 'pushkin_ballet_res', 'bedroom'
     act 'Enter the communal room':  minut += 5 & gt 'pushkin_ballet_res', 'communal_area'
     act 'Go to the bathroom':  minut += 5 & gt 'pushkin_ballet_class', 'shower'  
     act 'Go to the kitchen':  minut += 5 & gt 'pushkin_ballet_res', 'kitchen'
     if week ! 7:
-        ! act 'Visit Maya' :  minut += 5 & gt 'pushkin_ballet_res', 'maya_room'
+        !! act 'Visit Maya' :  minut += 5 & gt 'pushkin_ballet_res', 'maya_room'
     end
-    !act 'Knock on wardens door' :  minut += 5 & gt 'pushkin_ballet_res', 'warden_room'
+    !!act 'Knock on wardens door' :  minut += 5 & gt 'pushkin_ballet_res', 'warden_room'
 
     if ballet_day = 7:
         'The hall is bustling with various students settling into their rooms. A few of them wave or smile to greet you as you pass by. You see Bronya at the end of the hall, keeping an eye on the students and ready to provide assistance.'
@@ -186,52 +160,13 @@ if $ARGS[0] = 'hallway':
             if hour < 8 or hour > 21:
                 'You hear someone trying to play the piano at this hour. Before you can complain, you hear the piano being slammed shut, and you wince. A few moments later, two girls emerge from the communal room, arguing heatedly.'
             else
+                pcs_mood += 5
                 'You hear someone playing the piano in the communal room. You don''t recognize the piece being played, but its soothing melody relaxes you.'
             end
         end
     end
 end
 
-if $ARGS[0] = 'warden':
-    !! residential buzzer logic statements
-    if (hour > 20 or hour < 6) and ballet_awol = 1:
-        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s icy voice through the intercom.'
-        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause.'
-        '"<<$pcs_firstname>> <<$pcs_lastname>>, you will see me in my office. Now." You can swear the temperature around you just plummeted a few degrees and the door was buzzed open.'
-        gt 'pushkin_ballet_res', 'warden_room'
-    elseif (hour >= 17  or hour < 21 ) and ballet_awol = 1:
-        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s voice through the intercom.'
-        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause and you hear the door being buzzed open.'
-        gt 'pushkin_ballet_res', 'hallway'
-    elseif ballet_awol = 1:
-        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s voice through the intercom.'
-        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause.'
-        '"<<$pcs_firstname>> <<$pcs_lastname>>, where the hell have you been? Get in here. Now.", you gulp at her voice and with trepidation make your way to her office.'
-        gt 'pushkin_ballet_res', 'warden_room'
-    else
-        minut += 10
-        'You press the buzzer but there''s no response.'
-        act 'Return': gt 'pushkin'
-    end
-end
-
-if $ARGS[0] = 'warden_room':
-	*clr & cla
-    
-	$location_type = 'private'
-	$setloc['StageTitle'] = 'Wardens Residence'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden' 
-    $location_type = 'public_indoors'
-    gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
-    gs 'themes', 'indoors'
-	gs 'stat'
-   
-    gs 'core_library', 'stage_title'
-
-    ! Punishment or plot
-     act 'Go to the hallway':  minut += 5 & ballet_awol = 0 &  gt 'pushkin_ballet_res', 'hallway'
-end
-
 if $ARGS[0] = 'maya_room':
 	*clr & cla
 	$location_type = 'private'	
@@ -244,7 +179,7 @@ if $ARGS[0] = 'maya_room':
     'Maya''s room closely resembles your own. Her wardrobe is open, and you see her collection of tutus hanging from the rails. On her desk there are several books, including an open poetry book. A quick glance reveals the page title "Like a White Stone" by Akhmatova.'
     'Next to it is an old picture of a woman in a park with a black ribbon in the corner.' 
     act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
-! Maya events
+    !! Maya events
 end
 
 if $ARGS[0] = 'communal_area':
@@ -279,15 +214,15 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
     
     $setloc['StageTitle'] = 'Residental Kitchen'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/kitchen'
-	$location_type = 'communal'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/kitchen'
+	$location_type = 'private'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
     gs 'stat'
 
     gs 'core_library', 'stage_title'
     act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
-
+    gs 'core_library', 'kitchen'  
 
     !! Set up events
     *nl    
@@ -321,7 +256,94 @@ if $ARGS[0] = 'kitchen':
     
 end
 
-! Activities
+!! Intercomm
+if $ARGS[0] = 'warden':
+    !! residential buzzer logic statements
+    if (hour > 20 or hour < 6) and ballet_awol = 1:
+        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s icy voice through the intercom.'
+        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause.'
+        '"<<$pcs_firstname>> <<$pcs_lastname>>, you will see me in my office. Now." You can swear the temperature around you just plummeted a few degrees and the door was buzzed open.'
+        gt 'pushkin_ballet_res', 'warden_room'
+    elseif (hour >= 17  or hour < 21 ) and ballet_awol = 1:
+        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s voice through the intercom.'
+        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause and you hear the door being buzzed open.'
+        gt 'pushkin_ballet_res', 'hallway'
+    elseif ballet_awol = 1:
+        '"Pushkin Ballet Residential Block, how may I help you?", you hear Bronya''s voice through the intercom.'
+        '"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause.'
+        '"<<$pcs_firstname>> <<$pcs_lastname>>, where the hell have you been? Get in here. Now.", you gulp at her voice and with trepidation make your way to her office.'
+        gt 'pushkin_ballet_res', 'warden_room'
+    else
+        minut += 10
+        'You press the buzzer but there''s no response.'
+        act 'Return': gt 'pushkin'
+    end
+end
+
+if $ARGS[0] = 'warden_room':
+	*clr & cla
+    
+	$location_type = 'private'
+	$setloc['StageTitle'] = 'Wardens Residence'
+	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden' 
+    $location_type = 'public_indoors'
+    gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
+    gs 'themes', 'indoors'
+	gs 'stat'
+   
+    gs 'core_library', 'stage_title'
+
+    ! Punishment or plot
+     act 'Go to the hallway':  minut += 5 & ballet_awol = 0 &  gt 'pushkin_ballet_res', 'hallway'
+end
+
+!! Activities
+if $ARGS[0] = 'rules':
+    *clr & cla
+	minut += 5
+	gs 'stat'
+    *pl '<center><h2>Residence Rules</h2></center>'
+    *pl 'You look at the rules on the wall.'
+
+    *pl 'Whilst you stay in this accommodation, you will follow these rules:'
+
+    '1) No males are allowed in the accommodation block.'
+
+    '2) All residents must return to the block by 21:00. No exceptions. If you are late, you will have to report to the duty warden.'
+    
+    '3) No smoking, drinking, or drug use is allowed in the accommodation. If you are caught, you will face immediate dismissal from the school.'
+    
+    '4) Breakfast is from 06:00 to 07:00.'
+    
+    '5) All rooms must be kept clean and tidy.'
+    
+    '6) Valuables can be left with the duty warden if required. All thefts or problems are to be reported immediately.'
+    
+    '7) You are to follow the duty warden''s instructions in an emergency.'
+
+    act 'Look away': gt 'pushkin_ballet_res', 'bedroom'
+end
+
+if $ARGS[0] = 'radio':
+	*clr & cla
+	minut += 30
+	pcs_mood += rand(1,5)  
+    pcs_sleep -= rand(1,10)
+    if ballet_day >= 1 and week ! 7:
+        instrmusic_exp += rand(1,3)
+        pcs_perform += rand(1,3) 
+        mod_homework[week] += 1 
+        mod_daily_score[week] += 1
+    end
+    $setloc['StageTitle'] = 'Radio'
+	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/radio'
+	gs 'stat'
+    gs 'core_library', 'stage_title'
+
+    'You start to listen to the radio for half an hour, taking notes of the performance with the ideas from your earlier lesson. Then, you close your eyes and start humming along to the familiar music after a while. '
+
+    act 'Turn the radio off': gt 'pushkin_ballet_res', 'bedroom'
+end
 
 if $ARGS[0] = 'feetcare':
 
@@ -344,10 +366,10 @@ if $ARGS[0] = 'feetcare':
 	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/feet_soak'
     gs 'core_library', 'stage_title'
 
-    'After a long day, you diligently inspect your calves and feet for injuries, gently massaging Arnica Gel onto your calves and ankles to alleviate stiffness and swelling. Next, you carefully examine your calluses and check for any blisters.'
-    'With the checks completed, you reach for your exercise band, commencing a series of foot-stretching exercises, culminating in a soothing massage using a tennis ball on your calves and soles.'
+    'After the long day at the ballet class, you diligently inspect your calves and feet for injuries, gently massaging Arnica Gel onto your calves and ankles to alleviate stiffness and swelling. Next, you carefully examine your calluses and check for any blisters.'
+    'With your checks completed, you reach for your exercise band, commencing a series of foot-stretching exercises, culminating in a soothing massage using a tennis ball on your calves and soles.'
     'You take a brief moment to unwind before donning your foot warmers, making your way to the kitchen to fetch cold water and investigate the freezer for ice. Fortunately, the school has stored ice cube trays. After replenishing the trays, you fill a bowl and carry it back to your room.'
-    'Seated on your bed, you pour the bowl of ice cubes and water into a larger container. Adding a touch of Epsom Salts, you brace yourself as you immerse your feet in the chilling water. Your body shudders briefly from the shock, but after a few moments, the sensation subsides. You close your eyes and attempt to relax.'
+    'Seated on your bed, you pour into the bowl the ice cubes and chilled water into a foot bath. Adding a touch of Epsom Salts, you brace yourself as you immerse your feet in the chilling water. Your body shudders briefly from the shock, but after a few moments, the sensation subsides. You close your eyes and attempt to relax.'
 
     ! logic check for then you check your new ballet shoes, and start sewing the ribbons on and break the sole to relax whilst your feet soak.
 
@@ -368,4 +390,34 @@ if $ARGS[0] = 'study':
      act 'Finish studying': gt 'pushkin_ballet_res', 'bedroom'
 end
 
+if $ARGS[0] = 'make_up':
+        !! Practice make up skills
+        *clr & cla
+        minut += 60
+        mod_homework[week] += 1 
+        mod_daily_score[week] += 1
+        gs 'exp_gain', 'makupskl', rand(1,3)
+        if pcs_makupskl < 30:
+            mc_inventory['cosmetics'] -= 9
+            pcs_makeup = 0
+        elseif pcs_makupskl >=31 <= 74:
+            mc_inventory['cosmetics'] -= 5
+            pcs_makeup = 3
+        elseif pcs_makupskl >= 75:
+            mc_inventory['cosmetics'] -= 3
+            pcs_makeup = 5
+        end
+        gs 'stat'
+        $setloc['StageTitle'] = 'Feet Soak'
+        $setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up'
+        gs 'core_library', 'stage_title'
+
+        if pcs_makupskl < 30:
+            'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You wonder if you should get help with practicing.'
+        else
+            'You artfully apply the make-up look with a quick, practiced ease that would leave most girls with envy. The final look is almost perfect and you criticaly review the final result.'
+        end
+
+end
+
 --- pushkin_ballet_res ---------------------------------