Browse Source

[changed] more WIP hunter fixes, additions and tweaks

3xpurt 5 years ago
parent
commit
268ea1a576

+ 2 - 2
locations/AndreiHunter.qsrc

@@ -18,9 +18,9 @@ if huntersAndreiQw > 25 :'You love him.'
 if huntersAndreiLove = 1:'You love each other.'
 if huntersAndreiLove = 1:'You love each other.'
 gs 'stat'
 gs 'stat'
 
 
-act 'Chat (0:15)':
+act 'Chat (0:30)':
 	*clr & cla
 	*clr & cla
-	minut += 15
+	minut += 30
 	if huntersAndreiQw < 10:huntersAndreiQw += 1
 	if huntersAndreiQw < 10:huntersAndreiQw += 1
 	gs 'stat'
 	gs 'stat'
 
 

+ 2 - 2
locations/IgorHunter.qsrc

@@ -35,9 +35,9 @@ if huntersIgorLove = 1:'You two have fallen in love.'
 if huntersIgorLove = 2:'<<$boydesc>> is your boyfriend.'
 if huntersIgorLove = 2:'<<$boydesc>> is your boyfriend.'
 if huntersIgorLove = 3:'<<$boydesc>> is your husband.'
 if huntersIgorLove = 3:'<<$boydesc>> is your husband.'
 
 
-act 'Chat (0:15)':
+act 'Chat (0:30)':
 	*clr & cla
 	*clr & cla
-	minut += 15
+	minut += 30
 	menu_off = 1
 	menu_off = 1
 	if huntersIgorQw < 10:huntersIgorQw += 1
 	if huntersIgorQw < 10:huntersIgorQw += 1
 	gs 'stat'
 	gs 'stat'

+ 2 - 2
locations/SergeiHunter.qsrc

@@ -19,9 +19,9 @@ if huntersSergeiQw >= 30 and huntersSergeiQw <= 35:'You have a mutual crush on e
 if huntersSergeiQw > 35 :'You have an unrequited love for him.'
 if huntersSergeiQw > 35 :'You have an unrequited love for him.'
 if huntersSergeiLove = 1:'You two love each other.'
 if huntersSergeiLove = 1:'You two love each other.'
 
 
-act 'Chat (0:15)':
+act 'Chat (0:30)':
 	*clr & cla
 	*clr & cla
-	minut += 15
+	minut += 30
 	if huntersSergeiQw < 10:huntersSergeiQw += 1
 	if huntersSergeiQw < 10:huntersSergeiQw += 1
 	gs 'stat'
 	gs 'stat'
 
 

+ 15 - 1
locations/backwater.qsrc

@@ -12,7 +12,21 @@ gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
 
 if $ARGS[0] = '':
 if $ARGS[0] = '':
-	act 'Go back to the hut': minut += 5 & gt 'swamp_yard', 'start'
+	act 'Go back to the hut':
+	if $clothingworntype = 'nude' and ((hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1) or (inhibitioncheck !  daystart and pcs_inhib >= 25) or exhibitionist_lvl < 1):
+		$loc = 'swamp_yard'
+		$metka = 'start'
+		hunter_refuse = 0
+		inhibitionbackwater = daystart
+		gs 'stat'
+		gt 'swamphouse', 'get_dressed'
+	else
+		minut += 5
+		hunter_refuse = 0
+		gs 'stat'
+		gt 'swamp_yard', 'start'
+	end
+end
 
 
 	'<center><B>Backwater</B></center>'
 	'<center><B>Backwater</B></center>'
 
 

+ 1 - 3
locations/hunter_interactions.qsrc

@@ -213,7 +213,7 @@ end
 
 
 if $ARGS[0] = 'chat_with_hunters':
 if $ARGS[0] = 'chat_with_hunters':
 	*clr & cla
 	*clr & cla
-	minut += rand (5,15)
+	minut += rand (15,30)
 	pcs_mood += rand(10,20)
 	pcs_mood += rand(10,20)
 
 
 	hunter_collective_opinion += 2
 	hunter_collective_opinion += 2
@@ -482,7 +482,6 @@ if $ARGS[0] = 'drink_with_hunters':
 	'Holding up two bottles, Igor approaches you "Take your pick Sveta: vodka, or beer?"'
 	'Holding up two bottles, Igor approaches you "Take your pick Sveta: vodka, or beer?"'
 	act 'Drink vodka':
 	act 'Drink vodka':
 		*clr & cla
 		*clr & cla
-		minut += 10
 		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		gs 'stat'
 
 
@@ -494,7 +493,6 @@ if $ARGS[0] = 'drink_with_hunters':
 	end
 	end
 	act 'Drink beer':
 	act 'Drink beer':
 		*clr & cla
 		*clr & cla
-		minut += 10
 		gs 'drugs', 'alcohol', 'beer', 1
 		gs 'drugs', 'alcohol', 'beer', 1
 		gs 'stat'
 		gs 'stat'
 
 

+ 8 - 8
locations/swamp_woods.qsrc

@@ -23,10 +23,10 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 
 
 	act 'Go back to the hut': minut += 10 & gt 'swamp_yard', 'start'
 	act 'Go back to the hut': minut += 10 & gt 'swamp_yard', 'start'
-	if firewood < 25:
+	if firewood < 10:
 		'You can pick up some firewood around here to keep the fire going.'
 		'You can pick up some firewood around here to keep the fire going.'
 
 
-		act 'Collect firewood (0:45)':
+		act 'Collect firewood (0:15)':
 			cla & *clr
 			cla & *clr
 			if $clothingworntype ! 'nude':
 			if $clothingworntype ! 'nude':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
@@ -34,14 +34,14 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
 			end
 			end
 
 
-			firewood += 10
-			minut += 45
+			firewood += rand(2,6)
+			minut += 15
 			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
 			'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'
+			if firewood < 15:
+				'You have <<firewood>> pieces of firewood, and should probably grab some more to keep the fire going.'
+			else
+				'You have <<firewood>> pieces of firewood, and should have enough firewood to get a fire going.'
 			end
 			end
 
 
 			act 'Further': gt 'swamp_woods', 'start'
 			act 'Further': gt 'swamp_woods', 'start'

+ 11 - 9
locations/swamp_yard.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'start':
 	gs 'gadukino_event', 'sound'
 	gs 'gadukino_event', 'sound'
 	gs 'hunter_ambient', 'schedule'
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 	gs 'stat'
+	if hour = 5:campfire = 0
 	!the chance of encountering hunters
 	!the chance of encountering hunters
 	!the chance of hitting GG, if she`s a slut
 	!the chance of hitting GG, if she`s a slut
 	huntslutsexrand = rand(1,3)
 	huntslutsexrand = rand(1,3)
@@ -32,6 +33,7 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		gs 'stat'
 
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamp_yard.jpg"></center>'
 		'<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.'
 		'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.'
 		'After a while you''ve finished tidying up the yard and put the trash in the garbage bag. You''re quite pleased with yourself.'
 
 
@@ -75,8 +77,10 @@ if $ARGS[0] = 'start':
 		'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 		'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 	else
 	else
 		if huntersKnow = 0:
 		if huntersKnow = 0:
+			*nl
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 		else
 		else
+			*nl
 			'The camp is quiet. The hunters aren''t here right now, where could they be.'
 			'The camp is quiet. The hunters aren''t here right now, where could they be.'
 		end
 		end
 	end
 	end
@@ -496,10 +500,10 @@ if $ARGS[0] = 'start':
 			act 'Go':gt 'swamp_yard', 'start'
 			act 'Go':gt 'swamp_yard', 'start'
 		end
 		end
 		!Declaration of love Igor
 		!Declaration of love Igor
-		if hunters_outside = 1 and huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1:
+		if hunters_outside = 1 and huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1 and declareloveigor ! daystart:
 			*clr & cla
 			*clr & cla
 			minut += 10
 			minut += 10
-
+			declareloveigor = daystart
 			gs 'stat'
 			gs 'stat'
 
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
@@ -1089,7 +1093,7 @@ if $ARGS[0] = 'campfire':
 			*nl
 			*nl
 			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting'
 			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting'
 
 
-			act 'Chat (0:15)':
+			act 'Chat (0:30)':
 				gt 'hunter_interactions', 'chat_with_hunters'
 				gt 'hunter_interactions', 'chat_with_hunters'
 			end
 			end
 
 
@@ -1128,7 +1132,7 @@ if $ARGS[0] = 'campfire':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 			*nl
 			*nl
 			'Hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like'
 			'Hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like'
-			act 'Chat (0:15)':
+			act 'Chat (0:30)':
 				gt 'hunter_interactions', 'chat_with_hunters'
 				gt 'hunter_interactions', 'chat_with_hunters'
 			end
 			end
 
 
@@ -1222,7 +1226,7 @@ if $ARGS[0] = 'campfire':
 		end
 		end
 	else
 	else
 		!TODO: Tie fire lighting to bushcraft, make hunters do it on their schedule or with Sveta asking
 		!TODO: Tie fire lighting to bushcraft, make hunters do it on their schedule or with Sveta asking
-		if firewood >= 10:
+		if firewood >= 10 and campfire = 0:
 			act 'Light fire':
 			act 'Light fire':
 				cla & *clr
 				cla & *clr
 
 
@@ -1240,11 +1244,9 @@ if $ARGS[0] = 'campfire':
 
 
 				act 'Further': gt 'swamp_yard', 'campfire'
 				act 'Further': gt 'swamp_yard', 'campfire'
 			end
 			end
-		elseif firewood > 1:
+		elseif firewood < 10 and campfire = 0:
 			*nl
 			*nl
-			'There is some wood and twigs by the pit but not enough to light a new fire'
-		else
-			'You do not see any firewood nearby. You will probably need to collect some branches, chop some or ask a hunter to do so.'
+			'There is some wood and twigs by the pit but not enough to light a new fire. You will probably need to collect some branches, chop some or ask a hunter to do so.'
 		end
 		end
 	end
 	end
 end
 end

+ 97 - 46
locations/swamphouse.qsrc

@@ -14,6 +14,8 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	gs 'themes', 'indoors'
 	gs 'hunter_ambient', 'schedule'
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 	gs 'stat'
+
+	if hour = 5:stovefire = 0
 	huntslutsexrand = rand(1,3)
 	huntslutsexrand = rand(1,3)
 	temp_sh = rand(1,5)
 	temp_sh = rand(1,5)
 	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
 	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
@@ -32,38 +34,49 @@ if $ARGS[0] = 'start':
 	end
 	end
 	'You see an old <a href="exec: gs ''swamphouse'', ''washstand'' ">washstand</a> you can use to wash your hands and face. There is a well-used <a href="exec: gs ''swamphouse'', ''tub''">tub</a> nearby, that you can use to bathe in.'
 	'You see an old <a href="exec: gs ''swamphouse'', ''washstand'' ">washstand</a> you can use to wash your hands and face. There is a well-used <a href="exec: gs ''swamphouse'', ''tub''">tub</a> nearby, that you can use to bathe in.'
 	*nl
 	*nl
-	'In the other corner you see a small <a href="exec: gs ''swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms, you could cook a simple mushroom soup, or warm the water so you can bathe in the tub.'
+	'In the other corner you see a small <a href="exec: gs ''swamphouse'', ''stove''">stove</a>. With water from the spring and some mushrooms or meat, you could cook something to eat, or warm the water so you can bathe in the tub.'
+	if stovefire = 0:
+		*nl
+		'The hut feels '+iif(temper < 15, 'quite cold, maybe you should start a fire in the old stove.', 'quite warm, even without the stove fire burning.')+''
+	elseif stovefire > 0:
+		*nl
+		'The hut feels '+iif(temper > 15, 'extremely', 'quite')+' warm with the old stove fire burning away.'
+	end
 	*nl
 	*nl
 	'Beside the stove, there''s a stack of old <a href="exec: gs ''swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
 	'Beside the stove, there''s a stack of old <a href="exec: gs ''swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
-	*nl
 	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
 	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
-	if swamp_enema = 1:'You found an enema syringe on the shelf.'
-	if $clothingworntype = 'nude' and hunterknowday ! daystart and hunters_inside = 1:gt 'swamphouse', 'get_dressed'
-	*nl
+	if $clothingworntype = 'nude' and hunters_inside = 1 and ((hunterknowday ! daystart or (inhibitioncheck !  daystart and pcs_inhib >= 25) or exhibitionist_lvl < 1)):gt 'swamphouse', 'get_dressed'
 	if hunters_inside = 1 and huntersknow = 0:
 	if hunters_inside = 1 and huntersknow = 0:
 		if hunters_drink = 1:
 		if hunters_drink = 1:
+			*nl
 			'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
 			'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
 		elseif hunters_sleep = 1:
 		elseif hunters_sleep = 1:
+			*nl
 			'The hunters are sleeping on the couch.'
 			'The hunters are sleeping on the couch.'
 		elseif hunters_available = 1 or hunters_breakfast = 1 or hunters_lunch = 1 or hunters_evening = 1:
 		elseif hunters_available = 1 or hunters_breakfast = 1 or hunters_lunch = 1 or hunters_evening = 1:
+			*nl
 			'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
 			'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
 		elseif hunters_hunting = 1 and hunters_outside = 1:
 		elseif hunters_hunting = 1 and hunters_outside = 1:
+			*nl
 			'The Hunters said they will be out hunting for a couple hours. You have the camp to yourself!'
 			'The Hunters said they will be out hunting for a couple hours. You have the camp to yourself!'
 		end
 		end
 	else
 	else
 		if huntersknow = 0:
 		if huntersknow = 0:
+			*nl
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 		else
 		else
+			*nl
 			'The camp is quiet. The hunters aren''t here right now, where could they be.'
 			'The camp is quiet. The hunters aren''t here right now, where could they be.'
 		end
 		end
 	end
 	end
 	*nl
 	*nl
 
 
 	act 'Go outside':
 	act 'Go outside':
-		if $clothingworntype = 'nude' and hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1 or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+		if $clothingworntype = 'nude' and ((hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1) or (inhibitioncheck !  daystart and pcs_inhib >= 25) or exhibitionist_lvl < 1):
 			$loc = 'swamp_yard'
 			$loc = 'swamp_yard'
 			$metka = 'start'
 			$metka = 'start'
 			hunter_refuse = 0
 			hunter_refuse = 0
+			inhibitioncheck = daystart
 			gs 'stat'
 			gs 'stat'
 			gt 'swamphouse', 'get_dressed'
 			gt 'swamphouse', 'get_dressed'
 		else
 		else
@@ -78,7 +91,7 @@ if $ARGS[0] = 'start':
 	if $clothingworntype ! 'nude' and clothesAtLocation = 0:
 	if $clothingworntype ! 'nude' and clothesAtLocation = 0:
 		!have cloth, or rag on
 		!have cloth, or rag on
 		act 'Get undressed':
 		act 'Get undressed':
-			if huntersKnowSlut > 0 or hunters_inside = 0 or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+			if (huntersKnowSlut > 0  or (pcs_inhib >= 25 or exhibitionist_lvl < 1) and hunters_inside = 1) or hunters_outside = 1:
 				*clr & cla
 				*clr & cla
 				minut+=5
 				minut+=5
 				if $clothingworntype ! 'nude':
 				if $clothingworntype ! 'nude':
@@ -161,7 +174,11 @@ if $ARGS[0] = 'start':
 		end
 		end
 	end
 	end
 
 
-	act 'Grab some food': gt 'swamphouse', 'stove'
+	if stovefire = 0 or meat_stew = 0 or mushroom_soup = 0 act 'Use the rickety stove': gt 'swamphouse', 'stove'
+	if pcs_energy < 80: act 'Grab something to eat': gs 'swamphouse', 'food'
+	if bucket > 0 and pcs_hydra < 80: act 'Grab a drink of water': gt 'swamphouse', 'bucket'
+	if bucket > 0 or pcs_hairbsh = 0:: act 'Use the wash basin': gt 'swamphouse', 'washstand'
+	if hotwater = 1 and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
 	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
 	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
 
 
 	act 'Relax on the couch': gt 'bed', 'start'
 	act 'Relax on the couch': gt 'bed', 'start'
@@ -306,10 +323,11 @@ if $ARGS[0] = 'start':
 		end
 		end
 	end
 	end
 	!hunters are invited to the table
 	!hunters are invited to the table
-	if hunters_drink = 1 and hunters_inside = 1 and huntersKnowSlut = 0 and hunter_refuse = 0:
+	if hunters_drink = 1 and hunters_inside = 1 and huntersKnowSlut = 0 and hunter_refuse = 0 and huntersdrinking ! daystart:
 		gs 'stat'
 		gs 'stat'
 		minut += 1
 		minut += 1
 		temp_sh = rand(1,4)
 		temp_sh = rand(1,4)
+		huntersdrinking = daystart
 		gs 'stat'
 		gs 'stat'
 
 
 		if temp_sh = 1:
 		if temp_sh = 1:
@@ -347,10 +365,11 @@ if $ARGS[0] = 'start':
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		end
-	elseif hunters_breakfast = 1 or hunters_lunch = 1:
+	elseif (hunters_breakfast = 1 or hunters_lunch = 1) and huntersbreakfast ! daystart:
 		*clr & cla
 		*clr & cla
+		huntersbreakfast = daystart
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-		'You went into the hut and notice that the hunters have prepared breakfast.'
+		'You went into the hut and notice that the hunters have prepared '+iif(hunters_breakfast = 1, 'breakfast', 'lunch')+'.'
 		'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
 		'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
 		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 		act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
@@ -389,18 +408,35 @@ if $ARGS[0] = 'stove':
 
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/stove.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/stove.jpg"></center>'
 	*nl
 	*nl
-	'A barely functioning wodden stove, but somehow it does what it''s supposed to do. You can heat 5 liters of water at a time. Or you can make a mushroom soup.'
+	'A barely functioning wodden stove, but somehow it does what it''s supposed to do. You can heat 5 liters of water at a time. Or you can make a mushroom soup, and a meat stew.'
 
 
 	act 'Move away': gt 'swamphouse', 'start'
 	act 'Move away': gt 'swamphouse', 'start'
 
 
-	if bucket > 0 and boletus > 0 and mushroom_soup = 0:
+	if firewood >= 5 and stovefire = 0:
+		act 'Light stove':
+			cla
+			*nl
+			'You use some chopped wood, dry branches and twigs to light the stove'
+
+			firewood -= 5
+			stovefire = 1
+			minut += 5
+
+			act 'Continue': gt 'swamphouse', 'stove'
+		end
+	elseif firewood < 5 and stovefire = 0:
+		*nl
+		'There isn''t enough firewood in the woodbox to start the stove fire. You should go outside to find some.'
+	end
+
+	if bucket > 0 and boletus > 0 and mushroom_soup = 0 and stovefire = 1:
 		act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
 		act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
 	end
 	end
 
 
-	if bucket > 0 and raw_meat > 0 and meat_stew = 0:
+	if bucket > 0 and raw_meat > 0 and meat_stew = 0 and stovefire = 1:
 		act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
 		act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
 	end
 	end
-	if bucket >= 5 and hotwater = 0:
+	if bucket >= 5 and hotwater = 0 and stovefire = 1:
 		act 'Heat up water (0:30)':
 		act 'Heat up water (0:30)':
 			cla
 			cla
 			*clr
 			*clr
@@ -413,9 +449,15 @@ if $ARGS[0] = 'stove':
 			*nl
 			*nl
 			'With the now heated water, you can bathe yourself in the tub.'
 			'With the now heated water, you can bathe yourself in the tub.'
 
 
-			act 'Continue': gt 'swamphouse', 'start'
+			act 'Continue': gt 'swamphouse', 'stove'
 		end
 		end
 	end
 	end
+	gs 'swamphouse', 'food'
+end
+
+if $ARGS[0] = 'food':
+	cla
+	act 'Finish': gt 'swamphouse', 'start'
 	act 'Eat jerky and trail mix':gt 'food', 'jerky'
 	act 'Eat jerky and trail mix':gt 'food', 'jerky'
 	if meat_stew > 0:
 	if meat_stew > 0:
 		act 'Eat meat stew':
 		act 'Eat meat stew':
@@ -454,27 +496,31 @@ if $ARGS[0] = 'bucket':
 	minut += 1
 	minut += 1
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
-	'A bucket of water. There''s still <<bucket>> liters of water left.'
-
-	act 'Drink the water':
-		cla
-		minut+=5
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		bucket -= 1
-		gs 'stat'
-		if pcs_hydra >= 100:
-			'You''re not thirsty anymore. You don''t need to drink more water.'
-		else
-			pcs_hydra += 80
+	*nl
+	if bucket > 0: 
+	'There''s a bucket of water by the wall. There''s approximately <<bucket>> liters of water left.'
+		act 'Drink the water':
+			cla
+			minut+=5
 			cumspclnt = 2
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			gs 'cum_cleanup'
 			pcs_breath = 0
 			pcs_breath = 0
+			bucket -= 1
 			gs 'stat'
 			gs 'stat'
-			'You take a sip from bucket, quenching your thirst.'
+			if pcs_hydra >= 100:
+				'You''re not thirsty anymore. You don''t need to drink more water.'
+			else
+				pcs_hydra += 80
+				cumspclnt = 2
+				gs 'cum_cleanup'
+				pcs_breath = 0
+				gs 'stat'
+				'You take a sip from bucket, quenching your thirst.'
+			end
+			act 'Continue': gt 'swamphouse', 'start'
 		end
 		end
-		act 'Continue': gt 'swamphouse', 'start'
+	else
+		'There''s no water left in the bucket. You should go out by the creek and bring some in.'
 	end
 	end
 	act 'Move Away': gt 'swamphouse', 'start'
 	act 'Move Away': gt 'swamphouse', 'start'
 end
 end
@@ -496,13 +542,12 @@ if $ARGS[0] = 'washstand':
 		!use current by illume
 		!use current by illume
 		dynamic $basin
 		dynamic $basin
 	end
 	end
-	if hunters_inside = 0:gs 'lact_bp', 'massage'
+	if hunters_outside = 1:gs 'lact_bp', 'massage'
 	act 'Move away': gt 'swamphouse', 'start'
 	act 'Move away': gt 'swamphouse', 'start'
 end
 end
 
 
 if $ARGS[0] = 'tub':
 if $ARGS[0] = 'tub':
-	cla
-	*clr
+	*clr & cla
 	$loc = 'swamphouse'
 	$loc = 'swamphouse'
 	$metka = 'tub'
 	$metka = 'tub'
 	minut += 1
 	minut += 1
@@ -512,8 +557,10 @@ if $ARGS[0] = 'tub':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basin.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basin.jpg"></center>'
 	*nl
 	*nl
 	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water, and get undressed first.'
 	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water, and get undressed first.'
+	*nl
 	'If you are desperate enough, you found a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf, that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	'If you are desperate enough, you found a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf, that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	dynamic $brit
 	dynamic $brit
+	if swamp_enema = 1:*nl & 'You found an enema syringe on the shelf.'
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
 		dynamic $enema
 		dynamic $enema
 	end
 	end
@@ -837,7 +884,6 @@ if $ARGS[0] = 'hunterstable':
 	if hunters_drink = 1:
 	if hunters_drink = 1:
 		act 'Drink vodka (0:15)':
 		act 'Drink vodka (0:15)':
 			*clr & cla
 			*clr & cla
-			minut += 1
 			gs 'drugs', 'alcohol', 'vodka', 1
 			gs 'drugs', 'alcohol', 'vodka', 1
 			gs 'stat'
 			gs 'stat'
 
 
@@ -849,7 +895,6 @@ if $ARGS[0] = 'hunterstable':
 		end
 		end
 		act 'Drink beer (0:15)':
 		act 'Drink beer (0:15)':
 			*clr & cla
 			*clr & cla
-			minut += 15
 			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'stat'
 			gs 'stat'
 
 
@@ -862,7 +907,6 @@ if $ARGS[0] = 'hunterstable':
 		act 'Eat a snack (0:15)':
 		act 'Eat a snack (0:15)':
 			gs 'food', 'snack'
 			gs 'food', 'snack'
 			*clr & cla
 			*clr & cla
-			minut += 15
 			gs 'stat'
 			gs 'stat'
 
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
@@ -870,9 +914,9 @@ if $ARGS[0] = 'hunterstable':
 			'You grab something to eat, so you don''t get drunk to quickly.'
 			'You grab something to eat, so you don''t get drunk to quickly.'
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
 		end
-		act 'Chat (0:15)':
+		act 'Chat (0:30)':
 			*clr & cla
 			*clr & cla
-			minut += 15
+			minut += 30
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
@@ -1638,10 +1682,17 @@ if $ARGS[0] = 'hunterstable':
 	elseif hunters_lunch = 1 or hunters_breakfast = 1 or hunters_evening = 1:
 	elseif hunters_lunch = 1 or hunters_breakfast = 1 or hunters_evening = 1:
 		act 'Eat a meal (0:15)':
 		act 'Eat a meal (0:15)':
 			gs 'food', 'm_meal'
 			gs 'food', 'm_meal'
+			*clr & cla
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
+			*nl
+			'You sit down and have something to eat with the hunters.'
+			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
 		end
-		act 'Chat (0:15)':
+		act 'Chat (0:30)':
 			*clr & cla
 			*clr & cla
-			minut += 15
+			minut += 30
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
@@ -1651,13 +1702,13 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			*nl
 			'You start chating with the guys about trivial stuff...'
 			'You start chating with the guys about trivial stuff...'
 
 
-			act 'Move away from the table': gt 'swamphouse', 'start'
+			act 'Continue': gt 'swamphouse', 'hunterstable'
 		end
 		end
 		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 	else
 	else
-		act 'Chat (0:15)':
+		act 'Chat (0:30)':
 			*clr & cla
 			*clr & cla
-			minut += 15
+			minut += 30
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
@@ -1667,7 +1718,7 @@ if $ARGS[0] = 'hunterstable':
 			*nl
 			*nl
 			'You start chating with the guys about trivial stuff...'
 			'You start chating with the guys about trivial stuff...'
 
 
-			act 'Move away from the table': gt 'swamphouse', 'start'
+			act 'Continue': gt 'swamphouse', 'hunterstable'
 		end
 		end
 		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 	end
 	end