Maid: Updated clearVars in nichUtil

locations/nichApartment.qsrc

@@ -440,14 +440,12 @@ elseif $ARGS[0] = 'visitTanya':
 				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."'
 			'Tanya 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': gt 'nichTanya', 'sexL'
 		elseif (work = 0 or cheatWork = 0):
-			tanday = daystart
 			'When Tanya 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."'

locations/nichGala.qsrc

@@ -6,6 +6,7 @@
 !! nichGalaOpponentDay: the day Gala decided she wants to get rid of PC
 !! nichGalaTraining: 1=enabled
 !! nichGalaTrainCounter
+!! nichGalaTrainLast
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/characters/city/gala/02.jpg"></center>'

locations/nichKitchen.qsrc

@@ -26,9 +26,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'The kitchen has a sleek, contemporary design with lots of metal and polished wood - black, white and gray dominate the room''s color scheme and all appliances and additional furniture in it adhere to this order.'
 	'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.'
 
-	cookPresent = FUNC('nichUtil','isPresent','cook','kitchen')
+	nichCookPresent = FUNC('nichUtil','isPresent','cook','kitchen')
 
-	if cookPresent = 1:
+	if nichCookPresent = 1:
 		if nichKnowsCook = 1:
 			'<a href="exec: gt ''nichCook'', ''desc''">Jegor</a>, the cook of the family, is preparing some meals.'
 		else

locations/nichUtil.qsrc

@@ -42,9 +42,11 @@ elseif $ARGS[0] = 'debug':
 	elseif $ARGS[1] = 'shortcut':
 		if $ARGS[2] = 'meetTanya':
 			!! abonement is a var from fit
+			gs 'nichUtil','clearVars'
 			abonement = 30
 			nichWork = 0
 			nichTanyaOpinion = 0
+			nichTanyaFuckCounter = 0
 			gt 'fit','start'
 		elseif $ARGS[2] = 'getHired':
 			nichWork = 0
@@ -211,26 +213,66 @@ elseif $ARGS[0] = 'startWorkday':
 	end
 !! get rid of all variables concerning Nicholas except for nichWork
 elseif $ARGS[0] = 'clearVars':
-	killvar 'nichPerformance'
-	killvar 'nickHired'
-	killvar 'nichVacationFrom'
-	killvar 'nichVactionTil'
+	!!System vars
+	!!Do not kill nichDebug
+	killvar 'nichRand'
+	killvar '$nichTempPic'
+	killvar '$nichTemp'
+	
+	!!Work vars
+	!!Do not kill nichWork
+	killvar 'nichWorkState'
+	killvar 'nichNote'
 	killvar 'nichLastWorkDay'
 	killvar 'nichMissedWorkdays'
+	killvar 'nichAfterBFEvent'
+	
 	killvar 'nichEvaluationLast'
 	killvar 'nichEvaluationLastReq'
-	killvar 'nichMaidBathG'
-	killvar 'nichMaidLaundry'
-	killvar 'nichMaidDishes'
-	killvar 'nichMaidGroceries'
-	killvar 'nichMaidHallway'
-	killvar 'nichMaidLivingDust'
-	killvar 'nichMaidLivingFloor'
-	killvar 'nichMaidLivingItems'
-	killvar 'nichMaidLivingWindows'
-	killvar 'nichLastInspepection'
+	
+	killvar 'nichHotelReferral'
+	killvar 'nickHired'
+	killvar 'nichHireMode'
+	killvar 'nichJobRefused'
+	killvar 'nichJobRefusedTReact'
+	
+	killvar 'nichPerformance'
+	killvar 'nichSalaryNext'
+	
+	killvar 'nichCleanAppropriate'
 	killvar 'nichOutfitState'
-
+	
+	!!NPC vars
+	killvar 'nichKnowsCook'
+	killvar 'nichCookPresent'
+	
+	killvar '$nichGalaAct'
+	killvar '$nichNichAct'
+	killvar '$nichTanyAct'
+	
+	killvar 'nichGalaPresent'
+	killvar 'nichNichPresent'
+	killvar 'nichTanyPresent'
+	
+	killvar 'nichGalaKnowsPT'
+	killvar 'nichGalaOpinion'
+	killvar 'nichGalaOpponent'
+	killvar 'nichGalaOpponentDay'
+	killvar 'nichGalaTraining'
+	killvar 'nichGalaTrainCounter'
+	killvar 'nichGalaTrainLast'
+	
+	killvar 'nichFlirtCounter'
+	killvar 'nichFlirtLast'
+	killvar 'nichNTRelation'
+	killvar 'nichSex'
+	
+	!!Do not kill nichTanyaUni
+	!!Do not kill Tanyas fuck vars since Sveta might meet her after leaving her job
+	killvar 'nichTanyaSpyLast'
+	killvar 'nichTanyaSpyCounter'
+	
+	
 elseif $ARGS[0] = 'fired':
 	'It takes you a few moments to process what just happened:'
 	'You have just been fired. And kind of lost your home, too.'