Browse Source

[Fix] Fixed ballet start for non-dancer starts - misplaced if end and repair previous broken commit.

Hooded Silence 6 months ago
parent
commit
6538cd38da
1 changed files with 132 additions and 129 deletions
  1. 132 129
      locations/core_library.qsrc

+ 132 - 129
locations/core_library.qsrc

@@ -4,6 +4,7 @@
 !! Date Created: 17th Sept, 2022
 !! Modified date: 
 !! Version: .01 - initial release
+!! Version: .02 - refactoring to streamline content start, new standardised locations function for kitchen and bathroom test code
 !! Author: Hooded Silence
 !!
 
@@ -13,10 +14,11 @@ if $ARGS[0] = 'init':
 
     !!  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: 
+     !! alterstrtimg is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
+    if alterstrtimg = 13 or mod_ballet['beta'] = 1: 
+        if daystart = 1:
             mod_ballet['blocker'] = 1
-        end
+        end    
         !! Parents Home Triggers
         if $loc = 'kuhrPar':
             if daystart < 6 and  mod_ballet['blocker'] = 1:
@@ -48,149 +50,150 @@ if $ARGS[0] = 'init':
                 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
-    
     end
+ end
     
-    !! --- 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.
-    
-        
+!! --- 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[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[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
     
-    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.'
+    !! npc location tracker - if tracking npc locations add them here.
+
     
-                act 'Continue' : gt $loc, $loc_arg
-            end
-        elseif $location_type = 'communal':
+end
     
-        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  
+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] = '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
-        dynamic $driwater
-        dynamic $dritea
-        dynamic $fill_bottle
+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':
+
     end
-    
-    if $ARGS[0] = 'bedroom':
+!! 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
-        if $location_type = 'private':   
-            if pcs_horny >= 50:
-                act 'Masturbate':gt 'selfplay', 'start'
-            end
-        elseif $location_type = 'guest':
-        elseif $location_type = 'private_shared': 
+    dynamic $driwater
+    dynamic $dritea
+    dynamic $fill_bottle
+end
+
+if $ARGS[0] = 'bedroom':
+!! Default facilities
+    if $location_type = 'private':   
+        if pcs_horny >= 50:
+            act 'Masturbate':gt 'selfplay', 'start'
         end
-        act 'Relax on your bed': gt 'bed', 'start'
-        act 'Open wardrobe': gt 'wardrobe', 'start'
-        gs 'events', 'read'
-        gs 'exercise', 'start'
-    
+    elseif $location_type = 'guest':
+    elseif $location_type = 'private_shared': 
     end
+    act 'Relax on your bed': gt 'bed', 'start'
+    act 'Open wardrobe': gt 'wardrobe', 'start'
+    gs 'events', 'read'
+    gs 'exercise', 'start'
+
+end
 --- core_library ---------------------------------