Maid: Update hiring process

locations/nichApartment.qsrc

@@ -1,4 +1,5 @@
 # nichApartment
+!! code for the hallway and everything that involves the apartment as a whole
 CLOSE ALL
 
 $metka = ''
@@ -22,26 +23,28 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></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.'
-	elseif nichWork > 1:
+	'You are standing in a luxurious and spacious city center home.'
+	
+	$nickFamDesc = 'It belongs to <a href="exec: gt ''nicholas'', ''desc''">Nicholas</a>, who is also the head of home.'
+	$nickFamDesc += ' He lives here with his wife <a href="exec: gt ''nichGala'', ''desc''">Gala</a>.'
+	$nickFamDesc += ' <a href="exec: gt ''nichTanja'', ''desc''">Tanja</a> is the daughter of Gala and step-daughter of Nicholas. She also lives here.'
+	$nickFamDesc
+	killvar '$nickFamDesc'
+	
+	if nichWork = 2 or nichWork = 3:
+		'You work here as a live-in maid.'
+	elseif nichWork > 3:
 		'You used to work here.'
 	end
 	'The corridor''s floor and walls are a tasteful mix of marble and wood. Besides several paintings and small statues for decoration, the only thing of note in it is are a coat and shoe rack for guests.'
 	
-	if nichWork = 1:
+	if nichWork = 2 or nichWork = 3:
 		if nichLastWorkDay ! daystart:
 			gs 'nichUtil', 'startWorkday'
 		end
 		gs 'nichUtil', 'checkOutfit'
 	end
 	
-	
-	!'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'!
 
 	act '<b>Leave and go to the city center</b>':
 		if $clothingworntype ! 'nude':
@@ -58,10 +61,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gt 'nichBathGuest'
 	end
 	
-	act 'Go to the kitchen':
-		minut += 1
-		gt 'nichKitchen'
-	end
 
 	if nichWork = 1:
 		act 'Go to your bedroom':
@@ -95,36 +94,116 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gt 'nichStudy'
 	end
 
-	if nichWork = 1:
-		if nichLastInspepection ! daystart :
-			if nichOutfitState = 1:
-				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 could create a list of your chores for today, but you should wear an appropriate outfit to do so.'
-			end
+	if nichWork = 2 or nichWork = 3:
+		if nichWorkState = 0:
+		
 		else
-			''
-			'You have created a list of your remaining chores for today:'
-			if nichMaidHallway >= 4:
-				'-the hallway must be cleaned'
-			elseif nichMaidHallway >= 2:
-				'-the hallway should be cleaned'
+			act 'Clean the apartment':
+				
 			end
 		end
-		
-		gs 'nichUtil', 'renderJob', 'hallwaySweep'
 	end
+	
 
 
+elseif $ARGS[0] = 'hiring':
+	*clr & cla
+	$location_type = 'private'
+	killvar '$locclass'
+	menu_off = 0
+	'Tanja leads you into the living room. Nicholas, her step-father, and her mother Gala are already sitting there.'
+	'"This is <<$pcs_nickname>>, the girl I told you about." Tanja says before sitting down next to her mother. You have the feeling that you are expected to keep standing.'
+	if CloInhibit > 20:
+		nichGalaOpinion = 1
+		'Gala look at your uniform disparagingly. "Tanja, what did you tell this girl we would hire her as? Did you tell her to dress like a hooker?"'
+		'Tanja squirms a little and her head turns red "Of course not..."'
+		'Nicholas raises his hand. The gesture is subtle. Nevertheless it imidiately silences both women. "The rule is to wear a maid uniform. If <<$pcs_nickname>> is comfortable showing her skin we won''t judge her." Nicholas'' voice is friendly but also commands authority.'
+		'Gala nods though it''s clear that she does not agree with her husband.'
+	elseif pcs_apprnc >= 120:
+		'Gala leans forward to take a closer look at you. "She is gorgeous."'
+		'"Maybe so. But that''s not the reason we consider hiring her." Nicholas'' voice is friendly but also commands authority.'
+		'Gala nods though it''s clear that she does not completely believe her husband.'
+	else
+		'Gala leans forward to take a closer look at you. "Finally a girl who looks like a real maid. I was afraid you would present us with yet another slut."'
+		'"I don''t think Katinka was a slut." Tanja protests.'
+		'Nicholas raises his hand. The gesture is subtle. Nevertheless it imidiately silences both women. "This is not the time to discuss that matter." Nicholas'' voice is friendly but also commands authority.'
+		'Gala nods though it''s clear that she does not agree with her husband.'
+	end
+	'Nicholas stands up and walks around you, inspecting your from every side.'
+	if spdirty > 0 or (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or cumloc[1] = 1 or cumloc[2] = 1 or cumloc[4] = 1 or cumloc[5] = 1 or cumloc[6] = 1 or cumloc[7] = 1 or cumloc[14] = 1 or cumloc[12] = 1:
+		*nl
+		'Whether it''s a whiff of the smell or something he spotted - the cum on you cannot escape his senses; he wrinkles his nose and you can see is expression harden.'
+		'"I cannot believe you have the audacity to come before me like a prostitute after a busy night. Is that how you intend to leave a good impression with me?" He doesn''t give you time to respond, dismissively waving his hand: "I won''t hire anybody who can''t even clean herself up. Get out!"'
+		!!TODO: end event chain
+	end
+	nichImperfections = 0
+	if ShoHeels < 4:
+		nichImperfections += 1
+		*nl
+		'He makes a nod in the direction of your feet.'
+		'"I do understand that wearing heels may cause discomfort. Especially while doing manual labor. But as a maid that is something you have to get comfortable with."'
+	elseif ShoHeels >= 5:
+		*nl
+		'He makes a nod in the direction of your feet.'
+		'"I hope you are able to work in these heels. I approve of your choice of footwear but there is no sense in wearing these shoes if you can''t perform to my satisfaction."'
+	end
+	if lashair ! 1 and pcs_pubes > 3 or pcs_leghair > 3:
+		nichImperfections += 1
+		*nl
+		'"Are your legs, armpits and sex clean-shaved?"'
+		'Looking down and realizing that you are, in fact, not, you shake your head no, and he nods gravely.'
+		'"I expect my maids to have nothing short of a perfect personal hygiene", he states. "If you can''t take care of yourself, how are you going to care for this household? You will take care of this if we hire you."'
+	end
+	if pcs_hairbsh = 0:
+		nichImperfections += 1
+		*nl
+		'Of course, he cannot miss the fact that your hair is tangled and uncombed. He almost imperceptibly shakes his head at you.'
+		'"<<$pcs_nickname>>, I expect from my maids what I expect from all of my employees, and what they can expect of me: An immaculate appearance that commands respect, for you, for me, for my company, for my family. If you want to work for us you will start taking care of your hair."'
+	end
+	if nichImperfections = 0:
+		'Unable to find anything to criticize, he gives you an approving nod.' 
+		'"The uniform suits you, <<$pcs_nickname>>, and it seems you know how to take care of your appearance. Good."'
+	end
+	killvar 'nichImperfections'
+	'He sits back down. "Tanja told me that you will do a good job as our maid. And I trust her judgment." He takes a look at the two women sitting next to him. Tanja beams back while Gala shrugs.'
+	'"Well then. In the name of my family I would like to offer you the job as our live-in maid. There are a few rules you should be aware of:'
+	*nl
+	'1. You have to look presentable at all times. During work you will wear your uniform.'
+	'2. Your job is to clean the apartment, to buy groceries and to pepare breakfast. Sometimes we will have special requests which are also required to follow.'
+	'3. You have your own bedroom and a personal bathroom. Every other room is your working place only and you will always act and be treated as a maid there.'
+	'4. You will work from Thursday to Tuesday. Wednesday is your free day.'
+	'5. Your payment is 10.000 each month. I will transfer the money to your bank account at the end of each month.'
+	'6. You will call me Master Nicholas, my wife is Mistress Gala and from now on Tanja is Miss Tanja to you. You will also curtsy when you approach one of us.'
+	'7. Starting tomorrow you are on probation. You will do all your chores during the day and report to me in the evening. If you do everything to my satisfaction for three days I will formally employ you.'
+	*nl
+	'Do you accept these conditions?"'
+	act 'Yes':
+		cla
+		'"I do, Master Nicholas."'
+		'"Good. Your work will start tomorrow. You are dismissed for the evening. Tanja will show you your room."'
+		'Tanja jumps up. She looks excited. "Of course. Follow me, <<$pcs_nickname>>!"'
+		act 'Follow her':
+			*clr & cla
+			'She leads you to your new room.'
+			'It has a small double bed, a wardrobe, a desk and enough free space for doing excercises. A door leads to your personal bathroom.'
+			'After showing you around your tiny new home she sits down on your bed.'
+			'"Do I really have to call you Miss Tanja now, Miss Tanja?"'
+			'She laughs out. "No, of course not. Only when Nicholas is around. Following the ''protocol'' is very important to him."'
+			'She drives her hand over the fabric of your duvet cover. Looking at you she bites down on her lower lip. "You''re looking hot in this uniform..." You feel like she is undressing you with her eyes.'
+			act 'Fuck her':
+				!!TODO
+			end
+			act 'Not in the mood':
+				cla
+				'"Sorry Tanja, but I''m not in the mood right now. It was a very stressful day."'
+				'"I understand." She jumps up and gives you a hug before heading for the door. "If you change your mind just come over to my room. And don''t forget: breakfast is at 07:30." With a wink she leaves and closes the door behind her.'
+				act 'Continue': gt 'nichBedroomServant'
+			end
+		end
+	end
+	act 'No':
+		!!TODO
+	end
 end
 
 --- nichApartment ---------------------------------

locations/nichKitchen.qsrc

@@ -19,9 +19,10 @@ gs 'boyStat', 'A161', 'a'
 'It seems to house every kitchen device known to man - all of them the most expensive variant of their kind - and the fridge and freezer cabinet are filled to the top with fresh food. There''s also a refrigerated wine rack, stocked with bottle upon bottle of reds and whites of the finest vintages.'
 
 
-act 'Return to the hallway':
+
+act 'Go to the living room':
 	minut += 1
-	gt 'nichApartment'
+	gt 'nichLivingroom'
 end
 
 --- nichKitchen ---------------------------------

locations/nichLivingroom.qsrc

@@ -11,115 +11,79 @@ gs 'stat'
 sexpartkno = 1
 gs 'boyStat', 'A52'
 gs 'boyStat', 'A161', 'a'
-'<center><b>Nicholas'' Living Room</b></center>'
-'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/living.jpg"></center>'
-
-'The living room is furnished with finest leather couches of modern design, a fireplace, a large TV on the wall, several side tables and a cabinet and fridge for various expensive alcoholic beverages.'
-'Just like every other room in the apartment, it serves to convey to anybody who enters that Nicholas and his family are doing really well financially.'
 
-if nichWork = 1:
+if nichWork = 2 or nichWork = 3:
 	if nichLastWorkDay ! daystart:
 		gs 'nichUtil', 'startWorkday'
 	end
 	gs 'nichUtil', 'checkOutfit'
 end
 
-if nichWork = 1:
-	''
-	if nichMaidLivingDust < 5 and nichMaidLivingFloor = 0 and nichMaidLivingItems = 0 and nichMaidLivingWindows = 0 :
-		'The living room is in pristine condition. There is no need to clean it.'
-	else
-		if nichMaidLivingDust < 5 :
-			'The furniture is completely free of dust.'
-			act '(0:30) Wipe the dust':
-				minut += 30
-				nichMaidLivingDust = 0
-				'There is so little dust you can''t even see it. Neverthelesse you decide to remove it, even if it is impossible to tell the difference.'
-				act 'Finish':
-					gt $CURLOC
-				end
-			end
-		elseif nichMaidLivingDust < 15 :
-			'There is a tiny amount of dust on the furniture, hardly enough to notice.'
-			act '(0:30) Wipe the dust':
-				minut += 30
-				nichMaidLivingDust = 0
-				'You decide to remove the dust. It is a tiny amount but even a small improvement is an improvement.'
-				act 'Finish':
-					gt $CURLOC
-				end
-			end
-		elseif nichMaidLivingDust <= 20 :
-			'There is a small amount of dust on the furniture.'
-			act '(0:30) Wipe the dust':
-				minut += 30
-				nichMaidLivingDust = 0
-				'You decide to remove the dust. After you are done the furniture looks way cleaner.'
-				act 'Finish':
-					gt $CURLOC
-				end
-			end
-		else
-			'There is an obvious amount of dust on the furniture.'
-			act '(0:60) Wipe the dust diligently':
-				minut += 60
-				nichMaidLivingDust = 0
-				'You decide to remove the dust. There is so much dust you need to clean some spots several times to remove every last bit of it. After you are done everything looks way cleaner.'
-				act 'Finish':
-					gt $CURLOC
-				end
-			end
-			act '(0:30) Wipe the dust quickly':
-				minut += 30
-				nichMaidLivingDust -= 15
-				'You decide to remove the dust. You hastily wish over the very dusty spots to the effect that some of the dust is distributed instead of removed. After you are done everything looks less dusty, but not clean.'
-				act 'Finish':
-					gt $CURLOC
-				end
-			end
-		end
+galaPresent = FUNC('nichUtil','isPresent','gala','living')
 
-		if nichMaidLivingFloor = 0:
-			''
-			'The floor is spotless. There is no reason to clean it.'
-		elseif nichMaidLivingFloor = 1:
-			''
-			'The floor is pretty clean. Only a close look would reveal some tiny amounts of dirt.'
-			if nichOutfitState = 1:
-				act '(0:15) Sweep dirt away':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/city/nicholas/maid/sweepDust_001.jpg"></center>'
-					minut += 15
-					act 'Finish':
-						nichMaidLivingFloor = 0
-						gt $CURLOC
-					end
-				end
-			end
-		else
-			'The floor is pretty dirty with quite some hair and dirt on it.'
-		end
-		
-		if nichMaidLivingItems = 0 :
-			'All the items in this room are at their places and there is nothing that doesn''t belong here.'
-		elseif nichMaidLivingItems = 1 :
-			'A nearly empty bottle of wine and some glasses are standing at the side table. The pillows on the couches could use some shaking up. And the remotes for the TV and the HiFi are not at their places.'
-		elseif nichMaidLivingItems = 2 :
-			'A nearly empty bottle of wine and some glasses are standing at the side table. The pillows on the couches could use some shaking up. And the remotes for the TV and the HiFi are not at their places.'
-			'There are also some clothes distributed throughout the room. You see a shirt, pumps, a dress, a bra and black socks.'
-		end
-		
-		if nichMaidLivingWindows < 30 :
-			'The windows are spotless clean.'
-		elseif nichMaidLivingWindows < 60 :
-			'The windows are a little dirty. It is only recognizable when the sun directly shines at them.'
+if galaPresent and nichEvtGalaTele1 = 0:
+	nichEvtGalaTele1 = 1
+	'Just before you enter the living room you hear the voice of Gala. Apparently she is making a phone call. She hasn''t noticed you so far.'
+	act 'Enter': gt $loc
+	act 'Eavesdrop':
+		minut += 10
+		'You hear Gala talking about her hobbies, the dress she bought last week and how she despises the wife of one of Nicholas'' employees. Nothing of this is of any interest to you.'
+		'Just before you are about to stop eavesdropping you hear something interesting.'
+		'"By the way: we have a new maid. Yes another young girl."'
+		'...'
+		if nichGalaOpinion = 1:
+			'"No, it''s the same type we had before. You wouldn''t believe what kind of uniform she wears around the house. I feel like living in a brothel."'
+			'...'
+			'"Tanya is more than ok with that! It was actually her who brought this slut into our house. They met at the gym or something like that."'
+			'...'
+			'"What am I supposed to tell her? That her step-father fucked our former maid... that I don''t want another slut who seduces him?"'
+			'...'
+			'"Yes, she vanished... she only left a letter..."'
+			'...'
+			'"Maybe you are right. But we should not discuss this now. Lets meet in private soon."'
+			'...'
+			'"Yes, that''s fine. See you then."'
 		else
-			'The windows are dirty. Looking through them feels like looking through grey fog.'
+			'"I''m not sure. She looks quite nice. But so far I have no reason to assume that she is after Nicholas."'
+			'...'
+			'"Tanya likes her. It was actually her who introduced us to the new girl. They met at the gym or something like this."'
+			'...'
+			'"No, I don''t think so. If she wanted to steal something she would have done so already. Tanya told me that she had her over several times already."'
+			'...'
+			'"Girls stuff I guess. You are not implying that my daughter is a Lesbian, are you?"'
+			'...'
+			'She laughs out "That means nothing. Have you taken a look in the mirror lately?"'
+			'...'
+			'"Anyways... I have some things to do. Will I see you next week?"'
+			'...'
+			'"Great. See you then."'
 		end
+		'She ends her call. There is no reason to continue eavesdropping.'
+		act 'Enter': gt $loc
 	end
 end
 
+'<center><b>Nicholas'' Living Room</b></center>'
+'<center><img <<$set_imgh>> src="images/characters/city/nicholas/apartment/living.jpg"></center>'
+
+'The living room is furnished with finest leather couches of modern design, a fireplace, a large TV on the wall, several side tables and a cabinet and fridge for various expensive alcoholic beverages.'
+'Just like every other room in the apartment, it serves to convey to anybody who enters that Nicholas and his family are doing really well financially.'
 
+if galaPresent = 1:
+	nichRand = rand(0,2)
+	if nichRand = 0:
+		'<a href="exec: gt ''nichGala'', ''desc''">Gala</a> is sitting on the couch reading a book.'
+	elseif nichRand = 1:
+		'<a href="exec: gt ''nichGala'', ''desc''">Gala</a> is sitting on the couch reading a magazine.'
+	else
+		'<a href="exec: gt ''nichGala'', ''desc''">Gala</a> is sitting on the couch watching tv.'
+	end
+end
+
+act 'Go to the kitchen':
+	minut += 1
+	gt 'nichKitchen'
+end
 
 act 'Return to the hallway':
 	minut += 1

locations/nichStudy.qsrc

@@ -16,7 +16,7 @@ gs 'boyStat', 'A161', 'a'
 nicholasPresent = FUNC('nichUtil','isPresent','nicholas','study')
 
 if nicholasPresent = 1:
-	'<a href="exec: gt ''nicholas'', ''start''">Nicholas</a> is sitting behind his desk working on his computer.'
+	'<a href="exec: gt ''nicholas'', ''study''">Nicholas</a> is sitting behind his desk working on his computer.'
 end
 
 act 'Return to the hallway':

locations/nichUtil.qsrc

@@ -2,7 +2,7 @@
 
 !! Used variables-
 !! 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
+!! nichWork- 0= does not work for nicholas and never has, 1=has agreed to work for Nicholas but has not introduced herself yet, 2=sample days, 3= currently works for nicholas, 4= quit job in good faith and could get hired again, 5= quit job in bad faith or got thrown out and nicholas is blocked
 !! nichPerformance- ranging from 0 (fired) to 100 (best)
 !! nichHired- the day Sveta was hired
 !! nichVacationFrom- the first free day if Sveta gets some time off 
@@ -23,6 +23,8 @@
 !! nichMaidLivingWindows
 !! nichOutfitState- 0=not wearing an appropriate outfit, 1=wearing an appropriate outfit
 
+!! nichGalaOpinion: 0- Gala has no opinion about PC, 1- Gala thinks PC is a slut
+
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 	'This page should never appear. Please report this bug including a description of how you got here.'
 end
@@ -114,6 +116,7 @@ end
 !! initializes variables when hired, might mess everything up if called at any other time
 if $ARGS[0] = 'hired':
 	nichWork = 1
+	nichWorkState = 0
 	nichPerformance = 20
 	nickHired = daystart
 	nichVacationFrom = daystart
@@ -165,102 +168,36 @@ if $ARGS[0] = 'checkOutfit':
 	end
 end
 
-if $ARGS[0] = 'doJob':
-	*clr & cla
-	gs 'nichUtil', 'setCurrentJob', $ARGS[1]
-	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/maid/'+$nickChorePicture+'.jpg"></center>'
-	minut += nichChoreTime
-	act 'Finish':
-		nichChoresStates[nichChoreID] = 0
-		gt $loc
-	end
-end
-
-if $ARGS[0] = 'renderJob':
-	gs 'nichUtil', 'setCurrentJob', $ARGS[1]
-	
-	if nichChoreState <= nichChoreEvalGood:
-		''+$nichChoreDescGood
-		dyneval ('
-			act "('+nichChoreTime+' minutes) '+$nichChoreDescriptionAction+'":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-		')
-	elseif nichChoreState <= nichChoreEvalOk:
-		''+ $nichChoreDescOk
-		dyneval ('
-			act "('+nichChoreTime+' minutes) '+$nichChoreDescriptionAction+'":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-		')
-	elseif nichChoreState <= nichChoreEvalBadEffect:
-		''+ $nichChoreDescBad
-		dyneval ('
-			act "('+nichChoreTime*2+' minutes) '+$nichChoreDescriptionAction+' (diligently)":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-			act "('+nichChoreTime+' minutes) '+$nichChoreDescriptionAction+' (quickly)":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-		')
-	else
-		''+ $nichChoreDescVBad
-		dyneval ('
-			act "('+nichChoreTime*4+' minutes) '+$nichChoreDescriptionAction+' (diligently)":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-			act "('+nichChoreTime*2+' minutes) '+$nichChoreDescriptionAction+' (quickly)":
-				gt "nichUtil", "doJob", "'+$ARGS[1]+'"
-			end
-		')
-	end
-	
-	
-end
 
-if $ARGS[0] = 'setCurrentJob':
-	if $ARGS[1] = 'hallwaySweep':
-		nichChoreID = 0
-		nichChoreState = nichChoresStates[nichChoreID]
-		nichChoreDaily = 1
-		nichChoreEvalGood = 0
-		nichChoreEvalOk = 1
-		nichChoreEvalBad = 3
-		nichChoreEvalGoodEffect = 0
-		nichChoreEvalOkEffect = 0
-		nichChoreEvalBadEffect = -10
-		nichChoreEvalVBadEffect = -30
-		$nichChoreCommentBad = 'I expect you to take more care of the hallway. It is way too dirty.'
-		$nichChoreCommentVBad = 'Have you taken a look at the hallway lately? It is in an inacceptable condition.'
-		$nichChoreDescGood = 'The hallway is spotless. There is no reason to clean it.'
-		$nichChoreDescOk = 'The hallway is pretty clean. Only a close look would reveal some tiny amounts of dirt.'
-		$nichChoreDescBad = 'The hallway only appears clean at a first glace. A close look would reveal a small trail of dirt between the entry door and the shoe cabinet.'
-		$nichChoreDescVBad = 'There is a hard to miss trail of dirt between the entry door and the shoe cabinet.'
-		nichChoreTime = 15
-		$nichChoreDescriptionAction = 'Sweep dust'
-		$nickChorePicture = 'sweepDust_001'
-	elseif $ARGS[1] = 'livingSweep':
-		nichChoreState = 1
-		nichChoreDaily = 1
-		nichChoreEvalGood = 0
-		nichChoreEvalOk = 1
-		nichChoreEvalBad = 3
-		nichChoreEvalGoodEffect = 5
-		nichChoreEvalOkEffect = 0
-		nichChoreEvalBadEffect = -10
-		nichChoreEvalVBadEffect = -30
-		nichChoreTime = 30
-		$nichChoreDescriptionAction = 'Sweep dust Liv'
-		$nickChorePicture = ''
 
-	end
-	
-end
 
 if $ARGS[0] = 'whereIs':
 	if $ARGS[1] = 'nicholas':
-		if hour >= 19 and hour <= 21 and week <= 4:
-			$RESULT = 'study'
+		$RESULT = 'nowhere'
+		if week <= 4:
+			if (hour < 6) or (hour = 6 and minut < 45) or (hour > 22) or (hour = 22 and minut >= 45):
+				$RESULT = 'masterBedroom'
+			elseif (hour < 7) or (hour = 7 and minut < 15):
+				$RESULT = 'masterBathroom'
+			elseif hour = 7 and minut < 45:
+				$RESULT = 'study'
+			elseif (hour < 8) or (hour = 8 and minut < 15):
+				$RESULT = 'kitchen'
+			elseif (hour < 18) or (hour = 18 and minut < 45):
+				$RESULT = 'work'
+			elseif hour < 21:
+				$RESULT = 'study'
+			elseif (hour = 22 and minut >= 15 and minut < 45):
+				$RESULT = 'masterBathroom'
+			else
+				if week=1:
+					$RESULT = 'study'
+				elseif week=2 or week = 4:
+					$RESULT = 'tanjaBedroom'
+				else
+					$RESULT = 'living'
+				end
+			end
 		end
 	end
 end

locations/tanapartment.qsrc

@@ -8,7 +8,52 @@ gs 'stat'
 
 'This is the apartment where Tanya lives - the girl you fooled around with in the gym''s shower. It is a luxurious inner city apartment, so her parents must be doing very well.'
 
-if tanpred < 2:
+if nichWork = 1:
+	*clr & cla
+	!! PC agreed to meet the parents for the job interview. Tanja expects her to be unemployed and dressed as a maid.
+	if tanday = daystart:
+		!! Tanja and PC just had sex because PC cant go to the job interview yet
+		'Now that the immediate lust is sated and you''re both enjoying your postcoital bliss, you rest naked in each other''s arms.'
+		if $clothingworntype = 'uniform':
+			'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to quit your current job."'
+			'You promise her to do it as soon as possible before putting your uniform back on.'
+		else
+			'"<<$pcs_nickname>>, I really enjoy this. But I kind of promised to my parents that you will apply for the maid job. I really need you to wear a maid uniform the next time you come over."'
+			'You promise her to do so before putting your clothes back on.'
+		end
+		act 'Leave the apartment':gt 'down'
+	elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'uniform':
+		'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
+		act 'Great':
+			cla
+			'"Good, I guess. I think I could really get used to wearing it."'
+			'Tanja smiles brightly. That''s great, because you will need to wear it a lot.'
+			'"Come on now. My parents are waiting in the living room."'
+			act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
+		end
+		act 'Embarrassing':
+			cla
+			'"I don''t know. It felt a little bit embarrassing walking through the streets dressed like this."'
+			'Tanja smiles comfortingly. "Don''t worry. You will get used to it."'
+			'"Come on now. My parents are waiting in the living room."'
+			act 'Follow her': minut += 3 & gt 'nichApartment', 'hiring'
+		end
+	elseif $clothingworntype = 'uniform':
+		tanday = daystart
+		'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. Are you ready to have your interview with my parents?"'
+		'"Not yet. I still have to quit my current job."'
+		'Tanja looks a little bit dissapointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'
+		'Not giving you a chance to say a word, she leads you to her room and pushes you on her bed.'
+		act 'Have sex with Tanya':tanpred = 1 & gt 'lezbsex', 'start'
+	elseif (work = 0 or cheatWork = 0):
+		tanday = daystart
+		'When Tanja opens the door she looks a little be dissapointed.'
+		'"<<$pcs_nickname>>, I told you that you need to wear a maid uniform when you meet my parents. Remember?"'
+		'She bites down on her lip. "But since you are here we could have some fun as well."'
+		'Not giving you a chance to say a word, she leads you to her room and pushes you on her bed.'
+		act 'Have sex with Tanya':tanpred = 1 & gt 'lezbsex', 'start'
+	end
+elseif tanpred < 2:
 	if npc_rel['A218'] <= 50:
 		tanday = daystart
 		npc_rel['A218'] += 3
@@ -137,13 +182,16 @@ if tanpred < 2:
 		'<center><b>Tanya''s Apartment</b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/house.jpg"></center>'
 		'When you look into Tanya''s eyes, they seem to be sparkling with excitement, and her entire face lights up as she smiles at you.'
-		'"<<$pcs_nickname>>, I have the best idea ever! <<$npc_nickname[''A29'']>> just fired our maid yesterday, and I could suggest <b>you</b> to my stepfather as a replacement! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
+		!!'"<<$pcs_nickname>>, I have the best idea ever! <<$npc_nickname[''A29'']>> just fired our maid yesterday, and I could suggest <b>you</b> to my stepfather as a replacement! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
+		'"<<$pcs_nickname>>, I have the best idea ever! Our maid quit yesterday, and I could suggest <b>you</b> to my stepfather as a replacement! He pays really well, and all you gotta do is tidy up a bit, but you would be able to live right here with us!"'
 		'Tanya is so giddy that you almost don''t dare to voice your concerns: "And where do you get the idea that your stepfather would employ me? I''ve never worked as a maid before and I''m sure that, with his kind of money, he could get a much better one."'
+		!!TODO: check whether PC has worked as maid in hotel. If so she will mention or think it.
 		'"Believe me, if I ask him <i>nicely</i>, he will hire you", Tanya smiles lasciviously.'
 
 		act 'Refuse':
 			cla
 			npc_rel['A218'] = 25
+			tanday = daystart
 			'"I don''t know about this, Tanya", you say carefully. "I mean, can you imagine me cleaning up and cooking, day in and day out? It doesn''t sound like me."'
 			'Her joyful expression falters and is quickly replaced with a cold, angry stare. "You just don''t want to be around me."'
 			'"No!", you exclaim, "No, of course I''d love to be around yo-"'
@@ -152,35 +200,41 @@ if tanpred < 2:
 			'Tanya still doesn''t look happy about your refusal, but her anger seems to dissipate somewhat and she looks away. "Yeah, sure, whatever. You think about and we''ll talk about later." You think you can see tears in her eyes when she turns her back on you and says: "I''ve gotta go do something now."'
 			'You understand immediately: "Yeah, okay, I had to leave anyway. Talk to you soon?"'
 			'"Sure", is the last thing you hear from her that day.'
-
+	
 			act 'Leave the apartment':gt 'down'
 		end
 
 		act 'Agree':
+			tanpred = 2
 			cla
+			npc_rel['A218'] += 5
+			nichWork = 1
+			!!tanwork = 1
+			!!tan_work_rep = 10
+			!!work = 1
+			'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately: "Okay."'
+			'"Okay?", she asks, making sure she didn''t misunderstand.'
 			if work = 1 or cheatWork = 0:
-				cla
-				npc_rel['A218'] += 5
-				tanpred = 2
-				'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately:'
-				'"Okay... but I have to go and quit my current job first."'
-				'Tanya is overjoyed by your response that she hugs you tightly, but almost immediately pushes you towards the door.'
-				'"Well, what are you waiting for?! Go now, run, and tell them that you''re quitting!", she exclaims happily.'
-
-				act 'Leave the apartment':gt 'down'
+				'"Yes, I''ll take your offer... but I have to go and quit my current job first."'
 			else
+				'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss.'
+			end
+			!!'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss, but she lets you go a second later and runs off.'
+			!!'"I''ll go and talk to my stepfather", she calls over her shoulder before disappearing in one of the rooms.'
+			
+			'"That''s great, I''m so happy right now. Of course you will need to pass the interview of my parents."'
+			'You look at her with a questioning look.'
+			'"Don''t worry. Since I will vouch for you this will be nothing but a formality. The only thing important is that you look presentable. And that includes wearing a maid uniform."'
+			'"Where would I get a maid uniform?"'
+			'"I think they sell them at G&M. One of their shops is at the mall nearby. But make sure you don''t buy an outfit that''s too skimpy. Nicholas wouldn''t mind but my mother surely would."'
+			!!act 'Take a look around while you wait':gt 'tanapartment', 'sex'
+			act 'Understood':
 				cla
-				npc_rel['A218'] += 5
-				tanwork = 1
-				tan_work_rep = 10
-				work = 1
-				'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately: "Okay."'
-				'"Okay?", she asks, making sure she didn''t misunderstand.'
-				'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss, but she lets you go a second later and runs off.'
-				'"I''ll go and talk to my stepfather", she calls over her shoulder before disappearing in one of the rooms.'
-
-				act 'Take a look around while you wait':gt 'tanapartment', 'sex'
+				'She hugs you again.'
+				'"Great! Just come back any day between 18 and 22 o''clock while wearing your uniform. My parents should be home then."'
+				act 'Leave the apartment':gt 'down'
 			end
+			
 		end
 	end