Explorar el Código

Current status. Still need to finetune the locations.

HotMike hace 1 año
padre
commit
f27d33f413

+ 57 - 47
locations/anushapt_city.qsrc

@@ -73,7 +73,7 @@
 !---------------------------------------------
 
 ! 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
@@ -112,48 +112,53 @@ if $ARGS[0] = 'home':
 		'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 locat['A144'] and locat['A156'] >= 0 and locat['A144'] and locat['A156'] < 8:
-	*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:
+	!elseif locat['A144'] and locat['A156'] >= 0 and locat['A144'] and locat['A156'] < 8:
+	elseif $AnushkaLocCity = 'home':
+		*clr & cla
+		if $ArkadiLocCity = 'home':
+			!locat['A144'] = 2
 			!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.'
+			! 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.'
-			locat['A144'] = 2
 			act 'Enter': gt 'anush_bedroom_city','anushroom'
 		end
-	!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'
-	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
@@ -204,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:
@@ -238,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:

+ 10 - 2
locations/anushka_konstantinov_schedule.qsrc

@@ -20,8 +20,8 @@
 !---------------------------------------------
 
 ! City schedule
-! Standard location is not at home
-locat['A144'] = 0
+! 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)
@@ -84,12 +84,20 @@ elseif week = 6:
 			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

+ 62 - 0
locations/arkadi_fyodorov_schedule.qsrc

@@ -17,7 +17,69 @@
 !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 ---------------------------------

+ 26 - 20
locations/radomir_popov_schedule.qsrc

@@ -20,64 +20,70 @@
 !locat['A154'] = 9 (Radomir is at work at music store in mall Mon-Fri 8 to 17)
 !---------------------------------------------
 
-locat['A158'] = 3
+!! 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.
 
 if week = 1:
 	if hour >= 8 and hour < 17:
-		locat['A158'] = 9
+		locat['A154'] = 9
 	end
 elseif week = 2:
 	if hour >= 8 and hour < 17:
-		locat['A158'] = 9
+		locat['A154'] = 9
 	end
 elseif week = 3:
 	if hour >= 8 and hour < 17:
-		locat['A158'] = 9
+		locat['A154'] = 9
 	elseif hour >= 18 and hour < 23:
-		locat['A158'] = 8
+		locat['A154'] = 8
 	end
 elseif week = 4:
 	if hour >= 8 and hour < 17:
-		locat['A158'] = 9
+		locat['A154'] = 9
 	end
 elseif week = 5:
 	if hour >= 8 and hour < 17:
-		locat['A158'] = 9
+		locat['A154'] = 9
 	elseif hour >= 20:
-		locat['A158'] = 0
+		locat['A154'] = 0
 	end
 elseif week = 6:
 	if hour >= 20:
-		locat['A158'] = 0
+		locat['A154'] = 0
 	end
 elseif week = 7:
 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['A158'] = 0:
+	if locat['A154'] = 0:
 		npcLocation['A144'] = 'Radomir not home Fri and Sat 20:00 for rest of night.'
-	elseif locat['A158'] = 1:
+	elseif locat['A154'] = 1:
 		npcLocation['A144'] = 'Radomir in the hallway.'
-	elseif locat['A158'] = 2:
+	elseif locat['A154'] = 2:
 		npcLocation['A144'] = 'Radomir in Anushka''s room.'
-	elseif locat['A158'] = 3:
+	elseif locat['A154'] = 3:
 		npcLocation['A144'] = 'Radomir in Radomir''s room.'
-	elseif locat['A158'] = 4:
+	elseif locat['A154'] = 4:
 		npcLocation['A144'] = 'Radomir in the kitchen.'
-	elseif locat['A158'] = 5:
+	elseif locat['A154'] = 5:
 		npcLocation['A144'] = 'Radomir in the livingroom.'
-	elseif locat['A158'] = 6:
+	elseif locat['A154'] = 6:
 		npcLocation['A144'] = 'Radomir in Valentin''s and Arkadi''s room.'
-	elseif locat['A158'] = 7:
+	elseif locat['A154'] = 7:
 		npcLocation['A144'] = 'Radomir in the bathroom.'
-	elseif locat['A158'] = 8: 
+	elseif locat['A154'] = 8: 
 		npcLocation['A144'] = 'Radomir is in the garage with the band.'
-	elseif locat['A158'] = 9:
+	elseif locat['A154'] = 9:
 		npcLocation['A144'] = 'Radomir is at work, mechanic Mon-Fri 8 to 17.'
-	elseif locat['A158'] = 10:
+	elseif locat['A154'] = 10:
 		npcLocation['A144'] = 'Radomir is in the garage working on his bike Mon 17-23.'
 	end
 end

+ 8 - 2
locations/valentin_bogdanov_schedule.qsrc

@@ -18,8 +18,8 @@
 !locat['A158'] = 10 (Valentin is in the garage working on his bike Mon 17-23)
 !---------------------------------------------
 
-!! Standard location is his shared own room.
-locat['A158'] = 6
+!! Standard location is his shared own room which should be set at init
+!locat['A158'] = 6
 
 if week = 1:
 	if hour >= 8 and hour < 17:
@@ -54,6 +54,12 @@ elseif week = 6:
 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':