Jelajahi Sumber

[fixed] issues with Anya's schedule, Roma moved to be 16-18

Anya 2 tahun lalu
induk
melakukan
ada383022d
3 mengubah file dengan 22 tambahan dan 26 penghapusan
  1. 15 20
      locations/family_schedule.qsrc
  2. 1 0
      locations/shop.qsrc
  3. 6 6
      locations/sister_chat.qsrc

+ 15 - 20
locations/family_schedule.qsrc

@@ -50,17 +50,17 @@ if sister_indorf = 0:
 			anyaloc = 7
 			anyaloc['athome'] = 0
 			anyaloc['inroom'] = 0
-		elseif hour = 16 and minut < 10:
-			!!traveling
-			anyaloc = 6
-			anyaloc['athome'] = 0
-			anyaloc['inroom'] = 0
 		elseif hour < 18:
 			if week = 5:
 				!!At the community center
 				anyaloc = 10
 				anyaloc['athome'] = 0
 				anyaloc['inroom'] = 0
+			elseif sisboyday + 1 = daystart:
+				!!in bedroom with Roma
+				anyaloc = 11
+				anyaloc['athome'] = 1
+				anyaloc['inroom'] = 1
 			else
 				!!Personal activities: Relaxing in bedroom 15, at the community center 10
 				anyaloc = func('shortgs', 'rand_pick', '', 10, 15)
@@ -72,23 +72,18 @@ if sister_indorf = 0:
 					anyaloc['inroom'] = 0
 				end
 			end
-		elseif hour = 18:
-			if sisboyday + 1 = daystart:
-				!!in bedroom with Roma
-				anyaloc = 11
-				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+		elseif hour = 18 and minut < 30:
+			if week = 5:
+				!!Goes to a party
+				anyaloc = 24
+				anyaloc['athome'] = 0
+				anyaloc['inroom'] = 0
 			else
-				!!in bedroom hanging out
-				anyaloc = 15
+				!!Family dinner
+				anyaloc = 12
 				anyaloc['athome'] = 1
-				anyaloc['inroom'] = 1
+				anyaloc['inroom'] = 0
 			end
-		elseif hour = 18 and minut < 30:
-			!!Family dinner
-			anyaloc = 12
-			anyaloc['athome'] = 1
-			anyaloc['inroom'] = 0
 		elseif hour < 22:
 			if week = 5:
 				!!Goes to a party
@@ -172,7 +167,7 @@ if sister_indorf = 0:
 				anyaloc['inroom'] = 0
 			end
 		elseif hour = 18 and minut < 30:
-			if week = 6
+			if week = 6:
 				!!Goes to a party
 				anyaloc = 24
 				anyaloc['athome'] = 0

+ 1 - 0
locations/shop.qsrc

@@ -41,6 +41,7 @@ if $shoplocation = 'main':
 	'<br>Most of the space in the supermarket is taken up by the <a href="exec:$shoplocation = ''grocery'' & gt ''shop'', ''move''">grocery department</a>, but the store has many smaller departments as well. <a href="exec:$shoplocation=''cosmetics'' & gt ''shop'', ''move''">Cosmetics</a>, <a href="exec:$shoplocation = ''hardware'' & gt ''shop'', ''move''">hardware</a>, <a href="exec:$shoplocation = ''clothing'' & gt ''shop'', ''move''">clothing</a> and the department of <a href="exec:$shoplocation = ''tech'' & gt ''shop'', ''move''">household appliances</a>. Not far from the entrance is a <a href="exec:$shoplocation = ''icecream'' & gt ''shop'', ''move''">counter selling ice cream</a>.'
 	gs 'stat'
 	gs 'themes', 'indoors'
+	gs 'family_schedule'
 	
 	!! The store in the town and in the altstart only
 	if $loc = 'pav_commercial' and StoryLine = 1:

+ 6 - 6
locations/sister_chat.qsrc

@@ -840,7 +840,7 @@ if $ARGS[0] = 'sister_chat':
 						minut += 5
 						temp = rand(1,14)
 						gs 'stat'
-						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart:
+						if temp <= 3 and npc_QW['A33'] = 10 and sisboytrio >= 1 and sisboyday ! daystart and sistrioday <= daystart and (week < 5 or week = 7):
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
 							if rand(0,3) = 1:
@@ -875,7 +875,7 @@ if $ARGS[0] = 'sister_chat':
 							else
 								'"The last time Roma was here was so good! Thank you very much."'
 								'"You''re welcome, I''m always very happy to help my sister and to see her happy."'
-								'"He would like to come here again tomorrow. Could you take another walk for about an hour?"'
+								'"He would like to come here again tomorrow. Could you take another walk for about an hour or two?"'
 								gs 'willpower', 'misc', 'resist', 'easy'
 								if will_cost <= pcs_willpwr:
 									act 'No (<<will_cost>> Willpower)':
@@ -907,7 +907,7 @@ if $ARGS[0] = 'sister_chat':
 									act 'Finish': gt 'sister_chat', 'sister_chat'
 								end
 							end
-						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0:
+						elseif temp <= 3 and npc_QW['A33'] = 10 and sisterLesb >= 5 and sisboyday ! daystart and sistrioday <= daystart and sisterQW['roma3block'] = 0 and (week < 5 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 							sisboyday = daystart
@@ -960,18 +960,18 @@ if $ARGS[0] = 'sister_chat':
 								'You hug and kiss your sister.'
 								act 'Finish': gt 'sister_chat', 'sister_chat'
 							end
-						elseif temp <= 3 and sisboyday ! daystart:
+						elseif temp <= 3 and sisboyday ! daystart and (week < 5 or week = 7):
 							'<center><h1><font color="maroon">Anya</font></h1></center>'
 							if sisterQW['romatime'] = 0:
 								sisterQW['romatime'] = 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_01.jpg"></center>'
-								'Anya takes a long and hesitant look at you and eventually asks you, "<<$pcs_nickname>>, could you spend an hour tomorrow after 18:00 going for a walk or something? Roma wants to visit me here and... well, you know what I mean."'
+								'Anya takes a long and hesitant look at you and eventually asks you, "<<$pcs_nickname>>, could you spend an hour or two tomorrow after 16:00 going for a walk or something? Roma wants to visit me here and... well, you know what I mean."'
 								'Your sister is blushing a little and looks at you with pleading eyes.'
 							else
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_09.jpg"></center>'
 								'"The last time Roma was here was so good! Thank you for giving us some space, <<$pcs_nickname>>."'
 								'"You''re welcome, I''m always very happy to help my sister and to see her happy."'
-								'"He would like to come here again tomorrow, could you take another walk for about an hour?"'
+								'"He would like to come here again tomorrow, could you take another walk for about an hour or two?"'
 							end
 							gs 'willpower', 'misc', 'resist', 'easy'
 							if will_cost <= pcs_willpwr: