1
0
فهرست منبع

[Formatting & bug fixes] Removal of extra padding, cosmetic clean up of text and images, and fix evening meal(again). School is now balance tested with the new stats progression and further work will begin on adding additional content and exam grading.

Myles Croft (Hooded Silence) 4 ماه پیش
والد
کامیت
0a65f7dfcd
4فایلهای تغییر یافته به همراه135 افزوده شده و 134 حذف شده
  1. 55 55
      locations/pushkin_ballet_class.qsrc
  2. 39 39
      locations/pushkin_ballet_evt.qsrc
  3. 7 7
      locations/pushkin_ballet_init.qsrc
  4. 34 33
      locations/pushkin_ballet_res.qsrc

+ 55 - 55
locations/pushkin_ballet_class.qsrc

@@ -8,10 +8,10 @@
 !!
 !! Classes start 0800 and finish at 1700
 !! 0800 - 0900 - Stretches / Pilates - unknown instructor
-!! 0900 - 1100 - Group  barre work and pose - Biserka Ananiashvili
+!! 0900 - 1100 - Group barre work and pose - Biserka Ananiashvili
 !! 1100 - 1200 - Make up theory and practice unknown instructor
 !! 1200 - 1300 - Lunch
-!! 1300 - 1600 - Pas de Deux and solo barre and movement practice -  Biserka Ananiashvili
+!! 1300 - 1600 - Pas de Deux and solo barre and movement practice - Biserka Ananiashvili
 !! 1600 - 1700 - Ballet and musical theory - Sofia Solovyova
 !!
 !! Variables
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
 
-	!! Random trivia -  Terpsichore is one of the nine Greecian muses. Her sphere was dance, rhythm and choral music.
+	!! Random trivia - Terpsichore is one of the nine Greecian muses. Her sphere was dance, rhythm and choral music.
 
 	if ballet_day = 6 and balletqw['school'] ! 1:
 		gt 'pushkin_ballet_class', 'assessment'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 		'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  <<$npc_firstname[''A284'']>>, 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.'
+		'You grab a shower before you leave to catch the bus that is waiting for you outside. Standing next to it is <<$npc_firstname[''A284'']>>, 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.'
 		dynamic $showerdin
 		gs 'stat'
 		gs 'pushkin_ballet_init', 'cleanup_var'
@@ -91,7 +91,7 @@ if $ARGS[0] = 'pilates':
 		'You''re led to the class by <<$npc_firstname[''A284'']>> Volkova, who tells you all to wait outside and disappears into the classroom. A few minutes later, she steps out and opens the door. "In you go, girls. Remember from this point, be polite, respectful and, above all else, dedicated."'
 		'You enter a large studio with dance equipment and mirrors on the wall. A large corner window lets natural light flood in. In the corner stands a sturdy piano made of polished mahogany. Two ladies are standing watching you file in.'
 		'Your group forms a gaggle near the door. One of the ladies shouts out for you to take your positions! Your group automatically fans out and instinctively falls into the First Position.'
-		'"Good." She walks past each girl looking for mistakes. Then, she turns around and walks back to the front. As she reaches the front, she says, "You can relax, I''m  <<$npc_firstname[''A284'']>> Ananiashvili, and I''ll be your instructor this week." Then, she turns and indicates towards the other woman. "This is <<$npc_firstname[''A285'']>> Solovyova. She will be your music instructor and class pianist."'
+		'"Good." She walks past each girl looking for mistakes. Then, she turns around and walks back to the front. As she reaches the front, she says, "You can relax, I''m <<$npc_firstname[''A284'']>> Ananiashvili, and I''ll be your instructor this week." Then, she turns and indicates towards the other woman. "This is <<$npc_firstname[''A285'']>> Solovyova. She will be your music instructor and class pianist."'
 		'"You have all been selected to attend this week by merit or determination. You are the select few that''ll represent the Pavlova Class. You are the best of this year''s intake and have been chosen to attend this course to further your passion for dance and ballet."'
 		'"This week will be intensive. You will live, breathe, and dance your hearts out during your time here. I expect no less from each of you. You represent the school. If you exhibit any behaviour that negatively affects the school''s reputation, you will be dismissed. Understood? Good."'
 		cla
@@ -106,13 +106,13 @@ if $ARGS[0] = 'pilates':
 			'"Refer to your dorm''s induction books for the daily course lessons, but now that introductions are out of the way, let us start stretching with pilates."'
 			'"Hands up; who knows why we do Pilates over Yoga?"'
 			'One of the girls put her hand up. '
-			'"You are?"  <<$npc_firstname[''A284'']>> asks. "<<$npc_firstname[''A279'']>><<$npc_lastname[''A279'']>>," the girl replies.'
+			'"You are?" <<$npc_firstname[''A284'']>> asks. "<<$npc_firstname[''A279'']>><<$npc_lastname[''A279'']>>," the girl replies.'
 			'"<<$npc_firstname[''A284'']>>''s daughter?"'
 			'"Yes, Miss."'
-			'"So, what are the differences?",  <<$npc_firstname[''A284'']>> asks brusquely.'
+			'"So, what are the differences?", <<$npc_firstname[''A284'']>> asks brusquely.'
 			'"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,  <<$npc_firstname[''A284'']>> 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.'
+			'With that, <<$npc_firstname[''A284'']>> 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
 
@@ -150,19 +150,19 @@ if $ARGS[0] = 'first_lesson':
 		gs 'stat'
 		gs 'core_library', 'stage_title'
 
-		'"Listen up!" shouts  <<$npc_firstname[''A284'']>>, "I want you to introduce yourselves. Once introductions are done, I''ll assign you to a dance partner for the week."'
+		'"Listen up!" shouts <<$npc_firstname[''A284'']>>, "I want you to introduce yourselves. Once introductions are done, I''ll assign you to a dance partner for the week."'
 		' <<$npc_firstname[''A284'']>> points to the student that''s furthest from you. Seeing her being picked first, she gets a panicked look and stutters ""I..I... I''m G... <<$npc_firstname[''A277'']>> Molchalina," she says in a final rush to get her name out, her face crimson with embarrassment.'
 		' <<$npc_firstname[''A284'']>> frowns. "You need to work on your confidence and presentation, <<$npc_firstname[''A277'']>>." "Yes, Ms. Ananiashvili," replies <<$npc_firstname[''A277'']>>, wilting a bit under her gaze.'
-		'"You."  <<$npc_firstname[''A284'']>> 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.'
-		' <<$npc_firstname[''A284'']>> points to another student. "Kima Agapova," Kima calls out, also performing another elegant curtsey.  <<$npc_firstname[''A284'']>> 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."  <<$npc_firstname[''A284'']>> starts calling out names, and the girls move into pairs as they''re assigned.'
+		'"You." <<$npc_firstname[''A284'']>> 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.'
+		' <<$npc_firstname[''A284'']>> points to another student. "Kima Agapova," Kima calls out, also performing another elegant curtsey. <<$npc_firstname[''A284'']>> 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." <<$npc_firstname[''A284'']>> starts calling out names, and the girls move into pairs as they''re assigned.'
 		'"<<$pcs_nickname>> is fine <<$npc_firstname[''A274'']>>", you reply.'
-		' <<$npc_firstname[''A284'']>> moves to the front of the class and claps her hands for attention. She nods to <<$npc_firstname[''A285'']>>, who sits at the piano and starts playing.  <<$npc_firstname[''A284'']>> starts a nearly flawless ballet routine demonstrating her elegance and mastery of what she teaches.'
-		'Once  <<$npc_firstname[''A284'']>> stops her performance, she thanks <<$npc_firstname[''A285'']>> and turns back to the class.'
+		' <<$npc_firstname[''A284'']>> moves to the front of the class and claps her hands for attention. She nods to <<$npc_firstname[''A285'']>>, who sits at the piano and starts playing. <<$npc_firstname[''A284'']>> starts a nearly flawless ballet routine demonstrating her elegance and mastery of what she teaches.'
+		'Once <<$npc_firstname[''A284'']>> stops her performance, she thanks <<$npc_firstname[''A285'']>> 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,  <<$npc_firstname[''A284'']>> puts you through a series of demanding exercises going to each girl to guide her posture with a quick word or touch.'
+		'For the next hour, <<$npc_firstname[''A284'']>> 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  <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>>.'
+		'The lesson concluded with the traditional Reverence to <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>>.'
 
 		act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
 	end
@@ -174,13 +174,13 @@ if $ARGS[0] = 'first_lesson':
 		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[''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  <<$npc_firstname[''A284'']>> 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 <<$npc_firstname[''A284'']>> 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."'
 
 		'class event'
 
-		'As with the previous lesson, it concluded with the traditional Reverence to  <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>>. Today you perform ports de bras to pay your respects.'
+		'As with the previous lesson, it concluded with the traditional Reverence to <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>>. Today you perform ports de bras to pay your respects.'
 
 		act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
 	end
@@ -198,12 +198,12 @@ if $ARGS[0] = 'first_lesson':
 		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  <<$npc_firstname[''A284'']>> standing close to <<$npc_firstname[''A285'']>>, 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  <<$npc_firstname[''A284'']>>''s hand is resting on <<$npc_firstname[''A285'']>>''s shoulder. She looks up as the class enters the room with a start and quickly moves away.'
+		'You see <<$npc_firstname[''A284'']>> standing close to <<$npc_firstname[''A285'']>>, 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 <<$npc_firstname[''A284'']>>''s hand is resting on <<$npc_firstname[''A285'']>>''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 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?"  <<$npc_firstname[''A284'']>> asks. <<$npc_firstname[''A274'']>> and Kima both put up their hands.  <<$npc_firstname[''A284'']>> nods. "Good. You will take the lead as Coryphée for your respective groups, the class will split into two groups of five, and <<$npc_firstname[''A285'']>> 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  <<$npc_firstname[''A284'']>> of the last few days. Instead, she drives all the students hard, criticising all mistakes, leaving <<$npc_firstname[''A277'']>> close to tears.'
+		'"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?" <<$npc_firstname[''A284'']>> asks. <<$npc_firstname[''A274'']>> and Kima both put up their hands. <<$npc_firstname[''A284'']>> nods. "Good. You will take the lead as Coryphée for your respective groups, the class will split into two groups of five, and <<$npc_firstname[''A285'']>> 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 <<$npc_firstname[''A284'']>> of the last few days. Instead, she drives all the students hard, criticising all mistakes, leaving <<$npc_firstname[''A277'']>> close to tears.'
 		act 'Conclude lesson':
 			*clr & cla
 			gs 'core_library', 'stage_title'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first_lesson':
 			'The class concludes with you performing an adagio culminating in a ports de bras for your Reverence.'
 			*nl
 			'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.  <<$npc_firstname[''A284'']>> 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.'
+			'<<$npc_firstname[''A274'']>> approaches you. "Don''t worry about the class, Sveta. <<$npc_firstname[''A284'']>> 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'
@@ -230,11 +230,11 @@ if $ARGS[0] = 'first_lesson':
 		gs 'stat'
 		gs 'core_library', 'stage_title'
 
-		'After yesterday''s rehearsals, you sense an air of both anticipation and dread for today''s lesson.  <<$npc_firstname[''A284'']>> is waiting in the class for you all to arrive.'
-		'"Welcome. Today we will go over the Entrance. Any questions?" Silence greets  <<$npc_firstname[''A284'']>>''s question. "Good, let us proceed. <<$npc_firstname[''A285'']>>, from the start."'
-		'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  <<$npc_firstname[''A284'']>> doesn''t give much time to relax.'
-		'When you get a bit of breathing space, you quickly eat an energy bar before  <<$npc_firstname[''A284'']>> finishes working with the other group. Now it''s your turn to practice.'
-		'As you finish,  <<$npc_firstname[''A284'']>> 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."'
+		'After yesterday''s rehearsals, you sense an air of both anticipation and dread for today''s lesson. <<$npc_firstname[''A284'']>> is waiting in the class for you all to arrive.'
+		'"Welcome. Today we will go over the Entrance. Any questions?" Silence greets <<$npc_firstname[''A284'']>>''s question. "Good, let us proceed. <<$npc_firstname[''A285'']>>, from the start."'
+		'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 <<$npc_firstname[''A284'']>> doesn''t give much time to relax.'
+		'When you get a bit of breathing space, you quickly eat an energy bar before <<$npc_firstname[''A284'']>> finishes working with the other group. Now it''s your turn to practice.'
+		'As you finish, <<$npc_firstname[''A284'']>> 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.'
 
@@ -252,10 +252,10 @@ if $ARGS[0] = 'first_lesson':
 		'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[''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  <<$npc_firstname[''A284'']>> enter the room and start to inspect you all, trying to find faults. Still, your class passes with only minor criticisms.'
+		'It''s not ideal, but you have no choice. As you finish tying the ribbons, you see <<$npc_firstname[''A284'']>> enter the room and start to inspect you all, trying to find faults. Still, your class passes with only minor criticisms.'
 		act 'Continue lesson':
 			gs 'core_library', 'stage_title'
-			'"Well done, class, you have done me proud. You have done exactly what I asked." It was rare praise from  <<$npc_firstname[''A284'']>>. "Now I want you to give me your best. I want you to dance like you never danced."'
+			'"Well done, class, you have done me proud. You have done exactly what I asked." It was rare praise from <<$npc_firstname[''A284'']>>. "Now I want you to give me your best. I want you to dance like you never danced."'
 			'With that, she claps her hands. "Take your positions." <<$npc_firstname[''A285'']>> starts to play. You lose yourself in the performance of all the lessons coming together from the last week, and you flow through the performance.'
 			' <<$npc_firstname[''A284'']>> 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':
@@ -268,10 +268,10 @@ if $ARGS[0] = 'first_lesson':
 				'"Any questions? If you have any tonight or need assistance, contact <<$npc_firstname[''A284'']>>, 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/reverence.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  <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>> 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,"  <<$npc_firstname[''A284'']>> says, with <<$npc_firstname[''A285'']>> nodding her agreement and repeating her words.'
+					'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 <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A285'']>> 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," <<$npc_firstname[''A284'']>> says, with <<$npc_firstname[''A285'']>> nodding her agreement and repeating her words.'
 					act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
 				end
 			end
@@ -285,7 +285,7 @@ if $ARGS[0] = 'shower':
 	gs 'stat'
 	*nl
 	$setloc['StageTitle'] = 'School Showers'
-	$setloc['StageImage'] =  'locations/pushkin/ballet_school/daily/shower_1.jpg'
+	$setloc['StageImage'] = 'locations/pushkin/ballet_school/daily/shower_1.jpg'
 
 	$setloc['StageImage'] = 'locations/pushkin/ballet_school/daily/shower_1.jpg'
 	if nclass > 1:
@@ -303,7 +303,7 @@ if $ARGS[0] = 'shower':
 		*nl
 	else
 		$setloc['StageTitle'] = 'Residential Bathroom'
-		$setloc['StageImage'] =  'locations/pushkin/ballet_residence/residential_bathroom.jpg'
+		$setloc['StageImage'] = 'locations/pushkin/ballet_residence/residential_bathroom.jpg'
 		$location_type = 'private'
 		gs 'themes', 'indoors'
 		gs 'stat'
@@ -419,32 +419,32 @@ if $ARGS[0] = 'second_lesson':
 	end
 	gs 'core_library', 'stage_title'
 	if ballet_day = 1:
-		!!  32-count combination
+		!! 32-count combination
 
-		'"Class, listen up,"  <<$npc_firstname[''A284'']>> 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."'
+		'"Class, listen up," <<$npc_firstname[''A284'']>> 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[''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,  <<$npc_firstname[''A284'']>> switches on a projector. "Here are your movements for your pas de deux. Please continue to the center, and I will observe your performances."'
+		'Once you finish the Barre exercises, <<$npc_firstname[''A284'']>> 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[''A274'']>> quickly study the chart and wait for <<$npc_firstname[''A285'']>> 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  <<$npc_firstname[''A284'']>>, 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."'
+		'This doesn''t go unnoticed by <<$npc_firstname[''A284'']>>, 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. <<$npc_firstname[''A285'']>>?"'
-		'The following five minutes of performance pushed <<$npc_firstname[''A274'']>> hard, and you watch in amazement how well she performed following  <<$npc_firstname[''A284'']>>''s lead.'
-		'Once the performance is done,  <<$npc_firstname[''A284'']>> and <<$npc_firstname[''A274'']>> curtsy to each other, and <<$npc_firstname[''A274'']>> comes over to you. You hand over her towel and water bottle.'
+		'The following five minutes of performance pushed <<$npc_firstname[''A274'']>> hard, and you watch in amazement how well she performed following <<$npc_firstname[''A284'']>>''s lead.'
+		'Once the performance is done, <<$npc_firstname[''A284'']>> 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[''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[''A274'']>>  as you work through your barre exercises.  <<$npc_firstname[''A284'']>> 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.'
+		'You stand next to <<$npc_firstname[''A274'']>> as you work through your barre exercises. <<$npc_firstname[''A284'']>> 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,  <<$npc_firstname[''A284'']>> calls an end to the class.'
+		'Before you can ask another question, <<$npc_firstname[''A284'']>> calls an end to the class.'
 
 	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  <<$npc_firstname[''A284'']>> comes by. "<<$npc_firstname[''A274'']>>, you can do better than that."'
-		'<<$npc_firstname[''A274'']>> winces, but does as  <<$npc_firstname[''A284'']>> asks, this time with few mistakes. "That''s better, I don''t expect such sloppiness from my dancers,"  <<$npc_firstname[''A284'']>> says, frowning. "You''re better than that and I hope you''re not getting lazy."'
-		'Before <<$npc_firstname[''A274'']>> can protest,  <<$npc_firstname[''A284'']>> leaves you alone for the rest of class, but you notice her watching <<$npc_firstname[''A274'']>> closely.'
+		'"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 <<$npc_firstname[''A284'']>> comes by. "<<$npc_firstname[''A274'']>>, you can do better than that."'
+		'<<$npc_firstname[''A274'']>> winces, but does as <<$npc_firstname[''A284'']>> asks, this time with few mistakes. "That''s better, I don''t expect such sloppiness from my dancers," <<$npc_firstname[''A284'']>> says, frowning. "You''re better than that and I hope you''re not getting lazy."'
+		'Before <<$npc_firstname[''A274'']>> can protest, <<$npc_firstname[''A284'']>> 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[''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'']>>?"'
@@ -454,10 +454,10 @@ if $ARGS[0] = 'second_lesson':
 			'"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[''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[''A274'']>>, I understand the grief about losing your mother. You''ll do her proud this week, and even  <<$npc_firstname[''A284'']>> thinks you''re one of the best in the class alongside Kima," you said to cheer her up.'
+		elseif mayaqw['grave'] < 4:
+			'"It''s okay <<$npc_firstname[''A274'']>>, I understand the grief about losing your mother. You''ll do her proud this week, and even <<$npc_firstname[''A284'']>> 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  <<$npc_firstname[''A284'']>> looking your way and continue your practice.'
+			'"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 <<$npc_firstname[''A284'']>> looking your way and continue your practice.'
 		end
 
 	elseif ballet_day = 5:
@@ -529,24 +529,24 @@ if $ARGS[0] = 'music_theory':
 	elseif ballet_day = 4:
 		gs 'sweat', 'add', 20
 		'"Positions!" <<$npc_firstname[''A285'']>> 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, <<$npc_firstname[''A285'']>> 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  <<$npc_firstname[''A284'']>> has been drilling into you.'
+		'You all stand there wondering if you should dance, but after a few moments, <<$npc_firstname[''A285'']>> 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 <<$npc_firstname[''A284'']>> has been drilling into you.'
 		'The difference is <<$npc_firstname[''A285'']>> 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:
 		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.'
-		'<<$npc_firstname[''A285'']>> and  <<$npc_firstname[''A284'']>> walk into the class together, and <<$npc_firstname[''A285'']>> 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."'
+		'<<$npc_firstname[''A285'']>> and <<$npc_firstname[''A284'']>> walk into the class together, and <<$npc_firstname[''A285'']>> 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."'
 		'"Take your positions." The class scrambles to get ready. "Remember everything that <<$npc_firstname[''A285'']>> and I have gone over in the last week. I want you to listen to the music cues, I want you to follow the steps I''ve taught you and, most of all, I want you to prove to me that you''re ready for tomorrow."'
-		'Birserka claps her hands, and on the count of three, you hear her calling out mistakes from each of the students. "Remember your cues!"  <<$npc_firstname[''A284'']>> drives you harder. She stops the class.'
-		'"That wasn''t a complete disaster. From the top once more." You complete the dance, and  <<$npc_firstname[''A284'']>> is watching the class. "Good, that was better. I''ll let you all finish early today, but I want you to return to the halls and prepare for tomorrow."'
+		'Birserka claps her hands, and on the count of three, you hear her calling out mistakes from each of the students. "Remember your cues!" <<$npc_firstname[''A284'']>> drives you harder. She stops the class.'
+		'"That wasn''t a complete disaster. From the top once more." You complete the dance, and <<$npc_firstname[''A284'']>> is watching the class. "Good, that was better. I''ll let you all finish early today, but I want you to return to the halls and prepare for tomorrow."'
 		'"You will find in the kitchen our recommendations for your evening meal and breakfast tomorrow. You may ignore it if you wish, but it will serve you well as you''ll need all the energy tomorrow for the exam. There are also energy bars provided between assessments."'
 		'<<$npc_firstname[''A285'']>> comes over and starts handing out booklets to each of the students. "These are some guides for ballet scores and music theory. It will list the dance combinations and give tips on deconstructing them."'
 		'You struggle to get up, and your legs feel like jelly, but you manage a passable curtsy to your teachers without stumbling. You notice that Maya''s own curtsey is just as weak-kneed as your own.'
-		'"Remember, keep your muscles warm and do light stretches tonight. You don''t want to injure yourself or push too hard,"  <<$npc_firstname[''A284'']>> says as you leave the class.'
+		'"Remember, keep your muscles warm and do light stretches tonight. You don''t want to injure yourself or push too hard," <<$npc_firstname[''A284'']>> says as you leave the class.'
 
 	end
 	school_daily_check = daystart
-	act 'Finish school' :  hour = 17 & minut = 15 & gt 'pushkin_ballet_res', 'hallway'
+	act 'Finish school' : hour = 17 & minut = 15 & gt 'pushkin_ballet_res', 'hallway'
 end
 
 if $ARGS[0] = 'assessment':
@@ -586,7 +586,7 @@ if $ARGS[0] = 'assessment':
 
 		'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  <<$npc_firstname[''A284'']>>, 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.'
+		'You recognise <<$npc_firstname[''A284'']>>, 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."'
 

+ 39 - 39
locations/pushkin_ballet_evt.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'letter':
 
 		! Rejection letter into the Corp.
 
-		act 'Continue your day.' :  act 'Continue': gt 'kuhrPar'
+		act 'Continue your day.' : act 'Continue': gt 'kuhrPar'
 	end
 end
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'res_events':
 	!! Communal fixed events
 	if $ARGS[1] = 'introductions':
 		!! Sunday night meet some of your classmates.
-        'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Madam <<$npc_lastname[''A286'']>> watching over the proceedings.'
+		'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Madam <<$npc_lastname[''A286'']>> watching over the proceedings.'
 		i_ballet = 274
 		i_npc_end = 282
 		$grid_text = ''
@@ -119,7 +119,7 @@ if $ARGS[0] = 'res_events':
 		*nl
 		'<center><table cellspacing="3">'
 		:jmp_ballet_intro
-		$grid_text += '<td><table bgcolor=<<$theme[''table_bg_alt'']>><tr><td align="center"><a href="exec: gt ''pushkin_ballet_evt'',''intro_<<i_ballet>>''"><img  height="100" src="<<$npc_img_path[''A<<i_ballet>>'']>>/<<i_ballet>>_profile.jpg"></a></td></tr><tr><td align="center"><<$npc_firstname[''A<<i_ballet>>'']>></td></tr></table>' + '</td>'
+		$grid_text += '<td><table bgcolor=<<$theme[''table_bg_alt'']>><tr><td align="center"><a href="exec: gt ''pushkin_ballet_evt'',''intro_<<i_ballet>>''"><img height="100" src="<<$npc_img_path[''A<<i_ballet>>'']>>/<<i_ballet>>_profile.jpg"></a></td></tr><tr><td align="center"><<$npc_firstname[''A<<i_ballet>>'']>></td></tr></table>' + '</td>'
 
 		grid_count += 1
 		if grid_count = 4:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'res_events':
 		killvar 'grid_count'
 		killvar '$grid_text'
 		ballet_mod['res_mg'] = 1
-		act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+		act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 	end
 
 	if $ARGS[1] = 'birthday':
@@ -183,17 +183,17 @@ if $ARGS[0] = 'res_events':
 
 	if $ARGS[1] = 'homesick':
 
-        'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
-        'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
-        '"You''re a friend of <<$npc_firstname[''A279'']>>?" you ask her, trying to distract her.'
-        '"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
-        '"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
-        'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
-        '"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad grin on her face.'
-        '"Anytime, Gasha, if you''re feeling down, let me know."'
+    'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
+    'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
+    '"You''re a friend of <<$npc_firstname[''A279'']>>?" you ask her, trying to distract her.'
+    '"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
+    '"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
+    'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
+    '"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad grin on her face.'
+    '"Anytime, Gasha, if you''re feeling down, let me know."'
 
-        act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
-    end
+    act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
+  end
 
 
 	if $ARGS[1] = 'tanis_bully':
@@ -202,7 +202,7 @@ if $ARGS[0] = 'res_events':
 	end
 
 	if $ARGS[1] = 'tanis_gasha':
-		!  Sveta catches Tanis bullying Gasha
+		! Sveta catches Tanis bullying Gasha
 		'WIP - tbc'
 	end
 
@@ -218,34 +218,34 @@ if $ARGS[0] = 'res_events':
 
 	!! Communal random events
 
-    if $ARGS[1] = '1':
+  if $ARGS[1] = '1':
 		! Chess game between Calina and Ruza
 		$setloc['StageTitle'] = 'The Chess Match'
-		$setloc['StageImage'] =   '<<$default_img_path>>ballet_events/chess.jpg'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/chess.jpg'
 		gs 'core_library', 'stage_title'
 
 		'You enter the communal room you see the twins Calina and Ruza sitting in the corner intently staring at a chess board. You notice the game has just started and a few of the other residents had settled down to watch them.'
 		act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
 	end
-    if $ARGS[1] = '2':
+  if $ARGS[1] = '2':
 		$setloc['StageTitle'] = 'TV Night'
-		$setloc['StageImage'] =   '<<$default_img_path>>ballet_events/chess.jpg'
-        ! TV with Gasha and munchies
-        '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.'
+		$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/chess.jpg'
+    ! TV with Gasha and munchies
+    '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'
-    end
-    if $ARGS[1] = '4':
-        ! Random girls doing yoga.
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '5':
+  if $ARGS[1] = '3':
+    ! Random girls doing barre training.
+    'WIP - tbc'
+  end
+  if $ARGS[1] = '4':
+    ! Random girls doing yoga.
+    '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.'
@@ -338,39 +338,39 @@ end
 
 if $ARGS[0] = 'intro_274':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A274'']>>/274-1.jpg"></a>'
+	'<center><a><img <<$set_imgh>> src="<<$npc_img_path[''A274'']>>/274-1.jpg"></center>'
 	'You walk over to a tall willowly blonde girl, "Hi I''m <<$pcs_nickname>>". The girl gives you a warm smile, "I''m <<$npc_firstname[''A274'']>> pleased to meet you. Where you from?" ''Pavlosk'' you reply, ''Yourself?'''
 	'"I live Pushkin now but from Moscow originally.", <<$npc_firstname[''A274'']>> replles before another girl jumps in taking her attention. '
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end
 if $ARGS[0] = 'intro_275':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A275'']>>/275.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A275'']>>/275.jpg"></a></center>'
 	'You notice girl writing in a small book she notices you looking at it, she makes an small attempt to try and avoid you. "Yes?", she asks, "I''m just introducing myself, <<$pcs_nickname>>". "Ah you''re the dancer from Pavlovsk looking critically at you." '
 	'"Yes, how did you know?", you ask puzzled but before she ignores you and goes back to writing into the book. '
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 	end
 if $ARGS[0] = 'intro_276':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A276'']>>/276.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A276'']>>/276.jpg"></a></center>'
 	'Glancing around the room you spot another girl and quickly approach her, "Hi I''m <<$pcs_nickname>>". The girl gives you a wary look, "Hello, I suppose I should introduce myself since it is obvious you don''t know me. I''m <<$npc_firstname[''A276'']>> . I am one of the leading dancers in the area.", she looks at you coldly as expecting you to know her and seeing your blank look looks disdainfully at you before walking off.'
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end
 if $ARGS[0] = 'intro_277':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A277'']>>/277.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A277'']>>/277.jpg"></a></center>'
 	'content to be added'
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end
 if $ARGS[0] = 'intro_278':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A278'']>>/278.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A278'']>>/278.jpg"></a></center>'
 	'content to be added'
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end
 if $ARGS[0] = 'intro_279':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A279'']>>/279.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A279'']>>/279.jpg"></a></center>'
 	'You see a girl talking animatedly to Madam <<$npc_lastname[''A284'']>> as you approach them, Madam <<$npc_lastname[''A284'']>> looks at you sharply before she leaves the girl with a sharp glance.'
 	'"Hello, you must be <<$pcs_nickname>>", she says with a cheeky grin.'
 	'"Yes, how did you know?"'
@@ -383,7 +383,7 @@ if $ARGS[0] = 'intro_279':
 end
 if $ARGS[0] = 'intro_280':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A280'']>>/280.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A280'']>>/280.jpg"></a></center>'
 	'You spot a girl sitting alone in the corner and make your way through the girls to where is sitting, she looks up at you in surprise that you approached her and looks at you quizically. "Did <<$npc_firstname[''A280'']>> ask you to talk to me?"'
 	'"No", you reply, "just saw you alone and wanted to meet you. I''m <<$pcs_nickname>>", the girl gives you a shy smile, "I''m <<$npc_firstname[''A280'']>> pleased to meet you!"'
 	'"Likewise, are you looking forward to this week?", you ask.'
@@ -398,13 +398,13 @@ if $ARGS[0] = 'intro_280':
 end
 if $ARGS[0] = 'intro_281':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A281'']>>/281.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A281'']>>/281.jpg"></a></center>'
 	'In the corner of the room you see a pair of twins bickering with each other. Over the clamour of the room you can''t hear what is being said. As you start to move closer to see what the commotion is a voice says "I wouldn''t interfere with the <<$npc_lastname[''A281'']>> twins", you turn round to see who spoke but then you notice Madam <<$npc_lastname[''A284'']>> walking over to them and you decide to stay away. '
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end
 if $ARGS[0] = 'intro_282':
 	*clr & cla
-	'<img  height="600" src="<<$npc_img_path[''A282'']>>/282.jpg"></a>'
+	'<center><a><img height="600" src="<<$npc_img_path[''A282'']>>/282.jpg"></a></center>'
 	'In the corner of the room you see a pair of twins bickering with each other. Over the clamour of the room you can''t hear what is being said. As you start to move closer to see what the commotion is a voice says "I wouldn''t interfere with the <<$npc_lastname[''A281'']>> twins", you turn round to see who spoke but then you notice Madam <<$npc_lastname[''A284'']>> walking over to them and you decide to stay away. '
 	act 'Leave': gt 'pushkin_ballet_evt','res_events', 'introductions'
 end

+ 7 - 7
locations/pushkin_ballet_init.qsrc

@@ -14,7 +14,7 @@
 !!
 !! mod_ballet[blocker]- quest line initiator to start/stop the quests.
 !! mod_ballet[letter]- temp blocker to prevent the letter being read multiple times.
-!! ballet[hypno] = 1  - hypno content trapdoor
+!! ballet[hypno] = 1 - hypno content trapdoor
 !! school_prep, school_running tally and final_score - preparation work, will be added to final school score to determine pass, almost pass (favor) or fail (no favor) converts to balletqw[school]
 !! balletqw[school] - Holding variable for final score 2 - passed, 3 - passed with Rudolph''s help, 4 - passed with Maya's help, 5 = Merit, 1 - failed
 !! balletqw[rank] - What stage of her career, 1 apprenticeship, 2 part of Corp de ballet, 3 full member of the Theatre.
@@ -48,7 +48,7 @@ if $ARGS[0] = 'init':
 			!! trigger late event for Maya wtih fall back
 			$balletEv['trigger'] = 'late'
 			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):
+		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
 
@@ -89,7 +89,7 @@ if $ARGS[0] = 'daily_assessment':
 		!! Positive additions:
 		mod_grade_attendance[week] += 1
 		if pcs_makeup > 1: mod_grade_mua[week] += 1
-		if hBraids > 0  or hpingripw > 0: mod_grade_appearance[week] +=1
+		if hBraids > 0 or hpingripw > 0: mod_grade_appearance[week] +=1
 
 		!! Negative deductions:
 		if pcs_hairbsh = 0: mod_grade_appearance[week] -=1
@@ -101,7 +101,7 @@ if $ARGS[0] = 'daily_assessment':
 		!!mod_daily_score[week] = mod_grade_mua[week] + mod_grade_attendance[week] + mod_grade_appearance[week] - mod_grade_discipline[week]
 		!! msg 'Attend: <<mod_grade_attendance[week]>>, MUA:<<mod_grade_mua[week]>>, Appear: <<mod_grade_appearance[week]>>, Discipline <<mod_grade_disciple[week]>>, <<pcs_hairbsh>>'
 	end
-	if nclass = 5 and  school_daily_check ! daystart:
+	if nclass = 5 and school_daily_check ! daystart:
 		mod_daily_score[week] = mod_grade_attendance[week] + mod_grade_mua[week] + mod_grade_appearance[week] + mod_homework[week] - mod_grade_discipline[week]
 	end
 
@@ -167,7 +167,7 @@ if $ARGS[0] = 'cleanup_var':
 		gs 'shortgs', 'remove_array_element', 'balletqw','rank'
 	end
 	!! Diags
-		ballet_temp['srt'] =  school_running_tally
+		ballet_temp['srt'] = school_running_tally
 		ballet_temp['school_prep'] = school_prep
 	!! End diags
 	killvar 'ballet_awol'
@@ -191,9 +191,9 @@ if $ARGS[0] = 'score_debug':
 		'Rules and Discipline: <<mod_grade_disciple[debug_day]>>'
 		'Homework: <<mod_homework[debug_day]>>'
 		'Attendance: <<mod_grade_attendance[debug_day]>>'
-		'Total Day Score:  <<mod_daily_score[debug_day]>>'
+		'Total Day Score: <<mod_daily_score[debug_day]>>'
 		' - - - '
 		debug_day += 1
-	if debug_day <=  5: jump 'jmp_debug_score'
+	if debug_day <= 5: jump 'jmp_debug_score'
 end
 --- pushkin_ballet_init ---------------------------------

+ 34 - 33
locations/pushkin_ballet_res.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'bedroom':
 	*clr & cla
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Residential Bedroom'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/bedroom.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_residence/bedroom.jpg'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'bedroom':
 		'You look around your room that will be the bedroom for the next week, and a small comfortable bed sits in the corner. You have a desk you can study on. In the corner, there''s a full-size <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> with a mirror on one of the doors.'
 		'You start to unpack your suitcase into the wardrobe and settle for the evening before preparing to meet your fellow students.'
 		'On the wall beside the entrance are various instructions for fire evacuation. Alongside these instructions is a sheet of paper with the words <b>Accommodation Rules</b>.'
-		act 'Explore the rest of the accommodation':  gt 'pushkin_ballet_res', 'hallway'
+		act 'Explore the rest of the accommodation': gt 'pushkin_ballet_res', 'hallway'
 		act 'Read the rules': gt 'pushkin_ballet_res', 'rules'
 
 	else
@@ -70,17 +70,17 @@ if $ARGS[0] = 'bedroom':
 		if $apparel['status'] ! 'nude':
 			act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 		else
-			act 'Go to the hallway': msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself Madam <<$npc_lastname[''A284'']>>  would likely have a few choice words about your behaviour.</font></b>'
+			act 'Go to the hallway': msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself Madam <<$npc_lastname[''A284'']>> would likely have a few choice words about your behaviour.</font></b>'
 		end
 
 		!! Default actions
 		gs 'core_library', 'bedroom'
 
 		!! Non-standard actions
-		if  hour >= 16 and week ! 7:
+		if hour >= 16 and week ! 7:
 			act 'Barre Practice (60m)': gt 'pushkin_ballet_evt', 'barre_exercise'
-			act 'Study (60m)':  gt 'pushkin_ballet_res', 'study'
-			if  mc_inventory['cosmetics'] >= 9:
+			act 'Study (60m)': gt 'pushkin_ballet_res', 'study'
+			if mc_inventory['cosmetics'] >= 9:
 				act 'Practice make-up' : gt 'pushkin_ballet_res', 'make_up'
 			end
 			if feet_track ! daystart: act 'Take care of your feet': gt 'pushkin_ballet_res', 'feetcare'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'bedroom':
 
 	!! First Maya event
 
-	if ballet_day = 3 and mayaqw['grave'] = 0  and ( hour >= 17 and hour <= 21):
+	if ballet_day = 3 and mayaqw['grave'] = 0 and ( hour >= 17 and hour <= 21):
 		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_274_init', 'post_grave'
@@ -103,7 +103,7 @@ end
 if $ARGS[0] = 'hallway':
 	*clr & cla
 	$setloc['StageTitle'] = 'Residental Hallway'
-	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_residence/hall.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>/ballet_residence/hall.jpg'
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'core_library', 'corridor'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'hallway':
 	nclass = 0
 	gs 'shortgs', 'clothing_status'
 	if $apparel['status'] ! 'nude' and ($apparel['status'] = 'sport' or $apparel['status'] = 'dance'):
-		if hour = 6 or (hour  = 7 and minut <=  30):
+		if hour = 6 or (hour = 7 and minut <= 30):
 			act 'Attend Ballet Classes': gt 'pushkin_ballet_class', 'start'
 		elseif hour = 7 and (minut > 30 and minut <= 59):
 			$balletEv['trigger'] = 'late'
@@ -128,20 +128,20 @@ if $ARGS[0] = 'hallway':
 			act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
 		end
 	else
-		msg '<b><font color = red>Whilst as a dancer you have less inhibition than most, Madam <<$npc_lastname[''A284'']>>  would likely have a few choice words about your clothing choices or lack thereof.</font></b>'
+		msg '<b><font color = red>Whilst as a dancer you have less inhibition than most, Madam <<$npc_lastname[''A284'']>> would likely have a few choice words about your clothing choices or lack thereof.</font></b>'
 	end
 
-	act 'Go to your room':  minut += 5 & gt 'pushkin_ballet_res', 'bedroom'
-	act 'Enter the communal room':  minut += 5 & gt 'pushkin_ballet_res', 'communal_area'
-	act 'Go to the bathroom':  minut += 5 & gt 'pushkin_ballet_class', 'shower'
-	act 'Go to the kitchen':  minut += 5 & gt 'pushkin_ballet_res', 'kitchen'
+	act 'Go to your room': minut += 5 & gt 'pushkin_ballet_res', 'bedroom'
+	act 'Enter the communal room': minut += 5 & gt 'pushkin_ballet_res', 'communal_area'
+	act 'Go to the bathroom': minut += 5 & gt 'pushkin_ballet_class', 'shower'
+	act 'Go to the kitchen': minut += 5 & gt 'pushkin_ballet_res', 'kitchen'
 	if week ! 7 and npc_trust['A274'] >= 10:
-		!! act 'Visit Maya' :  minut += 5 & gt 'pushkin_ballet_res', 'maya_room'
+		!! act 'Visit Maya' : minut += 5 & gt 'pushkin_ballet_res', 'maya_room'
 	end
-	!!act 'Knock on wardens door' :  minut += 5 & gt 'pushkin_ballet_res', 'warden_room'
+	!!act 'Knock on wardens door' : minut += 5 & gt 'pushkin_ballet_res', 'warden_room'
 
 	if ballet_day = 7:
-		'The hall is bustling with various students settling into their rooms. A few of them wave or smile to greet you as you pass by. You see Madam <<$npc_lastname[''A284'']>>  at the end of the hall, keeping an eye on the students and ready to provide assistance.'
+		'The hall is bustling with various students settling into their rooms. A few of them wave or smile to greet you as you pass by. You see Madam <<$npc_lastname[''A284'']>> at the end of the hall, keeping an eye on the students and ready to provide assistance.'
 
 	elseif week = 2 and hour <= 18:
 		gs 'pushkin_ballet_evt', 'res_events', 'birthday', 1
@@ -170,14 +170,14 @@ if $ARGS[0] = 'maya_room':
 	*clr & cla
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Maya Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/maya_room.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>/ballet_residence/maya_room.jpg'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 	'Maya''s room closely resembles your own. Her wardrobe is open, and you see her collection of tutus hanging from the rails. On her desk there are several books, including an open poetry book. A quick glance reveals the page title "Like a White Stone" by Akhmatova.'
 	'Next to it is an old picture of a woman in a park with a black ribbon in the corner.'
-	act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+	act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 	!! Maya events
 end
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'communal_area':
 	*clr & cla
 
 	$setloc['StageTitle'] = 'Communal Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/communal.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>/ballet_residence/communal.jpg'
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
@@ -193,7 +193,7 @@ if $ARGS[0] = 'communal_area':
 	gs 'core_library', 'stage_title'
 	!!'You enter the communal room.'
 
-	act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+	act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 
 	if week = 7 and ballet_mod['res_mg'] = 0:
 		*nl
@@ -214,28 +214,29 @@ if $ARGS[0] = 'kitchen':
 	*clr & cla
 
 	$setloc['StageTitle'] = 'Residental Kitchen'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/kitchen.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_residence/kitchen.jpg'
 	$location_type = 'private'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
 
 	gs 'core_library', 'stage_title'
-	act 'Go to the hallway':  minut += 5 & gt 'pushkin_ballet_res', 'hallway'
+	act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 	gs 'core_library', 'kitchen'
 
 	!! Set up events
 	*nl
 	if hour > 15:
 		act 'Eat a light meal':gs 'food', 's_meal'
-		act 'Eat an Evening Meal':gs 'food', 'only_stats_medium_meal'
+		act 'Eat an Evening Meal':gs 'food', 'm_meal'
 		elseif (hour > 4 and hour < 8) and mayaqw['grave'] = 4 and sharedmeal ! daystart:
-		act 'Have breakfast with Maya':
+		act 'Have breakfast with <<$npc_firstname[''A274'']>>':
 			*clr & cla
 			sharedmeal = daystart
 			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.'
+			'<center><img <<$set_imgh>> src="<<$npc_img_path[''A274'']>>/274-1.jpg"></center>'
+			'You encounter <<$npc_firstname[''A274'']>> 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'
 		end
 	elseif hour > 4 and hour < 8:
@@ -264,7 +265,7 @@ if $ARGS[0] = 'warden':
 		'"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause.'
 		'"<<$pcs_firstname>> <<$pcs_lastname>>, you will see me in my office. Now." You can swear the temperature around you just plummeted a few degrees and the door was buzzed open.'
 		gt 'pushkin_ballet_res', 'warden_room'
-	elseif (hour >= 17  or hour < 21 ) and ballet_awol = 1:
+	elseif (hour >= 17 or hour < 21 ) and ballet_awol = 1:
 		'"Pushkin Ballet Residential Block, how may I help you?", you hear Madam <<$npc_lastname[''A284'']>>''s voice through the intercom.'
 		'"<<$pcs_firstname>> <<$pcs_lastname>>, can I be let in please?", there''s a few seconds pause and you hear the door being buzzed open.'
 		gt 'pushkin_ballet_res', 'hallway'
@@ -285,7 +286,7 @@ if $ARGS[0] = 'warden_room':
 
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Wardens Residence'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/warden.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>/ballet_residence/warden.jpg'
 	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'pushkin_ballet_res', $ARGS[0]
 	gs 'themes', 'indoors'
@@ -293,7 +294,7 @@ if $ARGS[0] = 'warden_room':
 	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
@@ -335,7 +336,7 @@ if $ARGS[0] = 'radio':
 		mod_daily_score[week] += 1
 	end
 	$setloc['StageTitle'] = 'Radio'
-	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/russian_radio.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_residence/russian_radio.jpg'
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 
@@ -362,7 +363,7 @@ if $ARGS[0] = 'feetcare':
 	feet_track = daystart
 	gs 'stat'
 	$setloc['StageTitle'] = 'Feet Care'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/feet_soak.jpg'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_events/feet_soak.jpg'
 	gs 'core_library', 'stage_title'
 
 	'After the long day at the ballet class, you diligently inspect your calves and feet for injuries, gently massaging Arnica Gel onto your calves and ankles to alleviate stiffness and swelling. Next, you carefully examine your calluses and check for any blisters.'
@@ -383,7 +384,7 @@ if $ARGS[0] = 'study':
 	mod_homework[week] += 1
 	mod_daily_score[week] += 1
 	$setloc['StageTitle'] = 'Ballet Studies'
-	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study.jpg'
+	$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.'
@@ -409,7 +410,7 @@ if $ARGS[0] = 'make_up':
 		end
 		gs 'stat'
 		$setloc['StageTitle'] = 'Make Up Practice'
-		$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up.jpg'
+		$setloc['StageImage'] = '<<$default_img_path>>/ballet_events/make-up.jpg'
 		gs 'core_library', 'stage_title'
 
 		if pcs_makupskl <= 30: