Maid: Chore changes

locations/nichApartment.qsrc

@@ -15,7 +15,7 @@ if nichWork = 2:
 	if nichLastWorkDay ! daystart:
 		gs 'nichUtil', 'startWorkday'
 	end
-	!! this code has to be include everywhere where PC can change clothes or enter the apartment
+	!! this code has to be included everywhere where PC can change clothes or enter the apartment
 	gs 'nichUtil', 'checkOutfit'
 end
 

locations/nichBathGuest.qsrc

@@ -20,40 +20,17 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'This is the restroom for the guests of Nicholas and his family. The staff is also allowed to use it.'
 	'You could use the <a href="exec:gt ''mirror'', ''start''">mirror</a> to check your appearance.'
 
-	act 'Return to the hallway':
+	act '<b>Return to the hallway</b>':
 		minut += 1
 		gt 'nichApartment'
 	end
-
+	
 	if nichWork = 2:
-		if nichWorkState = 0:
-			act 'Inspect room':
-				*clr & cla
-				nichChoreID = 1
-				nichChoreTimeF = 1
-				$nichChoreType = 'bath'
-				$nichChoreLoc = 'bathGuest'
-				if nichChoreState[nichChoreID] = 0:
-					'The cloakroom hasn''t been used since it was last cleaned. There are no used towels in the basket, the end of the toilet paper is folded and the sink is in pristine condition. There is no need to clean up.'
-				elseif nichChoreState[nichChoreID] <= 5:
-					'Judging from a used towel being in the towel basket and some tiny splashes of water somebody has used this room lately. Although it being very clean Nicholas surely expects you to clean it.'
-				elseif nichChoreState[nichChoreID] <= 15:
-					nichChoreTimeF = 2
-					'This room has been used several times since it has been cleaned for the last time. The sink is somewhat dirty, the toilet paper needs to be filled up and the fresh towels are nearly used up.'
-				else
-					nichChoreTimeF = 4
-					'This room is dirty, which can not only be seen but also smelled. The toilet paper is used up, the sink has some water, soap and hair in it and the toilet hasn''t been flushed correctly.'
-				end
-				
-				nichtTimeQuick = 10* nichChoreTimeF
-				nichTimeNormal = 20* nichChoreTimeF
-				nichTimeDiligently = 30* nichChoreTimeF
-				
-				gs 'nichUtil', 'cleanOptions'
-				
-			end
-		end
+	
+		gs 'nichChore','inspect','bathGuest'
+	
 	end
+	
 end
 
 

locations/nichBedroomServant.qsrc

@@ -139,35 +139,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 			act 'Leave':gt $curloc
 		end
 	end
-
+	
 	if nichWork = 2:
-		act 'Inspect room':
-			*clr & cla
-			nichChoreID = 2
-			nichChoreTimeF = 1
-			$nichChoreType = 'bed'
-			$nichChoreLoc = 'servant'
-			if nichChoreState[nichChoreID] = 0:
-				'Your room is all cleaned up. Everything is at its place, the bed is tidied up and there is no visible dust on the furniture.'
-			elseif nichChoreState[nichChoreID] <= 5:
-				'Your room appears to be clean. You should make your bed though.'
-			elseif nichChoreState[nichChoreID] <= 15:
-				nichChoreTimeF = 2
-				'Some items are lying on the ground and your bed looks untidy.'
-			else
-				nichChoreTimeF = 4
-				'Some items are lying on the ground and your bed looks untidy. Also there is some visible dust on the shelves.'
-			end
-			
-			nichtTimeQuick = 5* nichChoreTimeF
-			nichTimeNormal = 10* nichChoreTimeF
-			nichTimeDiligently = 20* nichChoreTimeF
-			
-			gs 'nichUtil', 'cleanOptions'
-			
-		end
+	
+		gs 'nichChore','inspect','servant'
+	
 	end
-
 	
 elseif $ARGS[0] = 'evtBodyguardIntim1':
 	*clr & cla

locations/nichChore.qsrc

@@ -17,8 +17,6 @@
 
 !! nichChoreTimeF: Factor to multiply basetime with
 
-gs 'nichUtil', 'checkOutfit'
-
 if $ARGS[0] = 'inspect':
 	if $ARGS[1] = 'hallway':
 		$location_type = 'event'
@@ -35,14 +33,18 @@ if $ARGS[0] = 'inspect':
 		nichTimeBDiligent	= 30
 		
 		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/hallway.jpg'
 			$nichChoreDesc = 'The hallway has been cleaned recently. There is no need to clean it again.'
 		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(1).jpg'
 			$nichChoreDesc = 'The floor is a little bit dirty.'
 		elseif nichChoreState[nichChoreID] <= 15:
 			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(2).jpg'
 			$nichChoreDesc = 'The floor is somewhat dirty. One has to be careful not to step into the dirt.'
 		else
 			nichChoreTimeF = 4
+			$nichTempPic = 'images/characters/city/nicholas/misc/hallwayDirt(3).jpg'
 			$nichChoreDesc = 'The floor is very dirty. Wearing shoes here would be wise because otherwise hosiery could be ruined.'
 		end
 		
@@ -50,8 +52,74 @@ if $ARGS[0] = 'inspect':
 		nichtTimeQuick 		= nichTimeBQuick    * nichChoreTimeF
 		nichTimeNormal 		= nichTimeBNormal   * nichChoreTimeF
 		nichTimeDiligent 	= nichTimeBDiligent * nichChoreTimeF
+	elseif $ARGS[1] = 'bathGuest':
+		$location_type = 'event'
+		menu_off = 1
+		
+		nichChoreID = 1
+		nichChoreTimeF = 1
+		$nichChoreType = 'bath'
+		$nichChoreLoc = 'hallway'
+		$nichChoreActCaption = 'Inspect Room'
+		
+		nichTimeBQuick		= 10
+		nichTimeBNormal		= 20
+		nichTimeBDiligent	= 30
+		
+		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/bathroomGuest.jpg'
+			$nichChoreDesc = 'The cloakroom hasn''t been used since it was last cleaned. There are no used towels in the basket, the end of the toilet paper is folded and the sink is in pristine condition. There is no need to clean up.'
+		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(1).jpg'
+			$nichChoreDesc = 'Judging from a used towel being in the towel basket and some tiny splashes of water somebody has used this room lately. Although it being very clean Nicholas surely expects you to clean it.'
+		elseif nichChoreState[nichChoreID] <= 15:
+			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(2).jpg'
+			$nichChoreDesc = 'This room has been used several times since it has been cleaned for the last time. The sink is somewhat dirty, the toilet paper needs to be filled up and the fresh towels are nearly used up.'
+		else
+			nichChoreTimeF = 4
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathGuestDirt(3).jpg'
+			$nichChoreDesc = 'This room is dirty, which can not only be seen but also smelled. The toilet paper is used up, the sink has some water, soap and hair in it and the toilet hasn''t been flushed correctly.'
+		end
+		
+		
+		nichtTimeQuick 		= nichTimeBQuick    * nichChoreTimeF
+		nichTimeNormal 		= nichTimeBNormal   * nichChoreTimeF
+		nichTimeDiligent 	= nichTimeBDiligent * nichChoreTimeF	
+	elseif $ARGS[1] = 'servant':
+		$location_type = 'event'
+		menu_off = 1
+		
+		nichChoreID = 2
+		nichChoreTimeF = 1
+		$nichChoreType = 'bed'
+		$nichChoreLoc = 'servant'
+		$nichChoreActCaption = 'Inspect Room'
+		
+		nichTimeBQuick		= 5
+		nichTimeBNormal		= 10
+		nichTimeBDiligent	= -1
 		
+		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomServant.jpg'
+			$nichChoreDesc = 'Your room is all cleaned up. Everything is at its place, the bed is tidied up and there is no visible dust on the furniture.'
+		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(1).jpg'
+			$nichChoreDesc = 'Your room appears to be clean. You should make your bed though.'
+		elseif nichChoreState[nichChoreID] <= 15:
+			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(2).jpg'
+			$nichChoreDesc = 'Some items are lying on the ground and your bed looks untidy.'
+		else
+			nichChoreTimeF = 4
+			$nichTempPic = 'images/characters/city/nicholas/misc/bedServantDirty(3).jpg'
+			$nichChoreDesc = 'It appears as if most of your possessions are lying on the ground and your bed looks untidy. Also there is some visible dust on the shelves.'
+		end
 		
+		
+		nichtTimeQuick 		= nichTimeBQuick    * nichChoreTimeF
+		nichTimeNormal 		= nichTimeBNormal   * nichChoreTimeF
+		nichTimeDiligent 	= nichTimeBDiligent * nichChoreTimeF		
 	end
 	
 	
@@ -59,6 +127,7 @@ if $ARGS[0] = 'inspect':
 	act '<<$nichChoreActCaption>>':
 	
 		*clr & cla
+		'<center><img <<$set_imgh>> src="<<$nichTempPic >>"></center>'
 		'<<$nichChoreDesc>>'
 		
 		if nichOutfitState = 0:
@@ -70,8 +139,10 @@ if $ARGS[0] = 'inspect':
 			act '(<<nichTimeNormal>> minutes) Clean normally':
 				gt 'nichChore', 'work', 2
 			end
-			act '(<<nichTimeDiligent>> minutes) Clean diligently':
-				gt 'nichChore', 'work', 3
+			if nichTimeDiligent > 0:
+				act '(<<nichTimeDiligent>> minutes) Clean diligently':
+					gt 'nichChore', 'work', 3
+				end
 			end
 		end
 		
@@ -82,6 +153,7 @@ if $ARGS[0] = 'inspect':
 	end
 
 elseif $ARGS[0] = 'work':
+	!! Relies on some vars being set by 'nichChore','inspect'.
 	!! ARG[1]:
 	!!	1: quick
 	!!	2: normal
@@ -114,6 +186,36 @@ elseif $ARGS[0] = 'work':
 			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'The polish has no visible effect. The floor looks very clean nevertheless.'"
 			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 100
 		end
+	elseif nichChoreID = 1:
+		if ARGS[1] = 1:
+			$nichChoreDesc = 'You clean the room as quickly as possible, cleaning every spot only once and using as few different cleaning agents as possible.'
+			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'Once you are finished you realize that you didn''t improve the condition of the room at all. It is still as dirty as before.' & nichChoreResult = nichChoreState[nichChoreID]"
+			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
+			if nichChoreState[nichChoreID] > 10:
+				$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'Once you are finished you realize that the room is now cleaner, but not perfectly clean.' & nichChoreResult = nichChoreState[nichChoreID] - 10"
+				nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
+			end
+		elseif ARGS[1] = 2:
+			$nichChoreDesc = 'You carefully clean the room, using the recommended cleaning agents for the toilet, the sink and the floor. You also make sure that the towels are neatly folded.'
+		else
+			$nichChoreDesc = 'You carefully clean the room, using the recommended cleaning agents for the toilet, the sink and the floor. You also apply a special perfume to improve the smell and fold some of the towels into hearts and swans.'
+			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'You managed to create a perfect ambiente for every guest who wants to use this room.' & nichChoreResult = -1"
+			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = pcs_cleaning
+			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'The effect is not as stunning as you hoped it to be but the room is at least perfectly clean.'"
+			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 100
+		end
+	elseif nichChoreID = 2:
+		if ARGS[1] = 1:
+			$nichChoreDesc = 'You clean the room as quickly as possible.'
+			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'Once you are finished you realize that you didn''t improve the condition of the room at all. It is still as dirty as before.' & nichChoreResult = nichChoreState[nichChoreID]"
+			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
+			if nichChoreState[nichChoreID] > 10:
+				$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'Once you are finished you realize that the room is now cleaner, but not perfectly clean.' & nichChoreResult = nichChoreState[nichChoreID] - 10"
+				nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 30
+			end
+		elseif ARGS[1] = 2:
+			$nichChoreDesc = 'DESC 2.2.'
+		end
 	end
 	
 	!! Default to an empty event to prevent infinite loops

locations/nichNicholas.qsrc

@@ -179,8 +179,12 @@ elseif $ARGS[0] = 'evaluation':
 	end
 	
 	!!Guest
-	if nichChoreState[1] = 0:
-		!! 
+	if nichChoreState[1] = -1:
+		'<font color = green>I took a look at the guest cloakroom. You did an exceptional job there.</font>'
+		nichTempEval += 3
+		nichChoreState[1] = 0
+	elseif nichChoreState[1] = 0:
+		!! He wont comment or notice a clean guest bathroom
 	elseif nichChoreState[1] <= 5:
 		if rand(1,10) <= 5:
 			'<font color = orange>Did you take a look into the guest cloakroom today? It needs some cleaning up.</font>'

locations/nichUtil.qsrc

@@ -320,7 +320,7 @@ end
 !! Returns the path to a picture of a maid cleaning something. If there are more than one pictures matching the citeria one of them is chosen at random.
 !! Arguments:
 !! 1 (required): What to clean/do (bed, floor, furniture,bath,kitchen)
-!! 2 (optional): Where (servant (=bedroom servant), living, kitchen, hallway, masterbath, study)
+!! 2 (optional): Where (servant (=bedroom servant), living, kitchen, hallway, masterbath, study, bathGuest)
 !! 3 (optional): How to clean (quickly, normally, diligently)
 if $ARGS[0] = 'cleanPic':
 	killvar '$nichTempPic'