Browse Source

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

Lurk_Morrison 5 năm trước cách đây
mục cha
commit
ac2200de80

+ 35 - 26
locations/Voltrenersex.qsrc

@@ -402,12 +402,15 @@ if $ARGS[0] = 'masaj':
 	'"<<$pcs_lastname>>, you look tired, do you want a massage?"'
 	act 'Agree':
 		cls
+		gs 'boyStat', 'A69'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj1.jpg"></center>'	
 		'Coach lubricates his hand with oil and said to you: "Undress", you are slightly embarrassed, but also hot with desire to get a massage and you began to pull your clothes off.'
 		act 'Undress':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj2.jpg"></center>'	
 			'"Fully undressed", added coach, when he seen that you hesitated on panties. Sighing, you pull your panties off.'
+			gs 'arousal', 'foreplay', 5
+			gs 'stat'
 			act 'Lie down':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj3.jpg"></center>'	
@@ -416,37 +419,44 @@ if $ARGS[0] = 'masaj':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj4.jpg"></center>'
 					'You lay on the sofa, as the coach began to lubricate your naked body with oil, gently rubbing your chest, foot, neck, rubbing the oil in and relaxing the muscles. You nipples harden from the feelings of pleasure and you blush. Seeing this, the coach just smiled.'	
+					gs 'arousal', 'massage', 5
+					gs 'stat'
 					act 'Further':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj5.jpg"></center>'
 						'Mikhail began to knead your feet, lifting and twisting them. And you could only moan with pleasure and mild pain. You lost all track of time as the coach massaged you.'
+						gs 'arousal', 'massage', 10
+						gs 'stat'
 						act 'Further':
 							pcs_sleep += 25
-							minut += 30
 							pcs_mood += 20
+							gs 'arousal', 'massage', 10
 							gs 'stat'
 							cls
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj6.jpg"></center>'
 							'You lie with your legs spread apart, you can feel how wet your pussy is. Perfectly visible to your coach, he gently glides his hands over your body. Then Mikhail Nikolayevich asked "Well that ''s all for today, or do you want to continue?".'
-							act 'Dress and leave': gt 'gdksport', 'start'
+							act 'Dress and leave': gs 'arousal', 'end' & gt 'gdksport', 'start'
 							if pcs_horny >= 100 and rand(0,1) = 1 and mesec <= 0: 
 								act 'Continue':
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj7.jpg"></center>'
 									'He slide his hand between your legs, the touch was so light, intoxicating and gentle. You desire building in your body, all you want to do is just grab him and force his hand to caress you firmer. Mikhail continued stroking your hot swollen pussy, from which flowed your wetness. Closing your eyes, you try not to moan, suddenly you feel the touch of the lips and tongue on your pussy.'
+									gs 'arousal', 'foreplay', 5
+									gs 'stat'
 									act 'Further':
 										cls
-										orgasm += 1
-										stat['cuni'] += 1
-										pcs_horny = 0
 										npc_rel['A69'] += 1
-										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj8.mp4"></video></center>'
-										'His mouth and tongue worked your pussy, bringing you to new highest of passion and pleasure. Before long your body is wracked with rolling orgasms.'
+										$orgasm_txt = 'His mouth and tongue worked your pussy, bringing you to new highest of passion and pleasure. Before long your body is wracked with rolling orgasms.'
+										$orgasm_or = 'yes'
+										gs 'arousal', 'cuni', 5
+										gs 'stat'
 										act 'Recover':
 											cls
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj9.jpg"></center>'
 											'With your eyes still closed you recover form your orgasm. Mikhail, moved up near you head, he starts to massage your breasts next.'
+											gs 'arousal', 'foreplay', 5
+											gs 'stat'
 											act 'Lick':
 												cls
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj10.jpg"></center>'
@@ -455,15 +465,14 @@ if $ARGS[0] = 'masaj':
 													cls
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj11.jpg"></center>'
 													'You happily open your mouth, he grabs you and pulls you towards him till your head is off the couch and your head tilts back, till holding your mouth open, he slides his dick in your mouth. You instantly start sucking his cock. At first he is slow and gentle as he thrust into your mouth, but as he gets more aroused he gets faster and harder. He starts driving his cock into your mouth and down your throat as he literally starts to fuck your mouth. Despite the discomfort of feeling his cock thrust down your throat you still moan in pleasure.'
+													gs 'arousal', 'bj', 10, 'deepthroat'
+													gs 'stat'
 													act 'Swallow':
 														cls
-														gs 'boyStat', 'A69'
-														sexpartkno = 1
+														gs 'arousal', 'bj', 5, 'deepthroat'
 														swallow += 1
-														spafinloc = 12
-														gs 'cum_manage'
-														stat['bj'] += 1
-														minut += 30
+														gs 'cum_call', 'mouth', $boy, 1
+														gs 'cum_call', 'face', $boy, 1
 														pcs_mood += 20
 														trenerSex += 1
 														gs 'stat'
@@ -504,7 +513,6 @@ if $ARGS[0] = 'discoSex':
 				act 'Pulling up your skirt':
 					cls
 					npc_rel['A69'] += 5
-					pcs_horny += 10
 					if $pantyworntype ! 'none':
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco2.mp4"></video></center>'
 						'You sit on one of the toilets, pulling your skirt up and spreading your legs, watching your little display for a moment. He pulls you up and then pulls you panties down, letting them pool around your ankles.'
@@ -512,40 +520,41 @@ if $ARGS[0] = 'discoSex':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco3.jpg"></center>'
 						'Stepping out of your panties around your ankles you pull up your skirt showing him your naked wet pussy. While the coach pulls out his hard dick and starts stroking it as he watched you.'
 					end
+					gs 'arousal', 'foreplay', 2
+					gs 'stat'
 					act 'Bending over to show him your ass':
 						cls
-						pcs_horny += 10
-						minut += 20
 						gs 'boyStat', 'A69'
+						gs 'arousal', 'foreplay', 3
 						gs 'stat'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco4.mp4"></video></center>'
 						'As you bend over you pull up your skirt showing him your bare ass. Almost at once he grabs your hip with one hand, apparently no longer wanting to just watch. With his other hand he guides his dick, he rubs the head of it against your wet pussy. Then trails it up to your asshole, leaving a trail of your wetness from your pussy to your ass, then he slides it back down and rubs his head against your pussy again.'
 						'Getting the head of his dick even more soaked in your pussy juices, once more he slides it back up and starts rubbing it against your asshole. This time he doesn''t slide it back down, instead he pushes the head of his dick into your ass. You wince and cry out slightly in pain, as you feel the head of his dick force itself into your ass. He rubs your back with one hand, caressing you. "Take a breath and relax it will feel better."'
 						act 'Fuck your ass':
 							cls
-							stat['anal'] += 1
-							pcs_ass += 1
-							gs 'boyStat', 'A69'
-							gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco5.mp4"></video></center>'
+							gs 'dinSex','boy_wants_anal','lubri'
 							'You do your best to do as he says, taking a deep breath and trying to relax, but it is hard to relax when you have a <<dick>>cm <<$dick_girth>> cock in your ass. He begins slowly and gently fucking your ass, with each stroke he does just a tiny bit deeper. Bitting your lower lip in pain as he slowly fucks your ass.'
 							'But he was right in time it hurts less and even starts to feel kinda good, a bit of a mixture of pleasure and pain. You feel yourself starting to moan. Taking this as a sign you are ready he starts to pump in and out of your ass faster, slowly but steadily picking up the pace, until he is pounding your balls deep in your ass.'
-							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'							
+							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'
+							gs 'arousal', 'anal', 10
+							gs 'stat'
 							act 'Cumming':
 								cls
-								sexpartkno = 1
-								spafinloc = 4
-								gs 'cum_manage'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco6.mp4"></video></center>'
 								'He suddenly pulls out of your ass, at once you feel the streams of hot sperm landing on your ass, several spurts of cum cover your ass, with a sigh of satisfaction he puts his dick away as he waits, leaving your to clean the cum off your ass.'
+								gs 'arousal', 'anal', 5
+								gs 'arousal', 'end'
+								gs 'cum_call', 'butt', $boy, 1
+								gs 'stat'
 								act 'Go with coach':
+									cls
 									Discoclose = 1
 									!closing disco on this day not to forget  stat
-									minut += 20
+									minut += 10
 									music_loop = 0
 									close all
 									gs 'stat'
-									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 									'Leaving you walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
 									act 'Listen to him': gt 'Voltrener', 'trener_speak'

+ 3 - 3
locations/backwater.qsrc

@@ -12,7 +12,7 @@ gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
 if $ARGS[0] = '':
-	act 'Go back to the hut':minut += 5 & gt 'swamp_yard', 'start'
+	act 'Go back to the hut': minut += 5 & gt 'swamp_yard', 'start'
 
 	'<center><B>Backwater</B></center>'
 
@@ -145,7 +145,7 @@ if $ARGS[0] = '':
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
 				menu_off = 1
