Browse Source

[fixed] On rainy days, Mira should only show up in the main house, until you've actually seen her

anjuna krokus 2 weeks ago
parent
commit
4855a55890
3 changed files with 21 additions and 10 deletions
  1. 9 1
      locations/gad_gphouse.qsrc
  2. 3 1
      locations/miroslava.qsrc
  3. 9 8
      locations/miroslava_schedule.qsrc

+ 9 - 1
locations/gad_gphouse.qsrc

@@ -361,7 +361,15 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
 	end
 
-	if MiraVars['guest'] = 1: locat['A60'] = 21 & '<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
+	if locat['A60'] = 21: 
+		if MiraVars['guest'] = 0:
+			MiraVars['follow_time'] = 1
+			gt 'gad_gphouse', 'start'
+		else
+			MiraVars['follow_time'] = 0
+			'<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
+		end
+	end
 
 	gs 'stat'
 	gs 'themes', 'indoors'

+ 3 - 1
locations/miroslava.qsrc

@@ -892,12 +892,14 @@ if $ARGS[0] = 'guest_acts':
 			*clr & cla
 			menu_off = 1
 			minut += 5
-			MiraVars['guest'] = 0
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 
 			'You say goodbye to Mira, and she goes home.'
 
+			MiraVars['guest'] = 0
+			MiraVars['follow_time'] = 0
+			MiraVars['follower'] = 0
 			act 'Walk back home': gt 'gad_gphouse', 'start'
 		end
 	end

+ 9 - 8
locations/miroslava_schedule.qsrc

@@ -157,27 +157,28 @@ if $ARGS[0] = 'update_locat':
 	gs 'miroslava_schedule', 'get_base_schedule'
 
 
-	if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
-	if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution 
-	if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
-	if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
-	if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
-	if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.
-
 	if sunWeather = 0:
 		if locat['A60'] >= 30 and locat['A60'] ! 42:
-			if MiraVars['guestday'] >= daystart or npc_known['A60'] = 0 or hour < 8 or hour >= 20 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
+			if MiraVars['guestday'] >= daystart or npc_known['A60'] = 0 or locat['A60'] = 10 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
 				locat['A60'] = 10
 			else
 				MiraVars['invite_rand'] = rand(0, 1)
 				MiraVars['guestday'] = daystart
 				if MiraVars['invite_rand'] = 0:
 					locat['A60'] = 21
+					MiraVars['follow_time'] = 3
 				else
 					locat['A60'] = 10
 				end
 			end
 		end
+	else
+		if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
+		if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution 
+		if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
+		if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
+		if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
+		if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.
 	end
 end