1
0

55 Commits 9a65a9dc72 ... 039615965d

Autor SHA1 Mensagem Data
  wingbrother 039615965d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work há 5 anos atrás
  KevinSmarts f95ae7e48e Merge remote-tracking branch 'julzor/master' há 5 anos atrás
  julzor 4de6e6c1aa [fixes] wrong pav_slut value in shulgakuh há 5 anos atrás
  3xpurt a3c2bf93cc [fixed] image toolbar not hiding properly in stat_display. há 5 anos atrás
  julzor d39361b22f Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife há 5 anos atrás
  julzor 217aff7891 [added] the two different starting location to preCSB há 5 anos atrás
  3xpurt fa092ce08d [changed] more action menu sorting to shulga_room, shulgabath, shulgabed, shulgahall, shulgahome, shulkgakuh há 5 anos atrás
  3xpurt 46fdd0db75 [added] menu_loc to pavtrain há 5 anos atrás
  3xpurt 1761a03d70 [changed] standardised movement actions in pavCommerical, pavComplex, pavResidential, pavTrain, shulgahall. há 5 anos atrás
  3xpurt 04c50ba7e2 [fixed] double blank lines when not pregnant in obj_din preg description. há 5 anos atrás
  julzor c1b26817a4 [added] trait everything is new again for the cursed schoolboy start há 5 anos atrás
  julzor 583af5ab44 [added] missing items to preCSB, object and stat window activation há 5 anos atrás
  3xpurt e80ec04952 [changed] shortened some overly descriptive acts in bed2, bedrpar, gadsarai, pavsharedapt há 5 anos atrás
  3xpurt 23ad454b4b [fixed] event showing when not ordering food and exits now return to cafe if no event is triggered. há 5 anos atrás
  julzor bb6a601ae6 [added] cursed schoolboy intro in preCSB há 5 anos atrás
  julzor 9d04806de4 [fixes] blocked the experiment for succubi há 5 anos atrás
  julzor 10609be0fd [fixes] reduced the inhibition requirement in komp for the cam girl job to bring it more in line with similar actions há 5 anos atrás
  3xpurt f9341dbaa5 [fixed] missing exit in closed gkafe há 5 anos atrás
  3xpurt cbe9c7b594 [changed] some separation in the preg descriptions for obj_din há 5 anos atrás
  julzor 96aa647c51 [added] basic stats, relationships, clothing and so on for the cursed school boy start in begin, preCUST, preSYS há 5 anos atrás
  wingbrother 456f79edf0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work há 5 anos atrás
  julzor 9aed8b75aa [fixes] pregdueday should have been added to temp and not subtracted from it ... result was an error of up to two month in due date calculation há 5 anos atrás
  julzor 3e74bd13b8 [fixes] added implementation time to the due date calculation há 5 anos atrás
  julzor 8bea517a60 [fixes] due date calculation in din_bad há 5 anos atrás
  julzor 6bd0a858dc [fixes] the clinic is now open if sveta is in labour há 5 anos atrás
  julzor bc47c0734e [fixes] if sveta never was filmed before by dima, she will now be harassed by him if he films her at the new years party há 5 anos atrás
  julzor 41874f9ee0 [added] menu variables to gdk há 5 anos atrás
  julzor 32a560e223 [fixes] blocked niko's events from happening in the school breaks, moved niko's events out of dima's if condition in gschool_grounds há 5 anos atrás
  julzor dfa06555cb [fixes] errors from the analyser in gadforest, pavsharedapt, swamp and swamphouse há 5 anos atrás
  julzor f1b294d99b [fixes] missing cla in din_van and a small text edit há 5 anos atrás
  wingbrother 300941f44c Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work há 5 anos atrás
  julzor 8d0e02f3e7 [fixes] moved the leave option in changingroom to the top to make it consistent with the other wardrobe actions há 5 anos atrás
  julzor f1a9bd2084 [added] decline option to street_walker há 5 anos atrás
  KevinSmarts fcef44d60f Merge remote-tracking branch '3xpurt/master' há 5 anos atrás
  julzor 5bcfe88207 [added] small inhib_exp increase to the maid work há 5 anos atrás
  3xpurt 8cebb98ea2 [changed] ordering of various menus to have exits at the top as per normal game formatting: há 5 anos atrás
  wingbrother 5c44a63943 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife into work há 5 anos atrás
  3xpurt 5673909b10 [changed] tidied up swamphouse. Removed dirty clothes, changed mushroom soup to 4 servings per kg of mushrooms, fixed basin and bath, fixed some clothing strip and dress issues. há 5 anos atrás
  3xpurt 32c15b2a10 [removed] dirty clothes from stat_display and stat. added txt for wearing hessian sack. há 5 anos atrás
  3xpurt 01004746d5 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 5 anos atrás
  3xpurt 4671c7f270 [changed] tidied up swamp, and added action to go to the hut. há 5 anos atrás
  3xpurt 56544de29f [fixed] more image links in hantersex. há 5 anos atrás
  3xpurt 8e86d2f791 [added] nap option to bed2. If pcs_sleep < 10, player will fall asleep while napping. há 5 anos atrás
  3xpurt 63c9f09bbb [changed] re-ordered menu in backwater, and swampspring. há 5 anos atrás
  3xpurt 0f0dcab67f [fixed] old water value in anushapt há 5 anos atrás
  3xpurt b1f1e0aee1 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 5 anos atrás
  3xpurt a89c08f4b3 [changed] <br> to weight display. há 5 anos atrás
  wingbrother 5b3abf9217 [fixes] small various fixes for realism há 5 anos atrás
  julzor 8d9a1c6428 [fixes] Eat and run should be for free in gkafe if your mother didn't throw you out of the house há 5 anos atrás
  julzor e57ef1d8ca [fixes] wrong image links in nyp_school há 5 anos atrás
  julzor f64a6478fb [fixes] pregchem wasn't set to 0 in cheatmenu_din and hotelhole há 5 anos atrás
  julzor 3ced201973 [added] you can throw away your porn card decks (new cards can be bought again, vintage cards are gone forever) há 5 anos atrás
  julzor 9800e8e9fd Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife há 5 anos atrás
  julzor c36422a579 [fixes] matched katjas pav_sex checks in stat to pav_slut and matched the check to similar pav_slut checks há 5 anos atrás
  julzor 681a2adf72 [fixes] giving birth didn't set pregchem to 0, recovery period wasn't set in poli and gpoli há 5 anos atrás
75 ficheiros alterados com 2203 adições e 1244 exclusões
  1. 1 0
      build.sh
  2. 3 2
      locations/Cheatmenu_din.qsrc
  3. 2 21
      locations/Gadbana.qsrc
  4. 6 5
      locations/Gadhouse.qsrc
  5. 5 2
      locations/Gadsarai.qsrc
  6. 8 15
      locations/HotelHole.qsrc
  7. 3 3
      locations/Komp.qsrc
  8. 48 36
      locations/ParkKafe.qsrc
  9. 5 1
      locations/anushapt.qsrc
  10. 141 179
      locations/backwater.qsrc
  11. 92 60
      locations/bed2.qsrc
  12. 1 30
      locations/bedr.qsrc
  13. 14 3
      locations/bedr2x.qsrc
  14. 10 35
      locations/bedrPar.qsrc
  15. 30 11
      locations/begin.qsrc
  16. 0 2
      locations/bicycle.qsrc
  17. 7 7
      locations/brothel.qsrc
  18. 3 3
      locations/burger.qsrc
  19. 6 6
      locations/cafe_parco.qsrc
  20. 7 0
      locations/card.qsrc
  21. 3 5
      locations/changingroom.qsrc
  22. 7 1
      locations/cikl.qsrc
  23. 2 0
      locations/clothing.qsrc
  24. 34 38
      locations/din_bad.qsrc
  25. 8 7
      locations/din_van.qsrc
  26. 27 23
      locations/experiment.qsrc
  27. 7 3
      locations/food_menu.qsrc
  28. 45 44
      locations/gadforest.qsrc
  29. 3 5
      locations/gadforestlost.qsrc
  30. 3 3
      locations/gadforestswamp.qsrc
  31. 1 1
      locations/gadukino.qsrc
  32. 0 1
      locations/gadukino_event.qsrc
  33. 3 0
      locations/gdk.qsrc
  34. 29 11
      locations/gkafe.qsrc
  35. 6 1
      locations/gpoli.qsrc
  36. 24 23
      locations/gschool_grounds.qsrc
  37. 1 2
      locations/hanters.qsrc
  38. 56 56
      locations/hantersex.qsrc
  39. 18 16
      locations/kafe.qsrc
  40. 2 4
      locations/kit_din.qsrc
  41. 6 6
      locations/kotovtalker.qsrc
  42. 7 7
      locations/lakecafe.qsrc
  43. 9 5
      locations/liamelkafe.qsrc
  44. 6 6
      locations/lover_meet.qsrc
  45. 57 64
      locations/mirror.qsrc
  46. 10 10
      locations/nyp_school.qsrc
  47. 9 2
      locations/obj_din.qsrc
  48. 3 1
      locations/pavCommercial.qsrc
  49. 1 1
      locations/pavComplex.qsrc
  50. 5 4
      locations/pavResidential.qsrc
  51. 5 33
      locations/pavSharedApt.qsrc
  52. 7 3
      locations/pavtrain.qsrc
  53. 6 7
      locations/poli.qsrc
  54. 689 0
      locations/preCSB.qsrc
  55. 40 18
      locations/preCUST.qsrc
  56. 194 41
      locations/preSYS.qsrc
  57. 4 3
      locations/restoran.qsrc
  58. 82 82
      locations/shulga_room.qsrc
  59. 37 20
      locations/shulgabath.qsrc
  60. 1 0
      locations/shulgabed.qsrc
  61. 17 17
      locations/shulgahall.qsrc
  62. 1 1
      locations/shulgahome.qsrc
  63. 23 9
      locations/shulgakuh.qsrc
  64. 2 1
      locations/sny.qsrc
  65. 2 3
      locations/stat.qsrc
  66. 24 13
      locations/stat_display.qsrc
  67. 4 0
      locations/stat_sklattrib.qsrc
  68. 1 1
      locations/street.qsrc
  69. 35 20
      locations/street_walker.qsrc
  70. 8 5
      locations/swamp.qsrc
  71. 8 9
      locations/swamp_yard.qsrc
  72. 218 181
      locations/swamphouse.qsrc
  73. 7 4
      locations/swampspring.qsrc
  74. 1 1
      locations/wardrobe.qsrc
  75. 3 1
      locations/ybedr.qsrc

+ 1 - 0
build.sh

@@ -166,6 +166,7 @@
 		<Location name="preNT"/>
 		<Location name="preCUST"/>
 		<Location name="preALT"/>
+		<Location name="preCSB"/>
 	</Folder>
 	<Folder name="NPCManage">
 		<Location name="npccleanc"/>

+ 3 - 2
locations/Cheatmenu_din.qsrc

@@ -1473,8 +1473,9 @@ $cheatmenu['remove_preg'] = {
 	thinkpreg = 0
 	knowpreg = 0
 	cycle = 4
-	RecovH = rand(7,70)
-	RecovH += pregchem
+	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is 1 week
+	RecovH = 189 
+	pregchem = 0	
 	knowpregloss = 2
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 	nextbaby = arrsize('yearkid')

+ 2 - 21
locations/Gadbana.qsrc

@@ -134,7 +134,8 @@ 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>. There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
+	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, which you can use to ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!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.'
@@ -174,26 +175,6 @@ if mira = 0:
 
 	dynamic $brit
 
-	if dirtyclothes = 1 and $loc = 'Gadbana':
-		act 'Wash your clothes (1:00)':
-			cla
-			*clr
-			minut += 60
-			dirtyclothes = 0
-			pcs_mood -= 10
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
-			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-				 'You undress and wash your dirty clothes.'
-			end
-			*nl
-			'You soak your muddy clothes and underwear in the basin and pour in washing powder, then you scrub them until they are finally clean.'
-			act 'Finish':gt $loc, $metka
-		end
-	end
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
 			gt 'lact_lib', 'bp_milking'

+ 6 - 5
locations/Gadhouse.qsrc

@@ -134,9 +134,9 @@ if $ARGS[0] = 'Main':
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
-	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can rest. The bed is more comfortable than it looks.'
+	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed'', ''start''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
-	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>. <<$bmi_desc>></center>''">scales</a>.'
+	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">scales</a>.'
 
 	if hour < 8:
 		temp = RAND(0,9)
@@ -195,10 +195,10 @@ if $ARGS[0] = 'Main':
 	end
 
 	act 'Go outside':
-		if $clothingworntype ! 'nude':
+		if $clothingworntype ! 'nude' and swamp_clothes = 0:
 			minut += 1 & gt 'Gaddvor'
-		else
-			msg'<b><font color = red>You can''t leave the house naked! You need to get dressed first.</font></b>'
+		elseif $clothingworntype = 'nude' or swamp_clothes = 1:
+			msg'<b><font color = red>You can''t leave the like this! You need to put some clothes on first.</font></b>'
 			gt 'Gadhouse', 'Main'
 		end
 	end
@@ -388,6 +388,7 @@ if $ARGS[0] = 'Main':
 	end
 
 	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+	act 'Relax on your bed': gt 'bed', 'start'
 end
 
 if $ARGS[0]='grandma':

+ 5 - 2
locations/Gadsarai.qsrc

@@ -323,7 +323,7 @@ if $ARGS[0] = '':
 			*clr & cla
 			minut += 15
 			gs 'stat'
-			if vcard = 0:
+			if vcard = 0 and vcard_trash = 0:
 				*clr & cla
 				if RAND(0,5) >= 4:
 					gs 'stat'
@@ -409,7 +409,10 @@ if $ARGS[0] = '':
 		end
 
 		if vcard > 0:
-			act 'Take card from the vintage deck of erotic cards':card_deck = 0 & gt 'card'
+			act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+		end
+		if card > 0:
+			act 'View your new porn cards':card_deck = 1 & gt 'card'
 		end
 
 		if pcs_horny >= 50:

+ 8 - 15
locations/HotelHole.qsrc

@@ -31,10 +31,7 @@ end
 if hour = 0 and $prevloc = 'HotelRoom':
 	if resepseen = 1:
 	hotresepQW = 3
-
-		*clr
-		cls
-		cla
+		*clr & cla
 		observ_exp += 3
 		gs 'stat'
 		'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
@@ -50,9 +47,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 		'"Oh Mister Leonidovich," she says pouting like a little girl, "I am so sorry, I have been bad daddy."'
 		'At that moment you figure out they are just playing a game and being caught flashing was all part of their weird little role play.'
 		act 'Continue':
-
-			*clr
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event9.jpg"></center>'
 			 'She needs his foregiveness and kisses his mouth while he undresses her.'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event3.jpg"></center>'
@@ -64,9 +59,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 			 'All of a sudden, she moves the dick between her breasts and starts fucking it through the space between them.'
 			'"Miss Tanich, you should slow down, I don''t want to blow my load before I get to try that sweet little pussy of yours."'
 			act 'Continue':
-
-				*clr
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event5.jpg"></center>'
 				'So Miss Tanich releases his cock and pushes him down on to the bench. And then she turns around, props herself up so her cunt rests on top of his cock and she slowly lowers her hips down as his cock spears her pussy.'
 				'She starts riding him furiously while he reaches his hands around her body and squeezes her juicy breasts.'
@@ -77,8 +70,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 				gs 'arousal', 'voyeur',60
 				gs 'arousal', 'end'
 				act 'Continue':
-					*clr
-					cls
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event7.jpg"></center>'
 					'"Ok, my turn now," the manager suddenly yelled.'
 					'It seems like the desk girl knew exactly what he meant by that since she dismounted him and placed herself on her hands and knees.'
@@ -90,7 +82,6 @@ if hour = 0 and $prevloc = 'HotelRoom':
 					'Miss Tanich just smiled at him while showing off her pussy and cum stained buttocks.'
 					'You have seen enough and quietly go back to your room'
 
-
 					act 'Continue':
 						if hotelroom = 1:gt'hotelroom','normal'
 						if hotelroom = 2:gt'hotelroom','better'
@@ -135,6 +126,7 @@ if maidqw >= 1 and hour >= 16 and hour < 17:
 			cla
 			*clr
 			maid_cloth = 1
+			if pcs_inhib < 30: inhib_exp += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/maid.cloth'+rand(0,5)+'.jpg"></center>'
 			'You sit down in the locker room and look at the maid uniform. You run your hands over the delicate fabric while you think: "Hmm, it''s a bit skimpy. I bet that''s why the hotel manager thinks this is important, the guests probably love seeing the maids like this!"'
 			'You quickly take off your own clothes, and put the maid uniform on as instructed. After a few quick poses in the mirror you''re convinced: the manager is a pervert! Then again, it does look cute on you. All you have to is clean and prepare rooms for guests... why not look good while you do?'
@@ -600,8 +592,9 @@ if $ARGS[0] = 'PregBDSM' :
 									abortionbirthdate = daystart
 									cycle = 4
 									unintendedabort = 1
-									RecovH = rand(7,70)
-									RecovH += pregchem
+									!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
+									RecovH = rand(375,575) 
+									pregchem = 0
 									knowpregloss = 2
 									thinkpreg = 0
 									knowpreg = 0

+ 3 - 3
locations/Komp.qsrc

@@ -250,7 +250,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave':gt 'Komp', 'brows'
+				act 'Leave this website':gt 'Komp', 'brows'
 			end
 
 			act 'Look for a normal guy':
@@ -260,7 +260,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave':gt 'Komp', 'brows'
+				act 'Leave this website':gt 'Komp', 'brows'
 			end
 
 			act 'Look for a strong man':
@@ -465,7 +465,7 @@ if $ARGS[0] = 'rabota':
 				'The website hides your stream for viewers from your region, so the chance of being recognized by someone you know in real life is very low.'
 				'If you''re interested in becoming a webcam girl, please fill in this questionnaire below.</i>'
 				
-				if pcs_inhib >= 50 or exhibitionist_lvl > 1 or (pcs_inhib >= 40 and exhibitionist_lvl > 0):
+				if pcs_inhib >= 40 or exhibitionist_lvl > 1 or (pcs_inhib >= 35 and exhibitionist_lvl > 0):
 					act 'Fill in the questionnaire':
 						cls
 						camwhore = 1

+ 48 - 36
locations/ParkKafe.qsrc

@@ -9,26 +9,25 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
-	*nl
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
+	*nl
+
+	act 'Leave the cafe': gt 'parkKafe', 'end'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':pk_rand = rand(1, 7) & gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
 
-	arand = rand(1, 7)
+	if pk_rand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
+	if pk_rand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
+	if pk_rand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
+	if pk_rand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
+	if pk_rand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
+	if pk_rand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
+	if pk_rand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
 
-	if arand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
-	if arand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
-	if arand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
-	if arand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
-	if arand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
-	if arand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
-	if arand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
-
-	act 'Leave': minut += 5 & gt 'park', 'start'
 end
 
 if $ARGS[0] = 'guys':
@@ -37,9 +36,9 @@ if $ARGS[0] = 'guys':
 	if rand(0, 1) = 0:
 		'You look at them intensely, but you don''t think they notice you.'
 
-		act 'Go home': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 
 		if parkara > 0:
 			'Jora Senya notices you, but continues to drink beer with his friends.'
@@ -120,7 +119,7 @@ if $ARGS[0] = 'klof 1':
 	'You try to rise from the grass in front of the guys, your legs and hands are shaking from the rough pounding they gave you. Your vagina feels itchy as warm gooey sperm tickles down your legs. "Did you like it baby?" Asks one of the guys mockingly.'
 
 	act 'Yes':gt 'event', 'klof 2'
-	act 'Leave': minut += 5 & gt 'park', 'start'
+	act 'Leave': gt 'parkKafe', 'end'
 end
 
 if $ARGS[0] = 'Armenians':
@@ -129,11 +128,11 @@ if $ARGS[0] = 'Armenians':
 	if rand(0, 1) = 0:
 		'You look at them intensely, but you don''t think they notice you.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
 		'Your looks were noticed by the Armenians and one of them comes over to your table with a bottle of champagne.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 
 		act 'Drink together':
 			cla
@@ -165,7 +164,7 @@ if $ARGS[0] = 'Armenians':
 
 				'They finish in your mouth and laughing, they leave you there.'
 
-				act 'Leave': minut += 5 & gt 'park', 'start'
+				act 'Leave': gt 'parkKafe', 'end'
 			else
 				if parkarman = 0:guy += 2 & parkarman = 1
 
@@ -191,7 +190,7 @@ if $ARGS[0] = 'Armenians':
 
 				'One of them finishes in your mouth and you greedily swallow it all, while the other hastily pulls out and cums on your ass.'
 
-				act 'Leave': minut += 5 & gt 'park', 'start'
+				act 'Leave': gt 'parkKafe', 'end'
 			end
 		end
 	end
@@ -204,11 +203,13 @@ if $ARGS[0] = 'man':
 	if rand(0, 1) = 0:
 		'You stealthily glance at the respectable man, but it doesn''t look like he noticed you.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
 		cla
 		'A man walks up to you and invites you to dance.'
 
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
+
 		act 'Dance':
 			cla
 			'He dances well and confidently leads you during your dance. After the dance comes to an end, you sit down at a table with him, he orders an expensive wine and various snacks, you start to relax as he showers tou with gallant compliments.'
@@ -235,11 +236,9 @@ if $ARGS[0] = 'man':
 				'The two of you have very passionate sex'
 				dynamic $vagend
 
-				act 'Leave':gt 'street'
+				act 'Leave': gt 'parkKafe', 'end', 'street'
 			end
 		end
-
-		act 'Leave': minut += 5 & gt 'park', 'start'
 	end
 end
 
@@ -248,7 +247,7 @@ if $ARGS[0] = 'woman':
 	cla
 	'You stealthily glance at the imperious woman, but she doesn''t seem to noticed you.'
 
-	act 'Leave': minut += 5 & gt 'park', 'start'
+	act 'Leave': gt 'parkKafe', 'end', 'cafe'
 end
 
 if $ARGS[0] = 'youth':
@@ -257,17 +256,17 @@ if $ARGS[0] = 'youth':
 	if rand(0, 1) = 0:
 		'You look at the group of snickering youths, but they don''t seem to notice you.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
 		'A tipsy young man approaches you and invites you to go and enjoy their company.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 
-		act 'Company':
+		act 'Accompany':
 			cla
 			'You joined their table and started talking with the cheerful and noisy group of young people. You had a good time and they invite you to continue having fun with them at a late night party held at their apartment.'
 
-			act 'Leave': minut += 5 & gt 'park', 'start'
+			act 'Leave': gt 'parkKafe', 'end'
 
 			act 'Party!':
 				minut += 60
@@ -276,7 +275,7 @@ if $ARGS[0] = 'youth':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/cafe/student.jpg"></center>'
 				'You continue to enjoy yourself at the flat. As the night went on most people went home, you were left alone with one girl and six guys. The guys started kissing with the girl, eventually she got on her knees. The boys eagerly got their members out, the girl started stroking two of them with her hands, while the rest guys started masturbating in front of her face'
 
-				act 'Leave': minut += 5 & gt 'park', 'start'
+				act 'Leave': gt 'parkKafe', 'end', 'street'
 
 				act 'Join her':
 					cls
@@ -308,7 +307,7 @@ if $ARGS[0] = 'youth':
 						'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/cafe/student3.jpg"></center>'
 						'You kiss the girl, you both have mouths full of sperm and you are sharing it as you kiss, you finally get tired and you both swallow the cum in your mouths.'
 
-						act 'Leave':gt 'street'
+						act 'Leave': gt 'parkKafe', 'end', 'street'
 					end
 				end
 			end
@@ -323,12 +322,12 @@ if $ARGS[0] = 'negros':
 	if rand(0, 1) = 0 or afra >= 1:
 		'You stealthily glance at the Africans, but it looks like they overlooked you.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
 		afra = 1
 		'A few of the Africans come over to your table, they are quite unrestrained, talking a lot in English, grabbing your back and chest. One of them introducing himself as DeMarcus, he tells you that they are all students from Africa and live in the dorm, he gives you directions on how to get to the hostel and find them.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	end
 end
 
@@ -339,20 +338,33 @@ if $ARGS[0] = 'the_boy':
 	if rand(0, 1) = 0 and gosh = 0:
 		'You secretly look at the young boy, but it looks like he didn''t notice you.'
 
-		act 'Leave': minut += 5 & gt 'park', 'start'
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
 	else
 		if gosh = 1:
 			'You secretly look at the young boy. It''s Gosha, but it looks like he didn''t notice you.'
 
-			act 'Leave': minut += 5 & gt 'park', 'start'
+			act 'Leave': gt 'parkKafe', 'end', 'cafe'
 		else
 			gosh = 1
 			'A young man comes to your table and introduces himself as Gosha, you become acquainted with him, you learn that he is a student and that he lives in the hostel. Gosha tells you how to get to the hostel and how to find his dorm.'
 
-			act 'Leave': minut += 5 & gt 'park', 'start'
+			act 'Leave': gt 'parkKafe', 'end', 'cafe'
 		end
 	end
 end
 
+if $ARGS[0] = 'end':
+	minut += 5
+	gs 'stat'
+	killvar 'pk_rand'
+	if $ARGS[1] = 'street':
+		gt 'street'
+	elseif $ARGS[1] = 'cafe':
+		gt 'parkKafe', 'start'
+	else
+		gt 'park', 'start'
+	end
+end
+
 --- ParkKafe ---------------------------------
 

+ 5 - 1
locations/anushapt.qsrc

@@ -1516,7 +1516,11 @@ if $ARGS[0] = 'holodilnik':
 			pcs_mood += 20
 			fat += 2
 			pcs_energy += 50
-			water += 40
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0

+ 141 - 179
locations/backwater.qsrc

@@ -1,56 +1,18 @@
 # backwater
 
 $location_type = 'secluded'
-$metka = ''
 $loc = 'backwater'
+$metka = ''
+$menu_loc = 'backwater'
+$menu_arg = ''
+menu_off = 0
 gs 'gadukino_event', 'sound'
 cls
 gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
-!events before everything
-if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour > 8 and hour < 20 and hanterknowday < day:
-	cla
-	*clr
-	minut += 5
-	gs 'stat'
-	'<center><B>Backwater</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
-	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
-
-	if clothesAtLocation = 1 and clearclothes = 0 :
-		act'Get dressed':
-			cls
-			minut += 5
-			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
-			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
-			act'Further':gt 'backwater'
-		end
-	else
-		act'Hide':
-			cls
-			minut += 1
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
-			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
-			act'Go back to the hut':gt 'swamp_yard'
-		end
-	end
-	act'Stay naked':
-		cls
-		hanterslut += 1
-		hanterknowday = day
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
-		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
-		act'Further':gt 'backwater'
-	end
-	exit
-end
+act 'Go back to the hut':minut += 5 & gt'swamp_yard'
 
-!start location
 '<center><B>Backwater</B></center>'
 
 if month >= 4 and month <= 10:
@@ -66,14 +28,114 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter_night.jpg"></center>'
 	end
 end
+*nl
 
 'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
+*nl
 if clothesAtLocation = 1:'Your clothes lie on the shore.'
 
-!re-arrange it, there should be no logic error now by illume
+if $clothingworntype = 'nude':
+	act 'Wash self':
+		cla
+		*clr
+		dynamic $showerdin
+		face_write = 0
+		body_write = 0
+		minut += 30
+		pcs_mood += 10
+		pcs_willpwr += 5
+		inhib_exp += rand(1,3)
+		if hantersRape = 1: hantersRape = 2
+
+		if $pantyworntype = 'none':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+		end
+			*nl
+		'You washed yourself in the creek.'
+
+		act 'Finish':gt 'backwater'
+	end
+end
+if cumloc[11] = 1 or cumloc[12] = 1:
+	act 'Clean the sperm from your face (0:10)':
+		cla
+		*clr
+		pcs_makeup = 1
+		cumspclnt = 9
+		gs 'cum_cleanup'
+		cumspclnt = 13
+		gs 'cum_cleanup'
+		if pcs_sweat > 19 : pcs_sweat -= 5
+		minut += 10
+		if hantersRape = 1: hantersRape = 2
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+		*nl
+		'You carefully wash off the sperm in the creek.'
+		act 'Finish':gt 'backwater'
+	end
+end
+if body_write > 0 or face_write > 0:
+	act 'Wash the writings off your body (0:10)':
+		cla
+		*clr
+		body_write = 0
+		face_write = 0
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
+		*nl
+		'You wash off the indecent inscriptions on your body.'
+
+		act 'Finish':menu_off = 0 & gt $loc, $metka
+	end
+end
+if cumloc[6] = 1 or cumloc[7] = 1:
+	act 'Wipe the cum off your clothes (0:10)':
+		cla
+		*clr
+		cumspclnt = 6
+		gs 'cum_cleanup'
+		minut += 10
+		if hantersRape = 1: hantersRape = 2
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
+		*nl
+		'You clean the cum stains off your clothes.'
+
+		act 'Finish':gt 'backwater'
+	end
+end
+
+if spdirty > 0:
+	act 'Quick wash (0:15)':
+		cla
+		*clr
+		cumspclnt = 4
+		gs 'cum_cleanup'
+		if pcs_sweat < 30:
+			pcs_sweat = 15 + rand(0,4)
+		else
+			pcs_sweat -= 10 + rand(0,4)
+		end
+		minut += 15
+		if hantersRape = 1: hantersRape = 2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
+		*nl
+		'You carefully wash your face, removing any impurities.'
+		act 'Finish':gt 'backwater'
+	end
+end
+
 if clothesAtLocation = 0:
 	if $clothingworntype ! 'nude' and temper >= 15:
-		act'Undress':
+		act'Get undressed':
 			if hantersKnowSlut > 0 or hanters = 0 or hour < 8 or hour >= 20 or pcs_inhib > 35:
 				cla
 				*clr
@@ -97,6 +159,8 @@ if clothesAtLocation = 0:
 				act'Back':gt'backwater'
 			end
 		end
+	else
+	'It''s too cold to undress. Maybe you should bathe inside the hut'
 	end
 else
 	if $clothingworntype ! 'nude':
@@ -116,152 +180,50 @@ else
 			'You pick up your clothes laying on the ground and get dressed.'
 			gt $loc, $metka
 		end
-
 	end
 end
 
-if $clothingworntype = 'nude':
-	act 'Wash self':
-		cla
-		*clr
-		dynamic $showerdin
-		face_write = 0
-		body_write = 0
-		minut += 30
-		pcs_mood += 10
-		pcs_willpwr += 5
-		inhib_exp += rand(1,3)
-		if hantersRape = 1: hantersRape = 2
-
-		if $pantyworntype = 'none':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-		end
-		'You washed yourself in the creek.'
-
-		act 'Further':gt 'backwater'
-	end
-	if arrsize('sparrvol') > 0:
-		act 'Wash off sperm':
-			cla
-			*clr
-			dynamic $showerdin
-			lubonus = 0
-			pcs_sweat -= 1
-			minut += 10
-			if hantersRape = 1: hantersRape = 2
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			'You carefully wash off the sperm in the creek.'
-			act 'Further':gt 'backwater'
-		end
-	end
-	if dirtyclothes = 1 and clothesAtLocation = 1:
-		act 'Wash your clothes':
-			cla
-			*clr
-			if hantersRape = 1: hantersRape = 2
-			minut += 60
-			dirtyclothes = 0
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterwash.jpg"></center>'
-			'You get undressed and wash your dirty clothes. Unfortunately the clothes didn''t get fully clean because of the cold water.'
-			!fix logic by illume
-			act 'Hang the clothes in the hut':
-				cla
-				*clr
-				minut += 5
-				clearclothes = 5
-				gs 'clothing','recover_lost_clothes','backwater', 1
-				gs 'clothing', 'strip', 'swamphouse'
-				if $clothingworntype = 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash1.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-				end
-				'You hang the clothes near the stove so they could dry.'
-
-				act 'Further':gt $loc, $metka
-			end
-			if month >= 5 and month <= 9:
-				act 'Hang clothes on the clothesline':
-					cla
-					*clr
-					minut += 10
-					clearclothes = 3
-					gs 'clothing','recover_lost_clothes','backwater', 1
-					gs 'clothing', 'strip', 'clothesline_swamp'
-					if $clothingworntype = 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basinwash2.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-					end
-					'You hang the clothes on the clothesline to dry.'
-
-					act 'Further':gt'swamp_yard'
-				end
-			end
-		end
-	end
-else
-	!not nude
-	if dirtyclothes = 1 and temper >= 10:
-		act 'Clean your dirty clothes':
-			cla
-			*clr
-			if hantersRape = 1: hantersRape = 2
-			minut += 30
-			dirtyclothes = 0
-			cumspclnt = 6 & gs 'cum_cleanup'
-			gs 'stat'
+if $clothingworntype = 'nude' and hantersKnowSlut = 0 and hanters = 1 and hour > 8 and hour < 20 and hanterknowday < day:
+	cla
+	*clr
+	minut += 5
+	gs 'stat'
+	'<center><B>Backwater</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
+	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterwash2.jpg"></center>'
-			'You start undressing as you enter the water thinking you''ll be able to clean your dirty clothes. Unfortunately you don''t seem able to get the clothes clean because you didn''t want to get undressed not wanting to freeze your butt off in the cold water.'
+	if clothesAtLocation = 1:
+		act'Get dressed':
+			cls
+			minut += 5
+			gs 'underwear', 'wear'
+			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 
-			act 'Further':gt'swamp_yard'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
+			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
+			act'Further':gt 'backwater'
 		end
-	end
-	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Clean the sperm off your clothes':
-			cla
-			cumspclnt = 6 & gs 'cum_cleanup'
-			minut += 5
-			if hantersRape = 1: hantersRape = 2
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
-			'You clean the cum stains off your clothes.'
-				act 'Finish':gt 'backwater'
+	else
+		act'Hide':
+			cls
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
+			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
+			act'Go back to the hut':gt 'swamp_yard'
 		end
 	end
-end
-
-if temper >= 10:
-	act 'Wash your face':
-		cla
-		*clr
-		minut += 5
-		pcs_makeup = 1
-		cumspclnt = 9
-		face_write = 0
-		gs 'cum_cleanup'
-		cumspclnt = 11
-		gs 'cum_cleanup'
-		cumspclnt = 13
-		gs 'cum_cleanup'
-		if pcs_sweat > 19 : pcs_sweat -= 5
+	act'Stay naked':
+		cls
+		hanterslut += 1
+		hanterknowday = day
 		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
-		*nl
-		'You carefully wash your face, removing any impurities.'
-		act 'Further':gt 'backwater'
-		if hantersRape = 1: hantersRape = 2
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
+		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
+		act'Further':gt 'backwater'
 	end
+	exit
 end
 
-act 'Go back to the hut':minut += 5 & gt'swamp_yard'
-
 if hantersRape = 2:
 	cla
 	*clr

+ 92 - 60
locations/bed2.qsrc

@@ -1,45 +1,20 @@
 # bed2
 
-if $ARGS[0] = 'options':
-	cla
-	act 'Set Alarm Clock':gt 'budilnik', 'start'
-	if bedPanty = 0:
-		act 'You will wear underwear in the morning, click to turn off':bedpanty = 1 & gt 'bed2', 'options'
-	else
-		act 'You will not wear underwear in the morning, click to turn on':bedpanty = 0 & gt 'bed2', 'options'
-	end
-	if analplug = 1:
-		if bedanal = 0:
-			act 'If worn, you will remove your analplug at night, click to always leave it in':bedanal = 1 & gt 'bed2', 'options'
-		else
-			act 'If worn, you will wear your analplug through the night, click to always remove it':bedanal = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	if vibrator = 1 and cheatVib = 1:
-		if bedvibrator = 0:
-			act 'If worn, you will remove your vibrator at night, click to always leave it in':bedvibrator = 1 & gt 'bed2', 'options'
-		else
-			act 'If worn, you will wear your vibrator through the night, click to always remove it':bedvibrator = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	act 'Return':gt 'bed2'
-end
-
 if $ARGS[0] = '':
 	cla & *clr
+	menu_off = 1
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
+	*nl
 
 	if budilnikOn = 0:
-		'You lie on the bed. Your alarm is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 1 & GT ''bed2''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
 	else
-		'You lie on the bed. Your alarm is set to <<timer>>:<<timerM>> and is currently turned <a href="exec: budilnikOn = 0 & GT ''bed2''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
 	end
 
 	if pcs_makeup ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
@@ -52,7 +27,10 @@ if $ARGS[0] = '':
 		end
 		if succubusQW = 2:
 			act '<<$sleep_txt>>':
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if $clothingworntype ! 'nude':
+					strip_here = 1
+					gs 'clothing', 'strip'
+				end
 				gt 'bed2', 'succhoice'
 			end
 		else
@@ -64,7 +42,10 @@ if $ARGS[0] = '':
 						savegame 'autosave_alt.sav'
 					end
 				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if $clothingworntype ! 'nude':
+					strip_here = 1
+					gs 'clothing', 'strip'
+				end
 				if magf2bdo = 2:
 					gt 'bed2', 'magbstchoice'
 				else
@@ -74,13 +55,30 @@ if $ARGS[0] = '':
 			killvar '$sleep_txt'
 		end
 	end
+	act 'Take a nap (1:00)':
+		if pcs_sleep >= 10 and pcs_sleep <= 90:
+			pcs_sleep += 10
+			pcs_health += 5
+			minut += 60
+			gs 'stat'
+			*nl
+			'You sleep about an hour.'
+		elseif pcs_sleep < 10:
+			gt 'bed2', 'sleep'
+		else
+			minut += 5
+			gs 'stat'
+			*nl
+			'You are not tired enough to sleep, even for a short nap.'
+		end
+	end
 
-	act 'Options':gt 'bed2', 'options'
+	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $metka
 
 !!Braid hair skill
 
 	if canBraidHair = 1 and hBraids = 0 and (pcs_hairlng > 80 and pcs_hairlng <= 800):
-		act 'Spend some time braiding your hair':
+		act 'Braid your hair (0:30)':
 			cls
 			hbraids = 15
 			minut += 30
@@ -90,7 +88,7 @@ if $ARGS[0] = '':
 	end
 
 	if hbraids > 0:
-		act 'Spend some time removing your braids':
+		act 'Remove your braids (0:30)':
 			cls
 			hbraids = 0
 			minut += 30
@@ -98,13 +96,16 @@ if $ARGS[0] = '':
 			act 'Return to bed':gt 'bed2'
 		end
 	end
-
-	act 'Get out of bed':killvar '$sleep_txt' & gt $loc, $metka
+	act 'Sleep options':gt 'bed2', 'options'
 end
 
 if $ARGS[0] = 'sleep':
 	cls
-	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
+	if $clothingworntype ! 'nude':
+		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
+	end
 	gs 'stat'
 	pcs_hairbsh = 0
 	InSleep = 1
@@ -234,23 +235,23 @@ if $ARGS[0] = 'wake_horny':
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		slept_in = 0
 		gs 'bed2', 'end'
 	end
-	act 'Get out of bed and get dressed (0:15)':
-		gs 'clothing', 'wear_last_worn'
-		slept_in = 0
-		minut += 15
-		gs 'bed2', 'end'
+	if strip_here = 1:
+		act 'Get out of bed and get dressed (0:15)':
+			minut += 15
+			gs 'clothing', 'wear_last_worn'
+			gs 'bed2', 'end'
+		end
 	end
 
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
-		act 'Wake Anya and see if she''s in the mood': InSleep = 0 & gt 'sistersleep'
+		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep'
 	elseif $loc = 'FedorEv4':
-		act 'Wake Fedor and see if he''s in the mood': InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'
+		act 'Wake Fedor and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'FedorEv4', 'Bedroom 1'
 		!!Intro text doesn''t quite fit event (but doesn''t quite fit - try for baby - scenario either) - custom scene from VK?
 	elseif ($loc = 'bedr' or $loc = bedr2x) and husband > 0:
-		act 'Wake your husband and see if he''s in the mood': InSleep = 0 & gt 'husbSex', 'variant'
+		act 'Wake your husband and see if he''s in the mood': strip_here = 0 & InSleep = 0 & gt 'husbSex', 'variant'
 		!!Should be custom scene - maybe boyfriend/husband overhaul can cover this?
 	end
 end
@@ -270,7 +271,6 @@ if $ARGS[0] = 'wake':
 			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
 			minut += 15
 			if schtype = 0:schtype = 6
 			if schoolH[schtype] = 0:schtype = 6
@@ -279,18 +279,18 @@ if $ARGS[0] = 'wake':
 		end
 	end
 
-	act 'Get out of bed and get dressed (0:15)':
-		gs 'clothing', 'wear_last_worn'
-		slept_in = 0
-		minut += 15
-		gs 'bed2', 'end'
+	if strip_here = 1:
+		act 'Get out of bed and get dressed (0:15)':
+			minut += 15
+			gs 'clothing', 'wear_last_worn'
+			gs 'bed2', 'end'
+		end
 	end
 	if enfullmorrout = 1 and hour >= 4 and hour < 12:
 		act 'Full morning routine (01:00)':
-			gs 'clothing', 'wear_last_worn'
-			slept_in = 0
 			minut += 15
 			fullmorrout = 1
+			gs 'clothing', 'wear_last_worn'
 			gs 'bed2', 'end'
 		end
 		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
@@ -301,7 +301,6 @@ if $ARGS[0] = 'wake':
 			end
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
-				slept_in = 0
 				minut += 15
 				if schtype = 0:schtype = 6
 				if schoolH[schtype] = 0:schtype = 6
@@ -331,8 +330,11 @@ end
 
 if $ARGS[0] = 'end':
 	InSleep = 0
-	if bedpanty = 1: gs 'underwear', 'remove'
-
+	slept_in = 0
+	strip_here = 0
+	if bedpanty = 1:
+		gs 'underwear', 'remove'
+	end
 	if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
@@ -436,10 +438,13 @@ if $ARGS[0] = 'succubinit':
 	sucwalkday = daystart + 2 + rand(0,5)
 	$sucself1 = 'that feeling'
 	pcs_horny = 100
+	InSleep = 0
+	slept_in = 0
+	strip_here = 0
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
 	*nl
 	'<font color="red">You feel the power flowing around your body for several minutes, leaking through your skin and making changes all throughout you, before fading to a presence deep in your core leaving you looking the same as before... but feeling so different! </font>'
-	
+
 	if preg = 1:
 		preg = 0
 		pregtime = 0
@@ -448,7 +453,7 @@ if $ARGS[0] = 'succubinit':
 		knowpreg = 0
 		pregchem = 0
 		cycle = 4
-		
+
 		nextbaby = arrsize('yearkid')
 		:poliabortloop
 		if yearkid[nextbaby-1] = 0:
@@ -472,7 +477,7 @@ if $ARGS[0] = 'succubinit':
 			jump 'poliabortloop'
 		end
 	end
-	
+
 	act 'Finish': gt $loc, $metka
 end
 
@@ -493,5 +498,32 @@ if $ARGS[0] = 'magbstchoice':
 	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'sleep'
 end
 
+if $ARGS[0] = 'options':
+	cla
+	act 'Set Alarm Clock':gt 'budilnik', 'start'
+	if bedPanty = 0:
+		act 'Wear underwear in the morning: Currently (ON)':bedpanty = 1 & gt 'bed2', 'options'
+	else
+		act 'Wear underwear in the morning: Currently (OFF)':bedpanty = 0 & gt 'bed2', 'options'
+	end
+	if analplug = 1:
+		if bedanal = 0:
+			act 'Remove your analplug at night: Currently (ON)':bedanal = 1 & gt 'bed2', 'options'
+		else
+			act 'Remove your analplug at night: Currently (OFF)':bedanal = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	if vibrator = 1 and cheatVib = 1:
+		if bedvibrator = 0:
+			act 'Remove your vibrator at night: Currently (ON)':bedvibrator = 1 & gt 'bed2', 'options'
+		else
+			act 'Remove your vibrator at night: Currently (OFF)':bedvibrator = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	act 'Return':gt 'bed2'
+end
+
 --- bed2 ---------------------------------
 

+ 1 - 30
locations/bedr.qsrc

@@ -233,36 +233,7 @@ if pornMagazine > 0:'Under your mattress you hide a porn magazine.'
 gs 'events', 'read_porn'
 gs 'subkid'
 
-if pcs_sleep <= 80:
-	if $clothingworntype = 'nude':
-		$sleep_txt = 'Go to sleep'
-	else
-		$sleep_txt = 'Undress and go to sleep'
-	end
-	if succubusQW = 2:
-		act '<<$sleep_txt>>':
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			gt 'bed2', 'succhoice'
-		end
-	else
-		act '<<$sleep_txt>>':
-			if disable_autosave = 0:
-				if StoryLine = 0:
-					savegame 'autosave.sav'
-				else
-					savegame 'autosave_alt.sav'
-				end
-			end
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			if magf2bdo = 2:
-				gt 'bed2', 'magbstchoice'
-			else
-				gt 'bed2', 'sleep'
-			end
-		end
-		killvar '$sleep_txt'
-	end
-end
+act 'Relax on your bed': gt 'bed', 'start'
 
 --- bedr ---------------------------------
 

+ 14 - 3
locations/bedr2x.qsrc

@@ -17,10 +17,19 @@ elektro = elektro + 1
 gs'stat'
 gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
+*nl
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
-'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
-if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
+'A bright and beautiful bedroom, with modern and stylish furniture.'
+*nl
+'The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a>'
+'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table.'
+*nl
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+*nl
+'Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
+*nl
+if komp = 1:'On the other bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
+*nl
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'
@@ -217,5 +226,7 @@ end
 gs 'events', 'read_porn'
 gs 'subkid'
 
+act 'Relax on your bed': gt 'bed', 'start'
+
 --- bedr2x ---------------------------------
 

+ 10 - 35
locations/bedrPar.qsrc

@@ -1,16 +1,18 @@
 # bedrPar
+
 CLOSE ALL
-$metka = ''
 $loc = 'bedrPar'
+$metka = ''
 $location_type = 'private'
 $locclass = 'bedr'
 $menu_loc = 'bedrPar'
 $menu_arg = ''
 menu_off = 0
-clr
+*clr & cla
 minut += 1
 gs 'stat'
 gs 'themes', 'indoors'
+
 if saveparQW = 2:
 	cls
 	'As soon as you enter the room you rush over to <<$namepopu2>>''s  cage and pour the contents of the vial in to his water bowl.'
@@ -62,7 +64,7 @@ end
 *nl
 'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 *nl
-'Your <a href="exec:gt ''bed2''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
+'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
 *nl
 if popugai2 = 1:
 	'<a href="exec:GT ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
@@ -165,10 +167,10 @@ else
 
 
 	if vcard > 0:
-		act 'Look at your deck of vintage porn cards':card_deck = 0 & gt 'card'
+		act 'View your vintage porn cards':card_deck = 0 & gt 'card'
 	end
 	if card > 0:
-		act 'Look at your deck of new porn cards':card_deck = 1 & gt 'card'
+		act 'View your new porn cards':card_deck = 1 & gt 'card'
 	end
 
 	if dur > 0:'You have hidden <<dur>> doses of Pale Lady.'
@@ -242,36 +244,9 @@ elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 end
 gs 'lact_lib', 'massage'
 
-if pcs_sleep <= 80:
-	if $clothingworntype = 'nude':
-		$sleep_txt = 'Go to sleep'
-	else
-		$sleep_txt = 'Undress and go to sleep'
-	end
-	if succubusQW = 2:
-		act '<<$sleep_txt>>':
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			gt 'bed2', 'succhoice'
-		end
-	else
-		act '<<$sleep_txt>>':
-			if disable_autosave = 0:
-				if StoryLine = 0:
-					savegame 'autosave.sav'
-				else
-					savegame 'autosave_alt.sav'
-				end
-			end
-			if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-			if magf2bdo = 2:
-				gt 'bed2', 'magbstchoice'
-			else
-				gt 'bed2', 'sleep'
-			end
-		end
-		killvar '$sleep_txt'
-	end
-end
+
+act 'Relax on your bed': gt 'bed', 'start'
+
 
 if $ARGS[0] = 'intro':
 	cla & *clr

+ 30 - 11
locations/begin.qsrc

@@ -10,12 +10,15 @@ if $ARGS[0] = 'start':
 	'<b>Transformation Start:</b>'
 	'You are Mikhail 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>'
+	'<b>School Girl Start:</b>'
 	'You are a school girl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone or become a sex addicted whore? Or anything in between, the possibilities are endless. No magic.'
 	*nl
-	'<b>Cursed schoolgirl Start:</b>'
+	'<b>Cursed Schoolgirl Start:</b>'
 	'Marvel as we recklessly squish both of the above into one start. You are a school girl who finds the amulet and not much changes, except the magic, actually that''s quite a big change.'
 	*nl
+	'<b>Cursed Schoolboy Start:</b>'
+	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a school girl. Now you have to deal with a new body, new desires, and your new life in the most lustful town in Russia. Features magic.'
+	*nl
 	'<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.'
 	
@@ -48,6 +51,15 @@ if $ARGS[0] = 'start':
 		altQS = 1
 		gt 'preSYS', 'SGStart'
 	end
+	
+	act '<center><b>Cursed Schoolboy Start</b></center>':
+		cla
+		settingmode = 0
+		showstat 0
+		altQS = 1
+		csb_start = 1
+		gt 'preSYS', 'CSBStart'
+	end
 
 	act '<center><b>New in Town Start</b></center>':
 		cla
@@ -212,7 +224,6 @@ if $ARGS[0] = 'eyes':
 	if pcs_eyecol = 3:$pcs_eyecol = 'blue' & $glacol2 = 'blue'
 	if glass <= 0:$glass = '' & glassvnesh = 0
 	if glass = 1:$glass = ' You wear silly glasses in a cheap frame.' & glassvnesh = 10
-	if glass = 2:$glass = ' You wear glasses.' & glassvnesh = 0
 	if pcs_lashes > 2:pcs_lashes = 2
 	if pcs_lashes = 0:$pcs_lashes = 'with short eyelashes'
 	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
@@ -235,8 +246,8 @@ if $ARGS[0] = 'eyes':
 	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''begin'', ''eyes''">Shorten lashes</a></center>'
 	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''begin'', ''eyes''">Larger eyes</a></center>'
 	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''begin'', ''eyes''">Smaller eyes</a></center>'
-	if glass = 0 and glass < 2:'<center><a href="exec:glass = 2 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
-	if glass > 0 and glass <= 2:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
+	if glass = 0:'<center><a href="exec:glass = 1 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
+	if glass = 1:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
 
 	if player_avatar = 1:
 		act'<center><b>Done</b></center>': gt'begin','description_real_character'
@@ -257,10 +268,14 @@ end
 if $ARGS[0] = 'birthday':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if player_avatar = 1:
-		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
+	if csb_start ! 1:
+		if player_avatar = 1:
+			'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		end
 	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		'<center><img <<$set_imgh>> src="images/pre/csb/petercsb.jpg"></center>'
 	end
 	'<center>Choose your date of birth:</center>'
 	*nl
@@ -313,10 +328,14 @@ if $ARGS[0] = 'birthday':
 	'<center><a href="exec:birthmonth = 11 & gs ''begin'', ''birthday''">November</a></center>'
 	'<center><a href="exec:birthmonth = 12 & gs ''begin'', ''birthday''">December</a></center>'
 
-	if player_avatar = 1:
-		act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
+	if csb_start ! 1:
+		if player_avatar = 1:
+			act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
+		else
+			act'<center><b>Done</b></center>': gt 'preSYS', 'SGStart2'
+		end
 	else
-		act'<center><b>Done</b></center>': gt 'preSYS', 'SGStart2'
+		act'<center><b>Done</b></center>': gt 'preSys', 'CSBStart'
 	end
 end
 

+ 0 - 2
locations/bicycle.qsrc

@@ -132,7 +132,6 @@ if $ARGS[0] = 'forest':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (0:25)':
-		dirtyclothes = 0
 		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls
@@ -182,7 +181,6 @@ if $ARGS[0] = 'swamp':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 
 	act 'Bike to the village (1:15)':
-		dirtyclothes = 0
 		gs 'clothing', 'swamp_clothes', 0
 		if $clothingworntype ! 'nude' or pcs_inhib > 50:
 			cls

+ 7 - 7
locations/brothel.qsrc

@@ -66,9 +66,9 @@ if $ARGS[0] = 'lobby':
 	*nl
 	'Alongside the windows are tables, each for about four to six people.'
 	nroad = 20
-	act 'Hotel bar': gt 'brothel', 'bar'
-	act 'Lobby bathroom': gt 'brothel', 'lobby:toilet'
-	act 'Leave':gt 'road'
+	act 'Leave the hotel':gt 'road'
+	act 'Visit the Hotel bar': gt 'brothel', 'bar'
+	act 'Visit the bathroom': gt 'brothel', 'lobby:toilet'
 end
 
 if $ARGS[0] = 'lobby:toilet':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'lobby:toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/hoteltoilet.jpg"></center>'
 	*nl
 
-	act 'Leave':gt 'brothel', 'lobby'
+	act 'Return to the lobby':gt 'brothel', 'lobby'
 
 	act 'Look into the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -123,9 +123,9 @@ if $ARGS[0] = 'bar':
 		*nl
 		'<font color=#<<$red_font>>>You are wasted. Lying your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
 	end
+	act 'Leave the bar':gt 'brothel', 'lobby'
 	act 'Order something':gt 'brothel', 'bar:order'
 	act 'Just sit here':gt 'brothel', 'bar:sit'
-	act 'Leave the bar':gt 'brothel', 'lobby'
 end
 
 if $ARGS[0] = 'bar:sit':
@@ -184,8 +184,8 @@ if $ARGS[0] = 'bar:order':
 		! if hotelWhore = 1:
 			! act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
 		! end
-		act 'See the menu': gs 'food_menu'
-		act 'Return':gt 'brothel', 'bar'
+		act 'Cancel order':gt 'brothel', 'bar'
+		act 'Order from the menu (0:05)': gs 'food_menu'
 	end
 end
 

+ 3 - 3
locations/burger.qsrc

@@ -18,15 +18,15 @@ if $ARGS[0] = 'start':
 
 	if BistroBoss > 0:'<a href="exec:gt ''burger'', ''boss''">The Office of the Director</a> Anatoly Borisovich'
 
-	act 'Leave':
+	act 'Leave the diner':
 		cla
 		minut += 1
 		gt 'down'
 	end
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 315:
-		act 'Eat and run (0:20) (315 <b>₽</b>)':money -= 315 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (315<b>₽</b>)':money -= 315 & gt 'food', 'f_food'
 	end
 
 	if IvanPodstavaQW = 2:

+ 6 - 6
locations/cafe_parco.qsrc

@@ -11,9 +11,9 @@ if $args[0]= 'start':
 	'The newly opened cafe "Del Parco", with its striking facade, there are lots of tables and a summer terrace. Opening hours between 14.00 to 21.00.'
 
 	if hour >= 14 and hour < 21:
-		act 'Enter': gt 'cafe_parco', 'inner'
+		act 'Enter the cafe': gt 'cafe_parco', 'inner'
 	end
-	act 'Go back to the square': gt 'gskver', 'start'
+	act 'Return to the square': gt 'gskver', 'start'
 end
 
 if $args[0]= 'inner':
@@ -24,13 +24,13 @@ if $args[0]= 'inner':
 	$loc = 'cafe_parco'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Exit the cafe': gt 'gskver', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 
-	act 'Go back outside': gt 'gskver', 'start'
-
 	gs 'family'
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:

+ 7 - 0
locations/card.qsrc

@@ -58,6 +58,13 @@ act 'Pull a card from the deck':
 end
 
 act 'Put the cards away':gt $loc
+
+if card_deck = 0:
+	act 'Throw away your deck of vintage porn cards': vcard = 0 & vcard_trash = 1 & gt $loc
+elseif card_deck = 1:
+	act 'Throw away your deck of new porn cards': card = 0 & gt $loc
+end
+
 !!act 'Playing cards':gt 'blackjack'
 
 --- card ---------------------------------

+ 3 - 5
locations/changingroom.qsrc

@@ -30,6 +30,8 @@ if $ARGS[0] = 'view_swim_list':
 		'<center>You cannot go swimming or sunbathing when the temperature below 15C, so there is no point in getting changed.</center>'
 	end
 
+	act 'Leave':gt $loc, $metka
+	
 	if $clothingworntype = 'swimwear':
 		act 'Put your regular clothes back on':
 			gs 'underwear', 'wear'
@@ -37,9 +39,6 @@ if $ARGS[0] = 'view_swim_list':
 			gt 'changingroom', 'view_swim_list'
 		end
 	end
-
-	act 'Leave':gt $loc, $metka
-
 end
 
 if $ARGS[0] = 'view_swim_item':
@@ -53,14 +52,13 @@ if $ARGS[0] = 'view_swim_item':
 	FUNC('$attributes_swimwear', $ARGS[1], ARGS[2])
 	FUNC('$clothing_name', $ARGS[1], ARGS[2])
 
-
 	$RESULT = '(strength '
 	dynamic '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]'
 	$RESULT += ')'
 	'<<$RESULT>>'
 
-
 	act 'Return':gt 'changingroom', 'view_swim_list'
+	
 	!! if the clothing is worn out
 	if dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'

+ 7 - 1
locations/cikl.qsrc

@@ -133,6 +133,11 @@ if i <= 147:jump 'loopprice'
 
 if coatH[defaultcoat] <= 0: defaultcoat = 0
 
+!! Abortion and pregnancy recovery resets if finished
+
+if abortionbirthdate ! 0 and daystart - abortionbirthdate > 24: abortionbirthdate = 0
+if pregbirthdate ! 0 and daystart - pregbirthdate > 73: pregbirthdate = 0
+
 !!------------------------------------------------------------------------------------------------------------
 !!	Bimbo
 !!------------------------------------------------------------------------------------------------------------
@@ -1364,7 +1369,8 @@ end
 
 if bcream_used >= 1:
     bcream_used = 0
-    temp = rand(0,5)
+    temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
+    if temp > 0: temp = 1
     nbsize += temp
     if temp > 0:'Feels like your breasts have grown slightly.'
 end

+ 2 - 0
locations/clothing.qsrc

@@ -831,6 +831,7 @@ end
 
 if $ARGS[0] = 'swamp_clothes':
 	if ARGS[1] = 1:
+	!hessian clothing to owned, sets size and equipped.
 		cheap[414] = 1
 		cheapS[414] = 0
 		cheapH[414] = 100
@@ -839,6 +840,7 @@ if $ARGS[0] = 'swamp_clothes':
 		gs 'clothing', 'wear', 'cheap', 414
 	end
 	if ARGS[1] = 0:
+	!hessian clothing no longer owned, but not unequipped.
 		cheap[414] = 0
 		swamp_clothes = 0
 	end

+ 34 - 38
locations/din_bad.qsrc

@@ -79,7 +79,6 @@ $mobile_check = {
 	killvar 'lover_number'
 }
 
-
 $d_salf = {
 	*clr & cla
 	'<center><h1>Tissues</h1></center>'
@@ -687,60 +686,57 @@ $d_cycreport_update = {
 
 
 $d_cycreport_upduedate = {
-	temp = (280 + daylastperiod) - daystart
+	!! Ovulation is ~7d after menstruation
+	!! Implantation takes several days: Average is 5
+	!! Human gastation period: 280 days
+	!! ovu_calc: Days since last ovulation
+	ovu_calc = daystart - lastmens + 7 + 5
+	temp = 280 - ovu_calc
 	pregdueday = day
 	pregduemonth = month
 	pregdueyear = year
+	
+	temp += pregdueday
+	pregdueday = 0
+	
 	:pregduedateloop
-	if pregduemonth = 1 and temp > 31 - pregdueday:
+	if pregduemonth = 1 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 2 and temp > 28 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 2 and temp > 28:
 		pregduemonth += 1
-		temp -= 28 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 3 and temp > 31 - pregdueday:
+		temp -= 28
+	elseif pregduemonth = 3 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 4 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 4 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 5 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 5 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 6 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 6 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 7 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 7 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 8 and temp > 31 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 8 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 9 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 9 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 10 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 10 and temp > 31:
 		pregduemonth += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 11 and temp > 30 - pregdueday:
+		temp -= 31
+	elseif pregduemonth = 11 and temp > 30:
 		pregduemonth += 1
-		temp -= 30 - pregdueday
-		pregdueday = 0
-	elseif pregduemonth = 12 and temp > 31 - pregdueday:
+		temp -= 30
+	elseif pregduemonth = 12 and temp > 31:
 		pregduemonth = 1
 		pregdueyear += 1
-		temp -= 31 - pregdueday
-		pregdueday = 0
+		temp -= 31
 	else
 		pregdueday = temp
 		temp = 0

+ 8 - 7
locations/din_van.qsrc

@@ -639,6 +639,7 @@ $pirPubic = {
 }
 
 $pirManage = {
+	cla
 	menu_off = 1
 	*nl
 	if pirsA > 0:
@@ -706,7 +707,7 @@ $pirManage = {
 		*nl
 	end
 
-	act'Back':menu_off = 0 & gt $loc, $metka
+	act 'Continue': menu_off = 0 & gt $loc, $metka
 }
 
 $enema = {
@@ -864,10 +865,10 @@ if $ARGS[0] = 'private':
 		'<a href="exec:dynamic $use_bcream & gt $loc, $metka">Apply breast cream.</a> Uses left: <<bcream_have>>.'
 	end
 
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage your piercings</a>'
 
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from breast implants.</a>'
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $metka">Inject silicone into your breast implants.</a>'
+	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $metka">Drain silicone from your breast implants.</a>'
 
 	dynamic $bteeth
 
@@ -905,7 +906,7 @@ if $ARGS[0] = 'private':
 		dynamic $toymanage
 	end
 
-	'<a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>. <<$bmi_desc>></center>''">Check weight on the scales</a>'
+	'<a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">Check weight on the scales</a>'
 
 	gs 'din_van', 'prvt_pee'
 
@@ -1470,7 +1471,8 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-
+	
+	act 'Return':menu_off = 0 & gt $loc, $metka
 	act 'Set image height for this view':
 		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")
 		if shave_img_hgt < 50:
@@ -1480,7 +1482,6 @@ if $ARGS[0] = 'shave_options':
 		end
 		gt 'din_van', 'shave_options'
 	end
-	act 'Return':menu_off = 0 & gt $loc, $metka
 end
 
 --- din_van ---------------------------------

+ 27 - 23
locations/experiment.qsrc

@@ -21,30 +21,34 @@ if $ARGS[0] = 'start':
 		*nl
 		'An elderly nurse is sitting behind a desk.'
 	end
-
-	if unrelated_preg = 1 and knowpreg = 1:
-		*nl
-		'You are pregnant and they don''t take on pregnant candidates.'
-	elseif exp_form = 0 and experimentAbsolved = 0 and (knowpreg = 0 or unrelated_preg = 0):
-		*nl
-		'You are warmly welcomed by the woman sitting behind the desk, "Hello miss, can I help you?"'
-		'"I read an advert that you are looking for people to test some kind of new treatment... And that you compensate the subjects for it." you reply.'
-		'"Yes, that is true. If you want to apply, please read and fill in this form." She hands you over the form.'
-
-		act 'Take the form':gt 'experiment', 'form'
-	elseif exp_form = 1 and experimentAbsolved = 0 and (knowpreg = 0 or unrelated_preg = 0):
-		act 'Go to the area marked in the book to start the experiment':gt 'experiment', 'form:filled'
-	elseif shouted = 1:
-		*nl
-		'"Hello miss <<$pcs_lastname>>, you are not going to shout at me again, will you?" the woman behind the desk asks.'
-		act '<i>Angrily shout at her for ruining your life</i>':gt 'experiment', 'deskTalk:shout'
-		act 'No, I am sorry about that..':gt 'experiment', 'deskTalk' & shouted = 0
+	
+	if succubusflag = 0: 
+		if unrelated_preg = 1 and knowpreg = 1:
+			*nl
+			'You are pregnant and they don''t take on pregnant candidates.'
+		elseif exp_form = 0 and experimentAbsolved = 0 and (knowpreg = 0 or unrelated_preg = 0):
+			*nl
+			'You are warmly welcomed by the woman sitting behind the desk, "Hello miss, can I help you?"'
+			'"I read an advert that you are looking for people to test some kind of new treatment... And that you compensate the subjects for it." you reply.'
+			'"Yes, that is true. If you want to apply, please read and fill in this form." She hands you over the form.'
+
+			act 'Take the form':gt 'experiment', 'form'
+		elseif exp_form = 1 and experimentAbsolved = 0 and (knowpreg = 0 or unrelated_preg = 0):
+			act 'Go to the area marked in the book to start the experiment':gt 'experiment', 'form:filled'
+		elseif shouted = 1:
+			*nl
+			'"Hello miss <<$pcs_lastname>>, you are not going to shout at me again, will you?" the woman behind the desk asks.'
+			act '<i>Angrily shout at her for ruining your life</i>':gt 'experiment', 'deskTalk:shout'
+			act 'No, I am sorry about that..':gt 'experiment', 'deskTalk' & shouted = 0
+		else
+			'Hello miss <<$pcs_lastname>>, how is your pregnancy?'
+			if kid = 0 and pregchem > 0:act 'It is going well':gt 'experiment', 'deskTalk'
+			if kid > 0 and knowpreg = 1:act 'I already gave birth, but I''m also pregnant again':gt 'experiment', 'deskTalk'
+			if kid > 0 and knowpreg = 0:act 'I already gave birth':gt 'experiment', 'deskTalk'
+			if kid = 0 and pregchem = 0:act 'I had an abortion':gt 'experiment', 'deskTalk'
+		end
 	else
-		'Hello miss <<$pcs_lastname>>, how is your pregnancy?'
-		if kid = 0 and pregchem > 0:act 'It is going well':gt 'experiment', 'deskTalk'
-		if kid > 0 and knowpreg = 1:act 'I already gave birth, but I''m also pregnant again':gt 'experiment', 'deskTalk'
-		if kid > 0 and knowpreg = 0:act 'I already gave birth':gt 'experiment', 'deskTalk'
-		if kid = 0 and pregchem = 0:act 'I had an abortion':gt 'experiment', 'deskTalk'
+		'You have a really bad feeling about this place. It''s no place for a succubus.'
 	end
 
 	act 'Leave':gt 'poli', 'start'

+ 7 - 3
locations/food_menu.qsrc

@@ -4,8 +4,12 @@ food_loc = 1
 gs 'themes', 'food_menu'
 
 *clr & cla
-act 'Back':killvar 'food_loc' & gt $loc, $metka
-
+act 'Return':
+	killvar 'food_loc'
+	minut += 5
+	gs 'stat'
+	gt $loc, $metka
+end
 killvar '$_drink'
 killvar '$_eat'
 if $loc = 'burger':
@@ -52,7 +56,7 @@ if $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if home_owned[2] = 1 or SchoolBlock = 1:
+	if home_owned[2] = 1 or SchoolBlock = 0:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 45 - 44
locations/gadforest.qsrc

@@ -9,27 +9,27 @@
 !MiraLoc = 4 (Mira at field)
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
-	
+
 if $ARGS[0] = '1':
 	*clr & cla
 	! figure out if Sveta came from Mira code or not. events play out differently whether with Mira or not
 	PC_arrive = iif($loc ! 'Miroslava', 1 , 0)
 
 	! edge of forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '1'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '1'
 	menu_off = 0
-	
+
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	*clr & cla
-	
+
 	! Add to knowledge of forest
 	if goforest < 20:goforest += rand(0,1)
 	! chance to get lost
@@ -58,13 +58,13 @@ if $ARGS[0] = '1':
 			'You are at the edge of the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	
+
 	if forestpicnic = 1:'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
 	if MiraLoc = 3:'Nearby is <a href="exec: gt ''Miroslava'' ">Mira</a>.'
 	if clothesAtLocation = 1:'Your clothes are nearby on the ground.'
 	if findvel = 2:'Leaning up against a tree is your old <a href="exec:gt ''bicycle'',''forest''">bike</a>.'
 	if goforest < 10:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
-	
+
 	! Sveta arrive without Mira events
 	if PC_arrive = 1:
 		if temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest = 1:gt 'gadforest_event', 'nude_event'
@@ -92,7 +92,7 @@ if $ARGS[0] = '1':
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'exhibitionism', 3
 				gs 'stat'
-				
+
 				'You don''t hesitate and quickly get undressed, your clothes are left laying in a pile.'
 
 				act'Continue':gt'gadforest','1'
@@ -106,7 +106,7 @@ if $ARGS[0] = '1':
 			end
 		end
 	end
-	
+
 	if clothesAtLocation = 1 and $clothingworntype = 'nude':
 		act 'Get dressed':
 			cla
@@ -122,7 +122,7 @@ if $ARGS[0] = '1':
 			act 'Back': gt 'gadforest','1'
 		end
 	end
-	
+
 	! if Sveta left the forest without retrieving her clothes
 	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
 		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
@@ -151,7 +151,7 @@ if $ARGS[0] = '1':
 			end
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and sunWeather = 1:
 		act 'Go for a walk in the woods':
 			cla
@@ -186,11 +186,11 @@ if $ARGS[0] = '1':
 					'You walk with Mira through the snowy woods, enjoying the sounds of the forest and the fresh air.'
 				end
 			end
-			
+
 			act 'Continue':gt 'gadforest','1'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and edge_forestday ! daystart:
 		act 'Look for mushrooms and berries':
 			cla
@@ -200,7 +200,7 @@ if $ARGS[0] = '1':
 			edge_forestday = daystart
 			if goforest < 20:goforest += rand(0,1)
 			gs 'stat'
-			
+
 			! no mushroom pickers or mushroom pickers moved deeper into the forest
 			if mushroom_pickers = 0 or mushroom_pickers = 2:
 				cla
@@ -238,14 +238,14 @@ if $ARGS[0] = '1':
 			act 'Continue':gt 'gadforest','1'
 		end
  	end
- 	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and MiraLoc ! 3:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	 	end
 	end
-	
+
 	if goswamp = 1 and MiraLoc ! 3:
 		! day time chance to get stuck in swamp. ps. use bike to get there 100% of the time by illume
 		if hour >= 6 and hour < 20:
@@ -262,13 +262,10 @@ if $ARGS[0] = '1':
 			act 'Go to the swamp':gt 'gadforest_event', 'swamp_road'
 		end
 	end
-	
+
 	act 'Leave the woods':
-		dirtyclothes = 0
-		gs 'clothing', 'swamp_clothes', 0
-		gs 'stat'
-		if $clothingworntype = 'nude':
-			if $CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1:
+		if $clothingworntype = 'nude' or swamp_clothes = 1:
+			if ($CloLosTyp[$CURLOC] = '' or gadforest_clothestorn = 1) and swamp_clothes = 0:
 				! no clothes here, they must be ripped apart enough times in the woods or swamp to get destroyed.
 				! This may be a good exhibition or rape event entry point
 				inhib_exp += rand(0,2)
@@ -276,12 +273,16 @@ if $ARGS[0] = '1':
 				'You sneak out the woods, hiding your naked body in the shadows and moving toward grandparents house.'
 				'You successfully reach home without anyone noticing.'
 				cla
+				minut += 30
+				gs 'stat'
 				act 'Go home':gt'Gadhouse'
 			else
-				'<B>You should get dressed before leaving the woods.</B>'
+				'<B>You should pick up your clothes and get dressed before leaving the woods.</B>'
 			end
 		else
-			minut += 30 & gt'gadroad'
+			minut += 30
+			gs 'stat'
+			gt 'gadroad'
 		end
 	end
 	if rand(1,10)> 9: gs 'gadforest', 'torncloth'
@@ -291,17 +292,17 @@ end
 if $ARGS[0] = '2':
 	*clr & cla
 	! slightly inside forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '2'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '2'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 40:goforest += rand(0,1)
 	! Determine where Sveta got lost in the forest
@@ -311,7 +312,7 @@ if $ARGS[0] = '2':
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -388,7 +389,7 @@ if $ARGS[0] = '2':
 			act 'Continue':gt 'gadforest','2'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 		act 'Go further into the forest':
 			if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
@@ -401,17 +402,17 @@ end
 if $ARGS[0] = '3':
 	*clr & cla
 	! deep inside forest
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '3'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '3'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 60:goforest += rand(0,1)
 	lost = 3
@@ -421,7 +422,7 @@ if $ARGS[0] = '3':
 	foresteventrand = rand(1,10)
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Deep Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -452,7 +453,7 @@ if $ARGS[0] = '3':
 		if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
 		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and thicketday ! daystart:
 
 	act 'Look for mushrooms and berries':
@@ -472,7 +473,7 @@ if $ARGS[0] = '3':
 			act 'Continue':gt 'gadforest','3'
 		end
 	end
-	
+
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
 
 		act 'Go further into the forest':
@@ -486,17 +487,17 @@ end
 if $ARGS[0] = '4':
 	*clr & cla
 	! forest near swamp
-	$loc = 'gadforest'	
+	$loc = 'gadforest'
 	$metka = '4'
 	$location_type = 'secluded'
-	
+
 	$menu_loc = 'gadforest'
 	$menu_arg = '4'
 	menu_off = 0
-	
+
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	! Add to knowledge of forest
 	if goforest < 80:goforest += rand(0,1)
 	lost = 4
@@ -507,7 +508,7 @@ if $ARGS[0] = '4':
 	dirty = 0
 	new_boletus = 0
 	new_bilberry = 0
-	
+
 	'<center><H4>Forest near the Swamp</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -557,7 +558,7 @@ if $ARGS[0] = '4':
 			act 'Continue':gt 'gadforest','4'
 		end
 	end
-	
+
 	act 'Go further into the swamp':
 		if goforest >= lostrand and goswamp = 1:minut += 30 & gt 'swamp'
 		if goforest >= lostrand and goswamp = 0:minut += 30 & gt 'gadforestswamp','1'

+ 3 - 5
locations/gadforestlost.qsrc

@@ -16,7 +16,6 @@ if $ARGS[0] = 'forestrescue':
 
 	minut += 150
 	lost_girl = 0
-	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
 	gs 'clothing', 'swamp_clothes', 0
@@ -39,11 +38,11 @@ if $ARGS[0] = 'forestrescue':
 
 	'You get ready quickly and follow the forest ranger out of the woods.'
 
-	if $clothingworntype ! 'nude':
+	if $clothingworntype ! 'nude' or swamp_clothes = 0:
 		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
 
 		act 'To your grandparents house':gt'Gadhouse'
-	elseif $clothingworntype = 'nude':
+	elseif $clothingworntype = 'nude' or swamp_clothes = 1:
 		'The ranger looks you up and down and you feel like he is about to ask you something but he decides against it.'
 		'You remember you left your clothes by the edge of the woods and ask the ranger to take you there instead.'
 
@@ -257,9 +256,8 @@ if $ARGS[0] = 'gadforestlostfinish':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
 	'You look over and realize that you finally see lights shining from distant houses, glad to get out of this alive you rush forward.'
 
-	!clear lost flags by illume, clear dirtyclothes flag by rachels
+	!clear lost flags by illume
 	lost_girl = 0
-	dirtyclothes = 0
 	forest_lostday = 0
 	hanters = 0
 	gs 'clothing', 'swamp_clothes', 0

+ 3 - 3
locations/gadforestswamp.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = '1':
 		*clr & cla
 		minut += 10
 		swamprand = pcs_stren + pcs_agil
-		pcs_sweat += 10
+		pcs_sweat += 15
 		gs 'stat'
 
 		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
@@ -72,8 +72,8 @@ if $ARGS[0] = '2':
 	pcs_hairbsh = 0
 	if pcs_makeup > 1:pcs_makeup = 0
 
-	! clothes wear out, "dirty" to avoid at a time
-	if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dirtyclothes = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
+	! clothes wear out
+	if dirty = 0 and ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):dirty = 1 & dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 10'
 	! add remove clothes if worn out
 	if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
 		'Your ripped clothes were barely holding together, but now they have finally fell apart.'

+ 1 - 1
locations/gadukino.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = '':
 			act 'Go Hunting (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 'Go to the highway':minut += 30 & nroad = 10 & gt 'road'
 	end
 end
 

+ 0 - 1
locations/gadukino_event.qsrc

@@ -817,7 +817,6 @@ end
 if $ARGS[0] = 'go_home_ender':
 	*clr & cla
 	minut += rand(15,25)
-	dirtyclothes = 0
 	if grandmahelp > 0:
 		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'

+ 3 - 0
locations/gdk.qsrc

@@ -1,6 +1,9 @@
 # gdk
 music_loop = 0
 CLOSE ALL
+$menu_loc = 'gdk'
+$menu_arg = ''
+menu_off = 0
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'public_outdoors'

+ 29 - 11
locations/gkafe.qsrc

@@ -12,12 +12,16 @@ if $ARGS[0] = '':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+	*nl
 	'A small cafe, attached to the train station. It looks rather shabby.'
 	'The cafe is closed right now, it''s usually open between 8:00 and 20:00.'
 
+	act 'Leave the cafe':gt 'pavtrain'
+
 	if mother_go = 1 and hour = 16 and indorf = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+		*nl
 		'A small cafe, attached to the train station. It looks rather shabby.'
 		'The door is currently locked, and the sign on the door says "Closed". That''s strange, the cafe is supposed to be open at this time.'
 
@@ -32,6 +36,7 @@ if $ARGS[0] = '':
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut.jpg"></center>'
+				*nl
 
 				if momslut >= 1:
 					'You carefully climb on top of the boxes, and stand on your toes to reach the small window. It gives you a view into the back room of the cafe. Through the window you see your mother on her knees, giving the cafe owner a blowjob. She''s very enthusiastic about it, and alternates between sucking his dick and licking his balls. Then she begins to deepthroat him, sliding his dick further and further down her mouth until his balls rest on her chin.'
@@ -46,22 +51,36 @@ if $ARGS[0] = '':
 					mother_go = 0
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut2.jpg"></center>'
+					*nl
 					'The cafe owner abruptly pulls his groin away from your mother''s mouth, a string of saliva still attached to his dick as he roughly pulls your mother up by her shoulders and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing in following up his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately drove his cock in her pussy. His thrusting is fast and furious and you figure he doesn''t intend to stay here much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as she is getting her pussy roughly pounded by her boss, you can easily hear it despite the window between you and them. And sure enough, a few moments later he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees quickly without needing a prompt and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates, before she sees you.'
 
-					act 'Go back to the train station':gt 'pavtrain'
+					act 'Leave the cafe':gt 'pavtrain'
 				end
 				act 'Leave, you don''t want to see this':gt 'pavtrain'
 			end
-			act 'Leave, it''s probably none of your business':gt 'pavtrain'
+			act 'Leave, it''s none of your business':gt 'pavtrain'
 		end
-		act 'Leave, it''s probably none of your business':gt 'pavtrain'
+		act 'Leave, it''s none of your business':gt 'pavtrain'
 	else
 		if hour >= 8 and hour <= 19:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+			*nl
 			'A small cafe, attached to the train station. It looks rather shabby.'
 
-			if StoryLine > 0:'Since your <<$npc_nickname[''A29'']>> works here, you can eat here for free.'
+			act 'Leave the cafe':gt 'pavtrain'
+			
+			gs 'gkafe', 'menu'
+
+			if StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> works here at the cafe, you can eat-in for free.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> kicked you out of home, you can no longer eat here for free.'
+			elseif StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since you got kicked out of school, you can no longer eat here for free, your <<$npc_nickname[''A29'']>> wants you to earn a living.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 1:
+				'Since you got kicked out of school and your <<$npc_nickname>> kicked you out of home, you can no longer eat here for free.'
+			end
 
 			if week < 6:
 				if hour >= 6 and hour < 16 and StoryLine > 0:
@@ -78,12 +97,12 @@ if $ARGS[0] = '':
 					''
 					'A male figure walks closely by your table. You look up and recognize uncle Misha, your neighbor. He stops and recognizes you as well, and sits down with you. He gives you a friendly smile as he says: "Oh, <<$pcs_nickname>>, hello. Listen, me and your stepfather were working late in the garage yesterday, and went for a nightcap at my place when we were finished. When your stepfather left, he accidentally left some of his tools behind. I''m fairly sure he needs them again today, and I could use a hand bringing them back to the garage. Could you help me out? I''ll give you money so you can get some ice cream for your troubles."'
 
-					act 'Agree to help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
+					act 'Go help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
 				elseif razvrand > 7 and hour > 16 and hour < 20 and dyadyamishaevent = 1 and dmishaday ! daystart:
 					''
 					'Suddenly, a man slides in the seat next to you while you eat your meal. You look up and see it''s uncle Misha. He has a greedy look in his eyes, the kind that is already stripping you naked in his thoughts. His eyes are fixated on your boobs as he says: "Hey, <<$pcs_nickname>>. Would you like to join me for some tea at my place? We can have a bit of fun just like last time, and you can earn some more money..."'
 
-					act 'Agree to go ''drink tea'' with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
+					act '"Drink tea" with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 				end
 			end
 			if StoryLine = 1 and SchoolAtestat = 0:
@@ -91,8 +110,6 @@ if $ARGS[0] = '':
 					'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting at a table in the far corner, drinking beer.'
 			end
 		end
-		act 'Leave':gt 'pavtrain'
-		if hour >= 8 and hour <= 19:gs 'gkafe', 'menu'
 	end
 end
 
@@ -100,9 +117,9 @@ if $ARGS[0] = 'menu':
 	menu_off = 1
 	$loc = 'gkafe'
 	$metka = ''
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 end
 
@@ -110,9 +127,10 @@ if $ARGS[0] = 'boris':
 	menu_off = 1
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/Borislav.jpg"></center>'
+	*nl
 	'The owner of the cafe, called Borislav. He is a tall, thin man in his forties. Most people call him Slava.'
 
-	act 'Leave':gt 'gkafe'
+	act 'Return':gt 'gkafe'
 end
 
 --- gkafe ---------------------------------

+ 6 - 1
locations/gpoli.qsrc

@@ -26,9 +26,10 @@ if $ARGS[0] = '':
 			menu_off = 1
 			if kid > 0:minut += rand(300,660) else minut += rand(120,480)
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
-			'You lay on the bed and your feet are put in stirups.'
+			'You lay on the bed and your feet are put in stirrups.'
 			'Your contractions get closer and closer, and after some time (and a lot of swearing) you finally give birth.'
 			:multikidloop
+				minut += rand(30,90)
 				sterilewb += 1
 				nextbaby = arrpos('$kidname', 'unborn')
 				kid += 1
@@ -48,11 +49,15 @@ if $ARGS[0] = '':
 				end
 			if BabyEmbryo > 0:'You do not have much time to stare at your <<$polreb[nextbaby]>>, because you are having an another contraction. Your next baby is coming!' & jump 'multikidloop'
 			preg = 0
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
+			RecovH = rand(1175,1875)
+			pregbirthdate = daystart
 			thinkpreg = 0
 			knowpreg = 0
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
+			pregchem = 0
 			cycle = 4
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice

+ 24 - 23
locations/gschool_grounds.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 
 	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
-		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
 	if day = nyp_day and month = 12 and age <= 17 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
@@ -131,7 +131,7 @@ if $ARGS[0] = 'main':
 
 	act 'Return to town': minut += 2 & gt 'pavResidential'
 	
-	act 'Go to the sports field': gt 'gschool_grounds', 'sports'
+	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
 	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0:
 		act 'Go to detention': gt 'gschool_detention', 'start'
@@ -173,28 +173,30 @@ if $ARGS[0] = 'main':
 		gt 'dimaRevenge', 5	
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
 		gt 'dimaRevenge', dimaRevenge
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11 and NikoDate_Day ! daystart:
-		'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
-		'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai Volkov</a> is smoking outside of the school.'
 	end
 
-	if week = 1 and NikoIntro = 0 and hour = 14:
-		gt 'NikoEv', 'Intro'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0 and NikoDate_Day ! daystart:
-		gt 'NikoDates', 'After School'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0 and NikoDate_Day ! daystart:
-		gt 'NikoDates', 'After School 2'
-	elseif week <= 5 and hour = 14 and NikoVolkovQW = 10 and NikoEv = 22 and NikoDate_Day ! daystart:
-		gt 'NikoEv2', 'Recovery'
-	end
-
-	if hour >= 14 and pav_slut >= 75 and SchoolGossip > 0 and afterschoolday ! daystart:gt 'gschool_sex', 'suck'
+	if hour >= 14 and pav_slut >= 125 and SchoolGossip > 0 and afterschoolday ! daystart:gt 'gschool_sex', 'suck'
 
 	if week = 1 and kanikuli = 0 and arthakQW = 10 and apmeetday ! daystart and hour >= 14:gt 'artgar'
 
 	if hour = 14 and week < 6 and kanikuli = 0:
 
+		if NikoDate_Day ! daystart:
+			if NikoIntro = 0:
+				gt 'NikoEv', 'Intro'
+			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
+				gt 'NikoDates', 'After School'
+			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
+				gt 'NikoDates', 'After School 2'		
+			elseif (NikoVolkovQW = 5 and NikoDate = 1) or NikoEv = 11:
+				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
+			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20:
+				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai Volkov</a> is smoking outside of the school.'
+			elseif NikoVolkovQW = 10 and NikoEv = 22:
+				gt 'NikoEv2', 'Recovery'
+			end
+		end
+		
 		if ivan_afterschool = 1:
 			act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 		end
@@ -288,8 +290,8 @@ if $ARGS[0] = 'sports':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
-
-	act 'Leave the sports field':gt 'gschool_grounds', 'main'
+	
+	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
 	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
 		act 'Go for a run (1 hour)':
@@ -312,7 +314,7 @@ if $ARGS[0] = 'sports':
 	end
 
 	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
-		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
 	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
@@ -370,7 +372,6 @@ if $ARGS[0] = 'bulding':
 		His words fill you with dread as you make your way to class.'
 	end		
 
-
 	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
 		zverSlutQW = 2
 		if KotovZverHelp ! 1:
@@ -599,7 +600,6 @@ if $ARGS[0] = 'change_room':
 	$locM = 'gschool_grounds'
 	$metkaM = 'change_room'
 	*clr & cla
-	minut += 5
 	gs 'stat'
 
 	act 'Leave the school building':
@@ -607,6 +607,7 @@ if $ARGS[0] = 'change_room':
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt 'gschool_grounds', 'change_room'
 		else
+			minut += 1
 			gt 'gschool_grounds', 'main'
 		end
 	end
@@ -616,6 +617,7 @@ if $ARGS[0] = 'change_room':
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt 'gschool_grounds', 'change_room'
 		else
+			minut += 1
 			gt 'gschool_grounds', 'sports'
 		end
 	end
@@ -636,7 +638,6 @@ if $ARGS[0] = 'change_room':
 	dynamic $removepan
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-
 end
 
 --- gschool_grounds ---------------------------------

+ 1 - 2
locations/hanters.qsrc

@@ -792,7 +792,6 @@ end
 if $ARGS[0]='hantersgroupORALs':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupORALs.jpg"></center>'
 	if hantersexnude = 1 or forest_hantersex = 3:'Sergei grabs you by the head and shoves his cock into your mouth. Igor, feeling left out and just stands there with his cock out. You look at Igor with lust while sucking Sergei''s cock. Igor pushes Sergei away and shoves his cock inside your mouth.'
-	'"There, there, don''t fight I can do you both at the same time." you say. You start altering between their cocks, pleasuring them both.'
 	if forest_gopsex = 3:'Kolyamba grabs you by the head and shoves his cock into your mouth. Vasyan, feeling left out and just stands there with his cock out. You look at Vasyan with lust while sucking Kolyamba''s cock. Vasyan pushes Kolyamba away and shoves his cock inside your mouth.'
 	'"There, there, don''t fight I can do you both at the same time." you say. You start altering between their cocks, pleasuring them both.'
 
@@ -934,7 +933,7 @@ if $ARGS[0]='hantersgroupORALend1':
 	swallow += 1
 	if hantersexnude = 1 or forest_hantersex = 3:'The men order you to swallow all of the sperm. You enthusiasticly open your mouth ready to recive their loads. The men started groaning loudly and began cumming, the quantity of sperm was so overwhelming that you were not able to swallow all of it and some of drips onto your face. You see the displeasure in Sergeis'' and Igors'' faces not being able to swallow it all...'
 	if forest_gopsex = 3:'The men order you to swallow all of the sperm. You enthusiasticly open your mouth ready to recive their loads. The men started groaning loudly and began cumming, the quantity of sperm was so overwhelming that you were not able to swallow all of it and some of drips onto your face. You see the displeasure in Kolambas'' with Vasyas'' faces not being able to swallow it all...'
-	''
+	*nl
 	gs 'arousal', 'bj', 5, 'sub', 'gangbang'
 	gs 'arousal', 'end'
 	gs 'stat'

+ 56 - 56
locations/hantersex.qsrc

@@ -35,12 +35,12 @@ if $ARGS[0] = 'sexafterstrip1':
 
 	act 'Stroke him':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi.jpg"></center>'
 		'The alcohol had dulled your sense of shame and you quickly took his cock your in hand and began to stroke it...'
 
 		act 'Put his cock in your mouth':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi1.jpg"></center>'
 			'You slowly wrap your mouth around his member...'
 			'Sensing his chance, Igor suddenly shoves his entire dick down your throat before you can protest. Tears begin to well up in your eyes...'
 			gs 'arousal', 'bj',5, 'dick[2]', 'sub', 'deepthroat'
@@ -48,14 +48,14 @@ if $ARGS[0] = 'sexafterstrip1':
 
 			act 'Suck on':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi2.jpg"></center>'
 				'Igor continues to batter your mouth, while Andrei and Sergei watch and even help him, pushing your head deeper on his cock...'
 				gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'deepthroat'
 				gs 'stat'
 
 				act 'Suck them all':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoasi1.'+rand(1,3)+'.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOasi1.'+rand(1,3)+'.jpg"></center>'
 					'Andrei and Sergei aren''t content to just watch you all night and put hands on their dicks as well. You began to suck and stroke the circle of guys around you, alternating attention to each member.'
 					gs 'arousal', 'bj', 5,'dick[1]', 'sub', 'gangbang'
 					gs 'arousal', 'bj', 5,'dick[3]', 'sub', 'gangbang'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 					act 'Lie down on your back':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaosi1.'+rand(1,2)+'.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOsi1.'+rand(1,2)+'.jpg"></center>'
 						'The guys put you on the bed and Andrei settles down between your legs, while Igor and Sergei hover over you and put their members in front of your face...'
 						gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
 						gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
@@ -73,7 +73,7 @@ if $ARGS[0] = 'sexafterstrip1':
 						
 						act 'Lie on your side':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aosi1.'+rand(1,3)+'.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOsi1.'+rand(1,3)+'.jpg"></center>'
 							'Andrei rolls you to the side and without even moving from between your legs, and Igor and Sergei reposition to put their dicks in the face again...'
 							gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
 							gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
@@ -83,7 +83,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 							act 'Get on all fours':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvioas1.'+rand(1,4)+'.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViOas1.'+rand(1,4)+'.jpg"></center>'
 								'Igor pushes you down on all fours and then moves behind you. He begins to pound you from behind with increasing frequency. Sergei and Andrei refuse to give you a rest and shove their dicks in your mouth...'
 								gs 'arousal', 'bj', 5, 'dick[3]', 'sub', 'gangbang'
 								gs 'arousal', 'bj', 5, 'dick[1]', 'sub', 'gangbang'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 								act 'Sit down':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoia1.'+rand(1,3)+'.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOia1.'+rand(1,3)+'.jpg"></center>'
 									'Sergei sits on the bed, and pulls you on top of him. Igor and Andrei adjust to this new position accordingly...'
 									gs 'arousal', 'bj', 5, 'dick[2]', 'sub', 'gangbang'
 									gs 'arousal', 'bj', 5, 'dick[1]', 'sub', 'gangbang'
@@ -103,7 +103,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 									act 'Further':
 										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi3.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi3.jpg"></center>'
 										'You continue to suck Igor, but then you feel someone''s finger begins to penetrate your ass...'
 										gs 'arousal', 'bj', 5, 'dick[2]','sub', 'gangbang'
 										gs 'arousal', 'anal_finger', 2, 'sub', 'gangbang'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'sexafterstrip1':
 										act 'Further':
 											*clr & cla
 											pcs_mood += 25
-											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi4.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi4.jpg"></center>'
 											'Andrei greased your ass with vaseline...'
 											'- Well, even so, not dry, " you thought with relief.'
 											lubri +=1
@@ -122,7 +122,7 @@ if $ARGS[0] = 'sexafterstrip1':
 
 											act 'Lie down on the ground':
 												*clr & cla
-												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaios1.'+rand(1,2)+'.jpg"></center>'
+												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAiOs1.'+rand(1,2)+'.jpg"></center>'
 												'Andrei gets on the ground and pulls you down with him. You feel his dick pop into your ass.'
 												'Igor moves in front of you and lines up on your second exposed hole.'
 												'You think, "At least I only have to suck one dick at a time now..."'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'sexafterstrip1':
 												act 'Kneel in front of the guys':
 													*clr & cla
 													minut += 1
-													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi5.jpg"></center>'
+													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi5.jpg"></center>'
 													'Without a word all three guys pull out of you and drag you to your knees.'
 													'They all begin to masturbate in front of your face, and you prepare yourself for the amount of cum that is about to cover you...'
 
@@ -150,7 +150,7 @@ if $ARGS[0] = 'sexafterstrip1':
 														gs 'cum_call','breasts',$boy[3],1,'','',20
 														swallow += 1
 														gs 'stat'
-														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi6.jpg"></center>'
+														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi6.jpg"></center>'
 														'Finally, the guys started to cum. Jets of sperm struck your face, some got in your mouth and dripped onto your breast and stomach as well...'
 
 														act 'Pass out':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'sexafterstrip3':
 
 	act 'Suck':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoi2.'+rand(0,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOi2.'+rand(0,4)+'.jpg"></center>'
 		'You wrap your lips  around Igor''s member..'
 		gs 'boyStat', 'A173' &! Igor ... need data for oral procedure
 		gs 'oral','start'
@@ -1382,7 +1382,7 @@ end
 
 if $ARGS[0] = 'hantersgrOasi':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexoasi1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/dancesexOasi1.'+rand(1,3)+'.jpg"></center>'
 	'You began to suck all the guys around you, alternating between each member.'
 	pose = 0
 	pcs_horny += rand(10,20)
@@ -1404,7 +1404,7 @@ end
 if $ARGS[0] = 'hantersgrVaOsi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaosi1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOsi1.'+rand(1,2)+'.jpg"></center>'
 	'The guys put you on the bed, Andrei gets down between your legs, while Igor and Sergei put their members in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -1430,7 +1430,7 @@ end
 if $ARGS[0] = 'hantersgrVOsi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvosi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVOsi.jpg"></center>'
 	'Andrei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -1459,7 +1459,7 @@ end
 if $ARGS[0] = 'hantersgrVaO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvao.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaO.jpg"></center>'
 	'Sergei and Igor enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1496,7 +1496,7 @@ end
 if $ARGS[0] = 'hantersgrVaOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOi.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1527,7 +1527,7 @@ end
 if $ARGS[0] = 'hantersgrVsOai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoai1.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOai1.'+rand(1,4)+'.jpg"></center>'
 	'The guys put you on the bed, Sergei gets down between your legs, while Igor and Andrei put their members in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1555,7 +1555,7 @@ end
 if $ARGS[0] = 'hantersgrVOai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvoai.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVOai.jpg"></center>'
 	'Sergei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A172'
@@ -1584,7 +1584,7 @@ end
 if $ARGS[0] = 'hantersgrVsOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOi.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1616,7 +1616,7 @@ end
 if $ARGS[0] = 'hantersgrVsO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsO.jpg"></center>'
 	'Sergei and Igor enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1654,7 +1654,7 @@ end
 if $ARGS[0] = 'hantersgrViOas':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvioas1.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViOas1.'+rand(1,4)+'.jpg"></center>'
 	'You get down on all fours. Igor begins to penetrate you from behind, while Sergei and Andrei put their members in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'hantersgrViO':
 	*clr & cla
 	pose = 1
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrViO.jpg"></center>'
 	'Sergei and Andrei enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1723,7 +1723,7 @@ end
 if $ARGS[0] = 'hantersgrVsOia':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoia1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOia1.'+rand(1,3)+'.jpg"></center>'
 	'Sergei sat down on the bed, and pulled you on top of him, while Igor and Andrei put their dicks in front of your face...'
 
 	gs 'boyStat', 'A172'
@@ -1750,7 +1750,7 @@ end
 if $ARGS[0] = 'hantersgrVsOi1':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvsoi1.1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVsOi1.1.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -1782,7 +1782,7 @@ end
 if $ARGS[0] = 'hantersgrVaOis':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaois1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOis1.'+rand(1,3)+'.jpg"></center>'
 	'Andrei sat down on the bed, and pulled you on top of him, while Igor and Sergei put their dicks in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -1810,7 +1810,7 @@ end
 if $ARGS[0] = 'hantersgrVaOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVaOs.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1841,7 +1841,7 @@ end
 if $ARGS[0] = 'hantersgrVO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrvo.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrVO.jpg"></center>'
 	'You begin to cum after the marathon of sex you have engaged in.'
 	'Seeing you cum the guys around you quickly do as well.'
 
@@ -1882,7 +1882,7 @@ end
 if $ARGS[0] = 'hantersgrV2aOsi':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aosi1.'+rand(1,3)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOsi1.'+rand(1,3)+'.jpg"></center>'
 	'Andrei put you on your side and began to get down between your legs, while Igor and Sergei stood in front of your face with their dicks waiting...'
 
 	gs 'boyStat', 'A174'
@@ -1911,7 +1911,7 @@ end
 if $ARGS[0] = 'hantersgrV2aOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrv2aos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrV2aOs.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -1941,7 +1941,7 @@ end
 if $ARGS[0] = 'hantersgrDPVaAiOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaios1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAiOs1.'+rand(1,2)+'.jpg"></center>'
 	'Andrei lays down on the couch and pulls you on top of him, Igor straddles you and lines up to penetrate your second hole, while Sergei expects you to suck his dick too...'
 	
 	gs 'boyStat', 'A174'
@@ -1968,7 +1968,7 @@ end
 if $ARGS[0] = 'hantersgrDPVaAOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrdpvaaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrDPVaAOs.jpg"></center>'
 	'After a while <<$boydesc2>> moaned and you felt like your ass fills with heat. He gets up and walks away.'
 
 	gs 'boyStat', 'A174'
@@ -1992,7 +1992,7 @@ end
 if $ARGS[0] = 'hantersgrAiOsa':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraiosa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAiOsa.jpg"></center>'
 	'The guys put you on your back, Igor spreads your legs and puts the tip of his dick against your ass, while Andrei and Sergei over you and put their members in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -2021,7 +2021,7 @@ end
 if $ARGS[0] = 'hantersgrAiO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAiO.jpg"></center>'
 	'Andrei and Sergei enjoy being sucked by you for a while before deciding they have better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2060,7 +2060,7 @@ if $ARGS[0] = 'hantersgrO3':
 	*clr & cla
 	minut += 1
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro3.'+rand(1,4)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO3.'+rand(1,4)+'.jpg"></center>'
 	'The guys drag you to your kness and surround you. They began to masturbate in front of your face, sometimes inserting their member into your mouth, and you get ready for the cum about to cover you...'
 
 	act 'Wait patiently':
@@ -2072,7 +2072,7 @@ if $ARGS[0] = 'hantersgrO3':
 		gs 'cum_call', 'mouth', $boy, 1
 		swallow += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro3cum1.'+rand(1,6)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO3cum1.'+rand(1,6)+'.jpg"></center>'
 		'Finally all the guys start to cum. Jets of sperm cover your face, hit you in the mouth and drip all over your body too...'
 
 		if hantersexnude = 0:act 'Pass out': gt 'hantersex', 'hantersGrEnd'
@@ -2083,7 +2083,7 @@ end
 if $ARGS[0] = 'hantersgrAOsa':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgraosa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrAOsa.jpg"></center>'
 	'Igor roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -2111,7 +2111,7 @@ end
 if $ARGS[0] = 'hantersgr2VaOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vaoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaOi.jpg"></center>'
 	'The guys put you on your back, Andrei spreads your legs and puts the tip of his dick against your pussy, while Igor puts his member in front of your face...'
 
 	gs 'boyStat', 'A173'
@@ -2133,7 +2133,7 @@ end
 if $ARGS[0] = 'hantersgr2VOi':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2voi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VOi.jpg"></center>'
 	'Andrei roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A173'
@@ -2157,7 +2157,7 @@ end
 if $ARGS[0] = 'hantersgr2VO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vo.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VO.jpg"></center>'
 	'The guys climax at the same time and cover you in their cum.'
 	'They get you to clean their dicks off before walking away and leaving you alone.'
 
@@ -2209,7 +2209,7 @@ end
 if $ARGS[0] = 'hantersgr2ViO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2ViO.jpg"></center>'
 	'Andrei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A172'
@@ -2237,7 +2237,7 @@ end
 if $ARGS[0] = 'hantersgr2VsO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VsO.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2266,7 +2266,7 @@ end
 if $ARGS[0] = 'hantersgr2VaOs':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vaos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaOs.jpg"></center>'
 	'Andrei put you on your side and began penetrate you from behind, while Sergei put his dick in your face...'
 
 	gs 'boyStat', 'A174'
@@ -2289,7 +2289,7 @@ end
 if $ARGS[0] = 'hantersgr2VaO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2vao.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2VaO.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2318,7 +2318,7 @@ end
 if $ARGS[0] = 'hantersgr2AiOs':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aios.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AiOs.jpg"></center>'
 	'The guys put you on your back, with Igor in between your legs, and Sergei with his dick in front of your face...'
 
 	gs 'boyStat', 'A174'
@@ -2343,7 +2343,7 @@ if $ARGS[0] = 'hantersgr2AOs':
 	*clr & cla
 	pose = 0
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aos.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AOs.jpg"></center>'
 	'Igor roughly fucks you for a while before deciding he has better things to do and unceremoniously cumming inside you...'
 
 	gs 'boyStat', 'A174'
@@ -2366,7 +2366,7 @@ end
 if $ARGS[0] = 'hantersgr2AiO':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aio.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AiO.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A174'
@@ -2396,7 +2396,7 @@ end
 if $ARGS[0] = 'hantersgr2AOi':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aoi.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AOi.jpg"></center>'
 	'Sergei enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2419,7 +2419,7 @@ end
 if $ARGS[0] = 'hantersgr2AsO':
 	*clr & cla
 	pose = 1
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2aso.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr2AsO.jpg"></center>'
 	'Igor enjoys being sucked by you for a while before deciding he has better things to do and unceremoniously cumming all over you...'
 
 	gs 'boyStat', 'A173'
@@ -2493,7 +2493,7 @@ if $ARGS[0] = 'hantersgrO2':
 	body_write += 1
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro2cum1.'+rand(1,2)+'.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO2cum1.'+rand(1,2)+'.jpg"></center>'
 	'Sergei and Igor put you on your back and begin to cum on you. A jet of sperm hit in your mouth and face and another hit your breasts and stomach. For fun, the guys wrote on your body to commemorate the event...'
 
 	act 'Pass out': gt 'hantersex', 'hantersGrEnd'
@@ -2518,7 +2518,7 @@ end
 if $ARGS[0] = 'hantersgr1Ai':
 	*clr & cla
 	pose = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1ai.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1Ai.jpg"></center>'
 	'Igor quickened his pace and you feel him cum deep inside of you.'
 	'Andrei gets up and walks away.'
 	
@@ -2532,7 +2532,7 @@ end
 
 if $ARGS[0] = 'hantersgr1Aa':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1aa.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1Aa.jpg"></center>'
 	'Andrei quickened his pace and you feel him cum deep inside of you.'
 	'Andrei gets up and walks away.'
 	
@@ -2546,7 +2546,7 @@ end
 
 if $ARGS[0] = 'hantersgr1As':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1as.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgr1As.jpg"></center>'
 	'Sergei quickened his pace and you feel him cum deep inside of you.'
 	'Sergei gets up and walks away.'
 	
@@ -2566,7 +2566,7 @@ if $ARGS[0] = 'hantersgrO1':
 	swallow += 1
 	body_write += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgro1cum.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/dance/hantersgrO1cum.jpg"></center>'
 	'Andrei put you on your back and then shot his cum all over you. Jets of sperm hit in your mouth, and on your face and hair.'
 
 	act 'Pass out': gt 'hantersex', 'hantersGrEnd'

+ 18 - 16
locations/kafe.qsrc

@@ -17,15 +17,14 @@ if $ARGS[0] = 'start':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
+
+	act 'Leave the diner': minut += 5 & gt 'street'
+
 	if QWdogReiq = 3 and week = 7 and hour >= 12:
-		act 'Sit down at the table and wait for Margaret':gt 'kafe2', 'margo'
+		act 'Sit down and wait for Margaret':gt 'kafe2', 'margo'
 	end
 
-	!!act 'Agree':gt 'cafe3', 'wc'
-
 	act 'Sit down at a table': gt 'kafe', 'table'
-
-	act 'Leave': minut += 5 & gt 'street'
 end
 
 if $ARGS[0] = 'table':
@@ -43,14 +42,15 @@ if $ARGS[0] = 'table':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if rand(1, 10) > 5:
 		gs 'boy'
 		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
 		xgt 'kafe', 'razvod'
 	end
-
-	act 'Get up from the table':gt 'kafe', 'start'
 end
 
 if $ARGS[0] = 'vlad':
@@ -851,43 +851,45 @@ if $ARGS[0] = 'razvod':
 	menu_off = 0
 	$location_type = 'event'
 	cla
-	!!*clr
-	!!act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
+
 	deyst = rand(0, 3)
 	if deyst = 0:
 		'<<$boydesc>> invites you to dance.'
-		act 'Dance':gt 'cafe2', 'dance'
+		act 'Dance with him':gt 'cafe2', 'dance'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
-		act 'Drink':gt 'cafe2', 'booze'
+		act 'Drink with him':gt 'cafe2', 'booze'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 2:
 		'<<$boydesc>> invites you to a nearby party which he is going to.'
-		act 'Agree':gt 'cafe2', 'kompashka'
+		act 'Agree to party':gt 'cafe2', 'kompashka'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 3:
 		'<<$boydesc>> is incredibly drunk and you feel tipsy just from the smell of booze on him. "Hey baby, got some spare time? Come have fun in the outhouse."'
-		act 'Agree':gt 'cafe3', 'toilet'
+		act 'Meet in bathroom':gt 'cafe3', 'toilet'
 		if pcs_horny < 95:
 			act 'Leave':
 				cla
 				if rand(0, 400) < pcs_apprnc:
 					'"Come on, baby, I will give you two thousand <b>₽</b>. Daddy wants to have fun."'
-					act 'Agree':
+					act 'Meet in bathroom':
 						money += 2000
 						gt 'cafe3', 'toilet'
 					end
 				else
 					'"Well, okay, get out of here, you are ugly anyway."'
 				end
-				act 'Fuck you': minut += 5 & gt 'street'
+				act 'Tell him to fuck off': minut += 5 & gt 'street'
 			end
 		end
 	end

+ 2 - 4
locations/kit_din.qsrc

@@ -488,11 +488,9 @@ $fatdel = {
 			else
 				pcs_hydra += 50
 			end
-			salo -= 20
-			if salo < 11: salo = 11
-			gs 'body_shape', 'softreset'
+			fat -= 20
 
-			'You drink the fat burning capsule. These capsules are quick release and results can be seen immediately.'
+			'You drink the fat burning capsule. These capsules are quick release and results can be seen soon.'
 
 			act 'Get up from the table':gt $loc, $metka
 		end

+ 6 - 6
locations/kotovtalker.qsrc

@@ -2,7 +2,7 @@
 !!!!!!!!!!!!!!!!!
 !!!Vitek Cats!!!
 !!!!!!!!!!!!!!!!!
-if numnpc = 9 and pav_slut < 25 and kotovLoveQW >= 0 and (npc_rel[$static_num] >= 80 or hotcat >= 5):
+if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num] >= 80 or hotcat >= 5):
 	if $loc = 'gdkin':
 		if alko < 3:
 			'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
@@ -89,7 +89,7 @@ if numnpc = 9 and pav_slut < 25 and kotovLoveQW >= 0 and (npc_rel[$static_num] >
 		'<<$npc_firstname[$static_num]>> "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end
-elseif kotovLoveQW > 0 and pav_slut >= 25:
+elseif kotovLoveQW > 0 and pav_slut >= 100:
 	'Vitek scowled and tells you "Well <<$pcs_nickname>>, whats this garbage I hear about what you and <<$gnikname>> did? The whole town already knows, the guys have been telling me all about it. You fucking bitch! "'
 
 	act 'Accuse him of sleeping around':
@@ -107,8 +107,8 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 		act 'Argue that it''s not true':
 			cls
 			sub += 20
-			if pav_sex > 25: pav_sex = 25
-			if pav_prostitute > 25: pav_prostitute = 25
+			if pav_sex > 100: pav_sex = 100
+			if pav_prostitute > 100: pav_prostitute = 100
 			gs 'stat'
 			'It takes a bit but you convince Vitek that all this was just gossip and none of it was true. Vitek frowned, "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry, baby I will shut their yapping mouths."'
 
@@ -117,7 +117,7 @@ elseif kotovLoveQW > 0 and pav_slut >= 25:
 		end
 	end
 elseif $loc = 'gdkin':
-	if pav_slut < 50:
+	if pav_slut < 125:
 		'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 
 		act 'Refuse':npc_rel[$static_num] -= 5 & gt $loc, $metka
@@ -135,7 +135,7 @@ elseif $loc = 'gdkin':
 
 			act 'Move away':gt $loc, $metka
 		end
-	elseif pav_slut >= 50:
+	elseif pav_slut >= 125:
 		'<<$npc_firstname[$static_num]>> "Then what the fuck are you doing here cumwhore? Came to suck some dick?"'
 
 		act 'Leave':npc_rel[$static_num] -= 5 & gt $loc, $metka

+ 7 - 7
locations/lakecafe.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'main':
 	'Opening hours: 14:00 to 04:00'
 	*nl
 
+	act 'Leave the cafe':minut += 2 & gt 'nord'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			if barrnd = 1:'Behind the bar you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently polishing some glasses.'
@@ -60,17 +62,15 @@ if $ARGS[0] = 'main':
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 
-		act 'See the menu':gs 'food_menu'
+		act 'Order from the menu (0:05)':gs 'food_menu'
 		if money >= 350:
-			act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+			act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 		end
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:
-		act 'Offer to help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
+		act 'Help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
 	end
-
-	act 'Leave':minut += 2 & gt 'nord'
 end
 
 if $ARGS[0] = 'barmensha':
@@ -104,6 +104,8 @@ if $ARGS[0] = 'barmensha':
 		'Eugene smiles as she sees you approach the bar, and says cheerfully: "Hi, <<$pcs_nickname>>! What''s up?"'
 	end
 
+	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			act 'Chat with the barmaid (0:30)':
@@ -329,8 +331,6 @@ if $ARGS[0] = 'barmensha':
 		end
 	end
 
-	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
-
 	if npc_horny['A89'] > 50:
 		'Eugene smiles at you, with a glimmer in her eye.'
 		if LCEugenefirst > 0:

+ 9 - 5
locations/liamelkafe.qsrc

@@ -9,7 +9,11 @@ if $ARGS[0] = 'start':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
+	*nl
 	'You enter a tiny cafe, consisting of very little floor space packed with small tables.'
+
+	act 'Leave the cafe':gt 'liames'
+
 	if hour > 11 and hour < 13:
 		'The cafe is packed with people eating their afternoon meal.'
 		if stallionQ = 1: stallionQ = 2
@@ -20,7 +24,6 @@ if $ARGS[0] = 'start':
 	if money > 45:
 		act 'Sit down for a meal': money -= 45 & gt 'liamelkafe', 'food'
 	end
-	act 'Leave':gt 'liames'
 end
 
 if $ARGS[0] = 'food':
@@ -32,9 +35,11 @@ if $ARGS[0] = 'food':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Leave the table':gt 'liamelkafe', 'start'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if stallionQ = 2:
-		if FocH > (Foch_Max - 10): 
+		if FocH > (Foch_Max - 10):
 			stallionQ = 3
 			FocH = Foch_Max
 			EggRH += 300
@@ -44,8 +49,7 @@ if $ARGS[0] = 'food':
 	end
 	'The tiny cafe is wonderfully situated and you enjoy the beautiful scenery as you eat.'
 	if stallionQ = 0: StallionQ = 1
-	
-	act 'Leave the table':gt 'liamelkafe', 'start'
+
 end
 
 --- liamelkafe ---------------------------------

+ 6 - 6
locations/lover_meet.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'start':
 					else
 						'This should not fire off at all: TongueKiss'
 					end
-				elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pervConstant = 1 and loverGender[lover_number] = 0:
+				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1) and pervConstant = 1 and loverGender[lover_number] = 0:
 					if cumloc[11] = 1:
 						if haraklover[lover_number] = 0:
 							loverrelation[lover_number] += 2
@@ -209,7 +209,7 @@ if $ARGS[0] = 'start':
 							'<<$tXec>> can see sperm on your ass, but by the bulge in <<$tXyr>> pants you know it only turns <<$tXem>> on.'
 						end
 					end
-				elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and (pervConstant ! 1 or loverGender[lover_number] = 0):
+				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1) and (pervConstant ! 1 or loverGender[lover_number] = 0):
 					if cumloc[11] = 1:
 						gs 'lover', 'remove', lover_number
 						'<<$tXec>> notices the sperm on your face, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you out of <<$tXyr>> face. "We are through, I don''t want to see your face again!'
@@ -250,7 +250,7 @@ if $ARGS[0] = 'start':
 						gs 'arousal', 'kiss', 5
 						gs 'stat'
 					end
-				elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[12] = 1 and pervConstant = 1:
+				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1 or cumloc[12] = 1) and pervConstant = 1:
 					if cumloc[11] = 1:
 						if haraklover[lover_number] = 0:
 							loverrelation[lover_number] += 2
@@ -296,7 +296,7 @@ if $ARGS[0] = 'start':
 						end
 					end
 				else 
-					if cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pervConstant ! 1:
+					if (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1) and pervConstant ! 1:
 						if cumloc[11] = 1:
 							gs 'lover', 'remove', lover_number
 							'<<$tXec>> notices the sperm on your face, "<<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you out of <<$tXyr>> face. "We are through, I don''t want to see your face again!'
@@ -338,7 +338,7 @@ if $ARGS[0] = 'start':
 						gs 'arousal', 'kiss', 5
 						gs 'stat'
 					end
-				elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[12] = 1 and pervConstant = 1:
+				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1 or cumloc[12] = 1) and pervConstant = 1:
 					if cumloc[11] = 1:
 						if haraklover[lover_number] = 0:
 							loverrelation[lover_number] += 2
@@ -368,7 +368,7 @@ if $ARGS[0] = 'start':
 							'<<$tXec>> can see sperm on your ass, but by the bulge in <<$tXyr>> pants you know it only turns <<$tXem>> on.'
 						end
 					end
-				elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pervConstant ! 1:
+				elseif (cumloc[11] = 1 or cumloc[6] = 1 or cumloc[7] = 1) and pervConstant ! 1:
 					if cumloc[11] = 1:
 						gs 'lover', 'remove', lover_number
 						'<<$tXec>> notices the sperm on your face, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$tXe>> then pushes you out of <<$tXyr>> face. "We are through, I don''t want to see your face again!'

+ 57 - 64
locations/mirror.qsrc

@@ -83,6 +83,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	act 'Move away from the mirror':gt 'mirror','fin'
+	
 	! WD: Cheat Unused ~ 'AutoLipBalm'
 
 	!! Added the makeup setting.
@@ -197,8 +199,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-
-
 !	if (pcs_makeup <= 1 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
 !		act 'Do the works': gt 'mirror', 'works'
 !	end
@@ -219,71 +219,63 @@ if $ARGS[0] = 'start':
 !		'Currently the level you have set is for thick make-up.'
 !	end
 
-if $routine1 ! '':
-
-	'Make-up routine 1 is called ''<<$routine1custname>> ''and consists of : '
-	if mid($routine1,1,1) = 0:'No make-up'
-	if mid($routine1,1,1) = 1:'Light make-up'
-	if mid($routine1,1,1) = 2:'Vibrant make-up'
-	if mid($routine1,1,1) = 3:'Thick make-up'
-	if mid($routine1,2,1) = 0:'No Lipbalm'
-	if mid($routine1,2,1) = 1:'Lipbalm'
-	if mid($routine1,3,1) = 0:'No fake lashes'
-	if mid($routine1,3,1) = 1:'Normal fake lashes'
-	if mid($routine1,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine2 ! '':
-
-	'Make-up routine 2 is called ''<<$routine2custname>>'' and consists of : '
-	if mid($routine2,1,1) = 0:'No make-up'
-	if mid($routine2,1,1) = 1:'Light make-up'
-	if mid($routine2,1,1) = 2:'Vibrant make-up'
-	if mid($routine2,1,1) = 3:'Thick make-up'
-	if mid($routine2,2,1) = 0:'No Lipbalm'
-	if mid($routine2,2,1) = 1:'Lipbalm'
-	if mid($routine2,3,1) = 0:'No fake lashes'
-	if mid($routine2,3,1) = 1:'Normal fake lashes'
-	if mid($routine2,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine3 ! '':
-
-	'Make-up routine 3 is called ''<<$routine3custname>>'' and consists of : '
-	if mid($routine3,1,1) = 0:'No make-up'
-	if mid($routine3,1,1) = 1:'Light make-up'
-	if mid($routine3,1,1) = 2:'Vibrant make-up'
-	if mid($routine3,1,1) = 3:'Thick make-up'
-	if mid($routine3,2,1) = 0:'No Lipbalm'
-	if mid($routine3,2,1) = 1:'Lipbalm'
-	if mid($routine3,3,1) = 0:'No fake lashes'
-	if mid($routine3,3,1) = 1:'Normal fake lashes'
-	if mid($routine3,3,1) = 2:'Mink fake lashes'
-	''
-end
-
-if $routine4 ! '':
-
-	'Make-up routine 4 is called ''<<$routine4custname>>'' and consists of : '
-	if mid($routine4,1,1) = 0:'No make-up'
-	if mid($routine4,1,1) = 1:'Light make-up'
-	if mid($routine4,1,1) = 2:'Vibrant make-up'
-	if mid($routine4,1,1) = 3:'Thick make-up'
-	if mid($routine4,2,1) = 0:'No Lipbalm'
-	if mid($routine4,2,1) = 1:'Lipbalm'
-	if mid($routine4,3,1) = 0:'No fake lashes'
-	if mid($routine4,3,1) = 1:'Normal fake lashes'
-	if mid($routine4,3,1) = 2:'Mink fake lashes'
-	''
-end
+	if $routine1 ! '':
+		'Make-up routine 1 is called ''<<$routine1custname>> ''and consists of : '
+		if mid($routine1,1,1) = 0:'No make-up'
+		if mid($routine1,1,1) = 1:'Light make-up'
+		if mid($routine1,1,1) = 2:'Vibrant make-up'
+		if mid($routine1,1,1) = 3:'Thick make-up'
+		if mid($routine1,2,1) = 0:'No Lipbalm'
+		if mid($routine1,2,1) = 1:'Lipbalm'
+		if mid($routine1,3,1) = 0:'No fake lashes'
+		if mid($routine1,3,1) = 1:'Normal fake lashes'
+		if mid($routine1,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
+	if $routine2 ! '':
+		'Make-up routine 2 is called ''<<$routine2custname>>'' and consists of : '
+		if mid($routine2,1,1) = 0:'No make-up'
+		if mid($routine2,1,1) = 1:'Light make-up'
+		if mid($routine2,1,1) = 2:'Vibrant make-up'
+		if mid($routine2,1,1) = 3:'Thick make-up'
+		if mid($routine2,2,1) = 0:'No Lipbalm'
+		if mid($routine2,2,1) = 1:'Lipbalm'
+		if mid($routine2,3,1) = 0:'No fake lashes'
+		if mid($routine2,3,1) = 1:'Normal fake lashes'
+		if mid($routine2,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
-	gs 'stat'
+	if $routine3 ! '':
+		'Make-up routine 3 is called ''<<$routine3custname>>'' and consists of : '
+		if mid($routine3,1,1) = 0:'No make-up'
+		if mid($routine3,1,1) = 1:'Light make-up'
+		if mid($routine3,1,1) = 2:'Vibrant make-up'
+		if mid($routine3,1,1) = 3:'Thick make-up'
+		if mid($routine3,2,1) = 0:'No Lipbalm'
+		if mid($routine3,2,1) = 1:'Lipbalm'
+		if mid($routine3,3,1) = 0:'No fake lashes'
+		if mid($routine3,3,1) = 1:'Normal fake lashes'
+		if mid($routine3,3,1) = 2:'Mink fake lashes'
+		''
+	end
 
-	act 'Move away from the mirror':gt 'mirror','fin'
+	if $routine4 ! '':
+		'Make-up routine 4 is called ''<<$routine4custname>>'' and consists of : '
+		if mid($routine4,1,1) = 0:'No make-up'
+		if mid($routine4,1,1) = 1:'Light make-up'
+		if mid($routine4,1,1) = 2:'Vibrant make-up'
+		if mid($routine4,1,1) = 3:'Thick make-up'
+		if mid($routine4,2,1) = 0:'No Lipbalm'
+		if mid($routine4,2,1) = 1:'Lipbalm'
+		if mid($routine4,3,1) = 0:'No fake lashes'
+		if mid($routine4,3,1) = 1:'Normal fake lashes'
+		if mid($routine4,3,1) = 2:'Mink fake lashes'
+		''
+	end
 	
+	gs 'stat'	
 end &! --- start ---
 
 
@@ -317,6 +309,8 @@ $createcustroutine = {
 	
 	$routine = str(makeupSetting) + str(custlipbalm) + str(custlashes)
 	
+	act 'Exit':gt 'mirror','start'
+	
 	if $routine1 ! '':
 		act 'Remove <<$routine1custname>>':
 			killvar '$routine1'
@@ -385,7 +379,6 @@ $createcustroutine = {
 			'max 4 routines allowed, please remove one before adding a new one'
 		end
 	end
-	act 'exit':gt 'mirror','start'
 }
 
 

+ 10 - 10
locations/nyp_school.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 					act 'Drink some more':pcs_hydra += 10 & gt 'nyp_school', 'drink more'
 					if grupTipe = 5:
 						!!If Sveta is a outcast this should be the only option and the above options should not show up, if Sveta is a outcast. If Sveta is not a outcast then the go stand against the wall alone should not show up.
-						act 'Go stand against the wall alone.':gt 'nyp_school', 'outcast'
+						act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 					else
 						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
 						act 'Hangout with the nerds':gt 'nyp_school', 'nerds'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'gopniks':
 			act 'Hangout until the party ends':gt 'nyp_school', 'end'
 		end
 	end
-	act 'Go pick on someone.':
+	act 'Go pick on someone':
 		cla & *clr
 		minut += 5
 		gs 'stat'
@@ -970,10 +970,10 @@ end
 if $ARGS[0] = 'slut':
 	*clr & cla
 	gs 'stat'
-	'Once in the bathroom Vasily immediately pulls down his pants and says, "Suck my cock bitch.I know that you''ve been anticipating this the whole party."'
+	'Once in the bathroom Vasily immediately pulls down his pants and says, "Suck my cock bitch. I know that you''ve been anticipating this the whole party."'
 	act 'Suck him off':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolbj.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snybj.jpg"></center>'
 		'You kneel down infront of Vasily and begin sucking his cock. After a few moments you hear the door open and a few guys from your class wander in. Before you know it all the boys in your class, except Kotova, who was rumored to have already passed out, are surrounding you. You hear someone unzipping their fly, pulling out their cock. Shortly thereafter the others follow suit.'
 		$rand_boy = $npc_firstname['A9']
 		pav_sex += 60
@@ -984,7 +984,7 @@ if $ARGS[0] = 'slut':
 		act 'Serve classmates':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolfilming.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyfilming.jpg"></center>'
 			'You slurp on one cock in your mouth, while you use your hands to jerk off two others, casually looking up you see that Nosov has taken out a camera and started filming it all. "Don''t worry, <<$pcs_nickname>> this is for all our private collections. I''m sure no one will spread this video around." he winks.'
 			gs 'gschool_events', 'rand_boy_arg1',1,2
 			gs 'boyStat', $static_num, '2'
@@ -998,7 +998,7 @@ if $ARGS[0] = 'slut':
 			act 'Try to please them all':
 				*clr & cla
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang.jpg"></center>'
 				'You suck more cocks than you can count, constantly changing from one to another while always making sure that you''re jerking off two others. You completely lose track of how many guys there are, all you know is that they''re surrounding you and are awaiting their turn as they hold their bare cocks out.'
 				gs 'gschool_events', 'rand_boy_arg1',3,4
 				gs 'boyStat', $static_num, '4'
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'slut':
 				act 'Keep doing it':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang2.jpg"></center>'
 					'Some of them grow tired of waiting and start slapping their cocks against your head and face as they await for your mouth or one of your hands to become available. By now you''re starting to feel fatigued as your mouth and hands are already getting tired.'
 					gs 'gschool_events', 'rand_boy_arg1',1,2
 					gs 'boyStat', $static_num, '6'
@@ -1026,7 +1026,7 @@ if $ARGS[0] = 'slut':
 					act 'Struggle through':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolblowbang3.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyblowbang3.jpg"></center>'
 						'Your jaw starts to ache from sucking so many cocks, but the guys aren''t easing up as they continue to pile on. You look at them pleadingly but they just turn away as they tell you that they won''t fall for your tricks as everyone knows that you''ve done this many times before.'
 						gs 'gschool_events', 'rand_boy_arg1',1,2,3,4
 						gs 'boyStat', $static_num
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'slut':
 						gs 'stat'
 						act 'Keep sucking':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/nyp_schoolcum.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snycum.jpg"></center>'
 							'Just as you''re about to break, you finally feel one of them twitch inside the mouth and cums in it. All of a sudden you feel another shoot his sperm onto your face and so begin the rest of them to cum. It''s like everyone waited for the first one to finish just so they wouldn''t last the least. By the time the last one finishes you have lost count of the number of mouth fulls of cum you swallowed and leaving your face completely covered in sperm.'
 							minut += 15
 							gs 'cum_call', 'mouth', $boy, 1
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'drink more':
 	gs 'stat'
 	if grupTipe = 5:
 		!!If Sveta is a outcast this should be the only option and the above options should not show up, if Sveta is a outcast. If Sveta is not a outcast then the go stand against the wall alone should not show up.
-		act 'Go stand against the wall alone.':gt 'nyp_school', 'outcast'
+		act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 	else
 		act 'Drink some more':gt 'nyp_school', 'drink more'
 		act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'

+ 9 - 2
locations/obj_din.qsrc

@@ -160,27 +160,34 @@ if $ARGS[0] = 'description':
 	'You are <<pcs_hgt>>cm tall and <a href="exec:gs ''obj_din'', ''show_body''"><<$body>></a>.'
 	'Your breasts would be considered an EU <a href="exec:gs ''obj_din'', ''show_tits''"><<$titsize>></a>.'
 	'<<$nipplesize>>'
-
+	*nl
 	if preg = 1:
 		if denypreg = 1 and pregtime > 75:
 			'You seem to be putting on a bit of weight, your belly is definitely bigger.'
+			*nl
 		elseif pregtime > 196:
 			'You''re rapidly approaching the finish line and have entered the third trimester. Your belly is so big now that you can barely remember what your toes look like. Your back hurts most of the time and it is a struggle to get to your feet if you sit down. The baby seems to think that your bladder makes a nice punching bag.'
+			*nl
 		elseif pregtime > 130:
 			'Your belly is quite swollen now and shows under even the loosest of clothes. You find yourself constantly caressing your belly without realizing it.'
+			*nl
 		elseif pregtime > 90 and knowpreg = 1:
 			'You are showing for sure now. Your tummy is starting to become rounder as it grows larger each day, although you can still wear baggy clothes to hide it. At least the morning sickness and nausea seem to have gone away for the most part.'
+			*nl
 		elseif pregtime > 90 and knowpreg = 0:
 			'You can''t seem to stop gaining weight and your belly looks like it is getting bigger everyday, although you can still wear baggy clothes to hide it. At least the flu you''ve been fighting lately seems to have finally gone away for the most part.'
+			*nl
 		elseif pregtime > 75 and knowpreg = 1:
 			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach. Speaking of your stomach, you can definitely feel a baby bump now, although it is still hard to see.'
+			*nl
 		elseif pregtime > 75 and knowpreg = 0:
 			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach. Speaking of your stomach, you have developed a bit of a paunch, although it is still hard to see.'
+			*nl
 		elseif pregtime > 50:
 			'You''ve noticed that your breasts seem firmer lately and your nipples seem to be sticking out more.'
+			*nl
 		end
 	end
-
 	'<<$lip>>'
 	'<<$pcs_throat>>'
 	'<<$skin>>'

+ 3 - 1
locations/pavCommercial.qsrc

@@ -139,7 +139,9 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
-act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
+
+act 'Walk to the train station':minut += 15 & gt 'pavtrain'
 
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 

+ 1 - 1
locations/pavComplex.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if home_owned[2] = 1: act '<b>Go home</b> (Parents'' Apartment)': minut += 5 & GT 'korrPar'
-	act 'Return to the residential street':minut += 2 & gt 'pavResidential'
+	act 'Walk to the residential street':minut += 2 & gt 'pavResidential'
 	act 'Go to the Southern apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	act 'Go to the Eastern apartment building':
 		minut += 1

+ 5 - 4
locations/pavResidential.qsrc

@@ -185,11 +185,12 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-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'
+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 += 2 & gt 'pavcomplex', 'start'
+act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+
+act 'Walk to the apartment complex':minut += 2 & gt 'pavcomplex', 'start'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 5 - 33
locations/pavSharedApt.qsrc

@@ -765,10 +765,10 @@ if $ARGS[0] = 'pcsRoom':
 	end
 
 	if vcard > 0:
-		act 'Look at your deck of vintage porn cards':card_deck = 0 & gt 'card'
+		act 'View your vintage porn cards':card_deck = 0 & gt 'card'
 	end
 	if card > 0:
-		act 'Look at your deck of new porn cards':card_deck = 1 & gt 'card'
+		act 'View your new porn cards':card_deck = 1 & gt 'card'
 	end
 
 	if dur > 0:'You have <<dur>> doses of Pale Lady, hidden from the other housemates.'
@@ -846,38 +846,10 @@ if $ARGS[0] = 'pcsRoom':
 	dynamic $wearpan
 	dynamic $removepan
 	!gs 'subkid'
-	if pcs_sleep <= 80:
-		if $clothingworntype = 'nude':
-			$sleep_txt = 'Go to sleep'
-		else
-			$sleep_txt = 'Undress and go to sleep'
-		end
-		if succubusQW = 2:
-			act '<<$sleep_txt>>':
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				gt 'bed2', 'succhoice'
-			end
-		else
-			act '<<$sleep_txt>>':
-				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
-					else
-						savegame 'autosave_alt.sav'
-					end
-				end
-				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
-				if magf2bdo = 2:
-					gt 'bed2', 'magbstchoice'
-				else
-					gt 'bed2', 'sleep'
-				end
-			end
-			killvar '$sleep_txt'
-		end
-	end
-end
 
+	act 'Relax on your bed': gt 'bed', 'start'
+end
+	
 if $ARGS[0] = 'sofabed':
 	$menu_loc = 'pavSharedApt'
 	$menu_arg = 'sofabed'

+ 7 - 3
locations/pavtrain.qsrc

@@ -1,6 +1,10 @@
 # pavtrain
-$metka = $ARGS[0]
-$loc = $CURLOC
+
+$loc = 'pavtrain'
+$metka = ''
+$menu_loc = 'pavtrain'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'public_outdoors'
 CLOSE ALL
 if sound = 0:
@@ -152,7 +156,7 @@ end
 gs 'family'
 
 act 'Enter the train station': gt 'pavtrainhall'
-act 'Go to Pavlovsk high street':minut += 15 & gt 'pavCommercial'
+act 'Walk to the commerical area':minut += 15 & gt 'pavCommercial'
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 
 --- pavtrain ---------------------------------

+ 6 - 7
locations/poli.qsrc

@@ -145,8 +145,8 @@ if $ARGS[0] = 'start':
 			thinkpreg = 0
 			knowpreg = 0
 			cycle = 4
-			RecovH = rand(7,70)
-			RecovH += pregchem
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~2-3 weeks
+			RecovH = rand(375,575) 
 			pregchem = 0
 			knowpregloss = 2
 			abortrand = rand(0, 10)
@@ -199,7 +199,6 @@ if $ARGS[0] = 'start':
 		act 'Give birth':
 			*clr & cla
 			menu_off = 1
-			cnt = 0
 			if kid > 0:minut += rand(300,660) else minut += rand(120,480)
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
 			'You lay on the bed and your feet are put in stirrups.'
@@ -209,7 +208,6 @@ if $ARGS[0] = 'start':
 				sterilewb += 1
 				nextbaby = arrpos('$kidname', 'unborn')
 				kid += 1
-				cnt += 1
 				BabyEmbryo -= 1
 				daykid[nextbaby] = day
 				monthkid[nextbaby] = month
@@ -226,15 +224,16 @@ if $ARGS[0] = 'start':
 				end
 			if BabyEmbryo > 0:'You do not have much time to stare at your <<$polreb[nextbaby]>>, because you are having an another contraction. Your next baby is coming!' & jump 'multikidloop'
 			preg = 0
-			RecovH = rand(7*cnt,70)
-			abortionbirthdate = daystart
+			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
+			RecovH = rand(1175,1875)
+			pregbirthdate = daystart
 			thinkpreg = 0
 			knowpreg = 0
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
+			pregchem = 0
 			cycle = 4
-			killvar 'cnt'
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice
 			gs 'stat'

+ 689 - 0
locations/preCSB.qsrc

@@ -0,0 +1,689 @@
+# preCSB
+
+music_loop = 0
+CLOSE ALL
+gs 'themes', 'indoors'
+
+!!-------
+!! Intro
+!!-------
+
+if $ARGS[0] = 'intro_0':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'	
+	'You are Peter Ivanov.'
+	'<<$startdob>>'
+	'Your parents died shortly after you were born. Your only remaining relative, your great uncle Ivan, took you in. Your uncle has always made it clear that he took you in as a courtesy to your parents, not to become one himself. You two never became close, causing a lonely childhood.'
+
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/csb/ivan3csb.jpg"></center>'
+		'You had a pleasant, undisturbed childhood when you were young. Although you don''t remember much from kindergarten, you do remember going to elementary school when you were 7 years old. While you wanted your uncle to act like the fathers of the other kids at school, you were never allowed to call him anything else than "sir."'
+		
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pre/csb/ivan4csb.jpg"></center>'
+			'Your teenage years were beset by the same changes as the rest of the boys your age: You got taller and gained a lot of muscle, your shoulders widened, your voice squeaked until it deepened, and hair sprouted from everywhere on your body.' 
+			'You spent most of the last few years in a near-constant state of arousal, set off just by as little as a suggestively shaped vegetable. Thankfully the awkward changes and acne have started to subside, leaving you looking like the young man you will be.'
+		
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pre/csb/ivan5csb.jpg"></center>'
+				'During the last winter break, you decided to enjoy a Christmas party at a friend of a friend''s house. An incident involving a spiked punch bowl, mistletoe, and a drunken dare led to a picture of you kissing another man being circled around. Everything went downhill from there. Now everyone thinks that you are gay, regardless of your protests.'
+				'Everyone you knew quickly turned on you; nothing you could say worked to change their minds. You became an outcast and received regular beatings from the other guys.'
+
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'
+					'A few days after the incident, you came home to find a livid Uncle Ivan. He grabs you by the collar and pins you against the wall, spittle hitting you as he screams into your face.'
+					'"What''s this I''m hearing about you being a fucking faggot?! What''s wrong with you? What, you want to suck cock you fucking fairy?!"'
+					act 'No!': gt 'preCSB', 'intro_1_straight'
+					act 'No! (Lie)': gt 'preCSB', 'intro_1_bi'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'intro_1_straight':
+	*clr & cla
+	csb_bisexual = 0
+	'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'
+	'You protest your innocence. It was just a drunken prank, nothing more. You manage to impress upon your uncle the truth, but he is still furious, more at the damage you are causing [i]his[/i] reputation than anything else. He gives you an ultimatum: undo the damage you have done by proving your masculinity.'
+	'You have to convince a girl to have sex with you and post pictures by the end of the summer. If you fail, you will be disowned and have to fend for yourself.'
+	
+	act 'Continue': gt 'preCSB', 'intro_2_name'
+end
+
+if $ARGS[0] = 'intro_1_bi':
+	*clr & cla
+	csb_bisexual = 1
+	'<center><img <<$set_imgh>> src="images/pre/csb/bisexualcsb.jpg"></center>'
+	'You can''t tell him the truth. You''ve always enjoyed the sight of muscular men just as much as half-naked women.'
+	'But being a gay man, or even a bisexual one, in Russia is a death sentence. You''ve played the part all your life, trying to blend in by pretending to only like girls.'
+	'All it took was one moment of drunken weakness and your carefully constructed facade came crumbling down around you. And given the look on your Uncle Ivan''s face, that mistake will cost you dearly.'
+
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/csb/ivancsb.jpg"></center>'
+		'You somehow manage to deceive your uncle. Maybe he believes you, or maybe he just wants to, but he believes that it is only a drunken prank gone wrong. He is still furious, but it is more at the damage you are causing [i]his[/i] reputation than anything else.'
+		'He gives you an ultimatum: undo the damage you have done by proving your masculinity. You have to convince a girl to have sex with you and post pictures by the end of the summer. If you fail, you will be disowned and have to fend for yourself.' 
+
+		act 'Continue': gt 'preCSB', 'intro_2_name'
+	end
+end
+
+if $ARGS[0] = 'intro_2_name':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/pre/csb/mockingcsb.jpg"></center>'
+	'Unfortunately your reputation is in tatters. You''ve become the school outcast, no girl will give you the time of day, let alone agree to sleep with you. Out of desperation you turn to the Internet, fruitlessly looking for months before you finally manage to come across a girl from the nearby town of Pavlovsk.'
+	
+	act 'Her name is ...':
+		$pcs_firstname = 'Svetlana'
+		$pcs_lastname = 'Lebedev'
+		$pcs_nickname = 'Sveta'
+
+		!!Player names are set here
+		$temp_firstname = '<<$pcs_firstname>>'
+		$pcs_firstname = input("What is the girls first name? (Leave blank for Svetlana)")
+		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
+		killvar '$temp_firstname'
+
+		$temp_lastname = '<<$pcs_lastname>>'
+		$pcs_lastname = input("What is the girls name? (Leave blank for Lebedev)")
+		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
+		killvar '$temp_lastname'
+
+		$temp_nickname = '<<$pcs_nickname>>'
+		$pcs_nickname = input("What the girls nickname? (Leave blank for Sveta)")
+		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+		killvar '$temp_nickname'
+		
+		gt 'preCSB', 'intro_3'
+	end
+end
+
+if $ARGS[0] = 'intro_3':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/pre/csb/start7csb.jpg"></center>'
+	'Her name is <<$pcs_firstname>> "<<$pcs_nickname>>" <<$pcs_lastname>>. She was born on the same day as you, [Selectable Text: Birthday MM/DD/YYYY]. She has no friends in her home town, a result of not being a particularly outgoing or beautiful girl.'
+	'She enthusiastically responds to your messages, eager to finally have someone to talk to. You can''t believe your luck; this might be your saving grace.'
+	'You spend the next few weeks messaging back and forth. <<$pcs_nickname>> appears to crave your attention, telling you all about her life as well as her likes and dislikes.'
+	
+	act 'Continue': gt 'preCSB', 'intro_4'
+	
+	act 'Re-enter her names':
+		$pcs_firstname = 'Svetlana'
+		$pcs_lastname = 'Lebedev'
+		$pcs_nickname = 'Sveta'
+
+		!!Player names are set here
+		$temp_firstname = '<<$pcs_firstname>>'
+		$pcs_firstname = input("What is the girls first name? (Leave blank for Svetlana)")
+		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
+		killvar '$temp_firstname'
+
+		$temp_lastname = '<<$pcs_lastname>>'
+		$pcs_lastname = input("What is the girls name? (Leave blank for Lebedev)")
+		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
+		killvar '$temp_lastname'
+
+		$temp_nickname = '<<$pcs_nickname>>'
+		$pcs_nickname = input("What the girls nickname? (Leave blank for Sveta)")
+		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+		killvar '$temp_nickname'
+		
+		gt 'preCSB', 'intro_3'
+	end
+end
+
+if $ARGS[0] = 'intro_4':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/pre/sys/altstart.jpg"></center>'
+	'You find out about her mother Natasha, and how her biological father left before she was born. Her mother remarried shortly afterwards to a man called Vladimir.'
+	'She has a sister named Anya who is two years older than her. Anya chose to live at home instead of going to college, working at the local grocery in the day and partying at night.'
+	'<<$pcs_nickname>> has a half-brother Kolka, who is a year younger than her and really into football.'
+	'Her mother''s sister, Aunt Luda, lives on the top floor of the same building as her. Her stepfather''s best friend is called Uncle Misha, who lives across the hall. Her mother''s old friend Sergey Shulgin lives on the floor above them, and <<$pcs_nickname>>''s old childhood friend Vasily is his son.'
+	'Her grandparents live in a nearby village, where she occasionally spends a weekend.' 
+	'You listen to her complaining about her extended family and about how she and Vasily drifted apart, comforting her as best you can. Yet you can''t help but feel a little jealous at how many caring relatives she has, given that your only relation is a great uncle who is about to kick you onto the streets for the sake of his own reputation.'
+	'You do the best you can to repress any resentment towards <<$pcs_nickname>> about how little she appreciates what she has.'
+
+	act 'When she talks about her mother, she calls her ...':
+		$npc_nickname['A29'] = input('<center>What name does she use to address her mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+		
+		gt 'preCSB', 'intro_5'
+	end
+end
+
+if $ARGS[0] = 'intro_5':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/pre/csb/talkingcsb.jpg"></center>'
+	'A couple months pass. You and <<$pcs_nickname>> continue to talk, and you learn even more about her life, from her envy of the confidence of the gopnik Anushka to her secret crush on the athlete Fedor.'
+	'In a short while, <<$pcs_nickname>> develops a massive crush on you, as you are the only boy who has ever paid any attention to her. As [If starting in August, add line "the end of"] summer break approaches, you bring up the idea of meeting up. <<$pcs_nickname>> is excited at the prospect and you agree to meet at the café where her mother works.'
+
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/csb/start6csb.jpg"></center>'
+		'Things at home haven''t been doing so well during this time.'
+		'Instead of the rumors dying, they have kept escalating over time. You''ve had to plan your routes home from school to avoid spots where you will be cornered and beaten. More than once you''ve gotten garbage thrown at you, and your uncle has become furious from the snide comments made about him by his coworkers.'
+		'You were quickly kicked out of any groups you used to spent time with, ending up with no friends. You find yourself hiding in your room most days, messaging <<$pcs_nickname>>. You live for the hope that after you meet up with <<$pcs_nickname>> everything will go back to normal. Just a few more days...'
+
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pre/csb/brokenwindowcsb.jpg"></center>'
+			'The morning before you are set to meet up with <<$pcs_nickname>>, someone throws a brick through your window. This proves to be the last straw for your uncle, who tosses you out then and there. You barely manage to tell him about the impending meeting, prompting him to give you one last chance, "Either you come back with photos, or you won''t come back at all."'
+			
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pre/csb/leavingcsb.jpg"></center>'
+				'You pack up condoms and some spare cash into a backpack, heading off to the train station to get laid.' 
+				'On the train ride to Pavlovsk, you get a message from <<$pcs_nickname>>. Her parents have taken her to spend time with her grandparents in Gaduyinko. She is unable to get out of the trip, since her mother has been upset at how she has been spending so much time on her phone and not with her family.' 
+				'With no other choice, you buy a second ticket to meet her at Gaduyinko. This is your last shot to regain your old life; you can''t let this chance slip through your fingers.'
+				
+				act 'Travel to Gaduyinko':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg"></center>'			
+					'You get off the train next to a small road in the middle of nowhere. A dirt road leads to a small village made up of rickety wooden houses and even more ruined ones. Unsure of which house is <<$pcs_nickname>>''s grandparent''s, you pull out your phone to text her that you have arrived.'
+					'A few minutes later, an excited teenage girl comes rushing down one of the dirt roads. You double-check a picture of <<$pcs_nickname>> on your phone, as this is the first time you have seen her with your own eyes.'
+
+					act 'Take a look at her picture': gt 'preCSB', 'intro_6_looks'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'intro_6_looks':
+	*clr & cla
+	if player_avatar = 1:
+		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
+		'She looks exactly like in the picture she send you.'
+		act 'Meet her': gt 'preCSB', 'intro_7'
+	else
+		'<center><b><font color = maroon>GIRLFRIEND CUSTOMIZATION</font></b></center>'
+		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		*nl
+		
+		'<center><a href="exec:gs ''preCSB'', ''hair''"><img src="images/pre/shared/hair icon.png"></a> <a href="exec:gs ''preCSB'', ''eyes''"><img src="images/pre/shared/eye icon.png"></a></center>'
+		
+		act '<b>Finish customization</b>': gt 'preCSB', 'intro_7'
+	end
+end
+
+if $ARGS[0] = 'intro_7':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	'She''s shorter than you but rather tall for a woman, with a body that is neither too fat nor especially skinny. On her chest rest a pair of decently-sized breasts. Her <<$curly>><<$pcdesc_hairlength>> hair is <<$pcs_haircol>>.'
+	'She has <<$pcs_eyecol>> eye with <<$pcs_lashes>>'+iif(glass > 0, ' hidden behind a pair of cheap glasses.', '.')
+	'She looks like she has spent some time in front of the mirror trying to pretty herself up, and her clothes are very clean. Despite that, she still looks rather average. Like she is the type of girl that would be a background character in another person''s life. Little wonder she isn''t very popular.'
+	
+	act 'Go for a walk':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'	
+		'You both walk along a dirt road heading through grain fields and towards a forest. <<$pcs_nickname>> is holding your hand and keeps babbling on, asking you question after question.'
+		
+		act 'Keep walking':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pre/alt/ruinpre.jpg"></center>'
+			'You end up being dragged into her pace, getting lost in the conversation between you two. Before too long, you look up to realize that while you were talking you ended up somewhere in the forest. Just ahead of you is an old ruin.'
+
+			act 'Take a rest and make a move':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pre/csb/kisscsb.jpg"></center>'
+				'You see a large stone at the ruins and sit <<$pcs_nickname>> down. You put your arm around her shoulders, and she leans into you. You turn to look at her face, she looks back. You lean in to plant a kiss on her lips...'
+				
+				act 'What''s that sound?':
+					*clr & cla
+					!!Background: Black
+					fcolor = rgb(255, 255, 255)
+					bcolor = rgb(0, 0, 0)
+					lcolor = rgb(106, 90, 205)
+					
+					'<center><img <<$set_imgh>> src="images/pre/alt/tunnel1pre.jpg"></center>'
+					'A loud crack runs through the ruins. The ground gives way beneath you, sending both of you tumbling down into a dark hole. Miraculously you both manage to land with only minor scrapes and bruises. You curse and look around at your surroundings.'
+					'You seem to be in an underground chamber of some sort. Looking up you see that climbing out is not an option. There is also an old gate one one side of the chamber but it''s either locked or rusted shut. Looks like the only way out is the tunnel on the other side of the chamber.'
+					'The romantic mood has been thoroughly broken. You have more immediate concerns of survival. You pull your backpack back on your shoulders, turn on the flashlight on your phone and lead <<pcs_nickname>> out the only way you can.'
+
+					act 'Follow the tunnel':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/pre/alt/tunnel2pre.jpg"></center>'
+						'The tunnel goes on for what feels like miles. You start to worry that your phone battery will die.'
+						
+						act 'Keep going':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/pre/shared/dunpre3.jpg"></center>'
+							'At the end of the tunnel you find a dead end. Or at least it seems so. <<$pcs_nickname>> notices light coming through the cracks in the wall. You do your best to knock it down.' 
+							'After a few good hits the wall crumbles and you find yourself in another chamber filled with old pottery and baubles. Opposite you is another tunnel, that hopefully leads out. In the center of the room is an altar and on it is what seems to be centerpiece of this room, a strange amulet.'
+							
+							act 'Examine the amulet':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pre/shared/amuletpre.jpg"></center>'
+								'You pick up the strange amulet and examine it. You take the amulet in your hands and notice its much lighter than it looks and unusually warm for a piece of metal. It''s shaped like an antique oil lamp and... is that a penis? This is clearly very old, you think to yourself.'
+								'While holding the amulet, you realize that it''s getting warmer, almost hot. Suddenly you feel heat coursing through your entire body. You feel a surge of strength inside you. It''s like you just finished a long jog, but without the fatigue.'
+								'<<$pcs_nickname>> touches your arm, asking what you found. "Just some old junk," you reply as you pocket the amulet. "Come on, let''s get going."'
+
+								act 'Find a way out':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/pre/shared/kotpre.jpg"></center>'
+									'You follow the passage and find yourselves in a construction site. There are several keep out signs visible from here.' 
+									'<b>Shit!</b> You think.'
+
+									act 'Sneak out':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/pre/alt/road.jpg"></center>'
+										'The workers shift has long since finished so sneaking out is not too hard. The site is on a highway so hopefully you can make it back before people notice that <<$pcs_nickname>> is missing. It''s already late in the afternoon. You hope that you can get back before dark.'
+
+										act 'Walk towards Gaduyinko':
+											*clr & cla
+											!!Background: Grey
+											fcolor = rgb(255, 255, 255)
+											bcolor = rgb(20, 20, 20)
+											lcolor = rgb(106, 90, 205)
+											
+											'<center><img <<$set_imgh>> src="images/pre/alt/road.jpg"></center>'
+											'You and <<$pcs_nickname>> walk along the road for several hours. The sun has started to set, the trees casting long shadows across the road. <<$pcs_nickname>> is lagging behind, getting tired.'
+											'You stick your hands in your pockets, slowing down to let her catch up. You feel a hard object and pull out the amulet to look at it.'
+											'It still looks kind of funny, but holding it is sending a pleasant rush of heat and energy through you. There''s something about it that...'
+											'Suddenly, <<$pcs_nickname>> grabs your arm.'
+											'"Who''s that?"'
+											
+											act 'Look up': gt 'preCSB', 'intro_8'
+										end												
+									end
+								end
+							end
+						end
+					end					
+				end
+			end
+			
+		end
+	end
+end
+
+if $ARGS[0] = 'intro_8':
+	*clr & cla
+	!!Background: Grey
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(20, 20, 20)
+	lcolor = rgb(106, 90, 205)
+	'<center><img <<$set_imgh>> src="images/pre/csb/shadowyfigurecsb.jpg"></center>'
+	'You look up to see a dark figure in a long coat. The shadows cast by the setting sun obscure his figure, but you can see him striding purposefully towards you.' 
+	'All of a sudden a cold chill of fear run through you. Two teenagers alone, in the dark, on the side of a road, in the middle of nowhere, being approached by a tall figure cloaked in shadows? There are dozens of horror stories that begin this way, and you don''t want to stick around to find out how it ends.'
+	
+	act 'Run':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/tg/reinholdpre.jpg"></center>'
+		'<<$pcs_nickname>> seems to have shared your thoughts, as she grabs your hand and dashes into the woods. Amidst the panic the amulet slips from your hands and lands in the grass, giving off a slight glow that briefly illuminates the face of the man who was following you. Your long legs allow you to take the lead, dragging <<$pcs_nickname>> behind you into the forest.'
+
+		act 'Keep running':
+			*clr & cla
+			!!Background:Black
+			fcolor = rgb(255, 255, 255)
+			bcolor = rgb(0, 0, 0)
+			lcolor = rgb(106, 90, 205)
+			
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night4.jpg"></center>'
+			'You drag <<$pcs_nickname>> along in a mad dash to escape the dark figure. You twist and turn, trying to lose him in the woods. After a few minutes you feel <<$pcs_nickname>>''s hand rip out of your grasp. You look back to see her collapsing on the ground, panting in exhaustion. There''s no sign of the man anywhere. You think you lost him. You sigh in relief.'
+
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/howl.jpg"></center>'
+				'Suddenly your hear a terrifying howl close behind you. Another jolt of adrenaline passes through you. Wolves?!'
+				
+				act 'Run away':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_wolf.jpg"></center>'
+					'You turn to help <<$pcs_nickname>> stand up. You look at her just in time to see a wolf knock her down, its fangs clamping down on her neck. A gush of crimson blood stains the jaws of the wolf as you look on in shock. You hear the sound of rustling brush and you rush to escape in panic, but almost immediately you feel a powerful push in the back and fall down.'
+					act 'Lash out':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/wolf.jpg"></center>'
+						'You panic and lash backwards with your hands, causing the other wolf to spring backwards out of range. Yet another wolf rushes in from the side, tearing into your shoulder.'
+						
+						act 'Scream in pain':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night2.jpg"></center>'
+							'You let out a scream of pain, every thought being buried under the wild panic of adrenaline. You try to get up to run, but a pair of jaws bites deep into your thigh, sending you to the ground.' 
+							
+							act 'Oh god...':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pre/csb/dyingforest.jpg"></center>'
+								'Shock and blood loss set in, causing your vision to start to black out. So this is how you die. Moments before you pass out, you swear you can hear the sound crunching bones from above you and see a flash of red hair.'
+								
+								act '...am I dying?': gt 'preCSB', 'intro_9'
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'intro_9':
+	*clr & cla
+	!!Background:Black
+	fcolor = rgb(255, 255, 255)
+	bcolor = rgb(0, 0, 0)
+	lcolor = rgb(106, 90, 205)
+	'<center><img <<$set_imgh>> src="images/pre/csb/dyingforest.jpg"></center>'
+	'...'
+	wait 3000
+	*nl
+	'...'
+	wait 3000
+	*nl
+	'Darkness consumes your thoughts for some time. Eventually, images begin to form in your mind and you soon find yourself in a middle of a dream. The strange amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes which then turn into two planet earths.'
+	'"Most who look at the world see only the mundane, but there is more to it. Much more. Now you see that too. You have the potential to shape it all, but first, you have company."'
+
+	act 'Wake up':		
+		*clr & cla
+		!!Background: White
+		bcolor = rgb(BColorBase, BColorBase, BColorBase)
+		lcolor = rgb(106, 90, 205)
+		fcolor = rgb(0, 0, 0)
+		'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+		'You open your eyes to see you are in a hospital room. Next to you is an unfamiliar red-haired girl.'
+		'"Ah, you woke up," she chirped. "We found you half-dead, you know. You almost didn''t make it. There wasn''t anything that I could do for the girl though. Those wolves really did a number on the two of you. Running half-exhausted through the forest must have made you a pretty tempting target. Then again, given how you picked up that amulet, you probably wouldn''t have lasted much longer even if you had managed to get away."'
+
+		act 'What? Who? Where?':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+			'You try to ask her all the questions running through your mind right now. Unfortunately all that comes out of your mouth is a croaking groan. Your tongue feels half-numb, as does the rest of your body. Your head is too fuzzy at the moment to think straight.'
+			'"I''d take it easy right now. I managed to save you, but your body still needs to get used to the change."'
+			
+			act 'What change?':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+				'"What change?" You manage to get those words out, though your voice sounds a lot higher than normal.'
+				'The girl points at your chest, "Take a look for yourself."'
+				
+				act 'Look down':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pre/csb/wakeupcsb.jpg"></center>'
+					'You look down, hair longer than it was yesterday shifting in front of your eyes. The covers of the hospital bed lie flat over your body, but they cover a far different shape than you are used to.'
+					'You whip back the covers and the front-open hospital gown to discover a pair of naked breasts in front of your face. Past them lie the smooth curves of a teenage girl. An empty feeling between your legs informs you that your old friend has gone missing.'
+					'You hastily recover your body in a panic, turning to the girl at your bedside.'
+					
+					act 'What did you do to me?!':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+						'The girl frowns at your tone. "<i´>I</i> saved your life. Twice, even. You shouldn''t run off into the woods at night, let alone be fondling ancient amulets you know nothing about. Especially something like the Amulet of Power. Turns out that it passed to you. Must have happened when you touched it."'
+
+						act 'What''s going on?':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+							'"What the hell is going on?" you respond. "What does that have to do with turning me into a girl?!"'
+							'"Hold on, I''ll get around to that. Let me start from the beginning," the girl says. "Magic exists and is real. Ages ago the world was not the same, the fae creatures who possess natural magic lived in balance but the succubus were free to breed with whom ever they wished."'
+							'"They bred with humans and with that human magicians were born. The Sidhe, the most powerful of the fae, feared the increasing numbers of human magicians and cast a very powerful spell to bind the succubus to them, preventing either from being able to reproduce without the other."'
+							'"All magicians have some of that original fae blood in their bodies. It is through that that they are able to connect with the world of magic."'
+							'The redhead adjusts her glasses. "Most of the world simply ignores magic, or are protected from it by magic''s natural desire to remain hidden."'
+							
+							act 'Continue':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+								'"But last night there was a powerful burst of magical energy, strong enough to be clearly felt by any with magical connections. Can you guess where this surge came from? Yeah, that cave you found. Apparently the surge occurred when you opened the seal to the archive. Anyway, that was when we started to search. That source of power is desired by many, but it is extremely dangerous and in the wrong hands could do untold horrors."'
+								'She stops for a few seconds for you process that information. It seems really far fetched.'
+								'"A man named Reinhold wanted to prevent the amulet being misused, so he went out to find it. Of course, the moment you saw him you dropped the amulet and bolted into the woods. He picked it up but didn''t bother to check you over. Unfortunately, he''s probably realized by now that the amulet no longer has the power and now he''ll be out to hunt you down."'
+								
+								act 'So, the whole world is just an illusion?':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+									'"So magic exists and is used by all these people and creatures. But the rest of us just don''t see it, or we convince ourselves it didn''t happen?" You ask.'
+									'The girl nods. "Yes. You''re a quick study. Machines, apartments, television and the Internet, all this really does exist and is in the form in which people see it. But if I say, hurl a fireball, then people might see that I threw a grenade or shot a flamethrower. The average human mind can''t process magic, so it blocks it out as a way to protect the person from going crazy."'
+									'"Hence such things as little green men, UFOs, poltergeists, and spontaneous combustion are from when people encounter a difficult-to-hide phenomenon and their minds come to a flawed conclusion. In some cases, a person''s mind can''t cope with the spell they witness and they are driven so crazy that no one believes them."'
+									
+									act 'And who are you?':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+										'"And who are you?" you ask.'
+										'The girl smiled. "Me? I''m Tatiana, a young mage with an keen interest in magical phenomenon. I specialize in the treatment of mutations, and magic relating to the body. I have little combat skill, so I rely on the services of Gustav to provide some muscle. He''s a Mutant due to magical exposure. It gives him unmatched physical strength, plus he''s a great tracker."'
+										'"The two of us run a detective agency for cover and money, but our real objective is studying magic and its effects."'
+										
+										act 'What do you want from me?':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+											'"And what is this amulet? Where did it come from?" you ask.'
+											'Tatiana thinks about it for a few moments. "It was made by the trickster Rikudo, one of the most powerful ancient magicians. He taunted the only living mage who could control its immense power by cursing him to be stuck in a female form, yet making it only activate for a male mage."'
+											'"I''m not a mage though, how could the power be transferred to me? And what does that have to do with turning me into a girl?"'
+											'"Well as for how the power was transferred, it seems that its long time underground caused it to malfunction and its power to enter your body. It was far too powerful for your body and would have ended up killing you and who knows how many others. Which is where the ''turning you into a girl'' part comes in."'
+											
+											act 'Continue':
+												*clr & cla
+												'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+												'"See, when I found you I could feel the aura of power emanating from you. That made it easy to put things together. I knew enough about the Amulet to know that the power would have destroyed you. So I drew from that aura to transform you into someone who was protected from the masculine alignment of the power."'
+												'Tatiana runs a hand through her hair and giggles. "So I made you into a pretty teenage girl. Now the power is going to lie dormant, saving you from blowing up a city or something."'
+												'"Wasn''t there any other way? Taking away my manhood is a pretty drastic move!"'
+												
+												act 'Continue':
+													*clr & cla
+													'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+													'"Of course there was another way. I could have just stopped your heart and let your power dissolve into nature. You would have died though. Reinhold might be the kind of person to kill you to save others, but I didn''t want to kill you right after saving you. Plus with my magic I was able to take this risk. Sure, maybe with more time doing research I could have worked out another solution, but I didn''t have a lot of time."'
+													'"Of course I couldn''t just leave a newly teenage girl without parents or a home. So I decided to kill two birds with one stone. Instead of just turning you into the girl version of you, I turned you into that girl you were with."'
+													
+													act 'What?':
+														*clr & cla
+														'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
+														'Startled, you reach up to your face, tracing out the features. You didn''t get a chance to become familiar with her face, but it feels about right. This whole time, the death of <<$pcs_nickname>> didn''t feel real, like she was still around somehow. Maybe it''s because you now "are" <<$pcs_nickname>>, but even now you don''t feel a sense of loss or guilt.'
+														'"Having a template to work off of really helped. Not even a geneticist could tell you two apart; you are identical from your fingerprints down to your DNA. Of course, that means your new ''equipment'' down there is fully functional as well, so if you don''t want to be a mommy, you should start thinking about contraceptives. You should probably also stay away from any male relatives if you don''t want to end up with a kid with eleven toes or something."'
+														'You angrily look at Tatiana, "So you think I''m a complete woman? On the outside I''ll look like one, but guess what, I''m still a man!"'
+														'"Well, yes. I won''t argue about that." Tatiana agrees. "You can decide what you want to do with your life, but you might want to play the part of <<$pcs_firstname>> until graduation at least. On a side note, I already took care of an alibi. Yesterday, "<<$pcs_firstname>>" was found half-dead on the edge of the woods while the leftovers of Peter''s body were found deeper in. It''s in the news." With these words, she tosses a newspaper onto the bed, an article circled out.'
+														
+														act 'Read the newspaper':
+															*clr & cla
+															'<center><img <<$set_imgh>> src="images/pre/csb/newspapercsb.jpg"></center>'
+															'There is a news report about about a teenage boy, whose remains were found by a group of hunters half-eaten by wolves.'
+															'You give Tatiana a bewildered look. She has an enigmatic smile, "Well, I am a magician. That''s something that I can do. Reinhold has definitely lost the trail; there''s no reason he should suspect the power been passed to a girl. You took <<$pcs_firstname>>''s place, and she took yours. The body that ''died'' in the woods was a perfect copy of your old self, from your absorbed amulet energy down to the placement of every single hair."'
+															'"Anyways, your ''mother'' will be by in a couple hours to pick you up; she thinks that you''ve got some amnesia from a head injury and mental trauma from seeing your ''boyfriend'' get eaten alive by wolves, so you should probably be covered for any slip-ups. Just play the part of the traumatized little schoolgirl and it should be all good. Have fun."'
+															'She gets up and heads to the door, opening it up to reveal a tall man with red hair and face tattoos. "Come on, Gustav, let''s go." The pair disappears into the hall, leaving you with your thoughts.'
+															
+															act 'Think about your situation':
+																*clr & cla
+																'<center><img <<$set_imgh>> src="images/pre/csb/hospitalroomcsb.jpg"></center>'
+																'You aren''t sure what to think.'
+																'On the one hand, you''ve lost your manhood forever. You''ll have to deal with skirts and periods and makeup and babies and all other sorts of girly things.' 
+																'On the other hand, you''ve been granted a clean slate. No more beatings, no threats of becoming homeless, and you are gaining the family you never had. Plus, you''re going to be able to spy on girls in the locker rooms. [If Bi: And now nobody will look twice at you for kissing a man.]'
+																'Whining about the situation isn''t going to change it, so you resolve to deal with it one day at a time, living your new life as <<$pcs_firstname>> "<<$pcs_nickname>>" <<$pcs_lastname>>.'
+																
+																act 'Continue':
+																	*clr & cla
+																	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
+																	'Welcome to the Cursed Schoolboy version! You may have lost your masculinity and your old life, but you''ve gained new possibilities in return! Will you try to live your new life as a mere schoolgirl, or do you have grander aspirations with your newfound knowledge of magic? The choice is yours!'
+																	!!'Now, would you like to dive right into the action? Or would you rather take some time to get used to your new body and life?'
+																	
+																	act 'Start main game!': gt 'preCSB', 'intro_end'
+																	
+																	!! [Will lead into the prologue, which is currently WIP]
+																	!! act 'Let''s keep this intro going!': 
+																end
+															end
+														end
+													end													
+												end
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end			
+			end		
+		end
+	end
+end
+
+if $ARGS[0] = 'intro_end':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+	'Shortly after Tatiana left, your new mother showed up to take you to your new home. You met your new family and did the best you could to fit in, afraid of them figuring out that you are not <<$pcs_firstname>>. They seem to have bought Tatiana''s explanation of amnesia and mental trauma, going out of their way to reintroduce you to your new life.'
+	
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/csb/checkingoutguycsb.jpg"></center>'
+		'Over the next week, you slowly became accustomed to your new life. You aren''t used to being a girl just yet, but you''ve come to think of yourself as <<$pcs_nickname>> instead of Peter, and <<$pcs_nickname>>''s family as your own.'
+		'There were a few incidents where you acted in some decidedly non-feminine ways. Luckily Tatiana''s alibi has proved helpful here as well, covering your mistakes.'
+		if csb_bisexual = 0:																
+			'You''ve noticed some other mental changes apart from just thinking of yourself as <<$pcs_firstname>>. Perhaps it is a result of your new gender, but with your new body has come an attraction towards men. You are a little unsettled by these changes, but you can''t feel repulsed by these new desires any more than you could have been repulsed for finding girls attractive before.'
+			'The first time you saw a man''s penis was a mind-opening experience, awakening unfamiliar feelings. Luckily it seems that you''ve retained your attraction towards women, making your changing sexuality easier to deal with. So far, you haven''t had the time to really explore a woman''s pleasure.'
+		else 
+			'You''ve noticed some other mental changes apart from just thinking of yourself as <<$pcs_firstname>>. While you were always attracted to men before, your new gender has changed the nature of that attraction. The first time that you saw a man''s penis brought a new need to be conquered, to be the one who gets fucked instead of the one who fucks.'
+			'While this type of desire isn''t completely unfamiliar, it is now far more dominant than before. So far, you haven''t had the time to really explore a woman''s pleasure.'
+		end
+		
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
+			'It will take some more time for you to get completely used to your new body and life as <<$pcs_firstname>>. For now, you should just focus on getting out of bed.'
+			
+			act 'Continue':
+				cla
+				showstat 1
+				showobjs 1
+				
+				!!Stuff from the backpack, phone
+				money += 5000
+				prezik = 3
+				pornMagazine = 40
+				balans = 200
+				
+				minut = 0
+				hour = 9
+				
+				msg 'You have gained the trait ''Everything is New Again''! <br>Being thrust into a new life has forced you to reevaluate and relearn everything. You pick up new skills more quickly for a short time.'
+				
+				gs 'stat'
+				
+				act 'Continue': gt 'preCSB', 'game_start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'game_start':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/system/schoolboy.jpg"></center>'
+	*nl
+	'You can choose from two starting locations:'
+	*nl
+	'In the Pavlovsk start you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start you are visiting your grandparent''s house in the small farming village of Gadukino.'
+
+	act 'Pavlovsk Start': gt 'preCSB', 'pav_start'
+	act 'Gadukino Start': gt 'preCSB', 'gad_start'
+end
+
+if $ARGS[0] = 'pav_start':
+	*clr & cla
+	'<center><h2>Pavlovsk</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gorodok.jpg"></center>'
+	*nl
+	'<center>A provincial town in a rural area of Russia, it looks much like all the other towns in the region. Population: about 15000 inhabitants.</center>'
+	
+	act 'Get out of bed and get dressed': gt 'bedrPar'
+	act 'Change location': gt 'preCSB', 'game_start'
+end
+
+if $ARGS[0] = 'gad_start':
+	*clr & cla
+	'<center><h2>Gadukino</h2></center>'
+	'<center><img <<$set_imgh>> src="images/pre/alt/gadukino.jpg"></center>'
+	*nl
+	'<center>A small farming village with many rickety wooden houses and even more ruins of houses. This village has seen better times.</center>'
+	
+	act 'Get out of bed and get dressed': gt 'gadhouse'
+	act 'Change location': gt 'preCSB', 'game_start'
+end
+
+!!------------------------
+!! Character Customization
+!!------------------------
+
+if $ARGS[0] = 'hair':
+	*clr & cla
+	'<center><b><font color = maroon>GIRLFRIEND CUSTOMIZATION</font></b></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	*nl
+	if pcs_hairlng <= 1:
+		$hair = 'She has <a href="exec:pcs_hairlng = 31 & gs ''preCSB'', ''hair''">very short</a>,'
+	elseif pcs_hairlng <= 31:
+		$hair = 'She has <a href="exec:pcs_hairlng = 81 & gs ''preCSB'', ''hair''">short</a>,'
+	elseif pcs_hairlng <= 81:
+		$hair = 'She has <a href="exec:pcs_hairlng = 161 & gs ''preCSB'', ''hair''">chin length</a>,'
+	elseif pcs_hairlng <= 161:
+		$hair = 'She has <a href="exec:pcs_hairlng = 261 & gs ''preCSB'', ''hair''">shoulder length</a>,'
+	elseif pcs_hairlng <= 261:
+		$hair = 'She has <a href="exec:pcs_hairlng = 401 & gs ''preCSB'', ''hair''">breast length</a>,'
+	elseif pcs_hairlng <= 401:
+		$hair = 'She has <a href="exec:pcs_hairlng = 601 & gs ''preCSB'', ''hair''">back length</a>,'
+	elseif pcs_hairlng <= 601:
+		$hair = 'She has <a href="exec:pcs_hairlng = 801 & gs ''preCSB'', ''hair''">hip length</a>,'
+	elseif pcs_hairlng <= 801:
+		$hair = 'She has <a href="exec:pcs_hairlng = 1001 & gs ''preCSB'', ''hair''">ass length</a>,'
+	else
+		$hair = 'She has <a href="exec:pcs_hairlng = 1 & gs ''preCSB'', ''hair''">extremely long</a>,'
+	end
+
+	if pcs_haircol = 0 and curly <= 0:$hair += '<a href="exec:defcurly = 1 & curly = 2147483647 & gs ''preCSB'', ''hair''">straight</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
+	if pcs_haircol = 1 and curly <= 0:$hair += '<a href="exec:defcurly = 1 & curly = 2147483647 & gs ''preCSB'', ''hair''">straight</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
+	if pcs_haircol = 2 and curly <= 0:$hair += '<a href="exec:defcurly = 1 & curly = 2147483647 & gs ''preCSB'', ''hair''">straight</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
+	if pcs_haircol = 3 and curly <= 0:$hair += '<a href="exec:defcurly = 1 & curly = 2147483647 & gs ''preCSB'', ''hair''">straight</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
+	if pcs_haircol = 0 and curly > 0:$hair += '<a href="exec:defcurly = 0 & curly = 0 & gs ''preCSB'', ''hair''">curly</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
+	if pcs_haircol = 1 and curly > 0:$hair += '<a href="exec:defcurly = 0 & curly = 0 & gs ''preCSB'', ''hair''">curly</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
+	if pcs_haircol = 2 and curly > 0:$hair += '<a href="exec:defcurly = 0 & curly = 0 & gs ''preCSB'', ''hair''">curly</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
+	if pcs_haircol = 3 and curly > 0:$hair += '<a href="exec:defcurly = 0 & curly = 0 & gs ''preCSB'', ''hair''">curly</a>, <a href="exec:gs ''preCSB'', ''pcs_haircol'' & gs ''preCSB'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
+
+	'<center><i><<$hair>></i>'
+	
+	nathcol = pcs_haircol
+	
+	act'<center><b>Done</b></center>': gt 'preCSB', 'intro_6_looks'
+end
+
+if $ARGS[0] = 'pcs_haircol':
+	pcs_haircol += 1
+	if pcs_haircol > 3: pcs_haircol = 0
+end
+
+if $ARGS[0] = 'eyes':
+	*clr & cla
+	'<center><b><font color = maroon>GIRLFRIEND CUSTOMIZATION</font></b></center>'
+	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+	*nl
+	if pcs_eyecol = 0:$pcs_eyecol = 'brown' & $glacol2 = 'brown'
+	if pcs_eyecol = 1:$pcs_eyecol = 'gray' & $glacol2 = 'gray'
+	if pcs_eyecol = 2:$pcs_eyecol = 'green' & $glacol2 = 'green'
+	if pcs_eyecol = 3:$pcs_eyecol = 'blue' & $glacol2 = 'blue'
+	if glass <= 0:$glass = '' & glassvnesh = 0
+	if glass = 1:$glass = 'She wears silly glasses in a cheap frame.' & glassvnesh = 10
+	if glass = 2:$glass = 'She wears glasses.' & glassvnesh = 0
+	if pcs_lashes > 2:pcs_lashes = 2
+	if pcs_lashes = 0:$pcs_lashes = 'with short eyelashes'
+	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
+	if pcs_lashes = 2:$pcs_lashes = 'with long eyelashes'
+	if pcs_eyesize > 3:pcs_eyesize = 3
+	if pcs_eyesize = 0:$glaza = 'She has small <a href="exec:gs ''preCSB'', ''eye color'' & gs ''preCSB'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>. <<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
+	if pcs_eyesize = 1:$glaza = 'She has expressive <a href="exec:gs ''preCSB'', ''eye color'' & gs ''preCSB'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>. <<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
+	if pcs_eyesize = 2:$glaza = 'She has large <a href="exec:gs ''preCSB'', ''eye color'' & gs ''preCSB'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>. <<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
+	if pcs_eyesize = 3:$glaza = 'She has huge <a href="exec:gs ''preCSB'', ''eye color'' & gs ''preCSB'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>. <<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
+	*nl
+	'<center><i><<$glaza>></i></center>'
+	*nl
+	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''preCSB'', ''eyes''">Lengthen lashes</a></center>'
+	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''preCSB'', ''eyes''">Shorten lashes</a></center>'
+	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''preCSB'', ''eyes''">Larger eyes</a></center>'
+	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''preCSB'', ''eyes''">Smaller eyes</a></center>'
+	if glass = 0 and glass < 2:'<center><a href="exec:glass = 2 & gs ''preCSB'', ''eyes''">Wear glasses</a></center>'
+	if glass > 0 and glass <= 2:'<center><a href="exec:glass = 0 & gs ''preCSB'', ''eyes''">Remove glasses</a></center>'
+
+	act'<center><b>Done</b></center>': gt 'preCSB', 'intro_6_looks'
+end
+
+if $ARGS[0] = 'eye color':
+	pcs_eyecol += 1
+	if pcs_eyecol > 3: pcs_eyecol = 0
+end
+
+--- preCSB ---------------------------------
+
+

+ 40 - 18
locations/preCUST.qsrc

@@ -299,7 +299,7 @@ if $ARGS[0] = 'Done':
 	end
 
 !!	SG Start Specific Variable Setting
-	if $ARGS[1] = 'SGS':
+	if $ARGS[1] = 'SGS' or $ARGS[1] = 'CSB':
 		school[6] = 1
 		umbrella = 1
 		sisboyday = -2
@@ -329,7 +329,7 @@ if $ARGS[0] = 'Done':
 
 		$holyday += ', <b><<kanicont>> days left.</b>'
 	end
-	
+		
 !!*************************
 !!	Final Initializations
 
@@ -361,22 +361,21 @@ if $ARGS[0] = 'Done':
 
 	gs 'body_shape', 'initial'
 
-!! Adding underwear
-
-	cheap_panties[37] = 1
-	cheap_bras[11] = 1
-	$pantyworntype = 'cheap'
-	pantywornnumber = 37
-	$braworntype = 'cheap'
-	brawornnumber = 11
-
-!!adding default shoes and assigning them
-
-	sgandm[6] = 1
-	strainers[21] = 1
-	$shoeworntype = 'gandm'
-	shoewornnumber = 6
-
+!! Adding underwear and default shoes and assigning them
+
+	if $ARGS[1] ! 'CSB'
+		cheap_panties[37] = 1
+		cheap_bras[11] = 1
+		$pantyworntype = 'cheap'
+		pantywornnumber = 37
+		$braworntype = 'cheap'
+		brawornnumber = 11
+		sgandm[6] = 1
+		strainers[21] = 1
+		$shoeworntype = 'gandm'
+		shoewornnumber = 6
+	end
+	
 !!	Starting clothing set
 	if NTstart = 1:
 		cheap[161] = 1
@@ -392,6 +391,27 @@ if $ARGS[0] = 'Done':
 		swimwearH[3] = 60
 		swimwearB[3] = pcs_hips
 		gs 'clothing', 'wear', 'cheap', 370
+	elseif $ARGS[1] = 'CSB':
+		cheap_panties[5] = 1
+		cheap_bras[12] = 1
+		$pantyworntype = 'cheap'
+		pantywornnumber = 5
+		$braworntype = 'cheap'
+		brawornnumber = 12
+		exercise[4] = 1
+		exerciseH[4] = 100
+		sportsclothingnumber = 4
+		strainers[21] = 1
+		sgandm[43] = 1
+		shoewornnumber = 43
+		$shoeworntype = 'gandm'
+		cheap[397] = 1
+		cheapH[397] = 100
+		cheapB[397] = pcs_hips
+		cheap[355] = 1
+		cheapH[355] = 100
+		cheapB[355] = pcs_hips
+		gs 'clothing', 'wear', 'cheap', 355
 	elseif pcs_inhib = 0:
 		cheap[15] = 1
 		cheapH[15] = 100
@@ -593,6 +613,8 @@ if $ARGS[0] = 'Done':
 		gt 'preNT'
 	elseif $ARGS[1] = 'TGS':
 		gt 'preTG', 'sleepPRE'
+	elseif $ARGS[1] = 'CSB':
+		gt 'preCSB', 'intro_0'
 	else
 		gt 'preALT', 'One'
 	end

+ 194 - 41
locations/preSYS.qsrc

@@ -27,27 +27,191 @@ if $ARGS[0] = 'TGStart':
 	end
 end
 
+if $ARGS[0] = 'CSBStart':
+	*clr & cla	
+	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
+
+	StoryLine = 1
+
+	!! NPC Data and Relations
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	
+	gs 'gschool_lessons', 'npc_data'
+
+	r = 1
+	:default_friendship_loop
+	$school_static_num = $school_static_num[r]
+	if grupTipe[r] ! 5:npc_rel[$school_static_num] = 30
+	r += 1
+	if r <= 65:jump 'default_friendship_loop'
+
+	npc_rel['A11'] = 40
+	npc_rel['A28'] = 60
+	npc_rel['A29'] = 60
+	npc_rel['A30'] = 50
+	npc_rel['A31'] = 50
+	npc_rel['A32'] = 50
+	npc_rel['A33'] = 70
+	npc_rel['A34'] = 50
+	
+	!! Sveta was an outcast (good girl start)
+	gs 'preSYS', 'outcast'
+	gs 'preSYS', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
+	
+	npc_rel['A25'] -= 5
+	
+	home_owned[2] = 1
+	gs 'set_home', 2
+					
+	if player_avatar = 0:
+		pcs_eyesize = 3
+		pcs_lip = 2
+		pcs_lashes = 1
+		pcs_haircol = 3
+		pcs_eyecol = 3
+		pcs_hairlng = 300
+	end
+	
+	if birthday_set = 0:
+		birthday = 1
+		birthmonth = 4
+		birthday_set = 1
+	end
+	
+	birthyear = 2000
+	school_year = 2000
+	yearlefttemp = 1
+	
+	!!Looks
+	pcs_hgt = 170
+	salo = 80
+	genbsize = 17
+	pcs_pubes = 30
+	pcs_leghair = 12
+	pcs_makeup = 1
+	pcs_skin = 40
+	dick = 0
+	
+	!!Basic	
+	pcs_energy = 60
+	pcs_hydra = 60
+	pcs_sleep = 70
+
+	!!Attributes
+	pcs_inhib = 5
+	pcs_stren = 30
+	strenbuf = 10
+	pcs_agil = 30
+	agilbuf = 10
+	pcs_vital = 30
+	vitalbuf = 10
+	pcs_intel = 30
+	pcs_react = 30
+	pcs_sprt = 20
+	pcs_chrsm = 35
+	pcs_prcptn = 40
+	
+	!!Skills
+	pcs_def = 20
+	pcs_run = 20
+	pcs_gaming = 20
+	pcs_humint = 20
+	pcs_observ = 20
+	
+	!!Money, School, ...
+	money = 2000
+	pcs_grades = 40
+	prezikProver = 3
+	brothersawpirsF = 0
+	
+	'<center><img <<$set_imgh>> src="images/pre/csb/petercsb.jpg"></center>'
+	'Your name is Peter Ivanov. You''ve got blond hair and blue eyes. Your parents died shortly after you were born, and your great uncle Ivan took you in. He works at a construction company out of one of the suburbs of St. Petersburg. He''s a man''s man and has never been very close to you, choosing to let you make your own way as long as it does not embarrass him publicly. You''ve grown to be quite independent, but lack any real defining qualities.'
+	
+	date_toggle = args[1]
+	if birthday < 10 and birthmonth < 10:
+		$startdob = 'Your birthday: <B>0<<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday < 10 and birthmonth >= 10:
+		$startdob = 'Your birthday: <B><<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday >= 10 and birthmonth < 10:
+		$startdob = 'Your birthday: <B>0<<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	elseif birthday >= 10 and birthmonth >= 10:
+		$startdob = 'Your birthday: <B><<birthmonth>>/<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
+	end
+
+	if player_avatar = 0:
+		*nl
+		'<a href="exec:gt ''begin'', ''birthday''"><<$startdob>></a>.'
+	else
+		*nl
+		'<<$startdob>>'
+	end
+	
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pre/csb/petercsb.jpg"></center>'
+		*nl
+		'You have two options when it comes to beginning your game:'
+		*nl
+		'Starting in August, at the end of the summer holiday, very close to the new school year <i>(recommended for new players)</i>, or starting in June, at the beginning of the summer holiday.'
+		
+		if date_toggle ! 1:
+			if birthmonth >= 7: birthyear -= 1
+			if birthmonth = 6 and day > 1: birthyear -= 1
+		end
+		
+		killvar '$startdob'
+		killvar 'date_toggle'
+		
+		kanikuli = 5
+		$holyday = '<b>Summer holidays</b>'
+		
+		act 'Start at the end of August':
+			month = 8
+			$month = 'August'
+			monthbabkapay = month
+			day = 26
+			week = 5
+			hour = 9
+			kanicont = 6
+			gt 'preCUST', 'Done', 'CSB'
+		end
+
+		act 'Start at the beginning of June':
+			month = 6
+			$month = 'June'
+			monthbabkapay = month
+			day = 1
+			week = 3
+			kanicont = 92
+			Gspassed = 1
+			dostupindorf = 1
+			gt 'preCUST', 'Done', 'CSB'
+		end
+	end
+end
+
 !!******************** SG Start Background Options ******************************
 if $ARGS[0] = 'SGStart':
 
-
 	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
 
 	StoryLine = 1
 
-	month = 8
-!!	Last friday in August 2016
-	$month = 'August'
-	day = 26
-	week = 5
-	hour = 9
-	kanikuli = 5
-	$holyday = '<b>Summer holidays</b>'
-
+	birthyear = 2000
+	school_year = 2000
+	yearlefttemp = 1
+	
 	if player_avatar = 0:
 		birthmonth = 4
 		birthday = 1
 		pcs_haircol = 1
+		pcs_eyesize = 2
+		pcs_lip = 1
+		pcs_lashes = 1
 	end
 
 !!	Body
@@ -71,28 +235,18 @@ if $ARGS[0] = 'SGStart':
 	pcs_prcptn = 30
 	pcs_magik = 0
 
-	
-	if player_avatar = 0:
-		pcs_eyesize = 2
-		pcs_lip = 1
-		pcs_lashes = 1
-	end
-
 	pcs_heels = 5
 	pcs_makupskl = 20
 	pcs_pubes = 30
 	pcs_leghair = 12
 	pcs_makeup = 1
 
-	home_owned[2] = 1
 	money = 2000
 	pcs_grades = 75
 	prezikProver = 3
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
-!!	********************
-
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'
@@ -129,12 +283,7 @@ if $ARGS[0] = 'SGStart':
 	'Your <<$npc_usedname[''A30'']>> lives in the same building as you do, though you rarely see her except when you pass her in the stairwell. She is your mother''s sister. <<$npc_usedname[''A54'']>>, as everyone calls him, is best friends with your stepfather. <<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>>, your childhood friend, is the same age as you and grew up living in the same apartment building on the floor above yours. His father, <<$npc_firstname[''A112'']>>, is an old friend of your mother''s.'
 
 	act 'Re-enter name/s': gt 'preSYS', 'SGStart'
-	act 'Continue':
-		birthyear = 2000
-		yearlefttemp = 1
-		school_year = 2000
-		gt 'preSYS', 'SGStart2'
-	end
+	act 'Continue':	gt 'preSYS', 'SGStart2'
 end
 
 if $ARGS[0] = 'SGStart2':
@@ -170,26 +319,30 @@ if $ARGS[0] = 'SGStart2':
 		end
 		killvar '$startdob'
 		killvar 'date_toggle'
-		act 'Start at the end of August':
+		
+		$holyday = '<b>Summer holidays</b>'
+		
 		!!This is the default start
+		act 'Start at the end of August':
+			month = 8
+			$month = 'August'
+			day = 26
+			week = 5
+			hour = 9
+			kanikuli = 5
 			kanicont = 6
 			gt 'preSYS', 'SGStart3'
 		end
 
-		!!This is to prevent to player from starting at 14
-		if birthmonth = 6 and yearlefttemp = 2:
-			act '<i>Start at the beginning of June</i> Restricted due PC age, set birthday before June or after July to unlock': gt 'preSYS', 'SGStart2', 1
-		else
-			act 'Start at the beginning of June':
-				month = 6
-				$month = 'June'
-				day = 1
-				week = 3
-				kanicont = 92
-				Gspassed = 1
-				dostupindorf = 1
-				gt 'preSYS', 'SGStart3'
-			end
+		act 'Start at the beginning of June':
+			month = 6
+			$month = 'June'
+			day = 1
+			week = 3
+			kanicont = 92
+			Gspassed = 1
+			dostupindorf = 1
+			gt 'preSYS', 'SGStart3'
 		end
 	end
 end

+ 4 - 3
locations/restoran.qsrc

@@ -15,8 +15,9 @@ if $ARGS[0] = 'start':
 
 	if vladimirday = daystart and vladimirQW = 21 and hour = 20: gt 'qwmeet'
 
-	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 	act 'Leave the restaurant': minut += 5 & gt 'down'
+
+	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 end
 
 if $ARGS[0] = 'maitred':
@@ -108,7 +109,7 @@ if $ARGS[0] = 'comtable':
 	'<center><b><font color="maroon">Babel, Common Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 	'You are escorted to your seat by the maître d''. You sit and and prepare to order a wonderful meal in the busy restaurant.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'zal'
 end
@@ -124,7 +125,7 @@ if $ARGS[0] = 'viptable':
 	'<center><b><font color="maroon">Babel, VIP room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/chefrecommends.jpg"></center>'
 	'You sit and prepare to order a wonderful meal, recommended by the chef. You''ll be dining with pleasure in the peaceful and luxurious VIP Room.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'vip'
 end

+ 82 - 82
locations/shulga_room.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	!limit 1 sex after class
 	if shulga_lern_day ! daystart: shulga_lern_count = 1
 	!----------------------------------------------------
- 
+
 	if RAND(0,3) < 2:
 		$sveta_rnd_name = '<<$pcs_nickname>>'
 	else
@@ -47,7 +47,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	internetS = internet
 	'<center><b><font color = maroon>Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom.jpg"></center>'
-	
+	*nl
+	act 'Leave the room': gt 'shulgahall'
+
 	if hour >= 14 and hour <= 18 and shulga_whore ! 0 and shulga_whore ! daystart + 7:
 		if shulga_whore < daystart:
 			shulga_whore = daystart + 7
@@ -81,7 +83,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	'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'
-	
+
 	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.'
@@ -90,14 +92,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if week < 5 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 = 7 and hour >= 20): 'Sergey''s son <a href="exec: gt ''shulga_room'', ''shulga_bazar_day''">Vasily</a> is sitting on the big sofa.'
 
-	act 'Leave the room': gt 'shulgahall'
-	
 	if week < 5 and hour >= 20:
 		act 'Drink beer with the guys': gt 'shulga_room', 'shulga_beer'
 		act 'Play cards': gt 'cardgame_durak', 'start'
 	end
 
-	act 'Small sofa':
+	act 'Sit on the small sofa':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/sdivan.jpg"></center>'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	!do homework:
 	if shulga_lern_count > 0 and kanikuli = 0 and SchoolAtestat = 0 and ((week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20)):
-		act 'Do homework': gt 'shulga_room', 'shulga_lern'
+		act 'Do homework with Vasily': gt 'shulga_room', 'shulga_lern'
 	end
 
 	!You want sex:
@@ -166,7 +166,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	!You get fucked for days
 	if $ARGS[1] = 'hall':
 		roomsex_gang = RAND(0,100)
-		if kotovLoveQW < 1 and roomsex_gang <= 2 and pav_slut >= 75 and gangsexroom_count > 0 and week < 5 and hour >= 20: 
+		if kotovLoveQW < 1 and roomsex_gang <= 2 and pav_slut >= 75 and gangsexroom_count > 0 and week < 5 and hour >= 20:
 			gt 'shulga_room', 'gang_sex_room_ev1'
 		end
 
@@ -184,7 +184,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		!If you came in dressed as a prostitute
 		if PCloStyle = 4 and sh_hooker_count > 0 and ((week < 5 and hour >= 20) or (week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20)):
 			gt 'shulga_room', 'sh_hooker'
-		end 
+		end
 	end
 end
 
@@ -201,7 +201,7 @@ if $ARGS[0] = 'sh_hooker':
 		'"Oh, I came over dressed like this for you boys and this is how you greet me. I guess I''ll just be on my way then", you say as you turn toward the door.'
 		'"Wait <<$pcs_nickname>>, it was just a joke. We didn''t mean to offend you. Why don''t you come over and let us make it up to you", Vasily says with a grin.'
 
-		act 'Sigh dramatically and open your arms': 
+		act 'Sigh dramatically and open your arms':
 			shgopsex_gr_day = daystart
 			shgopsex_gr_count -= 1
 			gs 'gopsex', 'settings'
@@ -212,7 +212,7 @@ if $ARGS[0] = 'sh_hooker':
 		'"Listen you jerk, I came here dressed like this for you. If you want I can turn around and head right back out that door", you say putting on your best pouty expression.'
 		'"Come on <<$pcs_nickname>>, I''m sorry it was just a bad joke. Let''s just kiss and make up", Vasily smiles as he unzips his pants.'
 
-		act 'Accept his apology': 
+		act 'Accept his apology':
 			$gopsex_n_npc = 1
 			shgopsex_vasya_day = daystart
 			shgopsex_vasya_count -= 1
@@ -222,7 +222,7 @@ if $ARGS[0] = 'sh_hooker':
 		end
 	end
 
-	act 'Leave feigning resentment': 
+	act 'Leave feigning resentment':
 		sub += 1
 		gt'shulgahall'
 	end
@@ -230,7 +230,7 @@ end
 
 !------------------!
 ! Events with Sonya !
-!==================! 
+!==================!
 !Event Vasily and Sonya in the big room
 
 if $ARGS[0] = 'shulv_sexev1_sonya':
@@ -300,7 +300,7 @@ end
 if $ARGS[0] = 'shulv_sex_sonya':
 	menu_off = 1
 	shulv_sexev_sonya = RAND(0,100)
-	if shulv_sexev_sonya <= 40: 
+	if shulv_sexev_sonya <= 40:
 		gt 'shulga_room', 'shulv_sexev1_sonya'
 	else
 		gt 'shulga_room', 'shulv_sexev2_sonya'
@@ -318,9 +318,9 @@ if $ARGS[0] = 'gang_sexev1_sonya':
 	gs 'arousal','voyeur',5,'group','gangbang'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/group/ev1_1.jpg"></center>'
-	'You halt on your way into the living room at the sight of Sonia laid out on the couch. Dan''s dick was buried in her pussy, while Vitek slowly fucked her mouth.' 
+	'You halt on your way into the living room at the sight of Sonia laid out on the couch. Dan''s dick was buried in her pussy, while Vitek slowly fucked her mouth.'
 	gs 'gopsex', 'masturb_gg'
-	
+
 	act 'Slide a hand inside your panties.':
 		*clr & cla
 		gs 'arousal', 'masturbate', 5
@@ -381,18 +381,18 @@ end
 if $ARGS[0] = 'gang_sex_sonya':
 	menu_off = 1
 	gang_sexev_sonya = RAND(0,100)
-	if RAND(0,100) < 40: 
+	if RAND(0,100) < 40:
 		gt 'shulga_room', 'gang_sexev1_sonya'
-	elseif RAND(40,100) < 70: 
+	elseif RAND(40,100) < 70:
 		gt 'shulga_room', 'gang_sexev2_sonya'
 	else
 		gt 'shulga_room', 'gang_sexev3_sonya'
-	end	
+	end
 end
 
 !----------------------------------------------!
 !Drink beer with the guys, opening event, etc..d. c Monday - Thursday 20:00 - 24:00!
-!==============================================! 
+!==============================================!
 !Fucked for days by the boys
 
 if $ARGS[0] = 'gang_sex_room_ev1':
@@ -402,7 +402,7 @@ if $ARGS[0] = 'gang_sex_room_ev1':
 	gangsexroom_count -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_1.jpg"></center>'
-	'Entering the room you are greeted by three drunken boys. Seeing you, they rejoice and begin to pester you.' 
+	'Entering the room you are greeted by three drunken boys. Seeing you, they rejoice and begin to pester you.'
 
 	act 'Greet them':
 		*clr & cla
@@ -429,7 +429,7 @@ if $ARGS[0] = 'gang_sex_room_ev1_1':
 	gs 'arousal','foreplay',5,'group','gangbang'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_4.jpg"></center>'
-	'You playfully tell the boys they might as well all get undressed. You grab hold of Vasily and Vitek and slowly start to stroke them. Dan is the odd man out, but a whisper in your ear is all it takes for you fall to you knees.'	
+	'You playfully tell the boys they might as well all get undressed. You grab hold of Vasily and Vitek and slowly start to stroke them. Dan is the odd man out, but a whisper in your ear is all it takes for you fall to you knees.'
 	act 'Serve them': gt 'shulga_room', 'gang_sex_room_ev1_2'
 end
 
@@ -446,7 +446,7 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 	gs 'arousal','bj',10,'dick[1]','group','gangbang'
 	gs 'stat'
 	'The boys crowd around you eager to be pleased. As Dan approaches from the front you look up and give him a sultry smile'
-	'Spurred into action, Dan almost knocks you over as jabs his <<dick[1]>>cm <<$dick_girth[1]>> cock in you face. You obediently open your mouth as Dan wraps his hand around the back of your head. He lets out a groan as he slowly begins to fuck your mouth.' 
+	'Spurred into action, Dan almost knocks you over as jabs his <<dick[1]>>cm <<$dick_girth[1]>> cock in you face. You obediently open your mouth as Dan wraps his hand around the back of your head. He lets out a groan as he slowly begins to fuck your mouth.'
 
 	act 'Keep sucking':
 		*clr & cla
@@ -461,7 +461,7 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 		act 'Show them how turned on you are':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_7.jpg"></center>'
-			'The boys laid you on the sofa, and you spread your legs wide so they can see that even your thighs are all slippery. They get to work between your legs. All you can do is giggle when Vasily remarks on how wet you are. You squirm wildly, as Vitek slides two fingers inside you, while Vasily plays with your clit.' 
+			'The boys laid you on the sofa, and you spread your legs wide so they can see that even your thighs are all slippery. They get to work between your legs. All you can do is giggle when Vasily remarks on how wet you are. You squirm wildly, as Vitek slides two fingers inside you, while Vasily plays with your clit.'
 			gs 'arousal','vaginal_finger',10,'group','gangbang','exhibitionism'
 			gs 'stat'
 			if analplugin = 1:
@@ -470,14 +470,14 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 				'"I learned a lesson the hard way that a good girl always come prepared, and It was from someone with a bigger cock than yours anyway", you say as you playfully stick your tongue out at him.'
 				'The boys laugh loudly and continue to explore your body.'
 			end
-			'You can''t take it anymore: "I need someone inside now, so who''s first?"'	
+			'You can''t take it anymore: "I need someone inside now, so who''s first?"'
 
 			act 'Get fucked':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_8.jpg"></center>'
 				'They put you down on all fours, Dan immediately starts to furiously fucking you from behind with his <<dick[1]>>cm <<$dick_girth[1]>> cock. Every few seconds he gives you a little slap on the ass for encouragement.'
 				'You answer back with muffled moans that can barely escape your mouth, which is stuffed full with Vitek''s <<dick[3]>>cm <<$dick_girth[3]>> cock.'
-				'Vitek grabs the back of your head and forces himself further into your mouth. When he yells, "Suck it bitch, take it all", a wave of pleasure runs though your body, and you redouble your effort.' 
+				'Vitek grabs the back of your head and forces himself further into your mouth. When he yells, "Suck it bitch, take it all", a wave of pleasure runs though your body, and you redouble your effort.'
 				gs 'arousal','vaginal',10,'dick[1]','group','gangbang'
 				gs 'arousal','bj',10,'dick[3]','group','gangbang'
 				minut -= 10
@@ -532,7 +532,7 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 									'Dan was kind enough to help remove anal plug.'
 								end
 								if lubri > 0: 'Remembering it at the last moment, you asked Vasily to grab the lube from your purse.'
-								gs 'arousal', 'anal_finger', 1,'lube' 
+								gs 'arousal', 'anal_finger', 1,'lube'
 								fat -= 1
 								gs 'arousal','vaginal',10,'dick[3]','group','gangbang'
 								gs 'arousal','anal',5,'dick[1]','group','gangbang'
@@ -555,21 +555,21 @@ if $ARGS[0] = 'gang_sex_room_ev1_2':
 									act 'Deeper':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_14.jpg"></center>'
-										'You moan loudly as Vitek rocks you from behind with his powerful <<dick[3]>>cm <<$dick_girth[3]>> cock thrusting into your ass. With your head upturned it doesn''t take Dan long to silence yous cries, and fill your mouth back up.' 
+										'You moan loudly as Vitek rocks you from behind with his powerful <<dick[3]>>cm <<$dick_girth[3]>> cock thrusting into your ass. With your head upturned it doesn''t take Dan long to silence yous cries, and fill your mouth back up.'
 										'It goes on like this for awhile with no sound other than soft grunts and moans. Your lower half is almost numb with pleasure. Having your holes stretched like this all at once almost feels too good to put into words. The only word you can think of to describe it is: full. You feel so wonderfully full.'
 										gs 'arousal','anal',10,'dick[3]','group','gangbang'
 										gs 'arousal','bj',10,'dick[1]','group','gangbang'
 										gs 'arousal','vaginal',10,'dick[2]','group','gangbang'
 										minut -= 20
 										gs 'stat'
-										'Eventually Dan decides to take the initiative, or rather take your head in his hands. He forces his cock into the side of you mouth stretching your mouth to it''s limits. Then he sinks halfway down your throat and slowly pulls back out. He orders you to stick out your tongue and begins to slap his rock hard cock against your face. With a groan of appreciation Dan says: "<<$pcs_nickname>> you have become such a good little cocksucker. It wasn''t so long ago that you couldn''t even give a decent hand-job. I think you might even deserve a reward."' 
+										'Eventually Dan decides to take the initiative, or rather take your head in his hands. He forces his cock into the side of you mouth stretching your mouth to it''s limits. Then he sinks halfway down your throat and slowly pulls back out. He orders you to stick out your tongue and begins to slap his rock hard cock against your face. With a groan of appreciation Dan says: "<<$pcs_nickname>> you have become such a good little cocksucker. It wasn''t so long ago that you couldn''t even give a decent hand-job. I think you might even deserve a reward."'
 										'Before you can respond Dan rewards you by violently shoving his cock down your throat until your <<$lip1>> lips are wrapped around the base.'
 
 										act 'Work it':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/sex/1_15.jpg"></center>'
-											'Eventually the boys lay you down on the sofa. They stand over you and jerk themselves in earnest toward the finish. You eagerly smile up at them awaiting yet another reward.' 
-											'The first to finish is Vitek. He grunts as he blows his load on you, the first of many warm wet splashes against your face and chest. As if on cue, after Vitek finishes Dan and Vasily both begin to cum at the same time. You squirm and giggle with delight as it rains down on you.' 
+											'Eventually the boys lay you down on the sofa. They stand over you and jerk themselves in earnest toward the finish. You eagerly smile up at them awaiting yet another reward.'
+											'The first to finish is Vitek. He grunts as he blows his load on you, the first of many warm wet splashes against your face and chest. As if on cue, after Vitek finishes Dan and Vasily both begin to cum at the same time. You squirm and giggle with delight as it rains down on you.'
 											pcs_horny +=10
 											minut +=10
 											gs 'cum_call', 'face', $boy[3],1,'','',20
@@ -604,13 +604,13 @@ end
 
 if $ARGS[0] = 'drunken_sex_yes':
 	menu_off = 1
-	minut += 5 
+	minut += 5
 	pcs_horny +=10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/yes'+rand(1,6)+'.jpg"></center>'
 	'It''s time to show these boys that you know how to have a good time'
 	'The guys urge you on calling out various lewd suggestions'
-	
+
 	act 'Present your ass for inspection': gt 'shulga_room', 'drunken_body_popa'
 	act 'Show them your pussy': gt 'shulga_room', 'drunken_body_piz'
 	act 'Shake your tits': gt 'shulga_room', 'drunken_body_sisi'
@@ -684,7 +684,7 @@ if $ARGS[0] = 'drunken_sex':
 	gs 'arousal','bj',3,'dick[2]','group','gangbang','sub'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sex/bj'+rand(1,13)+'.jpg"></center>'
-	'As you near them, the boys gather around presenting themselves to you for satisfaction. In a haze, you take the nearest cock into your mouth and begin to suck. Your hands instinctively find the shafts of the other boys, and you begin to stroke.'  
+	'As you near them, the boys gather around presenting themselves to you for satisfaction. In a haze, you take the nearest cock into your mouth and begin to suck. Your hands instinctively find the shafts of the other boys, and you begin to stroke.'
 	'The next few minutes become a blur of sucking and stroking. Each boy has turn at your mouth, and they all seem determined to test just how good of a cock sucker you are. When you finally take a moment to catch your breath, your throat hurts and your eyes are watering, but you get a sense of pride from all the groans of pleasure you elicited from the guys..'
 
 	act 'Stand up':
@@ -700,12 +700,12 @@ if $ARGS[0] = 'drunken_sex':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sex/sex'+rand(1,22)+'.jpg"></center>'
 		gs 'gopsex', 'gg_devst_deflor'
 		'You get halfway to your feet, before you stumble back to the floor. Unannounced one of the boys slides his cock into you from behind. Your gasp is cut short when someone else''s cock rudely fills you mouth, and hits the back of your throat. As you gag and gasp for air, it all becomes a blur. The boys take turns using your young body from end-to-end.'
-		'As time passes, their rough treatment stops hurting and even starts to feel pretty good. You encourage whoever it is behind to keep it up by grinding back into his pelvis.' 
+		'As time passes, their rough treatment stops hurting and even starts to feel pretty good. You encourage whoever it is behind to keep it up by grinding back into his pelvis.'
 		gs 'gopsex', 'gg_sex_orgasm'
 
 		act 'Feel it':
 			*clr & cla
-			minut += 5 
+			minut += 5
 			pcs_horny +=5
 			temp = rand(0,2)
 			if temp = 0:gs 'cum_call', 'stomach', $boy[2],1
@@ -729,7 +729,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'
@@ -743,7 +743,7 @@ end
 
 if $ARGS[0] = 'drunken_sex_no':
 	menu_off = 1
-	minut += 5 
+	minut += 5
 	pcs_dom +=1
 	pcs_health -= 10
 	gs 'stat'
@@ -757,7 +757,7 @@ end
 
 if $ARGS[0] = 'drunken_sleep':
 	menu_off = 1
-	minut += 180 
+	minut += 180
 	if pcs_sleep < 75:
 		pcs_sleep += 25
 	else
@@ -772,12 +772,12 @@ if $ARGS[0] = 'drunken_sleep':
 	'You wake up with a splitting headache and only vague memories of your night with the guys. Remembering that somebody deserved a kick in the balls you look around the room. Vasily is the only one left, and he is passed out in a heap on the sofa. "It was probably Dan that deserved a kick", you mutter to yourself as you try to get your bearings.'
 
 	act 'Clear your head': gt 'shulga_room', 'start'
-end	
+end
 
 if $ARGS[0] = 'shulga_beer':
 	menu_off = 1
-	if alko < 6: 
-		minut += 5 
+	if alko < 6:
+		minut += 5
 		alko += RAND(1,2)
 		cumspclnt = 2
 		gs 'cum_cleanup'
@@ -789,7 +789,7 @@ if $ARGS[0] = 'shulga_beer':
 		act 'Have another drink': gt 'shulga_room', 'shulga_beer'
 		act 'You''ve had enough': gt 'shulga_room', 'start'
 	else
-		minut += 5 
+		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pjanaja'+rand(1,8)+'.jpg"></center>'
 		'You are almost too drunk to stand'
@@ -802,11 +802,11 @@ if $ARGS[0] = 'shulga_beer':
 		else
 			act 'Get this party started': gt 'shulga_room', 'drunken_sex_yes'
 		end
-	end	
+	end
 end
 !------------------------------------!
 !TV porn channel, opening event, etc..d.!
-!====================================! 
+!====================================!
 !watch porn TV
 if $ARGS[0] = 'view_pornotv':
 	menu_off = 1
@@ -832,7 +832,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 		'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.'
-		if pav_slut < 75 or kotovLoveQW > 0: 
+		if pav_slut < 75 or kotovLoveQW > 0:
 			act 'Flee the scene': gt 'shulga_room', 'start'
 		else
 			act 'Suck a cock or three':
@@ -852,7 +852,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 				gs 'stat'
 				'<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.' 
+				'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.'
 				if pav_slut >= 75 and pcs_horny < 30 or pav_slut < 75:
 
@@ -944,12 +944,12 @@ if $ARGS[0] = 'view_pornotv_vasya':
 
 		if npc_rel['A11'] >=20 and npc_rel['A11'] <50:'Vasily opens his pants and starts stroking his cock right in front of you. "<<$pcs_nickname>> would you please lend me a hand?", he asks.'
 		if npc_rel['A11'] >=50 and npc_rel['A11'] <70:'Vasily is very excited. He opens his pants and starts jerking off almost as soon as he sits down. He looks you in the eye and silently waits'
-		if npc_rel['A11'] >=70:'Vasily unceremoniously walks up to you and slaps his cock against the side of your face. You don''t even have time to understand whats going before he has you off the couch and down on your knees.'	 
+		if npc_rel['A11'] >=70:'Vasily unceremoniously walks up to you and slaps his cock against the side of your face. You don''t even have time to understand whats going before he has you off the couch and down on your knees.'
 
 		if npc_rel['A11'] < 70:
 			act 'Chicken out': gt 'shulga_room', 'start'
 		end
-		if npc_rel['A11'] >=50 and pav_slut < 75: 
+		if npc_rel['A11'] >=50 and pav_slut < 75:
 			act 'Suck it':
 				*clr & cla
 				npc_sex['A11'] += 1
@@ -969,7 +969,7 @@ if $ARGS[0] = 'view_pornotv_vasya':
 					'Wow, he got a bunch of it in your mouth, but your face and lips are all sticky too. He made such mess, but that''s why you find it so exciting. You gather a little cum off your chin with your finger, and lick it clean. It''s still warm!'
 					'As usual Vasily has gone back to watching TV, and pays no attention to you sitting on the floor, playing with his cum.'
 					act 'Finish':gt 'shulga_room', 'start'
-				end 
+				end
 			end
 		end
 		if npc_rel['A11'] >=20 and npc_rel['A11'] <50:
@@ -979,11 +979,11 @@ if $ARGS[0] = 'view_pornotv_vasya':
 				gs 'cum_call', 'hands', $boy,1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/tv/hj'+rand(1,7)+'.jpg"></center>'
-				'Vasily guides your hand around the shaft of his <<dick>>cm <<$dick_girth>> penis, and slowly starts moving your hand up and down his length. When he removes his hand, your hand continues to tentatively pump. Vasily voices a small grunt of encouragement, and you pick up the pace. He relaxes, as you build a steady rhythm.' 
+				'Vasily guides your hand around the shaft of his <<dick>>cm <<$dick_girth>> penis, and slowly starts moving your hand up and down his length. When he removes his hand, your hand continues to tentatively pump. Vasily voices a small grunt of encouragement, and you pick up the pace. He relaxes, as you build a steady rhythm.'
 				'He let''s out a sharp grunt, and your hand is covered in sticky warmth. Without a word, he quickly tucks himself back in his pants, and goes back to watching TV. Before looking for a tissue, you examine the white mess on your hand. Curious, you give it a little lick with the tip of your tongue.'
 				act 'Stand': gt 'shulga_room', 'start'
 			end
-		end	
+		end
 		if pav_slut >= 75 and npc_rel['A11'] >=70:
 			act 'Suck on it':
 				*clr & cla
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'view_pornotv_vasya':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/tv/cum'+rand(1,10)+'.jpg"></center>'
 						'Vasily gasps loudly, and thick streams of semen begin to slap against your face'
-						'He finishes with one last loud groan, and gives you a little pat on the head.' 
+						'He finishes with one last loud groan, and gives you a little pat on the head.'
 						'He immediately starts getting dressed while flipping though TV channels, leaving you on the floor feeling like a hot sticky mess.'
 						'You idly clean some of his mess off your face, and lick your fingers, while trying to decide what to do next'
 						act 'Stand up':gt 'shulga_room', 'start'
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'view_pornotv_vasya':
 end
 !----------------------------------!
 !TV in the living room with Vasily!
-!==================================! 
+!==================================!
 if $ARGS[0] = 'shultv':
 	menu_off = 1
 	rndtvs=rand(1,100)
@@ -1034,7 +1034,7 @@ if $ARGS[0] = 'shultv':
 	if rndtvs>10: pcs_willpwr = pcs_willpwr + RAND(1,5)
 	if rndtvs<=10: minut += 5
 	gs 'stat'
-	
+
 	shulga_tv_rnd = RAND(0,3)
 	if shulga_tv_rnd = 0:$shulga_tv_rnd = 'You watch'
 	if shulga_tv_rnd = 1:$shulga_tv_rnd = 'You watch'
@@ -1055,12 +1055,12 @@ if $ARGS[0] = 'shultv':
 	if shulga_tv_rand = 10:$shulga_tv_rand = '<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvsport1.mp4" width="748" height="540"></video></center><<$shulga_tv_rnd>> an MMA fight. You wonder if Vitek is as good as these guys.'
 	if shulga_tv_rand = 11:$shulga_tv_rand = '<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvsport2.mp4" width="748" height="540"></video></center><<$shulga_tv_rnd>> a football match.'
 
-	if rndtvs>10:'<<$shulga_tv_rand>> <br> You veg out in front of the TV for 30 minutes.' 
+	if rndtvs>10:'<<$shulga_tv_rand>> <br> You veg out in front of the TV for 30 minutes.'
 	if rndtvs<=10:'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvrekl'+rand(1,4)+'.mp4" width="748" height="540"></video></center> You find some advertising.'
 
 	act 'Look around the room': gt 'shulga_room', 'start'
 	act 'Change the channel': gt 'shulga_room', 'shultv'
-	
+
 	porno_tv_rand=RAND(0,100)
 	if porno_tv_rand<50 or porno_tv_rand>=50 and week < 6 and hour >= 3 and hour <= 23 or porno_tv_rand>=50 and week >= 6 and hour > 2 and hour < 10 or porno_tv_rand>=50 and week >= 6 and hour > 16 and hour <= 23: gt 'shulga_room', 'view_pornotv'
 	if porno_tv_rand>=50:
@@ -1069,10 +1069,10 @@ if $ARGS[0] = 'shultv':
 		if week < 6 and hour >= 0 and hour <= 2: gt 'shulga_room', 'view_pornotv_evgr'
 	end
 end
-	
+
 !--------------------------------------!
 !Bazaar night with Vasily, Vitek, and Dan. On Weekdays hours: 0 to 2!
-!======================================! 
+!======================================!
 if $ARGS[0] = 'shulga_bazar_night':
 	menu_off = 1
 	rnd_rebyata = RAND(0,1)
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'shulga_bazar_night':
 		if vasyan_textb = 3:$vasyan_textb = '  He tells you a story about a fight: "I got into a scrap with Dimka behind the community center once. I totally whipped his ass, but be careful around him he''s a nasty piece of work."'
 		if vasyan_textb = 4:$vasyan_textb = '  He tells you a story about his trip to the city: "I lost my wallet in the city and had no way to get home. The only way I could earn money for the train was by washing dishes at the barbecue. It turned out great though. The cute barmaid was flirting with me all night, and I even got to make out with her before I left. The next time I make it up there I''m going to rock her world."<br>  "You go get her tiger", you encourage him.'
 		if vasyan_textb = 5:$vasyan_textb = '  Vasily complains: "The economy is broken, and none of these idiots is doing anything about it."<br>  "What should be done to fix it", you ask curiously.<br>  "Oh, I don''t care. I can use my laptop to hack the banks, and get money whenever I need it", he says.<br> "Then why the hell are you complaining", you say frustrated'
-		if vasyan_textb = 6:$vasyan_textb = '  He talks about his trip to the city: "I got lost in the old section of the city. I nearly starved to death, before I found my way out. If you ever end up there be careful. That place is like a Byzantine labyrinth."<br>  "Did you find anything interesting?", you ask.<br>  Not really, there was lot''s of grass and abandoned buildings. I did see a leather clad woman get out of a cab, but she disappeared like a puff of smoke.' 
+		if vasyan_textb = 6:$vasyan_textb = '  He talks about his trip to the city: "I got lost in the old section of the city. I nearly starved to death, before I found my way out. If you ever end up there be careful. That place is like a Byzantine labyrinth."<br>  "Did you find anything interesting?", you ask.<br>  Not really, there was lot''s of grass and abandoned buildings. I did see a leather clad woman get out of a cab, but she disappeared like a puff of smoke.'
 		if vasyan_textb = 7:$vasyan_textb = '  "Hey <<$pcs_nickname>>, the guys and I were trying to figure something out. How big are your tits? I said they look like <<$titsize>>s, but I figured I''d ask you to be sure."<br>  You cross your arms over your chest, and glare at him in response.<br>  "So,bigger then?", he quirks an eyebrow.<br>  You give him a little slug in the arm for an answer.'
 		if vasyan_textb = 8 and npc_rel['A11'] < 30:$vasyan_textb = '  He tells you a story about magic fairies, who live in the countryside. He swears it''s true, but you just roll you eyes.'
 		if vasyan_textb = 8 and npc_rel['A11'] >=30 and webcamera = 1:$vasyan_textb = '  Don''t you sometimes do homework at Julia Milova''s place after school?, he asks.<br>  "Maybe", you say suspiciously.<br>  "Well, if you ever do please put in a good word for me. I think she''s cute", he finishes.'
@@ -1150,7 +1150,7 @@ if $ARGS[0] = 'shulga_bazar_night':
 				'Vasily says: "Keep your pants on, woman. I''m not a machine."'
 				act 'Humph': gt 'shulga_room','shulga_bazar_night'
 			elseif shgopsex_vasya_count > 0:
-				$gopsex_n_npc = 1 
+				$gopsex_n_npc = 1
 				shgopsex_vasya_day = daystart
 				shgopsex_vasya_count -= 1
 				gs 'boyStat', 'A11'
@@ -1158,11 +1158,11 @@ if $ARGS[0] = 'shulga_bazar_night':
 				gs 'gopsex', 'shgopsex'
 			end
 		end
-	end	
+	end
 end
 !--------------------------------------------!
 !Bazaar night with Dan. Monday - Thurstday hours: 20:00 - 24:00!
-!============================================! 
+!============================================!
 if $ARGS[0] = 'den_bazar':
 	menu_off = 1
 	minut += 1
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'den_bazar':
 		if den_textb_gorslut = 5:$den_textb_gorslut = '  "<<$pcs_nickname>>, hand me the TV remote", Dan says.<br>  He is way closer to it than you, but he looks comfortable. You happily fetch it for him.<br>  "Good girl", he praises you for a job well done.'
 		if den_textb_gorslut = 6:$den_textb_gorslut = '  Dan asks:" <<$pcs_nickname>>, does your sister still work at the local supermarket?"<br>  "Yea, but she does not enjoy it much, so I try not to bother her when she is working", you inform him.<br>  "You should bring her over here sometime. I bet we could find a way to cheer her up", he says suggestively.<br>  "God, is sex the only thing you ever think about, and what on earth makes you think I would do that sort of thing with my sister?", you say a little sheepishly while giving him a sideways glance.'
 		if den_textb_gorslut = 7:$den_textb_gorslut = '  Dan tells you about his visit to the strip club: "You need an ID to get in, but once you do it''s great. They have some of the best looking woman I''ve ever seen in there, and I think on some nights the even have male strippers for ladies"'
-	
+
 		if bazar_count_den <= 0:'  "Be quiet <<$pcs_nickname>>. That''s enough talk out of you tonight. Leave me in peace, unless you want to put those <<$lip1>> lips to a better use", Dan says'
 		if pav_slut < 75 and bazar_count_den > 0: '<<$den_textb>>'
 		if pav_slut >= 75 and bazar_count_den > 0: '<<$den_textb_gorslut>>'
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'den_bazar':
 	act 'Drink beer': gt 'shulga_room', 'shulga_beer'
 
 	if pav_slut >= 75 and alko >= 1:
-		act 'Have sex with Dan': 
+		act 'Have sex with Dan':
 			if shgopsex_den_count = 0:
 				cla
 				'Dan says: "Damn slut, I''m only one man. Suck your supper out of someones else''s cock"'
@@ -1225,11 +1225,11 @@ if $ARGS[0] = 'den_bazar':
 				gs 'gopsex', 'shgopsex'
 			end
 		end
-	end	
+	end
 end
 !---------------------------------------------!
 !Bazaar with Vitek(Kotov) Monday - Thurstday hours: 20:00 - 24:00!
-!=============================================! 
+!=============================================!
 if $ARGS[0] = 'vitek_bazar':
 	menu_off = 1
 	minut += 1
@@ -1249,7 +1249,7 @@ if $ARGS[0] = 'vitek_bazar':
 		vitek_textb = RAND(0,7)
 		if vitek_textb = 0:$vitek_textb = '  "Any chance I could get you to come over, and do some cleaning? My apartment is such a wreck that it''s virtually uninhabitable. It could really use a woman''s touch."<br>  "I''ll think about it", you answer shyly.<br>  The thought of cleaning Vitek''s place in a skimpy little outfit bubbles up in your mind, and you turn away blushing'
 		if vitek_textb = 1 and SchoolAtestat = 0:$vitek_textb = '  Vitek flexes his bicep, and tells you to feel it. Somewhat hesitantly you give his muscle a little squeeze. It''s hard as a rock, and a little exciting too.<br> "I can bench 300", he boasts.<br>  You have no idea what that means but say: "Wow, that''s really good. I''m impressed."'
-		if vitek_textb = 1 and SchoolAtestat = 1:$vitek_textb = '  Vitek compliments you: "<<$pcs_nickname>>, your hair looks beautiful. I''ve always had a thing for girls with <<$pcs_haircol>> hair"<br>  "Thank you", you say blushing.' 
+		if vitek_textb = 1 and SchoolAtestat = 1:$vitek_textb = '  Vitek compliments you: "<<$pcs_nickname>>, your hair looks beautiful. I''ve always had a thing for girls with <<$pcs_haircol>> hair"<br>  "Thank you", you say blushing.'
 		if vitek_textb = 2:$vitek_textb = '  Vitek invites you to the community center at night to drink and dance with him. The thought of dancing with him sends a little flutter though your chest.<br>  "I might just take you up on that offer you tell", you tell him trying your best to sound sexy.'
 		if vitek_textb = 3:$vitek_textb = '  Vitek talks to you about his boxing training at that community center. He thinks he is getting pretty good. "Stop by if you want to see me in action. There is plenty of other stuff to do there too", he finishes.'
 		if vitek_textb = 4:$vitek_textb = '  Vitek asks: "Do you ever go down to the lake to swim?"<br>  "Sometimes, but it''s been a while", you answer.<br>  "It''s a shame I''ve never seen you in a bathing suit", he says almost shyly.'
@@ -1262,7 +1262,7 @@ if $ARGS[0] = 'vitek_bazar':
 		if vitek_textb_gorslut = 0:$vitek_textb_gorslut = '  Your lying on the couch when Vitek sits down, and puts your feet in his lap. Without saying anything, he gently starts to massage them. You let him know how good it feels with a series of soft moans. Vitek can be so good to you when he wants to be. You think you should probably reward him.'
 		if vitek_textb_gorslut = 1:$vitek_textb_gorslut = '  Vitek imparts some wisdom: "You can determine how close your relationship is with someone by how much you can mock them, before receiving a beating."<br>  "What if I said you have a tiny cock?", you say.<br>  "Then I would attack you", he says. He takes both hands and furiously tickles you around your sides and stomach.<br>  You sequel with delight laughing until you are out of breath.'
 		if vitek_textb_gorslut = 2:$vitek_textb_gorslut = '  Vitek is full of fun facts: "<<$sveta_rnd_name>>, did you know that it''s empirically proven that 95% of girls can no longer pronounce the name of the city Naberezhnye Cheln if they go a month without sex?"<br>  Deadpan you respond: "I speak seven languages."'
-		if vitek_textb_gorslut = 3 and SchoolAtestat = 0 and soniaPS = 1:$vitek_textb_gorslut = '  Vitek says: "Sonia pulled me into the school toilet yesterday, climbed on top of me, and used me for sex. She basically raped me. I may have to go see the therapist at the clinic to get over it."<br>  He says it with a smile, but you can tell he is worried about Sonia.' 
+		if vitek_textb_gorslut = 3 and SchoolAtestat = 0 and soniaPS = 1:$vitek_textb_gorslut = '  Vitek says: "Sonia pulled me into the school toilet yesterday, climbed on top of me, and used me for sex. She basically raped me. I may have to go see the therapist at the clinic to get over it."<br>  He says it with a smile, but you can tell he is worried about Sonia.'
 		if vitek_textb_gorslut = 3 and SchoolAtestat = 1 and soniaPS = 1:$vitek_textb_gorslut = '  Vitek says: "Sonia was pestering me in the park yesterday. When I told her no, and walked away she just followed me. I decided I''d had enough, and started to jog away. She chased me! She actually chased me though the park trying to have sex with me..." He just shakes his head dumbfounded by this turn of events.'
 		if vitek_textb_gorslut = 3 and soniaPS <= 0:$vitek_textb_gorslut = '  Vitek advises you: "If you ever lend money to Natasha Belova don''t expect to get it back. Well, not with cash anyway, her methods of repayment are very interesting though."<br>  You give him a playful slug on the shoulder, and start thinking about Natasha''s legs.'
 		if vitek_textb_gorslut = 4:$vitek_textb_gorslut = '  Vitek starts talking like he is telling a ghost story: " There is a woman who walks our quite streets at night wearing leather and brandishing a whip. They say if she catches you wind up in her dungeon never to be seen again." He finishes by laughing and making spooky sounds.<br>  You are to distracted by thoughts of mysterious leather clad women to laugh with him.'
@@ -1314,11 +1314,11 @@ if $ARGS[0] = 'shulga_lern':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/lern/ev<<lern_imgset>>.jpg"></center>'
 		'You sit down with Vasily for an hour, and do your homework.'
-		act 'Keeps studying': 
+		act 'Keeps studying':
 			lernHome = 0
 			gt 'shulga_room', 'shulga_lern'
 		end
-		act 'Take a break': 
+		act 'Take a break':
 			lernHome = 0
 			gt 'shulga_room', 'shulga_bazar_day'
 		end
@@ -1329,9 +1329,9 @@ if $ARGS[0] = 'shulga_lern':
 			'"<<$pcs_nickname>>, there is no way I can concentrate with you in that outfit. Let''s get you out of it, so we can continue", he suggests.'
 			'From the way he is pawing at you, it looks like more school work is out of the question'
 			'The only questions that remains is: What are you going to do about that bulge in Vasily''s pants?'
-			if pcs_horny >= 50: 
+			if pcs_horny >= 50:
 				act 'You''re already wet.': gt 'shulga_room', 'shulga_lern_sex_yes'
-			elseif pcs_horny <= 50: 
+			elseif pcs_horny <= 50:
 				act 'Oh, I suppose!': gt 'shulga_room', 'shulga_lern_sex_yes'
 				act 'You''re not in the mood': gt 'shulga_room', 'shulga_lern_sex_no'
 			end
@@ -1461,7 +1461,7 @@ if $ARGS[0] = 'shulga_bazar_day':
 	'Vasily is always with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically the weakest one of the three, but is a bit of a prankster and always makes the others laugh. He was raised by just his father, after his mother left when he was still an infant.'
 
 	gs 'shulga_room', 'vasya_shulgin_rep'
-	
+
 	act 'Move away': gt 'shulga_room'
 	act 'Talk':
 		*clr & cla
@@ -1491,13 +1491,13 @@ if $ARGS[0] = 'shulga_bazar_day':
 		act 'Further': gt 'shulga_room', 'shulga_bazar_day'
 		gs 'stat'
 	end
-	
+
 	if shulga_lern_count > 0 and SchoolAtestat = 0:
 		act 'Do homework': gt 'shulga_room', 'shulga_lern'
 	end
 
 	if npc_rel['A11']>=70 and pcs_vag >=1 and (alko >= 1 or pcs_horny >= 30):
-		act 'Suggest sex': 
+		act 'Suggest sex':
 			if shgopsex_vasya_count = 0:
 				cla
 				'Vasily says: "Maybe next time <<$pcs_nickname>>. I''ve had a enough for day."'
@@ -1556,11 +1556,11 @@ if $ARGS[0] = 'sleep_vasya_soglasie':
 	'Vasily rubbed his eyes and asks: "What do you want <<$pcs_nickname>>?"'
 	'You plead: "Vasily can I sleep next to you? I can''t get comfortable on the little sofa"'
 	'He couldn''t refuse you, and he scooched over to let you into the bed.'
-	
+
 	act 'Take a nap': gt 'shulga_room', 'sleep_vasya_bed'
-		
+
 	if npc_rel['A11']>=70:
-		act 'Suggest fuck': 
+		act 'Suggest fuck':
 			if shgopsex_vasya_count = 0:
 				cla
 				'Vasily says: "<<$pcs_nickname>>, I''m beat let''s just call it a day."'
@@ -1573,8 +1573,8 @@ if $ARGS[0] = 'sleep_vasya_soglasie':
 				gs 'gopsex', 'settings'
 				gs 'gopsex', 'shgopsex'
 			end
-		end		
-		
+		end
+
 	end
 end
 !---------------------!
@@ -1586,7 +1586,7 @@ if $ARGS[0] = 'shulga_bazar_sleep':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/vasya_sleep.jpg"></center>'
 	'Vasily fast asleep'
 	act 'Leave': gt 'shulga_room'
-	act 'Wake up': 
+	act 'Wake up':
 		if npc_rel['A11'] < 50: gt 'shulga_room', 'sleep_vasya_otkaz'
 		if npc_rel['A11'] >= 50: gt 'shulga_room', 'sleep_vasya_soglasie'
 	end

+ 37 - 20
locations/shulgabath.qsrc

@@ -1,9 +1,9 @@
 # shulgabath
 CLOSE ALL
-$metka = $ARGS[0]
-$loc = $CURLOC
-$metkaM = $ARGS[0]
-$locM = $CURLOC
+$loc = 'shulgabath'
+$metka = 'start'
+$locM = 'shulgabath'
+$metkaM = 'start'
 $location_type = 'bathroom'
 cla
 *clr
@@ -41,9 +41,9 @@ end
 !Bathroom, Sonia choice opening event:
 if $ARGS[0] = 'sexev':
 	menu_off = 1
-	if RAND(0,100) < 50: 
+	if RAND(0,100) < 50:
 		gt 'shulgabath', 'sexev1'
-	else 
+	else
 		gt 'shulgabath', 'sexev2'
 	end
 end
@@ -56,6 +56,7 @@ if $ARGS[0] = 'sexev1':
 	sexev_sonya_count -= 1
 	sh_sonya_sexev += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/bj'+rand(1,2)+'.jpg"></center>'
+	*nl
 	'When you enter the bathroom, you freeze when you hear a girl''s voice in there. You carefully open the door to see Sonia sucking Sergey''s cock. She''s even taking a video of herself doing it... you wonder why?'
 	gs 'arousal', 'voyeur', 5
 	gs 'arousal', 'end'
@@ -71,20 +72,23 @@ if $ARGS[0] = 'sexev2':
 	sexev_sonya_count -= 1
 	sh_sonya_sexev += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/ev2_1'+rand(1,2)+'.jpg"></center>'
+	*nl
 	'When you want to enter the bathroom, you see Sonia standing in front of the mirror. Luckily she didn''t see you; she was too occupied counting money. Your curiosity gets the better of you, and you decide to watch her for a while. Where did she get that money?'
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
-	act 'Continue': 
+	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/ev2_2'+rand(1,2)+'.jpg"></center>'
+		*nl
 		'Sonia starts to undress, and then puts on a delicate lingerie set. She then touches up on her make-up, fixing every little blemish she can find.'
 		'You realize she''s probably going to come out of the bathroom soon, and quickly move to the kitchen and hide there.'
 		'Sure enough, Sonia comes out of the bathroom a few seconds later, and heads straight for uncle Sergey''s bedroom.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
-		act 'Continue': 
+		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev2_3'+rand(1,2)+'.jpg"></center>'
+			*nl
 			'You quickly sneak to the door, and carefully open it just enough so you can see what''s happening inside the room.'
 			'What you see does not surprise you in the slightest; Sonia is on her knees in front of Sergey, eagerly sucking on his dick.'
 			'"Very nice, baby. Take it deeper... all the way in, there you go..." he encourages her.'
@@ -92,19 +96,21 @@ if $ARGS[0] = 'sexev2':
 			gs 'arousal', 'voyeur', 5
 			gs 'gopsex', 'masturb_gg'
 			gs 'stat'
-			act 'Continue': 
+			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev2_4'+rand(1,2)+'.jpg"></center>'
+				*nl
 				'Sergey makes Sonia bend over for him and rams his cock inside her sopping cunt. When he rhythmically fucks your classmate, Sonia moans and groans while her face turns a deep red. She''s completely lost in the moment... for a second you wonder why Sergey even gave her money, looking at her like this makes you think she probably would''ve done it for free anyway.'
-				'After a few minutes Sonia orgasms violently on Sergey''s cock, and even squirts a little.'	
+				'After a few minutes Sonia orgasms violently on Sergey''s cock, and even squirts a little.'
 				gs 'arousal', 'voyeur', 5
 				gs 'stat'
 				gs 'gopsex', 'masturb_gg'
-				act 'Continue': 
+				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev2_5'+rand(1,2)+'.jpg"></center>'
+					*nl
 					'When he''s too worked up to postpone his orgasm any longer, Sergey says: "On your knees! Fast!"'
-					'Sonia aims to please, and immediately drops to her knees in front of him with her mouth wide open. Sergey finishes inside Sonia''s mouth, and she swallows his load eagerly. She loudly smacks her lips and smiles at him: "Mmm... delicious!"'	
+					'Sonia aims to please, and immediately drops to her knees in front of him with her mouth wide open. Sergey finishes inside Sonia''s mouth, and she swallows his load eagerly. She loudly smacks her lips and smiles at him: "Mmm... delicious!"'
 					gs 'gopsex', 'masturb_gg'
 					'Now that they''re done, you realize you should probably get the hell out of there before they find you staring. You quickly shut the door.'
 					gs 'arousal', 'voyeur', 5
@@ -133,6 +139,7 @@ if $ARGS[0] = 'ev1':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/m.jpg"></center>'
+	*nl
 	'When you go to the bathroom, you find Sonia already in there. "Hi!" she says cheerfully, before returning to touching up her make-up.'
 
 	act 'Chat with Sonia': gt 'shulgabath', 'bazar'
@@ -153,6 +160,7 @@ if $ARGS[0] = 'ev2':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/t.jpg"></center>'
+	*nl
 	'When you go to the bathroom, you find Sonia already in there. "Hey!" she shouts indignantly. Oops, she''s on the toilet!'
 	'"Sorry, sorry!" you apologize, quickly leaving the bathroom.'
 	act 'Return to the hallway': gt'shulgahall'
@@ -170,6 +178,7 @@ if $ARGS[0] = 'bazar':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/b.jpg"></center>'
+	*nl
 	'Ever since Sonia inadvertedly got way too drunk and gave five guys including Vitek and his friends a simultaneous blowjob near the disco, her reputation in Pavlovsk has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'
 
 	sonya_textb_vanna = RAND(1,7)
@@ -212,32 +221,36 @@ if $ARGS[0] = 'lesb':
 	if frost > 0:frost = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/ev1_1.jpg"></center>'
+	*nl
 	'You fill the bath tub and get in. Sonia is still standing near the mirror, fixing her make-up. She doesn''t seem to mind that you are in here with her.'
 	'Then you smile at her and ask: "Hey Sonia... would you like to take a bath with me?"'
 	'Sonia looks puzzled for a second, and asks: "Like... you want me to get in the bath with you right now?"'
 	'When you nod, she grins: "Actually, that sounds like fun! Sure!" and quickly gets naked, sliding her naked body into the warm tub water.'
 
-	act 'Continue': 
+	act 'Continue':
 		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev1_2'+rand(1,2)+'.jpg"></center>'
+		*nl
 		'"Mmmm..." Sonia muses, enjoying the warmth of the bath water slowly seeping into her body. For the next few minutes you just sit in the bath next to each other. Sonia occasionally looks at you, but doesn''t say much.'
 
-		act 'Continue': 
+		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev1_3'+rand(1,2)+'.jpg"></center>'
+			*nl
 			'Just when you were about to say something, Sonia moves closer to you and kisses you full on your mouth. You freeze for a second, and then think to yourself... why the hell not?'
 			'You kiss Sonia back eagerly, playing with her tongue as she thrusts it into your mouth.'
 			gs 'arousal', 'kiss', 5, 'lesbian'
 			gs 'arousal', 'kiss_give', 5, 'lesbian'
 			minut -= 5
 			gs 'stat'
-			act 'Continue': 
+			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/shuglinhome/vanna/ev1_4'+rand(1,3)+'.jpg"></center>'
+				*nl
 				'Before you realize what''s going on, Sonia signals for you to lift your hips above the water, which you do immediately.'
-				'Sonia moves her head between your legs and licks your cunt eagerly, teasing your clitoris with her tongue. She teases you with one hand, thrusting two fingers inside your snatch while she licks you skilfully. The way she looks into your eyes the whole time makes it a very intimate experience... she''s really good at this!'	
+				'Sonia moves her head between your legs and licks your cunt eagerly, teasing your clitoris with her tongue. She teases you with one hand, thrusting two fingers inside your snatch while she licks you skilfully. The way she looks into your eyes the whole time makes it a very intimate experience... she''s really good at this!'
 				if pcs_horny >=70:
 					pcs_mood += 35
 					pcs_willpwr +=20
@@ -269,6 +282,7 @@ if $ARGS[0] = 'serg_sex':
 	sh_sonya_sexev +=1
 	npc_sex['A25'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna/gr/ev1_1_'+rand(1,5)+'.jpg"></center>'
+	*nl
 	'"Sure, I bet Sergey would love having an extra girl around when he fucks me!" she grins. "Come on!"'
 	'You follow her into his room, and she was right; Sergey loves the idea! Sonia eagerly begins to suck his cock, and then offers it to you after a while: "Come on, <<$pcs_nickname>>! Get to work!"'
 	'Sonia notices your hesitance and puts her hand behind your head, gently but firmly guiding your head to his cock. "Go on, you''ll love it! I''ll help!"'
@@ -277,9 +291,10 @@ if $ARGS[0] = 'serg_sex':
 	'"Wow, <<$pcs_nickname>>", Sonia says with some admiration in her voice, "I thought I was good with my mouth, but you sure look like you could teach me a thing or two!"'
 	gs 'arousal', 'bj', 5, 'sub', 'deepthroat', 'group'
 	gs 'stat'
-	act 'Continue': 
+	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna/gr/ev1_2_'+rand(1,2)+'.jpg"></center>'
+		*nl
 		'Sergey seems to have made his choice; he wants to fuck you first. He moves up behind you and rubs his hard cock against your pussy lips; the wetness of them combined with his precum make it feel very nice.'
 		'Sonia just watches as Sergey slowly pushes his dick further and further inside of you, idly rubbing her clit and massaging her boobs. Your pussy feels quite full when Sergey is all the way in, but it''s a good kind of full. A nice kind of full. Maybe you should visit Sergey more often...'
 		'When he slowly begins to thrust his cock in and out of you, you open your mouth and let out a soft moan. Sonia sees this as an invitation and grabs your hair, as she rubs her pussy against your lips eagerly. Her actions are making it perfectly clear: you''re supposed to service her with your mouth while you get fucked.'
@@ -290,12 +305,13 @@ if $ARGS[0] = 'serg_sex':
 		gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub', 'group'
 		minut -= 5
 		gs 'stat'
-		act 'Continue': 
+		act 'Continue':
 			*clr & cla
 			minut += 5
 			pcs_horny += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna/gr/ev1_3_'+rand(1,4)+'.jpg"></center>'
+			*nl
 			'You have a devious grin on your face when you see Sonia in her current position. She forced you to lick her when Sergey fucked you... well, two can play that game!'
 			'Sergey groans as he enters Sonia, the wetness of her pussy definitely easing his access to her. You must''ve done a good job with your mouth, getting her that worked up.'
 			'"Your turn to service me, dear..." you smirk, right before you lower your hips over Sonia''s mouth before she can protest.'
@@ -310,14 +326,15 @@ if $ARGS[0] = 'serg_sex':
 				$orgasm_txt = 'She does such a good job, she brings you to an orgasm before you can stop her. You loudly groan and your body trembles over hers, causing Sergey to give you some confused looks.'
 				gs 'arousal', 'cuni', 5, 'lesbian', 'dom', 'group'
 				gs 'stat'
-			end	
-			act 'Continue': 
+			end
+			act 'Continue':
 				*clr & cla
 				minut += 5
 				pcs_horny += 10
 				gs 'cum_call','mouth',$boy,1,'','',7
 				pcs_hairbsh = 0
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna/gr/ev1_4_'+rand(1,2)+'.jpg"></center>'
+				*nl
 				'When Sergey is close to his orgasm, he stops fucking Sonia and orders the both of you to get down on your knees before him. Sergey readily puts his cock into Sonia''s mouth, and roars loudly as he drops his hot load of sperm onto her tongue.'
 				'Sonia swallows some of it, while you lick the sperm that she didn''t manage to swallow from Sergey''s cock and balls after he pulls out of Sonia''s mouth.'
 				'"<<$pcs_nickname>>, you horny minx!" Sonia exclaims. "I didn''t know you were such a slut for cum!"'

+ 1 - 0
locations/shulgabed.qsrc

@@ -14,6 +14,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'wakeup':
 	gs 'stat'
 	'<center><b><font color = maroon>Uncle Sergey''s bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom.jpg"></center>'
+	*nl
 	'Sergey''s bedroom looks just like any other bedroom. There''s a large bed, a television with a VCR connected to it, and a large cabinet to store clothes in. A random amount of junk is deposited on one of the nightstands.'
 
 	if hour < 7 or hour >= 23: 'When you come in you see that<<$serg_obr>> <a href="exec:GT ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'

+ 17 - 17
locations/shulgahall.qsrc

@@ -47,6 +47,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
+	act 'Leave the apartment':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
 
 	act 'Go to the living room': gt 'shulga_room', 'start','hall'
 	if instr($maintxt,'hear') > 0:
@@ -56,7 +57,6 @@ if $ARGS[0] = '':
 	end
 	act 'Go to the bathroom': gt 'shulgabath', 'start'
 	act 'Go to the kitchen': gt 'shulgakuh',instr($maintxt,'hear')
-	act 'Leave':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
 end &!--- main ---
 
 if $ARGS[0] = 'shulga_home_momgg1':
@@ -69,7 +69,7 @@ if $ARGS[0] = 'shulga_home_momgg1':
 	'Then Sergey runs her hands over her snatch, rubbing her clit until your mother tries to scoot away from him.'
 	'He smirks at her, and moves his head to her inner thighs. He''s placing kisses all over the place, carefully avoiding her pussy.'
 	'"Just lick me already, you bastard!" your mother groans, and she moans happily as Sergey thrusts his tongue inside her. Having her beg for him is all he was waiting for. Your mother lets out a satisfied sigh and closes her eyes, thoroughly enjoying his mouth on her wet cunt.'
-	
+
 	gs 'arousal', 'voyeur', 5
 	gs 'gopsex', 'masturb_gg'
 	gs 'stat'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'shulga_home_momgg1':
 		'After licking your mother''s pussy for a few minutes, he grabs her by the arms and pulls her up from the couch, putting her down on her knees in front of him. Without needing any prompting, she eagerly closes her lips around th head of his huge cock and begins to take it further and further into her mouth. They''ve definitely done this before.'
 		'Sergey grips your mother''s hair firmly and thrusts his hips forward, forcing his cock all the way down her throat.'
 		'"That''s it Natasha, take it all the way... rub your lipstick all over my groin", he grins, looking her straight in the eye. Then he begins to fuck your mother''s mouth furiously. Your mother takes it like a champ, not showing any gag reflex whatsoever.'
-		
+
 		gs 'arousal', 'voyeur', 5
 		gs 'gopsex', 'masturb_gg'
 		gs 'stat'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'shulga_home_momgg1':
 			'Sergey spreads her butt cheeks with his hands, and guides his cock to her cunt. He''s not very gentle with your <<$npc_nickname[''A29'']>>, and begins to pound her furiously as if his life depended on it.'
 			'Your mother looks like she wouldn''t have it any other way and rhythmically bounces her ass back against his hips, matching his thrusts.'
 			'"Yes! Keep fucking me! Just like that! Aaahhh..." your mother groans.'
-			
+
 			gs 'arousal', 'voyeur', 5
 			gs 'gopsex', 'masturb_gg'
 			gs 'stat'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'shulga_home_momgg1':
 				'You know you shouldn''t be watching this... but wow! Sergey is treating your mother like a cheap whore, and she''s loving it!'
 				'Sergey decides to change things up a bit, and gets up. He then sits down on the couch, his cock still firmly erect. You mother immediately mounts him with a lewd grin on her face, and rides his cock eagerly.'
 				'Sergey roughly pinches your mother''s nipples while he keeps degrading her, talking about what a huge slut she is for him, and how he can''t believe how often she''s coming upstairs to see him lately. Your mother just groans and rides him even harder.'
-				
+
 				gs 'arousal', 'voyeur', 5
 				gs 'gopsex', 'masturb_gg'
 				gs 'stat'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'shulga_home_momgg1':
 					'He lovingly strokes her hair for a second and says: "You''re insatiable, Natasha. I''m glad Vladimir decided the two of you should live here, right below me!"'
 					'"What can I say? Vladimir just can''t keep me satisfied by himself. A woman has her needs, you know..." she grins. "I better freshen up and head back downstairs though, before anyone notices I''m gone. See you soon?"'
 					'Sergey nods happily: "Absolutely!"'
-					
+
 					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -134,11 +134,11 @@ if $ARGS[0] = 'shulga_home_momgg2':
 	'She looks like she''s been at it for a while. Her hair looks all disheveled, and her face looks a bit puffy.'
 	'"Keep sucking, slut", Sergey commands. "I''ll tell you when you''re done."'
 	'Your mother nods and keeps serving his large dick obediently with her mouth. You''re baffled... your mother lets Sergey talk to her like that? Your high-and-mighty mother, who always takes the high ground with you?'
-	
+
 	gs 'arousal', 'voyeur', 5
 	gs 'gopsex', 'masturb_gg'
 	gs 'stat'
-	act 'Keep watching': 
+	act 'Keep watching':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev2_2_'+rand(1,2)+'.jpg"></center>'
 		'After a few more minutes, your mother pulls away and winks at him: "You''ll have to fuck my ass today. It''s that time of the month..."'
@@ -146,21 +146,21 @@ if $ARGS[0] = 'shulga_home_momgg2':
 		'Your mother gets on top of Sergey, and guides his cock towards her tight sphincter. She left out of a soft sigh and bites her lip as she slowly lowers herself down onto it.'
 		'"I''m so full!" she groans, when he''s all the way inside her ass. "Why do you have to be this big?"'
 		'Sergey smirks: "As if you''d have it any other way..." and slowly begins to move his hips once she gets used to his size. Your mother soon matches his thrusts, and rides Sergey more and more enthusiastically.'
-		
+
 		gs 'arousal', 'voyeur', 5
 		gs 'gopsex', 'masturb_gg'
 		gs 'stat'
-		act 'Keep watching': 
+		act 'Keep watching':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev2_3_'+rand(1,2)+'.jpg"></center>'
 			'Then Sergey makes your mother roll on her side. "I love that time of the month..." he growls in her ear as he begins to thrust his cock into her ass more firmly, making your mother moan and mewl with pleasure.'
 			'"Ohh Sergey, that feels so good! Don''t stop!" your mother groans, and she begins to rub her pussy to stimulate herself while he fucks her ass from behind.'
 			'He responds by redoubling his efforts, hammering his hips against hers. He whispers: "You love it when I stretch out your ass, don''t you Natasha? We could be doing this all the time, you know..."'
-			
+
 			gs 'arousal', 'voyeur', 5
 			gs 'gopsex', 'masturb_gg'
 			gs 'stat'
-			act 'Keep watching': 
+			act 'Keep watching':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev2_4.jpg"></center>'
 				'Your mother moans between ragged breaths: "No... I like it... when it''s special..."'
@@ -169,7 +169,7 @@ if $ARGS[0] = 'shulga_home_momgg2':
 				'"Ohh yea! I love it when you come in my ass, Sergey!" your mother gasps. After a few more thrusts, he pulls out and you see his sperm slowly trickle from your <<$npc_nickname[''A29'']>>''s slightly gaped anus.'
 				'"That was fun, babe", Sergey smiles. "I''m guessing I will see you again soon? I know how horny you get when you''re on your period!"'
 				'She kisses him on the lips and slaps his chest playfully. "Shut up!" she grins. "But... yea. See you soon!"'
-				
+
 				gs 'arousal', 'voyeur', 5
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -188,7 +188,7 @@ if $ARGS[0] = 'shulga_home_momggbang':
 	'She''s almost naked, while the men still have their clothes on. They pulled their cocks out through their zippers and your mother is sucking them both off greedily, taking them in her mouth in turns. She''s doing her best to please them both, jerking off whoever she''s not pleasing with her mouth.'
 	'"Just like good old times eh, Misha?" Sergey grins. Misha laughs and nods: "Indeed... I don''t think we''ve ever had a better slut to share than our Natasha!"'
 	'Your mother blushes a bit, but keeps servicing them as if she didn''t hear it.'
-	
+
 	gs 'arousal', 'voyeur', 5
 	gs 'gopsex', 'masturb_gg'
 	gs 'stat'
@@ -201,7 +201,7 @@ if $ARGS[0] = 'shulga_home_momggbang':
 		'Sergey grins and the men change places, moving your mother around. She''s content to just let it happen, happy to please the men any way they see fit.'
 		'"Such an eager slut..." Sergey muses, after they''d been fucking her for a while. "Let''s see how she likes it when both her holes are fucked at once!"'
 		'Misha snorts: "You don''t remember the last time we did? You''re getting old and forgetful, Sergey... it was last week, for crying out loud!"'
-		
+
 		gs 'arousal', 'voyeur', 5
 		gs 'gopsex', 'masturb_gg'
 		gs 'stat'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'shulga_home_momggbang':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/momgg/ev3_3.jpg"></center>'
 			'Your mother ignores the derogatory remarks and eagerly mounts uncle Misha, slowly taking his cock in her ass before leaning back. In fact, it almost looks like she''s enjoying hearing the men talk about her like that!'
 			'Sergey immediately moves between her legs and guides his cock towards her dripping cunt, slamming it in. After a few testy thrusts, the men find a rhythm and fuck your mother in sync, making her moan and beg like you''ve never heard her before. From her usual model behaviour, to acting like a total whore in less than 15 minutes... oh, how the mighty have fallen!'
-			
+
 			gs 'arousal', 'voyeur', 5
 			gs 'gopsex', 'masturb_gg'
 			gs 'stat'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'shulga_home_momggbang':
 				'Your mother quickly blurts out: "No! No, don''t tell Vladimir... he wouldn''t understand."'
 				'Misha raises his hands apologetically and kisses her cheek: "Of course, dear. I honestly prefer keeping you for just me and Sergey anyway. Thanks for the fuck, Natasha. You know where to find us if you need more!"'
 				'You quickly hide when he walks past you. That was close! Your mother quickly cleans herself up a little, chatting with Sergey about everyday things. This really was nothing special for her. You can''t help but wonder how long this has been going on... from how they were talking, it could be years!'
-				
+
 				gs 'arousal', 'voyeur', 5
 				gs 'arousal', 'end'
 				gs 'stat'

+ 1 - 1
locations/shulgahome.qsrc

@@ -15,6 +15,7 @@ gs 'stat'
 if npc_rel['A112'] < 30:$serg_obr = ' uncle' else $serg_obr = ''
 
 'You''re at the door to the Shulgin apartment.'
+act 'Leave':minut += 1 & gt'pod_ezd','etaj_3'
 !Entry conditions:
 if week < 6 and hour >= 10 and hour < 16:
 	'When you ring the doorbell, no one comes to answer the door. Apparently both '+func('gopsex','hide','Shulga_var_name')+' and Sergey are not at home.'
@@ -39,7 +40,6 @@ else
 	'The door is opened by '+func('gopsex','hide','Shulga_var_name')+' and you are invited in.' & act 'Enter':gt 'shulgahall'
 end
 
-act 'Leave':minut += 1 & gt'pod_ezd','etaj_3'
 
 --- shulgahome ---------------------------------
 

+ 23 - 9
locations/shulgakuh.qsrc

@@ -14,6 +14,7 @@ if $ARGS[0] = '':
 	gs 'kit_din'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh.jpg"></center>'
+	*nl
 
 	if hour >= 18 and hour < 21 and ARGS[0] = 0:
 		if rand(1,100) < 10:
@@ -22,15 +23,15 @@ if $ARGS[0] = '':
 			'When you enter the kitchen,<<$serg_obr>> <a href="exec:gt ''Serge_kuh''">Sergey</a> is standing at the kitchen counter preparing a meal.'
 		end
 	end
+	act 'Return to the hallway': gt 'shulgahall'
 
 	act 'Look in the fridge': gt 'shulgakuh', 'holodil'
 
 	dynamic $driwater
 
-	act 'Return to the hallway': gt 'shulgahall'
 
 !Launch Event with gopotoy kitchen
-	if RAND(0,100) <= 5 and pav_slut >= 75 and gangsexroom_count > 0 and week < 6 and hour >= 0 and hour < 3 and kotovLoveQW < 1: gt 'shulgakuh', 'gang_sex_ev1' 
+	if RAND(0,100) <= 5 and pav_slut >= 125 and gangsexroom_count > 0 and week < 6 and hour >= 0 and hour < 3 and kotovLoveQW < 1: gt 'shulgakuh', 'gang_sex_ev1'
 
 	!===========!
 	!FRIDGE!
@@ -78,10 +79,14 @@ if $ARGS[0] = 'holodil':
 
 	if beer_count = 0 and vodka_count = 0 and sup_count = 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holodpusto.jpg"></center><br><font color = red>empty shelves.</font>'
 	if beer_count > 0 and vodka_count > 0 and sup_count > 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holod'+rand(1,3)+'.jpg"></center>'
+	*nl
 		'You open the fridge and see:<<$r_vodka>><<$r_beer>><<$r_sup>><<$r_pusto>>'
+
+	act 'Close the refrigerator': gt 'shulgakuh'
+
 	!drink beer
-	if beer_count > 0: 
-		act 'Have a beer':
+	if beer_count > 0:
+		act 'Drink a beer':
 			*clr & cla
 			minut += 5
 			alko += 1
@@ -97,13 +102,14 @@ if $ARGS[0] = 'holodil':
 			beer_count -= 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer'+rand(1,3)+'.jpg"></center>'
+			*nl
 			'You take a bottle of beer from the fridge and drink it, quenching your thirst.'
 
 			act 'Continue': gt 'shulgakuh', 'holodil'
 		end
 	end
 	!drink vodka
-	if vodka_count > 0: 
+	if vodka_count > 0:
 		act 'Drink some vodka':
 			*clr & cla
 			minut += 1
@@ -121,9 +127,10 @@ if $ARGS[0] = 'holodil':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(1,2)+'.jpg"></center>'
 			'You pour some vodka in a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
+			*nl
 			act 'Put the bottle back in the fridge': gt 'shulgakuh', 'holodil'
 
-			act 'Drink more vodka': 
+			act 'Drink more vodka':
 				if vodka_count = 0: '<font color = red>There''s no vodka left, you drank it all!</font><center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka0.jpg"></center>'
 				if vodka_count > 0:
 					minut += 1
@@ -146,13 +153,14 @@ if $ARGS[0] = 'holodil':
 	end
 	!Chava soup
 	if sup_count > 0:
-		act 'Eat a bowl of soup': 
+		act 'Eat a bowl of soup':
 			*clr & cla
 			minut += 5
 			sup_day = daystart
 			sup_count -= 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/sup.jpg"></center>'
+			*nl
 			pcs_health += 10
 			pcs_mood += 20
 			fat += 2
@@ -171,14 +179,13 @@ if $ARGS[0] = 'holodil':
 			act 'Further': gt 'shulgakuh', 'holodil'
 		end
 	end
-	
-	act 'Close the refrigerator': gt 'shulgakuh'
 end &!--- holodil ----
 
 !Event in the kitchen with gopotoy:
 if $ARGS[0] = 'gang_sex_ev1':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang1.jpg"></center>'
+	*nl
 	gs 'boyStat', 'A9','3'
 	gs 'boyStat', 'A10','1'
 	gs 'boyStat', 'A11','2'
@@ -197,6 +204,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang2.jpg"></center>'
+		*nl
 		minut += 3
 		gs 'stat'
 		'You stop protesting when Vitek firmly grabs you by the hair. Meanwhile, '+func('gopsex','hide','Shulga_var_name')+' slides his hand underneath your clothes, attempting to thrust a finger inside your snatch.'
@@ -207,6 +215,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang3.jpg"></center>'
+			*nl
 			gs 'arousal', 'foreplay', 5, 'sub', 'rough', 'gangbang'
 			gs 'stat'
 			'The guys force you to squat, and surround you. They all pulled their cocks out of their pants, and Dan is slapping his cock against your cheek impatiently.'
@@ -215,6 +224,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang4.jpg"></center>'
+				*nl
 				gs 'arousal','bj',2,'dick[3]','gangbang'
 				gs 'arousal','bj',2,'dick[1]','gangbang'
 				gs 'arousal','bj',2,'dick[2]','gangbang'
@@ -227,6 +237,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang5.jpg"></center>'
+					*nl
 					gs 'arousal','vaginal',5,'dick[2]','gangbang'
 					gs 'arousal','bj',5,'dick[1]','gangbang'
 					gs 'arousal','hj',5,'dick[3]','gangbang'
@@ -237,6 +248,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang6.jpg"></center>'
+						*nl
 						gs 'dinsex','boy_wants_anal',$boydesc[3]
 						gs 'arousal','anal',5,'dick[3]','gangbang'
 						gs 'arousal','bj',5,'dick[1]','gangbang','sub','rough'
@@ -253,6 +265,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 							'When he sees the concerned look on your face, he smirks: "Do the math, <<$pcs_nickname>>. There are three guys here, you have three holes... what did you think was going to happen? You expect one of us to just jerk off the whole time? Not gonna happen. Let''s take her to the couch, guys."'
 							'Vitek carries you to the couch in his arms as if you weigh nothing, and positions you over his cock before he lowers you. Then the other guys join in, Dan sliding his cock into your already warmed up asshole while Vasily takes your mouth again.'
 							'For the next twenty minutes, the guys take turns fucking all of your holes, swapping it up every now and then.'
+							*nl
 							gs 'arousal','vaginal',3,'dick[3]','gangbang'
 							gs 'arousal','anal',2,'dick[1]','gangbang'
 							gs 'arousal','bj',2,'dick[2]','gangbang','deepthroat'
@@ -272,6 +285,7 @@ if $ARGS[0] = 'gang_sex_ev1':
 							act 'Continue':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/gang8.jpg"></center>'
+								*nl
 								gs 'arousal','bj',5,'dick[2]','gangbang'
 								gs 'arousal','hj',5,'gangbang'
 								gs 'cum_call','face',$boy[2],1

+ 2 - 1
locations/sny.qsrc

@@ -432,7 +432,8 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial'+rand(1,23)+'.jpg"></center>'
 	'Having wiped cum from your eyes you see Dimka walk over to the table and take out a hidden camera. He stopped the recording and looked at his friend, "Hey Gosha, the vid came out perfect."'
-
+	if DimaRudeQW = 0: DimaRudeQW += 1
+	if dimafilm = 0: dimaFilm = 1
 	if NosovRevenge = 1:
 		NosovRevenge = 2
 		daynosovrevenge = daystart

+ 2 - 3
locations/stat.qsrc

@@ -86,8 +86,8 @@ end
 if lernSkill >= 8: intel_exp += 1 & lernSkill = 0
 if lern >= 10: intel_exp += 1 & lern = 0
 
-if pav_sex >= 25:KatjaKnowBJ = 1
-if pav_sex >= 50 or preg > 0:KatjaKnowSex = 1
+if pav_slut >= 75:KatjaKnowBJ = 1
+if pav_slut >= 125 or preg > 0:KatjaKnowSex = 1
 
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney
@@ -569,7 +569,6 @@ if minut >= 60:
 	end
 
 	! vovan edition, from 1.2.5
-	if clearclothes > 0: clearclothes -= 1
 	if hantersAndreisex > 0: hantersAndreisex -= 1
 	if hantersSergeisex > 0: hantersSergeisex -= 1
 	if hantersIgorsex > 0: hantersIgorsex -= 1

+ 24 - 13
locations/stat_display.qsrc

@@ -85,7 +85,7 @@ if pcs_sleep > 100: pcs_sleep = 100
 $stat_imgtool_msg=''
 $stat_imgextra_msg=''
 
-if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
+if Enable_showstatimg = 1:
 	!There are 3 display mode, with toobar / top / bottom, controlled by Enable_statimg_loc
 	if Enable_statimg_face = 0:
 		$stat_imgtool_msg += '<a href="exec:Enable_statimg_face = 1 & gs ''$menu_obnovit''">◇Face</a>'
@@ -510,10 +510,26 @@ if thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succub
 		elseif daystart - lastmens > 84:
 			$stat_msg += '<BR><font color = #AB052A><b>You should consider the possibility of a pregnancy, since apparently you no longer have periods.</b></font>'
 		end
-	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate <= 60:
-		$stat_msg += '<BR><font color = #705243><b>You are probably still in your recovery period. Nothing to worry about.</b></font>'
-	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 60:
+	!!Recovery period after an abortion is ~14-21 days
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate <= 13:
+		$stat_msg += '<BR><font color = #705243><b>You are still in your recovery period. Nothing to worry about.</b></font>'
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 13 and daystart - abortionbirthdate <= 16:
+		$stat_msg += '<BR><font color = #705243><b>You are maybe still in your recovery period, but there could be a risk.</b></font>'	
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 16 and daystart - abortionbirthdate <= 21:
+		$stat_msg += '<BR><font color = #820000><b>You should have recovered from you abortion by know... Right?</b></font>'
+	elseif abortionbirthdate ! 0 and daystart - abortionbirthdate > 21:
+		$stat_msg += '<BR><font color = #820000><b>You should have definitely recovered from your abortion by now.</b></font>'				
+	!!Recovery period after giving birth is ~42-70 days
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate <= 41:
+		$stat_msg += '<BR><font color = #705243><b>You are still in your recovery period. Nothing to worry about.</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 41 and daystart - pregbirthdate <= 48:
+		$stat_msg += '<BR><font color = #705243><b>You are probably still in your recovery period.</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 48 and daystart - pregbirthdate <= 55:
+		$stat_msg += '<BR><font color = #705243><b>You are maybe still in your recovery period, but there could be a risk.</b></font>'	
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 55 and daystart - pregbirthdate <= 70:
 		$stat_msg += '<BR><font color = #820000><b>You should have recovered by know... Right?</b></font>'
+	elseif pregbirthdate ! 0 and daystart - pregbirthdate > 70:
+		$stat_msg += '<BR><font color = #820000><b>You should have definitely recovered from giving birth by now.</b></font>'		
 	end
 end
 if implant_day > 0:
@@ -660,14 +676,6 @@ if cheatNoSweat = 0:
 	:statDswtEnd
 end
 
-if dirtyclothes = 1 and swamp_clothes = 0:
-	if pcs_sweat > 40:
-		$stat_msg +='<br><font color = red>You are <a href="exec:view''images/locations/gadukino/hunters/dirtyclothes1.jpg''">covered</a> from head to toe in the mud.</font><BR>'
-	else
-		$stat_msg +='<br><font color = red>Your <a href="exec:view''images/locations/gadukino/hunters/dirtyclothes2.jpg''">clothes</a> are dirty.</font><BR>'
-	end
-end
-
 if lactate <= 0 and prolactinlvl >= 100:
 	$stat_msg += '<BR>'+iif(night_mode > 0,'<font color = white>','<font color = black>')+'Your breasts feel weirdly engorged and sore.</font><BR>'
 end
@@ -1083,6 +1091,8 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 		$stat_msg += '<BR><b><font color= #AB052A>You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.</font></b>'
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
 		$stat_msg += '<BR><b><font color = #FF00FF>You like, totally forgot to put on any panties. You are such a bimbo.</font></b>'
+	elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':
+		$stat_msg += '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
 	elseif PCloSkirt > 3:
 		if pcs_inhib > 50:
 			$stat_msg += '<BR><b><font color=#0064FF>You feel liberated not wearing panties as your naked ass flashes from under your short skirt.</font></b>'
@@ -1106,8 +1116,9 @@ elseif $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 	end
 elseif PCloBimbo = 1 and cheatBimbo = 0:
 	$stat_msg += '<BR><b><font color = #FF00FF>You are dressed as a bimbo</font></b>'
+elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':
+	$stat_msg += '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
 end
-!$stat_msg += '<BR>'
 
 if mosol >= 50:
 	$stat_msg += '<BR><b><font color="red">Your pussy itches a great deal and is affecting your mood, you should use some cream or stop wearing pants without underwear.</font></b>'

+ 4 - 0
locations/stat_sklattrib.qsrc

@@ -116,6 +116,10 @@ if attsklupdate = 0:
 	i = 0 & x = 1
 	:rstloop
 	expadj = func('_difficulty','getexpadj')
+	
+	!! Trait ''Everything is new again'', gained from the cursed school boy start
+	if csb_start = 1 and daystart <= 84: expadj += expadj/2
+	
 	tl = 0
 	:trtrstloop
 	tltp = 0

+ 1 - 1
locations/street.qsrc

@@ -119,7 +119,7 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
-if hour >= 8 and hour <= 20:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
+if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
 if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''rinok'', ''start''">marketplace</a>.'
 if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'

+ 35 - 20
locations/street_walker.qsrc

@@ -1,9 +1,6 @@
 # street_walker
 
 if $ARGS[0] = 'start':
-	$menu_loc = 'street_walker'
-	$menu_arg = 'work'
-	menu_off = 0
 	if prst_loc = 0:
 		if sound = 0:
 			if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -30,7 +27,7 @@ if $ARGS[0] = 'start':
 		end
 		gs 'stat'
 		'<center><h2>St. Petersburg</h2></center>'
-		'<center><b>City center</b></center>'
+		'<center><b>Red Light District</b></center>'
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/industwn.jpg"></center>'
 		else
@@ -58,6 +55,9 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'work':
+	$menu_loc = 'street_walker'
+	$menu_arg = 'work'
+	menu_off = 0
 	if $loc = 'down':
 		prst_loc = 0
 	elseif $loc = 'Nord':
@@ -221,20 +221,39 @@ if $ARGS[0] = 'event1':
 			'You smile to him. "That depends on what you want to do." You take a little time listening to his wants and telling him the price before he decides.'
 			!!it should be 50/50 is the first one, than 50/50 the second or last
 			if RAND(0,1) = 0:
-				'He decides he wants a blowjob. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'blowjob'
+				'He decides he wants a blowjob.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'blowjob'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			elseif RAND(0,1) = 0:
-				'He decides he wants a fuck. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'vaginal'
+				'He decides he wants a fuck.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'vaginal'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			else
-				'He decides he wants a anal. With that and the price decided you get into the car.'
-				act 'continue': gt 'street_walker', 'anal'
+				'He decides he wants a anal.'
+				act 'Accept':
+					cla
+					*nl
+					'With that and the price decided you get into the car.'
+					act 'Continue': gt 'street_walker', 'anal'
+				end
+				act 'Decline': gt 'street_walker', 'work'
 			end
 		end
 	else
 		*clr & cla
 		minut += 15
 		city_prostitute += 1
+		gs 'stat'
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/workingw1.jpg"></center>'
 		else
@@ -512,6 +531,7 @@ if $ARGS[0] = 'policeblowjob':
 	else
 		prst_bribe = 1
 		*nl
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		'"What is wrong with you girl? Are you trying to solicitate a member of the law?" the police office angrily responds.'
 		'"N-No officer. I was just thinking the two of us could have a good time..." you try once again, maybe he misunderstood you.'
 		'"That''s it! You''re coming with me, whore!" he turns you around, cuffs you and leads you to the police car. He shoves you in the back and quickly drives off towards the police station.'
@@ -546,7 +566,7 @@ if $ARGS[0] = 'policelie':
 
 			act 'Walk away':gt 'street_walker', 'work'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			*nl
 			'"The only way you''re going to learn is if you''re punished," he shakes his head in disgust. "Turn around, hands behind your back." In a matter of seconds, you''re cuffed and being tossed into the back seat of an unmarked police car. You sit in silence as he drives you back to the police station for booking.'
 
@@ -581,7 +601,7 @@ if $ARGS[0] = 'policeexp':
 
 			act 'Walk away':gt 'street_walker', 'work'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			*nl
 			'"Save it for someone that cares, whore!" Without hesitation, he has you spun around, your arm twisted behind your back as he reaches for his handcuffs. Your crying only gets louder as he drags you to his unmarked police car and shoves you into the back. On the drive back to the station, he gets tired of hearing you and turns on the radio, drowning you out completely.'
 
@@ -590,8 +610,6 @@ if $ARGS[0] = 'policeexp':
 	end
 end
 
-
-
 if $ARGS[0] = 'policebribe':
 	*clr & cla
 	minut += 10
@@ -605,8 +623,6 @@ if $ARGS[0] = 'policebribe':
 	act 'Wait for his reaction': gt 'street_walker', 'briberyreaction'
 end
 
-
-
 if $ARGS[0] = 'briberyreaction':
 	*clr & cla
 	minut += 10
@@ -632,7 +648,7 @@ if $ARGS[0] = 'briberyreaction':
 		prst_bribe = 2
 		gs 'pain', 6, 'armL', 'break'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		*nl
 		'His lips turn up into a disgusted sneer. Before you can react, he slaps your hand away, the money exploding out into the air and onto the ground. "You think I can be paid off, whore?!" he snarls as you stand there holding your red and stinging hand. You knew there was a chance this could happen, but you didn''t expect him to get physical.'
 		*nl
@@ -644,7 +660,7 @@ if $ARGS[0] = 'briberyreaction':
 	elseif temp_rand <= 9:
 	!!elseif he takes the bribe but still arrests you
 		prst_bribe = 2
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/arrest.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 		*nl
 		'The cop sighs heavily before taking the money. He takes a moment to count it, occasionally glancing your way as he does. "It''s one thing to be a whore, but to be dumb too?" he laughs cruelly as he pockets the money. You stare at him, hurt and confused before you realize that he''s still planning to arrest you. Your first instinct is to run, maybe he''s just trying to scare you and won''t chase after you, but if he''s being serious then it could mean you getting hurt.'
 		*nl
@@ -672,6 +688,7 @@ if $ARGS[0] = 'briberyreaction':
 			*clr & cla
 			prst_bribe = 2
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/arrested.jpg"></center>'
 			'"No...no, I can''t do that..." You tell him as you pull your hand back and pocket your money again. The officer looks disappointed but doesn''t seem to dwell on it. He probably has another girl like you he''s forced into fucking him...'
 			'"Fine by me, slut. Hands behind your back," he orders and you comply. In a matter of seconds, you''re cuffed and in the back of his unmarked car being driven to the station to be booked.'
 
@@ -680,7 +697,6 @@ if $ARGS[0] = 'briberyreaction':
 	end
 end
 
-
 if $ARGS[0] = 'policesub1':
 	police_sub_counter += 1
 	if police_sub_counter > 4: gt 'street_walker', 'policesub2'
@@ -716,7 +732,6 @@ if $ARGS[0] = 'policesub1':
 	end
 end
 
-
 if $ARGS[0] = 'policesub2':
 	*clr & cla
 	gs 'pain', 5, 'vaginal', 'tear'

+ 8 - 5
locations/swamp.qsrc

@@ -15,7 +15,7 @@ goswamp = 1
 gs 'gadukino_event', 'sound'
 gs 'stat'
 
-cls
+*clr & cla
 
 '<center><H4>Swamp</H4></center>'
 
@@ -32,12 +32,15 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
 	end
 end
-
+*nl
 'You are in the swamp area of the forest.'
-'It is considered dangerous to hike here day unless extremely physically fit and should be avoided at night no matter what.'
-'But you can find a lot of mushrooms and berries here.'
-
+'It is considered dangerous to hike in this area, unless physically fit, and should always be avoided at night.'
+*nl
+'You can find a lot of mushrooms and berries here.'
+*nl
 'There''s a small visible path to a clearing that leads to <a href="exec: gt ''swamp_yard'' ">the hut</a>, used by the hunters.'
+*nl
+act 'Go to the hut': gt 'swamp_yard'
 
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
 	act 'Walk into the forest':gs 'clothing', 'swamp_clothes', 0 & minut += 30 & gt 'gadforest','4'

+ 8 - 9
locations/swamp_yard.qsrc

@@ -1,8 +1,11 @@
 # swamp_yard
 
-$location_type = 'secluded'
-$metka = ''
 $loc = 'swamp_yard'
+$metka = ''
+$menu_loc = 'swamp_yard'
+$menu_arg = ''
+menu_off = 0
+$location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
 gs 'stat'
@@ -55,7 +58,6 @@ end
 'The yard in front of the hut.'
 'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 if findvel = 3:'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-if clearclothes > 0 and clearclothesH = 0: 'You can dry your clothes in the meadow.'
 if hanters > 0 and hantersKnow = 0:'You spot some unfamiliar <a href="exec: gt ''hanters'', ''start'' ">people</a> standing in front of the hut.'
 if hanters > 0 and hantersKnow > 0 and hour >= 8 and hour < 20:'You notice the <a href="exec: gt ''hanters'', ''start'' ">hunters</a> standing in the front yard.'
 
@@ -148,7 +150,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 			'"I''m Andrei," replied the older man, "and these are my friends, from the city, Igor and Sergei."'
 			'"Is your lastname possibly <<$pcs_lastname>>?" he asked. You look at him and nodded approvingly.'
 			'"Don''t be afraid <<$pcs_nickname>>, you look a lot like your mother when she was younger. I... Hmmm... that''s good to know, I''m also from Gadukino." said Andrei.'
-			if pcs_sweat > 0 or dirtyclothes = 1:
+			if pcs_sweat > 0:
 				'"Go on, take a bath and wash your clothes, they''re quite dirty," Andrei continued.'
 				'"Where?"'
 				'"Well, it''s still warm outside, so you can wash up in the creek, just follow the path behind the hut, you can''t miss it. Or if you want use the basin over there, collect the water from the spring and heat it on the oven." said Andrei.'
@@ -161,7 +163,7 @@ if hanterhelp = 2 and hantersKnow = 0:
 			'You look at him feeling a bit uncomfortable.'
 			'"Don''t be afraid, I''m also from Gadukino, you look just like your mother when she was younger, and I see you''re also been blessed with good looks." he said.'
 			'"I''m Andrei," he says, adding "and these are my friends, from the city, Igor and Sergei.'
-			if pcs_sweat > 3 or dirtyclothes = 1:
+			if pcs_sweat > 3:
 				hantersKnowSlut = 1
 				hantersRape = 1
 				'"Go and take a bath and wash your clothes, you''re dirty as hell... and you look disgusting..." said Andrei. "Go on now, while we think what to do with you.'
@@ -383,7 +385,7 @@ if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude.jpg"></center>'
 			'Seeing some men in the yard, you try to cover up your private parts...'
 
-			if FUNC('lost_clothes_here','swamphouse') = 1 and clearclothes = 0 and $lastwornclothingtype ! 'nude':
+			if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude':
 				act'Get dressed':
 					*clr & cla
 					minut += 5
@@ -1018,10 +1020,7 @@ if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
 	minut += 150
 	lost_girl = 0
 	forest_lostday = 0
-	dirtyclothes = 0
 	hanters = 0
-	gs 'clothing', 'swamp_clothes', 0
-	gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'

Diff do ficheiro suprimidas por serem muito extensas
+ 218 - 181
locations/swamphouse.qsrc


+ 7 - 4
locations/swampspring.qsrc

@@ -1,8 +1,11 @@
 # swampspring
 
-$location_type = 'secluded'
-$metka = ''
 $loc = 'swampspring'
+$metka = ''
+$menu_loc = 'swamp_yard'
+$menu_arg = ''
+menu_off = 0
+$location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
 gs 'stat'
@@ -22,9 +25,10 @@ else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter_night.jpg"></center>'
 	end
 end
-
+*nl
 'You''ve come across a natural spring with pure natural water.'
 
+act 'Go back to the hut':minut += 5 & gt 'swamp_yard'
 
 if pcs_hydra < 150:
 	act 'Drink the water':
@@ -56,7 +60,6 @@ if bucket < 10:
 		act 'Finish':gt 'swampspring'
 	end
 end
-act 'Leave':minut += 5 & gt 'swamp_yard'
 
 --- swampspring ---------------------------------
 

+ 1 - 1
locations/wardrobe.qsrc

@@ -7,8 +7,8 @@ if $ARGS[0] = 'start':
 	PShoStyle = ShoStyle
 	$wloc = 'wardrobe'
 	if $clothingworntype = 'cheap' and clothingwornnumber = '414':
-		gs 'clothing', 'strip'
 		gs 'clothing', 'swamp_clothes', 0
+		gs 'clothing', 'strip'
 	end
 	if ward_img_hgt = 0:ward_img_hgt = 150
 	'<h3><center><b><font color="maroon">Wardrobe overview</b></h3><br><center><font color="maroon">These are the clothes you are currently wearing - Click on an item to change it</font></center>'

+ 3 - 1
locations/ybedr.qsrc

@@ -15,7 +15,9 @@ if ymanrem[4] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/
 if ymanrem[4] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
 if ymanrem[4] = 2:
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybedr.jpg"></center>'
-	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>. On one of the sides there''s an entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	*nl
+	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
+	'On one side of the bed is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start'', ''start''">wardrobe</a>.'
 	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 end
 

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff