|
@@ -36,13 +36,13 @@ if week <= 5:
|
|
|
anyaloc = 8
|
|
|
elseif hour < 18:
|
|
|
!!Personal activities: Relaxing in bedroom, working out at the community center, etc (this is also the time frame Roma comes over some times)
|
|
|
- anyaloc = rand(9,11)
|
|
|
+ anyaloc = func('shortgs', 'rand_pick', '', 9, 10, 11)
|
|
|
elseif hour = 18 and minut < 30:
|
|
|
!!Family dinner
|
|
|
anyaloc = 12
|
|
|
elseif hour < 22:
|
|
|
!!Goes out to hang out with friends/Roma (this could be random so sometimes she stays home to give Sveta more time to talk to her)
|
|
|
- anyaloc = rand(13,15)
|
|
|
+ anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
|
|
|
else
|
|
|
!!In her room
|
|
|
anyaloc = 15
|
|
@@ -328,7 +328,7 @@ if week <= 5:
|
|
|
elseif hour < 14:
|
|
|
kolloc = 0
|
|
|
elseif hour = 16 and minut < 45:
|
|
|
- kolloc = rand(10,12)
|
|
|
+ kolloc = func('shortgs', 'rand_pick', '', 10, 11, 12)
|
|
|
elseif hour < 17:
|
|
|
kolloc = 0
|
|
|
elseif hour < 18:
|
|
@@ -356,11 +356,11 @@ else
|
|
|
elseif hour = 13 and minut < 10:
|
|
|
kolloc = 13
|
|
|
elseif hour < 18:
|
|
|
- kolloc = iif(rand(1,4) = 1, 8, rand(10,12))
|
|
|
+ kolloc = func('shortgs', 'rand_pick', '', 8, 10, 11, 12)
|
|
|
elseif hour = 18 and minut < 30:
|
|
|
kolloc = 4
|
|
|
elseif hour < 21:
|
|
|
- kolloc = rand(10,12)
|
|
|
+ kolloc = func('shortgs', 'rand_pick', '', 10, 11, 12)
|
|
|
elseif hour = 21 and minut < 15:
|
|
|
kolloc = 5
|
|
|
elseif hour < 23:
|