|
@@ -122,6 +122,7 @@ if $ARGS[0] = 'update_locat':
|
|
|
locat['A60'] = 10
|
|
|
exit
|
|
|
end
|
|
|
+
|
|
|
if MiraVars['follower'] = 1:
|
|
|
MiraVars['follower'] = 0
|
|
|
! Mira is your follower, so set her location to your location.
|
|
@@ -226,17 +227,17 @@ if $ARGS[0] = 'get_base_schedule':
|
|
|
if locat['A60_rand'] = 0:
|
|
|
!! 0-8, 8-10, 10-14, 14-16, 16-18, 18-20, 20-00
|
|
|
!! Sched0: Home, Forest, Beach, Gad, Meadow, Gad, gopn
|
|
|
- if hour <= 7:
|
|
|
+ if hour < 8:
|
|
|
locat['A60'] = 10
|
|
|
- elseif hour <= 9:
|
|
|
+ elseif hour < 10:
|
|
|
locat['A60'] = 60
|
|
|
- elseif hour <= 13:
|
|
|
+ elseif hour < 14:
|
|
|
locat['A60'] = 51
|
|
|
- elseif hour <= 15:
|
|
|
+ elseif hour < 16:
|
|
|
locat['A60'] = 30
|
|
|
- elseif hour <= 17:
|
|
|
+ elseif hour < 18:
|
|
|
locat['A60'] = 61
|
|
|
- elseif hour <= 19:
|
|
|
+ elseif hour < 20:
|
|
|
locat['A60'] = 30
|
|
|
else
|
|
|
locat['A60'] = 42
|
|
@@ -245,11 +246,11 @@ if $ARGS[0] = 'get_base_schedule':
|
|
|
elseif locat['A60_rand'] = 1:
|
|
|
!! 0-10, 10-16, 16-20, 20-00
|
|
|
!! Sched1: Home, Beach grandp, home
|
|
|
- if hour <= 9:
|
|
|
+ if hour < 10:
|
|
|
locat['A60'] = 10
|
|
|
- elseif hour <= 15:
|
|
|
+ elseif hour < 16:
|
|
|
locat['A60'] = 51
|
|
|
- elseif hour <= 19:
|
|
|
+ elseif hour < 20:
|
|
|
locat['A60'] = 20
|
|
|
else
|
|
|
locat['A60'] = 10
|
|
@@ -258,25 +259,25 @@ if $ARGS[0] = 'get_base_schedule':
|
|
|
elseif locat['A60_rand'] = 2:
|
|
|
!! 0-8, 8-10, 10-14, 14-16, 16-18, 18-20, 20-00
|
|
|
!! Sched2: Home, Forest, Meadow, Beach, Meadow, Forest, gopn
|
|
|
- if hour <= 7:
|
|
|
+ if hour < 8:
|
|
|
locat['A60'] = 10
|
|
|
- elseif hour <= 9:
|
|
|
+ elseif hour < 10:
|
|
|
locat['A60'] = 60
|
|
|
- elseif hour <= 13:
|
|
|
+ elseif hour < 14:
|
|
|
locat['A60'] = 61
|
|
|
- elseif hour <= 15:
|
|
|
+ elseif hour < 16:
|
|
|
locat['A60'] = 51
|
|
|
- elseif hour <= 17:
|
|
|
+ elseif hour < 18:
|
|
|
locat['A60'] = 61
|
|
|
- elseif hour <= 19:
|
|
|
+ elseif hour < 20:
|
|
|
locat['A60'] = 60
|
|
|
else
|
|
|
locat['A60'] = 42
|
|
|
end
|
|
|
|
|
|
elseif locat['A60_rand'] = 3:
|
|
|
- !! 0-8, 8-10, 10-12, 12-14, 14-16, 16-18, 18-20, 20-22, 22-00
|
|
|
- !! Sched3: Home, Home, Home, Home, Home, Home, Home, Home, Home
|
|
|
+ !! 0-8, 8-14, 14-18, 18-00
|
|
|
+ !! Sched3: Home, grandp, Beach, Home
|
|
|
if hour < 8:
|
|
|
locat['A60'] = 10
|
|
|
elseif hour < 14:
|
|
@@ -288,8 +289,8 @@ if $ARGS[0] = 'get_base_schedule':
|
|
|
end
|
|
|
|
|
|
elseif locat['A60_rand'] = 4:
|
|
|
- !! 0-8, 8-10, 10-12, 12-14, 14-16, 16-18, 18-20, 20-22, 22-00
|
|
|
- !! Sched4: Home, Home, Home, Home, Home, Home, Home, Home, Home
|
|
|
+ !! 0-8, 8-10, 10-14, 14-20, 20-00
|
|
|
+ !! Sched4: Home, Forest, Meadow, Beach, Home
|
|
|
if hour < 8:
|
|
|
locat['A60'] = 10
|
|
|
elseif hour < 10:
|
|
@@ -303,24 +304,16 @@ if $ARGS[0] = 'get_base_schedule':
|
|
|
end
|
|
|
|
|
|
elseif locat['A60_rand'] = 5:
|
|
|
- !! 0-8, 8-10, 10-12, 12-14, 14-16, 16-18, 18-20, 20-22, 22-00
|
|
|
- !! Sched5: Home, Home, Home, Home, Home, Home, Home, Home, Home
|
|
|
+ !! 0-8, 8-10, 10-14, 14-18, 18-00
|
|
|
+ !! Sched5: Home, Meadow, Forest, Gad, grandp
|
|
|
if hour < 8:
|
|
|
locat['A60'] = 10
|
|
|
elseif hour < 10:
|
|
|
locat['A60'] = 61
|
|
|
- elseif hour < 12:
|
|
|
- locat['A60'] = 60
|
|
|
elseif hour < 14:
|
|
|
locat['A60'] = 60
|
|
|
- elseif hour < 16:
|
|
|
- locat['A60'] = 30
|
|
|
elseif hour < 18:
|
|
|
locat['A60'] = 30
|
|
|
- elseif hour < 20:
|
|
|
- locat['A60'] = 20
|
|
|
- elseif hour < 22:
|
|
|
- locat['A60'] = 20
|
|
|
else
|
|
|
locat['A60'] = 20
|
|
|
end
|