Revert "Ballet content is now active, you need to start in summer as a dancer. Journal needs to be updated with way markers, but slowly going through the code bug fixing. Image paths still need to be fixed which will be the next update alongside content additions. *Note* Whilst you can start Starlets these are exclusionary storylines and you have the option to gracefully leave the Starlets."

This reverts commit e5efb0640b2a5e527b1fdb789189c0a8be134462.

locations/bedrPar.qsrc

@@ -12,8 +12,6 @@ $locclass = 'bedr'
 gs 'themes', 'indoors'
 gs 'stat'
 gs 'family_schedule'
-!! ballet career
-gs 'core_library', 'init'
 
 !! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal

locations/core_library.qsrc

@@ -1,196 +1,152 @@
 # core_library
 
-
 !! Date Created: 17th Sept, 2022
 !! Modified date: 
 !! Version: .01 - initial release
 !! Author: Hooded Silence
 !!
 
-!! Ballet School Initiator - This class is to act as a gateway to the various locations for the ballet school
-
-if $ARGS[0] = 'init':
+!! like SetLoc, to reduce code bloat and memorisation of header title and images.
+!! Project: allow for scene changes on the fly rather than static content based on story?
+!! Set two var, third if you need to change the ext.: 
 
-    !!  Summer School
-    
-        !! alterstrtimg is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
-        if (alterstrtimg = 13 and daystart = 1) or mod_ballet['beta'] = 1: 
-            mod_ballet['blocker'] = 1
-        end
-        !! Parents Home Triggers
-        if $loc = 'kuhrPar':
-            if daystart < 6 and  mod_ballet['blocker'] = 1:
-                gs 'pushkin_ballet_init', 'init'
-            end
-    
-            if  (daystart > 6 and mod_ballet['letter'] = 0) or daystart > 45:	
-                gs 'pushkin_ballet_init', 'start'
-            end 
-        end
-    
-        !! Pavlovsk
-        if $loc = 'gdksport':
-            !! Close down Starlets
-            if mod_ballet['letter'] = 1 and (month = 7 or (month = 6 and day > 6)):
-                if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
-                    if hour = 15 and starlets_on = 1:
-                        act 'Tell Albina about the letter' : gt 'pushkin_ballet_evt', 'starlets'
-                    end
-                end
-            end
-            !! Dance job?
-    
-        end
-    
-        if $loc = 'pav_commcenter':
-            if month = 7 and day = 3 and (hour >= 16 and hour < 17) and mod_ballet['letter'] = 1:
-                ! Pre-flight - travel to school dorms
-                act '<font color="#80E656">Get on the bus</font>': gs 'shortgs', 'remove_array_element', 'mod_ballet', 'letter' & gt 'pushkin_ballet_res', 'start'	
-            end
-        end
-        !! Pushkin
-    
-        !! Theatre 
-    
-        !! Other Events
-    
+!! $setloc[''StageTitle'']: Var to set up $loc h1 header
+!! $setloc[''StageImage'']: Var to set up $loc image - set 1 to randomise
+if $ARGS[0] = 'stage_title':
+    if $ARGS[1] = 1: 
+        $temp_StageExt = 'gif'
+    elseif $ARGS[1] = 2:
+        $temp_StageExt = 'mp4'
+    else 
+        $temp_StageExt = 'jpg'
     end
+	
+	if $ARGS[2] = 2:
+	!! Randomise header image	
+		!!dummyr
+	end
+    *clr & cla
+	'<center><h2><<$setloc[''StageTitle'']>></h2></center>'
+	'<center><img <<$set_imgh>> src="mod/img_ballet/<<$setloc[''StageImage>'']>>.<<$setloc[''temp_StageExt>>'']>>"></center>'
+
+    !! Clean up
+    killvar '$setloc'
+
+    !! set indoor or outdoor location specific variables
+
+    !!
+
+    !! set standardised location variables such as kitchen, bathroom, personal bedroom
     
-    !! --- Generic shared Locations and classes ---
-    
-    
-    !! like SetLoc, to reduce code bloat and memorisation of header title and images.
-    !! Project: allow for scene changes on the fly rather than static content based on story?
-    !! Set two var, third if you need to change the ext.: 
-    
-    !! $setloc[''StageTitle'']: Var to set up $loc h1 header
-    !! $setloc[''StageImage'']: Var to set up $loc image - set 1 to randomise
-    if $ARGS[0] = 'stage_title':
-        if $ARGS[1] = 1: 
-            $temp_StageExt = 'gif'
-        elseif $ARGS[1] = 2:
-            $temp_StageExt = 'mp4'
-        else 
-            $temp_StageExt = 'jpg'
-        end
-        
-        if $ARGS[2] = 2:
-        !! Randomise header image	
-            !!dummyr
-        end
-        *clr & cla
-        '<center><h2><<$setloc[''StageTitle'']>></h2></center>'
-        '<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':
+    if frost > 0: frost = 0
+    music_loop = 0
+    menu_off = 0
+    CLOSE ALL
+    if $location_type = 'private':
+    elseif $location_type = 'public':
     end
     
-    if $ARGS[0] = 'corridor':
-        if frost > 0: frost = 0
-        music_loop = 0
-        menu_off = 0
-        CLOSE ALL
-        if $location_type = 'private':
-        elseif $location_type = 'public':
+end
+
+if $ARGS[0] = 'bathroom':
+    !! Location facilities
+    if $location_type = 'private':
+        gs 'din_van', 'private'
+    elseif $location_type = 'public':
+        act 'Take a shower':
+            *clr & cla
+            pcs_hairbsh = 0
+            pcs_makeup = 1
+            minut += 10
+            pcs_mood += 10
+            noShampoo = 1
+            dynamic $showerdin	
+            gs 'stat'
+            'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'
+            act 'Continue' : gt $loc, $loc_arg
         end
-        
+    elseif $location_type = 'communal':
+
     end
-    
-    if $ARGS[0] = 'bathroom':
-        !! Location facilities
-        if $location_type = 'private':
-            'Your accommodation for the week has the luxury of a private shower and a bath. There''s a poster on the wall promoting the health benefits of ice baths and other advice on looking after your body.' 
-            *nl  
-             'There is a shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-    
-            gs 'din_van', 'private'
-        elseif $location_type = 'public':
-            act 'Take a shower':
-                *clr & cla
-                pcs_hairbsh = 0
-                pcs_makeup = 1
-                minut += 10
-                pcs_mood += 10
-                noShampoo = 1
-                dynamic $showerdin	
-                gs 'stat'
-                'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'
-                 'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-    
-                act 'Continue' : gt $loc, $loc_arg
-            end
-        elseif $location_type = 'communal':
-    
+!! Default facilities    
+    dynamic $basin
+    dynamic $tampon
+    if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+    if deodorant > 0 and deodorant_on = 0:
+        'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+        act 'Apply deodorant (0:01)':
+            *clr & cla
+            menu_off = 1
+            minut += 1
+            deodorant -= 1
+            gs 'sweat', 'deo'
+            iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+            'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
+            act 'Continue': menu_off = 0 & gt $loc, $loc_arg
         end
-    !! Default facilities    
-        dynamic $basin
-        dynamic $tampon
-        if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-        if deodorant > 0 and deodorant_on = 0:
-            'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
-            act 'Apply deodorant (0:01)':
-                *clr & cla
-                menu_off = 1
-                minut += 1
-                deodorant -= 1
-                gs 'sweat', 'deo'
-                iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
-                'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
-                act 'Continue': menu_off = 0 & gt $loc, $loc_arg
-            end
-        end  
-    end
-    
-    if $ARGS[0] = 'kitchen':
-        !! Location facilities
-        if $location_type = 'private':
-            !! Home or parents kitchen
-            dynamic $edasnack
-            dynamic $sandwich
-            dynamic $pranik
-            dynamic $fatdel
-            dynamic $lekarstvo
-            dynamic $vitamin 
-        elseif $location_type = 'public_indoors':
-            !! canteen type location
-        elseif $location_type = 'communal':
-            !! shared or communal kitchen
-            dynamic $edasnack
-            dynamic $sandwich
-            dynamic $pranik
-            dynamic $vitamin 
-        end    
-        !! Default facilities
+    end  
+end
+
+
+
+if $ARGS[0] = 'kitchen':
+    !! Location facilities
+    if $location_type = 'private':
+        !! Home or parents kitchen
+        dynamic $edasnack
+        dynamic $sandwich
         dynamic $driwater
         dynamic $dritea
         dynamic $fill_bottle
-    end
-    
-    if $ARGS[0] = 'bedroom':
+        dynamic $pranik
+        dynamic $fatdel
+        dynamic $lekarstvo
+        dynamic $vitamin 
+    elseif $location_type = 'public_indoors':
+        !! canteen type location
+        dynamic $driwater
+        dynamic $dritea
+        dynamic $fill_bottle
+    elseif $location_type = 'communal':
+        !! shared or communal kitchen
+        dynamic $edasnack
+        dynamic $sandwich
+        dynamic $driwater
+        dynamic $dritea
+        dynamic $fill_bottle
+        dynamic $pranik
+        dynamic $vitamin 
+    end    
     !! Default facilities
-        if $location_type = 'private':   
-            if pcs_horny >= 50:
-                act 'Masturbate':gt 'selfplay', 'start'
-            end
-        elseif $location_type = 'guest':
-        elseif $location_type = 'private_shared': 
+end
+
+
+
+if $ARGS[0] = 'bedroom':
+!! Default facilities
+    if $location_type = 'private':
+        act 'Relax on your bed': gt 'bed', 'start'
+        act 'Open wardrobe': gt 'wardrobe', 'start'        
+        if pcs_horny >= 50:
+            act 'Masturbate':gt 'selfplay', 'start'
         end
+        gs 'events', 'read'
+        gs 'exercise', 'start'
+
+    elseif $location_type = 'guest':
+    elseif $location_type = 'private_shared': 
         act 'Relax on your bed': gt 'bed', 'start'
         act 'Open wardrobe': gt 'wardrobe', 'start'
         gs 'events', 'read'
         gs 'exercise', 'start'
-    
     end
+
+
+end
 --- core_library ---------------------------------

locations/gdksport.qsrc

@@ -160,8 +160,6 @@ if $ARGS[0] = 'start':
 				else
 					act 'Train with Starlets': gt 'albina_starlets', 'starlets'
 				end
-				!! ballet career
-				gs 'core_library', 'init'
 				'Tell Albina you want to <a href="exec:gt ''albina_starlets'',''Quit''">quit</a> the Starlets.'
 			end
 		end

locations/kuhrPar.qsrc

@@ -27,10 +27,6 @@ gs 'stat'
 gs 'kit_din'
 gs 'themes', 'indoors'
 gs 'family_schedule'
-
-!! ballet career
-gs 'core_library', 'init'
-
 '<center><b><font color="maroon">Kitchen</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 

locations/npc_3501_init.qsrc

@@ -164,27 +164,6 @@ if $ARGS[0] = 'post_grave':
 	end
 end
 
-!! Summer School 
-
-if ARGS[0] 'summer_school':
-	if $balletEv['trigger'] = 'late':
-		*clr & cla
-		if mayaqw['grave'] = 4:
-			mood += 10
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/3501_1.jpg"></center>'
-			'<<$npc_firstname[''A3501'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
-			'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A3501'']>>.'
-
-			act 'Go to School': gt 'pushkin_ballet_class', 'start'
-		else
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/warden.jpg"></center>'
-			'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
-
-			act 'Go to School': gt 'pushkin_ballet_class', 'start'
-		end
-	end
-end
-
 !! Career Events - highlights of career, initialise show, joining the Corp de Ballet.
 
 !! Maya Path multiple join points

locations/pav_commcenter.qsrc

@@ -62,8 +62,6 @@ if $ARGS[0] ! 'XXX':
 	if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	!! ballet career
-	gs 'core_library', 'init'
 
 	act 'Wait': gs 'obj_din', 'wait'
 

locations/pushkin_ballet_class.qsrc

@@ -300,11 +300,14 @@ end
 if $ARGS[0] = 'shower':
 	*clr & cla
     gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0] 
+
     gs 'stat'
     *nl
     $setloc['StageTitle'] = 'School Showers'
-	$setloc['StageImage'] =  'locations/pushkin/school/daily/shower_1'
+	$setloc['StageImage'] =  'pushkin/school/daily/shower_1'
+
     if nclass > 1:
+        *clr & cla    
         if nclass = 2:
             act 'Go to next lesson' : gt 'pushkin_ballet_class', 'makeup'
         elseif nclass = 4:
@@ -312,20 +315,23 @@ if $ARGS[0] = 'shower':
         end
         $location_type = 'public'
         gs 'themes', 'indoors'
-        gs 'stat'
-        gs 'core_library', 'stage_title'
         gs 'core_library', 'bathroom'
+        gs 'core_library', 'stage_title'
              
         '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.'
         *nl
+        
     else 
+         
         $setloc['StageTitle'] = 'Residential Bathroom'
-        $setloc['StageImage'] =  'locations/pushkin/ballet_residence/residential_bathroom'
+        $setloc['StageImage'] =  'pushkin/residence/residential_bathroom'
         $location_type = 'private' 
         gs 'themes', 'indoors'
-        gs 'stat'    
+        gs 'core_library', 'bathroom'
         gs 'core_library', 'stage_title'
-		gs 'core_library', 'bathroom'  
+
+        'Your accommodation for the week has the luxury of a private shower and a bath. There''s a poster on the wall promoting the health benefits of ice baths and other advice on looking after your body.' 
+        *nl    
         act 'Return to the hallway' : 
             if $clothingworntype = 'nude':
                 msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
@@ -335,7 +341,8 @@ if $ARGS[0] = 'shower':
             end
         end
     end
-   
+    'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+
 end
 
 if $ARGS[0] = 'makeup':

locations/pushkin_ballet_evt.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'letter':
             'You quickly grab a knife from the counter to open the letter and start to read the contents.'
             'You skim through the letter to find the information you were hoping for and let out a scream as you find the paragraph that has awarded you a grant and a spot at the Pushkin Ballet summer school.'
             '"Did you get the place, <<$pcs_nickname>>?" your <<$npc_nickname[''A29'']>> asks.'
-            '"Yes, I''ve been accepted into the summer ballet school and I have awarded a full grant to cover all the accomodation costs," you proudly announce.'
+            '"Yes, I''ve been accepted into the summer ballet school and awarded a full grant to cover all the costs," you proudly announce.'
             '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.'
@@ -69,14 +69,13 @@ if $ARGS[0] = 'starlets':
 
         '<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
         '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-        '"Albina, I need to have a talk with you." She turns towards you with a frown, "What''s wrong, <<$pcs_nickname>>." You wince at her frosty tone; you know she''s a hard taskmaster with an even sharper tongue.'
-        '"I want to thank yo...", Albina cuts in, "What is it, you''re not been knocked up or you want to quit?", she demands impatiently.'
-        '"No, no", you hastily reply holding up your hands, "nothing like that it''s just that I''ve been accepted into the Pushkin Ballet School for assessment."' 
-        'Albina looks at you for a long moment then gives one of her rare smiles, "That''s great and all that, but what does that mean for Starlets?"'
-        '"I need to attend their residential school for a week, so I will not be able attend your training for Starlets and I''m not sure what is going to happen after the week is over."'
-        'Albina stands staring at you with a frown, "Fine. I know you''ve worked hard for this, ", she pauses, "but don''t expect to get back into the Starlets when you''re finished. I need 100% commitment from my dancers. When do you leave?"'
-        '"I''ll be leaving in the first weekend in July. Thank you for you being understanding," you say with a sigh of relief, realizing you had been holding your breath. You''re relieved that Albina hasn''t started one of her famous tirades against you.'
-        'As you are about to leave Albina calls out, "Good luck!" before turning back to her dancers.'        
+        'Albina, I need to have a word with you. She turns towards you with a frown, "What''s wrong, <<$pcs_nickname>>." You wince at her tone; you know she''s a hard taskmaster.'
+        '"I want to thank yo...", Albina cuts in, "What is it, you''re not knocked up or want to quit?", she demands.'
+        '"No, no", you hastily reply holding up your hands, "I''ve been accepted into the Pushkin ballet school."' 
+        'Albina looks at you for a moment then gives one of her rare smiles, "That''s great and all that, but what does that mean for me?"'
+        '"I need to attend their residential school for a week, so I can''t be part of the Starlets. I''m not sure what happens after."'
+        'Albina stands staring at you, "Fine, I know you''ve worked hard for this, ", she pauses, "but don''t expect to get back into the Starlets when you''re finished. When do you leave?"'
+        '"I''ll be leaving in the first week of July. Thank you for your understanding," you say with a sigh of relief, realizing you had been holding your breath. You''re relieved that Albina hasn''t started one of her famous tirades against you.'        
         !Same value to quit Starlets.
         AlbinaQW['StarletsJoined'] = -1
 

locations/pushkin_ballet_init.qsrc

@@ -31,9 +31,46 @@
 
 
 if $ARGS[0] = 'init':
+
+    
+    if (alterstrtimg = 13 and daystart = 1) or mod_ballet['beta'] = 1: 
+        mod_ballet['blocker'] = 1
+    end
+    
+    if $loc = 'kuhrPar':
+    
+        if daystart < 6 and  mod_ballet['blocker'] = 1:
+            gs 'pushkin_ballet_init', 'init'
+        end
+    
+        if  daystart > 6 and mod_ballet['letter'] = 0:	
+            gs 'pushkin_ballet_init', 'start'
+        end 
+    
+        if  daystart > 45:	
+            gs 'pushkin_ballet_init', 'start'
+        end 
     
-    !! Start the School
-    if alterstrtimg = 13 or mod_ballet['beta'] = 1:
+    end
+    
+    ! Start the School
+    if alterstrtimg = 13 or mod_ballet('beta') = 1:
+        if $loc = 'pav_commcenter':
+            if month = 7 and day = 3 and (hour >= 16 and hour < 17) and mod_ballet['letter'] = 1:
+                ! Pre-flight - travel to school dorms
+                act '<font color="#80E656">Get on the bus</font>': gs 'shortgs', 'remove_array_element', 'mod_ballet', 'letter' & gt 'pushkin_ballet_res', 'start'	
+            end
+        end
+        
+        if $loc = 'gdksport':
+            if mod_ballet['letter'] = 1 and month = 7 or (month = 6 and day > 6):
+                if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
+                    if hour = 15 and starlets_on = 1:
+                        act 'Tell Albina about the letter' : gt 'pushkin_ballet_evt', 'starlets'
+                    end
+                end
+            end
+        end
         
         !! School week
         
@@ -46,9 +83,20 @@ if $ARGS[0] = 'init':
         end
         
         if $loc = 'pushkin_ballet_res' and (hour = 7 and minut >= 30):
-            !! trigger late event for Maya wtih fall back
-            $balletEv['trigger'] = 'late'
-            gs 'npc_3501_init', 'summer_school'
+            *clr & cla
+            if mayaqw['grave'] = 4:
+                mood += 10
+                '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/3501_1.jpg"></center>'
+                '<<$npc_firstname[''A3501'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
+                'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A3501'']>>.'
+        
+                act 'Go to School': gt 'pushkin_ballet_class', 'start'
+            else
+                '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/warden.jpg"></center>'
+                'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
+        
+                act 'Go to School': gt 'pushkin_ballet_class', 'start'
+            end
         elseif $loc = 'pushkin_ballet_res' and $loc_arg = 'hallway' and (hour >= 6 and hour < 8) and (day >=  1 or day <= 6):
                 act 'Go to School (07:30 start)': gt 'pushkin_ballet_class', 'start'	
         end

locations/pushkin_ballet_res.qsrc

@@ -14,14 +14,15 @@
 !! ballet_day - Sets which day of the course you are on.
 !! prep - How much prep work for the exam has been done. To be used as part of the assessment mechanics.
 
-$default_img_path = 'locations/pushkin/'
+
 if $ARGS[0] = 'start':
 	*clr & cla
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0] 
+    
     minut += 45
     gs 'stat'
     '<center><h1>Welcome and Introduction</h1></center>'
-	'<center><img <<$set_imgh>> src="images/characters/ballet/3513.jpg"></center>'
+	'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/warden.jpg"></center>'
     *nl
     'As you and your group enter the halls for the first time, you are greeted by a matronly-looking woman who will be your warden during your stay.'
     '"Welcome, students, to your first night at these halls. I''m your warden, <<$npc_firstname[''A3513'']>> <<$npc_lastname[''A3513'']>>. If you have any problems or need assistance, you can find me in the room to the right." She gestures towards a door with a brass plaque that reads "Warden".'
@@ -43,7 +44,7 @@ if $ARGS[0] = 'bedroom':
 	!! Init    
 	$location_type = 'private'    
 	$setloc['StageTitle'] = 'Residental Bedroom'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/bedroom'
+	$setloc['StageImage'] =  'pushkin/residence/bedroom'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
     gs 'stat'
