Merge remote-tracking branch 'Anjuna/master'

# Conflicts:
#	locations/stwork3.qsrc

locations/buklinik.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_outdoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'start'
 	minut += 5
 	gs 'stat'
@@ -13,26 +14,28 @@ if $ARGS[0] = 'start':
 	'A well-known homeless shelter in a run-down building. Looking above the entrance you can see a sign saying, Mercy Clinic.'
 	'There is a note by the entrance.'
 	'Working hours: '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+''
-	temp = rand(1, 10)
-	if temp = 9:'A crowd of homeless people have huddled together trying to see if there are any available beds...'
-	if temp = 2:'A homeless person is trying to get into the shelter...'
-	if temp = 3:'An older man is standing outside the shelter...'
-	if temp = 4:'There is a woman standing outside the shelter trying to console her crying child...'
-	if temp = 5:'A bruised woman stands near the entrance having a smoke...'
-	if temp = 1:'A man is walking up and down a path, screaming profanities...'
-	if temp = 8:'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
-	if temp = 7:'A couple are loudly arguing if they want to stay at the shelter tonight...'
-	if temp = 6:'A woman is crying, arguing on the phone, probably with her husband...'
-	if temp = 10:'Surprisingly, there is no one around the shelter...'
 
-	act 'Leave':gt 'city_industrial'
-
-	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
+	temp = rand(0, 9)
+	if temp = 0: 'Surprisingly, there is no one around the shelter...'
+	if temp = 1: 'A man is walking up and down a path, screaming profanities...'
+	if temp = 2: 'A homeless person is trying to get into the shelter...'
+	if temp = 3: 'An older man is standing outside the shelter...'
+	if temp = 4: 'There is a woman standing outside the shelter trying to console her crying child...'
+	if temp = 5: 'A bruised woman stands near the entrance having a smoke...'
+	if temp = 6: 'A woman is crying, arguing on the phone, probably with her husband...'
+	if temp = 7: 'A couple are loudly arguing if they want to stay at the shelter tonight...'
+	if temp = 8: 'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
+	if temp = 9: 'A crowd of homeless people have huddled together trying to see if there are any available beds...'
+
+	act 'Leave': gt 'city_industrial'
+
+	if hour >= 9 and hour < 18: act 'Enter the shelter': gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'holl':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'holl'
 	minut += 5
 	gs 'stat'
@@ -40,7 +43,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'The <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room is locked.'
@@ -68,7 +71,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'As you approach the counter there are two women chatting with each other, and laughing.'
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat, "Hello, my name is <<$pcs_firstname>>, I found a note that you were looking for volunteers..."'
 		'One of the women cheerfully replies, "Welcome to our little humble shelter. As you''ve probably noticed the place is run down and we''re really in need of some volunteers." They point further down the corridor, "What you see here is just a small part of the operation that we provide. We also help out with the elderly and the less fortunate outside the shelter."'

locations/gad_gpbarn.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '':
 			gs'stat'
 
 			act 'Finish': gt 'gad_gpbarn'
-			act 'Return back to your grandfather': minut += 2 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 2 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	gs 'bicycle', 'gad_gpbarn'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'horse':
 			'You watch him eat for a little while before moving on.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_lead_horse_to_field'] = 1:
@@ -169,7 +169,7 @@ if $ARGS[0] = 'horse':
 			'You take Desperado by the bridle and lead him to the field. You let him free in the paddock area and watch him run about before moving on.'
 
 			act 'Continue': gt 'gad_field', 'field'
-			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 1:
@@ -187,7 +187,7 @@ if $ARGS[0] = 'horse':
 		end
 	end
 	if grandpaQW['chore_bathe_horse'] = 2:
-		act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+		act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 	end
 	if grandpaQW['chore_brush_horse'] = 1:
 		act 'Groom the horse (1:00)':
@@ -201,7 +201,7 @@ if $ARGS[0] = 'horse':
 			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. Finally, you are satisfied with the result - he looks as clean and healthy as ever.'
 
 			act 'Finish': gt 'gad_gpbarn','horse'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end
@@ -230,7 +230,7 @@ if $ARGS[0] = 'cow':
 			'You start milking Dawn, improving each time you do it.'
 
 			act 'Finish': gt 'gad_gpbarn', 'cow'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
@@ -245,7 +245,7 @@ if $ARGS[0] = 'cow':
 			'Dawn is excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump some hay in her trough and watch as she digs in.'
 
 			act 'Finish': gt 'gad_gpbarn','cow'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
@@ -263,7 +263,7 @@ if $ARGS[0] = 'cow':
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where your grandfather awaits you. It''s his turn to keep an eye on the cows..'
 
 			act 'Continue': gt 'gad_field', 'cow'
-			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gad_gphouse', 'grandpa'
+			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end
@@ -291,7 +291,7 @@ if $ARGS[0] = 'boar':
 			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish': gt 'gad_gpbarn','boar'
-			act 'Return back to your grandfather': minut += 3 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 3 & gt 'gp_zlatek', 'talk'
 		end
 	end
 end

locations/gad_gphouse.qsrc

@@ -162,6 +162,7 @@ if $ARGS[0] = 'kitchen':
 	act 'Eat a normal meal (0:15)': gs 'food', 'm_meal'
 	act 'Eat a light meal (0:10)': gs 'food', 's_meal'
 
+	gs 'kit_din'
 	dynamic $edasnack
 	dynamic $sandwich
 	dynamic $driwater
@@ -601,6 +602,9 @@ if $ARGS[0] = 'grandpa_leave_event':
 	act 'Leave': minut += 1 & gt $loc, $loc_arg
 end
 
+
+
+
 	!!=============================================================================================!!
 	!!                                                                                             !!
 	!!                                       INACTIVE BACKUP                                       !!

locations/gad_gpyard.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'start':
 			end
 			gs'stat'
 			act 'Finish': gt 'gad_gpyard', 'start'
-			act 'Return back to your grandfather': minut += 1 & gt 'gad_gphouse', 'grandpa'
+			act 'Return back to your grandfather': minut += 1 & gt 'gp_zlatek', 'talk'
 		end
 	end
 	act 'Enter your grandparents'' house': minut += 1 & gt 'gad_gphouse', 'entry'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'chickens':
 			gs 'stat'
 
 			act 'Finish': gt 'gad_gpyard', 'start'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -334,7 +334,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/work_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend some time doing some gardening.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 2 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 2 & gt 'gp_elene', 'talk'
 		end
 	end
 	!job Granny
@@ -353,7 +353,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/water_garden.jpg"></center>'
 			'You spend an hour watering the garden.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 	!job Granny
@@ -372,7 +372,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/harvest_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend a few hours harvesting vegetables in the garden.'
 			act 'Finish': gt 'gad_gpyard', 'garden'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'strawberry':
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish': gt 'gad_gpyard', 'strawberry'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 end
@@ -500,7 +500,7 @@ if $ARGS[0] = 'fruit_garden':
 			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
 
 			act 'Finish': gt 'gad_gpyard', 'fruit_garden'
-			act 'Return back to your grandmother': minut += 3 & gt 'gad_gphouse', 'grandma'
+			act 'Return back to your grandmother': minut += 3 & gt 'gp_elene', 'talk'
 		end
 	end
 end

locations/gad_store.qsrc

@@ -35,7 +35,7 @@ if grandmaQW['chore_groceries'] = 1:
 		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out anymore..."'
 
 		act 'Thank him and leave': minut += 5 & gt 'gadukino'
-		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gad_gphouse', 'grandma'
+		act 'Thank him and take the groceries back to your grandmother (0:10)': minut += 10 & gt 'gp_elene', 'talk'
 	end
 end
 

locations/kiosk.qsrc

@@ -11,9 +11,9 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/kiosk/kiosk21.jpg"></center>'
 		'It is currently very busy and looks like you''ll have to wait to get to the counter.'
-		
+
 		act 'Leave': minut += 1 & gt $loc
-		
+
 		act 'Wait in line (20 Minutes)': minut += 20 & gt 'kiosk', 'counter'
 
 		if exhibitionist_lvl > 1:
@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'full', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'pussy', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 				minut += 1
 				gs 'flash', 'tits', 'outdoors', 5
 				gs 'stat'
-				
+
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			end
 		end
@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 
 					gs 'arousal', 'bj', 10, 'sub'
 					gs 'stat'
-					
+
 					act 'Cum on your face':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/cumface' + rand(1,23) + '.jpg"></center>'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'start':
 
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Go to the counter': gt 'kiosk', 'counter'
 					end
 
@@ -84,17 +84,17 @@ if $ARGS[0] = 'start':
 
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Go to the counter': gt 'kiosk', 'counter'
 					end
 				else
 					*clr & cla
-					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'	
+					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'
 					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the kiosk and spend 2 hours curled up in a ball.'
 					minut += 120
 					gs 'pain', 4, 'tummy', 'hit'
 					gs 'stat'
-					
+
 					act 'Recover':gt $loc
 				end
 			end
@@ -117,10 +117,10 @@ if $ARGS[0] = 'counter':
 	gs 'item_cart', 'shoppping_aisle', 'kiosk'
 	gs 'stat'
 	gs 'themes', 'outdoors'
-	
+
 	$backimage='images/locations/city/shared/kiosk/kiosk123.jpg'
 	act 'Leave':minut += 1 & gt $loc
-	
+
 	if money < 100:
 		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some snack.</TD></TR></table></center>'
 	else
@@ -191,7 +191,7 @@ if $ARGS[0] = 'counter':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You buy the daily newspaper</TD></TR></table></center>'
+			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You buy the weekly newspaper</TD></TR></table></center>'
 			act 'return': gt 'kiosk', 'start'
 		end
 	end
@@ -202,11 +202,11 @@ end
 if $ARGS[0] =  'themes':
 	*clr & cla
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/kiosk/kiosk123.jpg"></center>'
 	'<center><img WIDTH = 245 HEIGHT = 56 src="images/locations/city/shared/kiosk/ruch.jpg"></center>'
 	'All themes cost 500 <b>₽</b>'
-	
+
 	if money >= 500:
 		i = 1
 		:phonethemeloop

locations/kit_din.qsrc

@@ -28,7 +28,7 @@ $santehnikend3 = {
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Get up':gt $curloc
+	act 'Get up': gt $loc, $loc_arg
 }
 
 $santehnikend1 = {
@@ -90,7 +90,7 @@ $santehnikend2 = {
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 	'You offer to issue the plumber a reciept of debt. He thinks for a moment and says, "Okay. Write a receipt. Next time I''m about, I''ll look in and you give me the money. <<$textsan>> Then teking a pen and paper you write the plumber a receipt that you owe him 1,500 <b>₽</b>. Grisha takes the paper and puts it in his pocket. "If you have another leak, call me, here''s my card."'
 
-	act 'Plumber leaves':gt $curloc
+	act 'Plumber leaves': gt $loc, $loc_arg
 }
 
 $santehnikend = {
@@ -104,7 +104,7 @@ $santehnikend = {
 	if money >= 1500:
 		act 'Pay':
 			money -= 1500
-			gt $curloc
+			gt $loc, $loc_arg
 		end
 	elseif money < 1500:
 		'You do not have enough cash on you.'
@@ -122,7 +122,7 @@ $santehnikend = {
 				end
 				killvar 'temp_amount'
 				killvar 'temp_debt'
-				gt $curloc
+				gt $loc, $loc_arg
 			end
 		elseif money + stolmoney + karta >= 1500:
 			'You know that even with your stash in the apartment you are short, but you could get the extra from the ATM.'
@@ -144,7 +144,7 @@ $santehnikend = {
 				killvar 'temp_amount'
 				killvar 'temp_debt'
 
-				gt $curloc
+				gt $loc, $loc_arg
 			end
 		else
 			act 'I did not have enough money':
@@ -168,7 +168,7 @@ $santehnikend = {
 
 				act 'Continue':
 ! here I need work around the direct return address and get from kuhr korr and from kuhr2x korr2x
-					$sexloc = 'korr' + $mid($curloc,5,2)
+					$sexloc = 'korr' + $mid($loc, 5, 2)
 
 					if pcs_apprnc < 60:
 						*clr & cla

locations/lover.qsrc

@@ -8,8 +8,10 @@ if $ARGS[0] = 'add':
 		gs 'npcStat', $ARGS[1]
 	end
 
-	$lover[] = $npcID
-	gs 'telefon', 'AddContact', $npcID, $npc_icon[$npcID], 0
+	if arrpos('$lover', $npcID) < 0:
+		$lover[] = $npcID
+		gs 'telefon', 'AddContact', $npcID, $npc_icon[$npcID], 0
+	end
 end
 
 if $ARGS[0] = 'remove':
@@ -25,14 +27,14 @@ end
 
 if $ARGS[0] = 'add_boyfriend':
 	gs 'lover', 'add', $ARGS[1]
-	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "hour > 6 and hour < 20", "", "0"
+	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$npcID>>'", "npc_meetday['<<$npcID>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 	$npc_rel_type[$npcID] = 'boyfriend'
 	stat['boyfriends_current'] += 1
 	stat['total_lovers_current'] += 1
 
 elseif $ARGS[0] = 'add_girlfriend':
 	gs 'lover', 'add', $ARGS[1]
-	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "hour > 6 and hour < 20", "", "0"
+	gs 'telefon', 'SetCallSchedule', $npcID, "gt 'lover_call', 'callingTheLover', '<<$npcID>>'", "npc_meetday['<<$npcID>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 	$npc_rel_type[$npcID] = 'girlfriend'
 	stat['girlfriends_current'] += 1
 	stat['total_lovers_current'] += 1
@@ -80,6 +82,11 @@ end
 
 ! $ARGS[1+]: npc_rel_types that you want to include
 if $ARGS[0] = 'draw_random_from':
+	if $ARGS[1] = 'all':
+		$result = $lover[rand(0, arrsize('$lover')-1)]
+		exit
+	end
+
 	lover_i = 0
 	lover_max_i = arrsize('$lover')
 	:draw_from_lover_loop

locations/lover_call.qsrc

@@ -8,9 +8,9 @@ if $ARGS[0] = 'scheduler':
 			$temp_npcid = $lover[ts_temp_i]
 			if $npc_rel_type[$temp_npcid] = 'boyfriend' or $npc_rel_type[$temp_npcid] = 'girlfriend':
 				if rand(0, 1) = 1:
-					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "totminut > <<totminut + (9 - hour) * 24 + rand(0, 600) - minut>>"
+					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "totminut > <<totminut + (9 - hour) * 24 + rand(0, 600) - minut>>"
 				else
-					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "", "0"
+					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 				end
 			end
 			ts_temp_i += 1
@@ -408,7 +408,7 @@ if $ARGS[0] = 'lover':
 	Call4Date['lover_days'] = daystart - npc_eventday[$Call4Date["NPC"]]
 	gs 'stat'
 	gs 'telefon', 'phone_call_receive'
-	gs 'telefon', 'SetCallSchedule', $Call4Date["NPC"], "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "", "0"
+	gs 'telefon', 'SetCallSchedule', $Call4Date["NPC"], "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour < 20", "", "0"
 
 
 	if npc_gender[$ARGS[1]] = 0 or npc_gender[$ARGS[1]] = 3:
@@ -935,4 +935,5 @@ if $ARGS[0] = 'NPCCallsForDate':
 	end
 end
 
---- lover_call ---------------------------------
+
+--- lover_call ---------------------------------

locations/lover_living.qsrc

@@ -438,4 +438,4 @@ if $ARGS[0] = 'santehnik':
 	end
 end
 
---- lover_living ---------------------------------
+--- lover_living ---------------------------------

locations/lover_meet.qsrc

@@ -285,7 +285,7 @@ if $ARGS[0] = 'start':
 					end
 				elseif (cumloc[6] = 1 or cumloc[7] = 1):
 					if npc_gentle[$npcID] = 1:
-						npc_rel[$npcID] += 2
+						npc_rel[$npcID] += 1
 						pcs_horny += 5
 						'<<$Xec>> can see sperm on your ass, but underneath <<$Xyr>> shy demener you know that it only turns <<$Xem>> on.'
 					elseif npc_rough[$npcID] = 0:

locations/metro.qsrc

@@ -101,7 +101,6 @@ if $ARGS[0] = 'start':
 	end
 
 	if pusher = 1 and dealer = 0:
-		dealer = 1
 		'You see a tall, emaciated man leaning against the wall next to the tracks, looking very shady. He notices you looking and beckons you to come closer.'
 		act 'Talk to the man':gt 'metro', 'dealer'
 	elseif dealer ! 0:
@@ -209,6 +208,7 @@ end
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
+	dealer = 1
 	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."'
 	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.'
 	'He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'

locations/npcStat.qsrc

@@ -457,7 +457,7 @@ if $ARGS[1] ! '' and npcStat_i > 0:
 		$dick_class<<npcStat_i>>		= $npcStatVars['dick_class']
 		$dick_desc<<npcStat_i>>			= $npcStatVars['dick_desc']
 		$dick_desc_pref<<npcStat_i>>	= $npcStatVars['dick_desc_pref']
-		silavag<<npcStat_i>>			=  npcStatVars['sexskill']
+		silavag<<npcStat_i>>			=  npcStatVars['sexskill'] / 50
 		npcAge<<npcStat_i>>				=  npcStatVars['age']
 		$npcHair<<npcStat_i>>			= $npcStatVars['hair']
 		$npcClo<<npcStat_i>>			= $npcStatVars['outfit']
@@ -500,7 +500,7 @@ else
 	$dick_class[npcStat_i]		= $npcStatVars['dick_class']
 	$dick_desc[npcStat_i]		= $npcStatVars['dick_desc']
 	$dick_desc_pref[npcStat_i]	= $npcStatVars['dick_desc_pref']
-	silavag[npcStat_i]			=  npcStatVars['sexskill']
+	silavag[npcStat_i]			=  npcStatVars['sexskill'] / 50
 	 npcAge[npcStat_i]			=  npcStatVars['age']
 	$npcHair[npcStat_i]			= $npcStatVars['hair']
 	$npcClo[npcStat_i]			= $npcStatVars['outfit']

locations/npcgeneratec.qsrc

@@ -172,7 +172,6 @@ if $ARGS[0] = 'assign_stats':
 	else
 		npc_sexskill[$ARGS[1]] = rand(1, 100)
 	end
-	silaVag = npc_sexskill[$ARGS[1]]
 end
 
 

locations/shortgs.qsrc

@@ -1230,17 +1230,18 @@ if $ARGS[0] = 'enumerate_list':
 	if temp_sgs_max_i = 0:
 		!!empty on purpose
 	elseif temp_sgs_max_i = 1:
-		dynamic '$temp_sgs_text = <<$sgs_arrname>>[0]'
+		dynamic "$temp_sgs_text = <<$sgs_arrname>>[0]"
 	elseif temp_sgs_max_i = 2:
-		dynamic '$temp_sgs_text = <<$sgs_arrname>>[0] + <<$temp_sgs_sep[1]>> + <<$sgs_arrname>>[1]'
+		dynamic "$temp_sgs_text = <<$sgs_arrname>>[0] + '<<$temp_sgs_sep[1]>>' + <<$sgs_arrname>>[1]"
 	else
 		temp_sgs_i = 0
 		:sgs_enum_list
-			dynamic '$temp_sgs_text += <<$sgs_arrname>>[<<temp_sgs_i>>]'
+			dynamic "$temp_sgs_text += <<$sgs_arrname>>[<<temp_sgs_i>>]"
 			temp_sgs_i += 1
 		if temp_sgs_i < temp_sgs_max_i - 1: $temp_sgs_text += $temp_sgs_sep[0] & jump 'sgs_enum_list'
 
-		dynamic '$temp_sgs_text += <<$temp_sgs_sep[2]>> + <<$sgs_arrname>>[<<temp_sgs_i>>]'
+		dynamic "$temp_sgs_text += '<<$temp_sgs_sep[2]>>' + <<$sgs_arrname>>[<<temp_sgs_i>>]"
+
 		killvar 'temp_sgs_i'
 	end
 

locations/stripclub.qsrc

@@ -528,7 +528,7 @@ if $ARGS[0] = 'hire3':
 	end
 	'"Did you have any questions for me?" he asks.'
 	'"Just two," you reply. "When do I work and what do I get paid?"'
-	'He chuckles. "Straight to the point I see. The club operates between 18:00 and 03:00 and I currently have two shift patterns open. Wednesday and Thursday nights, or Friday and Saturday nights. You get paid monthly plus tips. Interested?"'
+	'He chuckles. "Straight to the point I see. The club operates between 18:00 and 03:00 and I currently have two shift patterns open. Wednesday and Thursday nights, or Friday and Saturday nights. You get paid weekly plus tips. Interested?"'
 
 	act 'Take the job':
 		cla

locations/stwork2.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'strip_show_start':
 	*clr & cla
 	strip_club['cust_boos'] = 0
+	strip_club['strip_tips'] = 0
 	$strip_club['bra_type'] = $braworntype
 	strip_club['bra_number'] = brawornnumber
 	$strip_club['panty_type'] = $pantyworntype
@@ -206,7 +207,7 @@ if $ARGS[0] = 'dance_clothed':
 	gs 'sweat', 'add', 5
 	fat -= 1
 	gs 'exp_gain', 'dancero', rand(1,2)
-	strip_club['strip_tips'] = rand(pcs_dancero, 5 * pcs_dancero) / 10
+	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 10
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
@@ -225,7 +226,7 @@ if $ARGS[0] = 'strip_clothes':
 	gs 'exp_gain', 'dancero', rand(1,2)
 	gs 'exp_gain', 'inhib', rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
-	strip_club['strip_tips'] = rand(pcs_dancero, 5 * pcs_dancero) / 7
+	strip_club['strip_tips'] += rand(pcs_dancero, 5 * pcs_dancero) / 7
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
 	'You start moving seductively around the pole in the center of the stage.'

locations/stwork3.qsrc

@@ -1,6 +1,6 @@
 #stwork3
 !! 2024/08/10
-if $ARGS[0] = 'work':
+if $ARGS[0] = 'start':
 	*clr & cla
 	if strip_club['first_bar_shift'] = 0:
 		gt 'stwork3', 'first_shift'
@@ -575,17 +575,31 @@ if $ARGS[0] = 'tips':
 	money += strip_club['tips_total']
 	!! Reset daily modifier
 	strip_club['tips_roll'] = 0
+	strip_club['bar_shifts'] += 1
 	!! Skill and attribute gains
 	if pcs_servng < 100: gs 'exp_gain', 'servng', 1
 	if pcs_vital < 30: gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
 	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
 	*clr & cla
 	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/city/.jpg"></center>'
 	'With your shift finally over, you sit at the bar and count out your tips.'
 	*nl
 	'You made <<strip_club[''tips_total'']>> <b>₽</b> in tips tonight.'
-	if strip_club['manager_speak'] = 1:
+
+	if (strip_club['stripbarwork'] = 1 and week = 4) or (strip_club['stripbarwork1'] = 1 and week = 6):
+		*nl
+		temp_shifts_pay = 125 * 9 * strip_club['bar_shifts']
+		'After counting your tips, Ivanna pays you <<temp_shifts_pay>> <b>₽</b> for the <<strip_club[''bar_shifts'']>> shifts you''ve worked.'
+		money += temp_shifts_pay
+		killvar 'temp_shifts_pay'
+		strip_club['bar_shifts'] = 0
+		gs 'stat'
+	end
+
+	*nl
+	if strip_club['manager'] = 1:
 		'Ivanna asked to speak with you before you leave.'
 		act 'Speak with Ivanna': gt 'stwork3', 'manager_speak'
 	else