[changed][fixed] Suggested fixes and changes to branch collection mechanics and code organization

locations/hunters.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'check_opinion':
 	if $loc = 'swamp_yard':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstalk.jpg"></center>'
 		'You look at the hunters hanging out at the yard.'
-	elseif $loc = 'swamphut':
+	elseif $loc = 'swamphouse':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersrelax1.4.jpg"></center>'
 		'You look at the hunters hanging out inside the hut.'	
 	end

locations/swamp_yard.qsrc

@@ -47,7 +47,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if hunters > 0 and huntersKnow > 0 and hour >= 8 and hour < 20:'You notice the <a href="exec: gt ''hunters'', ''check_opinion'' ">hunters</a> standing in the front yard.'
 
 	if huntersknow = 1:
-		act 'Go into the hut':gt 'swamphouse'
+		act 'Go into the hut':
+			minut += 2
+			gt 'swamphouse'
+		end	
 	end	
 	act 'Sit by the firepit': gt 'swamp_yard', 'campfire'
 	act 'Look around the nearby woods': minut += 10 & gt 'swamp_yard', 'nearby_woods'
@@ -265,52 +268,8 @@ if $ARGS[0] = 'campfire':
 		minut += 1
 		gs 'stat'
 
-		!TODO: Initial fireside chat dynamics, to be fleshed out 
-		!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
-		if hour >= 8 and hour < 20:
-			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff'
-			act 'Chat (1:00)':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-				minut += 60
-				hunter_collective_opinion += 2
-				gs 'stat'
-
-				*nl
-				'You start chating with the guys about trivial stuff...'
-
-				act 'Further': gt 'swamp_yard', 'campfire'
-			end
-			
-			!TODO: Flesh out the learning content here
-			act 'Ask for some tips on how to survive in the woods(1:00)':
-				hunter_lessons += 1
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-			
-				if hunter_collective_opinion > 25:
-					hunter_collective_opinion -= 1
-					pcs_bushcraft += 1
-					gs 'stat'
-
-					minut += 60
+		act 'Move away': gt 'swamp_yard', 'start'
 
-					*nl
-					'Hunters talk to you about some of their experiences when they first started out'
-				else
-					if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
-						!TODO: Prototype implementation for the creekside event, to be revamped
-						'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
-						hunter_lessons -= 8
-						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
-					else		
-						minut += 20
-						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
-					end		
-				end
-				act 'Further': gt 'swamp_yard', 'campfire'
-			end
-		end
 		if campfire = 1:
 			if hour >= 8 and hour < 20:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_day.jpg"></center>'
@@ -336,15 +295,11 @@ if $ARGS[0] = 'campfire':
 			end
 
 			if bucket > 0 and boletus > 0 and mushroom_soup = 0:
-				act 'Cook some mushroom soup (0:30)':
-					gs 'hunter_favors', 'mushroom_soup'
-				end
+				act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
 			end
 		
 			if bucket > 0 and raw_meat > 0 and meat_stew = 0:
-				act 'Cook some meat stew (1:00)':
-					gs 'hunter_favors', 'meat_stew'
-				end
+				act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
 			end
 		
 			if bucket >= 5 and hotwater = 0:
@@ -398,10 +353,53 @@ if $ARGS[0] = 'campfire':
 				'You do not see any firewood nearby. You will probably need to collect some branches, chop some or ask a hunter to do so.'		
 			end	
 		end
+		
+		!TODO: Initial fireside chat dynamics, to be fleshed out 
+		!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
+		if hour >= 8 and hour < 20:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
+			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff'
+			act 'Chat (1:00)':
+				*clr & cla
+				minut += 60
+				hunter_collective_opinion += 2
+				gs 'stat'
 
-		*nl
+				*nl
+				'You start chating with the guys about trivial stuff...'
 
-		act 'Move away': gt 'swamp_yard', 'start'
+				act 'Further': gt 'swamp_yard', 'campfire'
+			end
+			
+			!TODO: Flesh out the learning content here
+			act 'Ask for some tips on how to survive in the woods (1:00)':
+				hunter_lessons += 1
+				*clr & cla
+			
+				if hunter_collective_opinion > 25:
+					hunter_collective_opinion -= 1
+					pcs_bushcraft += 1
+					gs 'stat'
+
+					minut += 60
+
+					*nl
+					'Hunters talk to you about some of their experiences when they first started out'
+				else
+					if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
+						!TODO: Prototype implementation for the creekside event, to be revamped
+						'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
+						hunter_lessons -= 8
+						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
+					else		
+						minut += 20
+						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
+					end		
+				end
+
+				act 'Further': gt 'swamp_yard', 'campfire'
+			end
+		end
 end	
 
 !Auxilliary locations
@@ -417,7 +415,7 @@ if $ARGS[0] = 'nearby_woods':
 	if firewood < 25:
 		'You can pick up some firewood around here to keep the fire going.'
 
-		act 'Collect firewood (0:15)':
+		act 'Collect firewood (0:45)':
 			cla & *clr
 			if $clothingworntype ! 'nude':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
@@ -425,10 +423,16 @@ if $ARGS[0] = 'nearby_woods':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
 			end
 
-			firewood += rand(1,4)
-			minut += 15
-			'You pick up some dry branches and twigs.'
+			firewood += 10
+			minut += 45
+			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
 			
+			if firewood < 10:
+				'You think you might need to pick some more to get a fire going'
+			else:
+				'You think you have enough firewood to get a fire going'
+			end		
+
 			act 'Further': gt 'swamp_yard', 'nearby_woods'
 		end
 	else
@@ -532,7 +536,7 @@ if $ARGS[0] = 'daytime_flavor_events':
 		gs 'hunter_ambient' , 'yard_convo'
 	elseif rand(1,10) = 1:
 		gs 'hunter_interactions', 'naked_encounter'
-	elseif rand(1,10) = 1:
+	elseif rand(1,15) = 1:
 		gs 'hunter_ambient', 'bring_food'
 	end	
 end

locations/swamphouse.qsrc

@@ -45,7 +45,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 	*nl
 	
-	act 'Go outside':hunter_refuse = 0 & minut += 5 & gt 'swamp_yard'
+	act 'Go outside':
+		minut += 2 & gt 'swamp_yard'
+	end	
 
 	act 'Sit on the table':
 		gt 'swamphouse', 'meal_table'
@@ -395,6 +397,9 @@ if $ARGS[0] = 'bucket':
 	menu_off = 1
 	if bucket > 10:bucket = 10
 	minut += 1
+	
+	act 'Move Away': gt 'swamphouse', 'start'
+
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
 	'A bucket of water. There''s still <<bucket>> liters of water left.'
@@ -415,7 +420,6 @@ if $ARGS[0] = 'bucket':
 		end
 		act 'Continue': gt 'swamphouse', 'start'
 	end
-	act 'Move Away': gt 'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'washstand':
@@ -438,6 +442,10 @@ end
 if $ARGS[0] = 'meal_table':
 	cla & *clr
 
+	act 'Get off the table':
+		gt 'swamphouse', 'start'
+	end
+
 	if hour >= 21 and hour < 23 :
 		huntersdrink = 1
 	else
@@ -488,9 +496,9 @@ if $ARGS[0] = 'meal_table':
 
 			if pcs_energy >= 85:
 					fat += 1
-					pcs_energy += 10
+					pcs_energy += 20
 			else
-				pcs_energy += 15
+				pcs_energy += 30
 			end
 
 			gs 'stat'
@@ -521,7 +529,7 @@ if $ARGS[0] = 'meal_table':
 					pcs_hydra += 20
 				end
 				*nl
-				if mushroom_soup > 0:
+				if meat_stew > 0:
 					'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
 				else
 					'You have finished the last of the stew, the pot is empty.'
@@ -579,9 +587,6 @@ if $ARGS[0] = 'meal_table':
 			end
 		end
 	end	
-	act 'Get off the table':
-		gt 'swamphouse', 'start'
-	end
 end
 
 if $ARGS[0] = 'tub':
@@ -632,6 +637,8 @@ if $ARGS[0] = 'stackmagazines':
 	minut += 1
 	gs 'stat'
 
+	act 'Move away': gt 'swamphouse', 'start'
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/stackmagazines.jpg"></center>'
 	*nl
 	'A stack of all kinds of magazines, there''s even one with "interesting" pictures.'
@@ -716,7 +723,6 @@ if $ARGS[0] = 'stackmagazines':
 		gs 'stat'
 		act 'Continue': gs 'swamphouse', 'stackmagazines'
 	end
-	act 'Move away': gt 'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'huntersrelax':