leonid_fix

locations/din_bad.qsrc

@@ -24,7 +24,7 @@ $mobile_check = {
 		end
 	end
 
-	if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
+	if leonidSlave = 1 and leonidSlaveDay = daystart and hour >= 6 and hour <= 17 and leonidVisit = 0:
 		'<b><font color="red">Your phone is ringing</font></b>'
 		$caller = 'Leonid Vostov'
 		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
@@ -32,6 +32,14 @@ $mobile_check = {
 		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
 	end
 
+	if leonidSlave = 1 and leonidSlaveDay ! daystart and hour >= 6 and hour <= 17 and leonidVisitMissed > 0:
+		'<b><font color="red">Your phone is ringing</font></b>'
+		$caller = 'Leonid Vostov'
+		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
+		gs 'telefon','phone_ring'
+		pl'<center><a href="exec:gt ''leonid'', ''callMissed''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $metka"><img src="images/system/phone/decline.png"></a></center>'
+	end
+
 	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
 		'<b><font color="red">Your phone is ringing</font></b>'
 		$caller = 'Margaret'

locations/sauna.qsrc

@@ -107,12 +107,21 @@ if $ARGS[0] = 'saunaroom':
 		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & gt ''sauna'', ''saunaroom''">on</a>.'
 	end
 
-	if SaunaWhore > 0 and money > 0 and workDolg > 0:
-		workDolg = dolg_temp
+!	if SaunaWhore > 0 and money > 0 and workDolg > 0:
+!		workDolg = dolg_temp
+!		workDolg -= money
+!		money -= dolg_temp
+!		if money < 0: money = 0
+!		if workDolg < 0: workDolg = 0
+!	end
+
+	if SaunaWhore > 0 and money > workDolg:
+		money -= workDolg
+		workDolg = 0
+	end
+	if SaunaWhore > 0 and money < workDolg:
 		workDolg -= money
-		money -= dolg_temp
-		if money < 0: money = 0
-		if workDolg < 0: workDolg = 0
+		money = 0
 	end
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 

locations/stat_display.qsrc

@@ -1285,7 +1285,17 @@ if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_
 if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
 if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
 if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
-if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
+!if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
+
+if leonidVisit = 1:
+	if hour = 21:
+		leonidVisit = 0
+		leonidVisitMissed += 1
+		$stat_msg += '<BR><b><font color="red">You missed to serve Leonid.</font></b>'
+	elseif hour < 21 and hour > 6:
+		$stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
+	end
+end
 
 if npc_QW['A113'] = 1:
 	$stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b>₽</b></b> and you need to pay him <<belgangpayweek>> <b>₽</b></b> this week.'