Merge branch 'mine'

locations/pav_shared_apt.qsrc

@@ -250,9 +250,9 @@ if $ARGS[0] = 'start':
 			'You have already paid the whole rent for the next week.'
 		end
 	elseif weekNum >= rentWeekNum:
-		if rentLeft = 0:
+		if rentLeft <= 0:
 			!rent was forepaid, everything OK, proceed to next week
-			rentLeft += 2000
+			rentLeft = rentWeekly
 			cashPaid = 0
 			servicePaid = 0			
 			rentWeekNum = weekNum + 1

locations/sleep.qsrc

@@ -5,10 +5,10 @@ if $ARGS[0] = 'simple':
 !! the quality of the sleep depends on many factors, so the time of sleep can be modify later, especially the part when the time of sleep is shortened
 
 	varsleep['time_to_full'] = (100 - pcs_sleep) * 6
-!! fully exhausted Sveta can recover in 420 minutes = 7 hours of sleep
+!! fully exhausted Sveta can recover in 420 minutes = 10 hours of sleep
 !! healthy Sveta can hardly sleep more then 10 hours = 600 minutes
-!! so we can add about 3 hours to time to full as a limit
-	varsleep['time_to_full'] += 150 + rand(0,60)
+!! so we can add about 1 hour to time to full as a limit
+	varsleep['time_to_full'] += rand(0,60)
 
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 	varsleep['alarm_time_end'] = daystart*1440 + timerEnd * 60 + timerEndM
@@ -31,7 +31,7 @@ if $ARGS[0] = 'simple':
 	
 	if stime >= 12:
 		stime = 0
-		pcs_sleep += 3
+		pcs_sleep += 2
 		gs 'stat'
 	end