Revamp hunter rescue from the forest

locations/gadforest_event.qsrc

@@ -440,124 +440,120 @@ if $ARGS[0] = 'forest_hunters':
 
 	act 'Leave them alone':gt 'gadforest', $ARGS[1]
 
-	if $clothingworntype ! 'nude':
-		act 'Approach the hunters':
-			*clr & cla
-			if hunters_were_met = 0:
-				hunters_were_met = 1
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
-				*nl
-				'You decide to approach the strangers and chat. You never know, maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat for a while.'
-				'"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
-				'"<<$pcs_nickname>>," you answer.'
-				*nl
-				if gadriver_gang = 0:
-					minut += 30
-					gs 'stat'
-
-					'"I''m Andrei," replies the older man, "And these are my friends, from the village, Igor and Sergei."'
-					'"By any chance is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
-					'"Don''t be surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I ... Hmmm... very good to know, I''m also from Gadukino." said Andrei.'
-					*nl
-					'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-					'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
-					'"If you want, we can bring you to the swamp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
-					act 'Stay in the forest':gt 'gadforest', $ARGS[1]
-					act 'Go with them':hunters_here = 1 & minut += 60 & gt 'swamp_yard', 'start'
-				else
-					minut += 15
-					huntersKnowSlut = 1
-					huntersRape = 1
-					gs 'stat'
-
-					'"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore.'
-					'You look at him with a mixture of surprise and shock.'
-					'"Don''t be surprised, I''m also from Gadukino, and you look just like your mother when she was younger, and apparently you are a whore like her too." he said.'
-					'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
-					'"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
-					*nl
-					if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
-					'"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
-					'"I think it''s about time I left" you reply.'
-					'You quickly move away from them and only slowing once you can no longer hear them talking.'
-					act 'Go back to the forest':gt 'gadforest', $ARGS[1]
-				end
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
-				*nl
-				'You decide to approach the guys and chat.'
-
-				if huntersKnowSlut = 0:
-					minut += 30
-					'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-					'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
-					act 'Stay in the forest':gt 'gadforest', $ARGS[1]
-					act 'Go with them':hunters_here = 1 & minut += 60 & gt 'swamp_yard', 'start'
-				else
-					'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
-					'"How about you come back with us to our hut, we were just about to head back there anyways."'
-
-					gs 'willpower', 'misc', 'resist', 'hard'
-					if will_cost <= pcs_willpwr:
-						act 'Stay in the forest  (<<will_cost>> Willpower)':
-							gs 'willpower', 'pay', 'resist'
-							gs 'stat'
-							gt 'gadforest', $ARGS[1]
-						end
-					else
-						act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-					act 'Go with them':hunters_here = 1 & minut += 60 & gt 'swamp_yard', 'start'
-				end
-			end
-		end
-	elseif $clothingworntype = 'nude':
-		if huntersKnowSlut = 0 and gadriver_gang = 0:
-			act 'Keep walking':
-				*clr &cla
-				minut += 5
-				if huntersKnowSlut = 0:huntersKnowSlut = 1
-				pcs_horny += 20
-				inhib_exp += rand(1,3)
-				gs 'exhibitionism', 3
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mitkanudeforest.jpg"></center>'
-				*nl
-				'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
-
-				act 'Continue':gt 'gadforest', $ARGS[1]
-			end
-			act 'Hide':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/hiding_woods.jpg"></center>'
-				*nl
-				'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
-
-				act 'Continue':gt 'gadforest', $ARGS[1]
-			end
-		else
-			'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
-			'"How about you come back with us to our hut, we were just about to head back there anyways."'
-
-			gs 'willpower', 'misc', 'resist', 'hard'
-			if will_cost <= pcs_willpwr:
-				act 'Stay in the forest  (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					gt 'gadforest', $ARGS[1]
-				end
-			else
-				act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-			act 'Go with them':hunters_here = 1 & minut += 60 & gt 'swamp_yard', 'start'
-		end
-	end
+    %!TODO: Move to hunter interactions
+    act 'Approach the hunters':
+        *clr & cla
+        if hunters_were_met = 0:
+            hunters_were_met = 1
+            gs 'stat'
+
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+            *nl
+            'You decide to approach the strangers and chat. You never know, maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat for a while.'
+            '"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
+            '"<<$pcs_nickname>>," you answer.'
+            *nl
+            if gadriver_gang = 0:
+                minut += 30
+                gs 'stat'
+
+                '"I''m Andrei," replies the older man, "And these are my friends, from the village, Igor and Sergei."'
+                '"By any chance is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
+                '"Don''t be surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I ... Hmmm... very good to know, I''m also from Gadukino." said Andrei.'
+                *nl
+                'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
+                '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
+                '"If you want, we show you our camp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
+                act 'Stay in the forest':gt 'gadforest', $ARGS[1]
+                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+            else
+                minut += 15
+                huntersRape = 1
+                gs 'stat'
+
+                '"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore.'
+                'You look at him with a mixture of surprise and shock.'
+                '"Don''t be surprised, I''m also from Gadukino, and you look just like your mother when she was younger, and apparently you are a whore like her too." he said.'
+                'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
+                '"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
+                *nl
+                if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
+                '"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
+                '"I think it''s about time I left" you reply.'
+                'You quickly move away from them and only slowing once you can no longer hear them talking.'
+                act 'Go back to the forest':gt 'gadforest', $ARGS[1]
+            end
+        else
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+            *nl
+            'You decide to approach the guys and chat.'
+
+            if hunter_sexual_comfort < 60 or hunter_collective_opinion < 60:
+                minut += 30
+                'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
+                '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
+                act 'Stay in the forest':gt 'gadforest', $ARGS[1]
+                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+            else
+                '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
+                '"How about you come back with us to our hut, we were just about to head back there anyways."'
+
+                gs 'willpower', 'misc', 'resist', 'hard'
+                if will_cost <= pcs_willpwr:
+                    act 'Stay in the forest  (<<will_cost>> Willpower)':
+                        gs 'willpower', 'pay', 'resist'
+                        gs 'stat'
+                        gt 'gadforest', $ARGS[1]
+                    end
+                else
+                    act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+                end
+                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+            end
+        end
+    end
+    if $clothingworntype = 'nude':
+            act 'Keep walking':
+                *clr &cla
+                hunter_sexual_comfort += pcs_apprnc / 12
+
+                gs 'arousal', 'flash', 5
+                gs 'arousal', 'end'
+
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mitkanudeforest.jpg"></center>'
+                *nl
+                'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
+
+                act 'Continue':gt 'gadforest', $ARGS[1]
+            end
+            act 'Hide':
+                *clr & cla
+                minut += 5
+                gs 'stat'
+
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/hiding_woods.jpg"></center>'
+                *nl
+                'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
+
+                act 'Continue':gt 'gadforest', $ARGS[1]
+            end
+        if hunters_were_met = 1:
+            '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
+            '"How about you come back with us to our hut, we were just about to head back there anyways."'
+
+            gs 'willpower', 'misc', 'resist', 'hard'
+            if will_cost <= pcs_willpwr:
+                act 'Stay in the forest  (<<will_cost>> Willpower)':
+                    gs 'willpower', 'pay', 'resist'
+                    gs 'stat'
+                    gt 'gadforest', $ARGS[1]
+                end
+            else
+                act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+            end
+            act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+        end
+    end
 end
 
 if $ARGS[0] = 'mitka_temporary_event':

locations/gadforestlost.qsrc

@@ -549,33 +549,19 @@ if $ARGS[0] = 'rescue':
 		'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."')
-			if $clothingworntype ! 'nude':
-				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
-				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
-				end
-			else
+			'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, you can stay at our camp for the time being until someone can take you back."')
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
-				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+					act 'Continue': minut += 45 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
+				else:
+					act 'Continue': minut += 30 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
 				end
 			end
 		else
-			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')
-			if $clothingworntype ! 'nude':
-				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
-				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
-				end
-			else
+			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, you can stay at our camp for the time being until someone can take you back."')
 				if $ARGS[2] = 'forest_outskirts':
-					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
-				elseif $ARGS[2] = 'forest_center':
-					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+					act 'Continue': minut += 45 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
+				else:
+					act 'Continue': minut += 30 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
 				end
 			end
 		end

locations/hunter_ambient.qsrc

@@ -239,9 +239,6 @@ end
 
 !Behavior events
 if $ARGS[0] = 'schedule':
-	if week = 6 or week = 7:huntersrand = RAND(1,5)
-	if week < 6:huntersrand = RAND(1,7)
-
 	killvar 'hunters_breakfast'
 	killvar 'hunters_lunch'
 	killvar 'hunters_evening'

locations/hunter_favors.qsrc

@@ -3,7 +3,7 @@
 !Non-sexual favors
 if $ARGS[0] = 'housekeeping_request':
 
-	if hunters_here > 0 and hunters_were_met = 1 and util_rand_favor < 3:
+	if hunters_were_met = 1 and util_rand_favor < 3:
 		*clr & cla
 		util_rand_favor = rand(1,3)
 		minut += 5

locations/hunter_interactions.qsrc

@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'meet_hunters':
 	cla & *clr
 
 	hunter_collective_opinion = rand(20,30)
-	hunter_sexual_comfort = 10 + pcs_apprnc / 4
+	hunter_sexual_comfort += 10 + pcs_apprnc / 4
 	hunters_violent = 0
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.7.jpg"></center>'
@@ -1110,7 +1110,7 @@ if $ARGS[0] = 'meet_hunters_after_rescue':
 
 	!TODO: More behavior variables w/ explanation
 	hunter_collective_opinion = rand(20,30)
-	hunter_sexual_comfort = 10 + pcs_apprnc / 4
+	hunter_sexual_comfort += 10 + pcs_apprnc / 4
 	hunters_violent = 0
 
 	!TODO: Figure what to do with hunter inidividual opinion

locations/swamp_yard.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'start':
 	else
 		if hunters_were_met = 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, but the camp looks like it is likely in use and not abandoned.'
 		else
 			*nl
 			'The camp is quiet. The hunters aren''t here right now, where could they be.'