Ver Fonte

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

wingbrother há 5 anos atrás
pai
commit
208b689072

+ 25 - 25
locations/MartinTalk.qsrc

@@ -6,7 +6,7 @@ gs 'stat'
 gs 'themes', 'indoors'
 
 if $ARGS[0] = '':
-	cls
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/MartinTalk.jpg"></center>'
 		
 	if MartinTalkVar = 0:
@@ -34,7 +34,7 @@ if $ARGS[0] = '':
 		*nl
 		'With that, he directs his attention at another visitor of the bar. You notice that you''ve been holding your breath and release it now, glad you didn''t piss him off. Watching Martin from afar, you nurse on your beverage until you find it empty.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinTalkVar = 1:
 		MartinTalkVar = 2
@@ -52,7 +52,7 @@ if $ARGS[0] = '':
 		'"Guess I better get back to work," he says, and you agree, glad that he broke the uncomfortable silence and leaves you to your beverage.'
 		'Maybe you can satisfy your curiosity about him at a later date. If he talks to you at all, that is.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		
 	elseif MartinTalkVar = 2:
 		MartinTalkVar = 3
@@ -86,7 +86,7 @@ if $ARGS[0] = '':
 		*nl
 		'With that, he leaves you to your drink. Minutes pass as you enjoy your beverage, only stopping when you find your glass empty.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		
 	elseif MartinTalkVar = 3 and npc_rel['A216'] >= 20:
 		MartinTalkVar = 4
@@ -112,7 +112,7 @@ if $ARGS[0] = '':
 		'And armed with that knowledge and a newfound ease, you chat and joke with Martin a while longer before another patron demands his attention.'
 		$OpenInnerThought+'Hm... Maybe I really should try and talk to him when he''s starting to clean up and close for the night - I think he starts throwing people out around quarter to Midnight.'+$CloseInnerThought
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 				
 	elseif MartinTalkVar = 4 and npc_rel['A216'] >= 28:
 		MartinTalkVar = 5
@@ -136,7 +136,7 @@ if $ARGS[0] = '':
 		'"Suuure," you say and watch Martin walk off.'
 		'Either there was a point to this that you missed completely, or you really look <b>that</b> skinny to him.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinTalkVar = 5:
 		MartinTalkVar = 6
@@ -163,7 +163,7 @@ if $ARGS[0] = '':
 		'"And do you find me attractive?" You ask innocently.'
 		'"That''s for me to know and for you to find out, <<$pcs_nickname>>." With that, he turns and leaves you to drink and ponder his noncommittal answer.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinTalkVar = 6 and npc_rel['A216'] >= 35:
 		MartinTalkVar = 7
@@ -196,7 +196,7 @@ if $ARGS[0] = '':
 		*nl
 		'For a fraction of a second, it looks like he is going to say something, but instead he just gives you a warm smile and you respond in kind, before Martin has to go back to work, leaving you to enjoy your drink in peace.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinTalkVar = 7:
 		MartinTalkVar = 8
@@ -380,7 +380,7 @@ if $ARGS[0] = '':
 		'He sighs deeply; not at your question, you feel, but at his own answer: "Life happened, corazón. Life can make or break someone''s faith. Me, I eventually figured that either there was no god or the filio di puta had a really twisted sense of humor and didn''t deserve my faith." The bitterness in his voice is almost palpable.'
 		
 		act 'What happened to him?':
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/MartinTalk.jpg"></center>'
 			'The question is burning under your nails: What could have brought this man to the other end of the world? But you realize that he has opened up to you in good faith, not because you pressed him for answer. He would only tell you as much as he wanted to, and pushing him would get you nowhere.'
 			'So, you do what friends do: You try not to be an ass.' 
@@ -406,7 +406,7 @@ if $ARGS[0] = '':
 			end
 			
 			act 'Raving lunacy':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/MartinTalk.jpg"></center>'
 				'Martin listens patiently, and when you finish, he gives you that same understanding look he always wears when one of his patrons gets something heavy off their chest.'
 				'"Who am I to judge you?" He reaches out for your hand, takes it into his large one, and squeezes it gently. "If that''s how you feel, that''s how you feel; don''t let somebody else take that away from you. I envy those who have faith in something, regardless of whether it''s something they witness out on the street or something they see all around them. If it''s real to you, that''s enough."'
@@ -418,7 +418,7 @@ if $ARGS[0] = '':
 				*nl
 				'For a moment, you want to talk back, stop him from deflecting your heartfelt compliment like that, but then you just smile and hold your tongue because you notice that Martin hasn''t let go of your hand and, after his laughter has subsided, he''s giving you a smile full of gratitude.'
 				
-				act 'Finish your drink': gt 'qwBarPolet'
+				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
 		
@@ -474,7 +474,7 @@ if $ARGS[0] = '':
 			
 		if SchoolAtestat = 0: 
 			act '"I''m still going to school"':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/MartinTalk.jpg"></center>'
 				'"No, actually, I''m still going to school."'
 				'You regret your words almost immediately when Martin''s face darkens. "Still going to school, huh? What about you being 18?"'
@@ -494,7 +494,7 @@ if $ARGS[0] = '':
 						*nl
 						'You don''t think you''re off the hook - this definitely hurt your relationship with him. But it''s probably a good sign that he didn''t throw you out, so if you give him some space and keep your conversation with him light, you could probably recover from this.'
 
-						act 'Finish your drink': gt 'qwBarPolet'
+						act 'Finish your drink': gt 'qwBarPolet', 'bar'
 					
 					else
 						npc_rel['A216'] -= 20
@@ -535,7 +535,7 @@ if $ARGS[0] = '':
 					*nl
 					'You just about managed to save the situation, and you are pretty sure this could have gone A LOT worse, but Martin definitely needs a moment to cool it, and you are suddenly very grateful to have a drink in front of you and a moment to yourself.'
 					
-					act 'Finish your drink': gt 'qwBarPolet'
+					act 'Finish your drink': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
@@ -553,7 +553,7 @@ if $ARGS[0] = '':
 				'"It can get pretty wild there during the weekend, I heard," Martin comments, "and drunk people can be unpredictable. You watch yourself, okay?"'
 				'"I always do," you reply with a smile, touched by his concern.'
 				
-				act 'Finish your drink': gt 'qwBarPolet'
+				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
 		
@@ -594,7 +594,7 @@ if $ARGS[0] = '':
 				'"Like I said, I''m fine," you placate him once again. "It makes sense. I gotta make breakfast and all that, and I have a big room to myself, AND the apartment is right in the city center, so, really, it''s all I could ask for."'
 				'"Well, as long as you''re happy with it." Martin, however, doesn''t sound very happy. Could he be jealous of Nicholas?'
 				
-				act 'Finish your drink': gt 'qwBarPolet'
+				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
 		
@@ -774,7 +774,7 @@ if $ARGS[0] = '':
 		'Well, it doesn''t really matter now. It''s probably the best you could have hoped for: You have friend and experienced lover you can hook up with whenever you feel like it and who just told you that neither of you have to worry about the other''s feelings too much.'
 		'After all, you weren''t actually looking for a serious relationship with a man old enough to be your father, were you?'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		
 		
 	elseif MartinTalkVar = 11 and MartinSex = 1 and npc_rel['A216'] >= 64:
@@ -804,7 +804,7 @@ if $ARGS[0] = '':
 		*nl
 		'You cannot outright see the effect of your words, but the telltale hints of it alone somehow make your drink taste better.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinTalkVar = 12 and MartinSex = 1 and npc_rel['A216'] >= 70:
 		MartinTalkVar = 13
@@ -856,7 +856,7 @@ if $ARGS[0] = '':
 		'With that, he turns around and, rather than serving patrons, retreats to wash some glasses and check the register, apparently needing some space to pull himself together again.'
 		'Whatever happened to his brothers seems to deeply trouble him.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		
 	elseif npc_rel['A216'] < 20:
 		'As usual, Martin brings you your drink of choice. He seems to be in a talkative mood today, though, because he stays with you and strikes up a conversation.'
@@ -865,7 +865,7 @@ if $ARGS[0] = '':
 		*nl
 		'Still, you manage to keep it going for a while and by the time another patron wants to order something, you feel like you''ve gotten to know each other a little better, even if you''re still a ways away from becoming best friends.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	elseif MartinSex = 1:
 		pcs_horny += rand(0,1)
@@ -879,7 +879,7 @@ if $ARGS[0] = '':
 		*nl
 		'So, when one of the regulars calls for Martin, you lick your <<$pcdesc_lipsrandom>> lips lasciviously and thank him for the drink in a low, sexy voice before Martin goes back to work, his walk a little funnier than before.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	
 	else
 		'As always, Martin brings you your beverage of choice. Rather then leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
@@ -888,12 +888,12 @@ if $ARGS[0] = '':
 		*nl
 		'Neither of you finds out anything mindblowing about the other, but you still feel like you and Martin know each other a little better now, your friendship with him growing stronger the more time you spend with him.'
 		
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	end
 end
 
 if $ARGS[0] = 'MartinTalkHobby':
-	cls
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/MartinTalk.jpg"></center>'
 	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:' 
 	'A new patron is calling him over, so it looks like this heart-to-heart is coming to an end soon.'
@@ -904,7 +904,7 @@ if $ARGS[0] = 'MartinTalkHobby':
 	*nl
 	'You''ve done some friendly flirting with Martin before, but something about the way he said this before turning to serve another customer made your belly tingle.'
 
-	act 'Finish your drink': gt 'qwBarPolet'
+	act 'Finish your drink': gt 'qwBarPolet', 'bar'
 end
 
 if $ARGS[0] = 'MartinTalkApartment':
@@ -960,7 +960,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"Okay..." He says slowly, raising an eyebrow. Before he can make any further inquiries, a nearby patron calls for him, saving you from further embarrassment and giving you time to get your story straight, should he ask again.'
 	end
 	
-	act 'Finish your drink': gt 'qwBarPolet'
+	act 'Finish your drink': gt 'qwBarPolet', 'bar'
 end
 
 

+ 37 - 11
locations/ParkKafe.qsrc

@@ -1,36 +1,60 @@
 # ParkKafe
 
 if $ARGS[0] = 'start':
-	minut = +5
-	$metka = 'start'
 	$loc = 'ParkKafe'
+	$metka = 'start'
 	$menu_loc = 'ParkKafe'
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'public_indoors'
+	minut = +5
+	gs 'stat'
+	park_food = (pcs_ate + pcs_drank)
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
 	*nl
 
 	act 'Leave the cafe': gt 'parkKafe', 'end'
 
-	act 'Order from the menu (0:05)':pk_rand = rand(1, 7) & gs 'food_menu'
+	act 'Sit down at a table':
+		gt 'parkKafe', 'table'
+	end
+
 	if money >= 350:
 		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
+	*nl
+end
 
-	if pk_rand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
-	if pk_rand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
-	if pk_rand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
-	if pk_rand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
-	if pk_rand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
-	if pk_rand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
-	if pk_rand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
-
+if $ARGS[0] = 'table':
+	*clr & cla
+	$loc = 'ParkKafe'
+	$metka = 'table'
+	$menu_loc = 'ParkKafe'
+	$menu_arg = 'table'
+	menu_off = 0
+	'<center><B><font color=maroon>Park Cafe</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
+	*nl
+	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
+	act 'Get up from the table': gt 'parkKafe', 'start'
+	act 'Order from the menu (0:05)': gs 'food_menu'
+	if park_food < (pcs_ate + pcs_drank):
+		pk_rand = rand(1, 7)
+		*nl
+		if pk_rand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
+		if pk_rand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
+		if pk_rand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
+		if pk_rand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
+		if pk_rand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
+		if pk_rand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
+		if pk_rand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
+	end
 end
 
 if $ARGS[0] = 'guys':
+	menu_off = 1
 	cla
 
 	if rand(0, 1) = 0:
@@ -123,6 +147,7 @@ if $ARGS[0] = 'klof 1':
 end
 
 if $ARGS[0] = 'Armenians':
+	menu_off = 1
 	cla
 
 	if rand(0, 1) = 0:
@@ -357,6 +382,7 @@ if $ARGS[0] = 'end':
 	minut += 5
 	gs 'stat'
 	killvar 'pk_rand'
+	killvar 'park_food'
 	if $ARGS[1] = 'street':
 		gt 'street'
 	elseif $ARGS[1] = 'cafe':

+ 2 - 2
locations/brothel.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'bar':
 		*nl
 		'<font color=#<<$red_font>>>You are wasted. Lying your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
 	end
-	act 'Leave the bar':gt 'brothel', 'lobby'
+	act 'Leave the bar': gt 'brothel', 'lobby'
 	act 'Order something':gt 'brothel', 'bar:order'
 	act 'Just sit here':gt 'brothel', 'bar:sit'
 end
@@ -158,7 +158,7 @@ if $ARGS[0] = 'bar:order':
 	*clr & cla
 	gs 'stat'
 	$loc = 'brothel'
-	$metka = 'bar:order'
+	$metka = 'bar'
 	abdCh = rand (0, 100)
 	'<center><h3>Hotel Bar</h3></center>'
 	'<center><h5>Ordering a drink</h5></center>'

+ 5 - 5
locations/cafe3.qsrc

@@ -250,13 +250,13 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/vagtualet.jpg"></center>'
 		'You attempt to abandon your hot lover but he refuses, he turns your back to him and bends you forwards.'
 		'You feel <<$boydesc>> bare your ass and something solid against your vagina.'
-		'You''re fucked doggy style in the outhouse.'
+		'You''re fucked doggy style in the toilet.'
 		dynamic $vagend
 		gs 'arousal', 'vaginal', 15, 'sub', 'rough'
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'kafe', 'start'
 	end
 
 	act 'Suck it':
@@ -291,7 +291,7 @@ if $ARGS[0] = 'toilet':
 			if bjrand >= 50 or repa = 6:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
 
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'kafe', 'start'
 		end
 
 		act 'Suck on':
@@ -309,7 +309,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'kafe', 'start'
 			end
 
 			act 'Spit out':
@@ -322,7 +322,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'kafe', 'start'
 			end
 		end
 	end

+ 35 - 33
locations/cikl.qsrc

@@ -158,15 +158,15 @@ if cheatBimbo = 0: bimbo += snapshotY
 
 !!Once bimbolevel is set to 1, must use the withdrawal in stat to return to 0
 if bimbo > 0 or bimbolevel > 0:
-    if bimbo < 10:
-        bimbo -= 1
-    elseif bimbo < 20:
-    	bimbolevel = 1
-    elseif bimbo < 30:
-    	bimbolevel = 2
-    else
-        bimbolevel = 3
-    end
+	if bimbo < 10:
+		bimbo -= 1
+	elseif bimbo < 20:
+		bimbolevel = 1
+	elseif bimbo < 30:
+		bimbolevel = 2
+	else
+		bimbolevel = 3
+	end
 end
 
 if bimbo >= 40: bimbo = 40
@@ -198,15 +198,15 @@ snapshotY = 0
 !!------------------------------------------------------------------------------------------------------------
 
 if pcs_exhib > 0 or exhibitionist_lvl > 0:
-    if pcs_exhib < 10:
-        pcs_exhib -= 1
-    elseif pcs_exhib < 20:
-    	exhibitionist_lvl = 1
-    elseif pcs_exhib < 30:
-    	exhibitionist_lvl = 2
-    else
-        exhibitionist_lvl = 3
-    end
+	if pcs_exhib < 10:
+		pcs_exhib -= 1
+	elseif pcs_exhib < 20:
+		exhibitionist_lvl = 1
+	elseif pcs_exhib < 30:
+		exhibitionist_lvl = 2
+	else
+		exhibitionist_lvl = 3
+	end
 end
 
 !!Inhibition increases from wearing revealing clothing
@@ -1022,7 +1022,7 @@ end
 
 if day = 25:
 	!! meynold payment
-	if  mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
+	if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
 		karta += 10000
 		'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
 		mey_tamara['help_count'] = 0
@@ -1230,6 +1230,8 @@ if home_owned[4] > 0: ArendHouseSL4 -= 1
 
 killvar 'holyday'
 killvar 'kanikuli'
+killvar 'pcs_ate'
+killvar 'pcs_drank'
 
 !!sisboyparty
 !!-1 - don''t go to the party
@@ -1368,27 +1370,27 @@ if natholi = 1:
 end
 
 if bcream_used >= 1:
-    bcream_used = 0
-    temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
-    if temp > 0: temp = 1
-    nbsize += temp
-    if temp > 0:'Feels like your breasts have grown slightly.'
+        bcream_used = 0
+        temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
+        if temp > 0: temp = 1
+        nbsize += temp
+        if temp > 0:'Feels like your breasts have grown slightly.'
 end
 if steroid_dose >= 1:
-    if lashair < 1:
-        pcs_pubes += steroid_dose
-        pcs_leghair += steroid_dose
-    end
-    steroid_dose = 0
+	if lashair < 1:
+		pcs_pubes += steroid_dose
+		pcs_leghair += steroid_dose
+	end
+	steroid_dose = 0
 end
 if aphrodisiac_overdose = 1:aphrodisiac_overdose = 0
-if aphrodisiac_timer ! 0:aphrodisiac_timer  = 0
+if aphrodisiac_timer ! 0:aphrodisiac_timer	= 0
 
 if mentats_dose = 1:
-    mentats_dose = 0
+	mentats_dose = 0
 elseif mentats_dose > 1:
-    pain['head'] += 20 * mentats_dose
-    mentats_dose = 0
+	pain['head'] += 20 * mentats_dose
+	mentats_dose = 0
 end
 
 !!Appearance base calculation call

+ 6 - 3
locations/food_menu.qsrc

@@ -1,4 +1,7 @@
 # food_menu
+!pcs_drank and pcs_ate variables track how much Sveta consumes each day. Vars are reset each day.
+!food_loc returns food and beverage menus back to the food_menu.
+
 menu_off = 1
 food_loc = 1
 gs 'themes', 'food_menu'
@@ -15,8 +18,8 @@ killvar '$_eat'
 if $loc = 'burger':
 	'<center><b><font color="maroon">Diner Bystroeshka</font></b></center>'
 	*nl
-	!'<center><img <<$set_imgh>> src="images/shared/menus/burger.png"</center><br>'
-	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/menus/burger.png"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
 	$_eat['0,price'] = 80
@@ -431,7 +434,7 @@ end
 $_str = '<table border="0" width="800" cellpadding="0" cellspacing="1">'
 food_loop = 0
 :loop_diner_drinks
-$_str += '<tr><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_eat['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_eat['<<food_loop>>,price']),'<a href="exec:gt''food'',$_eat[''<<food_loop>>,type''],<<food_loop>>">'+$_eat['<<food_loop>>,price']+'</a>',$_eat['<<food_loop>>,price'])+''+iif($_eat['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td><td bgcolor=<<$bcolor3>> border="0" width="50" cellpadding="0" cellspacing="0" ></td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_drink['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_drink['<<food_loop>>,price']),'<a href="exec:gt''beverage'',$_drink[''<<food_loop>>,type''],<<food_loop>>">'+$_drink['<<food_loop>>,price']+'</a>',$_drink['<<food_loop>>,price'])+''+iif($_drink['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td></tr>'
+$_str += '<tr><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_eat['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_eat['<<food_loop>>,price']),'<a href="exec:pcs_ate += 1 & gt''food'',$_eat[''<<food_loop>>,type''],<<food_loop>>">'+$_eat['<<food_loop>>,price']+'</a>',$_eat['<<food_loop>>,price'])+''+iif($_eat['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td><td bgcolor=<<$bcolor3>> border="0" width="50" cellpadding="0" cellspacing="0" ></td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_drink['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_drink['<<food_loop>>,price']),'<a href="exec:pcs_drank += 1 & gt''beverage'',$_drink[''<<food_loop>>,type''],<<food_loop>>">'+$_drink['<<food_loop>>,price']+'</a>',$_drink['<<food_loop>>,price'])+''+iif($_drink['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>', '')+'</td></tr>'
 food_loop += 1
 if food_loop < arrsize('$_drink')/3:jump 'loop_diner_drinks'
 $_str += '</table></center></font>'

+ 28 - 34
locations/gskver.qsrc

@@ -72,25 +72,22 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
 			'The main square of Pavlovsk Park. It''s winter, and the park is quite busy with locals and tourists alike.'
 			'There''s snow everywhere, and kids from the whole town have gathered here to make snowmen and enjoy snowball fights. Some of the adults are joining them, happy to play like kids again for just a moment.'
-			''
+			*nl
 		else
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
 			'The main square of Pavlovsk Park. It''s winter, and the nights in Pavlovsk are very cold.'
 			'As you expected, the park is mostly deserted at this time of day. You occasionally see a wild animal, scrounging for food.'
-			''
+			*nl
 		end
 	end
-
+	
+	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
+	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commerical</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
+	
 	*nl
-
 	if $clothingworntype = 'nude':pcs_willpwr -= 15 & pcs_mood -= 15 & 'You notice passers-by in the park pointing at you as you walk, and overhear one older lady telling her friend: "Look at her... it''s that <<$pcs_lastname>> girl. Youth these days, they have no shame at all!"'
-
-	*nl
-
-	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
-	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace.'
-
+		
 	if GvstreBoy = 1:'You see <a href="exec:numnpc = SkverBoy & gt ''Gnpc''"><<$nameBoyfrend[SkverBoy]>></a> walking across the main square of Pavlovsk Park. He doesn''t look like he''s going anywhere in particular, and seems to just be enjoying his walk.'
 	!!if kotovLoveQW > 0 and hour >= 18 and hour < 20 and week < 6 or week >= 6 and kotovLoveQW > 0 and hour >= 9 and hour < 20:'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> sitting on a bench in the park, drinking beer by himself. Judging from the empty bottles near the bench, he''s already had a few.'
 	if StoryLine = 1 and SchoolAtestat = 0:
@@ -104,20 +101,21 @@ if $ARGS[0] = 'start':
 	elseif week <= 5 and hour >= 16 and hour < 20 and strelaQW = -2 and fedorKozlovQW <= -10 and FedorOutcast = 1:
 		'You can see the train tracks where <a href="exec:gt ''FedorMisc'', ''Outcast''">Fedor</a> spends his time.'
 	end
-
+	
 	if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
 		'You see Rex walking in the park.'
 		act 'Go and see Rex':gt 'reks', 'skver'
 	end
 
-
-	if hour >= 20 or hour < 6 :
+	if (hour >= 20 or hour < 6) and pcs_sleep <= 40:
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
-			if StoryLine = 1:*P 'Or try your luck and go to Uncle Shulgin''s Apartment?'
+			if StoryLine = 1: 'Or try your luck and go to Uncle Shulgin''s Apartment?'
+		elseif home_owned[2] = 1 and (hour >= 22 or hour < 6):
+			'It''s quite dark outside, and you feel tired. Maybe you should head home.'
 		else
-			'It''s quite dark now, and you don''t feel like walking. Maybe you should try sleeping on a bench?'
+			'It''s quite dark now, and you feel tired. Maybe you should try sleeping on a bench?'
 		end
 		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
 	end
@@ -132,24 +130,22 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		else
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			place = 1
 			Frend_num = 0
 			if MagikDostup ! 1:
-				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
-					gt 'MagEncounterFairy'
-				end
+				if rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
 			end
 			gt 'placer'
 		end
 	end
 
+	gs 'parkivent', 'run'
+	
 	if hour >= 8 and hour < 22:
 		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
-			cla
-			*clr
+			*clr & cla
 			minut += 60
 			money += 50
 			pcs_mood -= 5
@@ -162,22 +158,20 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	gs 'parkivent', 'run'
-
 	! meynold`s events
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
 		!disable after can access home
-		act 'Look for Vika':
+		act 'Look for Vika (0:05)':
+			minut += 5
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
-			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		end
 	end
-
+	
 	if pcs_inhib >= 35 or exhibitionist_lvl > 0:
-		act 'Flash your tits':
+		act 'Flash your tits (0:05)':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			cls
+			*clr & cla
 			gs 'exhibitionism', 1
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
@@ -189,9 +183,9 @@ if $ARGS[0] = 'start':
 	gs 'kseniyaQW', 'events'
 
 	if exhibitionist_lvl > 1:
-		act 'Flash your pussy':
+		act 'Flash your pussy (0:05)':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
-			cls
+			*clr & cla
 			gs 'exhibitionism', 3
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
@@ -199,9 +193,9 @@ if $ARGS[0] = 'start':
 			act 'Continue': gt 'gskver', 'start'
 		end
 	end
-
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the high street':minut += 5 & gt 'pavCommercial'
+	
+	act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
+	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
 end
 
 --- gskver ---------------------------------

+ 9 - 6
locations/kafe.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'kafe'
 	$menu_arg = 'start'
 	menu_off = 0
+	kafe_food = (pcs_ate + pcs_drank)
 	$location_type = 'public_indoors'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/cafe.mp3',30
@@ -17,7 +18,7 @@ if $ARGS[0] = 'start':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
-
+	*nl
 	act 'Leave the diner': minut += 5 & gt 'street'
 
 	if QWdogReiq = 3 and week = 7 and hour >= 12:
@@ -46,10 +47,12 @@ if $ARGS[0] = 'table':
 	act 'Get up from the table':gt 'kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
-	if rand(1, 10) > 5:
-		gs 'boy'
-		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
-		xgt 'kafe', 'razvod'
+	if kafe_food < (pcs_ate + pcs_drank):
+		if rand(1, 10) > 5:
+			gs 'boy'
+			'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
+			xgt 'kafe', 'razvod'
+		end
 	end
 end
 
@@ -875,7 +878,7 @@ if $ARGS[0] = 'razvod':
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 3:
-		'<<$boydesc>> is incredibly drunk and you feel tipsy just from the smell of booze on him. "Hey baby, got some spare time? Come have fun in the outhouse."'
+		'<<$boydesc>> is incredibly drunk and you feel tipsy just from the smell of booze on him. "Hey baby, got some spare time? Come have fun in the toilet."'
 		act 'Meet in bathroom':gt 'cafe3', 'toilet'
 		if pcs_horny < 95:
 			act 'Leave':

+ 19 - 16
locations/kid.qsrc

@@ -127,27 +127,30 @@ if $ARGS[0] = 'start':
 	if $pcs_mothername = '':
 		$pcs_mothername = input("What name do you wish your children to call you by?")
 	end
-	if kid > 0:
-		k = 0
-		end
-		if lactate > 0 and pain['nipples'] > 60:
-			'You cannot breast feed right now. Your nipples are too sore.'
-		end
-		:loop
-		if k < kid:
-			gs 'kid','kidlist'
-			k += 1
-			jump 'loop'
-		end
-		'Child Selected: <<$kidname[ks]>>'
-		if ks > 0:'<a href="exec:ks -= 1& gt ''kid'', ''start'' ">Select Previous Child</a>'
-		if ks < (kid - 1):'<a href="exec:ks += 1& gt ''kid'', ''start'' ">Select Next Child</a>'
-
 	act 'Leave':
 		cla
 		killvar 'ks'
 		gt $loc, $metka
 	end
+	if kid > 0:k = 0
+	if lactate > 0 and pain['nipples'] > 60:
+		'You cannot breast feed right now. Your nipples are too sore.'
+	end
+	:loop
+	if k < kid:
+		gs 'kid','kidlist'
+		k += 1
+		jump 'loop'
+	end
+	'Child Selected: <<$kidname[ks]>>'
+	if ks < (kid - 1):
+		'<a href="exec:ks += 1& gt ''kid'', ''start'' ">Select Next Child</a>'
+		act 'Select Next Child': ks += 1 & gt 'kid', 'start'
+	end
+	if ks > 0:
+		'<a href="exec:ks -= 1& gt ''kid'', ''start'' ">Select Previous Child</a>'
+		act 'Select Previous Child': ks -= 1 & gt 'kid', 'start'
+	end
 end
 
 if $ARGS[0] = 'kidlist':

+ 7 - 1
locations/kseniyaQW.qsrc

@@ -20,12 +20,15 @@ end
 
 if $ARGS[0] = 'events':
 	if exhibitionQW = 1:
-		act 'Search for flashing woman':
+		act 'Find the flashing woman':
 			if hour > 9 and hour <= 18 and rand(0,3) = 0:
 				gt 'kseniyaQW', 'event2'
 			else
+				cla
+				minut += 5
 				*nl
 				'You look around the park but can''t find her'
+				act 'Continue': gt $loc, $metka
 			end
 		end
 	elseif exhibitionQW = 2:
@@ -33,8 +36,11 @@ if $ARGS[0] = 'events':
 			if hour > 9 and hour <= 18 and rand(0,3) = 0:
 				gt 'kseniyaQW', 'event3'
 			else
+				cla
+				minut += 5
 				*nl
 				'You look around the park but can''t find her'
+				act 'Continue': gt $loc, $metka
 			end
 		end
 	end

+ 500 - 56
locations/lact_lib.qsrc

@@ -1,5 +1,240 @@
 # lact_lib
 
+if $ARGS[0] = 'view_milk_bottles':
+	!! func('lact_lib', 'view_milk_bottles', location_id)
+	!! use gs 'lact_lib','view_milk_bottles', 2
+	!! locations
+	!! 0 = lost
+	!! 1 = in svetas hand
+	!! 2 = in svetas bag
+	!! 3 = parent bathroom
+	!! 4 = parent fridge
+	!! 5 = Resident Area Appartment Bathroom
+	!! 6 = Resident Area Appartment Fridge
+	!! 7 = Grandparents Bathroom
+	!! 8 = Villa Bathroom
+	!! 9 = Villa Fridge
+	!! 10 = Shared Apartment Bathroom
+	!! 11 = Shared Apartment Fridge
+	!! Locations are not used yet but are implemented. I will add this on another day.
+	!! milk bottle array indices
+	!! mbarrtype: Size of milk bottle. Normal bottles are 150ml and large bottles are 250ml. Values are ml*10
+	!! mbarrfill: Filled milk volume in the bottle. Values are in ml*10 and can''t surpass mbarrtype
+	!! mbarrmage: timestamp the milk was pumped.
+	!! mbarrcool: Is the milk cooled? 0 = no, 1 = normal cooler, 2 = deep freezer
+	!! $mbarrstat: State of the milk: fresh, normal, old, rancid
+	!! $mbarrtemp: Temperature of the milk: hot, warm, normal, cold, frozen
+	!! mbarrloca: Location of the bottle.
+	*clr
+	cla
+	!! Checking for unregistered bottles.
+	gs 'lact_lib', 'reg_bottle_count'
+	'You check the bottles that you store here.<br>'
+	temp_var = (bpbottlem + bpbottles) - 1
+	vmb_i = 0
+	milkedvolume = 0
+	:vmbloop
+	if vmb_i <= temp_var:
+		if mbarrloca[vmb_i] = ARGS[1]:
+			gs 'lact_lib', 'update_mbottle', vmb_i
+			if mbarrfill[vmb_i] <=0:
+				mbarrfill[vmb_i] = 0 
+				'<br><<vmb_i + 1>>. - An empty <<mbarrtype[vmb_i]/10>>ml bottle. You can use it to store your breast milk.'
+			else
+				'<br><<vmb_i + 1>>. - A <<mbarrtype[vmb_i]/10>>ml bottle. There is <<mbarrfill[vmb_i]/10>>ml of milk in the bottle. <a href="exec:msg ''<center>You open the bottle and check the milk inside.<br>You can feel the milk is <<$mbarrtemp[vmb_i]>> and it smells <<$mbarrstat[vmb_i]>>.</center>''">Check the content</a>'
+				milkedvolume += mbarrfill[vmb_i]
+				!! '| <a href="exec:func(''lact_lib'',''empty_milk_bottle'',''vmb_i'')">Empty the bottle</a>'
+			end
+		end
+		vmb_i += 1
+		jump 'vmbloop'
+	end
+	if milkedvolume > 0:
+		'<br><a href="exec:gt''lact_lib'',''empty_milk_bottles''">Pour the milk into the sink</a>'
+	end
+	act 'Back':gt 'lact_lib', 'bp_milking'
+end
+
+!! empty bottle function
+if $ARGS[0] = 'empty_milk_bottles':
+	!! use gt 'lact_lib', 'empty_milk_bottles'
+	*clr
+	cla
+	temp_var = (bpbottlem + bpbottles) - 1
+	emb_i = 0
+	:emb_loop
+	if emb_i <= temp_var:
+		mbarrfill[emb_i] = 0
+		mbarrmage[emb_i] = 0
+		mbarrcool[emb_i] = 0
+		$mbarrstat[emb_i] = 'none'
+		$mbarrtemp[emb_i] = 'none'
+		emb_i += 1
+		jump 'emb_loop'
+	end
+	'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
+	'<center>You pour all of your collected breast milk into the sink and clean up the bottles.</center>'
+	minute += temp_var
+	act 'Finish':menu_off = 0 & gt $loc, $metka
+	!!gt 'lact_lib','view_milk_bottles',1
+end
+
+!! fill a bottle function
+if $ARGS[0] = 'fill_milk_bottle':
+	!! use func('lact_lib','fill_milk_bottle',bottle_id,milk_amount)
+	!! example func('lact_lib','fill_milk_bottle',3,300)
+	if ARGS[2] > mbarrtype[ARGS[1]]:
+		'ERROR - More milk going into bottle than the bottle can hold.'
+	else
+		mbarrfill[ARGS[1]] = ARGS[2]
+		mbarrmage[ARGS[1]] = func('lact_lib','time_stamp')
+		mbarrcool[ARGS[1]] = 0
+		$mbarrstat[ARGS[1]] = 'fresh'
+		$mbarrtemp[ARGS[1]] = 'warm'
+	end	
+end
+
+!! Time Stamp function for milk bottles.
+if $ARGS[0] = 'time_stamp':
+	!! use func('lact_lib','time_stamp')
+	!! This function creates a time stamp in minutes. It takes the current in game time and converts it to total minutes from year 01.01.0000 to in game now.
+	!! Used to check breast milk age in bottles. Can be used for other functions if needed.
+	temp_timestamp = 0
+	temp_timestamp += year * 365 * 24 * 60
+	ts_i = 1
+	if month > 1:
+		:ts_loop
+		if (month - 1) => ts_i:
+			if ts_i = 1 or ts_i = 3 or ts_i = 5 or ts_i = 7 or ts_i = 8 or ts_i = 10 or ts_i = 12:
+				temp_timestamp += 44640
+			elseif ts_i = 4 or ts_i = 6 or ts_i = 9 or ts_i = 11:
+				temp_timestamp += 43200
+			elseif ts_i = 2:
+				temp_timestamp += 40320
+				if (year mod 4) = 0 and (year mod 100) ! 0 or (year mod 400) = 0:
+					temp_timestamp += 1440
+				end
+			end
+			ts_i += 1
+			jump 'ts_loop'
+		end
+	end
+	temp_timestamp += (day - 1) * 24 * 60
+	temp_timestamp += hour * 60
+	temp_timestamp += minut
+	result = temp_timestamp
+end
+
+!! Update Milk bottle function
+if $ARGS[0] = 'update_mbottle':
+	!! func('lact_lib', 'update_mbottle', bottle_id)
+	!! use result = func('lact_lib','update_mbottle', '0')
+	!! this function is used to update milk bottles whenever the milk is pumped or sveta checkes the bottles in her stash.
+	!! Room temperature. Freshly expressed breast milk can be kept at room temperature for up to six hours. However, use or proper storage within four hours is optimal. If the room is especially warm, the limit is also four hours.
+	!! Insulated cooler. Freshly expressed breast milk can be stored in an insulated cooler with ice packs for up to one day.
+	!! Refrigerator. Freshly expressed breast milk can be stored in the back of the refrigerator for up to five days in clean conditions. However, use or freezer storage within three days is optimal.
+	!! Deep freezer. Freshly expressed breast milk can be stored in the back of a deep freezer for up to 12 months. However, using the frozen milk within six months is optimal.
+	!! milk bottle array indices
+	!! mbarrtype: Size of milk bottle. Normal bottles are 150ml and large bottles are 250ml. Values are ml*10
+	!! mbarrfill: Filled milk volume in the bottle. Values are in ml*10 and can''t surpass mbarrtype
+	!! mbarrmage: timestamp the milk was pumped.
+	!! mbarrcool: Is the milk cooled? 0 = no, 1 = normal cooler, 2 = deep freezer
+	!! $mbarrstat: State of the milk: fresh, normal, old, rancid
+	!! $mbarrtemp: Temperature of the milk: hot, warm, normal temparture, cold, frozen
+	!! mbarrloca: Location of the bottle.
+	if mbarrfill[ARGS[1]] > 0:
+		if mbarrfill[ARGS[1]] > mbarrtype[ARGS[1]]: mbarrfill[ARGS[1]] = mbarrtype[ARGS[1]]
+		if mbarrmage[ARGS[1]] <= 0: mbarrmage[ARGS[1]] = func('lact_lib','time_stamp')
+		if mbarrcool[ARGS[1]] = 0:
+			if (mbarrmage[ARGS[1]] + 60) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'warm'
+				$mbarrstat[ARGS[1]] = 'fresh'
+			elseif (mbarrmage[ARGS[1]] + 60) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 360) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] =  'normal temparture'
+				$mbarrstat[ARGS[1]] = 'normal'
+			elseif (mbarrmage[ARGS[1]] + 360) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 1440) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'normal temparture'
+				$mbarrstat[ARGS[1]] = 'old'
+			else
+				$mbarrtemp[ARGS[1]] = 'normal temparture'
+				$mbarrstat[ARGS[1]] = 'rancid'
+			end
+		elseif mbarrcool[ARGS[1]] = 1:
+			if (mbarrmage[ARGS[1]] + 1440) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'cold'
+				$mbarrstat[ARGS[1]] = 'fresh'
+			elseif (mbarrmage[ARGS[1]] + 1440) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 4320) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'cold'
+				$mbarrstat[ARGS[1]] = 'normal'
+			elseif (mbarrmage[ARGS[1]] + 4320) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 7200) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'cold'
+				$mbarrstat[ARGS[1]] = 'old'
+			else
+				$mbarrtemp[ARGS[1]] = 'cold'
+				$mbarrstat[ARGS[1]] = 'rancid'
+			end
+		elseif mbarrcool[ARGS[1]] = 2:
+			if (mbarrmage[ARGS[1]] + 10080) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'frozen'
+				$mbarrstat[ARGS[1]] = 'fresh'
+			elseif (mbarrmage[ARGS[1]] + 10080) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 262080) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'frozen'
+				$mbarrstat[ARGS[1]] = 'normal'
+			elseif (mbarrmage[ARGS[1]] + 262080) < func('lact_lib','time_stamp') and (mbarrmage[ARGS[1]] + 525600) >= func('lact_lib','time_stamp'):
+				$mbarrtemp[ARGS[1]] = 'frozen'
+				$mbarrstat[ARGS[1]] = 'old'
+			else
+				$mbarrtemp[ARGS[1]] = 'frozen'
+				$mbarrstat[ARGS[1]] = 'rancid'
+			end
+		else
+			$mbarrtemp[ARGS[1]] = 'warm'
+			$mbarrstat[ARGS[1]] = 'fresh'
+		end
+	else
+		$mbarrtemp[ARGS[1]] = 'none'
+		$mbarrstat[ARGS[1]] = 'none'
+		mbarrmage[ARGS[1]] = 0
+		mbarrfill[ARGS[1]] = 0
+	end
+end
+
+if $ARGS[0] = 'useable_sbottle_count':
+	!! use result = func('lact_lib','useable_sbottle_count',)
+	!! function will give you the amount of 150ml bottles that sveta can use at the moment.
+	usbc_i = 0
+	bottlecounter = 0
+	if reg_bottles_count > 0:
+		:usbc_loop
+		if usbc_i <= (reg_bottlem_count + reg_bottles_count):
+			if mbarrtype[usbc_i] = 1500 and mbarrfill[usbc_i] = 0:
+				bottlecounter += 1
+			end
+			usbc_i += 1
+			jump 'usbc_loop'
+		end
+	end
+	result = bottlecounter
+end
+
+if $ARGS[0] = 'useable_mbottle_count':
+	!! use result = func('lact_lib','useable_mbottle_count')
+	!! function will give you the amount of 250ml bottles that sveta can use at the moment.
+	umbc_i = 0
+	bottlecounter = 0
+	if reg_bottlem_count > 0:
+		:umbc_loop
+		if umbc_i <= (reg_bottlem_count + reg_bottles_count):
+			if mbarrtype[umbc_i] = 2500 and mbarrfill[umbc_i] = 0:
+				bottlecounter += 1
+			end
+			umbc_i += 1
+			jump 'umbc_loop'
+		end
+	end
+	result = bottlecounter
+end
+
 if $ARGS[0] = '$get_bfat_tissue':
 	!! func('lact_lib', 'get_bfattissue', npc_nbsize, npc_lactatemm)
 	!! function to get breast fat tissue amount. Can be used for NPC as well as PC.
@@ -516,8 +751,8 @@ end
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0
 	pumptype = 0
+	gs 'lact_lib', 'reg_bottle_count'
 	if pump_bottletype < 1500: pump_bottletype = 1500
-	if bpbottles <= 0: bpbottles = 1
 	if $location_type ! 'bathroom' and pcs_inhib < 30:
 		'You aren''t confident enough to do that here.'
 			act 'Finish': menu_off = 0 & gt $loc, $metka
@@ -531,14 +766,36 @@ if $ARGS[0] = 'bp_milking':
 		cla
 		'<center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
 		'How long do you want to pump your breasts with the manual breast pump?'
-		if bpbottlem > 0:
-			if pump_bottletype = 1500:
+		if func('lact_lib','useable_sbottle_count') > 0 and func('lact_lib','useable_mbottle_count') > 0:
+			if func('lact_lib','useable_sbottle_count') > 0 and pump_bottletype = 1500:
 				'Current bottle size in use: &gt;150ml | <a href="exec:pump_bottletype = 2500 & gt ''lact_lib'', ''bp_milking''">250ml</a>'
-			else
+			elseif func('lact_lib','useable_mbottle_count') > 0:
+				pump_bottletype = 2500
 				'Current bottle size in use <a href="exec:pump_bottletype = 1500 & gt ''lact_lib'', ''bp_milking''">150ml</a> | &gt;250ml'
+			else
+				'this should not end up here - got to tfg forums.'
+			end
+		elseif func('lact_lib','useable_sbottle_count') > 0 and func('lact_lib','useable_mbottle_count') <= 0:
+			pump_bottletype = 1500
+			'You currently use a 150ml bottle on your breast pump.'
+		elseif func('lact_lib','useable_sbottle_count') <= 0 and func('lact_lib','useable_mbottle_count') > 0:
+			pump_bottletype = 2500
+			'You currently use a 250ml bottle on your breast pump.'
+		else
+			if pcs_knowsmilkbottles > 0:
+				'You have no bottles left to use. Please empty bottles or buy new ones in the pharmacy.'
+			else
+				'You have no bottles left to use. Please empty bottles or check if you can additional ones in the pharmacy.'
+				pcs_knowsmilkbottles = 1
 			end
 		end
-		if lactatemv > 0:
+		if (bpbottlem + bpbottles) = 1:
+			'You have one bottle. You can check it <a href="exec:gs ''lact_lib'',''view_milk_bottles'', 1">here</a>'
+		elseif (bpbottlem + bpbottles) > 1:
+			'You have <<bpbottlem + bpbottles>> bottles. You can check them <a href="exec:gs ''lact_lib'',''view_milk_bottles'', 1">here</a>'
+		end
+		
+		if lactatemv > 0 and (func('lact_lib','useable_sbottle_count') > 0 or func('lact_lib','useable_mbottle_count') > 0):
 			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactatemv/10)))
 			if pumptime > 5:
 				pumptime -= 2
@@ -580,23 +837,25 @@ if $ARGS[0] = 'bp_milking':
 				end
 			end
 		end
-		act '15 Minutes':
-			pumptime = 15
-			gt 'lact_lib', 'milking'
-		end
-		act '30 Minutes':
-			pumptime = 30
-			gt 'lact_lib', 'milking'
-		end
-		act 'Custom':
-			pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
-			if pumptime <= 0 or pumptime > 60:
-				minut += 2
-				act 'Don''t pump':menu_off = 0 & gt $loc, $metka
-				act 'back':gt 'lact_lib', 'bp_milking'
-			elseif pumptime > 0 and pumptime <= 60:
+		if (func('lact_lib','useable_sbottle_count') > 0 or func('lact_lib','useable_mbottle_count') > 0):
+			act '15 Minutes':
+				pumptime = 15
+				gt 'lact_lib', 'milking'
+			end
+			act '30 Minutes':
+				pumptime = 30
 				gt 'lact_lib', 'milking'
 			end
+			act 'Custom':
+				pumptime = input ("How long do you plan to pump your breasts? (Not more than 60 minutes)")
+				if pumptime <= 0 or pumptime > 60:
+					minut += 2
+					act 'Don''t pump':menu_off = 0 & gt $loc, $metka
+					act 'back':gt 'lact_lib', 'bp_milking'
+				elseif pumptime > 0 and pumptime <= 60:
+					gt 'lact_lib', 'milking'
+				end
+			end
 		end
 		act 'Massage your breasts': gt 'lact_lib','man_milking'
 		act 'Don''t pump':menu_off = 0 & gt $loc, $metka
@@ -622,6 +881,7 @@ if $ARGS[0] = 'man_milking':
 	pumptime = 0
 	*clr
 	cla
+	gs 'lact_lib', 'reg_bottle_count'
 	'How long do you want to massage your breasts?'
 	if lactatemv > 0:
 		pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10)))
@@ -709,6 +969,10 @@ if $ARGS[0] = 'bp_unbox_event':
 		else
 			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing_bath.jpg"></center>'
 		end
+		!! creating first 150ml bottle
+		bpbottles += 1
+		gs 'lact_lib', 'reg_bottle_count'
+		!! Actions
 		if (pcs_inhib > 40 and $location_type = 'private') or $location_type = 'bathroom':
 			act 'Try out how it works':
 				*clr
@@ -853,76 +1117,175 @@ if $ARGS[0] = 'bp_unbox_event':
 	end
 end
 
+if $ARGS[0] = 'reg_bottle_count':
+	if reg_bottles_count <= 0: reg_bottles_count = 0
+	if reg_bottlem_count <= 0: reg_bottlem_count = 0
+	if (reg_bottlem_count + reg_bottles_count) < (bpbottlem + bpbottles):
+		:rbc_loop
+		rbc_index = (reg_bottlem_count + reg_bottles_count) - 1
+		if (bpbottles - reg_bottles_count) > 0:
+			reg_bottles_count += 1
+			rbc_index = (reg_bottlem_count + reg_bottles_count) - 1
+			mbarrtype[rbc_index] = 1500
+			mbarrfill[rbc_index] = 0
+			mbarrmage[rbc_index] = 0
+			mbarrcool[rbc_index] = 0
+			$mbarrstat[rbc_index] = 'none'
+			$mbarrtemp[rbc_index] = 'none'
+			mbarrloca[rbc_index] = 1
+			jump 'rbc_loop'
+		end
+		if (bpbottlem - reg_bottlem_count) > 0:
+			reg_bottlem_count += 1
+			rbc_index = (reg_bottlem_count + reg_bottles_count) - 1
+			mbarrtype[rbc_index] = 2500
+			mbarrfill[rbc_index] = 0
+			mbarrmage[rbc_index] = 0
+			mbarrcool[rbc_index] = 0
+			$mbarrstat[rbc_index] = 'none'
+			$mbarrtemp[rbc_index] = 'none'
+			mbarrloca[rbc_index] = 1
+			jump 'rbc_loop'
+		end
+	end
+end
+
 !!	milking
 !!	never use directly. Always use bp_milking, man_milking or sex_milking
-
 if $ARGS[0] = 'milking':
-	!!	if pumptime <= 0 or pumptime > 60:
-	!!		act 'Finish':gt $loc, $metka
-	!!	end
-	if pumptype = 1:
-		pumptime = (pumptime*6)/10
-	end
-
-		!!	:loop
-		!!	if k < kid:
-		!!	gs 'kid','kidlist'
-		!!	k += 1
-		!!	jump 'loop'
-		!! end
+	gs 'lact_lib', 'reg_bottle_count'
 	if lactate > 0 and pain['nipples'] < 60:
 		milkedvolume = func('lact_lib','$get_breastmilk', 3, pumptime)
+		!!act 'Finish':menu_off = 0 & gt $loc, $metka
+		bp_used_mbottle = 0
+		bp_used_sbottle = 0
+		bp_useable_sbottle = func('lact_lib','useable_sbottle_count')
+		bp_useable_mbottle = func('lact_lib','useable_mbottle_count')
 		'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_lactating.jpg"></center>'
 		if pumptime > 1:
 			'You attach the pump to your breast and start rythmically squeezing the bulb for <<pumptime>> minutes.'
 		else
 			'You attach the pump to your breast and start rythmically squeezing the bulb for one minute.'
 		end
-		!!	Fill the bottles :D
-		if milkedvolume > pump_bottletype and (bpbottles*1500 + bpbottlem*2500) = pump_bottletype:
+		if milkedvolume > pump_bottletype and (bp_useable_sbottle*1500 + bp_useable_mbottle*2500) = pump_bottletype:
 			'During pumping you have to empty the collecting bottle as it filled up with your milk.'
 			'You give it a few more pumps and detach the pump.<br>You filled the bottle with <<pump_bottletype/10>>ml of your milk.'
 			'To collect all your pumped milk you should probably check if the pharmacy has additional bottles for your breast pump.'
-			pcs_knowsmilkbottles = 1
-		elseif milkedvolume > pump_bottletype and (bpbottles*1500 + bpbottlem*2500) > pump_bottletype:
+			if (bp_useable_sbottle - bp_used_sbottle) > 0:
+				bottlecounter = 0
+				:sbottle_loneloop
+				if bottlecounter < (bpbottlem + bpbottles) and milkedvolume > 1500:
+					if mbarrtype[bottlecounter] = 1500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,1500)
+						jump 'bottlefull_loopbreak'
+					end
+					bottlecounter += 1
+					jump 'sbottle_loneloop'
+				end
+			elseif (bp_useable_mbottle - bp_used_mbottle) > 0 and milkedvolume > 2500:
+				bottlecounter = 0
+				:mbottle_loneloop
+				if bottlecounter < (bpbottlem + bpbottles):
+					if mbarrtype[bottlecounter] = 2500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,2500)
+						jump 'bottlefull_loopbreak'
+					end
+					bottlecounter += 1
+					jump 'mbottle_loneloop'
+				end
+			else
+				'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+				'first fork case'
+				'bp_used_mbottle: <<bp_used_mbottle>>'
+				'bp_used_sbottle: <<bp_used_sbottle>>'
+				'milkedvolume: <<milkedvolume>>'
+				'pump_bottletype: <<pump_bottletype>>'
+				'bp_useable_sbottle: <<bp_useable_sbottle>>'
+				'bp_useable_mbottle: <<bp_useable_mbottle>>'
+			end
+			:bottlefull_loopbreak
+			pcs_knowsmilkbottles = 1		
+		elseif milkedvolume > pump_bottletype and (bp_useable_sbottle*1500 + bp_useable_mbottle*2500) > pump_bottletype:
 			!!	Checking which bottletype is used and filling those bottles up before the other type is used.
-			bp_used_mbottle = 0
-			bp_used_sbottle = 0
 			:sbottleloop
-			if pump_bottletype < 2500 and milkedvolume >= 1500 and bp_used_sbottle < bpbottles:
+			if pump_bottletype < 2500 and milkedvolume >= 1500 and bp_used_sbottle < bp_useable_sbottle:
 				bp_used_sbottle += 1
 				milkedvolume -= 1500
+				bottlecounter = 0
+				:sbottle_searchloop
+				if bottlecounter < (bpbottlem + bpbottles):
+					if mbarrtype[bottlecounter] = 1500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,1500)
+						jump 'sbottle_searchloopbreak'
+					end
+					bottlecounter += 1
+					jump 'sbottle_searchloop'
+				end
+				:sbottle_searchloopbreak
 				jump 'sbottleloop'
 			end
 			:mbottleloop
-			if pump_bottletype >= 2500 and milkedvolume >= 2500 and bp_used_mbottle < bpbottlem:
+			if pump_bottletype >= 2500 and milkedvolume >= 2500 and bp_used_mbottle < bp_useable_mbottle:
 				bp_used_mbottle += 1
 				milkedvolume -= 2500
+				bottlecounter = 0
+				:mbottle_searchloop
+				if bottlecounter < (bpbottlem + bpbottles):
+					if mbarrtype[bottlecounter] = 2500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,2500)
+						jump 'mbottle_searchloopbreak'
+					end
+					bottlecounter += 1
+					jump 'mbottle_searchloop'
+				end
+				:mbottle_searchloopbreak
 				jump 'mbottleloop'
-			end
+			end			
 			!!	Checking for the milkedvolume and if there are bottles left. if yes - use these bottles
-			if milkedvolume > 0 and (((bpbottlem - bp_used_mbottle) > 0) or ((bpbottles - bp_used_sbottle) > 0)):
+			if milkedvolume > 0 and (((bp_useable_mbottle - bp_used_mbottle) > 0) or ((bp_useable_sbottle - bp_used_sbottle) > 0)):
 				:altfill01
-				if pump_bottletype < 2500 and milkedvolume >= 2500 and bp_used_mbottle < bpbottlem:
+				if pump_bottletype < 2500 and milkedvolume >= 2500 and bp_used_mbottle < bp_useable_mbottle:
 					bp_used_mbottle += 1
 					milkedvolume -= 2500
+					bottlecounter = 0
+					:sbottle_altsearchloop
+					if bottlecounter < (bpbottlem + bpbottles):
+						if mbarrtype[bottlecounter] = 2500 and mbarrfill[bottlecounter] = 0:
+							func('lact_lib','fill_milk_bottle',bottlecounter,2500)
+							jump 'sbottle_altsearchloopbreak'
+						end
+						bottlecounter += 1
+						jump 'sbottle_altsearchloop'
+					end
+					:sbottle_altsearchloopbreak
 					jump 'altfill01'
 				end
 				:altfill02
-				if pump_bottletype >= 2500 and milkedvolume >= 1500 and bp_used_sbottle < bpbottles:
+				if pump_bottletype >= 2500 and milkedvolume >= 1500 and bp_used_sbottle < bp_useable_sbottle:
 					bp_used_sbottle += 1
 					milkedvolume -= 1500
+					bottlecounter = 0
+					:mbottle_altsearchloop
+					if bottlecounter < (bpbottlem + bpbottles):
+						if mbarrtype[bottlecounter] = 1500 and mbarrfill[bottlecounter] = 0:
+							func('lact_lib','fill_milk_bottle',bottlecounter,1500)
+							jump 'mbottle_altsearchloopbreak'
+						end
+						bottlecounter += 1
+						jump 'mbottle_altsearchloop'
+					end
+					:mbottle_altsearchloopbreak
 					jump 'altfill02'
 				end
 			end
 			!!	by this point all bottles should have been used up. Everything else needs to end up in the drain.
-			if milkedvolume > 0 and bpbottlem = bp_used_mbottle and bpbottles = bp_used_sbottle:
+			if milkedvolume > 0 and bp_useable_mbottle = bp_used_mbottle and bp_useable_sbottle = bp_used_sbottle:
 				'During pumping you have to switch the collecting bottle as it filled up with your milk. Unfortunately you don''t have enough bottles to collect all your milk.'
 				'You had to pour <<milkedvolume/10>>ml of your breast milk into the sink.'
 				milkedvolume = ((bp_used_mbottle*2500) + (bp_used_sbottle*1500))
-			elseif milkedvolume > 0 and milkedvolume < 1500 and (bpbottles - bp_used_sbottle) > 0:
+			elseif milkedvolume > 0 and milkedvolume < 1500 and (bp_useable_sbottle - bp_used_sbottle) > 0:
 				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
-			elseif milkedvolume > 0 and milkedvolume < 2500 and milkedvolume > 1500 and (bpbottlem - bp_used_mbottle) > 0:
+			elseif milkedvolume > 0 and milkedvolume < 2500 and milkedvolume > 1500 and (bp_useable_mbottle - bp_used_mbottle) > 0:
 				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
 			else
 				'During pumping you have to switch the collecting bottle as it filled up with your milk.'
@@ -931,7 +1294,7 @@ if $ARGS[0] = 'milking':
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/bottles_full.jpg"></center>'
 				if milkedvolume = ((bp_used_mbottle*2500) + (bp_used_sbottle*1500)):
 					'You pumped <<milkedvolume/10>>ml of milk from your breasts, collecting it in:'
-					if bp_used_sbottle = 1:
+					if bp_useable_sbottle = 1:
 						'One 150ml bottle'
 					elseif bp_used_sbottle > 1:
 						'<<bp_used_sbottle>> x 150ml bottles'
@@ -953,23 +1316,47 @@ if $ARGS[0] = 'milking':
 					elseif bp_used_mbottle > 1:
 						'<<bp_used_mbottle>> x 250ml bottles'
 					end
-					if (bpbottles - bp_used_sbottle) > 0 and milkedvolume <= 1500:
+					if (bp_useable_sbottle - bp_used_sbottle) > 0 and milkedvolume <= 1500:
+						bottlecounter = 0
+						:sbottle_restsearchloop
+						if bottlecounter < (bpbottlem + bpbottles):
+							if mbarrtype[bottlecounter] = 1500 and mbarrfill[bottlecounter] = 0:
+								func('lact_lib','fill_milk_bottle',bottlecounter,milkedvolume)
+								jump 'sbottlefilled_break'
+							end
+							bottlecounter += 1
+							jump 'sbottle_restsearchloop'
+						end
+						:sbottlefilled_break
 						'You also stored <<milkedvolume/10>>ml of breast milk in a 150ml bottle.'
-					elseif (bpbottlem - bp_used_mbottle) > 0 and milkedvolume <= 2500:
+					elseif (bp_useable_mbottle - bp_used_mbottle) > 0 and milkedvolume <= 2500:
+						bottlecounter = 0
+						:mbottle_restsearchloop
+						if bottlecounter < (bpbottlem + bpbottles):
+							if mbarrtype[bottlecounter] = 2500 and mbarrfill[bottlecounter] = 0:
+								func('lact_lib','fill_milk_bottle',bottlecounter,milkedvolume)
+								jump 'mbottlefilled_break'
+							end
+							bottlecounter += 1
+							jump 'mbottle_restsearchloop'
+						end
+						:mbottlefilled_break
 						'You also stored <<milkedvolume/10>>ml of breast milk in a 250ml bottle.'
 					else
 						'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+						'second fork case'
 						'bp_used_mbottle: <<bp_used_mbottle>>'
 						'bp_used_sbottle: <<bp_used_sbottle>>'
 						'milkedvolume: <<milkedvolume>>'
 						'pump_bottletype: <<pump_bottletype>>'
-						'bpbottles: <<bpbottles>>'
-						'bpbottlem: <<bpbottlem>>'
+						'bp_useable_sbottle: <<bp_useable_sbottle>>'
+						'bp_useable_mbottle: <<bp_useable_mbottle>>'
 					end
 					milkedvolume += bp_used_mbottle*2500 + bp_used_sbottle*1500
 				end
 			else
 				'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+				'third fork case'
 				'bp_used_mbottle: <<bp_used_mbottle>>'
 				'bp_used_sbottle: <<bp_used_sbottle>>'
 				'milkedvolume: <<milkedvolume>>'
@@ -979,6 +1366,41 @@ if $ARGS[0] = 'milking':
 			end
 		else
 			'You give it a few more pumps and detach the pump.<br>You filled the bottle with <<milkedvolume/10>>ml of your milk.'
+			if (bp_useable_sbottle - bp_used_sbottle) > 0 and milkedvolume <= 1500:
+				bottlecounter = 0
+				:single_sbottle_searchloop
+				if bottlecounter < (bpbottlem + bpbottles):
+					if mbarrtype[bottlecounter] = 1500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,milkedvolume)
+						jump 'single_sbottlefilled_break'
+					end
+					bottlecounter += 1
+					jump 'single_sbottle_searchloop'
+				end
+				:single_sbottlefilled_break
+			elseif (bp_useable_mbottle - bp_used_mbottle) > 0 and milkedvolume <= 2500:
+				bottlecounter = 0
+				:single_mbottle_searchloop
+				if bottlecounter < (bpbottlem + bpbottles):
+					if mbarrtype[bottlecounter] = 2500 and mbarrfill[bottlecounter] = 0:
+						func('lact_lib','fill_milk_bottle',bottlecounter,milkedvolume)
+						jump 'single_mbottlefilled_break'
+					end
+					bottlecounter += 1
+					jump 'single_mbottle_searchloop'
+				end
+				:single_mbottlefilled_break
+			else
+				'unhandled case - you shouldn''t end up here. Please report this in the bug section of Girl Life in the tfg-forums.'
+				'second fork case'
+				'bp_used_mbottle: <<bp_used_mbottle>>'
+				'bp_used_sbottle: <<bp_used_sbottle>>'
+				'milkedvolume: <<milkedvolume>>'
+				'pump_bottletype: <<pump_bottletype>>'
+				'bp_useable_sbottle: <<bp_useable_sbottle>>'
+				'bp_useable_mbottle: <<bp_useable_mbottle>>'
+			end
+			milkedvolume += bp_used_mbottle*2500 + bp_used_sbottle*1500
 		end
 		breastcounter += 1
 		if energytomilkpump > 0 and pcs_energy = 0:
@@ -1040,6 +1462,13 @@ if $ARGS[0] = 'milking':
 		act 'Pour it into the sink':
 			*clr
 			cla
+			piits_i = 0
+			:piits_emptyloop
+			if piits_i < (bpbottlem + bpbottles):
+				if mbarrmage[piits_i] = (func('lact_lib','time_stamp') + pumptime):mbarrfill[piits_i] = 0
+				piits_i += 1
+				jump 'piits_emptyloop'
+			end
 			if milkedvolume > 1500 and bpbottles <= 1:
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
 				'<center>You pour 150ml of your breast milk into the sink and clean up your breastpump.</center>'
@@ -1053,13 +1482,29 @@ if $ARGS[0] = 'milking':
 				menu_off = 0 & gt $loc, $metka
 			end
 		end
+		act 'Leave it here':
+			*clr
+			cla
+			'You screw the cap onto the bottle and put it away.'
+			act 'Finish':
+				milkedvolume = 0
+				menu_off = 0 & gt $loc, $metka
+			end
+		end
 		if pcs_hydra < 100:
 			act 'Drink it':
 				*clr
 				cla
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
 				'<center>You drink your own breast milk and clean up your breastpump.</center>'
-				'<center>The milk is still warm from your breasts.</center>'
+				'<center>The milk is still warm from your breasts.</center>'				
+				di_i = 0
+				:di_emptyloop
+				if di_i < (bpbottlem + bpbottles):
+					if mbarrmage[di_i] = (func('lact_lib','time_stamp') + pumptime):mbarrfill[di_i] = 0
+					di_i += 1
+					jump 'di_emptyloop'
+				end
 				pcs_health += milkedvolume/400
 				pcs_energy += milkedvolume/500
 				if pcs_hydra >= 100:
@@ -1081,7 +1526,6 @@ end
 
 !!	engorged_morning
 !!	use href="exec:gt ''lact_lib'',''engorged_morning''"
-
 if $ARGS[0] = 'engorged_morning':
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/pc/body/tits/lactate_start.jpg"></center>'

+ 2 - 2
locations/mod_setting.qsrc

@@ -44,7 +44,7 @@ else
 	'<br>You have no Mods activated.'
 end
 '</center>'
-act 'Install new mod':
+act ''+iif(settingmode = 1, '<center><b>Install new mod</b></center>','Install new mod')+'':
 	killvar 'mod_info'
 	$mod_temp=input('input mod name (as for the example image above, input <B>isample</B>)')
 	if $mod_temp='':exit
@@ -61,7 +61,7 @@ act 'Install new mod':
 	$mod_desc[mod_list] = $mod_info[3]
 	gt curloc
 end
-act 'Disable all mods':
+act ''+iif(settingmode = 1, '<center><b>Disable all mods</b></center>','Disable all mods')+'':
 	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
 		KILLQST
 		set mod_list=0

+ 5 - 2
locations/obj_din.qsrc

@@ -59,8 +59,11 @@ if $ARGS[0] = 'settingtabs':
 	if menu_page = 4:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th>Mods</th>'
 	'</tr></table></b></center>'
 	if settingmode = 1:
-		!value= 2, call from Character creation
-		act '<center><b>Return to character creation</b></center>': killvar 'menu_page' & gt 'begin', 'start'
+		act '<center><b>Return to character creation</b></center>':
+			killvar 'menu_page'
+			settingmode = 0
+			gt 'begin', 'start'
+		end
 	else
 		!call from Menu - Game settings
 		act 'Enter cheat menu': killvar 'menu_page' & gs '$menu_cheat'

+ 48 - 38
locations/preCSB.qsrc

@@ -369,10 +369,16 @@ if $ARGS[0] = 'intro_9':
 	lcolor = rgb(106, 90, 205)
 	'<center><img <<$set_imgh>> src="images/pre/csb/dyingforest.jpg"></center>'
 	'...'
-	wait 3000
+	wait 1500
 	*nl
 	'...'
-	wait 3000
+	wait 1500
+	*nl
+	'...'
+	wait 1500
+	*nl
+	'...'
+	wait 1500
 	*nl
 	'Darkness consumes your thoughts for some time. Eventually, images begin to form in your mind and you soon find yourself in a middle of a dream. The strange amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes which then turn into two planet earths.'
 	'"Most who look at the world see only the mundane, but there is more to it. Much more. Now you see that too. You have the potential to shape it all, but first, you have company."'
@@ -515,6 +521,40 @@ if $ARGS[0] = 'intro_9':
 end
 
 if $ARGS[0] = 'intro_end':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
+	*nl
+	'You can choose from two starting locations:'
+	*nl
+	'In the Pavlovsk start you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start you are visiting your grandparent''s house in the small farming village of Gadukino.'
+
+	act 'Pavlovsk Start': gt 'preCSB', 'pav_start'
+	act 'Gadukino Start': gt 'preCSB', 'gad_start'
+end
+
+if $ARGS[0] = 'pav_start':
+	*clr & cla
+	'<center><h2>Pavlovsk</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gorodok.jpg"></center>'
+	*nl
+	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
+	
+	act 'Continue': $starting_location = 'pavlovsk' & gt 'preCSB', 'game_start'
+	act 'Change location': gt 'preCSB', 'gad_start'
+end
+
+if $ARGS[0] = 'gad_start':
+	*clr & cla
+	'<center><h2>Gadukino</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
+	*nl
+	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
+	
+	act 'Continue': $starting_location = 'gadyukino' & gt 'preCSB', 'game_start'
+	act 'Change location': gt 'preCSB', 'pav_start'
+end
+
+if $ARGS[0] = 'game_start':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'Shortly after Tatiana left, your new mother showed up to take you to your new home. You met your new family and did the best you could to fit in, afraid of them figuring out that you are not <<$pcs_firstname>>. They seem to have bought Tatiana''s explanation of amnesia and mental trauma, going out of their way to reintroduce you to your new life.'
@@ -534,7 +574,8 @@ if $ARGS[0] = 'intro_end':
 		
 		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+			if $starting_location = 'pavlovsk': '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+			if $starting_location = 'gadukino': '<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
 			'It will take some more time for you to get completely used to your new body and life as <<$pcs_firstname>>. For now, you should just focus on getting out of bed.'
 			
 			act 'Continue':
@@ -555,46 +596,15 @@ if $ARGS[0] = 'intro_end':
 				
 				gs 'stat'
 				
-				act 'Continue': gt 'preCSB', 'game_start'
+				act 'Start your new life': 
+					if $starting_location = 'pavlovsk': gt 'bedrPar'
+					if $starting_location = 'gadukino': gt 'gadhouse'
+				end
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'game_start':
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
-	*nl
-	'You can choose from two starting locations:'
-	*nl
-	'In the Pavlovsk start you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start you are visiting your grandparent''s house in the small farming village of Gadukino.'
-
-	act 'Pavlovsk Start': gt 'preCSB', 'pav_start'
-	act 'Gadukino Start': gt 'preCSB', 'gad_start'
-end
-
-if $ARGS[0] = 'pav_start':
-	*clr & cla
-	'<center><h2>Pavlovsk</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pre/alt/gorodok.jpg"></center>'
-	*nl
-	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
-	
-	act 'Get out of bed and get dressed': gt 'bedrPar'
-	act 'Change location': gt 'preCSB', 'game_start'
-end
-
-if $ARGS[0] = 'gad_start':
-	*clr & cla
-	'<center><h2>Gadukino</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
-	*nl
-	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
-	
-	act 'Get out of bed and get dressed': gt 'gadhouse'
-	act 'Change location': gt 'preCSB', 'game_start'
-end
-
 !!------------------------
 !! Character Customization
 !!------------------------

+ 1 - 1
locations/preCUST.qsrc

@@ -363,7 +363,7 @@ if $ARGS[0] = 'Done':
 
 !! Adding underwear and default shoes and assigning them
 
-	if $ARGS[1] ! 'CSB'
+	if $ARGS[1] ! 'CSB':
 		cheap_panties[37] = 1
 		cheap_bras[11] = 1
 		$pantyworntype = 'cheap'

+ 2 - 2
locations/preSYS.qsrc

@@ -368,11 +368,11 @@ if $ARGS[0] = 'SGStart3':
 
 !!default friendship is 30 for all students, except Vasily Shulgin who starts at 60
 	r = 1
-	:default_friendship_loop
+	:default_friendship_loop1
 	$school_static_num = $school_static_num[r]
 	if grupTipe[r] ! 5:npc_rel[$school_static_num] = 30
 	r += 1
-	if r <= 65:jump 'default_friendship_loop'
+	if r <= 65:jump 'default_friendship_loop1'
 
 	npc_rel['A11'] = 60
 

+ 30 - 31
locations/qwBarBilliard.qsrc

@@ -34,13 +34,12 @@ end
 !What does she get out of that, though?
 
 !Find (better) pictures for scenes?
-!Check cla / cls
 
 if $ARGS[0] = 'billiard_ev1':
 	if billiard_ev_var = 1:
 		if billwin > 16:
 			act 'Win':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolw.jpg"></center>'
 				pool_exp += rand(2,5)
 				money += 2500
@@ -53,12 +52,12 @@ if $ARGS[0] = 'billiard_ev1':
 				'"How about a rematch?" You tease, to which he laughs and shakes his head: "Nah, I think I''ve lost enough money for one day."'
 				'You collect your winnings, chat with him for a few more minutes and then part ways.'
 
-				act 'Return to the bar': gt 'qwBarPolet'
+				act 'Return to the bar': gt 'qwBarPolet', 'bar'
 			end
 
 		else
 			act 'Lose':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pooll.jpg"></center>'
 				pool_exp += rand(2,5)
 				money -= 2500
@@ -99,7 +98,7 @@ if $ARGS[0] = 'billiard_ev1':
 							'"Do I look like some sort of cheap whore to you?"'
 							'You don''t even give him time to respond - you simply turn on your heel and walk back to the main room.'
 
-							act 'Return to the bar': gt 'qwBarPolet'
+							act 'Return to the bar': gt 'qwBarPolet', 'bar'
 						end
 					end
 
@@ -111,7 +110,7 @@ if $ARGS[0] = 'billiard_ev1':
 						'Deciding against it, you tell him: "I think I''ll pass today. Thank you for the drink and the game, though."'
 						'He seems to notice that you don''t seem angry or even put off, so he smiles and simply says "See you around" before you leave.'
 
-						act 'Return to the bar': gt 'qwBarPolet'
+						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 					end
 					if pcs_inhib >= 20:
 						act 'You''re on':
@@ -135,7 +134,7 @@ if $ARGS[0] = 'billiard_ev1':
 					'"Sounds reasonable," he concurs, "but remember, luck is fickle: My luck can run out any moment."'
 					'"Then maybe it''ll run out next time. Thank you for the drink and the... expensive company." With that, you return to the main room.'
 
-					act 'Return to the bar': gt 'qwBarPolet'
+					act 'Return to the bar': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
@@ -143,7 +142,7 @@ if $ARGS[0] = 'billiard_ev1':
 	elseif billiard_ev_var = 2:
 		if billwin > 16:
 			act 'Win':
-				cls
+				*clr & cla
 				pool_exp += rand(2,5)
 				money += 2500
 				killvar 'billiard_ev_var'
@@ -156,12 +155,12 @@ if $ARGS[0] = 'billiard_ev1':
 				'"How about a rematch?" You tease, to which he laughs and shakes his head: "Nah, I think I''ve lost enough money for one day."'
 				'You collect your winnings, chat with him for a few more minutes and then part ways.'
 
-				act 'Return to the bar': gt 'qwBarPolet'
+				act 'Return to the bar': gt 'qwBarPolet', 'bar'
 			end
 
 		else
 			act 'Lose':
-				cls
+				*clr & cla
 				pool_exp += rand(2,5)
 				killvar 'billiard_ev_var'
 				minut += 30
@@ -173,7 +172,7 @@ if $ARGS[0] = 'billiard_ev1':
 				'You made that bet willingly but you are getting the distinct feeling that he hustled you...'
 
 				act 'Refuse':
-					cls
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolr.jpg"></center>'
 					'You shake your head. "I''m not sucking your dick. You scammed me."'
 					'You turn to walk off, but his eyes flash with anger and he grabs your arm. "You''re not going anywhere. You made a bet, sweetheart, and you lost, so pay up."'
@@ -234,7 +233,7 @@ if $ARGS[0] = 'billiard_ev1':
 							'"There are things you shouldn''t do for money. You''re not easy, coraz󮬠so don''t make yourself cheap."'
 							'And with that, Martin walks off, leaving you to contemplate his words and his concern for you.'
 
-							act 'Return to the bar': gt 'qwBarPolet'
+							act 'Return to the bar': gt 'qwBarPolet', 'bar'
 
 						else
 							npc_rel['A216'] -= 1
@@ -251,7 +250,7 @@ if $ARGS[0] = 'billiard_ev1':
 								'"It''s better this way. But maybe we could continue after closing time?"'
 								'"I''ll see what I can do," you say noncommittally, give him a smile and leave him to calm down.'
 
-								act 'Return to the bar': gt 'qwBarPolet'
+								act 'Return to the bar': gt 'qwBarPolet', 'bar'
 							end
 
 							if pcs_dom >= 30 and exhibitionist_lvl > 1:
@@ -262,7 +261,7 @@ if $ARGS[0] = 'billiard_ev1':
 
 							if (pcs_horny >= 80 and exhibitionist_lvl > 0) or (pcs_dom >= 30 and exhibitionist_lvl > 1):
 								act '<<$martinpos>>':
-									cls
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolm1.jpg"></center>'
 									gs 'boyStat', 'A216'
 									npc_rel['A216'] += 1
@@ -285,7 +284,7 @@ if $ARGS[0] = 'billiard_ev1':
 									killvar '$martinpos'
 
 									act 'Make Martin come':
-										cls
+										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolm2.jpg"></center>'
 										gs 'exhibitionism', 1
 										'You are giving Martin the best blowjob you can, working him over with your mouth, tongue and hand to make him shoot his load quickly. And you seem to be doing something right, cause Martin is starting to tense.'
@@ -329,7 +328,7 @@ if $ARGS[0] = 'billiard_ev1':
 					gs 'stat'
 
 					act 'Payoff':
-						cls
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poold2.jpg"></center>'
 						'It feels like you''ve only just started when you hear him give a suppressed grunt. You barely manage to open your mouth and pull away as he shoots his load of cum all over your face and into your mouth. He looks down at you as he tucks his dick away.'
 						*nl
@@ -343,7 +342,7 @@ if $ARGS[0] = 'billiard_ev1':
 						gs 'cum_manage'
 						gs 'stat'
 
-						act 'Return to the bar': gt 'qwBarPolet'
+						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 					end
 				end
 			end
@@ -368,7 +367,7 @@ if $ARGS[0] = 'billiard_ev2':
 			'You notice how blatantly the other one checks you out but you ignore it as best you can.'
 
 			act 'Play a round':
-				cls
+				*clr & cla
 				minut += 20
 				pool_exp += rand(3,5)
 				pcs_mood += rand(1,3)
@@ -385,7 +384,7 @@ if $ARGS[0] = 'billiard_ev2':
 
 				if money >= 500:
 					act 'Sure, let''s play':
-						cls
+						*clr & cla
 						minut += 20
 						pool_exp += rand(3,5)
 						pcs_mood += rand(3,5)
@@ -403,12 +402,12 @@ if $ARGS[0] = 'billiard_ev2':
 						'But you don''t say that out loud, of course. You just tell them that you should get going and that you''ll see them around.'
 						'"We''ll be here for you," Victor promises as you turn to the curtain.'
 
-						act 'Return to the bar': gt 'qwbarPolet'
+						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 					end
 
 				elseif money <= 500:
 					act 'Sounds fun - I''m broke, though':
-						cls
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolVicArt.jpg"></center>'
 						'"Sounds like fun... but I don''t have that kind of money on me", you admit.'
 						'Victor gives you a surprised look. "Oh? Well, that''s a pity."'
@@ -419,7 +418,7 @@ if $ARGS[0] = 'billiard_ev2':
 						'"Maybe next time," Victor cuts him off. "Want to play another round without a wager?"'
 
 						act 'Sure, let''s play':
-							cls
+							*clr & cla
 							minut += 20
 							pool_exp += rand(3,5)
 							pcs_mood += rand(1,3)
@@ -428,7 +427,7 @@ if $ARGS[0] = 'billiard_ev2':
 							'Victor once again applauds your skill while Artyom merely gives you an acknowledging nod. Victor seems annoyed at his friend''s bad mood but doesn''t let it keep himself from having a friendly chat with you for a few minutes.'
 							'"You know where to find us if you wanna play," Victor emphasizes as you give them your goodbye.'
 
-							act 'Return to the bar': gt 'qwbarPolet'
+							act 'Return to the bar': gt 'qwBarPolet', 'bar'
 						end
 
 						act 'No thanks':
@@ -438,7 +437,7 @@ if $ARGS[0] = 'billiard_ev2':
 							'Victor gives you a friendly pat on the shoulder. "Alright, take care."'
 							'As you walk out, you cannot help but notice the scowl on Artyom''s face. It''s not directed at you but at Victor. Looks like they had slightly different ideas of what was supposed to happen...'
 
-							act 'Return to the bar': gt 'qwbarPolet'
+							act 'Return to the bar': gt 'qwBarPolet', 'bar'
 						end
 					end
 				end
@@ -449,7 +448,7 @@ if $ARGS[0] = 'billiard_ev2':
 					'Artyom looks like he wants to say something, but Victor quickly interjects: "Sure, another time. You know where to find us. We''re always happy to have you."'
 					'"See you later," you bid them farewell and return to the main room.'
 
-					act 'Return to the bar': gt 'qwbarPolet'
+					act 'Return to the bar': gt 'qwBarPolet', 'bar'
 				end
 			end
 
@@ -474,7 +473,7 @@ if $ARGS[0] = 'billiard_ev2':
 				'"Sounds like fun, but I think I better get going. I don''t wanna be blamed if either of you loses," you joke.'
 				'"Alright, see you later," they tell you as you return to the main room.'
 
-				act 'Return to the bar': gt 'qwbarPolet'
+				act 'Return to the bar': gt 'qwBarPolet', 'bar'
 			end
 
 			act 'Sounds fun - I''m almost broke, though': gt 'VicArt_Billiard', 'VicArt_Ev1_Broke'
@@ -526,7 +525,7 @@ if $ARGS[0] = 'billiard_ev2':
 						'"Yeah, I don''t think I wanna play for money with you either," another one agrees.'
 						'"Suit yourselves," you shrug and turn to leave. Pity.'
 
-						act 'Return to the bar': gt 'qwBarPolet'
+						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 					else
 						'"Sure," one of them agrees and his friends nod, "we can do another match for cash."'
 						'Without further ado, they set up the table again.'
@@ -556,7 +555,7 @@ if $ARGS[0] = 'billiard_ev2':
 		end
 
 		act 'Suggest a friendly match':
-			cls
+			*clr & cla
 			pool_exp += rand(1,4)
 			pcs_mood += rand(1,3)
 			minut += 30
@@ -593,11 +592,11 @@ if $ARGS[0] = 'billiard_friendly':
 	*nl
 	'Another small group of people enters the backroom just as you and your newfound acquaintances finish up. With a few friendly words, you return to the main room and part ways.'
 
-	act 'Return to the bar': gt 'qwbarPolet'
+	act 'Return to the bar': gt 'qwBarPolet', 'bar'
 end
 
 if $ARGS[0] = 'billiard_money':
-	cls
+	*clr & cla
 	pool_exp += rand(1,4)
 	minut += 30
 	'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
@@ -620,7 +619,7 @@ if $ARGS[0] = 'billiard_money':
 		'Since they also have to leave, you return to the main room with them where you part ways, 250 rubles poorer than half an hour ago.'
 	end
 
-	act 'Return to the bar': gt 'qwbarPolet'
+	act 'Return to the bar': gt 'qwBarPolet', 'bar'
 end
 
 --- qwBarBilliard ---------------------------------

+ 9 - 10
locations/qwBarBilliard2.qsrc

@@ -4,7 +4,7 @@ $location_type = 'event'
 gs 'themes', 'indoors'
 
 if $ARGS[0] = 'VicArt_Ev1_Cash':
-	cls
+	*clr & cla
 	minut += 20
 	pool_exp += rand(2,4)
 	'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
@@ -24,7 +24,7 @@ if $ARGS[0] = 'VicArt_Ev1_Cash':
 		'Victor laughs. "No thanks, I think you''ve proven that luck is on your side tonight. We''ll play more next time we''re here."'
 		'You grin. "Sure thing." Cheerfully waving the handful of bills around, you bid them farewell and return to the main room, 2000 rubles richer for it.'
 
-		act 'Return to the bar': gt 'qwbarPolet'
+		act 'Return to the bar': gt 'qwBarPolet', 'bar'
 
 	else
 		money -= 1000
@@ -40,7 +40,7 @@ if $ARGS[0] = 'VicArt_Ev1_Cash':
 			'"Well, you know where to find us," Artyom says with an uncharacteristic smile.'
 			'"Take care, <<$pcs_firstname>>," Victor bids you farewell and you return to the main room.'
 
-			act 'Return to the bar': gt 'qwbarPolet'
+			act 'Return to the bar': gt 'qwBarPolet', 'bar'
 		end
 
 		act 'Maybe I could... I''m almost broke though': gt 'qwBarBilliard2', 'VicArt_Ev1_Broke'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'VicArt_Ev1_Cash':
 end
 
 if $ARGS[0] = 'VicArt_Ev1_Broke':
-	cls
+	*clr & cla
 	!Replace if more appropriate picture for scene is found
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolVicArt.jpg"></center>'
 	if Jaska_Friend_Bill = 1:
@@ -98,12 +98,12 @@ if $ARGS[0] = 'VicArt_Ev1_Broke':
 		'"Yeah, we''ll see you next time."'
 		'With a few more parting words, you return to the main room.'
 
-		act 'Return to the bar': gt 'qwbarPolet'
+		act 'Return to the bar': gt 'qwBarPolet', 'bar'
 	end
 
 	if pcs_inhib >= 40:
 		act 'Deal - If I lose, I strip':
-			cls
+			*clr & cla
 			minut += 20
 			pool_exp += rand(2,4)
 			'<center><video src="images/locations/city/industrial/bar/sex/pool/pool4.mp4"></center>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'VicArt_Ev1_Broke':
 				'Victor laughs. "No thanks, I think you''ve proven that luck is on your side tonight. We''ll play more next time we''re here."'
 				'You grin. "Sure thing." Cheerfully waving the handful of bills around, you bid them farewell and return to the main room, 2000 rubles richer for it - not a bad turnout for a bet like yours.'
 
-				act 'Return to the bar': gt 'qwbarPolet'
+				act 'Return to the bar': gt 'qwBarPolet', 'bar'
 
 			else
 				pcs_mood -= rand(1,5)
@@ -139,7 +139,6 @@ if $ARGS[0] = 'VicArt_Ev1_Broke':
 				act 'Pay your dues':
 					!Link to argument
 
-					cls
 					if Jaska_Friend_Bill = 1: Jaska_Friend_Bill = 2
 					pic_rand = rand(1,3)
 					!!A few strip variants? How many max?
@@ -154,7 +153,7 @@ if $ARGS[0] = 'VicArt_Ev1_Broke':
 					act 'part 2':
 						!Same here - variants for different pic sets
 
-						act 'Return to the bar': gt 'qwbarPolet'
+						act 'Return to the bar': gt 'qwBarPolet', 'bar'
 
 					end
 				end
@@ -231,7 +230,7 @@ if $ARGS[0] = 'VicArt_Ev1_Broke':
 
 								'As you ready yourself to walk out, you realize that the other patrons must have heard the argument between Martin and the guys, must have heard your name...'
 
-								act 'Return to the bar': gt 'qwbarPolet'
+								act 'Return to the bar': gt 'qwBarPolet', 'bar'
 							end
 						end
 					end

+ 85 - 85
locations/qwBarEncounters.qsrc

@@ -10,29 +10,29 @@ gs 'themes', 'indoors'
 ! - Bar Threesome Dream
 
 !An event chain where some random guy pays for Svetas drink, with multiple outcomes:
-!- Not interested and nothing happens; 
-!- Not interested and rape (but Martin steps in); 
-!- Roofied (but Martin steps in); 
-!- Drunk sex somewhere else; 
-!- Drunk sex on the toilet; 
+!- Not interested and nothing happens;
+!- Not interested and rape (but Martin steps in);
+!- Roofied (but Martin steps in);
+!- Drunk sex somewhere else;
+!- Drunk sex on the toilet;
 !- Pleasant banter and potential boyfriend;
 
 !IDEAS FOR SCENES:
-!You have an over protective barman so realistically the sex is either with him or off the premises. 
-!Being the industrial area at night then there are going to be quiet streets or car parks for the sexy-times and if its a nicer guy there''s a hotel above the casino. 
-!You can have it not unlike the dance in Pav with guys asking Sveta if she wants to ''step out'' with them (you could have it as a way for Sveta to earn so ''tips'' but the BBQ in the same area does that probably not). 
+!You have an over protective barman so realistically the sex is either with him or off the premises.
+!Being the industrial area at night then there are going to be quiet streets or car parks for the sexy-times and if its a nicer guy there''s a hotel above the casino.
+!You can have it not unlike the dance in Pav with guys asking Sveta if she wants to ''step out'' with them (you could have it as a way for Sveta to earn so ''tips'' but the BBQ in the same area does that probably not).
 !Throw in a couple looking to spice things up (hotel for sure), some guys looking for a slut to use and a woman looking for some lesbian company and you''ve covered all bases.
 
 
 
-!!Check cla, cls ... Adjust pictures etc.
+!!Check *clr & cla ... Adjust pictures etc.
 
 
 
 if $ARGS[0] = '':
 	!Enc_Rand ALWAYS NEEDS TO BE ADJUSTED FOR NEW EVENTS!!!
 	Enc_Rand = rand(1,2)
-	
+
 	if Enc_Rand = 1 and Jaska_Ev = 0:
 		*clr
 		cla
@@ -42,12 +42,12 @@ if $ARGS[0] = '':
 		*nl
 		'With not much else to do, you settle on watching them play, only mildly interested until you see the younger guy pull out a small wad of cash and reluctantly hand it over to the other two.'
 		'It looks like they’re playing for money. Maybe they’ll let you join them?'
-		
+
 		act 'On second thought...':
 			cla
 			'After a moment, you decide not to join them, and instead go back to your drink. At least that way you can''t lose any money, right?'
-			
-			act 'Finish your drink': gt 'qwBarPolet'
+
+			act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		end
 
 		act 'Ask them if you can play':
@@ -76,10 +76,10 @@ if $ARGS[0] = '':
 					*nl
 					'"Well, that’s all I got time to teach you," Jaska says, glancing down at his watch. He grabs his worn-out leather jacket and slips it on. "Next time, we’ll play for real!" He says before pausing, "There will be a next, right?"'
 					'"Of course. Just make sure you have your wallet ready,” you tease. He laughs before saying one last goodbye and walking out the door.'
-					
-					act 'Return to the bar': gt 'qwBarPolet'
+
+					act 'Return to the bar': gt 'qwBarPolet', 'bar'
 				end
-			
+
 			else
 				act 'I already know how to play':
 					cla
@@ -95,17 +95,17 @@ if $ARGS[0] = '':
 					'"What’s wrong?" You ask.'
 					'Jaska sighs, "Well, as much as I like being beaten by you, I’ve gotta go." He sets down the pool cue and slips on his worn-out leather jacket. "How about we play again some other time?"'
 					'"Just make sure you have your wallet ready," you tease. Jaska laughs before saying one last goodbye and leaving.'
-					
-					act 'Return to the bar': gt 'qwBarPolet'
+
+					act 'Return to the bar': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
-			
+
 	elseif Enc_Rand = 1 and bill_rand ! 3:
 		cla
 		*nl
 		minut += 5
-		
+
 		if PBB_Met = 1:
 			'While you are sitting at the bar and enjoying your drink, somebody approaches you - it''s the guy in his mid-twenties you had a drink with earlier. What was his name again?'
 			'Before you can even try to remember, he''s already sat down next to you and asks if you wanna chat and have a drink on him.'
@@ -115,16 +115,16 @@ if $ARGS[0] = '':
 		else
 			'While you are sitting at the bar and enjoying your drink, a guy who''s slightly older than you - in his mid- or maybe late twenties - sits down next to you and orders himself a drink. After a few minutes of silently nursing on your respective drinks, he starts chatting you up and offers to buy you a drink.'
 		end
-		
+
 		act 'Decline':
 			cla
 			*nl
-			'You shake your head no and decline the offered drink, letting him know you can buy your own. "But thanks anyways."' 
+			'You shake your head no and decline the offered drink, letting him know you can buy your own. "But thanks anyways."'
 			'He doesn''t seem too disappointed though. He remains polite and chats with you for a few more minutes before getting up and leaving you to yourself.'
-			
-			act 'Finish your drink': gt 'qwBarPolet'
+
+			act 'Finish your drink': gt 'qwBarPolet', 'bar'
 		end
-			
+
 		act 'Accept':
 			cla
 			if $boozeVar = 'beer':
@@ -148,38 +148,38 @@ if $ARGS[0] = '':
 			alko += 2
 			*nl
 			PBB_Met = 1
-			'You smile at him and accept his offer. He buys you another <<$boozeVar>> and as you nurse on it, the two of you chat some more about everything and nothing.' 
+			'You smile at him and accept his offer. He buys you another <<$boozeVar>> and as you nurse on it, the two of you chat some more about everything and nothing.'
 			'Eventually he asks you if you would like to go play pool with him.'
-			
+
 			act 'Decline':
 				cla
 				*nl
 				minut += 30
-				'You decline the offer with a laugh.' 
-				'"After the drinks I''ve had, you''d have it too easy", you joke, to which he responds with a broad laughter.' 
+				'You decline the offer with a laugh.'
+				'"After the drinks I''ve had, you''d have it too easy", you joke, to which he responds with a broad laughter.'
 				'But the two of you sit and talk for another half hour before he says needs to get going.'
 				'"I wouldn''t mind seeing you again, though," he smiles before leaving.'
-				
-				act 'Finish your drink': gt 'qwBarPolet'
+
+				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
-				
+
 			act 'Challenge accepted':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pool1.jpg"></center>'
 				minut += 30
 				gs 'stat'
 				pcs_billiard += rand(1,3)
 				'You agree to go play pool with him and he leads you to the side area where the lone pool table sits, deserted and in sore need of use.'
 				*nl
-				'Your new acquaintance racks up the pool balls and lets you go first.' 
-				'It ends up being a very close game: He takes the lead for most of it, seemingly effortlessly pocketing one ball after the other, but towards the end he seems to be having trouble even hitting the ones he was aiming for and more than once accidentally sets up easy shots for you. You catch up, take the lead and, with a final good shot, win the game.' 
+				'Your new acquaintance racks up the pool balls and lets you go first.'
+				'It ends up being a very close game: He takes the lead for most of it, seemingly effortlessly pocketing one ball after the other, but towards the end he seems to be having trouble even hitting the ones he was aiming for and more than once accidentally sets up easy shots for you. You catch up, take the lead and, with a final good shot, win the game.'
 				'He curses his luck and points out that he "almost had you."'
 				*nl
 				'"Well, it''s not really worth much when you ''almost'' win the lottery or ''almost'' had an orgasm," you say with a grin.'
 				'"True," he laughs. "How about you give me a chance to restore my honor? A rematch? And now that we know what we''re up against, we could make it more interesting by playing for money."'
 				'"How much were you thinking?", you ask.'
 				'"I don''t know... 2,500 rubels?"'
-				
+
 				act 'Decline':
 					cla
 					*nl
@@ -189,10 +189,10 @@ if $ARGS[0] = '':
 					'He seems slightly disappointed but quickly recovers: "Well, it was fun while it lasted."'
 					'"Yeah, it was," you agree. "Thank you for the game and the drink."'
 					'"See you around," he bids you farewell and you return to the main room.'
-					
-					act 'Return to the bar': gt 'qwBarPolet'
+
+					act 'Return to the bar': gt 'qwBarPolet', 'bar'
 				end
-				
+
 				if money >= 2500:
 					act 'Accept':
 						*clr
@@ -201,13 +201,13 @@ if $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pool2.jpg"></center>'
 						billiard_ev_var = 1
 						'"Alright, let''s play."'
-						'You ' + iif(bag > 0,'open your purse','reach into your pocket') + ' and pull out a few bills and lay them down on the table.' 
+						'You ' + iif(bag > 0,'open your purse','reach into your pocket') + ' and pull out a few bills and lay them down on the table.'
 						'Your acquaintance gives you a wolfish grin, racks up the balls and lets you break again as he lays his money down on top of yours.'
 						gs 'qwBarBilliard', 'billiard_engine'
 						gs 'qwBarBilliard', 'billiard_ev1'
 					end
 				end
-				
+
 				if money < 2500 or pcs_int >= 60 or pcs_persuas >= 60:
 					act 'Tell him you don''t have that kind of money':
 						cla
@@ -216,7 +216,7 @@ if $ARGS[0] = '':
 						'You shrug slightly and tell him you don''t have that much money on you. He nods understandingly, then looks around a bit before leaning in close. "We could play for something else, you know..."'
 						'You look at him suspiciously. "Like what?"'
 						'His smile may be friendly, but his casual tone doesn''t match his suggestion: "If you win, you get the money. And if I win, you give me a blowjob. Sound fair?"'
-					
+
 						if city_slut < 75 and (pcs_dom >= 20 or (pcs_inhib < 40 and alko < 5) or pcs_horny < 30):
 							act 'Not that kind of girl':
 								cla
@@ -225,28 +225,28 @@ if $ARGS[0] = '':
 								'You shake your head and glare at him.'
 								'"Do I look like some sort of cheap whore to you?!"'
 								'You don''t even give him time to respond - you simply turn on your heel and walk back to the main room.'
-							
-								act 'Return to the bar': gt 'qwBarPolet'
+
+								act 'Return to the bar': gt 'qwBarPolet', 'bar'
 							end
 						end
-					
+
 						act 'I don''t think so':
 							cla
 							*nl
-							'The thought of making a wager that might end up with you sucking some random guy''s cock doesn''t really bother you in and of itself, if you''re being perfectly honest, but you are not really interested in it either.' 
-							'Deciding against it, you tell him: "I think I''ll pass. Thank you for the drink, though."' 
+							'The thought of making a wager that might end up with you sucking some random guy''s cock doesn''t really bother you in and of itself, if you''re being perfectly honest, but you are not really interested in it either.'
+							'Deciding against it, you tell him: "I think I''ll pass. Thank you for the drink, though."'
 							'He notices that you don''t seem angry or even put off, so he smiles and simply says, "Until next time, then," before you leave.'
-						
-							act 'Return to the bar': gt 'qwBarPolet'
+
+							act 'Return to the bar': gt 'qwBarPolet', 'bar'
 						end
-						
+
 						act 'You''re on':
 							*clr
 							cla
 							*nl
 							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pool2.jpg"></center>'
 							billiard_ev_var = 2
-							$OpenInnerThought+'I can take him,'+$CloseInnerThought+' you think to yourself, '+$OpenInnerThought+'and even if he beats me, it''s just a blowjob.' +$CloseInnerThought 
+							$OpenInnerThought+'I can take him,'+$CloseInnerThought+' you think to yourself, '+$OpenInnerThought+'and even if he beats me, it''s just a blowjob.' +$CloseInnerThought
 							'With that in mind, you nod your head and tell him he''s got himself a deal.'
 							gs 'qwBarBilliard', 'billiard_engine'
 							gs 'qwBarBilliard', 'billiard_ev1'
@@ -255,46 +255,46 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-	
+
 	!elseif Enc_Rand = 2:
 	else
-		cls
+		*clr & cla
 		gs 'stat'
 		gs 'npcgeneratec', 0, 'stranger', rand(18,35)
 		gs 'boyStat', $npclastgenerated
-		
+
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrind1.jpg"></center>'
 		'Martin nods and prepares your beverage, then places it in front of you.'
 		'"Thank you," you smile at him and earn a half-smile in return before he leaves you to yourself.'
 		*nl
-		
+
 		if alko >= 5:
 			'Truth is, you''re drinking more than you can really handle and at this point, you are starting to feel pretty drunk.'
 		end
-		
+
 		'You lean against the bar, caught up in a random thought as you nurse on your drink, and so you barely notice at first that somebody is grinding against your ass. Taking your ignorance as consent, the guy grabs you by the hip with one hand to pull you back against him, at which point it becomes pretty hard to ignore, and just then, he grabs you by your hair and tilts you forward a bit more.'
 		'It''s not difficult to deduce how this is going to end if you don''t put an end to it right now.'
-	
+
 		act 'Tell him to get lost':
 			cla
 			*nl
 			npc_rel['A216'] += 1
-			'At first you just try to pull away, but the guy is either too drunk or too horny to take a hint. You try to shove him off but the guy hangs onto you, his grip tight and insistent.' 
+			'At first you just try to pull away, but the guy is either too drunk or too horny to take a hint. You try to shove him off but the guy hangs onto you, his grip tight and insistent.'
 			*nl
-			'Just as you are about to tell him to "piss off", Martin comes over.' 
-			'"Is there a problem here?"' 
+			'Just as you are about to tell him to "piss off", Martin comes over.'
+			'"Is there a problem here?"'
 			'You nod and open your mouth to respond, but the man talks over you: "No, no problem. The bitch likes it, you can tell..."'
 			*nl
 			'Martin silences him with a glare, giving you the chance to speak up: "This asshole won''t let go of me. I want him to leave me alone."'
 			'As soon as Martin hears this, he turns and looks at the guy. "I suggest you let her go before I make you let go."'
-			*nl			
-			'The man may be horny, but he isn''t stupid enough to risk butting heads with the bulky bartender, and before you can blink, he has vanished into the night.' 
-			'You give the bartender a grateful smile. "Thank you, Martin."' 
+			*nl
+			'The man may be horny, but he isn''t stupid enough to risk butting heads with the bulky bartender, and before you can blink, he has vanished into the night.'
+			'You give the bartender a grateful smile. "Thank you, Martin."'
 			'He just nods. "My pleasure, but I think you''ve had enough for the night."'
-			
-			act 'He might have a point - Finish your drink': gt 'qwBarPolet'
+
+			act 'He might have a point - Finish your drink': gt 'qwBarPolet', 'bar'
 		end
-		
+
 		if pcs_horny >= 70 or sub >= 20 or alko >= 5 or exhibitionist_lvl > 1:
 			act 'Grind back against him':
 				cla
@@ -306,13 +306,13 @@ if $ARGS[0] = '':
 				'You grind your butt back against him and that is all the incentive he needs: After a little more grinding, he reaches around and worms his fingers into your bottoms. You are shocked and want to say something but just when you open your mouth, he finds your clit and your protest turns into a soft moan. You can feel his erection growing against your butt and the whole situation is getting you really excited.'
 				gs 'arousal', 'vaginal_finger', 5, 'sub', 'exhibitionism'
 				gs 'stat'
-				
+
 				act 'Let him guide you':
 					cla
 					*clr
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrinds1.mp4"></video></center>'
 					gs 'boyStat', $npclastgenerated
-					'He works your clit with his fingers for a bit, clearly knowing what he''s doing and getting you hot and bothered before he pulls his hand free. He turns you around so your back is against the bar and then pushes down on your shoulders until you are squatted down in front of him and hidden from most views.' 
+					'He works your clit with his fingers for a bit, clearly knowing what he''s doing and getting you hot and bothered before he pulls his hand free. He turns you around so your back is against the bar and then pushes down on your shoulders until you are squatted down in front of him and hidden from most views.'
 					'The strangers pulls out his cock and shoves it in your open mouth - you already knew what to expect and at this point, you are eager to suck his cock. He leans in close and starts fucking your mouth, and you are reveling in it, masturbating as he shoves his <<dick>>cm <<$dick_girth>> cock down your throat again and again. You don''t know if anybody''s watching and you are too drunk to feel anything but excitement at the prospect.'
 					gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'deepthroat', 'rough'
 					gs 'arousal', 'masturbate', 5, 'sub', 'exhibitionism'
@@ -320,13 +320,13 @@ if $ARGS[0] = '':
 					pcs_dom -= 2
 					gs 'stat'
 					$orgasm_txt = 'Your fingers on your needy cunt and the sensation of blowing a stranger in the middle of a bar prove too much to you, and you cum, shaking all over, your moans muffled by his <<$dick_girth>> cock.'
-					
+
 					act 'Finish him':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrinds2.jpg"></center>'
 						gs 'boyStat', $npclastgenerated
-						'You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.' 
+						'You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.'
 						'Once the last spurt is out, he wipes the tip of dick against your lips to get the last drops off cum off. Then he tucks his cock back in his pants, orders another drink for each of you and, before you''re even fully back on your feet, takes his drink and walks off.'
 						gs 'arousal', 'end'
 						spafinloc = 11
@@ -335,19 +335,19 @@ if $ARGS[0] = '':
 						gs 'cum_manage'
 						gs 'fame', 'city', 'sex', 1
 						gs 'stat'
-												
-						act 'Finish up': gt 'qwBarPolet'
+
+						act 'Finish up': gt 'qwBarPolet', 'bar'
 					end
 				end
-					
+
 				if pcs_dom > 20:
 					act 'Take charge':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrindd1.jpg"></center>'
 						gs 'boyStat', $npclastgenerated
-						'Once you are good and wet, you pull his hands away, sit down on a bar stool, move your clothes out of the way enough to reveal your pussy and spread your legs as you pull him close. You gently push down on his shoulders and he gets the idea, smiles and goes down to his knees to lick your pussy.' 
-						'He laps at your cunt without a hint of reservation. One of his hands is squeezing your tits through your clothes while the other joins his mouth, his fingers inside you adding to the overwhelming sensations you are feeling. You notice some people watching but not as many as you expected; you don''t care though, this simply feels too great to think about consequences, and your guy friend seems unconcerned with the looks of other patrons too, maybe even enjoying the fact that he can show off his conquest right here.' 
+						'Once you are good and wet, you pull his hands away, sit down on a bar stool, move your clothes out of the way enough to reveal your pussy and spread your legs as you pull him close. You gently push down on his shoulders and he gets the idea, smiles and goes down to his knees to lick your pussy.'
+						'He laps at your cunt without a hint of reservation. One of his hands is squeezing your tits through your clothes while the other joins his mouth, his fingers inside you adding to the overwhelming sensations you are feeling. You notice some people watching but not as many as you expected; you don''t care though, this simply feels too great to think about consequences, and your guy friend seems unconcerned with the looks of other patrons too, maybe even enjoying the fact that he can show off his conquest right here.'
 						'He keep going, working your sex tirelessly until an orgasm rocks your body and you have to bite down on your lip to keep yourself from moaning out loud. As the shuddering subsides, he stands up with a shit-eating grin and his hands move to unbutton his pants.'
 						gs 'arousal', 'cuni', 5, 'dom', 'exhibitionism'
 						$orgasm_or = 'yes'
@@ -358,12 +358,12 @@ if $ARGS[0] = '':
 							cla
 							*nl
 							pcs_dom += 2
-							'You put your hands on his and stop him from undoing his pants further. You lean in to kiss his cheek, then whisper. "Thank you for this... but I gotta go. Have a nice evening."' 
+							'You put your hands on his and stop him from undoing his pants further. You lean in to kiss his cheek, then whisper. "Thank you for this... but I gotta go. Have a nice evening."'
 							'Then, before he has even had time to process what you just said, you pull away and walk off. You can hear him calling you a "bitch" among other things, but you don''t care - you got yours, and that puts a spring in your step as you leave the bar.'
 							gs 'arousal', 'end'
 							act 'Leave':gt 'nord'
 						end
-													
+
 						act 'Return the favor':
 							cla
 							*clr
@@ -377,13 +377,13 @@ if $ARGS[0] = '':
 							pcs_dom -= 1
 							gs 'stat'
 							$orgasm_txt = 'Your fingers on your needy cunt and the sensation of blowing a stranger in the middle of a bar prove too much to you, and you cum, shaking all over, your moans muffled by his <<$dick_girth>> cock.'
-					
+
 							act 'Finish him':
 								cla
 								*clr
 								'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrinds2.jpg"></center>'
 								gs 'boyStat', $npclastgenerated
-								'You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.' 
+								'You are not quite sure for how long you are squatting there while he fucks your mouth, but at some point, he picks up the pace and starts to groan, then suddenly pulls his cock out of your mouth and the first hot jet of sperm hits your face, then another shoots into your mouth. Several more follow and cover your lips, chin and tongue with cum.'
 								'Once the last spurt is out, he wipes the tip of dick against your lips to get the last drops off cum off. Then he tucks his cock back in his pants, orders another drink for each of you and, before you''re even fully back on your feet, takes his drink and walks off.'
 								gs 'arousal', 'end'
 								spafinloc = 11
@@ -392,8 +392,8 @@ if $ARGS[0] = '':
 								gs 'cum_manage'
 								gs 'fame', 'city', 'sex', 1
 								gs 'stat'
-												
-								act 'Finish up': gt 'qwBarPolet'
+
+								act 'Finish up': gt 'qwBarPolet', 'bar'
 
 							end
 						end
@@ -408,12 +408,12 @@ end
 
 
 	! 'While you are sitting at the bar, minding your own business, a young man sits next to you.'
-	
+
 	!pcs_lover < 3 (has less than three lovers) or bfa < 1 (has a boyfriend with a dominant personality):      !!! DOESN''T MAKE ANY SENSE HERE - SHOULD BE PLACED AT THE END OF EVENT, WHEN THE GUY ASKS FOR SVETA''S NUMBER !!!
 	! gs 'boy'
 	! 'A <<$boybody>>, <<$boybod>> guy with <<$boyface>> hair walks up to you, he is <<$boyClo>>'
 	!		'The guy introduces himself as <<$boydesc>> and asks for your phone number.'
-	!		
+	!
 	!if $ARGS[0] = 'hasan':
 	!	!!stopboy = 0
 	!	gs 'boyStat', 'A92'
@@ -457,7 +457,7 @@ end
 	!
 	!	if guy_personality = normal:
 	!		'The guy introduces himself as <<$boydesc>> and he uses a cheesy pick-up line in an attempt to strike up a conversation.'
-	!	
+	!
 	!	if guy_personality = blunt:
 	!		'The guy tells you his name is <<$boydesc>> and he asks your name, looking to get a conversation started.'
 	!
@@ -470,7 +470,7 @@ end
 	!
 	!else: !!! DOESN''T MAKE ANY SENSE HERE - SHOULD BE PLACED AT THE END OF EVENT, WHEN THE GUY ASKS FOR SVETA''S NUMBER !!!
 	!	'You ignore him, knowing that (if pcs_lover >= 3 - you already have three lovers and probably couldn''t handle more than that; elseif bfa = 1 - your boyfriend would probably go nuts if he found out).'
-	
+
 
 
 

+ 114 - 130
locations/qwBarPolet.qsrc

@@ -3,19 +3,16 @@
 gs 'themes', 'indoors'
 
 if $ARGS[0] = '':
+	$loc = 'qwBarPolet'
 	$metka = ''
 	$menu_loc = 'qwBarPolet'
 	$menu_arg = ''
 	menu_off = 0
-	$loc = 'qwBarPolet'
 	$location_type = 'public_indoors'
 	alko_temp = alko
 	gs 'stat'
 	gs 'qwBarPolet', 'intro'
-	if orderDrink = 1:
-		orderDrink = 0
-		gt 'qwbarPolet','DrinkingBooze'
-	end
+	orderDrink = pcs_drank
 	if MartinTalkDaystart ! daystart:
 		MartinTalkDaystart = daystart
 		MartinTalkDay = 0
@@ -63,6 +60,78 @@ if $ARGS[0] = '':
 		'This place has a rowdy air about it: The smell of spilled beer, schnaps, and a hint of vomit and blood are hard to miss, and some of the stools and billiard cues look like they''ve been used in fights before. It is obviously a worker pub and not trying to be anything fancier than that, but that gives it an odd charm and coziness of its own' + iif(hour >= 16,', and despite the hints of shadiness, you can hear plenty of laughter and friendly conversation','') + '. You doubt you''ll get a fancy cocktail in here, though.'
 		*nl
 
+	act 'Exit to the street':gt 'nord'
+	act 'Approach the bar': gt 'qwBarPolet', 'bar'
+	act 'Go to the toilet': gt 'qwBarPoletToilet'
+end
+
+if $ARGS[0] = 'bar':
+	*clr & cla
+	$loc = 'qwBarPolet'
+	$metka = 'bar'
+	$menu_loc = 'qwBarPolet'
+	$menu_arg = 'bar'
+	menu_off = 0
+	if orderDrink < pcs_drank:
+		orderDrink = pcs_drank
+		gt 'qwbarPolet','DrinkingBooze'
+	end
+
+	'<center><b><font color="maroon">Bar "Rabotnik"</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bar.jpg"></center>'
+
+	act 'Order from the bar (0:05)': gt 'qwBarPolet','Ordering'
+
+	!!!bill_rand = rand(1,6) instead of (0,6) because content incomplete
+	if BillHour ! hour:
+		BillHour = hour
+		:bill_loop
+			bill_rand = rand(1,6)
+			if bill_rand = 0 and VicArt_BillDay = 1:jump 'bill_loop'
+			if bill_rand = 1 and PBB_BillDay = 1:jump 'bill_loop'
+	end
+	*nl
+	'Your eyes wander towards the backroom with the billiard table.'
+	*nl
+
+	if bill_rand = 0 and Jaska_Ev = 0:
+		'You notice some guys are playing billiards in the backroom. They seem know each other well and are playing for quite a bit of money, from what you can tell, so you don''t want to interrupt right now.'
+	elseif bill_rand = 0 and Jaska_Friend_Bill = 0:
+		'You notice the guys Jaska played against are in the backroom with the billiard table, having a friendly match. Maybe you could play a round with them?'
+	elseif bill_rand = 0 and Jaska_Friend_Bill < 4:
+		'You notice that Jaska''s friends, Victor and Artyom, are in the backroom with the billiard table, having a friendly match. You could join them, if you wanted to.'
+	elseif bill_rand = 0:
+		temp = rand(1,4)
+		if temp = 1:
+			'You notice that Jaska''s friends, Victor and Artyom, are in the backroom with the billiard table, but they don''t seem to be alone: A woman you don''t know is with them, and judging by the looks Artyom is giving her, she has offered them something other than money as a wager...'
+		else
+			'You notice that Jaska''s friends, Victor and Artyom, are alone in the backroom with the billiard table, having a friendly match. You could join them, if you wanted to.'
+		end
+
+	elseif PBB_Met ! 0 and bill_rand = 1:
+		PBB_BillDay = 1
+		'The guy you played billiards with before seems to be playing against a pair of women who are looking increasingly distressed as he pockets one ball after the other. You can see quite a bit of money sitting on the side of the table and you are pretty sure he is about to win it all.'
+		if PBB_Met = 2:
+			'You wonder if he offered them the same ''money or blowjob'' deal he offered you...'
+		end
+	elseif bill_rand = 1:
+		PBB_BillDay = 1
+		'A stranger seems to be playing billiards with a pair of women who are looking increasingly distressed as he pockets one ball after the other. You can see quite a bit of money sitting on the side of the table and you are pretty sure he is about to win it all.'
+
+	elseif bill_rand = 2:
+		'The backroom seems to be empty at the moment, the billiard table deserted. Looks like there''s nobody you could play with.'
+
+	elseif bill_rand > 2:
+		'You notice that some people are playing some billiards. Maybe you could join them?'
+	end
+
+	if bill_rand > 2 or (bill_rand = 0 and Jaska_Ev ! 0 and (Jaska_Friend_Bill < 4 or temp ! 1)):
+		act 'Go play billiards':
+			if bill_rand = 0: VicArt_BillDay = 1
+			gt 'qwBarBilliard','billiard_ev2'
+		end
+	end
+
 	if (week < 5 or week = 7) and ((hour < 16) or (hour = 23 and minut >= 45)):
 		'The bar is emptying quickly as its owner is telling the few patrons who are left that he''s closing for the night. Within minutes, even those who you thought were too drunk to even understand what "leaving" means are gone and only the bartender himself remains.'
 		if npc_rel['A216'] < 20:
@@ -105,110 +174,27 @@ if $ARGS[0] = '':
 				'But honestly, you don''t want to talk to him at all right now - you are still too angry for that.'
 			end
 		end
-
-		act 'Order a snack':
-			if cumloc[7] > 0 or cumloc[10] > 0 or cumloc[11] > 0 or cumloc[13] > 0 or cumloc[16] > 0:
-				if exhibitionist_lvl < 2:
-					mood -= rand(2,5)
-				else
-					pcs_horny += 5
-				end
-				npc_rel['A216'] -= 2
-				'Martin gives a stern look. "Don''t you think you should clean yourself up first?"'
-				*nl
-				if exhibitionist_lvl < 2 and pcs_inhib < 70:
-					'You are visibly covered in cum and Martin noticed it!'
-					*nl
-					'How embarrassing...'
-				elseif pcs_inhib >= 70 and exhibitionist_lvl < 2:
-					'"Huh?" You look over to the mirror behind the bar and realize that you still have cum on your face.'
-					'"Oh! Didn''t notice that. Yeah you''re right, I should go wash that off," you say before excusing yourself.'
-				else
-					'You are visibly covered in cum and Martin noticed it!'
-					'It''s kinda sexy to know that he noticed it. Your belly tingles at the thought that seeing the sperm must have made Martin imagine you having sex.'
-					'Still... You should probably go to the bathroom and wash it off.'
-				end
-				act 'Step away from the counter': gt 'qwBarPolet'
-			else
-				'"What do you want?" The bartender asks.'
-				gs 'food_menu'
-			end
-		end
-
-		act 'Order drinks': gt 'qwBarPolet','Ordering'
-
-		act 'Go to the toilet': gt 'qwBarPoletToilet'
-
-		!!!bill_rand = rand(1,6) instead of (0,6) because content incomplete
-		if BillHour ! hour:
-			BillHour = hour
-			:bill_loop
-				bill_rand = rand(1,6)
-				if bill_rand = 0 and VicArt_BillDay = 1:jump 'bill_loop'
-				if bill_rand = 1 and PBB_BillDay = 1:jump 'bill_loop'
-		end
-		*nl
-		'Your eyes wander towards the backroom with the billiard table.'
-		*nl
-
-		if bill_rand = 0 and Jaska_Ev = 0:
-			'You notice some guys are playing billiards in the backroom. They seem know each other well and are playing for quite a bit of money, from what you can tell, so you don''t want to interrupt right now.'
-		elseif bill_rand = 0 and Jaska_Friend_Bill = 0:
-			'You notice the guys Jaska played against are in the backroom with the billiard table, having a friendly match. Maybe you could play a round with them?'
-		elseif bill_rand = 0 and Jaska_Friend_Bill < 4:
-			'You notice that Jaska''s friends, Victor and Artyom, are in the backroom with the billiard table, having a friendly match. You could join them, if you wanted to.'
-		elseif bill_rand = 0:
-			temp = rand(1,4)
-			if temp = 1:
-				'You notice that Jaska''s friends, Victor and Artyom, are in the backroom with the billiard table, but they don''t seem to be alone: A woman you don''t know is with them, and judging by the looks Artyom is giving her, she has offered them something other than money as a wager...'
-			else
-				'You notice that Jaska''s friends, Victor and Artyom, are alone in the backroom with the billiard table, having a friendly match. You could join them, if you wanted to.'
-			end
-
-		elseif PBB_Met ! 0 and bill_rand = 1:
-			PBB_BillDay = 1
-			'The guy you played billiards with before seems to be playing against a pair of women who are looking increasingly distressed as he pockets one ball after the other. You can see quite a bit of money sitting on the side of the table and you are pretty sure he is about to win it all.'
-			if PBB_Met = 2:
-				'You wonder if he offered them the same ''money or blowjob'' deal he offered you...'
-			end
-		elseif bill_rand = 1:
-			PBB_BillDay = 1
-			'A stranger seems to be playing billiards with a pair of women who are looking increasingly distressed as he pockets one ball after the other. You can see quite a bit of money sitting on the side of the table and you are pretty sure he is about to win it all.'
-
-		elseif bill_rand = 2:
-			'The backroom seems to be empty at the moment, the billiard table deserted. Looks like there''s nobody you could play with.'
-
-		elseif bill_rand > 2:
-			'You notice that some people are playing some billiards. Maybe you could join them?'
-		end
-
-		if bill_rand > 2 or (bill_rand = 0 and Jaska_Ev ! 0 and (Jaska_Friend_Bill < 4 or temp ! 1)):
-			act 'Go to the backroom for a game of billiards':
-				if bill_rand = 0: VicArt_BillDay = 1
-				gt 'qwBarBilliard','billiard_ev2'
-			end
-		end
 	end
 
-!! act 'Find somebody to drink with':
-!! OR
-!! act 'Look around the bar': action to find people to interact with/who will invite her to a drink?
-	!!SOMEBODY ELSE ORDERING A DRINK FOR SVETA?
-	![RANDOM EVENTS (Rapey strangers inviting Sveta to have shots or something else with them)?]
-	![Events where Sveta interacts with random guys, resulting in drunk sex, groping etc. when drinking vodka?]
-	![RANDOM EVENTS (Friendly strangers or friends/acquaintances inviting Sveta to have beer or something else with them)?]
-	![RANDOM EVENTS (Strangers inviting her to have beer or something else with them, but overall friendly/consensual tone)?]
+	!! act 'Find somebody to drink with':
+	!! OR
+	!! act 'Look around the bar': action to find people to interact with/who will invite her to a drink?
+		!!SOMEBODY ELSE ORDERING A DRINK FOR SVETA?
+		![RANDOM EVENTS (Rapey strangers inviting Sveta to have shots or something else with them)?]
+		![Events where Sveta interacts with random guys, resulting in drunk sex, groping etc. when drinking vodka?]
+		![RANDOM EVENTS (Friendly strangers or friends/acquaintances inviting Sveta to have beer or something else with them)?]
+		![RANDOM EVENTS (Strangers inviting her to have beer or something else with them, but overall friendly/consensual tone)?]
 
 
-!!Run-in with Martin at the city gym?
-!Between 10 and 2
-!Quick talk?
-!Assisted Training?
-!Sex?
+	!!Run-in with Martin at the city gym?
+	!Between 10 and 2
+	!Quick talk?
+	!Assisted Training?
+	!Sex?
 
-!Event / Talk at lakecafe mentioning Martin?
+	!Event / Talk at lakecafe mentioning Martin?
 
-!NEED TO ADJUST obj_din or other location with npc_rel['A216'] so that people can actually see their relationship value with Martin
+	!NEED TO ADJUST obj_din or other location with npc_rel['A216'] so that people can actually see their relationship value with Martin
 
 	if npc_rel['A216'] > 20 and (hour < 16 or (hour = 23 and minut >= 45)) and MartinTalkVar > 3 and MartinSexDay = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/emptybar.jpg"></center>'
@@ -224,13 +210,12 @@ if $ARGS[0] = '':
 			act 'Have a private chat with Martin': gt 'MartinSex'
 		end
 	end
-
-	act 'Leave':gt 'nord'
+	act 'leave the bar': gt 'qwBarPolet'
 end
 
 if $ARGS[0] = 'DrinkingBooze':
 	menu_off = 1
-	cls
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bar.jpg"></center>'
 	!Different Picture/s?!
@@ -241,7 +226,7 @@ if $ARGS[0] = 'DrinkingBooze':
 		*nl
 		'When you''re finally finished with it, you are both angry and glad at the sight of the empty glass and the thought of ordering another crosses your mind.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif knowMartin ! 1:
 		knowMartin = 1
@@ -258,7 +243,7 @@ if $ARGS[0] = 'DrinkingBooze':
 		*nl
 		'You spend the next 15 minutes pondering his words and the impression he has left on you, absentmindedly drinking your <<$boozeVar>> until you finally notice that your glass is empty.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	else
 		if MartinTalkDay = 0:
@@ -282,7 +267,7 @@ if $ARGS[0] = 'DrinkingBooze':
 				'Safe from the friendly smile and words of gratitude you exchange with Martin, you were quickly left alone with your drink and nothing interesting seemed to be happening around the bar.'
 				'You therefore spent the last 15 minutes in peace, taking the occasional sip from your glass as you reflect the events of the day, think about your life and the people in it. You barely notice how your glass gets emptier and emptier until, finally, you notice that you have nothing left to drink.'
 
-				act 'Finish your drink': gt 'qwBarPolet'
+				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
 	end
@@ -290,7 +275,9 @@ end
 
 if $ARGS[0] = 'Ordering':
 	menu_off = 1
-	cls
+	minut += 5
+	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bar.jpg"></center>'
 	!Different Picture/s?!
 	'You go to the counter, sit down on one of the stools and, when the bartender notices you, ask: "Hey, could you bring me something to drink?"'
@@ -341,7 +328,7 @@ if $ARGS[0] = 'Ordering':
 			'With that, he turns and walks off to serve somebody else. Looks like he won''t let you drink yourself into a coma.'
 			'Bastard!'
 
-			act 'Give up for now': gt 'qwBarPolet'
+			act 'Give up for now': gt 'qwBarPolet', 'bar'
 		end
 
 	elseif knowMartin ! 1:
@@ -376,7 +363,6 @@ if $ARGS[0] = 'Ordering':
 			knowMartin = 1
 			killvar 'RabotnikFirst'
 			npc_rel['A216'] += 10
-			orderDrink = 1
 			*nl
 			'"Here," you hand him your new, genuine ID.'
 			'"Not a fake one again, I hope," he growls and examines it closely.'
@@ -395,7 +381,6 @@ if $ARGS[0] = 'Ordering':
 			gs 'food_menu'
 
 		elseif fakepassport = 1 or age >= 18:
-			orderDrink = 1
 			*nl
 			'Nodding, you take out your ID and show it to him. He eyes it suspiciously and gives you a stern look... but then nods and hands it back to you.'
 			'"What can I bring you?"'
@@ -408,12 +393,11 @@ if $ARGS[0] = 'Ordering':
 			*nl
 			'Guess you''ll have to come back with an ID, or come up with another way to get a drink.'
 
-			act 'Nod and give up': gt 'qwBarPolet'
+			act 'Nod and give up': gt 'qwBarPolet', 'bar'
 		end
 
 	else
 		'Martin nods. "Sure. What are you having?"'
-		orderDrink = 1
 		gs 'food_menu'
 	end
 end
@@ -444,7 +428,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'While you enjoy your drink, you briefly wonder why Martin didn''t just throw them out, but then you notice that the Artur and Grigori are talking to each other again and then burst into laughter as if nothing happened.'
 		'Looks like the bartender knows his regulars.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/event6.jpg"></center>'
@@ -461,7 +445,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'Feeling victorious (and a little lonely), you focus your attention on your beverage again while the card players set up their next round.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 3:
 		'<center><video src="images/locations/city/industrial/bar/event5.mp4"></center>'
@@ -482,7 +466,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 4:
 		if pcs_horny < 90: pcs_horny += rand(1,3)
@@ -503,7 +487,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'Only now that their storytime is over do you notice how enthralled you were by it, how you pictured that woman being molested in public... and that the thought aroused you a little.'
 		$OpenInnerThought+'Maybe I should ride the metro more often.'+$CloseInnerThought
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 5:
 		if pcs_horny < 90: pcs_horny += rand(3,5)
@@ -519,7 +503,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'At least somebody''s having fun.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 6:
 
@@ -537,7 +521,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'Not long after, the four of them leave together, the woman flanked by two of the man, each of them possessively grabbing one of her ass cheeks.'
 		'That woman has a long night ahead of her, you''d wager, and the image of their impending foursame makes your belly tingle.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 7:
 		pcs_mood -= 5
@@ -554,7 +538,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		$OpenInnerThought+'They can take his job, but they can never take his dignity,'+$CloseInnerThought+' you think to yourself with a smirk.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/event10.jpg"></center>'
@@ -576,7 +560,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'Shortly after, the bar returns to normal, and after taking a moment to check up on the woman he saved, Martin brings you that drink you''d all but forgotten about. Say what you will about his appearance but he seems to have his heart in the right place.'
 
-		act 'Enjoy your drink': gt 'qwBarPolet'
+		act 'Enjoy your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 9:
 		if pcs_horny < 90: pcs_horny += rand(1,3)
@@ -591,7 +575,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'Of course, this only encourages her to redouble her efforts in flirting with Martin, and when Martin''s eyes meet yours, you share a shrug and a knowing smile with him and focus on your beverage.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 10:
 		if pcs_horny < 90: pcs_horny += rand(1,3)
@@ -609,7 +593,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'You quickly turn your face straight ahead again and focus so hard on your drink that it''s should be catching fire any second now.'
 		'The image in your head, however, is that of the exhibitionist and her smooth, exposed pussy...'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 11:
 		if pcs_horny < 90: pcs_horny += rand(1,3)
@@ -629,7 +613,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'He knew you had noticed them. He was aware that you would be waiting for them to come out again. And, looking at how ashamed the woman seems to be, maybe he told her too...'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bartalk<<pic_rand>>.jpg"></center>'
@@ -650,7 +634,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'"Most of them do. Have you ever actually been to another bar?" The other male asks.'
 		'"Why bother? The beer tastes like piss everywhere," his friend remarks, and they both laugh and raise their glasses to that.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bartalk<<pic_rand>>.jpg"></center>'
@@ -663,7 +647,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		'"... really?"'
 		'"<b>No, you idiot!</b> I don''t have a fucking clue why you can''t buy a second car. How am I supposed to know? I can''t even afford <b>one</b>!"'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 	elseif DrinkingRand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/bartalk<<pic_rand>>.jpg"></center>'
@@ -685,7 +669,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 		*nl
 		'Whoever this Vanya is, his fate makes you think that you should probably aim higher than assembly-line work.'
 
-		act 'Finish your drink': gt 'qwBarPolet'
+		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 !Template for infos	the NPCs give on events, stories and other points of interest in the game
 !	!!DrinkingRand ALWAYS HAS TO BE ADJUSTED AT THE TOP OF THE ARGUMENT
@@ -695,7 +679,7 @@ if $ARGS[0] = 'RandomDrinkEvents':
 !		'As you forlornly muster the liquid, one of the many conversations in the bar piques your interest.'
 !		*nl
 !		'BLA BLA BLA'
-!		act 'Finish your drink': gt 'qwBarPolet'
+!		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 
 
 	!Ideas for other random events: