|
@@ -787,6 +787,14 @@ if $ARGS[0] = 'npcActivity':
|
|
|
gs 'nichUtil', 'npcActivityAdd', 'breakfast', 8 , 30
|
|
|
gs 'nichUtil', 'npcActivityAdd', 'bathMorning', 9 , 15
|
|
|
|
|
|
+ elseif week = 6:
|
|
|
+ !! Tanya will go to a club on Friday evening and return on Saturday morning
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'club', 2 , 30
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'returnClub', 2 , 35
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'sleep', 8 , 45
|
|
|
+ !! note: breakfast time should be the same for all three characters
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'breakfast', 9 , 30
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'bathMorning', 10 , 15
|
|
|
else
|
|
|
gs 'nichUtil', 'npcActivityAdd', 'sleep', 8 , 45
|
|
|
!! note: breakfast time should be the same for all three characters
|
|
@@ -847,11 +855,18 @@ if $ARGS[0] = 'npcActivity':
|
|
|
else
|
|
|
gs 'nichUtil', 'npcActivityAdd', 'tanya', 22 , 0
|
|
|
end
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'sleep', 24 , 0
|
|
|
+ elseif week = 5:
|
|
|
+ !! Tanya will go to a club on Friday evenings and stay there til Saturday morning
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'prepareClub', 21 , 30
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'leaveClub', 21 , 35
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'club', 24 , 0
|
|
|
else
|
|
|
gs 'nichUtil', 'npcActivityAdd', 'tanya', 22 , 0
|
|
|
+ gs 'nichUtil', 'npcActivityAdd', 'sleep', 24 , 0
|
|
|
end
|
|
|
|
|
|
- gs 'nichUtil', 'npcActivityAdd', 'sleep', 24 , 0
|
|
|
+
|
|
|
end
|
|
|
|
|
|
$RESULT = $nichNpcActArr[0]
|
|
@@ -913,11 +928,11 @@ if $ARGS[0] = 'whereIs':
|
|
|
$nichTemp = func('nichUtil','npcActivity','tanya')
|
|
|
if $nichTemp = 'sleep' or $nichTemp = 'nicholas' or $nichTemp = 'tanya' or $nichTemp = 'boyfriend':
|
|
|
$RESULT = 'bedroomTanya'
|
|
|
- elseif $nichTemp = 'bathMorning' or $nichTemp = 'bathEvening':
|
|
|
+ elseif $nichTemp = 'bathMorning' or $nichTemp = 'bathEvening' or $nichTemp = 'prepareClub':
|
|
|
$RESULT = 'masterBathroom'
|
|
|
elseif $nichTemp = 'breakfast' or $nichTemp = 'living' or $nichTemp = 'dinner':
|
|
|
$RESULT = 'living'
|
|
|
- elseif $nichTemp = 'leaveUni' or $nichTemp = 'returnUni' or $nichTemp = 'leaveBallet' or $nichTemp = 'returnBallet' or $nichTemp = 'leaveFriend' or $nichTemp = 'returnFriend' or $nichTemp = 'leaveShopping' or $nichTemp = 'returnShopping':
|
|
|
+ elseif $nichTemp = 'leaveUni' or $nichTemp = 'returnUni' or $nichTemp = 'leaveBallet' or $nichTemp = 'returnBallet' or $nichTemp = 'leaveFriend' or $nichTemp = 'returnFriend' or $nichTemp = 'leaveShopping' or $nichTemp = 'returnShopping' or $nichTemp = 'leaveClub' or $nichTemp = 'returnClub':
|
|
|
$RESULT = 'hallway'
|
|
|
elseif $nichTemp = 'uni':
|
|
|
$RESULT = 'uni'
|
|
@@ -927,6 +942,8 @@ if $ARGS[0] = 'whereIs':
|
|
|
$RESULT = 'friend'
|
|
|
elseif $nichTemp = 'shopping':
|
|
|
$RESULT = 'shopping'
|
|
|
+ elseif $nichTemp = 'club':
|
|
|
+ $RESULT = 'club'
|
|
|
end
|
|
|
elseif $ARGS[1] = 'cook':
|
|
|
if hour >= 10 and hour < 20:
|