Merge branch 'Beta'

initial release for ballet and gad dacha updates, testing in progress - committed to sync repo. grandparents dacha is partially complete, requires schedules and tasks to be coded in. ballet classes in ballet secrets now added for skills progress testing.

glife.qproj

@@ -1171,6 +1171,7 @@
 		<Location name="gad_swampspring"/>
 		<Location name="gad_swamp_woods"/>
 		<Location name="gad_backwater"/>
+		<Location name="gp_elene_schedule"/>		
 	</Folder>
 	<Folder name="Gadyukino Characters">
 		<Location name="hunters"/>
@@ -1396,16 +1397,15 @@
 	<Folder name="Ballet_career">
 		<Location name="pushkin_ballet_init"/>
 		<Location name="core_library"/>
-		<Location name="ballet_npc"/>
-		<Location name="npc_3501_init"/>
-		<Location name="npc_3510_init"/>
+		<Location name="npc_274_init"/>
+		<Location name="npc_292_init"/>
 		<Location name="maya_residence"/>
 		<Location name="pushkin_ballet_center"/>
 		<Location name="pushkin_ballet_res"/>
 		<Location name="pushkin_ballet_class"/>
 		<Location name="pushkin_ballet_evt"/>
 		<Location name="ballet_global_evt"/>
-		<Location name="ballet_secrets"/>
+		<Location name="pushkin_ballet_secrets"/>
 		<Location name="marlilnsky_theatre"/>
 		<Location name="pushkin_theatre"/>
 		<Location name="st_petersburg_canals"/>

locations/city_canal.qsrc

@@ -0,0 +1,49 @@
+# city_canal
+!! Date Created: 14th May, 2024
+!! Modified date: 
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!!
+!! St Petersburg Canals
+!!
+!! Sub-location in St Petersburg for dates, boat rides and other events
+
+if $args[0] = 'init':
+    img_sel = rand(1,2)
+    if daystage = 2 or daystage = 3:
+        $setloc['StageImage'] =  'city_canals_day_<<img_sel>>'
+    else
+        $setloc['StageImage'] =  'city_canals_night_<<img_sel>>'
+    end
+    killvar img_sel
+end
+
+if $args[0] = 'content':
+    !! Main location content.
+
+    *clr & cla
+	$setloc['StageTitle'] = 'St Petersburg Canals'
+    gs 'city_canal', 'init'
+	$location_type = 'public_outdoors'
+	gs 'shortgs', 'setloc', 'city_canals', $ARGS[0]
+	gs 'stat'
+	gs 'core_library', 'stage_title'
+
+
+    'You stand gazing at the famous Canals of the North, the hustle and bustle of people on the streets against a backdrop of elegant Russian buildings. You see boatmen plying their trade on the waters below and working on their tour boats.'
+
+    !! Navigation
+
+    act 'Head to the Arts district': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take a boat trip (100)': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take the boats to Vasily Island (50)': msg 'not implented' & gt 'city_canal', 'content'
+
+end
+
+if $args[0] = 'dates':
+    !! For all date related activities.
+
+end
+
+
+--- city_canal ---------------------------------

locations/din_van.qsrc

