Browse Source

make the hunters available

rachels 3 năm trước cách đây
mục cha
commit
69778b5328

+ 14 - 14
locations/bicycle.qsrc

@@ -15,7 +15,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 	act 'Ride your bicycle':
 		*clr & cla
 		menu_off = 1
-		
+
 		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
 		else
@@ -23,7 +23,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 		end
 		*nl
 		'You see your old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
-		
+
 		if BikeLoc = 1:
 			act 'Leave your bike alone':gt 'gadsarai'
 		elseif BikeLoc = 2:
@@ -42,14 +42,14 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				pcs_mood += 10
 				pcs_sweat += 2
 				gadbikeday = daystart
-				
+
 				if $clothingworntype = 'nude':
 					pcs_horny += 15
 					pcs_mood += 15
 					if pcs_inhib < 50: inhib_exp += rand(0,2)
 					gs 'exhibitionism', 3
 					gs 'stat'
-					
+
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
 					*nl
 					'You ride nude, avoiding crowded places, exulting from this newfound courage. It''s hard to say what excites you more, fear or desire to be noticed.'
@@ -62,7 +62,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 							if pcs_inhib < 20: inhib_exp += rand(0,2)
 							gs 'exhibitionism', 1
 							gs'stat'
-							
+
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
 							*nl
 							'During your ride you lift your skirt several times, showing a glimpse of your panties to a few lucky villagers passing-by.'
@@ -72,7 +72,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 							if pcs_inhib < 30: inhib_exp += rand(0,2)
 							gs 'exhibitionism', 2
 							gs'stat'
-							
+
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
 							*nl
 							'During your ride you lift your skirt several times, showing your bare ass to a few lucky villagers passing-by.'
@@ -80,15 +80,15 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					else
 						pcs_mood += 5
 						gs 'stat'
-						
+
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 						*nl
 						'You enjoy the breath of fresh air from riding your bike by the seemingly endless fields of the village.'
-					end					
+					end
 				elseif PCloSkirt = 0:
 					pcs_mood += 5
 					gs 'stat'
-					
+
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
 					*nl
 					'You ride your bike, enjoying the surrounding country-side.'
@@ -96,7 +96,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				act 'Finish your ride':gt 'gadsarai'
 			end
 		end
-		
+
 		if BikeLoc ! 1:
 			if BikeLoc = 2:
 				$bikeaction = 'Bike to your grandparents barn (0:12)'
@@ -137,11 +137,11 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				gs 'bicycle', 'clothes'
 				*nl
 				'You jump onto your bike and ride to your grandparent barn.'
-				
+
 				act 'Finish your ride':gt 'gadsarai'
 			end
 		end
-		
+
 		if BikeLoc ! 2 and pcs_bushcraft > 0:
 			if BikeLoc = 1:
 				$bikeaction = 'Bike to the forest edge (0:12)'
@@ -172,11 +172,11 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				gs 'bicycle', 'clothes'
 				*nl
 				'You jump onto your bike and ride to the edge of the forest.'
-				
+
 				act 'Finish your ride':gt 'gadforest','forest_edge'
 			end
 		end
-		
+
 		if BikeLoc ! 3 and hunterscabin = 1 and hunters_were_met = 1:
 			if BikeLoc = 1:
 				$bikeaction = 'Bike to the hunters cabin (0:44)'

+ 6 - 6
locations/hunter_ambient.qsrc

@@ -224,7 +224,7 @@ if $ARGS[0] = 'yard_convo':
 	end
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Further':gt 'swamp_yard', 'start'
 end
 
@@ -251,21 +251,21 @@ if $ARGS[0] = 'schedule':
 		elseif hour = 8:
 			hunters_available = 1
 			hunters_chattime = 1
-			if (sunWeather = 0 or temper <  15): hunters_inside  = 1 
+			if (sunWeather = 0 or temper <  15): hunters_inside  = 1
 		elseif hour > 8 and hour < 12:
 			hunters_hunting = 1
 		elseif hour = 12 or hour = 13:
 			hunters_lunch = 1
 			hunters_available = 1
-			if hour = 13: hunters_chattime = 1 
+			if hour = 13: hunters_chattime = 1
 			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1
 		elseif hour >= 14 and hour <= 17:
 			hunters_hunting = 1
 		elseif hour = 18 or hour = 19:
 			hunters_evening = 1
 			hunters_available = 1
-			if hour = 19: hunters_chattime = 1 
-			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1 
+			if hour = 19: hunters_chattime = 1
+			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1
 		elseif hour = 20:
 			hunters_dinner = 1
 			hunters_available = 1
@@ -273,7 +273,7 @@ if $ARGS[0] = 'schedule':
 		elseif hour > 20 and hour < 23:
 			hunters_drink = 1
 			hunters_available = 1
-			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1 
+			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1
 		elseif hour >= 23 or hour < 7:
 			hunters_sleep = 1
 			hunters_inside  = 1

+ 11 - 3
locations/hunters.qsrc

@@ -10,10 +10,18 @@ if $ARGS[0] = 'start':
 	if hunters_were_met > 0:
 		if hunters_chattime = 1:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
-			'The three hunters, Sergei, Igor and Andrei are sitting and telling each other all kinds of hunting stories.'
+			if hunters_evening = 0:
+				'The three hunters, Sergei, Igor and Andrei are sitting and telling each other all kinds of hunting stories.'
+			else
+				'The two hunters, Sergei and Igor are sitting and telling each other all kinds of hunting stories.'
+			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.'+rand(1,9)+'.jpg"></center>'
-			'The three hunters, Sergei, Igor and Andrei, are all minding their own business.'
+			if hunters_evening = 0:
+				'The three hunters, Sergei, Igor and Andrei, are all minding their own business.'
+			else
+				'The three hunters, Sergei, Igor and Andrei, are all minding their own business.'
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
@@ -274,7 +282,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	else
-		act'Talk to Andrei':gt 'andreihunter'
+		if hunters_evening = 0: act'Talk to Andrei':gt 'andreihunter'
 		act'Talk to Sergei':gt 'sergeihunter'
 		act'Talk to Igor':gt 'igorhunter'
 	end

+ 7 - 11
locations/swamp_yard.qsrc

@@ -1,5 +1,6 @@
 # swamp_yard
 
+gs 'hunter_ambient', 'schedule'
 if $ARGS[0] = 'start':
 	$loc = 'swamp_yard'
 	$loc_arg = 'start'
@@ -11,7 +12,6 @@ if $ARGS[0] = 'start':
 	hunterscabin = 1
 
 	gs 'gadukino_event', 'sound'
-	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 
 	if lost_girl = 1:
@@ -34,36 +34,32 @@ if $ARGS[0] = 'start':
 	if hunters_available = 1:
 		if hunters_were_met = 0:
 			if hunters_outside = 1:
-				*nl
 				'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
 			end if
 		else
 			if hunters_outside = 1:
 				if hunters_evening = 1:
-					*nl
 					'You hear some gunshots and see <a href="exec: gt ''swamp_woods'', ''shooting_practice'' ">Andrei</a> not too far in the distance shooting some bottles.'
+					'<a href="exec: gt ''hunters'', ''start'' ">Igor and Sergey</a> are standing in the front yard.'
 				else
-					if campfire = 1 :
-						*nl
+					if campfire = 1 and hunters_chattime = 0:
 						'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 					else
-						*nl
 						'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
 					end if
 				end if
+			else
+				'The camp is quiet, but you can hear the hunters'' voices from the hut.'
 			end if
 		end if
 	else
 		if hunters_were_met = 0:
-			*nl
 			'The camp is quiet. There''s nobody here right now, but the camp looks like it is likely in use and not abandoned.'
 		else
 			if hunters_hunting = 1:
-				*nl
 				'The hunters are most likely out hunting for a couple hours. You have the camp to yourself!'
-			else
-				*nl
-				'The camp is quiet. The hunters aren''t here right now, where could they be.'
+			else:
+				'The camp is quiet. The hunters are asleep in the hut.'
 			end if
 		end if
 	end if

+ 29 - 23
locations/swamphouse.qsrc

@@ -1,5 +1,6 @@
 # swamphouse
 !2020/10/16
+gs 'hunter_ambient', 'schedule'
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'indoors'
@@ -12,7 +13,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	bonusZ = 0
 	clr
 	gs 'themes', 'indoors'
-	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 
 	if hour = 5:stovefire = 0
@@ -24,16 +24,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampizba.jpg"></center>'
 	*nl
 	'A small hunting cabin. The cabin contains a small room with a low ceiling.'
-	*nl
 	'You see a <a href="exec: gt ''bed'', ''start''">couch</a> where you can lie down and sleep.'
-	*nl
 	if bucket > 0:
 		'There''s a <a href="exec: gs ''swamphouse'', ''bucket'' ">bucket</a> placed in the corner, filled with water collected from the spring.'
 	else
 		'There''s an empty bucket placed in the corner. It needs refilling with water from the spring.'
 	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.'
-	*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 or meat, you could cook something to eat, or warm the water so you can bathe in the tub.'
 	if stovefire = 0:
 		*nl
@@ -42,26 +39,37 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		*nl
 		'The hut feels '+iif(temper > 15, 'extremely', 'quite')+' warm with the old stove fire burning away.'
 	end
-	*nl
 	'Beside the stove, there''s a stack of old <a href="exec: gs ''swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
 	!TODO: fix this showing after dare, Sveta accepting Igors request or with hessian
-
 	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
 
-	if hunters_inside = 1 and hunters_were_met = 1:
-		if hunters_drink = 1:
-			*nl
-			'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
-		elseif hunters_sleep = 1:
-			*nl
-			'The hunters are sleeping on the couch.'
-		elseif hunters_breakfast = 1 or hunters_lunch = 1 or hunters_dinner = 1:
-			*nl
-			'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
-		end
-	end
-
-	if hunters_were_met = 0 and hunters_hunting = 1:  *nl & 'The camp is quiet. There''s nobody here right now, where could they be.'
+	if hunters_were_met = 1:
+		if hunters_inside = 1:
+			if hunters_drink = 1:
+				'You see the <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
+			elseif hunters_sleep = 1:
+				'The hunters are sleeping on the couch.'
+			elseif hunters_breakfast = 1 or hunters_lunch = 1 or hunters_dinner = 1:
+				'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table.'
+			else
+				'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
+			end if
+		end if
+	else
+		if hunters_inside = 1:
+			if hunters_drink = 1:
+				'You can see three hunters hanging out in the hut.'
+			elseif hunters_sleep = 1:
+				'You can see three hunters sleeping on the couch.'
+			elseif hunters_breakfast = 1 or hunters_lunch = 1 or hunters_dinner = 1:
+				'You can see three hunters sitting around the table talking.'
+			else
+				'You can see three hunters resting at the table talking.'
+			end if
+		else
+		   'There''s nobody here right now'
+		end if
+	end if
 
 
 	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'swamp_yard', 'start'
@@ -1753,8 +1761,7 @@ if $ARGS[0] = 'hunterstable':
 end
 
 if $ARGS[0] = 'huntersrelax':
-	cla
-	*clr
+	*clr & cla
 	minut += 1
 	menu_off = 1
 	gs 'stat'
@@ -1767,7 +1774,6 @@ if $ARGS[0] = 'huntersrelax':
 	act 'Speak with Sergei': gt 'sergeihunter'
 	act 'Speak with Igor': gt 'igorhunter'
 	act 'Move away': gt 'swamphouse', 'start'
-
 end
 
 if $ARGS[0] = 'huntersmokBJ':