Browse Source

Merge branch 'dev' into galaMistress

Christine 5 years ago
parent
commit
fa54bbe75a

+ 1 - 0
glife.qproj

@@ -65,6 +65,7 @@
 		<Location name="body_shape"/>
 		<Location name="lact_lib"/>
 		<Location name="lact_bp"/>
+		<Location name="medUtil"/>
 	</Folder>
 	<Folder name="Stimulus">
 		<Location name="boyStat"/>

+ 1 - 1
locations/Katja_Tanga.qsrc

@@ -255,7 +255,7 @@ if $ARGS[0] = 'dance':
 					Act 'Show your tits':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_2.jpg"></center>'
-						'Laughing, you pull aside your dress and reveal one of your bare breasts. Katja looks at you wanting more. "I showed you both of mine." You smile and reply "Yeah but your wearing panties and I wasn''t."'
+						'Laughing, you pull aside your dress and reveal one of your bare breasts. Katja looks at you wanting more. "I showed you both of mine." You smile and reply, "Yeah, but you''re wearing panties and I''m not."'
 						act 'Move away': gt'gdkin'
 					end
 				end

+ 1 - 0
locations/Katlake.qsrc

@@ -31,6 +31,7 @@ if $ARGS[0] = 'znakomstvo':
 		clr
 		katday = daystart
 		telkat += 1
+		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","",""
 		kat = 1
 		npc_rel['A219'] += 1
 		minut += 30

+ 1 - 1
locations/ParChurch2.qsrc

@@ -510,7 +510,7 @@ if $ARGS[0] = 'confession':
 				'"Hmmm." Father Kirill answered eagerly, "Such experimentation is to be expected, child. But I fear that your soul will become stained by your actions, if we do not purge this sin from you body at once."'
 				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will pray as you slake your lust and absorb your sin, freeing you from it."'
-				act 'Do as the father commands': gt 'ParChurch2', 'sex'
+				act 'Do as the father commands': gt 'ParChurch2', 'mast'
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to masturbate in front of the father (<<will_cost>> Willpower)':

+ 1 - 10
locations/abduction.qsrc

@@ -230,16 +230,7 @@ if $ARGS[0] = 'abdExam2':
 	'"Now there, our little slave, we will make sure you are healthy and ready to be trained."'
 	'He injects all the solutions into you.'
 	'The examination is at an end. The doctor leaves, you are untied, blindfolded again and led back down into the basement.'
-	venera = 0
-	GerpesOnce = 0
-	Gerpes = 0
-	SifacOnce = 0
-	Sifilis = 0
-	TriperOnce = 0
-	Triper = 0
-	TriperOral = 0
-	KandidozOnce = 0
-	Kandidoz = 0
+	gs 'medUtil','healSTDs'
 
 	examed = 1
 	act 'Continue':gt 'abduction', 'abdRoom'

+ 0 - 17
locations/bed2.qsrc

@@ -416,14 +416,6 @@ if $ARGS[0] = 'wake_horny':
 			gs 'bed2', 'end'
 		end
 	end
-	
-	if ARRSIZE('defclothingnumber') > 0:
-		i = 0
-		:loopdbedefclothing
-		if def_clothing_hkbed[i] = 1: dynamic "act 'Get out of bed and wear outfit "+$def_clothing_name[i]+" (0:15)':	minut += 15 & gs 'wardrobe', 'default_entry_wear', <<i>> & gs 'bed2', 'end'"
-		i += 1
-		if i < ARRSIZE('defclothingnumber'):jump 'loopdbedefclothing'
-	end
 
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
 		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep'
@@ -483,15 +475,6 @@ if $ARGS[0] = 'wake':
 			gs 'bed2', 'end'
 		end
 	end
-	
-	if ARRSIZE('defclothingnumber') > 0:
-		i = 0
-		:loopdbedefclothing2
-		if def_clothing_hkbed[i] = 1: dynamic "act 'Get out of bed and wear outfit "+$def_clothing_name[i]+" (0:15)':	minut += 15 & gs 'wardrobe', 'default_entry_wear', <<i>> & gs 'bed2', 'end'"
-		i += 1
-		if i < ARRSIZE('defclothingnumber'):jump 'loopdbedefclothing2'
-	end
-	
 	if enfullmorrout = 1 and hour >= 4 and hour < 12:
 		act 'Full morning routine (01:00)':
 			minut += 15

+ 5 - 0
locations/cikl.qsrc

@@ -33,7 +33,9 @@ end
 !!MJ: Dont think that one is needed. But it was here already.
 if day <= 0:day = 1
 
+ciklNewWeek = 0
 if week > 7:
+	ciklNewWeek = 1
 	:loopweek
 	week -= 7
 	husbandrink = 0
@@ -48,6 +50,9 @@ end
 !!Fame call to update all the fame variables
 gs 'fame'
 
+!!Cycle stats for Contacts
+gs 'telefon', 'DailyStatRefresh', ciklNewWeek
+
 !!moving the porn schedule ahead a day, flaffing for missed shootings, if it even matters
 if (film > 0 or pornstack = 1) and pfilmNO = 0 and pfilmSTOP = 0:
 	if pfilmday[0] > 0: gs 'pornschedule', 'pornmiss'

+ 61 - 29
locations/clothing.qsrc

@@ -433,37 +433,69 @@ if $ARGS[0] = 'view_clothing_item':
 			act 'Leave': gt $loc, $metka
 			if CloInhibit > pcs_inhib:
 				'You don''t feel daring enough to wear an outfit this revealing and can''t bring yourself to buy it.'
-			elseif money >= Price:
-				act 'Buy':
-					h = 0
-					if CloStyle = 2:h = 10
-					if CloStyle = 5:h = 20
-					h += (3 * CloQuality)
-					money -= price
-					dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
-					if $ARGS[2] = 'cheap' or $ARGS[2] = 'office':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
-					elseif $ARGS[2] = 'average':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
-					elseif $ARGS[2] = 'formal':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'
-					elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'burlesque':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 35 + <<h>>'
-					elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 120 + <<h>>'
-					elseif $ARGS[2] = 'exercise':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 100 + <<h>>'
-					elseif $ARGS[2] = 'coat':
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 250 + <<h>>'
-					else
-						dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 60 + <<h>>'
+			elseif karta + bankDebtLimit < Price or money < Price:
+				'You cannot afford this outfit.'
+			else
+				if money >= Price:
+					act 'Buy (cash)':
+						h = 0
+						if CloStyle = 2:h = 10
+						if CloStyle = 5:h = 20
+						h += (3 * CloQuality)
+						money -= price
+						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
+						if $ARGS[2] = 'cheap' or $ARGS[2] = 'office':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
+						elseif $ARGS[2] = 'average':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
+						elseif $ARGS[2] = 'formal':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'
+						elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'burlesque':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 35 + <<h>>'
+						elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 120 + <<h>>'
+						elseif $ARGS[2] = 'exercise':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 100 + <<h>>'
+						elseif $ARGS[2] = 'coat':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 250 + <<h>>'
+						else
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 60 + <<h>>'
+						end
+						dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
+						dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
+						gt $loc, $metka
+					end
+				end
+				if karta + bankDebtLimit >= Price:
+					act 'Buy (cash)':
+						h = 0
+						if CloStyle = 2:h = 10
+						if CloStyle = 5:h = 20
+						h += (3 * CloQuality)
+						karta -= price
+						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
+						if $ARGS[2] = 'cheap' or $ARGS[2] = 'office':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
+						elseif $ARGS[2] = 'average':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
+						elseif $ARGS[2] = 'formal':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'
+						elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'burlesque':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 35 + <<h>>'
+						elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 120 + <<h>>'
+						elseif $ARGS[2] = 'exercise':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 100 + <<h>>'
+						elseif $ARGS[2] = 'coat':
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 250 + <<h>>'
+						else
+							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 60 + <<h>>'
+						end
+						dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
+						dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
+						gt $loc, $metka
 					end
-					dynamic $ARGS[2] + 'B[<<ARGS[3]>>] = pcs_hips'
-					dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
-					gt $loc, $metka
 				end
-			else
-				'You cannot afford this outfit.'
 			end
 		end
 	elseif $ARGS[1] = 'wardrobe':

+ 1 - 1
locations/gschool_chats.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'nerds':
 			*nl
 			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 		end
-		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a> is sitting at a desk looking forlorn.')
+		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like he is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a> is sitting at a desk looking forlorn.')
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end

+ 1 - 1
locations/gschool_chats1.qsrc

@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'ivan':
 		act 'Discuss':
 			*clr & cla
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 			'You nod at what Ivan says. "Sure Ivan I understand, I am ok with just being friends, really close friends who sometimes fool around in the shower." You say in your best sexy voice with a wink.'
 			'He gives you a one armed hug. "<<$pcs_nickname>> your the best, not only are you smoking hot but you are a super cool chick too. If you want to hang out some time you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." He says with a suggestive tone and waggled eyebrows.'
 			'You laugh at his silly antics, it is nice to have found a fun guy to hang out with, perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'

+ 4 - 4
locations/gschool_chats2.qsrc

@@ -434,22 +434,22 @@ if $ARGS[0] = 'lesco':
 		if grupTipe = 5:
 			'You see Lesco sitting by himself just like usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?"'
 			*nl
-			'You tell him well enough and ask if he wants to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncle''s family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You tell him well enough and ask if he wants to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncle''s family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		else
 			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he stiffens and shyly looks up towards you, "C-Can I help you with something?"'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
 	elseif npc_rel['A7'] <= 20 and pav_slut < 125:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
 			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he relaxes slightly and shyly looks up towards you, "What do you want?"'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		else
 			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he stiffens and looks up towards you with a apprehensive expression. "Please leave me alone."'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. He seems unsure a bit but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders saying you just wanted to hang out for a bit. He seems unsure a bit but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut, I have enough problems with out being seen with the likes of you." With that he moves away from you.'

+ 2 - 2
locations/gschool_lessonsev1.qsrc

@@ -135,13 +135,13 @@ if $ARGS[0] = 'fiz_rand':
 		'While Ivan is watching Lina moves up behind Lariska and pushes her forward at the shoulders making her bend over. Then proceeds to pretend hump Lariska, obviously trying to mimic Ivan''s voice and speech. "Oh Lariska I want to fuck your ass!" Which gets several of the other students to laugh even Ivan joins in. It is quickly broken up by Mr Nikolaevich.'
 	elseif fizperand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bouncebhand.jpg"></center>'
-		'A girl from your bothers grades is doing jumping jacks and her breasts are really bouncing, she obviously isn''t wearing a bra. The bouncing of her breasts start to draw the attention of a lot of the boys, just as her friend walks up behind her, reaching around, and grabbing her boobs. The first girl lets out a startled squeak then laughs. Followed by a blush when her friend whispers in her ear and she see''s all the boys staring.'
+		'A girl from your brothers grades is doing jumping jacks and her breasts are really bouncing, she obviously isn''t wearing a bra. The bouncing of her breasts start to draw the attention of a lot of the boys, just as her friend walks up behind her, reaching around, and grabbing her boobs. The first girl lets out a startled squeak then laughs. Followed by a blush when her friend whispers in her ear and she see''s all the boys staring.'
 	elseif fizperand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/butt.jpg"></center>'
 		'While running laps around the inside of the gym, when Anushka passes behind Mr Nikolaevich, she pulls down the back of her shorts to show off her panty clad ass. It doesn''t take to long before many of the boys catch up to Anushka but not pass her, as they wait till she passes behind the teachers back and flashes them her panty clad ass again.'
 	elseif fizperand = 16:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/doublebutt.jpg"></center>'
-		'During class Lina and Lariska are whisper and giggling about something. After some time they pull down their back of their shorts to flash ther panty clad asses at several of the more popular jock boys.'
+		'During class Lina and Lariska are whispering and giggling about something. After some time they pull down their back of their shorts to flash ther panty clad asses at several of the more popular jock boys.'
 	elseif fizperand = 17:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/dry3some.jpg"></center>'
 		'Near the end of class, three of the underclass girls are talking and giggling, when the notice some of the more popular boys looking their way they start horsing around. With ones face buried in her friends breasts and the third one behind her pretending to hump her. After a few moments, once several guys are starting they stop, laughing as they move away.'

+ 3 - 1
locations/hunter_ambient.qsrc

@@ -257,13 +257,15 @@ if $ARGS[0] = 'schedule':
         hunters_evening = 1
     elseif hour >= 20 and hour < 23:
         hunters_drink = 1
