Maid: clean hallway

locations/nichUtil.qsrc

@@ -4,17 +4,18 @@
 !! Prefix- nich
 !! nichWork- 0= does not work for nicholas and never has, 1= currently works for nicholas, 2= quit job in good faith and could get hired again, 3= quit job in bad faith or got thrown out and nicholas is blocked
 !! nichPerformance- ranging from 0 (fired) to 100 (best)
-!! nickHired- the day Sveta was hired
+!! nichHired- the day Sveta was hired
 !! nichVacationFrom- the first free day if Sveta gets some time off 
 !! nichVactionTil- the last free day if Sveta gets some time off (=nichVacationFrom if she has one free day)
 !! nichLastWorkDay- the last day Sveta was in the appartment... needed because otherwise the player could avoid work performance checks by just not showing up here
 !! nichMissedWorkdays- the number of days Sveta has missed work... hopefully she has a good excuse
-!! nichEvaluationLast- the day Sveta had her last evaluation
-!! nichEvaluationLastReq- the last day Sveta was required to get an evaluation
+!! nichEvaluationLast- the day Sveta had her last evaluation (may be today)
+!! nichEvaluationLastReq- the last day Sveta was required to get an evaluation (may be today)
+!! nichLastInspepection- the day Sveta last inspected the appartment (if it is today she has a list of chores she still has to do)
 !! nichMaidLaundry- 
 !! nichMaidDishes-
-!! nichMaidGroceries:-
-
+!! nichMaidGroceries-
+!! nichMaidHallway-
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 	'This page should never appear. Please report this bug including a description of how you got here.'
@@ -77,6 +78,8 @@ if $ARGS[0] = 'clearVars':
 	killvar 'nichMaidLaundry'
 	killvar 'nichMaidDishes'
 	killvar 'nichMaidGroceries'
+	killvar 'nichMaidHallway'
+	killvar 'nichLastInspepection'
 end
 
 if $ARGS[0] = 'fired':
@@ -104,6 +107,8 @@ if $ARGS[0] = 'hired':
 	nichMaidLaundry = 0
 	nichMaidDishes = 0
 	nichMaidGroceries = 0
+	nichMaidHallway = 0
+	nichLastInspepection = -1
 end
 
 !! convert the old vars to the new system
@@ -124,5 +129,6 @@ if $ARGS[0] = 'convert':
 	killvar 'TanMadeBreakfast'
 	killvar 'tanwork'
 	killvar 'tan_work_rep'
+	killvar 'tan_work_evaluation'
 end
 --- nichUtil ---------------------------------

locations/tanhouse.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/house.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/hallway.jpg"></center>'
 	'This is the apartment of Tanya''s stepfather Nicholas - it''s a luxurious and spacious city center home.'
 	if nichWork = 1:
 		'You work and live here together with him, Tanya and her mother, Gala.'
@@ -66,7 +66,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	
 !!	if niksvid >= 2 and hour > 12 and hour < 19 and dayrazb < daystart:gt 'tanhouse', 'razb'
 	
-	if tan_work_evaluation = 0 and hour >= 20 and hour < 23:
+	if nichEvaluationLast ! daystart and nichEvaluationLastReq = daystart and hour >= 20 and hour < 23:
 		''
 		'Your contract states that, around this time, you should go to the living room and talk to Nicholas, so he can evaluate your day''s work.'
 	end
@@ -90,9 +90,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gt 'tankitchen'
 	end
 
-	act 'Go to your bedroom':
-		minut += 1
-		gt 'tanspalnya'
+	if nichWork = 1:
+		act 'Go to your bedroom':
+			minut += 1
+			gt 'tanspalnya'
+		end
 	end
 
 	act 'Go to the master bedroom':
@@ -110,7 +112,92 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gt 'tanroom'
 	end
 
+	if nichWork = 1:
+		if nichLastInspepection ! daystart :
+			act '(0:20) Inspect Apartment':
+				*clr & cla
+				minut += 20
+				nichLastInspepection = daystart
+				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/maid/inspect_001.jpg"></center>'
+				'You carefully inspect each room of the apartment. Whenever you see something you are supposed to clean or fix you take a note.'
+				act 'Finish':
+					gt $CURLOC
+				end
+			end
+		else
+			''
+			'You have created a list of your remaining chores for today:'
+			if nichMaidHallway >= 4:
+				'-the hallway should be cleaned'
+			elseif nichMaidHallway >= 3:
+				'-the hallway might be cleaned'
+			elseif nichMaidHallway >= 1:
+				'-the hallway is somewhat clean but could still be improved'
+			end
+		end
+		
+		
+		if nichMaidHallway = 0:
+			''
+			'The hallway is spotless. There is no reason to clean it.'
+		elseif nichMaidHallway = 1:
+			''
+			'The hallway is pretty clean. Only a close look would reveal some streaks where the floor wasn''t cleaned perfectly.'
+			act '(0:20) Remove streaks':
+				minut += 20
+				gt $CURLOC
+			end
+		elseif nichMaidHallway = 2:
+			''
+			'The hallway is pretty clean. Only a close look would reveal a small amount of dirt between the entry door and the shoe cabinet.'
+			act '(0:10) Sweep away dirt':
+				minut += 10
+				gt $CURLOC
+			end
+		elseif nichMaidHallway = 3:
+			''
+			'The hallway is clean at the obvious spots. But some dirt in hard to reach corners and gaps are hard to miss.'
+			act '(0:30) Clean again':
+				minut += 30
+				gt $CURLOC
+			end
+		elseif nichMaidHallway = 4:
+			''
+			'The hallway is somewhat dirty. The floor could really use some cleaning.'
+			act '(0:45) Clean up diligently':
+				minut += 45
+				gt $CURLOC
+			end
+			act '(0:30) Clean up':
+				minut += 30
+				gt $CURLOC
+			end
+			act '(0:15) Clean up quickly':
+				minut += 15
+				gt $CURLOC
+			end
+		elseif nichMaidHallway = 5:
+			''
+			'The hallway is very dirty. It looks like it hasn''t been cleaned for quite some time.'
+			act '(0:75) Clean up diligently':
+				minut += 75
+				gt $CURLOC
+			end
+			act '(0:45) Clean up':
+				minut += 45
+				gt $CURLOC
+			end
+			act '(0:25) Clean up quickly':
+				minut += 25
+				gt $CURLOC
+			end
+		end
+	end
 
+	
+	
+	
+	
 !'	if tanwork = 1:
 		act 'Quit your Maid Job':
 			cla