assorted control flow improvements, minor enhancements, and bug fixes

locations/cikl.qsrc

@@ -378,7 +378,7 @@ if pcs_ass > 1 and ashrink > 0 and analplugIN = 0:
 	if daystart mod(ashrinkdays) = 0: pcs_ass -= ashrink
 	if pcs_ass < 0: pcs_ass = 0
 end
-if pcs_vag > 10 and vshrink > 0:
+if pcs_vag > 1 and vshrink > 0:
 	if daystart mod(vshrinkdays) = 0: pcs_vag -= vshrink
 	if pcs_vag < 0: pcs_vag = 0
 end
@@ -693,16 +693,6 @@ killvar 'temprel'
 !!Not very realistic but won''t make anyone too rich.
 
 if bankAccount = 1:
-	kartatotal = karta
-	:kartaloop
-	if kartatotal > 20000000:
-		kartacount += 1
-		largekarta[kartacount] = 20000000
-		kartatotal -= 20000000
-		jump 'kartaloop'
-	else
-		largekarta[0] = kartatotal
-	end
 	if karta >= 2000000:
 		!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
 		intrate = 60
@@ -713,23 +703,7 @@ if bankAccount = 1:
 		!! yearly overdraft interest of 20% recalculated into daily interest = 0.055% daily
 		intrate = 550
 	end
-	:intloop
-	if kartacount > 0:
-		smallmoneypos += (largekarta[kartacount] * intrate)
-		if smallmoneypos >= 1000000 or smallmoneypos <= -1000000: karta += smallmoneypos / 1000000 & smallmoneypos = smallmoneypos mod 1000000
-		largekarta[kartacount] = 0
-		kartacount -= 1
-		jump 'intloop'
-	else
-		smallmoneypos += (largekarta[0] * intrate)
-		largekarta[0] = 0
-		if kartacount ! 0: kartacount = 0
-	end
-
-	if smallmoneypos >= 1000000 or smallmoneypos <= -1000000:
-		karta += smallmoneypos / 1000000
-		smallmoneypos = smallmoneypos mod 1000000
-	end
+	karta += (karta * intrate) / 1000000
 
 	if atmDeposit > 0 and atmDepositDate <= daystart:
 		karta += atmDeposit

locations/city_center.qsrc

@@ -107,6 +107,7 @@ if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['c
 
 		gs 'willpower', 'skill', 'self', $diff
 		will_cost = (will_cost * 3) - (pcs_perform)
+		if will_cost < 0: will_cost = 0
 		if will_cost <= pcs_willpwr:
 			act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)':
 				inhib_exp += rand(1,3)
@@ -125,6 +126,20 @@ end
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
+if week < 6 and (hour >= 8 and hour <= 9):
+	if workSec > 0: act 'Go to work at Titran-Express': gt 'office', 'start'
+end
+act 'Train station (0:05)':minut += 5 & gs 'city_train','start'
+act 'Metro Station (0:05)':minut += 5 & gt 'metro','start'
+act 'Central Park (0:35)':minut += 35 & gt 'city_park','start'
+
+gs 'taxi'
+
+
+if hour >= 6 and hour <= 23: act 'Go to the Aphrodite Photography': gt 'foto', 'start'
+if hour >= 5 and hour <= 23: act 'Go to the Havana Fitness Center': gt 'fit', 'start'
+if hour >= 8 and hour <= 22: act 'Go to the Galeria Mall': gt 'torgcentr'
+if hour >= 6 and hour <= 23: act 'Go to Bystroeshka''s Diner': gt 'burger', 'start'
 act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
@@ -144,16 +159,16 @@ else
 end
 'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open 8-10 selling magazines and cigarettes for cheap.'
 *nl
-if hour = 8 and minut >= 30:
-	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
-elseif hour >= 9 and hour <= 20:
-	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
+if hour >= 8 and hour <= 21:
+	$desc_txt1 = '<a href="exec:gt ''torgcentr''">The Galeria Mall</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Galeria Mall is closed and will reopen at 8:00''">The Galeria Mall</a>'
 end
+if hour < 5 or hour > 23: 
+  $desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 5:00''">Havana Fitness Center</a>'
+else
+	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
+end 
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'
 if hour >= 6 and hour <= 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''foto'', ''start''">Aphrodite Photography</a>'
@@ -161,9 +176,9 @@ else
 	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 6:00''">Aphrodite Photography</a>'
 end
 if hour >= 6 and hour <= 23:
-	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Diner Bystroeshka</a>'
+	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Bystroeshka''s Diner</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 6:00''">Diner Bystroeshka</a>'
+	$desc_txt2 = '<a href="exec:msg ''Bystroeshka''s Diner is closed and will reopen at 6:00''">Bystroeshka''s Diner</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec:gt ''restoran'', ''start''">Babel</a>'
@@ -174,6 +189,7 @@ end
 *nl
 if week >= 4 and (hour >= 18 or hour <= 3):
 	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
+  act 'Go to the nightclub': gt 'city_nightclub', 'start'
 else
 	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Friday to Sunday at 18:00''">The nightclub</a>'
 end
@@ -233,7 +249,7 @@ $desc_txt7 = '<a href="exec: minut += 5 & gt ''police_station'',''start''">Main
 *nl
 '<a href="exec: minut += 5 & gt ''city_church'', ''start''">Kazan Cathedral</a>, also known as the Cathedral of Our Lady of Kazan, sits at the very center of the city.'
 *nl
-if nichHotelReferral = 2:
+if nichHotelReferral = 2 and nichWork ! 2:
 	if hour >= 4 and hour < 16:
 		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too early for that. You should come back between 16:00 and 20:59.'
 	elseif hour < 4 or hour > 20:

locations/city_clinic.qsrc

@@ -1,7 +1,7 @@
 # city_clinic
 $location_type = 'public_indoors'
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'start' or $ARGS[0] = '':
 	CLOSE all
 	$sexloc = 'city_clinic'
 	$loc = 'city_clinic'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 	act 'Leave the clinic': minut += 5 & gt 'city_residential'
 	act 'Go see a cosmetic surgeon':gt 'city_clinic','cosmetic1'
 	if lact_ev['pcs_knows_milkbank'] >= 1:
-		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation_room'
+		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation'
 	end
 
 	if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
@@ -900,7 +900,6 @@ if $ARGS[0] = 'ninel':
 
 													if ninelsex = 1:girl += 1
 
-													pcs_vag += 1
 													sick = 0
 													pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
 													pcs_mood = 100
@@ -1026,7 +1025,6 @@ if $ARGS[0] = 'ninel2':
 											
 								act 'Obey':
 									*clr & cla
-									pcs_vag += 1
 									sick = 0
 									pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
 									pcs_mood = 100
@@ -1550,10 +1548,10 @@ if $ARGS[0] = 'milk_donation_room':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milkbank_door.jpg"></center>'
 	'There is a door with a sign on it, indicating this is the office for the milk donation.'
 	act 'Go back':gt 'city_clinic','start'
-	if lactation['pc_aware'] > 0 and hour < 10 or hour > 19:
+	if lactation['pc_aware'] > 0 and hour < 7 or hour > 19:
 		'The door seems to be locked, nobody is here.'
-		'There is a sign that reads "Opening hours are 10:00 to 19:00 daily.'
-	elseif lactation['pc_aware'] > 0 and hour >= 10 and hour <= 19:
+		'There is a sign that reads "Opening hours are 7:00 to 19:00 daily.'
+	elseif lactation['pc_aware'] > 0 and hour >= 7 and hour <= 19:
 		'The door seems open and someone is talking inside.'
 		act 'Go inside':
 			*clr & cla
@@ -1714,7 +1712,7 @@ if $ARGS[0] = 'milk_donation':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	if hour >= 10 and hour <= 19:
+	if hour >= 7 and hour <= 19:
 		lactation['nipple_cream_applied'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/mward/pumping.jpg"></center>'
 		'The employee attaches the pumps and switches them on.'
@@ -1725,7 +1723,7 @@ if $ARGS[0] = 'milk_donation':
 		end
 		act 'Continue':
 			*clr & cla
-			lact_ev['poli_milkedvolume'] = func('lact_lib','$get_breastmilk', 4, 15)
+			lact_ev['poli_milkedvolume'] = func('lact_lib','$get_breastmilk', 6, func('lact_lib','$get_breastmilk_time', 6, lactation['breastmv']/1000))
 			lactation['breastpumped'] = 1
 			'After 15 minutes, the employee detaches the pumps from your breasts.'
 			if lact_ev['poli_milkedvolume'] => 50000:
@@ -1775,7 +1773,7 @@ if $ARGS[0] = 'milk_donation':
 				'The employee looks at your breasts'
 				'Nurse: It seems there is still some milk left, do you want to donate more?'
 				act 'have your breasts pumped again': gt 'city_clinic','milk_donation'
-			else
+			elseif lactation['breastmv'] > 0:
 				act 'ask to donate more': gt 'city_clinic','milk_donation'
 			end
 			act 'enough for today':
@@ -1784,22 +1782,24 @@ if $ARGS[0] = 'milk_donation':
 				if lact_ev['poli_donationsessioncount'] > 0:
 					money += lact_ev['poli_donatemoney']
 					'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
+					  lact_ev['poli_donatemoney'] = 0
+				    lact_ev['poli_donationsessioncount'] = 0
 				else
 					'You put on your top'
 				end
 				act 'leave':
 					lact_ev['poli_milkedvolume'] = 0
-					gt 'city_clinic', 'milk_donation_room'
+					gt 'city_clinic', 'start'
 				end
 			end
 		end
 	elseif lact_ev['poli_donationsessioncount'] > 0:
 		'Sorry Ms. <<$pcs_lastname>>, we are closing now.'
 		'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
-		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'start'
 	else
-		'The milk donation service is closed. It''s open every day between 10:00 and 19:00.'
-		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
+		'The milk donation service is closed. It''s open every day between 7:00 and 19:00.'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'start'
 	end
 end
 

locations/city_dima.qsrc

@@ -14,6 +14,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Entrance to Dimas house</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
 
+	act 'Knock':gt 'event', 'dima11'
 	act 'Leave': 
 		cla
 		minut += 5

locations/city_industrial.qsrc

@@ -45,9 +45,13 @@ if $ARGS[0] = '':
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
 	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
 
-	act 'Wait':gs 'obj_din', 'wait'
+  act 'Metro Station (0:05)':minut += 5 & gt 'metro','start' 
+	act 'Train Station (0:15)':minut += 15 & gt 'city_industrial_train','outside'
+  act 'Central Park (1:00)':minut += 60 & gt 'city_park','start'
 
 	gs 'taxi'
+	
+  act 'Wait':gs 'obj_din', 'wait'
 
 	if car > 0:
 		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):

locations/city_industrial_train.qsrc

@@ -235,7 +235,7 @@ end
 
 if $ARGS[0] = 'pavlovsk':
 	$loc = 'pav_train_hall'
-	$loc_arg = 'platform'
+	$loc_arg = ''
 	menu_off = 1
 	minut += 35
 	if rand(1, 100) < 15: gt 'train', 'private'

locations/city_island.qsrc

@@ -49,6 +49,8 @@ if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF
 
 act 'Wait':gs 'obj_din', 'wait'
 
+act 'Metro Station (0:05)': minut += 5 & gt 'metro','start'
+
 gs 'taxi'
 gs 'camera', 'check_location'
 

locations/city_lake.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+	if PCloSwimwear = 0:
 		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path leading to the railway station in the industrial region. You should get dressed into your clothes if you want to go there.'
@@ -780,6 +780,26 @@ if $ARGS[0] = 'walklake2':
 				'You don''t want to talk with them and start walking out of the water as Stasik tries to persuade you. "Come on, babe. Do we look like savages? We just wanted to talk, but I understand if you''re frightened. I just wanted to ask you your name."'
 				act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
 
+				act 'Leave':gt 'city_lake', 'start'
+			end
+		end
+	else
+		act 'Look at them':
+			cla & *clr
+			minut += 1
+			StasikValera = 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
+			'You look at the men and notice that they are whispering to each other. Then one of the men comes up to you. He says smiling, "Hey beautiful, I am Stasik, and this is my friend Valera. What''s your name?"'
+			act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
+
+			act 'I have to go':
+				cla & *clr
+				minut += 1
+				gs 'stat'
+				'You''re not going to get acquainted with these fellows and began to leave. Stasik tries to persuade you. "Come on, babe. Do we look like savages? We just wanted to talk, but I understand if you''re frightened. I just wanted to ask you your name."'
+				act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
+
 				act 'Leave':gt 'city_lake', 'start'
 			end
 		end
@@ -971,11 +991,13 @@ if $ARGS[0] = 'stasValera4':
 	minut -= 3
 	gs 'stat'
 	act 'Get fucked':
+		*clr & cla
 		gs 'boyStat', 'A47'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(7,9)>>.jpg"></center>'
 		'Valera watches as Stasik spreads your legs and lines his dick up with your pussy. He slowly pushes into you, making you moan softly.'
 		gs 'dinsex','vaginal_sex',10
 		act 'Don''t forget Valera':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(1,6)>>.jpg"></center>'
 			'Stasik starts fucking you as Valera kneels in front of you and slides his dick into your mouth.'
 			gs 'boyStat', 'A48'
@@ -984,6 +1006,7 @@ if $ARGS[0] = 'stasValera4':
 			pose = 1
 			gs 'dinsex','sexcum'
 			act 'Finish Valera off':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(1,4)>>.jpg"></center>'
 				'Valera groans and his cock twitches in your mouth as his cum spurts into your throat. You obediently swallow all of it.'
 				gs 'boyStat', 'A48'
@@ -1112,6 +1135,7 @@ if $ARGS[0] = 'vlake1':
 					gs 'npcgeneratec', 0, 'Stranger at the lake', rand(18,45)
 					gs 'boyStat', $npclastgenerated
 					gs 'arousal', 'bj', 10, 'group'
+					gs 'arousal', 'vaginal_finger', 10, 'group'
 					gs 'arousal', 'vaginal', 10, 'group'
 					minut -= 10
 					gs 'stat'

locations/city_nightclub.qsrc

@@ -218,7 +218,11 @@ if $ARGS[0] = 'toi':
 			elseif TQuest >= 3 and rand(1, 100) < 60:
 				gt 'city_nightclub', 'tou'
 			elseif TQuest >= 3:
-				gt 'Club2', 'toilet1'
+				if rand(0,2) > 0:
+					gt 'Club2', 'toilet1'
+				else
+					gt 'Club2', 'toilet2'
+				end
 			end
 		end
 	end
@@ -231,7 +235,7 @@ if $ARGS[0] = 'tou':
 	$loc = 'club'
 	$locM = 'club'
 	$locM_arg = 'tou'
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
 	$locclass = 'restroom'
 	$menu_loc = 'club'
 	$menu_arg = 'tou'
@@ -854,7 +858,6 @@ if $ARGS[0] = 'sex':
 		cla
 		*clr
 		guy += 1
-		pcs_vag += 1
 		cumprecheck = 1
 		gs 'cum_manage'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/clubsex.jpg"></center>'

locations/city_residential.qsrc

@@ -86,10 +86,20 @@ if home_owned[1] > 0:
 	end
 end
 
+act 'Metro Station (0:05)':minut += 5 & gt 'metro','start' 
+act 'Central Park (0:20)':minut += 20 & gt 'city_park','start'
+act 'Lake (0:40)':minut += 40 & gt 'city_lake','start'
+
+gs 'taxi'
+
 act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
+if hour >= 8 and hour <= 9 and workrin = 1 and (week = 2 or week = 4 or week = 6): act 'Work at the Market':minut += 10 & gt 'city_market','start'
+if hour >= 11 and hour <= 12 and week > 1 and week < 5 and workKafe = 1: act 'Work at the Roadhouse':minut += 5 & gt 'city_kafe', 'work'
+if clener >= 1 and hour >= 7 and hour <= 22: act 'Clean the Office':minut += 5 & gt 'city_smalloffice','start'
+
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$loc = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
 	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kat''s</a> apartment'
@@ -116,10 +126,11 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> station is a 5 minute walk away.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
-if (hour >= 8 and hour <= 20) or preg = 2:
+if (hour >= 7 and hour <= 20) or preg = 2:
 	'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
+	act 'Go to the clinic': gt 'city_clinic','start'
 else
-	'The clinic is close. It will open at 08:00.'
+	'The clinic is close. It will open at 07:00.'
 end
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:
 	'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'

locations/city_suburbs.qsrc

@@ -12,9 +12,10 @@ if $ARGS[0]='start':
 	'<center><H4>Elite settlement<H4></center>'
 	'<left><img <<$set_imgh>> src="images/locations/city/suburb/settlement.jpg" ></left>'
 
+	act 'Go to the main road':nroad = 1 & minut += 15 & gt 'road'
 	if car > 0 and cardrive = 28:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands on the street.'
 
-    if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minut walk from here.'
+	if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minut walk from here.'
 
 	gs 'taxi'
 
@@ -36,11 +37,10 @@ if $ARGS[0]='start':
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit Matryona Mansion': gt 'city_mansion_entrance'
 	end
+
 	act 'View the insane asylum': minut += 2 & gt 'city_suburbs', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
-	act 'Go to the main road':nroad = 1 & minut += 15 & gt 'road'
-
 	if AlexandriaQW = 6:
 		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -52,6 +52,9 @@ if $ARGS[0]='start':
 			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
+
+	act 'Metro Station (0:05)':minut += 5 & gt 'metro','start' 
+	gs 'taxi'
 end
 
 if $ARGS[0]='ps1':

locations/city_trademission.qsrc

@@ -38,54 +38,52 @@ if svQW = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
 			'You head into the office to get paid, Stat is pleased with your work and hands 500 <b>₽</b> over to you.'
 
-			if npc_sex['A50'] = 0:
-				if TPworkTimes >= 3 and TPmainQW = 0 and mesec = 0:
-					if PCloSkirt > 0:
-						'Stas asks, "How do you like it so far, do you enjoy working for me?"'
-
-						act 'I like it':
+			if TPworkTimes >= 3 and TPmainQW = 0 and mesec = 0:
+				if PCloSkirt > 0:
+					'Stas asks, "How do you like it so far, do you enjoy working for me?"'
+
+					act 'I like it':
+						cls
+						TPmainQW = 1
+						minut += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stas.jpg"></center>'
+						'You think about it for a moment, "It''s pretty great I love my job, thank you again for hiring me." Stas nods and smiles, "Our company is still expanding and for a bright young thing like you, there will be lots of opportunities. Why don''t you come to the cafe with me and we can discuss about it."'
+
+						act 'Agree':
 							cls
-							TPmainQW = 1
-							minut += 5
+							minut += 15
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
-							'You think about it for a moment, "It''s pretty great I love my job, thank you again for hiring me." Stas nods and smiles, "Our company is still expanding and for a bright young thing like you, there will be lots of opportunities. Why don''t you come to the cafe with me and we can discuss about it."'
-
-							act 'Agree':
-								cls
-								minut += 15
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
-								'You happily accept, "That sounds wonderful." You know your new job and any future prospects depends completely on his opinion, and you would like to keep him on his good side.'
-								'Stas is delighted and takes you to the cafe, on the way there you get to talk about work. Once at the cafe Stas pulls a chair out for you.'
-
-								act 'Take a seat': gt 'StasQW'
-							end
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stas.jpg"></center>'
+							'You happily accept, "That sounds wonderful." You know your new job and any future prospects depends completely on his opinion, and you would like to keep him on his good side.'
+							'Stas is delighted and takes you to the cafe, on the way there you get to talk about work. Once at the cafe Stas pulls a chair out for you.'
+
+							act 'Take a seat': gt 'StasQW'
 						end
+					end
+
+					act 'It''s okay':
+						cls
+						TPmainQW = 1
+						minut += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stas.jpg"></center>'
+						'You tell Stas how it is, "The work is ok, it is nice having steady work." Stas grins, "Our company is still expanding and for a bright young thing like you, there will be lots of opportunities. Why don''t you come to the cafe with me and we can discuss about it."'
 
-						act 'It''s okay':
+						act 'Agree':
 							cls
-							TPmainQW = 1
-							minut += 5
+							minut += 15
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
-							'You tell Stas how it is, "The work is ok, it is nice having steady work." Stas grins, "Our company is still expanding and for a bright young thing like you, there will be lots of opportunities. Why don''t you come to the cafe with me and we can discuss about it."'
-
-							act 'Agree':
-								cls
-								minut += 15
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
-								'You happily accept, "That sounds wonderful." You know your new job and any future prospects depends completely on his opinion, and you would like to keep him on his good side.'
-								'Stas is delighted and takes you to the cafe, on the way there you get to talk about work. Once at the cafe Stas pulls a chair out for you.'
-
-								act 'Take': gt 'StasQW'
-							end
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stas.jpg"></center>'
+							'You happily accept, "That sounds wonderful." You know your new job and any future prospects depends completely on his opinion, and you would like to keep him on his good side.'
+							'Stas is delighted and takes you to the cafe, on the way there you get to talk about work. Once at the cafe Stas pulls a chair out for you.'
+
+							act 'Take': gt 'StasQW'
 						end
 					end
-
-					exit
 				end
+
+				exit
 			end
 
 			if TPmainQW = 1:
@@ -102,36 +100,31 @@ if svQW = 2:
 	if TPmainQW = 1 and npc_sex['A50'] > 0 and StVaGang = 0:
 		'As Stas notices you, he smiles broadly and is obviously pleased to see you. He leans in close and whispers, as not to be overheard, "I really like you and I want us to start dating."'
 
-		if bfa >= 1:
-			'You''re not that sure your current boyfriend would be pleased if you accepted this offer. Stas, of course, is very nice and kind, but you need to first figure out what to do with your current relationship.'
-		elseif bfa < 1:
-			act 'Agree':
-				'You smile, "I would love to start dating you." He jumps for joy and promises to call you soon to set up a date.'
-				TPmainQW = 2
-				gs 'boyStat', 'A50'
-				boybodyrand = 1
-				$boybody = 'high'
-				boybodrand = 1
-				$boybod = 'thin'
-				boyfacerand = 3
-				$boyface = 'blond'
-				harakBoy = 1
-				finance = 1
-				vneshBoy = 1
-				$boyClo = 'dressed in jeans and a sweater.'
-				figurBoy = rand(0, 2)
-				titBoy = rand(0, 2)
-				hairBoy = rand(0, 3)
-				izvrat = 0
-				gs 'boyfrend', 'start'
-				stopboy = 0
-				bfa = 70
-				boyonceA = 1
-				cla
-				gs 'stat'
+		act 'Agree':
+			'You smile, "I would love to start dating you." He jumps for joy and promises to call you soon to set up a date.'
+			TPmainQW = 2
+			gs 'boyStat', 'A50'
+			boybodyrand = 1
+			$boybody = 'high'
+			boybodrand = 1
+			$boybod = 'thin'
+			boyfacerand = 3
+			$boyface = 'blond'
+			harakBoy = 1
+			finance = 1
+			vneshBoy = 1
+			$boyClo = 'dressed in jeans and a sweater.'
+			figurBoy = rand(0, 2)
+			titBoy = rand(0, 2)
+			hairBoy = rand(0, 3)
+			izvrat = 0
+			gs 'boyfrend', 'start'
+			stopboy = 0
+			boyonceA = 1
+			cla
+			gs 'stat'
 
-				act 'Leave': gt 'city_smalloffice', 'start'
-			end
+			act 'Leave': gt 'city_smalloffice', 'start'
 		end
 
 		act 'I need to think about it':

locations/city_train.qsrc

@@ -1,6 +1,6 @@
 # city_train
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'start' or $ARGS = 'inside':
 	$loc_arg = 'start'
 	$loc = 'city_train'
 	$location_type = 'public_outdoors'
@@ -43,7 +43,7 @@ if $ARGS[0] = 'tickets':
 	end
 
 	if money >= 1500 and Trainpass_day <= daystart:
-		act 'Buy a weekly pass  (7 days - 1500 <b>₽</b>) ':
+		act 'Buy a weekly pass (7 days - 1500 <b>₽</b>) ':
 			cla
 			menu_off = 1
 			money -= 1500
@@ -53,7 +53,7 @@ if $ARGS[0] = 'tickets':
 	end
 
 	if money >= 5500 and Trainpass_day <= daystart:
-		act 'Buy a monthly pass (30day -  5500 <b>₽</b>)':
+		act 'Buy a monthly pass (30day - 5500 <b>₽</b>)':
 			cla
 			menu_off = 1
 			money -= 5500
@@ -129,7 +129,7 @@ end
 
 if $ARGS[0] = 'ind':
 	$loc = 'city_industrial_train'
-	$loc_arg = 'platform'
+	$loc_arg = 'inside'
 	menu_off = 1
 	minut += 5
 	gs 'stat'
@@ -178,7 +178,7 @@ end
 
 if $ARGS[0] = 'pavlovsk':
 	$loc = 'pav_train_hall'
-	$loc_arg = 'platform'
+	$loc_arg = ''
 	menu_off = 1
 	minut += 40
 	if rand(1, 100) < 15: gt 'train', 'private'

locations/city_trashplace.qsrc

@@ -89,7 +89,7 @@ $bomzstartqwestdi = {
 						minut += 15
 						gs 'stat'
 
-						if $ARGS[1] = 'suspicious':
+						if podozrenie = 1:
 							'Uncle Nick goes to the manager and whispers something in his ear.'
 
 							if film > 0:
@@ -256,29 +256,31 @@ if musor > 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
 		'You throw your trash into one of the bins.'
 		
-		if bomjqw > 0:
-			'"Hey, babe, come over here, show an old man some service!" you hear in an impudent rattle.'
-			'This is an old homeless man, you saw him last time.'
-			act 'See the homeless man':gt'city_trashplaceevents','pos10'
-		end
-			
-		if bumtolik = 0:
-			'"Hey, there!" You hear from the bins.'
-			'You are scared and surprised.'
+		if rand(0,1) = 0:
+			if bomzQW > 0:
+				'"Hey, babe, come over here, show an old man some service!" you hear in an impudent rattle.'
+				'This is an old homeless man, you saw him last time.'
+				act 'See the homeless man':gt'city_trashplaceevents','pos10'
+			end
+		else	
+			if bumtolik = 0:
+				'"Hey, there!" You hear from the bins.'
+				'You are scared and surprised.'
 
-			act 'See who spoke':gt'city_trashplaceevents','pos2'
-		elseif bumtolik = 1:
-			'"Hey, babe, come here, do an old man a favor!"'
-			'Wheezes the old bum you saw last time.'
+				act 'See who spoke':gt'city_trashplaceevents','pos2'
+			elseif bumtolik = 1:
+				'"Hey, babe, come here, do an old man a favor!"'
+				'Wheezes the old bum you saw last time.'
 
-			act 'Listen to the homeless man':gt'city_trashplaceevents','pos3'
+				act 'Listen to the homeless man':gt'city_trashplaceevents','pos3'
+			end
 		end
 
 		act 'Move away from the tank':gt $loc, $loc_arg
 	end
 end
 
-if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
+if bomzlQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 	*clr & cla
 	menu_off = 1
 	gs'stat'
@@ -287,7 +289,7 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 	'"Girl, it''s national give 300 <b>₽</b> to a bum day, so come on then.'
 
 	if money >= 300:
-		act 'Yeah, that''s a thing':
+		act 'Happy to help':
 			*clr & cla
 			money -= 300
 			gs'stat'
@@ -298,39 +300,31 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 		end
 	end
 
-	act 'No':
-		*clr & cla
-		gs 'stat'
+	if bomzQW = 0:
+		act 'No':
+			*clr & cla
+			gs 'stat'
 
-		if $start_type[1] = 'tg':
 			if daystart < 10 or stat['vaginal'] <= 2:
-				'"I''d love to, but I don''t have much money." Hell, you''re not even accustomed to your new body, but you take care not to say anything.'
+				'"I''d love to, but I don''t have much money."'
 				'"Are you alright?" He looks you up and down.'
 
 				act 'No':
 					*clr & cla
 					gs'stat'
-					podozrenie += 1
-
-					'"No, you just ogle away."'
-					'The bum looks at you with suspicion.'
-
+					podozrenie = 1
 					dynamic $bomzstartqwestdi
 				end
 			else
-				'"I''d love to, but I don''t have that kind of money, who does?"'
+				'"I''d love to help, but I don''t have that kind of money."'
 
 				dynamic $bomzstartqwestdi
 			end
-		else
-			'"I''m sorry mister, but I don''t have that kind of money."'
-
-			dynamic $bomzstartqwestdi
 		end
 	end
 	act 'Get lost':
 		*clr & cla
-		bomzQW = -10
+		bomzlQW = 1
 		gs'stat'
 
 		'"You should not be so rude to me. I meet a lot of people, and I know a lot of things. This may come back to haunt you, when you least expect it.'
@@ -342,7 +336,7 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 end
 
 !Hobos gangbang
-if bomzQW = -10 and rand(0,5) = 0:
+if bomzlQW = 1 and rand(0,5) = 0:
 	*clr
 	cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/street/drinkinghobos.jpg"></center>'

locations/city_trashplaceevents.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'pos2':
 	*clr & cla
-	bumtolik = 1
+	if bumtolik = 0: bumtolik = 1
 	minut += 5
 	menu_off = 1
 	gs'stat'
@@ -15,7 +15,7 @@ end
 
 if $ARGS[0] = 'pos3':
 	*clr & cla
-	bumtolik = 2
+	if bumtolik = 1: bumtolik = 2
 	minut += 5
 	menu_off = 1
 	gs'stat'
@@ -49,7 +49,7 @@ end
 if $ARGS[0] = 'pos5':
 	*clr & cla
 	minut += 5
-	bumtolik = 2
+	if bumtolik = 1: bumtolik = 2
 	money -= 20
 	menu_off = 1
 	gs'stat'
@@ -66,7 +66,7 @@ end
 if $ARGS[0] = 'pos6':
 	*clr & cla
 	minut += 5
-	bumtolik = 2
+	if bumtolik = 1: bumtolik = 2
 	money -= 100
 	menu_off = 1
 	gs'stat'
@@ -104,7 +104,7 @@ end
 if $ARGS[0] = 'pos8':
 	*clr & cla
 	minut += 5
-	bumtolik = 3
+	if bumtolik = 2: bumtolik = 3
 	menu_off = 1
 	gs'stat'
 
@@ -145,7 +145,7 @@ end
 if $ARGS[0] = 'pos9':
 	*clr & cla
 	minut += 5
-	bumtolik = 4
+	if bumtolik = 3: bumtolik = 4
 	menu_off = 1
 	gs'stat'
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'pos10':
 		gs 'arousal', 'flash', -10
 		gs 'stat'
 		
-		if bomjqw > 0:
+		if bomzQW > 0:
 			'The homeless man asks, "Thank you very much once again, but if you agree to one more service...'
 			'"What service?"'
 			'"Could you help an old man with your lovely mouth? I''ll pay 150 <b>₽</b>, well, what do you say?"'
@@ -249,12 +249,12 @@ if $ARGS[0] = 'pos10':
 						dick = 14
 						money += 300
 						bomjshet += 1
-						gs 'cum_call', 'vaginal', 'hobo'
+						gs 'cum_call', 'anal', 'hobo'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/old1,'+rand(0,2)+'.jpg"></center>'
 						'It is not your first time dealing with such people. You have already learned to overcome any aversion. So you decide to give the homeless man something a little better to just a blowjob.
 						You take off your panties and throw them to the homeless. He is, of course, shocked by this. But the shock does not last long. After throwing off his pants full of holes, the old man moves to you.'
 						
-						gs 'arousal', 'vaginal', 15, 'prostitution'
+						gs 'arousal', 'anal', 15, 'prostitution'
 						gs 'arousal', 'end'
 						gs 'stat'
 					

locations/dachi.qsrc

@@ -22,9 +22,9 @@ end
 'At the alley entrance dug into the ground is a <a href="exec:gt ''etoexhib'', ''pos7''">column with ads</a>.'
 'At the end of the alley there is <a href="exec:gt ''etoexhib'', ''pos6''">a spring with spring water</a>.'
 
-act 'Go to the highway':minut += 15 & nroad = 5 & gt 'road'
 
 if home_owned[3] > 0:
+  act 'Go home': gt 'dachamy', 'start'
 	'Enter <a href="exec:gt ''dachamy'', ''start''">your yard</a>.'
 	'Across the street from your cottage is another <a href="exec:gt ''etoexhib'', ''pos8''">cottage</a> almost identical to yours.'
 	if hour = meethour:
@@ -51,7 +51,10 @@ end
 
 if etoexhib < 13:'You feel a slight presence of magic.'
 
+act 'Go to spring': gt 'etoexhib', 'pos6'
 act 'Stroll through the alleys':gt 'etoexhib', 'pos2'
 
+act 'Go to the highway':minut += 15 & nroad = 5 & gt 'road'
+
 --- dachi ---------------------------------
 

locations/dibodi.qsrc

@@ -5,11 +5,11 @@ menu_off = 1
 if $ARGS[0] = 'os1':
 	*clr & cla
 	gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/artstudio/downud1.jpg"></center>'
-    'You are taken aback by all the naked people, with their bodies only covered by body paint.'
-    'One of the painted naked girls approaches you. "Hello, sorry for being so forward, but we could really use your participation right now, and perhaps if you like it, we could even take you to participate in some of our other shows."'
-    '"Huozhnik Moses Kruzhinsky is a very talented artist. As you can see, it''s not just us girls participating. There are guys here too," she says pointing some of them out.'
-    '"So what do you say? Would you like to join us?"'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/artstudio/downud1.jpg"></center>'
+	'You are taken aback by all the naked people, with their bodies only covered by body paint.'
+	'One of the painted naked girls approaches you. "Hello, sorry for being so forward, but we could really use your participation right now, and perhaps if you like it, we could even take you to participate in some of our other shows."'
+	'"Huozhnik Moses Kruzhinsky is a very talented artist. As you can see, it''s not just us girls participating. There are guys here too," she says pointing some of them out.'
+	'"So what do you say? Would you like to join us?"'
 	if pcs_inhib < 50:'You consider it. Having your naked body painted and then walking around in public sounds a little shameful, but it''d be really interesting too.'
 	act 'Decline':bodimodel1 = 1 & gt'ugol'
 	act 'Doubt':gt 'dibodi', 'bodiart1'
@@ -21,15 +21,15 @@ if $ARGS[0] = 'bodiart':
 	gs'stat'
 	bodimodel = 1
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/artstudio/downud1.jpg"></center>'
-    '"I''m so glad, you agreed. That''s Moses Kruzhinsky over there, though everyone just calls him Masya," she says, pointing at a man painting a girl. "My name is Galina."'
-    'She turns back to the artist waving her arms and cries, "Masya, there is a new girl here that would be perfect for your work." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his current work.'
-    if lesbian > 0:
-    	'Galina chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to what she says as you find yourself staring at her chest.'
-    	'After a few minutes, perhaps noticing you paying more attention to her body than to what she is saying she falls silent.'
- 	   'Several minutes of silence pass before she speaks again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
+	'"I''m so glad, you agreed. That''s Moses Kruzhinsky over there, though everyone just calls him Masya," she says, pointing at a man painting a girl. "My name is Galina."'
+	'She turns back to the artist waving her arms and cries, "Masya, there is a new girl here that would be perfect for your work." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his current work.'
+	if lesbian > 0:
+		'Galina chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to what she says as you find yourself staring at her chest.'
+		'After a few minutes, perhaps noticing you paying more attention to her body than to what she is saying she falls silent.'
+ 	 'Several minutes of silence pass before she speaks again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
  	else
  		'Galina chats about a variety of things, using her hands to gesture often. However after a few minutes, she tells you, "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
-    end
+	end
 	act 'Leave': gt'ugol'
 end
 
@@ -38,21 +38,21 @@ if $ARGS[0] = 'bodiart1':
 	gs'stat'
 	bodimodel = 1
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/artstudio/downud1.jpg"></center>'
-    '"I understand your reluctance, but you shouldn''t be worried. Moses Kruzhinsky is a great artist,"
-     she says, pointing to a man painting a girl. "Everyone just calls him Masya though. My name is Galina."'
-    'You listen to her and tell her, "I have done photo shoots before, but this," you gesture at the other models, "this is a bit different. I''m not sure I''m ok being naked in public in a crowd of people."'
-    '"Don''t worry about it," says Galina, "even if we are completely naked, you don''t have to worry about rape or anything like that happening to you. We all watch out for one another, and we will make sure no one bothers you. We all make sure no one bothers anyone. We are we almost like one big family."'
-    'Then she turns back to the artist waving her arms and cries, "Masya, there is a new girl for your work who in my opinion would be perfect." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his work.'
-    if lesbian > 0:
-        'She chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to her as you find yourself staring at her chest.'
-        'After a bit, perhaps noticing you watching her body more than paying attention to her, she falls silent.'
-        'Several minutes of silence pass before she speaks up again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
+	'"I understand your reluctance, but you shouldn''t be worried. Moses Kruzhinsky is a great artist,"
+	 she says, pointing to a man painting a girl. "Everyone just calls him Masya though. My name is Galina."'
+	'You listen to her and tell her, "I have done photo shoots before, but this," you gesture at the other models, "this is a bit different. I''m not sure I''m ok being naked in public in a crowd of people."'
+	'"Don''t worry about it," says Galina, "even if we are completely naked, you don''t have to worry about rape or anything like that happening to you. We all watch out for one another, and we will make sure no one bothers you. We all make sure no one bothers anyone. We are we almost like one big family."'
+	'Then she turns back to the artist waving her arms and cries, "Masya, there is a new girl for your work who in my opinion would be perfect." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his work.'
+	if lesbian > 0:
+		'She chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to her as you find yourself staring at her chest.'
+		'After a bit, perhaps noticing you watching her body more than paying attention to her, she falls silent.'
+		'Several minutes of silence pass before she speaks up again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
 	else
  		'Galina chats about a variety of things, using her hands to gesture often. However after a few minutes, she tells you, "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
 	end
 	act 'Refuse':bodimodel1 = 1 & gt'ugol'
-    act 'I''ll think about it':bodimodel2 = 1 & gt'ugol'
-    if pcs_inhib > 30: act 'Agree':gt'ugol'
+	act 'I''ll think about it':bodimodel2 = 1 & gt'ugol'
+	if pcs_inhib > 30: act 'Agree':gt'ugol'
 end
 
 if $ARGS[0] = 'sgtusa':
@@ -60,34 +60,35 @@ if $ARGS[0] = 'sgtusa':
 	gs'stat'
 	tusa = 1
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/photo.jpg"></center>'
-    'You walk over to a group of girls and boys talking and introduce yourself.'
-    'You are surprisingly well received.'
+	'You walk over to a group of girls and boys talking and introduce yourself.'
+	'You are surprisingly well received.'
 	act 'Continue': gt'liames'
 end
 
 if $ARGS[0] = 'sotusa':
-    *clr & cla
+	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/photo.jpg"></center>'
-	if sttan = 0 and $pantyworntype = 'none':
-	    sttan = 1
-	    '"Hey <<$pcs_nickname>>, what''s with the no panties?" The crowd laughs out loud, noticing your lack of underwear.'
-	    act 'Continue':gt'liames'
+	if $pantyworntype = 'none':
+		if sttan = 0: sttan = 1
+		'"Hey <<$pcs_nickname>>, what''s with the no panties?" The crowd laughs out loud, noticing your lack of underwear.'
 	end
+	act 'Continue':gt'liames'
 end
 
 if $ARGS[0] = 'sptusa':
-    *clr & cla
+	*clr & cla
 	arts = 1
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pushkin/marinka/marinka.jpg"></center>'
 	'You ask Marinka whether Masya''s studio is around here. In response, Marinka nods her head, "Yes, it''s in the courtyard at the other end of that passage over there."'
 	act 'You live around here?':
-		cla
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/marinka/marinka.jpg"></center>'
 		'"Yes," Marinka says.'
 		act 'Say goodbye and leave': gt 'liam'
-    end    
+	end
 end
 
 --- dibodi ---------------------------------

locations/din_van.qsrc

@@ -55,6 +55,7 @@ $bteeth = {
 				play 'sound/brushteeth.mp3',100
 			else
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brushteeth.jpg"></center>'
+				play 'sound/brushteeth.mp3',100
 			end
 			*nl
 			'You brush your teeth and now they are clean and minty fresh.'
@@ -112,7 +113,7 @@ $shower = {
 			act 'Examine yourself closer while drying off and getting dressed...': gt 'din_van', 'buffpick'
 		end
 
-		if lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:
+		if lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0 and lactation['lactmess'] >= 3:
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'As you clean your breasts, something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularly probably made you lactate!'
 				lactation['induced'] = 1
@@ -172,12 +173,8 @@ $shower = {
 				gs 'arousal', 'clit_vibe', 10, 'masturbate'
 				gs 'arousal', 'end'
 
-				if hypnoAddict ! 0:
-					'You unconsciously avoid spraying water into your vagina.'
-				else
-					cumspclnt = 8
-					gs 'cum_cleanup'
-				end
+				cumspclnt = 8
+				gs 'cum_cleanup'
 
 				dynamic $dryOff
 			end
@@ -543,25 +540,23 @@ $tampon = {
 }
 
 $quickwash = {
-	if spdirty > 0:
-		act 'Quick wash (0:15)':
-			menu_off = 1
-			*clr & cla
-
-			cumspclnt = 4
-			gs 'cum_cleanup'
-			if pcs_sweat < 30:
-				pcs_sweat = 15 + rand(0,4)
-			else
-				pcs_sweat -= 10 + rand(0,4)
-			end
-			minut += 15
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash5.jpg"></center>'
-			*nl
-			'You give yourself a catlick, thus removing any traces of cum.'
+	act 'Quick wash (0:15)':
+		menu_off = 1
+		*clr & cla
 
-			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
+		cumspclnt = 4
+		gs 'cum_cleanup'
+		if pcs_sweat < 30:
+			pcs_sweat = 15 + rand(0,4)
+		else
+			pcs_sweat -= 10 + rand(0,4)
 		end
+		!!minut += 15
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash5.jpg"></center>'
+		*nl
+		'You give yourself a catlick, thus removing any traces of cum.'
+
+		act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 	end
 
 	gs 'din_van', 'pblc_pee'
@@ -856,6 +851,7 @@ $basin = {
 	end
 }
 
+
 $pirManage = {
 	gt 'piercing_management', 'main'
 }
@@ -935,7 +931,7 @@ $toymanage = {
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif vibrator = 1 and vibratorIN = 0 and pcs_vag ! 0:
+	elseif vibrator = 1 and vibratorIN = 0 and stat['vaginal'] ! 0:
 		act 'Insert the vibrator in your vagina (0:05)':
 			menu_off = 1
 			cla

locations/dina.qsrc

@@ -117,12 +117,12 @@ $rexpot = {
 $hypnoDaychange = {
 	!!if for some reason hypnoTime is too high
 	if hypnoTime > 15:hypnoTime = 15
-	timeTresh = 76 - 4*hypnoType
+	timeTresh = 76 - 4*hypnoTime
 	!!Withdrawal effect begings if too strong influence and no visitation
 	if daystart-hypnoDay > 7:
 		if hypnoAddict = 1:
 			hypnoWithdrawal = 1
-		elseif hypnoAddict = 2:
+		elseif hypnoAddict >= 2:
 			hypnoWithdrawal = 2
 		end
 	end
@@ -138,23 +138,31 @@ $hypnoDaychange = {
 				hypnoTime -= 1
 				if hypnoTime < 7:hypnoAddict = 0 & hypnoWithdrawal = 0
 			end
-		else
+		elseif hypnoAddict = 2:
 			if rand(0,4) = 0:
 				hypnoStrength = 19
 				hypnoTime -= 1
 				if hypnoTime < 10:hypnoAddict = 1 & hypnoBlock = 0 & hypnoWithdrawal = 1
 			end
+		else
+			if rand(0,8) = 0:
+				hypnoStrength = 19
+				hypnoTime -= 1
+				if hypnoTime < 13:hypnoAddict = 2 & hypnoBlock = 0 & hypnoWithdrawal = 2
+			end
 		end
 	end
 }
 
 $hypnoAddiction = {
-	if cumloc[0] = 1 or cumloc[3] = 1:
+	if cumloc[0] = 1 or cumloc[3] = 1 or cumloc[12] = 1:
 		killvar 'missCum'
 		if hypnoAddict = 1:
 			pcs_mood += 5
-		else
+		elseif hypnoAddict = 2:
 			pcs_mood += 10
+		else
+			pcs_mood += 20
 		end
 	else
 		missCum += 1
@@ -164,15 +172,18 @@ $hypnoAddiction = {
 		if hypnoAddict = 1:
 			pcs_mood -= 5
 			pcs_horny += 10
-		else
+		elseif hypnoAddict = 2:
 			pcs_mood -= 10
 			pcs_horny += 20
+		else
+			pcs_mood -= 20
+			pcs_horny += 40
 		end
 	end
 
 	if hypnoWithdrawal > 0:
 		if hypnoWithdrawal = 1:
-			if missCum >= timeTresh:
+			if missCum > timeTresh:
 				sprt_deg -= 2*hypnoAddict
 				pcs_mood -= 10
 			else

locations/etoexhib.qsrc

@@ -199,6 +199,8 @@ if $ARGS[0] = 'pos6':
 	'<center><img <<$set_imgh>> src="images/locations/suburban/rodnik.jpg"></center>'
 	'Spring water.'
 
+  act 'Leave':gt 'dachi'
+
 	act 'Drink from the spring':
 		if pcs_hydra >= 90:
 			'You are not thirsty.'
@@ -211,9 +213,9 @@ if $ARGS[0] = 'pos6':
 		end
 
 		act 'Leave':gt 'dachi'
-	end
 
-	act 'Leave':gt 'dachi'
+    gs 'treeCircEntry', 'Village'
+	end
 
 	gs 'treeCircEntry', 'Village'
 end
@@ -449,7 +451,7 @@ if $ARGS[0] = 'pos14':
 	'<center><img <<$set_imgh>> src="images/locations/suburban/sex/event/dachagang2.jpg"></center>'
 	'The drunk workers have surrounded you.'
 	'"Look, here is our princess! You''re just in time for fun, come on guys, our hostess needs some love!"'
-	'You:"<font color="magenta">What are you doing?/font>"'
+	'You:"<font color="magenta">What are you doing?</font>"'
 
 	act 'Next':
 		cla

locations/exercise.qsrc

@@ -27,6 +27,15 @@ if $ARGS[0] = 'workout':
 	exer_menu = 0
 	gs 'exercise', 'routines'
 	clothesAtLocation = FUNC('lost_clothes_here',$loc)
+	if $clothingworntype = 'nude' or $clothingworntype = 'danilovich_outfits':
+		if exer_stam[1] ! 0 and pcs_stam > exer_stam[1]: act '<<$excer_name[1]>> - (<<exer_stam[1]>> stamina)': exercisex = 1 & gt 'exercise', 'auto'
+		if exer_stam[2] ! 0 and pcs_stam > exer_stam[2]: act '<<$excer_name[2]>> - (<<exer_stam[2]>> stamina)': exercisex = 2 & gt 'exercise', 'auto'
+		if exer_stam[3] ! 0 and pcs_stam > exer_stam[3]: act '<<$excer_name[3]>> - (<<exer_stam[3]>> stamina)': exercisex = 3 & gt 'exercise', 'auto'
+		if exer_stam[4] ! 0 and pcs_stam > exer_stam[4]: act '<<$excer_name[4]>> - (<<exer_stam[4]>> stamina)': exercisex = 4 & gt 'exercise', 'auto'
+		if exer_stam[5] ! 0 and pcs_stam > exer_stam[5]: act '<<$excer_name[5]>> - (<<exer_stam[5]>> stamina)': exercisex = 5 & gt 'exercise', 'auto'
+	else
+		'<b>You need to equip the proper attire before you can exercise</b>'
+	end
 	if $clothingworntype = 'nude' and clothesAtLocation = 1:
 		act 'End workout and get dressed':
 			cla
@@ -41,17 +50,8 @@ if $ARGS[0] = 'workout':
 			gt $loc, $loc_arg
 		end
 	end
-	if $clothingworntype = 'nude' or $clothingworntype = 'danilovich_outfits':
-		act 'Manual routines': gt 'exercise', 'manual'
-		act 'Define routines': gt 'exercise', 'setup'
-		if exer_stam[1] ! 0 and pcs_stam > exer_stam[1]: act '<<$excer_name[1]>> - (<<exer_stam[1]>> stamina)': exercisex = 1 & gt 'exercise', 'auto'
-		if exer_stam[2] ! 0 and pcs_stam > exer_stam[2]: act '<<$excer_name[2]>> - (<<exer_stam[2]>> stamina)': exercisex = 2 & gt 'exercise', 'auto'
-		if exer_stam[3] ! 0 and pcs_stam > exer_stam[3]: act '<<$excer_name[3]>> - (<<exer_stam[3]>> stamina)': exercisex = 3 & gt 'exercise', 'auto'
-		if exer_stam[4] ! 0 and pcs_stam > exer_stam[4]: act '<<$excer_name[4]>> - (<<exer_stam[4]>> stamina)': exercisex = 4 & gt 'exercise', 'auto'
-		if exer_stam[5] ! 0 and pcs_stam > exer_stam[5]: act '<<$excer_name[5]>> - (<<exer_stam[5]>> stamina)': exercisex = 5 & gt 'exercise', 'auto'
-	else
-		'<b>You need to equip the proper attire before you can exercise</b>'
-	end
+	if $clothingworntype = 'nude' or $clothingworntype = 'danilovich_outfits':act 'Manual routines': gt 'exercise', 'manual'
+	act 'Define routines': gt 'exercise', 'setup'
 end
 
 if $ARGS[0] = 'auto':

locations/family.qsrc

@@ -59,6 +59,7 @@ if mid($start_type,1,2) = 'sg':
 
 	if sister_indorf = 0 and $loc = 'pav_commcenter' and anyaloc = 10:
 		'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
+		act 'Talk to your sister': gt 'sister','pav_commcenter'
 	end
 
 	if indorf = 0:
@@ -76,22 +77,29 @@ if mid($start_type,1,2) = 'sg':
 			if kolloc = 2 and brothermorningsex = daystart:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
+				act 'Talk to Kolka': gt 'brother','start'
 			elseif kolloc = 1:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
+				act 'Talk to Kolka': gt 'brother','start'
 			elseif kolloc = 7:
 				ocpd_room = 1
 				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
+				act 'Talk to Kolka': gt 'brother','start'
 			elseif kolloc = 11:
 				ocpd_room = 1
 				if momloc = 19 and sdadloc = 10:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
+					act 'Talk to Kolka': gt 'brother','start'
 				elseif momloc = 19:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
+					act 'Talk to Kolka': gt 'brother','start'
 				elseif sdadloc = 10:
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
+					act 'Talk to Kolka': gt 'brother','start'
 				else
 					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+					act 'Talk to Kolka': gt 'brother','start'
 				end
 			end
 
@@ -101,6 +109,7 @@ if mid($start_type,1,2) = 'sg':
 					''
 				else
 					'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
+					act 'Talk your stepfather': gt 'father'
 				end
 			end
 		end
@@ -108,8 +117,10 @@ if mid($start_type,1,2) = 'sg':
 		if $loc = 'gschool_grounds':
 			if week = 5 and kolloc = 6:
 				'You wonder if your <a href="exec:gt ''brother'', ''start''">brother</a> is one of the kids yelling.'
+					act 'Find Kolka': gt 'brother','start'
 			elseif (week < 6 and kolloc = 6) or ((week >= 6 or kanikuli > 0) and kolloc = 9):
 				'You see your <a href="exec:gt ''brother'', ''start''">brother</a> play football by the field near the school.'
+					act 'Talk to Kolka': gt 'brother','start'
 			end
 		end
 	end

locations/fight.qsrc

@@ -670,7 +670,7 @@ if $ARGS[0] = 'player':
 
 	!! If this is the Player character
 	if ARGS[2] = 0:
-		if pcs_magik > 0:
+		if MagikDostup = 0 and pcs_magik > 0:
 			act 'Cast a Spell': gs 'fight', 'spellcast'
 		end
 		if func('fight', 'AvailableTargets', 'opp') > 0:

locations/fit.qsrc

@@ -120,42 +120,7 @@ if $ARGS[0] = 'dressing room':
         end
     end
 
-	if shampoo > 0:
-		act 'Take a shower (0:15)':
-			cla
-			*clr
-			menu_off = 1
-			minut += 15
-			pcs_horny += 1
-			pcs_hairbsh = 0
-			pcs_makeup = 1
-			if pcs_inhib < 15:inhib_exp += rand(1,2)
-			dynamic $showerdin
-			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-			act 'Get out of the shower':gt 'fit', 'dressing room'
-		end
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-	end
-
-	act 'Use mirror':
-		cla
-		gt 'mirror', 'start'
-	end
-
-	act 'Change outfit':
-		cla
-		gt 'wardrobe', 'start'
-	end
-
-	if PCloswimwear = 1:
-		act 'Use the pool': gt 'bass', 'start'
-	else
-		act 'Change into swimwear': gt 'changingroom', 'view_swim_list'
-	end
+	if PCloswimwear = 1: act 'Use the pool': gt 'bass', 'start'
 
 	if abonement > 0:
 		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
@@ -198,6 +163,32 @@ if $ARGS[0] = 'dressing room':
 		end
 	end
 	
+	act 'Use mirror': cla & gt 'mirror', 'start'
+	act 'Change outfit': cla & gt 'wardrobe', 'start'
+	gs 'wardrobe', 'sports_outfit'
+	if PCloswimwear ! 1: act 'Change into swimwear': gt 'changingroom', 'view_swim_list'
+
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			menu_off = 1
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			if pcs_inhib < 15:inhib_exp += rand(1,2)
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
+			act 'Get out of the shower':gt 'fit', 'dressing room'
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
 	if deodorant > 0 and deodorant_on = 0:
 		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':