Maid: Chore changes (BedroomMaster)

locations/nichBedroomMaster.qsrc

@@ -58,49 +58,25 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		minut += 1
 		gt 'nichBathMaster'
 	end
-
+	
 	if nichWork = 2:
-		act 'Inspect room':
-			*clr & cla
-			nichChoreID = 7
-			nichChoreTimeF = 1
-			$nichChoreType = 'bed'
-			$nichChoreLoc = 'master'
-			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'
+		if nichNichPresent = 1:
+			'With Nicholas being present it wouldn''t be appropriate to clean this room now.'
+			act 'Don''t clean':
+				gt $loc
 			end
-			
-			if nichNichPresent = 1:
-				'With Nicholas being present it wouldn''t be appropriate to clean this room now.'
-				act 'Don''t clean':
-					gt $loc
-				end
-			elseif nichGalaPresent = 1:
-				'With Gala being present it wouldn''t be appropriate to clean this room now.'
-				act 'Don''t clean':
-					gt $loc
-				end
-			elseif nichTanyPresent = 1:
-				'With Tanya being present it wouldn''t be appropriate to clean this room now.'
-				act 'Don''t clean':
-					gt $loc
-				end
-			else			
-				nichtTimeQuick = 5* nichChoreTimeF
-				nichTimeNormal = 10* nichChoreTimeF
-				nichTimeDiligently = 20* nichChoreTimeF
-				
-				gs 'nichUtil', 'cleanOptions'
+		elseif nichGalaPresent = 1:
+			'With Gala being present it wouldn''t be appropriate to clean this room now.'
+			act 'Don''t clean':
+				gt $loc
 			end
-			
+		elseif nichTanyPresent = 1:
+			'With Tanya being present it wouldn''t be appropriate to clean this room now.'
+			act 'Don''t clean':
+				gt $loc
+			end
+		else
+			gs 'nichChore','inspect','master'
 		end
 	end
 elseif $ARGS[0] = 'evtGalaMast1':

locations/nichChore.qsrc

@@ -222,14 +222,42 @@ if $ARGS[0] = 'inspect':
 			$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'
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(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'
+			$nichTempPic = 'images/characters/city/nicholas/misc/bathMasterDirty(3).jpg'
 			$nichChoreDesc = 'The bathroom is very dirty. There is also a unpleasant smell in the air.'
 		end	
+	elseif $ARGS[1] = 'master':
+		$location_type = 'event'
+		menu_off = 1
+		
+		nichChoreID = 7
+		nichChoreTimeF = 1
+		$nichChoreType = 'bed'
+		$nichChoreLoc = 'master'
+		$nichChoreActCaption = 'Inspect Room'
 		
+		nichTimeBQuick		= 5
+		nichTimeBNormal		= 10
+		nichTimeBDiligent	= -1
+		
+		if nichChoreState[nichChoreID] = 0:
+			$nichTempPic = 'images/characters/city/nicholas/apartment/bedroomMaster.jpg'
+			$nichChoreDesc = 'The bedroom of Nicholas is in pristine condition. There is no need to clean it now.'
+		elseif nichChoreState[nichChoreID] <= 5:
+			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(1).jpg'
+			$nichChoreDesc = 'The bed of Nicholas need to be made. You could also sweep the floor.'
+		elseif nichChoreState[nichChoreID] <= 15:
+			nichChoreTimeF = 2
+			$nichTempPic = 'images/characters/city/nicholas/misc/bedMasterDirty(2).jpg'
+			$nichChoreDesc = 'There are some clothes cluttered over the floor. You should put them into the laundry. The bed also needs to be made.'
+		else
+			nichChoreTimeF = 4
+			$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		
 	end
 	
 	nichtTimeQuick 		= nichTimeBQuick    * nichChoreTimeF
@@ -392,6 +420,18 @@ elseif $ARGS[0] = 'work':
 			$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 = 7:
+		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 Nicholas at the right place so he can easily find it again.'
+		end
 	end
 	
 	!! Default to an empty event to prevent infinite loops