Browse Source

[fixed?] Some Miroslava guest issues.

anjuna krokus 3 weeks ago
parent
commit
e8479dda51
2 changed files with 11 additions and 11 deletions
  1. 1 1
      locations/miroslava.qsrc
  2. 10 10
      locations/miroslava_schedule.qsrc

+ 1 - 1
locations/miroslava.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'underwear', 'wear'
 			end
 
-			act 'Go back to the village': gt 'Gadukino'
+			act 'Go back': gt 'miroslava', 'leave'
 		end
 	end
 end

+ 10 - 10
locations/miroslava_schedule.qsrc

@@ -123,16 +123,6 @@ if $ARGS[0] = 'update_locat':
 		exit
 	end
 
-	if MiraVars['follower'] = 1:
-		MiraVars['follower'] = 0
-		! Mira is your follower, so set her location to your location.
-		locat['A60'] = func('miroslava_schedule', 'get_locat_from_loc')
-		exit
-	elseif Miravars['follow_time'] > 0:
-		locat['A60'] = locat['A60_prev']
-		exit
-	end
-
 	if MiraVars['guest'] = 1:
 		if MiraVars['guestday'] <= daystart: MiraVars['guestday'] = daystart + 1
 		!! check if mira and sveta are in the same location.
@@ -156,6 +146,16 @@ if $ARGS[0] = 'update_locat':
 		exit
 	end
 
+	if MiraVars['follower'] = 1:
+		MiraVars['follower'] = 0
+		! Mira is your follower, so set her location to your location.
+		locat['A60'] = func('miroslava_schedule', 'get_locat_from_loc')
+		exit
+	elseif Miravars['follow_time'] > 0:
+		locat['A60'] = locat['A60_prev']
+		exit
+	end
+
 	gs 'miroslava_schedule', 'get_base_schedule'
 
 	if hour <= 7: