Merge remote-tracking branch 'Maid_Christine/dev'

locations/down.qsrc

@@ -254,5 +254,11 @@ if hour >= 20 or hour <= 4:
 	end
 end
 
+
+!! Savegame Compatibility
+if tanwork ! 0:
+	gt 'nichUtil','updateNotice'
+end
+
 --- down ---------------------------------
 

locations/loadg.qsrc

@@ -96,5 +96,11 @@ if alko < 0: alko = 0
 if pranik < 0: pranik = 0
 if poroshok < 0: poroshok = 0
 
+if $loc = 'tanapartment' or $loc = 'tanhouse' or $loc = 'tanhousezal' or $loc = 'tanhozspal' or $loc = 'tankitchen' or $loc = 'tanNicholas' or $loc = 'tanroom' or $loc = 'tanspalnya' or $loc = 'tanvanr':
+	$loc = 'nichApartment'
+	$metka = ''
+	gt 'nichUtil','updateNotice'
+end
+
 --- loadg ---------------------------------
 

locations/nichApartment.qsrc

@@ -28,11 +28,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	tanhouse1 = 1
 	$location_type = 'private'
 	killvar '$locclass'
-	
-	if tanwork > 0:
-		gs 'nichUtil', 'convert'
-	end
-	
+		
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/hallway.jpg"></center>'

locations/nichUtil.qsrc

@@ -322,10 +322,7 @@ end
 
 !! convert the old vars to the new system
 if $ARGS[0] = 'convert':
-	if tanwork = 1:
-		gs 'nichUtil', 'hired'
-		nichPerformance = tan_work_rep * 5
-	end
+	
 	killvar 'MaidWorkDay'
 	killvar 'MaidWork'
 	killvar 'TanHallClean'
@@ -341,6 +338,30 @@ if $ARGS[0] = 'convert':
 	killvar 'tan_work_evaluation'
 end
 
+if $ARGS[0] = 'updateNotice':
+	
+	'<b><font color = red>Update Notice</font></b>'
+	'It appears as if you are currently the live-in maid of Nicholas.'
+	*nl
+	'This story-line has changed drastically in the last updates.'
+	*nl
+	'Please select one option:'
+	'1. Start over: You can play the whole story-line all over again as if it has never happened.'
+	'2. Stay hired: You will stay the maid of Nicholas and your job performance will be translated to the new system. You will be in a sexual relationship with Tanya.'
+	gs 'nichUtil','convert'
+	
+	act 'Start over':
+		gt $loc, $metka
+	end
+	
+	act 'Stay hired':
+		gs 'nichUtil', 'hired'
+		nichPerformance = tan_work_rep * 5
+		nichTanyaOpinion = 1
+		gt $loc, $metka
+	end
+	
+end
 
 if $ARGS[0] = 'checkOutfit':
 	if $clothingworntype = 'uniform':