Merge remote-tracking branch 'Hooded_Silence/master'

.gitignore

@@ -45,4 +45,5 @@ glife.7z.tmp
 glife.7z
 
 *.test
+*.drawio
 missing_media.txt

locations/ballet_npc.qsrc

@@ -1,8 +1,13 @@
 # ballet_npc
+!! Date Created: 17th Sept, 2022
+!! Modified date: 11th April, 2024
+!! Version: .01 - initial release
+!! Version: .02 - bug fixes, code refactor and new character variable $npc_img_path to link characters default profile image and related images.
+!! Author: Hooded Silence
+!!
+!! Set up dance school dramatis personae - Start at 3500 to avoid conflicts with main game.
 
-!! Set up dance school dramatis personae - Start at 3500 to avoid conflicts with main game...
-
-!! Students
+!! Pushkin Ballet School Students - Year one schoot start
 
 npctemp = 3501
 $npc_firstname['A<<npctemp>>'] = 'Maya'
@@ -24,27 +29,30 @@ $npc_haircolour['A<<npctemp>>'] = 'Blonde'
 $npc_eyecolour['A<<npctemp>>'] = 'blue'
 $npc_height['A<<npctemp>>'] = 160
 $npc_weight['A<<npctemp>>'] = 50 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
 
-!! NPC Temp: 3502 - Kima
+npctemp = 3502 
 !! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta's activities.
 !! will try and blackmail Sveta into either giving up if she learns if she's has dirty secrets such as prostitution, slut rep, etc or passing the information to Rudolph to destroy her career to remove her as competition.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
-!! NPC temp: 3503 - Tanis
+npctemp = 3503
 !! Tanis Komarova - Bitchy dancer who thinks she''s already the Principle Dancer. Age 17. Future concept as the class bully to other dancers and students.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
 
-!! NPC temp: 3504 - Galina
+npctemp = 3504
 !! Galina Molchalina - Quiet and shy student, age 16. Highly secretive and doesn't engage with the class, she also has a nervous personality as if she's afraid. This comes from her family being marked as 'radicals' by the old KGB and under constant watch from FSB even to this day.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
 
-!! NPC temp: 3505 - Taisiya
+npctemp = 3505 
 !! Taisiya Lebedeva - The eldest student, and an elegant beauty, Age 18. A quiet, but captivating beauty who has a enchanting charismatic presence that men can't keep their eyes off her leading to bitchy remarks from other girls. 
 !! She''s oblivous to her beauty instead focusing on acting and dance. (side note: surname is one of the most common in St P.), she's got a strong religous personality.
-!! Malta Aurelie
-
-!! NPC temp: 3506 - Nikita
-!! Nikita Volkova - Bronya''s daughter. Age 16. Keep fit fanatic, and does tap, ballet, etc. As Bronya's daughter she's been given privileged access to the school, whilst no great talent she's still one of the better dance students at the school but just not at ballet despite Bronya's wishes.
+!! Character model: Malta Aurelie
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
-!! NPC temp: 3507 - Gasha
-!! Gasha Morozova - The youngest in the class at 15, close friend of Nikita as the grew up in the same village. Nikita and Galina are often seen in each others company in the local coffee shop and rarely seen alone leading to rumours. She''s a bit of a foodie, and love sweet things which conflicts with keeping in shape for her dance career.
+npctemp = 3506
+!! Nikita Volkova - Bronya''s daughter. Age 16. Keep fit fanatic, and does tap, ballet, etc. As Bronya's daughter she's been given privileged access to the school, whilst not a great talent she's still one of the best dance students at the school but just not at ballet despite Bronya's hopes.
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
 npctemp = 3507
 $npc_firstname['A<<npctemp>>'] = 'Gasha'
@@ -66,14 +74,18 @@ $npc_haircolour['A<<npctemp>>'] = 'Brunette'
 $npc_eyecolour['A<<npctemp>>'] = 'Blue'
 $npc_height['A<<npctemp>>'] = 145
 $npc_weight['A<<npctemp>>'] = 40 
-
-
-!! NPC temp: 3508 - Calina
-!! NPC temp: 3509 - Ruza
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
+
+!! Calina
+npctemp = 3508 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
+!! Ruza
+npctemp = 3509 
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 !! Calina and Ruza Sokolova - Twin dancers. Not interested in ballet, but took the course to further their education into becoming dancers. Age 17. They also professional models with a Moscow agency. 
 !! Adel and Alina Fakhteeva twins?
 
-!! Staff
+!! Ballet Staff 
 
 npctemp = 3510
 $npc_firstname['A<<npctemp>>'] = 'Rudolf'
@@ -90,25 +102,27 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_intel['A<<npctemp>>'] = 67
 hotcat_rating['A<<npctemp>>'] = 8
 npc_spermpot['A<<npctemp>>'] = 15000
+$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/rudolph'
 
-
-!! NPC temp: 3511 - Biserka
 !! class teacher: Biserka Ananiashvili
+npctemp = 3511
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
-!! NPC temp: 3512 - Sofia
 !! class teacher/pianist: Sofia Solovyova
+npctemp = 3512
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
-!! NPC temp: 3513 - Bronya 
 !! Residential Warden: Bronya Volkova and former violinist, strict but fair has two daughters with Nikita being the youngest training to be a ballet dancer and her eldest in Germany training to be a surgeon. 
-
-npc_temp = 3513
+npctemp = 3513 
 $npc_firstname['A<<npctemp>>'] = 'Bronya'
 $npc_nickname['A<<npctemp>>'] = 'Bronya '
 $npc_lastname['A<<npctemp>>'] = 'Volkova'
 $npc_usedname['A<<npctemp>>'] = 'Bronya'
+gs 'npcstaticdefaults', 'defaults'
+$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 
 !! NPC temp: 3514 - Physio - Pelageya Makarova
- 
+
 !! Make up teacher: Rada Egorova, the teacher never bothers to tell the class after a week. Former stage make up artist, beautician and scatterbrained.
 
 !! Staff Physio -  Syuzanna Zakharova / Klavdii Frolov (Klavdii is a pun)
@@ -117,6 +131,7 @@ $npc_usedname['A<<npctemp>>'] = 'Bronya'
 !! Names f: Boleslava Grigoreva, Esfir Mikhaylova, Gavriila Makarova (warrior),Yustina Vinogradova
 !! Names m: Ipatiy Novikov, Venedikt Sorokin, Ony Volkov, Kazimir Sokolov
 
+killvar 'npctemp'
 --- ballet_npc ---------------------------------
 
 

locations/ballet_secrets.qsrc

@@ -4,7 +4,7 @@
 !! Version: .01
 !! Author: Hooded Silence
 !! A dance shop which includes ballet, gymnastics and physio-therapy sources. Alternative path to ballet or dance career in second year and first.
-!! TBC - NPCs to be created
+!! TODO: - NPCs to be created
 
 $default_img_path = 'locations/pushkin/ballet_secrets/'
 
@@ -37,7 +37,6 @@ if $ARGS[0] = 'init':
 			act 'Swipe membership card': gt 'ballet_secrets', 'reception'
 		end
 	end
-
 end
 
 !! Intro
@@ -55,7 +54,7 @@ if $ARGS[0] = 'first_visit':
 	'The woman smiles warmly, "Ah you are the new students for this year?" she claps her hands and then takes yours, "Come, come we must measure your feet and order your shoes"'
 	'Before you say anything she''s dragging you through the shop towards the back we are are greeted by a wall of shoes and there is pictures on the wall signed by dancers with shoes next to them. You look at the woman.'
 	'"Yes, they are all dancers who are or have been clients of our establishment", she noticed your gaze and explains with pride."We will only provide the best for the school."'
-	!! Set up gate for sponsored or not, not implemented system needs to be added to the end of year assessment.
+	!! TODO:  Set up gate for sponsored or not, not implemented system needs to be added to the end of year assessment.
 	'"But where are my manners I am Darya Pushkina, I am the owner of this shop and facilies" she exclaims, "now to your fitting grabbing a tape measure and fitting tools for your feet"'
 	'For the next hour Madam Pushkina bombards you with questions of whether you want leather or cotton fabric, how many satin shoes and a myriad other questions before she finally relents.'
 	'"Of course as you are aware the school is sponsoring these costs, but only for the first year she says and you will need to manage your own equipment after this.", Madame Pushkina advises.'
@@ -93,6 +92,7 @@ if $ARGS[0] = 'reception':
 		!! act 'Attend a gymnastics class.': gt 'ballet_secrets', 'gymnastics_courses'
 		!! act 'Attend a dance class': gt 'ballet_secrets', 'ballet_courses'
 		act 'Attend a yoga class': gt 'ballet_secrets', 'yoga_courses'
+		!! act 'Look at jobs board': gt 'ballet_secrets', 'jobs'
 	elseif hour >= 16:
 		'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
 	end
@@ -131,7 +131,7 @@ end
 if $ARGS[0] = 'changing_room':
 	menu_off = 0
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
-	$location_type = 'private'
+	$location_type = 'public'
 	$locclass = 'changingroom'
 	gs 'themes', 'indoors'
 	minut += 5
@@ -187,7 +187,7 @@ if $ARGS[0] = 'changing_room':
 			act 'Continue': menu_off = 0 & gt 'ballet_secrets', 'changing_room'
 		end
 	end
-	dynamic $tampon
+	gs 'core_library', 'bathroom'  
 end
 
 !! Physiotherapy
@@ -200,7 +200,7 @@ if $ARGS[0] = 'physio':
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
 
-	!! write attendance spiel 
+	!! TODO: write attendance spiel 
 	act 'Leave': gt 'pushkin_sq'
 end
 
@@ -215,11 +215,12 @@ if $ARGS[0] = 'gymnastics_courses':
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
 
-	!! write attendance spiel and some random reactions for post-exercise such that was a great workout, you didn''t feel you did well today
+	!! TODO: write attendance spiel and some random reactions for post-exercise such that was a great workout, you didn''t feel you did well today
 	act 'Leave': gt 'pushkin_sq'
 end
 
 !! Ballet Courses Easy, Intermediate and advanced
+
 if $ARGS[0] = 'ballet_courses':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'
@@ -228,9 +229,19 @@ if $ARGS[0] = 'ballet_courses':
 	$location_type = 'public_indoors'
 	gs 'themes', 'indoors'
 	gs 'core_library', 'stage_title'
+	if balletqw['ballet_session'] ! daystart:
+		lesson_tier = rand(1,5)
+
+
+		killvar 'lesson_tier'
+		act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
+	else 
+		'There is another fitness class in progress and no more ballet sessions today.'
+	end
+	act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
 end
 
-	!! Gymnastics
+!! Yoga class
 
 if $ARGS[0] = 'yoga_courses':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
@@ -277,6 +288,10 @@ if $ARGS[0] = 'yoga_courses':
 	act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
 end 
 
+if $ARGS[0] = 'jobs':
+	!! TODO: Add ad hoc dance or promo events.
+end
+
 !! Shopping
 if $ARGS[0] = 'clothing':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
@@ -289,7 +304,7 @@ if $ARGS[0] = 'clothing':
 	act 'Leave': gt 'pushkin_sq'
 end
 
-!! Custom Tutus for quests/shows, ballet shoe fitting, clothing, physio items, portable ballet equipment (barre) etc.
+!! TODO: Custom Tutus for quests/shows, ballet shoe fitting, clothing, physio items, portable ballet equipment (barre) etc.
 if $ARGS[0] = 'quest':
 	gs 'shortgs', 'setloc', 'ballet_secrets', $ARGS[0] 
 	$location_type = 'public_indoors'

locations/emp_functions.qsrc

@@ -115,8 +115,8 @@ if $ARGS[0] = 'gen_schedule':
 				end	
 				killvar '$transient_tb'
 			else
-				 i_day += 1
-				 jump 'jmp_day_create'
+				i_day += 1
+				jump 'jmp_day_create'
 			end
 			i_hour += 1
             if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
@@ -242,11 +242,11 @@ if $ARGS[0] = 'disp_evt':
 		act_tracker = 0
 		act_found = 0
 		:jmp_act_create			
-			 if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1): 
+			if evt_hour[act_tracker] = hour or evt_hour[act_tracker] = (hour -1): 
 				act_found = 1
 				act_idx = act_tracker 				
-			 end
-			 act_tracker +=1 
+			end
+			act_tracker +=1 
 		if act_found = 0:
 			if act_tracker < arrsize('evt_event'): jump 'jmp_act_create'
 		end

locations/pushkin_ballet_center.qsrc

@@ -17,6 +17,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	'You can see the apartment block that''s been converted into a residential accomodation for the school. The street always seems to be packed with cars but there is few people on the street at this time.'
 
 	act 'Press the buzzer': gt 'pushkin_ballet_res', 'warden'
-	act 'Back to street': gt 'pushkin_sq'
+	act 'Back to street': gt 'pushkin'
 end
 --- pushkin_ballet_center ---------------------------------