Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

KevinSmarts 3 years ago
parent
commit
ae8f1165ef

+ 1 - 1
glife.qproj

@@ -780,7 +780,7 @@
 		<Location name="tatiana_lab"/>
 		<Location name="tatiana_missions"/>
 		<Location name="alexandriaEv"/>
-		<Location name="NewCloShop"/>
+		<Location name="shop_fashionista"/>
 		<Location name="office"/>
 		<Location name="restoran"/>
 		<Location name="hairsalon"/>

+ 5 - 5
locations/AlbStars.qsrc

@@ -22,17 +22,17 @@ if $ARGS[0] = 'albina1':
 		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big23.jpg"></center>'
 		'You approach and greet Albina. She raises an eyebrow haughtily.'
-		'"And you are? Oh, right. <<$pcs_nickname>>. You''ve taken up dancing, have you?" You nod, confirming the obvious. Albina laughs dismissively. "Well, how''s that going for you?"'
+		'"And you are? Oh, right. <<$pcs_nickname>>. You''ve taken up dancing, have you?" You nod, confirming the obvious, but Albina just laughs dismissively. "Well, how''s that going for you?"'
 		'"Not bad." you answer coldly. "Not bad at all."'
 		'Albina stares at you arrogantly. "Not bad? Well maybe in comparison with the local bowlegged cows, but I doubt that you can dance on a professional level."'
 
-		act 'I do not care':
+		act 'I don''t care':
 			*clr & cla
 			npc_rel['A23'] -= 5
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big23.jpg"></center>'
-			'You reply as scornfully as possible that you do not care and turn away from her.'
+			'You reply as scornfully as possible that you don''t care and turn away from her.'
 			'She snickers nastily and turns to the other girls. "Alright girls. Let''s get to work."'
 
 			act 'Leave': gt 'gdksport', 'start'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'albina2':
 		'"I''m pretty good, I think." you reply with a smile. "Even if I do say so myself."'
 		'"Pretty good, huh?" Albina responds in a condescending tone. "Well, I''ve seen some of the dancers that take lessons here. It wouldn''t take much to be better than those bow-legged cows. I doubt you''re up to any kind of professional standard though."'
 
-		act 'I do not care':
+		act 'I don''t care':
 			*clr & cla
 			npc_rel['A23'] -= 5
 			gs 'stat'
@@ -110,7 +110,7 @@ if $ARGS[0] = 'albina3':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big23.jpg"></center>'
-	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a very close relationship from your mutal love for dancing.'
+	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a very close relationship from your mutual love for dancing.'
 
 	act 'Greet Albina':
 		*clr & cla

+ 165 - 185
locations/andreihunter.qsrc

@@ -7,215 +7,195 @@ boyage = npc_dob[$boy]
 boyage = (boyage - boyage mod 10000) / 10000
 boyage = year - boyage
 
-'<center><b><font color = maroon>Andrei</font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
-'Andrei is the leader of the group of hunters that frequent the woods and swamp by Gadukino while living close by. He''s <<boyage>> years old and divorced.'
-if huntersAndreiQw < 0:'You and him have a bad relationship, because you offended him in the past.'
-if huntersAndreiQw >= 0 and huntersAndreiQw < 10:'You have a normal relationship with him.'
-if huntersAndreiQw >= 10 and huntersAndreiQw < 15:'You have friendly relations with him.'
-if huntersAndreiQw >= 15 and huntersAndreiQw < 25:'You''re good friends.'
-if huntersAndreiQw > 25 :'You love him.'
-if huntersAndreiLove = 1:'You love each other.'
-gs 'stat'
-
-act 'Chat (0:30)':
+if huntersAndreiLove > 0 and huntersAndreiQw < 10:
 	*clr & cla
-	minut += 30
-	if huntersAndreiQw < 10:huntersAndreiQw += 1
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
+	*nl
+	'You want to talk to Andrei, but he cuts in before you can say anything.'
+	'"<<$pcs_nickname>>, It''s over between us," he says firmly and walks away.'
+	'"Well, maybe it''s for the best," you think as you leave in the other direction.'
+	minut += 3
+	huntersAndreiLove = 0
+	huntersAndreiQw -= 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
-	if huntersAndreiQw >= 0:'You chat with Andrei. You learn interesting tidbits about hunting from him.'
-	if huntersAndreiQw < 0:'You talk to Andrei. He makes it clear he''d rather not talk to you, but takes part in the conversation anyway.'
-
-	act'Continue':gt $loc, $loc_arg
-end
+	act 'Leave': gt $loc, $loc_arg
+else
+	if huntersAndreiLove > 0 and pcs_horny <= 60 and huntersAndreiQw >= 10 and huntersAndreisex = 0 and rand(0,2) = 1 :
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
+		*nl 'As soon as you walk up to Andrei, he pulls you in for a kiss without saying a word. You have no time to get a word in as he pulls you towards him.'
+		gs 'arousal', 'kiss', 5
+		gs 'stat'
 
-if huntersAndreiQw >= 10:
-	if huntersAndreiLove = 0:
-		act 'Flirt':
-			minut += 5
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
+		act 'Go with Andrei':
 			*clr & cla
-			if huntersAndreiQw <= 35 and huntersKnowSlut = 0:huntersAndreiQw += 1
-			if huntersIgorQw >= 10 and huntersKnowSlut = 0:huntersIgorQw -= 1
-			if huntersSergeiQw >= 10 and huntersKnowSlut = 0:huntersSergeiQw -= 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterhands.jpg"></center>'
+			*nl 'You go with Andrei with your hand in his. You know how this ends, and you really don''t mind.'
+			huntersAndreisex += rand(6,24)
+			huntersAndreiQw += 1
+			gs 'arousal', 'foreplay', 5
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
-			'You flirt with Andrei. He doesn''t say so aloud, but he likes the attention. You notice him checking you out when he thinks you aren''t looking.'
-
+			act 'Further':gt 'hunterLoveSex','Andrei'
+		end
+		act 'Refuse':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+			*nl '"No, Andrei not now." You quickly leave back the way you came.'
+			minut += 5
+			huntersAndreiQw -= 1
+			huntersAndreisex += 1
 			gs 'stat'
 
-			if huntersAndreiLove = 0 and huntersAndreiQw >= 25 and huntersKnowSlut = 0 and pcs_apprnc >= 60:
-				*clr & cla
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
-				'You smile sweetly at Andrei while you flirt, and you are caught off guard when he suddenly goes in for a kiss.'
+			act 'Leave':gt $loc, $loc_arg
+		end
 
-				gs 'arousal', 'foreplay', 5
-				gs 'stat'
+	else
+		'<center><b><font color = maroon>Andrei</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
+		*nl
+		'Andrei is the leader of the group of hunters that frequent the woods and swamp by Gadukino while living close by. He''s <<boyage>> years old and divorced.'
+		if huntersAndreiQw < 0:
+			'You and him have a bad relationship, because you offended him in the past.'
+		elseif huntersAndreiQw < 10:
+			'You have a normal relationship with him.'
+		elseif huntersAndreiQw < 15:
+			'You have friendly relations with him.'
+		elseif huntersAndreiQw < 25:
+			'You''re good friends.'
+		else
+			if huntersAndreiLove = 1:'You love each other.' else 'You love him.'
+		end
+		gs 'stat'
 
-				act 'Answer kiss':
-					*clr & cla
-					huntersAndreiLove = 1
-					huntersAndreiQw += 1
-					pcs_mood = 100
-					gs 'stat'
+		act 'Chat (0:30)':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
+			*nl
+			if huntersAndreiQw >= 0: *nl 'You chat with Andrei. You learn interesting tidbits about hunting from him.' else *nl 'You talk to Andrei. He makes it clear he''d rather not talk to you, but takes part in the conversation anyway.'
+			minut += 30
+			if huntersAndreiQw < 10 : huntersAndreiQw += 1
+			gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
-					'Your lips touch... your heart skips a beat. Andrei takes control and continues aggressively, so you find yourself responding to his whims.'
+			act'Continue':gt $loc, $loc_arg
+		end
 
-					gs 'arousal', 'kiss', 5
+		if huntersAndreiQw >= 10:
+			if huntersAndreiLove = 0:
+				act 'Flirt':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
+					*nl 'You flirt with Andrei. He doesn''t say so aloud, but he likes the attention. You notice him checking you out when he thinks you aren''t looking.'
+					if huntersAndreiQw <= 35 and huntersKnowSlut = 0:huntersAndreiQw += 1
+					if huntersIgorQw >= 10 and huntersKnowSlut = 0:huntersIgorQw -= 1
+					if huntersSergeiQw >= 10 and huntersKnowSlut = 0:huntersSergeiQw -= 1
+					minut += 5
+					!!not using arousal as no orgasm chance
+					pcs_horny += 10
 					gs 'stat'
 
-
-					if pcs_horny >= 40:
-						act'Continue':
+					if huntersAndreiQw >= 25 and huntersKnowSlut = 0 and pcs_apprnc >= 60:
+						act 'Continue Flirt':
 							*clr & cla
-							minut += 5
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
+							*nl 'You smile sweetly at Andrei while you flirt, and you are caught off guard when he suddenly goes in for a kiss.'
+							gs 'arousal', 'foreplay', 5
 							gs 'stat'
 
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"<<$pcs_nickname>>, I want you", Andrei whispers when your lips finally part. You nod eagerly then Andrei gently takes you by the hand and leads you to his bed.'
-							act 'Go':gt 'hunterLoveSex','Andrei'
+							act 'Answer kiss':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
+								*nl 'Your lips touch... your heart skips a beat. Andrei takes control and continues aggressively, so you find yourself responding to his whims.'
+								huntersAndreiLove = 1
+								huntersAndreiQw += 1
+								pcs_mood = 100
+								gs 'arousal', 'kiss', 5
+								gs 'stat'
+								if pcs_horny >= 40:
+
+									act'Continue':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+										*nl '"<<$pcs_nickname>>, I want you", Andrei whispers when your lips finally part. You nod eagerly then Andrei gently takes you by the hand and leads you to his bed.'
+										minut += 5
+										gs 'stat'
+
+										act 'Go':gt 'hunterLoveSex','Andrei'
+									end
+								else
+									act'Further':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+										*nl '"Maybe next time we won''t stop there, <<$pcs_nickname>>", Andrei says when your lips finally part. "For now though, let''s go back."'
+										minut += 5
+										gs 'stat'
+
+										act'Continue':gt $loc, $loc_arg
+									end
+								end if
+							end
+							act 'Push away':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+								*nl '"Sorry... Andrei... I can''t right now", you tell him. He leaves with an angry look on his face.'
+								minut += 5
+								hunterslut += 1
+								huntersAndreiQw -= 50
+								gs 'stat'
+
+								act'Leave':gt $loc, $loc_arg
+							end
 						end
-					else
-						act'Further':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"Maybe next time we won''t stop there, <<$pcs_nickname>>", Andrei says when your lips finally part. "For now though, let''s go back."'
-
-							act'Continue':gt $loc, $loc_arg
-						end
-					end
+					end if
+					act'Leave':gt $loc, $loc_arg
 				end
-				act 'Push away':
+			else
+				act 'Spend time together':
 					*clr & cla
-					minut += 5
-					hunterslut += 1
-					huntersAndreiQw -= 50
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
+					*nl 'You spend time together with Andrei. He can''t keep his hands and lips off of you as you lie there together. He is happy with your company. You can see a look of satisfaction on his face and feel wonderful knowing you''re the one who put it there'
+					minut += 60
+					!!not using arousal as no orgasm chance
+					pcs_horny += 10
+					huntersAndreiQw += 1
+					if huntersIgorLove > 0 or huntersSergeiLove > 0:hunterslut += 1
+					if huntersIgorLove = 0 and huntersSergeiLove = 0:hunterslut -= 1
+					pcs_mood = 100
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-					'"Sorry... Andrei... I can''t right now", you tell him. He leaves with an angry look on his face.'
-
 					act'Leave':gt $loc, $loc_arg
 				end
-			else
-				act'Leave':gt $loc, $loc_arg
-			end
-		end
-	else
-		act 'Spend time together':
-			minut += 60
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
-			*clr & cla
-			huntersAndreiQw += 1
-			if huntersIgorLove > 0 or huntersSergeiLove > 0:hunterslut += 1
-			if huntersIgorLove = 0 and huntersSergeiLove = 0:hunterslut -= 1
-			pcs_mood = 100
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
-			'You spend time together with Andrei. He can''t keep his hands and lips off of you as you lie there together. He is happy with your company. You can see a look of satisfaction on his face and feel wonderful knowing you''re the one who put it there'
-
-			gs 'stat'
-
-			act'Leave':gt $loc, $loc_arg
-		end
-	end
-end
-
-if huntersAndreiLove > 0 and pcs_horny >= 60:
-	act 'Have sex':
-		*clr & cla
-		huntersAndreiQw += 1
-		huntersAndreisex += rand(6,24)
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
-		'You catch Andrei''s eyes with yours and give him a look that leaves no doubt what you want. He nods then places an arm around your shoulders to lead you inside.'
-
-		gs 'arousal', 'foreplay', 10
-		gs 'stat'
-
-		act 'Go':gt 'hunterLoveSex','Andrei'
-	end
-end
-
-if huntersAndreiLove > 0 and pcs_horny <= 60 and huntersAndreiQw >= 10 and temp = 1 and huntersAndreisex = 0:
-	*clr & cla
-	huntersAndreisex += rand(6,24)
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-	'As soon as you walk up to Andrei, he pulls you in for a kiss without saying a word. You have no time to get a word in as he pulls you towards him.'
-
-	gs 'arousal', 'kiss', 5
-	gs 'stat'
-
-	act 'Go with Andrei':
-		*clr & cla
-		huntersAndreiQw += 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterhands.jpg"></center>'
-		'You go with Andrei with your hand in his. You know how this ends, and you really don''t mind.'
-
-		gs 'arousal', 'foreplay', 5
-		gs 'stat'
-
-		act 'Further':gt 'hunterLoveSex','Andrei'
-	end
-	act 'Refuse':
-		*clr & cla
-		minut += 5
-		huntersAndreiQw -= 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-		'"No, Andrei not now." You quickly leave back the way you came.'
-		act 'Leave':gt $loc, $loc_arg
-	end
-end
-
-if huntersAndreiLove > 0:
-	act 'Break up with Andrei':
-		*clr & cla
-		minut += 5
-		huntersAndreiLove = 0
-		huntersAndreiQw -= 100
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
-		'"Andrei, I feel that our relationship has no future. I''m breaking up with you", you say. You leave while trying not to look back at him.'
-
-		act 'Leave':gt $loc, $loc_arg
-	end
-end
-
-act'Leave':gt $loc, $loc_arg
-
-if huntersAndreiQw < 10 and huntersAndreiLove > 0:
-	*clr & cla
-	minut += 5
-	huntersAndreiLove = 0
-	huntersAndreiQw -= 10
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
-	'You want to talk to Andrei, but he cuts in before you can say anything.'
-	'"<<$pcs_nickname>>, It''s over between us," he says firmly and walks away.'
-	'"Well, maybe it''s for the best," you think as you leave in the other direction.'
-
-	act 'Leave':gt $loc, $loc_arg
-end
+				if pcs_horny >= 60:
+					act 'Have sex':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
+						*nl 'You catch Andrei''s eyes with yours and give him a look that leaves no doubt what you want. He nods then places an arm around your shoulders to lead you inside.'
+						huntersAndreiQw += 1
+						huntersAndreisex += rand(6,24)
+						gs 'arousal', 'foreplay', 10
+						gs 'stat'
+
+						act 'Go':gt 'hunterLoveSex','Andrei'
+					end
+				end if
+				if rand(0,9) = 0:
+					act 'Break up with Andrei':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
+						*nl '"Andrei, I feel that our relationship has no future. I''m breaking up with you", you say. You leave while trying not to look back at him.'
+						minut += 5
+						huntersAndreiLove = 0
+						huntersAndreiQw -= 100
+						gs 'stat'
+
+						act 'Leave':gt $loc, $loc_arg
+					end
+				end if
+			end if
+		end if
+		act'Leave':gt $loc, $loc_arg
+	end if
+end if
 
 --- andreihunter ---------------------------------
-

+ 69 - 116
locations/backwater.qsrc

@@ -7,43 +7,50 @@ $menu_loc = 'backwater'
 $menu_arg = ''
 menu_off = 0
 gs 'gadukino_event', 'sound'
-cls
-gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
 if $ARGS[0] = '':
-	act 'Go back to the hut':
+	if huntersRape = 2:
+		clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax.jpg"></center>'
+		*nl 'You sit down by the shore, resting.'
+		menu_off = 1
 		minut += 5
-		hunter_refuse = 0
+		huntersRape = 3
 		gs 'stat'
-		gt 'swamp_yard', 'start'
-	end
 
-	'<center><B>Backwater</B></center>'
+		act 'Further':gt 'hunters', 'start'
+	else
+		if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
+	end if
+end if
 
+if $ARGS[0] = 'alone':
+	'<center><B>Backwater</B></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'backwater.jpg','backwater_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'backwater_winter.jpg','backwater_winter_night.jpg')+'"></center>'
 	end
 	*nl
-
 	'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
 	*nl
+
 	if clothesAtLocation = 1:'Your clothes lie on the shore.'
 
+
+	act 'Go back to the hut':
+		minut += 5
+		hunter_refuse = 0
+		gt 'swamp_yard', 'start'
+	end
+
+
 	if $clothingworntype = 'nude':
 		act 'Wash self':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
+			*nl 'You washed yourself in the creek.'
 			menu_off = 1
 			noShampoo = 1
 			dynamic $showerdin
@@ -54,22 +61,15 @@ if $ARGS[0] = '':
 			if willday_bath ! daystart: willday_bath = daystart & pcs_willpwr += 1
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
-
-			if $pantyworntype = 'none':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			end
-				*nl
-			'You washed yourself in the creek.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-			act 'Finish':gt 'backwater'
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if cumloc[11] = 1 or cumloc[12] = 1:
 		act 'Clean the sperm from your face (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+			*nl 'You carefully wash off the sperm in the creek.'
 			menu_off = 1
 			pcs_makeup = 1
 			cumspclnt = 9
@@ -81,33 +81,28 @@ if $ARGS[0] = '':
 			if huntersRape = 1: huntersRape = 2
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			*nl
-			'You carefully wash off the sperm in the creek.'
-			act 'Finish':gt 'backwater'
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
+			*nl 'You wash off the indecent inscriptions on your body.'
 			menu_off = 1
 			body_write = 0
 			face_write = 0
 			minut += 10
 			gs'stat'
 
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
-			*nl
-			'You wash off the indecent inscriptions on your body.'
-
-			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if cumloc[6] = 1 or cumloc[7] = 1:
 		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
+			*nl 'You clean the cum stains off your clothes.'
 			menu_off = 1
 			cumspclnt = 6
 			gs 'cum_cleanup'
@@ -115,32 +110,21 @@ if $ARGS[0] = '':
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
-			*nl
-			'You clean the cum stains off your clothes.'
-
 			act 'Finish':gt 'backwater'
 		end
 	end
-
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
+			*nl 'You carefully wash your face, removing any impurities.'
 			menu_off = 1
 			cumspclnt = 4
 			gs 'cum_cleanup'
-			if pcs_sweat < 30:
-				pcs_sweat = 15 + rand(0,4)
-			else
-				pcs_sweat -= 10 + rand(0,4)
-			end
+			if pcs_sweat < 30: pcs_sweat = 15 + rand(0,4) else pcs_sweat -= 10 + rand(0,4)
 			minut += 15
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
-			*nl
-			'You carefully wash your face, removing any impurities.'
 			act 'Finish':gt 'backwater'
 		end
 	end
@@ -148,28 +132,22 @@ if $ARGS[0] = '':
 	if clothesAtLocation = 0:
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
+				*clr & cla
 				menu_off = 1
 				if huntersKnowSlut > 0 or (hunters_outside = 0 and hunters_available = 0) or (hour < 7 or hour > 22) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
-					cla
-					*clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(PCloSkirt > 0,'backwaterundress_ski.jpg','backwaterundress.jpg')+'"></center>'
+					'You do not hesitate getting undressed, not caring if anyone is watching.'
 					minut+=5
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
-
-					if PCloSkirt > 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'
-					end
 					gs 'clothing', 'strip', 'backwater'
-					'You do not hesitate getting undressed, not caring if anyone is watching.'
-					act'Back':gt'backwater'
+
+					act'Back': gt 'backwater'
 				else
-					cla
-					*clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 					'You hesitate getting undressed, what if someone suddenly sees you?'
-					act'Back':gt'backwater'
+
+					act'Back': gt 'backwater'
 				end
 			end
 		else
@@ -178,86 +156,61 @@ if $ARGS[0] = '':
 	else
 		if $clothingworntype ! 'nude':
 			act 'Pick up your clothes':
-				cla
-				*clr
-				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater'
-				'You pick up your clothes laying on the ground.'
-				gt $loc, $loc_arg
+				!! 'You pick up your clothes laying on the ground.'
+				gt 'backwater'
 			end
 		elseif forced_naked_day < daystart:
 			act 'Get dressed':
-				cla
-				*clr
-				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 				gs 'underwear', 'wear'
-				'You pick up your clothes laying on the ground and get dressed.'
-				gt $loc, $loc_arg
+				!! 'You pick up your clothes laying on the ground and get dressed.'
+				gt 'backwater'
 			end
 		end
 	end
 
 end
 
-if $ARGS[0] = 'creekside_relax':
-
-end
-
-if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1:
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	gs 'stat'
+if $ARGS[0] = 'hunter':
 	'<center><B>Backwater</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
 	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 
 	if clothesAtLocation = 1:
 		act'Get dressed':
-			cls
-			minut += 5
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
+			*nl 'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
+			minut += 5
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
-			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			act'Further':gt 'backwater'
 		end
 	else
 		act'Hide':
-			cls
-			minut += 1
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
 			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
+			minut += 1
+
 			act'Go back to the hut':gt 'swamp_yard', 'start'
 		end
 	end
 	act'Stay naked':
-		cls
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
+		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
 		hunterslut += 1
 		hunterknowday = day
 		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
-		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
+
 		act'Further':gt 'backwater'
 	end
-	exit
-end
-
-if huntersRape = 2:
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	huntersRape = 3
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax.jpg"></center>'
-	'You sit down by the shore, resting.'
-
-	act 'Further':gt 'hunters', 'start'
 end
 
 --- backwater ---------------------------------

+ 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)'

+ 1 - 0
locations/cikl.qsrc

@@ -54,6 +54,7 @@ if day <= 0:day = 1
 
 ciklNewWeek = 0
 if week > 7:
+	odd_week = iif(odd_week,0,1)
 	ciklNewWeek = 1
 	:loopweek
 	week -= 7

+ 155 - 159
locations/gadforest_event.qsrc

@@ -14,38 +14,36 @@ if $ARGS[0] = 'find_meadow':
 	act 'Ignore it and keep walking':gt 'gadforest', 'forest_edge'
 	act 'Follow the path to see where it goes':
 		*clr & cla
-		meadow = 1
-		minut += 10
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
 		*nl
 		'You follow the path to see where it goes, but soon it becomes indistinguishable from the bushes and trees around you.'
+		meadow = 1
+		minut += 10
+		gs 'stat'
 
 		act 'Look around':
 			*clr & cla
-			minut += 10
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
 			*nl
 			'You''re about to return to the edge of the forest, but you spot a small break in the thicket, from the looks of it, it''s no more than an animal trail.'
+			minut += 10
+			gs 'stat'
 
 			act 'Head down the trail':
 				*clr & cla
-				minut += 10
-				gs 'stat'
-
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 				*nl
 				'A few minutes later, you reach a majestic meadow filled with wildflowers. Judging by its undisturbed state no one else uses it or has been even been here in a long time.'
+				minut += 10
+				gs 'stat'
 
 				act 'Claim the meadow as your own':
 					*clr & cla
-					minut += 10
-					gs 'stat'
-
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 					*nl
 					'You spend some time exploring the meadow and its surroundings. You''re positive no one visits this location. You proclaim the meadow to be your secret hideway all your own.'
+					minut += 10
+					gs 'stat'
 
 					act 'Continue':gt 'meadow', 'start'
 				end
@@ -206,7 +204,6 @@ if $ARGS[0] = 'mushroom_pickers2':
 	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers2.jpg"></center>'
 	*nl
@@ -215,13 +212,13 @@ if $ARGS[0] = 'mushroom_pickers2':
 		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
-		gs 'stat'
-
-		act 'Stay here':gt 'gadforest','forest_edge'
 	else
-		act 'Stay here':gt 'gadforest','forest_edge'
 		act 'Follow them':gt 'gadforest','forest_outskirts'
 	end
+	gs 'stat'
+
+	act 'Stay here':gt 'gadforest','forest_edge'
+
 end
 
 if $ARGS[0] = 'mushroom_pickers3':
@@ -229,34 +226,27 @@ if $ARGS[0] = 'mushroom_pickers3':
 	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
-	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
 	*nl
 	'Wandering through the outskirts of the forest, you notice the mushroom pickers from the village had organized a camp.'
+
+
 	if $clothingworntype = 'nude':
 		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
-		gs 'stat'
-
-		act 'Leave them be':gt 'gadforest','forest_outskirts'
 	else
-		act 'Leave them be':gt 'gadforest','forest_outskirts'
 		act 'Say Hello':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
+			*nl
 			minut += 5
 			if pickersQW <= 3:pickersQW += 1
-			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
-			*nl
 			if pickersQW < 3:
 				'You politely greet them as you are passing by. The men glance at you and respond the same.'
-				act 'Leave':gt $loc, $loc_arg
 			else
 				'You politely greet them as you are passing by. The men look at you and invite you to stop and chat for a bit.'
-				act 'Leave':gt $loc, $loc_arg
 				act 'Chat':
 					*clr & cla
 					minut += 10
@@ -265,10 +255,9 @@ if $ARGS[0] = 'mushroom_pickers3':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
 					*nl
-					pickersrand = rand(0,1)
-					if pickersrand = 0:
+					if rand(0,1) = 0:
 						'They are very good at finding mushrooms and berries, one of them shows you his basket full of mushrooms and berries. You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-					elseif pickersrand = 1:
+					else
 						'One of them asks, "How is your day going?"'
 						if boletus + boletus_cooked + bilberry < 5:
 							'"Not great today." you answer sadly, showing him your less than full basket.'
@@ -279,13 +268,19 @@ if $ARGS[0] = 'mushroom_pickers3':
 						else
 							'"Pretty well today." you answer happily, showing him your full basket.'
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-						end
-					end
+						end if
+					end if
 					act 'Leave':gt 'gadforest','forest_outskirts'
 				end
-			end
+				gs 'stat'
+
+				act 'Leave':gt $loc, $loc_arg
+			end if
 		end
-	end
+	end if
+	gs 'stat'
+
+	act 'Leave them be':gt 'gadforest','forest_outskirts'
 end
 
 if $ARGS[0] = 'mushroom':
@@ -293,7 +288,6 @@ if $ARGS[0] = 'mushroom':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom0.'+rand(1,3)+'.jpg"></center>'
 	*nl
@@ -317,9 +311,10 @@ if $ARGS[0] = 'mushroom':
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
-
-		act 'Continue':gt 'gadforest','forest_center'
 	end
+
+	gs 'stat'
+	act 'Continue':gt 'gadforest','forest_center'
 end
 
 if $ARGS[0] = 'bilberry':
@@ -327,7 +322,6 @@ if $ARGS[0] = 'bilberry':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry'+rand(3,5)+'.jpg"></center>'
 	*nl
@@ -351,9 +345,10 @@ if $ARGS[0] = 'bilberry':
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately your basket is already full and you cannot carry any more berries.'
-
-		act 'Continue':gt 'gadforest','forest_center'
 	end
+	gs 'stat'
+
+	act 'Continue':gt 'gadforest','forest_center'
 end
 
 if $ARGS[0] = 'basket':
@@ -361,10 +356,9 @@ if $ARGS[0] = 'basket':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
-	foresteventrand = rand(1,2)
-	if foresteventrand = 1:
+
+	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_boletus.jpg"></center>'
 		*nl
 		'Wandering in the forest you find a basket full of mushrooms. Strange, someone must have left it here or lost it.'
@@ -374,7 +368,7 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
 		end
-	elseif foresteventrand = 2:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_bilberry.jpg"></center>'
 		*nl
 		'Wandering in the forest you find a basket full of berries. Strange, someone must have left it here or lost it.'
@@ -384,7 +378,9 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more berries.'
 		end
-	end
+	end if
+	gs 'stat'
+
 	act 'Leave the basket alone':gt 'gadforest','forest_center'
 end
 
@@ -437,120 +433,120 @@ if $ARGS[0] = 'forest_hunters':
 
 	act 'Leave them alone':gt 'gadforest', $ReturnAdr
 
-    !%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', $ReturnAdr
-                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', $ReturnAdr
-            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', $ReturnAdr
-                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', $ReturnAdr
-                    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', $ReturnAdr
-            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', $ReturnAdr
-            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', $ReturnAdr
-                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
+	!%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', $ReturnAdr
+				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', $ReturnAdr
+			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', $ReturnAdr
+				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', $ReturnAdr
+					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', $ReturnAdr
+			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', $ReturnAdr
+			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', $ReturnAdr
+				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':

+ 4 - 4
locations/gadforestlost.qsrc

@@ -100,7 +100,7 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforestlost', 'wander'
 if $ARGS[0] = 'wander':
-	if hour >= 6 and hour < 22:
+	if DayStage < 4:
 		act 'Wander trying to get your bearings (1:30)':
 			*clr & cla
 			menu_off = 1
@@ -326,7 +326,7 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforestlost', 'picking'
 if $ARGS[0] = 'picking':
-	if hour >= 6 and hour < 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+	if DayStage < 4 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
 		act 'Look for mushrooms and berries (0:30)':
 			*clr & cla
 			menu_off = 1
@@ -767,7 +767,7 @@ end
 if $ARGS[0] = 'gadforestlost_picture':
 	'<center><H4>Somewhere in the forest</H4></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
+		if DayStage < 4:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost0.'+rand(1,6)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
@@ -779,7 +779,7 @@ if $ARGS[0] = 'gadforestlost_picture':
 			'<font color="red">With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.</font>'
 		end
 	else
-		if hour >= 8 and hour < 20:
+		if DayStage < 4:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter0.'+rand(1,5)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'

+ 1 - 1
locations/gdksport.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		if gsAboDance > 0 and AlbinaQW['StarletsJoined'] = 0 and npc_pregtalk['A23'] = 0:
-			act 'Take a dance lesson, you have <<gsAboDance>> lessons remaining': gt 'gdksport', 'dance2'
+			act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining': gt 'gdksport', 'dance2'
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
 			if (pregtime >= 90) or (grupTipe = 5):
 				if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'

+ 3 - 2
locations/gschool_cheerleading.qsrc

@@ -553,7 +553,7 @@ if $ARGS[0] = 'shower':
 			end
 			act 'Watch':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/lina2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/lina2.jpg"></center>'
 				'She''s putting on a show that''s too good to resist. You continue to watch her but she suddenly arches her back and catches you spying.
 				"<<$pcs_nickname>>!!" she exclaims in surprise as she snaps her legs shut. "I didn''t think anyone else was here." She looks down in embarassment. "Christina asked me eat her out earlier and it left me feeling super horny. I just needed a little relief of my own was all. Can... Can you just pretend that you didn''t see me please?'
 				minut += 5
@@ -868,7 +868,8 @@ if $ARGS[0] = 'shower':
 				end
 			end
 		end if
-	else
+	end if
+	if $CURACTS = '':
 		'You get dressed, place your uniform back in your locker and get ready to leave.'
 		gs 'stat'
 

+ 4 - 4
locations/gschool_detention.qsrc

@@ -444,12 +444,12 @@ if $ARGS[0] = 'strange':
 	*clr & cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det.jpg"></center>'
-	'You take out your phone and play around with it for a while. When you look up, you rather bizzarely notice Feofan sitting at the same table as you, hunched over his folder with his arms surrounding it, obviously trying to hide what he''s looking at. You think it''s odd, yet amusing that one of the nerds is in detention. He seems to very engrossed in what he''s doing and is acting weird. Maybe you should take a peek at what he is doing? But then again, not minding your own business is at least part of the reason why you are here in the first place.'
+	'You take out your phone and play around with it for a while. When you look up, you rather bizzarely notice Feofan sitting at the same table as you, hunched over his folder with his arms surrounding it, obviously trying to hide what he''s looking at. You think it''s odd, yet amusing that one of the nerds is in detention. He seems to be very engrossed in what he''s doing and is acting weird. Maybe you should take a peek at what he''s doing? But then again, not minding your own business is at least part of the reason why you''re here in the first place.'
 	act 'Ignore him':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det.jpg"></center>'
-		'You give him one more curious look and then decide to ignore him, going back to playing something on your phone without reacting to the one or two sideways glances he gives you. After a while, he raises his hand and asks to go to the bathroom. When he gets up, you notice the bulge in his pants and his flushed features. He hurries out of the library and comes back some time later looking... relieved, with the bulge in his pants gone. He sits down at a different table and you soon forget about this little "mystery."'
+		'You give him one more curious look and then decide to ignore him, going back to playing on your phone without reacting to the one or two sideways glances he gives you. After a while, he raises his hand and asks to go to the bathroom. When he gets up, you notice the bulge in his pants and his flushed features. He hurries out of the library and comes back some time later looking... relieved, with the bulge in his pants gone. He sits down at a different table and you soon forget about this little "mystery."'
 		'Time passes really slowly but the bell finally rings and you can gather your stuff and head home.'
 		act 'Go home': gt 'gschool_detention', 'end'
 	end
@@ -457,13 +457,13 @@ if $ARGS[0] = 'strange':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det1.jpg"></center>'
-		'Youe curiousity gets the better of you and you get up, quietly circle behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at a picture of a guy fucking a schoolgirl in the ass, "Albina" scrawled on the page with a winky face. While you stare at the pornographic picture yourself, he notices your presence, turning to look over his shoulder at you, blushing bright red. He frantically covers the image up with his hands and blurts out "Please don''t tell anyone! Especially not Albina!"'
+		'Youe curiousity gets the better of you and you get up, quietly circle around behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at a picture of a guy fucking a schoolgirl in the ass, "Albina" scrawled on the page with a winky face. As you stare at the porn yourself, he notices your presence, turning to look over his shoulder at you, blushing bright red. He frantically covers the image up with his hands and blurts out "Please don''t tell anyone! Especially not Albina!"'
 		act 'Ignore it':
 			*clr & cla
 			npc_rel['A152'] += 1
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det.jpg"></center>'
-			'You roll your eyes at him and then decide to ignore him, going back to playing something on your phone without reacting to the one or two sideways glances he gives you. After a while, he raises his hand and asks to go to the bathroom. When he gets up, you notice the bulge in his pants and his flushed features. He hurries out of the library and comes back some time later looking... relieved, with the bulge in his pants gone. He sits down at a different table and you can''t help but snort a bit in amusement, knowing what he likely went and done.'
+			'You roll your eyes at him and then decide to ignore him, going back to playing on your phone without reacting to the one or two sideways glances he gives you. After a while, he raises his hand and asks to go to the bathroom. When he gets up, you notice the bulge in his pants and his flushed features. He hurries out of the library and comes back some time later looking... relieved, with the bulge in his pants gone. He sits down at a different table and you can''t help but snort a bit in amusement, knowing what he likely went and done.'
 			'Time passes really slowly, but the bell finally rings and you can gather your stuff and head home.'
 			act 'Go home': gt 'gschool_detention', 'end'
 		end

+ 14 - 10
locations/gschool_gossip.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'mixed':
 end
 
 if $ARGS[0] = 'boys':
-	chat_rand = rand(1,42)
+	chat_rand = rand(1,45)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!" His friend does not seem impressed and scoffs back "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin if your life depended on it."'
 	elseif chat_rand = 2:
@@ -736,8 +736,8 @@ if $ARGS[0] = 'boys':
 	elseif chat_rand = 44:
 	    'You overhear two scrawny boys speaking to each other.'
         '"Word is that Albina loves anal and makes people eat her ass." the first one whispers.'
-        'The other boy grins slyly. "The things I would do just to lick her asshole, but I would love to stick my dick between those big firm cheeks and-"'
-        'The first boy hushes his friend and looks nervously in Albina''s direction, who notices him staring at her and narrows her eyes, causing him to look back at his friend. "Quiet you idiot! You won''t have a dick left if she hears you talking about her like that!"' 
+        'The other boy grins slyly. "The things I would do to have a shot at licking her asshole... She''s got some serious junk in the trunk, but I would love to put my junk in her trunk." he says with a perverted laugh. "Having my dick between those sweet cheeks would be-"'
+        'The first boy hushes his friend and looks nervously in Albina''s direction, who notices him staring at her and narrows her eyes, causing him to quickly look back at his friend. "Quiet you idiot! You won''t have a dick left if she hears you talking about her like that!"' 
 	elseif chat_rand = 45:
 	    'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
         '"Come on, you know you want it!" you hear one of them say.'
@@ -760,7 +760,7 @@ end
 
 
 if $ARGS[0] = 'girls':
-	chat_rand = rand(1,40)
+	chat_rand = rand(1,43)
 	if chat_rand = 1:
 		'"I quit volleyball."'
 		'"Why?"'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'girls':
 	    'You overhear some girls whispering amongst themselves.'
         '"I was told that Albina is actually a lesbian, which is why she doesn''t like guys hitting on her." one says.'
         '"Told by who?" a second one asks.'
-        '"Lizeveta. Although I also heard she sometimes skips class for a quicky in the bathrooms with some of the guys, so maybe she''s actually bi, like Anushka?"'
+        '"Lizeveta. Although I also heard she sometimes skips class for a quicky in the bathrooms with some of the hot guys, so maybe she''s actually bi, like Anushka?"'
         '"Still. You mean to say I have a better chance at eating her amazing ass than any of the guys here?" a third one says and they all laugh.'
 	else	
 		gs 'gschool_gossip', 'girls'
@@ -968,7 +968,7 @@ if $ARGS[0] = 'girls':
 end
 
 if $ARGS[0] = 'Lizaveta':
-	chat_rand = rand(1, 46)
+	chat_rand = rand(1, 48)
 	if chat_rand = 1:
 		'"I heard Andrey cheats on Stasya!"'
 	elseif chat_rand = 2:
@@ -1062,6 +1062,10 @@ if $ARGS[0] = 'Lizaveta':
 		'"Radomir acts like he is already the next Yuri Shatunov. I mean, he''s OK, but nowhere near as good as he likes to think he is."'
 	elseif chat_rand = 46:
 		'"Lera is a lesbian. All you have to do is watch how she looks at Lena or other girls in the locker room."'
+	elseif chat_rand = 47:
+	    '"I''ve heard so many things about Albina''s ass that I don''t know what to tell people! She also likes anal, I mean <i>really</i> likes anal."'
+	elseif chat_rand = 48:
+	    '"I think Albina is a lesbian. Why else would she hate all the hot guys hitting on her?"'
 	end
 end
 
@@ -1105,10 +1109,10 @@ if $ARGS[0] = 'gosip':
 			'"I swear, it''s true! Maybe he''ll shoot us a video next time..."'
 		elseif pav_sex < 100:
 			*nl
-			'"They say, <<$pcs_nickname>> took part in a blowbang recently!"'
+			'"They say <<$pcs_nickname>> took part in a blowbang recently!"'
 			'"What, really? How did she even get in that situation?"'
 			'"Apparently, she just got down on her knees and told all the guys to gather around her in a circle!"'
-			'"Wow, what a slut I can''t believe it."'
+			'"Wow, what a slut! I can''t believe it."'
 			'"I know, right!?"'
 		elseif pav_sex < 125:
 			*nl
@@ -1121,8 +1125,8 @@ if $ARGS[0] = 'gosip':
 			*nl
 			'"Man, <<$pcs_nickname>> is such a washed up whore."'
 			'"I know, right? It''s kind of sad, really."'
-			'"Sad, but kind of hot at the same time. I wouldn''t mind getting a piece, she must be great in the sack with how often she gets fucked."'
-			'"If you can even feel anything, she must be so stretched out by now."'
+			'"Sad, but kind of hot at the same time. I wouldn''t mind getting a piece - she must be great in the sack with how often she gets fucked."'
+			'"If you can even feel anything. She must be so stretched out by now."'
 		else
 			*nl
 			'"<<$pcs_nickname>> is such a washed up whore. She''ll do anything for money, nowadays."'

+ 22 - 26
locations/hunter_ambient.qsrc

@@ -7,8 +7,6 @@ if $ARGS[0] = 'nude_model_convo':
 	hunter_sexual_comfort += 5
 	hunter_collective_opinion += 3
 
-	gs 'stat'
-
 	'"I''m telling you, I''ve seen her pictures in a men''s magazine." you overhear Igor.'
 	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
 end
@@ -19,8 +17,6 @@ if $ARGS[0] = 'stripper_convo':
 	hunter_sexual_comfort += 5
 	hunter_collective_opinion -= 3
 
-	gs 'stat'
-
 	'"I promise you, it was her, I swear!" you overhear Sergei. "She was on the stage, stripping and dancing."'
 	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
 end
@@ -31,14 +27,12 @@ if $ARGS[0] = 'pornstar_convo':
 	hunter_sexual_comfort += 7
 	hunter_collective_opinion -= 5
 
-	gs 'stat'
 	'"I recently downloaded some porn, and guess who was getting fucked in the video. Trust me, it was <<$pfname>>." you overhear Andrei.'
 	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
 end
 
 if $ARGS[0] = 'river_rape_convo':
 	huntersRape = 1
-	gs 'stat'
 
 	hunter_sexual_comfort += 7
 	hunter_collective_opinion -= 10
@@ -208,8 +202,6 @@ end
 !Branch conversation events (events that call the actual conversations)
 
 if $ARGS[0] = 'yard_convo':
-	minut += 5
-
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstalk.jpg"></center>'
 	'While walking around the yard you overhear the hunters'' conversation'
@@ -219,20 +211,19 @@ if $ARGS[0] = 'yard_convo':
 	!Keep specific conversations on stuff Sveta has been doing near the top so that they fire before generic conversation
 
 	!TODO: They do not just shut up when they notice Sveta, there is an opinion or comfort check for them saying something
-	if fame_sexind > 10 and city_modelling > 30 and huntersknowfoto = 0 and convo_rng_roll = 1:
-		gs 'hunter_ambient', 'nude_model_convo'
-
-	elseif stripdancesum > 0 and huntersknowstrip = 0 and convo_rng_roll = 2:
-		gs 'hunter_ambient', 'stripper_convo'
-
-	elseif film > 0 and huntersknowfilm = 0 and convo_rng_roll = 3:
-		gs 'hunter_ambient', 'pornstar_convo'
-
-	elseif gadriver_gang > 0 and huntersRape = 0 and convo_rng_roll = 4:
-		gs 'hunter_ambient', 'river_rape_convo'
+	if convo_rng_roll = 1:
+		if fame_sexind > 10 and city_modelling > 30 and huntersknowfoto = 0 : gs 'hunter_ambient', 'nude_model_convo'
+	elseif convo_rng_roll = 2:
+		if stripdancesum > 0 and huntersknowstrip = 0: gs 'hunter_ambient', 'stripper_convo'
+	elseif convo_rng_roll = 3:
+		if film > 0 and huntersknowfilm = 0: gs 'hunter_ambient', 'pornstar_convo'
+	elseif convo_rng_roll = 4:
+		if gadriver_gang > 0 and huntersRape = 0: gs 'hunter_ambient', 'river_rape_convo'
 	else
 		gs 'hunter_ambient', 'generic_convo'
 	end
+	minut += 5
+	gs 'stat'
 
 	act 'Further':gt 'swamp_yard', 'start'
 end
@@ -249,27 +240,32 @@ if $ARGS[0] = 'schedule':
 	killvar 'hunters_sleep'
 	killvar 'hunters_available'
 	killvar 'hunters_hunting'
+	killvar 'hunters_chattime'
+
 
 	if hunters_were_met > 0:
 		if hour = 7:
 			hunters_breakfast = 1
 			hunters_available = 1
-			if campfire = 0: hunters_inside  = 1
+			if (sunWeather = 0 or temper <  15) or (campfire = 0): hunters_inside  = 1
 		elseif hour = 8:
 			hunters_available = 1
-			if (sunWeather = 0 or temper <  15) and (campfire = 0): hunters_inside  = 1 
+			hunters_chattime = 1
+			if (sunWeather = 0 or temper <  15): hunters_inside  = 1
 		elseif hour > 8 and hour < 12:
 			hunters_hunting = 1
-		elseif hour >=12 and hour < 14:
+		elseif hour = 12 or hour = 13:
 			hunters_lunch = 1
 			hunters_available = 1
-			if campfire = 0: hunters_inside  = 1
-		elseif hour >= 14 and hour < 18:
+			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 (sunWeather = 0 or temper <  15) and (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
@@ -277,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) and (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

+ 46 - 53
locations/hunter_favors.qsrc

@@ -55,8 +55,8 @@ if $ARGS[0] = 'housekeeping_request':
 				if hunter_collective_opinion >= 15:'"Actually, nevermind. I got this, thanks though."'
 				if hunter_collective_opinion < 15:'"Actually, nevermind. I do not have anything you are useful for."'
 				act 'Okay':
-				    hunter_collective_opinion += 5
-				    gt 'swamp_yard', 'start'
+					hunter_collective_opinion += 5
+					gt 'swamp_yard', 'start'
 				end
 			end
 		end
@@ -90,8 +90,11 @@ if $ARGS[0] = 'housekeeping_request':
 end
 
 if $ARGS[0] = 'yard_cleanup':
-	cla & *clr
-
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamp_yard.jpg"></center>'
+	'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.'
 	if dirty_swamp_yard < 10:
 		minut += 60 & gs 'sweat', 'add', 10
 	elseif dirty_swamp_yard < 20:
@@ -99,67 +102,62 @@ if $ARGS[0] = 'yard_cleanup':
 	else
 		minut += 180 & gs 'sweat', 'add', 30
 	end
-
+	dirty_swamp_yard = 0
+	hunter_collective_opinion += 2
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamp_yard.jpg"></center>'
-	'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.'
-
-	act 'Done':dirty_swamp_yard = 0 & hunter_collective_opinion += 2 & gt 'swamp_yard', 'start'
+	act 'Done': gt 'swamp_yard', 'start'
 end
 
 if $ARGS[0] = 'dirty_swamphouse':
-	cla
-	*clr
 	menu_off = 1
-	if dirty_swamphouse > 10:minut += 60 & gs 'sweat', 'add', 10
-	if dirty_swamphouse >= 10 and dirty_swamphouse < 20:minut += 120 & gs 'sweat', 'add', 20
-	if dirty_swamphouse >= 20:minut += 180 & gs 'sweat', 'add', 30
-	if huntersAndreiQw < 15:huntersAndreiQw += 1
-	if huntersIgorQw < 15:huntersIgorQw += 1
-	if huntersSergeiQw < 15:huntersSergeiQw += 1
-	gs 'stat'
-
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamphouse.jpg"></center>'
 	*nl
 	'Visiting the hut, you notice that the hut has gotten pretty dirty. "I need to do something about this." you think to yourself. You grab a broom and a rag and began cleaning.'
 	'After a while you''ve finished cleaning and put back everything in order again. You''re quite pleased with yourself.'
 
-	act 'Continue':dirty_swamphouse = 0 & gt 'swamphouse', 'start'
+	if dirty_swamphouse < 10:
+		minut += 60
+		gs 'sweat', 'add', 10
+	elseif dirty_swamphouse < 20:
+		minut += 120
+		gs 'sweat', 'add', 20
+	else
+		minut += 180
+		gs 'sweat', 'add', 30
+	end if
+	if huntersAndreiQw < 15:huntersAndreiQw += 1
+	if huntersIgorQw < 15:huntersIgorQw += 1
+	if huntersSergeiQw < 15:huntersSergeiQw += 1
+	dirty_swamphouse = 0
+	gs 'stat'
+
+	act 'Continue': gt 'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'meat_stew':
-	cla
-	*clr
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
+	*nl	'You cooked a stew with the meat hunters brought. There''s enough for <<mushroom_soup>> servings'
 	raw_meat -= 1
 	minut += 60
 	bucket -= 1
 	meat_stew = 2
-
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
-	*nl
-
-	'You cooked a stew with the meat hunters brought. There''s enough for <<mushroom_soup>> servings'
 
 	act 'Continue': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'mushroom_soup':
-	cla
-	*clr
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
+	*nl	'You made a simple mushroom soup by the camppfire and carried it inside the hut. There''s enough for <<mushroom_soup>> servings'
 	boletus -= 1
 	minut += 30
 	bucket -= 1
 	mushroom_soup = 4
-
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
-	*nl
-
-	'You made a simple mushroom soup by the camppfire and carried it inside the hut. There''s enough for <<mushroom_soup>> servings'
 
 	act 'Continue': gt $loc, $loc_arg
 end
@@ -167,11 +165,10 @@ end
 !Sexual favors
 if $ARGS[0] = 'creekside_gangbang_request':
 	*clr & cla
-	minut += 5
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax2.jpg"></center>'
 	'You''re sitting down in the meadow near the road, relaxing, enjoying the nice weather, when all of a sudden Andrei, Sergei and Igor approach you. They quickly surround you not letting move away.'
 	'"Hey, <<$pcs_nickname>>, we''ve been talking with each other, and we feel that you need to repay us somehow for the lessons. So what do you say?"'
+	minut += 5
 
 	!TODO: WP check to agree?
 	act 'Agree':
@@ -211,7 +208,6 @@ if $ARGS[0] = 'creekside_gangbang_request':
 		act 'Refuse (<<will_cost>> Willpower)':
 			*clr & cla
 			minut += 5
-
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 
@@ -223,19 +219,15 @@ if $ARGS[0] = 'creekside_gangbang_request':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)':
-		*clr & cla
-		minut += 5
-
-		hunter_collective_opinion -= 25
-		hunter_sexual_comfort += 15
-
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax3.jpg"></center>'
-		'You politely refuse saying you don''t owe them anything, but the men won''t accept a no and you can see that they''re clearly not satisfied with your answer.'
-		'"<<$pcs_nickname>>, don''t fuck around with us. Deep inside you know you need to repay us." said Andrei, grabbing you by the hair.'
-
-		gs 'hunter_interactions', 'creekside_rape'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax3.jpg"></center>'
+			'You politely refuse saying you don''t owe them anything, but the men won''t accept a no and you can see that they''re clearly not satisfied with your answer.'
+			'"<<$pcs_nickname>>, don''t fuck around with us. Deep inside you know you need to repay us." said Andrei, grabbing you by the hair.'
+			minut += 5
+			hunter_collective_opinion -= 25
+			hunter_sexual_comfort += 15
+			gs 'hunter_interactions', 'creekside_rape'
+			gs 'stat'
 		end
 	end
 end
@@ -566,7 +558,8 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'cum_manage'
 				gs 'stat'
 
-				*nl 'After a few more minutes of railing your pussy, you feel Ifor pulling out and cumming all over your ass and back'
+				*nl
+				'After a few more minutes of railing your pussy, you feel Igor pulling out and cumming all over your ass and back'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked_cum.jpg"></center>'
 
 				act 'Further':

+ 136 - 187
locations/hunter_interactions.qsrc

@@ -4,66 +4,46 @@
 if $ARGS[0] = 'smoke_with_hunters':
 	*clr & cla
 	temp_sh = rand(1,4)
-	gs 'stat'
 
 	if temp_sh = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker1.jpg"></center>'
 		*nl
 		'The men ask you if you want to go out for a smoke.'
+		gs 'stat'
 
-		act 'Refuse': gs 'swamphouse', 'meal_table'
 		act 'Agree':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
+			*nl 'You follow them outside, they give you a cigarette, you light it and smoke it...'
+			if huntersKnowSlut = 0: huntersAndreiQw += 1 & huntersIgorQw += 1 & huntersSergeiQw += 1
 			minut += 15
 			siga += 1
 			gs 'drugs', 'smoke'
-			if huntersKnowSlut = 0:huntersAndreiQw += 1
-			if huntersKnowSlut = 0:huntersIgorQw += 1
-			if huntersKnowSlut = 0:huntersSergeiQw += 1
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
-			*nl
-			'You follow them outside, they give you a cigarette, you light it and smoke it...'
-
-		act 'Return to the table': gs 'swamphouse', 'meal_table'
+			act 'Return to the table': gs 'swamphouse', 'meal_table'
 		end
-	end
-	if temp_sh = 2:
+	elseif temp_sh = 2:
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
+		*nl 'Andrei offers you a cigarette.'
+		gs 'stat'
+
+		act 'Agree':
 			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
-			*nl
-			'Andrei offers you a cigarette.'
 
 			if huntersAndreiQw < 15 and huntersKnowSlut = 0 or huntersAndreiLove = 1:
-				act 'Agree':
-					*clr & cla
-					minut += 15
-					siga += 1
-					gs 'drugs', 'smoke'
-					huntersAndreiQw += 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
-					*nl
-					'The two of you walk outside, Andrei hands you a cigarette. You start talking about your feelings for each other.'
-
-					act 'Return to the table': gs 'swamphouse', 'meal_table'
-				end
-			end
-			if huntersAndreiQw >= 15 and huntersAndreiLove = 0 and huntersKnowSlut = 0:
-				if smokbj = 0:
-					act 'Agree':
-						*clr & cla
-						minut += 15
-						siga += 1
-						gs 'drugs', 'smoke'
-						huntersAndreiQw += 1
-						gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
+				*nl 'The two of you walk outside, Andrei hands you a cigarette. You start talking about your feelings for each other.'
+				minut += 15
+				siga += 1
+				gs 'drugs', 'smoke'
+				huntersAndreiQw += 1
+				gs 'stat'
 
+				act 'Return to the table': gs 'swamphouse', 'meal_table'
+			else
+				if huntersAndreiQw >= 15 and huntersKnowSlut = 0:
+					if smokbj = 0:
 						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 						*nl
 						'You follow Andrei outside. He gives you a cigarette, and the two of you continue on with your conversation. Suddenly Andrei, looking in your eyes, says:'
@@ -74,145 +54,147 @@ if $ARGS[0] = 'smoke_with_hunters':
 						'"Now <<$pcs_nickname>>, if you could help me out now and then, I would be very graIn the sput of the moment, while the men cheer you on, you remove your topteful," Andrei continued.'
 						'You watch in disbelief, he''s clearly not joking around. You can see on Andrei''s facial expression that he''s being dead serious.'
 						'"I won''t tell anybody about this, don''t worry, no one will know." he adds quickly. "Well, <<$pcs_nickname>>, what do you say?'
+						minut += 15
+						siga += 1
+						gs 'drugs', 'smoke'
+						huntersAndreiQw += 1
+						gs 'stat'
 
 						act 'Agree':
 							*clr & cla
-							minut += 10
-							pcs_horny += 10
-							hunterslut += 2
-							smokbj = 1
-							huntersAndreiQw += 1
-							gs 'stat'
-
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 							*nl
 							'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend is nice, but you sense that there''s an ulterior motive.'
 							'"Well Andrei, after carefully thinking about it, I''ll help you out. How do you want me to help you out?" you ask.'
 							'"Damn, <<$pcs_nickname>>, I knew you would," he replied. "Well, I wouldn''t mind a blowjob now and then, that''s good enough for me."'
 							'"Go back to the hut, and crawl under the table so no one notices." he adds while getting up from the bench.'
+							minut += 10
+							pcs_horny += 10
+							hunterslut += 2
+							smokbj = 1
+							huntersAndreiQw += 1
+							gs 'stat'
 
 							act 'Go': gs 'swamphouse', 'huntersmokBJ'
 						end
-
 						if alko < 6:
 							act 'Refuse':
 								*clr & cla
-								minut += 10
-								hunterslut -= 1
-								huntersAndreiQw += 1
-								gs 'stat'
-
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 								*nl
 								'After you hear him out, you start seriously considering his offer. It would be nice to help out a friend is nice, but you sense that there''s an ulterior motive.'
 								'"No Andrei, I''m sorry but I refuse." you answer. "How could you even think that I would be accepting your offer?'
 								'You got up from the bench and quickly went back to the hut.'
+								minut += 10
+								hunterslut -= 1
+								huntersAndreiQw += 1
+								gs 'stat'
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end
-					end
-				else
-					act 'Agree':
-						*clr & cla
+						end if
+					else
+						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
+						*nl
+						'You went outside for a smoke, with Andrei following after you, immediately saying:'
+						'"Forget the cigarette <<$pcs_nickname>>, go back inside and crawl under the table, I need you so bad right now...'
 						minut += 10
 						pcs_horny += 5
 						hunterslut += 1
 						huntersAndreiQw += 1
 						gs 'stat'
 
-						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
-						*nl
-						'You went outside for a smoke, with Andrei following after you, immediately saying:'
-						'"Forget the cigarette <<$pcs_nickname>>, go back inside and crawl under the table, I need you so bad right now...'
-
 						act 'Go': gs 'swamphouse', 'huntersmokBJ'
+
 						if alko < 6:
 							act 'Refuse':
 								*clr & cla
-								minut += 10
-								hunterslut -= 1
-								huntersAndreiQw -= 50
-								gs 'stat'
-
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks'+rand(1,2)+'.jpg"></center>'
 								*nl
 								'"You know what Andrei, I''ve changed my mind. I''m more than happy to help a friend in need, but I''m not some whore that only exists for your pleasure."'
 								'You got up from the bench and quickly went back to the hut.'
+								minut += 10
+								hunterslut -= 1
+								huntersAndreiQw -= 50
+								gs 'stat'
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end
-					end
-				end
-			end
-			if huntersKnowSlut = 1:
-				act 'Agree':
-					*clr & cla
-					minut += 10
-					pcs_horny += 5
-					gs 'stat'
-
+						end if
+					end if
+				else
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 					*nl
 					'You went outside for a smoke, with Andrei following after you, immediately saying:'
 					'"To hell with the cigarette <<$pcs_nickname>>, I need to relieve some stress."'
+					minut += 10
+					pcs_horny += 5
+					gs 'stat'
 
 					act 'Go': gs 'swamphouse', 'huntersmokBJ'
-				end
-			end
-			act 'Refuse': gs 'swamphouse', 'meal_table'
-	end
-	if temp_sh = 3:
+				end if
+			end if
+		end
+	elseif temp_sh = 3:
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
+		*nl
+		'Sergei offers you a cigarette.'
+		gs 'stat'
+
+		act 'Agree':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
+			*nl 'You followed Sergei outside. He gives you a cigarette, and the two of you continue on with your conversation.'
+			minut += 15
+			siga += 1
+			gs 'drugs', 'smoke'
+			if huntersKnowSlut = 0:huntersSergeiQw += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
-			*nl
-			'Sergei offers you a cigarette.'
-
-			act 'Agree':
-				*clr & cla
-				minut += 15
-				siga += 1
-				gs 'drugs', 'smoke'
-				if huntersKnowSlut = 0:huntersSergeiQw += 1
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
-				*nl
-				'You followed Sergei outside. He gives you a cigarette, and the two of you continue on with your conversation.'
 
+			act 'Return to the table': gs 'swamphouse', 'meal_table'
+		end
+	elseif temp_sh = 4:
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
+		*nl 'Igor offers you a cigarette.'
+		gs 'stat'
 
-				act 'Return to the table': gs 'swamphouse', 'meal_table'
-			end
-			act 'Refuse': gs 'swamphouse', 'meal_table'
-	end
-	if temp_sh = 4:
+		act 'Agree':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
+			*nl 'You followed Igor outside. He gives you a cigarette, and the two of you continue on with your conversation.'
+			minut += 15
+			siga += 1
+			gs 'drugs', 'smoke'
+			if huntersKnowSlut = 0:huntersIgorQw += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
-			*nl
-			'Igor offers you a cigarette.'
 
-			act 'Agree':
-				*clr & cla
-				minut += 15
-				siga += 1
-				gs 'drugs', 'smoke'
-				if huntersKnowSlut = 0:huntersIgorQw += 1
-				gs 'stat'
+			act 'Return to the table': gs 'swamphouse', 'meal_table'
+		end
+	end if
+	act 'Refuse': gs 'swamphouse', 'meal_table'
+end
 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersmoker2.jpg"></center>'
-				*nl
-				'You followed Igor outside. He gives you a cigarette, and the two of you continue on with your conversation.'
+if $ARGS[0] = 'chat_with_hunters':
 
-				act 'Return to the table': gs 'swamphouse', 'meal_table'
-			end
-			act 'Refuse': gs 'swamphouse', 'meal_table'
+	if hunter_sexual_comfort > 40 and alko > 4 and $clothingworntype ! 'nude' and rand(1,5) = 1:
+		gt 'hunter_interactions', 'chat_with_hunters_theme', 'entertainment'
+	else
+		if boy_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
+			gt 'hunter_interactions', 'chat_with_hunters_theme', 'boy_talk'
+		elseif boy_talk = 1 and virginity_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
+			gt 'hunter_interactions', 'chat_with_hunters_theme', 'virginity_talk'
+		elseif PCloSkirt > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
+			gt 'hunter_interactions', 'chat_with_hunters_theme', 'pantiless_flash'
+		elseif $clothingworntype = 'nude' and $pantyworntype = 'none' and rand(1,3) = 1:
+			gt 'hunter_interactions', 'chat_with_hunters_theme', 'nude'
+		else
+			gt 'hunter_interactions', 'chat_with_hunters_theme', 'generic'
+		end
 	end
-end
 
-if $ARGS[0] = 'chat_with_hunters':
+end if
+
+if $ARGS[0] = 'chat_with_hunters_theme':
 	*clr & cla
 	minut += rand (15,30)
 	pcs_mood += rand(10,20)
@@ -222,57 +204,32 @@ if $ARGS[0] = 'chat_with_hunters':
 
 	act 'Finish chatting': gt $loc, $loc_arg
 
-	if $ARGS[1] = '':
-		if hunter_sexual_comfort > 40 and alko > 4 and $clothingworntype ! 'nude' and rand(1,5) = 1:
-			gt 'hunter_interactions', 'chat_with_hunters', 'entertainment'
-		end
-
-		if boy_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
-			gs 'hunter_interactions', 'chat_with_hunters', 'boy_talk'
-		elseif boy_talk = 1 and virginity_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
-			gs 'hunter_interactions', 'chat_with_hunters', 'virginity_talk'
-		elseif PCloSkirt > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
-			gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
-		elseif $clothingworntype = 'nude' and $pantyworntype = 'none' and rand(1,3) = 1:
-			gs 'hunter_interactions', 'chat_with_hunters', 'nude'
-		else
-			gs 'hunter_interactions', 'chat_with_hunters', 'generic'
-		end
-	end
-
 	if $ARGS[1] = 'generic':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
 		'You enthusiastically listen to the their hunting stories and even share some of your stories.'
 		gs 'hunter_ambient', 'generic_convo'
 		'You get so caught up in the conversation, you don''t even notice how fast the time flies by.'
-	end
-
-	if $ARGS[1] = 'pantiless_flash':
-		*clr & cla
+	elseif $ARGS[1] = 'pantiless_flash':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'
+		'You are sitting in front of the men, not wearing any panties, so the stories you tell are mostly ignored by the men throwing not-so-subtle glances at your exposed pussy.'
 		if hunter_sexual_comfort > 30:
 			hunter_collective_opinion += 1
 			hunter_sexual_comfort += 3
 		else
 			hunter_collective_opinion -= 2
 			hunter_sexual_comfort += 5
-		end
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'
-		'You are sitting in front of the men, not wearing any panties, so the stories you tell are mostly ignored by the men throwing not-so-subtle glances at your exposed pussy.'
-		gs 'arousal', 5, 'flashlite'
+		end if
+		gs 'arousal', -5, 'flashlite'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
-		act 'Further': gt 'swamp_yard', 'campfire'
-	end
-
-	if $ARGS[1] = 'boy_talk':
-		*clr
 
-		boy_talk = 1
+		act 'Further': gt 'swamp_yard', 'campfire'
 
+	elseif $ARGS[1] = 'boy_talk':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 		'"So, <<$pcs_nickname>>, anyone special in your life?" Igor asks, slurring noticably'
+		boy_talk = 1
+		gs 'stat'
 
 		act 'Yes, actually':
 			cla
@@ -283,21 +240,20 @@ if $ARGS[0] = 'chat_with_hunters':
 			if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
 				'"Now that''s a lucky guy heh." says Andrei. "Let us know if he dares upset you though, we will show him"'
 			elseif hunter_sexual_comfort > 50 and $clothingworntype ! 'nude':
-				cla
 				'"Bet he is not as fun as us" says Andrei. "Also bet he is not as fun to suck off as us" he says, his eyes stripping you already.'
-
 				gs 'willpower', 'resist', 'bj', iif(hunter_collective_opinion > 40, 'easy', 'hard')
 				if will_cost <= pcs_willpwr:
-					act 'Maybe another time boys (<<will_cost>> Willpower)': 
+					act 'Maybe another time boys (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
 						gt 'swamp_yard', 'campfire'
 					end
 				else
 					act 'Maybe another time boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-				
+				end if
+				gs 'stat'
+
 				act 'Approach the hunters to find out': gt 'hunter_favors', 'nighttime_entertainment'
-			end
+			end if
 		end
 		act 'No, not really':
 			cla
@@ -309,18 +265,15 @@ if $ARGS[0] = 'chat_with_hunters':
 			else
 				'"Well guess it is better that way. You do not have someone to think about while we are having some fun" says Andrei'
 			end
+			gs 'stat'
+
 			act 'Finish chatting': gt 'swamp_yard', 'campfire'
 		end
-	end
-
-	if $ARGS[1] = 'virginity_talk':
-		*clr
-
-		virginity_talk = 1
-
+	elseif $ARGS[1] = 'virginity_talk':
 		!TODO: Add event branch with no panties and short skirt or nude
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 		'"So, <<$pcs_nickname>>, have you ever done it with a boy" Andrei asks, grinning mischievously.'
+		virginity_talk = 1
 		act '...no':
 			cla
 			hunter_sexual_comfort -= 5
@@ -336,7 +289,7 @@ if $ARGS[0] = 'chat_with_hunters':
 				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
 				!act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
 				act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
-			end
+			end if
 		end
 		act 'Uhh... kinda...':
 			cla
@@ -353,13 +306,12 @@ if $ARGS[0] = 'chat_with_hunters':
 				!end
 
 				!act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'nighttime_entertainment'
-			end
+			end if
 		end
-	end
-
-	if $ARGS[1] = 'nude':
+	elseif $ARGS[1] = 'nude':
 		*clr & cla
-
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/nude.jpg"></center>'
+		'You stand by the fire to chat up a bit with the men. Although you feel like the men are simply nodding along with whatever you are saying, staring at your bared ass and tits, devouring your exposed body with their eyes instead.'
 		if hunter_sexual_comfort > 30:
 			hunter_collective_opinion += 1
 			hunter_sexual_comfort += 5
@@ -367,18 +319,12 @@ if $ARGS[0] = 'chat_with_hunters':
 			hunter_collective_opinion -= 3
 			hunter_sexual_comfort += 7
 		end
-
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/nude.jpg"></center>'
-		'You stand by the fire to chat up a bit with the men. Although you feel like the men are simply nodding along with whatever you are saying, staring at your bared ass and tits, devouring your exposed body with their eyes instead.'
-		gs 'arousal', 15, 'flash'
-		minut -= 10
+		gs 'arousal', -15, 'flash'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue': gt 'swamp_yard', 'campfire'
-	end
 
-	if $ARGS[1] = 'entertainment':
+		act 'Continue': gt 'swamp_yard', 'campfire'
+	elseif $ARGS[1] = 'entertainment':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
 		'"Hey, <<$pcs_nickname>>, can you do us a favor?" says Andrei, seeing you approach them. "We are in desperate need of some entertainment. Say, why don''t you help us with that?"'
@@ -387,7 +333,7 @@ if $ARGS[0] = 'chat_with_hunters':
 		act 'Kneel down to oblige the boys': gt 'hunter_favors', 'nighttime_entertainment'
 		if alko < 7:
 			act 'Refuse the perverts. You are not their personal fucktoy':
-				*clr & cla
+				cla
 				'"Do I look like your private whore? Suck each other off if you are that desperate" you say, stomping off to the roar of laughter that erupts in response'
 
 				if hunter_collective_opinion > 20:
@@ -400,6 +346,9 @@ if $ARGS[0] = 'chat_with_hunters':
 				act 'Continue': gt 'swamp_yard', 'campfire'
 			end
 		end
+	else
+		MSG 'Please report dead end for this arguments: hunter_interactions - <<$ARGS[0]>> - <<$ARGS[1]>>'
+		act 'Continue': gt 'swamp_yard', 'campfire'
 	end
 end
 

+ 15 - 7
locations/hunters.qsrc

@@ -8,12 +8,20 @@ if $ARGS[0] = 'start':
 	!$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 hunters_were_met > 0:
-		if hour = 8 or hour = 14 or hour = 19:
+		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>'
@@ -55,7 +63,7 @@ if $ARGS[0] = 'start':
 			act 'Sit down': gt 'hunters', 'start'
 			act 'Move away': gt 'swamp_yard', 'start'
 		end
-	elseif hour = 8 or hour = 14 or hour = 19:
+	elseif hunters_chattime = 1:
 		if huntersKnowSlut > 0 and pcs_horny > 50 and mesec <= 0:
 			act 'Stick around':
 				*clr & cla
@@ -274,9 +282,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 	else
-		act'Talk to Andrei':gt'andreihunter'
-		act'Talk to Sergei':gt'sergeihunter'
-		act'Talk to Igor':gt'igorhunter'
+		if hunters_evening = 0: act'Talk to Andrei':gt 'andreihunter'
+		act'Talk to Sergei':gt 'sergeihunter'
+		act'Talk to Igor':gt 'igorhunter'
 	end
 
 	!actions if the SG slut in Gadukino

+ 263 - 284
locations/igorhunter.qsrc

@@ -19,317 +19,296 @@ izvrat = 0
 boyage = year - ((npc_dob['A173'] - (npc_dob['A173'] mod 10000)) / 10000)
 boy_birth_date = 9
 boy_birth_month = 6
-gs 'stat'
-
-'<center><b><font color = maroon>Igor Anisimov</font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
-'Igor is a hunter along with the Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center..'
-if huntersIgorQw < 0:'You and him have a bad relationship, because you offended him in the past.'
-if huntersIgorQw >= 0 and huntersIgorQw < 10:'You have a normal relationship with him.'
-if huntersIgorQw >= 10 and huntersIgorQw < 20:'You have friendly relations with him.'
-if huntersIgorQw >= 20 and huntersIgorQw < 25:'You''re good friends.'
-if huntersIgorQw >= 25 and huntersIgorQw < 30:'It seems he has a crush on you.'
-if huntersIgorQw >= 30 and huntersIgorQw <= 35:'You have a mutual crush on each other.'
-if huntersIgorQw > 35 :'You love him.'
-if huntersIgorLove = 1:'You two have fallen in love.'
-if huntersIgorLove = 2:'<<$boydesc>> is your boyfriend.'
-if huntersIgorLove = 3:'<<$boydesc>> is your husband.'
-
-act 'Chat (0:30)':
-	*clr & cla
-	minut += 30
-	menu_off = 1
-	if huntersIgorQw < 10:huntersIgorQw += 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
-	if huntersIgorQw >= 0:'You have a chat with Igor, swapping stories about life and love.'
-	if huntersIgorQw < 0:'You talk to Igor. He wears his heart on his sleeve, so you can tell he doesn''t like you.'
-
-	act'Continue':gt $loc, $loc_arg
-end
-
-if huntersIgorQw >= 10:
-	if huntersIgorLove = 0:
-		act 'Flirt':
-			minut += 5
-			menu_off = 1
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
-			*clr & cla
-			if huntersIgorQw <= 35 and huntersKnowSlut = 0:huntersIgorQw += 1
-			if huntersAndreiQw >= 10 and huntersKnowSlut = 0:huntersAndreiQw -= 1
-			if huntersSergeiQw >= 10 and huntersKnowSlut = 0:huntersSergeiQw -= 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
-			'You spend time with Igor, flirting all the while. He flirts back, and blushes when you catch him checking you out.'
-
-			gs 'stat'
-
-			if huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA = 1 and pcs_apprnc >= 60:
-				*clr & cla
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
-				'You smile sweetly at Igor. Suddenly Igor steals a kiss when you didnt expect it. You can feel his breath on your skin, smell the scent of the soap he used to clean himself. Suddenly, he looks embarrassed by what he just did and waits to see what your response will be.'
-
-				gs 'arousal', 'foreplay', 5
-				gs 'stat'
-
-				act 'Answer kiss':
-					*clr & cla
-					pcs_mood = 100
-					huntersIgorLove = 1
-					huntersIgorQw += 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
-					'You move closer to him and begin kissing him again. Igor gently kisses you back.'
-
-					gs 'arousal', 'kiss', 5
-					gs 'stat'
-
-					if pcs_horny >= 40:
-						act'Continue':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"<<$pcs_nickname>>, Do you want to..?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took your hand and led you inside.'
-
-							act 'Go inside':gt 'hunterLoveSex','Igor'
-						end
-					else
-						act'Continue':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
-
-							act'Continue':gt $loc, $loc_arg
-						end
-					end
-				end
-				act 'To remove the face':
-					*clr & cla
-					minut += 5
-					huntersIgorQw -= 50
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-					'"No, Igor, this isn''t right", you say, and try not to look at his sorrowful face as he leaves.'
-
-					act'Leave':gt $loc, $loc_arg
-				end
-			else
-				act'Leave':gt $loc, $loc_arg
-			end
-		end
-	else
-		act 'Spend time together':
-			*clr & cla
-			minut += 120
-			menu_off = 1
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
-			pcs_mood = 100
-			huntersIgorQw += 1
-			if huntersSergeiLove > 0 or huntersAndreiLove > 0:hunterslut += 1
-			if huntersSergeiLove = 0 and huntersAndreiLove = 0:hunterslut -= 1
-			if huntersIgorLove = 2:bfA += 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
-			'You cuddle up with Igor, and trade gentle kisses with him. He adores you and wishes you were always with him and you wish the same.'
-
-			gs 'stat'
-
-			act'Leave':gt $loc, $loc_arg
-		end
-	end
-end
-
-if huntersIgorLove > 0 and pcs_horny >= 60:
-	act 'Have sex':
-		*clr & cla
-		menu_off = 1
-		huntersIgorQw += 1
-		huntersIgorsex += rand(12,36)
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
-		'You wink seductively at Igor, and look in the direction of his bed. Igor gives you an excited hug before leading the way.'
-
-		gs 'arousal', 'foreplay', 10
-		gs 'stat'
-
-		act 'Go':gt 'hunterLoveSex','Igor'
-	end
-end
-
-!! I replaced the partial condition "and temp = 1" with "and rand(1,5) = 1" because temp is changed in the stat procedure. Formely the temp variable was initialized at the beginning of the file temp = rand(1,5)
-if huntersIgorLove > 0 and pcs_horny <= 60 and huntersIgorQw >= 10 and rand(1,5) = 1 and huntersIgorsex = 0:
-	*clr & cla
-	menu_off = 1
-	huntersIgorsex += rand(12,36)
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-	'You walked up to Igor to spend time together, but he suddenly kisses you and whispers,'
-	'"<<$pcs_nickname>>, let''s make love."'
-
-	gs 'arousal', 'foreplay', 5
-	gs 'stat'
-
-	act 'Agree':
-		*clr & cla
-		minut += 5
-		huntersIgorQw += 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
-		'Smiling, you wink at Igor. He gets a childlike grin on his face and leads you by the hand to his bed.'
-		act 'Go':gt 'hunterLoveSex','Igor'
-	end
-	act 'Decline':
-		*clr & cla
-		minut += 5
-		huntersIgorQw -= 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-		'"I can''t right now, Igor," you say'
-		'You see a look of regret on his face as you leave'
-		act 'Leave':gt $loc, $loc_arg
-	end
-end
-
-if huntersIgorLove > 0:
-	act 'Break up with Igor':
-		*clr & cla
-		minut += 5
-		menu_off = 1
-		huntersIgorLove = 0
-		if huntersIgorLove = 2:bfA = 0
-		huntersIgorQw -= 100
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
-		'"We''re through Igor. I don''t think that this relationship was going where either of us wanted," you say. Igor looks completely blindsided but turns and leaves without saying a word.'
-
-		act 'Leave':gt $loc, $loc_arg
-	end
-end
-
-act'Depart':gt $loc, $loc_arg
 
 if huntersIgorQw < 10 and huntersIgorLove > 0:
 	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
+	'You wanted to talk to Igor, but he cuts you off with an angry look.'
+	'"<<$pcs_nickname>>, I realized that our love wasn''t real and we need to break up," he says. As you try to find words to answer he turns and resolutely walks away.'
+	'"This may well be for the best," you think, as you leave in the other direction.'
 	minut += 5
 	menu_off = 1
 	huntersIgorLove = 0
 	if huntersIgorLove = 2:bfA = 0
 	huntersIgorQw -= 10
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
-	'You wanted to talk to Igor, but he cuts you off with an angry look.'
-	'"<<$pcs_nickname>>, I realized that our love wasn''t real and we need to break up," he says. As you try to find words to answer he turns and resolutely walks away.'
-	'"This may well be for the best," you think, as you leave in the other direction.'
 
 	act 'Leave':gt $loc, $loc_arg
-end
-
-if huntersIgorLove < 2 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1 and hour >= 8 and hour < 20 and pcs_apprnc >= 60:
-	*clr & cla
-	minut += 1
-	menu_off = 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
-	'Suddenly Igor kisses you when you didn''t expect it.'
-	'He looks a little nervous before gathering up his courage to ask you, "Will you be my girlfriend?"'
-
-	gs 'arousal', 'foreplay', 1
-	gs 'stat'
-!! this part is not included properly into boyfriend system yet - rachels
-!! it could be simply replaced with gs 'boyfrend', 'start' but we need to check if a slot is empty
-!! at the moment I disable all the actions
-	act 'Yes':
+else
+	if huntersIgorLove > 0 and pcs_horny <= 60 and huntersIgorQw >= 10 and rand(1,5) = 1 and huntersIgorsex = 0:
+		menu_off = 1
 		*clr & cla
-		!stopboy = 0
-!!		$lover[lover_number] = $boy
-!!		$loverbody[lover_number] = $boybody
-!!		$loverbod[lover_number] = $boybod
-!!		$loverface[lover_number] = $boyface
-!!		loverdick[lover_number] = dick
-!!		loversilaVag[lover_number] = silaVag
-!!		loverfinance[lover_number] = finance
-!!		vneshlover[lover_number] = vneshBoy
-!!		$loverClo[lover_number] = $boyClo
-!!		figurlover[lover_number] = figurBoy
-!!		titlover[lover_number] = titBoy
-!!		hairlover[lover_number] = hairBoy
-!!		haraklover[lover_number] = harakBoy
-!!		boyage[lover_number] = boyage
-!!		loverday[lover_number] = day
-!!		bfA = 1
-!!		day[lover_number] = 0
-!!		boyonce[lover_number] = 0
-!!		loverizvrat[lover_number] = izvrat
-!!		giftDay[lover_number] = 0
-!!		giftNum[lover_number] = 0
-!!		loverlove[lover_number] = 0
-!!		lover_picture[lover_number] = lover_picture_number
-		huntersIgorLove = 2
-		pcs_mood = 100
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
+		'You walked up to Igor to spend time together, but he suddenly kisses you and whispers,'
+		'"<<$pcs_nickname>>, let''s make love."'
+		huntersIgorsex += rand(12,36)
+		gs 'arousal', 'foreplay', 5
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
-		'You move closer to him and begin kissing him again. Igor gently kisses you back.'
-		'<center><b>Be aware! Igor is not in the Boyfriend system yet!</b></center>'
+		act 'Agree':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
+			*nl 'Smiling, you wink at Igor. He gets a childlike grin on his face and leads you by the hand to his bed.'
+			minut += 5
+			huntersIgorQw += 1
+			gs 'stat'
 
-		gs 'arousal', 'kiss', 5
-		gs 'stat'
+			act 'Go':gt 'hunterLoveSex','Igor'
+		end
+		act 'Decline':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+			*nl
+			'"I can''t right now, Igor," you say'
+			'You see a look of regret on his face as you leave'
+			minut += 5
+			huntersIgorQw -= 1
+			gs 'stat'
 
-		if pcs_horny >= 40:
-			act'Further':
+			act 'Leave':gt $loc, $loc_arg
+		end
+	else
+		if huntersIgorLove < 2 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1 and hour >= 8 and hour < 20 and pcs_apprnc >= 60:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
+			'Suddenly Igor kisses you when you didn''t expect it.'
+			'He looks a little nervous before gathering up his courage to ask you, "Will you be my girlfriend?"'
+			minut += 1
+			menu_off = 1
+			gs 'arousal', 'foreplay', 1
+			gs 'stat'
+		!! this part is not included properly into boyfriend system yet - rachels
+		!! it could be simply replaced with gs 'boyfrend', 'start' but we need to check if a slot is empty
+		!! at the moment I disable all the actions
+			act 'Yes':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
+				'You move closer to him and begin kissing him again. Igor gently kisses you back.'
+				'<center><b>Be aware! Igor is not in the Boyfriend system yet!</b></center>'
+				!stopboy = 0
+		!!		$lover[lover_number] = $boy
+		!!		$loverbody[lover_number] = $boybody
+		!!		$loverbod[lover_number] = $boybod
+		!!		$loverface[lover_number] = $boyface
+		!!		loverdick[lover_number] = dick
+		!!		loversilaVag[lover_number] = silaVag
+		!!		loverfinance[lover_number] = finance
+		!!		vneshlover[lover_number] = vneshBoy
+		!!		$loverClo[lover_number] = $boyClo
+		!!		figurlover[lover_number] = figurBoy
+		!!		titlover[lover_number] = titBoy
+		!!		hairlover[lover_number] = hairBoy
+		!!		haraklover[lover_number] = harakBoy
+		!!		boyage[lover_number] = boyage
+		!!		loverday[lover_number] = day
+		!!		bfA = 1
+		!!		day[lover_number] = 0
+		!!		boyonce[lover_number] = 0
+		!!		loverizvrat[lover_number] = izvrat
+		!!		giftDay[lover_number] = 0
+		!!		giftNum[lover_number] = 0
+		!!		loverlove[lover_number] = 0
+		!!		lover_picture[lover_number] = lover_picture_number
+				huntersIgorLove = 2
+				pcs_mood = 100
+				gs 'arousal', 'kiss', 5
+				gs 'stat'
+				if pcs_horny >= 40:
+					act'Further':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+						*nl '"<<$pcs_nickname>>, Do you want to..?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took you by the hand and led inside.'
+						minut += 5
+						gs 'stat'
+
+						act 'Go':gt 'hunterLoveSex','Igor'
+					end
+				else
+					act'Further':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+						*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
+						minut += 5
+						gs 'stat'
+
+						act'Further':gt $loc, $loc_arg
+					end
+				end if
+			end
+			act 'No':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+				*nl '"No, Igor, this isn''t right", you say, and try not to look at his sorrowful face as he leaves.'
 				minut += 5
+				huntersIgorQw -= 50
 				gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-				'"<<$pcs_nickname>>, Do you want to..?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took you by the hand and led inside.'
-
-
-				act 'Go':gt 'hunterLoveSex','Igor'
+				act'Go':gt $loc, $loc_arg
 			end
 		else
-			act'Further':
+			'<center><b><font color = maroon>Igor Anisimov</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
+			*nl
+			'Igor is a hunter along with the Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center..'
+			if huntersIgorQw < 0:
+				'You and him have a bad relationship, because you offended him in the past.'
+			elseif huntersIgorQw < 10:
+				'You have a normal relationship with him.'
+			elseif huntersIgorQw < 20:
+				'You have friendly relations with him.'
+			elseif huntersIgorQw < 25:
+				'You''re good friends.'
+			elseif huntersIgorQw < 30:
+				'It seems he has a crush on you.'
+			elseif huntersIgorQw <= 35:
+				'You have a mutual crush on each other.'
+			else
+				if huntersIgorLove = 0:
+					'You love him.'
+				elseif huntersIgorLove = 1:
+					'You two have fallen in love.'
+				elseif huntersIgorLove = 2:
+					'<<$boydesc>> is your boyfriend.'
+				else
+					'<<$boydesc>> is your husband.'
+				end if
+			end if
+			gs 'stat'
+
+			act 'Chat (0:30)':
 				*clr & cla
-				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
+				if huntersIgorQw >= 0: *nl 'You have a chat with Igor, swapping stories about life and love.' else *nl 'You talk to Igor. He wears his heart on his sleeve, so you can tell he doesn''t like you.'
+				minut += 30
+				menu_off = 1
+				if huntersIgorQw < 10:huntersIgorQw += 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-				'"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
 
-				act'Further':gt $loc, $loc_arg
+				act'Continue':gt $loc, $loc_arg
 			end
-		end
-	end
-	act 'No':
-		*clr & cla
-		minut += 5
-		huntersIgorQw -= 50
-		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-		'"No, Igor, this isn''t right", you say, and try not to look at his sorrowful face as he leaves.'
+			if huntersIgorQw >= 10:
+				if huntersIgorLove = 0:
+					act 'Flirt':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
+						*nl 'You spend time with Igor, flirting all the while. He flirts back, and blushes when you catch him checking you out.'
+						minut += 5
+						menu_off = 1
+						!!not using arousal as no orgasm chance
+						pcs_horny += 10
+						if huntersIgorQw <= 35 and huntersKnowSlut = 0:huntersIgorQw += 1
+						if huntersAndreiQw >= 10 and huntersKnowSlut = 0:huntersAndreiQw -= 1
+						if huntersSergeiQw >= 10 and huntersKnowSlut = 0:huntersSergeiQw -= 1
+						gs 'stat'
+
+						if huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA = 1 and pcs_apprnc >= 60:
+							act 'Continue Flirt':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
+								*nl 'You smile sweetly at Igor. Suddenly Igor steals a kiss when you didnt expect it. You can feel his breath on your skin, smell the scent of the soap he used to clean himself. Suddenly, he looks embarrassed by what he just did and waits to see what your response will be.'
+								gs 'arousal', 'foreplay', 5
+								gs 'stat'
+
+								act 'Answer kiss':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
+									*nl 'You move closer to him and begin kissing him again. Igor gently kisses you back.'
+									pcs_mood = 100
+									huntersIgorLove = 1
+									huntersIgorQw += 1
+									gs 'arousal', 'kiss', 5
+									gs 'stat'
+
+									if pcs_horny >= 40:
+										act'Continue':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+											*nl '"<<$pcs_nickname>>, Do you want to..?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took your hand and led you inside.'
+											minut += 5
+											gs 'stat'
+
+											act 'Go inside':gt 'hunterLoveSex','Igor'
+										end
+									else
+										act'Continue':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+											*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
+											minut += 5
+											gs 'stat'
+
+											act'Continue':gt $loc, $loc_arg
+										end
+									end if
+								end
+								act 'To remove the face':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+									*nl '"No, Igor, this isn''t right", you say, and try not to look at his sorrowful face as he leaves.'
+									minut += 5
+									huntersIgorQw -= 50
+									gs 'stat'
+
+									act'Leave':gt $loc, $loc_arg
+								end
+							end
+						end if
+						act'Leave':gt $loc, $loc_arg
+					end
+				else
+					act 'Spend time together':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
+						*nl 'You cuddle up with Igor, and trade gentle kisses with him. He adores you and wishes you were always with him and you wish the same.'
+						minut += 120
+						menu_off = 1
+						!!not using arousal as no orgasm chance
+						pcs_horny += 10
+						pcs_mood = 100
+						huntersIgorQw += 1
+						if huntersSergeiLove > 0 or huntersAndreiLove > 0:hunterslut += 1
+						if huntersSergeiLove = 0 and huntersAndreiLove = 0:hunterslut -= 1
+						if huntersIgorLove = 2:bfA += 1
+						gs 'stat'
+
+						act'Leave':gt $loc, $loc_arg
+					end
+					if pcs_horny >= 60:
+						act 'Have sex':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
+							*nl 'You wink seductively at Igor, and look in the direction of his bed. Igor gives you an excited hug before leading the way.'
+							menu_off = 1
+							huntersIgorQw += 1
+							huntersIgorsex += rand(12,36)
+							gs 'arousal', 'foreplay', 10
+							gs 'stat'
+
+							act 'Go':gt 'hunterLoveSex','Igor'
+						end
+					end if
+					if rand(0,6) = 0:
+						act 'Break up with Igor':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
+							*nl '"We''re through Igor. I don''t think that this relationship was going where either of us wanted," you say. Igor looks completely blindsided but turns and leaves without saying a word.'
+							minut += 5
+							menu_off = 1
+							huntersIgorLove = 0
+							if huntersIgorLove = 2:bfA = 0
+							huntersIgorQw -= 100
+							gs 'stat'
+
+							act 'Leave':gt $loc, $loc_arg
+						end
+					end if
+				end if
+			end if
+			act'Depart':gt $loc, $loc_arg
+		end if
+	end if
+end if
 
-		act'Go':gt $loc, $loc_arg
-	end
-end
 --- igorhunter ---------------------------------
 

+ 0 - 2
locations/npcpreservec.qsrc

@@ -80,7 +80,6 @@ if mid($npctemp,1,1) = 'C':
 	npc_grades[$npclastsaved] = npc_grades[$npctemp]
 	npc_run[$npclastsaved] = npc_run[$npctemp]
 	npc_vball[$npclastsaved] = npc_vball[$npctemp]
-	npc_nerd[$npclastsaved] = npc_nerd[$npctemp]
 	npc_shoot[$npclastsaved] = npc_shoot[$npctemp]
 	npc_sewing[$npclastsaved] = npc_sewing[$npctemp]
 	npc_serving[$npclastsaved] = npc_serving[$npctemp]
@@ -105,7 +104,6 @@ if mid($npctemp,1,1) = 'C':
 	npc_syth[$npclastsaved] = npc_syth[$npctemp]
 	npc_gon[$npclastsaved] = npc_gon[$npctemp]
 	npc_chlam[$npclastsaved] = npc_chlam[$npctemp]
-	npc_Hiv[$npclastsaved] = npc_Hiv[$npctemp]
 	npc_genwart[$npclastsaved] = npc_genwart[$npctemp]
 	npc_Thrush[$npclastsaved] = npc_Thrush[$npctemp]
 	npc_Malen[$npclastsaved] = npc_Malen[$npctemp]

+ 178 - 194
locations/sergeihunter.qsrc

@@ -3,231 +3,215 @@
 gs 'boyStat', 'A174'
 harakBoy = 1
 boyage = year - ((npc_dob['A174'] - (npc_dob['A174'] mod 10000)) / 10000)
-gs 'stat'
-
-'<center><b><font color = maroon>Sergei</font></b></center>'
-
-'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
-
-'Sergei is a friend of Andrei and Igor, and a member of the group of hunters that frequent the woods and swamp by Gadukino. He''s <<boyage>> years old. He is married and lives in the City Center..'
-if huntersSergeiQw < 0:'You and him have a bad relationship, because you offended him in the past.'
-if huntersSergeiQw >= 0 and huntersSergeiQw < 10:'You have a normal relationship with him.'
-if huntersSergeiQw >= 10 and huntersSergeiQw < 20:'You have friendly relations with him.'
-if huntersSergeiQw >= 20 and huntersSergeiQw < 25:'You''re good friends.'
-if huntersSergeiQw >= 25 and huntersSergeiQw < 30:'It seems he has a crush on you.'
-if huntersSergeiQw >= 30 and huntersSergeiQw <= 35:'You have a mutual crush on each other.'
-if huntersSergeiQw > 35 :'You have an unrequited love for him.'
-if huntersSergeiLove = 1:'You two love each other.'
-
-act 'Chat (0:30)':
-	*clr & cla
-	minut += 30
-	if huntersSergeiQw < 10:huntersSergeiQw += 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
-	if huntersSergeiQw >= 0:'You spend some time chatting with Sergei, listening to interesting stories from his life and telling some stories of your own.'
-	if huntersSergeiQw < 0:'You talk with Sergei. He seems uncomfortable, but doesn''t force you away.'
-
-	act'Continue':gt $loc, $loc_arg
-end
-
-if huntersSergeiQw >= 10:
-	if huntersSergeiLove = 0:
-		act 'Flirt':
-			minut += 5
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
+
+if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
+	if huntersSergeiLove > 0 and pcs_horny <= 60 and huntersSergeisex = 0  and rand(0,2) = 0:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
+		'You went to Sergei to spend time together, but instead he kisses you and playfully bites on your lip.'
+		'"<<$pcs_nickname>>, I want you," he whispers after the kiss.'
+		huntersSergeisex += rand(9,30)
+		gs 'arousal', 'foreplay', 5
+		gs 'stat'
+
+		act 'Agree':
 			*clr & cla
-			if huntersSergeiQw <= 35 and huntersKnowSlut = 0:huntersSergeiQw += 1
-			if huntersIgorQw >= 10 and huntersKnowSlut = 0:huntersIgorQw -= 1
-			if huntersAndreiQw >= 10 and huntersKnowSlut = 0:huntersAndreiQw -= 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
+			*nl 'Smiling, you bite softly on Sergei''s neck. He rushes to pull you along with him.'
+			minut += 5
+			huntersSergeiQw += 1
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
-			'You flirt playfully with Sergei. He is glad for your company, though he can'' stop himself from letting his eyes wander.'
-
+			act 'Go':gt 'hunterLoveSex','Sergei'
+		end
+		act 'Decline':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+			*nl '"No, Sergei, not now, but soon." You give him a small look of regret as you leave.'
+			minut += 5
+			huntersSergeiQw -= 1
 			gs 'stat'
 
-			if huntersSergeiLove = 0 and huntersSergeiQw >= 30 and huntersKnowSlut = 0 and pcs_apprnc >= 60:
-				*clr & cla
-				gs 'stat'
+			act 'Go':gt $loc, $loc_arg
+		end
+	else
+		'<center><b><font color = maroon>Sergei</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
+		*nl
+		'Sergei is a friend of Andrei and Igor, and a member of the group of hunters that frequent the woods and swamp by Gadukino. He''s <<boyage>> years old. He is married and lives in the City Center..'
+		if huntersSergeiQw < 0:
+			'You and him have a bad relationship, because you offended him in the past.'
+		elseif huntersSergeiQw < 10:
+			'You have a normal relationship with him.'
+		elseif huntersSergeiQw < 20:
+			'You have friendly relations with him.'
+		elseif huntersSergeiQw < 25:
+			'You''re good friends.'
+		elseif huntersSergeiQw < 30:
+			'It seems he has a crush on you.'
+		elseif huntersSergeiQw <= 35:
+			'You have a mutual crush on each other.'
+		else
+			if huntersSergeiLove = 1:'You two love each other.' else 'You have an unrequited love for him.'
+		end if
+		gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
-				'Suddenly he cups your chin in his hand and gives you a kiss full of passion.'
+		act 'Chat (0:30)':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/talk1.'+rand(1,3)+'.jpg"></center>'
+			if huntersSergeiQw >= 0:'You spend some time chatting with Sergei, listening to interesting stories from his life and telling some stories of your own.'
+			if huntersSergeiQw < 0:'You talk with Sergei. He seems uncomfortable, but doesn''t force you away.'
+			minut += 30
+			if huntersSergeiQw < 10:huntersSergeiQw += 1
+			gs 'stat'
 
-				gs 'arousal', 'foreplay', 5
-				gs 'stat'
+			act'Continue':gt $loc, $loc_arg
+		end
 
-				act 'Answer kiss':
+		if huntersSergeiQw >= 10:
+			if huntersSergeiLove = 0:
+				act 'Flirt':
 					*clr & cla
-					huntersSergeiLove = 1
-					huntersSergeiQw += 1
-					pcs_mood = 100
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
-					'You''ve been waiting for this and respond just as passionately. Sergei keeps kissing you and you are right there with him, returning every kiss.'
-
-					gs 'arousal', 'kiss', 5
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
+					*nl 'You flirt playfully with Sergei. He is glad for your company, though he can'' stop himself from letting his eyes wander.'
+					minut += 5
+					!!not using arousal as no orgasm chance
+					pcs_horny += 10
+					if huntersSergeiQw <= 35 and huntersKnowSlut = 0:huntersSergeiQw += 1
+					if huntersIgorQw >= 10 and huntersKnowSlut = 0:huntersIgorQw -= 1
+					if huntersAndreiQw >= 10 and huntersKnowSlut = 0:huntersAndreiQw -= 1
 					gs 'stat'
 
-					if pcs_horny >= 40:
-						act'Further':
-							*clr & cla
-							minut += 5
-							gs 'stat'
-
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"<<$pcs_nickname>>, I want to make love to you," he says, when he finally pulls back. You answer Sergei with a kiss every bit as passionate as the one that started this. You begin to make your way back towards his room as you do so.'
 
-							act 'Go inside': gt'hunterLoveSex', 'Sergei'
-						end
-					else
-						act'Continue':
+					if huntersSergeiQw >= 30 and huntersKnowSlut = 0 and pcs_apprnc >= 60:
+						act 'Continue Flirt':
 							*clr & cla
-							minut += 5
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
+							*nl 'Suddenly he cups your chin in his hand and gives you a kiss full of passion.'
+							gs 'arousal', 'foreplay', 5
 							gs 'stat'
 
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-							'"That was great <<$pcs_nickname>>," Sergei said, when your lips finally parted. You see a look that clearly shows he wishes for more and smile.'
-
-							act'Continue':gt $loc, $loc_arg
+							act 'Answer kiss':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss2.jpg"></center>'
+								*nl 'You''ve been waiting for this and respond just as passionately. Sergei keeps kissing you and you are right there with him, returning every kiss.'
+								huntersSergeiLove = 1
+								huntersSergeiQw += 1
+								pcs_mood = 100
+								gs 'arousal', 'kiss', 5
+								gs 'stat'
+
+								if pcs_horny >= 40:
+									act'Further':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+										*nl '"<<$pcs_nickname>>, I want to make love to you," he says, when he finally pulls back. You answer Sergei with a kiss every bit as passionate as the one that started this. You begin to make your way back towards his room as you do so.'
+										minut += 5
+										gs 'stat'
+
+										act 'Go inside': gt'hunterLoveSex', 'Sergei'
+									end
+								else
+									act'Continue':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
+										*nl '"That was great <<$pcs_nickname>>," Sergei said, when your lips finally parted. You see a look that clearly shows he wishes for more and smile.'
+										minut += 5
+										gs 'stat'
+
+										act'Continue':gt $loc, $loc_arg
+									end
+								end if
+							end
+							act 'Move away':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
+								*nl '"Sorry, Sergei, but this isn''t what I wanted", you say. He leaves with an angry look on his face.'
+								minut += 5
+								huntersSergeiQw -= 50
+								gs 'stat'
+
+								act'Leave':gt $loc, $loc_arg
+							end
 						end
-					end
+					end if
+					act'Leave':gt $loc, $loc_arg
 				end
-				act 'Move away':
+			else
+				act 'Spend time together':
 					*clr & cla
-					minut += 5
-					huntersSergeiQw -= 50
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
+					*nl 'You and Sergei spend time together, spooning the whole while. You can almost feel how much he needed to spend time with you. You notice the happy look on his face and feel very satisfied you put it there.'
+					minut += 120
+					!!not using arousal as no orgasm chance
+					pcs_horny += 10
+					huntersSergeiQw += 1
+					if huntersIgorLove > 0 or huntersAndreiLove > 0:hunterslut += 1
+					if huntersIgorLove = 0 and huntersAndreiLove = 0:hunterslut -= 1
+					pcs_mood = 100
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-					'"Sorry, Sergei, but this isn''t what I wanted", you say. He leaves with an angry look on his face.'
-
 					act'Leave':gt $loc, $loc_arg
 				end
-			else
-				act'Leave':gt $loc, $loc_arg
-			end
-		end
-	else
-		act 'Spend time together':
-			minut += 120
-			!!not using arousal as no orgasm chance
-			pcs_horny += 10
-			*clr & cla
-			huntersSergeiQw += 1
-			if huntersIgorLove > 0 or huntersAndreiLove > 0:hunterslut += 1
-			if huntersIgorLove = 0 and huntersAndreiLove = 0:hunterslut -= 1
-			pcs_mood = 100
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
-			'You and Sergei spend time together, spooning the whole while. You can almost feel how much he needed to spend time with you. You notice the happy look on his face and feel very satisfied you put it there.'
-
-			gs 'stat'
-
-			act'Leave':gt $loc, $loc_arg
-		end
-	end
-end
-
-if huntersSergeiLove > 0 and pcs_horny >= 60:
-	act 'Have sex':
-		*clr & cla
-		huntersSergeiQw += 1
-		huntersSergeisex += rand(9,30)
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
-		'You pull Sergei off to the side and kiss him. You guide his hands to your sopping, needy snatch so there''s no doubt what you want. Sergei doesn''t hesitate and leads you to his bed, never removing his hand.'
-
-		gs 'arousal', 'foreplay', 10
-		gs 'stat'
-
-		act 'Go':gt 'hunterLoveSex','Sergei'
-	end
-end
-
-!! I replaced the partial condition "and temp = 1" with "and rand(1,5) = 1" because temp was not initialized in the file and only in the IgorHunter was temp = rand(1,5) in the similar situation
-if huntersSergeiLove > 0 and pcs_horny <= 60 and huntersSergeiQw >= 10 and rand(1,5) = 1 and huntersSergeisex = 0:
-	*clr & cla
-	huntersSergeisex += rand(9,30)
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-	'You went to Sergei to spend time together, but instead he kisses you and playfully bites on your lip.'
-	'"<<$pcs_nickname>>, I want you," he whispers after the kiss.'
-
-	gs 'arousal', 'foreplay', 5
-	gs 'stat'
-
-	act 'Agree':
-		*clr & cla
-		minut += 5
-		huntersSergeiQw += 1
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
-		act 'Go':gt 'hunterLoveSex','Sergei'
-	end
-		'Smiling, you bite softly on Sergei''s neck. He rushes to pull you along with him.'
-	act 'Decline':
+				if pcs_horny >= 60:
+					act 'Have sex':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
+						*nl 'You pull Sergei off to the side and kiss him. You guide his hands to your sopping, needy snatch so there''s no doubt what you want. Sergei doesn''t hesitate and leads you to his bed, never removing his hand.'
+						huntersSergeiQw += 1
+						huntersSergeisex += rand(9,30)
+						gs 'arousal', 'foreplay', 10
+						gs 'stat'
+
+						act 'Go':gt 'hunterLoveSex','Sergei'
+					end
+				end if
+				if rand(0,6) = 0:
+					act 'Break up with Sergei':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
+						*nl '"Sergei the passion is gone", you say, "I think it''s time we parted." You leave without looking back.'
+						minut += 5
+						huntersSergeiLove = 0
+						huntersSergeiQw -= 100
+						gs 'stat'
+
+						act 'Leave':gt $loc, $loc_arg
+					end
+				end if
+			end if
+		end if
+		act'Depart':gt $loc, $loc_arg
+	end if
+else
+	if huntersSergeiQw < 10:
 		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
+		*nl
+		'You wanted to talk to Sergei, but he beat you to it, and started speaking before you could get a word in.'
+		'<<$pcs_nickname>>, I realized that our relationship had no future, and we need to stop seeing each other, " he said, and trying not to look in your direction, resolutely walked away.'
+		'"Well, maybe it''s for the best, " you think, as you leave in the other direction.'
 		minut += 5
-		huntersSergeiQw -= 1
+		huntersSergeiLove = 0
+		huntersSergeiQw -= 10
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
-		'"No, Sergei, not now, but soon." You give him a small look of regret as you leave.'
-		act 'Go':gt $loc, $loc_arg
-	end
-end
-
-if huntersSergeiLove > 0:
-	act 'Break up with Sergei':
+		act 'Leave':gt $loc, $loc_arg
+	else
 		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
+		*nl
+		'You wanted to talk to Sergei, but before you say anything he speaks instead.'
+		'"<<$pcs_nickname>>, I realized that our relationship has no future. You''re passion is unmatched, but I really love my family. I can''t risk that for you, " he says. He turns and walks away without saying another word, nor giving you time to say anything.'
+		'"Well, that''s how you feel is it?" you think as you stand there stunned. "Although this is probably for the best since he was married." you conclude before walking away.'
 		minut += 5
 		huntersSergeiLove = 0
-		huntersSergeiQw -= 100
+		huntersSergeiQw -= 50
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
-		'"Sergei the passion is gone", you say, "I think it''s time we parted." You leave without looking back.'
-
 		act 'Leave':gt $loc, $loc_arg
-	end
-end
-
-act'Depart':gt $loc, $loc_arg
-
-if huntersSergeiQw < 10 and huntersSergeiLove > 0:
-	*clr & cla
-	minut += 5
-	huntersSergeiLove = 0
-	huntersSergeiQw -= 10
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
-	'You wanted to talk to Sergei, but he beat you to it, and started speaking before you could get a word in.'
-	'<<$pcs_nickname>>, I realized that our relationship had no future, and we need to stop seeing each other, " he said, and trying not to look in your direction, resolutely walked away.'
-	'"Well, maybe it''s for the best, " you think, as you leave in the other direction.'
-
-	act 'Leave':gt $loc, $loc_arg
-end
-
-if huntersSergeiQw > 50 and huntersSergeiLove > 0:
-	*clr & cla
-	minut += 5
-	huntersSergeiLove = 0
-	huntersSergeiQw -= 50
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
-	'You wanted to talk to Sergei, but before you say anything he speaks instead.'
-	'"<<$pcs_nickname>>, I realized that our relationship has no future. You''re passion is unmatched, but I really love my family. I can''t risk that for you, " he says. He turns and walks away without saying another word, nor giving you time to say anything.'
-	'"Well, that''s how you feel is it?" you think as you stand there stunned. "Although this is probably for the best since he was married." you conclude before walking away.'
-
-	act 'Leave':gt $loc, $loc_arg
-end
+	end if
+end if
+
 --- sergeihunter ---------------------------------
 

+ 0 - 2
locations/shortgs.qsrc

@@ -565,7 +565,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_herpes')
 	arrsize('npc_hgt')
 	arrsize('npc_hipcurv')
-	arrsize('npc_Hiv')
 	arrsize('npc_horny')
 	arrsize('npc_hymen')
 	arrsize('npc_chem')
@@ -582,7 +581,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_magik')
 	arrsize('npc_makeup')
 	arrsize('npc_malen')
-	arrsize('npc_nerd')
 	arrsize('npc_nips')
 	arrsize('npc_pantys')
 	arrsize('npc_Pavrep')

+ 11 - 26
locations/swamp.qsrc

@@ -17,17 +17,9 @@ if $ARGS[0] = 'start':
 
 	'<center><H4>Swamp</H4></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp.jpg','swamp_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_winter.jpg','swamp_winter_night.jpg')+'"></center>'
 	end
 	*nl
 	'You are at the swamp on the far side of the woods from the village.'
@@ -39,7 +31,7 @@ if $ARGS[0] = 'start':
 		'You can see the small path to the clearing that contains the hunters cabin.'
 		act 'Go to the hunters cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
-			if hour >= 6 and hour <= 22:
+			if DayStage < 4:
 				swamp_stuck = 0
 				gt 'swamp', 'stuck','swamp'
 			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
@@ -145,7 +137,6 @@ if $ARGS[0] = 'stuck':
 				else
 					swamprand = rand(1,6)
 				end
-				gs 'stat'
 				'<center><H4>Swamp</H4></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlosthelp.jpg"></center>'
 				*nl
@@ -155,13 +146,15 @@ if $ARGS[0] = 'stuck':
 					act 'Success!':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
-						*nl
-						'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						*nl 'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						gs 'stat'
+
 						act 'Relax':gt 'swamp_yard','start'
 					end
 				else
-					*nl
-					'You yell out into the void, but your only response is the howling of the wind and the chirp of some crickets.'
+					*nl 'You yell out into the void, but your only response is the howling of the wind and the chirp of some crickets.'
+					gs 'stat'
+
 					act 'Failure':gt 'swamp','stuck'
 				end
 			end
@@ -169,17 +162,9 @@ if $ARGS[0] = 'stuck':
 	else
 		'<center><H4>Swamp</H4></center>'
 		if month >= 4 and month <= 10:
-			if hour >= 6 and hour < 22:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_night.jpg"></center>'
-			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp.jpg','gadforestlostswamp_night.jpg')+'"></center>'
 		else
-			if hour >= 8 and hour < 18:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter_night.jpg"></center>'
-			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp_winter.jpg','gadforestlostswamp_winter_night.jpg')+'"></center>'
 		end
 		*nl
 		if $ARGS[1] = 'forest_edge':

+ 79 - 133
locations/swamp_woods.qsrc

@@ -2,58 +2,47 @@
 
 !TODO: Break into more arg blocks
 if $ARGS[0] = 'start':
-	*clr & cla
-
+	CLOSE ALL
 	$loc = 'swamp_woods'
 	$loc_arg = 'start'
 	$location_type = 'secluded'
-
 	$menu_loc = 'swamp_woods'
 	$menu_arg = 'start'
 	menu_off = 0
-
 	$forest_args1 = 'swamp_woods'
 
-	CLOSE ALL
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-
-	gs 'hunter_ambient', 'schedule'
-
 	'<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.'
-
+	gs 'gadukino_event', 'sound'
+	gs 'hunter_ambient', 'schedule'
+	gs 'stat'
 	!TODO: Make schedule more dynamic e.g. more factors
 	*nl
 
 	act 'Go back to the hut': minut += 10 & gt 'swamp_yard', 'start'
+
 	if firewood < 10:
 		'You can pick up some firewood around here to keep the fire going.'
 
 		act 'Collect firewood (0:15)':
 			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 += rand(2,6)
-			minut += 15
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','firewood_normal.jpg','firewood_nude.jpg')+'"></center>'
 			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
-
+			firewood += rand(2,6)
 			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 if
+			minut += 15
+			gs 'stat'
 
 			act 'Further': gt 'swamp_woods', 'start'
 		end
 	else
 		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end
+	end if
 
 	act 'Try to circle around the swamp':
 		!no one likes to be trapped. Need to update gadfrestswamp with pcs_bushcraft method, but there should always be an option to try, no matter how low the skill.
@@ -76,11 +65,7 @@ if $ARGS[0] = 'start':
 
 				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
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_success.jpg','nearby_woods_success_nude.jpg')+'"></center>'
 					'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'
@@ -88,210 +73,171 @@ if $ARGS[0] = 'start':
 					act 'Success!': bushcraft_exp += 5 & gt 'gadforest','forest_center'
 				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
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_stuck.jpg','nearby_woods_stuck_nude.jpg')+'"></center>'
 					'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': bushcraft_exp += 3 & gt 'swamp','stuck'
 				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
-
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_hike.jpg','nearby_woods_hike_nude.jpg')+'"></center>'
 					!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...': bushcraft_exp += 2 & gt 'swamp_woods', 'start'
-				end
+				end if
 			end
 		else
-			minut += 30
-
+			minut += 90
 			!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
-
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','pathfinder.jpg','pathfinder_nude.jpg')+'"></center>'
 			'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','forest_center'
+			act 'Further': gt 'swamp_woods', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'shooting_practice':
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-	'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
-
-	act 'Walk away': gt 'swamp_woods', 'start'
-	act 'Ask if you can shoot too':
-		if hunter_collective_opinion > 50 and rand(1,4) = 1:
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-			'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
-			'"And what if I cannot?" you ask.'
-			'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
-			'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
+	if $ARGS[1] = '':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+		'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
 
-			act 'Take the bet':
+		act 'Ask if you can shoot too':
+			if hunter_collective_opinion > 50 and rand(1,4) = 1:
 				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+				'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
+				'"And what if I cannot?" you ask.'
+				'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
+				'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
 
-				hunter_collective_opinion += 6
-				gs 'stat'
+				act 'Take the bet':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
+					*nl 'You line up your sights and aim at the bottle. You inhale and hold your breath before...'
+					hunter_collective_opinion += 6
+					gs 'stat'
 
-				if $clothingworntype ! 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
+					act 'Pull the trigger': gt 'hunter_interactions', 'shooting_bet'
 				end
-				'You line up your sights and aim at the bottle. You inhale and hold your breath before...'
-				act 'Pull the trigger': gt 'hunter_interactions', 'shooting_bet'
-			end
-			act 'Refuse':
-				cla
 
-				hunter_collective_opinion -= 2
-				gs 'stat'
+				act 'Refuse':
+					cla
+					'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
+					hunter_collective_opinion -= 2
+					gs 'stat'
 
-				'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
-				act 'Further': gt 'swamp_woods', 'start'
-			end
-		elseif hunter_collective_opinion > 35:
-			gt 'swamp_woods', 'shooting_practice', 'practice'
-		elseif hunter_sexual_comfort > 20:
-			gt 'swamp_woods', 'shooting_practice', 'andrei_request'
-		else
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-			'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
-			act 'Further': gt 'swamp_woods', 'start'
+					act 'Further': gt 'swamp_woods', 'start'
+				end
+			elseif hunter_collective_opinion > 35:
+				gt 'swamp_woods', 'shooting_practice', 'practice'
+			else
+				if hunter_sexual_comfort > 20:
+					gt 'swamp_woods', 'shooting_practice', 'andrei_request'
+				else
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+					'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
+					act 'Further': gt 'swamp_woods', 'start'
+				end if
+			end if
 		end
-	end
 
-	if $ARGS[1] = 'practice':
-		cla & *clr
+		act 'Walk away': gt 'swamp_woods', 'start'
+
+	elseif $ARGS[1] = 'practice':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
+		*nl '"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
 		minut += 60
 		shoot_exp += 2
-
 		gs 'stat'
 
-		if $clothingworntype ! 'nude':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
-		end
-		'"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
 		act 'Walk away': gt 'swamp_woods', 'start'
-	end
 
-	if $ARGS[1] = 'andrei_request':
-		cla & *clr
+	elseif $ARGS[1] = 'andrei_request':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
 		'"You see, these bullets don''t come free" says Andrei. "My time looking over your shoulder also doesn''t come free. You gotta pay me back somehow"'
 		'"What do you mean?" you ask, with a vague idea of where this is going.'
 
-		act 'Walk away': gt 'swamp_woods', 'start'
-
 		if $clothingworntype = 'nude':
 			'"Since you are all naked might as well let me fuck your little pussy right here." he says. "Then I will let you shoot a bit"'
 			!TODO: if pcs_inhib < x
 			act 'Let him fuck you': gt 'hunter_interactions', 'andrei_quick_fuck'
 		else
 			andrei_shooting_request = rand(1,4)
-
 			if andrei_shooting_request = 1:
 				'"I want you to show me your tits. Just lift your top and let me have a good look at em. You can shoot the rifle then."'
 				act 'Flash your tits':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
+					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+					'"Would appreciate a longer look but I will take it" responds Andrei'
 					hunter_sexual_comfort += 3
 					gs 'arousal', 'flashlite', 3
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
-					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 2:
 				'"I want you to show me your pussy. Go sit on that log and lift up your bottom. You can shoot the rifle then."'
 				act 'Flash your pussy':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
+					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+					'"Would appreciate a longer look but I will take it" responds Andrei'
 					hunter_sexual_comfort += 5
 					gs 'arousal', 'flashlite', 5
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
-					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 3:
 				'"I want you to take off all your clothes. Then hand them all to me. If you wanna shoot my rifle, you gotta be in your birthday suit."'
 				act 'Strip naked':
 					cla & *clr
+!!Image needed						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
+					'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
+					'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
+					'"This naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
 					hunter_sexual_comfort += 7
-
 					gs 'clothing', 'strip', 'swamphouse'
 					gs 'underwear', 'remove'
-
 					gs 'arousal', 'flash', 10, 'exhibitionism'
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-!!Image needed						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
-					'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
-					'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
-					'"This	naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 4:
 				'"Seeing a young pretty thing like you prancing around gives me a boner. I want you to suck my dick." demands Andrei.'
 				act 'Suck his dick':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
+					'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
+					'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
 					hunter_sexual_comfort += 8
-
 					gs 'boyStat', 'A172'
 					gs 'arousal', 'bj', 15, 'sub', 'exhibitionism'
 					gs 'cum_call', 'mouth_swallow', 'A172', 1
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
-					'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
-					'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-			end
-		end
+			end if
+		end if
+
+		act 'Walk away': gt 'swamp_woods', 'start'
 	end
 end
 

+ 43 - 101
locations/swamp_yard.qsrc

@@ -1,5 +1,6 @@
 # swamp_yard
 
+gs 'hunter_ambient', 'schedule'
 if $ARGS[0] = 'start':
 	$loc = 'swamp_yard'
 	$loc_arg = 'start'
@@ -10,75 +11,62 @@ if $ARGS[0] = 'start':
 	$location_type = 'secluded'
 	hunterscabin = 1
 
-   	util_rand = rand(1,2)
-
 	gs 'gadukino_event', 'sound'
-	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 
 	if lost_girl = 1:
-	    if daystart > forest_lostday + 1 and rand(forest_lostday - daystart, 30) >= 30 and hour >= 8 and hour < 20:
-	        gt 'gadforestlost','rescue','ranger','swamp_yard'
-	    end
-    end
+		if daystart > forest_lostday + 1 and rand(forest_lostday - daystart, 30) >= 30 and DayStage = 2:
+			gt 'gadforestlost','rescue','ranger','swamp_yard'
+		end
+	end
 
 	'<center><B>The yard in front of the hut</B></center>'
 	if month >= 5 and month <= 9:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_yard.jpg','swamp_yard_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_yard_winter.jpg','swamp_yard_winter_night.jpg')+'"></center>'
 	end
 	*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:
 		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.'		
+			if hunters_outside = 1:
+				'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
-	
-	
-	
-	
+
+
+
+
 	act '<b>Go to the swamp</b>': gt 'swamp_yard', 'swamp_escape'
 	gs 'bicycle', 'swamp_yard'
 	act 'Go into the house':gt 'swamphouse', 'start'
@@ -89,9 +77,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:
-	    gs 'swamp_yard', 'daytime_flavor_events'
-    end
+	if hunters_outside = 1 and hunters_available = 1 and rand(1,2) = 1:
+		gs 'swamp_yard', 'daytime_flavor_events'
+	end
 end
 
 
@@ -107,25 +95,11 @@ if $ARGS[0] = 'campfire':
 	act 'Move away': gt 'swamp_yard', 'start'
 
 	if campfire = 1:
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_day.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg','campfire_night.jpg')+'"></center>'
 		*nl
 		'A nice, warm campfire you can sit and relax by. You can use it to cook something or heat up some water to bathe.'
 		'You can also put it out with the bucket if there is enough water in it'
-	else
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_out_day.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_out_night.jpg"></center>'
-		end
-		*nl
-		'You can use this firepit to light a fire, if you have some firewood available.'
-	end
 
-	if campfire = 1:
 		if hunters_breakfast = 1 or hunters_lunch = 1:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
@@ -138,16 +112,12 @@ if $ARGS[0] = 'campfire':
 
 			!TODO: Flesh out the learning content here
 			act 'Ask for some survival tips (0:10)':
+				cla
 				hunter_lessons += 1
-				*clr & cla
-
 				if hunter_collective_opinion > 25:
 					hunter_collective_opinion -= 1
 					bushcraft_exp += 1
-					gs 'stat'
-
 					minut += 10
-
 					*nl
 					'Hunters talk to you about some of their experiences when they first started out'
 				else
@@ -155,11 +125,13 @@ if $ARGS[0] = 'campfire':
 						!TODO: Prototype implementation for the creekside event, to be revamped
 						'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
 						hunter_lessons -= 8
+						gs 'stat'
+
 						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
 					else
 						minut += 20
 						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
-					end
+					end if
 				end
 
 				act 'Further': gt 'swamp_yard', 'campfire'
@@ -186,7 +158,6 @@ if $ARGS[0] = 'campfire':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_put_out.jpg"></center>'
 				*nl
 				'You pour some water to extinguish the campfire'
-
 				campfire = 0
 				minut += 5
 				bucket -= 3
@@ -194,34 +165,26 @@ if $ARGS[0] = 'campfire':
 				act 'Further': gt 'swamp_yard', 'campfire'
 			end
 		end
-
-		if bucket > 0 and boletus > 0 and mushroom_soup = 0:
-			act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
-		end
-
-		if bucket > 0 and raw_meat > 0 and meat_stew = 0:
-			act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
+		if bucket > 0:
+			if boletus > 0 and mushroom_soup = 0: act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
+			if raw_meat > 0 and meat_stew = 0: act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
 		end
 
 		if bucket >= 5 and hotwater = 0:
 			act 'Heat up water (0:30)':
-				cla
-				*clr
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 				minut += 30
 				bucket -= 5
 				hotwater = 1
-
 				water_heated += 1
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 				*nl
-
 				if water_heated > 5 and (pcs_inhib < 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
+				gs 'stat'
 
 				act 'Continue': gt 'swamp_yard', 'campfire'
 			end
@@ -252,31 +215,25 @@ if $ARGS[0] = 'campfire':
 					else
 						'You have finished the last of the soup, the pot is empty.'
 					end
-					gs 'stat'
 				end
 			end
 			if bilberry > 0:
 				act 'Eat berries':gt 'food','bilberry'
 			end
 		end
-
 		if alko > 8:
 			gt 'hunter_interactions', 'drunken_blackout'
 		end
 	else
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_out_day.jpg','campfire_out_night.jpg')+'"></center>'
+		*nl
+		'You can use this firepit to light a fire, if you have some firewood available.'
 		!TODO: Tie fire lighting to bushcraft, make hunters do it on their schedule or with Sveta asking
 		if firewood >= 10 and campfire = 0:
 			act 'Light fire':
 				cla & *clr
-
-				if $clothingworntype ! 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_light.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_light_nude.jpg"></center>'
-				end
-
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','campfire_light.jpg','campfire_light_nude.jpg')+'"></center>'
 				'You use some chopped wood, dry branches and twigs to light a campfire in the firepit'
-
 				firewood -= 10
 				campfire = 1
 				minut += 15
@@ -293,44 +250,29 @@ end
 if $ARGS[0] = 'swamp_escape':
 	!add chance to swamped by illume
 	if hunters_available = 1 and hunters_outside = 1:
-
 		if hour >= 6 and hour < 21:
 			minut += 5
-			if rand(1,10)>9:
-				gt 'swamp', 'start'
-			else
-				gt 'swamp','stuck'
-			end
+			if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
 		else
-			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>' & !! instead igorhanter.jpg
 			'As you start moving into the swamp Igor calls after you.'
 
 			!TODO: Different line depending on opinion and slut
 			'"<<$pcs_nickname>>, where are you going? You will get stuck in there!'
+			gs 'stat'
 
 			act 'Turn back':gt 'swamp_yard','start'
 			act 'Ignore him and keep going':
 				minut += 5
 
 				!TODO: Add skill clothing and temp check here instead of praying to RNGesus
-				if rand(1,10)>9:
-                	gt 'swamp', 'start'
-                else
-                	gt 'swamp','stuck'
-                end
+				if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
 			end
 		end
 	else
 		minut += 5
-
 		!TODO: Here too, also see how to avoid duplicating. Maybe create a child event node?
-		if (hour >= 6 and hour < 21) or rand(1,10)>7:
-			gt 'swamp', 'start'
-		else
-			gt 'swamp','stuck'
-		end
+		if (hour >= 6 and hour < 21) or rand(0,9)>6: gt 'swamp', 'start' else gt 'swamp','stuck'
 	end
 end
 

+ 43 - 43
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,38 +39,41 @@ 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 clothesAtLocation = 1:'Your clothes are laying on the shelf.'
+
+	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
 
-	if hunters_were_met = 0 and hunters_hunting = 1:
-		*nl
-		'The camp is quiet. There''s nobody here right now, where could they be.'
-	end
 
-	*nl
+	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'swamp_yard', 'start'
 
-	act 'Go outside':
-		minut += 1
-		hunter_refuse = 0
-		gs 'stat'
-		gt 'swamp_yard', 'start'
-	end
 
 
 	!re-arrange it, there should be no logic error now by illume
@@ -141,6 +141,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gt 'selfplay', 'start'
 		end
 	end
+
 	if ($clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0) or swamp_enema = 0:
 		act 'Look for some clothes':
 			cla
@@ -313,44 +314,44 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 	!hunters are invited to the table
 	if hunters_drink = 1 and hunters_inside = 1 and huntersKnowSlut = 0 and hunter_refuse = 0 and huntersdrinking ! daystart:
-		gs 'stat'
+		*clr & cla
 		minut += 1
 		temp_sh = rand(1,4)
 		huntersdrinking = daystart
 		gs 'stat'
 
 		if temp_sh = 1:
-			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'"Oh look who''s showed up. <<$pcs_nickname>>, come, join us for a drink!" they invite you in.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 2:
-			*clr & cla
 			huntersAndreiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" said Andrei.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 3:
-			*clr & cla
 			huntersSergeiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Sergei says noticing you entering.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 4:
-			*clr & cla
 			huntersIgorQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Igor shouts ignoring the other conversation.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
@@ -360,6 +361,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 		'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!"'
+
 		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 		act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 	end
@@ -486,7 +488,7 @@ if $ARGS[0] = 'bucket':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
 	*nl
-	if bucket > 0: 
+	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
@@ -555,7 +557,7 @@ if $ARGS[0] = 'tub':
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
 		dynamic $enema
 	end
-		
+
 	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 		act 'Bathe in the tub (0:30)':
 			cla
@@ -865,8 +867,8 @@ if $ARGS[0] = 'hunterstable':
 	*clr & cla
 	gs 'hunter_ambient', 'schedule'
 	if (hunters_available = 0 and hunters_breakfast = 0 and hunters_lunch = 0 and hunters_dinner = 0): gt 'swamphouse', 'hunterstable_end'
-	
-	
+
+
 	menu_off = 1
 	minut += 1
 	smokertemp = rand(1,3)
@@ -1759,8 +1761,7 @@ if $ARGS[0] = 'hunterstable':
 end
 
 if $ARGS[0] = 'huntersrelax':
-	cla
-	*clr
+	*clr & cla
 	minut += 1
 	menu_off = 1
 	gs 'stat'
@@ -1773,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':

+ 8 - 19
locations/swampspring.qsrc

@@ -8,25 +8,16 @@ menu_off = 0
 $location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
-gs 'stat'
 
 '<center><B>Spring</B></center>'
-
 if month >= 4 and month <= 10:
-	if hour >= 6 and hour < 22:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_night.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swampspring.jpg','swampspring_night.jpg')+'"></center>'
 else
-	if hour >= 8 and hour < 18:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter_night.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swampspring_winter.jpg','swampspring_winter_night.jpg')+'"></center>'
 end
 *nl
 'You''ve come across a natural spring with pure natural water.'
+gs 'stat'
 
 act 'Go back to the hut':minut += 5 & gt 'swamp_yard', 'start'
 
@@ -37,14 +28,11 @@ if pcs_hydra < 150:
 		pcs_breath = 0
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hands.jpg"></center>'
 		'You take a sip of the spring water.'
-		if pcs_hydra >= 100:
-			pcs_hydra += 25
-		else
-			pcs_hydra += 50
-		end
+		if pcs_hydra >= 100: pcs_hydra += 25 else pcs_hydra += 50
 		cumspclnt = 2
 		gs 'cum_cleanup'
 		gs 'stat'
+
 		act 'Finish':gt 'swampspring'
 	end
 end
@@ -52,11 +40,12 @@ end
 if bucket < 10:
 	act 'Collect water in a bucket':
 		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro.jpg"></center>'
+		'You fill the bucket with water.'
 		minut += 10
 		bucket += 10
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro.jpg"></center>'
-		'You fill the bucket with water.'
+
 		act 'Finish':gt 'swampspring'
 	end
 end