40 Commits 63a2c7a4e5 ... e48cc6c55a

Author SHA1 Message Date
  KevinSmarts e48cc6c55a [fixed] not worn variable wasn't applied in correct place to cover all options in wear 5 years ago
  KevinSmarts e8cc26483f Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_1' 5 years ago
  KevinSmarts 37270bf691 Merge remote-tracking branch 'julzor/master' 5 years ago
  KevinSmarts d5cb75598a Merge remote-tracking branch 'CroWke/master' 5 years ago
  julzor 22e5057d8c [fixed] a gazillion dead ends in pavtrain_market 5 years ago
  julzor 38a502d1eb [fixed] pregnant while trying to enter the experiment 5 years ago
  pfffbft 80b787fece [added] Finished passing fuck event for yard bondage 5 years ago
  pfffbft 012c6ee14e [added] Finished passing blowjob event for yard bondage 5 years ago
  CroWke 169e7b76f8 [fixed] missed a few c/p 5 years ago
  KevinSmarts 801fec96c3 Merge remote-tracking branch 'CroWke/master' 5 years ago
  KevinSmarts 2508b7b439 Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_1' 5 years ago
  CroWke 3dca199785 [added] Taking selfie in the shower. 5 years ago
  CroWke 00b9422cc1 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  CroWke a553319f32 [added] The option to take a selfie while you're in the shower or bath. 5 years ago
  julzor 4a524781b0 [fixed] panty loss due to mesec > 0 blocked in gaddvor and between 0:00 and 4:59 if sveta was using pad/tampon the day before 5 years ago
  julzor 57371e2328 Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife 5 years ago
  julzor 25ec8690ba [fixed] participation in the experiment with an std, getting an std during the trail and missing menu variables 5 years ago
  CroWke 4bf812a891 [fixed] Fixed the name of the bath and shower selfies. 5 years ago
  CroWke 844be7faad [added] 'Phone_selfie_image_bathing' added to use for selfies in the shower or bath. 5 years ago
  CroWke 5130411df6 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  CroWke 0de762ef10 [edit] Added the selfie variables for all the npcs currently in images/pc/npc_headshots and altered the display code to match. It will require a one time refresh of the npcstatic locations. 5 years ago
  pfffbft 816a8f5a43 [added] Assigned images to swamp bondage scenes 5 years ago
  KevinSmarts 8e346e39dd Merge remote-tracking branch 'CroWke/master' 5 years ago
  KevinSmarts cc787ec789 Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_1' 5 years ago
  KevinSmarts 602529d9b3 Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_1' 5 years ago
  CroWke 5aa8387446 [fixed] forgot to save this after I added a maxnpcs variable to make it easier to update in the future. 5 years ago
  CroWke d3b684e095 [fixed] I updated the Sgrup lists to use the same folder as the selfies system. 5 years ago
  pfffbft d1264f6101 [added]Refusal options to honor bets 5 years ago
  CroWke 22458120f1 [fixed] Fixed 2 bugs spotted by Rachels 5 years ago
  pfffbft 3c82aea46b [added] Yard bondage scene. Initial dynamics added, associated scenes pending 5 years ago
  pfffbft 020deff5b9 [removed] some legacy hantersex code 5 years ago
  pfffbft b144da4db2 [fixed] shooting exp gain not using the proper variable from various events 5 years ago
  pfffbft 5739324e0b [added] Snu snu for shooting lessons. Betting event chain pending. 5 years ago
  pfffbft ad0dd5bd67 [added] Shooting practice event with Andrei at the swamp woods 5 years ago
  pfffbft 4bc8bffb82 [fixed] various syntax issues 5 years ago
  pfffbft 20dce87a0c [added] Interactive fireside chat. Sexual chat options added for funsies. Pending associated scenes 5 years ago
  pfffbft d16a66d032 Moved hut table mechanics to fireside. Gave hunters initial schedule 5 years ago
  sovietmercader 0aa4d47cf4 [fixed] only make miras house appear after meeting her the first time 5 years ago
  sovietmercader d18db3f72e [changed] rebalance Miras father and Miras brother events 5 years ago
  pfffbft acfea51476 Split off swamp woods into its own location, menu locations added, otherr minor tweaks 5 years ago

+ 1 - 0
glife.qproj

@@ -528,6 +528,7 @@
 		<Location name="hunter_favors"/>
 		<Location name="hunter_ambient"/>
 		<Location name="hunter_interactions"/>
+		<Location name="swamp_woods"/>
 		<Location name="AndreiHunter"/>
 		<Location name="IgorHunter"/>
 		<Location name="SergeiHunter"/>

+ 221 - 148
locations/Mirafather.qsrc

@@ -14,185 +14,258 @@ if tempmonth < month or (tempmonth = month and tempday <= day): boyage -= 1
 
 gs 'stat'
 
-if npc_QW['A64'] < 10:'<center><b><font color = maroon>Father Miroslava</font></b></center>'
-if npc_QW['A64'] >= 10:'<center><b><font color = maroon>Afanasiy</font></b></center>'
+if npc_QW['A64'] = 0:'<center><b><font color = maroon>Mira''s Father</font></b></center>'
+if npc_QW['A64'] > 0:'<center><b><font color = maroon>Afanasiy</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+*nl
 'Mira''s father, <<boyage>> years old. After his wife died, he drank heavily and looks much older than he actually is. He is still in good shape for a man his age.'
 
-act 'Leave':gt 'miroslavahome', 'start'
+act 'Leave':gt 'MiroslavaHome', 'start'
 
-if MiraFather ! daystart:
-	MiraFather = daystart
-	
-	act 'Greet':
+if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+	*nl
+	'You are passing Mira''s house when you see Mira''s father headed in your direction.'
+	'"<<$pcs_firstname>>, wait. I need to speak with you," he says coming closer to you.'
+	'You stop and look at him frightfully. "Did Mira tell him what I made her do?" you think as panicked thoughts race through your head.'
+	'"<<$pcs_nickname>>, do you know what happened to Mira?" Afanasiy asks, looking you in the eye.'
+	'"N-no, what happened to her?" you ask in a confused voice, expecting him to start shouting any second.'
+	'"I don''t know. She is just sitting at home all the time. She doesn''t leave the yard, I''m concerned." Mira''s father answers.'
+	'"Oh, ah...I don''t know," you say, trying to make it sound believable and make your eyes look innocent. "Maybe she was by hurt some local boy, or had a fight with someone..."'
+	'"Okay, I think it will pass...soon I hope. But, I want you to come and visit us, I think your company would do Mira a lot of good. It might bring her out of this funk faster." Mira''s father says good-bye, and leaves to resume working around his house.'
+	'"Close call," you think as you watch his retreating back and exhale with relief.'
+	MiraLoc = 0
+	minut += 10
+	mirafathertalk = 1
+	gs'stat'
+
+	act 'Continue':gt 'Miroslava', 'Start'
+else
+	act 'Ask if Mira is home':
 		menu_off = 1
-		*clr & cla
-		if npc_QW['A64'] < 10:npc_QW['A64'] += 1
-		minut += 2
-		gs 'stat'
+		mira_temp = rand(1,20)
+		if sunWeather = 1:
+			if mira_temp > 15 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 23:
+				*clr & cla
+				minut += 2
+				MiraLoc = 8
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+				*nl
+				'Mira''s father tells you that she''s not home, she left without telling him where she was going.'
+				
+				if mirapimp = 1:
+					'Mira is not home but you know exactly where to find her. She has been working as your prostitute on the highway'
+				elseif miraprost > 1:
+					'Mira is not home but you know exactly where to find her. You have seen her working as a prostitute on the highway.'
+				elseif miraprost = 1:
+					'Mira is not home but you think you know where to find her. Ever since granting your second wish you have heard rumors that Mira has been earning money as a prostitute on the highway.'
+				else
+					'Mira is not home and you have no idea where she might be. Maybe you should go look around town.'
+				end
+				act 'Leave':gt 'Gadukino'
+				if miraprost > 0: act 'Go to the highway': gt 'gadprostitutes','start'
+			elseif mira_temp > 10 and month >= 4 and month <= 10 and hour <= 18:
+				*clr & cla
+				minut += 2
+				MiraLoc = 1
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+				*nl
+				'Mira''s father tells you that she''s not home, she said she was going to the river.'
 
-		act 'Leave': gt 'miroslavahome', 'start'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-		'You are greeted by Mira''s father and politely inquire about his health.  He responds with a smile and says,"All is well, little lady."'
-		if npc_QW['A64'] >= 10:
+				act 'Leave':gt 'Gadukino'
+				act 'Go to the river':gt 'gadriver','start'
+			else
+				MiraLoc = 0
+				gt 'Miroslava', 'Start'
+			end
+		else
+			MiraLoc = 0
+			gt 'Miroslava', 'Start'
+		end
+	end
 
-			act 'Chat':
+	if MiraFather ! daystart:
+		MiraFather = daystart
+		
+		if npc_QW['A64'] < 5:
+			act 'Ask how he''s doing':
 				*clr & cla
-				if npc_QW['A64'] < 20:npc_QW['A64'] += 1
+				menu_off = 1
+				if npc_QW['A64'] < 5:npc_QW['A64'] += 1
 				minut += 5
 				gs 'stat'
+				
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-				'You spend several minutes chatting with Mira''s father about the weather and trivia.'
+				*nl
+				'You are greeted by '+iif(npc_QW['A64'] = 0, 'Mira''s father','Afanasiy')+' and politely inquire about his health.  He responds with a smile and says,"All is well, little lady."'
+				if npc_QW['A64'] = 0:'Mira''s father continues, "I''m glad Mira has finally found a friend here in the village. It will be good for her to have another girl around. By the way, you can call me Afanasiy."'
+				
+				act 'Continue': gt 'Mirafather'
+			end
+		elseif npc_QW['A64'] <= 10:
+			act 'Chat with him':
+				*clr & cla
+				menu_off = 1
+				if npc_QW['A64'] < 10:npc_QW['A64'] += 1
+				minut += 5
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+				*nl
+				'You spend several minutes chatting with Afanasiy about the weather and trivia.'
 
-				act 'Leave': gt 'miroslavahome', 'start'
+				act 'Continue': gt 'Mirafather'
 			end
 		end
-		if npc_QW['A64'] >= 20:
-
-			act 'Flirt':
+		
+		if npc_QW['A64'] >= 10 and npc_QW['A64'] <= 15:
+			act 'Flirt with him':
 				*clr & cla
-				if npc_QW['A64'] < 30:npc_QW['A64'] += 1
+				menu_off = 1
+				if npc_QW['A64'] < 15:npc_QW['A64'] += 1
+				gs 'arousal', 'foreplay', 10
+				gs 'arousal', 'end'
+				gs 'stat'
+				
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-				'You spend several minutes with Afanasiy, playful looking him over and smiling meaningfully at him.  He is glad of the company of a beautiful young woman.  A couple of times during your conversation, you noticed that his eyes roving up and down your body appraisingly.'
+				*nl
+				'You spend several minutes with Afanasiy, playful looking him over and smiling meaningfully at him.  He is happy with the company of a beautiful young woman.  A couple of times during your conversation, you notice his eyes roving up and down your body appraisingly.'
+				
+				act 'Continue': gt 'Mirafather'
+			end
+		end
+		
+		if npc_QW['A64'] = 15:
+			act 'Seduce him':
+				*clr & cla
+				menu_off = 1
+				npc_QW['A64'] = 16
 				gs 'arousal', 'foreplay', 10
 				gs 'stat'
-				if npc_QW['A64'] = 30:
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+				*nl
+				'You move over and stand next to Afanasiy.  You let your hand start to stroke his thigh and slowly move towards his crotch. Afanasiy looks at you for a while deep in thought. Eventually he sighs, and then nods to himself as if he has made a decision. He takes you by the hand and leads you into his house, and then down the hall into his room.'
 
-					act 'Seduce him':
+				act 'Enjoy his touch':
+					*clr & cla
+					
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersexkuni.jpg"></center>'
+					*nl
+					'Afanasiy is a gentle lover. With practiced ease he gently undresses you and crouches before you.  His mouth and fingers play across the lips of your pussy, he skillfully licks you until, until he brings you a powerful orgasm.'
+					
+					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni', 10
+					gs 'arousal', 'vaginal_finger', 10
+					gs 'stat'
+					
+					act 'Turn around for him':
 						*clr & cla
-						npc_QW['A64'] = 31
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-						'You move over and stand next to Afanasiy.  You let your hand start to strokie his thigh and end up on his chest. Afanasiy a releases languid sigh, licking his lips and in a couple of minutes nods to himself as if he has made a decision.  Which he has.  Athanasios, takes you by the hand and leds you into his house, and then down the hall into his room.'
-						gs 'arousal', 'foreplay', 10
-						gs 'stat'
-
-						act 'Enjoy':
-							*clr & cla
-							guy += 1
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersexkuni.jpg"></center>'
-							'Afanasiy'' is a gentle lover.  With practiced ease he gently undresses you and crouches before you.  His mouth and fingers play across the lips of your pussy, he skillfully licks you until, until he brings you a powerful orgasm.'
-							$orgasm_or = 'yes'
-							gs 'arousal', 'cuni', 10
-							gs 'arousal', 'vaginal_finger', 10
-							minut -= 10
-							gs 'stat'
-
-							act 'Give':
-								*clr & cla
-								pose = 0
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex.jpg"></center>'
-								if mesec = 0 and pcs_vag > 0:
-									gs 'dinsex', 'boy_puts_condom'
-									gs 'dinsex','vaginal_sex',10
-									gs 'dinsex','sexcum'
-									gs 'arousal', 'vaginal', 10
-								else
-									gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-									gs 'arousal', 'anal', 10, 'rough'
-								end
-								gs 'arousal', 'end'
-								gs 'stat'
-								act 'Leave': gt 'miroslavahome', 'start'
-							end
+						
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex.jpg"></center>'
+						*nl
+						pose = 0
+						if mesec = 0 and pcs_vag > 0:
+							gs 'dinsex', 'boy_puts_condom'
+							gs 'dinsex','vaginal_sex',10
+							gs 'dinsex','sexcum'
+							gs 'arousal', 'vaginal', 10
+						else
+							gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+							gs 'arousal', 'anal', 10
 						end
+						gs 'arousal', 'end'
+						gs 'stat'
+						
+						act 'Continue': gt 'Mirafather'
 					end
 				end
-				if npc_QW['A64'] > 30:
-
-					act 'Wink at him':
+			end
+		elseif npc_QW['A64'] > 15:
+			act 'Wink at him':	
+				*clr & cla
+				menu_off = 1
+				if npc_QW['A64'] < 20:npc_QW['A64'] += 1		
+				gs 'arousal', 'foreplay', 5
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+				*nl
+				'You expressly wink at Afanasiy and he understands your meaning.  Looking about for nosy neighbors, he quickly waves for you to enter the house.'
+				
+				act 'Go inside':
+					*clr & cla
+					
+					pose = 0
+					temp_mf = rand(0,9)
+					if temp_mf = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex.jpg"></center>'
+					elseif temp_mf = 1:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex1.jpg"></center>'
+					elseif temp_mf = 2:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex2.jpg"></center>'
+					elseif temp_mf = 3:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex3.jpg"></center>'
+					elseif temp_mf = 4:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex4.jpg"></center>'
+					elseif temp_mf = 5:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj.jpg"></center>'
+					elseif temp_mf = 6:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj1.jpg"></center>'
+					elseif temp_mf = 7:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj2.jpg"></center>'
+					elseif temp_mf = 8:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj3.jpg"></center>'
+					elseif temp_mf = 9:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj4.jpg"></center>'
+					end
+					*nl
+					if temp_mf < 5:
+						if mesec = 0 or pcs_vag > 0:
+							gs 'dinsex', 'boy_puts_condom'
+							gs 'dinsex','vaginal_sex',10
+							gs 'dinsex','sexcum'
+							gs 'arousal', 'vaginal', 10
+						else
+							gs 'dinsex','boy_wants_anal','lubri'
+							gs 'dinsex','analsex'
+							gs 'arousal', 'anal', 10
+						end
+					else
+						gs 'oral','start'
+						gs 'arousal', 'bj', 10
+					end
+					gs 'stat'
+					
+					act 'Make him cum':
 						*clr & cla
-						pose = 0
-						temp_mf = RAND(0,5)
+						minut += 5
+						pcs_horny += 10
+						gs 'cum_call', 'stomach', $boy, 1,'','',15
+						gs 'cum_call', 'breasts', $boy, 1,'','',20
+						gs 'cum_call', 'mouth', $boy, 1,'','',5
+						gs 'arousal', 'end'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
+						
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathercum.jpg"></center>'
+						*nl
 						if temp_mf < 5:
-							'You expressly wink at Afanasiy and he understands your meaning.  Looking about for nosy neighbors, he quickly waves for you to enter the house.'
-							gs 'arousal', 'foreplay', 5
-							gs 'stat'
-
-							act 'Further':
-								*clr & cla
-								temp_mf = RAND(0,9)
-								if temp_mf = 0:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex.jpg"></center>'
-									gs 'arousal', 'vaginal', 10
-								elseif temp_mf = 1:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex1.jpg"></center>'
-									gs 'arousal', 'vaginal', 10
-								elseif temp_mf = 2:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex2.jpg"></center>'
-									gs 'arousal', 'vaginal', 10
-								elseif temp_mf = 3:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex3.jpg"></center>'
-									gs 'arousal', 'vaginal', 10
-								elseif temp_mf = 4:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathersex4.jpg"></center>'
-									gs 'arousal', 'vaginal', 10
-								elseif temp_mf = 5:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj.jpg"></center>'
-									gs 'arousal', 'bj', 10
-								elseif temp_mf = 6:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj1.jpg"></center>'
-									gs 'arousal', 'bj', 10
-								elseif temp_mf = 7:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj2.jpg"></center>'
-									gs 'arousal', 'bj', 10
-								elseif temp_mf = 8:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj3.jpg"></center>'
-									gs 'arousal', 'bj', 10
-								elseif temp_mf = 9:
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafatherbj4.jpg"></center>'
-									gs 'arousal', 'bj', 10
-								end
-								gs 'stat'
-								if temp_mf < 5:
-									if mesec = 0 or pcs_vag > 0:
-										gs 'dinsex', 'boy_puts_condom'
-										gs 'dinsex','vaginal_sex',10
-										gs 'dinsex','sexcum'
-										gs 'arousal', 'vaginal', 10
-									else
-										gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-										gs 'arousal', 'anal', 10, 'rough'
-									end
-									gs 'arousal', 'end'
-									gs 'stat'
-
-									act 'Leave':gt 'miroslavahome', 'start'
-								else
-									minut += 10
-									pcs_horny += 10
-									gs 'stat'
-									gs 'oral','start'
-
-									act 'Further':
-										*clr & cla
-										minut += 5
-										pcs_horny += 10
-										gs 'cum_call', 'stomach', $boy, 1,'','',15
-										gs 'cum_call', 'breasts', $boy, 1,'','',20
-										gs 'cum_call', 'mouth', $boy, 1,'','',5
-										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirafathercum.jpg"></center>'
-										'Afanasiy gently pulls away from you and leaving a couple of pearly drops of semen on your lips, he starts cumming on your tits and abdomen.'
-										gs 'arousal', 'end'
-										gs 'stat'
-
-										act 'Leave':gt 'miroslavahome', 'start'
-									end
-								end
-							end
+							'Afanasiy gently pulls away from you, leaving a couple of pearly drops of semen on your lips, and continues cumming on your tits and abdomen.'
 						else
-							'You expressly wink at Afanasiy, but he just smiles and says,"Too busy today honey, catch me later."'
-
-							act 'Leave': gt 'miroslavahome', 'start'
+							'Afanasiy gently pulls out of you, you kneel in front of him as he begins cumming on your tits and abdomen.'
 						end
+						
+						act 'Continue': gt 'Mirafather'
 					end
 				end
-
-				act 'Leave': gt 'miroslavahome', 'start'
 			end
-		end
-	end	
+		end	
+	end
 end
 
 --- Mirafather ---------------------------------

+ 29 - 87
locations/MiroslavaHome.qsrc

@@ -15,96 +15,37 @@ if $ARGS[0] = 'start':
 
 	'<center><h2>Gadukino Village</h2></center>'
 	'<center><b>Mira''s Yard</b></center>'
-		
-	act 'Leave': gt 'gadukino'
-
-	if hour >= 8 and hour <= 22:
-		if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-			'You are passing Mira''s house when you see Mira''s father headed in your direction.'
-			'"<<$pcs_firstname>>, wait. I need to speak with you," he says coming closer to you.'
-			'You stop and look at him frightfully. "Did Mira tell him what I made her do?" you think as panicked thoughts race through your head.'
-			'"<<$pcs_nickname>>, do you know what happened to Mira?" Afanasiy asks, looking you in the eye.'
-			'"N-no, what happened to her?" you ask in a confused voice, expecting him to start shouting any second.'
-			'"I don''t know. She is just sitting at home all the time. She doesn''t leave the yard, I''m concerned." Mira''s father answers.'
-			'"Oh, ah...I don''t know," you say, trying to make it sound believable and make your eyes look innocent. "Maybe she was by hurt some local boy, or had a fight with someone..."'
-			'"Okay, I think it will pass...soon I hope. But, I want you to come and visit us, I think your company would do Mira a lot of good. It might bring her out of this funk faster." Mira''s father says good-bye, and leaves to resume working around his house.'
-			'"Close call," you think as you watch his retreating back and exhale with relief.'
-			MiraLoc = 0
-			minut += 10
-			mirafathertalk = 1
-			gs'stat'
-
-			act 'Continue':gt 'miroslavahome', 'start'
+	
+	if month >= 4 and month <= 10:
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome.jpg"></center>'
 		else
-			if month >= 4 and month <= 10:
-				if hour >= 6 and hour < 22:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_night.jpg"></center>'
-				end
-			else
-				if hour >= 8 and hour < 18:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_winter.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_winter_night.jpg"></center>'
-				end
-			end
-			if npc_QW['A64'] < 10:
-				'Near the house you see <a href="exec: gt ''mirafather'' ">Mira''s father</a> working.'
-			else
-				'Near the house <a href="exec: gt ''mirafather'' ">Afanasiy</a> is working.'
-			end
-			if month >= 5 and month <= 9 and hour >= 18 and hour <= 21 and rand(0,30) >= 28:'You hear a motorcycle in the village. <a href="exec: gt ''miroslavahome'', ''mirabrother''">Miras brother</a> has come in from the city to visit his siblings and father.'
-
-			act 'Ask if Mira is home':
-				menu_off = 1
-				mira_temp = rand(1,20)
-				if sunWeather = 1:
-					if mira_temp > 15 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 23:
-						*clr & cla
-						minut += 2
-						MiraLoc = 8
-						gs 'stat'
-						
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-						'Mira''s father tells you that she''s not home, she left without telling him where she was going.'
-						
-						if mirapimp = 1:
-							'Mira is not home but you know exactly where to find her. She has been working as your prostitute on the highway'
-						elseif miraprost > 1:
-							'Mira is not home but you know exactly where to find her. You have seen her working as a prostitute on the highway.'
-						elseif miraprost = 1:
-							'Mira is not home but you think you know where to find her. Ever since granting your second wish you have heard rumors that Mira has been earning money as a prostitute on the highway.'
-						else
-							'Mira is not home and you have no idea where she might be. Maybe you should go look around town.'
-						end
-						act 'Leave':gt 'Gadukino'
-						if miraprost > 0: act 'Go to the highway': gt 'gadprostitutes','start'
-					elseif mira_temp > 10 and month >= 4 and month <= 10 and hour <= 18:
-						*clr & cla
-						minut += 2
-						MiraLoc = 1
-						gs 'stat'
-						
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
-						'Mira''s father tells you that she''s not home, she said she was going to the river.'
-
-						act 'Leave':gt 'Gadukino'
-						act 'Go to the river':gt 'gadriver','start'
-					else
-						MiraLoc = 0
-						gt 'Miroslava', 'Start'
-					end
-				else
-					MiraLoc = 0
-					gt 'Miroslava', 'Start'
-				end
-			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_night.jpg"></center>'
+		end
+	else
+		if hour >= 8 and hour < 18:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome_winter_night.jpg"></center>'
+		end
+	end
+	
+	if hour >= 8 and hour <= 22:
+		*nl
+		'Near the house you see '+iif(npc_QW['A64'] = 0, 'Mira''s father','Afanasiy')+' working.'
+		
+		act 'Leave': gt 'gadukino'
+		
+		act 'Talk to '+iif(npc_QW['A64'] = 0, 'Mira''s father','Afanasiy'): gt 'Mirafather'
+		
+		! Mira''s brother now visits on Friday nights during the summer - if he ever gets more content then he can stay the whole weekend - he is not even a fully set up NPC at the moment
+		if month >= 5 and month <= 9 and hour >= 18 and hour <= 21 and week = 5 and mirabrotherday ! daystart:
+			*nl
+			'You see a motorcycle parked outside of Mira''s house. Mira''s brother has come in from the city to visit his sister and father.'
+			act 'Talk to Mira''s brother': gt 'MiroslavaHome', 'mirabrother'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirahome.jpg"></center>'
+		*nl
 		if hour > 22 or hour < 3: 'It''s too late, most of Mira''s family is asleep, no need to wake them up unnecessarily.' else 'It''s too early, most of Mira''s family is still asleep, no need to wake them up unnecessarily.'
 		act 'Leave': gt 'gadukino'
 	end
@@ -112,6 +53,7 @@ end
 
 if $ARGS[0] = 'mirabrother':
 	*clr & cla
+	mirabrotherday = daystart
 	minut += 2
 	menu_off = 1
 	gs 'stat'

+ 18 - 13
locations/Sgrup.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You stay in the cafeteria where some of the teachers are eating or watching over the kids making sure there is no trouble.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 6:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 6 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 6:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 6 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 6:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 6:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup1.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 3:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 3 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 3:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 3 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 3:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 3:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup2.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 2:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 2 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 2:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 2 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 2:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 2:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup3.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 1:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 1 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 1:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 1 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 1:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 1:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup4.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You need to use the restroom and as you enter you notice a lot of beautiful girls from your school there. They check their make-up, doing minor touch-ups while they gossip about their classmates who happen to not be there. Some people are standing by the windows, smoking. The Gopniks from your class are standing near the toilets.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 4:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 4 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 4:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 4 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 4:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 4:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup5.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-
-if count1 = 6 : $textgrup += '<tr>'
-if grupTipe[i] = 5:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1 < 6 and grupTipe[i] = 5 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 5:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 5 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 5:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 5:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 40 - 27
locations/SgrupDisco.qsrc

@@ -3,43 +3,55 @@
 *clr & cla
 gs 'themes', 'food_menu'
 gs 'stat'
-$textgrup = ''
-$textgrup2 = ''
 
 act 'Move away':gt $loc, $metka
 
 '<center><b><font color="maroon">Disco</font></b></center>'
-!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
-*nl
+
+gs 'gschool_lessons', 'npc_data'
+
+!! First string for popular kids
+$textgrup = ''
 count1 = 0
-count2 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
 
-if grupTipe[i] = 1:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1 < 6 and grupTipe[i] = 1 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 1:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
+	if grupTipe[i] = 1 and discoenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 1:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 1:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
-!hack to force a new section for gopniks
-if i = 9 : $textgrup2 += '<tr></tr>'
-!end hack
+!! Force new line for gopniks
+$textgrup +='</td></tr><tr>'
 
-if count2 = 6 : $textgrup2 += '<tr>'
-if grupTipe[i] = 4: count2 += 1 & $textgrup2 += '' + '<td bgcolor=<<$bcolor1>> align="center"><img height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-
-if count2 < 6 and grupTipe[i] = 4:
-	$textgrup2 += '</td>'
-elseif count2 = 6 and grupTipe[i] = 4:
-	$textgrup2 +='</td></tr><tr>' & count2 = 0
-end
+!! Second string for gopniks
+$textgrup2 = ''
+count1 = 0
+i = 1
+'<center><table cellspacing="3">'
+:gruploop2	
+	if count1 = 6 : $textgrup2 += '<tr>'
 
-if i < 61:jump 'markgruploop'
+	if grupTipe[i] = 4 and discoenable[i] = 1:
+		count1 += 1
+		$textgrup2 += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 4:
+		$textgrup2 += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 4:
+		$textgrup2 +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop2'
 
 '<<$textgrup>>'
 *nl
@@ -48,5 +60,6 @@ if i < 61:jump 'markgruploop'
 if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec:gt ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
 '</table><center>'
 
+
 --- SgrupDisco ---------------------------------
 

+ 3 - 0
locations/anushapt.qsrc

@@ -248,6 +248,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'anushapt','bathroom'
 		end
 	end

+ 1 - 1
locations/backwater.qsrc

@@ -178,7 +178,7 @@ else
 			'You pick up your clothes laying on the ground.'
 			gt $loc, $metka
 		end
-	else
+	elseif forced_naked_day < daystart:
 		act 'Get dressed':
 			cla
 			*clr

+ 1 - 1
locations/bras.qsrc

@@ -20,8 +20,8 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'wear':
+	bra_none = 0
 	if $ARGS[1] = '':
-		bra_none = 0
 		if $lastwornbratype ! '':
 			$braworntype = $lastwornbratype
 			brawornnumber = lastwornbranumber

+ 1 - 0
locations/budgetclothes.qsrc

@@ -125,6 +125,7 @@ if $ARGS[0] = 'clothes':
 			gs 'clothing_QV', 'shop_filter'
 				
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''cheapclo''"><img src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="250" /></a>'
+			
 		end
 		i += 6
 		if i = 3: i = 9

+ 7 - 1
locations/cikl.qsrc

@@ -604,7 +604,13 @@ end
 lipkoef -= rand(0,1)
 if lipkoef <= 0: lipkoef = 0
 
-if Enable_autotampon = 0 and isprok = 1:isprok = 0 & 'You threw away your used tampon.'
+if isprok = 1 or isprokp = 1:
+	isprok_lastday = 1
+else
+	isprok_lastday = 0
+end
+
+if Enable_autotampon = 0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
 if Enable_autotampon = 0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:

+ 1 - 1
locations/clothing.qsrc

@@ -17,7 +17,7 @@ $clothing_list_line = {
 	else
 		clothing_temp = 150 & !clothing widdefault to 150
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"><p><<$ARGS[1]>> outfit</p></a></TD>'
 	killvar 'clothing_temp'
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 

+ 25 - 32
locations/din_van.qsrc

@@ -33,8 +33,7 @@ $bteeth = {
 	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:05)':
 		menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			cumspclnt = 2
 			gs 'cum_cleanup'
@@ -130,8 +129,7 @@ $shower = {
 		if pcs_horny >= 40:
 			act 'Use the shower head on your pussy':
 				menu_off = 1
-				cla
-				*clr
+				*clr & cla
 				if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 				*nl
@@ -154,6 +152,10 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -163,8 +165,7 @@ $shower = {
 $bath = {
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
-		cla
-		*clr
+		*clr & cla
 		shampoo -= 1
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
@@ -210,8 +211,7 @@ $bath = {
 
 		act '"Wash" your pussy':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
 			minut += 10
 
@@ -228,6 +228,10 @@ $bath = {
 
 			dynamic $dryOff
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -393,8 +397,7 @@ $tampon = {
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			sanpad -= 1
 			isprokp = 1
 			minut += 5
@@ -408,8 +411,7 @@ $tampon = {
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			tampon -= 1
 			isprok = 1
 			minut += 5
@@ -426,8 +428,7 @@ $quickwash = {
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 
 			cumspclnt = 4
 			gs 'cum_cleanup'
@@ -654,8 +655,7 @@ $basin = {
 }
 
 $pir_title = {
-	cla
-	*clr
+	*clr & cla
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
 	*nl
 }
@@ -1136,8 +1136,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
 		act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			poroshok -= 2
 			minut += 60
@@ -1153,8 +1152,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and huspolday ! daystart:
 		act 'Clean the apartment (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			minut += 60
 			huspolday = daystart
@@ -1250,15 +1248,13 @@ if $ARGS[0] = 'ArousedReact1':
 	'You rub your thighs together as you stare at the pregnancy test in your hand. The two strips displayed confirm that you’ve been knocked up. You excitedly recount every load of cum blast into your fertile womb, wondering which one found purchase. You gently rub your clit in a circular motion as you think about the fact that, in a few months, everyone who sees your large, pregnant belly will know what a slut you are.'
 		if rape > 0 and stat['vaginal'] > 1 and incest['exp'] = 0:
 			'You pick up speed as you recall your rapist forcefully pumping you full of his wonderful semen without any concern for your desires. You loved having your agency stripped away as a complete stranger decided to make you a mother.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		elseif incest['exp'] > 0:
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		else
-			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
+			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'	
 		end
+		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $metka
 end
 
@@ -1319,8 +1315,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
 			act 'Change tampon':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1331,8 +1326,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
 			act 'Change pad':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1346,8 +1340,7 @@ end
 
 if $ARGS[0] = 'prvt_pee_end':
 	act 'Finish and wipe':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,2)
 		if rand_pee = 0:
@@ -1393,7 +1386,7 @@ if $ARGS[0] = 'pblc_pee':
 			if rand_pee = 0:
 				'Albina and her Starlettes are a bunch of dirty whores.'
 			elseif rand_pee = 1:
-				'<<$rand_girl>>''s vagina smells like throw-up!'
+				'<<$rand_girl>>''s vagina smells like puke!'
 			elseif rand_pee = 2:
 				'Beware of Dimka! He''s not as nice as he seems!'
 			elseif rand_pee = 3:
@@ -1409,7 +1402,7 @@ if $ARGS[0] = 'pblc_pee':
 			elseif rand_pee = 8:
 				'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote “Freebleeder for life!” Ewww.'
 			elseif rand_pee = 9:
-				'Petras cock is smaller than my lipstick tube, LOL!'
+				'Petra''s cock is smaller than my lipstick tube, LOL!'
 			elseif rand_pee = 10:
 				'You''re beautiful! Believe that!'
 			elseif rand_pee = 11:

+ 71 - 6
locations/experiment.qsrc

@@ -90,6 +90,8 @@ end
 
 if $ARGS[0] = 'deskTalk:shout':
 	shouted = 1
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\shout.jpg"></center>'
 	*nl
 	'"Calm damn miss <<$pcs_lastname>>, or I will be forced to call a security!" the woman yells as she tries to calm you down.'
@@ -99,6 +101,8 @@ if $ARGS[0] = 'deskTalk:shout':
 end
 
 if $ARGS[0] = 'deskTalk:refuse':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"I understand miss <<$pcs_lastname>>. I guess being used by those extra large sized cocks is not an experience that a woman would like to go through repeatedly." she understandingly replies.'
@@ -115,14 +119,16 @@ if $ARGS[0] = 'deskTalk:refuse':
 end
 
 if $ARGS[0] = 'deskTalk:admitWhore':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"You see miss <<$pcs_lastname>>, acceptance is the first step. Now do you want to rejoin the experiment, or not?" she grins as she asks.'
 	'"I am not sure, nurse..." you hesitantly answer.'
 	'"Just think about all those big black cocks, ready to fill you up... And all the orgasms you would be experiencing!" she is trying her best to tempt you.'
 
-	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 	act 'No, I have to fight this..':gt 'poli', 'start'
+	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 end
 
 if $ARGS[0] = 'deskTalk:volunteer':
@@ -130,6 +136,7 @@ if $ARGS[0] = 'deskTalk:volunteer':
 	impreg = 0
 	expVolunteer = 1
 	expVolunteerExam = 0
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -139,6 +146,7 @@ end
 
 if $ARGS[0] = 'deskTalk:volunteer:start':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -154,6 +162,7 @@ end
 
 if $ARGS[0] = 'form':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<h2>Research project #667 - "Fruit of Eden"</h2>'
 
@@ -183,6 +192,7 @@ end
 if $ARGS[0] = 'form:filled':
 	exp_form = 1
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\desk.jpg"></center>'
 	*nl
@@ -195,6 +205,7 @@ end
 
 if $ARGS[0] = 'testarea:start':
 	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -582,8 +593,9 @@ if $ARGS[0] = 'testarea:start:treatmentStart':
 	'She takes out a syringe, pushing the remaining air bubbles out. Holding you by the arm she is about to inject it into you...'
 
 	act 'Brace for the pinch':
-		if preg = 0: gt 'experiment', 'testarea:start:treatmentStart:injection'
-		if preg > 0:
+		if pregchem = 0: 
+			gt 'experiment', 'testarea:start:treatmentStart:injection'
+		elseif pregchem > 0:
 			cla & *clr
 			minut += 120
 			thinkpreg = 1
@@ -761,9 +773,26 @@ if $ARGS[0] = 'testarea:start:treatmentStart:dream3':
 		if interr = 3:'<<$doc1>>: "Indeed. And she has had sex with both an asian AND an african male."'
 	end
 	*nl
-	'Unable to stay awake anymore you fade out back to the world of unknowing...'
+	
+	if venera = 0 and GerpesOnce = 0 and Gerpes = 0 and SifacOnce = 0 and Sifilis = 0 and TriperOnce = 0 and Triper = 0 and TriperOral = 0 and KandidozOnce = 0 and Kandidoz = 0:
+		'Unable to stay awake anymore you fade out back to the world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+	else
+		'"But she has a STD," is the last thing you here before you fade out back to world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup:std'
+	end
+end
 
-	act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+if $ARGS[0] = 'testarea:start:treatmentStart:wakeup:std':
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\lights.jpg"></center>'
+	'You''re finally awake, feeling as if you''ve slept for days.'
+	'Your eyes slowly adjust to the light coming from the ceiling lamps. It looks as if there are no windows at all and only artificial light illuminates the room.'
+	*nl
+	'A nurse stands next to your bed. "Sorry, we can''t let you be part of the experiment. You have a STD," she says. "You can get dressed here before you leave."'
+	
+	act 'Get dressed and leave': gt 'poli', 'start'	
 end
 
 if $ARGS[0] = 'testarea:start:treatmentStart:wakeup1':
@@ -1202,6 +1231,8 @@ if $ARGS[0] = 'testarea:treatment:sex3':
 	gs 'arousal', 'vaginal', 4, 'bound', 'sub', 'rough', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 	*nl
 	'At last his ejaculation ends. He does not pull immediately out, instead he signals for the nurse. As she arrives, he finally pulls his sticky, cum covered cock out. And you don''t feel empty for too long...'
@@ -1278,6 +1309,8 @@ if $ARGS[0] = 'testarea:treatment:deflower':
 		gs 'arousal', 'vaginal', 5, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 		*nl
 		act '(endure)':experi_stage = 5 & gt 'experiment', 'testarea:treatment:deflower'
@@ -1914,6 +1947,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal cowgirl, 1v1
@@ -1930,6 +1965,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 45, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal missionary, 1v1
@@ -1945,6 +1982,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'bj', 15, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal + mouth, 2v1
@@ -1962,6 +2001,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal doggy, 1v1
@@ -1978,6 +2019,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal missionary, 1v1
@@ -1994,6 +2037,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bj, 1v1
@@ -2013,6 +2058,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 70
 		gs 'cum_call', 'face', 'Some african male', 0, '', 250000, 20
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, anal, 1v1
@@ -2031,6 +2078,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, whip, 1v1
@@ -2223,6 +2272,7 @@ end
 if $ARGS[0] = 'testarea:treatment:room:event:nurse:check':
 	minut += 5
 	! STATUS CHECK: nurse
+	gs 'experiment', 'std_block'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'She takes a sample of your blood, measures your temperature, blood pressure and proceeds to examine insides of your vagina.'
 
@@ -2481,6 +2531,7 @@ if $ARGS[0] = 'testarea:treatment:impreg:leave':
 	minut += 5
 	money += 50000
 	experimentAbsolved += 1
+	gs 'experiment', 'std_block'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'The nurse speaks up, "And the last matter to be settled is your payment."'
@@ -2557,7 +2608,8 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish':
 	gs 'cum_call', 'breasts', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'butt', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'labia', 'Some african male', 0, '', 250000, 50
-
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 
 	act 'Continue':gt 'experiment', 'testarea:treatment:impreg:shout:punish:kickout'
@@ -2585,5 +2637,18 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish:kickout':
 	act 'Get up':gt 'poli', 'start'
 end
 
+if $ARGS[0] = 'std_block':
+	venera = 0
+	GerpesOnce = 0
+	Gerpes = 0
+	SifacOnce = 0
+	Sifilis = 0
+	TriperOnce = 0
+	Triper = 0
+	TriperOral = 0
+	KandidozOnce = 0
+	Kandidoz = 0
+end
+
 --- experiment ---------------------------------
 

+ 3 - 2
locations/gadukino.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = '':
 			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
 			act 'Grandparent''s house': minut += 5 & gt 'Gaddvor'
 		end
-		if npc_rel['A60'] > 0: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
+		if npc_rel['A60'] > 0 and metmira = 1: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
 		*nl
 
 		if month >= 6 and month <= 9:
@@ -301,7 +301,8 @@ if $ARGS[0] = 'mira_events':
 		'Walking around the village you notice a young girl around your own age. You do not recognize her from the last time you were at the village. She is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
 		act 'Help her':
 			*clr & cla
-			npc_rel['A60'] = 10
+			metmira = 1
+			npc_rel['A60'] += 10
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'

+ 2 - 2
locations/grandpahelp.qsrc

@@ -109,7 +109,7 @@ elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and
 	end
 else
 	if hour >= 9:
-		randmsg = rand(0,5):
+		randmsg = rand(0,5)
 		if randmsg = 0:
 			'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
 		elseif randmsg = 1:
@@ -124,7 +124,7 @@ else
 			'"- You can take the day off to rest up."'
 		end
 	else
-		randmsg = rand(0,1):
+		randmsg = rand(0,1)
 		if randmsg = 0:
 			'"- You don''t need to help out today <<$pcs_nickname>>."'
 		else

+ 1 - 1
locations/gschool_boys_bathroom.qsrc

@@ -1248,7 +1248,7 @@ if $ARGS[0] = 'companyb4':
 	act 'Masturbate': gt 'gschool_boys_bathroom', 'masturbateb4'
 end
 
-if $ARGS[0]  'masturbateb4':
+if $ARGS[0] = 'masturbateb4':
 	cla & *clr
 	stat['mast'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(1,3)

+ 148 - 2
locations/gschool_lessons.qsrc

@@ -3085,6 +3085,9 @@ if $ARGS[0] = 'npc_data':
 !!7 - Family
 !!8 - Pavlovsk
 
+!!===========================General=============================
+maxnpcs = 231
+
 !!
 !!===========================Male Students=======================
 !!
@@ -3093,6 +3096,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[1] = 0
 	grupTipe[1] = 1
 	selfieenable[1] = 1
+	schoolenable[1] = 1
+	discoenable[1] = 1
 	$npcGo[1] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 	$npcSelfie[1] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 
@@ -3101,6 +3106,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[2] = 0
 	grupTipe[2] = 3
 	selfieenable[2] = 1
+	schoolenable[2] = 1
+	discoenable[2] = 1
 	$npcGo[2] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
 	$npcSelfie[2] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
 
@@ -3109,6 +3116,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[3] = 0
 	grupTipe[3] = 2
 	selfieenable[3] = 1
+	schoolenable[3] = 1
+	discoenable[3] = 1
 	$npcGo[3] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
 	$npcSelfie[3] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
 
@@ -3117,6 +3126,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[4] = 0
 	grupTipe[4] = 1
 	selfieenable[4] = 1
+	schoolenable[4] = 1
+	discoenable[4] = 1
 	$npcGo[4] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
 	$npcSelfie[4] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
 
@@ -3126,6 +3137,8 @@ if $ARGS[0] = 'npc_data':
 	if fedormasha = 1: grupTipe[5] = 5
 	if fedormasha = 0: grupTipe[5] = 2
 	selfieenable[5] = 1
+	schoolenable[5] = 1
+	discoenable[5] = 1
 	$npcGo[5] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
 	$npcSelfie[5] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
 
@@ -3134,6 +3147,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[6] = 0
 	grupTipe[6] = 3
 	selfieenable[6] = 1
+	schoolenable[6] = 1
+	discoenable[6] = 1
 	$npcGo[6] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
 	$npcSelfie[6] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
 
@@ -3142,6 +3157,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[7] = 0
 	grupTipe[7] = 5
 	selfieenable[7] = 1
+	schoolenable[7] = 1
+	discoenable[7] = 1
 	$npcGo[7] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
 	$npcSelfie[7] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
 
@@ -3150,6 +3167,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[8] = 0
 	grupTipe[8] = 2
 	selfieenable[8] = 1
+	schoolenable[8] = 1
+	discoenable[8] = 1
 	$npcGo[8] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
 	$npcSelfie[8] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
 
@@ -3158,6 +3177,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[9] = 0
 	grupTipe[9] = 4
 	selfieenable[9] = 1
+	schoolenable[9] = 1
+	discoenable[9] = 1
 	$npcGo[9] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
 	$npcSelfie[9] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
 
@@ -3166,6 +3187,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[10] = 0
 	grupTipe[10] = 4
 	selfieenable[10] = 1
+	schoolenable[10] = 1
+	discoenable[10] = 1
 	$npcGo[10] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
 	$npcSelfie[10] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
 
@@ -3174,6 +3197,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[11] = 0
 	grupTipe[11] = 4
 	selfieenable[11] = 1
+	schoolenable[11] = 1
+	discoenable[11] = 1
 	$npcGo[11] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
 	$npcSelfie[11] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
 
@@ -3182,6 +3207,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[146] = 0
 	grupTipe[146] = 1
 	selfieenable[146] = 1
+	schoolenable[146] = 1
+	discoenable[146] = 1
 	$npcGo[146] = '<a href="exec:numnpc = 146 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
 	$npcSelfie[146] = '<a href="exec:numnpc = 146 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
 
@@ -3190,6 +3217,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[147] = 0
 	grupTipe[147] = 1
 	selfieenable[147] = 1
+	schoolenable[147] = 1
+	discoenable[147] = 1
 	$npcGo[147] = '<a href="exec:numnpc = 147 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
 	$npcSelfie[147] = '<a href="exec:numnpc = 147 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
 
@@ -3198,6 +3227,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[148] = 0
 	grupTipe[148] = 1
 	selfieenable[148] = 1
+	schoolenable[148] = 1
+	discoenable[148] = 1
 	$npcGo[148] = '<a href="exec:numnpc = 148 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
 	$npcSelfie[148] = '<a href="exec:numnpc = 148 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
 
@@ -3206,6 +3237,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[149] = 0
 	grupTipe[149] = 2
 	selfieenable[149] = 1
+	schoolenable[149] = 1
+	discoenable[149] = 1
 	$npcGo[149] = '<a href="exec:numnpc = 149 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
 	$npcSelfie[149] = '<a href="exec:numnpc = 149 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
 
@@ -3214,6 +3247,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[150] = 0
 	grupTipe[150] = 2
 	selfieenable[150] = 1
+	schoolenable[150] = 1
+	discoenable[150] = 1
 	$npcGo[150] = '<a href="exec:numnpc = 150 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
 	$npcSelfie[150] = '<a href="exec:numnpc = 150 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
 
@@ -3222,6 +3257,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[151] = 0
 	grupTipe[151] = 3
 	selfieenable[151] = 1
+	schoolenable[151] = 1
+	discoenable[151] = 1
 	$npcGo[151] = '<a href="exec:numnpc = 151 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
 	$npcSelfie[151] = '<a href="exec:numnpc = 151 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
 
@@ -3230,6 +3267,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[152] = 0
 	grupTipe[152] = 3
 	selfieenable[152] = 1
+	schoolenable[152] = 1
+	discoenable[152] = 1
 	$npcGo[152] = '<a href="exec:numnpc = 152 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
 	$npcSelfie[152] = '<a href="exec:numnpc = 152 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
 
@@ -3238,6 +3277,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[153] = 0
 	grupTipe[153] = 3
 	selfieenable[153] = 1
+	schoolenable[153] = 1
+	discoenable[153] = 1
 	$npcGo[153] = '<a href="exec:numnpc = 153 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
 	$npcSelfie[153] = '<a href="exec:numnpc = 153 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
 
@@ -3246,6 +3287,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[154] = 0
 	grupTipe[154] = 4
 	selfieenable[154] = 1
+	schoolenable[154] = 1
+	discoenable[154] = 1
 	$npcGo[154] = '<a href="exec:numnpc = 154 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
 	$npcSelfie[154] = '<a href="exec:numnpc = 154 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
 
@@ -3254,6 +3297,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[155] = 0
 	grupTipe[155] = 4
 	selfieenable[155] = 1
+	schoolenable[155] = 1
+	discoenable[155] = 1
 	$npcGo[155] = '<a href="exec:numnpc = 155 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
 	$npcSelfie[155] = '<a href="exec:numnpc = 155 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
 
@@ -3262,6 +3307,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[156] = 0
 	grupTipe[156] = 4
 	selfieenable[156] = 1
+	schoolenable[156] = 1
+	discoenable[156] = 1
 	$npcGo[156] = '<a href="exec:numnpc = 156 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
 	$npcSelfie[156] = '<a href="exec:numnpc = 156 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
 
@@ -3270,6 +3317,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[157] = 0
 	grupTipe[157] = 4
 	selfieenable[157] = 1
+	schoolenable[157] = 1
+	discoenable[157] = 1
 	$npcGo[157] = '<a href="exec:numnpc = 157 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
 	$npcSelfie[157] = '<a href="exec:numnpc = 157 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
 
@@ -3278,6 +3327,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[158] = 0
 	grupTipe[158] = 4
 	selfieenable[158] = 1
+	schoolenable[158] = 1
+	discoenable[158] = 1
 	$npcGo[158] = '<a href="exec:numnpc = 158 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
 	$npcSelfie[158] = '<a href="exec:numnpc = 158 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
 
@@ -3286,6 +3337,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[159] = 0
 	grupTipe[159] = 5
 	selfieenable[159] = 1
+	schoolenable[159] = 1
+	discoenable[159] = 1
 	$npcGo[159] = '<a href="exec:numnpc = 159 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
 	$npcSelfie[159] = '<a href="exec:numnpc = 159 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
 
@@ -3294,6 +3347,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[165] = 0
 	grupTipe[165] = 2
 	selfieenable[165] = 1
+	schoolenable[165] = 1
+	discoenable[165] = 1
 	$npcGo[165] = '<a href="exec:numnpc = 165 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 	$npcSelfie[165] = '<a href="exec:numnpc = 165 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 	
@@ -3302,6 +3357,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[189] = 0
 	grupTipe[189] = 4
 	selfieenable[189] = 1
+	schoolenable[189] = 1
+	discoenable[189] = 1
 	$npcGo[189] = '<a href="exec:numnpc = 189 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
 	$npcSelfie[189] = '<a href="exec:numnpc = 189 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
 
@@ -3313,6 +3370,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[12] = 1
 	grupTipe[12] = 3
 	selfieenable[12] = 1
+	schoolenable[12] = 1
+	discoenable[12] = 1
 	$npcGo[12] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
 	$npcSelfie[12] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
 
@@ -3321,6 +3380,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[13] = 1
 	grupTipe[13] = 2
 	selfieenable[13] = 1
+	schoolenable[13] = 1
+	discoenable[13] = 1
 	$npcGo[13] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
 	$npcSelfie[13] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
 
@@ -3329,6 +3390,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[14] = 1
 	grupTipe[14] = 1
 	selfieenable[14] = 1
+	schoolenable[14] = 1
+	discoenable[14] = 1
 	$npcGo[14] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
 	$npcSelfie[14] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
 
@@ -3337,6 +3400,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[15] = 1
 	grupTipe[15] = 1
 	selfieenable[15] = 1
+	schoolenable[15] = 1
+	discoenable[15] = 1
 	$npcGo[15] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
 	$npcSelfie[15] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
 
@@ -3345,6 +3410,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[16] = 1
 	grupTipe[16] = 3
 	selfieenable[16] = 1
+	schoolenable[16] = 1
+	discoenable[16] = 1
 	$npcGo[16] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
 	$npcSelfie[16] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
 
@@ -3353,6 +3420,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[17] = 1
 	grupTipe[17] = 1
 	selfieenable[17] = 1
+	schoolenable[17] = 1
+	discoenable[17] = 1
 	$npcGo[17] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
 	$npcSelfie[17] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
 
@@ -3360,11 +3429,13 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[18] = 'A18'
 	npcPol[18] = 1
 	if zverSlutQW >= 2:
-		grupTipe[18] = 0
+		grupTipe[18] = 5
 	else
 		grupTipe[18] = 2
 	end
 	selfieenable[18] = 1
+	schoolenable[18] = 1
+	discoenable[18] = 1
 	$npcGo[18] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
 	$npcSelfie[18] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
 
@@ -3373,6 +3444,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[19] = 1
 	grupTipe[19] = 2
 	selfieenable[19] = 1
+	schoolenable[19] = 1
+	discoenable[19] = 1
 	$npcGo[19] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
 	$npcSelfie[19] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
 
@@ -3381,6 +3454,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[20] = 1
 	grupTipe[20] = 4
 	selfieenable[20] = 1
+	schoolenable[20] = 1
+	discoenable[20] = 1
 	$npcGo[20] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
 	$npcSelfie[20] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
 
@@ -3389,6 +3464,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[21] = 1
 	grupTipe[21] = 4
 	selfieenable[21] = 1
+	schoolenable[21] = 1
+	discoenable[21] = 1
 	$npcGo[21] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
 	$npcSelfie[21] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
 
@@ -3397,13 +3474,18 @@ if $ARGS[0] = 'npc_data':
 	npcPol[22] = 1
 	grupTipe[22] = 2
 	selfieenable[22] = 1
+	schoolenable[22] = 1
+	discoenable[22] = 1
 	$npcGo[22] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
 	$npcSelfie[22] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
 
 !!Albina Barlovskaya
 	$school_static_num[23] = 'A23'
 	npcPol[23] = 1
+	selfieenable[23] = 1
 	grupTipe[23] = 1
+	schoolenable[23] = 1
+	discoenable[23] = 1
 	$npcGo[23] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
 	$npcSelfie[23] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
 
@@ -3412,6 +3494,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[24] = 1
 	grupTipe[24] = 4
 	selfieenable[24] = 1
+	schoolenable[24] = 1
+	discoenable[24] = 1
 	$npcGo[24] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
 	$npcSelfie[24] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
 
@@ -3424,6 +3508,8 @@ if $ARGS[0] = 'npc_data':
 		grupTipe[25] = 1
 	end
 	selfieenable[25] = 1
+	schoolenable[25] = 1
+	discoenable[25] = 1
 	$npcGo[25] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
 	$npcSelfie[25] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
 
@@ -3432,6 +3518,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[139] = 1
 	grupTipe[139] = 1
 	selfieenable[139] = 1
+	schoolenable[139] = 1
+	discoenable[139] = 1
 	$npcGo[139] = '<a href="exec:numnpc = 139 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
 	$npcSelfie[139] = '<a href="exec:numnpc = 139 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
 
@@ -3440,6 +3528,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[140] = 1
 	grupTipe[140] = 1
 	selfieenable[140] = 1
+	schoolenable[140] = 1
+	discoenable[140] = 1
 	$npcGo[140] = '<a href="exec:numnpc = 140 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
 	$npcSelfie[140] = '<a href="exec:numnpc = 140 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
 
@@ -3448,6 +3538,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[141] = 1
 	grupTipe[141] = 2
 	selfieenable[141] = 1
+	schoolenable[141] = 1
+	discoenable[141] = 1
 	$npcGo[141] = '<a href="exec:numnpc = 141 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
 	$npcSelfie[141] = '<a href="exec:numnpc = 141 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
 
@@ -3456,6 +3548,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[142] = 1
 	grupTipe[142] = 3
 	selfieenable[142] = 1
+	schoolenable[142] = 1
+	discoenable[142] = 1
 	$npcGo[142] = '<a href="exec:numnpc = 142 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
 	$npcSelfie[142] = '<a href="exec:numnpc = 142 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
 	
@@ -3464,6 +3558,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[143] = 1
 	grupTipe[143] = 4
 	selfieenable[143] = 1
+	schoolenable[143] = 1
+	discoenable[143] = 1
 	$npcGo[143] = '<a href="exec:numnpc = 143 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
 	$npcSelfie[143] = '<a href="exec:numnpc = 143 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
 
@@ -3472,6 +3568,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[144] = 1
 	grupTipe[144] = 4
 	selfieenable[144] = 1
+	schoolenable[144] = 1
+	discoenable[144] = 1
 	$npcGo[144] = '<a href="exec:numnpc = 144 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
 	$npcSelfie[144] = '<a href="exec:numnpc = 144 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
 
@@ -3480,6 +3578,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[145] = 1
 	grupTipe[145] = 4
 	selfieenable[145] = 1
+	schoolenable[145] = 1
+	discoenable[145] = 1
 	$npcGo[145] = '<a href="exec:numnpc = 145 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	$npcSelfie[145] = '<a href="exec:numnpc = 145 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	
@@ -3487,7 +3587,9 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[231] = 'A231'
 	$npcPol[231] = 1
 	grupTipe[231] = 3
-	selfieenable[231] = 1
+	selfieenable[231] = 0
+	schoolenable[231] = 0
+	discoenable[231] = 0
 	$npcGo[231] = '<a href="exec:numnpc = 231 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 	$npcSelfie[231] = '<a href="exec:numnpc = 231 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 
@@ -3499,6 +3601,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[26] = 0
 	grupTipe[26] = 6
 	selfieenable[26] = 1
+	schoolenable[26] = 1
+	discoenable[26] = 0
 	$npcGo[26] = '<a href="exec:numnpc = 26 & gt ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
 	$npcSelfie[26] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
 
@@ -3507,6 +3611,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[69] = 0
 	grupTipe[69] = 6
 	selfieenable[69] = 1
+	schoolenable[69] = 1
+	discoenable[69] = 1
 	$npcGo[69] = '<a href="exec:numnpc = 69 & gt ''Snpc''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
 	$npcSelfie[69] = '<a href="exec:numnpc = 69 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
 
@@ -3515,6 +3621,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[128] = 0
 	grupTipe[128] = 6
 	selfieenable[128] = 1
+	schoolenable[128] = 1
+	discoenable[128] = 0
 	$npcGo[128] = '<a href="exec:numnpc = 128 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 	$npcSelfie[128] = '<a href="exec:numnpc = 128 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 
@@ -3523,6 +3631,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[129] = 0
 	grupTipe[129] = 6
 	selfieenable[129] = 1
+	schoolenable[129] = 1
+	discoenable[129] = 0
 	$npcGo[129] = '<a href="exec:numnpc = 129 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
 	$npcSelfie[129] = '<a href="exec:numnpc = 129 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
 	
@@ -3531,6 +3641,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[130] = 0
 	grupTipe[130] = 6
 	selfieenable[130] = 1
+	schoolenable[130] = 1
+	discoenable[130] = 0
 	$npcGo[130] = '<a href="exec:numnpc = 130 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 	$npcSelfie[130] = '<a href="exec:numnpc = 130 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 
@@ -3539,6 +3651,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[131] = 0
 	grupTipe[131] = 6
 	selfieenable[131] = 1
+	schoolenable[131] = 1
+	discoenable[131] = 0
 	$npcGo[131] = '<a href="exec:numnpc = 131 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
 	$npcSelfie[131] = '<a href="exec:numnpc = 131 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
 
@@ -3547,6 +3661,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[132] = 0
 	grupTipe[132] = 6
 	selfieenable[132] = 1
+	schoolenable[132] = 1
+	discoenable[132] = 0
 	$npcGo[132] = '<a href="exec:numnpc = 132 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 	$npcSelfie[132] = '<a href="exec:numnpc = 132 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 
@@ -3555,6 +3671,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[133] = 0
 	grupTipe[133] = 6
 	selfieenable[133] = 1
+	schoolenable[133] = 1
+	discoenable[133] = 0
 	$npcGo[133] = '<a href="exec:numnpc = 133 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 	$npcSelfie[133] = '<a href="exec:numnpc = 133 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 	
@@ -3563,6 +3681,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[134] = 1
 	grupTipe[134] = 6
 	selfieenable[134] = 1
+	schoolenable[134] = 1
+	discoenable[134] = 0
 	$npcGo[134] = '<a href="exec:numnpc = 134 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 	$npcSelfie[134] = '<a href="exec:numnpc = 134 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 
@@ -3571,6 +3691,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[135] = 1
 	grupTipe[135] = 6
 	selfieenable[135] = 1
+	schoolenable[135] = 1
+	discoenable[135] = 0
 	$npcGo[135] = '<a href="exec:numnpc = 135 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 	$npcSelfie[135] = '<a href="exec:numnpc = 135 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 
@@ -3579,6 +3701,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[136] = 1
 	grupTipe[136] = 6
 	selfieenable[136] = 1
+	schoolenable[136] = 1
+	discoenable[136] = 0
 	$npcGo[136] = '<a href="exec:numnpc = 136 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 	$npcSelfie[136] = '<a href="exec:numnpc = 136 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 
@@ -3587,6 +3711,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[137] = 1
 	grupTipe[137] = 6
 	selfieenable[137] = 1
+	schoolenable[137] = 1
+	discoenable[137] = 0
 	$npcGo[137] = '<a href="exec:numnpc = 137 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 	$npcSelfie[137] = '<a href="exec:numnpc = 137 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 
@@ -3595,6 +3721,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[138] = 1
 	grupTipe[138] = 6
 	selfieenable[138] = 1
+	schoolenable[137] = 1
+	discoenable[137] = 0
 	$npcGo[138] = '<a href="exec:numnpc = 138 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 	$npcSelfie[138] = '<a href="exec:numnpc = 138 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 
@@ -3606,6 +3734,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[28] = 0
 	grupTipe[28] = 7
 	selfieenable[28] = 1
+	schoolenable[28] = 0
+	discoenable[28] = 0
 	$npcGo[28] = '<a href="exec:numnpc = 28 & gt ''Snpc''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
 	$npcSelfie[28] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
 	
@@ -3614,6 +3744,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[29] = 1
 	grupTipe[29] = 7
 	selfieenable[29] = 1
+	schoolenable[29] = 0
+	discoenable[29] = 0
 	$npcGo[29] = '<a href="exec:numnpc = 29 & gt ''Snpc''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
 	$npcSelfie[29] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
 	
@@ -3622,6 +3754,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[33] = 1
 	grupTipe[33] = 7
 	selfieenable[33] = 1
+	schoolenable[33] = 0
+	discoenable[33] = 0
 	$npcGo[33] = '<a href="exec:numnpc = 33 & gt ''Snpc''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
 	$npcSelfie[33] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
 	
@@ -3630,6 +3764,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[34] = 0
 	grupTipe[34] = 7
 	selfieenable[34] = 1
+	schoolenable[34] = 0
+	discoenable[34] = 0
 	$npcGo[34] = '<a href="exec:numnpc = 34 & gt ''Snpc''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
 	$npcSelfie[34] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
 
@@ -3638,6 +3774,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[35] = 0
 	grupTipe[35] = 7
 	selfieenable[35] = 1
+	schoolenable[35] = 0
+	discoenable[35] = 0
 	$npcGo[35] = '<a href="exec:numnpc = 35 & gt ''Snpc''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
 	$npcSelfie[35] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
 
@@ -3646,6 +3784,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[54] = 0
 	grupTipe[54] = 7
 	selfieenable[54] = 1
+	schoolenable[54] = 0
+	discoenable[54] = 0
 	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A54'']>> <<$npc_lastname[''A54'']>></a>'
 	$npcSelfie[54] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_nickname[''A54'']>>'
 	
@@ -3657,6 +3797,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[56] = 0
 	grupTipe[56] = 8
 	selfieenable[56] = 1
+	schoolenable[56] = 0
+	discoenable[56] = 0
 	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
 	$npcSelfie[56] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
 
@@ -3665,6 +3807,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[57] = 0
 	grupTipe[57] = 8
 	selfieenable[57] = 1
+	schoolenable[57] = 0
+	discoenable[57] = 0
 	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A57'']>> <<$npc_lastname[''A57'']>></a>'
 	$npcSelfie[57] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A57'']>>'
 
@@ -3673,6 +3817,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[112] = 0
 	grupTipe[112] = 8
 	selfieenable[112] = 1
+	schoolenable[112] = 0
+	discoenable[112] = 0
 	$npcGo[112] = '<a href="exec:numnpc = 112 & gt ''Snpc''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
 	$npcSelfie[112] = '<a href="exec:numnpc = 112 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
 

+ 27 - 2
locations/hunter_ambient.qsrc

@@ -238,8 +238,32 @@ if $ARGS[0] = 'yard_convo':
 end
 
 !Behavior events
+if $ARGS[0] = 'schedule':
+
+    hunters_breakfast = 0
+    hunters_off = 0
+    hunters_lunch = 0
+    hunters_evening = 0
+    hunters_drink = 0
+    hunters_sleep = 0
+
+    if hour = 5: 
+        hunters_breakfast = 0
+    elseif (hour >=6 and hour < 12) or (hour >= 14 and hour < 18):
+        hunters_off = 1
+    elseif hour >=12 and hour < 14:
+        hunters_lunch = 1
+    elseif hour >= 18 and hour < 20:
+        hunters_evening = 1
+    elseif hour >= 20 and hour < 23:
+        hunters_drink = 1
+    else
+        hunters_sleep = 1    
+    end
+end    
+
 if $ARGS[0] = 'bring_food':
-    if hour >= 9 and hour < 17:
+    if (hunters_lunch = 1 or hunters_evening = 1) and rand(1,10) = 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>'
@@ -248,6 +272,7 @@ if $ARGS[0] = 'bring_food':
 
         act 'Further': gt 'swamp_yard'
     end
-end    
+end
+
 
 --- hunter_ambient ---------------------------------

+ 242 - 0
locations/hunter_favors.qsrc

@@ -412,4 +412,246 @@ if $ARGS[0] = 'creekside_gangbang_request':
     end
 end
 
+if $ARGS[0] = 'yard_bondage':
+	if $ARGS[1] = '':
+		yard_bound_temprand = rand(1,10)
+
+		if hour >= 22 or hour < 5:
+			gs 'arousal', 'end'
+
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
+			'Finally with the hour getting so late Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel blood rushing back to your hands.'
+			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy'
+
+			act 'Further': gt 'swamp_yard'
+		end	
+
+		cla & *clr
+
+		hunter_sexual_comfort  += 1
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors_4.jpg"></center>'
+		'You are bound completely naked to some trees by the yard. Just the thought of being so helpless and exposed makes you feel butterflies in your stomach'
+	    'Anyone could do anything they wanted with your body right now. Maybe shove their dick in your available ass or pussy and have their way, or fuck your mouth as if you are a blow-up doll...'
+
+		gs 'arousal', 'flash', 2, 'bound', 'exhibitionism', 'sub'
+		gs 'arousal', 'end'
+
+		minut += 3
+
+		hunter_selector_temprand = rand(1,3)
+		if hunter_selector_temprand = 1:
+			gs 'boyStat', 'A172'
+		elseif hunter_selector_temprand = 2:
+			gs 'boyStat', 'A173'
+		elseif hunter_selector_temprand = 3:
+			gs 'boyStat', 'A174'
+		end	
+
+		if yard_bound_temprand = 4:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_bj'
+		elseif yard_bound_temprand = 5:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_fuck'
+		elseif yard_bound_temprand = 6:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'clamp_fuck'
+		elseif yard_bound_temprand = 7:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'quick_fuck'
+		elseif yard_bound_temprand = 8:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_fuck'
+		elseif yard_bound_temprand = 9:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_gangbang'
+		elseif yard_bound_temprand = 10:
+			act 'Further': gs 'hunter_favors', 'yard_bondage', 'bound_gangbang'						
+		end	
+
+		act 'Wait': gt 'hunter_favors', 'yard_bondage'
+	end
+
+	if $ARGS[1] = 'lost_bet':
+		*clr & cla
+
+		hunter_collective_opinion -= 20
+        hunter_sexual_comfort += 40
+		gs 'arousal', 'flash', 15, 'bound', 'exhibitionism', 'humiliation'
+		gs 'arousal', 'end'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors2.jpg"></center>'
+		'You let Andrei bind you right by the yard. After he is done, he leaves you hanging there to take care of something'
+		'You are completely helpless and feel your pussy starten to moisten as you feel the breeze on your bare skin.'
+
+		act 'Wait for him to come back': gt 'hunter_favors', 'yard_bondage'
+	end	
+	
+	!TODO: Add variety per hunter as opposed to the same event for all
+	if $ARGS[1] = 'passing_bj':
+
+		hunter_sexual_comfort += 6
+		hunter_collective_opinion -= 3
+		gs 'arousal', 'bj', 10, 'sub', 'bound', 'deepthroat'
+		gs 'arousal', 'end'
+			
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth1.jpg"></center>'
+		'You notice <<$boy>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
+		'He does not waste too much time unzipping his cock and pushing it on your face. You comply and start sucking his dick.'
+		'After a minute grabs your head and starts fucking your mouth. You struggle between trying to breathe and trying not to puke as his cock rams in and out of your throat'
+			
+		act 'Try and match his rythm':
+				cla & *clr
+				*nl
+				hunter_sexual_comfort += 4
+				hunter_collective_opinion -= 2
+				gs 'arousal', 'bj', 5, 'sub', 'bound', 'deepthroat'
+				gs 'arousal', 'end'
+				spafinloc = 12
+				gs 'cum_manage'
+				swallow += 1
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth2.jpg"></center>'
+				'You decide to make it some more fun for for him. You start bobbing your head in rhythm with his pumping.'
+				'Whenever he is all the way down your throat, you swallow to massage his cock.'
+
+				gs 'dinsex', 'dinrandbj'
+				*nl 
+				'Your efforts start paying off pretty quickly as he grabs your head and starts pumping even more quickly before he buries his cock all the way in'
+
+				gs 'dinsex', 'dinrandswallow'
+				'He gives you a pat on the head and says "Now that''s a good girl" before tying you upright and walking off, satisfied and drained.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+		act 'Let him have his way':
+				cla & *clr
+				*nl
+				gs 'arousal', 'bj', 10, 'rough', 'bound', 'deepthroat'
+				gs 'arousal', 'end'
+				spafinloc = 11
+				gs 'cum_manage'
+				spafinloc = 15
+				gs 'cum_manage'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth3.jpg"></center>'
+				'You decide if you relax your throat and face it will be easier not to puke all over his dick.'
+				'He strokes your hair as he keeps furiously ramming his cock up and down your throat, fucking your face like as if it was a sex toy.' 
+
+				gs 'dinsex', 'dinrandbj'
+				*nl 
+				'After a few minutes he pulls out of your mouth and jerks off to your face, splattering your face and chest with his spunk.'
+				'As you blink the cum off your eyes, he zips up and ties you back upright before walking away without saying anything else.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+	end	
+	
+	if $ARGS[1] = 'passing_fuck':
+		hunter_sexual_comfort += 10
+		hunter_collective_opinion -= 5
+			
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked2.jpg"></center>'
+		'You notice <<$boy>> walking towards you. Without saying a word, he unzips and bends you over.'
+		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boy>>''s cock fills your pussy'
+		'After letting you settle in to the sensation for a second he slowly starts pumping your pussy. In a minute you are screaming and moaning as he picks his pace up.'
+			
+		gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound'
+
+		act 'Start pumping your hips to match him':
+			cla & *clr
+			*nl
+			hunter_sexual_comfort += 5
+			hunter_collective_opinion -= 2
+
+			gs 'arousal', 'vaginal', 5, 'sub', 'bound'
+			gs 'arousal', 'end'
+			spafinloc = 0
+			pose = 3
+			gs 'cum_manage'
+			gs 'stat'
+
+			'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
+			'You cannot get enough of the sensation of <<$boy>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
+			
+			*nl
+			'<<$boy>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
+			gs 'dinsex', 'sexcum'
+			'After catching his breath, <<$boy>> gives your ass a fondle before walking away, leaving you hanging.'
+
+			act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+		act 'Let him have his way':
+				cla & *clr
+				*nl
+				gs 'arousal', 'vaginal', 10, 'rough', 'bound'
+				gs 'arousal', 'end'
+				spafinloc = 1
+				gs 'cum_manage'
+				spafinloc = 4
+				gs 'cum_manage'
+				spafinloc = 9
+				gs 'cum_manage'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked1.jpg"></center>'
+				'You are pretty much overwhelmed by <<$boy>> pumping your pussy while you are bound helpless and naked like this.'
+				'You decide to give in to the sensations and enjoy being fucked like an absolute whore.'
+				'He roughly grabs your ass to brace himself as he picks his pace even further, pounding your pussy with near fury.'
+				'Sounds of his hips rhythmically slamming against your ass fills your surrondings, mixed with the lewd smacking sounds of his cock pumping in your pussy and your loud moans and screams' 
+
+				*nl
+				'Just as you start feeling his cock throbbing in your pussy, he pulls out and blows his load all over your ass and pussy.'
+				'Without saying anything, <<$boy>> zips up and walks away, leaving you with cum running down your legs.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+	end	
+	
+	if $ARGS[1] = 'clamp_fuck':
+		gs 'boyStat', 'A172'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_clamps_fuck.jpg"></center>'
+
+	end	
+
+	if $ARGS[1] = 'quick_fuck':
+		gs 'boyStat', 'A174'
+		'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
+
+	end	
+
+	if $ARGS[1] = 'unbound_fuck':
+		gs 'boyStat', 'A173'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck1.jpg"></center>'
+
+
+	end	
+
+	if $ARGS[1] = 'unbound_gangbang':
+	end
+
+	if $ARGS[1] = 'bound_gangbang':
+	end
+
+		
+		gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
+		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'group'
+		gs 'arousal', 'end'
+		gs 'stat'
+			
+		gs 'dinsex','vaginal_sex',10,'sub'
+
+		gs 'arousal', 'bj', 240, 'sub', 'gangbang', 'humiliation'
+		gs 'arousal', 'hj', 240, 'sub', 'gangbang', 'humiliation'
+		gs 'arousal', 'vaginal', 240, 'sub', 'gangbang', 'humiliation'
+		gs 'arousal', 'anal', 240, 'sub', 'gangbang', 'humiliation' 
+		minut -= 720
+
+	end
+end	
+
+
+
+
+
 --- hunter_favors ---------------------------------

+ 233 - 172
locations/hunter_interactions.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'drink_with_hunters':
 			*nl
 			'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
 
-			act 'Continue': gs 'swamphouse', 'meal_table'
+			act 'Continue': gs 'swamp_yard', 'fireside'
 		end
 		act 'Drink beer':
 			*clr & cla
@@ -267,7 +267,7 @@ if $ARGS[0] = 'drink_with_hunters':
 			*nl
 			'You take a bottle of bear, open it and start drinking it.'
 
-			act 'Continue': gs 'swamphouse', 'meal_table'
+			act 'Continue': gs 'swamp_yard', 'fireside'
 		end
 end
 
@@ -275,26 +275,129 @@ if $ARGS[0] = 'chat_with_hunters':
     *clr & cla
     minut += rand (30,90)
     pcs_mood += rand(10,20)
-    if huntersAndreiQw < 10:huntersAndreiQw += 1
-    if huntersIgorQw < 10:huntersIgorQw += 1
-    if huntersSergeiQw < 10:huntersSergeiQw += 1
+    
+    hunter_collective_opinion += 2
     gs 'stat'
 
-    if CloSkirtShortness > 0 and $pantyworntype = 'none':
-        *clr & cla
-        if huntersKnowSlut > 0:hunterslut += 1
-        '<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 they tell get jumbled and most of the time is spent on throwing sideways glances at your naked vagina.'
-        gs 'arousal', 5, 'flashlite'
-        gs 'stat'
-    else
-        !TODO: Add more interactivity to the conversations. Make it point ot another dialogue event blog with new content even
+    act 'Finish chatting': gt 'swamp_yard'
+
+    if $ARGS[1] = '':
+        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 CloSkirtShortness > 0 and $pantyworntype = 'none' and rand(1,5) = 1:
+            gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
+        elseif $clothingworntype = 'nude' and rand(1,2) = 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
+        hunter_sexual_comfort += 5
+        hunter_collective_opinion -= 4
+    
+        '<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'
+        gs 'stat'
+    end  
+    
+    if $ARGS[1] = 'boy_talk':
+        *clr
+        
+        boy_talk = 1
+        
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+        '"So, Sveta, anyone special in your life?" Igor asks, slurring noticably'
+        
+        act 'Yes, actually':
+            cla 
+            act 'Finish chatting': gt 'swamp_yard'
+            hunter_sexual_comfort -= 5
+            hunter_collective_opinion += 3
+            '"Yeah I have been seeing someone for a while", you answer'
+            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:
+                cla
+                '"Bet he is not as fun as us" says Andrei'
+                '"Can he fuck you in all your holes at the same time like we can?" asks Sergey before the hunters get up and approach you'
+                if hunter_collective_opinion > 40 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                act 'You freeze in place, anticipating what is coming': gt 'hunter_interactions', 'fireside_gangbang'    
+            end    
+        end    
+        act 'No, not really': 
+            cla
+            act 'Finish chatting': gt 'swamp_yard'
+            hunter_sexual_comfort += 1
+            hunter_collective_opinion += 1
+            '"No, I do not really have someone. At least no one special.", you answer'
+            if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
+                '"How come?" says Igor. "Those... uh... boys in your class musssss... be stipud" drunkenly slurs Igor'
+            elseif hunter_sexual_comfort > 45 and hunter_collective_opinion > 30:
+                cla
+                '"Well guess it is better that way. You do not have someone to think about while having some fun" says Andrei'
+                '"Talking about fun, why don''t you get up and give us a little show" says Sergey before taking out his radio and putting on some music.'
+                gt 'hunter_interactions', 'dance_show'    
+            end 
+        end
+    end
+    
+    if $ARGS[1] = 'virginity_talk':
+        *clr
+
+        virginity_talk = 1
+
+        !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, Sveta, have you ever done it with a boy" Andrei asks, grinning mischievously.'
+        act '...no':
+            cla 
+            hunter_sexual_comfort -= 5
+            hunter_collective_opinion += 1
+            '"Huh...what? No I have not!" you answer, blushing to your ears'
+            if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
+                '"Stop embarrassing the little lady" says Sergey. "She is our guest, we have to be polite"'
+            elseif hunter_sexual_comfort > 50:
+                '"Wow so you really are a full on tease." says Igor'
+                '"Since you are such an innocent young lady why don''t you give us a little show without clothes blocking your innocence'
+                !TODO: Implement event
+                !if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                !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', 'fireside'    
+            end    
+        end    
+        act 'Uhh... kinda...': 
+            cla
+            hunter_sexual_comfort += 5
+            'You blurt out a small "yeah!" before going all red in the face. Why are you even telling these men that you have had sex? You look down embarrassed.'
+            if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
+                '"Well uhhh... it is normal at your age. You are not a little kid anymore" says Sergey'
+            elseif hunter_sexual_comfort > 50:
+                '"That means you know how to have fun. say, how about we play together a bit?" says Andrei before the hunters get up and start approaching you'
+                !TODO: Implement event
+                !if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                !act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'fireside_gangbang'    
+                act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+            end  
+        end
+    end
+
+    if $ARGS[1] = 'nude':
+        !TODO: Fill this in
     end
-    act 'Move away': gt 'swamp_yard'
 end
 
 if $ARGS[0] = 'meet_hunters':
@@ -386,161 +489,99 @@ if $ARGS[0] = 'meet_hunters_after_rescue':
 	end
 end
 
-!TODO: Revamp this
-if $ARGS[0] = 'shooting_practice':
-    if huntersKnowSlut = 0:
-        if shooting = 0:
-            act 'Ask to learn how to shoot the rifle':
-                *clr & cla
-                minut += 5
-                shootingday = daystart
-                gs 'stat'
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                '"Can''t you guys teach me how to shoot a rifle?'
-                '"You''re a girl, why would you want to learn something like that <<$pcs_nickname>>?" Andrei said smiling. "You should pursue sewing or maybe a girly sport instead. Shooting is for boys."'
-                '"Pretty please." you look at them while making puppy eyes.'
-                if pcs_apprnc >= 60:
-                    shooting = 1
-                    if huntersAndreiQw < 20:huntersAndreiQw += 1
-                    if huntersIgorQw < 20:huntersIgorQw += 1
-                    if huntersSergeiQw < 20:huntersSergeiQw += 1
-                    '"Okay <<$pcs_nickname>>, we give up", they say smiling. "You''ve persuaded us, we''ll teach you how to shoot...'
-                else
-                    huntersAndreiQw -= 1
-                    huntersIgorQw -= 1
-                    huntersSergeiQw -= 1
-                    '"No, <<$pcs_nickname>>, that will not work." they answer. "And don''t assume that those puppy eyes will work on us.'
-                    'You frown your lips and turn your back on the men. "You guys are no fun, I''m leaving." you say angrily while moving away from the hunters.'
+if $ARGS[0] = 'shooting_bet':
+    if $clothingworntype ! 'nude':
+        '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting.mp4"></video></center>'
+    else
+        '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting_nude.mp4"></video></center>'
+    end    
+    
+    !This beautiful snippet is from park.qsrc
+    tirkoef = pcs_agil + pcs_shoot
+	tirmin = tirkoef * 20 / 100
+    tirand = rand(tirkoef - tirmin, tirkoef + tirmin)
+    
+    act 'Further':
+        if tirand > 70:
+            gt 'hunter_interactions', 'shooting_bet', 'win'
+        else
+            gt 'hunter_interactions', 'shooting_bet', 'lose'
+        end        
+    end
+
+    if $ARGS[1] = 'win':
+    end    
+
+    if $ARGS[1] = 'lose':
+        cla & *clr
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/AndreiHanter.jpg"></center>'
+        '"Well seems like that did not work out as expected. Now, give me a moment while I think" says Andrei.'
+        'Just a second after you start thinking about what perverted scheme he can come up with, "Oh I know!" he says.'
+
+        !lost_bet_temprand = rand(1,4)
+        lost_bet_temprand = 1
+
+        if lost_bet_temprand = 1:
+            if $clothingworntype = 'nude':
+                '"I am going to tie you to that tree right next to the yard and then you will allow me to do whatever you want me to."'
+                '"Or the others..." he adds.'
+                act 'No fucking way!':
+                    cla
+
+                    hunter_collective_opinion -= 5
+                    hunter_sexual_comfort -= 20
+
+                    '"No fucking way! You really are getting ahead of yourself now." you angrily respond.'
+                    '"Damn you are such a cocktease. You are all fine walking around displaying yourself like that but the moment someone wants some fun you turn into an absolute prude." he says, somewhat annoyed.'
+                    act 'Walk away': gt 'swamp_woods'
                 end
-                if shooting = 1:
 
-                    act 'Learn how to shoot the rifle (0:30)':
-                        *clr & cla
-                        minut += 30
-                        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-                        'The hunters explain how to hold the rifle, aim, and when to squeeze the trigger. You feel that you are ready and decide to take a...'
-                        gs 'stat'
+                act 'Let him lead you to the trees': gt 'hunter_favors', 'yard_bondage', 'lost_bet'
+            else:
+                '"I want you to lose the clothes for today and tomorrow. Be more in touch with nature and all that. You can put em back on the day after of course"'
 
-                        act 'Shot':
-                            *clr & cla
-                            minut += 1
-                            fingal +=  rand(1,3)
-                            shoot_exp += 1
-                            '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting1.mp4"></video></center>'
-                            'The recoil wasn''t at all as you expected it to be. You hear a loud bang, and the last thing you remember is something hitting you on the forehead...'
-                            gs 'stat'
+                act 'Strip naked':
 
-                            act 'Pass out':gt 'hunters', 'huntersgroupfaint'
-                        end
-                    end
-                else
-                    act 'Go':gt 'swamp_yard'
-                end
-            end
-        else
-            act 'Ask to shoot the rifle':
-                if fingal = 0:
-                    *clr & cla
-                    minut += 5
-                    shootingday = daystart
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                    'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
-                    if shooting = 1:
-                        shooting = 2
-                        '"Okay, <<$pcs_nickname>>, just don''t end up like the first time," Andrei said jokingly.'
-                    elseif pcs_shoot <= 10:
-                        '"Sure, <<$pcs_nickname>>, just be careful." Andrei said smiling.'
-                    else
-                        '"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expensive." Andrei said smiling.'
-                    end
-                    if pcs_shoot >= 1 and pcs_shoot <= 10:
+                    !TODO: Add flavor 
+                    hunter_collective_opinion -= 5
+                    hunter_sexual_comfort += 10
 
-                        act 'Go shooting (1:00)':
-                            if (pcs_stren + pcs_shoot > 20) or (pcs_stren + pcs_shoot < 20 and rand(1,2) = 1):
-                                *clr & cla
-                                minut += 60
-                                shoot_exp += 1
-                                gs 'stat'
-                                '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
-                                'You fire the rifle for an hour under the hunters watchful eyes.'
+                    forced_naked_day = daystart + 1
 
-                                act'Further':gt 'swamp_yard'
-                            else
-                                *clr & cla
-                                minut += 5
-                                shoot_exp += 1
-                                gs 'stat'
-                                '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting1.mp4"></video></center>'
-                                'Everything went wrong just like the first time. You take a shot and got hit once again by the rifle on the forehead...'
-                                '"<<$pcs_nickname>>, are you still alive?" Igor asked you with some concern in his voice.'
-                                '"Yeah, I think so..." you reply, holding your bruised forehead.'
-                                '"I''m glad to hear that," Andrei said laughing. "Go get some rest, little Rambo".'
+                    gs 'clothing', 'strip', 'swamphouse'
+				    gs 'underwear', 'remove'
 
-                                act'Further':
-                                    *clr & cla
-                                    minut += 1
-                                    gs 'stat'
-                                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tongue.jpg"></center>'
-                                    '"I''m not Rambo, I''m Lara Croft," you reply. Andrei, stands there looking confused not understanding the reference.'
+				    gs 'arousal', 'flash', 10, 'exhibitionism', 'sub'
+				    gs 'arousal', 'end'
 
-                                    act'Further':gt 'swamp_yard'
-                                end
-                            end
-                        end
-                    else
-                        act 'Go shooting (1:00)':
-                            *clr & cla
-                            minut += 60
-                            shoot_exp += 1
-                            gs 'stat'
-                            '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
-                            'You fire the rifle for an hour under the hunters watchful eyes.'
+    			    gs 'stat'
+                    gt 'swamp_woods'
+                end
+                
+                act 'Refuse':
+                    cla 
 
-                            act'Further':gt 'swamp_yard'
-                        end
-                    end
-                else
-                    *clr & cla
-                    minut += 5
-                    shootingday = daystart
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                    'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
-                    '"You need to heal your forehead first." Andrei says smiling. "You have the spirit of an Amazon, you need to relax."'
+                    hunter_collective_opinion -= 10
+                    hunter_sexual_comfort -= 15
 
-                    act'Further':gt 'swamp_yard'
+                    '"I am not sure..." you respond. "I would be prancing around completely naked for three men I barely know, that''s just too much"'
+                    '"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just being silly together" he responds.'
+                    '"Besides, it is not fair to just back down from a bet liek that." he adds.'
+                    '"Sorry, but I will not just prance around naked for your viewing pleasure." you firmly respond.'
+                    act 'Walk away': gt 'swamp_woods'
                 end
             end
-        end
-    else
-        if huntslutsex = 0:
-            *clr & cla
-            minut += 5
-            shootingday = daystart
-            huntersexnude = 1
-            gs 'stat'
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-            'You approach the hunters sitting in the meadow. "Guys, let me shoot the rifle," you look at them with your puppy eyes.'
-            '"<<$pcs_nickname>>, come closer," replied Andrei. "If you want to shoot you need to repay us somehow."'
-
-            act'Approach':gt 'hunters', 'start'
-        else
-            *clr & cla
-            minut += 5
-            shootingday = daystart
-            gs 'stat'
 
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-            '"Please guys, I really want to shoot with the rifle."'
-            '"Don''t you worry <<$pcs_nickname>>, you have other talents that are more needed." Andrei replied.'
-            'He scoffs, pleased with the joke.'
+        !TODO: Implement these additional options
+        elseif lost_bet_temprand = 2:
+        elseif lost_bet_temprand = 3:
+        elseif lost_bet_temprand = 4:
+        end    
+    end 
 
-            act'Move away':gt 'swamp_yard'
-        end
-    end
 end    
 
+
 !Sexual interactions
 if $ARGS[0] = 'andrei_quick_fuck':
 	cla & *clr
@@ -554,7 +595,7 @@ if $ARGS[0] = 'andrei_quick_fuck':
 		'Andrei walks up to you without saying another word and forcefully pulls you closer by your nipples.'
 		gs 'pain', 10, 'pinch', 'nipples'
 		'You yelp but it is cut short when he shoves his tongue down your throat, roughly fondling you all over'
-		gs 'arousal', 'foreplay', 25, 'sub'
+		gs 'arousal', 'foreplay', 15, 'sub'
 		act 'You feel your pussy starting to get wet':
 			cla & *clr
             '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_finger.jpg"></center>'
@@ -563,8 +604,10 @@ if $ARGS[0] = 'andrei_quick_fuck':
             *nl
             '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_fuck.jpg"></center>'
             'He starts fucking you rough and hard, not caring what you are getting out of it. You are merely a cocksleeve for him.'
-			gs 'arousal', 'vaginal_finger', '15', 'sub'
-			gs 'arousal', 'vaginal', '30', 'sub', 'rough'
+            gs 'arousal', 'vaginal_finger', 15, 'sub'
+            gs 'dinsex','vaginal_sex', 30,'sub', 'rough'
+            minut -= 25
+
 			act '...':
 				cla & *clr
                 '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_cum.jpg"></center>'
@@ -575,10 +618,15 @@ if $ARGS[0] = 'andrei_quick_fuck':
 				gs 'arousal', 'end'
 				gs 'cum_call', 'breasts', 'A172', 1
 				gs 'cum_call', 'stomach', 'A172', 1
-				gs 'stat'
-				
-				act 'Further': gt 'swamp_yard'
-			end 
+                gs 'stat'
+                
+                minut -= 10
+                
+                act 'Further':
+                    if $loc = 'swamp_yard': gt 'swamp_yard'
+                    if $loc = 'swamp_woods': gt 'swamp_woods', 'shooting_practice', 'practice'    
+                end
+            end 
 		end
 	!end
 end
@@ -622,35 +670,38 @@ if $ARGS[0] = 'igor_demonstration':
 	end
 end
 
+if $ARGS[0] = 'indoors_naked_encounter':
+    gt $loc
+end    
+
 if $ARGS[0] = 'naked_encounter':
-	if huntersKnowSlut = 0 and $clothingworntype = 'nude':
-		cla
-		*clr
+	if huntersKnowSlut = 0 and $clothingworntype = 'nude' and hour < 23 and hour >= 7:
+		cla & *clr
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude.jpg"></center>'
 		'You notice the hunters ogling your body while you are walking around naked. You subconsciously cover up your private parts'
 
-		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude':
-			act 'Run inside and get dressed':
+		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude' and forced_naked_day < daystart:
+			act 'Run and get dressed':
 				*clr & cla
 				minut += 5
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
-				'You rush inside the hut so you can get dressed.'
-				act'Further':gt 'swamphouse'
+				'You rush to get your stuff in the hut so you can get dressed.'
+				act'Further': gt 'swamphouse'
 			end
-		else
-			act 'Run inside and cover up with a burlap sack':
+        elseif forced_naked_day < daystart:
+			act 'Cover up with a burlap sack you found':
 				*clr & cla
 				minut+=5
 				gs 'clothing', 'swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-				'You quickly rush inside the hut and wear a sack... It''s not much, but at least it''s better than nothing.'
-				act'Further':gt 'swamphouse'
+				'You look around and put on a piece of burlap sack you see... It''s not much, but at least it''s better than nothing.'
+				act'Further': gt $loc
 			end
 		end
 
@@ -751,6 +802,16 @@ if $ARGS[0] = 'naked_encounter':
 	end
 end
 
+if $ARGS[0] = 'dance_show':
+    gt $loc
+    !TODO: Fill this in
+end
+
+if $ARGS[0] = 'fireside_gangbang':
+    gt $loc
+    !TODO: Fill this in
+end
+
 if $ARGS[0] = 'striptease':
     if alko >= 8 and huntersKnowSlut > 0:
         *clr & cla

+ 3 - 0
locations/natbelapt.qsrc

@@ -335,6 +335,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'natbelapt','bathroom'
 		end
 	end

+ 133 - 0
locations/npcstatic1.qsrc

@@ -97,6 +97,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
+
 
 npctemp = 2
 $npc_dna['A<<npctemp>>'] = '1993665716 1616738815 1589755494 1229942753 1120816404 1371564141 1910586302'
@@ -195,6 +199,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
+
 
 npctemp = 3
 $npc_dna['A<<npctemp>>'] = '1580777525 1747887345 8321006077 1970922187 1029352130 7921283143 7765736018'
@@ -292,6 +300,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
+
 
 npctemp = 4
 $npc_dna['A<<npctemp>>'] = '1438762189 1855175944 1123617000 1817906848 1390916310 1459640815 1436321833'
@@ -389,6 +401,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
+
 
 npctemp = 5
 $npc_dna['A<<npctemp>>'] = '1379973003 1196687437 1136761140 2107449234 1973361988 1939869341 1786180096'
@@ -486,6 +502,11 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+if fedormasha = 1: npc_grupTipe['A<<npctemp>>'] = 5
+if fedormasha = 0: npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
+
 
 npctemp = 6
 $npc_dna['A<<npctemp>>'] = '1490744069 1013739636 1009283243 1951857582 1559659111 1792925326 1086487692'
@@ -583,6 +604,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
+
 
 npctemp = 7
 $npc_dna['A<<npctemp>>'] = '1689930319 1973226357 2129134392 2090450913 1513523102 2063456541 1533040976'
@@ -680,6 +705,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 5
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
+
 
 npctemp = 8
 $npc_dna['A<<npctemp>>'] = '1004746288 1743479356 1890053138 1336365224 1893621358 1730538237 1325162654'
@@ -777,6 +806,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
+
 
 npctemp = 9
 $npc_dna['A<<npctemp>>'] = '1851794364 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
@@ -874,6 +907,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
+
 
 npctemp = 10
 $npc_dna['A<<npctemp>>'] = '2049084127 1470960834 1280333156 1706598464 1268389504 1227431573 2132916352'
@@ -971,6 +1008,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
+
 
 npctemp = 11
 $npc_dna['A<<npctemp>>'] = '2092485270 1750615492 1357552191 1799649757 1558588590 1808035750 1644370082'
@@ -1072,6 +1113,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
+
 
 npctemp = 12
 $npc_dna['A<<npctemp>>'] = '1898622449 1904538322 8321006077 1825474042 1063577851 7921283143 7765736018'
@@ -1169,6 +1214,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
+
 
 npctemp = 13
 $npc_dna['A<<npctemp>>'] = '1731087833 1604487809 1464859113 1561062144 1440871037 1347904523 1150306572'
@@ -1270,6 +1319,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
+
 
 npctemp = 14
 $npc_dna['A<<npctemp>>'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
@@ -1367,6 +1420,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
+
 
 npctemp = 15
 $npc_dna['A<<npctemp>>'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
@@ -1464,6 +1521,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
+
 
 npctemp = 16
 $npc_dna['A<<npctemp>>'] = '1119464721 1614037462 1646642112 1959746313 1085890273 1009333823 1238937878'
@@ -1561,6 +1622,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
+
 
 npctemp = 17
 $npc_dna['A<<npctemp>>'] = '1736016429 1462897715 2010810526 1845581584 1266092607 1950870951 1153689245'
@@ -1658,6 +1723,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
+
 
 npctemp = 18
 $npc_dna['A<<npctemp>>'] = '1695885007 2098494473 1893236781 1197776866 1613803510 1095093401 1877459340'
@@ -1759,6 +1828,14 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+if zverSlutQW >= 2:
+	npc_grupTipe['A<<npctemp>>'] = 5
+else
+	npc_grupTipe['A<<npctemp>>'] = 2
+end
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
+
 
 npctemp = 19
 $npc_dna['A<<npctemp>>'] = '1868882449 1367396730 1179635869 1781589830 2141637715 1988698459 1710383168'
@@ -1856,6 +1933,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
+
 
 npctemp = 20
 $npc_dna['A<<npctemp>>'] = '1851794365 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
@@ -1953,6 +2034,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
+
 
 npctemp = 21
 $npc_dna['A<<npctemp>>'] = '1027294118 1526664895 1047167563 1146573782 1562782691 2063456541 1533040976'
@@ -2051,6 +2136,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
+
 
 npctemp = 22
 $npc_dna['A<<npctemp>>'] = '2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648'
@@ -2145,6 +2234,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
+
 
 npctemp = 23
 $npc_dna['A<<npctemp>>'] = '1410862429 1854775733 1705291842 1147504758 1609009238 1203561941 1602837590'
@@ -2239,6 +2332,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
+
 
 npctemp = 24
 $npc_dna['A<<npctemp>>'] = '1989757424 1370351107 1337196420 1362464918 1383218762 1045638336 1960389781'
@@ -2333,6 +2430,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
+
 
 npctemp = 25
 $npc_dna['A<<npctemp>>'] = '1633731691 1389436996 1448312616 1738900889 1051507305 1144473144 1251857548'
@@ -2432,6 +2533,14 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+if soniaPS > 0:
+	npc_grupTipe['A<<npctemp>>'] = 5
+else
+	npc_grupTipe['A<<npctemp>>'] = 1
+end
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
+
 
 npctemp = 26
 $npc_dna['A<<npctemp>>'] = '1047167563 2063456541 1533040976 1303801542 1620497680 1042269021 1659592524'
@@ -2526,6 +2635,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
+
 
 npctemp = 27
 $npc_dna['A<<npctemp>>'] = '1526664895 1146573782 1562782691 1262684992 1354837515 1727531312 2004326261'
@@ -2714,6 +2827,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
+
 
 npctemp = 29
 $npc_dna['A<<npctemp>>'] = '1545843327 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
@@ -2808,6 +2925,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
+
 
 npctemp = 30
 $npc_dna['A<<npctemp>>'] = '1545843328 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
@@ -3184,6 +3305,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
+
 
 npctemp = 34
 $npc_dna['A<<npctemp>>'] = '1588599246 1545843327 1085730943 1962976090 1780199176 1931034853 1979821791'
@@ -3278,6 +3403,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
+
 
 npctemp = 35
 $npc_dna['A<<npctemp>>'] = '1198040660 1936146603 2049979334 1276791698 1325847789 1379325296 1029736884'
@@ -3372,6 +3501,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
+
 
 npctemp = 36
 $npc_dna['A<<npctemp>>'] = '1902637322 1870968508 1231095894 1330096941 1541087381 1973617911 1386337081'

+ 16 - 0
locations/npcstatic2.qsrc

@@ -470,6 +470,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 7
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_nickname[''A54'']>>'
+
 
 npctemp = 55
 $npc_dna['A<<npctemp>>'] = '1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731'
@@ -658,6 +662,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 8
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
+
 
 npctemp = 57
 $npc_dna['A<<npctemp>>'] = '1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109'
@@ -752,6 +760,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 8
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A57'']>>'
+
 
 npctemp = 58
 $npc_dna['A<<npctemp>>'] = '1443401856 1151112047 8321006077 1153217734 1305220298 7921283143 7765736018'
@@ -1880,6 +1892,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 69 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
+
 
 npctemp = 70
 $npc_dna['A<<npctemp>>'] = '1625103852 1058929809 1950538836 1778016905 1380420827 1079863842 1745265049'

+ 92 - 0
locations/npcstatic3.qsrc

@@ -1132,6 +1132,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 8
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 112 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
+
 
 npctemp = 113
 $npc_dna['A<<npctemp>>'] = '1774396206 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
@@ -2636,6 +2640,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 128 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
+
 
 npctemp = 129
 $npc_dna['A<<npctemp>>'] = '1440577620 1404493595 1159165013 1229533074 1597914660 1301026307 1275667543'
@@ -2730,6 +2738,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 129 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
+
 
 npctemp = 130
 $npc_dna['A<<npctemp>>'] = '1726870149 1624130023 1044618711 1429525298 1800638929 1340956737 1405979189'
@@ -2824,6 +2836,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 130 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
+
 
 npctemp = 131
 $npc_dna['A<<npctemp>>'] = '1290761368 1731705745 1556198951 1402252861 1318878286 1783536035 1235327987'
@@ -2918,6 +2934,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 131 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
+
 
 npctemp = 132
 $npc_dna['A<<npctemp>>'] = '1845705457 1671776475 1432615990 2143340423 1777183626 1122316963 1021792548'
@@ -3012,6 +3032,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 132 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
+
 
 npctemp = 133
 $npc_dna['A<<npctemp>>'] = '1771221536 2027750396 2089544713 1734369517 1759135620 1433377965 1088177703'
@@ -3106,6 +3130,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 133 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
+
 
 npctemp = 134
 $npc_dna['A<<npctemp>>'] = '1837796316 1436860618 1699933821 1423519204 1271493655 1566380915 1482989416'
@@ -3200,6 +3228,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 134 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
+
 
 npctemp = 135
 $npc_dna['A<<npctemp>>'] = '1482962188 1063482733 1488899248 1806709653 1901966276 1373982700 1143695253'
@@ -3294,6 +3326,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 135 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
+
 
 npctemp = 136
 $npc_dna['A<<npctemp>>'] = '1323009327 1170828061 1350671739 1453635383 1122377435 1922441585 1637692781'
@@ -3388,6 +3424,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 136 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
+
 
 npctemp = 137
 $npc_dna['A<<npctemp>>'] = '1366158823 1463494144 1620282105 1806630761 1949066883 1679902075 1297964182'
@@ -3482,6 +3522,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 137 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
+
 
 npctemp = 138
 $npc_dna['A<<npctemp>>'] = '1041262937 1103319358 1212009691 1617547174 1655867289 1930930487 1952353548'
@@ -3576,6 +3620,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 6
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 138 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
+
 
 npctemp = 139
 $npc_dna['A<<npctemp>>'] = '1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077'
@@ -3670,6 +3718,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 139 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
+
 
 npctemp = 140
 $npc_dna['A<<npctemp>>'] = '1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038'
@@ -3764,6 +3816,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 140 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
+
 
 npctemp = 141
 $npc_dna['A<<npctemp>>'] = '2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018'
@@ -3858,6 +3914,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 141 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
+
 
 npctemp = 142
 $npc_dna['A<<npctemp>>'] = '1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730'
@@ -3952,6 +4012,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 142 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
+
 
 npctemp = 143
 $npc_dna['A<<npctemp>>'] = '1483702075 1521949936 1508959207 1971565483 1258438946 1771252769 1861114888'
@@ -4046,6 +4110,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 143 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
+
 
 npctemp = 144
 $npc_dna['A<<npctemp>>'] = '1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681'
@@ -4140,6 +4208,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 144 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
+
 
 npctemp = 145
 $npc_dna['A<<npctemp>>'] = '1353721655 1926973992 1103624951 1850596792 1430454682 1886117868 1618747491'
@@ -4234,6 +4306,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 145 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
+
 
 npctemp = 146
 $npc_dna['A<<npctemp>>'] = '1970425464 1559405118 2117548142 1930104143 1673957846 1166458305 1888536480'
@@ -4328,6 +4404,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 146 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
+
 
 npctemp = 147
 $npc_dna['A<<npctemp>>'] = '1457300123 1918120099 1967335170 1056889039 1290544338 1170828061 1350671739'
@@ -4422,6 +4502,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 147 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
+
 
 npctemp = 148
 $npc_dna['A<<npctemp>>'] = '1110871039 1215316528 1439574498 1881549627 1043257862 2062098828 1713844818'
@@ -4516,6 +4600,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 1
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 148 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
+
 
 npctemp = 149
 $npc_dna['A<<npctemp>>'] = '1299436863 1261698091 1686799294 1465620552 1949917866 1150154188 1072586683'
@@ -4610,6 +4698,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 149 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
+
 
 --- npcstatic3 ---------------------------------
 

+ 49 - 0
locations/npcstatic4.qsrc

@@ -94,6 +94,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 150 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
+
 
 npctemp = 151
 $npc_dna['A<<npctemp>>'] = '1668638992 1214865459 1808776698 1612495094 1514793001 1654481226 1823327274'
@@ -188,6 +192,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 151 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
+
 
 npctemp = 152
 $npc_dna['A<<npctemp>>'] = '1786501093 1834879963 1390361698 1051572151 1608736325 1790512075 1070782218'
@@ -282,6 +290,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 152 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
+
 
 npctemp = 153
 $npc_dna['A<<npctemp>>'] = '1907002748 2085207351 1100129632 1342689598 1745456331 1873513432 1485648419'
@@ -376,6 +388,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 153 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
+
 
 npctemp = 154
 $npc_dna['A<<npctemp>>'] = '1942572074 1700154733 1692821756 1194715785 1803063877 2081935270 2014274394'
@@ -470,6 +486,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 154 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
+
 
 npctemp = 155
 $npc_dna['A<<npctemp>>'] = '1153126939 1063403218 1979820912 1002904260 1380666059 1009730022 1657156801'
@@ -564,6 +584,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 155 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
+
 
 npctemp = 156
 $npc_dna['A<<npctemp>>'] = '1108429212 1130146285 1800931785 1571774683 1841942137 1677995681 1796981560'
@@ -658,6 +682,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 156 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
+
 
 npctemp = 157
 $npc_dna['A<<npctemp>>'] = '1663800525 1510572542 1424729633 1976950271 1830743114 1783648027 1763271904'
@@ -752,6 +780,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 157 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
+
 
 npctemp = 158
 $npc_dna['A<<npctemp>>'] = '1776510699 1586206108 1731953841 1110012478 1584998429 1767532419 1060614101'
@@ -846,6 +878,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 158 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
+
 
 npctemp = 159
 $npc_dna['A<<npctemp>>'] = '1426757610 1675195614 1268203516 1506174629 1153117090 1007713575 1605966541'
@@ -940,6 +976,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 5
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 159 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
+
 
 npctemp = 160
 $npc_dna['A<<npctemp>>'] = '1428796224 1909315069 1882255348 1835514071 1201593987 2123583560 1823246593'
@@ -1504,6 +1544,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 2
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 165 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
+
 
 npctemp = 166
 $npc_dna['A<<npctemp>>'] = '3081104871 3359076800 3939413889 3911496040 3098487725 3546780075 3860974284'
@@ -3742,6 +3786,11 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 4
+npc_selfieon['A<<npctemp>>'] = 1
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 189 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
+	
+
 npctemp = 190
 $npc_dna['A<<npctemp>>'] = '1492342626 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
 $npc_firstname['A<<npctemp>>'] = 'Yurik'

+ 4 - 0
locations/npcstatic5.qsrc

@@ -2960,6 +2960,10 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npc_grupTipe['A<<npctemp>>'] = 3
+npc_selfieon['A<<npctemp>>'] = 0
+$npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 231 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
+
 
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp

+ 2 - 2
locations/outdoors.qsrc

@@ -358,8 +358,8 @@ if $ARGS[0] = 'main':
 !!15 minute check to stop refreshes causing early gameover and cheating at exhibitionism
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
-			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0:
-				'<b><font color="red">You have the blood flowing down your legs and staining your clothes.</font></b>'
+			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'Gaddvor' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
+				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
 
 				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'
 

+ 1 - 1
locations/panties.qsrc

@@ -22,8 +22,8 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'wear':
+	panty_none = 0
 	if $ARGS[1] = '':
-		panty_none = 0
 		if $lastwornpantytype ! '':
 			$pantyworntype = $lastwornpantytype
 			pantywornnumber = lastwornpantynumber

+ 1 - 1
locations/park.qsrc

@@ -402,7 +402,7 @@ if $ARGS[0] = 'luna':
 						'You couldn''t even hit the target once.'
 					end
 
-					shoot_exp += 1
+					shoot_lvl += 1
 
 					act 'Move away':gt 'park', 'luna'
 				end

+ 54 - 30
locations/pavtrain_market.qsrc

@@ -239,8 +239,8 @@ if $ARGS[0] = 'events':
 	gs 'stat'
 	rinevrand = rand(1,19)
 
-	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if rand(0,3) ! 0: 
 		gs 'pavtrain_market', rinevrand
 	else
@@ -273,6 +273,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the beggar and pretend not to hear him.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 	act 'Give some money': 
@@ -283,6 +284,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles which he kindly thanks you for.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 end
@@ -294,6 +296,8 @@ if ARGS[0] = 2:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 3:
@@ -306,10 +310,11 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -320,7 +325,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a science fiction book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -331,7 +336,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a romance novel (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			w_book += 1
@@ -348,10 +353,11 @@ if ARGS[0] = 4:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 5
 			money -= 699
 			card = 2
@@ -367,7 +373,7 @@ if ARGS[0] = 4:
 	if porndeal = 1:
 		if money >= 400:
 			act 'Buy a porn magazine for the Chinese boy (400 <b>₽</b>)':
-				cls
+				*clr & cla
 				minut += 5
 				money -= 400
 				haveporn = 1
@@ -380,7 +386,7 @@ if ARGS[0] = 4:
 		end
 	else
 		act 'Browse the porn magazines':
-			cls
+			*clr & cla
 			pcs_horny += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -394,7 +400,7 @@ if ARGS[0] = 4:
 					act 'Leave':gt 'pavtrain_market', 'start'
 					act 'Look for something else':gt 'pavtrain_market', 4
 					act 'Ask for the price':
-						cls
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -403,7 +409,7 @@ if ARGS[0] = 4:
 						act 'Look for something else':gt 'pavtrain_market', 4
 						if money >= 400:
 							act 'Buy magazine (400 <b>₽</b>)':
-								cls
+								*clr & cla
 								minut += 5
 								money -= 400
 								pornMagazine = 40
@@ -426,7 +432,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -448,7 +454,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -465,7 +471,7 @@ if ARGS[0] = 4:
 		end
 	end
 	act 'Ask to see the sex toys':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
 		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
@@ -549,6 +555,8 @@ if ARGS[0] = 5:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 6:
@@ -558,7 +566,8 @@ if ARGS[0] = 6:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/nenavizublyadcigan.jpg"></center>'
 	'You meet a Gypsy woman. She offers to tell your fortune.'
-	act 'Agree':
+	act 'Decline': gt 'pavtrain_market', 'start'
+	act 'Accept':
 		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gadaet'+rand(1,2)+'.jpg"></center>'
@@ -571,8 +580,7 @@ if ARGS[0] = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pusto.jpg"></center>'
 			'With a sneaking suspicion you start looking through your stuff. Your wallet is nowhere to be found!'
 			act 'Find the Gypsy':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
 				'You search the area hoping to find the thief, but she has already disappeared into the crowd.'
 				act 'Back': gt 'pavtrain_market', 'start'
@@ -589,13 +597,13 @@ if ARGS[0] = 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
-			cls
 			minut += 15
 			money -= tovpay
 			kosmetica += 50
-			gs 'stat'
 			gt 'pavtrain_market', 'start'
 		end
 	end
@@ -609,9 +617,10 @@ if ARGS[0] = 8:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
-			cls
 			minut += 15
 			vitamin += 20
 			money -= tovpay
@@ -628,14 +637,15 @@ if ARGS[0] = 9:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/condoms.jpg"></center>'
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
-			cls
 			minut += 15
 			prezik += 5
 			i = 5
 			:cndmlp
-				if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
+			if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
@@ -652,9 +662,11 @@ if ARGS[0] = 10:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			lipbalm += 30
 			money -= tovpay
@@ -684,10 +696,11 @@ if ARGS[0] = 12:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
-			cla
-			*clr
+			*clr & cla
 			fat+=3
 			frost = 0
 			pcs_health += 5
@@ -713,7 +726,6 @@ if ARGS[0] = 13:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dropwallet.jpg"></center>'
 	'You see a wallet fall out of a woman''s purse.'
-	cla
 	act 'Tell her':
 		*clr & cla
 		minut += 2
@@ -730,10 +742,9 @@ if ARGS[0] = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/zaglanut.jpg"></center>'
 		'You open the wallet and you see that there''s <<i>> <b>₽</b>'
 		act 'Take the money and throw away the wallet':
-			*clr & cla
 			money += i
 			pcs_mood += 10
-			gs 'stat'
+			killvar 'i'
 			gt 'pavtrain_market', 'start'
 		end
 		act 'Catch up with the woman and return her purse':
@@ -742,7 +753,8 @@ if ARGS[0] = 13:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
-			act 'Continue walking through the market': gt 'pavtrain_market','events'
+			act 'Stop wandering': gt 'pavtrain_market', 'start'
+			act 'Wander around the market': gt 'pavtrain_market','events'
 		end
 	end
 end
@@ -754,6 +766,8 @@ if ARGS[0] = 14:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 15:
@@ -763,6 +777,8 @@ if ARGS[0] = 15:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 16:
@@ -772,6 +788,8 @@ if ARGS[0] = 16:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
 	'Looking around, you almost collide with a man pulling a small cart.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 17:
@@ -781,6 +799,8 @@ if ARGS[0] = 17:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
 	'You wander past a the meet seller and see a butcher working with an axe.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 18:
@@ -790,6 +810,8 @@ if ARGS[0] = 18:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Look through the hole':
 		*clr & cla
 		if girl > 1: pcs_horny += 5
@@ -807,9 +829,11 @@ if ARGS[0] = 19:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/birthcontrolpills.jpg"></center>'
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			tabletki += 1
 			if rand(0,49) - (6*(8-tovpay/50)) <= 0: 

+ 53 - 24
locations/phone_selfies.qsrc

@@ -9,6 +9,8 @@ if $ARGS[0] = 'selfies':
 	clovar = 1
 	undvar = 1
 	nudvar = 1
+	bathvar = 0
+	showervar = 0
 	
 	!!This variable will switch to bikini for beach selfies
 	$undname = 'underwear'
@@ -82,6 +84,34 @@ if $ARGS[0] = 'listretrieve':
 			temp_nudcnt += 1
 		if temp_nudcnt <= temp_total: jump'temp_loop2'
 	end
+	
+	!!loop for bath selfies
+	if bathvar = 1:
+		'<center><b>Bath selfies</b></center>'
+		*nl
+		temp_bathcnt = 1
+		dynamic 'temp_loop2 = <<$phone_loc>>_bathloop'
+		dynamic 'temp_total = <<$phone_loc>>_bathtot'
+		:temp_loop3
+			dynamic '$phone_locval = <<$phone_loc>>_bathselfie[<<temp_bathcnt>>]'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/bath/<<temp_bathcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/bath/<<temp_bathcnt>>.jpg"     height="150" /></a>  '
+			temp_bathcnt += 1
+		if temp_bathcnt <= temp_total: jump'temp_loop3'
+	end
+	
+	!!loop for shower selfies
+	if showervar = 1:
+		'<center><b>Shower selfies</b></center>'
+		*nl
+		temp_showercnt = 1
+		dynamic 'temp_loop2 = <<$phone_loc>>_showerloop'
+		dynamic 'temp_total = <<$phone_loc>>_showertot'
+		:temp_loop4
+			dynamic '$phone_locval = <<$phone_loc>>_showerselfie[<<temp_showercnt>>]'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/shower/<<temp_showercnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/shower/<<temp_showercnt>>.jpg"     height="150" /></a>  '
+			temp_showercnt += 1
+		if temp_showercnt <= temp_total: jump'temp_loop4'
+	end
 end
 
 if $ARGS[0] = 'listretrieve2':
@@ -628,6 +658,9 @@ end
 if $ARGS[0] = 'bathroom':
 	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
 	$phone_loc = 'bathroom'
+	gs 'telefon', 'Phone_selfie_totals'
+	bathvar = 1
+	showervar = 1
 	*nl
 	gs 'phone_selfies', 'listretrieve'
 	
@@ -755,7 +788,6 @@ end
 
 if $ARGS[0] = 'family':
 	'<center><h4><font color="maroon">Family members</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -763,17 +795,17 @@ if $ARGS[0] = 'family':
 	:familygruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 7 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 7 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 7:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 7:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 7:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 7:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'familygruploop'
+	if i <= aarraynumber:jump 'familygruploop'
 
 	'<<$textgrup>>'
 	
@@ -784,7 +816,6 @@ end
 
 if $ARGS[0] = 'school':
 	'<center><h4><font color="maroon">School friends</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -792,17 +823,17 @@ if $ARGS[0] = 'school':
 	:schoolgruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5) and selfieenable[i] = 1:
+		if (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5) and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+		if count1< 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
 			$textgrup += '</td>'
-		elseif count1 = 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+		elseif count1 = 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'schoolgruploop'
+	if i <= aarraynumber:jump 'schoolgruploop'
 
 	'<<$textgrup>>'
 	
@@ -813,7 +844,6 @@ end
 
 if $ARGS[0] = 'teacher':
 	'<center><h4><font color="maroon">Teachers</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -821,17 +851,17 @@ if $ARGS[0] = 'teacher':
 	:teachergruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 6 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 6 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 6:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 6:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 6:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 6:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'teachergruploop'
+	if i <= aarraynumber:jump 'teachergruploop'
 
 	'<<$textgrup>>'
 	
@@ -842,7 +872,6 @@ end
 
 if $ARGS[0] = 'pavlovsk':
 	'<center><h4><font color="maroon">Pavlovsk friends</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -850,17 +879,17 @@ if $ARGS[0] = 'pavlovsk':
 	:pavgruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 8 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 8 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 8:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 8:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 8:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 8:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'pavgruploop'
+	if i <= aarraynumber:jump 'pavgruploop'
 
 	'<<$textgrup>>'
 	

+ 304 - 0
locations/swamp_woods.qsrc

@@ -0,0 +1,304 @@
+# swamp_woods
+
+!TODO: Break into more arg blocks
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+    $loc = 'swamp_woods'
+	$metka = ''
+	$menu_loc = 'swamp_woods'
+	$menu_arg = ''
+	menu_off = 0
+	$location_type = 'secluded'
+
+	gs 'gadukino_event', 'sound'
+    gs 'stat'
+	
+	gs 'hunter_ambient', 'schedule'
+
+    cla & *clr
+	'<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.'
+
+	!TODO: Make schedule more dynamic e.g. more factors
+	
+	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.'
+	*nl
+
+	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
+	if firewood < 25:
+		'You can pick up some firewood around here to keep the fire going.'
+
+		act 'Collect firewood (0:45)':
+			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 += 10
+			minut += 45
+			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
+			
+			if firewood < 10:
+				'You think you might need to pick some more to get a fire going'
+			else:
+				'You think you have enough firewood to get a fire going'
+			end		
+
+			act 'Further': gt 'swamp_yard', 'nearby_woods'
+		end
+	else
+		'You think about picking up some firewood before you remember you have plenty back at the yard.'
+	end
+	
+	act 'Try to circle around the swamp':
+		*clr & cla
+		if pcs_bushcraft < 15:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
+			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
+			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
+
+			act 'Further': gt 'swamp_yard', 'nearby_woods'
+		elseif pcs_bushcraft < 30:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
+			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
+
+			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
+			act 'Try anyway':
+				*clr & cla
+				minut += 180
+				nearby_woods_check = rand(1,10)
+
+				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
+					'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'
+
+					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
+				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
+					'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': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+				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
+
+					if nearby_woods_check <= 5:
+						!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...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
+					else	
+						!Get lost in the woods
+						'You start going into the woods in a direction you think will take you around the swamp.'
+						'After a few hours walking you realize you have no idea where you are going.'
+						'You look back to see if you can get back to the hut but nothing around seems familiar'
+
+						act 'This can''t be good': gt 'gadforestlost','1'
+					end
+				end	
+			end	
+		else
+			minut += 120
+
+			!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
+			
+			'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','4'
+		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'
+	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.'
+			
+			act 'Take the bet':
+				cla & *clr
+				
+				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>'
+				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'
+
+				'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'
+			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'
+		end
+	end
+
+	if $ARGS[1] = 'practice':
+		cla & *clr
+		minut += 60
+		shoot_lvl += 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'
+	end	
+
+	if $ARGS[1] = 'andrei_request':
+		cla & *clr
+			'<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'
+
+			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
+						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
+						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
+						hunter_sexual_comfort += 7
+
+						gs 'clothing', 'strip', 'swamphouse'
+						gs 'underwear', 'remove'
+
+						gs 'arousal', 'flash', 10, 'exhibitionism'
+						gs 'arousal', 'end'
+
+						gs 'stat'
+
+						'<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
+						hunter_sexual_comfort += 8
+
+						gs 'boyStat', 'A172'
+						gs 'arousal', 'bj', 15, 'sub', 'exhibitionism'
+						gs 'cum_call', 'mouth', 'A172', 1
+						swallow += 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
+end
+
+--- swamp_woods ---------------------------------

+ 169 - 227
locations/swamp_yard.qsrc

@@ -43,26 +43,25 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'The yard in front of the hut.'
 	'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 findvel = 3:'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-	if hunters > 0 and huntersKnow = 0:'You spot some unfamiliar people standing in front of the hut.'
-	if hunters > 0 and huntersKnow > 0 and hour >= 8 and hour < 20:'You notice the <a href="exec: gt ''hunters'', ''check_opinion'' ">hunters</a> standing in the front yard.'
-
+	if hunters_off = 0 and hunters_sleep = 0 and huntersKnow = 0:'You spot some unfamiliar people standing in front of the hut.'
+	if hunters_off = 0 and hunters_sleep = 0 and huntersKnow = 1:'You notice the <a href="exec: gt ''hunters'', ''check_opinion'' ">hunters</a> standing in the front yard.'
+	if hunters_off = 1 and huntersKnow = 1:'Hunters are probably off hunting. Maybe you can find stuff to do around in the meantime?'
+	if hunters_sleep = 1 and huntersKnow = 1:'Hunters are in the hut sleeping. Maybe you should go to sleep too'
+	
 	if huntersknow = 1:
 		act 'Go into the hut':
 			minut += 2
 			gt 'swamphouse'
 		end	
 	end	
-	act 'Sit by the firepit': gt 'swamp_yard', 'campfire'
+	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
 	act 'Look around the nearby woods': minut += 10 & gt 'swamp_yard', 'nearby_woods'
 
 	!Conditional acts
-	if dirty_swamp_yard > 5:act 'Clean up the trash outside': gs 'hunter_favors', 'yard_cleanup'
+	if dirty_swamp_yard > 5:  act 'Clean up the trash outside': gs 'hunter_favors', 'yard_cleanup'
 	if hunter_collective_opinion < 10: act '<b>Escape to the swamp</b>': gs 'swamp_yard', 'swamp_escape'
 
-	! TODO: Figure how to remove the sneaky gotos if not tied to other locations
-	if hunterhelp = 1: 
-		gs 'swamp_yard', 'rescued_from_swamp'
-	end
+	if hunterhelp = 1: gs 'swamp_yard', 'rescued_from_swamp'	
 
 	if hunterhelp = 2 and huntersKnow = 0:
 		gs 'hunter_interactions', 'meet_hunters_after_rescue'
@@ -70,9 +69,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		act 'Approach the men': gt 'hunter_interactions', 'meet_hunters'
 	end
 
-	if hour >= 8 and hour < 20: 
-		gs 'swamp_yard', 'daytime_flavor_events'
-	end
+	gs 'hunter_ambient', 'schedule'
+
+	if hour >= 8 and hour < 20: gs 'swamp_yard', 'daytime_flavor_events'
+	if hour >= 20 and hour < 24: gs 'swamp_yard', 'nighttime_flavor_events'
 end	
 
 !Code blocks for leaf events (events not calling other  events)
@@ -197,67 +197,6 @@ if $ARGS[0] = 'skirt_breeze':
 	end
 end
 
-!TODO: This will be revamped. Temporary to keep the dialogue for now
-if $ARGS[0] = 'hunter_group_sex':
-	! sex if GG whore
-	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0:
-		*clr & cla
-		minut += 5
-		temphunt = rand(1,3)
-		! the choice of who will fuck GG
-		slutgosex = 1
-		gs 'stat'
-
-		if temphunt = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-		if temphunt = 2:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
-		if temphunt = 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
-		if temphunt = 1:'Andrei steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, walk with me..." without uttering another word he grabs you by the arm and leads you to the nearest tree...'
-		if temphunt = 2:'Sergei steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, let''s go a bit aside you need to help me out with my itch," he said and lead you in the direction of the nearest thicket.'
-		if temphunt = 3:'Igor steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin, leading you away from the yard...'
-		if pcs_horny < 40:' You obediently follow along, well knowing the reason he wanted you to tag along.'
-		if pcs_horny >= 40 and pcs_horny < 70:'"I need you to take me..." is all you manage to say while he''s leading you away.'
-		if pcs_horny >= 70:'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto him, taking charge, leaving him stunned about who wants it more, you or him.'
-
-		act 'Go':gt 'hunters', 'start'
-	end
-		
-	! trio if GG whore
-	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 2 and huntslutsex = 0:
-		*clr & cla
-		minut += 5
-		temphunt = rand(1,3)
-		slutgosex = 2
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.2.jpg"></center>'
-		if temphunt = 1:
-			'You see Andrei talking with Sergei in the yard. They notice you, and start moving towards you. "Come with us <<$pcs_nickname>>," without uttering another word Andrei grabs you by the arm and leads you to the nearest tree.... Sergei follows after.'
-		elseif temphunt = 2:
-			'Andrei and Igor notice you enter the yard, they call you over. "Come with us <<$pcs_nickname>>, you need to help us out with our itch," said Andrei pulling you in the direction of the nearest thicket. Igor follows behind.'
-		elseif temphunt = 3:
-			'You notice Igor and Sergei standing in the yard whispering something to each other. Igor approaches you and says "<<$pcs_nickname>>, "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin. He calls Sergei over and they start leading you away from the yard...'
-		end
-		if pcs_horny < 40: 
-			'You obediently follow along, well knowing the reason they wanted you to tag along.'
-		elseif pcs_horny >= 40 and pcs_horny < 70:
-			'"I need you to take me..." is all you manage to say while they''re leading you away.'
-		elseif pcs_horny >= 70:
-			'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto one of them, taking charge, leaving the other one stunned about who wants it more, they or you.'
-		end
-
-		act 'Go with the guys':
-			*clr & cla
-			minut += 5
-			pcs_horny += 5
-
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/doublehanterlove.jpg"></center>'
-			'You go along with the men holding their hands, knowing where they''re about to lead you. You don''t mind you want them as bad as they wants you...'
-			act 'Further':gt 'huntersex', 'sluthomesex'
-		end
-	end
-end
 
 !Code blocks for branch events (events calling other  events)
 if $ARGS[0] = 'campfire':
@@ -269,6 +208,7 @@ if $ARGS[0] = 'campfire':
 		gs 'stat'
 
 		act 'Move away': gt 'swamp_yard', 'start'
+		act 'Sit by the fire': gt 'swamp_yard', 'fireside'
 
 		if campfire = 1:
 			if hour >= 8 and hour < 20:
@@ -309,12 +249,19 @@ if $ARGS[0] = 'campfire':
 					minut += 30
 					bucket -= 5
 					hotwater = 1
+
+					water_heated += 1
 					gs 'stat'
 		
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 					*nl
-					'With the now heated water, you can bathe yourself in the tub.'
-		
+					
+					if water_heated > 5 and (inhibition < 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
+
 					act 'Continue': gt 'swamp_yard', 'campfire'
 				end
 			end	
@@ -353,178 +300,173 @@ if $ARGS[0] = 'campfire':
 				'You do not see any firewood nearby. You will probably need to collect some branches, chop some or ask a hunter to do so.'		
 			end	
 		end
-		
-		!TODO: Initial fireside chat dynamics, to be fleshed out 
-		!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff'
-			act 'Chat (1:00)':
-				*clr & cla
-				minut += 60
-				hunter_collective_opinion += 2
-				gs 'stat'
 
-				*nl
-				'You start chating with the guys about trivial stuff...'
+end	
 
-				act 'Further': gt 'swamp_yard', 'campfire'
-			end
-			
-			!TODO: Flesh out the learning content here
-			act 'Ask for some tips on how to survive in the woods (1:00)':
-				hunter_lessons += 1
-				*clr & cla
-			
-				if hunter_collective_opinion > 25:
-					hunter_collective_opinion -= 1
-					pcs_bushcraft += 1
-					gs 'stat'
+if $ARGS[0] = 'fireside':
+	cla & *clr
 
-					minut += 60
+	act 'Get up':
+		gt 'swamp_yard', 'start'
+	end
 
-					*nl
-					'Hunters talk to you about some of their experiences when they first started out'
-				else
-					if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
-						!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
-						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 hunter_breakfast = 1 or hunter_lunch = 1:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
+		'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting'
+		act 'Chat (1:00)':
+			gt 'hunter_interaction', 'chat_with_hunters'
+		end
+		
+		!TODO: Flesh out the learning content here
+		act 'Ask for some tips on how to survive in the woods (1:00)':
+			hunter_lessons += 1
+			*clr & cla
+		
+			if hunter_collective_opinion > 25:
+				hunter_collective_opinion -= 1
+				pcs_bushcraft += 1
+				gs 'stat'
 
-				act 'Further': gt 'swamp_yard', 'campfire'
+				minut += 60
+
+				*nl
+				'Hunters talk to you about some of their experiences when they first started out'
+			else
+				if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
+					!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
+					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
+
+			act 'Further': gt 'swamp_yard', 'campfire'
 		end
-end	
+	end		
 
-!Auxilliary locations
-if $ARGS[0] = 'nearby_woods':
-	cla & *clr
-	'<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.'
+	if hunters_drink = 1:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+		'Hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like'		
+		act 'Chat (1:00)':
+			gt 'hunter_interactions', 'chat_with_hunters'
+		end
 
-	*nl
+		act 'Have a drink': 
+		 	gs 'hunter_interactions', 'drink_with_hunters'
+		end
+	end
 
-	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
-	if firewood < 25:
-		'You can pick up some firewood around here to keep the fire going.'
+	act 'Eat a meal':	
+		cla & *clr
+		act 'Stop eating': gt 'swamp_yard', 'fireside'
+		act 'Eat jerky and trail mix':
+			!gs 'food', 'snack'
+			*clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/jerky_mix.jpg"></center>'
+		
+			'You munch on some dried meat and trail mix. Not a full hot meal by any means but it''s better than nothing'
+			pcs_hydra -= 15
 
-		act 'Collect firewood (0:45)':
-			cla & *clr
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
+			if pcs_energy >= 85:
+					fat += 1
+					pcs_energy += 20
 			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
+				pcs_energy += 30
 			end
 
-			firewood += 10
-			minut += 45
-			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
-			
-			if firewood < 10:
-				'You think you might need to pick some more to get a fire going'
-			else:
-				'You think you have enough firewood to get a fire going'
-			end		
-
-			act 'Further': gt 'swamp_yard', 'nearby_woods'
+			gs 'stat'
 		end
-	else
-		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end
-	
-	act 'Try to circle around the swamp':
-		*clr & cla
-		if pcs_bushcraft < 15:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
-			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
-			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
-
-			act 'Further': gt 'swamp_yard', 'nearby_woods'
-		elseif pcs_bushcraft < 30:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
-			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
-
-			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
-			act 'Try anyway':
-				*clr & cla
-				minut += 180
-				nearby_woods_check = rand(1,10)
-
-				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
-					'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'
+		if meat_stew > 0:
+			act 'Eat meat stew':
+				gs 'food', 'm_meal'
+				*clr
+				meat_stew -= 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
+				*nl
 
-					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
-				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
-					'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': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+				if pcs_energy >= 100:
+					fat += 5
+					'After having a healthy serving of meat stew, you feel stuffed.'
+				elseif pcs_energy >= 80:
+					fat += 3
+					pcs_energy += 40
+					'You force yourself to have another sip of the meat stew.'
 				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
-
-					if nearby_woods_check <= 5:
-						!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...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
-					else	
-						!Get lost in the woods
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize you have no idea where you are going.'
-						'You look back to see if you can get back to the hut but nothing around seems familiar'
-
-						act 'This can''t be good': gt 'gadforestlost','1'
-					end
-				end	
+					fat += 1
+					pcs_energy += 30
+					'You''re enjoing some warm meat stew. Just what you needed.'
+				end
+				if pcs_hydra >= 100:
+					pcs_hydra += 10
+				else
+					pcs_hydra += 20
+				end
+				*nl
+				if meat_stew > 0:
+					'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
+				else
+					'You have finished the last of the stew, the pot is empty.'
+				end
+				gs 'stat'
 			end	
-		else
-			minut += 120
+		end	
+		if mushroom_soup > 0:
+			act 'Eat mushroom soup':
+				gs 'food', 'm_meal'
+				*clr
+				mushroom_soup -= 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
+				*nl
 
-			!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>'
+				if pcs_energy >= 100:
+					fat += 3
+					'After having a healthy serving of mushroom soup, you feel stuffed.'
+				elseif pcs_energy >= 80:
+					fat += 1
+					pcs_energy += 30
+					'You force yourself to have another sip of the mushroom soup.'
+				else
+					pcs_energy += 20
+					'You''re enjoing some warm mushroom soup. Just what you needed.'
+				end
+				if pcs_hydra >= 100:
+					pcs_hydra += 20
+				else
+					pcs_hydra += 40
+				end
+				*nl
+				if mushroom_soup > 0:
+					'There''s <<mushroom_soup>> '+iif(mushroom_soup > 1, 'servings','serving')+' of soup left in the pot'
+				else
+					'You have finished the last of the soup, the pot is empty.'
+				end
+				gs 'stat'
 			end
-			
-			'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'
+		end
+		if bilberry > 0:
+			act 'Eat berries':
+				*clr
+				minut += 20
+				pcs_energy += 10
+				pcs_hydra += 10
+				bilberry -= 1
+				pcs_willpwr += 5
+				pcs_health += 5
+				pcs_mood += 10
+				gs 'stat'
+				'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
+				'You ate a few berries.'
+			end
+		end
+	end	
+end
 
-			act 'Further': gt 'gadforest','4'
-		end	 	
-	end
+!Auxilliary locations
+if $ARGS[0] = 'nearby_woods':
+	gt 'swamp_woods'
 end	
 
 if $ARGS[0] = 'daytime_flavor_events': 
@@ -534,7 +476,7 @@ if $ARGS[0] = 'daytime_flavor_events':
 		gs 'hunter_favors', 'housekeeping_request'
 	elseif rand(1,25) = 1: 
 		gs 'hunter_ambient' , 'yard_convo'
-	elseif rand(1,10) = 1:
+	elseif rand(1, hunter_sexual_comfort / 4 + 2) = 1:
 		gs 'hunter_interactions', 'naked_encounter'
 	elseif rand(1,15) = 1:
 		gs 'hunter_ambient', 'bring_food'

+ 26 - 159
locations/swamphouse.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	temp_sh = rand(1,5)
 	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
 
+	gs 'hunter_ambient', 'schedule'
+
 	'<center><H4>Hut</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampizba.jpg"></center>'
 	*nl
@@ -43,16 +45,20 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	else
 		'The hunters aren''t here right now'
 	end
+
+	if hour >= 8 and hour < 20: 
+		gs 'swamp_yard', 'daytime_flavor_events'
+	else
+		gs 'swamp_yard', 'nighttime_flavor_events'
+	end
+
+
 	*nl
 	
 	act 'Go outside':
 		minut += 2 & gt 'swamp_yard'
 	end	
 
-	act 'Sit on the table':
-		gt 'swamphouse', 'meal_table'
-	end
-
 	!re-arrange it, there should be no logic error now by illume
 	if $clothingworntype ! 'nude':
 		!have cloth, or rag on
@@ -82,7 +88,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	
 	if clothesAtLocation = 1 and swamp_clothes = 0:
 		!clothes are ready
-		if $clothingworntype = 'nude':
+		if $clothingworntype = 'nude' and forced_naked_day < daystart:
 			act 'Get dressed':
 				cla
 				*clr
@@ -94,7 +100,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'stat'
 				act 'Back': gt 'swamphouse', 'start'
 			end
-		else
+		elseif $clothingworntype ! 'nude':
 			act 'Pick up your clothes':
 				cla
 				*clr
@@ -103,7 +109,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				act 'Back': gt 'swamphouse', 'start'
 			end
 		end
-	elseif swamp_clothes = 1:
+	elseif swamp_clothes = 1 and forced_naked_day < daystart:
 		if $clothingworntype = 'nude':
 			act 'Wear hessian sack':
 				cla
@@ -120,13 +126,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if pcs_horny >= 50 and hunters = 0 or pcs_horny >= 50 and hunters = 1 and hour >= 8 and hour < 20:
-		!TODO: Add content for hunters being aroundd or walking in
+		!TODO: Add content for hunters being around or walking in
 		act 'Masturbate':
 			gt 'selfplay', 'start'
 		end
 	end
 	
-	if $clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0:
+	if $clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0 and forced_naked_day < daystart:
 		act 'Look for some clothes':
 			cla
 			*clr
@@ -439,156 +445,6 @@ if $ARGS[0] = 'washstand':
 	act 'Move away': gt 'swamphouse', 'start'
 end
 
-if $ARGS[0] = 'meal_table':
-	cla & *clr
-
-	act 'Get off the table':
-		gt 'swamphouse', 'start'
-	end
-
-	if hour >= 21 and hour < 23 :
-		huntersdrink = 1
-	else
-		huntersdrink = 0
-	end
-	!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
-	if (hour >= 20 and hour < 23) or (hour >= 7  and hour < 8):
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-		'You join the hunters on the meal table.'
-		act 'Chat (1:00)':
-			*clr & cla
-			minut += 60
-			hunter_collective_opinion += 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
-	else
-		if $clothingworntype ! 'nude':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/table_lone.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/table_lone_nude.jpg"></center>'
-		end		
-		'You sit on the table by yourself'
-	end		
-
-	if huntersdrink = 1:
-		'Hunters are drinking and chatting loudly. You can join them for a drink or two if you would like'		
-		act 'Have a drink': 
-		 	gs 'hunter_interactions', 'drink_with_hunters'
-		end
-	end
-
-	act 'Eat a meal':	
-		cla & *clr
-		act 'Get up from the table': gt 'swamphouse', 'start'
-		act 'Eat jerky and trail mix':
-			!gs 'food', 'snack'
-		
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/jerky_mix.jpg"></center>'
-		
-			'You munch on some dried meat and trail mix. Not a full hot meal by any means but it''s better than nothing'
-			pcs_hydra -= 15
-
-			if pcs_energy >= 85:
-					fat += 1
-					pcs_energy += 20
-			else
-				pcs_energy += 30
-			end
-
-			gs 'stat'
-		end
-		if meat_stew > 0:
-			act 'Eat meat stew':
-				gs 'food', 'm_meal'
-				*clr
-				meat_stew -= 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
-				*nl
-
-				if pcs_energy >= 100:
-					fat += 5
-					'After having a healthy serving of meat stew, you feel stuffed.'
-				elseif pcs_energy >= 80:
-					fat += 3
-					pcs_energy += 40
-					'You force yourself to have another sip of the meat stew.'
-				else
-					fat += 1
-					pcs_energy += 30
-					'You''re enjoing some warm meat stew. Just what you needed.'
-				end
-				if pcs_hydra >= 100:
-					pcs_hydra += 10
-				else
-					pcs_hydra += 20
-				end
-				*nl
-				if meat_stew > 0:
-					'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
-				else
-					'You have finished the last of the stew, the pot is empty.'
-				end
-				gs 'stat'
-			end	
-		end	
-		if mushroom_soup > 0:
-			act 'Eat mushroom soup':
-				gs 'food', 'm_meal'
-				*clr
-				mushroom_soup -= 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
-				*nl
-
-				if pcs_energy >= 100:
-					fat += 3
-					'After having a healthy serving of mushroom soup, you feel stuffed.'
-				elseif pcs_energy >= 80:
-					fat += 1
-					pcs_energy += 30
-					'You force yourself to have another sip of the mushroom soup.'
-				else
-					pcs_energy += 20
-					'You''re enjoing some warm mushroom soup. Just what you needed.'
-				end
-				if pcs_hydra >= 100:
-					pcs_hydra += 20
-				else
-					pcs_hydra += 40
-				end
-				*nl
-				if mushroom_soup > 0:
-					'There''s <<mushroom_soup>> '+iif(mushroom_soup > 1, 'servings','serving')+' of soup left in the pot'
-				else
-					'You have finished the last of the soup, the pot is empty.'
-				end
-				gs 'stat'
-			end
-		end
-		if bilberry > 0:
-			act 'Eat berries':
-				cla
-				*clr
-				minut += 20
-				pcs_energy += 10
-				pcs_hydra += 10
-				bilberry -= 1
-				pcs_willpwr += 5
-				pcs_health += 5
-				pcs_mood += 10
-				gs 'stat'
-				'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
-				'You ate a few berries.'
-			end
-		end
-	end	
-end
-
 if $ARGS[0] = 'tub':
 	cla
 	*clr
@@ -743,4 +599,15 @@ if $ARGS[0] = 'huntersrelax':
 
 end
 
+
+if $ARGS[0] = 'daytime_flavor_events': 
+	!TODO: Add stuff here
+end
+
+if $ARGS[0] = 'nighttime_flavor_events':
+	if rand(1,10) = 1:
+		gs 'hunter_interactions', 'indoors_naked_encounter'
+	end	
+end
+
 --- swamphouse ---------------------------------

+ 24 - 1
locations/telefon.qsrc

@@ -776,6 +776,8 @@ if $ARGS[0] = 'Phone_selfie_totals':
 	bathroom_clotot = 20
 	bathroom_undtot = 20
 	bathroom_nudtot = 20
+	bathroom_bathtot = 24
+	bathroom_showertot = 25
 	bedroom_clotot = 27
 	bedroom_undtot = 20
 	bedroom_nudtot = 20
@@ -807,7 +809,7 @@ end
 !!picking the selfie image when taking photos, this sets the location variable
 if $ARGS[0] = 'Phone_camera_selfie':
 	gs 'telefon', 'Phone_selfie_totals'
-	minut += RAND(5,7)
+	minut += rand(5,7)
 	if $location_type = 'bathroom':
 		$phone_loc = 'bathroom'
 		gs 'telefon', 'Phone_selfie_image'
@@ -865,6 +867,27 @@ if $ARGS[0] = 'Phone_selfie_image':
 	end
 end
 
+!!taking selfies in the shower or bath
+if $ARGS[0] = 'Phone_selfie_image_bathing':
+	gs 'telefon', 'Phone_selfie_totals'
+	minut += rand(5,7)
+	if $ARGS[1] = 'shower':
+		!!changing to and unmixed variable so the rng will work
+		dynamic 'temp_showertot = bathroom_showertot'
+		phone_rand = rand(1,temp_showertot)
+		!!Setting the image owned flag to 1
+		dynamic '<<$phone_loc>>_showerselfie[<<phone_rand>>] = 1'
+		gs 'stat'
+		view 'images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg'
+	elseif $ARGS[1] = 'bath':
+		dynamic 'temp_bathtot = bathroom_bathtot'
+		phone_rand = rand(1,temp_bathtot)
+		dynamic '<<$phone_loc>>_bathselfie[<<phone_rand>>] = 1'
+		gs 'stat'
+		view 'images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg'
+	end
+end
+
 !!for taking photos - only selfies for now
 if $ARGS[0] = 'Phone_camera':
 	clr

+ 4 - 4
locations/trFatherMisha.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 			act 'Try a fair game':
 				cls
 				minut += 15
-				shoot_exp += 1
+				shoot_lvl += 1
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_29.jpg"></center>'
 				'You suggest that you want to try one of the games they have at the fair. Your father is more than happy to comply with your wishes.'
@@ -319,7 +319,7 @@ if $ARGS[0] = '':
 				act 'Learn to shoot':
 					cls
 					minut += 10
-					shoot_exp += 1
+					shoot_lvl += 1
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_33.jpg"></center>'
 					'After he''s shows how it''s supposed to be done he tells you to try it out once again. Your accuracy improves a little bit.'
@@ -342,7 +342,7 @@ if $ARGS[0] = '':
 						cls
 						minut += 10
 						pcs_mood += 50
-						shoot_exp += 3
+						shoot_lvl += 3
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_35.jpg"></center>'
 						'You are focused and enthusiastically listen to what Mikhail has to say.'
@@ -354,7 +354,7 @@ if $ARGS[0] = '':
 				act 'Refuse help':
 					cls
 					minut += 10
-					shoot_exp += 1
+					shoot_lvl += 1
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_36.jpg"></center>'
 					'You refuse listening to your fathers advice. You loudly sigh as he continues explaining...'