Maid: Chore changes (BedroomTanya, BathroomMaster)

locations/nichBathMaster.qsrc

@@ -68,37 +68,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 	
 	if nichWork = 2:
-		act 'Inspect room':
-			*clr & cla
-			nichChoreID = 6
-			nichChoreTimeF = 1
-			$nichChoreType = 'bath'
-			$nichChoreLoc = 'masterbath'
-			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 = 20* nichChoreTimeF
-				nichTimeNormal = 40* nichChoreTimeF
-				nichTimeDiligently = 60* nichChoreTimeF
-				
-				gs 'nichUtil', 'cleanOptions'
-			end
-			
+		if nichCleanAppropriate = 0:
+			'It wouldn''t be appropriate to clean this room now.'
+		else
+			gs 'nichChore','inspect','masterbath'
 		end
 	end
 end

locations/nichChore.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] = 'inspect':
 		
 		nichTimeBQuick		= 5
 		nichTimeBNormal		= 10
-		nichTimeBDiligent	= 20
+		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomTanja.jpg'
@@ -200,8 +200,35 @@ if $ARGS[0] = 'inspect':
 			$nichChoreDesc = 'Even entering Tanyas room is difficult since she has cluttered dirty and clean clothes all over the floor.'
 		end
 		
+	elseif $ARGS[1] = 'masterbath':
+		$location_type = 'event'
+		menu_off = 1
 		
+		nichChoreID = 6
+		nichChoreTimeF = 1
+		$nichChoreType = 'bath'
+		$nichChoreLoc = 'masterbath'
+		$nichChoreActCaption = 'Inspect Room'
 		
+		nichTimeBQuick		= 20
+		nichTimeBNormal		= 40
+		nichTimeBDiligent	= 60
+		
+		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/bathroomMaster.jpg'
+			$nichChoreDesc = 'Since the bathroom gets used over the day some tiny bits of spilled water and a small amount of untidiness can''t be avoided. There is no need for you to clean this bathroom now.'
+		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(1).jpg'
+			$nichChoreDesc = 'There are various items cluttered around the sink, the floor could be cleaned and the bathtub could be scrubbed.'
+		elseif nichChoreState[nichChoreID] <= 15:
+			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/tanyaDirty(2).jpg'
+			$nichChoreDesc = 'The floor is covered in water and lime, the bathtub needs to be scrubbed and the toilet and the sink also require attention.'
+		else
+			nichChoreTimeF = 4
+			$nichTempPic = 'images/characters/city/nicholas/misc/tanyaDirty(3).jpg'
+			$nichChoreDesc = 'The bathroom is very dirty. There is also a unpleasant smell in the air.'
+		end	
 		
 	end
 	
@@ -335,6 +362,36 @@ elseif $ARGS[0] = 'work':
 			$nichChoreResultCode[ARRSIZE('$nichChoreResultCode')] = "nichChoreResult = max (0,nichChoreState[nichChoreID] - 30)"
 			nichChoreResulChance[ARRSIZE('nichChoreResulChance')] = 10000
 		end
+	elseif nichChoreID = 5:
+		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 place every posession of Tanya at the right place so she can easily find it again.'
+		end
+	elseif nichChoreID = 6:
+		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 bathtub, the shower, 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 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/nichNicholas.qsrc

@@ -280,7 +280,11 @@ elseif $ARGS[0] = 'evaluation':
 	end
 	
 	!! Master bathroom
-	if nichChoreState[6] = 0:
+	if nichChoreState[6] = -1:
+		'<font color = green>You did an exceptional job cleaning the master bathroom. I really like the smell there. And you seem to have a talend of folding towels.</font>'
+		nichTempEval += 3
+		nichChoreState[6] = 0
+	elseif nichChoreState[6] = 0:
 		if rand(1,10) <= 3:
 			'<font color = green>You did a good job cleaning up the master bathroom today.</font>'
 			nichTempEval += 1