Browse Source

[fixed] gadforest_event, gadHouse, gadukino_event menu_off

3xpurt 5 years ago
parent
commit
3e4dd71c1c
3 changed files with 34 additions and 4 deletions
  1. 1 1
      locations/Gadhouse.qsrc
  2. 18 1
      locations/gadforest_event.qsrc
  3. 15 2
      locations/gadukino_event.qsrc

+ 1 - 1
locations/Gadhouse.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'Main':
 	$locM = 'Gadhouse'
 	$locclass = 'livingr'
 	$menu_loc = 'Gadhouse'
-	$menu_arg = 'livingr'
+	$menu_arg = 'Main'
 	menu_off = 0
 	*clr
 	cla

+ 18 - 1
locations/gadforest_event.qsrc

@@ -11,10 +11,10 @@
 !---------------------------------------------
 
 $location_type = 'event_outdoors'
-menu_off = 1
 gs 'stat'
 
 if $ARGS[0] = 'gopforest_mitka':
+	menu_off = 1
 	! clothed events
 	if $clothingworntype ! 'nude':
 		! alone in forest
@@ -504,6 +504,7 @@ if $ARGS[0] = 'gopforest_mitka':
 end
 
 if $ARGS[0] = 'gopforest_kolyamba':
+	menu_off = 1
 	! clothed events
 	if $clothingworntype ! 'nude':
 		! alone in forest
@@ -864,6 +865,7 @@ if $ARGS[0] = 'gopforest_kolyamba':
 end
 
 if $ARGS[0] = 'gopforest_vasyan':
+	menu_off = 1
 	! clothed events
 	if $clothingworntype ! 'nude':
 		! alone in forest
@@ -1221,6 +1223,7 @@ if $ARGS[0] = 'gopforest_vasyan':
 end
 
 if $ARGS[0] = 'gopforest_2boys':
+	menu_off = 1
 	! clothed events
 	if $clothingworntype ! 'nude':
 		! alone in forest
@@ -1699,6 +1702,7 @@ if $ARGS[0] = 'gopforest_2boys':
 end
 
 if $ARGS[0] = 'gopforest_3boys':
+	menu_off = 1
 	! clothed events
 	if $clothingworntype ! 'nude':
 		! alone
@@ -2059,6 +2063,7 @@ end
 if $ARGS[0] = 'nude_event':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	miratalkforest = 2
 	if MiraLoc = 3:npc_rel['A60'] += 1
@@ -2135,6 +2140,7 @@ end
 if $ARGS[0] = 'mushroom_pickers1':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
 	gs 'stat'
@@ -2150,6 +2156,7 @@ end
 if $ARGS[0] = 'mushroom_pickers2':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
 	gs 'stat'
@@ -2171,6 +2178,7 @@ end
 if $ARGS[0] = 'mushroom_pickers3':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	gs 'stat'
 
@@ -2222,6 +2230,7 @@ end
 if $ARGS[0] = 'mushroom':
 	cla
 	*clr
+	menu_off = 1
 	foresteventday = daystart
 	gs 'stat'
 
@@ -2251,6 +2260,7 @@ end
 if $ARGS[0] = 'bilberry':
 	cla
 	*clr
+	menu_off = 1
 	foresteventday = daystart
 	gs 'stat'
 
@@ -2277,6 +2287,7 @@ end
 if $ARGS[0] = 'basket':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	temp_gadf = rand(1,2)
 	foresteventday = daystart
@@ -2301,6 +2312,7 @@ end
 if $ARGS[0] = 'picnic':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	gs 'stat'
 
@@ -2329,6 +2341,7 @@ end
 if $ARGS[0] = 'forest_hanters':
 	cla
 	*clr
+	menu_off = 1
 	minut += 5
 	foresteventday = daystart
 	gs 'stat'
@@ -2630,6 +2643,7 @@ end
 if $ARGS[0] = 'forest_road':
 	cla
 	*clr
+	menu_off = 1
 	temp_gadf = rand(1,10)
 	gs 'stat'
 
@@ -2707,6 +2721,7 @@ end
 if $ARGS[0] = 'swamp_road':
 	cla
 	*clr
+	menu_off = 1
 	temp_gadf = rand(1,10)
 	gs 'stat'
 
@@ -2785,6 +2800,7 @@ end
 if $ARGS[0] = 'lost':
 	cla
 	*clr
+	menu_off = 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.4.jpg"></center>'
@@ -2856,6 +2872,7 @@ end
 if $ARGS[0] = 'relax':
 	cla
 	*clr
+	menu_off = 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'

+ 15 - 2
locations/gadukino_event.qsrc

@@ -1,8 +1,7 @@
 # gadukino_event
 
-menu_off = 1
-
 if $ARGS[0] = 'mira_apologise':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	gs 'stat'
@@ -57,6 +56,7 @@ if $ARGS[0] = 'mira_apologise':
 end
 
 if $ARGS[0] = 'mitka_apologise':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	gadriver_gang = 4
@@ -92,6 +92,7 @@ if $ARGS[0] = 'mitka_apologise':
 end
 
 if $ARGS[0] = 'gang_apologise':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	gs 'stat'
@@ -665,6 +666,7 @@ if $ARGS[0] = 'gadriver_gang':
 end
 
 if $ARGS[0] = 'gadukino_mitka':
+	menu_off = 1
 	minut += 5
 	mitkaday = daystart
 	gs 'stat'
@@ -678,6 +680,7 @@ if $ARGS[0] = 'gadukino_mitka':
 end
 
 if $ARGS[0] = 'gadukino_kolyamba':
+	menu_off = 1
 	minut += 5
 	kolyambaday = daystart
 	gs 'stat'
@@ -690,6 +693,7 @@ if $ARGS[0] = 'gadukino_kolyamba':
 end
 
 if $ARGS[0] = 'gadukino_vasyan':
+	menu_off = 1
 	minut += 5
 	vasyanday = daystart
 	gs 'stat'
@@ -702,6 +706,7 @@ if $ARGS[0] = 'gadukino_vasyan':
 end
 
 if $ARGS[0] = 'gadukino_2boys':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	mitboyrand = rand(1,3)
@@ -720,6 +725,7 @@ if $ARGS[0] = 'gadukino_2boys':
 end
 
 if $ARGS[0] = 'mira_mitka':
+	menu_off = 1
 	minut += 5
 	mitkaday = daystart
 	gs 'stat'
@@ -733,6 +739,7 @@ if $ARGS[0] = 'mira_mitka':
 end
 
 if $ARGS[0] = 'mira_kolyamba':
+	menu_off = 1
 	minut += 5
 	kolyambaday = daystart
 	gs 'stat'
@@ -745,6 +752,7 @@ if $ARGS[0] = 'mira_kolyamba':
 end
 
 if $ARGS[0] = 'mira_vasyan':
+	menu_off = 1
 	minut += 5
 	vasyanday = daystart
 	gs 'stat'
@@ -757,6 +765,7 @@ if $ARGS[0] = 'mira_vasyan':
 end
 
 if $ARGS[0] = 'mira_2boys':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	mitboyrand = rand(1,3)
@@ -775,6 +784,7 @@ if $ARGS[0] = 'mira_2boys':
 end
 
 if $ARGS[0] = 'mira_3boys':
+	menu_off = 1
 	minut += 5
 	gadboyday = daystart
 	gs 'stat'
@@ -791,6 +801,7 @@ if $ARGS[0] = 'mira_3boys':
 end
 
 if $ARGS[0] = 'go_home':
+	menu_off = 1
 	if week = 7:
 		if hour = 20 or hour = 21:
 			family_trip_month = month
@@ -817,6 +828,7 @@ end
 
 
 if $ARGS[0] = 'go_home_ender':
+	menu_off = 1
 	*clr & cla
 	minut += rand(15,25)
 	if grandmahelp > 0:
@@ -833,6 +845,7 @@ if $ARGS[0] = 'go_home_ender':
 end
 
 if $ARGS[0] = 'to_gadukino':
+	menu_off = 1
 	*clr & cla
 	!family_trip_month = 1
 	minut += rand(15,25)