Split off swamp woods into its own location, menu locations added, otherr minor tweaks

glife.qproj

@@ -525,6 +525,7 @@
 		<Location name="hunter_favors"/>
 		<Location name="hunter_ambient"/>
 		<Location name="hunter_interactions"/>
+		<Location name="swamp_woods"/>
 		<Location name="AndreiHunter"/>
 		<Location name="IgorHunter"/>
 		<Location name="SergeiHunter"/>

locations/budgetclothes.qsrc

@@ -125,6 +125,7 @@ if $ARGS[0] = 'clothes':
 			gs 'clothing_QV', 'shop_filter'
 				
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''cheapclo''"><img src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="250" /></a>'
+			
 		end
 		i += 6
 		if i = 3: i = 9

locations/clothing.qsrc

@@ -17,7 +17,7 @@ $clothing_list_line = {
 	else
 		clothing_temp = 150 & !clothing widdefault to 150
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"><p><<$ARGS[1]>> outfit</p></a></TD>'
 	killvar 'clothing_temp'
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 

locations/hunter_interactions.qsrc

@@ -622,8 +622,12 @@ if $ARGS[0] = 'igor_demonstration':
 	end
 end
 
+if $ARGS[0] = 'indoors_naked_encounter':
+    gt $loc
+end    
+
 if $ARGS[0] = 'naked_encounter':
-	if huntersKnowSlut = 0 and $clothingworntype = 'nude':
+	if huntersKnowSlut = 0 and $clothingworntype = 'nude' and hour < 23 and hour >= 7:
 		cla
 		*clr
 		gs 'stat'
@@ -632,25 +636,25 @@ if $ARGS[0] = 'naked_encounter':
 		'You notice the hunters ogling your body while you are walking around naked. You subconsciously cover up your private parts'
 
 		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude':
-			act 'Run inside and get dressed':
+			act 'Run and get dressed':
 				*clr & cla
 				minut += 5
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
-				'You rush inside the hut so you can get dressed.'
+				'You rush to get your stuff in the hut so you can get dressed.'
 				act'Further':gt 'swamphouse'
 			end
 		else
-			act 'Run inside and cover up with a burlap sack':
+			act 'Cover up with a burlap sack sou found':
 				*clr & cla
 				minut+=5
 				gs 'clothing', 'swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-				'You quickly rush inside the hut and wear a sack... It''s not much, but at least it''s better than nothing.'
-				act'Further':gt 'swamphouse'
+				'You look around and put on a piece of burlap sack you see... It''s not much, but at least it''s better than nothing.'
+				act'Further':gt $loc
 			end
 		end
 

locations/swamp_woods.qsrc

@@ -0,0 +1,138 @@
+# swamp_woods
+
+!TODO: Break into more arg blocks
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+    $loc = 'swamp_woods'
+	$metka = ''
+	$menu_loc = 'swamp_woods'
+	$menu_arg = ''
+	menu_off = 0
+	$location_type = 'secluded'
+
+	gs 'gadukino_event', 'sound'
+    gs 'stat'
+    
+    cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
+	'You are in the woods near the hut. You can see it not too far in the distance.'
+	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
+
+	*nl
+
+	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
+	if firewood < 25:
+		'You can pick up some firewood around here to keep the fire going.'
+
+		act 'Collect firewood (0:45)':
+			cla & *clr
+			if $clothingworntype ! 'nude':
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
+			end
+
+			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
+		'You think about picking up some firewood before you remember you have plenty back at the yard.'
+	end
+	
+	act 'Try to circle around the swamp':
+		*clr & cla
+		if pcs_bushcraft < 15:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
+			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
+			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
+
+			act 'Further': gt 'swamp_yard', 'nearby_woods'
+		elseif pcs_bushcraft < 30:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
+			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
+
+			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
+			act 'Try anyway':
+				*clr & cla
+				minut += 180
+				nearby_woods_check = rand(1,10)
+
+				if nearby_woods_check = 1:
+					!Make it to the other side fine
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success_nude.jpg"></center>'
+					end
+					'You stick as close to the swamp as possible and follow the edge in one direction.'
+					'Even though you occassionally step into the swamp you manage to not get stuck'
+					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
+
+					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
+				elseif nearby_woods_check <= 3:
+					!End up stuck in the swamp
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck_nude.jpg"></center>'
+					end
+					'You stick as close to the swamp as possible and follow the edge in one direction.'
+					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
+					
+					*nl
+					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
+					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+				else
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
+					end
+
+					if nearby_woods_check <= 5:
+						!Circle back to where the pcs started
+						'You start going into the woods in a direction you think will take you around the swamp.'
+						'After a few hours walking you realize your surroundings are a bit familiar.'
+						'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
+
+						*nl
+						'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
+						act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
+					else	
+						!Get lost in the woods
+						'You start going into the woods in a direction you think will take you around the swamp.'
+						'After a few hours walking you realize you have no idea where you are going.'
+						'You look back to see if you can get back to the hut but nothing around seems familiar'
+
+						act 'This can''t be good': gt 'gadforestlost','1'
+					end
+				end	
+			end	
+		else
+			minut += 120
+
+			!Make it back without effort
+			if $clothingworntype ! 'nude':
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder_nude.jpg"></center>'
+			end
+			
+			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
+			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
+			'After a couple hours you are on the other edge of the forest'
+
+			act 'Further': gt 'gadforest','4'
+		end	 	
+	end
+end
+
+--- swamp_woods ---------------------------------

locations/swamp_yard.qsrc

@@ -309,12 +309,19 @@ if $ARGS[0] = 'campfire':
 					minut += 30
 					bucket -= 5
 					hotwater = 1
+
+					water_heated += 1
 					gs 'stat'
 		
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 					*nl
-					'With the now heated water, you can bathe yourself in the tub.'
-		
+					
+					if water_heated > 5 and (inhibition < 85 or hunter_sexual_comfort > 25):
+						'"It is too tedious to keep heatiing up water", you think to yourself.'
+					else
+						'With the now heated water, you can bathe yourself in the tub.'
+					end
+
 					act 'Continue': gt 'swamp_yard', 'campfire'
 				end
 			end	
@@ -404,127 +411,7 @@ end
 
 !Auxilliary locations
 if $ARGS[0] = 'nearby_woods':
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
-	'You are in the woods near the hut. You can see it not too far in the distance.'
-	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
-
-	*nl
-
-	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
-	if firewood < 25:
-		'You can pick up some firewood around here to keep the fire going.'
-
-		act 'Collect firewood (0:45)':
-			cla & *clr
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
-			end
-
-			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
-		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end
-	
-	act 'Try to circle around the swamp':
-		*clr & cla
-		if pcs_bushcraft < 15:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
-			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
-			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
-
-			act 'Further': gt 'swamp_yard', 'nearby_woods'
-		elseif pcs_bushcraft < 30:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
-			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
-
-			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
-			act 'Try anyway':
-				*clr & cla
-				minut += 180
-				nearby_woods_check = rand(1,10)
-
-				if nearby_woods_check = 1:
-					!Make it to the other side fine
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success_nude.jpg"></center>'
-					end
-					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Even though you occassionally step into the swamp you manage to not get stuck'
-					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
-
-					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
-				elseif nearby_woods_check <= 3:
-					!End up stuck in the swamp
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck_nude.jpg"></center>'
-					end
-					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
-					
-					*nl
-					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
-					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
-				else
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
-					end
-
-					if nearby_woods_check <= 5:
-						!Circle back to where the pcs started
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize your surroundings are a bit familiar.'
-						'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
-
-						*nl
-						'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
-						act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
-					else	
-						!Get lost in the woods
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize you have no idea where you are going.'
-						'You look back to see if you can get back to the hut but nothing around seems familiar'
-
-						act 'This can''t be good': gt 'gadforestlost','1'
-					end
-				end	
-			end	
-		else
-			minut += 120
-
-			!Make it back without effort
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder_nude.jpg"></center>'
-			end
-			
-			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
-			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
-			'After a couple hours you are on the other edge of the forest'
-
-			act 'Further': gt 'gadforest','4'
-		end	 	
-	end
+	gt 'swamp_woods'
 end	
 
 if $ARGS[0] = 'daytime_flavor_events': 

locations/swamphouse.qsrc

@@ -43,6 +43,14 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	else
 		'The hunters aren''t here right now'
 	end
+
+	if hour >= 8 and hour < 20: 
+		gs 'swamp_yard', 'daytime_flavor_events'
+	else
+		gs 'swamp_yard', 'nighttime_flavor_events'
+	end
+
+
 	*nl
 	
 	act 'Go outside':
@@ -743,4 +751,15 @@ if $ARGS[0] = 'huntersrelax':
 
 end
 
+
+if $ARGS[0] = 'daytime_flavor_events': 
+	!TODO: Add stuff here
+end
+
+if $ARGS[0] = 'nighttime_flavor_events':
+	if rand(1,10) = 1:
+		gs 'hunter_interactions', 'indoors_naked_encounter'
+	end	
+end
+
 --- swamphouse ---------------------------------