Преглед изворни кода

[fixes] for menu_off errors, and a missing gs in wakeup_events

anjuna krokus пре 7 месеци
родитељ
комит
da5882f00a
4 измењених фајлова са 12 додато и 11 уклоњено
  1. 2 2
      locations/alarmclock.qsrc
  2. 8 8
      locations/bed2.qsrc
  3. 0 1
      locations/bed_get_out.qsrc
  4. 2 0
      locations/wakeup_events.qsrc

+ 2 - 2
locations/alarmclock.qsrc

@@ -1,8 +1,8 @@
 # alarmclock
 # alarmclock
 
 
-menu_off = 1
-
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
+	menu_off = 1
+
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/bed2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/bed2.jpg"></center>'
 	'<center>Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.</center>'
 	'<center>Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.</center>'

+ 8 - 8
locations/bed2.qsrc

@@ -1,5 +1,6 @@
 # bed2
 # bed2
 $sleep_loc = 'bed2'
 $sleep_loc = 'bed2'
+menu_off = 0
 
 
 !! Lying in bed hub. From here PC can take various actions, including going to sleep.
 !! Lying in bed hub. From here PC can take various actions, including going to sleep.
 !!
 !!
@@ -7,7 +8,6 @@ $sleep_loc = 'bed2'
 !! Going to sleep: move to pre_sleep_events
 !! Going to sleep: move to pre_sleep_events
 
 
 if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
-	menu_off = 0
 	$menu_loc = 'bed2'
 	$menu_loc = 'bed2'
 	$alarmloc = 'bed2'
 	$alarmloc = 'bed2'
 	$menu_arg = 'start'
 	$menu_arg = 'start'
@@ -73,11 +73,11 @@ end
 if $ARGS[0] = 'wear_panties_decider':
 if $ARGS[0] = 'wear_panties_decider':
 	if hypnoPanty <= 0:
 	if hypnoPanty <= 0:
 		if sleepVars['bedPanty'] = 0:
 		if sleepVars['bedPanty'] = 0:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed'', ''bed2''">AS IS</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">AS IS</a>.'
 		elseif sleepVars['bedPanty'] = 1:
 		elseif sleepVars['bedPanty'] = 1:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed'', ''bed2''">YES</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 2 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
 		elseif sleepVars['bedPanty'] = 2:
 		elseif sleepVars['bedPanty'] = 2:
-			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed'', ''bed2''">NO</a>.'
+			'Will you always wear your underwear to bed? Currently - <a href="exec:sleepVars[''bedPanty''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
 		end
 		end
 	end
 	end
 end
 end
@@ -85,9 +85,9 @@ end
 if $ARGS[0] = 'wear_buttplug_decider':
 if $ARGS[0] = 'wear_buttplug_decider':
 	if mc_inventory['buttplug'] = 1:
 	if mc_inventory['buttplug'] = 1:
 		if sleepVars['bedAnal'] = 0:
 		if sleepVars['bedAnal'] = 0:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed'', ''bed2''">NO</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
 		elseif sleepVars['bedAnal'] = 1:
 		elseif sleepVars['bedAnal'] = 1:
-			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed'', ''bed2''">YES</a>.'
+			'Should you always remove your anal plug before bed? Currently - <a href="exec:sleepVars[''bedAnal''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
 		end
 		end
 	end
 	end
 end
 end
@@ -95,9 +95,9 @@ end
 if $ARGS[0] = 'wear_vibe_decider':
 if $ARGS[0] = 'wear_vibe_decider':
 	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
 	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
 		if sleepVars['bedVibrator'] = 0:
 		if sleepVars['bedVibrator'] = 0:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed'', ''bed2''">NO</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''start''">NO</a>.'
 		elseif sleepVars['bedVibrator'] = 1:
 		elseif sleepVars['bedVibrator'] = 1:
-			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed'', ''bed2''">YES</a>.'
+			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 0 & gs ''stat'' & gt ''bed2'', ''start''">YES</a>.'
 		end
 		end
 	end
 	end
 end
 end

+ 0 - 1
locations/bed_get_out.qsrc

@@ -4,7 +4,6 @@ menu_off = 1
 
 
 
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-	menu_off = 1
 	minut -= 1
 	minut -= 1
 	InSleep = 0
 	InSleep = 0
 	slept_in = 0
 	slept_in = 0

+ 2 - 0
locations/wakeup_events.qsrc

@@ -205,6 +205,8 @@ if $ARGS[0] = 'sg_go_school':
 	pcs_mood -= 10
 	pcs_mood -= 10
 	gs 'stat'
 	gs 'stat'
 	msg '<center>Damn it''s <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
 	msg '<center>Damn it''s <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
+	
+	gs 'wakeup_events', 'event_end'
 end
 end
 
 
 --- wakeup_events ---------------------------------
 --- wakeup_events ---------------------------------