Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/ballet_npc.qsrc

@@ -20,7 +20,7 @@ hotcat_rating['A<<npctemp>>'] = 8
 !! mod appearance NPC settings, height in cm, weight in kg
 $npc_haircolour['A<<npctemp>>'] = 'blonde'
 $npc_eyecolour['A<<npctemp>>'] = 'blue'
-$npc_height['A<<npctemp>>'] = 170
+$npc_height['A<<npctemp>>'] = 160
 $npc_weight['A<<npctemp>>'] = 50 
 
 !! NPC Temp: 3502 - Kima
@@ -83,12 +83,16 @@ $npc_nickname['A<<npctemp>>'] = 'Bronya '
 $npc_lastname['A<<npctemp>>'] = 'Volkova'
 $npc_usedname['A<<npctemp>>'] = 'Bronya'
 
-!! NPC temp: 3514 - Physio - 
+!! NPC temp: 3514 - Physio - Pelageya Makarova
  
-!! Make up teacher: No name, the teacher never bothers to tell the class after a week. Former stage make up artist, beautician and scatterbrained.
+!! Make up teacher: Rada Egorova, the teacher never bothers to tell the class after a week. Former stage make up artist, beautician and scatterbrained.
+
+!! Staff Physio -  Syuzanna Zakharova / Klavdii Frolov (Klavdii is a pun)
+!! Mistress of Ballet - Zarya Popova
+
+!! Names f: Boleslava Grigoreva, Esfir Mikhaylova, Gavriila Makarova (warrior),Yustina Vinogradova
+!! Names m: Ipatiy Novikov, Venedikt Sorokin, Ony Volkov, Kazimir Sokolov
 
-!! Staff Physio - TBC
-!! Mistress of Ballet - TBC
 --- ballet_npc ---------------------------------
 
 

locations/ballet_secrets.qsrc

@@ -1,74 +1,313 @@
 # ballet_secrets
-
 !! Author: Hooded Silence
-!! A dance shop which includes ballet, gymnastics and physio-therapy sources. Alternative path to ballet career in second year and first.
+!! Date Created: Nov, 2023
+!! Version: .01
+!! Author: Hooded Silence
+!! A dance shop which includes ballet, gymnastics and physio-therapy sources. Alternative path to ballet or dance career in second year and first.
 !! TBC - NPCs to be created
 
+$default_img_path = 'locations/pushkin/ballet_secrets/'
+
 if $ARGS[0] = 'init':
   *clr & cla
   gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
   $location_type = 'public_indoors'
   $setloc['StageTitle'] = 'Ballet Secrets'
-  $setloc['StageImage'] =  'pushkin/ballet_secrets'
+  $setloc['StageImage'] =  '<<$default_img_path>>ballet-shop-window'
   $location_type = 'public_indoors'
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
 
+  if week < 7 and hour >= 9 and hour <= 17:
+    'You enter the shop and greeted by a riot of displays showcasing ballet and other dance equipment. A woman is sewing something in the corner and glances at you before continuing.'
+    if balletqw['ballet_secrets'] = 1:
+      act 'Approach the woman': gt $loc, 'first_visit'
+    else
+      act 'Enter studio area': gt $loc, 'reception'
+      !! act 'Talk to assistant':
+      !! act'Look at equipment'
+      !! act 'look at dance wear'
+      act 'Leave shop': gt 'pushkin_sq'
+    end
+  else
+    'You look at the shop window and realise it''s closed, there is a security door to the left of you that allows you access the studio areas if you are a member.'
+    if balletqw['membership'] >= daystart:
+      act 'Swipe membership card': gt $loc, 'membership'
+    end
+  end
+
 end
 
 !! Intro
 
 if $ARGS[0] = 'first_visit':
+  balletqw['ballet_secrets_visit'] = 1
+  balletqw['shoe_order'] = daystart + 14
+  $setloc['StageImage'] =  '<<$default_img_path>>ballet_secrets_fitting_1'
+  minut += 60
+  gs 'core_library', 'stage_title'
+  gs 'stats'
+
+  'You are greeted by a middle aged woman. "Hello, how may I help you?" She askes politely.'
+  '"Hello, I am <<$pcs_firstname>> <<$pcs_lastname>>. I am part of the ballet school intake." you give her a smile and hand over the schools letter as proof.'
+  'The woman smiles warmly, "Ah you are the new students for this year?" she claps her hands and then takes yours, "Come, come we must measure your feet and order your shoes"'
+  'Before you say anything she''s dragging you through the shop towards the back we are are greeted by a wall of shoes and there is pictures on the wall signed by dancers with shoes next to them. You look at the woman.'
+  '"Yes, they are all dancers who are or have been clients of our establishment", she noticed your gaze and explains with pride."We will only provide the best for the school."'
+  !! Set up gate for sponsored or not, not implemented system needs to be added to the end of year assessment.
+  '"But where are my manners I am Darya Pushkina, I am the owner of this shop and facilies" she exclaims, "now to your fitting grabbing a tape measure and fitting tools for your feet"'
+  'For the next hour Madam Pushkina bombards you with questions of whether you want leather or cotton fabric, how many satin shoes and a myriad other questions before she finally relents.'
+  '"Of course as you are aware the school is sponsoring these costs, but only for the first year she says and you will need to manage your own equipment after this.", Madame Pushkina advises.'
+  '"Is there anything else you neeed? No? Good, I will see you again in two weeks for your final shoe fitting. I would like to extend my congratulations and wish you a successful career Ms. <<$pcs_lastname>>."'
+  act 'Leave': gt 'pushkin_sq'
+  act 'Return to shop': gt $loc, 'init'
+  
+
 end
 !! Services
-  !! Gymnastics
-  if $ARGS[0] = 'gymnastics':
-    gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
-    $location_type = 'public_indoors'
-    $setloc['StageTitle'] = 'Ballet Secrets - Gymnastics Class'
-    $setloc['StageImage'] =  'pushkin/ballet_secrets'
-    $location_type = 'public_indoors'
-    gs 'themes', 'indoors'
-    gs 'core_library', 'stage_title'
+
+!! Sports Area - Req Membership card
+
+if $ARGS[0] = 'reception':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Ballet Secrets - Reception'
+  $setloc['StageImage'] =  '<<$default_img_path>>reception'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+
+  'As you enter you are greeted warmly by the gym staff. The gym has an industrial feel reflecting the buildng being converted from an old factory.'
+
+  'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the gym hall to refill your water bottle.'
+ 
+
+  act 'Return to shop': gt $loc, 'init'
+  act 'Changing rooms': gt $loc, 'changing_room'
+  !! if membership not active:
+  if balletqw['membership'] = 0 or balletqw['membership'] < daystart:
+    act 'Discuss membership': gt $loc, 'enrol'
+  elseif hour <= 15 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= stammax / 5 and pcs_energy >= 20:
+    !! link to services:
+    !! if membership active
+    !! act 'Attend Physio': gt $loc, 'physio'
+    !! act 'Attend a gymnastics class.': gt $loc, 'gymnastics_courses'
+    !! act 'Attend a dance class': gt $loc, 'ballet_courses'
+    act 'Attend a yoga class': gt $loc, 'yoga_courses'
+  elseif hour >= 16:
+    'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
   end
-  !! Ballet Courses Easy, Intermediate and advanced
-  if $ARGS[0] = 'ballet_courses':
-    gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
-    $location_type = 'public_indoors'
-    $setloc['StageTitle'] = 'Ballet Secrets - Courses'
-    $setloc['StageImage'] =  'pushkin/ballet_secrets'
-    $location_type = 'public_indoors'
-    gs 'themes', 'indoors'
-    gs 'core_library', 'stage_title'
+end
+if $ARGS[0]= 'enrol':
+  
+	$epayments['method'] = ''
+	$epayments['item_variable'] = ''
+	$epayments['description'] = 'gym facilities access'
+	$epayments['loc'] = 'ballet_secrets'
+	$epayments['loc_arg'] = 'reception'
+	$epayments['banner']= 'locations/<<$default_img_path>>reception.jpg'
+  gs 'core_library', 'stage_title'
+
+  if balletqw['membership'] = 0:
+    'You approach the reception to discuss membership to the gym.'
+  elseif balletqw['membership'] ! 0:
+    'You approach the reception to renew your membership.'
   end
-  !! Physiotherapy
-  if $ARGS[0] = 'physio':
-    gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
-    $location_type = 'public_indoors'
-    $setloc['StageTitle'] = 'Ballet Secrets - Physio'
-    $setloc['StageImage'] =  'pushkin/ballet_secrets'
-    $location_type = 'public_indoors'
-    gs 'themes', 'indoors'
-    gs 'core_library', 'stage_title'
+  act 'Return to the studio entrance': gt $loc, 'reception'
+
+  'The gym offers a weekly or monthly subscription for of 1,500<b> ₽</b>  or 5,000<b> ₽</b> respectively to use the facilities with some courses included. Physio appointments are charged seperately.'
+  'The subscriptions includes classes in gymnastics, yoga and introductory ballet. For advanced classes there is an additional instructor charge. A physical trainer is on hand to assist at all times if you so need one.'
+  'We also have a small café which attracts a members discount and your membership card can purchase items directly from the vending machine which will be billed to your account.'
+
+  if money >= 5000 or karta + bankDebtLimit >= 5000:
+    '<td> <a href="exec: epayments[''value''] = 5000 & balletqw[''membership''] = daystart + 30  & gs ''shortgs'',''payments'' ">Purchase a monthly subscription for 5,000<b> ₽</b></a></td>'
   end
