80 Commits 35b7448555 ... b532197327

Author SHA1 Message Date
  KevinSmarts b532197327 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  KevinSmarts ca2871a202 Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  julzor b6ad7bb002 [fixes] removed double shulga in shulga_home 5 years ago
  julzor 46bd6efa74 Merge branch 'master' of https://git.catrenelle.com/Blatte/glife 5 years ago
  julzor af53a4417e [fixes] fixed not being able to talk to your mother in the morning 5 years ago
  julzor eb45b1ad29 [fixes] wrong variable in martinTalk 5 years ago
  Blatte 1b7a9d0d6f [fixes] Added headline to the Pavlovsk park 5 years ago
  Blatte c11cd18066 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor 0e14560d22 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor a4e6300e35 [fixes] wrong variable in shoplifting 5 years ago
  KevinSmarts 6476cf6598 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  KevinSmarts 0f6f3e0155 [added] variables for the detective type to feed into the sentencing 5 years ago
  julzor 7eef13fa1d [fixes] participating in the running competition should require wearing exercise clothing 5 years ago
  julzor 92350d642a [fixes] dead end in police_station and other problems 5 years ago
  julzor eb76928408 [fixes] replaced missing image with an appropiate existing one 5 years ago
  sovietmercader fe0acab47b [changed] new images for gas station already sent to nutluck for next image pack 5 years ago
  julzor 614f1d1afd [fixes] lazar can only steal svetas panties if she wears some 5 years ago
  julzor 3de662758f Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor a2817bc8af [fixes] moved text below the image 5 years ago
  julzor 94ba51347c Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 years ago
  Blatte ab9856aea7 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte 0a823281bb no message 5 years ago
  KevinSmarts d3eb790278 [text edit] gadukino by karma1996969, Gshveyfab by Blatte 5 years ago
  3xpurt bd1ab79c35 [fixed] duplicate dry off actions in saunawhore, and removed unnecessary actions. 5 years ago
  3xpurt 9b56c989f0 [fixed] half a missing word in obj_din 5 years ago
  julzor 484ea6d2c7 [fixes] switching the alarm clock on/off now returns you back to your room in the sauna 5 years ago
  julzor 56f7412676 [fixes] wrong variable 5 years ago
  julzor 0ca697f20f Revert "[fixes] changed prezik to prezikcount" 5 years ago
  julzor c5b28d806c [fixes] changed prezik to prezikcount 5 years ago
  julzor 36ae8b2576 [fixes] fix from pb2eb for meynold office party happening every day 5 years ago
  julzor 5f2c98abba [fixes] fix from pb2eb for the meynold job 5 years ago
  3xpurt cab3afa4d4 [fixed] phone settings error in telefon. 5 years ago
  KevinSmarts 3bb9a96784 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 years ago
  KevinSmarts c161d5a802 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  KevinSmarts 22e7790b61 Merge branch 'master' of https://git.catrenelle.com/sandra_schulz/glife 5 years ago
  3xpurt 83815ccfac [fixed] reducing vagina shrink days error in cheatmenu_din 5 years ago
  3xpurt 3a879b13f0 [fixed] endless conversations with mother 5 years ago
  3xpurt d0d37e1440 [fixed] copy paste errors in din_bad and Cheatmenu_din 5 years ago
  julzor ed70ea3278 [fixes] missing clr's in mother 5 years ago
  julzor 78df8106dc [changed] moved the return option to the top of the list 5 years ago
  julzor 0c65af72c2 [added] reminder for Dimkas New Year Party 5 years ago
  sandra_schulz ea8cdf2957 [added] hand milking/manual expressing functionality to lact_lib, din_van and bedrPar 5 years ago
  julzor c467052027 [fixed] mouthwash can now be used if your breath smells like sperm 5 years ago
  KevinSmarts d42646658a Merge remote-tracking branch 'Milky_boobs/master' 5 years ago
  sandra_schulz 093a36d7df Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  KevinSmarts 57e4b6e149 [fixes] Redunant end and some tidying up 5 years ago
  sandra_schulz c02f573c92 [fixed] Breastfeeding event in centralpark would start without Sveta lactating. 5 years ago
  KevinSmarts ee4e19c2a5 Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  KevinSmarts a762bc8d93 [fixes] Missing colon 5 years ago
  julzor 9389177a25 [fixes] dead end in brother2 5 years ago
  KevinSmarts f0ac58434c Merge branch 'master' of https://git.catrenelle.com/julzor/glife 5 years ago
  julzor 68ff5bc483 [fixes] fixed wrong image in belsex 5 years ago
  julzor 372510746e [fixes] fixed free drugs in the metro and wrong if conditions 5 years ago
  julzor f5e96db5af [fixes] moved the drug dealer action to the train station, so that you can find him without a train pass, added missing gs 'stats' 5 years ago
  julzor ca977d5b41 Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife 5 years ago
  julzor 41c1453716 [fixes] matched flashing conditions to other flashing actions, added missing slutty increases if you only get paid for flashing and not sex 5 years ago
  sandra_schulz 5e0caab888 update in lact_lib.qsrc: 5 years ago
  3xpurt be1de7cb26 [changed] some cls to cla in mother and magencounterfairy. 5 years ago
  3xpurt 83923931ba [changed] cheatmenu_din time page to make more sense and add spacing. 5 years ago
  KevinSmarts 603aa4d025 [fixes] inhib checks for stripping in the forest 5 years ago
  KevinSmarts d549fa51c0 [fixes] Added inhibition check for stripping to swim naked in the village 5 years ago
  3xpurt 3252a1a0c2 [fixed] incorrect links for birthcontrol in desk 'stol'. 5 years ago
  3xpurt 0b1b50a074 [changed] mother gynaecologist visit, now actually visits the gyno, giving you the normal chance of bribery. 5 years ago
  3xpurt fa3786237d [fixed] incorrect time display during wake messages in bed2 5 years ago
  3xpurt 1b43825ff3 [changed] separated $enema from $toymanage - giving yourself an enema is a bathroom action, not an accessory or clothing action. 5 years ago
  3xpurt 57e9e6866d [fixed] image below text in lact_lib 5 years ago
  3xpurt c4519dd8c0 [fixed?] attempt to make bag equipping more reliable in gadsarai 5 years ago
  3xpurt 07c9aa73db [changed] "your" to "the" in pavresidential apartment complex action. 5 years ago
  3xpurt 3e97e88d64 [removed] pavcomplex links from pavresidential 5 years ago
  3xpurt 5a317c1426 [fixed] forgot to add old menu activation back to game launch after deciding to keep certain features. 5 years ago
  3xpurt e0ad216d2a [added] shave options to gadbana. 5 years ago
  3xpurt 6682f306a2 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  3xpurt eee4c5d3cb [changed] transgendered > transformation in begin. Wouldn't mind the transgendered start, but that's a lot of work. 5 years ago
  Blatte 980dafb22e Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte 84aa32ff29 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte c1b404aa59 no message 5 years ago
  Blatte 24d3c809c0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte c4deeb600d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte 555b2102d0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  Blatte 763c52fd81 bla 5 years ago
61 changed files with 1622 additions and 879 deletions
  1. 1 1
      locations/BelSex.qsrc
  2. 10 10
      locations/Cheatmenu_din.qsrc
  3. 72 29
      locations/Gadbana.qsrc
  4. 4 2
      locations/Gadsarai.qsrc
  5. 64 61
      locations/Gshveyfab.qsrc
  6. 7 7
      locations/MagEncounterFairy.qsrc
  7. 2 2
      locations/MartinTalk.qsrc
  8. 1 1
      locations/abduction.qsrc
  9. 1 1
      locations/andrey.qsrc
  10. 6 1
      locations/bed2.qsrc
  11. 20 0
      locations/bedrPar.qsrc
  12. 3 2
      locations/begin.qsrc
  13. 1 1
      locations/body.qsrc
  14. 4 3
      locations/brothel.qsrc
  15. 1 1
      locations/brother2.qsrc
  16. 8 4
      locations/cikl.qsrc
  17. 105 52
      locations/din_bad.qsrc
  18. 36 21
      locations/din_van.qsrc
  19. 1 1
      locations/events.qsrc
  20. 1 1
      locations/gadforest.qsrc
  21. 19 17
      locations/gadforest_event.qsrc
  22. 1 1
      locations/gadriver.qsrc
  23. 70 70
      locations/gadukino.qsrc
  24. 145 127
      locations/gpoli.qsrc
  25. 14 8
      locations/gschool_boys_bathroom.qsrc
  26. 12 3
      locations/gschool_grounds.qsrc
  27. 1 1
      locations/gschool_lunch.qsrc
  28. 288 19
      locations/lact_lib.qsrc
  29. 7 7
      locations/metro.qsrc
  30. 1 1
      locations/mey_home.qsrc
  31. 339 315
      locations/mother.qsrc
  32. 2 2
      locations/obj_din.qsrc
  33. 2 0
      locations/parkdin.qsrc
  34. 200 0
      locations/parkivent.qsrc
  35. 2 0
      locations/pavComplex.qsrc
  36. 1 1
      locations/pavComplexOld.qsrc
  37. 5 17
      locations/pavResidential.qsrc
  38. 8 0
      locations/placer_gskver.qsrc
  39. 50 26
      locations/police_station.qsrc
  40. 3 0
      locations/preALT.qsrc
  41. 2 0
      locations/preNT.qsrc
  42. 2 0
      locations/preSYS.qsrc
  43. 1 0
      locations/preSYS2.qsrc
  44. 1 0
      locations/preTG.qsrc
  45. 1 0
      locations/rolanbath.qsrc
  46. 2 2
      locations/sauna.qsrc
  47. 26 25
      locations/saunawhore.qsrc
  48. 1 1
      locations/shoplifting.qsrc
  49. 6 5
      locations/shulga_room.qsrc
  50. 1 0
      locations/shulgabath.qsrc
  51. 10 0
      locations/sitrPar.qsrc
  52. 1 0
      locations/stat.qsrc
  53. 1 0
      locations/stat_display.qsrc
  54. 22 16
      locations/stol.qsrc
  55. 1 0
      locations/stwork.qsrc
  56. 1 1
      locations/swamphouse.qsrc
  57. 1 1
      locations/telefon.qsrc
  58. 6 0
      locations/vokzalGin.qsrc
  59. 0 7
      locations/vokzalperG.qsrc
  60. 5 1
      locations/zaprF.qsrc
  61. 13 4
      locations/zaprFWash.qsrc

+ 1 - 1
locations/BelSex.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'analdoggy':
 	belact -= 1
 	anal_temp += 1
 	picrand = rand(0,12)
-	'<center><video autoplay loop src="images/shared/sex/anal/doggy<<picrand>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<picrand>>.mp4"></video></center>'
 	'<<$boydesc>> pulls his cock out of your pussy and begins to slowly rub against your asshole. "Don''t worry, <<$pcs_nickname>>. I''ll be gentle," he says grinning as he has you on all fours, wide spread.'
 	'"Enough foreplay. Your ass is ready me!" he shouts as <<$boydesc>> starts pounding himself balls deep into you immediately. You bury your face into a pillow as he pounds your asshole roughly. The pain is unbearable and you flop with your legs trying to get away, but it only encourages <<$boydesc>> on as he keep pummeling your anus.'
 

+ 10 - 10
locations/Cheatmenu_din.qsrc

@@ -388,7 +388,7 @@ $cheatmenu['state'] = {
 		'<a href="exec:lactate = 1 & lactateinduced = 1 & total_milkinduce_growth = 8 & nbsize += 8 & prolactinlvl = 200 & lactaterate = 100 & lactatemv = 0 & lactatemm = func(''lact_lib'',''$calc_lactatemm'') & dynamic $cheatmenu[''state'']">Switch ON</a>'
 	else
 		'You are lactating'
-		'<a href="exec:lactate = 0 & lactateinduced = 0 & total_milkinduce_growth = 0 & nbsize -= 8 & prolactinlvl = 0 & lactaterate = 0 & lactatemv = 0 & lactatemm = 0 & dynamic & dynamic $cheatmenu[''state'']">Switch OFF</a>'
+		'<a href="exec:lactate = 0 & lactateinduced = 0 & total_milkinduce_growth = 0 & nbsize -= 8 & prolactinlvl = 0 & lactaterate = 0 & lactatemv = 0 & lactatemm = 0 & dynamic $cheatmenu[''state'']">Switch OFF</a>'
 		if lactaterate <= 0:
 			'Lactate Rate: <<lactaterate/10>>ml/h <a href="exec:lactaterate += 100 & dynamic $cheatmenu[''state'']">+10</a>'
 		elseif lactaterate >= 6000:
@@ -493,7 +493,7 @@ $cheatmenu['looks'] = {
 	if vshrink < 10:'<a href="exec:vshrink += 1 & dynamic $cheatmenu[''looks'']">Increase the amount to shrink</a>'
 	if vshrink > 0:'<a href="exec:vshrink -= 1 & dynamic $cheatmenu[''looks'']">Reduce the amount to shrink</a>'
 	if vshrinkdays < 10:'<a href="exec:vshrinkdays += 1 & dynamic $cheatmenu[''looks'']">Increase the number of days it takes</a>'
-	if vshrinkdays > 1:'<a href="exec:vshrinkdays -= 1 & gs $menu_obnovit dynamic $cheatmenu[''looks'']">Reduce the number of days it takes</a>'
+	if vshrinkdays > 1:'<a href="exec:vshrinkdays -= 1 & dynamic $cheatmenu[''looks'']">Reduce the number of days it takes</a>'
 	*nl
 	'<<$pcs_ass>>'
 	if pcs_ass <= 31:'<a href="exec:pcs_ass += 5 & dynamic $cheatmenu[''looks'']">Enlarge anus</a>'
@@ -1210,17 +1210,17 @@ $cheatmenu['time'] = {
 	if temp_minut < 46:$SS += '<a href="exec:temp_minut += 15 & dynamic $cheatmenu[''time'']">+15</a>'
 	$SS
 	killvar 'SS'
-
-	' <a href="exec:dynamic $cheatmenu[''input_time'']">Direct input time</a>'
-
+	*nl
 	'Weather: <a href="exec:sunWeather=iif(sunWeather=0,1,0) & $pogoda=iif(sunWeather=0,''Rain...'',''Clear...'') & chWeather = 1 & gs ''outdoors'', ''weather'' & dynamic $cheatmenu[''time'']">'+iif(sunWeather=0,'Rain','Sunny')+'</a>'
-
-	'<a href="exec:day = temp_day & $month = $temp_month & month = temp_month & year = temp_year & hour = temp_hour & minut = temp_minut & currtimecheck = 1 & dynamic $cheatmenu[''time'']">Accept target date & time</a>'
-	'<a href="exec:temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut & dynamic $cheatmenu[''time'']">Reset target date & time</a>'
-
+	*nl
 	'Temperature = <<$temperature>> - <a href="exec:temper += 1 & dynamic $cheatmenu[''time'']">+1 degree</a> - <a href="exec:temper += 5 & dynamic $cheatmenu[''time'']">+5 degrees</a> - <a href="exec:temper -= 1 & dynamic $cheatmenu[''time'']">-1 degree</a> - <a href="exec:temper -= 5 & dynamic $cheatmenu[''time'']">-5 degrees</a>'
-
+	*nl
 	if TempUnit = 0: 'Use <a href="exec:TempUnit = 1 & gs ''outdoors'',''weather'' & dynamic $cheatmenu[''time'']">Fahrenheit</a> scale' else 'Use <a href="exec:TempUnit = 0 & gs ''outdoors'',''weather'' & dynamic $cheatmenu[''time'']">Celsius</a> scale'
+	*nl
+	'<a href="exec:dynamic $cheatmenu[''input_time'']">Direct input time</a>'
+	*nl
+	'<a href="exec:day = temp_day & $month = $temp_month & month = temp_month & year = temp_year & hour = temp_hour & minut = temp_minut & currtimecheck = 1 & dynamic $cheatmenu[''time'']">Accept target date & time</a>'
+	'<a href="exec:temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut & dynamic $cheatmenu[''time'']">Reset target date & time</a>'
 	'</td></tr></table></center>'
 }
 

+ 72 - 29
locations/Gadbana.qsrc

@@ -13,25 +13,34 @@ frost = 0
 'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 gs 'stat'
 
-
 if mira = 0:
 	if $clothingworntype = 'nude':
-		act 'Get dressed':
+		act 'Get dressed and leave':
 			minut += 1
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
-			gt 'Gadbana'
+			gt 'Gaddvor'
 		end
 	end
-
-	act 'Go outside':
-		if $clothingworntype ! 'nude':
-			minut += 1 & gt'Gaddvor'
-		else
+	if $clothingworntype ! 'nude':
+		act 'Go outside':minut += 1 & gt'Gaddvor'
+	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+		act 'Go outside in your underwear':
 			cls
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-			'You can''t go out without any clothes on.'
-			act 'Back':gt'Gadbana'
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+			'Luckily no one saw you outside in your underwear, but there''s a thrill in almost getting caught'
+			gs 'arousal', 'voyeur', 10
+			act 'Continue': gt 'Gaddvor'
+		end
+	elseif $clothingworntype = 'nude':
+		act 'Go outside naked':
+			cls
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/Gaddvor_nude.jpg"></center>'
+			'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
+			gs 'arousal', 'voyeur', 10
+			act 'Continue': gt 'Gaddvor'
 		end
 	end
 
@@ -62,15 +71,7 @@ if mira = 0:
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/par.jpg"></center>'
 					'You strip, sit down and relax. After a proper banya session, you pick up a bucket filled with cold water and pour it over yourself and head over to the shower. You feel like a completely new person.'
-
-					act 'Get dressed':
-						minut += 1
-						gs 'clothing', 'wear_last_worn'
-						gs 'underwear', 'wear'
-						gt 'Gadbana'
-					end
-					
-					act 'Go outside nude': minut += 1 & gt 'Gaddvor'
+					act 'Finish': gt $loc, $metka
 				end
 			end
 		else
@@ -79,24 +80,35 @@ if mira = 0:
 	elseif week < 6:
 		'The banya is not used during the week, it is usually ready to use from 19:00 during the weekend.'
 	end
+	*nl
 
 	act 'Wash your body (0:25)':
 		cls
 		minut += 25
 		dynamic $showerdin
-
 		if frost > 0:frost = 0
-
+		gs 'clothing', 'strip'
+		gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
 
-		act 'Leave':gt $loc, $metka
+		act 'Finish':gt $loc, $metka
 	end
 
 	dynamic $bteeth
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
+
+	if $clothingworntype ! 'nude':
+		act 'Remove clothes':
+			minut += 1
+			gs 'clothing', 'strip'
+			gs 'stat'
+			gt 'Gadbana'
+		end
+	end
+
 	dynamic $wearpan
 	dynamic $removepan
 	dynamic $basin
@@ -120,6 +132,29 @@ if mira = 0:
 			end
 		end
 	end
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+
+	!WD: heal chafe
+	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
+
+	if tampon = 0 and sanpad = 0:
+		'<b><font color="red">You have no tampons left.</font></b>'
+	elseif tampon = 1:
+		'<font color="red">You have only <b><<tampon>></b> tampon left.</font>'
+	else
+		'You have <b><<tampon>></b> tampons.'
+	end
+	if sanpad = 0 and tampon = 0:
+		'<b><font color="red">You have no pads left.</font></b>'
+	elseif sanpad = 1:
+		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
+	else
+		'You have <b><<sanpad>></b> pads.'
+	end
+
+	if bcream_have > 0:
+		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
+	end
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Rinse the cum stains off your clothes in luke warm water(0:10)':
@@ -157,13 +192,14 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
-	if breastpump > 0:
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end
 	end
 
 	dynamic $toymanage
+	dynamic $enema
 
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
@@ -214,16 +250,23 @@ else
 				gs 'arousal', 'voyeur', 120
 				gs 'arousal', 'end'
 				gs 'stat'
-				
-				act 'Get dressed':
+
+				act 'Get dressed and leave':
 					mira = 0
 					minut += 1
 					gs 'clothing', 'wear_last_worn'
 					gs 'underwear', 'wear'
-					gt 'Gadbana'
+					act 'Continue': gt 'Gaddvor'
+				end
+
+				act 'Go outside naked':
+					mira = 0
+					minut += 1
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/Gaddvor_nude.jpg"></center>'
+					'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
+					gs 'arousal', 'voyeur', 10
+					act 'Continue': gt 'Gaddvor'
 				end
-				
-				act 'Go outside nude': mira = 0 & minut += 1 & gt 'Gaddvor'
 			end
 		end
 	end

+ 4 - 2
locations/Gadsarai.qsrc

@@ -360,13 +360,15 @@ if $ARGS[0] = '':
 					cheap_purses[5] = 1
 					$currentpursetype = 'cheap'
 					currentpursenumber = 5
-					bag = 1
 					'You can use this cool looking bag as a handbag.'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 					'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 				end
-				act 'Leave and get some fresh air':gt 'Gadsarai'
+				act 'Leave and get some fresh air':
+					if findbag = 1: bag = 1
+					gt 'Gadsarai'
+				end
 			elseif findbraclet = 0:
 				*clr & cla
 				if RAND(0,15) >= 14:

+ 64 - 61
locations/Gshveyfab.qsrc

@@ -8,60 +8,61 @@ if $ARGS[0] = 'start':
 	*clr
 	gs'stat'
 	
-	'<center><B>TEXTILE FACTORY, "PARIS COMMUNE"</B></center>'
+	'<center><B>TEXTILE FACTORY, PARIS COMMUNE</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg"></center>'
-	'The local textile factory; one of the few corporate enterprises in Pavlovsk. It makes clothing for G&M Store, which has a branch next door. Open from 8:00-20:00 Monday - Friday.'
-	if hour >= 8 and hour <= 20 and week >= 1 and week <= 5:
-		'The <a href="exec:minut += 5 & GT ''Gshveyfab'', ''enter''">entrance</a> sits behind a security checkpoint.'
+	'You''re standing in front one biggest employers in Pavlovsk, the local textile factory. It''s mostly known for making clothing for the G&M Store, which also opened up a store within the compound.'
+	'Opening hours are Monday to Friday, between 08:00 to 20:00.'
+	if hour >= 8 and hour < 20 and week >= 1 and week <= 5:
+		'Behind the security checkpoint you can see the <a href="exec:minut += 5 & GT ''Gshveyfab'', ''enter''">entrance</a> that every employee passes through.'
 	elseif hour < 8 or hour > 20 or week > 5:
 		'The factory is currently closed.' 
-		'Hours M-F:'
-		'First shift - 8:00 to 16:00.'
-		'Second shift - 16:00 to 20:00.'
+		'Opening hours are Monday through Friday:'
+		'First shift - 08:00 to 16:00'
+		'Second shift - 16:00 to 20:00'
 	end
-	if week < 6 and hour >= 8 and hour <= 20:
-		*pl 'The <a href="exec:torg = 0 & GT ''budgetclothes'',''start''">G&M Store</a> is currently open.'
+	if week < 6 and hour >= 8 and hour < 20:
+		*pl 'The local <a href="exec:torg = 0 & GT ''budgetclothes'',''start''">G&M Store</a> is currently open.'
 	else
-		*pl 'The G&M Store is currently closed. Hours are 8:00-20:00 Monday - Friday.'
+		*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
 	end
 	
-	if hour >= 8 and hour <= 15:
-		*p 'A small room near the entrance is being used as a tailor shop.'
-		act 'Go to the tailor':
+	if week < 7 and hour >= 8 and hour < 15:
+		'In a smaller building right next to the factory is the local tailor shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 15:00.'
+		act 'Visit the tailor':
 			cla
 			*clr
 			minut += 5
 			gs'stat'
-			'An elderly man is inspecting finished garments fresh from the factory floor, he pulls his glasses down a little and looking over the top of them walks up to the desk.'
-			
-			'"Hello there, come to get some clothes adjusted? It''ll cost you 500 <b>₽</b> per item."'
+			'An elderly man is inspecting some repaired clothes, as you walk in, he stops and smiles gently, greeting you.'
+			'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
 
 			if money >= 500:
-				act 'Take in the clothes you are wearing (500 <b>₽</b>)':
+				act 'Leave the clothes you''re wearing (500 <b>₽</b>)':
 					cla
 					*clr
 					minut += 15
 					if CloStyle = 5 or $clothingworntype = 'exercise':
-						'What are you wasting my time for? This type of clothing does not need to be resized.'
+						'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
 					else
 						money -= 500
 						dynamic '<<$clothingworntype>>B[<<clothingwornnumber>>] = pcs_hips'
-						'You undress and give the clothes you need adjusting to the tailor, it is fifteen minutes until your clothes are ready. you redress.'
+						'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment. The tailor is fast and only takes fifteen minutes until your clothes are ready.'
+						'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 					end
 
 					act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
 				end
 
-				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'
-				act 'Take in all the clothes':gt 'portnoi2'
+				act 'Leave your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
+				act 'Leave in all your clothes':gt 'portnoi2'
 			end
 			act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
 	
 		end
 	end
 
-	act 'Go to the residential area': minut += 15 & gt 'pavResidential'  
-	act 'Go to the high street': minut += 15 & gt 'pavCommercial'
+	act 'Head to the residential area': minut += 15 & gt 'pavResidential'  
+	act 'Head to the high street': minut += 15 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'enter':
@@ -69,26 +70,26 @@ CLOSE ALL
 	cla
 	*clr
 	gs'stat'
-	'<center><B>TEXTILE FACTORY, "PARIS COMMUNE"</B></center>'
+	'<center><B>TEXTILE FACTORY, PARIS COMMUNE</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg" ></center>'
-	'The local textile factory; one of the few corporate enterprises in Pavlovsk.'
+	'You''re standing inside the building that is accommodating the biggest employer in Pavlovsk, the local textile factory.'
 	'There is a work schedule hanging on the wall:'
-	'First shift - 8:00 to 16:00.'
+	'First shift - 08:00 to 16:00.'
 	'Second shift - 16:00 to 20:00.'
-	''
-	if workFabrika = 0 and age >= 16 and age < 18:'You could apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">part-time job</a> here.'
-	if work = 0 and workFabrika = 0 and age >= 18:'You could apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">job</a> here.'
+	*nl
+	if workFabrika = 0 and age >= 16 and age < 18:'You can apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">part-time job</a> here.'
+	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">full-time job</a> here.'
 	
 	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 8 and hour < 9 and age >= 18:
-		'You can start your shift now.'
+		'Your shift is starting now.'
 		act 'Start shift': gt'Gshveyfab','job'
 	end
 	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 16 and hour < 17 and age >= 16 and age < 18:
-		'You can start your shift now.'
+		'Your shift is starting now.'
 		act 'Start shift': gt'Gshveyfab','job'
 	end
 	if workFabrika = 1:
-		'You can quit your job, but early processing of your payment will cost you the wage of one shift.'
+		'You can quit your job, but quitting will lead to a deducted wage.'
 		act 'Quit job': 
 			if age >= 16 and age < 18:
 				smenaFabrika -= 1
@@ -116,37 +117,40 @@ if $ARGS[0] = 'job_start':
 	gs'stat'
 	'<center><B>FOREMAN''S OFFICE</B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/stepan/nachalnik.jpg" ></center>'
-	''
-	'You go to the factory foreman, Stepan Sergeyevich, and ask for a job.'
+	'You head into the factory foreman, Stepan Sergeyevich office, and ask him if there''s an available job.'
 	if age >= 16 and age < 18 and workFabrika = 0:
-		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 105 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
-			act 'Take the job':
-				cla
-				minut += 10
-				work = 1
-				workFabrika = 1
-				smenaFabrika = 0
-				FabrikaProgul = 0
-
-				'You give him your documents, which he takes and then reminds you to come in on every weekday, at 16:00.'
+		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 105 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00.'
+		'But beware, if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
+			
+		act 'Accept the job':
+			cla
+			minut += 10
+			work = 1
+			workFabrika = 1
+			smenaFabrika = 0
+			FabrikaProgul = 0
+			'You hand him over your documents, which he takes and then reminds you to come in on every weekday, at 16:00.'
 
-				act 'Leave':gt'Gshveyfab', 'enter'
-			end	
+			act 'Leave':gt'Gshveyfab', 'enter'
+		end	
+		
 	elseif age >= 18 and workFabrika = 0:
-		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 8:00 to 16:00, and the pay is 105 <b>₽</b> per hour. And if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month, and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
-			act 'Take the job':
-				cla
-				minut += 10
-				work = 1
-				workFabrika = 1
-				smenaFabrika = 0
-				FabrikaProgul = 0
-
-				'You give him your documents, which he takes and then reminds you to come in on every weekday, at 8:00.'
+		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, and the pay is 105 <b>₽</b> per hour.'
+		'But beware, if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month, and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
+			
+		act 'Accept the job':
+			cla
+			minut += 10
+			work = 1
+			workFabrika = 1
+			smenaFabrika = 0
+			FabrikaProgul = 0
+			'You hand him your documents, which he takes and then reminds you to come in on every weekday, at 08:00.'
 
-				act 'Leave':gt'Gshveyfab', 'enter'
-			end  
+			act 'Leave':gt'Gshveyfab', 'enter'
+		end  
 	end
+	
 	act 'Leave':gt'Gshveyfab', 'enter'
 end
 
@@ -164,10 +168,9 @@ if $ARGS[0] = 'job':
 		smenaFabrika += 2
 	end 
 	gs'stat'
-	'<center><B>TEXTILE FACTORY, "PARIS COMMUNE"</B></center>'
+	'<center><B>TEXTILE FACTORY, PARIS COMMUNE</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg" ></center>'
-	''
-	'You work through your shift at the factory.'
+	'You work hard throughout your shift at the factory. The foreman has you running all over the factory performing all type of tasks. You barely even have time to rest during the shift.'
 
 	act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
 end

+ 7 - 7
locations/MagEncounterFairy.qsrc

@@ -22,14 +22,14 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'fairy_chat_no1':
-	cls
+	cla
 	gs 'stat'
 	knowsfairy = 1
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
 	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	act 'Chat with the fairy':
-		cls
+		cla
 		minut += 30
 		fairychat = 1
 		pcs_manna += 25 * pcs_magik
@@ -54,7 +54,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 end
 
 if $ARGS[0] = 'fairy_shoo':
-	cls
+	cla
 	minut += 1
 	if knowsfairy < 1:
 		knowsfairy = 1
@@ -78,11 +78,11 @@ if $ARGS[0] = 'fairy_shoo':
 end
 
 if $ARGS[0] = 'fairy_chat':
-	cls
+	cla
 	gs 'stat'
 	'You take the few steps over to the glowing orb that apparently only you can recognize as what it truly is: a fairy.'
 	act 'Chat with the fairy':
-		cls
+		cla
 		minut += 30
 		if fairyshoo = 1 and rand (1, 3) = 2:
 			fairyshoo = 0
@@ -120,13 +120,13 @@ if $ARGS[0] = 'fairy_chat':
 			gs 'stat'
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
-				cls
+				cla
 				*nl
 				'You look at her, puzzled, wondering if you heard her right.  She just shrugs her shoulders and says "Okay, if you''re not interested"'
 				act 'Go on your way': gt $loc, $metka
 			end
 			act 'Sure':
-				cls
+				cla
 				fday_surprise += 1
 				fairy_surprise = RAND(1,9)
 				if fairy_surprise =< 2:

+ 2 - 2
locations/MartinTalk.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = '':
 		'"Excuse me?"' 
 		'You ' + iif($body='skinny','would call yourself skinny, too, but','see yourself as <<$body>> rather than skinny, so') + ' you don''t really see why he would bring this up.'
 		*nl
-		'"Are you eating right, <<pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
+		'"Are you eating right, <<$pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
 		'"Uh... I guess. Wait, you didn''t, by any chance, talk to my mother, did you?"'
 		'"Hmm? Oh, no no no, mi amor, but I''m sure she''d agree that you could use a good meal every now and then - good meat, not the filth they sell you everywhere."'
 		*nl
@@ -193,7 +193,7 @@ if $ARGS[0] = '':
 		*nl
 		'He recoils in mock-shock. "That you would even <b>suggest</b> that! The insolence!"'
 		'You grin at his antics, but your question is still to the point: "Do you do anything besides working out?"'
-		'"This and that," he replies, now more serious. "I don''t know what you want to hear, <<pcs_firstname>>. I don''t run a drug ring or strip club on the side, if that''s what you want to know. Days pass pretty quickly, even when all you do is sleep, work out and go for a walk every now and then."'
+		'"This and that," he replies, now more serious. "I don''t know what you want to hear, <<$pcs_firstname>>. I don''t run a drug ring or strip club on the side, if that''s what you want to know. Days pass pretty quickly, even when all you do is sleep, work out and go for a walk every now and then."'
 		'"You should share that thought at the next book club meeting," you comment dryly.'
 		'"I''d rather not. It would only disturb the other housewives," Martin retorts.'
 		*nl

+ 1 - 1
locations/abduction.qsrc

@@ -581,7 +581,7 @@ if $ARGS[0] = 'abdFood':
 
 	if abdTools = 1:
 		act 'Train with dildos':gt 'abduction', 'abdTrainDildos'
-		if breastpump > 0:
+		if breastpump > 0 and bp_unbox >= 1:
 			act 'Use breast pump':gt 'lact_lib', 'bp_milking'
 		end
 	end

+ 1 - 1
locations/andrey.qsrc

@@ -199,7 +199,7 @@ if $ARGS[0] = 'punish':
 		act 'Beg to keep your job':
 			cla
 			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\trears1.jpg"></center>'
+			'<center><img src="images/pc/tears1.jpg"></center>'
 			'"Please, I can''t lose the job! I really need the money, please don''t fire me! I promise to do better." As you say this, tears begin rolling down your cheeks.'
 			*nl
 			'Mr. Sobulyagin scoffs at you, obviously not swayed so easily by tears. He looks at you in silence, his dark eyes roaming over your body slowly as he licks his lips. "Listen, I''m not a bad guy," he says as he stands from his chair and walks to the door. "I''m willing to give you another chance, but you need to <i>show me</i> how important this job really is to you..." He cups his balls through his slacks and gives them a light squeeze.'

+ 6 - 1
locations/bed2.qsrc

@@ -184,16 +184,20 @@ if $ARGS[0] = 'sleep':
 	end
 
 	if slept_in = 1:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 0:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, no longer tired and ready to start the day with plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif pcs_sleep >= 100 and budilnikOn = 1 and alarm_now >= alarm_set:
+		gs 'stat'
 		$waketext = 'You wake up at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, just before your alarm goes off. You''ve had plenty of sleep.'
 		gs 'bed2', 'wake'
 	elseif budilnikOn = 1 and alarm_now = alarm_time:
 		pcs_mood -= 10
+		gs 'stat'
 		$waketext = 'Your alarm goes off at <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, '+iif(pcs_sleep < 90, 'but you could do with some extra sleep.', 'and you''ve had plenty of sleep.')+''
 		gs 'bed2', 'extra'
 		gs 'bed2', 'wake'
@@ -262,7 +266,8 @@ if $ARGS[0] = 'wake':
 	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and hour >= 8 and hour < 9:
 			pcs_mood -= 10
-			msg '<center>Damn, you''ve slept too long! You''re going to be late for school!</center>'
+			gs 'stat'
+			msg '<center>Damn it''s <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>, you''ve slept too long! You''re going to be late for school!</center>'
 		end
 		act 'Get up out of bed and get dressed for school (0:15)':
 			slept_in = 0

+ 20 - 0
locations/bedrPar.qsrc

@@ -236,6 +236,26 @@ if pcs_sewng >= 80:
 	end
 end
 
+if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif sisterHere = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition < 40:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+end
+if breastcounter <= 0:
+	temp_var = 50
+else
+	temp_var = (50/breastcounter)
+end
+if breastpump <= 0 and pcs_horny >= temp_var:
+	act 'Massage your breasts': gt 'lact_lib','man_milking'
+end
+
+end
+
 if pcs_sleep <= 80:
 	if $clothingworntype = 'nude':
 		$sleep_txt = 'Go to sleep'

+ 3 - 2
locations/begin.qsrc

@@ -3,10 +3,11 @@
 if $ARGS[0] = 'start':
 	$metka = 'start'
 	$loc = 'begin'
+	gs 'Cheatmenu_din'
 	showstat 1
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
-	'<b>Transgendered Start:</b>'
+	'<b>Transformation Start:</b>'
 	'You are Michael Kuznetsov, a fairly average, 35 year old businessman who finds an artefact that changes everything about him and his life. Features magic.'
 	*nl
 	'<b>School girl Start:</b>'
@@ -18,7 +19,7 @@ if $ARGS[0] = 'start':
 	'<b>New in Town Start:</b>'
 	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time you can make your own decisions and mistakes. No magic.'
 	
-	act '<center><b>Transgendered start</b></center>':
+	act '<center><b>Transformation Start</b></center>':
 		settingmode = 0
 		showstat 0
 		cla

+ 1 - 1
locations/body.qsrc

@@ -1612,7 +1612,7 @@ if lashair = 0:
 		if rand_pubes = 2:$pcdesc_pubesrandom = 'partially-maintained'
 		$pcdesc_pubes = 'bushy'
 		$pcdesc_pubeswordy = 'bushy, thick'
-	elseif pcs_pubes >= 31
+	elseif pcs_pubes >= 31:
 		lobkoef = 0
 		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)

+ 4 - 3
locations/brothel.qsrc

@@ -471,7 +471,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any.'
+	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $metka">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $metka">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
@@ -501,15 +501,16 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 		''
 		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
 		dynamic $dryOff
-		dynamic $brit
+		if stanok > 0: dynamic $brit
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage
+	dynamic $enema
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $removepan
-	dynamic $brit
+	if stanok > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':
 			pain['killer'] += 1

+ 1 - 1
locations/brother2.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = 'wakeup':
 			cla
 			brotherMorningSex = daystart
 			'"I''ll tell you what Kolka, if you get up now, I''ll show you my pussy."'
-			if $clothingworntype = 'nude' and $panyworntype = 'none':
+			if $clothingworntype = 'nude':
 				'He cracks open an eye. "I don''t need to get up to do that."'
 				'You look down at yourself and remember that you''re naked. Right. That wasn''t a very good plan...'
 				act'Back to the drawing board':gt'brother2','wakeup'

+ 8 - 4
locations/cikl.qsrc

@@ -1023,10 +1023,14 @@ end
 
 if day = 25:
 	!! meynold payment
-	if mey_vika_qw >= 35 and mey_tamara_help_count >= 10 and mey_tamara_qw_end = 0:
-		money += 5000
-		'<b><font color=green>For your efforts aunt Tamara gave you 5,000 rubles</font></b>'
-		mey_tamara_help_count = 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
+	elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
+		karta += 15000
+		'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+		mey_tamara['help_count'] = 0
 	end
 
 	if PersSecWork = 1 and PersSecWorkTimes > 0 and paydaybistrosec = 0:

+ 105 - 52
locations/din_bad.qsrc

@@ -82,7 +82,10 @@ $mobile_check = {
 
 $d_salf = {
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Tissues</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if cumloc[13] > 0 or cumloc[11] > 0 or cumloc[16] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 12 & gs ''cum_cleanup'' & cumspclnt = 9 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe your face and hands</b></a>'
 	if cumloc[14] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 14	& gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your belly</b></a>'
 	if cumloc[15] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 16 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Wipe clean your breasts</b></a>'
@@ -91,22 +94,30 @@ $d_salf = {
 	if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0: '<a href="exec:salfetka -= 1 & cumspclnt = 6 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Clean up clothing</b></a>'
 	if pcs_makeup ! 1: '<a href="exec:salfetka -= 1 & pcs_makeup = 1 & dynamic $d_bag"><b>Wipe cosmetics</b></a>'
 	'<a href="exec:gs ''stat'' & dynamic $d_bag"><br><b>Put tissues away</b></a>'
+	'</td></tr></table></center>'
 }
 
 $d_kosmetitka = {
 	*clr & cla
+	'<center><h1>Cosmetics</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	gs 'stat'
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
 
 	if kosmetitka >= 1: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 2 & kosmetitka -= 1 & gs ''stat'' & dynamic $d_bag"><b>Light make-up</b></a>'
 	if kosmetitka >= 2: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 3 & kosmetitka -= 2 & gs ''stat'' & dynamic $d_bag"><b>Natural make-up</b></a>'
 	if kosmetitka >= 3: '<a href="exec:makupskl_exp += rand(1,3) & pcs_makeup = 4 & kosmetitka -= 3 & gs ''stat'' & dynamic $d_bag"><b>Heavy make-up</b></a>'
-	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Close makeup bag</b></a>'
+	act 'Close makeup bag':gs 'stat' & dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $d_mouthwash = {
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Mouth Wash</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	pcs_breath = 1
 	cumspclnt = 2
 	gs 'cum_cleanup'
@@ -114,21 +125,24 @@ $d_mouthwash = {
 	gs 'stat'
 	'Your breath smells minty fresh.'
 	''
-	'<a href="exec:gs ''stat'' & dynamic $d_bag"><b>Done</b></a>'
+	act 'Done':gs 'stat' & dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $d_bag = {
 	*clr & cla
+	'<center><h1>Purse</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
-	*nl
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if salfetka > 0: 'You have <<salfetka>> wet wipes left in your purse. <a href="exec:dynamic $d_salf"><b>Use a tissue</b></a>'
 	if pain_timer > totminut - 242 and painkiller > 0: 'Take a <a href="exec:pain[''killer''] = 1 & painkiller -= 1 & pain_timer = totminut & dynamic $d_bag">painkiller</a>. <<painkiller>> painkillers left in your purse.'
 	if kosmetitka > 0 and pcs_makeup = 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left. <a href="exec:dynamic $d_kosmetitka"><b>Put on makeup</b></a>'
 	if kosmetitka > 0 and pcs_makeup ! 1: 'There''s a portable makeup in your purse. <<kosmetitka>> cosmetic applications left.'
-	if mouthwash > 0 and pcs_breath = 0: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
-	if mouthwash > 0 and pcs_breath = 1: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
-	if greben > 0 and pcs_hairbsh = 0: 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat''"><b>Brush your hair</b></a>'
-	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse.'
+	if mouthwash > 0 and (pcs_breath = 0 or cumloc[12] = 1): 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining. <a href="exec:dynamic $d_mouthwash"><b>Use mouthwash</b></a>'
+	if mouthwash > 0 and pcs_breath = 1 and cumloc[12] = 0: 'There''s a mouthwash in your purse. <<mouthwash>> uses remaining.'
+	if greben > 0 and pcs_hairbsh = 0: 'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & dynamic $d_bag"><b>Brush your hair</b></a>'
+	if greben > 0 and pcs_hairbsh = 1: 'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	if prezik + prezikcount + preziksabo > 0:
 		if preziktype = 2 or preziksabo > 0:
 			'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal condoms left, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Switch_Condom_Menu"><b>condoms left in the purse.</b></a>'
@@ -139,9 +153,7 @@ $d_bag = {
 	else
 		'You are out of condoms.'
 	end
-	if amphetamine > 0 :
-		'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
-	end
+	if amphetamine > 0:	'You have <<amphetamine>> tablets of amphetamine left in your purse. <b><a href="exec:dynamic $use_amphetamines & dynamic $d_bag">Take One</a></b>'
 	if tabletki > 0 and pillsleft[ptype] > 0:
 		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
@@ -151,18 +163,10 @@ $d_bag = {
 	else
 		'You are out of birth control pills.'
 	end
-	if mentats_have > 0:
-		'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
-	end
-	if steroid_have > 0:
-		'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
-	end
-	if bcream_have > 0:
-		'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
-	end
-	if aphrodisiac_have > 0:
-		'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
-	end
+	if mentats_have > 0:'<a href="exec:dynamic $use_mentats & dynamic $d_bag"><b>Use a neurobooster pill in your purse.</b></a> There are <<mentats_have>> pills left. The warning label says not to take more than one per day.'
+	if steroid_have > 0:'<a href="exec:dynamic $use_steroids & dynamic $d_bag"><b>Use steroids.</b></a> You have <<steroid_have>> steroids left in your purse.'
+	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & dynamic $d_bag"><b>Apply breast cream.</b></a> You have <<bcream_have>> cream left in your purse.'
+	if aphrodisiac_have > 0:'<a href="exec:dynamic $use_aphrodisiac & dynamic $d_bag"><b>Chew aphrodisiac gum.</b></a> You have <<aphrodisiac_have>> gum left in your purse.'
 
 	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <<lubri>> applications.'
 	if bottle > 0: 'There''s a bottle of water in your purse. <a href="exec:bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & dynamic $d_bag"><b>Drink</b></a>'
@@ -171,17 +175,17 @@ $d_bag = {
 	if wine = 1 and alkowine = 1:'There''s a half-bottle of <a href="exec:dynamic $dinalkowin2">wine</a> in your purse.'
 	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0:
-		if pattest > 1:$tt = 's' else $tt = ''
+		iif(used_pattest > 1,$tt = 's',$tt = '')
 		'You have <<pattest>> unused paternity test<<$tt>> in your purse.'
 	end
 	if used_pattest > 0:
-		if used_pattest > 1:$tt = 's' else $tt = ''
+		iif(used_pattest > 1,$tt = 's',$tt = '')
 		'You have <<used_pattest>> <a href="exec:dynamic $test_purse">used</a> paternity test<<$tt>> in your purse.'
 	end
 	killvar 'tt'
 
 	act 'Return':gt $loc, $metka
-	end
+	'</td></tr></table></center>'
 }
 
 $dinalkowin1 = {
@@ -199,6 +203,7 @@ $dinalkowin1 = {
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
+	*nl
 	'You take the wine bottle out of your purse and slowly drink half of it. You struggle quite a lot to put the cork back before being able to make it.'
 	act 'Continue':dynamic $d_bag
 }
@@ -219,6 +224,7 @@ $dinalkowin2 = {
 	pcs_breath = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/food/alkowin.jpg"></center>'
+	*nl
 	'You take out the remaining half wine bottle out of your purse, slowly drinking the rest of it. As you finish you throw the empty bottle away.'
 	act 'Continue':dynamic $d_bag
 }
@@ -226,7 +232,10 @@ $dinalkowin2 = {
 $din_Switch_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	i = 0
 	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
@@ -243,13 +252,16 @@ $din_Switch_Condom_Menu = {
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
-	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
+	act 'Return':dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $din_Table_Condom_Menu = {
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	i = 1
 	'You have <<iif(preziktype < 2, prezik+prezikcount, prezikcount)>> normal condoms left and	<<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged condoms left.'
 	*nl
@@ -266,13 +278,16 @@ $din_Table_Condom_Menu = {
 		'<a href="exec:dynamic $din_Do_Condom_Counts, 4">Sabotage a condom</a>.'
 	end
 	*nl
-	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
+	act 'Return':gt 'stol', 'bc'
 }
 
 $din_Do_Condom_Counts = {
 	!{set condom count and type}
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Condoms</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if ARGS[0] = 1:
 		'Offer a condom the next time you have sex.'
 		if preziktype = 2: preziksabo = prezik
@@ -309,6 +324,7 @@ $din_Do_Condom_Counts = {
 	else
 		dynamic $din_Table_Condom_Menu
 	end
+	'</td></tr></table></center>'
 }
 
 $din_Update_Condom_Counts = {
@@ -351,7 +367,10 @@ $din_Update_Condom_Counts = {
 
 $d_tabletkied = {
 	*clr & cla
-	'<center><img src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"	height="300"></center>'
+	'<center><h1>Birth Control</h1></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td cellspacing="0" cellpadding="0" valign="top">'
 	tabloc = 0
 	if tabletkiday < daystart:  '<a href="exec:dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
 	if tabletkicheck = 0:
@@ -361,10 +380,15 @@ $d_tabletkied = {
 	end
 	'<a href="exec:dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
 	if tabletkioddk = 1:  '<a href="exec:dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
-	'<a href="exec:gs ''stat'' & dynamic $d_bag">Return</a>'
+	act 'Return':dynamic $d_bag
+	'</td></tr></table></center>'
 }
 
 $d_tabletkiedt = {
+	*clr & cla
+	'<center><h1>Birth Control</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	tabloc = 1
 	if tabletkiday < daystart: '<a href="exec:*clr & dynamic $d_tabletkieda, 1">Take the birth control pill now.</b></a>'
 	if tabletkicheck = 0:
@@ -374,10 +398,10 @@ $d_tabletkiedt = {
 	end
 	'<a href="exec:*clr & dynamic $d_tabletkieda, 4">Examine the birth control pills.</b></a>'
 	if tabletkioddk = 1:  '<a href="exec:*clr & dynamic $d_tabletkieda, 5">Dump the strange pills.</b></a>'
-	'<a href="exec:gt ''stol'', ''bc''">Return</a>'
+	act 'Return':gt 'stol', 'bc'
 }
 
-$d_tabletkiedA = {
+$d_tabletkieda = {
 	if ARGS[0] = 1:
 		tabletkipd += tabletkipt
 		if tabletkiday ! daystart:
@@ -439,19 +463,23 @@ $d_tabletkiedA = {
 
 $d_cycreport_choice = {
 	*clr & cla
+	'<center><h1>Fertility Cycle</h1></center>'
+	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+	'<td width="800" cellspacing="0" cellpadding="0" valign="top">'
 	dynamic $d_cycreport_update
-	'Current Status: <<$cycreport_txt>>.'
+	'<center><b>Current Status:</b></center>'
+	'<center><<$cycreport_txt>></center>'
+	'</td></tr></table></center><center><table cellspacing="0" cellpadding="20" valign="top"><tr><td width="250" valign="top">'
 	if $cycreport_txt ! 'In labour':
-		*nl
-		'Change Status because:'
+		'<center><b>Change Status because:</b></center>'
 		if thinkpreg = 0:
 			if knowpreg = 1:
-				'<a href="exec: dynamic $d_cycreport_actor, 2">I''m pregnant.</a>'
+				'<a href="exec: dynamic $d_cycreport_actor, 2 & gs ''stat''">I''m pregnant.</a>'
 			else
-				'<a href="exec: dynamic $d_cycreport_actor, 2">I think I''m pregnant.</a>'
+				'<a href="exec: dynamic $d_cycreport_actor, 2 & gs ''stat''">I think I''m pregnant.</a>'
 			end
 		elseif thinkpreg = 1:
-			'<a href="exec: dynamic $d_cycreport_actor, 1">I''m not pregnant.</a>'
+			'<a href="exec: dynamic $d_cycreport_actor, 1 & gs ''stat''">I''m not pregnant.</a>'
 		end
 		if mesec > 0 and thinkpreg ! 1 and knowpreg ! 1:
 			'<a href="exec: dynamic $d_cycreport_actor, 3">I''m menstruating.</a>'
@@ -468,7 +496,8 @@ $d_cycreport_choice = {
 	else
 		dynamic $d_cycreport_actor, 10
 	end
-	'<a href="exec:gs ''stat'' & gt $loc, $metka">Return</a>'
+	act 'Exit':gs 'stat' & gt $loc, $metka
+	'</td></tr></table></center>'
 }
 
 $d_cycreport_actor = {
@@ -483,36 +512,55 @@ $d_cycreport_actor = {
 		end
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 2:
 		thinkpreg = 1
 		denypreg = 0
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 3:
 		thinkpreg = 0
 		denypreg = 0
 		daylastperiod = daystart
 		dynamic $d_cycreport_update
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 4:
 		thinkpreg = 0
 		denypreg = 0
-		clr
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
 		'How many days ago was it you had your last period?'
 		'Currently: <<pertemp>>'
-		'<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		'<a href="exec: pertemp += 1 & dynamic $d_cycreport_actor, 4">+1</a> <a href="exec: pertemp += 5 & dynamic $d_cycreport_actor, 4">+5</a> <a href="exec: pertemp += 10 & dynamic $d_cycreport_actor, 4">+10</a> <a href="exec: pertemp = 0 & dynamic $d_cycreport_actor, 4">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat'' & dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 5:
 		thinkpreg = 0
 		denypreg = 0
 		$cycreport_txt = 'You do not believe you have periods any more.'
 		gs 'stat'
+		dynamic $d_cycreport_choice
 	elseif ARGS[0] = 6:
-		clr
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
 		'How many days ago was it you had your last period?'
 		'Currently: <<pertemp>>'
-		'<a href="exec: pertemp += 1 & clr & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & clr & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & clr & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & clr & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat''">Accept</a>'
+		'<a href="exec: pertemp += 1 & dynamic $d_cycreport_actor, 6">+1</a> <a href="exec: pertemp += 5 & dynamic $d_cycreport_actor, 6">+5</a> <a href="exec: pertemp += 10 & dynamic $d_cycreport_actor, 6">+10</a> <a href="exec: pertemp = 0 & dynamic $d_cycreport_actor, 6">Reset</a> <a href="exec: daylastperiod = daystart - pertemp & dynamic $d_cycreport_update & gs ''stat'' & dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 7:
-		clr
+		*clr & cla
+		'<center><h1>Fertility Cycle</h1></center>'
+		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
+		'<td width="250" cellspacing="0" cellpadding="0" valign="top">'
 		tempmax = arrsize('$cumfthname')-1
 		tempcurr = 0
 		sumcum = 0
@@ -529,9 +577,9 @@ $d_cycreport_actor = {
 		:pickfathloop
 			if cumtime[tempcurr] > 0:
 				if $npc_usedname[$cumfthname[tempcurr]] <> '':
-					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$cumfthname[tempcurr]]>> (<<$cumfthname[tempcurr]>>)</a>'
 				else
-					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7">Unknown (-)</a>'
+					' <a href="exec: $wombthfath = ''<<$npc_usedname[$cumfthname[tempcurr]]>>'' & $wombthfathID = ''<<$cumfthname[tempcurr]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 				end
 			end
 		if tempcurr < tempmax:tempcurr += 1 & jump 'pickfathloop'
@@ -540,6 +588,9 @@ $d_cycreport_actor = {
 		killvar 'tempmax'
 		killvar 'tempcurr'
 		'<br>  <a href="exec:dynamic $d_cycreport_choice">Accept</a>'
+		act 'Return':dynamic $d_cycreport_choice
+		act 'Exit':gs 'stat' & gt $loc, $metka
+		'</td></tr></table></center>'
 	elseif ARGS[0] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1
@@ -557,7 +608,9 @@ $d_cycreport_update = {
 		if cyccustom = 1:
 			if preg = 1 and knowpreg = 1:
 				$cycreport_txt = 'You are pregnant. Your due date is around <<$pregduedate>>.'
-				if $wombthfath ! 'unknown': $cycreport_txt = '<<$cycreport_txt>> You suspect the father being <<$wombthfath>>'
+				if $wombthfath ! 'unknown': 
+					$cycreport_txt = '<<$cycreport_txt>> You suspect the father being <<$wombthfath>>.'
+				end
 			elseif knowpregloss = 1:
 				$cycreport_txt = 'Your body is recovering from the trauma of pregnancy.'
 			elseif knowpregrecover = 1:

+ 36 - 21
locations/din_van.qsrc

@@ -701,6 +701,26 @@ $pirManage = {
 	act'<b>Back</b>':gt $loc, $metka
 }
 
+$enema = {
+	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
+		act 'Give yourself an enema (0:05)':
+			cla
+			*clr
+			cumspclnt = 7
+			gs 'cum_cleanup'
+			minut += 5
+			klismaday = daystart
+			klismaday1 = 1
+
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
+			*nl
+			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
+
+			act 'Finish':gt $loc, $metka
+		end
+	end
+}
+
 $toymanage = {
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
@@ -737,24 +757,6 @@ $toymanage = {
 		end
 	end
 
-	if klisma = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) ! -1):
-		act 'Give yourself an enema (0:05)':
-			cla
-			*clr
-			cumspclnt = 7
-			gs 'cum_cleanup'
-			minut += 5
-			klismaday = daystart
-			klismaday1 = 1
-
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/klisma.jpg"></center>'
-			*nl
-			'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-
-			act 'Finish':gt $loc, $metka
-		end
-	end
-
 	if vibrator = 1 and vibratorIN = 1:
 		act 'Remove the vibrator (0:05)':
 			cla
@@ -862,6 +864,9 @@ if $ARGS[0] = 'private':
 
 	act 'Change clothes and toys':
 		cla
+		
+		act 'Return':gt $loc, $metka
+		
 		dynamic $wearpan
 		dynamic $removepan
 
@@ -887,8 +892,6 @@ if $ARGS[0] = 'private':
 			end
 		end
 		dynamic $toymanage
-
-		act 'Return':gt $loc, $metka
 	end
 
 	'<a href="exec:msg ''Your body fat is = (<<salo>>)''">Check weight on the scales</a>'
@@ -899,6 +902,9 @@ if $ARGS[0] = 'private':
 
 	dynamic $brit
 
+	dynamic $enema
+
+
 	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
 			cla
@@ -952,10 +958,19 @@ if $ARGS[0] = 'private':
 	end
 
 	!!breast pump is now in the menu, not on the screen
-	if breastpump > 0:
+	if breastcounter <= 0:
+		temp_var = 50
+	else
+		temp_var = (50/breastcounter)
+	end
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end
+	elseif breastpump > 0 and bp_unbox <= 0:
+		'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+	elseif breastpump <= 0 and pcs_horny >= temp_var:
+		act 'Massage your breasts': gt 'lact_lib','man_milking'
 	end
 end
 

+ 1 - 1
locations/events.qsrc

@@ -266,6 +266,7 @@ end
 if $ARGS[0] = 'snarkozaka':
 	cls
 	minut += 20
+	gs 'stat'
 	'<center><B>Pavlovsk train station</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 	'You walk to the end of the platform and see a man hiding undercover smoking a cigarette'
@@ -288,7 +289,6 @@ if $ARGS[0] = 'snarkozaka':
 	act 'Leave': gt $loc, $metka
 end
 
-
 if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'

+ 1 - 1
locations/gadforest.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = '1':
 		if foresteventrand = 9 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_3boys'
 	end
 
-	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3:
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and inhib > 50:
 		act'Strip naked':
 			if forestpicnic = 0:
 				inhib_exp += rand(1,3)

+ 19 - 17
locations/gadforest_event.qsrc

@@ -2014,23 +2014,25 @@ if $ARGS[0] = 'nude_event':
 		'Finally after the hundredth time, of looking around to make sure no one is around, you decide...'
 	end
 
-	act'Give in to the temptation':
-		cla
-		*clr
-		minut+=5
-		gs 'underwear', 'remove'
-		pcs_horny += 10
-		inhib_exp += rand(1,3)
-		if MiraLoc = 3:npc_rel['A60'] += 5
-		gs 'stat'
-		if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-		if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-		if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
-		gs 'clothing', 'strip', 'gadforest'
-		if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
-		if MiraLoc = 3:'Seeing that the resistance stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
-
-		act'Further':gt 'gadforest','1'
+	if inhib > 50:
+		act'Give in to the temptation':
+			cla
+			*clr
+			minut+=5
+			gs 'underwear', 'remove'
+			pcs_horny += 10
+			inhib_exp += rand(1,3)
+			if MiraLoc = 3:npc_rel['A60'] += 5
+			gs 'stat'
+			if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
+			gs 'clothing', 'strip', 'gadforest'
+			if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
+			if MiraLoc = 3:'Seeing that the resistance stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
+
+			act'Further':gt 'gadforest','1'
+		end
 	end
 
 	act 'Resist the temptation':

+ 1 - 1
locations/gadriver.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'Gadbitch':
 
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
-		if $clothingworntype ! 'nude':
+		if $clothingworntype ! 'nude' and pcs_inhib > 50:
 			act 'Strip naked':
 				cla
 				minut += 5

+ 70 - 70
locations/gadukino.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Kingpin</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-		'In the village you are approached by your old friend Mitka.'
+		'While walking through the village, you meet your old friend Mitka who approaches you.'
 
 		act 'Further':gt 'mitka'
 	elseif mitkaday ! daystart and mitka = 1 and hour >= 17 and hour < 20 and mitkarand = 1 and mitkaday ! daystart and npc_QW['A63'] < 13:
@@ -25,7 +25,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Kingpin</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
-		'In the village you are approached by your old friend Mitka.'
+		'While walking through the village, you meet your old friend Mitka who approaches you.'
 
 		act 'Further':gt 'mitka'
 	else
@@ -59,13 +59,13 @@ if $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/street_winter_night.jpg"></center>'
 			end
 		end
-		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
+		'A small village with many rickety wooden houses and even more ruins of houses. This village has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1 :
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
+			'Nearby there are several small farms, in one of which <a href="exec:minut += 5 & gt ''Gaddvor''">your grandparents</a> live.'
 			act 'Grandparent''s house': minut += 5 & gt 'Gaddvor'
 		else
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
+			'Nearby there are several small farms, in one of which <a href="exec:minut += 5 & gt ''Gaddvor''">old couple</a> live.'
 			act 'Old couple''s house': gt 'Gaddvor'
 		end
 		if npc_rel['A60'] > 0: 'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
@@ -75,10 +75,10 @@ if $ARGS[0] = '':
 			if hour >= 9 and hour <= 11:
 				'A truck from the city has come to <a href="exec: gt ''gadukino'',''collection_point''">collect</a> mushrooms and berries. Will stay around until noon.'
 			else
-				'Between 9.00 and 12.00, a truck will come to collect mushrooms and berries.'
+				'Between 09:00 and 12:00, there''s a truck waiting to collect mushrooms and berries.'
 			end
 		else
-			'It''s not the right season for mushrooms or berries. The truck which takes them in town won''t come.'
+			'It''s not the right season for mushrooms or berries. The truck which takes them to town won''t come during this season.'
 		end
 
 !MiaLoc tells us where Mira is Located
@@ -161,14 +161,14 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Go to forest road':minut += 20 & gt'gadroad'
+		act 'Head to the river':minut += 20 & gt 'gadriver', 'start'
+		act 'Head to forest road':minut += 20 & gt'gadroad'
 !!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
-			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
+			act 'Go on the prowl (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
 
-		act 'Go to the highway':minut += 30 & nroad = 10 & dirtyclothes = 0 & gt 'road'
+		act 'Head to the highway':minut += 30 & nroad = 10 & dirtyclothes = 0 & gt 'road'
 	end
 end
 
@@ -176,15 +176,15 @@ if $ARGS[0] = 'succubus_hunt':
 	cla
 	minut += 30
 	*nl
-	'At this hour of the night, the village is only illuminated by the light of the moon. You know this will be to your advantage. No one will be able to see you coming... That is, if there were anyone out at night. You prowl the village looking for prey, but as the minutes pass, your frustration grows.'
+	'At this time of the night, the village is only illuminated by the light of the moon. You know this will be to your advantage. No one will be able to see you coming... That is, if there was anyone out at night. You prowl the village looking for prey, but as the minutes pass, your frustration grows.'
 	if rand(1,100) < 70:
 		minut += 30
 		mood -= 5
 		*nl
-		'God, this place is dull! After searching for an hour, you find no one; not even a stray cat seems to be out and about tonight. You give up reluctantly, pondering how else you are going to feed tonight.'
+		'God, this place is dull! After spending an hour searching, you find no one; not even a stray cat seems to be out and about tonight. You give up reluctantly, pondering how else you are going to feed tonight.'
 		act 'Continue': gt 'gadukino'
 	else
-		'You are getting really antsy to feed, and after finding absolutely no one outside, you decide that breaking into someone''s house, risky as it is, is still better than going hungry.' 
+		'You are getting really anxious to feed, and after finding absolutely nobody outside, you decide that breaking into someone''s house, risky as it is, is still better than starving.' 
 		*nl
 		!Another rand_check here to choose the scene?
 		'You break the lock of the first house you see and go inside. You sneak around the house, looking for a meal, but there''s nobody there. This entire night is a bust... Well, since you''re here, you might as well try and see if there''s any regular food that helps with your hunger, even though you doubt it.' 
@@ -199,14 +199,14 @@ if $ARGS[0] = 'succubus_hunt':
 			gs 'underwear', 'remove'
 			!Just took a guess at where this image might go - Adjust src accordingly
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/succubus/kitchennude.jpg"></center>'
-			'Heavy footsteps echo through the corridor, approaching the kitchen, and with nowhere to hide, you decide to strip instead. You are here to feed, after all, and if he sees you nude, surely he will forget what he is angry about.'
+			'Heavy footsteps echo through the corridor, approaching the kitchen, and with nowhere to hide, you decide to strip instead. You are here to feed, after all, and if he sees you naked, surely he will forget what he is angry about.'
 			'When the man enters the dark kitchen, his first reaction is about what you''d expect: "Who the hell are you!?"'
-			'You give him a good look at your body; according to your plan, that should be enough to calm him down. Unfortunately, he doesn''t seem to be aware of the plan, cause he is having none of it.'
+			'You let him have a good look at your body; according to your plan, that should be enough to calm him down. Unfortunately, he doesn''t seem to care about your plan, because he isn''t behaving like you expected.'
 			'"Have you been eating my food?! Get the hell out of my house!"'
 			*nl
-			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip your mind.' 
-			'As soon as you resist his pull, he grinds to a halt, confused by the fact that he can''t move you further. With the tables turned, you grab him and half-drag, half-throw him into his own living room where he lands on his back, stunned by the fact that this woman so easily overpowered him.'
-			'You pull his pants off and, already nude yourself, lower your pussy to his cock. He may have played the angry man, but the fact that it stands at attention soothes your bruised ego - your seduction efforts didn''t go completely unnoticed - and you plunge yourself down on top of him.'
+			'He grabs you and starts dragging you towards the door. You protest and try in vain to seduce him, wondering how anyone could resist your charms like this. Then you remember that you are stronger than him - weird how easily superhuman strength can slip off your mind.' 
+			'As soon as you resist his pull, he grinds to a halt, confused by the fact that he can''t move you further. With the tables turned, you grab him and half-drag, half-throw him into his own living room where he heavily lands on his back, surprised by the fact that this woman so easily overpowered him.'
+			'You pull his pants off and, being already nude yourself, lower your pussy to meet his cock. He may have played the angry man, but the fact that it stands at attention soothes your bruised ego - your seduction efforts didn''t go completely unnoticed - and you plunge yourself down on top of him.'
 			
 			act 'Feed on him':
 				*clr
@@ -233,17 +233,17 @@ if $ARGS[0] = 'succubus_hunt':
 				
 				'You ride him hard, desperate to get your hungry pussy the nourishment it requires.' 
 				if scrand < succublvl:
-					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, oh yeah, the fact you are raping him, but you simply ignore that.' 
-					'All you need is his sperm. You could care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.' 
+					'Your seduction and succubus powers were strong enough to get your victim hard, but they weren''t enough to make him forget about his situation: He is giving you hateful looks, clearly pissed about his door and food and, what else? oh yeah, the fact you are raping him, but you simply ignore that.' 
+					'All you need is his sperm. You couldn''t care less about his happiness, and if he wants to complain about a woman like you fucking his brains out, that''s his problem. Just as you''re thinking that, your powers surge and force him to come, unloading his jizz deep into your waiting cunt.' 
 					*nl
-					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix.' 
+					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off your passed-out plaything and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your "meal".' 
 					'Then you head out the back door, making sure to break the handle on the way out - you''re nothing if not consistent.'
 				else
 					'He was resisting you initially, but after a while, your powers break any resistance he had in him. By the time his first orgasm hits and he shoots his sperm into your needy cunt, he would have betrayed his own mother, much less broken his front door and laid his fridge at your feet, just to be inside you a little longer.'
-					'However unsavory the first few minutes of your meeting, this state of bliss you share with him pushes that memory in the far back of your minds and lets both of you enjoy the hard ride you''re giving him.'
+					'However unsavory the first few minutes of your meeting, this state of bliss you share with him pushes that memory in the far back of your mind and lets both of you enjoy the hard ride you''re giving him.'
 					*nl
-					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off of your passed-out plaything, patting his head affectionately, and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your fix. There''s nothing better than sex with a willing subject.'
-					'Then you head out the back door. For a split second, you consider breaking that door too... but why add insult to injury when he has pleased you so?'
+					'You don''t know how long you go at it with him exactly, but after coming inside you <<$scxcum>>, and thus making you come too, he runs out of energy and falls unconscious. You lift yourself off your passed-out plaything, patting his head affectionately, and head for the kitchen to collect your clothes as well as one last snack, feeling wonderfully relaxed after getting your "meal". There''s nothing better than sex with a willing subject.'
+					'Then you head out the back door. For a split second, you consider breaking that door too... but why add insult to injury when he has pleased you so much?'
 				end
 				killvar 'scfeed' & killvar 'scrand'
 				gs 'stat'
@@ -261,13 +261,13 @@ if $ARGS[0] = '1':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
 	'Walking around the village you see a small path that leads between neighbor''s houses, the path leads away from the village into a dense thicket...'
 
-	act 'Follow the path to see where it goes':
+	act 'Follow the path to see where it leads':
 		*clr & cla
 		meadow = 1
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
-		'You follow the path to see where it goes, but about ten minutes later the path disappears into a very dense thicket if bushes and trees.'
+		'You follow the path to see where it leads, but about ten minutes later the path disappears into a very dense thicket of bushes and trees.'
 
 		act 'Look for a way around':
 			*clr & cla
@@ -310,15 +310,15 @@ if $ARGS[0] = '2':
 	if npc_rel['A60'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
-		'Walking around the village you notice unfamiliar young girl around your own age, she is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
+		'Walking around the village you notice an unfamiliar young girl around your own age, she is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes its head and refuses to move any further.'
 		act 'Help':
 			*clr & cla
 			npc_rel['A60'] = 1
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
-			'You decide to lend a hand to help the girl with the calf. Your lonely in the village, maybe this girl, if you get to know her, could make it seem to the other villagers that you are not a complete stranger in Gadukino. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately to moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava.'
-			'Together you are able to guide the calf back into its pen. Miroslava turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were destitute and could only afford to buy a house in this seedy dust covered village. You walk with her and chat until you reach her house, which is only a few away from your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
+			'You decide to lend a hand to the girl with the calf. Your lonely in the village, maybe this girl, if you get to know her, could make it seem to the other villagers that you are not a complete stranger in Gadukino. You walk over to the girl and introduce yourself asking if she needs help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a loud slap on the rump. The calf is surprised and immediately moves forward, away from you. The girl gives you a thankful smile and tells you her name is Miroslava.'
+			'Together you are able to guide the calf back to its pen. Mira turns out to be quite a sociable girl and a chatterbox. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable individuals forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time getting used to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...", so they were broke and could only afford to buy a house in this battered dust covered village. You walk with her and chat until you reach her house, which is only a little away from your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 
 			act 'Finish': gt 'gadukino'
 		end
@@ -334,7 +334,7 @@ if $ARGS[0] = '2':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira4.jpg"></center>'
 		end
-		'You meet Miroslava, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
+		'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
 		if npc_QW['A60'] >= 20:
 			act 'You''re feeling naughty':
 				*clr & cla
@@ -348,10 +348,10 @@ if $ARGS[0] = '2':
 						'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t wearing any panties.'
 					elseif temp < 25:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp1.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and sits down on the fence and slightly spreading his legs, showing you her bare naked pussy. She isn''t waering any panties.'
+						'You ask Mira to show you her pussy. She smiles casually and sits down on the fence and slightly spreading his legs, showing you her bare naked pussy. She isn''t wearing any panties.'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and getting on her hand and knees on the bench. She quickly glancing around and quickly pulls up her skirt and arched her back, showing you her naked pussy. Hold on a sec, she isn''t wearing any panties'
+						'You ask Mira to show you her pussy. She smiles casually and getting on her hand and knees on the bench. She quickly glances around, quickly pulls up her skirt and arched her back, showing you her naked pussy. Hold on a sec, she isn''t wearing any panties'
 					end
 					gs 'arousal', 'voyeur', 5, 'lesbian'
 					gs 'stat'
@@ -365,7 +365,7 @@ if $ARGS[0] = '2':
 					temp = RAND(0,30)
 					if temp < 5:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp3.jpg"></center>'
-						'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and gaping pussy is oozing cum. She must have just been fucked.'
+						'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and her gaping pussy is oozing cum. She must have just been fucked.'
 						'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp4.jpg"></center>'
@@ -389,7 +389,7 @@ if $ARGS[0] = '2':
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
-		'You meet Miroslava and her little calf. You both pause and start laughing, remembering how you first met.'
+		'You meet Mira and her little calf. You both pause and start laughing, remembering how you first met.'
 
 		act 'Finish': gt 'gadukino'
 	elseif npc_rel['A60'] > 0 and npc_QW['A60'] >= 4 and mirasextimes >= 10 and temper >= 12 and sunWeather = 1 and temp < 7:
@@ -402,10 +402,10 @@ if $ARGS[0] = '2':
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad1.jpg"></center>'
-				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
+				'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, seeing this, quickly takes his dick in her hand directing it towards her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
 			end
 		else
-			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
+			'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, while Mira''s head bobs up and down keeping to suck Mitka''s cock. Finally, he tilts his head back and Mira, seeing this, quickly takes his dick in hand directing it towards her mouth, taking a mouth full of sperm. She greedily swallowing it all, and she licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
 		end
 		gs 'arousal', 'voyeur', 5, 'exhibitionism'
 		gs 'stat'
@@ -418,7 +418,7 @@ if $ARGS[0] = '2':
 	elseif npc_rel['A60'] > 0 and npc_QW['A60'] >= 6 and mirasextimes >= 10 and temper < 18 and sunWeather = 1 and temp >= 7:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad2.jpg"></center>'
-		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just grunts and laughs.'
+		'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinded his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxes. She moans and scratches his back with her fingernails as she squirts and continues to cum. Mitka increases his pace and starts to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and starts to squeeze it without mercy. Mira just grunts and laughs.'
 		gs 'arousal', 'voyeur', 10, 'exhibitionism'
 		gs 'stat'
 		act 'Watch':
@@ -426,14 +426,14 @@ if $ARGS[0] = '2':
 				*clr & delact 'Watch'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-				'They are so absorbed in fucking each other senseless that they ignoring everything else, so decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
+				'They are so absorbed in fucking each other senseless that they are ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he starts to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
 				gs 'arousal', 'voyeur', 10, 'exhibitionism'
 				gs 'stat'
 			else
 				*clr & delact 'Watch'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-				'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubs rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving a bright red mark. Mitka begins to stutter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
+				'They are so absorbed in fucking each other senseless that they are ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and driving it deep into her ass, without any preparation. Mira lets out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks on it. Mitka begins to falter in his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
 				gs 'arousal', 'voyeur', 5, 'exhibitionism'
 				gs 'stat'
 			end
@@ -446,14 +446,14 @@ if $ARGS[0] = '2':
 	else
 		'<center><h2>Village Gadukino</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-		'You kill time, walking through the village.'
+		'To kill time, you take a walk through the village.'
 		act 'Leave':gt 'gadukino'
 	end
 end
 
 if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
-	'Walking through the village, you notice Miroslava, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
+	'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
 
 	act 'You approach slowly':
 		*clr & cla
@@ -472,11 +472,12 @@ if $ARGS[0] = '3':
 		elseif npc_QW['A60'] >= 20:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3,<<rand(0,3)>>.jpg"></center>'
 		end
-		'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Miroslava, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you wishes and you''re ready to collect your second wish. You tell Mira to sit down. Miroslava reluctantly agrees, and when is finally sitting on the ground, you order her to show you her pussy, you are thinking fast of other punishments for her. Mira grumbles incoherently and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at my crotch.'
+		'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting around, shifting her weight from foot to foot, explains hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you wishes and tell you''re ready to collect your second wish.'
+		'You tell Mira to sit down. Mira reluctantly agrees, and when is finally sitting on the ground, you order her to show you her pussy, you are thinking fast of other punishments for her. Mira grumbles incoherently and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
-			'You enjoy the view, then snap your fingers as a wicked idea comes to mind for your second wish. Mira says sadly, that she thought you had come up with your second wish. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile wickedly and tell her to follow you.'
+			'You enjoy the view, then snap your fingers as a wicked idea comes to mind for your second wish. Mira says sadly, that she thinks you just came up with your second wish. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile wickedly and tell her to follow you.'
 			gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
 			gs 'stat'
 
@@ -485,7 +486,7 @@ if $ARGS[0] = '3':
 				minut += 45
 				pcs_dom += RAND(0,2)
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-				'You lead her out to the main road. You tell Miroslava, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfil the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
+				'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing the street was quiet, fulfills your desire...'
 				gs 'stat'
 
 				act 'Watch her perform a trick...':
@@ -502,7 +503,7 @@ if $ARGS[0] = '3':
 						*clr & cla
 						minut += 10
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+						'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off to the vehicle.'
 						gs 'stat'
 
 						act 'Continue':
@@ -532,7 +533,7 @@ if $ARGS[0] = '3':
 											*clr & cla
 											minut += 10
 											'<center><img <<$set_imgh>> src="images/characters/village/mira/miramoney.jpg"></center>'
-											'Mira walks back towards town counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
+											'Mira walks back towards town counting the money he gave her as she absentmindedly licking the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
 											gs 'arousal', 'end'
 											gs 'stat'
 
@@ -551,7 +552,7 @@ if $ARGS[0] = '3':
 								act 'Continue':
 									*clr & cla
 									'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the John is hitting or entering her cervix.'
+									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy heavily pounds her pussy with his 20cm cock. From Mira''s grunts of a mix of ecstasy and pain, you know the John is reaching or entering her cervix.'
 									gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
 									gs 'stat'
 
@@ -566,7 +567,7 @@ if $ARGS[0] = '3':
 											*clr & cla
 											minut += 10
 											'<left><video autoplay loop src="images/locations/gadukino/sex/mira/miracumpump.mp4"></video></left>''<right><video autoplay loop src="images/locations/gadukino/sex/mira/miracumdump.mp4"></video></right>'
-											'After the wild sex, Mira and the John sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and says thanks.'
+											'After the wild sex, Mira and the John sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and thanks you.'
 											gs 'arousal', 'end'
 											gs 'stat'
 
@@ -586,7 +587,7 @@ end
 if $ARGS[0] = '4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to everything around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -597,7 +598,7 @@ end
 if $ARGS[0] = '5':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad6.jpg"></center>'
-	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to Mira around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
+	'Walking through the village, you notice that behind a shed Vasya and Mira are having sex. Mira moans as she rides his cock and it seems as if she''s oblivious to everything around her. But you''re not sure you can say the same about Vasya... So, you decide not to risk being caught peeking and leave the couple alone.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -608,7 +609,7 @@ end
 if $ARGS[0] = '6':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad7.jpg"></center>'
-	'Walking through the village, you notice Kolambu and Mira hiding behind some bushes. She''s squatting before him, passionately smacking her lips on his cock...'
+	'Walking through the village, you notice Kolyamba and Mira hiding behind some bushes. She''s squatting before him, passionately smacking her lips on his cock...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -619,7 +620,7 @@ end
 if $ARGS[0] = '7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad8.jpg"></center>'
-	'Walking through the village, you notice behind the bushes Kolambu with Vasya and Mira. That is to see you butt naked on all fours and take turns sucking boys members...'
+	'Walking through the village, you notice Kolyamba with Vasya and Mira behind the bushes. She''s butt naked on all fours and is eagerly sucking off the guys in turn...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -630,7 +631,7 @@ end
 if $ARGS[0] = '8':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirahorny.jpg"></center>'
-	'Walking through the village, you see Mira. She sits on the fence and constantly looking intensely RUB yourself pussy, when no one is watching...'
+	'Walking through the village, you see Mira. She sits on the fence and constantly looking nervously around while intensely playing with her pussy, when no one is watching...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -641,7 +642,7 @@ end
 if $ARGS[0] = '9':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad9.jpg"></center>'
-	'Walking through the village, you notice Mira behind fences with Kolyamba. She squirms and moans, but dutifully peddles her bare butt Kolyamba, trying to shove in her bottle...'
+	'Walking through the village, you notice Mira trying to hide behind a fence with Kolyamba. She squirms and moans, but dutifully opens her bare ass for Kolyamba as he''s trying to shove a bottle into it...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -652,7 +653,7 @@ end
 if $ARGS[0] = '10':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad10.jpg"></center>'
-	'Walking through the village, you see Mira, facing Mitka with his pants down and sticking his fingers Cebu anus, shows him prolapsed ass...'
+	'Walking through the village, you spot Mira and Mitka hidden between two buildings. Mira is bent over slightly, baring her ass to him as he probes her hole with his fingers, revealing her prolapsed anus to him.'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -663,7 +664,7 @@ end
 if $ARGS[0] = '11':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
-	'Walking through the village, you meet Mira, which corrects the shoes. However, she without panties and with her pussy white thread sticking out of a tampon...'
+	'Walking through the village, you meet Mira, after a while you''ve been chatting she bends over to fix her shoes. You can clearly notice that she''s not wearing any panties, you get a full view of her bare pussy...'
 	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -675,7 +676,7 @@ if $ARGS[0] = '12':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol.jpg"></center>'
-	'Walking through the village, you see two grandmas, sawing boards...'
+	'Walking through the village, you see two grandmas, sawing wood, preparing for the winter...'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -685,7 +686,7 @@ if $ARGS[0] = '13':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol1.jpg"></center>'
-	'Walking through the village, you see two thieving grannies, load-bearing boards with dilapidated farm...'
+	'Walking through the village, you see two thieving grannies hastily making their way down the street, having stole bundles of wooden boards from an old run down building.'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -696,21 +697,21 @@ if $ARGS[0] = '14':
 	minut += 5
 	if temper >= 15:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol3.jpg"></center>'
-		'Walking through the village, you see local elite. They kindly smile in your face, and as soon as you pass by, immediately start whispering among themselves...'
+		'Walking through the village, you come across the elderly gang. As you pass them, they kindly smile at you, but you know as soon as you pass by, they''ll immediately start gossiping among themselves...'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol2.jpg"></center>'
-		'Walking through the village, you see local elite. They, as if on command, all together subside and hard where to start looking-to the side, as soon as you approach him...'
+		'Walking through the village, you come across the elderly gang. As soon as you approach them, they all turn their back to you as they all pretentiously look away, not wanting to interact with you...'
 	end
 	gs 'stat'
 
-	act 'Pass by': gt 'gadukino'
+	act 'Continue on': gt 'gadukino'
 end
 
 if $ARGS[0] = '15':
 	*clr & cla
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadlol4.jpg"></center>'
-	'Walking through the village, you see the younger generation. They happily smile at you...'
+	'Walking through the village, a group of young boys, looking no older than 13 or 14, are playing in the road. Two of the older boys sit on an old, beat up dirt bike. You''re not even sure it even works, but the kids are having fun playing on it nonetheless.'
 	gs 'stat'
 
 	act 'Leave': gt 'gadukino'
@@ -720,7 +721,7 @@ if $ARGS[0] = '16':
 	*clr & cla
 	'<center><h2>Village Gadukino</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-	'You kill time, walking through the village.'
+	'Wanting to kill time, you decide on taking a stroll throughout the village.'
 
 	act 'Leave': gt 'gadukino'
 end
@@ -729,29 +730,28 @@ if $ARGS[0] = 'collection_point':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-	'Mobile procurement vehicle for local mushrooms and berries.'
+	'Parked half way off the road is an old, unmarked truck. The back doors are held open and found inside is usually a farmer looking to buy any mushrooms locals find while out in the nearby woods. Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like yours to buy their mushrooms, too.'
 
 	if boletus > 0:
-		act'sell mushrooms':
+		act'Sell your mushrooms':
 			*clr & cla
 			minut += 30
 			money += boletus*150
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You sale your mushrooms for <b><<boletus*150>></b> rubles.'
+			'You decide to sell your mushrooms for <<boletus*150>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Further':boletus = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if bilberry > 0:
-		act'sell berries':
+		act'Sell your berries':
 			*clr & cla
 			minut += 30
 			money += bilberry*75
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You sale your berries for <b><<bilberry*75>></b> rubles.'
+			'You decide to your berries for <<bilberry*75>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Further':bilberry = 0 & gt 'gadukino','collection_point'

+ 145 - 127
locations/gpoli.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = '':
 	if prcptn_lvl > 40 and pcs_know_mward <= 0:
 		'<br><br>You see a sign that reads <a href="exec: minut += 5 & gt ''gpoli'', ''maternity_ward''">"Maternity ward"</a>.'
 	end
-	
+
 	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0:
 		'<br><br><a href="exec: minut += 5 & gt ''gpoli'', ''reception''">Ask</a> at the reception for help with your breasts.'
 	end
@@ -72,7 +72,7 @@ if $ARGS[0] = '':
 				ginrand = rand(0, 1)
 
 				if Gspravka < 10 and ginrand = 0:
-					'When you clean the floor of the gynecologist''s examination room, he leaves the room to let you do your work in peace. You''re alone now.'
+					'When you clean the floor of the gynaecologist''s examination room, he leaves the room to let you do your work in peace. You''re alone now.'
 
 					if pcs_vag > 0:
 						act 'Forge a referral to give to your mother':
@@ -82,7 +82,7 @@ if $ARGS[0] = '':
 							gs 'stat'
 							'You see a pile of unused referral forms and think to yourself: "I may not be a virgin any more, but Mom doesn''t need to know that!"'
 							'After you make sure no one is in the corridor, you quickly walk to the desk, take one of the empty referral forms and press his stamp onto it. You can do the rest later. You quickly hide it under your clothes and get back to cleaning, after carefully putting everything back the way you found it.'
-							'Later, when you''re cleaning the office of a doctor who you know is not in today, you lock the door for a moment and carefully fill out the form. You take your time, doing your best to mimic your gynecologist''s handwriting. You nod happily and mutter to yourself: "This looks good, Mom will have no clue it''s forged! That''ll get me off the hook for at least one more month..."'
+							'Later, when you''re cleaning the office of a doctor who you know is not in today, you lock the door for a moment and carefully fill out the form. You take your time, doing your best to mimic your gynaecologist''s handwriting. You nod happily and mutter to yourself: "This looks good, Mom will have no clue it''s forged! That''ll get me off the hook for at least one more month..."'
 
 							act 'Finish cleaning':gt 'gpoli'
 						end
@@ -161,7 +161,7 @@ if $ARGS[0] = '':
 		if therapistday ! daystart:
 			act 'Visit the therapist (1:00)': gt 'therapist'
 		end
-		
+
 		if pcs_know_mward > 0:
 			act 'Visit the maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
 		end
@@ -350,14 +350,14 @@ if $ARGS[0] = '':
 		end
 
 		if (pav_slut >= 150 or guy > 10 or unprotfilm or whoreQW > 1 or bordelslutty > 0 or cumcondslip_aware > 0) or lastmens >= 35 and gynodaystart ! daystart:
-			act 'Visit your gynecologist (1,000 <b>₽</b>)':
+			act 'Visit your gynaecologist (1,000 <b>₽</b>)':
 				cls
 				gynodaystart = daystart
 				minut += 5
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-				'You decide to have a check-up with your gynecologist. Given your sexual history, you can''t be too careful.'
+				'You decide to have a check-up with your gynaecologist. Given your sexual history, you can''t be too careful.'
 				if docKnow = 0:
 					if pav_slut >= 150:
 						$gyn1 = 'He looks at you with some concern, but still has to ask: "Rumor in town says that you''re a prostitute?"'
@@ -379,7 +379,7 @@ if $ARGS[0] = '':
 					'You smile at him: "It''s true, dr. Petrovich. I am."'
 					'He rubs his hand over his chin, and continues: "Does your mother know?"'
 					$gyn2
-					'The gynecologist nods, and motions for you to stand up: "Very well, let''s see how you''re doing then. Undress for me, please."'
+					'The gynaecologist nods, and motions for you to stand up: "Very well, let''s see how you''re doing then. Undress for me, please."'
 				elseif docKnow = 1:
 					if pav_slut >= 150 or unprotfilm or whoreQW > 1 or bordelslutty > 0:
 						$gyn1 = 'He looks at you with some concern, asking: "Are you still in the business?"'
@@ -394,21 +394,21 @@ if $ARGS[0] = '':
 					'"Yes, doctor. I am," you tell him.'
 					'He rubs his hand over his chin, and continues: "If I may be so bold... why?"'
 					$gyn2
-					'The gynecologist smirks, but nods: "I understand. It''s not my place to judge, anyway. Let''s see how you''re doing. Undress for me, please."'
+					'The gynaecologist smirks, but nods: "I understand. It''s not my place to judge, anyway. Let''s see how you''re doing. Undress for me, please."'
 				end
 				act 'Take off your clothes':
 					cls
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
-					'You quickly take off your clothes so your gynecologist can examine you, and neatly fold them before putting them aside.'
+					'You quickly take off your clothes so your gynaecologist can examine you, and neatly fold them before putting them aside.'
 					act 'Sit in the chair':
 						cls
 						minut += 5
 						docKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
-						'Once you''re nude, you have a seat in the gynecologist''s chair and spread your legs in the stirrups.'
+						'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
 						'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
 						$gpoli_sick = ''
 						if cumcondslip > 0:
@@ -678,118 +678,120 @@ if $ARGS[0] = '':
 				end
 			end
 		end
+		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0:
+			act 'Go to the gynaecologist for a referral': gt 'gpoli', 'referral'
+		end
+	else
+		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+	end
+end
 
+if $ARGS[0] = 'referral':
 
-		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0:
-			act 'Go to the gynecologist for a referral':
-				if pcs_vag = 0:
-					cls
-					minut = minut + 15
-					gs 'stat'
+	if pcs_vag = 0:
+		cls
+		minut = minut + 15
+		gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
-					'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
-					Gspravka = 30
-					GspravkaT = 1
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
+		'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynaecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
+		Gspravka = 30
+		GspravkaT = 1
+		Gspassed = 1
 
-					'He confirms that you are still a virgin, and tells you to get dressed again while he prepares your referral. While you put your clothes back on, he fills out the form at his desk and stamps it before handing it to you. This should keep your mother happy for another month...'
-					act 'Leave':gt $curloc
-				end
-				if pcs_vag > 0:
+		'He confirms that you are still a virgin, and tells you to get dressed again while he prepares your referral. While you put your clothes back on, he fills out the form at his desk and stamps it before handing it to you. This should keep your mother happy for another month...'
+		act 'Leave':gt $curloc
+	end
+	if pcs_vag > 0:
+		cls
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
+		'You''re a bit nervous as you enter the gynaecologist''s office. Your mother expects you to her a referral from him that states you''re still a virgin, except there''s one small problem... you''re not a virgin any more! Maybe you can work something out with him?'
+		if gpoliuborka = 2:
+			'"Hi <<$pcs_nickname>>. What brings you in today?" dr. Petrovich says with a smile.'
+			'"Hello, doctor. It''s time for my monthly check-up again. My mother needs a referral from you to make sure I''m still a virgin," you reply.'
+			'"Ah, yes. For... school, right? Let''s take a look," the doctor replies with a chuckle as you are already on your way to stand by the examination table, like last time.'
+		else
+			'"Hello, young lady. I''m dr. Petrovich. Do you have specific complaints, or are you simply here for a check-up?" the doctor asks as he comes into the examination room.'
+			'"Hello sir. I''m here for my monthly referral. My mother needs one from you to establish I''m still a virgin. It''s for school," you explain.'
+			'"For... school?" he asks, a tad confused. Then he snaps out of it and replies: "Anyway... let''s take a look, shall we?" as he gestures for you to stand next to the examination table.'
+		end
+
+		act 'Have the check-up':
+			cls
+			minut += 5
+			gs 'stat'
+			'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_2.jpg"></center>'
+			'Lift your shirt? What does that have to do with your virginity?'
+			'He sees your hesitation, and reassures you: "I''m just doing some basic check-ups while you''re here anyway. Now... your shirt, please?"'
+			'That makes sense. You expose your <<$titsize>> breasts to him when you lift your shirt up, and he examines you. You''re no medical professional, but you''re fairly sure he''s not supposed to put the stethoscope on your boob like that! Nevertheless... you need him to give you that referral, and calling him out on it will definitely not help your cause.'
+			'You decide to humour him and just let him play with your boobs for several minutes, after which he nods happily and says: "Everything seems to be in order."'
+			'There is an eager sparkle in his eyes when he looks at your bare breasts. The pervert!'
+			'He continues: "Now get undressed and have a seat in the chair, please. You can put your feet in the stirrups."'
+			act 'Undress':
+				cls
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
+				'You reluctantly take your clothes off, trying to put off the moment as long as you can. You know he will find out about your secret in a moment. Nevertheless, you don''t have any other option. Maybe you''ll get lucky and he won''t notice?'
+				act 'Sit in the chair':
 					cls
 					minut += 5
 					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-					'You''re a bit nervous as you enter the gynecologist''s office. Your mother expects you to bring a referral home from him that states you''re still a virgin, except there''s one small problem... you''re not a virgin any more! Maybe you can work something out with him?'
-					if gpoliuborka = 2:
-						'"Hi <<$pcs_nickname>>. What brings you in today?" dr. Petrovich says with a smile.'
-						'"Hello, doctor. It''s time for my monthly check-up again. My mother needs a referral from you to make sure I''m still a virgin," you reply.'
-						'"Ah, yes. For... school, right? Let''s take a look," the doctor replies with a chuckle as you are already on your way to stand by the examination table, like last time.'
-					else
-						'"Hello, young lady. I''m dr. Petrovich. Do you have specific complaints, or are you simply here for a check-up?" the doctor asks as he comes into the examination room.'
-						'"Hello sir. I''m here for my monthly referral. My mother needs one from you to establish I''m still a virgin. It''s for school," you explain.'
-						'"For... school?" he asks, a tad confused. Then he snaps out of it and replies: "Anyway... let''s take a look, shall we?" as he gestures for you to stand next to the examination table.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
+					'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
+					'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
+					$gpoli_sick = ''
+					if preg > 0:
+						knowpreg = 1
+						$gpoli_sick = 'are pregnant'
 					end
-
-					act 'Have the check-up':
-						cls
-						minut += 5
-						gs 'stat'
-						'The doctor breathes on his stethoscope to warm it up and says: "Lift your shirt, please."'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_2.jpg"></center>'
-						'Lift your shirt? What does that have to do with your virginity?'
-						'He sees your hesitation, and reassures you: "I''m just doing some basic check-ups while you''re here anyway. Now... your shirt, please?"'
-						'That makes sense. You expose your <<$titsize>> breasts to him when you lift your shirt up, and he examines you. You''re no medical professional, but you''re fairly sure he''s not supposed to put the stethoscope on your boob like that! Nevertheless... you need him to give you that referral, and calling him out on it will definitely not help your cause.'
-						'You decide to humour him and just let him play with your boobs for several minutes, after which he nods happily and says: "Everything seems to be in order."'
-						'There is an eager sparkle in his eyes when he looks at your bare breasts. The pervert!'
-						'He continues: "Now get undressed and have a seat in the chair, please. You can put your feet in the stirrups."'
-						act 'Undress':
-							cls
-							minut += 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_3.jpg"></center>'
-							'You reluctantly take your clothes off, trying to put off the moment as long as you can. You know he will find out about your secret in a moment. Nevertheless, you don''t have any other option. Maybe you''ll get lucky and he won''t notice?'
-							act 'Sit in the chair':
-								cls
-								minut += 5
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
-								'Once you''re nude, you have a seat in the gynecologist''s chair and spread your legs in the stirrups.'
-								'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
-								$gpoli_sick = ''
-								if preg > 0:
-									knowpreg = 1
-									$gpoli_sick = 'are pregnant'
-								end
-								if venera > 0:
-									if $gpoli_sick ! '':$gpoli_sick = $gpoli_sick + ', and you have a sexually transmitted disease'
-									if $gpoli_sick = '':$gpoli_sick = 'have a sexually transmitted disease'
-								end
-								if $gpoli_sick = '':
-									'"Well, you are completely healthy. However, you are also no longer a virgin." At these words you see the corners of his mouth twitch, and you think his trousers look a little tighter in his crotch area. "Please get dressed again while I write out the referral for your mother."'
-									'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
-									'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
-									'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, I can''t do that, that''s fraud! Do you have any idea how much trouble I could get into?"'
-								else
-									'The doctor frowns when he gives you the results: "I''m afraid I have some bad news, <<$pcs_nickname>>. You <<$gpoli_sick>>. You''re also not a virgin any more, obviously."'
-									'Your heart begins to race when you hear that, that''s terrible! Your mother would kill you if she finds out what you have been up to!'
-									'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
-									'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, but you are not an adult. I need her permission to treat you. And I can''t lie on a referral... that''s fraud! Do you have any idea how much trouble I could get into?"'
-								end
-								act 'Offer him money':gt 'gpoli', 'spravka_money'
-								act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
-								act 'Just accept the referral as is':gt 'gpoli', 'badend'
-							end
-						end
+					if venera > 0:
+						if $gpoli_sick ! '':$gpoli_sick = $gpoli_sick + ', and you have a sexually transmitted disease'
+						if $gpoli_sick = '':$gpoli_sick = 'have a sexually transmitted disease'
 					end
-					act 'Admit you''re no virgin':
-						cls
-						minut += 5
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-						if gpoliuborka = 2:
-							'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
-							'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
-							'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
-							'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
-							'He looks puzzled for a second, and his eyes widen when he realizes what you''re asking of him: "You mean... fake your referral? That''s fraud! Do you have any idea how much trouble I could end up in if I do that?"'
-						else
-							'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
-							'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
-							'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
-							'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
-							'He nods again and says: "I see what you''re getting at. I might be able to help you, but I''m running a big risk by doing that. What''s in it for me?"'
-						end
-						act 'Offer him money':gt 'gpoli', 'spravka_money'
-						act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
-						act 'Just accept the referral as is':gt 'gpoli', 'badend'
+					if $gpoli_sick = '':
+						'"Well, you are completely healthy. However, you are also no longer a virgin." At these words you see the corners of his mouth twitch, and you think his trousers look a little tighter in his crotch area. "Please get dressed again while I write out the referral for your mother."'
+						'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
+						'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
+						'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, I can''t do that, that''s fraud! Do you have any idea how much trouble I could get into?"'
+					else
+						'The doctor frowns when he gives you the results: "I''m afraid I have some bad news, <<$pcs_nickname>>. You <<$gpoli_sick>>. You''re also not a virgin any more, obviously."'
+						'Your heart begins to race when you hear that, that''s terrible! Your mother would kill you if she finds out what you have been up to!'
+						'You quickly blurt: "Wait! Could you please just write down that I''m still a virgin, so I don''t get in trouble? Please?"'
+						'He looks at you sternly and shakes his head: "I''m sorry <<$pcs_nickname>>, but you are not an adult. I need her permission to treat you. And I can''t lie on a referral... that''s fraud! Do you have any idea how much trouble I could get into?"'
 					end
+					act 'Offer him money':gt 'gpoli', 'spravka_money'
+					act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
+					act 'Just accept the referral as is':gt 'gpoli', 'badend'
 				end
 			end
 		end
-	else
-		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
+		act 'Admit you''re no virgin':
+			cls
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
+			if gpoliuborka = 2:
+				'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
+				'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
+				'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
+				'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
+				'He looks puzzled for a second, and his eyes widen when he realizes what you''re asking of him: "You mean... fake your referral? That''s fraud! Do you have any idea how much trouble I could end up in if I do that?"'
+			else
+				'You pause for a second, and then decide to just confess. He was going to find out anyway during the examination.'
+				'Hesitantly you say: "Mister Petrovich, I have something to ask of you. You see, I... I''m no longer a virgin."'
+				'He nods understandingly: "I see." That''s probably not the first time one of his patients told him that.'
+				'You continue: "But... my mom thinks I''m still a virgin, and I would really like to keep it that way. Could you please help me?"'
+				'He nods again and says: "I see what you''re getting at. I might be able to help you, but I''m running a big risk by doing that. What''s in it for me?"'
+			end
+			act 'Offer him money':gt 'gpoli', 'spravka_money'
+			act 'Try to negotiate':gt 'gpoli', 'spravka_arrange'
+			act 'Just accept the referral as is':gt 'gpoli', 'badend'
+		end
 	end
 end
 
@@ -843,9 +845,15 @@ if $ARGS[0] = 'badend':
 	gs 'stat'
 	Gspravka = 30
 	GspravkaT = 2
-	'You sigh, understanding that there''s nothing you can (or would be willing to) do to change his mind. Your gynecologist takes an empty form from the pile and fills it out, stating that you are not a virgin. He presses his stamp onto it and offers it to you with a disappointed look in his eyes.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gin.jpg"></center>'
+	*nl
+	'You sigh, understanding that there''s nothing you can (or would be willing to) do to change his mind. Your gynaecologist takes an empty form from the pile and fills it out, stating that you are not a virgin. He presses his stamp onto it and offers it to you with a disappointed look in his eyes.'
 	'Dejectedly, you take it from him and get ready to leave. How are you going to tell your mother?'
-	act 'Leave':gt 'gpoli'
+	if $loc = 'kuhrPar':
+		act 'leave': gt 'mother', 'referral'
+	else
+		act 'Leave':gt 'gpoli'
+	end
 end
 
 if $ARGS[0] = 'spravka_arrange':
@@ -871,6 +879,7 @@ if $ARGS[0] = 'spravka_arrange':
 			cls
 			Gspravka = 30
 			GspravkaT = 1
+			Gspassed = 1
 			gs 'stat'
 			'This is your chance! You quickly grab a nearly filled out form from his desk and run out of his examination room. Dr. Petrovich pulls up his pants again but doesn''t even follow you, knowing this would be way too awkward to explain to anyone else in the clinic. Looks like you win this one!'
 			'A while later, you fill out the rest of the form and nod to yourself as you think: "This should get Mom off my back for another month..."'
@@ -1004,11 +1013,14 @@ if $ARGS[0] = 'spravka_arrange':
 											'You feel cheap for a moment, when you accept the referral. Nevertheless, you''re off the hook for another month... that''s worth something, right?'
 											Gspravka = 30
 											GspravkaT = 1
-
+											Gspassed = 1
 											gs 'arousal', 'end'
 											gs 'stat'
-
-											act 'Leave':gt 'gpoli'
+											if $loc = 'kuhrPar':
+												act 'leave': gt 'mother', 'referral'
+											else
+												act 'Leave':gt 'gpoli'
+											end
 										end
 									end
 								end
@@ -1020,8 +1032,10 @@ if $ARGS[0] = 'spravka_arrange':
 		end
 	end
 	act 'You can''t do that':
+		cla
 		'You frown. You really don''t want to have sex with him, sex is what got you into this whole mess in the first place! You try one more time: "I can''t do that doctor. Please, show some compassion... could you give me a break, just this once? I just need some time to figure out how to tell my mom about all this!"'
 		'His gaze is stone cold, without any sign of compassion. He says in an even tone: "So be it. Sorry <<$pcs_nickname>>, but that''s not how it works. I''m running a big enough risk as it is. If you''re not helping me, I''m not helping you."'
+		act 'Try to negotiate': gt 'gpoli', 'spravka_arrange'
 		act 'Just accept the referral as is':gt 'gpoli', 'badend'
 	end
 end
@@ -1044,6 +1058,7 @@ if $ARGS[0] = 'spravka_money':
 				gs 'stat'
 				Gspravka = 30
 				GspravkaT = 1
+				Gspassed = 1
 				'Without giving it much thought, you say: "Deal!"'
 				'It''s not cheap, but this way you get another month to think of a solution before your mother finds out you are not a virgin. Dr. Petrovich takes your money and fills out a form, stating you are a virgin. He stamps it and hands it to you, and you carefully put it in your pocket while thanking him.'
 				act 'Leave':gt 'gpoli'
@@ -1121,7 +1136,11 @@ if $ARGS[0] = 'spravka_arrange_pale':
 			cls
 			gs 'stat'
 			'In a panic, you grab your clothes and run out of the office. You know you can''t talk about this with anyone... if you say anything, dr. Petrovich would tell your mom about your addiction. You quickly get dressed again in an empty examination room, wondering how you''re going to get out of this mess now.'
-			act 'Leave':gt 'gpoli'
+			if $loc = 'kuhrPar':
+				act 'leave': gt 'mother', 'referral'
+			else
+				act 'Leave':gt 'gpoli'
+			end
 		end
 	end
 	act 'Do what you have to do':
@@ -1255,7 +1274,6 @@ if $ARGS[0] = 'spravka_arrange_pale':
 
 											gs 'arousal', 'end'
 											gs 'stat'
-
 											act 'Leave':gt 'gpoli'
 										end
 									end
@@ -1307,7 +1325,7 @@ if $ARGS[0] = 'maternity_ward':
 						if lactatemv > lactatemm*8/10:
 							'The nurse looks surprised at your engorged breasts'
 							'Nurse: Oh dear! These look painfully full. I hope the pumping will make you feel better.'
-						end					
+						end
 						if pain['nipples'] >= 60:
 							'<center><img <<$set_imgh>> src="images/pc/body/nipples/sore_nipples.jpg"></center>'
 							'The nurse looks at your sore nipples and frowns a bit. She then grabs a small tin, and takes a bit more of the yellowish cream from the tin.'
@@ -1346,9 +1364,9 @@ if $ARGS[0] = 'maternity_ward':
 					act 'Leave': gt 'gpoli', 'maternity_ward'
 				end
 				!!act 'Mammography (1:00)':
-				!!	
+				!!
 				!!end
-				act 'Leave': gt 'gpoli', 'maternity_ward'			
+				act 'Leave': gt 'gpoli', 'maternity_ward'
 			end
 		end
 		if lactate > 0 and lactatemv > lactatemm/8 and pcs_gpolimilkdonation <= 2:
@@ -1484,13 +1502,13 @@ if $ARGS[0] = 'maternity_ward':
 								else
 									mward_donatess = rand(45, 69)
 								end
-								act 'Leave':gt 'gpoli'								
+								act 'Leave':gt 'gpoli'
 							end
 							act 'deny to donate':
 								*clr
 								cla
 								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
-								act 'Leave':gt 'gpoli'							
+								act 'Leave':gt 'gpoli'
 							end
 						else
 							pcs_gpolimilkdonation = 2
@@ -1570,15 +1588,15 @@ if $ARGS[0] = 'maternity_ward':
 								else
 									mward_donatess = rand(45, 69)
 								end
-								act 'Leave':gt 'gpoli'								
+								act 'Leave':gt 'gpoli'
 							end
 							act 'deny to donate':
 								*clr
 								cla
 								'You deny to donate your breast milk. The nurse looks sad at you and let you leave.'
-								act 'Leave':gt 'gpoli'							
+								act 'Leave':gt 'gpoli'
 							end
-						end						
+						end
 					end
 				elseif pcs_gpolimilkdonation = 2:
 					act 'Offer to donate your breast milk (0:15)':
@@ -1657,8 +1675,8 @@ if $ARGS[0] = 'maternity_ward':
 							mward_donatess = rand(0,45)
 						else
 							mward_donatess = rand(45, 69)
-						end							
-						act 'Leave':gt 'gpoli'				
+						end
+						act 'Leave':gt 'gpoli'
 					end
 				end
 				act 'Leave':gt 'gpoli'
@@ -1683,7 +1701,7 @@ if $ARGS[0] = 'reception':
 	act 'Leave': gt 'gpoli'
 end
 
-if $ARGS[0] = 'maternity_ward_donation':	
+if $ARGS[0] = 'maternity_ward_donation':
 	*clr
 	cla
 	gs 'stat'

+ 14 - 8
locations/gschool_boys_bathroom.qsrc

@@ -315,7 +315,7 @@ if $ARGS[0] = 'boy3_kiss':
 			'He doesn''t stop his movements, though; with how excited he must be, it''d probably be close to impossible for him to do that. He has adjusted the depth and speed of his penetration but doesn''t say a word, beyond his adjustments, shows no sign of noticing what he did. Still, it helps, and after a while, the pain recedes and you can feel pleasure taking the upper hand again. He chooses that moment to pull out of you; Lazar quickly lifts you off your feet and lays you on your back, across the sink. He spreads your legs and steps between them where he slips his <<dick>>cm <<$dick_girth>> cock back into your ass. This time, you can appreciate the feeling of him entering your backdoor and moan in satisfaction. Your lover takes advantage of the new position and occasionally squeezes your boobs; you follow his example and rub your clit, making this steamy encounter even more enjoyable for you. Minutes go by and he keeps speeding up, eventually fucking your little asshole as fast as he can, the shockwaves traveling to your clit and up your spine, adding to the building orgasm. That''s when you notice that his panting changes and he has a look of intense concentration on his face - he is obviously about to shoot his load.'
 			gs 'arousal', 'anal', 6
 			gs 'stat'
-			act 'You do your math homework?':
+			act 'Continue':
 				*clr & cla
 				gs 'cum_call', 'labia', $boy, 1, '', '', 20
 				gs 'cum_call', 'anus', $boy, 1, '', '', 20
@@ -329,16 +329,22 @@ if $ARGS[0] = 'boy3_kiss':
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of hot sperm lands on your inner thigh, another lands on your pubic area, a third hitting your wet cunt and fingers. He shudders a bit and finally stops spurting cum as your own shivers subside. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was good", he comments and you are inclined to agree.'
 				*nl
-				'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that postcoital high. As you get cleaned up in the sink he gets dressed, when you start to get dressed you see him grab your panties. You expect him to give them to you but instead he sticks them in his pocket instead. "Um Lazar I think those are mine." You say indicating the pocket he just stuck your panties in.'
-				act 'You do your math homework?':
+				'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that postcoital high.'
+				
+				!!Should probably also remove svetas panties
+				if $pantyworntype ! 'none': 'As you get cleaned up in the sink he gets dressed, when you start to get dressed you see him grab your panties. You expect him to give them to you but instead he sticks them in his pocket instead. "Um Lazar I think those are mine." You say indicating the pocket he just stuck your panties in.'
+				
+				act 'Continue':
 					*clr
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-					'He grins at you. "Not anymore." seeing the look on your face he adds. "Hey I play for trophies, the more gratifying the challenge the more I deserve a trophy and fucking you is very gratifying. So I think I earned these."'
-					'"Yeah well this isn''t a game we shared something intimate."'
-					'He laughs slightly. "Everything in life is just a game and trust me, every guy in school wishes he had been me a few minutes ago. Yet it was me so I earned them."'
-					'You roll your eyes at that but give up, if he wants them that bad, well that was great and maybe he did earn them. So instead of saying more you just shake your head and finish getting dressed.'
-					*nl
+					if $pantyworntype ! 'none':
+						'He grins at you. "Not anymore." seeing the look on your face he adds. "Hey I play for trophies, the more gratifying the challenge the more I deserve a trophy and fucking you is very gratifying. So I think I earned these."'
+						'"Yeah well this isn''t a game we shared something intimate."'
+						'He laughs slightly. "Everything in life is just a game and trust me, every guy in school wishes he had been me a few minutes ago. Yet it was me so I earned them."'
+						'You roll your eyes at that but give up, if he wants them that bad, well that was great and maybe he did earn them. So instead of saying more you just shake your head and finish getting dressed.'
+						*nl
+					end
 					'Suddenly, Lazar asks: "Hey <<$pcs_nickname>>, did you do the math homework?" You are a bit taken off-guard by the unexpected question - it just doesn''t seem to fit in with everything that''s just happened - and it takes you a moment to reply. "Yeah, why?"'
 					*nl
 					'"Mind if I borrow it and fill in mine real quick? I was busy with practice and didn''t have time." First taking each of your holes and now your homework, too? The thought crosses your mind and makes you grin but you nod anyway - what''s a little homework cheating between friends after you just let him fuck you up the ass in the boys room? It sure as hell beat going to class, though, and the two of you spend the rest of the period talking while he copies your homework.'

+ 12 - 3
locations/gschool_grounds.qsrc

@@ -318,15 +318,24 @@ if $ARGS[0] = 'sports':
 	end
 
 	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
+		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
-
-		act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
+		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+			act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
+		else 
+			'You need to wear exercise clothes to participate.'
+		end
 	end
 
 	if week = 6 and schoolSorev = 1 and hour = 10 and SchoolBlock = 0:
+		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
-		act 'Participate in the 400m sprint race':gt 'gschool_grounds', 'SchoolRun'
+		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+			act 'Participate in the 400m sprint race':gt 'gschool_grounds', 'SchoolRun'
+		else
+			'You need to wear exercise clothes to participate.'
+		end
 	end
 
 	gs 'family'

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'events':
 	elseif (Anush_lunch > 0 or grupTipe = 4) and rand(0, 5) = 0:
 		pcs_horny += 20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
-		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing at your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me." , her fingers sliding up into your pussy as she says it.'
+		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing at your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me," her fingers sliding up into your pussy as she says it.'
 		act 'Not today':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'

+ 288 - 19
locations/lact_lib.qsrc

@@ -105,7 +105,7 @@ end
 
 if $ARGS[0] = '$get_breastmilk_time':
 	!!	func('lact_lib','$get_breastmilk_time', sucktion_type, milk_demand)
-	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6]
+	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6], weak baby_mouth [7]
 	!!	ARGS[2] = milk_demand: how much milk is demanded. Warning: Should be ml and not in ml*10 for ease of use. :D
 	!!	RESULT = Time in Minutes
 	!!	Usage: breastmilktimetoget = func('lact_lib','$get_breastmilk_time', 2, 150)
@@ -134,6 +134,15 @@ if $ARGS[0] = '$get_breastmilk_time':
 		elseif ARGS[1] = 6:
 			!!	'cow milker sucking'
 			suck_flow_rate = 1000
+		elseif ARGS[1] = 7:
+			!!	'weak baby sucking'
+			suck_flow_rate = 50
+			temp_var = pcs_mood + ARGS[2]
+			if temp_var > 100:
+				pcs_mood = 100
+			else
+				pcs_mood += ARGS[2]
+			end
 		else
 			!!	'suck flow else branch'
 			suck_flow_rate = 100
@@ -228,7 +237,7 @@ end
 
 if $ARGS[0] = '$get_breastmilk':
 	!!	func('lact_lib','$get_breastmilk', sucktion_type, sucktion_time)
-	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6]
+	!!	ARGS[1] = sucktion_type: the type of sucktion. adult_mouth [0], child_mouth [1], baby_mouth [2], manual_breastpump [3] , electric_breastpump [4], hand_expressing [5], cow milker [6], weak baby_mouth [7]
 	!!	ARGS[2] = sucktion_time: how many minutes the sucking/pumping takes place
 	!!	Usage: breastmilkvolume = func('lact_lib','$get_breastmilk', 4, 20)
 	!! 	RESULT = Milk in ml*10
@@ -275,6 +284,15 @@ if $ARGS[0] = '$get_breastmilk':
 	elseif ARGS[1] = 6:
 		!!	'cow milker sucking'
 		suck_flow_rate = 1000
+	elseif ARGS[1] = 7:
+		!!	'weak baby sucking'
+		suck_flow_rate = 50
+		temp_var = pcs_mood + ARGS[2]
+		if temp_var > 100:
+			pcs_mood = 100
+		else
+			pcs_mood += ARGS[2]
+		end
 	else
 		!!	'suck flow else branch'
 		suck_flow_rate = 100
@@ -500,11 +518,18 @@ if $ARGS[0] = 'bp_milking':
 	pumptype = 0
 	if pump_bottletype < 1500: pump_bottletype = 1500
 	if bpbottles <= 0: bpbottles = 1
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and pcs_inhib < 40:
 		'You can''t use it here.'
+			act 'Finish': gt $loc, $metka
+	elseif bp_unbox <= 0:
+		'You need to unbox your breast pump first.'
+			act 'Finish': gt $loc, $metka
+	elseif bp_unbox = 1 and ($location_type = 'bathroom' or $location_type = 'private'):
+		gt 'lact_lib', 'bp_unbox_event'
 	else
 		*clr
 		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:
@@ -513,7 +538,6 @@ if $ARGS[0] = 'bp_milking':
 				'Current bottle size in use <a href="exec:pump_bottletype = 1500 & gt ''lact_lib'', ''bp_milking''">150ml</a> | &gt;250ml'
 			end
 		end
-		'<center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
 		if lactatemv > 0:
 			pumptime = (func('lact_lib','$get_breastmilk_time', 3, (lactatemv/10)))
 			if pumptime > 5:
@@ -574,28 +598,253 @@ if $ARGS[0] = 'bp_milking':
 				gt 'lact_lib', 'milking'
 			end
 		end
+		act 'Massage your breasts':	gt 'lact_lib','man_milking'
 		act 'Don''t pump':gt $loc, $metka
 	end
 end
 
 !!	man_milking - manual (with hands) milking
 !!	use href="exec:gt ''lact_lib'',''man_milking''"
-!!	Warning! Protoype function! Don not make changes to this function as it is not used yet!
+!!	for manual milk expression in bathrooms etc. please use this function.
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
-	pumptype = 1
-	if $location_type ! 'bathroom' and pcs_inhib < 60:
+	if pcs_inhib < 40:
+		*clr
+		cla
 		'You can''t do this here.'
+			act 'Finish': gt $loc, $metka
 	else
 		*clr
 		cla
-		pumptime = input ("How long would you like to milk your breasts? (Not more than 60 minutes)")
-		if pumptime <= 0 or pumptime > 60:
-			minut += 2
-			act 'Don''t milk':gt $loc, $metka
-		elseif pumptime > 0 and pumptime <= 60:
-			gt 'lact_lib', 'milking'
+		'How long do you want to massage your breasts?'
+		if lactatemv > 0:
+			pumptime = (func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10)))
+			if pumptime > 60:
+				act 'Express until breasts are empty':
+					*clr
+					cla
+					minut += 2
+					'You prepare yourself and weight your breasts in your hands. You feel that your breasts carry a large amount of milk and manually expressing it will probably take a long time.'
+					'Getting relieve for your breasts with manual expression will probably take at least <<pumptime>> minutes.'
+					if breastpump <= 0 and bp_unbox <= 1:
+						'You should concider buying a breastpump'
+					elseif breastpump = 1 and bp_unbox <= 1 and pain['nipples'] <= 60:
+						'You should concider using your breastpump.'
+					else
+						'You should concider the use of a breastpump.'
+					end
+					'Do you want to continue?'
+					act 'Don''t express':gt $loc, $metka
+					act 'Express your milk':
+						gt 'lact_lib', 'hand_milking'
+					end
+				end
+			elseif pumptime <= 0:
+				act 'Express milk until breasts are empty':
+					*clr
+					cla
+					minute += 2
+					'As you prepare yourself you feel your breasts in your hands. Your breasts feel really empty. There is no need to express now.'
+					act 'Don''t express milk':gt $loc, $metka
+					act 'back':gt 'lact_lib', 'man_milking'
+				end
+			else
+				act 'Express until breasts are empty':
+					pumptime = func('lact_lib','$get_breastmilk_time', 5, (lactatemv/10))
+					gt 'lact_lib', 'hand_milking'
+				end
+			end
+		end
+		act '5 Minutes':
+			pumptime = 5
+			gt 'lact_lib', 'hand_milking'
+		end
+		act '10 Minutes':
+			pumptime = 10
+			gt 'lact_lib', 'hand_milking'
+		end
+		act 'Custom':
+			pumptime = input ("How long do you plan to massage your breasts? (Not more than 60 minutes)")
+			if pumptime <= 0 or pumptime > 60:
+				minut += 2
+				act 'Don''t express':gt $loc, $metka
+				act 'back':gt 'lact_lib', 'man_milking'
+			elseif pumptime > 0 and pumptime <= 60:
+				gt 'lact_lib', 'hand_milking'
+			end
 		end
+		act 'Don''t express':gt $loc, $metka
+	end
+end
+
+if $ARGS[0] = 'bp_unbox_event':
+	if bp_unbox <= 0:
+		*clr
+		cla
+		minut += 5
+		if $location_type = 'bathroom':
+			'You push down the toilet seat to sit down and slowly start to unbox your newly aquirred breast pump.'
+		elseif $location_type = 'private' and $locclass = 'bedr':
+			'You sit down on your bed and slowly start to unbox your newly aquirred breast pump.'
+		elseif $location_type = 'private':
+			'You sit down and slowly start to unbox your newly aquirred breast pump.'
+		end
+		if kid <= 0 and preg <= 0 and pregtimes <= 0 and pregchem <= 0 and bp_unbox <= 0:
+			'While examining it, you think about why you bought it in the first place. You are not pregnant nor do you have a kid that needs breast milk.'
+			if lactate <= 0:
+				'Your breasts haven''t got any milk in them too, so it seems this pump is a bit useless.'
+			else
+				'At least it can help to get the milk out of your breasts.'
+			end
+		end
+		if $location_type = 'private':
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing.jpg"></center>'
+		elseif $location_type = 'bathroom':
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing_bath.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/pc/body/tits/pump_unboxing_bath.jpg"></center>'
+		end
+		if (pcs_inhib > 40 and $location_type = 'private') or $location_type = 'bathroom':
+			act 'Try out how it works':
+				*clr
+				cla
+				'You pull up your top to release your breasts'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/t<<tits>>.jpg"></center><br>'
+				'Your fingers glide around the sucktion cup of the breast pump, while your other hand holds the pump.'
+				'Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.'
+				milkedvolume = func('lact_lib','$get_breastmilk', 3, 1)
+				minut += 1
+				bp_unbox = 2
+				if lactate > 0 and milkedvolume > 0:
+					if milkedvolume <= 50:
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+					elseif milkedvolume > 50 and milkedvolume <= 1500:
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breastmilk.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_half.jpg"></center>'
+					else
+						'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+						'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+						'You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.'
+						'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_full.jpg"></center>'
+					end
+					'You nod at the breast pump, thinking it will come in handy.'
+				elseif lactate > 0 and milkedvolume <= 0:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+					'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+				else
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+					'You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'
+				end
+				act 'continue':
+					*clr
+					cla
+					if milkedvolume > 50 and $location_type = 'private':
+						'You look at the milk in the bottle and then around the room. Having no idea what to do with the excess milk, you look at it and suddenly sip it down.'
+						'It is your milk, so it should be okay to drink it.'
+						'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
+						'<center>The milk is still warm from your breasts.</center>'			
+						pcs_health += milkedvolume/400
+						pcs_energy += milkedvolume/500
+						if pcs_hydra >= 100:
+							pcs_hydra += milkedvolume/200
+						else
+							pcs_hydra += milkedvolume/100
+						end
+						minut += ((milkedvolume/1000) + 3)
+						act 'Finish': gt $loc, $metka
+					else
+						'You clean up your pump and cover your breasts again.'
+						act 'Finish': gt $loc, $metka
+					end
+				end
+				bp_unbox = 2
+			end
+		end
+		act 'Don''t try it here':
+			*clr
+			cla
+			'You look around you, not feeling to comfortable to use the breast pump here.'
+			bp_unbox = 1
+			act 'Finish': gt $loc, $metka
+		end
+	elseif bp_unbox = 1:
+		if $location_type = 'private' and pcs_inhib < 40:
+			'You can''t do this here'
+			act 'Finish': gt $loc, $metka
+		else
+			'You pull up your top to release your breasts'
+			'<br><center><img <<$set_imgh>> src="images/pc/body/tits/t<<tits>>.jpg"></center><br>'
+			'Your fingers glide around the sucktion cup of the breast pump, while your other hand holds the pump.'
+			'Making sure that no one is around, you lift the breast pump to your left breast. The cold cone feels uncomfortable on your nipple.'
+			milkedvolume = func('lact_lib','$get_breastmilk', 3, 1)
+			minut += 1
+			bp_unbox = 2
+			if lactate > 0 and milkedvolume > 0:
+				if milkedvolume <= 50:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+				elseif milkedvolume > 50 and milkedvolume <= 1500:
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You collected <<milkedvolume/10>>ml of your breastmilk.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_half.jpg"></center>'
+				else
+					'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+					'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it. The pump starts to draw milk from your breast.'
+					'You go on for a minute and then detach the pump. You easily filed the breast pump bottle with your breast milk just with this little pumping.'
+					'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_full.jpg"></center>'						
+				end
+				'You nod at the breast pump, thinking it will come in handy.'
+			elseif lactate > 0 and milkedvolume <= 0:
+				'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+				'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+				'You go on for a minute and then detach the pump. You collected some milk, but it is just a small puddle in the bottle.'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/pump_milkdrops.jpg"></center>'
+			else
+				'You start to squeeze the bulb. Your nipple is sucked into the cone, getting elongated a bit. It feels weird at first and you release the lever, the sucktion on your nipple goes away and the nipple retracts.'
+				'With your hand you squeeze down again, your nipple sucked in again. You go on, and start to rythmically squeeze it.'
+				'You go on for a minute and then detach the pump. As expected no milk was collected in the bottle.'
+				'<br><center><img <<$set_imgh>> src="images/pc/body/tits/breast_pump.jpg"></center>'					
+			end
+			act 'continue':
+				*clr
+				cla
+				if milkedvolume > 50 and $location_type = 'private':
+					'You look at the milk in the bottle and then around the room. Having no idea what to do with the excess milk, you look at it and suddenly sip it down.'
+					'It is your milk, so it should be okay to drink it.'
+					'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_drink.jpg"></center>'
+					'<center>The milk is still warm from your breasts.</center>'			
+					pcs_health += milkedvolume/400
+					pcs_energy += milkedvolume/500
+					if pcs_hydra >= 100:
+						pcs_hydra += milkedvolume/200
+					else
+						pcs_hydra += milkedvolume/100
+					end
+					minut += ((milkedvolume/1000) + 3)
+					act 'Finish': gt $loc, $metka
+				else
+					'You clean up your pump and cover your breasts again.'
+					act 'Finish': gt $loc, $metka
+				end
+			end
+		end
+	elseif bp_unbox >= 2:
+		*clr
+		cla
+		'You unboxed your breast pump already.'
+		act 'Finish': gt $loc, $metka
 	end
 end
 
@@ -793,7 +1042,7 @@ if $ARGS[0] = 'milking':
 				'<center><img <<$set_imgh>> src="images/pc/body/tits/milk_sink.jpg"></center>'
 				'<center>You pour <<milkedvolume/10>>ml of your breast milk into the sink and clean up your breastpump.</center>'
 			end
-			minute += 5
+			minute += ((milkedvolume/1500) + 3)
 			act 'Finish':
 				milkedvolume = 0
 				gt $loc, $metka
@@ -805,13 +1054,15 @@ if $ARGS[0] = 'milking':
 				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>'
-				if pcs_hydra < 90:
-					pcs_hydra += 10
+				'<center>The milk is still warm from your breasts.</center>'				
+				pcs_health += milkedvolume/400
+				pcs_energy += milkedvolume/500
+				if pcs_hydra >= 100:
+					pcs_hydra += milkedvolume/200
 				else
-					pcs_hydra = 100
+					pcs_hydra += milkedvolume/100
 				end
-				minut += 7
+				minute += ((milkedvolume/1000) + 3)
 				act 'Finish':
 					milkedvolume = 0
 					gt $loc, $metka
@@ -833,5 +1084,23 @@ if $ARGS[0] = 'engorged_morning':
 	act 'Finish':gt $loc, $metka
 end
 
+if $ARGS[0] = 'hand_milking':
+	*clr
+	cla
+	if lactate > 0:
+		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
+		'Several small streams of your milk start to jet out of your nipples.'
+		'You go on for <<pumptime>> minutes until you stop. You clean yourself up and everything else that got wet from your milk.<br>'
+		'<center><video autoplay loop src="images/pc/body/tits/bathroom_milking.mp4"></video></center>'
+		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
+		minut += pumptime
+	else
+		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
+		milkedvolume = func('lact_lib','$get_breastmilk', 5, pumptime)
+		minut += pumptime
+	end
+	act 'Finish':gt $loc, $metka
+end
+
 --- lact_lib ---------------------------------
 

+ 7 - 7
locations/metro.qsrc

@@ -188,29 +188,29 @@ if $ARGS[0] = 'shop':
 	'<b>What''s it gonna be?</b>'
 	'He shows you a small box filled with red and blue pills. There is about two dozen of each pill inside.'
 	if money >= 1000:
-		'<a href="exec:money - 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
+		'<a href="exec:money -= 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
 	else
 		'Buy neuroboosters 1000 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<mentats_have>>'
 	'A pillbox with 10 orange pills inside, the description is removed from the box.'
-	if money >= 1000:
-		'<a href="exec:money - 500 & steroid_have += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
+	if money >= 500:
+		'<a href="exec:money -= 500 & steroid_have += 10 & gt ''metro'', ''shop''">Buy steroids</a> 500 <b>₽</b>'
 	else
 		'Buy steroids 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<steroid_have>>'
 	'Paste tube with two pictures of a woman. In latter one she sports an enormous bust.'
-	if money >= 1000:
-		'<a href="exec:money - 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
+	if money >= 500:
+		'<a href="exec:money -= 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
 	else
 		'Buy breast cream 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<bcream_have>>'
 	if MagikDostup = 0:
 		'Packet of pink chewing gums. There are 10 in one package.'
-		if money >= 1000:
-			'<a href="exec:money - 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
+		if money >= 200:
+			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
 		else
 			'Buy aphrodisiacs 200 <b>₽</b> (You do not have enough money)'
 		end

+ 1 - 1
locations/mey_home.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 			gt 'mey_tamara_events', 'party0'
 		end
 		! check appearance before going to corporate
-		if (hour = 17 or hour = 18) and mey_vika['mey_vika_qw'] = 41:
+		if week = 7 and (hour = 17 or hour = 18) and mey_vika['mey_vika_qw'] = 41:
 			'<br><a href="exec: gt''mey_tamara_events'',''check_look''">Tamara Mikhailovna.</a> is waiting for you in the lobby.'
 
 			exit

+ 339 - 315
locations/mother.qsrc

@@ -46,12 +46,12 @@ if $ARGS[0] = '':
 
 	!check hair color
 	if hcolfronce=0:
-		hcolmotherremember=pcs_haircol 
+		hcolmotherremember=pcs_haircol
 		hcolfronce=1
 	end
 
 	if hcolmotherremember!pcs_haircol:
-		if pcs_haircol = nathcol: 
+		if pcs_haircol = nathcol:
 			$texthcol = 'Or, rather, un-dyed your hair. Good, you decided to go back to your natural color!'
 		elseif pcs_haircol=0:
 			$texthcol='I see you decided to go back to go with black hair?'
@@ -65,7 +65,7 @@ if $ARGS[0] = '':
 			npc_rel['A29'] -= 25
 			$texthcol='What were you thinking? Do you think you''ll get into university with hair like that!'
 		end
-		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60: 
+		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60:
 			$texthcol2 = 'says with a frown, "You should concentrate on your studies, not on how you look."'
 		elseif pcs_haircol ! nathcol and pcs_haircol > 3 and npc_rel['A29'] < 60:
 			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -147,9 +147,9 @@ if $ARGS[0] = '':
 
 				act 'Move away':gt $loc, $metka
 			end
-		
+
 			act'Show her your pierced tongue':
-				cls
+				cla
 				pirsAmother=1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 				gs'stat'
@@ -167,7 +167,7 @@ if $ARGS[0] = '':
 		motherpirsadbytalk=daystart
 		'Your mother looks at your lips, noticing your new lip piercing. She doesn''t seem very happy about it. "And this is why?"'
 		act'I just think it looks pretty':
-			cls
+			cla
 			pirsBmother=1
 			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 			gs'stat'
@@ -208,36 +208,11 @@ if $ARGS[0] = '':
 			minut += 3
 			'You tell your mother you''re menstruating and ran out of tampons, but really need one right now. She looks at you knowingly, gives you three sanitary pads from her own supply and sternly tells you to next time take care of this in advance.'
 
-			act 'Thank her and move away':gt $loc, $metka
+			act 'Thank her':gt 'mother'
 			exit
 		end
 	end
 
-	act 'Chat':
-		cls
-		minut+=rand(10,15)
-		npc_rel['A29']+=1
-		gs'stat'
-		'<center><b><font color = maroon>Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		'Your mother Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
-		if npc_rel['A29']<20:'Your mother can''t stand you, and she avoids you as much as she can.'
-		if npc_rel['A29']>=20 and npc_rel['A29']<40:'You and mom have a tense relationship.'
-		if npc_rel['A29']>=40 and npc_rel['A29']<60:'You have a normal relationship with your mother.'
-		if npc_rel['A29']>=60 and npc_rel['A29']<80:'You have a good relationship with your mother.'
-		if npc_rel['A29']>=80:'You have a great relationship with your mother.'
-		act 'Move away':gt $loc, $metka
-		if npc_rel['A29']<20:
-			dynamic $d_mother[1]
-		exit
-		elseif npc_rel['A29']>=20 and npc_rel['A29']<40:
-			dynamic $d_mother[2]
-		exit
-		elseif npc_rel['A29'] >=40:
-			dynamic $d_mother[3]
-		end
-	end
-
 	if SchoolAtestat = 1 and SAtestatGift = 0:
 		SAtestatGift = 1
 		money += 5000
@@ -263,7 +238,7 @@ if $ARGS[0] = '':
 
 		if momslut = 1:
 			act 'Tell her you saw her fucking her boss':
-				cls
+				*clr & cla
 				minut += 5
 				momslut = 2
 				gs 'stat'
@@ -277,321 +252,289 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Ask for some money':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You ask your mother for some money.'
+		if mother_go = 0 or ((week < 6 and (hour >= 17 and hour < 21) or (hour >= 7 and hour < 8)) or (week >= 6 and hour >= 7 and hour < 21)):
+			if (week < 6 and (hour >= 17 and hour < 21) or (hour >= 7 and hour < 8)) or (week >= 6 and hour >= 7 and hour < 21 and hour ! 16):
+				! schedule copied from #family - should be identical.
+				act 'Chat':
+					*clr & cla
+					minut+=rand(10,15)
+					npc_rel['A29']+=1
+					gs'stat'
+					'<center><b><font color = maroon>Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'Your mother Natasha is still quite young and attractive. She''s only <<motherAge>> years. She works at the station cafe.'
+					if npc_rel['A29']<20:'Your mother can''t stand you, and she avoids you as much as she can.'
+					if npc_rel['A29']>=20 and npc_rel['A29']<40:'You and mom have a tense relationship.'
+					if npc_rel['A29']>=40 and npc_rel['A29']<60:'You have a normal relationship with your mother.'
+					if npc_rel['A29']>=60 and npc_rel['A29']<80:'You have a good relationship with your mother.'
+					if npc_rel['A29']>=80:'You have a great relationship with your mother.'
+					act 'Continue':gt 'mother'
+					if npc_rel['A29']<20:
+						dynamic $d_mother[1]
+					exit
+					elseif npc_rel['A29']>=20 and npc_rel['A29']<40:
+						dynamic $d_mother[2]
+					exit
+					elseif npc_rel['A29'] >=40:
+						dynamic $d_mother[3]
+					end
+				end
 
-			if SchoolAtestat = 0:
-				if npc_rel['A29'] >= 80:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+				act 'Ask for some money':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'You ask your mother for some money.'
 
-					else
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+					if SchoolAtestat = 0:
+						if npc_rel['A29'] >= 80:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 150
-								'Your mother reluctantly gives you 150 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+							else
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-								act 'Thank her and move away':gt $loc, $metka
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 150
+										'Your mother reluctantly gives you 150 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-							exit
-							else
-								money += 300
-								'Your mother smiles and gives you 300 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+										act 'Thank her':gt 'mother'
+
+									exit
+									else
+										money += 300
+										'Your mother smiles and gives you 300 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
+									exit
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
-						end
-					end
-				elseif npc_rel['A29'] >= 60 and npc_rel['A29'] < 80:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
-					else
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+						elseif npc_rel['A29'] >= 60 and npc_rel['A29'] < 80:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+							else
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 100
-								'Your mother reluctantly gives you 100 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 100
+										'Your mother reluctantly gives you 100 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
-							else
-								money += 250
-								'Your mother smiles and gives you 250 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+									exit
+									else
+										money += 250
+										'Your mother smiles and gives you 250 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							exit
+									exit
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
-						end
-					end
-				elseif npc_rel['A29'] >= 40 and npc_rel['A29'] < 60:
-					if motherPayDay = daystart:
-						'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
-					elseif motherPayDay ! daystart:
-						npc_rel['A29'] -= 1
-						motherPayDay = daystart
+						elseif npc_rel['A29'] >= 40 and npc_rel['A29'] < 60:
+							if motherPayDay = daystart:
+								'Your mother frowns: "Again, <<$pcs_nickname>>? Did you forget I already gave you money today? Don''t be greedy!"'
+							elseif motherPayDay ! daystart:
+								npc_rel['A29'] -= 1
+								motherPayDay = daystart
 
-						if pcs_grades >= 70:
-							if pcs_grades < 90:
-								money += 50
-								'Your mother reluctantly gives you 50 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
+								if pcs_grades >= 70:
+									if pcs_grades < 90:
+										money += 50
+										'Your mother reluctantly gives you 50 <b>₽</b>: "When you do better in school, I will give you more. In the meantime, this is all you deserve!"'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
-							else
-								money += 200
-								'Your mother smiles and gives you 200 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
+									else
+										money += 200
+										'Your mother smiles and gives you 200 <b>₽</b>: "Okay <<$pcs_nickname>>, you''ve earned it. I''m glad you''re doing such a good job in school."'
 
-								act 'Thank her and move away':gt $loc, $metka
+										act 'Thank her':gt 'mother'
 
+									end
+								else
+									'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+								end
 							end
-						else
-							'Your mother scoffs, and shakes her head: "Money? No way, <<$pcs_nickname>>. With how poorly you are doing in school, the only thing you deserve is the belt. You can have some money when you improve your grades, until then you get nothing."'
+						elseif npc_rel['A29'] < 40 and motherKnowWhore = 0 and motherKnowSpravka = 0:
+							'Your mother scowls, shaking her head: "Why should I give you anything? Go get a job, you''ll get nothing from me." She really doesn''t like you very much.'
+						elseif (motherKnowWhore >= 1 or motherKnowSpravka >= 1) and npc_rel['A29'] < 40:
+							'Your mother can''t believe you would even ask, and shouts angrily: "Whores don''t get money from me! Get out of here, run to your stud and go ask him!"'
 						end
+					elseif SchoolAtestat > 0:
+						'Your mother shakes her head: "You are old enough to earn your own money <<$pcs_nickname>>, you can''t keep depending on me forever. Get a job."'
 					end
-				elseif npc_rel['A29'] < 40 and motherKnowWhore = 0 and motherKnowSpravka = 0:
-					'Your mother scowls, shaking her head: "Why should I give you anything? Go get a job, you''ll get nothing from me." She really doesn''t like you very much.'
-				elseif (motherKnowWhore >= 1 or motherKnowSpravka >= 1) and npc_rel['A29'] < 40:
-					'Your mother can''t believe you would even ask, and shouts angrily: "Whores don''t get money from me! Get out of here, run to your stud and go ask him!"'
-				end
-			elseif SchoolAtestat > 0:
-				'Your mother shakes her head: "You are old enough to earn your own money <<$pcs_nickname>>, you can''t keep depending on me forever. Get a job."'
-			end
-
-			act 'Move away from her':gt $loc, $metka
-		end
 
-		act 'Ask about your biological father':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-
-			if npc_rel['A29'] < 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
-			elseif npc_rel['A29'] >= 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
-				'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story and let her get back to what she was doing.'
-			end
-
-			act 'Move away from her':gt $loc, $metka
-		end
+					act 'Continue':gt 'mother'
+				end
 
-		act 'Ask for some new clothes':
-			cls
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You wait until your mother is in a good mood, and then quickly swoop in: "Mom, I have nothing nice to wear. Can I please have some new clothes?"'
-			if pav_prostitute >= 100 and motherKnowWhore >= 1:
-				'Your mother is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+				act 'Ask about your biological father':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+
+					if npc_rel['A29'] < 80:
+						'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
+						'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+					elseif npc_rel['A29'] >= 80:
+						'You barely have any memories of your real father, and are curious about him. When you see your mother in the kitchen you decide to ask: "Mom... about my real father... what was he like? What happened between you two?"'
+						'You seem to have struck a sore spot. Your mother''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+						'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+					end
+					act 'Continue':gt 'mother'
+				end
 
-				act 'Move away from her':gt $loc, $metka
-			else
-				if SchoolAtestat = 0:
-					if npc_rel['A29'] >= 80:
-						if motherClotheMonth ! month:
-							'Your mother lets out an exasperated sigh, and throws her hands in the air. "Here we go again... "Mommy, I have nothing to wear!"" he says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
-	
-							act 'Go to the store':
-								cls
-								npc_rel['A29'] = 70
-								motherClotheMonth = month
-								minut += 30
-								gs 'stat'
-								'Going clothes shopping with your mother is always an interesting experience. You never get to pick your own clothes, but she brings you clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
-
-								act 'Try on the clothes she brings you':
-									cls
-									gs 'stat'
-									loop_counter = 0
-									:markbuyclomother
-									loop_counter += 1
-									if loop_counter = 300:
-										'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
-									else
-										numrand = rand(1, 413)
-
-										gs 'clothing_attributes', 'cheap', numrand
-										!!not prostitute
-										if CloStyle = 4:jump 'markbuyclomother'
-										!!Sveta can wear it and not too revealing
-										if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
-
-										if cheap[numrand] = 0:
-											cheap[numrand] = 1
-											cheapH[numrand] = 50
-											cheapB[numrand] = pcs_hips
-											'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<numrand>>.jpg"></center>'
-										else
-											jump 'markbuyclomother'
+				act 'Ask for some new clothes':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+					'You wait until your mother is in a good mood, and then quickly swoop in: "Mom, I have nothing nice to wear. Can I please have some new clothes?"'
+					if pav_prostitute >= 100 and motherKnowWhore >= 1:
+						'Your mother is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+
+						act 'Move away from her':gt $loc, $metka
+					else
+						if SchoolAtestat = 0:
+							if npc_rel['A29'] >= 80:
+								if motherClotheMonth ! month:
+									'Your mother lets out an exasperated sigh, and throws her hands in the air. "Here we go again... "Mommy, I have nothing to wear!"" he says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
+
+									act 'Go to the store':
+										cla
+										npc_rel['A29'] = 70
+										motherClotheMonth = month
+										minut += 30
+										gs 'stat'
+										'Going clothes shopping with your mother is always an interesting experience. You never get to pick your own clothes, but she brings you clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
+
+										act 'Try on the clothes she brings you':
+											*clr & cla
+											gs 'stat'
+											loop_counter = 0
+											:markbuyclomother
+											loop_counter += 1
+											if loop_counter = 300:
+												'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
+											else
+												numrand = rand(1, 413)
+
+												gs 'clothing_attributes', 'cheap', numrand
+												!!not prostitute
+												if CloStyle = 4:jump 'markbuyclomother'
+												!!Sveta can wear it and not too revealing
+												if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
+
+												if cheap[numrand] = 0:
+													cheap[numrand] = 1
+													cheapH[numrand] = 50
+													cheapB[numrand] = pcs_hips
+													'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<numrand>>.jpg"></center>'
+												else
+													jump 'markbuyclomother'
+												end
+											end
+
+											'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your mother and give her a hug.'
+
+											act 'Continue':gt 'mother'
 										end
 									end
-
-									'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your mother and give her a hug.'
-	
-									act 'Move away':gt $loc, $metka
+								else
+									'Your mother sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+									act 'Continue':gt 'mother'
 								end
+							else
+								'Your mother shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
+								act 'Continue':gt 'mother'
 							end
 						else
-							'Your mother sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
-							act 'Move away':gt $loc, $metka
+							'Your mother shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
+							act 'Continue':gt 'mother'
 						end
-					else
-						'Your mother shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
-						act 'Move away':gt $loc, $metka
 					end
-				else
-					'Your mother shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
-					act 'Move away':gt $loc, $metka
 				end
-			end
-		end
-	end
-
-	if $loc = 'kuhrPar':
-
-		gs 'mother', 'pregreact'
-
-		act 'Offer to help around the house':
-			cls
-			minut += 60
-			npc_rel['A29'] += rand(1, 5)
-			pcs_mood -= 10
-			delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
-			TotalMomPom += 1
-			MomPom += 1
-			gs 'stat'
-			'You offer to help your mother out around the house.'
-
-			if MomPom = 1:
-				'Your mother asks you to do the dishes. You spend an hour washing the dishes in the kitchen.'
-			elseif MomPom = 2:
-				'Your mother asks you to peel potatoes for tonight''s meals. You spend an hour in the kitchen peeling potatoes.'
-			elseif MomPom = 3:
-				'Your mother asks you to clean the floor. You spend an hour scubbing the floors of the apartment.'
-			elseif MomPom = 4:
-				'Your mother asks you to do a load of laundry. You spend an hour washing clothes in the bathroom.'
-			elseif MomPom = 5:
-				'Your mother asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
-			elseif MomPom = 6:
-				sdacharand = rand(10, 50)
-				money += sdacharand
-				gs 'stat'
-				'Your mother asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, and she gives you the money back when you return home.'
-			elseif MomPom = 7:
-				'Your mother asks you to go to the pharmacy, to get some medicine. Your mother''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your mother gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
-				'"Hello aunt!" You greet her back, and have a chat with her before you give her list your mother made. Aunt Luda quickly gathers the items your mother wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your mother I said hi!"'
-				'You say you will and wave her goodbye. When you come home, you give your mother the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your mom, but decide to not bother now.'
-			elseif MomPom = 8:
-				MomPom = 1
-			end
 
-			act 'Move away':gt $loc, $metka
-		end
-	end
-
-	if SchoolAtestat = 0 and motherKnowSpravka = 0:
-		if GspravkaT = 0 and GspravkaTimes >= 3 and hour >= 6 and hour <= 21:
-			cla
-			npc_rel['A29'] -= 1
-			'Your mother frowns and gets her handbag: "<<$pcs_nickname>>, why haven''t you been to the gynaecologist like I asked you to? You don''t have anything to hide, do you? Come on, we''re going there right now." Your mother takes you by the hand and leads you to the clinic, ushering you into the gynaecologist''s office.'
-
-			act 'Get a referral from the gynaecologist':
-				cla
-				minut += 15
-				'You lie on the examination table and spread your legs. The gynaecologist examines your vagina.'
-
-				if pcs_vag > 0:
-					Gspravka = 7
-					GspravkaT = 2
-					'The gynaecologist notices you are not a virgin any more, and gives you a written referral to give to your mother.'
-				else
-					Gspravka = 7
-					GspravkaT = 1
-					'The gynaecologist verifies you are a virgin and gives you a written referral to give to your mother.'
+				gs 'mother', 'pregreact'
+				act 'Offer to help around the house':
+					cla
+					minut += 60
+					npc_rel['A29'] += rand(1, 5)
+					pcs_mood -= 10
+					delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
+					TotalMomPom += 1
+					MomPom += 1
+					gs 'stat'
+					'You offer to help your mother out around the house.'
+
+					if MomPom = 1:
+						'Your mother asks you to do the dishes. You spend an hour washing the dishes in the kitchen.'
+					elseif MomPom = 2:
+						'Your mother asks you to peel potatoes for tonight''s meals. You spend an hour in the kitchen peeling potatoes.'
+					elseif MomPom = 3:
+						'Your mother asks you to clean the floor. You spend an hour scubbing the floors of the apartment.'
+					elseif MomPom = 4:
+						'Your mother asks you to do a load of laundry. You spend an hour washing clothes in the bathroom.'
+					elseif MomPom = 5:
+						'Your mother asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
+					elseif MomPom = 6:
+						sdacharand = rand(10, 50)
+						money += sdacharand
+						gs 'stat'
+						'Your mother asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, and she gives you the money back when you return home.'
+					elseif MomPom = 7:
+						'Your mother asks you to go to the pharmacy, to get some medicine. Your mother''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your mother gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
+						'"Hello aunt!" You greet her back, and have a chat with her before you give her list your mother made. Aunt Luda quickly gathers the items your mother wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your mother I said hi!"'
+						'You say you will and wave her goodbye. When you come home, you give your mother the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your mom, but decide to not bother now.'
+					elseif MomPom = 8:
+						MomPom = 1
+					end
+					act 'Continue':gt 'mother'
 				end
 
-				act 'Leave the office':gt $loc, $metka
-			end
+				if npc_QW['A29'] = 1 and npc_rel['A29'] >= 20 and $loc = 'kuhrPar':
+					act 'Try to reconcile':
+						*clr & cla
+						'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 
-		elseif GspravkaT = 0 and GspravkaTimes < 3:
-			GspravkaTimes += 1
-			'"<<$pcs_nickname>>, you need to go to the clinic. We need a written referral from the gynaecologist for school."'
-		elseif GspravkaT = 2 and motherKnowSpravka = 0:
-			cla
+						mqwtRand = rand(1, 10)
 
-			if motherKnowWhore = 0:
-				npc_rel['A29'] = 0
-				motherKnowSpravka = 1
+						if mqwtRand <= 2:
+							npc_rel['A29'] -= rand(1, 5)
+							minut += 30
+							'You try to have a talk with your mother, to hopefully patch up your horrible relationship. You''re not sure whether you said something wrong, or whether she''s just in a bad mood, but your attempt to reconcile backfired horribly; within moments the conversation turns into a screaming contest, and your mother ends up disliking you even more.'
 
-				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+							act 'Leave her be for now':gt $loc, $metka
+						elseif mqwtRand > 2 and mqwtRand <= 8:
+							npc_rel['A29'] += rand(0, 1)
+							minut += 30
+							'You try to have a talk with your mother, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your mother about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
 
-				if momslut < 2:
-					delin_beh += 1 &!counter for getting sent to Gadukino for the summer
-					'Your mother is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work. Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
-				else
-					'Your mother shakes her head sadly when she reads the referral. "Well... I guess I shouldn''t be surprised."'
+							act 'Leave her be for now':gt $loc, $metka
+						elseif mqwtRand > 8:
+							gt'motherQW','motherQW_2'
+						end
+					end
 				end
-			elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
-				npc_rel['A29'] -= 10
-				motherKnowSpravka = 1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
-				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
-				'Your mother reads the referral and closes her eyes for a second, trying to suppress her anger. "To be honest, it''s not even a surprise to me. Don''t think that I haven''t seen you sneaking around the house at weird times, and all the guys loitering near our apartment."'
-			elseif npc_QW['A29'] >= 2:
-				motherKnowSpravka = 2
-				'"Why are you showing me this, <<$pcs_nickname>>, do you think this is funny? Are you trying to rub it in my face? Even if you made photocopies of it and handed them out at school, I doubt it would change your reputation at all... everyone already knows." your mother says coldly.'
-			end
-
-			act 'Move away':gt $loc, $metka
-
-		end
-	end
-		
-	if npc_QW['A29'] = 1 and npc_rel['A29'] >= 20 and $loc = 'kuhrPar':
-		act 'Try to reconcile':
-			cls
-			'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-
-			mqwtRand = rand(1, 10)
-
-			if mqwtRand <= 2:
-				npc_rel['A29'] -= rand(1, 5)
-				minut += 30
-				'You try to have a talk with your mother, to hopefully patch up your horrible relationship. You''re not sure whether you said something wrong, or whether she''s just in a bad mood, but your attempt to reconcile backfired horribly; within moments the conversation turns into a screaming contest, and your mother ends up disliking you even more.'
-
-				act 'Leave her be for now':gt $loc, $metka
-			elseif mqwtRand > 2 and mqwtRand <= 8:
-				npc_rel['A29'] += rand(0, 1)
-				minut += 30
-				'You try to have a talk with your mother, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your mother about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
-
-				act 'Leave her be for now':gt $loc, $metka
-			elseif mqwtRand > 8:
-				gt'motherQW','motherQW_2'
+			else
+				gt $loc, $metka
 			end
 		end
 	end
@@ -667,7 +610,88 @@ if $ARGS[0] = '':
 			act 'Go to Gadukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
 		end
 	end
-end	
+
+	if SchoolAtestat = 0 and motherKnowSpravka = 0 and GspravkaT ! 1:
+		gt 'mother', 'referral'
+	elseif Gspassed = 1:
+		gt 'mother', 'referral_pass'
+	end
+end
+
+if $ARGS[0] = 'referral':
+	*clr & cla
+	'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+	*nl
+	if GspravkaT = 0 and GspravkaTimes >= 3 and hour >= 6 and hour <= 21:
+		npc_rel['A29'] -= 1
+		'Your mother frowns and gets her handbag: "<<$pcs_nickname>>, why haven''t you been to the gynaecologist like I asked you to? You don''t have anything to hide, do you? Come on, we''re going there right now." Your mother takes you by the hand and leads you to the clinic, ushering you into the gynaecologist''s office.'
+
+		act 'Get a referral from the gynaecologist':
+			gt 'gpoli', 'referral'
+		end
+
+	elseif GspravkaT = 0 and GspravkaTimes < 3:
+		GspravkaTimes += 1
+		'"<<$pcs_nickname>>, you need to go to the clinic. We need a written referral from the gynaecologist for school."'
+		act 'Continue': gt 'mother'
+
+	elseif GspravkaT = 2 and motherKnowSpravka = 0:
+		gt 'mother', 'referral_fail'
+	elseif Gspassed = 1:
+		gt 'mother', 'referral_pass'
+	end
+end
+
+if $ARGS[0] = 'referral_fail':
+	*clr & cla
+	'<center><h2>Pavlovsk</h2></center>'
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodokw.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
+	end
+	*nl
+	if motherKnowWhore = 0:
+		npc_rel['A29'] = 0
+		motherKnowSpravka = 1
+
+		if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+
+		if momslut < 2:
+			!counter for getting sent to Gadukino for the summer
+			delin_beh += 1
+			'Your mother is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work. Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
+			act 'Walk home': gt 'korrPar'
+		else
+			'Your mother shakes her head sadly when she reads the referral. "Well... I guess I shouldn''t be surprised." You head home in silence.'
+			act 'Walk home': gt 'korrPar'
+		end
+
+	elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
+		npc_rel['A29'] -= 10
+		motherKnowSpravka = 1
+		!counter for getting sent to Gadukino for the summer
+		delin_beh += 1
+		if npc_QW['A29'] = 0:npc_QW['A29'] = 1
+		'Your mother reads the referral and closes her eyes for a second, trying to suppress her anger. "To be honest, it''s not even a surprise to me. Don''t think that I haven''t seen you sneaking around the house at weird times, and all the guys loitering near our apartment." You head home in silence.'
+		act 'Walk home': gt 'korrPar'
+	elseif npc_QW['A29'] >= 2:
+		motherKnowSpravka = 2
+		'"Why are you showing me this, <<$pcs_nickname>>, do you think this is funny? Are you trying to rub it in my face? Even if you made photocopies of it and handed them out at school, I doubt it would change your reputation at all... everyone already knows." your mother says coldly. You head home in silence.'
+		act 'Walk home': gt 'korrPar'
+	end
+end
+
+if $ARGS[0] = 'referral_pass':
+	*clr & cla
+	'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+	*nl
+	Gspassed = 0
+	'You hand your mother the referral. She opens it, closes her eyes for a second, and breates a sigh of relief. "I''m not even surprised, you''re a good girl <<$pcs_nickname>>, just as I raised you to be."'
+	act 'Continue': gt 'mother'
+end
 
 if $ARGS[0] = 'pregreact':
 	*nl
@@ -739,11 +763,11 @@ if $ARGS[0] = 'pregreactnude':
 	act 'Return to mother':gt 'mother', 'pregreact1'
 end
 
-!!Mom should have more pregnancy reactions than other characters. 
+!!Mom should have more pregnancy reactions than other characters.
 !!Add shorter reactions inside this array. If longer, link to another array in the format of 'pregreactbrother'
 if $ARGS[0] = 'pregreact1':
 	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:	
+	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:
 		'"I... I don''t actually know. I was," you stammer as you struggle to get the next word out. "I was raped."'
 		'"What? Are you okay? Why did''t you tell me sooner?"'
 		'"I was scared and ashamed and I didn''t know how you would react." Your lip quivers as tears begin to flow down your face. "I''m sorry. I should have said something."'
@@ -758,7 +782,7 @@ if $ARGS[0] = 'pregreact1':
 			act 'Continue':gt 'kuhrPar'
 		elseif brotherSecret = 1 and pcs_intel < 60:
 			cla
-			'"Wow, thank God that worked. I thought for sure you would figure out I was lying and I would have to tell you that Kolka is really the father."' 
+			'"Wow, thank God that worked. I thought for sure you would figure out I was lying and I would have to tell you that Kolka is really the father."'
 			'You see the stunned look on her face and realize your mistake. "I mean... that was a joke. Shit."'
 
 			act 'Continue':gt 'mother', 'pregreactbrother'
@@ -777,7 +801,7 @@ if $ARGS[0] = 'pregreact1':
 			cla
 			'You continue on with your successful act, "Thank you. I''m so glad you didn''t get mad at me." The two of you then share a warm embrace as you''re doing a victory dance inside your head over your successful ruse.'
 
-			act 'Continue':gt 'kuhrPar'
+			act 'Continue':gt 'mother'
 		elseif stepdadSecret = 1 and pcs_intel < 60:
 			cla
 			'"Wow, I can''t believe that worked. I was for certain that you would figure out I was lying and I would have to tell you that Vladimir''s the true father."'
@@ -809,10 +833,10 @@ if $ARGS[0] = 'pregreact1':
 			'"All right, I had to ask," she says, hugging you again. A bit later she whispers in your ear. "You know, it will not be that bad. You will be still young when your child grows up. You can even go to parties with her. Or him. Whatever. And I will be the awesome hot grandma."'
 			'The image conjured by that thought makes you giggle a bit. Maybe it will not be that bad.'
 		end
-		act 'Continue':gt 'kuhrPar'
+		act 'Continue':gt 'mother'
 	else
 		'You tell her that the father is <<$wombthfath>> and give her some brief details about how you met and the events that led up to your pregnancy. She reassuers you that she will help you get through this.'
-		act 'Continue':gt 'kuhrPar'
+		act 'Continue':gt 'mother'
 	end
 end
 
@@ -822,7 +846,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
 		'"What the fuck is wrong with you?" she screams in your face. "I knew you were a worthless whore, but this? Even I didn''t think you’d go so far as to try corrupting your brother, too."'
 		'Kolka tries to speak up. "Mom, <<$pcs_nickname>>-"'
-		'Your mother quickly cuts him off. "Kolka, shut the fuck up and go to the living room. I''ll deal with you later."' 
+		'Your mother quickly cuts him off. "Kolka, shut the fuck up and go to the living room. I''ll deal with you later."'
 		'He shuffles out of the room, stopping in the doorway for a moment to look at you sympathetically.'
 		'Your mother releases your hair as tears begin to stream down your face.'
 		'"Mom, I''m s-"'

+ 2 - 2
locations/obj_din.qsrc

@@ -748,7 +748,7 @@ if $ARGS[0] = 'stats':
 	'Prostitution preference: <<prostitution[''pref'']>>'
 	'Prostituted yourself: <<prostitution[''exp'']>>'
 	'Bondage preference: <<bound[''pref'']>>'
-	'Bondage ay: <<bound[''exp'']>>'
+	'Bondage play: <<bound[''exp'']>>'
 	'Masochism preference: <<maso[''pref'']>>'
 	'Masochism experiences: <<maso[''exp'']>>'
 	'Bestiality encounters: <<beast[''pref'']>>'
@@ -1198,7 +1198,7 @@ if $ARGS[0] = 'stats_fetish':
 	'Prostitution preference: <<prostitution[''pref'']>>'
 	'Prostituted yourself: <<prostitution[''exp'']>>'
 	'Bondage preference: <<bound[''pref'']>>'
-	'Bondage ay: <<bound[''exp'']>>'
+	'Bondage play: <<bound[''exp'']>>'
 	'Masochism preference: <<maso[''pref'']>>'
 	'Masochism experiences: <<maso[''exp'']>>'
 	'Bestiality encounters: <<beast[''pref'']>>'

+ 2 - 0
locations/parkdin.qsrc

@@ -23,6 +23,8 @@ if hour > 7 and hour < 21:
 		if parkrand = 7:gt 'parkivent', '7'
 		if parkrand = 8:gt 'parkivent', '8'
 		if parkrand = 9:gt 'parkivent', '9'
+	elseif parkrand = 19 and prcptn_lvl >= 50 and lactate > 0:
+        gt 'parkivent', 'find_baby'
 	else
 		gt 'parkivent', 'empty'
 	end

+ 200 - 0
locations/parkivent.qsrc

@@ -859,5 +859,205 @@ if $ARGS[0] = 'run_reactions':
 	act 'Finish your run': gt $loc, $metka
 end
 
+if $ARGS[0] = 'find_baby':
+    if hour >= 8 and hour <= 20 and park_baby_found < 1:
+        pcs_mood += 10
+        pcs_willpwr += 10
+        gs 'stat'
+        '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_woods.jpg"></center>'
+        'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
+        'Your thoughts are interrupted by a weak noise coming from a small forest in the park.'
+        act 'Investigate':    
+            *clr
+            cla
+            '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_baby_a.jpg"></center>'
+            'After searching and following the noises you end up finding an abandoned baby in the park. You approach it and can hear weak cries coming from it.'
+            'You pull it from the crib an see that it is a boy. The baby boy isn''t moving much as he seems really weak.'
+            park_baby_found = 1
+            if lactate > 0:
+                'His small almost dry mouth makes little smacking movements.'
+            end
+            'What do you want to do?'
+            if lactate > 0:
+                act 'Breastfeed him':
+                    gs 'stat'
+                    *clr
+                    cla
+                    '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_baby_bf.jpg"></center>'
+					'You sit down on a nearby bench and get a breast out.'
+					if kid <= 0:
+						'Something feels weird in your breast, a pulling tension goes through it from the base to the nipple.'
+					end
+					'The boy is in your arms and you lead your nipple into his small dry mouth. You can feel the small lips clamping weakly onto your nipple, only light sucktion coming from the mouth.'
+					'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/feeding_01.jpg"></center>'
+					temp_var = func('lact_lib','$get_breastmilk_time', 7, 30)
+					if temp_var > 10:
+						'<br>The baby boys weak suckling isn''t getting better with time. He is suckling on your nipple for almost 10 minutes and his condition isn'' getting better.'
+						milkedvolume = func('lact_lib','$get_breastmilk', 7, 10)
+						milkedvolume = 0
+						minut += temp_var
+						if pcs_mood < 20:
+							act 'Leave him here':
+								*clr
+								cla
+								'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+								act 'Finish your walk': gt $loc, $metka
+							end
+						end
+						act 'Bring him to the hospital':
+							*clr
+							cla
+							'<center><b><font color="maroon">Clinic</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+							minut += 30
+							act 'Finish': gt 'poli', 'start'
+						end
+						!!if pcs_mood > 80:
+						!!    act 'Take him with you':
+						!!end
+					else
+						'<br>The baby boys weak suckling is getting better with time. After around <<temp_var>> minutes his sucking is getting more intense.'
+						milkedvolume = func('lact_lib','$get_breastmilk', 7, 10)
+						milkedvolume = 0
+						minut += temp_var
+						act 'Continue to breastfeed him':
+							*clr
+							cla
+							gs 'stat'
+							'You adjust yourself a bit as you continue to breastfeed the baby. He opens his mouth more to suck in your areola, starting to chew on it. You can feel how it causes your breast to leak more milk. His small hands grabbing up, holding onto your nutrious breast.'
+							'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/feeding_02.jpg"></center><br>'
+							temp_var = func('lact_lib','$get_breastmilk_time', 2, 120)
+							if temp_var > 30:
+								'You try to breastfeed him for 30 minutes but you can''t satisfy his needs even after switching breasts. Your breasts don''t make enough milk.'
+								milkedvolume = func('lact_lib','$get_breastmilk', 2, 30)
+								milkedvolume = 0
+								minut += 30
+								if pcs_mood < 20:
+									act 'Leave him here':
+										*clr
+										cla
+										'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+										act 'Finish your walk': gt $loc, $metka
+									end
+								end
+								act 'Bring him to the hospital':
+									*clr
+									cla
+									'<center><b><font color="maroon">Clinic</font></b></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+									minut += 35
+									act 'Finish': gt 'poli', 'start'
+								end
+								!!if pcs_mood > 80:
+								!!    act 'Take him with you':
+								!!end
+							else
+								if temp_var = 1:
+									if (lactatemv/1200) < 2:
+										'You breastfeed him for one minute. During feeding you have to switch breasts as he is drinking alot, but your breasts make enough milk to satisfy his needs.'
+									else
+										'You breastfeed him for one minute. Your breasts make so much milk you don''t even have to switch breasts during feeding. He is satisfied to his full content.'
+									end
+								else
+									if (lactatemv/1200) < 2:
+										'You breastfeed him for <<temp_var>> minutes. During feeding you have to switch breasts as he is drinking alot, but your breasts make enough milk to satisfy his needs.'
+									else
+										'You breastfeed him for <<temp_var>> minutes. Your breasts make so much milk you don''t even have to switch breasts during feeding. He is satisfied to his full content.'
+									end
+								end
+								if age < 18 and kid <= 0:
+									'As you notice how you where able to fully breastfeed a baby, even if you never had kids yourself, you start to feel proud and confident of yourself, smiling and nodding. This rises your mood as you feel more like a grown up woman now.'
+									pcs_mood += 20
+								elseif age >= 18 and kid <= 0:
+									'As you notice how you where able to fully breastfeed a baby, even if you never had kids yourself, you start to feel proud and confident of yourself, smiling and nodding. This rises your mood a bit.'
+									pcs_mood += 10
+								else
+									'You feel satisfied after the breastfeeding and smile at the baby. Your mood rises a bit.'
+									pcs_mood += 10
+								end
+								milkedvolume = func('lact_lib','$get_breastmilk', 2, temp_var)
+								milkedvolume = 0
+								minut += temp_var
+								if pcs_mood < 20:
+									act 'Leave him here':
+										*clr
+										cla
+										'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+										act 'Finish your walk': gt $loc, $metka
+									end
+								end
+								act 'Bring him to the hospital':
+									*clr
+									cla
+									'<center><b><font color="maroon">Clinic</font></b></center>'
+									'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+									minut += 35
+									act 'Finish': gt 'poli', 'start'
+								end
+								!!if pcs_mood > 80:
+								!!    act 'Take him with you':
+								!!end
+							end
+						end
+						if pcs_mood < 20:
+							act 'Leave him here':
+								*clr
+								cla
+								'You look around, someone probably left him here for good. You put him back into the crib and leave the baby behind, finishing your walk.'
+								act 'Finish your walk': gt $loc, $metka
+							end
+						end
+						act 'Bring him to the hospital':
+							*clr
+							cla
+							'<center><b><font color="maroon">Clinic</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+							minut += 35
+							act 'Finish': gt 'poli', 'start'
+						end
+						!!if pcs_mood > 80:
+						!!    act 'Take him with you':
+						!!end
+					end
+                end
+            end
+            act 'Bring him to the hospital':
+                *clr
+                cla
+                '<center><b><font color="maroon">Clinic</font></b></center>'
+                '<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+                'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
+                'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
+                minut += 30
+                act 'Finish': gt 'poli', 'start'
+            end
+            if pcs_mood < 20:
+                act 'Leave him here':
+                    *clr
+                    cla
+                    'You look around, someone probably left him here for good. You leave the baby behind and finish your walk.'
+                    act 'Finish your walk': gt $loc, $metka
+                end
+            end
+            !!if pcs_mood > 80:
+            !!    act 'Take him with you':
+            !!end
+        end
+        act 'Complete walk':gt 'park', 'start'
+    else
+        gt 'parkivent', 'empty'
+    end
+end
+
+
 --- parkivent ---------------------------------
 
+

+ 2 - 0
locations/pavComplex.qsrc

@@ -109,6 +109,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
+	act 'Go to the old apartment building':minut += 3 & gt 'pavComplexOld', 'etaj_1'
 	act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
 	act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
 end
@@ -160,6 +161,7 @@ if $ARGS[0] = 'courtyard':
 		end
 	end
 	act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
+	act 'Go to the old apartment building':minut += 3 & gt 'pavComplexOld', 'etaj_1'
 	act 'Go to the garages':minut += 1 & gt 'pavComplex', 'garages'
 end
 

+ 1 - 1
locations/pavComplexOld.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'etaj_1':
 		act 'Turn back': gt 'pavComplexOld', 'etaj_1'
 	end
 
-	act 'Leave the building':gt 'pavResidential'
+	act 'Leave the building':gt 'pavcomplex', 'start'
 end
 
 if $ARGS[0] = 'advert':

+ 5 - 17
locations/pavResidential.qsrc

@@ -114,14 +114,14 @@ end
 
 
 if home_owned[2] = 1:
-	'You live in one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your <a href="exec:minut += 5 & GT ''korrPar''">parents'' home</a> is on the second floor there. <<$gcartext>>'
+	'You live in one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 3 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your <a href="exec:minut += 5 & GT ''korrPar''">parents'' home</a> is on the second floor there. <<$gcartext>>'
 elseif StoryLine = 1:
-	'You are standing near one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
+	'You are standing near one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 3 & GT ''pavcomplex'',''start''">apartment building</a> is right there. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
 else
 	'<<$gcartext>>'
 end
 
-if StoryLine = 1: 'There is an <a href="exec:minut += 2 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> near to where your parents live.'
+if StoryLine = 1: 'There is an <a href="exec:minut += 3 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> near to where your parents live.'
 
 if rexCar = 1 and rexCarDay = daystart and hour >= 21 and hour < 23 and rexSisTalk = 3:
 	'Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
@@ -187,6 +187,8 @@ act 'Go to the high street':minut += 5 & gt 'pavCommercial'
 if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
 if pavSharedAptEnabled = 1:act '<b>GO HOME</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
 
+act 'Go to the apartment complex':minut += 3 & gt 'pavcomplex', 'start'
+
 act 'Wait':gs 'obj_din', 'wait'
 
 if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
@@ -221,20 +223,6 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-act 'Go to the Southern apartment building':minut += 3 & gt 'pod_ezd', 'etaj_1'
-act 'Go to the Eastern apartment building':
-	minut += 3
-	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50:
-		gt 'pavComplexb2', 'anushkaFirst'
-	else
-		gt 'pavComplexb2', 'etaj_1'
-	end
-end
-act 'Go to the Western apartment building':minut += 3 & gt 'pavComplexb3', 'etaj_1'
-act 'Go to the apartment courtyard':minut += 3 & gt 'pavComplex', 'courtyard'
-act 'Go to the apartment garages':minut += 3 & gt 'pavComplex', 'garages'
-
-
 if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and sosedday ! daystart:
 	cls
 	sosedday = daystart

+ 8 - 0
locations/placer_gskver.qsrc

@@ -86,12 +86,14 @@ gs 'placer_man'
 
 if month=3 or month=4 or month=5:
 	if hour>=6 and hour<=17:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'
 		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
 		'There are puddles on the ground everywhere, all remains from the melted snow. A lot of people in the park are having fun with them, trying to jump over them and mocking those that fail. They''re not particularly deep though, and plenty of others just walk through without giving them a second thought.'
 		'The park is not particularly crowded, this time of year. Many people think it''s still too cold.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.night.jpg"></center>'
 		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
 		'There is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
@@ -100,10 +102,12 @@ if month=3 or month=4 or month=5:
 end
 if month=6 or month=7 or month=8:
 	if hour>=6 and hour<=19:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 		'The main square of Pavlovsk Park. At this time of year, it''s one of the primary places locals and tourists enjoy spending their spare time in. It''s always busy: people are resting, walking, playing and dating to their heart''s desires, enjoying the nice surroundings.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.summer.night.jpg"></center>'
 		'The main square of Pavlovsk Park. At this time of year, it''s one of the places where locals and tourists enjoy going in their spare time.'
 		'However, there is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
@@ -112,11 +116,13 @@ if month=6 or month=7 or month=8:
 end
 if month=9 or month=10 or month=11:
 	if hour>=6 and hour<=18:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.jpg"></center>'
 		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves. The leaves that are still on the trees have changed colour, and are an colourful mix of red and brown.'
 		'Everywhere in the park, people are enjoying nature. Some are taking photos of the fallen leaves, kids are playing everywhere, and couples are walking hand-in-hand, simply enjoying each other''s company.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.night.jpg"></center>'
 		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves.'
 		'It gets quite cold at night, and you try to stay active to keep yourself warm. The lone soul you see running across the park is probably trying to get home faster, to warm up with some nice cocoa.'
@@ -125,11 +131,13 @@ if month=9 or month=10 or month=11:
 end
 if month=1 or month=2 or month=12:
 	if hour>=7 and hour<=16:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<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.'
 		''
 	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.'

+ 50 - 26
locations/police_station.qsrc

@@ -24,24 +24,40 @@ if $ARGS[0] = 'entrance':
 	!first time offender, event where Sveta gets caught stealing
 	!need to add a variable to store that Sveta has been brought into the police station
 	if shplft_booked + prst_booked = 0:
-		gt 'police_station', 'first'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'first', 'shplft'
+		else
+			gs 'police_station', 'first', 'prst'
+		end
 	elseif shplft_booked + prst_booked < 6:
-		gt 'police_station', 'repeat'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'repeat', 'shplft'
+		else
+			gs 'police_station', 'repeat', 'prst'
+		end
 	elseif shplft_booked + prst_booked < 11:
-		gt 'police_station', 'multiple'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'multiple', 'shplft'
+		else
+			gs 'police_station', 'multiple', 'prst'
+		end
 	else
-		gt 'police_station', 'regular'
+		if $ARGS[1] = 'shplft':
+			gs 'police_station', 'regular', 'shplft'
+		else
+			gs 'police_station', 'regular', 'prst'
+		end 
 	end
 end
 
 if $ARGS[0] = 'first':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
 
 		if toldonguard = 2:
 			!! if had sex with the security guard but still got arrested
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -55,7 +71,7 @@ if $ARGS[0] = 'first':
 
 		elseif grupTipe = 4:
 			!else if gopnik
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -70,7 +86,7 @@ if $ARGS[0] = 'first':
 
 		elseif hotcat > 7:
 			!else if beautiful
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -84,7 +100,7 @@ if $ARGS[0] = 'first':
 
 		elseif hotcat < 3:
 			!else if ugly
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -98,7 +114,7 @@ if $ARGS[0] = 'first':
 
 		else
 			!if plain looking
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -110,14 +126,14 @@ if $ARGS[0] = 'first':
 
 			act 'Continue further in':gt 'police_station', 'booking'
 		end
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 
 		if hotcat < 3:
 			!Prostitute event, this will be an continuation to the prostitute events that happened earlier
 			!if ugly
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -128,7 +144,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -139,7 +155,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -153,7 +169,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if ugly and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -164,7 +180,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -175,7 +191,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful and bribed the officer with money
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -186,7 +202,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if ugly and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -198,7 +214,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if plain and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -210,7 +226,7 @@ if $ARGS[0] = 'first':
 
 
 			!else if beautiful and bribed the officer with sex
-			*clr & cla
+			cla
 			minut += 2
 			gs 'pain', 2, 'armR', 'pinch'
 			gs 'stat'
@@ -226,10 +242,10 @@ end
 
 
 if $ARGS[0] = 'repeat':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -290,10 +306,10 @@ if $ARGS[0] = 'repeat':
 end
 
 if $ARGS[0] = 'multiple':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -352,10 +368,10 @@ if $ARGS[0] = 'multiple':
 end
 
 if $ARGS[0] = 'regular':
-	if ARGS[1] = 'shplft':
+	if $ARGS[1] = 'shplft':
 		shplft_booked += 1
 		shplft_tmp = 1
-	elseif ARGS[1] = 'prst':
+	elseif $ARGS[1] = 'prst':
 		prst_booked += 1
 		prst_tmp = 1
 	end
@@ -1136,6 +1152,7 @@ if $ARGS[0] = 'shplft_easy':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'easy'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat at the table opposite of you, "So caught stealing, eh?" he asks.'
@@ -1173,6 +1190,7 @@ if $ARGS[0] = 'shplft_norm':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'norm'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
@@ -1210,6 +1228,7 @@ if $ARGS[0] = 'shplft_hard':
 	*clr & cla
 	minut += 20
 	picrand = rand(1, 2)
+	$detec_type = 'hard'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
 	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
@@ -1246,6 +1265,7 @@ if $ARGS[0] = 'prst_easy':
 	!easy going detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'easy'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1289,6 +1309,7 @@ if $ARGS[0] = 'prst_norm':
 !normal detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'norm'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1336,6 +1357,7 @@ if $ARGS[0] = 'prst_hard':
 !rough detective
 	*clr & cla
 	minut += 20
+	$detec_type = 'hard'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
 	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
@@ -1434,6 +1456,7 @@ if $ARGS[0] = 'returncell':
 				'"Go on before they change their mind," she smiles.'
 				'You say good bye to each other and the officer leads you towards the entrance and as the police station doors open you can feel the fresh wind breeze against your face.'
 
+				Sentence_date = daystart + 7
 				act 'Walk outside':gt 'down'
 
 			end
@@ -1450,6 +1473,7 @@ if $ARGS[0] = 'returncell':
 		'Some time passes by and the cell door opens, "<<$pcs_lastname>>, it''s your time to get released."'
 		'You quickly jump up and hurry out from the holding cell. The officer leads you towards the entrance and as the police station doors open you can feel the fresh wind breeze against your face.'
 
+		Sentence_date = daystart + 7
 		act 'Walk outside':gt 'down'
 	end
 end

+ 3 - 0
locations/preALT.qsrc

@@ -45,6 +45,7 @@ if $ARGS[0] = 'Three':
 	if MagikDostup = 1:
 		showstat 1
 		showobjs 1
+		gs 'obj_din', 'old'
 		act 'Begin':
 			*clr
 			cla
@@ -130,6 +131,7 @@ if $ARGS[0] = 'Cursed Schoolgirl Start':
 		hour = 18
 		showstat 1
 		showobjs 1
+		gs 'obj_din', 'old'
 		'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'
 		'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad other issues that might pop up and all with the added spice of magic to keep things interesting!'
 		act 'Begin':
@@ -221,6 +223,7 @@ if $ARGS[0] = 'Cursed Schoolgirl Start 2':
 								act 'Continue':
 									showstat 1
 									showobjs 1
+									gs 'obj_din', 'old'
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'

+ 2 - 0
locations/preNT.qsrc

@@ -419,6 +419,7 @@ if $ARGS[0] =  'Listings':
 			cla
 			showstat 1
 			showobjs 1
+			gs 'obj_din', 'old'
 			gt 'korr'
 		end
 	end
@@ -506,6 +507,7 @@ if $ARGS[0] =  'Train':
 						cla
 						showstat 1
 						showobjs 1
+						gs 'obj_din', 'old'
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/system/newintown.jpg"></center>'

+ 2 - 0
locations/preSYS.qsrc

@@ -512,6 +512,7 @@ if $ARGS[0] = 'charselect':
 				currentpursenumber = 9
 				dynamic $currentpursetype + '_purses[' + currentpursenumber + '] = 1'
 				bag = 1
+				gs 'obj_din', 'old'
 				greben = 1
 				kosmetitka = 10
 				krem = 10
@@ -816,6 +817,7 @@ if $ARGS[0] = 'charselect':
 				$currentpursetype = 'kats'
 				currentpursenumber = 10
 				bag = 1
+				gs 'obj_din', 'old'
 				greben = 1
 				kosmetitka = 10
 				salfetka = 10

+ 1 - 0
locations/preSYS2.qsrc

@@ -19,6 +19,7 @@ if $ARGS[0] = 'start':
 		if bag = 1:
 			!!using current combination should prevent having more than 1 bag at the start of game.
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
+			gs 'obj_din', 'old'
 		end
 		gt 'preCUST', 'SGStart'
 	end

+ 1 - 0
locations/preTG.qsrc

@@ -483,6 +483,7 @@ if $ARGS[0] = 'sleepPRE':
 					cla
 					showstat 1
 					showobjs 1
+					gs 'obj_din', 'old'
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/transgender.jpg"></center>'

+ 1 - 0
locations/rolanbath.qsrc

@@ -422,6 +422,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	dynamic $toymanage
+	dynamic $enema
 end
 
 !Bathroom, Rolan caught:

+ 2 - 2
locations/sauna.qsrc

@@ -93,9 +93,9 @@ if $ARGS[0] = 'saunaroom':
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
 
 	if budilnikOn = 0:
-		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''sauna'', ''saunaroom''">off</a>.'
 	else
-		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''sauna'', ''saunaroom''">on</a>.'
 	end
 
 	if SaunaWhore > 0 and money > 0 and workDolg > 0:

+ 26 - 25
locations/saunawhore.qsrc

@@ -228,10 +228,10 @@ end
 
 if $ARGS[0] = 'blowjob':
 	minut += 5
-	'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
-
+	
 	if $moodType = 'fairly normal':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He pulls out his <<$dick_girth>> dick and brings it to your <<$liptalk>>.'
 		'You start kissing the tip, licking it all around and putting it a bit inside your mouth and sucking the head.'
 		gs 'arousal', 'bj', 5, 'prostitution'
@@ -240,12 +240,14 @@ if $ARGS[0] = 'blowjob':
 		act 'Suck it':gt 'saunawhore', 'blowjobGate'
 	elseif $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He comes close to you, fondles your hair and face and takes you gently by your arm, raising you up from the floor.'
 		'He directs you to the bed, undresses and both of you lie down.'
 
 		act 'Embrace him':gt 'saunawhore', 'fuckGate'
 	elseif $moodType = 'bad':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/slapface'+rand(1, 1)+'.mp4"></video></center>'
+		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He comes close to you and suddenly slaps your face hard.'
 		'You are caught by surprise and tears well up in your eyes.'
 		'He seems very angry and even aroused by your misfortune.'
@@ -914,13 +916,13 @@ if $ARGS[0] = 'saunawork':
 				else
 					if rand(0, 100) >= 40:saunaWorkKlient = 1
 				end
-				
+
 				if saunaWorkKlient = 1:
 					cls
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunawhore.jpg"></center>'
 					'A client has arrived at the sauna, and the girls line up so that the customer can choose his favorite.'
-					
+
 					if rand(0, 120) < pcs_apprnc:
 						'Client jabs a finger at you, "This one."'
 						act 'Go to the sauna with client':
@@ -1019,14 +1021,14 @@ if $ARGS[0] = 'bathroom':
 	$locM = 'saunawhore'
 	$metkaM = 'bathroom'
 	$location_type = 'bathroom'
-	
+
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
 	''
 	'You enter the staff bathroom, which is usually cleaned by the girls that have only just started work here, voluntary or otherwise.'
 	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
-		
+
 	act 'Return to foyer': minut += 1 & gt 'saunawhore', 'saunawork'
 
 	act 'Take a shower (0:15)':
@@ -1038,24 +1040,30 @@ if $ARGS[0] = 'bathroom':
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
 		''
 		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
-		act 'Get out and dry off':gt $locM, $metkaM
 		if workDolg > 0:
-			gs 'saunawhore', 'saunabrit'
-		else
+			if stanok <= 0: stanok = 5
+			dynamic $brit
+		elseif workDolg = 0 and stanok > 0:
 			dynamic $brit
 		end
+		dynamic $dryOff
 	end
 
 	if workDolg > 0:
-		gs 'saunawhore', 'saunabrit'
+		*nl
+		'There are a handful of cheap razors you can use, enough for <<stanok>> shaves. At least they don''t make you pay for them, but only because they don''t know who has used which blades. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		if stanok <= 0: stanok = 5
+		dynamic $brit
 	elseif workDolg = 0 and stanok > 0:
+		*nl
+		'Your currnet pack of razors will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
 	elseif workDolg = 0 and stanok = 0:
-		'Your razor blade looks in good enough shape for <b><<stanok>></b> more shaves.'	
+		*nl
+		'You have <<stanok>> razors left. You should to go to the store and buy more razors. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	end
 	gs 'din_van', 'prvt_pee'
-
-	dynamic $toymanage
+	dynamic $enema
 
 	if workdolg > 0:
 		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
@@ -1066,31 +1074,24 @@ if $ARGS[0] = 'bathroom':
 				minut += 5
 				pcs_mood -= 5
 				workDolg += 10
-	
+
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 				'You use a tampon, it will add another 10 <b>₽</b> to your debt, but the alternative is unpleasant.'
-	
+
 				act 'Finish':gt $locM, $metkaM
 			end
 		end
 	elseif workdolg = 0:
 		dynamic $tampon
 	end
-	
+
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin
-	dynamic $removepan
-	if breastpump > 0:
-		act 'Use breast pump':gt 'lact_lib', 'bp_milking'
+	if breastpump > 0 and bp_unbox >= 1:
+		act 'Use breast pump' :gt 'lact_lib', 'bp_milking'
 	end
 end
 
-if $ARGS[0] = 'saunabrit':
-	'There are a handful of cheap razors you can use. At least they don''t make you pay for them, but only because they don''t know who has used which blades.'
-	dynamic $brit
-	act 'Get out and dry off':gt $locM, $metkaM
-end
-
 --- saunaWhore ---------------------------------
 

+ 1 - 1
locations/shoplifting.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'punish':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/sex/revenge/revenge1.jpg"></center>'
 	'The guard forcefully drags you into the room and shoves you towards the chair, "Well well, look who''s back...If it isn''t the little rat!" he heatedly comments.'
-	'<i>Fuck it''s the same guard, now you''ve done it, <<pcs_nickname>>, get prepared for whatever awaits you...Your fate is in his hands...</i>'
+	'<i>Fuck it''s the same guard, now you''ve done it, <<$pcs_nickname>>, get prepared for whatever awaits you...Your fate is in his hands...</i>'
 	'"I hate you fucking rats. Do you know what I had to go through to get away from ending up in jail. Luckily one of the pigs didn''t mind getting bribed so I got away," he grins, "And now for your punishment."'
 
 	act 'Beg':

+ 6 - 5
locations/shulga_room.qsrc

@@ -80,14 +80,15 @@ if $ARGS[0] = 'start':
 	end
 
 	'There are two sofas next to a <a href="exec: gt ''shulga_room'', ''shultv''">TV</a>, and a <a href="exec:GT ''Komp'',''start''">laptop</a> sitting on a table covered in empty beer bottles.'
-	if hour >= 0 and hour < 7: '<a href="exec: gt ''shulga_room'', ''shulga_bazar_sleep''">Vasily</a> is sleeping on the big couch'
+	if (week < 6 and hour >= 0 and hour < 7) or (week >= 6 and hour >= 3 and hour < 7): '<a href="exec: gt ''shulga_room'', ''shulga_bazar_sleep''">Vasily</a> is sleeping on the big couch'
+	
 	shulga_room_rnd = RAND(0,2)
 	if shulga_room_rnd = 0:$shulga_room_rnd = 'The boys are sitting on the couch talking and drinking beer.'
 	if shulga_room_rnd = 1:$shulga_room_rnd = 'The boys are drinking beer and playing cards.'
 	if shulga_room_rnd = 2:$shulga_room_rnd = 'The boys are drinking beer while watching TV.'
 
 	if week < 6 and hour >= 20: '<<$shulga_room_rnd>> <a href="exec: gt ''shulga_room'', ''shulga_bazar_night''">Vasily</a>, <a href="exec: gt ''shulga_room'', ''den_bazar''">Dan</a> and <a href="exec: gt ''shulga_room'', ''vitek_bazar''">Vitek</a>, invites you to <a href="exec: gt ''shulga_room'', ''shulga_beer''">have a drink with them</a>.'
-	if week >= 6 and hour >= 10 and hour < 17 or week >= 6 and hour >= 0 and hour < 3: 'Sergey''s son <a href="exec: gt ''shulga_room'', ''shulga_bazar_day''">Vasily</a> is sitting on the big sofa.'
+	if (week >= 6 and hour >= 10 and hour < 17) or (week >= 6 and hour >= 0 and hour < 3): 'Sergey''s son <a href="exec: gt ''shulga_room'', ''shulga_bazar_day''">Vasily</a> is sitting on the big sofa.'
 
 	if week < 6 and hour >= 20:
 		act 'Drink beer with the guys': gt 'shulga_room', 'shulga_beer'
@@ -692,7 +693,7 @@ if $ARGS[0] = 'drunken_sex':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sex/cum'+rand(1,9)+'.jpg"></center>'
 			shulga_whore = daystart + 7
 			'It feels so intense!'
-			'Head spinning, you find yourself back on your knees, and quickly realize the boys weren''t finished. Hot cum and laughter rains down on you. You make a final effort to finish what you started. You open wide for your boys and smile up at them seeking approval. After you have milked the last drop from each of them. Dan pats you on the head and says:  "What a good little slut you are <<$pcs_nickname>>. From now on you get to be our personal whore. You are going to have so much fun with us. Now, what do you say? Or we will tell the whole school what a whore you are."' 
+			'Head spinning, you find yourself back on your knees, and quickly realize the boys weren''t finished. Hot cum and laughter rains down on you. You make a final effort to finish what you started. You open wide for your boys and smile up at them seeking approval. After you have milked the last drop from each of them. Dan pats you on the head and says: "What a good little slut you are <<$pcs_nickname>>. From now on you get to be our personal whore. You are going to have so much fun with us. Now, what do you say? Or we will tell the whole school what a whore you are."' 
 			'You gaze up at him, with your <<$pcs_eyecol>> eyes open wide as saucers and whisper, "Thank you."'
 			'Dan continues: "For your first official duty you will lick me clean"'
 			'With some hesitation and maybe a little excitement you bend down and lick Dan''s cock clean, occasionally moving to gently suckle on the tip'
@@ -791,7 +792,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvporn'+rand(1,5)+'.mp4" width="748" height="540"></video></center> You switched to porn channel.'
 		'The guys getting excited watching porn with you.'
 		'Vasily asks if you would like to help them get some relief.'
-		'Everyone''s  eyes are fixed on you, as they await your answer.'
+		'Everyone''s eyes are fixed on you, as they await your answer.'
 		if pav_slut < 75 or kotovLoveQW > 0: 
 			act 'Flee the scene': gt 'shulga_room', 'start'
 		else
@@ -813,7 +814,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/tv_ev/sex_group/bj'+rand(1,13)+'.jpg"></center>'
 				'When you nod yes, the boys start laughing and get their dicks out and form a pinwheel of flesh around your mouth. You roll your eyes and smile saying: "One at a time at boys. I would tell you to settle down, but I think we''re well past that."'
 				'You decide to reward Vitek for his patience by slowly licking him from base to tip, before wrapping your <<$liptalk3>> lips around him. For a good five minutes you slowly suck, savoring the taste his hard cock.' 
-				'Eventually Dan and Vasily get their turns too. While dutifully sucking away at one boy,  you worked your hands on whoever was waiting, doing your best to make sure nobody felt left out.'
+				'Eventually Dan and Vasily get their turns too. While dutifully sucking away at one boy, you worked your hands on whoever was waiting, doing your best to make sure nobody felt left out.'
 				if pav_slut >= 75 and pcs_horny < 30 or pav_slut < 75:
 
 					act 'Open wide and stick out your tongue':

+ 1 - 0
locations/shulgabath.qsrc

@@ -61,6 +61,7 @@ if $ARGS[0] = 'start':
 	end
 
 	dynamic $toymanage
+	dynamic $enema
 
 	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':

+ 10 - 0
locations/sitrPar.qsrc

@@ -71,5 +71,15 @@ elseif month = 1 and day = 1:
 	end
 end
 
+if ocpd_room = 0 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Unbox</a> your breast pump'
+elseif ocpd_room = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 40:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
+	'<a href="exec: gt ''lact_lib'', ''bp_unbox_event''">Try out</a> your breast pump'
+end
+
 --- sitrPar ---------------------------------
 

+ 1 - 0
locations/stat.qsrc

@@ -6,6 +6,7 @@ if opPRE > 0: exit
 if Enable_Android = 0:
 	clr
 	!only clear status and renew object in non-Android mode
+	gs 'obj_din', 'old'
 end
 
 if daystart_start < 100:

+ 1 - 0
locations/stat_display.qsrc

@@ -1242,6 +1242,7 @@ if StoryLine = 1:
 	if week = 6 and hour < 9 and detention_set = 1:$stat_msg += '<BR><b>You have a detention this morning and must be at school between 8 and 9.</b>'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight</b>'
 	if nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
+	if InvitationToDimkaNYparty = 1 and month = 12 and day = 31: $stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
 
 if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:

+ 22 - 16
locations/stol.qsrc

@@ -5,7 +5,10 @@ Added birth control control options to desk in Pavlovsk and "Bric-a-Brac drawer"
 }
 if $ARGS[0] = 'start':
 	cla
-	clr
+	*clr
+	'<center><h1>Desk</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	gs 'stat'
 	'Bric-a-brac drawer.'
 
@@ -16,13 +19,13 @@ if $ARGS[0] = 'start':
 	if dildo > 0:'Realistic Dildo.'
 
 	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
+		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''start''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
 	end
 	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+		'<a href="exec:dynamic $use_steroids & gt ''stol'', ''start''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	end
 	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''start''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
 	act 'Close the drawer':
@@ -67,25 +70,26 @@ end
 if $ARGS[0] = 'fin':
 	cla
 	gt $loc, $metka
-
 end
 
 if $ARGS[0] = 'stolPar':
+	*clr & cla
 	gs'stat'
-
+	'<center><h1>Desk</h1></center>'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	'You sat down at his desk.'
 	act 'Check birth control': gt 'stol', 'bc'
 	act 'Get up from the table':gt $loc, $metka
 
 	if mentats_have > 0:
-		pl'<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
+		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
 	end
 	if steroid_have > 0:
-		pl'<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+		'<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	end
 	if aphrodisiac_have > 0:
-		pl'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	end
 
 	if lernHome > 0:
@@ -111,8 +115,10 @@ if $ARGS[0] = 'stolPar':
 end
 
 if $ARGS[0] = 'bc':
-	cls 
-	cla
+	*clr & cla
+	'<center><h1>Desk</h1></center>'
+	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/stol.jpg"></center>'
+	*nl
 	gs 'stat'
 	gs 'din_bad'
 	'In the drawer of your desk, you store your birth control.'
@@ -122,16 +128,16 @@ if $ARGS[0] = 'bc':
 		elseif preziktype < 2 and preziksabo = 0:
 			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
 		END
-		NL
+		*nl
 	else
-		pl 'You are out of condoms.'
+		'You are out of condoms.'
 	end
 	if tabletki > 0 and pillsleft[ptype] > 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
 	elseif tabletki	= 0 and pillsleft[ptype] > 0:
-		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkied">birth control pills</a> left.</b>'
+		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
 	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkied">birth control pills</a>.'
+		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'
 	else
 		'You are out of birth control pills.'
 	end

+ 1 - 0
locations/stwork.qsrc

@@ -152,6 +152,7 @@ if $ARGS[0] = 'toilet':
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage
+	dynamic $enema
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin

+ 1 - 1
locations/swamphouse.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 	end
-	if breastpump > 0:
+	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'
 		end

+ 1 - 1
locations/telefon.qsrc

@@ -997,7 +997,7 @@ if $ARGS[0] = 'Phone_menu':
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:gs ''telefon'', ''Phone_contactlist'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a><a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a></center>'
-	pl'<center><a href="exec:gs ''Cheatmenu_din'' dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
+	pl'<center><a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a></center>'
 	pl'<center><a href="exec:clr & gs''stat''"><img src="images/system/icon/back.png"></a></center>'
 end &! --- Phone_menu ---
 

+ 6 - 0
locations/vokzalGin.qsrc

@@ -51,6 +51,12 @@ if $ARGS[0] = '':
 		act 'Go to the ticket office': gt 'vokzalGin', 'ticket'
 	end
 
+	if snarkozak = 1 and narkossista = 0 and narkozakday!day:
+		if money >= 1500:
+			act 'Find the drug dealer':gs 'events', 'snarkozaka'
+		end
+	end
+	
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:
 			act 'Work': gt 'vokzalGin', 'work'

+ 0 - 7
locations/vokzalperG.qsrc

@@ -20,13 +20,6 @@ gs'stat'
 '<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
 
-if snarkozak = 1 and narkossista = 0 and narkozakday!day:
-    if money >= 2000:
-        act 'Find the drug dealer':gs 'events', 'snarkozaka'
-    end
-end
-
-
 if Trainpass_day > daystart:
 	act 'Take a train to the old town': gt 'vokzalGin', 'oldtown'
 

+ 5 - 1
locations/zaprF.qsrc

@@ -9,7 +9,11 @@ if $ARGS[0] = 'start':
 	*clr
 	gs 'stat'
 	'<center><b>Gas Station</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr.jpg"></center>'
+	if hour < 9 or hour > 19:
+		'<center><img <<$set_imgh>> src="images/locations/shared/gas/gazprom_night.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/shared/gas/gazprom_day.jpg"></center>'
+	end
 	'The local gas station, the cheap pumps are limited in functionality and will always fill the tank up completely.'
 	*nl
 	'When the weather is nice sometimes girls will offer a car washing service for some tips, there''s no structure to it so you could always try it.'

+ 13 - 4
locations/zaprFWash.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'titsQ':
 	'Want to earn some more cash, girl? Show me your tits. I''ll give you 100 <b>₽</b>. It''s easy money.'
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 30 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
+	if exhibitionist_lvl > 0 or pcs_inhib >= 35 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -265,7 +265,10 @@ if $ARGS[0] = 'titsFlash':
 		end
 	! flashing for cars just allows you to return to the gas station
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end
 
@@ -349,7 +352,10 @@ if $ARGS[0] = 'assFlash':
 			act 'Continue':gt 'zaprFWash', 'pussyQ'
 		end
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end
 
@@ -401,7 +407,10 @@ if $ARGS[0] = 'pussyFlash':
 			act 'Continue':gt 'zaprFWash', 'handQ'
 		end
 	else
-		act 'Go back to the gas station':gt 'zaprF', 'start'
+		act 'Go back to the gas station': 
+			if $ARGS[1] = 'Paid': slutty += 1
+			gt 'zaprF', 'start'
+		end
 	end
 end