Maid: Chore changes (Living Room)

locations/nichChore.qsrc

@@ -258,6 +258,37 @@ if $ARGS[0] = 'inspect':
 			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(3).jpg'
 			$nichChoreDesc = 'There are clothes cluttered over the floor and the bed. The bed needs to be made and you should clean the floor.'
 		end		
+	
+	elseif $ARGS[1] = 'living':
+		$location_type = 'event'
+		menu_off = 1
+		
+		nichChoreID = 8
+		nichChoreTimeF = 1
+		$nichChoreType = 'furniture'
+		$nichChoreLoc = 'living'
+		$nichChoreActCaption = 'Inspect Room'
+		
+		nichTimeBQuick		= 30
+		nichTimeBNormal		= 60
+		nichTimeBDiligent	= 120
+		
+		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/living.jpg'
+			$nichChoreDesc = 'The living room of Nicholas is in pristine condition. There is no need to clean it now.'
+		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(1).jpg'
+			$nichChoreDesc = 'Some whine glasses and other items are standing around the living room. You could also remove dust from the furniture and clean the floor.'
+		elseif nichChoreState[nichChoreID] <= 15:
+			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(2).jpg'
+			$nichChoreDesc = 'A visible layer of dust covers the floor and some of the pieces of furniture.'
+		else
+			nichChoreTimeF = 4
+			$nichTempPic = 'images/characters/city/nicholas/misc/livingDirty(3).jpg'
+			$nichChoreDesc = 'There are many clusters of hair and dust all over the living room. Shou need to clean the floor and the furniture.'
+		end	
+	
 	end
 	
 	nichtTimeQuick 		= nichTimeBQuick    * nichChoreTimeF
@@ -432,6 +463,24 @@ elseif $ARGS[0] = 'work':
 		elseif ARGS[1] = 2:
 			$nichChoreDesc = 'You carefully clean the room, making sure you place every posession of Nicholas at the right place so he can easily find it again.'
 		end
+	elseif nichChoreID = 8:
+		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, making sure you catch every tiny bit of dust.'
+		else
+			$nichChoreDesc = 'You carefully clean the room, using the recommended cleaning agents for the the floor and the various pieces of furniture.'
+			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "*pl 'You managed to create a perfect ambiente for every family member 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
 	end
 	
 	!! Default to an empty event to prevent infinite loops

locations/nichLivingroom.qsrc

@@ -130,37 +130,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 	
 	if nichWork = 2:
-		act 'Inspect room':
-			*clr & cla
-			nichChoreID = 8
-			nichChoreTimeF = 1
-			$nichChoreType = 'furniture'
-			$nichChoreLoc = 'living'
-			if nichChoreState[nichChoreID] = 0:
-				'TODO: Desc1'
-			elseif nichChoreState[nichChoreID] <= 5:
-				'TODO: Desc2'
-			elseif nichChoreState[nichChoreID] <= 15:
-				nichChoreTimeF = 2
-				'TODO: Desc3'
-			else
-				nichChoreTimeF = 4
-				'TODO: Desc4'
-			end
-			
-			if nichCleanAppropriate = 0:
-				'It wouldn''t be appropriate to clean this room now.'
-				act 'Don''t clean':
-					gt $loc, 'return'
-				end
-			else			
-				nichtTimeQuick = 30* nichChoreTimeF
-				nichTimeNormal = 60* nichChoreTimeF
-				nichTimeDiligently = 120* nichChoreTimeF
-				
-				gs 'nichUtil', 'cleanOptions'
-			end
-			
+		if nichCleanAppropriate = 0:
+			'It wouldn''t be appropriate to clean this room now.'
+		else
+			gs 'nichChore','inspect','living'
 		end
 	end
 	

locations/nichNicholas.qsrc

@@ -318,7 +318,11 @@ elseif $ARGS[0] = 'evaluation':
 	end
 	
 	!! Living room
-	if nichChoreState[8] = 0:
+	if nichChoreState[8] = -1:
+		'<font color = green>You did an exceptional job cleaning the living room.</font>'
+		nichTempEval += 3
+		nichChoreState[8] = 0
+	elseif nichChoreState[8] = 0:
 		if rand(1,10) <= 3:
 			'<font color = green>You did a good job cleaning up the living room today.</font>'
 			nichTempEval += 1