@@ -65,7 +66,9 @@ if $ARGS[0] = 'bedroom':
         'You enter your room and sit at your desk, wondering what to do next.'
         'In the corner is your <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> containing a Ballet Blanc for your upcoming assessment and your clothes for the week.'
         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>.')
+        'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+        gs 'exercise', 'start'
+
         
        !  act 'Enter Shop': gt 'pushkin_ballet_shop', 'init'
         act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
@@ -131,11 +134,11 @@ if $ARGS[0] = 'radio':
         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'
 
+    '<center><h2>Radio</h2></center>'    
+   	'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/russian_radio.jpg"></center>'
     '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'
@@ -144,7 +147,7 @@ end
 if $ARGS[0] = 'hallway':    
 	*clr & cla
     $setloc['StageTitle'] = 'Residental Hallway'
-	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_residence/hall'
+	$setloc['StageImage'] =  'pushkin/residence/hall'
 	$location_type = 'public_indoors'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'core_library', 'corridor'
@@ -169,7 +172,7 @@ if $ARGS[0] = 'hallway':
     !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.'
+        'The hall is bustling with various students settling into their rooms. A few of them wave or smile at you as you pass by. You see Bronya at the end of the hall, keeping an eye on the students and ready to ask questions.'
         
     elseif week = 2 and hour <= 18:
         gs 'pushkin_ballet_evt', 'res_events', 'birthday', 1
@@ -220,7 +223,7 @@ if $ARGS[0] = 'warden_room':
     
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Wardens Residence'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden' 
+	$setloc['StageImage'] =  'npc/warden' 
     $location_type = 'public_indoors'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
@@ -236,7 +239,7 @@ if $ARGS[0] = 'maya_room':
 	*clr & cla
 	$location_type = 'private'	
     $setloc['StageTitle'] = 'Maya Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/maya_room'
+	$setloc['StageImage'] =  'pushkin/residence/maya_room'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
     gs 'stat'
@@ -251,7 +254,7 @@ if $ARGS[0] = 'communal_area':
 	*clr & cla
 
     $setloc['StageTitle'] = 'Communal Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/communal'
+	$setloc['StageImage'] =  'pushkin/residence/communal'
 	$location_type = 'public_indoors'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
@@ -260,8 +263,6 @@ if $ARGS[0] = 'communal_area':
     !!'You enter the communal room.'
 
     act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
-
-    'WIP Progress - no content'
     if week = 7 and ballet_mod['res_mg'] = 0:
         ballet_mod['res_mg'] = 1
         gs 'pushkin_ballet_evt', 'res_events', 'introduction'
@@ -279,7 +280,7 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
     
     $setloc['StageTitle'] = 'Residental Kitchen'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/kitchen'
+	$setloc['StageImage'] = 'pushkin/residence/kitchen'
 	$location_type = 'communal'
     gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
     gs 'themes', 'indoors'
@@ -316,7 +317,7 @@ if $ARGS[0] = 'kitchen':
     if week = 2 and (hour > 17 and hour < 19):
         gs 'pushkin_ballet_evt', 'kitchen_birthday'
     else
-      'You enter the kitchen area and you''re grateful that the school provides the essentials for cooking and snacks for the pupils to eat during the evenings.'
+      'You enter the kitchen area and you''re grateful the school provides the essentials for cooking and snacks for the pupils to eat during the evenings.'
     end
     
 end
@@ -340,9 +341,7 @@ if $ARGS[0] = 'feetcare':
     minut +=30
     feet_track = daystart
     gs 'stat'
-    $setloc['StageTitle'] = 'Feet Soak'
-	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/feet_soak'
-    gs 'core_library', 'stage_title'
+    '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/feet_soak.jpg"></center>'
 
     '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.'
@@ -362,7 +361,7 @@ if $ARGS[0] = 'study':
     mod_homework[week] += 1 
     mod_daily_score[week] += 1
     gs 'stat'
-     '<center><img <<$set_imgh>> src="<<$default_img_path>>/ballet_residence/study.jpg"></center>'
+     '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/study.jpg"></center>'
 
      'You gather your school books and notebook to begin studying ballet movements, history, and musical theory, diligently taking notes as you progress. After an hour of reading, you notice your eyes beginning to glaze over. Recognizing the need for a break, you decide to stand up and stretch.'
      act 'Finish studying': gt 'pushkin_ballet_res', 'bedroom'