Merge remote-tracking branch 'Kevin-upstream/master'

glife.qproj

@@ -330,6 +330,7 @@
 		<Location name="kompMFCanal"/>
 		<Location name="kompMFCoral"/>
 		<Location name="komp_HF_or_not"/>
+		<Location name="komp_assbook"/>
 		<Location name="mirror"/>
 		<Location name="stol"/>
 		<Location name="kit_din"/>

locations/Komp.qsrc

@@ -56,9 +56,7 @@ if $ARGS[0] = 'browse':
 	gs 'stat'
 	menu_off = 0
 	
-	act 'Close the browser':
-		gt 'komp','start'
-	end
+	act 'Close the browser': gt 'komp','start'
 	
 	!! TODO: Update
 	!! check if the original account still valid?
@@ -85,7 +83,7 @@ if $ARGS[0] = 'browse':
 		if $access['noporn'] = 1:
 			"<b><<$access['noporn']>></b>"
 		end
-		if  camwhore = 1 and access['nocamshow'] = 1 and mc_inventory['tech_webcam'] = 1: 
+		if camwhore = 1 and access['nocamshow'] = 1 and mc_inventory['tech_webcam'] = 1: 
 			"<b><<$access['nocamshow']>></b>"
 		end
 		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out': gt 'komp', 'sale'
@@ -104,13 +102,15 @@ if $ARGS[0] = 'browse':
 
 		act 'Search for cable TV services (1:00)': gt 'komp', 'kabtv'
 		act 'Play an online game': gt 'KGstart'
+		act 'Check social media on Assbook': gt 'komp_assbook', 'main'
+		if shantfoto > 0: act 'Find the girl you took photos of in the park': gt 'komp_assbook', 'blackmail'
+
 		if fuckornot = 3: act 'Visit ''Fuckable or not'' site': $view_location = 'komp' & gt 'komp_HF_or_not', 'fuckornot'
 		if hotornot >= 2: act 'Visit ''Hot or not'' site': $view_location = 'komp' & gt 'komp_HF_or_not', 'hotornot'
-!!new code make sure it will work please
+
 		if fuckornot_uni = 1: act 'Visit ''Fuckable or not'' University site': $view_location = 'komp' & gt 'komp_HF_or_not', 'fuckornot_uni'
 		if hotornot_uni = 1: act 'Visit ''Hot or not'' University site': $view_location = 'komp' & gt 'komp_HF_or_not', 'hotornot_uni'
 		!!if bankAccount > 0: act 'Visit your bank, maybe to purchase more online time': gt 'komp', 'bank'
-		if shantfoto > 0: act 'Find the girl you took photos of in the park on "Assbook"': gt 'komp', 'foto'
 		if gor_dorm = 7: act 'Read letter from Eugene': gt 'etoexhib', 'pos91'
 		if camwhore = 1 and access['nocamshow'] = 0 and mc_inventory['tech_webcam'] = 1: act 'Go to MyFreeCams.org': gt 'komp_camgirl', 'start'
 		if (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'): act 'Spend time studying': gt 'komp', 'study'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'browse':
 end
 
 if $ARGS[0] = 'sale':
-	*clr & cla	
+	*clr & cla
 	!! TODO: Update time and internet
 	
 	!! IMPORTANT: What happens if an activity takes more time than the minutes Sveta has? We just say "You tried, but could not finish"?

locations/core_library.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'bathroom':
     if $location_type = 'private':
         'Your accommodation for the week has the luxury of a private shower and a bath. There''s a poster on the wall promoting the health benefits of ice baths and other advice on looking after your body.' 
         *nl  
-            'There is a shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+        'There is a shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
         gs 'din_van', 'private'
     elseif $location_type = 'public':
@@ -125,10 +125,11 @@ if $ARGS[0] = 'bathroom':
             dynamic $showerdin	
             gs 'stat'
             'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'
-                'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-
+        
             act 'Continue' : gt $loc, $loc_arg
         end
+        'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+
     elseif $location_type = 'communal':
 
     end

locations/komp_assbook.qsrc

@@ -0,0 +1,139 @@
+# komp_assbook
+
+if $ARGS[0] = 'main' or $ARGS[0] = '':
+	gs 'stat'
+	$subs = $access['subscription']
+
+	act 'Close Assbook': gt 'komp', 'browse'
+
+	'<center><b>Assbook</b></center>'
+	if subscription[$subs] < 1:
+		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
+		'You have no internet access, ' + iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
+		act '<B>Close the browser</B>': gt 'komp','start'
+	else
+		'<center><img <<$set_imgh>> src="images/system/image_needed.jpg"></center>'
+		'You''re currently on Russia''s biggest social network site, "Assbook". Almost everyone has an account here'
+		*nl
+		if $assbook['account_name'] = '':
+			'Click here to log in or <a href="exec:gt ''komp_assbook'', ''signup'' ">sign up</a>'
+		else
+			'Click here to <a href="exec:gt ''komp_assbook'', ''login'' ">log in</a> or signup'
+			act 'Go to your page': gt 'komp_assbook', 'login'
+		end
+		
+		if shantfoto > 0: act 'Find the girl you took photos of in the park': gt 'komp_assbook', 'blackmail'
+		act 'Read more about Assbook': gt 'komp_assbook', 'mission_statements'
+	end
+end
+
+
+if $ARGS[0] = 'signup':
+	'<center><b>Assbook</b></center>'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.jpg"></center>'
+	'You consider which name you''d like to register under.'
+	$assbook['account_name'] = input('Which name would you like to use? (Leave blank for <<$pcs_nickname>>)')
+	if $assbook['account_name'] = '': $assbook['account_name'] = '<<$pcs_nickname>>'
+	'You fill in your personal details and within a few moments you''ve created an account. You can even upload photos to your own page.'
+	minut += 5
+	elektro += 1
+	gs 'internet_mobile', 'use_internet', $subs, 5
+	act 'Go back to the main page': gt 'komp_assbook', 'main'
+end
+
+if $ARGS[0] = 'login':
+	'<center><img <<$set_imgh>> src="images/system/image_needed.jpg"></center>'
+	
+	'This content is WIP.'
+	
+	act 'Go back to the main page': gt 'komp_assbook', 'main'
+end
+
+
+if $ARGS[0] = 'mission_statements':
+	'Introducing Assbook: Where Connections Speak Louder than Words!'
+	'Dive into the vibrant and dynamic world of Assbook, your passport to a digital realm filled with the rich tapestry of Russian culture, diverse communities, and unparalleled social interactions. Here''s why Assbook is the social media platform you''ve been waiting for:'
+	*nl
+	'<b>Cultural Richness:</b>'
+	'Assbook isn''t just a social media site; it''s a celebration of Russian culture. Immerse yourself in a community that cherishes the arts, history, and the unique traditions that make Russia a tapestry of diversity. From captivating stories to stunning visuals, Assbook is your window into the soul of this extraordinary nation.'
+	*nl
+	'<b>Connect with a Purpose:</b>'
+	'Unlike other social media platforms, Assbook is designed to foster meaningful connections. Engage in discussions that matter, share experiences, and find like-minded individuals who appreciate the depth of human interaction. From intellectual debates to heartfelt conversations, Assbook encourages connections that go beyond the surface.'
+	*nl
+	'<b>Visual Storytelling:</b>'
+	'Capture and share your life''s moments through Assbook''s visually immersive experience. Whether it''s breathtaking landscapes, artistic expressions, or snapshots of everyday life, let your images tell the story. With an emphasis on visual storytelling, Assbook transforms your feed into a canvas of emotions, sparking connections through the power of imagery.'
+	*nl
+	'<b>Privacy and Security:</b>'
+	'Your online safety is our top priority. Assbook employs state-of-the-art security measures to ensure that your personal information remains private. Enjoy a worry-free social experience, knowing that your data is in safe hands.'
+	*nl
+	'<b>Community-driven Features:</b>'
+	'Assbook is constantly evolving based on user feedback. Have a suggestion or a feature you''d love to see? Our community-driven approach means that your voice matters. Shape the platform to suit your needs and make Assbook your own.'
+	*nl
+	'<b>Exclusive Events and Groups:</b>'
+	'Discover and participate in exclusive events and groups tailored to your interests. From cultural meet-ups to niche communities, Assbook provides a platform for you to connect with people who share your passions.'
+	*nl
+	'<b>Assbook for Business:</b>'
+	'Entrepreneurs and businesses, take note! Assbook offers a unique platform for networking, brand promotion, and reaching your target audience. Leverage the power of the Assbook community to elevate your brand and connect with potential customers.'
+	*nl
+	'Join the Assbook revolution today and experience social media in a way that transcends the ordinary. Embrace the beauty of Russian culture, forge lasting connections, and make Assbook your digital home!'
+
+	act 'Go back to the main page': gt 'komp_assbook', 'main'
+end
+
+
+if $ARGS[0] = 'blackmail':
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
+	'You''re currently on Russia''s biggest social network site, "Assbook". Almost everyone has an account here, probably including the girl you took that photo of the other day!'
+	'"Maybe if I can find her, I can blackmail her", you think to yourself. "This photo is very raunchy, after all... I bet she would hate to see it published if she''s important!"'
+	'You can''t help but rub your pussy every now and then while you look at it. You''ll probably keep a copy of this for yourself, either way!'
+
+	act 'Try to find out who she is (1:00)':
+		cla
+		minut += 60
+		elektro += 6
+		gs 'internet_mobile', 'use_internet', $subs, 60
+		fotsearchrand = rand(0,10)
+
+		if fotsearchrand <= 7:
+			'Despite your best efforts, you don''t manage to find the girl this time.'
+
+			act 'Go back to the "Assbook" main page': gt 'komp_assbook', 'main'
+		end
+
+		if fotsearchrand > 7:
+			shantfoto -= 1
+			'Despite your best efforts, you don''t manage to... wait, that''s her! You found her!'
+			gerofotorand = rand(0,100)
+
+			if gerofotorand > 30:
+				'Your dreams of making a fortune are quickly shattered when you check out her profile. Cheap clothes, few friends, lives in a poor district of the city... this girl is not worth blackmailing.'
+
+				act 'Go back to the "Assbook" main page': gt 'komp_assbook', 'main'
+			end
+
+			if gerofotorand >= 5 and gerofotorand <= 30:
+				shantsr += 1
+				'When you click through her profile, you estimate she''s an unknown middle-class girl. Still, she has a lot of friends and the outfits she''s wearing in her photos look stylish... she has money to spend.'
+				'"Why not make her spend some of it on me?" you laugh to yourself, and begin to write a private message.'
+				'You send her a copy of the photo with the private message and tell her to transfer a very modest amount of 5,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to her entire friends list (which you secured before sending the message), the money needs to be on your bank account within 48 hours.'
+
+				act 'Go back to the "Assbook" main page': gt 'komp_assbook', 'main'
+			end
+
+			if gerofotorand < 5:
+				shantbog += 1
+				'You can barely believe it when you read her profile, this girl is a celebrity! It would be a major scandal if this photo got published!'
+				'You send her a copy of the photo with a private message, telling her to transfer 30,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to the press, the money needs to be on your bank account within 48 hours.'
+
+				act 'Go back to the "Assbook" main page': gt 'komp_assbook', 'main'
+			end
+		end
+	end
+
+	act 'Go back to the "Assbook" main page': gt 'komp_assbook', 'main'
+end
+
+
+--- komp_assbook ---------------------------------

locations/npc_3501_init.qsrc

@@ -45,9 +45,11 @@ if $ARGS[0] = 'scheduler':
 end
 !! Init first event - triggered from pushkin_ballet_res, bedroom
 
-if $ARGS[1] = 'grave':
-	time += 5
+if $ARGS[0] = 'grave':
+	*clr & cla
+	minut += 5
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/ballet/3501-1.jpg"></center>'
 	'<<$npc_firstname[''A3501'']>> enters your room, "<<$pcs_nickname>>, do you have some free time?"'
 	'"Sure, what do you need, <<$npc_firstname[''A3501'']>>? Some more practice?"' 
 	'"I need to go somewhere, but I don''t want to go alone," <<$npc_firstname[''A3501'']>> says, avoiding the question, her eyes looking at the floor.'
@@ -61,12 +63,11 @@ end
 
 if $ARGS[0] = 'graveyard_memorial':
 	*clr & cla
+	$setloc['StageTitle'] = 'Pushkin Graveyard'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_events/graveyard'
 	minut += 45
 	gs 'stat'
-   
-	'<center><h2>Pushkin Graveyard</h2></center>'
-	'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/graveyard.jpg"></center>'
-
+    gs 'core_library', 'stage_title'
 	'You agree to <<$npc_firstname[''A3501'']>>''s strange request. You grab your coat before the two of you head out of your bedroom. You take the short walk from your residence to the graveyard, a quiet location. <<$npc_firstname[''A3501'']>> has been quiet during your walk, totally unlike her usual boisterous self. However, you''re unsure how to break the silence when she touches your arm.'
 	'You pause and look towards her. "Thank you, <<$pcs_nickname>>, for coming with me. You''re probably wondering why we''re here." Grief fills her eyes, showing the pain that she''s been holding back. <<$npc_firstname[''A3501'']>> starts to walk again until you come to a grave.'
 	*nl
@@ -76,13 +77,11 @@ if $ARGS[0] = 'graveyard_memorial':
 		gs 'npc_relationship', 'modify', 'A3501', 'like'
 		npc_trust['A3501'] += 5
 		gs 'stat'
-		'<center><h2>Pushkin Graveyard</h2></center>'
-		'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/graveyard.jpg"></center>'
+		gs 'core_library', 'stage_title'
 		'You step in, pulling her close to you. You smell the soft, floral fragrance she wears, and she starts to cry. You just hold her waiting for the storm of tears to pass. You reach into your purse to take out a tissue and hand it to <<$npc_firstname[''A3501'']>>.'
 		act 'Talk to <<$npc_firstname[''A3501'']>>':
 			*clr & cla
-			'<center><h2>Pushkin Graveyard</h2></center>'
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/graveyard.jpg"></center>'
+			gs 'core_library', 'stage_title'
 			'<<$npc_firstname[''A3501'']>> gives you a warm smile as she takes the tissue. "Sorry for being such a mess, <<$pcs_nickname>>. This is why I dance. I owe it to my mum. She was a ballet dancer herself, and I inherited her talent."'
 			*nl
 			'You squeeze her hand to encourage her. Then, you put your coat on the ground for both of you to sit on. "Take your time, <<$npc_firstname[''A3501'']>>", you coax her softly.'
@@ -90,8 +89,7 @@ if $ARGS[0] = 'graveyard_memorial':
 			'"Sure, <<$npc_firstname[''A3501'']>>. I''ll be beside those trees."'
 			act 'Wait':
 				*clr & cla
-				'<center><h2>Pushkin Graveyard</h2></center>'
-				'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/graveyard.jpg"></center>'
+				gs 'core_library', 'stage_title'
 				'You pick up your coat and start walking to the bench near the main entrance, brushing the grass and leaves from your coat. You sit down and look towards <<$npc_firstname[''A3501'']>> but can''t see her. You pull out your phone and play a game to distract yourself.'
 				*nl
 				'You look up, hearing footsteps, and it''s <<$npc_firstname[''A3501'']>> coming back. Her eyes were red and puffy from crying. You stand up to meet her, "You look a fright, <<$npc_firstname[''A3501'']>>. Let me fix your makeup."'
@@ -107,8 +105,7 @@ if $ARGS[0] = 'graveyard_memorial':
 
 	act 'Talk to <<$npc_firstname[''A3501'']>>':
 		*clr & cla
-		'<center><h2>Pushkin Graveyard</h2></center>'
-		'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/graveyard.jpg"></center>'
+		gs 'core_library', 'stage_title'
 		'<<$npc_firstname[''A3501'']>> gives you a warm smile as she takes the tissue. "Sorry for being such a mess, <<$pcs_nickname>>. This is why I dance. I owe it to my mum. She was a ballet dancer herself, and I inherited her talent."'
 		'You squeeze her hand to encourage her. Then, you put your coat on the ground for both of you to sit on. "Take your time, <<$npc_firstname[''A3501'']>>", you coax her softly.'
 		'"I''m not usually this bad," <<$npc_firstname[''A3501'']>> replies. "It''s just that getting a place on this course is a major achievement for me. Do you mind and give me a moment alone, please?" She looks vulnerable as she makes the request.'
@@ -134,7 +131,7 @@ if $ARGS[0] = 'post_grave':
 		*clr & cla
 		minut += 15
 		'<center><h2>Residental Bedroom</h2></center>'
-		'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/bedroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/bedroom.jpg"></center>'
 		'<<$npc_firstname[''A3501'']>> enters your room, and you can see she''s been crying. "<<$pcs_nickname>>, do you have a moment?"'
 		'"Sure," you reply, wondering if you will get answers as to why she''s has been crying. She sits on your bed and stays silent for a few moments.'
 		'"<<$pcs_nickname>>, how much do you know about me?"'
@@ -147,16 +144,16 @@ if $ARGS[0] = 'post_grave':
 		minut += 20
 		gs 'stat'
 		'<center><h2>Residental Bedroom</h2></center>'
-		'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/bedroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/bedroom.jpg"></center>'
 		'You enter your room together and see that <<$npc_firstname[''A3501'']>> is still subdued. "You want some tea <<$npc_firstname[''A3501'']>>?" she looks up and nods before she starts dabbing her eyes with the handkerchief. '
 		act 'Go to the kitchen':  
 			*clr & cla
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/gasha_raid.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_events/gasha_raid.jpg"></center>'
 			'You quickly leave the room and bump into Gasha doing a snack raid. She jumps as she sees you, almost dropping her loot. She has a guilty expression. You''re about to say something, but she''s off before you can get a word out, leaving you to shake your head in amusement.' 
 			act 'Make tea':
 				*clr & cla
 				'<center><h2>Residental Kitchen</h2></center>'
-				'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/kitchen.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/kitchen.jpg"></center>'
 				'You make some strong tea and head back to your room. <<$npc_firstname[''A3501'']>> is laying on your bed with her eyes closed.'
 				'You approach her and lead down to touch her hand. "<<$npc_firstname[''A3501'']>>, you awake?"'
 				'She opens her eyes and gives you a small smile, "Yes, <<$pcs_nickname>>. You brought the tea, thank you. You''ve been too good to me tonight."'
@@ -173,11 +170,11 @@ if $ARGS[0] = 'post_grave':
 		if mayaqw['grave'] = 3:
 			*clr & cla   
 			'<center><h2>Residental Bedroom</h2></center>'
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/bedroom.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/bedroom.jpg"></center>'
 		else  
 			*clr & cla
 			'<center><h2>Residental Bedroom</h2></center>'
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/events/tea_bed.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_events/tea_bed.jpg"></center>'
 		end
 
 		'"Yeah, that''s true. Sorry, I''m used to everyone knowing who I am. You''re the first person that treats me like a person rather than some fragile piece of China."'
@@ -205,13 +202,13 @@ if $ARGS[0] = 'summer_school':
 		*clr & cla
 		if mayaqw['grave'] = 4:
 			mood += 10
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/3501_1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/character/ballet/3501_1.jpg"></center>'
 			'<<$npc_firstname[''A3501'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
 			'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A3501'']>>.'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'
 		else
-			'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/npc/warden.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/character/ballet/warden.jpg"></center>'
 			'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'

locations/pushkin_ballet_center.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
     gs 'shortgs', 'setloc', 'ballet_pushkin_center', $ARGS[0]
     $region = 'puskin'
     $setloc['StageTitle'] = 'Pushkin Residential School'
-	$setloc['StageImage'] =  '/pushkin/residence/residence'
+	$setloc['StageImage'] =  'pushkin/residence/residence'
     menu_off = 0
     if sound = 0:PLAY 'sound/street.mp3',30
     gs'stat'

locations/pushkin_ballet_class.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'first_lesson':
         gs 'sweat', 'add', 30
         gs 'pushkin_ballet_init', 'daily_assessment'
         gs 'stat'
-        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_003'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_003'
         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.'
@@ -281,16 +281,14 @@ if $ARGS[0] = 'first_lesson':
                 *clr & cla
                 $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_teach_1'
                 gs 'core_library', 'stage_title'
-                '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/ballet_teach_1.jpg"></center>'
                 '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."'
                 '"Your final examination is a solo divertissement lasting no more than five minutes. This performance shows your ability to the judges and will be freeform."'
                 '"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/daily/reverance'
+                        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/events/reverance'
                         gs 'core_library', 'stage_title'
-                        '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/events/reverence.jpg"></center>'
                         '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.'                           
                         act 'Go to the showers' : gt 'pushkin_ballet_class', 'shower'
@@ -306,7 +304,7 @@ if $ARGS[0] = 'shower':
     gs 'stat'
     *nl
     $setloc['StageTitle'] = 'School Showers'
-	$setloc['StageImage'] =  'images/locations/pushkin/ballet_school/daily/shower_1'
+	$setloc['StageImage'] =  'locations/pushkin/ballet_school/daily/shower_1'
     if nclass > 1:      
         $location_type = 'public'
         gs 'themes', 'indoors'
@@ -408,11 +406,12 @@ if $ARGS[0] = 'lunch':
 	$setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/cafeteria'
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
-    ! gs lunch events
+    !! gs lunch events
     gs 'core_library', 'stage_title'
     *nl 
     'You enter the school''s canteen. It seems you''ve timed it between lunch breaks, so it''s relatively quiet.'
     *nl
+    act 'Head to next lesson' : menu_off = 0 & gt 'pushkin_ballet_class', 'second_lesson'  
     gs 'core_library', 'kitchen'
     act 'Eat lunch':
         cla
@@ -422,7 +421,7 @@ if $ARGS[0] = 'lunch':
         gs 'food', 'm_meal'  
     end
     
-    act 'Head to next lesson' : menu_off = 0 & gt 'pushkin_ballet_class', 'second_lesson'  
+    
 end
 
 if $ARGS[0] = 'second_lesson':
@@ -438,14 +437,14 @@ if $ARGS[0] = 'second_lesson':
     gs 'pushkin_ballet_init', 'daily_assessment'
     nclass = 4
     gs 'stat'
-    '<center><h2>Dance Practice</h2></center>'
-
+    $setloc['StageTitle'] = 'Dance Practice'
     if mayaqw['grave'] = 4:
-        '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/mirror_ballet.jpg"></center>'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/mirror_ballet'
+
     else
-        '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/class_three.jpg"></center>'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/class_three'
     end
-
+    gs 'core_library', 'stage_title'
     if ballet_day = 1 :
         !!  32-count combination
 
@@ -501,7 +500,9 @@ if $ARGS[0] = 'second_lesson':
     *nl
     act 'Finish lesson': 
          *clr & cla
-		'<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/ballet_class_006.jpg"></center>'
+         $setloc['StageTitle'] = 'Reverance'
+         $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/ballet_class_006'
+         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.'
 
 		nclass = 4
@@ -579,24 +580,25 @@ end
 
 if $ARGS[0] = 'assessment':
     *clr & cla
+    $setloc['StageTitle'] = 'Assessment Day'    
     $location_type = 'public_indoors'
     gs 'themes', 'indoors'
-
     !! Dance exam
 
     balletqw['school'] = 1
     pcs_sleep -= rand(10,20)
     gs 'exercise', 'tier4', 180, 'agil_exp', 'stren_exp', 'danc_exp'
     !! rank is the final assessment score to determine pass, fail or a potential fall into Randolph''s clutches.
-    gs 'pushkin_ballet_init', 'famemodifier', 'rank'
+    !!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
-    '<center><h2>Assessment Day</h2></center>'
-    '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/daily/hall.jpg"></center>'
+
+    $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/daily/hall'
+    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 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.'
@@ -611,7 +613,8 @@ if $ARGS[0] = 'assessment':
         *clr & cla
         minut += 20
         gs 'stat'
-        '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/exams/exam_1.jpg"></center>'
+        $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_1'
+        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.'
@@ -623,7 +626,8 @@ if $ARGS[0] = 'assessment':
             *clr & cla
             minut += 60        	
             gs 'stat'
-            '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/exams/exam_2.jpg"></center>'
+            $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/exam_2'
+            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.'
             *nl
@@ -639,7 +643,8 @@ if $ARGS[0] = 'assessment':
                 *clr & cla
                 minut += 120
         	    gs 'stat'
-                '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/school/exams/solo_2.jpg"></center>'
+                $setloc['StageImage'] =  '<<$default_img_path>>ballet_school/exams/solo_2'
+                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'']>> .'
@@ -651,7 +656,7 @@ if $ARGS[0] = 'assessment':
                 *nl
                 'At the end of the performance, you feel a sense of loss of something extraordinary. You realise the emotional high you''ve been riding has come to a crashing end, and you barely retain your sense of poise and perform the great reverence to your examiners before you are given permission to leave.'
                 
-                gs 'pushkin_ballet_init', 'daily_assessment', 'grade'
+               !! gs 'pushkin_ballet_init', 'daily_assessment', 'grade'
                 act 'Finalé' : gt 'pushkin_ballet_class', 'start'
             end
         end

locations/pushkin_ballet_evt.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'letter':
         
         act 'Open Letter':
             *clr & cla
-            '<center><img <<$set_imgh>> src="mod/img_ballet/pavlosk/kuhrpar/letter.jpg"></center>'
+            '<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
             'You quickly grab a knife from the counter to open the letter and start to read the contents.'
             'You skim through the letter to find the information you were hoping for and let out a scream as you find the paragraph that has awarded you a grant and a spot at the Pushkin Ballet summer school.'
             '"Did you get the place, <<$pcs_nickname>>?" your <<$npc_nickname[''A29'']>> asks.'
@@ -42,7 +42,7 @@ if $ARGS[0] = 'letter':
         minut += 15
         gs 'stat'
 
-        '<center><img <<$set_imgh>> src="mod/img_ballet/pavlosk/kuhrpar/letter.jpg"></center>'
+        '<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
 
         'You look at the envelope with a sense of déjà vu when you see the school''s branding on the envelope. Then, you sit down at the kitchen table and open it.'
         'You read and reread the contents, trying to make sense of them. You can''t believe the news. You jubilantly punch the air and let out a cry of joy.'
@@ -122,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="mod/img_ballet/pushkin/npc/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="images/character/ballet/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
             end
             if mod_table_count < 6:
                 $mod_student_table += '</td>'
@@ -318,8 +318,9 @@ if $ARGS[0] = 'barre_exercise':
     gs 'exercise', 'tier1', 60, 'agil_exp', 'stren_exp'
     gs 'sweat', 'add', 20
     gs 'stat'
-    '<center><img <<$set_imgh>> src="mod/img_ballet/pushkin/residence/residence_barre_single.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/residence_barre_single.jpg"></center>'
     'You leave your room and head to the exercise area. You see some barres set up and spend an hour performing stretching exercises and practicing your forms.'
+    !! Add scenes with other girls - TBC
     act 'Return': gt $loc, $loc_arg
 end
 

locations/pushkin_ballet_init.qsrc

@@ -174,8 +174,6 @@ if $ARGS[0] = 'famemodifier':
 end
 
 if $ARGS[0] = 'cleanup_var':
-
-
     !! Clean up school variables upon completion.
     !! Debug - remove all variables associated with mod
 
@@ -200,11 +198,12 @@ if $ARGS[0] = 'cleanup_var':
     killvar 'sharedmeal'
     killvar 'study_tally'
     killvar 'school_prep'