+    elseif hour = 23:
+        hunters_night = 1    
     else
         hunters_sleep = 1    
     end
 end    
 
 if $ARGS[0] = 'bring_food':
-    if (hunters_lunch = 1 or hunters_evening = 1) and rand(1,10) = 1:
+    if (hunters_lunch = 1 or hunters_evening = 1) and rand(1,20) = 1:
         !TODO: Show the name of the hunter bringing the food. Also add variety besides rabbit
         cla & *clr
         '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/bunny_butcher.jpg"></center>'

+ 601 - 32
locations/hunter_interactions.qsrc

@@ -212,34 +212,6 @@ if $ARGS[0] = 'smoke_with_hunters':
     end
 end 
 
-if $ARGS[0] = 'drink_with_hunters':
-    cla
-    act 'Drink vodka':
-			*clr & cla
-			minut += 10
-			gs 'drugs', 'alcohol', 'vodka', 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka1.jpg"></center>'
-			*nl
-			'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
-
-			act 'Continue': gs 'swamp_yard', 'fireside'
-		end
-		act 'Drink beer':
-			*clr & cla
-			minut += 10
-			gs 'drugs', 'alcohol', 'beer', 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer2.jpg"></center>'
-			*nl
-			'You take a bottle of bear, open it and start drinking it.'
-
-			act 'Continue': gs 'swamp_yard', 'fireside'
-		end
-end
-
 if $ARGS[0] = 'chat_with_hunters':
     *clr & cla
     minut += rand (30,90)
@@ -255,9 +227,9 @@ if $ARGS[0] = 'chat_with_hunters':
             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:
+        elseif CloSkirtShortness > 0 and $pantyworntype = 'none' and rand(1,12) = 1:
             gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
-        elseif $clothingworntype = 'nude' and rand(1,2) = 1:
+        elseif $clothingworntype = 'nude' and $pantyworntype = 'none' and rand(1,5) = 1:
             gs 'hunter_interactions', 'chat_with_hunters', 'nude'
         else
             gs 'hunter_interactions', 'chat_with_hunters', 'generic'
@@ -297,7 +269,7 @@ if $ARGS[0] = 'chat_with_hunters':
             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"'
+                '"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'
@@ -356,7 +328,7 @@ if $ARGS[0] = 'chat_with_hunters':
                 '"Well uhhh... it is normal at your age. You are not a little kid anymore" says Sergey'
 				act 'Continue': gt 'swamp_yard', 'start'
             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'
+                '"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'    
@@ -370,6 +342,603 @@ if $ARGS[0] = 'chat_with_hunters':
     end
 end
 
+if $ARGS[0] = 'join_drinking':
+    *clr & cla
+    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+    'You approach the hunters and ask if you can join them drinking.'
+    !Friendly enough to score free booze
+    if hunter_collective_opinion > 40:
+        !Comfortable enough for letting her get wasted for drunken bangings
+        if hunter_sexual_comfort > 40:
+            '"Sure, Sveta, help yourself for as much as you want. Drink irresponsibly." says Andrei with a wolfish grin.'
+            act 'Further':
+                gt 'hunter_interactions', 'drink_with_hunters'
+            end    
+        !Not comfortable enough letting her get wasted without some proof of "drunkworthiness"
+        elseif hunter_sexual_comfort > 20:
+            if alko < 3:
+                gt 'hunter_interactions', 'drink_with_hunters'
+            else
+                '"I don''t  know, Sveta." says Andrei. "What if you turn out to be a mean drunk? You should perform a dare for us to prove we can safely have you wasted."'
+                if alko < 5:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'innocent'
+                elseif alko < 6:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'strip'
+                elseif alko < 7:    
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'softcore'
+                else:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'hardcore'  
+                end      
+            end
+        !Not comfortable letting her get wasted at all
+        else
+            if alko < 3:
+                gt 'hunter_interactions', 'drink_with_hunters'
+            else
+                '"No Sveta, go away" says Sergei. "It is not good for you to get blackout drunk so young. You have had enough for now"'
+                act 'Further': gt 'swamp_yard', 'fireside'
+            end    
+        end
+    !Not friendly enough for free booze
+    else
+        if hunter_sexual_comfort > 30:
+            !Friendly enough to let her put a bit of effort for some booze
+            if hunter_collective_opinion > 20:
+                '"You see, Sveta" says Andrei. "We had to work hard to make the money for this booze here. You should work for it just like us. Say, how about you provide some entertainment for us?"'
+                if alko < 1:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'innocent'
+                elseif alko < 3:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'strip'
+                elseif alko < 5:    
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'softcore'
+                else:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'hardcore'  
+                end
+            !Sexualy comfortable enough to ask for sexual favors, but not friendly enough for something light
+            else
+                '"What does this look like to you, free booze charity?" says Sergei. "You gotta pay up or put out and we are not interested in your money"'    
+                if alko < 4:    
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'softcore'
+                else:
+                    act 'Further': gt 'hunter_interactions', 'booze_dare', 'pick', 'hardcore'  
+                end
+            end        
+        !Not comfortable or friendly enough to let her get booze
+        else
+            '"Go away Sveta" says Igor. "We do not want you to join us, got better things to do than babysit a drunk teen"'
+            act 'Walk away': gt 'swamp_yard'
+            if inhibition < 60: 
+                act 'Ask nicely again. With a pair of visual aids': gt 'hunter_interactions', 'booze_dare', 'flash_tits' 
+            end
+        end
+    end
+
+    !TODO: Add trigger for drunken gangbang
+    !    if alko > 8:
+    !        gt 'hunter_interactions', 'fireside_gangbang'
+    !    end
+end
+
+
+if $ARGS[0] = 'drink_with_hunters':
+    *clr & cla
+    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+    'Holding up two bottles, Igor approaches you "Take your pick Sveta: vodka, or beer?"'
+    act 'Drink vodka':
+			*clr & cla
+			minut += 10
+			gs 'drugs', 'alcohol', 'vodka', 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka1.jpg"></center>'
+			*nl
+			'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
+
+			act 'Continue': gt 'swamp_yard', 'fireside'
+		end
+		act 'Drink beer':
+			*clr & cla
+			minut += 10
+			gs 'drugs', 'alcohol', 'beer', 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer2.jpg"></center>'
+			*nl
+			'You take a bottle of bear, open it and start drinking it.'
+
+			act 'Continue': gt 'swamp_yard', 'fireside'
+		end
+end
+
+if $ARGS[0] = 'booze_dare':
+    if $ARGS[1] = '' or $ARGS[1] = 'pick':
+        act 'Walk away': gt 'swamphouse'
+        if $ARGS[2] = 'innocent':
+            if $clothingworntype ! 'nude':
+                '"How about you show us your panties" says Andrei. "Wondering what color your underwear is, just scientific curiosity that''s all"'
+                
+                if $pantyworntype ! 'none':
+                    act 'Show him your panties, for science': gt 'hunter_interactions', 'booze_dare', 'flash_thong'
+                else
+                    hunter_sexual_comfort += 1
+                    'You tell Andrei that you are not wearing any panties with a blush. "I do not believe you" he says with a smirk. "We need empirical proof. Solid evidence or nothing."'
+                    act 'Show them your unclad ass': gt 'hunter_interactions', 'booze_dare', 'flash_ass'
+                    act 'Let them see your pussy': gt 'hunter_interactions', 'booze_dare', 'flash_pussy'
+                end
+            else
+                hunter_sexual_comfort += 2
+                'After thinking for a moment, Andrei asks "How about you dance by the fire a bit?"'
+                '"Just express how free you are unrestricted by civilization or some other artsy fartsy crap. We will even clap you a tempo!" says Andrei"'
+                act 'Dance naked by the bonfire': gt 'hunter_interactions', 'booze_dare', 'nude_dance'
+            end    
+        end
+
+        if $ARGS[2] = 'strip':
+            if $clothingworntype ! 'nude':
+                '"I can barely understand you over all those clothes" says Andrei. Noticing your confused stare, Sergei says "He means we want you to take your clothes off"'
+                act 'Strip off your clothes and toss them in the hut': gt 'hunter_interactions', 'booze_dare', 'strip_outfit'
+            elseif $pantyworntype ! 'none':
+                hunter_sexual_comfort += 1
+                '"Your dare is to get rid of those panties" says Sergei plainly.'
+                act 'Take off your panties': gt 'hunter_interactions', 'booze_dare', 'strip_panties'
+            else
+                hunter_sexual_comfort += 2
+                '"Did you ever think about becoming a model?" asks Igor.'
+                'Before you answer he adds "Let''s do an erotic nude pose. Why don''t you go lay prostrate there with your butt towards us? Maybe emphasize your butt a bit? I think it will look really sexy"'
+                act 'Dare to be an erotic model': gt 'hunter_interactions', 'booze_dare', 'present_pussy'
+            end
+        end
+
+        if $ARGS[2] = 'softcore':
+            if $clothingworntype ! 'nude' or $pantyworntype ! 'none':
+                gt 'hunter_interactions', 'booze_dare', 'pick', 'strip'
+            else
+                hunter_sexual_comfort += 2
+                if alko < 4:
+                    '"I want to see you play with your titties" says Sergei'
+                    act 'Oblige him': gt 'hunter_interactions', 'booze_dare', 'present_tits'
+                else:
+                    '"So, Sveta, I am scientifically curious again. Can you show us how you jill off? Just a little demonstration, and you get your booze."'
+                    act 'Give them a teaser': gt 'hunter_interactions', 'booze_dare', 'masturbate_1'
+                end    
+            end
+        end
+
+        if $ARGS[2] = 'hardcore':
+            if $clothingworntype ! 'nude':
+                '"I want you to suck my dick if you want some booze" says Sergei. "You get two free drinks eh?" quips Andrei behind him'
+                act 'Kneel down in front of Sergei': gt 'hunter_interactions', 'booze_dare', 'blow_clothed'
+            else
+                if $pantyworntype ! 'none': 
+                    hunter_sexual_comfort += 1
+                    gt 'hunter_interactions', 'booze_dare', 'pick', 'strip'
+                elseif hunter_collective_opinion > 40:
+                    hunter_sexual_comfort += 3
+                    '"I want to fuck you" says Igor heatedly. "I want to taste you, I want to be inside you. You are driving me crazy, Sveta"'
+                    act 'Lay down on the blanket': gt 'hunter_interactions', 'booze_dare', 'blanket_fuck' 
+                else
+                    hunter_sexual_comfort += 2
+                    '"Seeing you prance around naked is getting me real hot and bothered" says Andrei. "I need you to relieve me, I want to fuck that little pussy of yours"'
+                    act 'Approach Andrei on his chair': gt 'hunter_interactions', 'booze_dare', 'chair_fuck'
+                end            
+            end        
+        end
+    end
+
+    if $ARGS[1] = 'flash_thong':
+        *clr & cla
+        act 'Grab a drink':
+        hunter_sexual_comfort += 1
+        gt 'hunter_interactions', 'drink_with_hunters'
+        end    
+        
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/flash_thong.jpg"></center>'
+        'You do not think it is a big deal so you slide your pants down a bit to show off your panty clad ass.'
+        'After a few seconds you cover back up much to your friends'' dismay. They had a good enough look to satisfy their "scientific curiosity".'
+
+        gs 'arousal', 'flash', 2
+        minut -= 1
+        gs 'arousal', 'end'
+        gs 'stat'
+        
+    end    
+
+    if $ARGS[1] = 'flash_ass':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 2
+            hunter_collective_opinion -= 1
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end  
+
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/flash_ass.jpg"></center>'
+        'You pull up your bottom to expose your uncovered ass. Noticing Andrei trying to move closer probably to cope a feel, you cover back up.'
+        '"You have a cute butt, <<$pcs_nickname>>" comments Igor. You blush slightly at his remark.'
+        
+        gs 'arousal', 'flash', 5
+        minut -= 4
+        gs 'arousal', 'end'
+        gs 'stat'
+        
+    end
+
+    if $ARGS[1] = 'flash_tits':
+        *clr & cla
+        act 'Ask for a drink again':
+            *clr & cla
+            '"That''s a nice pair you got there" says Andrei. "Ask us nicely like that enough times and we might work something out"'
+            hunter_sexual_comfort += 4
+            hunter_collective_opinion -= 2
+            act 'Further': gt 'swamp_yard', 'fireside'
+        end  
+
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/flash_tits_2.jpg"></center>'
+        'You pull down your top to expose your tits to the hunters. You can feel your nipples slightly harden from the breeze.'
+        'After letting the hunters stare at your tits for a minute, you pull your top back up.'
+
+        gs 'arousal', 'flash', 5
+        minut -= 4
+        gs 'arousal', 'end'
+        gs 'stat'
+        
+    end
+
+    if $ARGS[1] = 'flash_pussy':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 3
+            hunter_collective_opinion -= 1
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/pantiless_upskirt.jpg"></center>'
+        'You pull up your skirt to show the hunters what is under. Since you were not wearing panties that means they get a direct view of your exposed pussy'
+        'You feel yourself getting a little wet feeling the breeze on your exposed pussy, bared for the hunters'' viewing pleasure'
+
+        gs 'arousal', 'flash', 8
+        minut -= 7
+        gs 'arousal', 'end'
+        gs 'stat'
+    end
+
+    if $ARGS[1] = 'nude_dance':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 4
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'arousal', 'flash', 12, 'exhibitionism'
+        minut -= 9
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/fire_dance.jpg"></center>'
+        'You dance by the fireside, putting on a show for the hunters. It feels much easier to contort your body without any clothes getting in the way.'
+        'You bend your body this way and that to emphasize your assets: shaking your hips, thrusting out your tits and pussy, bending down to show off your holes...'
+        
+        
+    end
+
+    if $ARGS[1] = 'strip_outfit':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 4
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'clothing', 'strip', 'swamphouse'
+        clothesAtLocation = 1
+        gs 'arousal', 'flash', 12, 'exhibitionism'
+        minut -= 10
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/strip_clothes.jpg"></center>'
+        'You start taking off your clothes at the hunters'' request. "Yes" says Andrei, "Take it all off."'
+        if $pantyworntype = 'none':
+            'You are now completely naked in front of the hunters'
+        else    
+            'You are stripped down to your panties, everything else bared.'
+            act 'Take off your panties too': gt hunter_interactions, 'booze_dare', 'strip_panties'
+        end
+    end
+    
+    if $ARGS[1] = 'strip_panties':
+        *clr & cla
+        gs 'underwear', 'remove'
+        act 'Grab a drink':
+            hunter_sexual_comfort += 2
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'arousal', 'flash', 13, 'exhibitionism'
+        minut -= 12
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/strip_panties.jpg"></center>'
+        'You walk over next to the creek, embarassed by the idea of taking off the last piece of fabric covering your body right under the gaze of the hunters.'
+        'With your back facing the water, you bend down and slide down your panties, smiling nervously at the hunters.'
+        'Now without a stitch to cover you, you can feel the nighttime breeze caressing your privates like a hand exploring your body.'
+    end
+
+    if $ARGS[1] = 'present_pussy':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 3
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'arousal', 'flash', 15, 'exhibitionism', 'sub'
+        minut -= 13
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/exhibition_pussy_2.jpg"></center>'
+        'You get down on your hands and knees and lower your chest to the ground while thrusting up your ass. You hold the pose for a good couple of minutes, showing off your now inflamed pussy lips.'
+    end
+
+    if $ARGS[1] = 'pussy_spread':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 4
+            hunter_collective_opinion -= 2
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'arousal', 'flash', 17, 'exhibitionism', 'sub'
+        minut -= 15
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/pussy_spread.jpg"></center>'
+        'Before you even start thinking, your hands start gliding through your now moist folds, spreading them apart to show off the pinkness inside.'
+        'You realize the hunters can tell exactly how turned on you are getting by this, the gleaming pinkness inside completely bared for them,'
+        
+    end
+
+    if $ARGS[1] = 'present_tits':
+        *clr & cla
+        act 'Grab a drink':
+            hunter_sexual_comfort += 4
+            hunter_collective_opinion -= 1
+            gt 'hunter_interactions', 'drink_with_hunters'
+        end
+
+        gs 'arousal', 'breasts', 13, 'exhibitionism', 'sub'
+        minut -= 10
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/exhibition_tits_2.jpg"></center>'
+        'You lightly grab one of your tits, gently massaging it. Twirling around and prodding with your finger, you slowly make your way to your nipple.'
+        'Then you pull and twist it until it becomes diamond hard, starting to moan lightly at the touch. You can tell Sergei''s very pleased with the show'
+    end
+
+    if $ARGS[1] = 'masturbate_1':
+        *clr & cla
+
+        $orgasm_or = 'no'
+        gs 'arousal', 'masturbate', 8, 'exhibitionism', 'sub'
+        minut -= 7
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_tease_1.jpg"></center>'
+        'You start stroking your pussy, your fingers easily finding your aching clit. Biting your bottom lip, you start flicking your bean. It feels so good!'
+
+        act 'Further':
+            *clr & cla
+
+            gs 'arousal', 'masturbate', 12, 'exhibitionism', 'sub'
+            gs 'arousal', 'breasts', 5, 'exhibitionism', 'sub'
+            minut -= 15
+            gs 'arousal', 'end'
+            gs 'stat'
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_tease_2.jpg"></center>'
+            'Getting more and more into the rhtym, you grab one of your tits with one hand and stroke your pussy with the other, getting faaster and faster.'
+
+            act 'Further':
+                *clr & cla
+                
+                gs 'arousal', 'masturbate', 15, 'exhibitionism', 'sub'
+                gs 'arousal', 'breasts', 5, 'exhibitionism', 'sub'
+                minut -= 17
+                gs 'arousal', 'end'
+                gs 'stat'
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_tease_3.jpg"></center>'
+                'It was just supposed to be a tease but it feels too good to stop. Bending over bit, you insert a finger and start pumping your pussy as you squeeze and knead your breast.'
+                'After a few minutes you start feeling your legs cramping. You realize you will not be able to climax standing up like this, even though you felt like you were getting there.'
+            
+                act 'Stop playing with yourself':
+                    *clr
+                    act 'Grab a drink':
+                        hunter_sexual_comfort += 6
+                        hunter_collective_opinion -= 2
+                        gt 'hunter_interactions', 'drink_with_hunters'
+                    end
+                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/nude.jpg"></center>'
+                    'Deciding not to get carried away, you ask for your drink.'   
+                end
+
+                act 'Find a more comfortable position to continue':
+                    hunter_sexual_comfort += 4
+                    gt 'hunter_interactions', 'booze_dare', 'masturbate_2'
+                end
+            end
+
+        end
+    end 
+
+    if $ARGS[1] = 'masturbate_2':
+        *clr & cla
+        gs 'arousal', 'masturbate', 10, 'exhibitionism', 'sub'
+        minut -= 8
+        gs 'arousal', 'end'
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_2.jpg"></center>'
+        'You sit down on a blanket by the fire to get more comfortable, your hand never leaving your pussy. Looking down, you notice how inflamed your pussy looks and how it aches to be touched and filled.'
+        
+        act 'Further':
+            *clr & cla
+            gs 'arousal', 'masturbate', 15, 'exhibitionism', 'sub'
+            minut -= 13
+            gs 'arousal', 'end'
+            gs 'stat'
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_3.jpg"></center>'
+            'Without losing time, you keep rubbing your engorged clit, subconsciously spreading your legs wide to give the hunters a full view of how you are fingerblasting your own pussy.'
+        
+            act 'Further':
+                *clr & cla
+                act 'Grab a drink':
+                    hunter_sexual_comfort += 4
+                    hunter_collective_opinion -= 2
+                    gt 'hunter_interactions', 'drink_with_hunters'
+                end
+
+                $orgasm_or = 'custom'
+                
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/masturbation_4.jpg"></center>'
+                'You have a sudden thought about how you are splayed open naked in front of three men you barely know, casually giving them a show writhing and moaning like a base tramp.'
+                
+                'That thought is the last straw that pushes you over the edge. You climax shaking and screaming without restraint, your pussy presented to your audience soaking wet and throbbing from your orgasm.'    
+                
+                gs 'arousal', 'masturbate', 15, 'exhibitionism', 'sub', 'humiliation'
+                minut -= 13
+                gs 'arousal', 'end'
+                gs 'stat'
+
+            end
+        end
+    end
+
+    if $ARGS[1] = 'blow_clothed':
+        *clr & cla
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_bj_clothed_1.jpg"></center>'
+        'You kneel down as Sergei unzips in front of you. Grabbing his throbbing dick with your hand, you start lightly stroking him as you start thinking about how you will fit it all in your mouth.'
+        
+        gs 'arousal', 'hj', 5
+        minut -= 4
+        gs 'arousal', 'end'
+        gs 'stat'
+        act 'Further':
+            *clr & cla
+            '<center><video autoplay loop src="images/locations/gadukino/sex/hunter/fireside_night/dare_bj_clothed_2.mp4"></video></center>'
+            'Sergei comes up with a solution as he grabs your head and forcefully pushes his cock down your throat. You let out a muffled yelp before he starts rhytmically fucking your throat like a pussy. His dick is suffocating you and you are gasping for air with each pump, but something about being skullfucked like this really turns you on.'
+
+            gs 'arousal', 'bj', 5, 'sub', 'rough'
+            gs 'arousal', 'end'
+            gs 'stat'
+            act 'Further':
+                *clr & cla
+                act 'Grab a drink':
+                    hunter_sexual_comfort += 10
+                    hunter_collective_opinion -= 3
+                    gt 'hunter_interactions', 'drink_with_hunters'
+                end
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_bj_clothed_facial.jpg"></center>'
+                'You feel Sergei''s cock throbbing more and more intensely before he suddenly pulls out, spurting his jizz all over your face. "Nice makeup Sveta!" says Andrei, after you blink the cum out of your eyes and make eye contact with him watching the whole thing.'
+                
+                gs 'boyStat', 'A174'
+                gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
+                gs 'cum_call', 'face', 'A174', 1
+                gs 'arousal', 'end'
+                gs 'stat'
+            end
+        end
+    end
+
+    if $ARGS[1] = 'chair_fuck':
+        *clr & cla
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_qfuck_1.jpg"></center>'
+        'Andrei quikly strips his clothes while you kneel in front of him. He is still flaccid so you grab and start stroking his shaft while licking the head, tasting his sweat and pre-cum. After a few moments, he is ready.'
+
+        $orgasm_or = 'no'
+        gs 'arousal', 'bj', 5, 'sub', 'exhibitionism'
+        gs 'arousal', 'hj', 5
+        minut -= 3
+        gs 'arousal', 'end'
+        gs 'stat'
+        act 'Further':
+            *clr & cla
+            act 'Grab a drink':
+                hunter_sexual_comfort += 13
+                hunter_collective_opinion -= 4
+                gt 'hunter_interactions', 'drink_with_hunters'
+            end
+            
+
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_qfuck_2.jpg"></center>'
+            'You jump on Andrei''s lap and lower yourself on his dick. He starts fondling you all over, grabbing your tits and tweaking your nipples, lightly spanking your ass and teasing your butthole as you bounce up and down, his friends watching your entire performance behind him silently.'
+            'After a few minutes, you start feeling his dick throbbing and rubbing more vigorously against your slick walls. Before you process this, Andrei grabs you by your hips and pulls you all the way down, filling your pussy with his cum with his cock buried inside to the hilt.'
+        
+            $orgasm_or = 'custom'
+            'The sensation of his warm cum spraying your insides and the quiet and hungry gazes of Sergei and Igor are enough to make you join him climaxing, your throbbing pussy milking Andrei''s cock while you moan and writhe in Andrei''s embrace'
+
+            gs 'boyStat', 'A172'
+            gs 'arousal', 'breasts', 5, 'sub', 'exhibitionism'
+            gs 'arousal', 'vaginal', 10, 'sub', 'exhibitionism'
+            gs 'cum_call', 'vaginal', 'A172', 1
+            minut -= 8
+            gs 'arousal', 'end'
+            gs 'stat'
+        end
+    end
+
+    if $ARGS[1] = 'blanket_fuck':
+        *clr & cla
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_bj_nude_1.jpg"></center>'
+        'You sit on your hands and knees on the blanket, watching Igor strip off his clothes. He joins you on the blanket before suddenly pulling you on top of him, burying his face in your crotch. You yelp half in shock and half in the blissful sensation of his tongue exploring your folds before taking his cock in your mouth, returning the favor.'
+
+        $orgasm_or = 'no'
+
+        gs 'arousal', 'vaginal_finger', 5, 'exhibitionism'
+        gs 'arousal', 'cuni', 10, 'exhibitionism'
+        minut -= 10
+        gs 'arousal', 'end'
+        gs 'stat'
+        act 'Further':
+            *clr & cla
+            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_fuck_1.jpg"></center>'
+            'Sensation of Igor''s tongue flicking your clit this way and that, his finger pumping your cunt, the taste of his pre-cum... You need his cock filling you right now! Almost like he could read your mind, he turns you around and puts you down before burying his cock in your pussy in one quick motion, eliciting a loud sigh from you.'
+
+            gs 'arousal', 'vaginal_finger', 3, 'exhibitionism'
+            gs 'arousal', 'cuni', 3, 'exhibitionism'
+            gs 'arousal', 'vaginal', 5, 'exhibitionism'
+            minut -= 7
+            gs 'arousal', 'end'
+            gs 'stat'
+            act 'Further':
+                *clr & cla
+                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_fuck_2.jpg"></center>'
+                'After a few minutes, he pulls you on top of him again. Your womanhood aches unbearably from the sensation of sudden emptiness for a moment before he penetrates you again, grabbing you by the waist and rhytmically sliding you up and down like a fuck toy. Both your fuckholes are in full display for Sergei and Andrei, who are intensely watching your pussy getting fucked.'
+
+                gs 'arousal', 'vaginal', 15, 'exhibitionism', 'rough'
+                minut -= 7
+                gs 'arousal', 'end'
+                gs 'stat'
+                act 'Further':
+                    *clr & cla
+                    $orgasm_or = 'custom'
+                    act 'Grab a drink':
+                        hunter_sexual_comfort += 15
+                        hunter_collective_opinion -= 2
+                        gt 'hunter_interactions', 'drink_with_hunters'
+                    end
+
+                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/fireside_night/dare_fuck_3.jpg"></center>'
+                    'Feeling him getting tired, you decide to take control. You turn around and lower yourself back on his dick now covered with your juices, wiggling your ass and hips rhytmically as you fuck yourself with Igor''s dick. You start milking his cock faster and faster, moaning louder and louder as you start rubbing your clit with one hand.'
+                    'It does not take long before you start feeling your climax approaching. You pick up your pace even more, milking Igor''s cock even more vigorously for your own orgasm. It hits you like a train all of a sudden, making you loudly scream in shocked bliss. Your pussy throbbing violently like a second heart sends Igor over the edge too, making him fill your cunt with his warm spunk and paint your nether lips white.'
+                    
+                    gs 'boyStat', 'A174'
+                    gs 'arousal', 'vaginal', 15, 'exhibitionism', 'dom'
+                    gs 'arousal', 'masturbate', 5, 'exhibitionism', 'dom'
+                    gs 'cum_call', 'vaginal', 'A174', 1
+                    gs 'cum_call', 'labia', 'A174', 1
+                    minut -= 14
+                    gs 'arousal', 'end'
+                    gs 'stat'
+                end
+            end
+        end
+    end
+end
+
+
 if $ARGS[0] = 'meet_hunters':
     cla & *clr
     

+ 5 - 2
locations/hunters.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	gs 'stat'
 
-	act 'Walk away':gt'swamp_yard'
+	act 'Walk away': gt 'swamp_yard'
 	if huntersKnow = 0:
 		act 'Greet them':
 			gs 'hunter_interactions', 'meet_hunters																																	'
@@ -43,7 +43,10 @@ if $ARGS[0] = 'check_opinion':
 		'Andrei then looks at you and throws you an air kiss.'
 	else
 		'The other hunters completely ignore you, pretending you are not even there.'
-	end	
+	end
+	
+	!Acceptance
+	!Coming soon!
 
 	act 'Further': gt $loc
 end	

+ 1 - 1
locations/kavkazkafe.qsrc

@@ -274,7 +274,7 @@ end
 
 if $ARGS[0] = 'givirape2':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/rape2.jpg"></center>'
-	'You bite Givis member and he is furious, "Bitch, for that I''ll fuck you in the ass, maybe that will each you to suck.'
+	'You bite Givis member and he is furious, "Bitch, for that I''ll fuck you in the ass, maybe that will teach you to suck.'
 	if analplugin = 1:
 		'<<$boydesc>> pulls the plug out of your narrow and tight ass.'
 		analplugout = 1

+ 1 - 1
locations/korr.qsrc

@@ -94,7 +94,7 @@ elseif parkday ! daystart and parkblackmail = 2:
 	'Damn, your photos with sperm on your face and two dicks in your mouth are plastered around porch.'
 end
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color="red">, the doorbell rings</font></b>'

+ 1 - 1
locations/korr2x.qsrc

@@ -69,7 +69,7 @@ act '<b><font color="maroon">Go outside</font></b>':
 		xgt'liames'
 	end
 end
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color = red>The doorbell rings</font></b>'

+ 1 - 1
locations/korrPar.qsrc

@@ -332,7 +332,7 @@ if hour >= 10 and hour <= 23 and pav_slut >= 125 and podwhoreQW >= 3:
 	end
 end
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- korrPar ---------------------------------
 

+ 1 - 1
locations/liam.qsrc

@@ -78,7 +78,7 @@ act 'Walk 1 h':
 	act 'Complete outing':gt'liam','start'
 end
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- liam ---------------------------------
 

+ 71 - 0
locations/medUtil.qsrc

@@ -0,0 +1,71 @@
+# medUtil
+
+if $ARGS[0] = 'abortion':
+	!! Aborts pregnency. Usage: gs 'medUtil','abortion'
+	vidage += 1
+	abort += 1
+	abortionbirthdate = daystart
+	pregtime = 0
+	pregtalk = 0
+	pcs_pregtalk = 0
+	npc_pregtalk['A16'] = 0
+	npc_pregtalk['A34'] = 0
+	preg = 0
+	thinkpreg = 0
+	knowpreg = 0
+	cycle = 4
+	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
+	RecovH = rand(375,575) 
+	pregchem = 0
+	knowpregloss = 2
+	abortrand = rand(0, 10)
+
+	if age > 18:
+		if abortrand < 10:sterilewb += 1
+		if abortrand = 10:sterilewb += 10
+	else
+		if abortrand < 7:sterilewb += 2
+		if abortrand >= 7:sterilewb += 10
+	end
+
+	pcs_hydra += 20
+	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
+	nextbaby = arrsize('yearkid')
+	if broodcurse > 0: over = 13 & gt'gameover'
+	:poliabortloop
+	!!Changed to check if baby has a birth year instead, if it doesn''t, do abortion
+	if yearkid[nextbaby-1] = 0:
+		KILLVAR 'polkid',nextbaby-1
+		KILLVAR '$kidname',nextbaby-1
+		KILLVAR 'kidage',nextbaby-1
+		KILLVAR 'daykid',nextbaby-1
+		KILLVAR 'monthkid',nextbaby-1
+		KILLVAR 'yearkid',nextbaby-1
+		KILLVAR 'Babyptype',nextbaby-1
+		KILLVAR '$ChildFath',nextbaby-1
+		KILLVAR '$ChildThFath',nextbaby-1
+		KILLVAR 'hairkid',nextbaby-1
+		KILLVAR 'eyeskid',nextbaby-1
+		KILLVAR 'cumarrcon',nextbaby-1
+		KILLVAR '$wombpotfath'
+		BabyEmbryo -= 1
+	end
+	nextbaby -= 1
+	if nextbaby > 0:
+		jump 'poliabortloop'
+	end
+elseif $ARGS[0] = 'healSTDs':
+	!! Heals all STDs. Usage: gs 'medUtil','healSTDs'
+	venera = 0
+	GerpesOnce = 0
+	Gerpes = 0
+	SifacOnce = 0
+	Sifilis = 0
+	TriperOnce = 0
+	Triper = 0
+	TriperOral = 0
+	KandidozOnce = 0
+	Kandidoz = 0
+end
+
+--- medUtil ---------------------------------

+ 3 - 3
locations/mey_home.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'start':
 	act 'Tamara Mikhailovna''s room': gt 'mey_home', '7'
 	act 'Garden': gt 'mey_home', '8'
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 ! kitchen
@@ -178,7 +178,7 @@ if $ARGS[0] = '1':
 
 	gs 'events', 'read'
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 if $ARGS[0] = '2':
@@ -269,7 +269,7 @@ if $ARGS[0] = '3':
 
 	act 'Wait':gs 'obj_din', 'wait'
 
-	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 if $ARGS[0] = '4':

+ 6 - 0
locations/nastja.qsrc

@@ -23,6 +23,7 @@ if $ARGS[0] = 'pos1':
 			cla
 			*clr
 			npc_QW['A192'] = 1
+			gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
 			minut += 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/anastasia/nastja.jpg"></center>'
@@ -60,6 +61,7 @@ if $ARGS[0] = 'pos5':
 	*clr
 	minut += 60
 	npc_QW['A192'] = 2
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/1party0.jpg"></center>'
 	'You arrive at a karaoke cafe called "Mast".'
@@ -312,6 +314,7 @@ if $ARGS[0] = 'pos12':
 	minut += 10
 	pcs_mood += 40
 	npc_QW['A192'] = 3
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
 	'It rings two, three, four times before Anastasia picks up.'
@@ -461,6 +464,7 @@ if $ARGS[0] = 'pos21':
 	*clr
 	minut += 20
 	npc_QW['A192'] = 5
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/2bslp.jpg"></center>'
 	'After running and jumping around like that in everybody''s plain view, sitting down and lying back topless isn''t enough to make you feel shy and neither you nor Nastya have any qualms about spreading your arms and showing off your bodies to everyone as you sunbathe once again.'
@@ -479,6 +483,7 @@ if $ARGS[0] = 'pos22':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 6
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
@@ -659,6 +664,7 @@ if $ARGS[0] = 'pos31':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 7
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20","",""
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'

+ 3 - 3
locations/npcstatic4.qsrc

@@ -563,7 +563,7 @@ gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2035042362 1045516320 1994842543 1052417530 1977000071 1331823092 1986866420'
 $npc_firstname['A<<npctemp>>'] = 'Andrei'
 $npc_nickname['A<<npctemp>>'] = 'Andrew'
-$npc_usedname['A<<npctemp>>'] = 'Unknown Man'
+$npc_usedname['A<<npctemp>>'] = 'Andrei'
 $npc_notes['A<<npctemp>>'] = 'A hunter in Gadukino.'
 npc_dob['A<<npctemp>>'] = 19800317
 npc_cyc['A<<npctemp>>'] = -1
@@ -585,7 +585,7 @@ gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1140758667 1773455079 2123382286 1650309847 1391480172 1829299044 1187608522'
 $npc_firstname['A<<npctemp>>'] = 'Igor'
 $npc_nickname['A<<npctemp>>'] = 'Igor'
-$npc_usedname['A<<npctemp>>'] = 'Unknown Man'
+$npc_usedname['A<<npctemp>>'] = 'Igor'
 $npc_notes['A<<npctemp>>'] = 'A hunter in Gadukino.'
 npc_dob['A<<npctemp>>'] = 19920609
 npc_cyc['A<<npctemp>>'] = -1
@@ -608,7 +608,7 @@ gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1008006962 1236637588 1489896373 1580273620 1293163913 1709107929 1173381311'
 $npc_firstname['A<<npctemp>>'] = 'Sergey'
 $npc_nickname['A<<npctemp>>'] = 'Sergey'
-$npc_usedname['A<<npctemp>>'] = 'Unknown Man'
+$npc_usedname['A<<npctemp>>'] = 'Sergey'
 $npc_notes['A<<npctemp>>'] = 'A hunter in Gadukino.'
 npc_dob['A<<npctemp>>'] = 19850000
 npc_cyc['A<<npctemp>>'] = -1

+ 1 - 1
locations/pavCommercial.qsrc

@@ -149,7 +149,7 @@ act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week = 7:
 	cla & *clr

+ 1 - 1
locations/pavIndustrial.qsrc

@@ -93,7 +93,7 @@ act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
 
 act 'Wait':gs 'obj_din', 'wait'
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week = 7:
 	menu_off = 1

+ 1 - 1
locations/pavResidential.qsrc

@@ -227,7 +227,7 @@ if storyline ! 0 and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 9
 	end
 end
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week = 7:
 	menu_off = 1

+ 5 - 52
locations/poli.qsrc

@@ -153,62 +153,15 @@ if $ARGS[0] = 'start':
 	if money >= 15000 and preg = 1 and pregchem < 1863 and knowpreg = 1:
 		act 'Get an abortion (15,000 <b>₽</b>)':
 			cla
-			menu_off = 1
-			vidage += 1
-			abort += 1
-			abortionbirthdate = daystart
 			money -= 15000
-			pregtime = 0
-			pregtalk = 0
-			pcs_pregtalk = 0
-			npc_pregtalk['A16'] = 0
-			npc_pregtalk['A34'] = 0
-			preg = 0
-			thinkpreg = 0
-			knowpreg = 0
-			cycle = 4
-			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
-			RecovH = rand(375,575) 
-			pregchem = 0
-			knowpregloss = 2
-			abortrand = rand(0, 10)
-
-			if age > 18:
-				if abortrand < 10:sterilewb += 1
-				if abortrand = 10:sterilewb += 10
-			else
-				if abortrand < 7:sterilewb += 2
-				if abortrand >= 7:sterilewb += 10
-			end
 
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/abort.jpg"></center>'
 			'You spread out on a gynecological chair, from which angle you are fortunate not to be able to see what is going on. You feel nauseous and violated. A nurse hands you a single aspirin and a glass of muddy-looking water to down it with.'
-			pcs_hydra += 20
-			!! I am not sure, why is it here this cycle, but I leave it so (rachels)
-			nextbaby = arrsize('yearkid')
-			if broodcurse > 0: over = 13 & gt'gameover'
-			:poliabortloop
-			!!Changed to check if baby has a birth year instead, if it doesn''t, do abortion
-			if yearkid[nextbaby-1] = 0:
-				KILLVAR 'polkid',nextbaby-1
-				KILLVAR '$kidname',nextbaby-1
-				KILLVAR 'kidage',nextbaby-1
-				KILLVAR 'daykid',nextbaby-1
-				KILLVAR 'monthkid',nextbaby-1
-				KILLVAR 'yearkid',nextbaby-1
-				KILLVAR 'Babyptype',nextbaby-1
-				KILLVAR '$ChildFath',nextbaby-1
-				KILLVAR '$ChildThFath',nextbaby-1
-				KILLVAR 'hairkid',nextbaby-1
-				KILLVAR 'eyeskid',nextbaby-1
-				KILLVAR 'cumarrcon',nextbaby-1
-				KILLVAR '$wombpotfath'
-				BabyEmbryo -= 1
-			end
-			nextbaby -= 1
-			if nextbaby > 0:
-				jump 'poliabortloop'
-			end
+			
+			gs 'medUtil','abortion'
+			
+			minut += 60
+			gs 'stat'
 
 			act 'Return to the entrance':gt 'poli', 'start'
 		end

+ 1 - 0
locations/salon.qsrc

@@ -370,6 +370,7 @@ if $ARGS[0] = '0':
 								cla
 								*clr
 								telmasha = 1
+								!gs 'telefon', 'AddContact', 'Axxx', 'icon_masha', "$telsob = 'Masha' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","",""
 								masha += 1
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/pri7.jpg"></center>'
 								$orgasm_txt = 'You begin to pant and moan and finally you have an intense orgasm, coating the girls face in your pussy juices. Seeing this the guy grunts and starts pounding harder, obviously getting near to blowing his load as well.'

+ 10 - 0
locations/saveupdater.qsrc

@@ -568,5 +568,15 @@ if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
 
 if npc_dob['A34'] ! 20001219: npc_dob['A34'] = 20001219
 
+if telefon_rev = 0:
+	gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
+	if telkat > 0:
+		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
+	end
+	if npc_QW['A192'] > 0:
+		gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
+	end
+end
+
 --- saveupdater ---------------------------------
 

+ 288 - 123
locations/sexshop.qsrc

@@ -18,13 +18,15 @@ if $ARGS[0] = 'start':
 	clr
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Sex Toys</font></b></center>'
+	'<center><b><font color="maroon">Dildopolis Inc.</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+	'The main counter displays various sex toys:'
 	'Lubricant - 145 <b>₽</b>'
 	'Dildo starting at - 800 <b>₽</b>'
 	'Vibrator - 800 <b>₽</b>'
 	'Strapon harness starting at 1,200 <b>₽</b>'
 	'Butt plug 1,200 <b>₽</b>'
+	*nl
 	'In the basement are the private booths for viewing porn movies (50 <b>₽</b> 15 minutes).'
 
 	act 'Leave': minut += 5 & gt 'Nord', 'redlight'
@@ -129,113 +131,217 @@ if $ARGS[0] = 'start':
 	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
 	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
 	
-	if money >= 300:
-		act 'Buy lubricant 300 <b>₽</b>':
-			*clr & cla
-			menu_off = 1
-			portion = input ("How much you want to buy?")
+	if money < 300 or karta + bankDebtLimit < 300:
+		'You cannot afford lubricant.'
+	else
+		if money >= 300:
+			act 'Buy lubricant 300 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				portion = input ("How much you want to buy?")
+
+				if portion * 300 > money:
+					'You do not have enough money.'
+				else
+					lubri += portion * 5
+					money -= portion * 300
+					minut += 5
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You buy some lubricant and pay the cashier.'
+				end
+				gs 'stat'
 
-			if portion * 300 > money:
-				'You do not have enough money.'
-			else
-				lubri += portion * 5
-				money -= portion * 300
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-				'You bought some lubricant and paid the cashier.'
+				act 'Move away from the counter':gt 'sexshop', 'start'
 			end
-			gs 'stat'
+		end
+		if karta + bankDebtLimit >= 300:
+			act 'Buy lubricant 300 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				portion = input ("How much you want to buy?")
+
+				if portion * 300 > karta + bankDebtLimit:
+					'You do not have enough credit.'
+				else
+					lubri += portion * 5
+					karta -= portion * 300
+					minut += 5
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You buy some lubricant and pay the cashier.'
+				end
+				gs 'stat'
 
-			act 'Move away from the counter':gt 'sexshop', 'start'
+				act 'Move away from the counter':gt 'sexshop', 'start'
+			end
 		end
-	else
-		'You cannot afford lubricant.'
 	end
+	
+	if pornMagazine <= 1 and (money < 400 or karta + bankDebtLimit < 400):
+		'You cannot afford the porn magazine.'
+	else
+		if pornMagazine <= 1 and money >= 400:
+			act 'Buy a porn magazine 400 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				money -= 400
+				pornMagazine = 50
+				gs 'stat'
+				'You buy a porn magazine and pay the cashier.'
 
-	if pornMagazine <= 1 and money >= 400:
-		act 'Buy a porn magazine (400 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			money -= 400
-			pornMagazine = 50
-			gs 'stat'
-			'You bought a porn magazine and paid the cashier.'
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
+		end
+		if pornMagazine <= 1 and karta + bankDebtLimit >= 400:
+			act 'Buy a porn magazine 400 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				karta -= 400
+				pornMagazine = 50
+				gs 'stat'
+				'You buy a porn magazine and pay the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop','start'
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
 		end
-	elseif pornMagazine <= 1:
-		'You cannot afford the porn magazine.'
 	end
 
-	if money >= 800 and dildo = 0:
-		act 'Buy 10cm dildo (800 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			dildo = 1
-			money -= 800
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a dildo and paid the cashier.'
+	if dildo = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the 10cm dildo.'
+	else
+		if money >= 800 and dildo = 0:
+			act 'Buy 10cm dildo 800 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				dildo = 1
+				money -= 800
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a dildo and paid the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop', 'start'
+				act 'Move away from the counter':gt 'sexshop', 'start'
+			end
+		end
+		if karta + bankDebtLimit >= 800 and dildo = 0:
+			act 'Buy 10cm dildo 800 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				dildo = 1
+				karta -= 800
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a dildo and paid the cashier.'
+
+				act 'Move away from the counter':gt 'sexshop', 'start'
+			end
 		end
-	elseif dildo = 0:
-		'You cannot afford the 10cm dildo.'
 	end
 
-	if money >= 850 and middildo = 0:
-		act 'Buy 15cm long dildo (850 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			middildo = 1
-			money -= 850
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a 15cm long dildo and paid the cashier.'
+	if middildo = 0 and (money < 850 or karta + bankDebtLimit < 850):
+		'You cannot afford the 15cm dildo.'
+	else
+		if money >= 850 and middildo = 0:
+			act 'Buy 15cm long dildo 850 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				middildo = 1
+				money -= 850
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 15cm long dildo and paid the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop','start'
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
+		end
+		if karta + bankDebtLimit >= 850 and middildo = 0:
+			act 'Buy 15cm long dildo 850 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				middildo = 1
+				karta -= 850
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 15cm long dildo and paid the cashier.'
+
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
 		end
-	elseif middildo = 0:
-		'You cannot afford the 15cm long dildo.'
 	end
 
-	if money >= 900 and largedildo = 0:
-		act 'Buy 20cm long dildo (900 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			largedildo = 1
-			money -= 900
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a 20cm long dildo and paid the cashier.'
+	if largedildo = 0 and (money < 900 or karta + bankDebtLimit < 900):
+		'You cannot afford the 20cm dildo.'
+	else
+		if money >= 900 and largedildo = 0:
+			act 'Buy 20cm long dildo 900 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				largedildo = 1
+				money -= 900
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 20cm long dildo and paid the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop','start'
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
+		end
+		if karta + bankDebtLimit >= 900 and largedildo = 0:
+			act 'Buy 20cm long dildo 900 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				largedildo = 1
+				karta -= 900
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 20cm long dildo and paid the cashier.'
+
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
 		end
-	elseif largedildo = 0:
-		'You cannot afford the 20cm long dildo.'
 	end
 
-	if money >= 950 and bigdildo = 0:
-		act 'Buy 25cm long dildo (950 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			bigdildo = 1
-			money -= 950
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a 25cm long dildo and paid the cashier.'
+	if bigdildo = 0 and (money < 950 or karta + bankDebtLimit < 950):
+		'You cannot afford the 25cm dildo.'
+	else
+		if money >= 950 and bigdildo = 0:
+			act 'Buy 25cm long dildo 950 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				bigdildo = 1
+				money -= 950
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 25cm long dildo and paid the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop','start'
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
+		end
+		if karta + bankDebtLimit >= 950 and bigdildo = 0:
+			act 'Buy 25cm long dildo 950 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				bigdildo = 1
+				karta -= 950
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a 25cm long dildo and paid the cashier.'
+
+				act 'Move away from the counter':gt 'sexshop','start'
+			end
 		end
-	elseif bigdildo = 0:
-		'You cannot afford the 25cm long dildo.'
 	end
 
+	if extradildo = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the 10cm dildo.'
+	else
 	if money >= 1000 and extradildo = 0:
 		act 'Buy 30cm long dildo (1,000 <b>₽</b>)':
 			*clr & cla
@@ -253,6 +359,9 @@ if $ARGS[0] = 'start':
 		'You cannot afford the 30cm long dildo.'
 	end
 
+	if superdildo = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the 10cm dildo.'
+	else
 	if money >= 1100 and superdildo = 0:
 		act 'Buy 35cm long dildo (1,100 <b>₽</b>)':
 			*clr & cla
@@ -270,6 +379,9 @@ if $ARGS[0] = 'start':
 		'You cannot afford the 35cm long dildo.'
 	end
 
+	if maddildo = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the 10cm dildo.'
+	else
 	if money >= 1200 and maddildo = 0:
 		act 'Buy 40cm long dildo (1,200 <b>₽</b>)':
 			*clr & cla
@@ -287,6 +399,9 @@ if $ARGS[0] = 'start':
 		'You cannot afford the 40cm long dildo.'
 	end
 
+	if vibrator = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the 10cm dildo.'
+	else
 	if money >= 800 and vibrator = 0:
 		act 'Buy vibrator (800 <b>₽</b>)':
 			*clr & cla
@@ -304,52 +419,102 @@ if $ARGS[0] = 'start':
 		'You cannot afford the vibrator.'
 	end
 
-	if money >= 1200 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo = 0):
-		act 'Buy a strapon with a 15cm dildo (1,200 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			strapon = 1
-			dildo = 1
-			money -= 1200
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a strapon and paid the cashier.'
-
-			act 'Move away from the counter':gt 'sexshop', 'start'
-		end
-	elseif money >= 500 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0):
-		act 'Buy a strapon harness (500 <b>₽</b>)':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			strapon = 1
-			money -= 500
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a strapon and paid the cashier.'
-
-			act 'Move away from the counter':gt 'sexshop', 'start'
+	if strapon = 0:
+		if (money < 1200 or karta + bankDebtLimit < 1200) and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo = 0):
+			'You cannot afford the strapon.'
+			if money >= 1200:
+				act 'Buy a strapon with a 15cm dildo 1,200 <b>₽</b> (cash)':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					strapon = 1
+					dildo = 1
+					money -= 1200
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You bought a strapon and paid the cashier.'
+
+					act 'Move away from the counter':gt 'sexshop', 'start'
+				end
+			end
+			if karta + bankDebtLimit >= 1200:
+				act 'Buy a strapon with a 15cm dildo 1,200 <b>₽</b> (card)':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					strapon = 1
+					dildo = 1
+					karta -= 1200
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You bought a strapon and paid the cashier.'
+
+					act 'Move away from the counter':gt 'sexshop', 'start'
+				end
+			end
+		elseif (money < 500 or karta + bankDebtLimit < 500) and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0):
+			if money >= 1200:
+				act 'Buy a strapon harness 500 <b>₽</b> (cash)':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					strapon = 1
+					money -= 500
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You bought a strapon and paid the cashier.'
+
+					act 'Move away from the counter':gt 'sexshop', 'start'
+				end
+			end
+			if karta + bankDebtLimit >= 1200:
+				act 'Buy a strapon harness 500 <b>₽</b> (card)':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					strapon = 1
+					karta -= 500
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+					'You bought a strapon and paid the cashier.'
+
+					act 'Move away from the counter':gt 'sexshop', 'start'
+				end
+			end
 		end
-	elseif strapon = 0:
-		'You cannot afford a strap on.'
 	end
 
-	if money >= 800 and analplug = 0:
-		act 'Buy butt plug 800 <b>₽</b>':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			analplug = 1
-			money -= 800
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-			'You bought a butt plug and paid the cashier.'
+	if analplug = 0 and (money < 800 or karta + bankDebtLimit < 800):
+		'You cannot afford the butt plug.'
+	else
+		if money >= 800 and analplug = 0:
+			act 'Buy butt plug 800 <b>₽</b> (cash)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				analplug = 1
+				money -= 800
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a butt plug and paid the cashier.'
 
-			act 'Move away from the counter':gt 'sexshop', 'start'
+				act 'Move away from the counter':gt 'sexshop', 'start'
+			end
+		end
+		if karta + bankDebtLimit >= 800 and analplug = 0:
+			act 'Buy butt plug 800 <b>₽</b> (card)':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				analplug = 1
+				karta -= 800
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You bought a butt plug and paid the cashier.'
+
+				act 'Move away from the counter':gt 'sexshop', 'start'
+			end
 		end
-	elseif analplug = 0:
-		'You cannot afford the butt plug.'
 	end
 end
 

+ 4 - 0
locations/stat.qsrc

@@ -263,8 +263,12 @@ if nminut ! minut or nhour ! hour:
 	nhour = hour
 end
 
+! Execute time based spells
 gs 'spellTimer', prevtotmin, totminut
 
+! Determine Incoming Telephone Calls
+gs 'telefon', 'IncomingCheck', prevtotmin, totminut
+
 !!painkiller
 if pain['killer'] > 0:
 	if pain['killer'] = 1: pain_timer = totminut - 2

+ 6 - 3
locations/swamp_yard.qsrc

@@ -219,6 +219,9 @@ if $ARGS[0] = 'campfire':
 			
 			'A nice, warm campfire you can sit and relax by. You can use it to cook something or heat up some water to bathe.'
 			'You can also put it out with the bucket if there is enough water in it'
+
+			if hunter_breakfast = 1 or hunter_lunch = 1 or hunters_drink = 1: 'You see hunters are also sitting by the fire'
+
 			
 			if bucket >= 3:
 				act 'Put out the fire':
@@ -352,8 +355,8 @@ if $ARGS[0] = 'fireside':
 			gt 'hunter_interactions', 'chat_with_hunters'
 		end
 
-		act 'Have a drink': 
-		 	gs 'hunter_interactions', 'drink_with_hunters'
+		act 'Ask to join them for a drink': 
+		 	gt 'hunter_interactions', 'join_drinking'
 		end
 	end
 
@@ -472,7 +475,7 @@ if $ARGS[0] = 'daytime_flavor_events':
 		gs 'swamp_yard', 'skirt_breeze'
 	elseif rand(1,20) = 1:
 		gs 'hunter_favors', 'housekeeping_request'
-	elseif rand(1,25) = 1: 
+	elseif rand(1,25) = 1 and hunter_breakfast = 1 or hunter_lunch = 1 or hunters_drink = 1: 
 		gs 'hunter_ambient' , 'yard_convo'
 	elseif rand(1, hunter_sexual_comfort / 4 + 2) = 1:
 		gs 'hunter_interactions', 'naked_encounter'

+ 3 - 5
locations/swamphouse.qsrc

@@ -36,11 +36,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*nl
 	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
 	*nl
-	if hour = 20 and hunters = 1 and huntersKnow > 0 or hour = 7 and hunters = 1 and huntersKnow > 0:
-		'The <a href="exec: gs ''hunters'', ''check_opinion''">hunters</a> are sitting around the table talking.'
-	elseif hour > 20 and hour < 23 and hunters = 1 and huntersKnow > 0:
+	if hour >= 23 and hunters = 1 and huntersKnow > 0:
 		'You see the <a href="exec: gs ''hunters'', ''check_opinion''">hunters</a> hanging out in the hut.'
-	elseif hour = 23 and hunters = 1 and huntersKnow > 0 or hour >= 0 and hour < 7 and hunters = 1 and huntersKnow > 0:
+	elseif hunters = 1 and huntersKnow > 0 and hour >= 0 and hour < 7 and hunters = 1 and huntersKnow > 0:
 		'The hunters are sleeping on the couch.'
 	else
 		'The hunters aren''t here right now'
@@ -596,7 +594,7 @@ if $ARGS[0] = 'daytime_flavor_events':
 end
 
 if $ARGS[0] = 'nighttime_flavor_events':
-	if rand(1,10) = 1:
+	if rand(1,10) = 1 and hunters_night:
 		gs 'hunter_interactions', 'indoors_naked_encounter'
 	end	
 end

+ 381 - 126
locations/telefon.qsrc

@@ -1,4 +1,73 @@
 # telefon
+! Draw screens for mobile phone.
+!
+! ContactList arrays:
+! $contact[]     = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
+! $contactIcon[] = Icon for the contact to use. If path is left off, standard phone icon folder is used. if file extension is left off, '.png' is used
+! $contactOCode[] = Code to execute if call is placed to this contact
+! $contactOSche[] = If statement code to determine schedule for outbound calls
+! $contactICode[] = Code to execute for Incoming call
+! $contactISche[] = if statement code for schedule of incoming calls
+! contactToday[] = Calls from this contact today
+! contactWeek[] = Calls from this contact this week
+! contactLastCall[] = last time this Contact called
+!
+! Add a contact with AddContact, example, to Add Mother:
+!	gs 'telefon', 'AddContact', 'A29', 'icon_npc1', "gs 'telefon', 'Phone_call'", "hour >= 8 and hour <= 20", "gs 'telefon', 'lover'", "hour >= 8 and hour <= 20"
+
+
+! Header for Phone Screen.  Keeps consistent and in one place
+$telefon['header'] = '<center>
+	<b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b><br>
+	<TABLE cellspacing="0" width="80%">
+		<TR>
+			<TD><img src="images/system/icon/icon_statusbar_left.png"></TD>
+			<TD></TD>
+			<TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD>
+		</TR>
+	</TABLE><br>'
+! Footer for phone screen.  Body should be between these two
+$telefon['footer'] = '
+	<a href="exec:gs''telefon'', ''Phone_menu''"><img src="images/system/icon/back.png"></a><br><br>
+	<a href="exec:gs''stat''">Put Phone Away.</a><br>
+</center>'
+
+! This is how we print the screnn on to the Additional Dscription window
+$telefon['print'] = {
+	clr
+	pl func('cleanHTML',$telefon['header'] + $telefon['body'] + $telefon['footer'])
+}
+
+! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
+$telefon['contact'] = {
+	! Contact Row in phone contact list
+	! $ARGS[0] = NPC icon
+	! $ARGS[1] = NPC Nickname
+	! $ARGS[2] = Code to execute for making a Call
+	! $ARGS[3] = if statement for determining if NPC is avaiable
+	$telefon['ContactIcon'] = $ARGS[0]
+	$telefon['ContactNickName'] = $ARGS[1]
+	$telefon['ContactCallCode'] = $ARGS[2]
+	$telefon['ContactCallSchedule'] = $ARGS[3]
+	!If file extension is not given, .png is assumed
+	if instr($telefon['ContactIcon'],'.') = 0:
+		$telefon['ContactIcon'] += '.png'
+	end
+	!If path is not given, default phone icon path is assumed
+	if instr($telefon['ContactIcon'],'/') = 0:
+		$telefon['ContactIcon'] = 'images/system/phone/icons/' + $telefon['ContactIcon']
+	end
+	!If Contact is not in available timeframe, we disable contact calling
+	if dyneval('result = iif(<<$telefon["ContactCallSchedule"]>>,1,0)') = 0:
+		$telefon['ContactCallCode'] = "gs 'telefon', 'phone_call_reject'"
+	end
+	$result = '<TABLE cellspacing="0" width="80%"><TR>
+		<TD><img src="<<$telefon[''ContactIcon'']>>"></TD>
+		<TD><<$telefon[''ContactNickName'']>></TD>
+		<TD align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></TD>
+	</TR></TABLE><br>'
+}
+
 
 if $ARGS[0] = 'start':
 	gs 'stat'
@@ -15,11 +84,129 @@ if $ARGS[0] = 'start':
 	elseif npc_QW['A192'] = 6 and nastjaday ! daystart:
 		gt 'nastja', 'pos31'
 	else
-		$callerid = 'icon_nastja'
+		$callerid = 'images/system/phone/icons/icon_nastja.png'
 		gs 'telefon','phone_call_reject'
 	end
 end
 
+! Reset Contact Call Stats Daily and Weekly
+!
+! ARGS[1] = New Week if 1, 0 if same week
+if $ARGS[0] = 'DailyStatRefresh':
+	i=0
+	:DailyStatRefLoop
+	if i < arrsize('$contact'):
+		contactToday[i] = 0
+		if ARGS[1] = 1:
+			contactWeek[i] = 0
+		end
+		i += 1
+		jump 'DailyStatRefLoop'
+	end
+	killvar 'i'
+end
+
+
+! Determine if any Incoming calls should happen
+!
+!	ARGS[1] = Previous totminut
+!	ARGS[2] = Current totminut
+if $ARGS[0] = 'IncomingCheck':
+	telefIncCheck['PrevTotalMinutes'] = ARGS[1]
+	telefIncCheck['NewTotalMinutes'] = ARGS[2]
+
+	if telefIncCheck['PrevTotalMinutes'] > telefIncCheck['NewTotalMinutes'] or telefon['LastIncCallCheck'] > telefIncCheck['NewTotalMinutes'] or telefon['LastIncCallCheck'] = 0:
+		! Time Cheat has been used, so we should do some cleanup
+		telefon['LastIncCallCheck'] = telefIncCheck['NewTotalMinutes']
+	end
+
+	! Limit the number of calls per day
+	! right now allow every 60 minutes
+	if telefIncCheck['NewTotalMinutes'] - telefon['LastIncCallCheck'] > 60:
+		telefon['LastIncCallCheck'] = telefIncCheck['NewTotalMinutes']
+		gs 'telefon','IncomingCallChooser'
+	end
+
+	killvar 'telefIncCheck'
+end
+
+if $ARGS[0] = 'IncomingCallChooser':
+	! When an Incoming call happens, choose who it comes from
+
+	! Add Contacts
+	i=0
+	:telefonIncLoop1
+	if i < arrsize('$contact'):
+		if $contactICode[i] ! "":
+			if dyneval('result = iif(<<$contactISche[i]>>,1,0)') = 1:
+				j = arrsize('$telefIncCall')
+				$telefIncCall[j] = $contactICode[i]
+				$telefIncIcon[j] = $contactIcon[i]
+				$telefIncName[j] = $npc_nickname[$contact[i]]
+				$telefIncNPC[j] = $contact[i]
+			end
+		end
+		i += 1
+		jump 'telefonIncLoop1'
+	end
+
+	! Add Lovers
+	i=0
+	:telefonIncLoop2
+	if i < 3 and hour > 5 and hour < 20:
+		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,7) > 5:
+			j = arrsize('$telefIncCall')
+			$telefIncCall[j] = "cls & gs 'telefon', 'lover', <<i>>"
+			$telefIncIcon[j] = 'images/characters/shared/<<lover_picture[i]>>.jpg'
+			$telefIncName[j] = $loverdesc[i]
+		end
+		i += 1
+		jump 'telefonIncLoop2'
+	end
+
+	if arrsize('$telefIncCall') > 0:
+		j = rand(0,arrsize('$telefIncCall')-1)
+		if $telefIncNPC[j] ! "":
+			i = arrpos('$contact',$telefIncNPC[j])
+			contactLastCall[i] = totminut
+			contactToday[i] += 1
+			contactWeek[i] += 1
+		end
+		gs 'telefon', 'IncomingCall', $telefIncIcon[j], $telefIncName[j], $telefIncCall[j]
+	end
+
+	killvar 'i'
+	killvar 'j'
+	killvar '$telefIncIcon'
+	killvar '$telefIncName'
+	killvar '$telefIncCall'
+	killvar '$telefIncNPC'
+end
+
+if $ARGS[0] = 'IncomingCall':
+	! $ARGS[1] = Icon for contact
+	! $ARGS[2] = Nickname of contact
+	! $ARGS[3] = Code to execute for this Call
+
+	$telefonIncC['Icon'] = $ARGS[1]
+	$telefonIncC['Name'] = $ARGS[2]
+	$telefonIncC['Code'] = $ARGS[3]
+
+	PLAY 'sound/old_phone.mp3',30
+	$telefon['body'] = '
+	<font size=6><<$telefonIncC["Name"]>> calling</font><br>
+	<img src="<<$telefonIncC["Icon"]>>"><br>
+	<br>
+	<br>
+	<br>
+	<a href="exec:<<$telefonIncC["Code"]>>"><img src="images/system/phone/call_accept.png"></a>
+	<a href="exec:gt $loc, $metka"><img src="images/system/phone/decline.png"></a><br>
+	<b><font color="red">Your phone is ringing</font></b><br>'
+
+	dynamic $telefon['print']
+	killvar '$telefonIncC'
+end
+
 if $ARGS[0] = 'mobilaraz':
 	cls
 	cla
@@ -277,8 +464,8 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 	lover_number = ARGS[1]
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
-	gs 'stat'
-	gs 'telefon','phone_call_receive'
+	!gs 'stat'
+	!gs 'telefon','phone_call_receive'
 	svetrand = rand(0, 5)
 
 	if svetrand = 0:$sveta = 'cutie'
@@ -423,8 +610,8 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 	lover_number = ARGS[1]
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
-	gs 'stat'
-	gs 'telefon','phone_call_receive'
+	!gs 'stat'
+	!gs 'telefon','phone_call_receive'
 	svetrand = rand(0, 5)
 
 	if svetrand = 0:$sveta = 'cutie'
@@ -491,34 +678,30 @@ end
 
 
 if $ARGS[0] = 'phone_ring':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6><<$caller>> calling</font></center>'
-	pl'<center><img src="<<$callerid>>"><br></center>'
-	pl''
-	pl''
-	pl''
-	pl''
-!	pl'<center><a href="exec:gt ''telefon'', ''start''"><img src="images/system/phone/call_accept.png"></a>                               <a href="exec:gs ''stat''"><img src="images/system/phone/decline.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6><<$caller>> calling</font><br>
+	<img src="<<$callerid>>"><br>
+	<br>
+	<br>
+	<br>
+	<br>'
+	dynamic $telefon['print']
 end &! --- phone_ring ---
 
 if $ARGS[0] = 'phone_call_receive':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Talking to <<$caller>></font></center>'
-	pl'<center><img src="<<$callerid>>"><br></center>'
+	$telefon['body'] = '
+	<font size=6>Talking to <<$caller>></font><br>
+	<img src="<<$callerid>>"><br>'
+	dynamic $telefon['print']
 end &! --- phone_call_receive ---
 
 if $ARGS[0] = 'phone_balance':
 	if balans < 4:
-		clr
-		pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-		pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-		pl'<center><font size=6>Not enough credit on your account</font></center>'
-		pl'<center><img src="<<$callerid>>"><br></center>'
-		pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/phone/decline.png"></a></center>'
+		$telefon['body'] = '
+		<font size=6>Not enough credit on your account</font><br>
+		<img src="<<$callerid>>"><br><br>
+		<a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/phone/decline.png"></a><br>'
+		dynamic $telefon['print']
 		wait 3500
 		cla
 		gt $loc, $metka
@@ -528,66 +711,138 @@ if $ARGS[0] = 'phone_balance':
 end &! --- phone_balance ---
 
 if $ARGS[0] = 'Phone_call':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Calling <<$npc_nickname[''A29'']>></font></center>'
-	pl'<center><img src="images/system/phone/icons/icon_npc1.png"><br></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>Calling <<$npc_nickname[''A29'']>></font><br>
+	<img src="images/system/phone/icons/icon_npc1.png"><br><br>
+	<a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a><br>'
+	dynamic $telefon['print']
 	wait 1500
 	minut += 1
 	$callerid = 'images/system/phone/icons/icon_npc1.png'
 	gs 'telefon', 'phone_balance'
-	$callerid = 'icon_npc1'
+	$callerid = 'images/system/phone/icons/icon_npc1.png'
 	gs 'telefon', 'phone_call_reject'
 end &! --- Phone_call ---
 
 if $ARGS[0] = 'phone_call_reject':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Calling....</font></center>'
-	pl'<center><img src="images/system/phone/icons/<<$callerid>>.png"><br></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>Calling....</font><br>
+	<img src="<<$callerid>>"><br><br>
+	<a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="images/system/phone/decline.png"></a><br>'
+	dynamic $telefon['print']
 end &! --- phone_call_reject ---
 
 if $ARGS[0] = 'Phone_megafon':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>MegaFon</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"><br></center>'
-	pl'<center><b>The balance in the account:</b>'
-	pl'<center><font size=5><<balans>> ₽.</font></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>MegaFon</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"><br><br>
+	<b>The balance in the account:</b>
+	<font size=5><<balans>> ₽.</font><br>'
+	dynamic $telefon['print']
 end &! --- Phone_megafon ---
 
 
+if $ARGS[0] = 'AddContact':
+	! $ARGS[1] = NPC Array identifier
+	! $ARGS[2] = Icon
+	! $ARGS[3] = Code to execute for Call out
+	! $ARGS[4] = If statement code to determine schedule for outbound calls
+	! $ARGS[5] = Code to execute for Incoming call
+	! $ARGS[6] = if statement code for schedule of incoming calls
+	$telefonCon['NPC'] = $ARGS[1]
+	$telefonCon['Icon'] = $ARGS[2]
+	$telefonCon['OutCode'] = $ARGS[3]
+	$telefonCon['OutSched'] = $ARGS[4]
+	$telefonCon['InCode'] = $ARGS[5]
+	$telefonCon['InSched'] = $ARGS[6]
+	telefonCon['ContactListID'] = arrpos('$contact',$telefonCon['NPC'])
+	if telefonCon['ContactListID'] = -1:
+		telefonCon['ContactListID'] = len($contact)
+		$contact[telefonCon['ContactListID']] = $telefonCon['NPC']
+	end
+	$contactIcon[telefonCon['ContactListID']] = $telefonCon['Icon']
+	$contactOCode[telefonCon['ContactListID']] = $telefonCon['OutCode']
+	$contactOSche[telefonCon['ContactListID']] = $telefonCon['OutSched']
+	$contactICode[telefonCon['ContactListID']] = $telefonCon['InCode']
+	$contactISche[telefonCon['ContactListID']] = $telefonCon['InSched']
+
+	killvar 'telefonCon'
+	killvar '$telefonCon'
+end &! --- AddContact ---
+
+if $ARGS[0] = 'DeleteContact':
+	! $ARGS[1] = NPC Array identifier
+	$telefonCon['NPC'] = $ARGS[1]
+	telefonCon['ContactListID'] = arrpos('$contact',$telefonCon['NPC'])
+	if telefonCon['ContactListID'] > -1:
+		killvar '$contact', telefonCon['ContactListID']
+		killvar '$contactIcon', telefonCon['ContactListID']
+		killvar '$contactCode', telefonCon['ContactListID']
+	end
+
+	killvar 'telefonCon'
+	killvar '$telefonCon'
+end &! --- AddContact ---
+
+if $ARGS[0] = 'ContactList':
+	$telefon['body'] = '
+	<font size=6>Contacts</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br><br>'
+
+	!!iterating all Contacts
+	i=0
+	:contactloop2
+	if i < arrsize('$contact'):
+		$telefon['body'] += dyneval($telefon['contact'],$contactIcon[i],$npc_nickname[$contact[i]],$contactOCode[i],$contactOSche[i])
+		i += 1
+		jump 'contactloop2'
+	end
+
+	! Oddball Contacts
+	if telalla > 0:
+		$telefon['body'] += dyneval($telefon['contact'],'icon_ira1','Alla',"$telsob = 'Alla' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20")
+	end
+	if telmasha > 0:
+		$telefon['body'] += dyneval($telefon['contact'],'icon_masha','Masha',"$telsob = 'Masha' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20")
+	end
+
+	!! iterating all lovers
+	lover_number = 0
+	:loverloop2
+	if pcs_lovers[lover_number] = 1 and svidanie[lover_number] = 0:
+		$telefon['body'] += dyneval($telefon['contact'],'icon_bf'+lover_picture[lover_number],$loverdesc[lover_number],"lover_number = <<lover_number>> & gt 'telefon', 'callingTheLover', <<lover_number>>","hour > 6 and hour < 20")
+	end
+	lover_number += 1
+	if lover_number < arrsize('pcs_lovers'): jump 'loverloop2'
+
+	dynamic $telefon['print']
+	killvar 'i'
+	killvar 'lover_number'
+end &! --- ContactList ---
+
 if $ARGS[0] = 'Phone_contactlist':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl '<center><font size=6>Contacts</font></center>'
-	pl '<center><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br></center>'
-	if StoryLine = 1:pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_npc1.png"></TD><TD><<$npc_nickname[''A29'']>></TD><TD align="right"><a href="exec:gs ''telefon'', ''Phone_call'' "><b>Call</b></a></TD></TR></TABLE></center>'
+	$telefon['body'] = '
+	<font size=6>Contacts</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br><br>'
+	if StoryLine = 1:$telefon['body'] += dyneval($telefon['contact'],'icon_npc1',$npc_nickname['A29'],"gs 'telefon', 'Phone_call'")
 	if hour >= 8 and hour <= 19:
 		if telalla > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_ira1.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''images/system/phone/icons/icon_ira1.png'' & $telsob = ''Alla'' & gt ''telefon'', ''mobilaraz''"><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_ira1','Alla',"$telsob = 'Alla' & gt 'telefon', 'mobilaraz'")
 		end
 
 		if telmasha > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_masha.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''images/system/phone/icons/icon_masha.png'' & $telsob = ''Masha'' & gt ''telefon'', ''mobilaraz''"><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_masha','Masha',"$telsob = 'Masha' & gt 'telefon', 'mobilaraz'")
 		end
 
 		if telkat > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_kat.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''images/system/phone/icons/icon_kat.png'' & $telsob = ''Kate'' & gt ''telefon'', ''mobilaraz''"><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_kat','Kate',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'")
 		end
 
 		!! iterating all lovers
 		lover_number = 0
 		:loverloop
 		if pcs_lovers[lover_number] = 1 and svidanie[lover_number] = 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_bf'+lover_picture[lover_number]+'.png"></TD><TD></TD><TD align="right"><a href="exec:lover_number = <<lover_number>> & gt ''telefon'', ''callingTheLover'', <<lover_number>>"><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_bf'+lover_picture[lover_number],$loverdesc[lover_number],"lover_number = <<lover_number>> & gt 'telefon', 'callingTheLover', <<lover_number>>")
 		end
 		lover_number += 1
 		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
@@ -596,22 +851,22 @@ if $ARGS[0] = 'Phone_contactlist':
 
 	else
 		if telalla > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_ira1.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''icon_ira1'' & gs ''telefon'', ''phone_call_reject'' "><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_ira1','Alla',"gs 'telefon', 'phone_call_reject'")
 		end
 
 		if telmasha > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_masha.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''icon_masha'' & gs ''telefon'', ''phone_call_reject'' "><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_masha','Masha',"gs 'telefon', 'phone_call_reject'")
 		end
 
 		if telkat > 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_kat.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''icon_kat'' & gs ''telefon'', ''phone_call_reject'' "><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_kat','Kate',"gs 'telefon', 'phone_call_reject'")
 		end
 
 		!! iterating all lovers
 		lover_number = 0
 		:loverunavailableloop
 		if pcs_lovers[lover_number] = 1 and svidanie[lover_number] = 0:
-			pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_bf'+lover_picture[lover_number]+'.png"></TD><TD></TD><TD align="right"><a href="exec:$callerid = ''icon_bf''+lover_picture[lover_number] & gs ''telefon'', ''phone_call_reject'' "><b>Call</b></a></TD></TR></TABLE></center>'
+			$telefon['body'] += dyneval($telefon['contact'],'icon_bf'+lover_picture[lover_number],$loverdesc[lover_number],"lover_number = <<lover_number>> & gt 'telefon', 'phone_call_reject'")
 		end
 		lover_number += 1
 		if lover_number < arrsize('pcs_lovers'): jump 'loverunavailableloop'
@@ -619,7 +874,7 @@ if $ARGS[0] = 'Phone_contactlist':
 		killvar 'lover_number'
 	end
 	if npc_QW['A192'] > 0:
-		pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/phone/icons/icon_nastja.png"></TD><TD align="right"><a href="exec:gs ''telefon'', ''start''"><b>Call</b></a></TD></TR></TABLE></center>'
+		$telefon['body'] += dyneval($telefon['contact'],'icon_nastja',$npc_nickname['A192'],"gs 'telefon', 'start'")
 	end
 	dummyas = arrsize('$contact')
 :din_bad_as
@@ -630,9 +885,9 @@ if $ARGS[0] = 'Phone_contactlist':
 	end
 	killvar 'dummyas'
 
-	if arrsize('$contact')>0:pl'<center><a href="exec:gs ''telefon'', ''Edit_Custom_list'' "><b>Edit Contacts</b></a></center>'
+	if arrsize('$contact')>0:$telefon['body'] += '<a href="exec:gs ''telefon'', ''Edit_Custom_list'' "><b>Edit Contacts</b></a><br>'
 
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	dynamic $telefon['print']
 end &! --- Phone_contactlist ---
 
 if $ARGS[0] = 'Edit_Custom_list':
@@ -653,18 +908,17 @@ if $ARGS[0] = 'Edit_Custom_list':
 	killvar 'dummyedit2'
 
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	!dynamic $telefon['print']
 end &! --- Edit_Custom_list ---
 
 
 
 if $ARGS[0] = 'Phone_notebook':
-	clr
 	gs 'housing', 'rent'
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Planner</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></center>'
-	pl'<center><<year>>-<<$month>>-<<day>>, <<$week[week]>><br></center>'
+	$telefon['body'] = '
+	<font size=6>Planner</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"><br>
+	<<year>>-<<$month>>-<<day>>, <<$week[week]>><br><br>'
 	rent1 = -1
 	rent4 = -1
 	if home_owned[1] > 0 and ArendHouseSL > 0:rent1 = ArendHouseSL
@@ -739,8 +993,8 @@ if $ARGS[0] = 'Phone_notebook':
 		end
 
 		if $calendarday ! '':
-			p '<b><<$monthName[m1]>> <<d1>>, <<$week[w1]>>:</b>'
-			pl $calendarday
+			$telefon['body'] += '<b><<$monthName[m1]>> <<d1>>, <<$week[w1]>>:</b>'
+			$telefon['body'] += $calendarday +'<br>'
 		end
 	if i < 14:
 		rent1 -= 1
@@ -763,7 +1017,7 @@ if $ARGS[0] = 'Phone_notebook':
 	killvar 'm1'
 	killvar 'y1'
 	killvar 'daynum'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	dynamic $telefon['print']
 end &! --- Phone_notebook ---
 
 !!----------------------------------------Camera-------------------------------------------------
@@ -946,7 +1200,6 @@ end
 
 !!for taking photos - only selfies for now
 if $ARGS[0] = 'Phone_camera':
-	clr
 	if $location_type = 'bathroom':
 		$phone_loc = 'bathroom'
 	elseif $locclass = 'bedr':
@@ -966,31 +1219,30 @@ if $ARGS[0] = 'Phone_camera':
 	else
 		$phone_loc = ''
 	end
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Camera</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br></center>'
+	$telefon['body'] = '<font size=6>Camera</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br><br>'
 	!! Take a selfie depending on which clothes you are wearing
-	pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a>'
+	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a><br>'
 	!! Flashing selfie
 	if $clothingworntype ! 'nude' and ($phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
 		if $phone_loc = 'bedroom':
-			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a>'
-			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a>'
-			pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a>'
+			$telefon['body'] += '
+			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a><br>
+			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a><br>
+			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a><br>'
 		else
 			if pcs_inhib >= 35 or exhibitionist_lvl > 0:
-				pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a>'
+				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a><br>'
 			end
 			if exhibitionist_lvl > 0:
-				pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a>'
+				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''assflash'' "><b>Flash your ass for a selfie</b></a><br>'
 			end
 			if exhibitionist_lvl > 1:
-				pl'<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a>'
+				$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''pussyflash'' "><b>Flash your pussy for a selfie</b></a><br>'
 			end
 		end
 	end
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	dynamic $telefon['print']
 end
 
 if $ARGS[0] = 'titflash':
@@ -1011,62 +1263,65 @@ end
 !!-----------------------------------end of Camera------------------------------------------
 
 if $ARGS[0] = 'Phone_wheather':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Weather</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"><br></center>'
-	pl'<center><b>Temperature:</b></center>'
-	pl'<center><<$temperature>>. <<$osadki>></center>'
-	pl'<center>P.O.P. today is <<weatherFall>>%</center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>Weather</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"><br><br>
+	<b>Temperature:</b><br>
+	<<$temperature>>. <<$osadki>><br>
+	P.O.P. today is <<weatherFall>>%<br>'
+	dynamic $telefon['print']
 end &! --- Phone_wheather ---
 
 if $ARGS[0] = 'Phone_calendar':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Calendar</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"><br></center>'
-	pl'<center><B>Today:</B></center>'
-	pl'<center><<$week[week]>>, <<day>> <<$month>> <<year>></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>Calendar</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"><br><br>
+	<B>Today:</B><br>
+	<<$week[week]>>, <<day>> <<$month>> <<year>><br>'
+	dynamic $telefon['print']
 end &! --- Phone_calendar ---
 
 if $ARGS[0] = 'Phone_media':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>Media</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></center>'
-	pl'<center><b>This option is not active</b></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>Media</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"><br>
+	<b>This option is not active</b><br>'
+	dynamic $telefon['print']
 end &! --- Phone_media ---
 
 if $ARGS[0] = 'Phone_sms':
-	clr
-	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><font size=6>SMS</font></center>'
-	pl'<center><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></center>'
-	pl'<center><b>This option is not active</b></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_menu'' "><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<font size=6>SMS</font><br>
+	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><br>
+	<b>This option is not active</b><br>'
+	dynamic $telefon['print']
 end &! --- Phone_sms ---
 
 if $ARGS[0] = 'Phone_menu':
-	clr
-	pl'<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
-	pl'<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a></center>'
-	pl''+iif(menu_off = 1, '<center><a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>', '<center><a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>')+''
-	pl'<center><a href="exec:clr & gs''stat''"><img src="images/system/icon/back.png"></a></center>'
+	$telefon['body'] = '
+	<a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a>
+	<br>
+	<a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a>
+	<br>
+	<a href="exec:gs ''telefon'', ''ContactList'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a>
+	<a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a>
+	<br>'
+	if menu_off = 1:
+		$telefon['body'] += '<a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+	else
+		$telefon['body'] += '<a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+	end
+	dynamic $telefon['print']
 end &! --- Phone_menu ---
 
 if $ARGS[0] = 'Add_contact':
 	$dummy = INPUT('Enter a note:')
-	$contact[arrsize('$contact')] = '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="<<$ARGS[1]>>"></TD><TD><<$dummy>></TD><TD align="right"><a href="exec:<<$ARGS[2]>>"><b>Call</b></a></TD></TR></TABLE>'
+	$contact[arrsize('$contact')] = dyneval($telefon['contact'],$ARGS[1],$dummy,$ARGS[2])
 	killvar '$dummy'
 end &! --- Add_contact ---
 

+ 4 - 15
locations/wardrobe.qsrc

@@ -130,32 +130,22 @@ if $ARGS[0] = 'default':
 	'<center><b>Custom outfits</b></center>'
 	'<center><font color="grey">Choose your clothing, then select "Add as a new custom set" to save your clothing choice</font></center>'
 	*nl
-	'<center><table>'
-	
+	'<center><table width="600">'
+	'<tr><td>'
 	if ARRSIZE('defclothingnumber') > 0:
 		i = 0
 		:loopdefclothing
-		'<tr>'
-		'<td><b><<$def_clothing_name[i]>>:</b></td>'
-		'<td><a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear</a></td>'
-		'<td><a href="exec:gs ''wardrobe'', ''default_entry_set'', <<i>>">Overwrite</a></td>'
-		'<td><a href="exec:$def_clothing_name[<<i>>] = ''Custom <<i>>'' & gt ''wardrobe'', ''default''">Reset name</a></td>'
-		'<td><a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<i>>">Delete</a></td>'
-		'<td>'+iif(def_clothing_hkbed[i] = 1,'<b>','')+'<a href="exec:def_clothing_hkbed[<<i>>] = 1 - def_clothing_hkbed[<<i>>] & gt ''wardrobe'', ''default''">Shortcut Bed</a>'+iif(def_clothing_hkbed[i] = 1,'</b>','')+'</td>'
+		'<b><<$def_clothing_name[i]>>:</b> <a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear</a> | <a href="exec:gs ''wardrobe'', ''default_entry_set'', <<i>>">Overwrite</a> | <a href="exec:$def_clothing_name[<<i>>] = ''Custom <<i>>'' & gt ''wardrobe'', ''default''">Reset name</a> | <a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<i>>">Delete</a>'
 		i += 1
-		'</tr>'
 		if i < ARRSIZE('defclothingnumber'):jump 'loopdefclothing'
-		
 	end
-	
+	'</td></tr>'
 	'</table></center>'
 	act 'Return': gt 'wardrobe', 'start'
 	act 'Add as a new custom set': gt 'wardrobe', 'default_entry_set', ARRSIZE('defclothingnumber')
-	'<center>Shortcut Bed: this outfit will be presented as an option for dressing up after waking up in a bed.</center>'
 	'<center>Note: Selecting an outfit will show the bonus for equipped shoes, this is only applied when outside.</center>'
 end
 
-
 if $ARGS[0] = 'default_entry_wear':
 	gs 'stat'
 	default_entry = ARGS[1]
@@ -311,7 +301,6 @@ if $ARGS[0] = 'default_entry_delete':
 	killvar 'defpursenumber', i
 	killvar 'defcoat', i
 	killvar 'def_clothing_name', i
-	killvar 'def_clothing_hkbed', i
 	gt 'wardrobe', 'default'
 end
 

+ 2 - 1
locations/worksalon.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/city/masha/sex/s7.jpg"></center>'
 				'After you eat your lunch you walk over to Masha. Placing your hands on your hips you tell her in a commanding voice. "Well why are you just sitting there? Get up and give me a massage, a nice slow one."'
 				'Masha immediately jumps up and waits for you to get undressed and lay down. Once you are naked and laying on the table Masha starts massaging you.'
-
+npc_QW['A192']
 				gs 'arousal', 'massage', 30, 'dom'
 				gs 'stat'
 				
@@ -393,6 +393,7 @@ if $ARGS[0] = '2':
 		*clr
 		girl += 1
 		telalla = 1
+		!gs 'telefon', 'AddContact', 'Axxx', 'icon_ira1', "$telsob = 'Alla' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20","",""
 		alla += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/sex/ira2.jpg"></center>'
 		'When you don''t object she gets up and pushes you down in the chair. Pulling your clothes off she exposes your pussy and pushes your legs apart. Dropping down to her hands and knees her face goes between your legs and her tongue darts out and starts licking you.'

+ 1 - 1
locations/ymans.qsrc

@@ -38,7 +38,7 @@ if ymanrem[3] >= 1:act 'Go the gym':minut += 1 & gt 'ysport'
 if ymanrem[3] >= 1:act 'Go to your work room':minut += 1 & gt 'ykabinet'
 if $clothingworntype ! 'nude':act 'Walk outside':minut += 5 & gt 'youplace'
 
-if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- ymans ---------------------------------