Ver Fonte

[fixed] stat_display not updated during sleep. Reported by BBZ

anjuna krokus há 1 mês atrás
pai
commit
083d8bd0f6

+ 2 - 0
locations/bed_events.qsrc

@@ -100,6 +100,7 @@ end
 
 
 if $ARGS[0] = 'exit':
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'
@@ -109,6 +110,7 @@ end
 
 
 if $ARGS[0] = 'continue':
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'

+ 2 - 1
locations/bed_get_out.qsrc

@@ -4,6 +4,7 @@
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	menu_off = 1
 	InSleep = 0
 	InSleep = 0
+	sleepVars['stat_display'] = 0
 	sleepVars['slept_in'] = 0
 	sleepVars['slept_in'] = 0
 	strip_here = 0
 	strip_here = 0
 	SleepHorny = 0
 	SleepHorny = 0
@@ -17,7 +18,7 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!! Check for: if $ARGS[0] = 'bed_get_out' and $ARGS[1] = 'mod_sleeptriggers'
 	!! Check for: if $ARGS[0] = 'bed_get_out' and $ARGS[1] = 'mod_sleeptriggers'
 	!!
 	!!
 	!! This is NOT for events!!
 	!! This is NOT for events!!
-	
+
 	gs 'LOCA', 'bed_get_out', 'mod_sleeptriggers'
 	gs 'LOCA', 'bed_get_out', 'mod_sleeptriggers'
 	xgt 'bed_get_out_events', 'start'
 	xgt 'bed_get_out_events', 'start'
 end
 end

+ 3 - 0
locations/bed_get_out_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 
 
@@ -97,6 +98,7 @@ end
 
 
 if $ARGS[0] = 'exit':
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'
@@ -106,6 +108,7 @@ end
 
 
 if $ARGS[0] = 'continue':
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'

+ 2 - 0
locations/dream_events.qsrc

@@ -121,6 +121,7 @@ end
 
 
 if $ARGS[0] = 'exit':
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'
@@ -130,6 +131,7 @@ end
 
 
 if $ARGS[0] = 'continue':
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'

+ 1 - 0
locations/pre_sleep.qsrc

@@ -14,6 +14,7 @@ end
 
 
 if $ARGS[0] = 'pre_sleep2':
 if $ARGS[0] = 'pre_sleep2':
 	menu_off = 1
 	menu_off = 1
+	sleepVars['stat_display'] = 0
 	if clo_flag['bed'] = 0:
 	if clo_flag['bed'] = 0:
 		clo_flag['bed'] = 1
 		clo_flag['bed'] = 1
 		$lastwornclothingtype['bed'] = $clothingworntype
 		$lastwornclothingtype['bed'] = $clothingworntype

+ 3 - 0
locations/pre_sleep_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 
 
@@ -116,6 +117,7 @@ end
 
 
 if $ARGS[0] = 'exit':
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'
@@ -125,6 +127,7 @@ end
 
 
 if $ARGS[0] = 'continue':
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'

+ 3 - 2
locations/sleep.qsrc

@@ -35,7 +35,7 @@ end
 if $ARGS[0] = '':
 if $ARGS[0] = '':
 	msg 'gt ''sleep'', is depricated! If you did not load an old save, please report this bug. You can continue playing without worry.'
 	msg 'gt ''sleep'', is depricated! If you did not load an old save, please report this bug. You can continue playing without worry.'
 	gt 'pre_sleep', 'start'
 	gt 'pre_sleep', 'start'
-	
+
 end
 end
 
 
 
 
@@ -111,6 +111,7 @@ end
 
 
 if $ARGS[0] = 'sleep_loop':
 if $ARGS[0] = 'sleep_loop':
 	menu_off = 1
 	menu_off = 1
+	sleepVars['stat_display'] = 0
 	:sleep_loop_loop
 	:sleep_loop_loop
 		minut += 1
 		minut += 1
 		sleepVars['stime'] += 1
 		sleepVars['stime'] += 1
@@ -163,7 +164,7 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!! Check for: if $ARGS[0] = 'pre_sleep' and $ARGS[1] = 'mod_sleeptriggers'
 	!! Check for: if $ARGS[0] = 'pre_sleep' and $ARGS[1] = 'mod_sleeptriggers'
 	!!
 	!!
 	!! This is NOT for events!!
 	!! This is NOT for events!!
-	
+
 	gs 'LOCA', 'sleep', 'mod_sleeptriggers'
 	gs 'LOCA', 'sleep', 'mod_sleeptriggers'
 end
 end
 
 

+ 3 - 0
locations/sleep_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 
 
@@ -113,6 +114,7 @@ end
 
 
 if $ARGS[0] = 'exit':
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'
@@ -122,6 +124,7 @@ end
 
 
 if $ARGS[0] = 'continue':
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
 	killvar 'temp_slev_id'

+ 1 - 1
locations/stat.qsrc

@@ -899,7 +899,7 @@ gs 'stat_sklattrib_lvlset'
 !!Sleep variable cap
 !!Sleep variable cap
 if pcs_sleep > 100: pcs_sleep = 100
 if pcs_sleep > 100: pcs_sleep = 100
 
 
-if insleep = 0:
+if insleep = 0 or sleepVars['stat_display'] = 1:
 	gs 'outdoors', 'main'
 	gs 'outdoors', 'main'
 	gs 'stat_display'
 	gs 'stat_display'
 end
 end

+ 1 - 0
locations/wakeup.qsrc

@@ -8,6 +8,7 @@
 if $ARGS[0] = 'start' or $ARGS[0] = 'wake' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = 'wake' or $ARGS[0] = '':
 	menu_off = 1
 	menu_off = 1
 	InSleep = 1
 	InSleep = 1
+	sleepVars['stat_display'] = 1
 	gs 'stat'
 	gs 'stat'
 
 
 	SleepVars['no_sleep_loss'] = 1
 	SleepVars['no_sleep_loss'] = 1