Maid: Clean whole apartment option

locations/nichApartment.qsrc

@@ -190,7 +190,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	if nichWork = 2:
 	
 		gs 'nichChore','inspect','hallway'
-	
+		
+		act 'Clean apartment':
+			gt 'nichChore', 'cleanApartment', 'start'
+		end
+		
 	end
 	
 	if nichDebug = 1:

locations/nichChore.qsrc

@@ -375,11 +375,13 @@ if $ARGS[0] = 'inspect':
 				end
 			end
 		end
-		
-		act 'Don''t clean':
-			gt $loc, 'return'
+		if nichChoreMode = 0:
+			act 'Don''t clean':
+				gt $loc, 'return'
+			end
+		else
+			gs 'nichChore', 'cleanApartmentActions',0
 		end
-		
 	end
 	
 elseif $ARGS[0] = 'work':
@@ -603,15 +605,102 @@ elseif $ARGS[0] = 'work':
 	
 	nichChoreState[nichChoreID] = nichChoreResult
 	
+	gs 'stat'
+	
 	killvar 'nichChoreResult'
 	killvar '$nichChoreDesc'
 	killvar '$nichChoreResultCode'
 	killvar 'nichChoreResulChance'
 	
-	act 'Finish':
-		gt $loc, 'return'
+	if nichChoreMode = 0:
+		act 'Finish':
+			gt $loc, 'return'
+		end
+	else
+		gs 'nichChore', 'cleanApartmentActions',1
+	end
+elseif $ARGS[0] = 'cleanApartment':
+	if $ARGS[1] = '' or $ARGS[1] = 'start':
+		nichChoreMode = 1
+		if $nichChoreCurrent = '': 
+			$nichChoreCurrent = 'hallway'
+		end
+		gt 'nichChore', 'inspect', $nichChoreCurrent, 1
+	elseif $ARGS[1] = 'end':
+		killvar 'nichChoreMode'
+		killvar '$nichChoreCurrent'
+		gt $loc
+	end
+
+elseif $ARGS[0] = 'cleanApartmentActions':
+	!! ARGS[1]: whether to show the Clean Again-option (because it does not make sense if the room wasnt cleaned once)
+	if nichChoreState[nichChoreID] > 0 and ARGS[1] = 1:
+		act 'Clean again':
+			gt 'nichChore', 'inspect', $nichChoreCurrent, 1
+		end
+	end
+
+	if nichChoreID = 0:
+		act 'Continue to guest cloakroom':
+			$nichChoreCurrent = 'bathGuest'
+			gt 'nichChore', 'inspect', 'bathGuest', 1
+		end
+	elseif nichChoreID = 1:
+		act 'Continue to your bedroom':
+			$nichChoreCurrent = 'servant'
+			gt 'nichChore', 'inspect', 'servant', 1
+		end
+	elseif nichChoreID = 2:
+		act 'Continue to your bathroom':
+			$nichChoreCurrent = 'bathServant'
+			gt 'nichChore', 'inspect', 'bathServant', 1
+		end
+	elseif nichChoreID = 3:
+		act 'Check laundry':
+			$nichChoreCurrent = 'laundry'
+			gt 'nichChore', 'inspect', 'laundry', 1
+		end
+	elseif nichChoreID = 4:
+		act 'Continue to Tanyas bedroom':
+			$nichChoreCurrent = 'tanya'
+			gt 'nichChore', 'inspect', 'tanya', 1
+		end
+	elseif nichChoreID = 5:
+		act 'Continue to the master bathroom':
+			$nichChoreCurrent = 'masterbath'
+			gt 'nichChore', 'inspect', 'masterbath', 1
+		end
+	elseif nichChoreID = 6:
+		act 'Continue to Nicholas'' bedroom':
+			$nichChoreCurrent = 'master'
+			gt 'nichChore', 'inspect', 'master', 1
+		end
+	elseif nichChoreID = 7:
+		act 'Continue to the living room':
+			$nichChoreCurrent = 'living'
+			gt 'nichChore', 'inspect', 'living', 1
+		end
+	elseif nichChoreID = 8:
+		act 'Continue to the kitchen':
+			$nichChoreCurrent = 'kitchen'
+			gt 'nichChore', 'inspect', 'kitchen', 1
+		end
+	elseif nichChoreID = 9:
+		act 'Continue to the study':
+			$nichChoreCurrent = 'study'
+			gt 'nichChore', 'inspect', 'study', 1
+		end
+	elseif nichChoreID = 10:
+		act 'Finish':
+			gt 'nichChore', 'cleanApartment', 'end'
+		end
 	end
 	
+	if nichChoreID < 10:
+		act 'Pause cleaning':
+			gt $loc, 'return'
+		end
+	end
 end