Forráskód Böngészése

[added] Tanya goes clubbing on Fridays

Christine 5 éve
szülő
commit
0c8a77da8e

+ 4 - 0
locations/nichApartment.qsrc

@@ -130,6 +130,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		'Tanya is about to leave the apartment. From the way she is dresses you assume that she is heading for a shopping trip.'
 	elseif $nichTanyAct = 'returnShopping':  
 		'Tanya just entered the apartment. She carries some plastic bags with her, indicating that she bought some new clothes and shoes.'
+	elseif $nichTanyAct = 'leaveClub':  
+		'Tanya is about to leave to a dance club.'
+	elseif $nichTanyAct = 'returnClub':  
+		'Tanya just entered the apartment. She wears the clothes she usually wears to her dance club. She appears to be a little bit exhausted.'
 	end
 	
 	killvar '$nichNichAct'

+ 3 - 0
locations/nichBathMaster.qsrc

@@ -56,6 +56,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	elseif $nichTanyAct = 'bathEvening':
 		'Tanya is currently in here brushing her teeth.'	
 		nichCleanAppropriate = 0
+	elseif $nichTanyAct = 'prepareClub':
+		'Tanya is currently in here doing her make-up.'	
+		nichCleanAppropriate = 0
 	end
 	
 	act 'Go to the master bedroom':

+ 4 - 0
locations/nichTanya.qsrc

@@ -774,6 +774,10 @@ elseif $ARGS[0] = 'desc':
 		'Tanya usually visits a friend around this time.'
 	elseif $nichTemp = 'leaveShopping' or $nichTemp = 'shopping' or $nichTemp = 'returnShopping':
 		'Tanya usually goes shopping around this time.'
+	elseif $nichTemp = 'prepareClub':
+		'Tanya is likely preparing herself to go clubbing in the master bathroom.'
+	elseif $nichTemp = 'leaveClub' or $nichTemp = 'club' or $nichTemp = 'returnClub':
+		'Tanya usually goes clubbing around this time.'
 	else
 		'You have no idea where Tanya is at the moment.'
 	end

+ 20 - 3
locations/nichUtil.qsrc

@@ -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: