Update event scheduling to fix ghost hunter interactions

locations/hunter_ambient.qsrc

@@ -255,24 +255,28 @@ if $ARGS[0] = 'schedule':
 	if huntersKnow > 0:
 		if hour = 7:
 			hunters_breakfast = 1
+			hunters_available = 1
 		elseif hour > 8 and hour < 11:
 			hunters_hunting = 1
 		elseif hour >=12 and hour < 14:
 			hunters_lunch = 1
+			hunters_available = 1
 		elseif hour >= 15 and hour < 16:
 			hunters_hunting = 1
 		elseif hour >= 18 and hour < 19:
 			hunters_evening = 1
+			hunters_available = 1
 		elseif hour > 20 and hour < 23:
 			hunters_drink = 1
+			hunters_available = 1
 		elseif hour >= 23 or hour < 7:
 			hunters_sleep = 1
-		else
 			hunters_available = 1
 		end
 	end
-	if sunWeather = 1 and temper >= 15:hunters_outside = 1
-	if sunWeather = 0 and temper < 15:hunters_inside = 1
+
+	if sunWeather = 1 or temper >= 15:hunters_outside = 1
+	if sunWeather = 0 or temper < 15:hunters_inside = 1
 end
 
 if $ARGS[0] = 'bring_food':

locations/swamp_yard.qsrc

@@ -6,38 +6,21 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'swamp_yard'
 	$menu_arg = 'start'
 	menu_off = 0
+
 	$location_type = 'secluded'
 	hunterscabin = 1
+
+   	util_rand = rand(1,8)
+
 	gs 'gadukino_event', 'sound'
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
-	if hour = 5:campfire = 0
-	!the chance of encountering hunters
-	!the chance of hitting GG, if she`s a slut
-	huntslutsexrand = rand(1,8)
-	!if lost make this trigger after 2 days in swamp house
-	if lost_girl = 1 and daystart > forest_lostday+1 and hour >= 8 and hour < 20: gt 'gadforestlost','rescue','ranger','swamp_yard'
-	dirty = 0
-	temp_sy = rand(1,10)
-
-	$dirty_swamp_yard = {
-		cla
-		*clr
-		if dirty_swamp_yard < 10:minut += 60 & gs 'sweat', 'add', 10
-		if dirty_swamp_yard >= 10 and dirty_swamp_yard < 20:minut += 120 & gs 'sweat', 'add', 20
-		if dirty_swamp_yard >= 20:minut += 180 & gs 'sweat', 'add', 30
-		if huntersAndreiQw < 15:huntersAndreiQw += 1
-		if huntersIgorQw < 15:huntersIgorQw += 1
-		if huntersSergeiQw < 15:huntersSergeiQw += 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamp_yard.jpg"></center>'
-		*nl
-		'You notice that the yard has gotten pretty dirty. "I need to do something about this." you think to yourself. You grab a garbage bag and start picking up trash.'
-		'After a while you''ve finished tidying up the yard and put the trash in the garbage bag. You''re quite pleased with yourself.'
 
-		act 'Further':dirty_swamp_yard = 0 & gt 'swamp_yard', 'start'
-	}
+	if lost_girl = 1
+	    if rand(forest_lostday - daystart, 30) >= 30 and hour >= 8 and hour < 20: 
+	        gt 'gadforestlost','rescue','ranger','swamp_yard'
+	    end
+    end
 
 	'<center><B>The yard in front of the hut</B></center>'
 	if month >= 5 and month <= 9:
@@ -127,7 +110,7 @@ if $ARGS[0] = 'start':
 	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
 
 
-	if hunters_outside = 1 and hunters_available = 1 and huntslutsexrand = 1: gt 'hunter_interactions', 'naked_encounter'
+	if hunters_outside = 1 and hunters_available = 1 and util_rand = 1: gt 'hunter_interactions', 'naked_encounter'
 end
 
 
@@ -328,16 +311,16 @@ end
 
 if $ARGS[0] = 'daytime_flavor_events':
 	gs 'hunter_ambient', 'schedule'
-	if rand(1,50) = 1:
-		gs 'swamp_yard', 'skirt_breeze'
-	elseif rand(1,20) = 1:
-		gs 'hunter_favors', 'housekeeping_request'
-	elseif rand(1,25) = 1 and hunters_breakfast = 1 or hunters_lunch = 1 or hunters_drink = 1:
-		gs 'hunter_ambient' , 'yard_convo'
-	elseif rand(1, hunter_sexual_comfort / 4 + 2) = 1:
-		gs 'hunter_interactions', 'naked_encounter'
-	elseif rand(1,15) = 1:
-		gs 'hunter_ambient', 'bring_food'                        
+	if rand(1,30) = 1 and hunters_available > 0:
+		gt 'hunter_interactions', 'skirt_breeze'
+	elseif rand(1,10) = 1 and hunters_available > 0:
+		gt 'hunter_favors', 'housekeeping_request'
+	elseif rand(1,12) = 1 and hunters_available > 0:
+		gt 'hunter_ambient' , 'yard_convo'
+	elseif rand(1, hunter_sexual_comfort / 4 + 2) = 1 and hunters_available > 0:
+		gt 'hunter_interactions', 'naked_encounter'
+	elseif rand(1,15) = 1 and hunters_available > 0:
+		gt 'hunter_ambient', 'bring_food'
 	end
 end