Browse Source

[Fixed]update weeks alarm clock endless loop

Ethan99 10 months ago
parent
commit
939b6e0d9c
1 changed files with 13 additions and 12 deletions
  1. 13 12
      locations/sleep.qsrc

+ 13 - 12
locations/sleep.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'simple':
 	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
 	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-	if budilnikOn = 1: 
+	if budilnikOn = 1:
 		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
 		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
-	else 
+	else
 		varsleep['minutes to wakeup'] = varsleep['time_to_full']
 		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
 	end
@@ -28,13 +28,13 @@ if $ARGS[0] = 'simple':
 	minut += 1
 	stime += 1
 	if recuperation = 0:pcs_health += 5
-	
+
 	if stime >= 60:
 		stime = 0
 		pcs_sleep += 15
 		gs 'stat'
 	end
-	
+
 	varsleep['minutes to wakeup'] -= 1
 	varsleep['minutes to wakeup end'] -= 1
 
@@ -43,10 +43,10 @@ if $ARGS[0] = 'simple':
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
 	elseif week > 5:
-	!! use weeken time alarm 
+	!! use weeken time alarm
 		varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 		if varsleep['minutes to wakeup end'] > 0:jump 'loopson_sleep'
-	else 
+	else
 		varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 		if varsleep['minutes to wakeup'] > 0:jump 'loopson_sleep'
 	end
@@ -304,10 +304,10 @@ if $ARGS[0] = 'dream':
 	if varsleep['time_now'] >= varsleep['alarm_time_end']: varsleep['alarm_time_end'] += 1440
 	varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 	if varsleep['time_now'] >= varsleep['alarm_time']: varsleep['alarm_time'] += 1440
-	if budilnikOn = 1: 
+	if budilnikOn = 1:
 		varsleep['minutes to wakeup'] = min(varsleep['time_to_full'], varsleep['alarm_time'] - varsleep['time_now'])
 		varsleep['minutes to wakeup end'] = min(varsleep['time_to_full'], varsleep['alarm_time_end'] - varsleep['time_now'])
-	else 
+	else
 		varsleep['minutes to wakeup'] = varsleep['time_to_full']
 		varsleep['minutes to wakeup end'] = varsleep['time_to_full']
 	end
@@ -366,7 +366,8 @@ if $ARGS[0] = 'dream':
 			gs 'stat'
 		end
 
-		
+		if minut = 60: gs 'stat'
+
 		varsleep['minutes to wakeup'] -= 1
 		varsleep['minutes to wakeup end'] -= 1
 
@@ -375,10 +376,10 @@ if $ARGS[0] = 'dream':
 			varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 			if varsleep['minutes to wakeup end'] = 0: wake_up = 1
 		elseif week > 5:
-		!! use weeken time alarm 
+		!! use weeken time alarm
 			varsleep['alarm_time'] = daystart*1440 + timerEnd * 60 + timerEndM
 			if varsleep['minutes to wakeup end'] = 0: wake_up = 1
-		else 
+		else
 			varsleep['alarm_time'] = daystart*1440 + timer * 60 + timerM
 			if varsleep['minutes to wakeup'] = 0: wake_up = 1
 		end
@@ -744,7 +745,7 @@ if $ARGS[0] = 'succubinit':
 
 	if preg = 1:
 		gs 'medical_din', 'remove_preg'
-		RecovH = 0		
+		RecovH = 0
 	end
 
 	act 'Finish': gt $loc, $loc_arg