Browse Source

Re-enabled daytime flavor events

pfffbft 4 years ago
parent
commit
51bd24d15b

+ 1 - 1
locations/bicycle.qsrc

@@ -177,7 +177,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 			end
 		end
 		
-		if BikeLoc ! 3 and hunterscabin = 1 and huntersKnow = 1:
+		if BikeLoc ! 3 and hunterscabin = 1 and hunters_were_met = 1:
 			if BikeLoc = 1:
 				$bikeaction = 'Bike to the hunters cabin (0:44)'
 			elseif BikeLoc = 2:

+ 1 - 1
locations/gadforest.qsrc

@@ -315,7 +315,7 @@ if $ARGS[0] = 'forest_edge':
 	end
 
 	! Can travel directly to the hunters cabin if Sveta has been there before, knows the hunters, and Mira is not here at the forest with Sveta
-	if hunterscabin = 1 and huntersKnow = 1 and MiraLoc ! 3:
+	if hunterscabin = 1 and hunters_were_met = 1 and MiraLoc ! 3:
 		act 'Go to the hunters cabin(1:00)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if hour >= 6 and hour <= 22:

+ 4 - 4
locations/gadforest_event.qsrc

@@ -435,16 +435,16 @@ if $ARGS[0] = 'forest_hunters':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
 	*nl
-	if huntersKnow = 0:'Wandering through the woods you come across some people. Judging by their appearance they must be hunters.'
-	if huntersKnow = 1:'Wandering through the woods you see the hunters, Andrei, Sergei and Igor.'
+	if hunters_were_met = 0:'Wandering through the woods you come across some people. Judging by their appearance they must be hunters.'
+	if hunters_were_met = 1:'Wandering through the woods you see the hunters, Andrei, Sergei and Igor.'
 
 	act 'Leave them alone':gt 'gadforest', $ARGS[1]
 
 	if $clothingworntype ! 'nude':
 		act 'Approach the hunters':
 			*clr & cla
-			if huntersKnow = 0:
-				huntersKnow = 1
+			if hunters_were_met = 0:
+				hunters_were_met = 1
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'

+ 1 - 1
locations/gadforestlost.qsrc

@@ -546,7 +546,7 @@ if $ARGS[0] = 'rescue':
 	elseif $ARGS[1] = 'hunters':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
 		*nl
-		'Suddenly you hear the sounds of people approaching. '+iif(huntersKnow=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
+		'Suddenly you hear the sounds of people approaching. '+iif(hunters_were_met=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
 		if StoryLine = 1 and grandmaQW['block'] = 0:
 			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')

+ 2 - 2
locations/gadukino_event.qsrc

@@ -466,8 +466,8 @@ if $ARGS[0] = 'gadriver_gang':
 																			npc_sex[$boy] += 1
 
 																			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_dog9.jpg"></center>'
-																			if huntersKnow = 0:'You squint a little to see who''s next in line while sucking someone''s cock, you see an unknown village man, penetrating your ass.'
-																			if huntersKnow = 1:'When another man starts penetrating your ass, you squint a little to see who it is, and to your horror there''s Andrei thrusting away. There''s no doubt that Igor and Sergei will find out...'
+																			if hunters_were_met = 0:'You squint a little to see who''s next in line while sucking someone''s cock, you see an unknown village man, penetrating your ass.'
+																			if hunters_were_met = 1:'When another man starts penetrating your ass, you squint a little to see who it is, and to your horror there''s Andrei thrusting away. There''s no doubt that Igor and Sergei will find out...'
 
 																			gs 'dinSex','boy_wants_anal','','lubri'
 																			gs 'dinsex','analsex'

+ 1 - 1
locations/hunter_ambient.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = 'schedule':
 	killvar 'hunters_available'
 	killvar 'hunters_hunting'
 
-	if huntersKnow > 0:
+	if hunters_were_met > 0:
 		if hour = 7:
 			hunters_breakfast = 1
 			hunters_available = 1

+ 5 - 5
locations/hunter_favors.qsrc

@@ -3,17 +3,17 @@
 !Non-sexual favors
 if $ARGS[0] = 'housekeeping_request':
 
-	if hunters_here > 0 and huntersKnow = 1 and swiss_army_random_number < 3:
+	if hunters_here > 0 and hunters_were_met = 1 and util_rand_favor < 3:
 		*clr & cla
-		swiss_army_random_number = rand(1,3)
+		util_rand_favor = rand(1,3)
 		minut += 5
-		if swiss_army_random_number = 1:
+		if util_rand_favor = 1:
 			gs 'boyStat', 'A172'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big172.jpg"></center>'
-		elseif swiss_army_random_number = 2:
+		elseif util_rand_favor = 2:
 			gs 'boyStat', 'A174'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big174.jpg"></center>'
-		elseif swiss_army_random_number = 3:
+		elseif util_rand_favor = 3:
 			gs 'boyStat', 'A173'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big173.jpg"></center>'
 		end

+ 2 - 2
locations/hunter_interactions.qsrc

@@ -1087,7 +1087,7 @@ if $ARGS[0] = 'meet_hunters':
 		'"Is your lastname possibly <<$pcs_lastname>>?" You look at him surprised for a moment before nodding.'
 		'"You look a lot like your mother that''s how I knew. I am also from Gadukino."'
 
-		huntersknow = 1
+		hunters_were_met = 1
 
 		if pcs_sweat > 2 or dirty = 1:
 			'You become aware of the dirty clothes sticking on your body, making you uncomfortable.'
@@ -1106,7 +1106,7 @@ end
 if $ARGS[0] = 'meet_hunters_after_rescue':
 	*clr & cla
 	minut += 5
-	huntersKnow = 1
+	hunters_were_met = 1
 
 	!TODO: More behavior variables w/ explanation
 	hunter_collective_opinion = rand(20,30)

+ 3 - 3
locations/hunters.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	!disabled - maybe hook into enema realism?
 	!$textsexhunter = 'From a member of the unpleasant smells and remains in the mouth tastes foul feces. "-Damn, I had to do an enema." - belatedly dumaeete you.'
 
-	if huntersKnow > 0:
+	if hunters_were_met > 0:
 		if hour = 8 or hour = 14 or hour = 19:
 			'<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.'
@@ -21,11 +21,11 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Walk away':gt 'swamp_yard', 'start'
-	if huntersKnow = 0:
+	if hunters_were_met = 0:
 		act 'Greet them':
 			*clr & cla
 			minut += 5
-			huntersKnow = 1
+			hunters_were_met = 1
 			huntersAndreiQw += 1
 			huntersIgorQw += 1
 			huntersSergeiQw += 1

+ 7 - 6
locations/swamp_yard.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	$location_type = 'secluded'
 	hunterscabin = 1
 
-   	util_rand = rand(1,8)
+   	util_rand = rand(1,2)
 
 	gs 'gadukino_event', 'sound'
 	gs 'hunter_ambient', 'schedule'
@@ -39,7 +39,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 
-	if hunters_available = 1 and hunters_outside = 1 and huntersknow = 0:
+	if hunters_available = 1 and hunters_outside = 1 and hunters_were_met = 0:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
 	elseif hunters_available = 1 and hunters_outside = 1:
@@ -50,12 +50,12 @@ if $ARGS[0] = 'start':
 		'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.'
 	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 are most likely out hunting for a couple hours. You have the camp to yourself!'
 	elseif (hunters_breakfast = 1 or hunters_lunch = 1 or hunters_drink = 1) and hunters_outside = 1:
 		*nl
 		'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 	else
-		if huntersKnow = 0:
+		if hunters_were_met = 0:
 			*nl
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 		else
@@ -67,7 +67,6 @@ if $ARGS[0] = 'start':
 	act '<b>Go to the swamp</b>': gt 'swamp_yard', 'swamp_escape'
 	gs 'bicycle', 'swamp_yard'
 	act 'Go into the house':gt 'swamphouse', 'start'
-	if dirty_swamp_yard > 10:act 'Go out in the yard':hunterslut -= 1 & dynamic $dirty_swamp_yard
 
 	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
 	act 'Visit the spring': gt 'swampspring'
@@ -75,7 +74,9 @@ if $ARGS[0] = 'start':
 	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
 
 
-	if hunters_outside = 1 and hunters_available = 1 and util_rand = 1: gt 'hunter_interactions', 'naked_encounter'
+	if hunters_outside = 1 and hunters_available = 1 and util_rand = 1:
+	    gt 'swamp_yard', 'daytime_flavor_events'
+    end
 end
 
 

+ 2 - 9
locations/swamphouse.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 	'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 huntersknow = 0:
+	if hunters_inside = 1 and hunters_were_met = 0:
 		if hunters_drink = 1:
 			*nl
 			'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			'The Hunters said they will be out hunting for a couple hours. You have the camp to yourself!'
 		end
 	else
-		if huntersknow = 0:
+		if hunters_were_met = 0:
 			*nl
 			'The camp is quiet. There''s nobody here right now, where could they be.'
 		else
@@ -864,13 +864,6 @@ if $ARGS[0] = 'hunterstable':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 	*nl
-	if hunters_drink = 1:
-		dirty_swamphouse += rand(1,3)
-		'There are loads of vodka bottles and beer on the makeshift table. The hunters are sitting around the table drinking and talking.'
-	else
-		dirty_swamp_yard  += rand(0,2)
-		'You see loads of spirits on the makeshift table. The hunters are enjoying their meal and discussing current events.'
-	end
 
 	if hunters_drink = 1:
 		act 'Drink vodka (0:15)':