-    killvar 'ballet_day'
-    killvar 'mod_ballet[''letter'']'
+    killvar 'ballet_day'    
     killvar 'ballet_first_bedroom'
-    killvar 'feet_track'
-    killvar 'ballet_mod[''res_mg'']'
+    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

@@ -94,8 +94,8 @@ if $ARGS[0] = 'bedroom':
 
     !! First Maya event
 
-    if ballet_day = 3 and mayaqw['grave'] = 0:
-        act 'Answer the knock' : gt 'npc_3501_init','grave'
+    if ballet_day = 3 and mayaqw['grave'] = 0  and ( hour >= 17 and hour <= 21):
+        act 'Answer the knock' : gs 'npc_3501_init','grave'
     elseif ballet_day = 3 and hour > 19 and mayaqw['grave'] = 1:
         act 'Another knock': gt 'npc_3501_init', 'post_grave' 
     end
@@ -336,7 +336,7 @@ if $ARGS[0] = 'radio':
         mod_daily_score[week] += 1
     end
     $setloc['StageTitle'] = 'Radio'
-	$setloc['StageImage'] =   '<<$default_img_path>>/ballet_residence/radio'
+	$setloc['StageImage'] =   '<<$default_img_path>>ballet_residence/russian_radio'
 	gs 'stat'
     gs 'core_library', 'stage_title'
 
@@ -363,7 +363,7 @@ if $ARGS[0] = 'feetcare':
     feet_track = daystart
     gs 'stat'
     $setloc['StageTitle'] = 'Feet Soak'
-	$setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/feet_soak'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_events/feet_soak'
     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,9 +383,10 @@ if $ARGS[0] = 'study':
     minut += 60
     mod_homework[week] += 1 
     mod_daily_score[week] += 1
+    $setloc['StageTitle'] = 'Study'
+	$setloc['StageImage'] =  '<<$default_img_path>>ballet_residence/study'
     gs 'stat'
-     '<center><img <<$set_imgh>> src="<<$default_img_path>>/ballet_residence/study.jpg"></center>'
-
+    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'
 end
@@ -412,12 +413,16 @@ if $ARGS[0] = 'make_up':
         $setloc['StageImage'] =  '<<$default_img_path>>/ballet_events/make-up'
         gs 'core_library', 'stage_title'
 
-        if pcs_makupskl < 30:
+        if pcs_makupskl <= 30:
             'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You wonder if you should get help with practicing.'
+        elseif pcs_makupskl >= 31 or pcs_makupskl <= 69:
+            'You try to replicate the deft strokes that you was taught in school apply the basic foundation. You struggle briefly with the eyelashes before they settle in place. It takes you a few attempts to finalise the blending of your looks but at the end of your practice you are happy with the results even though it won''t win any awards.'
+        elseif pcs_makupskl >= 70:
+            'You artfully apply the make-up look with a quick, practiced ease that would leave most girls with envy. The final look is almost flawless and you criticaly review the final result.'
         else
-            'You artfully apply the make-up look with a quick, practiced ease that would leave most girls with envy. The final look is almost perfect and you criticaly review the final result.'
+            $ballet['error'] += 'Makeup skill failed check'
         end
-
+        act 'Finish practicing': gt 'pushkin_ballet_res', 'bedroom'
 end
 
 --- pushkin_ballet_res ---------------------------------