-				if (huntersKnowSlut > 0 and hunters_here = 1) or (hour < 7 or hour > 22) or (hour >= 8 and hour < 20 and hunters_here =0) or (pcs_inhib >= 25 or exhibitionist_lvl > 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
 					minut+=5
@@ -200,7 +200,7 @@ if $ARGS[0] = 'creekside_relax':
 
 end
 
-if $clothingworntype = 'nude' and igor_away = 'no' and rand(1,10) = 1:
+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

+ 20 - 6
locations/hunter_ambient.qsrc

@@ -239,30 +239,44 @@ end
 
 !Behavior events
 if $ARGS[0] = 'schedule':
+	if week = 6 or week = 7:huntersrand = RAND(1,5)
+	if week < 6:huntersrand = RAND(1,7)
 
 	killvar 'hunters_breakfast'
 	killvar 'hunters_lunch'
 	killvar 'hunters_evening'
 	killvar 'hunters_drink'
-	killvar 'hunters_off'
+	killvar 'hunters_inside'
+	killvar 'hunters_outside'
+	killvar 'hunters_sleep'
+	killvar 'hunters_available'
+	killvar 'hunters_hunting'
 
-	if sunWeather = 1 and temper >= 15:
+	if huntersKnow > 0:
 		if hour = 7:
 			hunters_breakfast = 1
+		elseif hour > 8 and hour < 11:
+			hunters_hunting = 1
 		elseif hour >=12 and hour < 14:
 			hunters_lunch = 1
-		elseif hour >= 18 and hour < 20:
+		elseif hour >= 15 and hour < 16:
+			hunters_hunting = 1
+		elseif hour >= 18 and hour < 19:
 			hunters_evening = 1
-		elseif hour = 20:
+		elseif hour > 20 and hour < 23:
 			hunters_drink = 1
+		elseif hour >= 23 or hour < 7:
+			hunters_sleep = 1
 		else
-			hunters_off = 1
+			hunters_available = 1
 		end
 	end
+	if sunWeather = 1 and temper >= 15:hunters_outside = 1
+	if sunWeather = 0 and temper < 15:hunters_inside = 1
 end
 
 if $ARGS[0] = 'bring_food':
-	if (hunters_lunch = 1 or hunters_evening = 1) and rand(1,20) = 1:
+	if (hunters_hunting = 1) and rand(1,20) = 1:
 		!TODO: Show the name of the hunter bringing the food. Also add variety besides rabbit
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/bunny_butcher.jpg"></center>'

+ 2 - 23
locations/hunter_interactions.qsrc

@@ -483,6 +483,7 @@ if $ARGS[0] = 'chat_with_hunters':
 		minut -= 10
 		gs 'arousal', 'end'
 		gs 'stat'
+		act 'Continue': gt 'swamp_yard', 'campfire'
 	end
 
 	if $ARGS[1] = 'entertainment':
@@ -504,29 +505,7 @@ if $ARGS[0] = 'chat_with_hunters':
 					hunter_collective_opinion -= 3
 					hunter_sexual_comfort -= 5
 				end
-			end
-		end
-	end
-
-	if $ARGS[1] = 'entertainment':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-		'"Hey, Sveta, 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?"'
-		'"And I mean that as in sucking us all off of course." He adds.'
-
-		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
-				'"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 in response'
-
-				if hunter_collective_opinion > 20:
-					hunter_collective_opinion += 5
-					hunter_sexual_comfort -= 10
-				else
-					hunter_collective_opinion -= 3
-					hunter_sexual_comfort -= 5
-				end
+				act 'Continue': gt 'swamp_yard', 'campfire'
 			end
 		end
 	end

+ 3 - 3
locations/hunters.qsrc

@@ -96,9 +96,9 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-		act 'Chat':
+		act 'Chat (0:30)':
 			*clr & cla
-			minut += rand (30,90)
+			minut += rand (15,30)
 			pcs_mood += rand(10,20)
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
@@ -2905,7 +2905,7 @@ if $ARGS[0] = 'huntersgroupfaint':
 			'You weakly nod your head.'
 			'"You really scared us, and to be frank, you really fucked up. Go to the hut and rest."'
 
-			act 'Further': gt'swamphouse'
+			act 'Further': gt'swamphouse', 'start'
 		end
 	end
 end

+ 13 - 13
locations/huntersex.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'sexafterstrip1':
 																gs 'arousal', 'end'
 																gs 'stat'
 
-																act 'Further': gt'swamphouse'
+																act 'Further': gt'swamphouse', 'start'
 															end
 														end
 													end
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'sluthomeOralCum1':
 	gs 'arousal', 'bj', 5, 'sub', 'group'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end &! --- sluthomeOralCum1 ---
 
 if $ARGS[0] = 'sluthomeORAL2':
@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'sluthomeOralCum2':
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeORAL3':
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'sluthomeOralCum3':
 	gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeORAL4':
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'sluthomeOralCum4':
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeTanga':
@@ -1220,7 +1220,7 @@ if $ARGS[0] = 'sluthomeAnalDogCum1':
 	gs 'arousal', 'anal', 5, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeAnalDog2':
@@ -1248,7 +1248,7 @@ if $ARGS[0] = 'sluthomeAnalDogCum2':
 	gs 'arousal', 'anal', 5, 'sub', 'rough'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further': gt'swamphouse'
+	act 'Further': gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeAnalCow1':
@@ -1278,7 +1278,7 @@ if $ARGS[0] = 'sluthomeAnalCowCum1':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeAnalCow2':
@@ -1308,7 +1308,7 @@ if $ARGS[0] = 'sluthomeAnalCowCum2':
 	'<<$textsexhunter3>>'
 	gs 'arousal', 'anal', 5, 'sub', 'rough'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeAnalSide1':
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'sluthomeAnalSideCum1':
 	gs 'arousal', 'anal', 5, 'sub', 'rough'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 if $ARGS[0] = 'sluthomeAnalSide2':
@@ -1368,7 +1368,7 @@ if $ARGS[0] = 'sluthomeAnalSideCum2':
 	gs 'arousal', 'anal', 5, 'sub', 'rough'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Further':gt'swamphouse'
+	act 'Further':gt'swamphouse', 'start'
 end
 
 
@@ -2068,7 +2068,7 @@ if $ARGS[0] = 'huntersgrO3':
 		'Finally all the guys start to cum. Jets of sperm cover your face, hit you in the mouth and drip all over your body too...'
 
 		if huntersexnude = 0:act 'Pass out': gt 'huntersex', 'huntersGrEnd'
-		if huntersexnude = 1:act 'Further': huntersexnude = 0 & gt'swamphouse'
+		if huntersexnude = 1:act 'Further': huntersexnude = 0 & gt'swamphouse', 'start'
 	end
 end
 
@@ -2580,7 +2580,7 @@ if $ARGS[0] = 'huntersGrEnd':
 		'You don''t know how long you slept for, but you have a terrible headache and you vaguely remembered what happened yesterday.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Further': gt'SwampHouse'
+		act 'Further': gt'swamphouse', 'start'
 	end
 end
 

+ 32 - 28
locations/outdoors.qsrc

@@ -1,34 +1,34 @@
 # outdoors
 
-weatherGrM[1] = -15
-weatherGrM[2] = -10
-weatherGrM[3] = -5
+weatherGrM[1] = -10
+weatherGrM[2] = -5
+weatherGrM[3] = 0
 weatherGrM[4] = 10
-weatherGrM[5] = 15
-weatherGrM[6] = 20
+weatherGrM[5] = 10
+weatherGrM[6] = 15
 weatherGrM[7] = 25
-weatherGrM[8] = 25
-weatherGrM[9] = 20
+weatherGrM[8] = 20
+weatherGrM[9] = 15
 weatherGrM[10]= 10
-weatherGrM[11]= -5
-weatherGrM[12]= -10
+weatherGrM[11]= 0
+weatherGrM[12]= -5
 
 weatherGrDelta = 5
 
-weatherFallM[1] = 60
-weatherFallM[2] = 20
-weatherFallM[3] = 20
-weatherFallM[4] = 30
-weatherFallM[5] = 30
-weatherFallM[6] = 20
-weatherFallM[7] = 15
-weatherFallM[8] = 15
-weatherFallM[9] = 30
-weatherFallM[10]= 50
-weatherFallM[11]= 60
-weatherFallM[12]= 30
-
-weatherFallDelta = 20
+weatherFallM[1] = 50
+weatherFallM[2] = 40
+weatherFallM[3] = 30
+weatherFallM[4] = 20
+weatherFallM[5] = 20
+weatherFallM[6] = 10
+weatherFallM[7] = 10
+weatherFallM[8] = 10
+weatherFallM[9] = 20
+weatherFallM[10]= 20
+weatherFallM[11]= 30
+weatherFallM[12]= 40
+
+weatherFallDelta = 10
 
 DayLengthMin = 177 &! Minutes from dawn to noon
 DayLengthMax = 563
@@ -41,12 +41,16 @@ if $ARGS[0] = 'weather':
 	if (weatherHour ! hour) or (weatherDay ! daystart):
 		weatherDay = DayInYear
 		weatherHour = hour
-
+		
 		temper = hour
-		if temper < 2 : temper = 24 + temper
-		temper -= 14
-		if temper > 0 : temper = -temper
-		temper += 6
+		if temper <= 2:
+			temper = temper + (6 - (temper * 2))
+		elseif temper >= 3 and temper <= 15:
+			temper = temper
+		elseif temper >= 16:
+			temper = (temper - 30) * -1
+		end
+		
 		temper = weatherTemper + (weatherGrDelta*100/6*temper)/100
 		
 		if chWeather = 0:

+ 7 - 6
locations/soniadisco.qsrc

@@ -4,6 +4,7 @@
 !!Which arg it goes to depends on level of soniafall
 if $ARGS[0] = 'start':
 	if daystart => soniafallDay + 6:
+		soniafallDay = daystart
 		if soniafall = 0:
 			gt 'soniadisco', 'disco0'
 		elseif soniafall = 1:
@@ -24,7 +25,6 @@ if $ARGS[0] = 'start':
 	else
 		gt 'soniadisco', 'disco01'
 	end
-	soniafallDay = daystart
 end
 
 if $ARGS[0] = 'disco0':
@@ -76,7 +76,8 @@ if $ARGS[0] = 'disco0':
 				grupvalue[4] -= 2
 				grupvalue[1] += 2
 				npc_rel['A25'] += 5
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshot/big25.jpg"></center>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big25.jpg"></center>'
 				'You stand in front of her and grab ahold of her arms so she stops moving around. "Sonia! Look around, you are totally wasted and grinding on these guys like you plan to fuck them all."'
 				'Sonia resist for a moment but then your words seem to sink in and she drunkenly blinks a couple of times then looks around. She blushes a bit and seems to sober up just a little, as she realizes just how wasted she was. She gives you a grateful nod and awkwardly tries to leave the dance floor, but the guys are trying to keep her from it. You have to intervene on her behalf and make the guys let go of her. The two of you finally make it off the dance floor near the door leaving the dance hall.'
 				*nl
@@ -242,7 +243,7 @@ if $ARGS[0] = 'disco1':
 			npc_rel['A11'] -= 1
 			npc_rel['A25'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/soniadrink.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadrink.jpg"></center>'
 			'You move over to sit next to Sonia turning down the drink, as you say to her. "Slow down Sonia, you don''t want to get wasted." She turns and gives you a sour look.'
 			'"We''ve already been through this <<$pcs_nickname>>! You aren''t my mother, how about you chill out and enjoy the drinks like the rest of us." with that she grabs the bottle and chugs down a quarter of the bottle. The gopniks all whoop and holler encouraging her to keep going.'
 			'Sonia does have more, a lot more and it doesn''t take to long until she is totally wasted. With a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
@@ -263,12 +264,12 @@ if $ARGS[0] = 'soniadrinkmore1':
 	minut += 10
 	grupvalue[4] += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/soniadrink.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadrink.jpg"></center>'
 	'You smile and take hold of her hand holding the cup, while encouraging her to sit back down. "What''s the rush Sonia? We''re having a good time here right?" You ask her as you extend her arm and cup towards Vasily who happily refills it.'
 	'Sonia grins at you. "You''re right!" Then she downs about half the cup in one gulp coughing a bit. You all sit, talk and drink some more. Sonia finishes the cup finally and the boys start passing out more, which Sonia lets her cup be filled again.'
 	act 'Take another drink':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/panties1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties1.jpg"></center>'
 		'You smile and hold up your cup and get a refill, everyone is laughing and having a good time. When it comes time for a third refill Vasily refuses to refile your cup and instead whispers to you. "Good girls shouldn''t get drunk around bad boys."'
 		'Sonia is really starting to get wasted now. As she does Dan speaks up. "Hey Sonia what color are your panties?"'
 		'She looks at him a little confused. "What?"'
@@ -333,7 +334,7 @@ if $ARGS[0] = 'dance':
 			grupvalue[1] -= 1
 			grupvalue[2] -= 1
 			grupvalue[3] -= 2
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sonia2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/2.jpg"></center>'
 			'You tell her: "You have a nice set of boobs, Sonia. I can see why you''d be so willing to show them off to the world."'
 			'She looks at you with a slightly puzzled look on her face but never stops dancing as she asks: "Wha- what are you talking about?"'
 			'With a grin, you put your hand on her other shoulder and slide that strap down too, fully exposing her breasts to everyone who happens to be looking her way. She barely notices, and doesn''t understand why you are staring at her so intently. Once you walk away, she dances with both her breasts bouncing freely for several minutes before some guys pawing at her exposed breasts finally makes her notice. She blushes but also laughs about it, pulling her top back in place.' 

+ 1 - 1
locations/stat.qsrc

@@ -603,7 +603,7 @@ if minut >= 60:
 
 	gs 'traits', 'hourly'
 
-	gs 'outdoors', 'weather'
+	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
 	if minut >= 60:jump 'loopmin'
 end

+ 3 - 2
locations/swamp_woods.qsrc

@@ -51,6 +51,7 @@ if $ARGS[0] = 'start':
 	end
 
 	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.
 		*clr & cla
 		if pcs_bushcraft < 15:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
@@ -65,7 +66,7 @@ if $ARGS[0] = 'start':
 			act 'Stay around for now': gt 'swamp_woods', 'start'
 			act 'Try anyway':
 				*clr & cla
-				minut += 180
+				minut += 30
 				nearby_woods_check = rand(1,10)
 
 				if nearby_woods_check = 1:
@@ -120,7 +121,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		else
-			minut += 120
+			minut += 30
 
 			!Make it back without effort
 			if $clothingworntype ! 'nude':

+ 32 - 32
locations/swamp_yard.qsrc

@@ -12,11 +12,6 @@ if $ARGS[0] = 'start':
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 	!the chance of encountering hunters
-
-	if week = 6 or week = 7:huntersrand = RAND(1,5)
-	if week < 6:huntersrand = RAND(1,7)
-
-	if (hour >= 8 or hour < 23) and hunters_off = 1 and huntersrand = 1:hunters_here = 1
 	!the chance of hitting GG, if she`s a slut
 	huntslutsexrand = rand(1,3)
 	! to remember were cowards or not
@@ -63,27 +58,32 @@ if $ARGS[0] = 'start':
 		*nl
 		'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
 	end
-	if (hour > 7 and hour < 19) and hunters_here > 0 and huntersKnow = 0 and sunWeather = 1 and hunters_off = 1:
+	if hunters_available = 1 and hunters_outside = 1 and huntersknow = 0:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
-	end
-	if (hour > 7 and hour < 19) and hunters_here > 0 and huntersKnow > 0 and sunWeather = 1 and hunters_off = 1:
+	elseif hunters_available = 1 and hunters_outside = 1:
 		*nl
 		'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
-	end
-
-	if hunters_evening = 1:
+	elseif hunters_evening = 1 and hunters_outside = 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.'
-	end
-	if hunters_breakfast = 1 or hunters_lunch = 1 or hunters_drink = 1:
+	elseif hunters_hunting = 1 and hunters_outside = 1:
 		*nl
-		'You see hunters are also sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
+		'The hunters said they will be out hunting for a couple hours. You have the camp to yourself!'
+	elseif hunters_breakfast = 1 or hunters_lunch = 1 or hunters_drink = 1 and hunters_outside = 1:
+		*nl
+		'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
+	else
+		if huntersKnow = 0:
+			'The camp is quiet. There''s nobody here right now, where could they be.'
+		else
+			'The camp is quiet. The hunters aren''t here right now, where could they be.'
+		end
 	end
 	
 	act '<b>Go to the swamp</b>':
 		!add chance to swamped by illume
-		if hunters_here = 1:
+		if hunters_outside = 1 and huntersknow = 0:
 			if hour >= 6 and hour < 23:
 				minut += 5
 				if rand(1,10)>9:
@@ -268,7 +268,7 @@ if $ARGS[0] = 'start':
 
 	if hour >= 8 and hour < 20:
 		!please hunters cleaning in the house
-		if hunters_here > 0 and huntersKnow = 1 and dirty_swamphouse > 5 and temp_sy = 2:
+		if hunters_outside = 1 and huntersknow = 0 and dirty_swamphouse > 5 and temp_sy = 2:
 			*clr & cla
 			temp_sy = rand(1,3)
 			minut += 5
@@ -303,7 +303,7 @@ if $ARGS[0] = 'start':
 		end
 
 		!please hunters of cleaning in the yard
-		if hunters_here > 0 and huntersKnow = 1 and dirty_swamp_yard > 5 and temp_sy = 3:
+		if hunters_outside = 1 and huntersknow = 1 and dirty_swamp_yard > 5 and temp_sy = 3:
 			*clr & cla
 			temp_sy = rand(1,3)
 			minut += 5
@@ -338,7 +338,7 @@ if $ARGS[0] = 'start':
 		end
 
 		!the conversation of the hunters, if he did porn, in the Studio, dancing strip tease or a slut in Gadukino
-		if hunters_here > 0 and huntersKnowSlut = 0 and huntersKnow = 1 and hunters_check = 0:
+		if hunters_outside = 1 and huntersknow = 1 and huntersKnowSlut = 0 and hunters_check = 0:
 			if fame_sexind > 10 and city_modelling > 30 and huntersknowfoto = 0 and huntersIgorLove = 0:
 				*clr & cla
 				minut += 5
@@ -496,7 +496,7 @@ if $ARGS[0] = 'start':
 			act 'Go':gt 'swamp_yard', 'start'
 		end
 		!Declaration of love Igor
-		if hunters_here > 0 and huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1:
+		if hunters_outside = 1 and huntersIgorLove = 0 and huntersIgorQw >= 35 and huntersKnowSlut = 0 and bfA < 1:
 			*clr & cla
 			minut += 10
 
@@ -509,7 +509,7 @@ if $ARGS[0] = 'start':
 			act 'Further':gt 'Igorhunter'
 		end
 		!sex with Igor
-		if hunters_here > 0 and huntersIgorLove > 0 and huntersIgorQw >= 10 and temp_sy = 4 and huntersIgorsex = 0:
+		if hunters_outside = 1 and huntersIgorLove > 0 and huntersIgorQw >= 10 and temp_sy = 4 and huntersIgorsex = 0:
 			*clr & cla
 			minut += 5
 			huntersIgorsex += rand(12,36)
@@ -542,7 +542,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		!flowers from Igor
-		if hunters_here > 0 and huntersKnowSlut = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and huntersIgorQw >= 20 and temp_sy = 5 and flowersday ! daystart:
+		if hunters_outside = 1 and huntersKnowSlut = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and huntersIgorQw >= 20 and temp_sy = 5 and flowersday ! daystart:
 			*clr & cla
 			minut += 5
 			pcs_horny += 5
@@ -591,7 +591,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		! communication with Sergey
-		if hunters_here > 0 and huntersKnowSlut = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and huntersSergeiQw >= 15 and temp_sy = 6 and huntersSergeiday ! daystart:
+		if hunters_outside = 1 and huntersKnowSlut = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and huntersSergeiQw >= 15 and temp_sy = 6 and huntersSergeiday ! daystart:
 			*clr & cla
 			minut += 5
 			huntersSergeiday = daystart
@@ -628,7 +628,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		! sex with Sergei
-		if hunters_here > 0 and huntersSergeiLove > 0 and huntersSergeiQw >= 10 and temp_sy = 7 and huntersSergeisex = 0:
+		if hunters_outside = 1 and huntersSergeiLove > 0 and huntersSergeiQw >= 10 and temp_sy = 7 and huntersSergeisex = 0:
 			*clr & cla
 			minut += 5
 			huntersSergeisex += rand(9,30)
@@ -661,7 +661,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		! sex with Andrei
-		if hunters_here > 0 and huntersAndreiLove > 0 and huntersAndreiQw >= 10 and temp_sy = 8 and huntersAndreisex = 0:
+		if hunters_outside = 1 and huntersAndreiLove > 0 and huntersAndreiQw >= 10 and temp_sy = 8 and huntersAndreisex = 0:
 			*clr & cla
 			huntersAndreisex += rand(6,24)
 			gs 'stat'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		! sex if GG whore
-		if hunters_here > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0:
+		if hunters_outside = 1 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0:
 			*clr & cla
 			minut += 5
 			temphunt = rand(1,3)
@@ -714,7 +714,7 @@ if $ARGS[0] = 'start':
 			act 'Go':gt 'hunters', 'start'
 		end
 		!a choice between lovers
-		if hunters_here > 0 and huntersAndreiLove > 0 and huntersSergeiLove > 0 and temp_sy = 1:
+		if hunters_outside = 1 and huntersAndreiLove > 0 and huntersSergeiLove > 0 and temp_sy = 1:
 			*clr & cla
 			minut += 15
 			gs 'stat'
@@ -788,7 +788,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if hunters_here > 0 and huntersAndreiLove > 0 and huntersIgorLove > 0 and temp_sy = 1:
+		if hunters_outside = 1 and huntersAndreiLove > 0 and huntersIgorLove > 0 and temp_sy = 1:
 			*clr & cla
 			minut += 15
 			gs 'stat'
@@ -868,7 +868,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if hunters_here > 0 and huntersSergeiLove > 0 and huntersIgorLove > 0 and temp_sy = 1:
+		if hunters_outside = 1 and huntersSergeiLove > 0 and huntersIgorLove > 0 and temp_sy = 1:
 			*clr & cla
 			minut += 15
 			gs 'stat'
@@ -928,7 +928,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		! trio of HS, Andrei and Sergei, if love
-		if hunters_here > 0 and doublehunterlove = 1 and (huntersAndreisex = 0 or huntersSergeisex = 0):
+		if hunters_outside = 1 and doublehunterlove = 1 and (huntersAndreisex = 0 or huntersSergeisex = 0):
 			*clr & cla
 			minut += 5
 			huntersAndreisex += rand(6,24)
@@ -971,7 +971,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		!! wind lifts skirt
-		if hunters_here > 0 and huntersKnow > 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
+		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'start':
 		end
 
 		! trio if GG whore
-		if hunters_here > 0 and huntersRape = 5 and huntslutsexrand = 2 and huntslutsex = 0:
+		if hunters_outside = 1 and huntersRape = 5 and huntslutsexrand = 2 and huntslutsex = 0:
 			*clr & cla
 			minut += 5
 			temphunt = rand(1,3)
@@ -1016,7 +1016,7 @@ if $ARGS[0] = 'start':
 		end
 		! wind lifts skirt
 		skirtsrand = RAND(1,10)
-		if hunters_here > 0 and huntersKnow > 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and skirtsrand = 1:
+		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and skirtsrand = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'

+ 193 - 174
locations/swamphouse.qsrc

@@ -1,6 +1,7 @@
 # swamphouse
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	$location_type = 'indoors'
 	$loc = 'swamphouse'
 	$metka = 'start'
@@ -10,9 +11,9 @@ if $ARGS[0] = 'start':
 	frost = 0
 	bonusZ = 0
 	clr
-	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'hunter_ambient', 'schedule'
+	gs 'stat'
 	huntslutsexrand = rand(1,3)
 	temp_sh = rand(1,5)
 	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
@@ -37,31 +38,48 @@ if $ARGS[0] = 'start':
 	*nl
 	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
 	if swamp_enema = 1:'You found an enema syringe on the shelf.'
+	if $clothingworntype = 'nude' and hunterknowday ! daystart and hunters_inside = 1:gt 'swamphouse', 'get_dressed'
 	*nl
-	if (sunWeather = 0 and temper < 15) or hunters_off = 1:
-		if (hour = 20 and hunters_here = 1 and huntersKnow > 0) or (hour = 7 and hunters_here = 1 and huntersKnow > 0):
-			'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
-		elseif (hour > 20 and hour < 23 and hunters_here = 1 and huntersKnow > 0):
+	if hunters_inside = 1 and huntersknow = 0:
+		if hunters_drink = 1:
 			'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
-		elseif (hour = 23 and hunters_here = 1 and huntersKnow > 0) or (hour >= 0 and hour < 7 and hunters_here = 1 and huntersKnow > 0):
+		elseif hunters_sleep = 1:
 			'The hunters are sleeping on the couch.'
-		else
-			'The hunters aren''t here right now'
+		elseif hunters_available = 1 or hunters_breakfast = 1 or hunters_lunch = 1 or hunters_evening = 1:
+			'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table talking.'
+		elseif hunters_hunting = 1 and hunters_outside = 1:
+			'The Hunters said they will be out hunting for a couple hours. You have the camp to yourself!'
 		end
 	else
-		'The hunters aren''t here right now'
+		if huntersknow = 0:
+			'The camp is quiet. There''s nobody here right now, where could they be.'
+		else
+			'The camp is quiet. The hunters aren''t here right now, where could they be.'
+		end
 	end
 	*nl
 
-	act 'Go outside':hunter_refuse = 0 & minut += 5 & gt 'swamp_yard', 'start'
+	act 'Go outside':
+		if $clothingworntype = 'nude' and hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1 or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+			$loc = 'swamp_yard'
+			$metka = 'start'
+			hunter_refuse = 0
+			gs 'stat'
+			gt 'swamphouse', 'get_dressed'
+		else
+			minut += 5
+			hunter_refuse = 0
+			gs 'stat'
+			gt 'swamp_yard', 'start'
+		end
+	end
 
 	!re-arrange it, there should be no logic error now by illume
 	if $clothingworntype ! 'nude' and clothesAtLocation = 0:
 		!have cloth, or rag on
 		act 'Get undressed':
-			if (huntersKnowSlut > 0 and hunters_here = 1) or (hour >= 8 and hour < 20 and hunters_here =0) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
-				cla
-				*clr
+			if huntersKnowSlut > 0 or hunters_inside = 0 or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+				*clr & cla
 				minut+=5
 				if $clothingworntype ! 'nude':
 					gs 'clothing', 'strip', 'swamphouse'
@@ -73,8 +91,7 @@ if $ARGS[0] = 'start':
 				''+iif(temper > 23, 'Feeling the heat in the cabin', 'You feel the need to get naked, so')+' you start removing your clothes.'
 				act 'Back': gt 'swamphouse', 'start'
 			else
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 				''+iif(temper > 23, 'Despite the heat', 'Despite your need to get naked')+' you''re still too shy to get undressed - what if someone suddenly comes in?'
 				act 'Back': gt 'swamphouse', 'start'
@@ -85,8 +102,7 @@ if $ARGS[0] = 'start':
 		!clothes are ready
 		if $clothingworntype = 'nude':
 			act 'Get dressed':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"</center>'
 				*nl
 				'You put your clothes back on.'
@@ -97,8 +113,7 @@ if $ARGS[0] = 'start':
 			end
 		else
 			act 'Pick up your clothes':
-				cla
-				*clr
+				*clr & cla
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse'
 				'You picked up your clothes.'
 				act 'Back': gt 'swamphouse', 'start'
@@ -107,8 +122,7 @@ if $ARGS[0] = 'start':
 	elseif swamp_clothes = 1:
 		if $clothingworntype = 'nude':
 			act 'Wear hessian sack':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 				*nl
 				'You cover yourself with the hessian sack'
@@ -120,7 +134,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if ((pcs_horny >= 50 and hunters_here = 0) or (pcs_horny >= 50 and hunters_here = 1 and hour >= 8 and hour < 20) and $clothingworntype = 'nude'):
+	if pcs_horny >= 50 and $clothingworntype = 'nude' and (hunters_inside = 0 or huntersKnowSlut > 0 or (pcs_inhib >= 25 or exhibitionist_lvl > 1)):
 		act 'Masturbate':
 			gt 'selfplay', 'start'
 		end
@@ -146,14 +160,6 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	if breastpump > 0 and bp_unbox >= 1:
-		act 'Use breast pump':
-			gt 'lact_bp', 'bp_milking'
-		end
-	end
-	if (klismaday ! daystart and swamp_enema = 1 and hour >= 8 and hour < 20 and hunters_here = 1) or (klismaday ! daystart and swamp_enema = 1 and hunters_here = 0):
-		dynamic $enema
-	end
 
 	act 'Grab some food': gt 'swamphouse', 'stove'
 	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
@@ -257,7 +263,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	! trio of HS, Andrei and Sergei, if love
-	if hunters_here > 0 and doublehunterlove = 1 and hour >= 8 and hour < 20 and (huntersAndreisex = 0 or huntersSergeisex = 0):
+	if hunters_inside = 1 and doublehunterlove = 1 and hour >= 8 and hour < 20 and (huntersAndreisex = 0 or huntersSergeisex = 0):
 		*clr & cla
 		minut += 5
 		huntersAndreisex += rand(6,24)
@@ -300,135 +306,58 @@ if $ARGS[0] = 'start':
 		end
 	end
 	!hunters are invited to the table
-	if sunWeather = 0 and temper < 17 and hour = 20 and hunters_here = 1 and huntersKnow > 0 and huntersKnowSlut = 0 and hunter_refuse = 0:
-		cla
-		*clr
-		if hour >= 20 and hour <= 23 :
-			huntersdrink = 1
-		else
-			huntersdrink = 0
-		end
+	if hunters_drink = 1 and hunters_inside = 1 and huntersKnowSlut = 0 and hunter_refuse = 0:
+		gs 'stat'
+		minut += 1
+		temp_sh = rand(1,4)
 		gs 'stat'
 
-		if huntersdrink = 1:
+		if temp_sh = 1:
 			*clr & cla
-			minut += 1
-			temp_sh = rand(1,4)
-			gs 'stat'
-
-			if temp_sh = 1:
-				'<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': gs 'swamphouse', 'hunterstable'
-				act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
-			end
-			if temp_sh = 2:
-				huntersAndreiQw += 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-				'You enter the hut and notice the plastered hunters.'
-				'Oh, <<$pcs_nickname>>, come join us for a drink!" said Andrei.'
-				act 'Join': gs 'swamphouse', 'hunterstable'
-				act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
-			end
-			if temp_sh = 3:
-				huntersSergeiQw += 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.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': gs 'swamphouse', 'hunterstable'
-				act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
-			end
-			if temp_sh = 4:
-				huntersIgorQw += 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.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': gs 'swamphouse', 'hunterstable'
-				act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
-			end
-		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-			'You went into the hut and notice that the hunters have prepared breakfast.'
-			'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
-			act 'Join': gs 'swamphouse', 'hunterstable'
+			'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
-	end
-	!if GG naked and hunters in the hut
-	if $clothingworntype = 'nude' and (hunters_here = 1 and hour >= 20 and hour < 23 and hunterknowday ! daystart) or ($clothingworntype = 'nude' and hunters_here = 1 and hour = 7 and hunterknowday ! daystart):
-		cla
-		*clr
-		temp_sh =rand(1,3)
-		gs 'stat'
-		if huntersKnowSlut = 0:
-			cla
-			*clr
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude.jpg"></center>'
-			'You hear the hunters nearing the hut, grabbing the handle, about to open the door. You quickly hide your privare parts behind the hands...'
-
-			if clothesAtLocation = 1:
-				act 'Get dressed':
-					cla
-					*clr
-					minut += 5
-					gs 'underwear', 'wear'
-					gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
-					!tkan_cloth = 0
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
-					'You look around searching for your clothes. When you spot them, you dash over to grab them.'
-					act 'Continue': gt 'swamphouse', 'start'
-				end
-			else
-				act 'Cover yourself':
-					cla
-					*clr
-					minut+=5
-					gs 'clothing', 'swamp_clothes', 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-					'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of hessian... It''s better than nothing.'
-					act 'Continue': gt 'swamphouse', 'start'
-				end
-			end
-			act 'Stay naked':
-				cla
-				*clr
-				hunterslut += 1
-				hunterknowday = daystart
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
-				'You take a deep breath and decided to disregard your nerves and leave it as it is. Upon entering the hut, the hunters can''t help themselves, they start staring at your most private parts.'
-				'"Damn, <<$pcs_nickname>>, you look really good. The things I would want to do to you..." said a somewhat aroused Andrei.'
-				act 'Continue': gt 'swamphouse', 'start'
-			end
+		if temp_sh = 2:
+			*clr & cla
+			huntersAndreiQw += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.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 huntersKnowSlut > 0:
-			if huntslutsex = 0:
-				*clr & cla
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
-				'Seeing you naked, the men get quickly aroused...'
-				'"Come here <<$pcs_nickname>>, come to us," one of the guys calls out to you.'
-
-				act 'Continue':huntersexnude = 1 & gt 'huntersex', 'huntersexnude'
-			else
-				hunterknowday = daystart
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
-				'Seeing you naked, the men just shake their heads...'
-				'"Look here <<$pcs_nickname>>, if you want to charm us, you will need to think of something else." said one of the guys.'
-
-				act 'Continue': gt 'swamphouse', 'start'
-			end
+		if temp_sh = 3:
+			*clr & cla
+			huntersSergeiQw += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.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/locations/gadukino/hunters/igorhanter.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
+	elseif hunters_breakfast = 1 or hunters_lunch = 1:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
+		'You went into the hut and notice that the hunters have prepared breakfast.'
+		'"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
 
 	! sex if GG whore
-	if hunters_here > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0 and hour >= 7 and hour < 23:
+	if hunters_inside = 1 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0 and hour >= 7 and hour < 23:
 		*clr & cla
 		minut += 5
 		temphunt = rand(1,3)
@@ -446,13 +375,12 @@ if $ARGS[0] = 'start':
 		if pcs_horny >= 40 and pcs_horny < 70:'"Come and get me..." is all you manage to say before spreading your legs.'
 		if pcs_horny >= 70:'"I was hoping this would happen," you think to yourself, feeling your wet pussy screaming with desire. You jump on him, taking charge, leaving him stunned about who wants it more.'
 
-		act 'Go': gt 'huntersex', 'sluthomesex'
+		act 'Go with him': gt 'huntersex', 'sluthomesex'
 	end
 end
 
 if $ARGS[0] = 'stove':
-	cla
-	*clr
+	*clr & cla
 	$loc = 'swamphouse'
 	$metka = 'stove'
 	menu_off = 1
@@ -531,8 +459,11 @@ if $ARGS[0] = 'bucket':
 	act 'Drink the water':
 		cla
 		minut+=5
-		cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		pcs_breath = 0
 		bucket -= 1
+		gs 'stat'
 		if pcs_hydra >= 100:
 			'You''re not thirsty anymore. You don''t need to drink more water.'
 		else
@@ -540,6 +471,7 @@ if $ARGS[0] = 'bucket':
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
+			gs 'stat'
 			'You take a sip from bucket, quenching your thirst.'
 		end
 		act 'Continue': gt 'swamphouse', 'start'
@@ -564,6 +496,7 @@ if $ARGS[0] = 'washstand':
 		!use current by illume
 		dynamic $basin
 	end
+	if hunters_inside = 0:gs 'lact_bp', 'massage'
 	act 'Move away': gt 'swamphouse', 'start'
 end
 
@@ -581,6 +514,9 @@ if $ARGS[0] = 'tub':
 	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water, and get undressed first.'
 	'If you are desperate enough, you found a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf, that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
 	dynamic $brit
+	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'):
 		act 'Bathe in the tub (0:30)':
@@ -600,7 +536,7 @@ if $ARGS[0] = 'tub':
 			*nl
 			'You fill the tub with warm water, take off your clothes, and climbe into the tub. After a good clean and soak, you feel rejuvenated.'
 
-			act 'Continue': gt 'swamphouse', 'start'
+			act 'Continue': gt 'swamphouse', 'tub'
 		end
 	end
 	act 'Move away': gt 'swamphouse', 'start'
@@ -882,21 +818,15 @@ if $ARGS[0] = 'hunterstableBJ':
 end
 
 if $ARGS[0] = 'hunterstable':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
-	if hour >= 20 and hour <= 23 :
-		huntersdrink = 1
-	else
-		huntersdrink = 0
-	end
 	minut += 1
 	smokertemp = rand(1,3)
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 	*nl
-	if huntersdrink = 1:
+	if hunters_drink = 1:
 		dirty_swamphouse += rand(1,3)
 		'There are loads of vodka bottles and beer on the makeshift table. The hunters are sitting around the table drinking and talking.'
 	else
@@ -904,8 +834,8 @@ if $ARGS[0] = 'hunterstable':
 		'You see loads of spirits on the makeshift table. The hunters are enjoying their meal and discussing current events.'
 	end
 
-	if huntersdrink = 1 and hour >= 20:
-		act 'Drink vodka':
+	if hunters_drink = 1:
+		act 'Drink vodka (0:15)':
 			*clr & cla
 			minut += 1
 			gs 'drugs', 'alcohol', 'vodka', 1
@@ -917,7 +847,7 @@ if $ARGS[0] = 'hunterstable':
 
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
-		act 'Drink beer':
+		act 'Drink beer (0:15)':
 			*clr & cla
 			minut += 15
 			gs 'drugs', 'alcohol', 'beer', 1
@@ -929,10 +859,10 @@ if $ARGS[0] = 'hunterstable':
 
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
-		act 'Eat a snack':
+		act 'Eat a snack (0:15)':
 			gs 'food', 'snack'
 			*clr & cla
-			minut += 30
+			minut += 15
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/snack1.'+rand(1,2)+'.jpg"></center>'
@@ -940,7 +870,7 @@ if $ARGS[0] = 'hunterstable':
 			'You grab something to eat, so you don''t get drunk to quickly.'
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
-		act 'Chat':
+		act 'Chat (0:15)':
 			*clr & cla
 			minut += 15
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
@@ -954,7 +884,7 @@ if $ARGS[0] = 'hunterstable':
 
 			act 'Continue': gs 'swamphouse', 'hunterstable'
 		end
-		act 'Move away from the table':huntersdrink = 0 & hunter_refuse = 1 & gt 'swamphouse', 'start'
+		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 		if alko > 3 and alko < 8 and smokertemp = 1:
 			*clr & cla
 			temp_sh = rand(1,4)
@@ -1705,13 +1635,29 @@ if $ARGS[0] = 'hunterstable':
 				end
 			end
 		end
-	else
-		act 'Eat a meal':
+	elseif hunters_lunch = 1 or hunters_breakfast = 1 or hunters_evening = 1:
+		act 'Eat a meal (0:15)':
 			gs 'food', 'm_meal'
 		end
-		act 'Chat (1:00)':
+		act 'Chat (0:15)':
+			*clr & cla
+			minut += 15
+			if huntersAndreiQw < 10:huntersAndreiQw += 1
+			if huntersIgorQw < 10:huntersIgorQw += 1
+			if huntersSergeiQw < 10:huntersSergeiQw += 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
+			*nl
+			'You start chating with the guys about trivial stuff...'
+
+			act 'Move away from the table': gt 'swamphouse', 'start'
+		end
+		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
+	else
+		act 'Chat (0:15)':
 			*clr & cla
-			minut += 60
+			minut += 15
 			if huntersAndreiQw < 10:huntersAndreiQw += 1
 			if huntersIgorQw < 10:huntersIgorQw += 1
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
@@ -1726,7 +1672,7 @@ if $ARGS[0] = 'hunterstable':
 		act 'Move away from the table':hunter_refuse = 1 & gt 'swamphouse', 'start'
 	end
 	if huntersKnowSlut > 0 and hunterstableBJ = 0:
-		if huntersdrink = 0:
+		if hunters_drink = 0:
 			*clr & cla
 			minut += 1
 			gs 'stat'
@@ -1843,5 +1789,78 @@ if $ARGS[0] = 'dirty_swamphouse':
 	act 'Continue':dirty_swamphouse = 0 & gt 'swamphouse', 'start'
 end
 
+if $ARGS[0] = 'get_dressed':
+	!if GG naked and hunters in the hut
+	temp_sh =rand(1,3)
+	gs 'stat'
+	if huntersKnowSlut > 0:
+		if huntslutsex = 0:
+			*clr & cla
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
+			*nl
+			'Seeing you naked, the men get quickly aroused...'
+			'"Come here <<$pcs_nickname>>, come to us," one of the guys calls out to you.'
+
+			act 'Continue':huntersexnude = 1 & gt 'huntersex', 'huntersexnude'
+		else
+			*clr & cla
+			hunterknowday = daystart
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
+			*nl
+			'Seeing you naked, the men just shake their heads...'
+			'"Look here <<$pcs_nickname>>, if you want to charm us, you will need to think of something else." said one of the guys.'
+
+			act 'Continue': gt $loc, $metka
+		end
+	else
+		*clr & cla
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude.jpg"></center>'
+		*nl
+		'You hear the hunters nearby. You quickly hide your private parts behind your hands...'
+
+		if clothesAtLocation = 1:
+			act 'Get dressed':
+				*clr & cla
+				minut += 5
+				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
+				!tkan_cloth = 0
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
+				*nl
+				'You look around searching for your clothes. When you spot them, you dash over to grab them.'
+				act 'Continue': gt $loc, $metka
+			end
+		else
+			act 'Cover yourself':
+				*clr & cla
+				minut+=5
+				gs 'clothing', 'swamp_clothes', 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
+				*nl
+				'You look around searching for your clothes but can''t seem to find them, instead you hide behind a piece of hessian... It''s better than nothing.'
+				act 'Continue': gt $loc, $metka
+			end
+		end
+		act 'Stay naked':
+			*clr & cla
+			hunterslut += 1
+			hunterknowday = daystart
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamphousenude1.jpg"></center>'
+			*nl
+			'You take a deep breath and decided to disregard your nerves and leave it as it is. Upon encountering the hunters, they can''t help themselves, they start staring at your most private parts.'
+			'"Damn, <<$pcs_nickname>>, you look really good. The things I would want to do to you..." said a somewhat aroused Andrei.'
+			act 'Continue': gt $loc, $metka
+		end
+	end
+end
+
+
 --- swamphouse ---------------------------------