+  if money >= 1500 or karta + bankDebtLimit >= 1500:
+    '<td> <a href="exec: epayments[''value''] = 1500 & balletqw[''membership''] = daystart + 7  & gs ''shortgs'',''payments'' ">Purchase a weekly subscription for 1,500<b> ₽</b></a></td>'
+	end
+end
+
+if $ARGS[0] = 'changing_room':
+  menu_off = 0
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	$location_type = 'private'
+	$locclass = 'changingroom'
+  gs 'themes', 'indoors'
+  '<center><h2>Changing Room</h2></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/locker.jpg"></center>'
+
+  act 'Return to the studio reception': gt $loc, 'reception'
+  if mc_inventory['shampoo'] > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			menu_off = 1
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			if pcs_inhib < 15:inhib_exp += rand(1,2)
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
+			act 'Get out of the shower':gt $loc, 'changing_room'
+
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
+	act 'Use mirror':
+		cla
+		gt 'mirror', 'start'
+	end
+
+	act 'Change outfit':
+		cla
+		gt 'wardrobe', 'start'
+	end
+
+	gs 'wardrobe', 'default_sport_options'
+
+  if mc_inventory['deodorant'] > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
+		act 'Apply deodorant (0:01)':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			mc_inventory['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
+	dynamic $tampon
+  
+end
+
+!! Physiotherapy
+if $ARGS[0] = 'physio':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Ballet Secrets - Physio'
+  $setloc['StageImage'] =  '<<$default_img_path>>physio'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+
+  !! write attendance spiel 
+  act 'Leave': gt 'pushkin_sq'
+end
+
+!! Gymnastics
+
+if $ARGS[0] = 'gymnastics_courses':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Ballet Secrets - Gymnastics Class'
+  $setloc['StageImage'] =  '<<$default_img_path>>gymnastics'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+
+  !! write attendance spiel and some random reactions for post-exercise such that was a great workout, you didn''t feel you did well today
+  act 'Leave': gt 'pushkin_sq'
+end
+
+!! Ballet Courses Easy, Intermediate and advanced
+if $ARGS[0] = 'ballet_courses':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Ballet Secrets - Courses'
+  $setloc['StageImage'] =  '<<$default_img_path>>ballet_class'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+end
+
+  !! Gymnastics
+
+if $ARGS[0] = 'yoga_courses':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Ballet Secrets - Yoga Class'
+  $setloc['StageImage'] =  '<<$default_img_path>>yoga_class'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+  if balletqw['yoga_session'] ! daystart:
+    act 'Attend Yoga Class':
+      cla
+      balletqw['yoga_session'] = daystart
+      lesson_tier = rand(1,3)
+      if lesson_tier = 1:
+        gs 'exercise', 'tier1', 60, 'sprt', 'agil'
+      'You spend sixty minutes in an easy going class today, leaving you feeling refreshed and ready to face the world again.'
+      elseif lesson_tier = 2:
+
+
+        'You spend sixty minutes with your instructor today correcting your poses and providing advice on how you can improve, leaving you feeling tired and some muscle aches from the exercises.'
+        gs 'exercise', 'tier2', 60, 'sprt', 'agil'
+      else 
+        gs 'exercise', 'tier3', 60, 'sprt', 'agil', 'stren'
+        'Today''s sixty minutes was challenging with the instructor taking the class through some of the more demanding positions. Leaving many of your yoga buddies look more than a little bit ragged after todays session.'
+      end
+      pcs_willpwr += rand(1,lesson_tier)
+        !! Set minor pain to reflect exercising
+
+      gs 'pain', 2, 'legL', 'stretch'
+      gs 'pain', 2, 'legR', 'stretch'
+      gs 'pain', 2, 'shoulders', 'stretch'
+      gs 'pain', 2, 'armL', 'stretch'
+      gs 'pain', 2, 'armR', 'stretch'
+      gs 'pain', 2, 'back', 'stretch'
+      gs 'pain', 2, 'chest', 'stretch'
+
+      killvar 'lesson_tier'
+      act 'Return to the studio reception': gt $loc, 'reception'
+    end
+  else 
+    'There is another fitness class in progress and no more yoga sessions today.'
+  end
+  act 'Return to the studio reception': gt $loc, 'reception'
+end 
+
 !! Shopping
 if $ARGS[0] = 'clothing':
   gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
   $location_type = 'public_indoors'
   $setloc['StageTitle'] = 'Ballet Secrets - Dancewear'
-  $setloc['StageImage'] =  'pushkin/ballet_secrets'
+  $setloc['StageImage'] =  '<<$default_img_path>>sports_shop'
   $location_type = 'public_indoors'
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
+  act 'Leave': gt 'pushkin_sq'
 end
+
 !! Custom Tutus for quests/shows, ballet shoe fitting, clothing, physio items, portable ballet equipment (barre) etc.
 if $ARGS[0] = 'quest':
   gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
   $location_type = 'public_indoors'
   $setloc['StageTitle'] = 'Ballet Secrets'
-  $setloc['StageImage'] =  'pushkin/ballet_secrets'
+  $setloc['StageImage'] =  '<<$default_img_path>>quest'
+  $location_type = 'public_indoors'
+  gs 'themes', 'indoors'
+  gs 'core_library', 'stage_title'
+  act 'Leave': gt 'pushkin_sq'
+end
+
+if $ARGS[0] = 'food':
+  gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+  $location_type = 'public_indoors'
+  $setloc['StageTitle'] = 'Food Court'
+  $setloc['StageImage'] =  '<<$default_img_path>>food_court'
   $location_type = 'public_indoors'
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
+
+  'There is a small area set aside for vending machines to provide drinks and food. '
+  act 'Leave': gt 'pushkin_sq'
 end
 --- ballet_secrets ---------------------------------

locations/pushkin_ballet_class.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'pilates':
             minut += 50
             !! set Pain
             !! increase stats gain for endurance/strength.
-            gs 'exercise', 'tier1', 30, 'agil_exp', 'stren_exp'
+            gs 'exercise', 'tier1', 30, 'agil', 'stren'
             gs 'sweat', 'add', 20
             gs 'stat'
             gs 'core_library', 'stage_title'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'pilates':
         minut += 60
         !! set Pain
         !! increase stats gain for endurance/strength.
-        gs 'exercise', 'tier1', 30, 'agil_exp', 'stren_exp'
+        gs 'exercise', 'tier1', 30, 'agil', 'stren'
         gs 'sweat', 'add', 20
         gs 'stat'
         gs 'core_library', 'stage_title'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'first_lesson':
 
     if ballet_day = 1 :
         !! Set stats for modern dance
-        gs 'exercise', 'tier3', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+        gs 'exercise', 'tier3', 90, 'agil', 'stren', 'danc'
         gs 'sweat', 'add', 30
         pcs_sleep -= rand(1,10)
         gs 'stat'
@@ -184,7 +184,7 @@ if $ARGS[0] = 'first_lesson':
 
     if ballet_day = 2:
         !! Set stats for modern dance
-        gs 'exercise', 'tier3', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+        gs 'exercise', 'tier3', 90, 'agil', 'stren', 'danc'
         pcs_sleep -= rand(1,10)
         gs 'sweat', 'add', 30
         gs 'stat'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'first_lesson':
 
     if ballet_day = 3:
         !! Set stats for modern dance
-        gs 'exercise', 'tier4', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+        gs 'exercise', 'tier4', 90, 'agil', 'stren', 'danc'
         gs 'pain', 2, 'legL', 'stretch'
 	    gs 'pain', 2, 'legR', 'stretch'
 	    gs 'pain', 5, 'feet', 'stretch'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'first_lesson':
     if ballet_day = 4:
         !! Set stats for modern dance
 
-        gs 'exercise', 'tier3', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+        gs 'exercise', 'tier3', 90, 'agil', 'stren', 'danc'
         gs 'pain', 2, 'legL', 'stretch'
 	    gs 'pain', 2, 'legR', 'stretch'
 	    gs 'pain', 5, 'feet', 'stretch'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'first_lesson':
 
     if ballet_day = 5:
         ! Set stats for modern dance
-        gs 'exercise', 'tier2', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+        gs 'exercise', 'tier2', 90, 'agil', 'stren', 'danc'
         pcs_sleep -= rand(1,5)
         gs 'sweat', 'add', 30
         gs 'pushkin_ballet_init', 'daily_assessment'
@@ -431,7 +431,7 @@ if $ARGS[0] = 'second_lesson':
         minut = 0
     end 
     ! set stats for modern dance
-    gs 'exercise', 'tier2', 90, 'agil_exp', 'stren_exp', 'danc_exp'
+    gs 'exercise', 'tier2', 90, 'agil', 'stren', 'danc'
     pcs_sleep -= rand(1,5)
     gs 'sweat', 'add', 60   
     gs 'pushkin_ballet_init', 'daily_assessment'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'assessment':
 
     balletqw['school'] = 1
     pcs_sleep -= rand(10,20)
-    gs 'exercise', 'tier4', 180, 'agil_exp', 'stren_exp', 'danc_exp'
+    gs 'exercise', 'tier4', 180, 'agil', 'stren', 'danc'
     !! rank is the final assessment score to determine pass, fail or a potential fall into Randolph''s clutches.
     !!gs 'pushkin_ballet_init', 'famemodifier', 'rank'
     !! Maya friendship mechanics to be implemented after feedback on core game with how she reacts to you at the exams.

locations/pushkin_sq.qsrc

@@ -30,10 +30,16 @@ if week < 7 and hour >= 9 and hour <= 17:
 	'The long standing alternative clothing shop <a href="exec:gt ''shop_tsar_bomba'',''start''">Tsar Bomba</a> is unmistakable amongst the tourist shops on the main square.'
 	'Clothing for younger women is catered for in <a href="exec:gt ''shop_flamingos'',''start''">Flamingos</a>.'
 	'Catering for the burlesque club here there is the <a href="exec:gt ''shop_fancy_pancy'',''start''">Fancy Pancy</a> boutique clothing store.'
+	else
+	'Tsar Bomba, Flamingos and Fansy Pansy,  are all current closed, they are open open Mon - Sat day 9:00 - 18:00'
+end
+if week < 7 and hour >= 9 and hour <= 17:
+	'<a href="exec:gt ''ballet_secrets'',''init''">Ballet Secrets</a> is located at the end of a well maintained alleyway with a flamboyant ballet shop display and despite it''s name the premises offers a wide range of services for dancers and athletes. '
+elseif 	week = 7 and (hour >= 10 and hour <=16):
+	'The dance shop is closed, but you can still access the <a href="exec:gt ''ballet_secrets'',''init''">Members Area</a> with your card.'
 else
-	'Tsar Bomba, Flamingos and Fansy Pansy are all current closed, they are open open Mon - Sat day 9:00 - 18:00'
+	'Ballet Secrets is currently closed. The shop opens 09:00-17:00 Monday to Saturday, and members only access for class is open on Sunday from 10:00 - 17:00.'
 end
-
 if exhibitionQW > 3:
 	if week < 7 and hour >= 8 and hour <= 17:
 		'<a href="exec:gt ''exhibitionistshop'',''start''">Simply Salacious</a> is just down a small side street from here.'
@@ -64,7 +70,7 @@ act 'Walk to the Town Center (0:05)':minut += 5 & gt 'pushkin'
 
 if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
-act 'wait':gs 'obj_din', 'wait'
+act 'Wait':gs 'obj_din', 'wait'
 
 if $home['current'] = 'old_town_apartment':
 	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'