Browse Source

Improve schedules. Add starter of journal function

HotMike 1 year ago
parent
commit
99f92be6cd

+ 21 - 0
locations/anushka_konstantinov_schedule.qsrc

@@ -130,5 +130,26 @@ if $ARGS[0] = 'getLocation':
 	end
 	end
 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 ---------------------------------
 --- anushka_konstantinov_schedule ---------------------------------

+ 13 - 5
locations/radomir_popov_schedule.qsrc

@@ -3,9 +3,7 @@
 
 
 !! His schedule:
 !! His schedule:
 !RadomirLocCity tells us where Radomir is located
 !RadomirLocCity tells us where Radomir is located
-! TODO. Later on in this file the schedule is described as:
-! !!Radomir is home Mon-Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
-! Which one is correct?
+
 !locat['A154']
 !locat['A154']
 !----------------------------------------------
 !----------------------------------------------
 !locat['A154'] = 0 (Radomir not home Fri and Sat 20:00 for rest of night)
 !locat['A154'] = 0 (Radomir not home Fri and Sat 20:00 for rest of night)
@@ -23,14 +21,19 @@
 !! locat['A154'] = 3 An init should set this, bur here we want to preserve the current location.
 !! 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.
 !! 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 week = 1:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A154'] = 9
 		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
 	end
 	end
 elseif week = 2:
 elseif week = 2:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A154'] = 9
 		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
 	end
 	end
 elseif week = 3:
 elseif week = 3:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
@@ -41,6 +44,8 @@ elseif week = 3:
 elseif week = 4:
 elseif week = 4:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A154'] = 9
 		locat['A154'] = 9
+	elseif hour > 18:
+		locat['A154'] = 3
 	end
 	end
 elseif week = 5:
 elseif week = 5:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
@@ -49,10 +54,13 @@ elseif week = 5:
 		locat['A154'] = 0
 		locat['A154'] = 0
 	end
 	end
 elseif week = 6:
 elseif week = 6:
-	if hour >= 20:
+	if hour >= 8 and hour <20:
+		locat['A154'] = 3
+	elseif hour >= 20:
 		locat['A154'] = 0
 		locat['A154'] = 0
 	end
 	end
 elseif week = 7:
 elseif week = 7:
+		locat['A154'] = 3
 end
 end
 
 
 if locat['A154'] > 0 and locat['A154'] < 8: 
 if locat['A154'] > 0 and locat['A154'] < 8: 

+ 10 - 1
locations/valentin_bogdanov_schedule.qsrc

@@ -21,6 +21,9 @@
 !! Standard location is his shared own room which should be set at init
 !! Standard location is his shared own room which should be set at init
 !locat['A158'] = 6
 !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 week = 1:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A158'] = 9
 		locat['A158'] = 9
@@ -30,6 +33,8 @@ if week = 1:
 elseif week = 2:
 elseif week = 2:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A158'] = 9
 		locat['A158'] = 9
+	elseif hour >= 18:
+		locat['A158'] = 6
 	end
 	end
 elseif week = 3:
 elseif week = 3:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
@@ -40,6 +45,8 @@ elseif week = 3:
 elseif week = 4:
 elseif week = 4:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
 		locat['A158'] = 9
 		locat['A158'] = 9
+	elseif hour >= 18:
+		locat['A158'] = 6
 	end
 	end
 elseif week = 5:
 elseif week = 5:
 	if hour >= 8 and hour < 17:
 	if hour >= 8 and hour < 17:
@@ -48,7 +55,9 @@ elseif week = 5:
 		locat['A158'] = 0
 		locat['A158'] = 0
 	end
 	end
 elseif week = 6:
 elseif week = 6:
-	if hour >= 20:
+	if hour >= 8 and hour < 20:
+		locat['A158'] = 6
+	elseif hour >= 20:
 		locat['A158'] = 0
 		locat['A158'] = 0
 	end
 	end
 elseif week = 7:
 elseif week = 7: