1
1
Эх сурвалжийг харах

Merge branch 'nutluck_230508_city_schedule' into nutluck_230508

HotMike 1 жил өмнө
parent
commit
441113a60d

+ 6 - 1
glife.qproj

@@ -546,13 +546,16 @@
 		<Location name="anushkaev1"/>
 		<Location name="anushkaev2"/>
 		<Location name="anushapt"/>
-		<Location name="anushapt_city"/>
 		<Location name="anush_bedroom"/>
 		<Location name="anush_bedroom_city"/>
 		<Location name="anushaptbr"/> 
 		<Location name="anushkachat"/>
 		<Location name="anushkachat_city"/>
 		<Location name="anushkamaksim"/>
+		<Location name="anushka_konstantinov_schedule"/>
+		<Location name="valentin_bogdanov_schedule" />
+		<Location name="radomir_popov_schedule" />
+		<Location name="arkadi_fyodorov_schedule" />
 	</Folder>
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
@@ -1001,6 +1004,8 @@
 		<Location name="shop_nerdvana"/>
 		<Location name="shop_flamingos"/>
 		<Location name="city_coffee_hole"/>
+		<Location name="anushapt_city"/>
+		<Location name="anushapt_city_schedule"/>
 	</Folder>
 	<Folder name="University">
 		<Location name="uni_grounds"/>

+ 72 - 48
locations/anushapt_city.qsrc

@@ -73,12 +73,12 @@
 !---------------------------------------------
 
 ! City quest (should go into journal)
-!!anushkaCityQW['first_visit'] = first visit to her city apartment. 0: you did not meet her yet, 1: she told you the location of the apartment, 2: you entered the first time.
+!!anushkaCityQW['first_visit'] = first visit to her city apartment. 0: You did not meet her yet, 1: She told you the location of the apartment, 2 (could be daystart): You met her in the apartment for the first time.
 
 if $ARGS[0] = 'home':
 	menu_off = 0
 	$track_loop = ''
-	if sound = 0:PLAY 'sound/korr.mp3',30
+	if sound = 0:play 'sound/korr.mp3',30
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
@@ -88,12 +88,14 @@ if $ARGS[0] = 'home':
 	$location_type = 'private'	
 	gs 'themes', 'indoors'
 	gs 'stat'
+!!! Probably we should have an init call here that sets all the locations, depending on time. Then those locations get updated when other locations are entered.
+	gs 'anushapt_city_schedule'
+	! First time here, progress the Quest
 	if anushkaQW['home_day'] ! daystart:
 		anushkaQW['home_day'] = daystart
 		locat['A144'] = 0
 	end
-!!! Probably we should have an init call here that sets all the locations, depending on time. Then those locations get updated when other locations are entered.
-	
+
 !!notes about when each person is home by default.
 !!Anushka is home Mon from 18:00 for rest of night, Tues and Thurs from 15:00 till 18:00, Fri from 16:00 till 20:00, Sat from 08:00 till 20:00 (first Sat each month from 16:00 till 20:00), Sun from 08:00 till 17:00
 !!Radomir is home Mon-Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
@@ -109,46 +111,54 @@ if $ARGS[0] = 'home':
 	elseif hour < 8:
 		'It''s too early in the day to visit Anushka, Radomir, Valentin, or Arkadi.'
 		act 'Move away from the door': gt 'city_island'
-	elseif week = 1 and hour >= 18 and hour < 23:
+	!elseif week = 1 and hour >= 18 and hour < 23:
+	!elseif locat['A144'] and locat['A156'] >= 0 and locat['A144'] and locat['A156'] < 8:
+	elseif $AnushkaLocCity = 'home':
 		*clr & cla
-		locat['A144'] = 2
-		locat['A156'] = 1
-		! Either Anushka or Arkadi opens the door
-		aptdoor = rand(1,2)
-		'You stand outside the door as you knock, waiting to see who answers it.'
-		if aptdoor = 1:
-			locat['A156'] = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
-			if npc_rel['A156'] >= 60:
-				'Arkadi answers the door. "What''s up?"'
-				'You give him one of your big smiles. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
-			elseif npc_rel['A156'] <= 20:
-				'Arkadi answers the door. "What the fuck do you want?"'
-				'You give him a careful smile. "Nothing much. Thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise you can fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+		if $ArkadiLocCity = 'home':
+			!locat['A144'] = 2
+			!locat['A156'] = 1
+			! Either Anushka or Arkadi opens the door
+			aptdoor = rand(1,2)
+			'You stand outside the door as you knock, waiting to see who answers it.'
+			if aptdoor = 1:
+				!locat['A156'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+				if npc_rel['A156'] >= 60:
+					'Arkadi answers the door. "What''s up?"'
+					'You give him one of your big smiles. "Nothing much. Thought I would stop by and hang out."'
+					'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				elseif npc_rel['A156'] <= 20:
+					'Arkadi answers the door. "What the fuck do you want?"'
+					'You give him a careful smile. "Nothing much. Thought I would stop by and hang out."'
+					'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise you can fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				else
+					'Arkadi answers the door. "What''s up?"'
+					'You smile at him. "Nothing much. Thought I would stop by and hang out."'
+					'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				end
+				act 'Leave': gt 'city_island'
+				act 'Enter': gt 'anushapt_city','hallway'
 			else
-				'Arkadi answers the door. "What''s up?"'
-				'You smile at him. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+				'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
+				locat['A144'] = 2
+				act 'Enter': gt 'anush_bedroom_city','anushroom'
 			end
-			act 'Leave': gt 'city_island'
-			act 'Enter': gt 'anushapt_city','hallway'
 		else
+	!elseif week = 2 and hour >= 15 and hour < 18:
+	!elseif locat['A144'] >= 0 and locat['A144'] <= 8:
+			*clr & cla
+			locat['A144'] = 2
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 			'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
 			act 'Enter': gt 'anush_bedroom_city','anushroom'
 		end
-	elseif week = 2 and hour >= 15 and hour < 18:
-		locat['A144'] = 2
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-		'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
-		act 'Enter': gt 'anush_bedroom_city','anushroom'
-	elseif (week = 2 or week = 4) and hour >= 18 and hour < 23:
+	elseif locat['A144'] = 9:
+	!elseif (week = 2 or week = 4) and hour >= 18 and hour < 23:
 		*clr & cla
 		!! Anushka is at work
-		locat['A144'] = 9
+		
 		!! Arkadi or Valentin
 		locat['A156'] = 1
 		locat['A158'] = 1
@@ -199,20 +209,23 @@ if $ARGS[0] = 'home':
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
 		end
-	elseif week = 4 and hour >= 15 and hour < 18:
-		locat['A144'] = 2
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-		'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
-		act 'Enter': gt 'anush_bedroom_city','anushroom'
-	elseif week = 5 and hour >= 16 and hour < 20:
-		locat['A144'] = 2
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-		'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
-		act 'Enter': gt 'anush_bedroom_city','anushroom'
-	elseif day <= 7 and week = 6 and hour >= 8 and hour < 16:
+!	elseif week = 4 and hour >= 15 and hour < 18:
+!		*clr & cla
+!		locat['A144'] = 2
+!		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+!		'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
+!		act 'Enter': gt 'anush_bedroom_city','anushroom'
+!	elseif week = 5 and hour >= 16 and hour < 20:
+!		locat['A144'] = 2
+!		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+!		'Anushka opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in." She leads you down the hall to her room.'
+!		act 'Enter': gt 'anush_bedroom_city','anushroom'
+	!elseif day <= 7 and week = 6 and hour >= 8 and hour < 16:
+	elseif locat['A144'] = 11:
 	!! Amushka in the studio. Only happens on the first Saturday of the month, otherwise it goes to the Saturday elseif code below
 		*clr & cla
-		locat['A144'] = 11
+		minut += 1
+		!Force Valentin to be in the hallway for now. Need to get a better solution in schedule.
 		locat['A158'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 		if npc_rel['A158'] >= 60:
@@ -233,9 +246,11 @@ if $ARGS[0] = 'home':
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
 		end
-	elseif (week = 6 and hour >= 16 and hour < 20) or (week = 6 and hour >= 8 and hour < 20):
+	!elseif (week = 6 and hour >= 16 and hour < 20) or (week = 6 and hour >= 8 and hour < 20):
+	elseif $AnushkaLocCity = 'home' and $ValentinLocCity = 'home':
 		*clr & cla
-		locat['A144'] = 2
+		minute += 1
+		!locat['A144'] = 2
 		aptdoor = rand(1,2)
 		'You stand outside the door as you knock, waiting to see who answers it.'
 		if aptdoor = 1:
@@ -377,6 +392,7 @@ if $ARGS[0] = 'hallway':
 	killvar '$locclass'
 	minut += 1
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/hallway.jpg"></center>'
 	'This is the entrance hall to the apartment. It''s devoid of any furniture, the walls and floor are completely bare. The only thing you can see is a single row of coat hooks by the door which is mostly empty. Other than that the hall just has a series of doors leading to the other rooms in the apartment.'
@@ -410,6 +426,7 @@ if $ARGS[0] = 'bathroom':
 		minut += 10
 		dynamic $showerdin
 		gs 'stat'
+		gs 'anushapt_city_schedule'
 		!!tempShower = rand(0,4)
 !!I commented this out for now, eventually I will have chances the boys or Anushka might walk in on Sveta showering. I am assuming by just commenting out the temp above that it will always be the else then yes? If not please fix the code so for now the else always shows up.
 		!! HM We still need tempShower as it it will be equal to 0 if not set; so set it to a value outside of the range for now
@@ -493,6 +510,7 @@ if $ARGS[0] = 'livingroom':
 	$locclass = 'livingr'
 	minut += 1
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living_room.jpg"></center>'
 !!note to self expand these interactions in the future.
@@ -554,6 +572,7 @@ if $ARGS[0] = 'kitchen':
 	minut += 1
 	$locclass = 'kitr'
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	gs 'kit_din'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/kitchen.jpg"></center>'
@@ -734,6 +753,7 @@ if $ARGS[0] = 'rad_room':
 	*clr & cla
 	minut += 1
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	'<center><b><font color = maroon>Radomir''s room</font></b></center>'
 	if (week = 1 or week = 2 or week = 4) and hour >= 18 and hour < 23:
 		locat['A154'] = 3
@@ -829,6 +849,7 @@ if $ARGS[0] = 'ark_val_room':
 	*clr & cla
 	minut += 1
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	'<center><b><font color = maroon>Arkadi and Valentin''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/ark_val_room.jpg"></center>'
 	'The room is pretty small, obviously the smallest bedroom in the apartment. In each corner opposite the door is a bed, both are a mess and neither looks like they have ever been made. The walls and even the ceiling is covered in posters along with a few records. Most of the posters are of varies bands, but a few are of scantly or completely naked girls, along with one rather larger star wars poster on the ceiling. Between the beds along the back wall is two night stands, one by each bed. Both are pretty cluttered looking with a single window just between the night stands. Other than that the room is pretty empty but the beds almost completely fill the room, there is a small closest near the door and two dressers along the same wall as the drawer.'
@@ -852,6 +873,7 @@ if $ARGS[0] = 'nushlivroom':
 	close all
 	*clr & cla
 	gs 'stat'
+	gs 'anushapt_city_schedule'
 	locat['A144'] = 5
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living.jpg"></center>'
@@ -864,6 +886,7 @@ if $ARGS[0] = 'nushlivroom':
 		gs 'stat'
 		minut += 120
 		gs 'stat'
+		gs 'anushapt_city_schedule'
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
 		'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
@@ -887,6 +910,7 @@ if $ARGS[0] = 'nushlivroom':
 					gs 'stat'
 					minut += 120
 					gs 'stat'
+					gs 'anushapt_city_schedule'
 					'<center><b><font color = maroon>Living room</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
 					'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on, let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'

+ 15 - 0
locations/anushapt_city_schedule.qsrc

@@ -0,0 +1,15 @@
+# anushapt_city_schedule
+!! 2023-05-26
+
+! We call the NPCs that live in the apartment from here
+gs 'anushka_konstantinov_schedule'
+gs 'valentin_bogdanov_schedule'
+gs 'arkadi_fyodorov_schedule'
+gs 'radomir_popov_schedule'
+
+
+! Additional settings go here
+
+
+
+--- anushapt_city_schedule ---------------------------------

+ 155 - 0
locations/anushka_konstantinov_schedule.qsrc

@@ -0,0 +1,155 @@
+# anushka_konstantinov_schedule
+!! 2023-05-26
+
+!! Her schedule:
+!AnushkaLocCity tells us where Anvushka is located
+!----------------------------------------------
+!locat['A144'] = 0 (Anushka not home Fri and Sat 20:00 for rest of night)
+!locat['A144'] = 1 (Anushka in the hallway)
+!locat['A144'] = 2 (Anushka in her room)
+!locat['A144'] = 3 (Anushka in Radomir''s room)
+!locat['A144'] = 4 (Anushka in the kitchen)
+!locat['A144'] = 5 (Anushka in the livingroom)
+!locat['A144'] = 6 (Anushka in Valentin and Arkadi''s room)
+!locat['A144'] = 7 (Anushka in the bathroom)
+!locat['A144'] = 8 (Anushka is in the garage with the band Wed 18-23)
+!locat['A144'] = 9 (Anushka is at the Coffee Hole working (week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16))
+!locat['A144'] = 10 (Anushka is at the University classes 09:00 to 15:00)
+!locat['A144'] = 11 (Anushka is at the modeling studio First Sat of each month 8 to 16:00)
+!locat['A144'] = 12 (Anushka is at the University Library Mon and Wed from 15:00 till 18:00)
+!---------------------------------------------
+
+! City schedule
+! Standard location is not at home which should be set at init
+!locat['A144'] = 0
+!!Anushka is home Mon from 18:00 for rest of night, Tues and Thurs from 15:00 till 18:00, Fri from 16:00 till 20:00, Sat from 08:00 till 20:00 (first Sat each month from 16:00 till 20:00), Sun from 08:00 till 17:00
+
+!! Home is located in her bedroom (2)
+! TODO: randomize the location inside home?
+
+if week = 1:
+	! Monday
+	if hour >= 9 and hour < 15:
+		! Need an additional check: is the university open?
+		locat['A144'] = 10
+	elseif hour >= 15 and hour < 18:
+		locat['A144'] = 12
+	elseif hour >= 18 and hour <= 23:
+		locat['A144'] = 2
+	end
+elseif week = 2:
+	if hour >= 9 and hour < 15:
+		locat['A144'] = 10
+	elseif hour >= 15 and hour < 18:
+		locat['A144'] = 2
+	elseif hour >= 18 and hour <23:
+		locat['A144'] = 9
+	end
+elseif week = 3:
+	if hour >= 9 and hour < 15:
+		locat['A144'] = 10
+	elseif hour >= 15 and hour < 18:
+		locat['A144'] = 12
+	elseif hour >= 18 and hour < 23:
+		locat['A144'] = 8
+	end
+elseif week = 4:
+	if hour >= 9 and hour < 15:
+		locat['A144'] = 10
+	elseif hour >= 18 and hour <23:
+		locat['A144'] = 9
+	end
+elseif week = 5:
+	if hour >= 9 and hour < 15:
+		locat['A144'] = 10
+	elseif hour >= 10 and hour <16:
+		locat['A144'] = 9
+	elseif hour >= 16 and hour <20:
+		locat['A144'] = 2
+	elseif hour >= 20:
+		locat['A144'] = 0
+	end
+elseif week = 6:
+	!(first Sat each month from 16:00 till 20:00)
+	if day <= 7:
+		if hour >= 8 and hour < 16:
+			locat['A144'] = 11
+		elseif hour >= 16 and hour < 20:
+			locat['A144'] = 2
+		end
+	else
+		if hour <= 8: and hour < 20:
+			locat['A144'] = 2
+		elseif hour >= 20:
+			locat['A144'] = 0
+		end
+	end
+end
+	
+else
+	if hour >= 18 and hour <23:
+		locat['A144'] = 9
+	end
+end
+
+if locat['A144'] > 0 and locat['A144'] < 8:
+	$AnushkaLocCity = 'home'
+else
+	$AnushkaLocCity = 'notHome'
+end
+
+! Use this in the calendar app on Sveta''s phone Loop over an array there that holds NPC IDs she is allowed to see there, and for each ID call this function.
+if $ARGS[0] = 'getLocation':
+	!Set the text for the current NPC ID
+	if locat['A144'] = 0:
+		npcLocation['A144'] = 'Anushka not home Fri and Sat 20:00 for rest of night'
+	elseif locat['A144'] = 1: 
+		npcLocation['A144'] = 'Anushka in the hallway at her city apartment'
+	elseif locat['A144'] = 2:
+		npcLocation['A144'] = 'Anushka in her room at her city apartment'
+	elseif locat['A144'] = 3:
+		npcLocation['A144'] = 'Anushka in Radomir''s room at her city apartment'
+	elseif locat['A144'] = 4:
+		npcLocation['A144'] = 'Anushka in the kitchen at her city apartment'
+	elseif locat['A144'] = 5:
+		npcLocation['A144'] = 'Anushka in the livingroom at her city apartment'
+	elseif locat['A144'] = 6: 
+		npcLocation['A144'] = 'Anushka in Valentin and Arkadi''s room'
+	elseif locat['A144'] = 7:
+		npcLocation['A144'] = 'Anushka in the bathroom'
+	elseif locat['A144'] = 8:
+		npcLocation['A144'] = 'Anushka is in the garage with the band Wed 18-23'
+	elseif locat['A144'] = 9:
+		npcLocation['A144'] = 'Anushka is at her job at the The Coffee Hole'
+	elseif locat['A144'] = 10:
+		npcLocation['A144'] = 'Anushka is at the University classes 09:00 to 15:00'
+	elseif locat['A144'] = 11:
+		npcLocation['A144'] = 'Anushka is at the modeling studio First Sat of each month 8:00 to 16:00'
+	elseif locat['A144'] = 12:
+		npcLocation['A144'] = 'Anushka is at the University Library Mon and Wed from 15:00 till 18:00'
+	end
+end
+
+!! Get the current description for a journal entry
+!! This function will create a text, already formatted, showing the current instruction to progress for this character. That means we can store all scheduling info here and there is no need to edit other files.
+if $ARGS[0] = 'journal':
+
+	$anushka_konstantinov_schedule_journal = ''
+	! City quest 
+	if anushkaCityQW['first_visit'] = 0:
+		$anushka_konstantinov_schedule_journal += 'You don''t know where she lives but you likely know her as you went to school with her.'
+	elseif anushkaCityQW['first_visit'] = 1:
+		anushka_konstantinov_schedule_journal += 'You have been told where her apartment in they city is but you have not been there.'
+	elseif anushkaCityQW['first_visit'] >= 2:
+		anushka_konstantinov_schedule_journal += 'You have visit her apartment before, you should visit her again.'
+	end
+	anushka_konstantinov_schedule_journal += '<BR />'
+	if 
+	! Kiss
+	! kisses < 5 'I think Anushka is really pretty and I would like to be more than just friends with her. Maybe I should try kissing her in bed, until she is ready to do more than just kiss.'
+	end
+
+end
+
+
+--- anushka_konstantinov_schedule ---------------------------------

+ 85 - 0
locations/arkadi_fyodorov_schedule.qsrc

@@ -0,0 +1,85 @@
+# arkadi_fyodorov_schedule
+!! 2023-05-26
+
+!! His schedule:
+!ArkadiLocCity tells us where Arkadi is located
+!locat['A156'] =
+!----------------------------------------------
+!locat['A156'] = 0 (Arkadi not home Fri and Sat 20:00 for rest of night)
+!locat['A156'] = 1 (Arkadi in the hallway)
+!locat['A156'] = 2 (Arkadi in Anushka''s room)
+!locat['A156'] = 3 (Arkadi in Radomir''s room)
+!locat['A156'] = 4 (Arkadi in the kitchen)
+!locat['A156'] = 5 (Arkadi in the livingroom)
+!locat['A156'] = 6 (Arkadi in his and Valentin''s room)
+!locat['A156'] = 7 (Arkadi in the bathroom)
+!locat['A156'] = 8 (Arkadi is in the garage with the band Wed 18-23)
+!locat['A156'] = 9 (Arkadi is at work, factory Mon-Fri 8 to 17)
+!---------------------------------------------
+
+if week = 1:
+	if hour >= 8 and hour < 17:
+		locat['A156'] = 9
+	end
+elseif week = 2:
+	if hour >= 8 and hour < 17:
+		locat['A156'] = 9
+	end
+elseif week = 3:
+	if hour >= 8 and hour < 17:
+		locat['A156'] = 9
+	elseif hour >= 18 and hour < 23:
+		locat['A156'] = 8
+	end
+elseif week = 4:
+	if hour >= 8 and hour < 17:
+		locat['A156'] = 9
+	end
+elseif week = 5:
+	if hour >= 8 and hour < 17:
+		locat['A156'] = 9
+	elseif hour >= 20:
+		locat['A156'] = 0
+	end
+elseif week = 6:
+	if hour >= 20:
+		locat['A156'] = 0
+	end
+elseif week = 7:
+end
+
+if locat['A156'] > 0 and locat['A156'] < 8:
+	$ArkadiLocCity = 'home'
+else
+	$ArkadiLocCity = 'notHome'
+end
+
+if $ARGS[0] = 'getLocation':
+	!Set the text for the current NPC ID
+	if locat['A156'] = 0:
+		npcLocation['A144'] = 'Arkadi not home Fri and Sat 20:00 for rest of night.'
+	elseif locat['A156'] = 1:
+		npcLocation['A144'] = 'Arkadi in the hallway.'
+	elseif locat['A156'] = 2:
+		npcLocation['A144'] = 'Arkadi in Anushka''s room.'
+	elseif locat['A156'] = 3:
+		npcLocation['A144'] = 'Arkadi in Radomir''s room.'
+	elseif locat['A156'] = 4:
+		npcLocation['A144'] = 'Arkadi in the kitchen.'
+	elseif locat['A156'] = 5:
+		npcLocation['A144'] = 'Arkadi in the livingroom.'
+	elseif locat['A156'] = 6:
+		npcLocation['A144'] = 'Arkadi in Valentin''s and his room.'
+	elseif locat['A156'] = 7:
+		npcLocation['A144'] = 'Arkadi in the bathroom.'
+	elseif locat['A156'] = 8: 
+		npcLocation['A144'] = 'Arkadi is in the garage with the band.'
+	elseif locat['A156'] = 9:
+		npcLocation['A144'] = 'Arkadi is at work, mechanic Mon-Fri 8 to 17.'
+	elseif locat['A156'] = 10:
+		npcLocation['A144'] = 'Arkadi is in the garage working on his bike Mon 17-23.'
+	end
+end
+
+
+--- arkadi_fyodorov_schedule ---------------------------------

+ 2 - 2
locations/cikl.qsrc

@@ -40,7 +40,7 @@ if day > monthsEnd[month]:
 		end
 	end
 
-	!!MJ: Don't think that one is needed. But it was in the original loop.
+	!!MJ: Don''t think that one is needed. But it was in the original loop.
 	if month < 1: month = 1
 
 	$month = $monthName[month]
@@ -57,7 +57,7 @@ if day > monthsEnd[month]:
 
 end
 
-!!MJ: Don't think that one is needed. But it was here already.
+!!MJ: Don''t think that one is needed. But it was here already.
 if day <= 0:day = 1
 
 ciklNewWeek = 0

+ 100 - 0
locations/radomir_popov_schedule.qsrc

@@ -0,0 +1,100 @@
+# radomir_popov_schedule
+!! 2023-05-26
+
+!! His schedule:
+!RadomirLocCity tells us where Radomir is located
+
+!locat['A154']
+!----------------------------------------------
+!locat['A154'] = 0 (Radomir not home Fri and Sat 20:00 for rest of night)
+!locat['A154'] = 1 (Radomir in the hallway)
+!locat['A154'] = 2 (Radomir in Anushka''s room)
+!locat['A154'] = 3 (Radomir in his room)
+!locat['A154'] = 4 (Radomir in the kitchen)
+!locat['A154'] = 5 (Radomir in the livingroom)
+!locat['A154'] = 6 (Radomir in Valentin and Arkadi''s room)
+!locat['A154'] = 7 (Radomir in the bathroom)
+!locat['A154'] = 8 (Radomir is in the garage with the band Wed 18-23)
+!locat['A154'] = 9 (Radomir is at work at music store in mall Mon-Fri 8 to 17)
+!---------------------------------------------
+
+!! locat['A154'] = 3 An init should set this, bur here we want to preserve the current location.
+
+!! For the moment based on the standard schedule. Should be adjusted to City schedule.
+! TODO-DONE. Fix for:
+!!Radomir is home Mon-Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
+if week = 1:
+	if hour >= 8 and hour < 17:
+		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
+	end
+elseif week = 2:
+	if hour >= 8 and hour < 17:
+		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
+	end
+elseif week = 3:
+	if hour >= 8 and hour < 17:
+		locat['A154'] = 9
+	elseif hour >= 18 and hour < 23:
+		locat['A154'] = 8
+	end
+elseif week = 4:
+	if hour >= 8 and hour < 17:
+		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
+	end
+elseif week = 5:
+	if hour >= 8 and hour < 17:
+		locat['A154'] = 9
+	elseif hour >= 20:
+		locat['A154'] = 0
+	end
+elseif week = 6:
+	if hour >= 8 and hour <20:
+		locat['A154'] = 3
+	elseif hour >= 20:
+		locat['A154'] = 0
+	end
+elseif week = 7:
+		locat['A154'] = 3
+end
+
+if locat['A154'] > 0 and locat['A154'] < 8: 
+	$RadomirLocCity = 'home'
+else
+	$RadomirLocCity = 'notHome'
+end
+
+if $ARGS[0] = 'getLocation':
+	!Set the text for the current NPC ID
+	if locat['A154'] = 0:
+		npcLocation['A144'] = 'Radomir not home Fri and Sat 20:00 for rest of night.'
+	elseif locat['A154'] = 1:
+		npcLocation['A144'] = 'Radomir in the hallway.'
+	elseif locat['A154'] = 2:
+		npcLocation['A144'] = 'Radomir in Anushka''s room.'
+	elseif locat['A154'] = 3:
+		npcLocation['A144'] = 'Radomir in Radomir''s room.'
+	elseif locat['A154'] = 4:
+		npcLocation['A144'] = 'Radomir in the kitchen.'
+	elseif locat['A154'] = 5:
+		npcLocation['A144'] = 'Radomir in the livingroom.'
+	elseif locat['A154'] = 6:
+		npcLocation['A144'] = 'Radomir in Valentin''s and Arkadi''s room.'
+	elseif locat['A154'] = 7:
+		npcLocation['A144'] = 'Radomir in the bathroom.'
+	elseif locat['A154'] = 8: 
+		npcLocation['A144'] = 'Radomir is in the garage with the band.'
+	elseif locat['A154'] = 9:
+		npcLocation['A144'] = 'Radomir is at work, mechanic Mon-Fri 8 to 17.'
+	elseif locat['A154'] = 10:
+		npcLocation['A144'] = 'Radomir is in the garage working on his bike Mon 17-23.'
+	end
+end
+
+
+--- radomir_popov_schedule ---------------------------------

+ 101 - 0
locations/valentin_bogdanov_schedule.qsrc

@@ -0,0 +1,101 @@
+# valentin_bogdanov_schedule
+!! 2023-05-26
+
+!! His schedule:
+!ValentinLocCity tells us where Valentin is located
+!locat['A158']
+!----------------------------------------------
+!locat['A158'] = 0 (Valentin not home Fri and Sat 20:00 for rest of night)
+!locat['A158'] = 1 (Valentin in the hallway)
+!locat['A158'] = 2 (Valentin in Anushka''s room)
+!locat['A158'] = 3 (Valentin in Radomir''s room)
+!locat['A158'] = 4 (Valentin in the kitchen)
+!locat['A158'] = 5 (Valentin in the livingroom)
+!locat['A158'] = 6 (Valentin in his and Arkadi''s room)
+!locat['A158'] = 7 (Valentin in the bathroom)
+!locat['A158'] = 8 (Valentin is in the garage with the band Wed 18-23)
+!locat['A158'] = 9 (Valentin is at work, mechanic Mon-Fri 8 to 17)
+!locat['A158'] = 10 (Valentin is in the garage working on his bike Mon 17-23)
+!---------------------------------------------
+
+!! Standard location is his shared own room which should be set at init
+!locat['A158'] = 6
+
+! TODO fix for
+!!Valentin is home Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
+
+if week = 1:
+	if hour >= 8 and hour < 17:
+		locat['A158'] = 9
+	elseif hour >= 17 and hour < 23:
+		locat['A158'] = 10
+	end
+elseif week = 2:
+	if hour >= 8 and hour < 17:
+		locat['A158'] = 9
+	elseif hour >= 18:
+		locat['A158'] = 6
+	end
+elseif week = 3:
+	if hour >= 8 and hour < 17:
+		locat['A158'] = 9
+	elseif hour >= 18 and hour < 23:
+		locat['A158'] = 8
+	end
+elseif week = 4:
+	if hour >= 8 and hour < 17:
+		locat['A158'] = 9
+	elseif hour >= 18:
+		locat['A158'] = 6
+	end
+elseif week = 5:
+	if hour >= 8 and hour < 17:
+		locat['A158'] = 9
+	elseif hour >= 20:
+		locat['A158'] = 0
+	end
+elseif week = 6:
+	if hour >= 8 and hour < 20:
+		locat['A158'] = 6
+	elseif hour >= 20:
+		locat['A158'] = 0
+	end
+elseif week = 7:
+end
+
+if locat['A158'] > 0 and locat['A158'] < 8:
+	$ValentinLocCity = 'home'
+else
+	$ValentinLocCity = 'notHome'
+end
+
+
+! Use this in the calendar app on Sveta''s phone Loop over an array there that holds NPC IDs she is allowed to see there, and for each ID call this function.
+if $ARGS[0] = 'getLocation':
+	!Set the text for the current NPC ID
+	if locat['A158'] = 0:
+		npcLocation['A144'] = 'Valentin not home Fri and Sat 20:00 for rest of night.'
+	elseif locat['A158'] = 1:
+		npcLocation['A144'] = 'Valentin in the hallway.'
+	elseif locat['A158'] = 2:
+		npcLocation['A144'] = 'Valentin in Anushka''s room.'
+	elseif locat['A158'] = 3:
+		npcLocation['A144'] = 'Valentin in Radomir''s room.'
+	elseif locat['A158'] = 4:
+		npcLocation['A144'] = 'Valentin in the kitchen.'
+	elseif locat['A158'] = 5:
+		npcLocation['A144'] = 'Valentin in the livingroom.'
+	elseif locat['A158'] = 6:
+		npcLocation['A144'] = 'Valentin in his and Arkadi''s room.'
+	elseif locat['A158'] = 7:
+		npcLocation['A144'] = 'Valentin in the bathroom.'
+	elseif locat['A158'] = 8: 
+		npcLocation['A144'] = 'Valentin is in the garage with the band.'
+	elseif locat['A158'] = 9:
+		npcLocation['A144'] = 'Valentin is at work, mechanic Mon-Fri 8 to 17.'
+	elseif locat['A158'] = 10:
+		npcLocation['A144'] = 'Valentin is in the garage working on his bike Mon 17-23.'
+	end
+end
+
+--- valentin_bogdanov_schedule ---------------------------------