@@ -157,6 +157,7 @@ $shower = {
 				*nl
 				'You grab the soap again and scrub yourself again, but it still feels like something is there, coating your skin. You scrub and scrub and scrub but it just won''t go away until you finally cry out, throwing it into the corner. Tremors begin coursing through your body and you slowly sink down onto the shower floor, where you remain, sobbing while the water continues raining down on you.'
 
+
 				dynamic $dryOff
 			end
 		elseif pcs_horny >= 40:
@@ -189,8 +190,10 @@ $shower = {
 			end
 		end
 
+
 		gs 'selfplay', 'shower_dildo_check'
 
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
@@ -283,6 +286,7 @@ $bath = {
 			dynamic $dryOff
 		end
 
+
 		gs 'selfplay', 'bathtub_dildo_check'
 
 		act 'Take a selfie':
@@ -306,6 +310,7 @@ $SkinCare = {
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/skincare.jpg"></center>'
 			'You get out your skin care products and apply them, the creams feel cool and nice against your skin. You sometimes wonder if all this effort and money is worth it, but one look in the mirror at your skin and you figure it is.'
 
+
 			gs 'body', 'SkinGain', 'Moisturizer'
 			gs 'stat'
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
@@ -332,6 +337,7 @@ $brit = {
 							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
 							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
 						else
+							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
 							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 						end
@@ -360,6 +366,7 @@ $brit = {
 					elseif pubestyle = 11:
 						$shave_act = 'Shave your legs and pussy'
 						if pcs_pubes <= 10:
+							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
 						else
@@ -369,6 +376,7 @@ $brit = {
 						$shave_act = ''
 					end
 
+
 					if $shave_act ! '':
 						act '<<$shave_act>> (0:15)':
 							menu_off = 1
@@ -415,6 +423,7 @@ $brit = {
 				if pubestyle = 1:
 					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
+						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
 					else
@@ -716,6 +725,7 @@ $publicpan = {
 	!! Changing into a different outfit for prostitution
 	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
 		gs 'prostitution_functions', 'work_clothes'
+		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
 		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
 			act 'Change into prostitute outfit': gt 'prostitution_functions', 'change_to_work', 'restroom'
 		elseif prostitute['work_clothes'] and prostitute['changed_for_work']:
@@ -910,6 +920,7 @@ $basin = {
 		end
 	end
 
+
 	if KandidozOnce = 1 and KandidNapr > 0:
 		act 'Use antifungal Medication':
 			*clr & cla
@@ -1087,6 +1098,7 @@ if $ARGS[0] = 'private':
 		'You have <b><<mc_inventory[''tampons'']>></b> tampons.'
 	end
 
+
 	if mc_inventory['sanitary_pads'] = 1 and tampon['warning'] ! daystart:
 		tampon['warning'] = daystart
 		msg'<font color="red">You only have <b><<mc_inventory[''sanitary_pads'']>></b> pad left!</font>'
@@ -1098,6 +1110,7 @@ if $ARGS[0] = 'private':
 
 	'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =  1, 'application.', 'applications.')
 
+
 	if $ARGS[1] = 'hotelroom':
 		dynamic $shower
 		if $ARGS[2] = 'bath': dynamic $bath
@@ -1147,6 +1160,13 @@ if $ARGS[0] = 'private':
 		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
 	end
 
+	if mc_inventory['hair_extensioncream'] > 0:
+		'<a href="exec:gs ''drugs'', ''hair_extensioncream'' & gt $loc, $loc_arg">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
+	end
+	if mc_inventory['butt_injection'] > 0:
+		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
+	end
+
 	if mc_inventory['breastcream'] > 0:
 		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
@@ -1208,6 +1228,7 @@ if $ARGS[0] = 'private':
 
 	dynamic $enema
 
+
 	dynamic $palelady
 
 
@@ -1279,6 +1300,7 @@ if $ARGS[0] = 'private':
 				'The test shows one band. You are not pregnant.'
 				act 'Sigh in relief': gt 'din_van', 'ReliefReact'
 
+
 				act 'Sigh in disappointment': gt 'din_van', 'DisappointedReact'
 			end
 
@@ -1803,6 +1825,7 @@ if $ARGS[0] = 'shave_options':
 	!! ROW 1: IMAGES
 		*p '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD>'
 
+
 		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 2)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
@@ -1864,6 +1887,7 @@ if $ARGS[0] = 'shave_options':
 		$temp_pube_image = FUNC('$pube_image', 26, pcs_pubecol[2], 10)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
 
+
 	!! ROW 2: TEXT
 		*p '<TR><TD><center>'
 		if pubestyle ! 6 and pcs_pubes > 15:

locations/gad_gpbath.qsrc

@@ -25,6 +25,8 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
 	'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
 	'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
+	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">scales</a>.'
+	
 	gs 'stat'
 
 	gs 'gad_gpbath', 'set_leave_acts'

locations/gp_elene_schedule.qsrc

@@ -0,0 +1,53 @@
+# gp_elene_schedule
+!! Date Created: 15th May, 2024
+!! Version: .01
+!! Author: Myles Croft
+!!
+!! Sveta''s Grandmother in Gad npc id A31
+!!
+$locat['elene'] = ''
+
+!! scheduled weekday events.
+
+if week <= 7:
+    if (hour > 5 and hour < 7) or (hour  = 12 or hour = 13) or  hour = 18:
+        $locat['elene'] = 'kitchen'
+    end
+    if day ! 7 and hour = 13:
+        $locat['elene'] = 'sauna'
+    end
+    if (hour >= 14 and <= 17) or (hour >= 19 and hour <= 20):
+        $locat['elene'] = 'lounge'
+    end
+    if hour > 21 and < 6:
+        $locat['elene'] = 'bed'
+    end
+end
+if day <= 3 and (hour >= 8 and hour <= 11):
+    loc_switch = rnd(0,1)
+    if loc_switch = 0 and sunWeather = 1:
+        $locat['elene'] = 'garden'
+    else
+        locat['elene'] = 'lounge'
+    end
+    killvar 'loc_switch'
+end
+if week = 6 or week = 7:
+    if day = 6 and (hour = 19 or hour = 20)
+        $locat['elene'] = 'church'
+    end
+    if  day = 7 and (hour >= 9 or hour <= 11):
+        $locat['elene'] = 'church'
+    end
+    if day =  7 and (hour  = 13 or hour = 14):
+        $locat['elene'] = 'kitchen'
+    end
+end
+
+if day = 5 or day = 6 and (hour >= 8 or hour <= 11):
+    $locat['elene'] = 'village'
+elseif day = 7 and hour = 8
+    $locat['elene'] = 'village'
+end
+
+--- gp_elene_schedule ---------------------------------

locations/npcstatic6.qsrc

@@ -563,6 +563,129 @@ npc_spermpot['A<<npctemp>>'] = 11000
 hotcat_rating['A<<npctemp>>'] = 8
 npc_haircol['A<<npctemp>>'] = 1
 
+!! Set up ballet school dramatis personae
+
+!! Pushkin Ballet School Students - Year one school start
+!! Incorporated May, 2024 from ballet - Myles
+
+npctemp = 274
+$npc_firstname['A<<npctemp>>'] = 'Maya'
+$npc_nickname['A<<npctemp>>'] = 'Maya'
+$npc_lastname['A<<npctemp>>'] = 'Semionova'
+$npc_usedname['A<<npctemp>>'] = 'Maya'
+$npc_notes['A<<npctemp>>'] = 'Maya is the daughter of Anitchka a freelance coryphée, she was encouraged to dance from a young age until she was nine when she started doing gymnastics. This changed when she was eleven when her mother became ill and she was asked to carry on the family tradition. Maya is a naturally gifted dancer and after six years is tipped to become one of Russia''s leading stars in the future.'
+npc_dob['A<<npctemp>>'] = 19990502
+npc_gender['A<<npctemp>>'] = 1
+npc_bust['A<<npctemp>>'] = 14
+npc_intel['A<<npctemp>>'] = 75
+hotcat_rating['A<<npctemp>>'] = 8
+gs 'npcstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
+gs 'npcstaticdefaults', 'body', 'model'
+
+!! mod appearance NPC settings, height in cm, weight in kg
+$npc_haircolour['A<<npctemp>>'] = 'Blonde'
+$npc_eyecolour['A<<npctemp>>'] = 'blue'
+$npc_height['A<<npctemp>>'] = 160
+$npc_weight['A<<npctemp>>'] = 50 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
+
+npctemp = 275
+!! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta's activities.
+!! will try and blackmail Sveta into either giving up if she learns if she's has dirty secrets such as prostitution, slut rep, etc or passing the information to Rudolph to destroy her career to remove her as competition.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 276
+!! Tanis Komarova - Bitchy dancer who thinks she''s already the Principle Dancer. Age 17. Future concept as the class bully to other dancers and students.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
+
+npctemp = 277
+!! Galina Molchalina - Quiet and shy student, age 16. Highly secretive and doesn't engage with the class, she also has a nervous personality as if she's afraid. This comes from her family being marked as 'radicals' by the old KGB and under constant watch from FSB even to this day.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
+
+npctemp = 278
+!! Taisiya Lebedeva - The eldest student, and an elegant beauty, Age 18. A quiet, but captivating beauty who has a enchanting charismatic presence that men can't keep their eyes off her leading to bitchy remarks from other girls. 
+!! She''s oblivous to her beauty instead focusing on acting and dance. (side note: surname is one of the most common in St P.), she's got a strong religous personality.
+!! Character model: Malta Aurelie
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 279
+!! Nikita Volkova - Bronya''s daughter. Age 16. Keep fit fanatic, and does tap, ballet, etc. As Bronya's daughter she's been given privileged access to the school, whilst not a great talent she's still one of the best dance students at the school but just not at ballet despite Bronya's hopes.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 280
+$npc_firstname['A<<npctemp>>'] = 'Gasha'
+$npc_nickname['A<<npctemp>>'] = 'Gasha'
+$npc_lastname['A<<npctemp>>'] = 'Morozova'
+$npc_usedname['A<<npctemp>>'] = 'Gasha'
+$npc_notes['A<<npctemp>>'] = 'The youngest in the class at 15, close friend of Nikita as the grew up in the same village. Nikita and Galina are often seen in each others company in the local coffee shop and rarely seen alone leading to rumours. She''s a bit of a foodie, and love sweet things which conflicts with keeping in shape for her dance career.'
+npc_dob['A<<npctemp>>'] = 20000705
+npc_gender['A<<npctemp>>'] = 1
+npc_bust['A<<npctemp>>'] = 9
+npc_intel['A<<npctemp>>'] = 50
+hotcat_rating['A<<npctemp>>'] = 6
+gs 'npcstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
+gs 'npcstaticdefaults', 'body', 'model'
+
+!! mod appearance NPC settings, height in cm, weight in kg
+$npc_haircolour['A<<npctemp>>'] = 'Brunette'
+$npc_eyecolour['A<<npctemp>>'] = 'Blue'
+$npc_height['A<<npctemp>>'] = 145
+$npc_weight['A<<npctemp>>'] = 40 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
+
+!! Calina
+npctemp = 290
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+!! Ruza
+npctemp = 291
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+!! Calina and Ruza Sokolova - Twin dancers. Not interested in ballet, but took the course to further their education into becoming dancers. Age 17. They also professional models with a Moscow agency. 
+!! Adel and Alina Fakhteeva twins?
+
+!! Ballet Staff 
+
+npctemp = 292
+$npc_firstname['A<<npctemp>>'] = 'Rudolf'
+$npc_nickname['A<<npctemp>>'] = 'Rudolf '
+$npc_lastname['A<<npctemp>>'] = 'Baryshnikov'
+$npc_usedname['A<<npctemp>>'] = 'Rudolf'
+npc_dob['A<<npctemp>>'] = 19820920
+$npc_notes['A<<npctemp>>'] = 'Rudolf is a charming and handsome man, he was on course to become one of Russia''s best ballet dancers until a stage accident cut short his career. Today he works at the dance school as a instructor, agent and a board member. Many rumours about his life have swirled around him over the years but none have been proven.'
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'slim'
+npc_dick['A<<npctemp>>'] = 10
+npc_sexskill['A<<npctemp>>'] = 2
+npc_intel['A<<npctemp>>'] = 67
+hotcat_rating['A<<npctemp>>'] = 8
+npc_spermpot['A<<npctemp>>'] = 15000
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/rudolph'
+
+!! class teacher: Biserka Ananiashvili
+npctemp = 293
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! class teacher/pianist: Sofia Solovyova
+npctemp = 294
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! Residential Warden: Bronya Volkova and former violinist, strict but fair has two daughters with Nikita being the youngest training to be a ballet dancer and her eldest in Germany training to be a surgeon. 
+npctemp = 295 
+$npc_firstname['A<<npctemp>>'] = 'Bronya'
+$npc_nickname['A<<npctemp>>'] = 'Bronya '
+$npc_lastname['A<<npctemp>>'] = 'Volkova'
+$npc_usedname['A<<npctemp>>'] = 'Bronya'
+gs 'npcstaticdefaults', 'defaults'
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! NPC temp: 296 - Physio - Pelageya Makarova
+
+!! 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
 
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp

locations/pushkin_ballet_class.qsrc

@@ -24,8 +24,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Terpsichore Wing'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall.jpg'
-
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/hall.jpg'
 	!! clear switch vars
 	killvar 'sharedmeal' 
 	$balletEv['trigger'] = ''
@@ -46,10 +45,10 @@ if $ARGS[0] = 'start':
 		gs 'core_library', 'stage_title'
 		*nl
 		if mayaqw['grave'] = 4:				
-			'You''ve done it. You''ve survived until the end of the week. Then, <<$npc_firstname[''A3501'']>>. runs up to you and gives you a big hug. "What''s that for?" you ask. "For being a friend and my dance partner," she says with a big smile.'
+			'You''ve done it. You''ve survived until the end of the week. Then, <<$npc_firstname[''A274'']>>. runs up to you and gives you a big hug. "What''s that for?" you ask. "For being a friend and my dance partner," she says with a big smile.'
 			'It''s been great to meet you, <<$pcs_nickname>>. I hope we meet again and can work together." You pretend to think for a moment and see the worried expression on her face. "Sure, it''s been fantastic to meet you, and I''ll keep in touch."'
 		elseif mayaqw['grave'] < 4:
-			'You''ve done it. You''ve survived until the end of the week. Then, <<$npc_firstname[''A3501'']>>. comes up to you and gives you a quick hug. "What''s that for?", you ask. '
+			'You''ve done it. You''ve survived until the end of the week. Then, <<$npc_firstname[''A274'']>>. comes up to you and gives you a quick hug. "What''s that for?", you ask. '
 			'"For being my dance partner!" she says with a smile.'
 			'"It''s been wonderful to meet you, <<$pcs_nickname>>. I hope we meet again and can work together."'
 			'"Sure, it''s been great to meet you too, I''ll keep in touch. Once I know my results, I''ll let you know.'
@@ -58,7 +57,7 @@ if $ARGS[0] = 'start':
 		*nl
 		'At that moment, Birserka comes out of the examination room. "Thank you all for attending this week. I hope you all had a great experience and have taken these lessons to heart." You and your class murmur together in agreement.'
 		'"The school will be in touch in a few weeks to give your assessment marks and if we have decided to grant you a place in our apprenticeship program." '
-		'You know the places are going to be hard fought over, and you glance at <<$npc_firstname[''A3501'']>>.'
+		'You know the places are going to be hard fought over, and you glance at <<$npc_firstname[''A274'']>>.'
 		'She gives you a wink indicating she has confidence in your acceptance into the school.'
 		*nl
 		'You grab a shower before you leave to catch the bus that is waiting for you outside. Standing next to it is Biserka, who addresses you all once you''ve gathered. "I wish you all the best for your future." With that, Birserka returns back into the school.'
@@ -82,14 +81,10 @@ if $ARGS[0] = 'pilates':
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	$setloc['StageTitle'] = 'Pilates'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/pilates_2.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/pilates_2.jpg'
 	nclass = 1
 	if ballet_day = 1:
-
-		if minut > 0:
-			minut = 0
-		end
-		hour = 8
+		minut = (8 - hour) * 60
 		gs 'stat'
 		gs 'core_library', 'stage_title'
 
@@ -102,7 +97,6 @@ if $ARGS[0] = 'pilates':
 		cla
 		act 'Start Pilates':
 			*clr & cla
-			minut += 50
 			!! set Pain
 			!! increase stats gain for endurance/strength.
 			gs 'exercise', 'tier1', 30, 'agil', 'stren'
@@ -119,17 +113,11 @@ if $ARGS[0] = 'pilates':
 			'"Yoga is about spirituality and flexibility, and Pilates is about strengthening your mind and core body."'
 			'"Excellent answer, that''s why we will do pilates each morning. If you do yoga exercises, then you will find this easy."'
 			'With that, Biserka leads the class through strenuous exercises designed to strengthen and stretch your muscles. After an hour, your body slightly aches from the warm-up exercises.'
-
 			act 'Next class': gt 'pushkin_ballet_class', 'first_lesson'
 		end
 
 	elseif ballet_day => 2:
 		*clr & cla
-		if minut > 0:
-			minut = 0
-		end
-		hour = 8
-		minut += 60
 		!! set Pain
 		!! increase stats gain for endurance/strength.
 		gs 'exercise', 'tier1', 30, 'agil', 'stren'
@@ -139,21 +127,19 @@ if $ARGS[0] = 'pilates':
 		'You all file into the class for your pilates lesson. It''s a different teacher today. Still, before you can settle in, she''s already guiding you on how to use the various bits of equipment. After an hour, your muscles ache from the exercises.'
 		'"Remember, students, stretching, warm-ups and a disciplined fitness regime are needed to be a dancer. You''re an elite athlete. Remember this at all times." You notice Gasha blush in the back and wonder what caused that reaction. You grab a quick drink of water at the end of the class before heading to your next class.'
 		pcs_hydra += 30
-
 		act 'Next class': gt 'pushkin_ballet_class', 'first_lesson'
 	end
 end
 
 if $ARGS[0] = 'first_lesson':
 	*clr & cla
-	hour = 9
-	minut = 0
-	pcs_sleep -= rand(1,10)
+	minut = (9 - hour) * 60
 	gs 'pushkin_ballet_init', 'daily_assessment'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	$setloc['StageTitle'] = 'Dance Class'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_002.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_class_002.jpg'
+	gs 'exp_gain', 'perform', rand(1,2)
 	nclass = 2
 	gs 'stat'
 
@@ -161,7 +147,6 @@ if $ARGS[0] = 'first_lesson':
 		!! Set stats for modern dance
 		gs 'exercise', 'tier3', 90, 'agil', 'stren', 'danc'
 		gs 'sweat', 'add', 30
-		pcs_sleep -= rand(1,10)
 		gs 'stat'
 		gs 'core_library', 'stage_title'
 
@@ -171,26 +156,25 @@ if $ARGS[0] = 'first_lesson':
 		'"You." Biserka points to another student. "I''m Taisiya Lebedeva." You look at her effortless grace in envy as she curtseys to Birserka. You noticed her captivating beauty when you entered the studio earlier in the morning.'
 		'Biserka points to another student. "Kima Agapova," Kima calls out, also performing another elegant curtsey. Biserka keeps pointing out the students who introduce themselves, and you finally get your chance to introduce yourself to the class.'
 		'"Now we''ve introduced yourselves. I will assign your study partner for this week." Biserka starts calling out names, and the girls move into pairs as they''re assigned.'
-		'"<<$pcs_nickname>> is fine <<$npc_firstname[''A3501'']>>", you reply.'
+		'"<<$pcs_nickname>> is fine <<$npc_firstname[''A274'']>>", you reply.'
 		'Biserka moves to the front of the class and claps her hands for attention. She nods to Sofia, who sits at the piano and starts playing. Biserka starts a nearly flawless ballet routine demonstrating her elegance and mastery of what she teaches.'
 		'Once Biserka stops her performance, she thanks Sofia and turns back to the class.'
 		'"That is what I expect from you this week. You have been all shortlisted as the best dancers in this area, and I expect no less from you all. Topics this week will include basic technique, classical performances, divertissement, and Pas de Deux. In addition, there will be an informal grading assessment on Saturday, of which the three best dancers will be offered to join the theatre."'
 		'For the next hour, Biserka puts you through a series of demanding exercises going to each girl to guide her posture with a quick word or touch.'
 		*nl
 		'The lesson concluded with the traditional Reverence to Biserka and Sofia.'
-				
+		
 		act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
 	end
 
 	if ballet_day = 2:
 		!! Set stats for modern dance
 		gs 'exercise', 'tier3', 90, 'agil', 'stren', 'danc'
-		pcs_sleep -= rand(1,10)
 		gs 'sweat', 'add', 30
 		gs 'stat'
 		gs 'core_library', 'stage_title'
 
-		'You sit in the class, take your ballet shoes out of your shoe bag, and fit them on. <<$npc_firstname[''A3501'']>> comes over to talk to you and starts giving tips on your ballet shoes and how to wear them. You give her a quick smile and thank her when Biserka walks through the door. She claps her hands to get everyone''s attention.'
+		'You sit in the class, take your ballet shoes out of your shoe bag, and fit them on. <<$npc_firstname[''A274'']>> comes over to talk to you and starts giving tips on your ballet shoes and how to wear them. You give her a quick smile and thank her when Biserka walks through the door. She claps her hands to get everyone''s attention.'
 		'"Yesterday showed me what you were all capable of. Today we are going through the assessment requirements. The assessment is for both group and individual routines. I expect everyone here to diligently practice with their assigned partners over the next week."'
 		'"Do I make myself clear?" There''s a chorus of ''Yes, Ms. Ananiashvili.'' She looks over the class, gauging her students'' expressions. "Excellent, now I want everyone to team up with your partner and, today, we will concentrate on your form and poise."'
 
@@ -207,19 +191,18 @@ if $ARGS[0] = 'first_lesson':
 		gs 'pain', 2, 'legL', 'stretch'
 		gs 'pain', 2, 'legR', 'stretch'
 		gs 'pain', 5, 'feet', 'stretch'
-		pcs_sleep -= rand(5,10)
 		gs 'sweat', 'add', 30
 		gs 'pushkin_ballet_init', 'daily_assessment'
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_003.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_class_003.jpg'
 		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.'
 		'You see Biserka standing close to Sofia, going over a musical score. You can''t help but wonder if they''re more than friends because of how close they are and how Biserka''s hand is resting on Sofia''s shoulder. She looks up as the class enters the room with a start and quickly moves away.'
 		'"Today, we''re concentrating on your group assessment routine. This is what you will be graded on." She doesn''t sound like her commanding self and is slightly flustered. Still, it''s only momentary as she starts moving you all into a group.'
 		'"The routine will be a revised Entrance of the Swans from Swan Lake as part of the Corp de Ballet. There will be no Principle Dancer. Instead, you will concentrate purely on working as the Corp on this performance. You will be assessed on both your performance and will perform with your fellow dancers."'
-		'You realize that you will be assessed on one of the most demanding routines the Corp can perform. It requires an inordinate amount of concentration and timing to pull off. You look at <<$npc_firstname[''A3501'']>> and see by the expression on her face the same thoughts must be going through her head.'
-		'"You were chosen as the best this Oblast has, so I expect you to perform your best. Have any of you performed Swan Lake here?" Biserka asks. <<$npc_firstname[''A3501'']>> and Kima both put up their hands. Biserka nods. "Good. You will take the lead as Coryphée for your respective groups, the class will split into two groups of five, and Sofia will play the opening scene on the piano."'
+		'You realise that you will be assessed on one of the most demanding routines the Corp can perform. It requires an inordinate amount of concentration and timing to pull off. You look at <<$npc_firstname[''A274'']>> and see by the expression on her face the same thoughts must be going through her head.'
+		'"You were chosen as the best this Oblast has, so I expect you to perform your best. Have any of you performed Swan Lake here?" Biserka asks. <<$npc_firstname[''A274'']>> and Kima both put up their hands. Biserka nods. "Good. You will take the lead as Coryphée for your respective groups, the class will split into two groups of five, and Sofia will play the opening scene on the piano."'
 		'What follows for the next hour and a half can only be described as hell. Gone was the comforting Biserka of the last few days. Instead, she drives all the students hard, criticising all mistakes, leaving Galina close to tears.'
 		act 'Conclude lesson':
 			*clr & cla
@@ -227,8 +210,8 @@ if $ARGS[0] = 'first_lesson':
 			*nl
 			'The class concludes with you performing an adagio culminating in a ports de bras for your Reverence.'
 			*nl
-			'As you finish the reverence, you realize your feet and body ache not so much from the dancing but from the demands of standing still during the performance. So you drag yourself up from the ground after removing the tape and your ballet shoes, then stow them back in your bag after checking if they''re safe to use.'
-			'<<$npc_firstname[''A3501'']>> approaches you. "Don''t worry about the class, Sveta. Biserka was too hard on everyone. You all performed as well as you could without having done this before." Her words comfort you, but you still have doubts.'
+			'As you finish the reverence, you realise your feet and body ache not so much from the dancing but from the demands of standing still during the performance. So you drag yourself up from the ground after removing the tape and your ballet shoes, then stow them back in your bag after checking if they''re safe to use.'
+			'<<$npc_firstname[''A274'']>> approaches you. "Don''t worry about the class, Sveta. Biserka was too hard on everyone. You all performed as well as you could without having done this before." Her words comfort you, but you still have doubts.'
 			'"Come on, we have to get ready!" she exclaims as you both hurry to get a shower before attending your next class.'
 
 			act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
@@ -242,7 +225,6 @@ if $ARGS[0] = 'first_lesson':
 		gs 'pain', 2, 'legL', 'stretch'
 		gs 'pain', 2, 'legR', 'stretch'
 		gs 'pain', 5, 'feet', 'stretch'
-		pcs_sleep -= rand(5,10)
 		gs 'sweat', 'add', 60
 		gs 'pushkin_ballet_init', 'daily_assessment'
 		gs 'stat'
@@ -250,9 +232,9 @@ if $ARGS[0] = 'first_lesson':
 
 		'After yesterday''s rehearsals, you sense an air of both anticipation and dread for today''s lesson. Biserka is waiting in the class for you all to arrive.'
 		'"Welcome. Today we will go over the Entrance. Any questions?" Silence greets Biserka''s question. "Good, let us proceed. Sofia, from the start."'
-		'You split into your two groups, and you follow <<$npc_firstname[''A3501'']>>. She places your second line to follow her and help guide the students behind you into the routine. Unfortunately, it''s another demanding routine, and Biserka doesn''t give much time to relax.'
+		'You split into your two groups, and you follow <<$npc_firstname[''A274'']>>. She places your second line to follow her and help guide the students behind you into the routine. Unfortunately, it''s another demanding routine, and Biserka doesn''t give much time to relax.'
 		'When you get a bit of breathing space, you quickly eat an energy bar before Biserka finishes working with the other group. Now it''s your turn to practice.'
-		'As you finish, Biserka tells the class, "Tomorrow, you will wear the Ballet Blanc provided for the rehearsals. I will be assessing you on your attire and presentation before your actual assessment on Saturday. So please ensure you are ready and here at 0900 sharp."' 
+		'As you finish, Biserka tells the class, "Tomorrow, you will wear the Ballet Blanc provided for the rehearsals. I will be assessing you on your attire and presentation before your actual assessment on Saturday. So please ensure you are ready and be here at 0900 sharp."' 
 		*nl
 		'The class concludes with you repeating the previous day''s routine for your Reverence.'
 
@@ -262,14 +244,13 @@ if $ARGS[0] = 'first_lesson':
 	if ballet_day = 5:
 		! Set stats for modern dance
 		gs 'exercise', 'tier2', 90, 'agil', 'stren', 'danc'
-		pcs_sleep -= rand(1,5)
 		gs 'sweat', 'add', 30
 		gs 'pushkin_ballet_init', 'daily_assessment'
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_005.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_class_005.jpg'
 		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.'
+		'<<$npc_firstname[''A274'']>> grabs your attention, "Hey, <<$pcs_nickname>>, let''s check you over quickly.". <<$npc_firstname[''A274'']>> 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':
@@ -279,7 +260,7 @@ if $ARGS[0] = 'first_lesson':
 			'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.jpg'
+				$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_teach_1.jpg'
 				gs 'core_library', 'stage_title'
 				'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."'
@@ -287,7 +268,7 @@ 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
-					$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/events/reverance.jpg'
+					$setloc['StageImage'] = '<<$default_img_path>>ballet_school/events/reverance.jpg'
 					gs 'core_library', 'stage_title'
 					'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.'						   
@@ -305,6 +286,8 @@ if $ARGS[0] = 'shower':
 	*nl
 	$setloc['StageTitle'] = 'School Showers'
 	$setloc['StageImage'] =  'locations/pushkin/ballet_school/daily/shower_1.jpg'
+
+	$setloc['StageImage'] = 'locations/pushkin/ballet_school/daily/shower_1'
 	if nclass > 1:	  
 		$location_type = 'public'
 		gs 'themes', 'indoors'
@@ -342,31 +325,29 @@ if $ARGS[0] = 'makeup':
 	!! Face Paint The Story of Makeup, Lisa Eldridge 
 
 	*clr & cla
-	if minut > 0:
-		minut = 0
-	end
+	minut = (11 - hour) * 60
 	$setloc['StageTitle'] = 'Theatre Make Up'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/first_mua.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/first_mua.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	! set stats for make up gain - makupskl_lvl
 	gs 'exp_gain', 'intel', rand(1,2)
+	gs 'exp_gain', 'makeupskl', rand(1,2)
 	makupskl_lvl += rand(1, 3)
-	pcs_sleep -= rand(1,3)
 	!pcs_makeup = 4
 	gs 'pushkin_ballet_init', 'daily_assessment'
 	nclass = 3
 	gs 'stat'
 
-	if ballet_day = 1 :
+	if ballet_day = 1:
 		gs 'core_library', 'stage_title'
 		'"Welcome. On your desk you will find a make-up box with most of what you need. You will also need to provide your own moisturiser and foundation. All dancers are expected to do their own make-up for rehearsals and shows."'
 		'The teacher continues to rattle on without introducing herself, going over the different make-up in front of you and the various brushes and applicators. You soon feel overwhelmed by the amount of information from the lesson.'
 		'However, after ten minutes, the teacher relents and starts to hand out makeup charts and tip pamphlets. In addition, the teacher hands out two books, one by Lisa Elridge and one by Kevin Aucoin, to help give additional information on 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.'
+		'<<$npc_firstname[''A274'']>> 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'] =  '<<$default_img_path>>ballet_school/daily/second_mua.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/second_mua.jpg'
 		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.'
@@ -377,7 +358,7 @@ if $ARGS[0] = 'makeup':
 		gs 'core_library', 'stage_title'
 		'"Today, I''m going to assess the results of your homework. You have 30 minutes to achieve this look." She then points to the make-up chart on the wall covering the details and colours required.'
 		'You open your makeup bag and quickly apply the look on the chart. Unfortunately, it''s stressful, and there''s little time to think as you concentrate on applying the look.'
-		'You quickly glance at <<$npc_firstname[''A3501'']>>, who gives you an encouraging smile and then she turns back to finish her own look.'
+		'You quickly glance at <<$npc_firstname[''A274'']>>, who gives you an encouraging smile and then she turns back to finish her own look.'
 	
 	elseif ballet_day = 4:
 		gs 'core_library', 'stage_title'
@@ -391,7 +372,7 @@ if $ARGS[0] = 'makeup':
 		'"You all have your partners, so today, you will help each other prepare for your assessment. If you end up working together in future, you will help each other during rehearsals and shows, and if you are capable, the rest of your Corp."'
 		'"As dancers, we all look after each other. Remember this!" She says the last few words with strong emphasis, reminding you that ballet is as much a team effort as it is about self-discipline. "Now class, split up and work with your partner. If you need assistance, put your hand up."'
 		'"Your guidelines for the exam are as follows: Your hair must be in a bun, ensuring your face and neck aren''t obscured. If needed, use pins and ensure there are no hair wisps. No jewellery is to be worn except ear studs. Make-up must be complimentary and kept to a minimum. Remember to use your setting powder. Any questions? Good, carry on."'
-		'Today your teacher is more active, going between the various students, and complimenting or advising them as required. You see her have a short conversation with Nikita, and you''re curious about what it was about before <<$npc_firstname[''A3501'']>> grabs your attention to carry on with practicing your makeup.'
+		'Today your teacher is more active, going between the various students, and complimenting or advising them as required. You see her have a short conversation with Nikita, and you''re curious about what it was about before <<$npc_firstname[''A274'']>> grabs your attention to carry on with practising your makeup.'
 	end
 
 	act 'Grab lunch' : gt 'pushkin_ballet_class', 'lunch'
@@ -401,7 +382,7 @@ if $ARGS[0] = 'lunch':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'pushkin_ballet_class', $ARGS[0]
 	$setloc['StageTitle'] = 'School Cafeteria'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/cafeteria.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/cafeteria.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	!! gs lunch events
@@ -422,69 +403,66 @@ end
 
 if $ARGS[0] = 'second_lesson':
 	*clr & cla
-	hour = 13
-	if minut > 0:
-		minut = 0
-	end 
+	minut = (13 - hour) * 60
 	! set stats for modern dance
 	gs 'exercise', 'tier2', 90, 'agil', 'stren', 'danc'
-	pcs_sleep -= rand(1,5)
+	gs 'exp_gain', 'perform', rand(1,2)
 	gs 'sweat', 'add', 60   
 	gs 'pushkin_ballet_init', 'daily_assessment'
 	nclass = 4
 	gs 'stat'
 	$setloc['StageTitle'] = 'Dance Practice'
 	if mayaqw['grave'] = 4:
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/mirror_ballet.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/mirror_ballet.jpg'
 	else
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/class_three.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/class_three.jpg'
 	end
 	gs 'core_library', 'stage_title'
-	if ballet_day = 1 :
+	if ballet_day = 1:
 		!!  32-count combination
 
 		'"Class, listen up," Biserka calls out. "You are going to team up with your dance partner to practice barre work and to do the pas de deux as your centers which will form your assessment."'
-		'You walk over to <<$npc_firstname[''A3501'']>>, "Hey, <<$pcs_nickname>>, are you ready?". Then, you work with <<$npc_firstname[''A3501'']>> to go through the various movements of Plié, Elevé, Battement Tendu and Rond de Jambe.'
+		'You walk over to <<$npc_firstname[''A274'']>>, "Hey, <<$pcs_nickname>>, are you ready?". Then, you work with <<$npc_firstname[''A274'']>> to go through the various movements of Plié, Elevé, Battement Tendu and Rond de Jambe.'
 		'Once you finish the Barre exercises, Biserka switches on a projector. "Here are your movements for your pas de deux. Please continue to the center, and I will observe your performances."'
-		'You and <<$npc_firstname[''A3501'']>> quickly study the chart and wait for Sofia to start playing on the piano. Then, with a count, you start to go through the movements, <<$npc_firstname[''A3501'']>> helping you call out the next position."'
-		'This doesn''t go unnoticed by Biserka, and once the movement is finished, she calls <<$npc_firstname[''A3501'']>> over, "You seem to have memorised this the first time. Let''s see if you can perform this with me."'
-		'She changes the image on the projector and lets <<$npc_firstname[''A3501'']>> study it for a few moments. "Ready?" she asks, and <<$npc_firstname[''A3501'']>> nods. "Let us begin. Sofia?"'
-		'The following five minutes of performance pushed <<$npc_firstname[''A3501'']>> hard, and you watch in amazement how well she performed following Biserka''s lead.'
-		'Once the performance is done, Biserka and <<$npc_firstname[''A3501'']>> curtsy to each other, and <<$npc_firstname[''A3501'']>> comes over to you. You hand over her towel and water bottle.'
+		'You and <<$npc_firstname[''A274'']>> quickly study the chart and wait for Sofia to start playing on the piano. Then, with a count, you start to go through the movements, <<$npc_firstname[''A274'']>> helping you call out the next position."'
+		'This doesn''t go unnoticed by Biserka, and once the movement is finished, she calls <<$npc_firstname[''A274'']>> over, "You seem to have memorised this the first time. Let''s see if you can perform this with me."'
+		'She changes the image on the projector and lets <<$npc_firstname[''A274'']>> study it for a few moments. "Ready?" she asks, and <<$npc_firstname[''A274'']>> nods. "Let us begin. Sofia?"'
+		'The following five minutes of performance pushed <<$npc_firstname[''A274'']>> hard, and you watch in amazement how well she performed following Biserka''s lead.'
+		'Once the performance is done, Biserka and <<$npc_firstname[''A274'']>> curtsy to each other, and <<$npc_firstname[''A274'']>> comes over to you. You hand over her towel and water bottle.'
 		'"Thanks, <<$pcs_nickname>>." She''s slightly out of breath from the grand allegro and pirouettes she''s just performed."'
-		'"Well done, <<$npc_firstname[''A3501'']>>, that was a wonderful performance." Birserka sounds impressed with <<$npc_firstname[''A3501'']>>''s performance. "You will go far with talent like that."'
+		'"Well done, <<$npc_firstname[''A274'']>>, that was a wonderful performance." Birserka sounds impressed with <<$npc_firstname[''A274'']>>''s performance. "You will go far with talent like that."'
 		'You momentarily look over the rest of the class and see Tanis'' face frowning, you think with jealousy.'
 
-	elseif ballet_day = 2 :
-		'You stand next to <<$npc_firstname[''A3501'']>>  as you work through your barre exercises. Biserka leaves you alone today after yesterday''s impromptu performance. You and <<$npc_firstname[''A3501'']>> quickly finish your warm up and start to work through your pas de deux routine for your assessment.'
-		'"Remember <<$pcs_nickname>>, when doing your plié, your butt should be over your heels and you should balance your weight on the second toe.", <<$npc_firstname[''A3501'']>> chides you.'
-		'"Okay, let''s see you do your solo, and then you can watch me." You put on the routine you''ve been practicing for the assessment. "Remember: leg high and watch your lines!" <<$npc_firstname[''A3501'']>> calls out.'
-		'You watch <<$npc_firstname[''A3501'']>> effortlessly go through her routine. "Why haven''t you done your grading or assessment already?" you ask her. "Time and my instructor didn''t feel I was ready," she replies.'
+	elseif ballet_day = 2:
+		'You stand next to <<$npc_firstname[''A274'']>>  as you work through your barre exercises. Biserka leaves you alone today after yesterday''s impromptu performance. You and <<$npc_firstname[''A274'']>> quickly finish your warm up and start to work through your pas de deux routine for your assessment.'
+		'"Remember <<$pcs_nickname>>, when doing your plié, your butt should be over your heels and you should balance your weight on the second toe.", <<$npc_firstname[''A274'']>> chides you.'
+		'"Okay, let''s see you do your solo, and then you can watch me." You put on the routine you''ve been practicing for the assessment. "Remember: leg high and watch your lines!" <<$npc_firstname[''A274'']>> calls out.'
+		'You watch <<$npc_firstname[''A274'']>> effortlessly go through her routine. "Why haven''t you done your grading or assessment already?" you ask her. "Time and my instructor didn''t feel I was ready," she replies.'
 		'Before you can ask another question, Biserka calls an end to the class.'
 
-	elseif ballet_day = 3 :
-		'<<$npc_firstname[''A3501'']>> doesn''t seem focused on the lesson today. She seems more distant than her usual self from the last few days. "Are you okay <<$npc_firstname[''A3501'']>>?" you ask.'
-		'"Yes, I''m fine." <<$npc_firstname[''A3501'']>> replies, but she''s making too many little mistakes and you''re hesitant to pick up here when Biserka comes by. "<<$npc_firstname[''A3501'']>>, you can do better than that."'
-		'<<$npc_firstname[''A3501'']>> winces, but does as Biserka asks, this time with few mistakes. "That''s better, I don''t expect such sloppiness from my dancers," Biserka says, frowning. "You''re better than that and I hope you''re not getting lazy."'
-		'Before <<$npc_firstname[''A3501'']>> can protest, Biserka leaves you alone for the rest of class, but you notice her watching <<$npc_firstname[''A3501'']>> closely.'
+	elseif ballet_day = 3:
+		'<<$npc_firstname[''A274'']>> doesn''t seem focused on the lesson today. She seems more distant than her usual self from the last few days. "Are you okay <<$npc_firstname[''A274'']>>?" you ask.'
+		'"Yes, I''m fine." <<$npc_firstname[''A274'']>> replies, but she''s making too many little mistakes and you''re hesitant to pick up here when Biserka comes by. "<<$npc_firstname[''A274'']>>, you can do better than that."'
+		'<<$npc_firstname[''A274'']>> winces, but does as Biserka asks, this time with few mistakes. "That''s better, I don''t expect such sloppiness from my dancers," Biserka says, frowning. "You''re better than that and I hope you''re not getting lazy."'
+		'Before <<$npc_firstname[''A274'']>> can protest, Biserka leaves you alone for the rest of class, but you notice her watching <<$npc_firstname[''A274'']>> closely.'
 
-	elseif ballet_day = 4 :
-		'You quickly team up with <<$npc_firstname[''A3501'']>> for today''s lesson, the first time you''ve had a proper chance to speak to her about the previous evening''s events. "How are you feeling today, <<$npc_firstname[''A3501'']>>?"'
+	elseif ballet_day = 4:
+		'You quickly team up with <<$npc_firstname[''A274'']>> for today''s lesson, the first time you''ve had a proper chance to speak to her about the previous evening''s events. "How are you feeling today, <<$npc_firstname[''A274'']>>?"'
 		'She gives you a small smile as you work through your barre exercises. "I''m better, thank you <<$pcs_nickname>>. Sorry about the scene last night."'
 		if mayaqw['grave'] = 4:
-			'"Don''t be silly <<$npc_firstname[''A3501'']>>, you know where to find me if you ever need help. You''ve helped me so much this week and I''d not have learned as much as I have without you," you reply.'
+			'"Don''t be silly <<$npc_firstname[''A274'']>>, you know where to find me if you ever need help. You''ve helped me so much this week and I''d not have learned as much as I have without you," you reply.'
 			'"I never thought I''d meet someone like you, <<$pcs_nickname>>. Your company was welcome last night and you don''t have to thank me about helping each other."'
-			'Her words give you a warm feeling of having done something right. <<$npc_firstname[''A3501'']>> is dancing better than she has all week; even other students are noticing how graceful and elegant her divertissement perfomance is.'
-			'You take a breather and grab some water, then see Kima doing her own routine and find it hard to decide who''s better: <<$npc_firstname[''A3501'']>> or her. After a few moments, you decide it''s a question of grace and in this, you feel <<$npc_firstname[''A3501'']>> has the edge.'
+			'Her words give you a warm feeling of having done something right. <<$npc_firstname[''A274'']>> is dancing better than she has all week; even other students are noticing how graceful and elegant her divertissement perfomance is.'
+			'You take a breather and grab some water, then see Kima doing her own routine and find it hard to decide who''s better: <<$npc_firstname[''A274'']>> or her. After a few moments, you decide it''s a question of grace and in this, you feel <<$npc_firstname[''A274'']>> has the edge.'
 		elseif mayaqw['grave']  < 4:
-			'"It''s okay <<$npc_firstname[''A3501'']>>, I understand the grief about losing your mother. You''ll do her proud this week, and even Biserka thinks you''re one of the best in the class alongside Kima," you said to cheer her up.'
+			'"It''s okay <<$npc_firstname[''A274'']>>, I understand the grief about losing your mother. You''ll do her proud this week, and even Biserka thinks you''re one of the best in the class alongside Kima," you said to cheer her up.'
 			'"Shush <<$pcs_nickname>>, I''ve still a long way to go she replies. "It''s been a hard few years and I''ve sacrificed everything to get here today. I owe it to her memory."' 
 			'"She must have meant eveything to you?" you ask. "Yes, but I never got a chance to be close to her. She was always rehearsing or travelling." Before she can continue, you notice Biserka looking your way and continue your practice.'		
 		end
 
-	elseif ballet_day = 5 :
-		'"This is it, <<$pcs_nickname>>, are you ready for tomorrow?" <<$npc_firstname[''A3501'']>> asks. You both feel the pressure, but know not to push yourselves too hard. Instead, you study and recite the routines.'
-		'Despite your nerves, you manage to complete your barre exercises and walk through the movements with only minor criticism from <<$npc_firstname[''A3501'']>>. Before long, you realize the time has flown by losing yourself into the lesson.'
+	elseif ballet_day = 5:
+		'"This is it, <<$pcs_nickname>>, are you ready for tomorrow?" <<$npc_firstname[''A274'']>> asks. You both feel the pressure, but know not to push yourselves too hard. Instead, you study and recite the routines.'
+		'Despite your nerves, you manage to complete your barre exercises and walk through the movements with only minor criticism from <<$npc_firstname[''A274'']>>. Before long, you realise the time has flown by losing yourself into the lesson.'
 		if mayaqw['grave'] = 4:
 			'"This is it <<$pcs_nickname>>, it''s our big day tomorrow. Come by my room tonight if you want to talk or rehearse more for tomorrow. It''s my turn to make the tea," she says with a laugh.'
 			'You share her laugh. "Sure, I''ll take you up on the offer."'
@@ -496,7 +474,7 @@ if $ARGS[0] = 'second_lesson':
 	act 'Finish lesson': 
 		*clr & cla
 		$setloc['StageTitle'] = 'Reverance'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_006.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_class_006.jpg'
 		gs 'core_library', 'stage_title'
 		'You perform a reverence to Maya in thanks for her help, she returns the curtsey, and you head to the showers together.'
 
@@ -507,55 +485,54 @@ end
 
 if $ARGS[0] = 'music_theory':
 	*clr & cla
-	hour = 16
-	if minut > 0:
-		minut = 0
-	end
+	minut = (16 - hour) * 60 + 60
 	$setloc['StageTitle'] = 'Music Theory'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_004.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/ballet_class_004.jpg'
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	killvar 'nclass'
 	gs 'pushkin_ballet_init', 'daily_assessment'
-	pcs_sleep -= rand(1,3)
+	!! set stats for performance, music production and inst. music.
 	gs 'exp_gain', 'intel', rand(1,2)
+	gs 'exp_gain', 'instrmusic', rand(1,2)
+	gs 'exp_gain', 'musicprod', rand(1,2)
 	nclass = 5
 
 	gs 'stat'
 	gs 'core_library', 'stage_title'
-	!! set stats for performance, music production and inst. music.
+	
 
-	if ballet_day = 1 :
-		'You enter the classroom, and you see Sofia standing beside the door. "Welcome, girls. It''s a pleasure to see you all again. I hope you''ve enjoyed your first day?" She greets you in a warm and rich voice.'
-		'You and your classmates murmur a yes, unsure how to react. Sofia ignores the half-hearted response. "You''re probably wondering why you are here, as you''re not musicians. However, as a dancer, it''s essential to'
-		'understand the basics of Harmony, Melody and Rhythm. How they form the backbone, and how composers have audible cues to your performance. Whilst I don''t expect you to become a musician by the end of this week, you'
-		'should have a solid understanding of the user scores.'
+	if ballet_day = 1:
+		'You enter the classroom, and you see Sofia standing beside the door. "Welcome, girls. It''s a pleasure to see you all again. I hope you''ve enjoyed your first day?" She greets you in a warm and rich voice.
+		You and your classmates murmur a yes, unsure how to react. Sofia ignores the half-hearted response. "You''re probably wondering why you are here, as you''re not musicians. However, as a dancer, it''s essential to
+		understand the basics of Harmony, Melody and Rhythm. How they form the backbone, and how composers have audible cues to your performance. Whilst I don''t expect you to become a musician by the end of this week, you
+		should have a solid understanding of the user scores.'
 		*nl
-		'The rest of the lesson is taken up with music theory and how to deconstruct the performances to pick up the cues.'
+		'The rest of your lesson is taken up with music theory and how to deconstruct the performances and variations to pick up the composers cues.'
 
-	elseif ballet_day = 2 :
+	elseif ballet_day = 2:
 		'On day two of your music lessons, you begin to appreciate the time afforded to relax. "Hands up, who knows the first composition written specifically for ballet?"'
 		'To your surprise, you see a girl''s hand shoot up. She''s the one that''s been garnering jealous looks from around the school for her beauty.'
 		'"Taisiya, yes?"'
 		'"It was Tchaikovsky''s Swan Lake in 1876. Until then, composers who created the performances were treated with disdain by their more illustrious symphonic peers."'
 		'Sofia''s eyebrow rises slightly. "Excellent answer, Taisiya. So you''ve studied music before?"'
-		'"No, Ms. Solovyova, I just loved the performances and wanted to learn about them," she replies.'
-		'Sofia spends the rest of the lesson discussing the history of ballet. You noticed a few of your classmates looking sleepy by the end of the class.'
+		'"No, Ms. Solovyova, I just loved the ballet performances and wanted to learn more about them," she replies.'
+		'Sofia nods in approval to Taiya''s response spends the rest of the lesson discussing the history of ballet. You noticed a few of your classmates looking sleepy by the end of the class.'
 
-	elseif ballet_day = 3 :
+	elseif ballet_day = 3:
 		gs 'sweat', 'add', 20
 		'Today, you''re given a sharp shock. Sofia claps her hands to get everyone''s attention. "Today, we will test what you''ve learned. I''m going to be playing some pieces. On the first beat, you will do a demi plié down."'
 		'"On the second beat, you will do a demi plié up. Repeat until the sixth beat and do a grand plié. The seventh rise from the demi, and the eighth beat finish the demi. Understand? Good."'
 		'Sofia wastes no time. She starts the piece and calls out, "1 2 3, 2 2 3, 3 2 3, 4 2 3, 5 2 3 and grand plié! 6 2 3, and finish." Sofia runs an eye critically over the class. "You can do better than that and again."'
 		'You continue the lesson. Sofia keeps you all on your toes by changing the tempo, causing some girls to stumble and earning themselves criticism. By the end of the lesson, you''re glad it''s over.'
 	
-	elseif ballet_day = 4 :
+	elseif ballet_day = 4:
 		gs 'sweat', 'add', 20
-		'"Positions!" Sofia calls out before you can relax as you enter the class. "You''ve been practicing the routine for the assessment. I will review the score cues," she says as she sits at the piano and starts playing the Entrance of the Swans.'
+		'"Positions!" Sofia calls out before you can relax as you enter the class. "You''ve been practising the requisite variations for the assessment. I will review the score cues," she says as she sits at the piano and starts playing the Entrance of the Swans.'
 		'You all stand there wondering if you should dance, but after a few moments, Sofia stops. "Did you listen to the music to find your cues? Let''s try that again, on the count of three, one, two, three." Then, you start the whole routine that Biserka has been drilling into you.'
 		'The difference is Sofia is creating audible cues with the notes being played to guide you through the whole performance, and you see a marked improvement from all the dancers with the additional guidance.'
 
-	elseif ballet_day = 5 :
+	elseif ballet_day = 5:
 		gs 'sweat', 'add', 20
 		'It''s your final lesson today before your assessment tomorrow. So you all crowd into the dance hall and start to put on your shoes in preparation for your lesson.'
 		'Sofia and Biserka walk into the class together, and Sofia moves towards the piano. "Class, this is your final lesson. After that, we will do a rehearsal, and I will give you feedback on your performances."'
@@ -580,55 +557,52 @@ if $ARGS[0] = 'assessment':
 	!! Dance exam
 
 	balletqw['school'] = 1
-	pcs_sleep -= rand(10,20)
 	gs 'exercise', 'tier4', 180, 'agil', 'stren', 'danc'
+	gs 'exp_gain', 'perform', rand(5,10)
 	!! 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.
 
-	hour = 9
-	if minut > 0:
-		minut = 0
-	end
+	minut = (9 - hour) * 60
 
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_school/daily/hall.jpg'
 	gs 'core_library', 'stage_title'
 
-	'You arrive at the ballet school and can sense an air of anticipation and nervousness among your classmates. <<$npc_firstname[''A3501'']>> is standing close to you.'
+	'You arrive at the ballet school and can sense an air of anticipation and nervousness among your classmates. <<$npc_firstname[''A274'']>> is standing close to you.'
 	'You notice on the door, someone pinned the old Russian proverb - Без труда́ не вытащишь и рыбку из пруда́ (You must work to pull the fish from the pond). An admonishment to all students to work hard to acheive their dreams.'
 	'"Come on, <<$pcs_nickname>>." Maya draws your attention to the task at hand. "Time to start warming up. We''ve got an hour to do some light warm-up exercises, then we''ll need to get changed." You nod in agreement and enter the classroom set aside for the warm-ups. You approach the barres and start to exercise.'
 	*nl
-	'You quickly go through the routine with <<$npc_firstname[''A3501'']>> and grab a quick shower before getting changed into your Ballet Blanc outfit provided, check your tights before putting them on, and take out the new shoes you''ve kept for this moment.'
+	'You quickly go through the routine with <<$npc_firstname[''A274'']>> and grab a quick shower before getting changed into your Ballet Blanc outfit provided, check your tights before putting them on, and take out the new shoes you''ve kept for this moment.'
 	*nl
-	'Once you''re dressed, you check your makeup in the mirror and walk over to <<$npc_firstname[''A3501'']>> to check her appearance in preparation for the first assessment, and she returns the favor.'
+	'Once you''re dressed, you check your makeup in the mirror and walk over to <<$npc_firstname[''A274'']>> to check her appearance in preparation for the first assessment, and she returns the favour.'
 	*nl
 	'With minutes to spare, you''re outside the door to the examination. You feel your nerves are shredded, but Maya grabs your hand and whispers, "You''ve got this; remember neither fluff, nor feather." You nod smiling at the old saying replying with "to the devil", and the doors open.'
 	act 'Perform the Entrance':
 		*clr & cla
 		minut += 20
 		gs 'stat'
-		$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_1.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>ballet_school/exams/exam_1.jpg'
 		gs 'core_library', 'stage_title'
 
 		'You all file into the room and assume the first position. An examiner is at the door checking each girl as they enter for any flaws in their outfits or their appearance.'
 		'"Welcome, students. You have been shortlisted for this year''s apprenticeship intake. Three of you will be allowed to join our school, you have been told what we expect of you today, and we will assess all aspects of your appearance, conduct and the elegance of your performance." An elderly man sits at the table continues to list the assessment requirements.'
-		'You recognise Biserka, two other teachers you''ve not seen before, and <<$npc_firstname[''A3502'']>>, all assessing you. <<$npc_firstname[''A3502'']>>  seems to have his eyes mostly on yourself, but you think you are imagining it.'
-		'"Excellent. Shall we start? Then take your positions and at a count of three, and begin!" At those words, you feel a sense of calmness, and your nerves fall away as you concentrate on your performance. The minutes fly by so quickly that the performance is over before you even realize it.'
+		'You recognise Biserka, two other teachers you''ve not seen before, and <<$npc_firstname[''A292'']>>, all assessing you. <<$npc_firstname[''A292'']>>  seems to have his eyes mostly on yourself, but you think you are imagining it.'
+		'"Excellent. Shall we start? Then take your positions and at a count of three, and begin!" At those words, you feel a sense of calmness, and your nerves fall away as you concentrate on your performance. The minutes fly by so quickly that the performance is over before you even realise it.'
 		'"Thank you, that was a most wonderfful performance from you all," one of the female teachers says to the class. "Now we shall see how you perform a Pas de Deux with your partner. Please wait outside, and we will call you in."'
 
 		act 'Perform pas de deux': 
 			*clr & cla
 			minut += 60			
 			gs 'stat'
-			$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_2.jpg'
+			$setloc['StageImage'] = '<<$default_img_path>>ballet_school/exams/exam_2.jpg'
 			gs 'core_library', 'stage_title'
 
-			'You wait outside the classroom. You''ve put on your feet warmers to ensure they remain pliable and take the opportunity to drink some water and eat an energy bar. <<$npc_firstname[''A3501'']>> sits down beside you, lost in thought.'
+			'You wait outside the classroom. You''ve put on your feet warmers to ensure they remain pliable and take the opportunity to drink some water and eat an energy bar. <<$npc_firstname[''A274'']>> sits down beside you, lost in thought.'
 			*nl
-			'"How do you think we did?" you ask her. "Hmm?" <<$npc_firstname[''A3501'']>> looks up. "Yeah, we did brilliantly. I didn''t see many faults from any of us, but it went so quickly, and I couldn''t watch everything."' 
-			'"I know," you reply. Before you can say anything else, you and <<$npc_firstname[''A3501'']>> are called in.'
+			'"How do you think we did?" you ask her. "Hmm?" <<$npc_firstname[''A274'']>> looks up. "Yeah, we did brilliantly. I didn''t see many faults from any of us, but it went so quickly, and I couldn''t watch everything."' 
+			'"I know," you reply. Before you can say anything else, you and <<$npc_firstname[''A274'']>> are called in.'
 			*nl
-			'You and <<$npc_firstname[''A3501'']>> are given your assessment instructions. Finally, after your ten minutes, you both finish your Pas de Deux performance with a curtsy of reverence to your examiners. All the while, during movements, you''ve felt <<$npc_firstname[''A3502'']>>''s eyes still watching you.'
+			'You and <<$npc_firstname[''A274'']>> are given your assessment instructions. Finally, after your ten minutes, you both finish your Pas de Deux performance with a curtsy of reverence to your examiners. All the while, during movements, you''ve felt <<$npc_firstname[''A3502'']>>''s eyes still watching you.'
 			*nl
 			'You ignore his attention to concentrate on your performance. Though, after you finish, he''s still staring at you.'
 			'"Thank you both for the performance," one of the examiners says in a neutral voice. "We will call you in for your solo performances shortly, so please take the time to prepare yourselves."'
@@ -637,13 +611,13 @@ if $ARGS[0] = 'assessment':
 				*clr & cla
 				minut += 120
 				gs 'stat'
-				$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/solo_2.jpg'
+				$setloc['StageImage'] = '<<$default_img_path>>ballet_school/exams/solo_2.jpg'
 				gs 'core_library', 'stage_title'
-				'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 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'']>> .'
+				'Back outside, you and <<$npc_firstname[''A274'']>> do checks on your outfits. You notice a small tear on <<$npc_firstname[''A274'']>>''s tights and get your needle and thread out to repair it. You then check each other''s hair and makeup, with <<$npc_firstname[''A274'']>> 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 examination performance. Then, you start doing some light exercises with <<$npc_firstname[''A274'']>> to remain supple.'
+				'Shortly after you finish your snacks and stretches, you''re called in before <<$npc_firstname[''A274'']>> .'
 				*nl
-				'"<<$pcs_firstname>> <<$pcs_lastname>>, this is your solo performance. You understand what is required of you?" You realize it''s the school''s Ballet Mistress attending the solo performances. Thankfully, <<$npc_firstname[''A3510'']>> isn''t assessing the solo exams.'
+				'"<<$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[''A292'']>> isn''t assessing the solo exams.'
 				'You curtsy and reply, "Yes, Mistress, I''m ready."'
 				*nl
 				'"Very well, let us begin." With that, she taps the table with something you can''t see. Then, on the count of three, you start your performance. As the music starts, you perform the movements you have learned by rote over the last week. You feel you''ve never performed so well in your life, and everything flows together in a way it never has before.'

locations/pushkin_ballet_class.qsrc.rej

@@ -0,0 +1,13 @@
+diff a/locations/pushkin_ballet_class.qsrc b/locations/pushkin_ballet_class.qsrc	(rejected hunks)
+@@ -305,7 +305,11 @@
+  		*nl
+  	else 
+  		$setloc['StageTitle'] = 'Residential Bathroom'
+++<<<<<<< HEAD
+ +		$setloc['StageImage'] =  'locations/pushkin/ballet_residence/residential_bathroom.jpg'
+++=======
++ 		$setloc['StageImage'] = 'locations/pushkin/ballet_residence/residential_bathroom'
+++>>>>>>> cc4186e69 ([Beta Branch] code for testing purpose away from GL main branch, npc migration and various locations updated. untested code and is WIP, there will be hungry dragons.)
+  		$location_type = 'private' 
+  		gs 'themes', 'indoors'
+  		gs 'stat'	

locations/pushkin_ballet_evt.qsrc

@@ -9,7 +9,6 @@
 if $ARGS[0] = 'letter':
 
 	if mod_ballet['letter'] ! 1:
-		mod_ballet['letter'] = 1
 		*clr & cla
 		minut += 15
 		gs 'stat'
@@ -32,7 +31,7 @@ if $ARGS[0] = 'letter':
 			'"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, 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 'Accept the opportunity': gt 'kuhrPar'
+			act 'Accept the opportunity': mod_ballet['letter'] = 1 & gt 'kuhrPar'
 			act 'Think on the opportunity': gt 'kuhrpar'
 			act 'Reject the opportunity': gs 'pushkin_ballet_init', 'cleanup_var' & gt 'kuhrpar'
 		end
@@ -123,7 +122,7 @@ if $ARGS[0] = 'res_events':
 			if mod_table_count = 6:
 				$mod_student_table += '<tr>'
 				mod_table_count += 1
-				$mod_student_table += '' + '<td><table bgcolor=<<$theme[''table_bg_alt'']>>><tr><td align="center"><img  height="100" src="images/characters/ballet/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
+				$mod_student_table += '' + '<td><table bgcolor=<<$theme[''table_bg_alt'']>>><tr><td align="center"><img  height="100" src="<<$npc_img_path['A<<i_student>>']>><<i_student>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname['A<<i_student>>']>></td></tr></table>'
 			end
 			if mod_table_count < 6:
 				$mod_student_table += '</td>'
@@ -163,7 +162,7 @@ if $ARGS[0] = 'res_events':
 					'"It''s fine, Nikita. Tell her to buy a treat to cheer herself up. Just don''t mention it''s from me, please. How do you know I''m from a poor family?" you ask, frowning.'
 					'"She''ll love the gift, and I know because my mother is given a list of students to help out if they don''t have the necessary items, whether it''s tampons, makeup, or other essentials. She''s here to support them."'
 					'"The school thinks of everything, doesn''t it?"'
-					'"It tries. It helped me adapt to life here when my mother got the job. The first year was tough at the local school with the kids bullying me for being a villager. The ballet school became my refuge."'
+					'"It tries. It helped me adapt to the life here when my mother got the job. The first year was brutally tough at the local school with the kids bullying me for being a villager. The ballet school became my refuge."'
 					'"This is why you''re organizing the party?"'
 					'"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at 18:30. Don''t miss it!"'
 					act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
@@ -173,7 +172,7 @@ if $ARGS[0] = 'res_events':
 			act 'Hand card back':
 				'You hand the card back to Nikita, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
 				'"Think nothing of it, Nikita. If it makes her feel better, that''s great," you say.'
-				'"Yeah, look, I need to start baking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
+				'"Yeah, look, I need to start cooking 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':
@@ -229,9 +228,15 @@ if $ARGS[0] = 'res_events':
 		act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
 	end
     if $ARGS[1] = '2':
+		$setloc['StageTitle'] = 'TV Night'
+		$setloc['StageImage'] =   '<<$default_img_path>>ballet_events/chess.jpg'
         ! TV with Gasha and munchies
-        'WIP - tbc'
-    end
+        'You enter the common room and see Gasha relaxing in front of the TV watching a dance rehearsal. She is nibbling a small plate of fruit pieces and looks towards you as you enter.'
+		!! if trust
+		!! 'Hi <<$pcs_nickname>> want to watch the theatre shows with me?' 
+		!! no trust
+		!! 'Gasha watches you as you enter the room not doing anything to draw attention to herself.'
+	end 
     if $ARGS[1] = '3':
         ! Random girls doing barre training.
         'WIP - tbc'
@@ -241,7 +246,6 @@ if $ARGS[0] = 'res_events':
         'WIP - tbc'
     end
     if $ARGS[1] = '5':
-
 		'You enter the communal room and see Gasha at her favorite place watching TV. She looks at you nervously as you enter, you ask if you could join her.'
 		'"Are you going to bully me too?", she asks, her voice trembling..'
 		'"No why?", you ask. Gasha looks nervously at the door, "She was here, calling me a fat hippo that can''t dance.", Gasha looks as if she''s about to break down in tears.'
@@ -254,8 +258,8 @@ if $ARGS[0] = 'res_events':
 			npc_trust['A3507'] += 2
 			gs 'stat'
 			'"Okay, but I''m not willing to let this rest.", you say your voice tinged with anger.'
-			'You grab a blanket to cover yourself and settle down to watch TV. After a moment Gasha shivers a bit and you pull the blanket over her. This seems to help relax her and you sit in companionable silence enjoying the show.'
-			'When the show finishes, you get up to leave. Gasha stirs from her position and looks at you but doesn''t say anything, but you can tell she appreciates your company.'
+			'You grab a blanket to cover yourself and settle down to watch TV. After a moment Gasha shivers a bit and you pull the blanket up over her. This seems to help relax her and you sit in companionable silence enjoying the show.'
+			'When the show finishes, you get up to leave. Gasha stirs from her position and looks at you but doesn''t say anything, but you can tell she appreciated your company.'
 			act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
 		end
 		act 'Let Gasha handle it':
@@ -267,6 +271,7 @@ if $ARGS[0] = 'res_events':
 		end
 	end
 	if $ARGS[1] = '6':
+		!! Gasha drawing event
 		'WIP - tbc'
 	end
 	if $ARGS[1] = '7':

locations/pushkin_ballet_init.qsrc

@@ -29,8 +29,6 @@
 !! AlbinaQW[StarletsJoined] - Set -1 to prevent rejoining.
 !!
 
-
-
 if $ARGS[0] = 'init':
 	
 	!! Start the School
@@ -49,7 +47,7 @@ if $ARGS[0] = 'init':
 		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'
+			gs 'npc_274_init', 'summer_school'
 		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
@@ -60,36 +58,18 @@ if $ARGS[0] = 'init':
 		
 			msg 'You''ve missed your ballet school start date, maybe there will be other opportunities in future.'
 		end
-		
-		if $loc = 'bedrPar':
-			
-		end
 	end
 	!! Initiate the ballet events.
 	If mod_ballet['blocker'] = 1:   
 		mod_ballet['blocker'] = 2
 		gs 'fame', 'pushkin', 'ballet', 30, 'local'
 		gs 'ballet_npc'
-		i_npc = 1
-		:mod_ballet_rel_set
-			if i_npc < 10:
-				$npc_idx = 'A350<<i_npc>>'
-			else
-				$npc_idx = 'A35<<i_npc>>'
-			end		   
-			gs 'npc_relationship', 'set', '<<$npc_idx>>', 'unknown'
-			npc_trust[$npc_idx] = 0 
-			i_npc += 1
-		if i_npc <=  17: jump 'mod_ballet_rel_set'
-		!! Set local fame to fit narrative of up and coming ballet dancer	
 	end
 end
 
 if $ARGS[0] = 'start':
 	! Initial acceptance
-
-	if $loc = 'kuhrPar' and $start_type['cat'] = 'dancer':
-	
+	if $loc = 'kuhrPar' and ($start_type['cat'] = 'dancer' or ($start_type['cat'] = 'custom' and danc_lvl >= 50)):	
 		if locat['Mother'] = 4 and mod_ballet['letter'] < 1 and daystart <= 14 :
 			! Trigger first act
 			gs 'ballet_npc'
@@ -108,7 +88,6 @@ if $ARGS[0] = 'daily_assessment':
 
 	!! Daily Appearance
 	if school_daily_check ! daystart and (hour >= 8 and hour <= 17):
-	
 		!! Positive additions:
 		mod_grade_attendance[week] += 1
 		if pcs_makeup > 1: mod_grade_mua[week] += 1  
@@ -131,7 +110,6 @@ if $ARGS[0] = 'daily_assessment':
 
 	if $ARGS[1]= 'grade':
 		final_score = (pcs_apprnc / 10) + ((pcs_stren + pcs_agil + pcs_danc) / 10 ) + school_running_tally + study_tally
-
 		!! Three score levels, fail, pass and merit. Fail is one route for corruption path, pass is either low or no pay, merit is low to low +10%. 
 		if final_score <= 40:
 			balletqw[school] = 5
@@ -204,7 +182,6 @@ if $ARGS[0] = 'cleanup_var':
 	killvar 'feet_track'	
 	gs 'shortgs', 'remove_array_element', 'mod_ballet', 'letter'
 	gs 'shortgs', 'remove_array_element', 'mod_ballet', 'res_mg'
-
 end
 
 if $ARGS[0] = 'score_debug':   

locations/pushkin_ballet_res.qsrc

@@ -1,7 +1,8 @@
 # pushkin_ballet_res
 
 !! Date Created: 17th Sept, 2022
-!! Version: .01
+!! Version: .01 - initial release
+!! Version: .02 - bug fixes and additional content
 !! Author: Hooded Silence
 !!
 !! Ballet Summer School - Residential accomodation activities.
@@ -23,19 +24,18 @@ if $ARGS[0] = 'start':
 	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="<<$npc_img_path'[''A295'']>>/295.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".'
+	'"Welcome, students, to your first night at these halls. I''m your warden, <<$npc_firstname[''A295'']>> <<$npc_lastname[''A295'']>>. 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".'
 	'"I will go through the student roster, and you will respond each evening. You can also find a list of rules in your bedroom, which will be strictly enforced. We do not tolerate any behavior that brings this school into disrepute."'
 	*pl '"Do you understand?" '
-	'With that, you and the other students answer in unison, "Yes, Ms. <<$npc_lastname[''A3513'']>>."'
+	'With that, you and the other students answer in unison, "Yes, Ms. <<$npc_lastname[''A295'']>>."'
 	'"Very well. I suggest you read the rules in your bedroom. Ignorance will not be accepted as an excuse."'
 	*nl
 	'"With that out of the way, I will now assign your rooms." She consults her clipboard and starts reading out student names, ticking them off as she allocates rooms.'
 	'"<<$pcs_firstname>> <<$pcs_lastname>>?" "Here!" you reply, "You''ve been assigned to room twelve, first floor to the right of the staircase. Do you have any questions? No? I will see you in the communal room once you''ve settled in."'
 	act 'Find your room': gt 'pushkin_ballet_res', 'bedroom'
-
 end
 
 if $ARGS[0] = 'bedroom':
@@ -94,9 +94,9 @@ if $ARGS[0] = 'bedroom':
 	!! First Maya event
 
 	if ballet_day = 3 and mayaqw['grave'] = 0  and ( hour >= 17 and hour <= 21):
-		act 'Answer the knock' : gs 'npc_3501_init','grave'
+		act 'Answer the knock' : gs 'npc_274_init','grave'
 	elseif ballet_day = 3 and hour > 19 and mayaqw['grave'] = 1:
-		act 'Another knock': gt 'npc_3501_init', 'post_grave' 
+		act 'Another knock': gt 'npc_274_init', 'post_grave' 
 	end
 end
 
@@ -123,7 +123,7 @@ if $ARGS[0] = 'hallway':
 			act 'Attend Ballet Classes': gt 'pushkin_ballet_class', 'start'
 		elseif hour = 7 and (minut > 30 and minut <= 59):
 			$balletEv['trigger'] = 'late'
-			gs 'npc_3501_init', 'summer_school'
+			gs 'npc_274_init', 'summer_school'
 		else
 			act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
 		end
@@ -135,7 +135,7 @@ if $ARGS[0] = 'hallway':
 	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 and npc_trust['A3501'] >= 10:
+	if week ! 7 and npc_trust['A274'] >= 10:
 		!! 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'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'kitchen':
 			gs 'food', 'family_meals', 'breakfast'
 			gs 'stat'
 			'You encounter Maya as she prepares her breakfast. You lend a hand with the preparations and engage in a conversation about your upcoming lessons while enjoying your morning meal.'
-			 act 'Finish breakfast': gt 'pushkin_ballet_res', 'kitchen'
+			act 'Finish breakfast': gt 'pushkin_ballet_res', 'kitchen'
 		end
 	elseif hour > 4 and hour < 8:
 		act 'Eat breakfast':
@@ -244,14 +244,14 @@ if $ARGS[0] = 'kitchen':
 			gs 'food', 'family_meals', 'breakfast'
 			gs 'stat'
 			'You look in the fridge for some fruit and then make some porridge for breakfast.'
-			 act 'Finish breakfast': gt 'pushkin_ballet_res', 'kitchen'
+			act 'Finish breakfast': gt 'pushkin_ballet_res', 'kitchen'
 		end
 	end
 	
 	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 that the school provides the essentials for cooking and snacks for the pupils to eat during the evenings.'
 	end
 	
 end
@@ -290,11 +290,10 @@ if $ARGS[0] = 'warden_room':
 	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'
+	act 'Go to the hallway':  minut += 5 & ballet_awol = 0 &  gt 'pushkin_ballet_res', 'hallway'
 end
 
 !! Activities
@@ -387,8 +386,8 @@ if $ARGS[0] = 'study':
 	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study.jpg'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
-	 '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'
+	'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'
 end
 
 if $ARGS[0] = 'make_up':

locations/ballet_secrets.qsrc → locations/pushkin_ballet_secrets.qsrc

@@ -1,4 +1,4 @@
-# ballet_secrets
+# pushkin_ballet_secrets
 !! Author: Hooded Silence
 !! Date Created: Nov, 2023
 !! Version: .01
@@ -10,7 +10,7 @@ $default_img_path = 'locations/pushkin/ballet_secrets/'
 
 if $ARGS[0] = 'init':
 	*clr & cla
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets'
 	$setloc['StageImage'] =	'<<$default_img_path>>ballet-shop-window.jpg'
@@ -22,9 +22,9 @@ if $ARGS[0] = 'init':
 	if week < 7 and hour >= 9 and hour <= 17:
 		'You enter the shop getting 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 'ballet_secrets', 'first_visit'
+			act 'Approach the woman': gt 'pushkin_ballet_secrets', 'first_visit'
 		else
-			act 'Enter studio area': gt 'ballet_secrets', 'reception'
+			act 'Enter studio area': gt 'pushkin_ballet_secrets', 'reception'
 			!! act 'Talk to assistant':
 			!! act'Look at equipment'
 			!! act 'look at dance wear'
@@ -34,7 +34,7 @@ if $ARGS[0] = 'init':
 		'You look at the shop window and realize 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.'
 		act 'Return to Okhlopkov Square' : gt 'pushkin_sq'
 		if balletqw['membership'] >= daystart:
-			act 'Swipe membership card': gt 'ballet_secrets', 'reception'
+			act 'Swipe membership card': gt 'pushkin_ballet_secrets', 'reception'
 		end
 	end
 end
@@ -60,14 +60,14 @@ if $ARGS[0] = 'first_visit':
 	'"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 need? 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 'ballet_secrets', 'init'
+	act 'Return to shop': gt 'pushkin_ballet_secrets', 'init'
 end
 !! Services
 
 !! Sports Area - Req Membership card
 
 if $ARGS[0] = 'reception':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Reception'
 	$setloc['StageImage'] =	'<<$default_img_path>>reception.jpg'
@@ -80,19 +80,19 @@ if $ARGS[0] = 'reception':
 
 	'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 'ballet_secrets', 'init'
-	act 'Changing rooms': gt 'ballet_secrets', 'changing_room'
+	act 'Return to shop': gt 'pushkin_ballet_secrets', 'init'
+	act 'Changing rooms': gt 'pushkin_ballet_secrets', 'changing_room'
 	!! if membership not active:
 	if balletqw['membership'] = 0 or balletqw['membership'] < daystart:
-		act 'Discuss membership': gt 'ballet_secrets', 'enrol'
+		act 'Discuss membership': gt 'pushkin_ballet_secrets', '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 'ballet_secrets', 'physio'
-		!! act 'Attend a gymnastics class.': gt 'ballet_secrets', 'gymnastics_courses'
-		!! act 'Attend a dance class': gt 'ballet_secrets', 'ballet_courses'
-		act 'Attend a yoga class': gt 'ballet_secrets', 'yoga_courses'
-		!! act 'Look at jobs board': gt 'ballet_secrets', 'jobs'
+		!! act 'Attend Physio': gt 'pushkin_ballet_secrets', 'physio'
+		!! act 'Attend a gymnastics class.': gt 'pushkin_ballet_secrets', 'gymnastics_courses'
+		act 'Attend a ballet class (2 hr)': gt 'pushkin_ballet_secrets', 'ballet_courses'
+		act 'Attend a yoga class (1 hr)': gt 'pushkin_ballet_secrets', 'yoga_courses'
+		!! act 'Look at jobs board': gt 'pushkin_ballet_secrets', 'jobs'
 	elseif hour >= 16:
 		'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
 	end
@@ -114,7 +114,7 @@ if $ARGS[0]= 'enrol':
 	elseif balletqw['membership'] ! 0:
 		'You approach the reception to renew your membership.'
 	end
-	act 'Return to the studio entrance': gt 'ballet_secrets', 'reception'
+	act 'Return to the studio entrance': gt 'pushkin_ballet_secrets', 'reception'
 
 	'The gym offers a weekly or monthly subscription for 1,500<b> ₽</b>	or 5,000<b> ₽</b> respectively to use the facilities with some courses included. Physio appointments are charged separately.'
 	'The subscriptions include 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.'
@@ -130,7 +130,7 @@ end
 
 if $ARGS[0] = 'changing_room':
 	menu_off = 0
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public'
 	$locclass = 'changingroom'
 	gs 'themes', 'indoors'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'changing_room':
 	'<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 'ballet_secrets', 'reception'
+	act 'Return to the studio reception': gt 'pushkin_ballet_secrets', 'reception'
 	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'changing_room':
 			'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 'ballet_secrets', 'changing_room'
+			act 'Get out of the shower':gt 'pushkin_ballet_secrets', 'changing_room'
 
 		end
 	else
@@ -184,7 +184,7 @@ if $ARGS[0] = 'changing_room':
 			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 'ballet_secrets', 'changing_room'
+			act 'Continue': menu_off = 0 & gt 'pushkin_ballet_secrets', 'changing_room'
 		end
 	end
 	gs 'core_library', 'bathroom'  
@@ -192,7 +192,7 @@ end
 
 !! Physiotherapy
 if $ARGS[0] = 'physio':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Physio'
 	$setloc['StageImage'] =	'<<$default_img_path>>physio.jpg'
@@ -207,7 +207,7 @@ end
 !! Gymnastics
 
 if $ARGS[0] = 'gymnastics_courses':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Gymnastics Class'
 	$setloc['StageImage'] =	'<<$default_img_path>>gymnastics.jpg'
@@ -222,29 +222,71 @@ end
 !! Ballet Courses Easy, Intermediate and advanced
 
 if $ARGS[0] = 'ballet_courses':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Courses'
-	$setloc['StageImage'] =	'<<$default_img_path>>ballet_class.jpg'
+	if pcs_danc <= 49:
+		$setloc['StageImage'] =	'<<$default_img_path>>basic_class.jpg'
+	elseif pcs_danc <=74:
+		$setloc['StageImage'] =	'<<$default_img_path>>intermediate_class.jpg'
+	else
+		$setloc['StageImage'] =	'<<$default_img_path>>advanced_class.jpg'
+	ends
+	
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
 	if balletqw['ballet_session'] ! daystart:
-		lesson_tier = rand(1,5)
-
-
-		killvar 'lesson_tier'
-		act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
+		balletqw['ballet_session'] = daystart
+		if pcs_danc <= 49:
+			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'
+			gs 'exercise', 'tier1', 120, 'agil', 'stren', 'danc'
+			gs 'exp_gain', 'danc', rand(1,5)
+			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your introductory ballet lesson starts along your fellow students.'
+			basic ballet
+		elseif pcs_danc >= 50 or dance_skill <= 74:
+			gs 'pain', 3, 'legL', 'stretch'
+			gs 'pain', 3, 'legR', 'stretch'
+			gs 'pain', 3, 'shoulders', 'stretch'
+			gs 'pain', 3, 'armL', 'stretch'
+			gs 'pain', 3, 'armR', 'stretch'
+			gs 'pain', 3, 'back', 'stretch'
+			gs 'pain', 3, 'chest', 'stretch'
+			gs 'exercise', 'tier2', 120, 'agil', 'stren', 'danc'
+			gs 'exp_gain', 'danc', rand(1,10)
+			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your intermediate lesson starts along your fellow students.'
+			Intermediate ballet
+		else
+			gs 'pain', 3, 'legL', 'stretch'
+			gs 'pain', 3, 'legR', 'stretch'
+			gs 'pain', 3, 'shoulders', 'stretch'
+			gs 'pain', 3, 'armL', 'stretch'
+			gs 'pain', 3, 'armR', 'stretch'
+			gs 'pain', 3, 'back', 'stretch'
+			gs 'pain', 3, 'chest', 'stretch'
+			gs 'exercise', 'tier3', 120, 'agil', 'stren', 'danc'
+			gs 'exp_gain', 'danc', rand(5,10)
+			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your advanced lesson starts along your fellow students.'
+			advance ballet
+		end
+		gs 'stat'
+		act 'Return to the studio reception': gt 'pushkin_ballet_secrets', 'reception'
 	else 
 		'There is another fitness class in progress and no more ballet sessions today.'
 	end
-	act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
+	act 'Return to the studio reception': gt 'pushkin_ballet_secrets', 'reception'
 end
 
 !! Yoga class
 
 if $ARGS[0] = 'yoga_courses':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Yoga Class'
 	$setloc['StageImage'] =	'<<$default_img_path>>yoga_class.jpg'
@@ -280,12 +322,12 @@ if $ARGS[0] = 'yoga_courses':
 			gs 'pain', 2, 'chest', 'stretch'
 
 			killvar 'lesson_tier'
-			act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
+			act 'Return to the studio reception': gt 'pushkin_ballet_secrets', 'reception'
 		end
 	else 
 		'There is another fitness class in progress and no more yoga sessions today.'
 	end
-	act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
+	act 'Return to the studio reception': gt 'pushkin_ballet_secrets', 'reception'
 end 
 
 if $ARGS[0] = 'jobs':
@@ -294,7 +336,7 @@ end
 
 !! Shopping
 if $ARGS[0] = 'clothing':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets - Dancewear'
 	$setloc['StageImage'] =	'<<$default_img_path>>sports_shop.jpg'
@@ -306,7 +348,7 @@ end
 
 !! TODO: 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] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Ballet Secrets'
 	$setloc['StageImage'] =	'<<$default_img_path>>quest.jpg'
@@ -317,7 +359,7 @@ if $ARGS[0] = 'quest':
 end
 
 if $ARGS[0] = 'food':
-	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
+	gs 'shortgs', 'setloc', 'pushkin_ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
 	$setloc['StageTitle'] = 'Food Court'
 	$setloc['StageImage'] =	'<<$default_img_path>>food_court.jpg'
@@ -325,7 +367,7 @@ if $ARGS[0] = 'food':
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
 
-	'There is a small area set aside for vending machines to provide drinks and food. '
+	'There is a small area set aside for vending machines to provide drinks and food to help you relax and gain some energy back after your sessions. It also has knick knacks in case you forgot to bring items for your class. '
 	act 'Leave': gt 'pushkin_sq'
 end
 --- ballet_secrets ---------------------------------

locations/pushkin_sq.qsrc

@@ -36,7 +36,7 @@ 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.'
+	'The dance shop is closed, but you can still access the <a href="exec:gt ''pushkin_ballet_secrets'',''init''">Members Area</a> with your card.'
 else
 	'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

locations/unused/ballet_npc.qsrc

@@ -0,0 +1,140 @@
+# ballet_npc
+!! Date Created: 17th Sept, 2022
+!! Modified date: 11th April, 2024
+!! Version: .01 - initial release
+!! Version: .02 - bug fixes, code refactor and new character variable $npc_img_path to link characters default profile image and related images.
+!! Author: Hooded Silence
+!!
+!! Set up dance school dramatis personae - Start at 3500 to avoid conflicts with main game.
+
+!! Pushkin Ballet School Students - Year one schoot start
+
+npctemp = 3501
+$npc_firstname['A<<npctemp>>'] = 'Maya'
+$npc_nickname['A<<npctemp>>'] = 'Maya'
+$npc_lastname['A<<npctemp>>'] = 'Semionova'
+$npc_usedname['A<<npctemp>>'] = 'Maya'
+$npc_notes['A<<npctemp>>'] = 'Maya is the daughter of Anitchka a freelance coryphée, she was encouraged to dance from a young age until she was nine when she started doing gymnastics. This changed when she was eleven when her mother became ill and she was asked to carry on the family tradition. Maya is a naturally gifted dancer and after six years is tipped to become one of Russia''s leading stars in the future.'
+npc_dob['A<<npctemp>>'] = 19990502
+npc_gender['A<<npctemp>>'] = 1
+npc_bust['A<<npctemp>>'] = 14
+npc_intel['A<<npctemp>>'] = 75
+hotcat_rating['A<<npctemp>>'] = 8
+gs 'npcstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
+gs 'npcstaticdefaults', 'body', 'model'
+
+!! mod appearance NPC settings, height in cm, weight in kg
+$npc_haircolour['A<<npctemp>>'] = 'Blonde'
+$npc_eyecolour['A<<npctemp>>'] = 'blue'
+$npc_height['A<<npctemp>>'] = 160
+$npc_weight['A<<npctemp>>'] = 50 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
+
+npctemp = 3502 
+!! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta's activities.
+!! will try and blackmail Sveta into either giving up if she learns if she's has dirty secrets such as prostitution, slut rep, etc or passing the information to Rudolph to destroy her career to remove her as competition.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 3503
+!! Tanis Komarova - Bitchy dancer who thinks she''s already the Principle Dancer. Age 17. Future concept as the class bully to other dancers and students.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
+
+npctemp = 3504
+!! Galina Molchalina - Quiet and shy student, age 16. Highly secretive and doesn't engage with the class, she also has a nervous personality as if she's afraid. This comes from her family being marked as 'radicals' by the old KGB and under constant watch from FSB even to this day.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
+
+npctemp = 3505 
+!! Taisiya Lebedeva - The eldest student, and an elegant beauty, Age 18. A quiet, but captivating beauty who has a enchanting charismatic presence that men can't keep their eyes off her leading to bitchy remarks from other girls. 
+!! She''s oblivous to her beauty instead focusing on acting and dance. (side note: surname is one of the most common in St P.), she's got a strong religous personality.
+!! Character model: Malta Aurelie
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 3506
+!! Nikita Volkova - Bronya''s daughter. Age 16. Keep fit fanatic, and does tap, ballet, etc. As Bronya's daughter she's been given privileged access to the school, whilst not a great talent she's still one of the best dance students at the school but just not at ballet despite Bronya's hopes.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+npctemp = 3507
+$npc_firstname['A<<npctemp>>'] = 'Gasha'
+$npc_nickname['A<<npctemp>>'] = 'Gasha'
+$npc_lastname['A<<npctemp>>'] = 'Morozova'
+$npc_usedname['A<<npctemp>>'] = 'Gasha'
+$npc_notes['A<<npctemp>>'] = 'The youngest in the class at 15, close friend of Nikita as the grew up in the same village. Nikita and Galina are often seen in each others company in the local coffee shop and rarely seen alone leading to rumours. She''s a bit of a foodie, and love sweet things which conflicts with keeping in shape for her dance career.'
+npc_dob['A<<npctemp>>'] = 20000705
+npc_gender['A<<npctemp>>'] = 1
+npc_bust['A<<npctemp>>'] = 9
+npc_intel['A<<npctemp>>'] = 50
+hotcat_rating['A<<npctemp>>'] = 6
+gs 'npcstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
+gs 'npcstaticdefaults', 'body', 'model'
+
+!! mod appearance NPC settings, height in cm, weight in kg
+$npc_haircolour['A<<npctemp>>'] = 'Brunette'
+$npc_eyecolour['A<<npctemp>>'] = 'Blue'
+$npc_height['A<<npctemp>>'] = 145
+$npc_weight['A<<npctemp>>'] = 40 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
+
+!! Calina
+npctemp = 3508 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+!! Ruza
+npctemp = 3509 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+!! Calina and Ruza Sokolova - Twin dancers. Not interested in ballet, but took the course to further their education into becoming dancers. Age 17. They also professional models with a Moscow agency. 
+!! Adel and Alina Fakhteeva twins?
+
+!! Ballet Staff 
+
+npctemp = 3510
+$npc_firstname['A<<npctemp>>'] = 'Rudolf'
+$npc_nickname['A<<npctemp>>'] = 'Rudolf '
+$npc_lastname['A<<npctemp>>'] = 'Baryshnikov'
+$npc_usedname['A<<npctemp>>'] = 'Rudolf'
+npc_dob['A<<npctemp>>'] = 19820920
+$npc_notes['A<<npctemp>>'] = 'Rudolf is a charming and handsome man, he was on course to become one of Russia''s best ballet dancers until a stage accident cut short his career. Today he works at the dance school as a instructor, agent and a board member. Many rumours about his life have swirled around him over the years but none have been proven.'
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'slim'
+npc_dick['A<<npctemp>>'] = 10
+npc_sexskill['A<<npctemp>>'] = 2
+npc_intel['A<<npctemp>>'] = 67
+hotcat_rating['A<<npctemp>>'] = 8
+npc_spermpot['A<<npctemp>>'] = 15000
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/rudolph'
+
+!! class teacher: Biserka Ananiashvili
+npctemp = 3511
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! class teacher/pianist: Sofia Solovyova
+npctemp = 3512
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! Residential Warden: Bronya Volkova and former violinist, strict but fair has two daughters with Nikita being the youngest training to be a ballet dancer and her eldest in Germany training to be a surgeon. 
+npctemp = 3513 
+$npc_firstname['A<<npctemp>>'] = 'Bronya'
+$npc_nickname['A<<npctemp>>'] = 'Bronya '
+$npc_lastname['A<<npctemp>>'] = 'Volkova'
+$npc_usedname['A<<npctemp>>'] = 'Bronya'
+gs 'npcstaticdefaults', 'defaults'
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+
+!! NPC temp: 3514 - Physio - Pelageya Makarova
+
+!! 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
+
+killvar 'npctemp'
+--- ballet_npc ---------------------------------
+
+
+
+
+