Further revamp rescue events

locations/gadforest.qsrc

@@ -404,7 +404,7 @@ if $ARGS[0] = 'forest_outskirts':
 	foresteventrand = rand(1,20)
 	if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers1'
 	if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
-	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
 
 	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_edge'
 
@@ -482,10 +482,10 @@ if $ARGS[0] = 'forest_center':
 	end
 
 	foresteventrand = rand(1,20)
-	if foresteventrand <= 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'basket'
-	if foresteventrand <= 3 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
-	if foresteventrand <= 4 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
-	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_center'
+	if foresteventrand <= 2 and month >= 6 and month <= 9: gt 'gadforest_event', 'basket'
+	if foresteventrand <= 3 and month >= 6 and month <= 9: gt 'gadforest_event', 'bilberry'
+	if foresteventrand <= 4 and month >= 6 and month <= 9: gt 'gadforest_event', 'mushroom'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforest_event', 'forest_hunters', 'forest_center'
 
 	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
@@ -561,7 +561,8 @@ if $ARGS[0] = 'bushcraft':
 	! decide if Sveta is now lost as Sveta raises her bushcraft her chances of getting lost decreases
 	if pcs_bushcraft < bushcraft_lost:
 		lostrand = rand(1,bushcraft_lost)
-		if pcs_bushcraft < lostrand: lost_girl = 1 & forest_lostday = daystart & gt 'gadforestlost', $ARGS[1]
+		forest_lostday = daystart
+		if pcs_bushcraft < lostrand: lost_girl = 1 & gt 'gadforestlost', $ARGS[1]
 	end
 end
 

locations/gadforest_event.qsrc

@@ -291,7 +291,6 @@ if $ARGS[0] = 'mushroom':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	foresteventday = daystart
 	gs 'gadforest', 'bushcraft', 'forest_center'
 	gs 'stat'
 
@@ -326,7 +325,6 @@ if $ARGS[0] = 'bilberry':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	foresteventday = daystart
 	gs 'gadforest', 'bushcraft', 'forest_center'
 	gs 'stat'
 
@@ -361,7 +359,6 @@ if $ARGS[0] = 'basket':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	foresteventday = daystart
 	gs 'gadforest', 'bushcraft', 'forest_center'
 	gs 'stat'
 
@@ -430,7 +427,6 @@ if $ARGS[0] = 'forest_hunters':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	foresteventday = daystart
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
@@ -440,7 +436,7 @@ if $ARGS[0] = 'forest_hunters':
 
 	act 'Leave them alone':gt 'gadforest', $ARGS[1]
 
-    %!TODO: Move to hunter interactions
+    !%TODO: Move to hunter interactions
     act 'Approach the hunters':
         *clr & cla
         if hunters_were_met = 0:

locations/gadforestlost.qsrc

@@ -24,9 +24,9 @@ if $ARGS[0] = 'forest_outskirts':
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
 	if foresteventrand <= (2+(bonfire*3)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
-	if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
-	if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
-	if foresteventrand <= (8-(bonfire*3)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_outskirts'
+	if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (8-(bonfire*3)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
 	gs 'gadforestlost', 'wander'
 
@@ -56,9 +56,9 @@ if $ARGS[0] = 'forest_center':
 
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
-	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
-	if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
-	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_center'
+	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
+	if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_center'
 
 	gs 'gadforestlost', 'wander'
 
@@ -151,13 +151,13 @@ if $ARGS[0] = 'relax':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
 		if foresteventrand <= (2+(bonfire*3)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
-		if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	elseif $forest_args1 = 'forest_center':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
-		if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
 
 	'<center><H4>Somewhere in the forest</H4></center>'