Browse Source

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

sandra_schulz 4 years ago
parent
commit
72c3ff5da3
100 changed files with 1806 additions and 2240 deletions
  1. 10 0
      build.sh
  2. 2 8
      glife.qproj
  3. 8 8
      locations/AlbStarsWhore.qsrc
  4. 2 0
      locations/AnalPR.qsrc
  5. 7 1
      locations/BDsex.qsrc
  6. 2 0
      locations/BelSex.qsrc
  7. 2 0
      locations/BurgerTip.qsrc
  8. 23 6
      locations/Cheatmenu_din.qsrc
  9. 1 0
      locations/FedorEv2.qsrc
  10. 9 2
      locations/FedorEv4.qsrc
  11. 4 14
      locations/Gnpc2.qsrc
  12. 6 6
      locations/KatjaHomeTalk.qsrc
  13. 7 1
      locations/Komp.qsrc
  14. 1 0
      locations/LCporn.qsrc
  15. 1 1
      locations/Nord.qsrc
  16. 3 2
      locations/NormPR.qsrc
  17. 2 1
      locations/Palatka.qsrc
  18. 1 0
      locations/Vnlake2.qsrc
  19. 2 1
      locations/Voltrenersex.qsrc
  20. 1 2
      locations/_attributes_cheap.qsrc
  21. 2 2
      locations/_attributes_school.qsrc
  22. 35 5
      locations/agentned.qsrc
  23. 1 0
      locations/alex.qsrc
  24. 0 467
      locations/annafrends.qsrc
  25. 2 1
      locations/anushapt.qsrc
  26. 5 1
      locations/anushka.qsrc
  27. 2 2
      locations/anushkaev1.qsrc
  28. 61 12
      locations/arousal.qsrc
  29. 27 22
      locations/artemEv.qsrc
  30. 0 66
      locations/artemEv3.qsrc
  31. 12 12
      locations/artemdate.qsrc
  32. 0 207
      locations/artemev2.qsrc
  33. 49 48
      locations/artemhome.qsrc
  34. 12 1
      locations/arturRinok.qsrc
  35. 2 2
      locations/arturdin.qsrc
  36. 1 1
      locations/avb.qsrc
  37. 1 1
      locations/bass.qsrc
  38. 2 2
      locations/bed2.qsrc
  39. 4 6
      locations/bedrPar.qsrc
  40. 130 88
      locations/beg1.qsrc
  41. 33 0
      locations/begin.qsrc
  42. 1 1
      locations/belpicknick.qsrc
  43. 4 8
      locations/bobka.qsrc
  44. 1 1
      locations/body_din.qsrc
  45. 1 0
      locations/brothel.qsrc
  46. 1 1
      locations/brother.qsrc
  47. 123 101
      locations/buklinik.qsrc
  48. 1 1
      locations/cafe3.qsrc
  49. 2 2
      locations/cikl.qsrc
  50. 4 3
      locations/clener.qsrc
  51. 40 10
      locations/clothing.qsrc
  52. 58 0
      locations/clothing_QV.qsrc
  53. 13 18
      locations/club.qsrc
  54. 13 0
      locations/dachamy.qsrc
  55. 5 0
      locations/dachi.qsrc
  56. 6 5
      locations/dimalina.qsrc
  57. 154 162
      locations/dinParty.qsrc
  58. 2 2
      locations/dinSex.qsrc
  59. 14 1
      locations/din_bad.qsrc
  60. 2 2
      locations/din_pav.qsrc
  61. 1 1
      locations/din_van.qsrc
  62. 0 402
      locations/dinsister.qsrc
  63. 1 0
      locations/dk.qsrc
  64. 7 1
      locations/dorm.qsrc
  65. 5 7
      locations/down.qsrc
  66. 53 0
      locations/ender.qsrc
  67. 4 9
      locations/event.qsrc
  68. 12 12
      locations/events.qsrc
  69. 5 1
      locations/exercise.qsrc
  70. 7 7
      locations/family.qsrc
  71. 104 0
      locations/family_schedule.qsrc
  72. 2 2
      locations/father.qsrc
  73. 30 29
      locations/fathersex.qsrc
  74. 2 2
      locations/fbDormD.qsrc
  75. 2 2
      locations/fight_npcdata.qsrc
  76. 1 1
      locations/fit.qsrc
  77. 0 12
      locations/foto.qsrc
  78. 0 2
      locations/furi.qsrc
  79. 1 1
      locations/gKristinaZv.qsrc
  80. 1 1
      locations/gLakeNude.qsrc
  81. 105 32
      locations/gadbana.qsrc
  82. 58 32
      locations/gaddvor.qsrc
  83. 30 28
      locations/gadfield.qsrc
  84. 4 4
      locations/gadforest.qsrc
  85. 31 25
      locations/gadgarden.qsrc
  86. 99 61
      locations/gadhouse.qsrc
  87. 5 5
      locations/gadmarket.qsrc
  88. 14 11
      locations/gadriver.qsrc
  89. 17 16
      locations/gadroad.qsrc
  90. 55 31
      locations/gadsarai.qsrc
  91. 32 30
      locations/gadukino.qsrc
  92. 29 28
      locations/gadukino_event.qsrc
  93. 4 4
      locations/gaptek.qsrc
  94. 2 4
      locations/garfather.qsrc
  95. 4 4
      locations/gdksport.qsrc
  96. 1 1
      locations/gopskver.qsrc
  97. 61 48
      locations/grandmahelp.qsrc
  98. 93 67
      locations/grandpahelp.qsrc
  99. 1 0
      locations/gschool_boys_bathroom.qsrc
  100. 3 0
      locations/gschool_chats.qsrc

+ 10 - 0
build.sh

@@ -21,6 +21,16 @@ elif [[ "$OSTYPE" == "msys" ]]; then
 	else
 		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
+elif [[ "$OSTYPE" == "cygwin" ]]; then
+	# Unsure if non-AMD CPUs give this or AMD64, tested on an actual AMD brand chip
+	# requires a python install visible to cygwin (for the txtmerge above)
+	if [[ "$PROCESSOR_ARCHITECTURE" == "x86_64" ]]; then
+		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+	elif [[ "$PROCESSOR_ARCHITECTURE" == "AMD64" ]]; then
+		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+	else
+		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+	fi
 fi
 if [ -d "${DESTDIR}" ]; then
 	cp --reflink=auto "${QSPFILE}" "${DESTDIR}"

+ 2 - 8
glife.qproj

@@ -79,7 +79,6 @@
 		<Location name="dinSex2"/>
 		<Location name="dinsexFX"/>
 		<Location name="oral"/>
-		<Location name="orgazm"/>
 	</Folder>
 	<Folder name="CumManage">
 		<Location name="Cum_Manage"/>
@@ -412,6 +411,7 @@
 		<Location name="gtelefon"/>
 	</Folder>
 	<Folder name="Family">
+		<Location name="family_schedule"/>
 		<Location name="seeparentsex"/>
 		<Location name="father"/>
 		<Location name="fathersex"/>
@@ -420,9 +420,9 @@
 		<Location name="motherQW"/>
 		<Location name="dinmother"/>
 		<Location name="sister"/>
+		<Location name="sister_chat"/>
 		<Location name="sistersleep"/>
 		<Location name="sisterQW"/>
-		<Location name="dinsister"/>
 		<Location name="family"/>
 	</Folder>
 	<Folder name="Rolan">
@@ -450,12 +450,9 @@
 		<Location name="reks"/>
 		<Location name="sbReksHome"/>
 		<Location name="dinParty"/>
-		<Location name="party_boy"/>
 		<Location name="party_boys"/>
 		<Location name="party_girls"/>
 		<Location name="sister_party"/>
-		<Location name="ira"/>
-		<Location name="lena"/>
 	</Folder>
 	<Folder name="Dima Nosov">
 		<Location name="dimaEv"/>
@@ -467,10 +464,8 @@
 	</Folder>
 	<Folder name="Artem Chebotarev">
 		<Location name="artemEv"/>
-		<Location name="artemEv3"/>
 		<Location name="artemhome"/>
 		<Location name="artemdate"/>
-		<Location name="artemev2"/>
 		<Location name="artgar"/>
 	</Folder>
 	<Folder name="Igor Kruglov">
@@ -607,7 +602,6 @@
 		<Location name="kotovdom"/>
 		<Location name="boymass"/>
 		<Location name="barbershop"/>
-		<Location name="annafrends"/>
 		<Location name="MagEncounterFairy"/>
 		<Location name="ParChurch"/>
 		<Location name="ParChurch2"/>

+ 8 - 8
locations/AlbStarsWhore.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'whore1':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/anal.jpg"></center>'
 				'Yoy present your ass to him, with a little giggle, you give it a wiggle.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				gs 'arousal', 'anal', 30, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'whore2':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d.jpg"></center>'
 				'You suckle at the tip of one boys cock, while the other gets ready to enter your ass. You wiggle your hips in anticipation.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				spafinloc = 3
 				gs 'arousal', 'bj', 30, 'sub', 'group'
 				gs 'arousal', 'anal', 30, 'sub', 'group'
@@ -366,7 +366,7 @@ if $ARGS[0] = 'whore3':
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/dog12.mp4"></video></center>'
 				'You give it a wiggle, and he says smiling: "Ha, now that''s a good girl."' 
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				gs 'arousal', 'anal', 30, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'whore4':
 				'<center><video autoplay loop src="images/shared/sex/group/threesomepm8.mp4"></video></center>'
 				'You let out another playful bleat as you begin to get filled.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				spafinloc = 3
 				gs 'arousal', 'anal', 30, 'group', 'sub'
 				gs 'arousal', 'bj', 30, 'group', 'sub'
@@ -565,7 +565,7 @@ if $ARGS[0] = 'whore5':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/f.jpg"></center>'
 				'You continue to languidly suck on the two remaining men, while the third man prepares to enter you from behind.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				spafinloc = 3
 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
@@ -733,7 +733,7 @@ if $ARGS[0] = 'whore6':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/analn.jpg"></center>'
 				'"Please be gentle", you whisper as he prepares to enter you.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				gs 'arousal', 'anal', 30, 'sub'
 				gs 'stat'
 				act 'Call a taxi': gt 'gdksport', 'cab_home'
@@ -802,7 +802,7 @@ if $ARGS[0] = 'whore7':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dn.jpg"></center>'
 				'You continue sucking away at the first guy, as the other prepares to enter your backdoor.'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				spafinloc = 3
 				gs 'cum_manage'
 				gs 'arousal', 'bj', 30, 'sub', 'group'
@@ -965,7 +965,7 @@ if $ARGS[0] = 'whore8':
 				'Two of the men move to get service from your mouth, while the third prepares to penetrate you.'
 				'"That''s one fine ass booty you got there, white girl", he says'
 				gs 'dinsex', 'boy_puts_condom'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
 				gs 'stat'

+ 2 - 0
locations/AnalPR.qsrc

@@ -10,6 +10,7 @@ if $ARGS[0] = '1':
 	prosti = 0
 	money += ProsMoney*100
 	gs'stat'
+	gs 'arousal', 'auto_lube', 'anal'
 
 	if pcs_ass < dick:
 		$analsex = 'Your anus stretches painfully while he fills your ass with his shaft, and you wince and beg him to take it easy for a little while. Fortunately, he listens. Once he feels he gave you enough time to adapt, he begins to move his hips. Slowly at first, but his thrusts accelerate more and more as he gets closer to his orgasm.'
@@ -47,6 +48,7 @@ if $ARGS[0] = '2':
 	*clr & cla
 	prosti = 0
 	gs'stat'
+	gs 'arousal', 'auto_lube', 'anal'
 
 	if pcs_ass < dick:
 		$analsex = 'You feel a sharp pain and wince when the man pushes the tip of his <<dick>> centimeter member past your sphincter, and continues to work most of his length inside you. Fortunately, he listens when you beg him to go slow.<br>The guy holds still for a moment so your ass can get used to how far it''s being stretched out. After a little while you don''t think it''s going to get any better, and you tell the man he can start to fuck you with a forced, fake smile on your face.<br>He''s still careful at first, but soon forgets about your suffering and accelerates more and more. The man groans loudly while he hammers his cock inside your ass, ignoring your crying and mewling underneath him.'

+ 7 - 1
locations/BDsex.qsrc

@@ -214,6 +214,7 @@ if $ARGS[0] = 'sex3':
 end
 
 if $ARGS[0] = 'anal':
+	gs 'arousal', 'auto_lube', 'anal'
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
 	gs 'bdsex', 'an'
@@ -244,6 +245,7 @@ end
 
 
 if $ARGS[0] = 'anal3':
+	gs 'arousal', 'auto_lube', 'anal'
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
 	gs 'bdsex', 'an'
@@ -803,7 +805,11 @@ if $ARGS[0] = 'an':
 	gs 'dinsex','boy_wants_anal'
 	'<<$boydesc>> lays you on your stomach on the bed, spreading your ass apart as he begins to massage and open your anus with his fingers, first one, then two.'
 	gs 'arousal', 'anal_finger', 5, 'sub'
-	if pcs_ass < 10:'You groan in pain as his third finger invades your ass.' else 'You feel your asshole stretch to accommodate his third finger.'
+	if pcs_ass < 10:
+		'You groan in pain as his third finger invades your ass.'
+	else
+		'You feel your asshole stretch to accommodate his third finger.'
+	end
 	'<<$boydesc>> abruptly pulls his fingers out of your ass and you feel his hard cock rest against your hole.'
 
 	if pcs_ass + lubonus < dick:'You scream and bite your lip at the sharp pain when the <<dick>> member centimeter enters your ass.'

+ 2 - 0
locations/BelSex.qsrc

@@ -341,6 +341,7 @@ if $ARGS[0] = 'anal2':
 	anal_temp += 1
 	picrand = rand(30,34)
 	'<center><video autoplay loop src="images/shared/sex/anal/cowgirl/kotovsexanal<<picrand>>.mp4"></video></center>'
+	gs 'arousal', 'auto_lube', 'anal'
 	'<<$boydesc>> lies on the bed, as you climb on top of him. <<$boydesc>> grabs hold of his cock, guiding his cock inside your tight anus.'
 	'You gasp as you start moving back and forth, controlling the rhythm as you ride him. First, slowly, as you adjust yourself. Soon enough you''re speeding up: fast, deep, and hard. You feel a sharp pain that quickly turns into a pleasant ache. You keep riding him at the same pace as he begins panting more and more.'
 
@@ -364,6 +365,7 @@ if $ARGS[0] = 'analdoggy':
 	picrand = rand(0,12)
 	'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<picrand>>.mp4"></video></center>'
 	'<<$boydesc>> pulls his cock out of your pussy and begins to slowly rub against your asshole. "Don''t worry, <<$pcs_nickname>>. I''ll be gentle," he says grinning as he has you on all fours, wide spread.'
+	gs 'arousal', 'auto_lube', 'anal'
 	'"Enough foreplay. Your ass is ready me!" he shouts as <<$boydesc>> starts pounding himself balls deep into you immediately. You bury your face into a pillow as he pounds your asshole roughly. The pain is unbearable and you flop with your legs trying to get away, but it only encourages <<$boydesc>> on as he keep pummeling your anus.'
 
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution'

+ 2 - 0
locations/BurgerTip.qsrc

@@ -885,6 +885,7 @@ if $ARGS[0] = 'anal':
 	!!bossfuck
 	'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossanal.jpg"></center>'
 	'You push your hips back presenting your ass for Anatoly.'
+	gs 'arousal', 'auto_lube', 'anal'
 	!!gs 'dinsex','sexcum'
 	spafinloc = 4
 	gs 'cum_manage'
@@ -945,6 +946,7 @@ if $ARGS[0] = 'anal2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossanal2.jpg"></center>'
 	'You brace yourself, as he pushes his rock hard cock against your tight little sphincter.'
+	gs 'arousal', 'auto_lube', 'anal'
 	!!gs 'dinsex','sexcum'
 	spafinloc = 3
 	gs 'cum_manage'

+ 23 - 6
locations/Cheatmenu_din.qsrc

@@ -1926,18 +1926,35 @@ $cheatmenu['status'] = {
 		$OpenInnerThought+'Oh my god, what will the neighbours think of us?'+$CloseInnerThought
 	end
 	*nl
+	'Scale Weather Banner: <a href="exec:default_wbanner = 1 & set_weatherht=input(''Weather Banner Height (Default: 72 Min: 50 Max: 100)'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_weatherht>></a>, Reset to default <a href="exec:default_wbanner = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">(72)</a>'
+		if set_weatherht < 50:
+			set_weatherht = 50
+		elseif set_weatherht > 100:
+			set_weatherht = 100
+		end
+	'Scale Menu Icons: <a href="exec:default_menu_icons = 1 & set_miconht=input(''Weather Banner Height (Default: 54 Min: 10 Max: 75)'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_miconht>></a>, Reset to default <a href="exec:default_menu_icons = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">(54)</a>'
+		if set_miconht < 10:
+			set_miconht = 10
+		elseif set_miconht > 75:
+			set_miconht = 75
+		end
+	if cheatStatusIcons = 0:
+		'Status icons: Click to <a href="exec:cheatStatusIcons = 1 & disable_show_icons = 1 & gs ''stat'' & dynamic $cheatmenu[''status'']">hide</a> them.'
+		'Status Icon Height: <a href="exec:default_status_icons = 1 & set_siconht=input(''Input Status Icon Height (Default: 54 Min: 10 Max: 75)'') & dynamic $cheatmenu[''status''] & gs ''stat''"><<set_siconht>></a>, Reset to default <a href="exec:default_status_icons = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">(54)</a>'
+	elseif cheatStatusIcons = 1:
+		'Status icons: Click to <a href="exec: cheatStatusIcons = 0 & disable_show_icons = 0 & gs ''stat'' & dynamic $cheatmenu[''status'']">show</a> them.'
+	end
+		if set_siconht < 10:
+			set_siconht = 10
+		elseif set_siconht > 75:
+			set_siconht = 75
+		end
 	if ETOmenu = 1:
 		'Status Display mode: Currently Text - <a href="exec:ETOmenu = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Select Scale Bar</a>'
 	else
 		'Status Display mode: Currently Scale Bar - <a href="exec:ETOmenu = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Select Text</a>'
 	end
 
-	if cheatStatusIcons = 0:
-		'Status icons: Click to <a href="exec: $cheatStatusIcons = ''Currently OFF'' & cheatStatusIcons = 1 & disable_show_icons = 1 & gs ''stat'' & dynamic $cheatmenu[''status'']">hide</a> them.'
-	elseif cheatStatusIcons = 1:
-		'Status icons: Click to <a href="exec: cheatStatusIcons = 0 & disable_show_icons = 0 & gs ''stat'' & dynamic $cheatmenu[''status'']">shown</a> them.'
-	end
-
 	if Enable_scalepic = 1:
 		'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
 		if Enable_scalewidth > 0:

+ 1 - 0
locations/FedorEv2.qsrc

@@ -535,6 +535,7 @@ if $ARGS[0] = 'Anal Sex':
 		*clr & cla			
 		gs 'boyStat', 'A5'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/virginanal2.mp4"></video></center>'
+		gs 'arousal', 'auto_lube', 'anal'
 		'Fedor slowly enters your asshole, as you feel your anus tighten up aound his penis, you clutch the pillow with both hands as you feel the rest of your body tensing up. Fedor gives your ass a chance to adjust to his dick for a few seconds then whispers in your ear "<<$pcs_nickname>>, are you ready?" you nod and he begins thrusting and lets out a soft moan. You moan loudly, focusing on his warm penis inside you and enjoying every thrust, bitting your lip as you surrender yourself to the pain and pleasure.'
 		*nl	
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/virginanal3.mp4"></video></center>'

+ 9 - 2
locations/FedorEv4.qsrc

@@ -412,6 +412,7 @@ if $ARGS[0] = '3way2':
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/3way/bed6.mp4"></video></center>'
 		'You begin riding Fedor''s dick as Ivan shoves his dick down your throat and starts to throat fuck you while Fedor continues fucking your pussy. You gag on Ivan''s cock and he pulls away. Ivan gives you a few seconds to catch your breath as he raises his dick to your mouth and begins brushing your lips with his cock. When you finish catching your breath, you casually wrap your lips around Ivan''s dick and do your best to lick and suck him off. After a few miniutes Ivan says, "Hey <<$pcs_firstname>>, Now that I''m all lubed up, It''s time to fuck your ass."'
+		anal_slip += 4
 		gs 'arousal', 'anal', 5, 'sub'
 		gs 'boyStat', 'A3'
 		gs 'arousal', 'bj', 5, 'sub'
@@ -1030,6 +1031,7 @@ if $ARGS[0] = 'Livingroom 3':
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/sex/ball2.mp4"></video></center>'
 		''
+		gs 'arousal', 'auto_lube', 'anal'
 		gs 'arousal', 'anal', 5
 		gs'stat'
 
@@ -1290,7 +1292,9 @@ if $ARGS[0] = 'Bathroom Cam 2':
 			act 'Anal':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/cam/camanal1.jpg"></center>'
-				'You walk up to Fedor and whisper in his ear "I want you to fuck my ass. Fedor gives you a smile as he places his camera on the ground in front of you then walks around you, grabbing you by the hips and pushing you into a kneeling position as he inserts his penis in your ass. You feel a jolt of pain as it first enters your anus but Fedor waits a few seconds for your ass to adjust to his dick then begins thrusting his hips into yours, ramming his dick deeper in your ass.'
+				'You walk up to Fedor and whisper in his ear "I want you to fuck my ass.'
+				gs 'arousal', 'auto_lube', 'anal'
+				'Fedor gives you a smile as he places his camera on the ground in front of you then walks around you, grabbing you by the hips and pushing you into a kneeling position as he inserts his penis in your ass. You feel a jolt of pain as it first enters your anus but Fedor waits a few seconds for your ass to adjust to his dick then begins thrusting his hips into yours, ramming his dick deeper in your ass.'
 				gs 'arousal', 'anal', 5
 				gs'stat'
 
@@ -1749,7 +1753,9 @@ if $ARGS[0] = 'Bedroom Cam':
 			act 'Anal':
 				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal8.mp4"></video></center>'
-				'You give Fedor a wink then walk up to a nearby stool and bend over. You lick your fingertips then begin lubing and massaging your anus with your fingers while giving Fedor a very inviting look. Fedor gives you a seductive smile as he takes off his pants then approaches you and soon you feel his penis tip pressing against you anus. Suddenly you feel Fedor''s penis enter your ass causing a jolt of pain. Fedor holds still for a few seconds, giving your ass some time to adjust to his dick before slowly fucking your ass. After a few minutes of Fedor fucking your ass he says, "<<$pcs_firstname>> are you ready for my cum?"'
+				'You give Fedor a wink then walk up to a nearby stool and bend over. You lick your fingertips then begin massaging your anus with your fingers while giving Fedor a very inviting look.'
+				gs 'arousal', 'auto_lube', 'anal'
+				'Fedor gives you a seductive smile as he takes off his pants then approaches you and soon you feel his penis tip pressing against you anus. Suddenly you feel Fedor''s penis enter your ass causing a jolt of pain. Fedor holds still for a few seconds, giving your ass some time to adjust to his dick before slowly fucking your ass. After a few minutes of Fedor fucking your ass he says, "<<$pcs_firstname>> are you ready for my cum?"'
 				gs 'arousal', 'anal', 5, 'sub', 'exhibitionism'
 				gs'stat'
 
@@ -2172,6 +2178,7 @@ if $ARGS[0] = 'Bedroom 2':
 		'You reply, "I want you to fuck my ass." Fedor gives you a smile as he grabs you by the arm and flips you onto your stomach. Fedor rubs your ass and gives it a firm smack then grabs onto your legs and lifts up your ass to his face where he begins licking your vagina and anus. You let out a soft moan as Fedor alternates between licking your ass and vagina. Fedor begins focusing on your ass properly lubricating your asshole before climbing onto his knees. You can feel Fedor''s penis lightly pushing against your anus and gradually pushing deeper inside you which gives you a sharp pain as his penis expands your anus.'
 		*nl
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/virginanal2.mp4"></video></center>'
+		anal_slip += 4
 		gs 'arousal', 'foreplay', 5, 'dom'
 		gs 'arousal', 'anal', 5
 		gs'stat'

+ 4 - 14
locations/Gnpc2.qsrc

@@ -628,7 +628,7 @@ $din_gboy_go_to_disco = {
 													gs 'cum_manage'
 													swallow += 1
 													gs 'stat'
-													'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
+													'<center><video autoplay loop src="images/shared/sex/public/c0<<rand(0,10)>>.mp4"></video></center>'
 													gs 'dinsex','bj_swallow_random'
 
 													act 'Further':
@@ -723,9 +723,6 @@ $din_gboy_go_to_disco = {
 													act 'Substitute ass (<<will_cost>> Willpower)':
 														cls
 														gs 'willpower', 'pay', 'self'
-														gs 'arousal', 'anal', 15
-														spafinloc = 3
-														gs 'cum_manage'
 														anala += 1
 														gs 'boyStat', $nameBoyfrend[numnpc]
 														if gnpcSex[numnpc] = 0:gnpcSex[numnpc] = 1 & guy += 1
@@ -734,9 +731,9 @@ $din_gboy_go_to_disco = {
 														GboyBalabol[numnpc] = 1
 
 														gs 'stat'
-														'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal31.jpg"></center>'
+														'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<rand(0,12)>>.mp4"></video></center>'
 														gs 'dinsex', 'boy_puts_condom'
-														gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+														gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 														'Finally the guy finishes and you feel something warm fill your ass.'
 
 														act 'Further':
@@ -909,9 +906,6 @@ $din_gboy_tits = {
 						act 'Substitute ass (<<will_cost>> Willpower)':
 							cls
 							gs 'willpower', 'pay', 'self'
-							gs 'arousal', 'anal', 15
-							spafinloc = 3
-							gs 'cum_manage'
 							anala += 1
 							gs 'boyStat', $nameBoyfrend[numnpc]
 							if gnpcSex[numnpc] = 0:gnpcSex[numnpc] = 1 & guy += 1
@@ -922,7 +916,7 @@ $din_gboy_tits = {
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal31.jpg"></center>'
 							gs 'dinsex', 'boy_puts_condom'
-							gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+							gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
 							act 'Leave.':gt 'pavResidential'
@@ -992,10 +986,6 @@ $din_gboy_tits = {
 						act 'Substitute ass (<<will_cost>> Willpower)':
 							cls
 							gs 'willpower', 'pay', 'self'
-							gs 'arousal', 'anal', 15
-							spafinloc = 3
-							gs 'cum_manage'
-							anala += 1
 							gs 'boyStat', $nameBoyfrend[numnpc]
 							if gnpcSex[numnpc] = 0: gnpcSex[numnpc] = 1 & guy += 1
 

+ 6 - 6
locations/KatjaHomeTalk.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = '':
 	end
 
 	if npc_pregtalk['A14'] = 0 and KatjaConflict = 0 and kid = 0:
-		if knowKatjaPreg = 1 and pregchem >= 3600:
+		if knowKatjaPreg = 1 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			gs 'stat'
 			minut += 5
@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -252,7 +252,7 @@ if $ARGS[0] = '':
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
 			end
-		elseif KatjaPreg = 0 and pregchem >= 3600:
+		elseif KatjaPreg = 0 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			*nl
 			minut += 5
@@ -265,7 +265,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
+		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -278,7 +278,7 @@ if $ARGS[0] = '':
 	end
 
 	if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and kid > 0:
-		if knowKatjaPreg = 1 and pregchem >= 3600:
+		if knowKatjaPreg = 1 and func('body_din','pregnancyVisibility') = 1:
 			cla
 			gs 'stat'
 			minut += 5
@@ -290,7 +290,7 @@ if $ARGS[0] = '':
 			else
 				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
 			end
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and pregchem < 3600:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
 				cls
 				gs 'stat'

+ 7 - 1
locations/Komp.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 
 	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:gt ''Komp'',''kursak''">coursework</a>.'
 
-	if $loc = 'shulga_room' or $loc = 'anushapt':
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome':
 		internet_store = internet
 		internet = 100000
 		act 'Browse the internet':gt 'Komp', 'brows'
@@ -188,6 +188,8 @@ if $ARGS[0] = 'masturbate':
 	if pcs_horny >= 100:
 		$orgasm_or = 'yes'
 		$orgasm_txt = 'Suddenly your muscles tighten and you cum powerfully, while you stifle your moans so your neighbours won''t find out. Afterwards, you have goosebumps all over your skin. That was just what you needed!'
+		gs 'arousal', 'masturbate', -1
+		gs 'stat'
 	end
 
 	act 'Stop masturbating':divanmastr = 0 & gt 'Komp', 'porno'
@@ -1136,6 +1138,8 @@ if $ARGS[0] = 'waitclients':
 				gs 'stat'
 				$orgasm_or = 'custom'
 				$orgasm_txt = 'You groan despite yourself, and realize you''re about to have an orgasm on camera! Deciding it''s too late to stop, you flick your fingers over your clit several more times and moan loudly as your whole body begins to tremble. When you look at the chat again, you see a mixture of compliments and lewd comments on your show. Either way: they loved it!'
+				gs 'arousal', 'masturbate', -1
+				gs 'stat'
 			end
 			act 'Continue':gt 'Komp','waitclients'
 		end
@@ -1452,6 +1456,7 @@ if $ARGS[0] = 'waitclients':
 				'When it subsides, you look at your current viewer count. Damn... you just came in front of <<camclients>> users, completely free of charge!'
 
 				$orgasm_or = 'yes'
+				gs 'arousal', 'vaginal_finger', -1, 'exhibitionism'
 				gs 'stat'
 			end
 			act 'Continue':gt 'Komp','waitclients'
@@ -1494,6 +1499,7 @@ if $ARGS[0] = 'waitclients':
 				gs 'stat'
 				$orgasm_or = 'yes'
 				$orgasm_txt = 'It feels too good to stop! Before you know it, your fingers are repeatedly penetrating your ass and you moan excitedly, barely keeping yourself from screaming. You just had an anal orgasm in front of <<camclients>> users, completely free of charge! Oops...'
+				gs 'arousal', 'masturbate', -1, 'exhibitionism'
 				gs 'stat'
 			end
 			act'Continue':gt'Komp','waitclients'

+ 1 - 0
locations/LCporn.qsrc

@@ -99,6 +99,7 @@ if $ARGS[0] = 'sex':
 	act 'Take it in the ass':
 		*clr & cla
 		npc_rel['A89'] += 5
+		gs 'boyStat', 'A89'
 		npc_sex[$boy] += 1
 		randlcpic = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/anal<<randlcpic>>.jpg"></center>'

+ 1 - 1
locations/Nord.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-	'The towns <a href="exec:hour += 1 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
+	'The towns <a href="exec:minut += 60 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
 
 	if hour > 7 and hour < 23:
 		'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'

+ 3 - 2
locations/NormPR.qsrc

@@ -20,8 +20,9 @@ if $ARGS[0] = '1':
 	end
 
 	'After a few minutes of fucking you, the man groans and you feel his hips spasming against yours. He pulls out of you and takes the filled condom off his slowly shrinking cock.'
-	gs 'arousal', 'vaginal', 15, 'sub', 'unknown', 'prostitution'
-	gs 'orgazm','start'
+	gs 'dinsex', 'boy_puts_condom'
+	gs 'dinsex', 'vaginal_sex', 15, 'sub', 'unknown', 'prostitution'
+	gs 'dinsex', 'sexcum'
 	'The man ties a knot in the condom and tosses it out of the window carelessly, very satisfied with your performance.'
 	
 	gs 'arousal', 'end'

+ 2 - 1
locations/Palatka.qsrc

@@ -23,7 +23,8 @@ if $ARGS[0] = 'start':
 	act 'Leave':palMir = 0 & gt 'Military', 'start'
 
 	act 'Sleep':
-		hour += 8
+		minut += 480
+		gs 'stat'
 		pcs_sleep = 100
 		gt 'palatka', 'start'
 	end

+ 1 - 0
locations/Vnlake2.qsrc

@@ -38,6 +38,7 @@ act 'Touch member':
 			cls
 			minut -= 20
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake4.jpg"></center>'
+			gs 'arousal', 'auto_lube', 'anal'
 			'You move forwards and sit on the cock that was in your mouth, hands on your buttocks you present your ass to the other, encouraged he accepts. They fuck you in both holes, while you moan loudly.'
 			'This continues for what feels like forever as you are lost in bliss, finally the member in your ass is removed, you are spent and happy to finish now.'
 			'"Sit your ass here" says the man on the bottom.'

+ 2 - 1
locations/Voltrenersex.qsrc

@@ -530,9 +530,10 @@ if $ARGS[0] = 'discoSex':
 						'As you bend over you pull up your skirt showing him your bare ass. Almost at once he grabs your hip with one hand, apparently no longer wanting to just watch. With his other hand he guides his dick, he rubs the head of it against your wet pussy. Then trails it up to your asshole, leaving a trail of your wetness from your pussy to your ass, then he slides it back down and rubs his head against your pussy again.'
 						'Getting the head of his dick even more soaked in your pussy juices, once more he slides it back up and starts rubbing it against your asshole. This time he doesn''t slide it back down, instead he pushes the head of his dick into your ass. You wince and cry out slightly in pain, as you feel the head of his dick force itself into your ass. He rubs your back with one hand, caressing you. "Take a breath and relax it will feel better."'
 						act 'Fuck your ass':
-							cls
+							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco5.mp4"></video></center>'
 							gs 'dinSex','boy_wants_anal','lubri'
+							gs 'arousal', 'auto_lube', 'anal'
 							'You do your best to do as he says, taking a deep breath and trying to relax, but it is hard to relax when you have a <<dick>>cm <<$dick_girth>> cock in your ass. He begins slowly and gently fucking your ass, with each stroke he does just a tiny bit deeper. Bitting your lower lip in pain as he slowly fucks your ass.'
 							'But he was right in time it hurts less and even starts to feel kinda good, a bit of a mixture of pleasure and pain. You feel yourself starting to moan. Taking this as a sign you are ready he starts to pump in and out of your ass faster, slowly but steadily picking up the pace, until he is pounding your balls deep in your ass.'
 							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'

+ 1 - 2
locations/_attributes_cheap.qsrc

@@ -846,8 +846,7 @@ elseif ARGS[1] = 150:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
-	CloPantsShortness = 1
-	CloExhibit = 10
+	CloSkirtShortness = 3
 elseif ARGS[1] = 151:
 	CloQuality = 2
 	CloThinness = 3

+ 2 - 2
locations/_attributes_school.qsrc

@@ -445,8 +445,8 @@ elseif ARGS[1] = 61:
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 10
-	CloSkirtShortness = 3
+	CloExhibit = 20
+	CloSkirtShortness = 4
 	CloBimbo = 1
 elseif ARGS[1] = 62:
 	CloQuality = 4

+ 35 - 5
locations/agentned.qsrc

@@ -301,7 +301,13 @@ if $ARGS[0] = 'rent_cityres':
 				karta -= home_rent[1]
 			end
 			home_owned[1] = 1
-			if ARRSIZE('home_owned') = 0: gs 'set_home', 1
+			if ARRSIZE('home_owned') = 0:
+				gs 'set_home', 1
+			else
+				$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+				if $set_homeyn = 'yes': gs 'set_home', 1
+				killvar '$set_homeyn'
+			end
 			ArendHouseSL += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -349,7 +355,13 @@ if $ARGS[0] = 'rent_pushkin':
 				karta -= home_rent[4]
 			end
 			home_owned[4] = 1
-			if ARRSIZE('home_owned') = 0: gs 'set_home', 4
+			if ARRSIZE('home_owned') = 0:
+				gs 'set_home', 4
+			else
+				$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+				if $set_homeyn = 'yes': gs 'set_home', 4
+				killvar '$set_homeyn'
+			end
 			ArendHouseSL4 += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -385,7 +397,13 @@ if $ARGS[0] = 'buy_cityres':
 	minut += 30
 	karta -= home_value[1]
 	home_owned[1] = 2
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 1
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 1
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 1
+		killvar '$set_homeyn'
+	end
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
@@ -402,7 +420,13 @@ if $ARGS[0] = 'buy_dacha':
 	minut += 30
 	karta -= home_value[3]
 	home_owned[3] = 1
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 3
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 3
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 3
+		killvar '$set_homeyn'
+	end
 	etoexhib = 0
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -420,7 +444,13 @@ if $ARGS[0] = 'buy_Mansion':
 	minut += 30
 	karta -= home_value[5]
 	home_owned[5] = 1
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 5
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 5
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 5
+		killvar '$set_homeyn'
+	end
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'

+ 1 - 0
locations/alex.qsrc

@@ -38,6 +38,7 @@ act 'Get on your knees and take it in your mouth':
 		'Suddenly you feel his cock exiting your vagina. Not wanting him to stop, you push your hips against him to try and keep his dick inside you.'
 		'But instead of entering your wet pussy, his cock slides into your anus.'
 		gs 'arousal', 'anal_finger', 10, 'sub'
+		anal_slip += 4
 		gs 'arousal', 'anal', 10, 'sub'
 		minut -= 10
 		gs 'stat'

+ 0 - 467
locations/annafrends.qsrc

@@ -1,467 +0,0 @@
-# annafrends
-$location_type = 'event_outdoors'
-
-if $ARGS[0] = 'scene1':
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-	gs 'reks'
-
-	'Your sister Anya and her friends Lena, Ira, Rex, and Roman are sitting outside the community center drinking beer.'
-	temprand = rand(0, 4)
-
-	if temprand = 0:
-		!!Anya
-		'Impatiently, Anya picks up a bottle of beer and shouts, "Come on guys! Will you pour me some beer today or not?"'
-
-		if rand(0, 1) = 0:
-			'Rex takes the bottle out of Anya''s hands.'
-			temprand = rand(0, 4)
-
-			if temprand = 0:
-				'"Stop shouting, I''m pouring!"'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
-				elseif temprand = 1:
-					'With a resounding slap on Rex'' shoulder, Lena says "Hurry up, you piece of dog shit!"'
-				else
-					'With a smile, Ira says "Don''t get angry, Rex."'
-
-					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him to a post until he calms down."'
-				end
-			elseif temprand = 1:
-				'"Well, you always like to be late for the fun. Relax your ass, I''m sorting it all out."'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Between fits of giggles, Anya says "I haven''t even started to yell. If I do, you''ll know!"'
-				elseif temprand = 1:
-					'With a resounding slap on Rex'' shoulder, Lena says "Hurry, you piece of dog shit!"'
-				else
-					'Roma giggles and says "It already stinks here, and if she relaxes her ass more, we run the risk of suffocation!"'
-					temprand = rand(0, 2)
-
-					if temprand = 0:
-						'Anya quips, "You''ll forever remain a virgin, Roma."'
-						if rand(0, 10) = 0:
-							'Roma grins "Is that an offer?"'
-							temprand = rand(0, 2)
-
-							if temprand = 0:
-								'Anya laughs "Dream on, punk."'
-							elseif temprand = 1:
-								'Anya laughs "Only in your dreams, punk."'
-							else
-								'Anya laughs "Yeah, right. Can you hear that? It''s a whore coming to help you."'
-							end
-						end
-					elseif temprand = 1:
-						'Anya quips "And you''re just sad because you can''t get any girls, Roma."'
-
-						if rand(0, 10) = 0:'Rex grins "Yeah, our eternal virgin Roma is truly able to enliven the conversation with the topic of anal gases."'
-					else
-						'Anya quips "The smell comes from you."'
-
-						if rand(0, 10) = 0:'Roma grins "Yes, no, it sobachatiny bears."'
-					end
-				end
-			elseif temprand = 2:
-				'"Come on, just open it already. Don''t you have hands?"'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Anya giggles "Yeah, what else do you need them for?"'
-
-					if rand(0, 10) = 0:'With mock indignation, Rex answers "Really just one other thing."'
-				elseif temprand = 1:
-					'With a resounding slap on Rex''s shoulder, Lena says "Is that how you speak to a lady?"'
-
-					if rand(0, 10) = 0:'With mock indignation, Rex answers "Yes. I speak russian to her."'
-				else
-					'Ira smiles, saying "Don''t get so upset, Rex."'
-
-					if rand(0, 10) = 0:'Anya quickly interjects, "We might need to chain him up to a tree to keep him calm."'
-				end
-			elseif temprand = 3:
-				'"Allow me, madame."'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Anya giggles "Of course, monsieur."'
-				elseif temprand = 1:
-					'With mock indignation, Anya says "Don''t you Madame me!"'
-
-					if rand(0, 10) = 0:'Rex bows gallantly and answers "I''m truly sorry, mademoiselle."'
-				else
-					'Impatiently, Anya says "Pour it already, you clown."'
-				end
-			else
-				'"Shit! Where''re the cups? Did we not buy any?"'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Anya picks up the cups, "Here they are, you blind monster."'
-				elseif temprand = 1:
-					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
-				else
-					'Lena holds up the cups and says "Rex, calm down."'
-				end
-			end
-		else
-			'Roma takes the bottle from Anya and opens it. "Somebody hold the cups."'
-			temprand = rand(0, 2)
-
-			if temprand = 0:
-				'Rex holds the cups while Roma pours the beer.'
-			elseif temprand = 1:
-				'Rex takes the cups and mutters "That worthless ass. Can''t he use both of his hands at once?"'
-			else
-				'Ira takes the cups and says "Pour it already, you big doofus."'
-			end
-
-			if rand(0, 3) = 0:
-				'As Roma pours beer in the cups, they suddenly tip over and spill all the beer on the ground.'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Outraged, Rex screams "You puny, armless ass! No one can trust you! Didn''t your mother ever tell you, ''Always pour with two hands!''"'
-				elseif temprand = 1:
-					'Outraged, Rex says "How the fuck could you spill that?"'
-				else
-					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
-				end
-			end
-		end
-	elseif temprand = 1:
-		!!Lena
-		'Indignantly, Lena says "Did we come here to drink beer or to look at it?"'
-	elseif temprand = 2:
-		!!Ira
-		'With a flirty look, Ira bats her eyelashes and says "Boys, are we going to drink beer today or not?"'
-	elseif temprand = 3:
-		!!Rex
-		if rand(0, 1) = 0:
-			'Rex picks up a bottle of beer and pops it open.'
-			if rand(0, 2) = 0:
-				'"Shit! Where''re the cups? Did we not buy any?"'
-
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Anya picks up the cups, "Here they are, you blind monster."'
-				elseif temprand = 1:
-					'Roma says "Rex, you''re the one who bought them, is your memory really that bad?"'
-				else
-					'Lena holds up the cups and says "Rex, calm down."'
-				end
-			else
-				'"Roma, hold the cups while I pour."'
-			end
-		else
-			'Rex picks up a bottle of beer and hands it to Roma. "You pour this time."'
-			'Roma takes the beer bottle from Rex, opens it and says "Somebody hold the cups."'
-			temprand = rand(0, 2)
-
-			if temprand = 0:
-				'Rex holds the cups while Roma pours the beer.'
-			elseif temprand = 1:
-				'Rex takes the cups and mutters "That worthless ass. Can''t he use both of his hands at once?"'
-			else
-				'Ira takes the cups and says "Pour it already, you big doofus."'
-			end
-
-			if rand(0, 3) = 0:
-				'As Roma pours beer in the cups, they suddenly tip over and spill all the beer on the ground.'
-				temprand = rand(0, 2)
-
-				if temprand = 0:
-					'Outraged, Rex screams "You puny, armless ass! No one can trust you! Didn''t your mother ever tell you, ''Always pour with two hands!''"'
-				elseif temprand = 1:
-					'Outraged, Rex says "How the fuck could you spill that?"'
-				elseif temprand = 2:
-					'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
-				end
-			end
-		end
-	else
-		!!Roma Meynold
-		'Roma picks up the bottle of beer, opens it and says "Somebody hold the cups."'
-		temprand = rand(0, 2)
-
-		if temprand = 0:
-			'Rex holds the cups while Roma pours the beer.'
-		elseif temprand = 1:
-			'Rex takes the cups and mutters "That worthless ass. Can''t he use both of his hands at once?"'
-		else
-			'Ira takes the cups and says "Pour it already, you big doofus."'
-		end
-
-		if rand(0, 3) = 0:
-			'As Roma pours beer in the cups, they suddenly tip over and spill all the beer on the ground.'
-			temprand = rand(0, 2)
-
-			if temprand = 0:
-				'Outraged, Rex screams "You puny, armless ass! No one can trust you! Didn''t your mother ever tell you, ''Always pour with two hands!''"'
-			elseif temprand = 1:
-				'Outraged, Rex says "How the fuck could you spill that?"'
-			else
-				'Indignantly, Anya says "Always the same; never let somebody else pour if you can do it yourself instead."'
-			end
-		end
-	end
-	killvar 'temprand'
-
-	if npc_QW['A33'] = 1:
-		act 'Meet your sister''s boyfriend':
-			*clr & cla
-			minut += 5
-			npc_QW['A33'] = 2
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/sisboyqw_02.jpg"></center>'
-			*nl
-			'"<<$pcs_nickname>>, you wanted to meet my boyfriend? This is my boyfriend Roma, and this is my sister <<$pcs_nickname>>."'
-			'"To friendship!!!" Rex shouts drunkenly, raising his cup. You pick up a cup full of beer and start drinking, glancing at your sister''s boyfriend.'
-			'Roma, red-haired and skinny, is actually pretty cute. You think to yourself, "Sister, how very lucky you are."'
-
-			act 'Continue to drink beer':gt 'annafrends', 'scene2'
-		end
-	end
-
-	act 'Continue to drink beer':gt 'annafrends', 'scene2'
-
-	'Finally, everybody''s plastic cup is filled with cold beer. You all merrily drink together.'
-	if reksLike = 1 and toiletRexSex = 0 and sisboypartyQW > 1 and rex_breakup = 0:
-		temp = rand(1,100)
-		if temp >= 70:
-			'You notice Rex briefly glancing at your feet.'
-			if pcs_horny > 30 and (PCloSkirt > 2 or PCloPants > 4):
-				act 'Show off your legs':
-					cla
-					minut += 5
-					pcs_horny += 5
-					rex += 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/community/rexpod<<rand(1,3)>>.jpg"></center>'
-					'You cross your foot over your leg, doing your best to appear seductive without being obvious.'
-					act 'Continue to drink beer':gt 'annafrends', 'scene2'
-					killvar 'temp'
-					exit
-				end
-			end
-		elseif alko > 2 and temp <= 20 and rex <= 60:
-			*clr & cla
-			minut += 5
-			rex += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			*nl
-			'Already pretty tipsy, Rex approaches you - "<<$pcs_nickname>>, let me refill your glass" - but he, seemingly accidentally, spills some on your foot. - "Oh, <<$pcs_nickname>>, forgive me! Here, I''ll clean that up."'
-			'Rex begins wiping off your legs with his shirt sleeve.'
-			gs 'willpower', 'foreplay', 'resist', 'easy'
-			if will_cost <= pcs_willpwr:
-				act 'Step back (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'resist'
-					minut += 5
-					rex -= 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/community/rexnet.jpg"></center>'
-					*nl
-					'"No problem, I can manage that."'
-					act 'Continue to drink beer':gt 'annafrends', 'scene2'
-				end
-			else
-				act 'Step back (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-			act 'Wait':
-				*clr & cla
-				minut += 5
-				pcs_horny += 5
-				rex += 1
-				gs 'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/resident/reks/event/community/rexda.mp4"></video></center>'
-				*nl
-				'Laughing, you wait until Rex finishes wiping your foot. While you are giggling, Rex becomes more bold, gradually replacing his sleeve with his palm and working up your thigh towards your panties. Just as Rex''s finger is about to touch your panties, you realize what is going on and hurriedly remove his hand, saying: "Hey..."'
-				act 'Continue to drink beer':gt 'annafrends', 'scene2'
-			end
-		elseif rexPark = 1 and rexParkDay < daystart and rexSisTalk = 2:
-			cla
-			minut += 5
-			rex = 50
-			rexPark = 0
-			gs 'reks'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			*nl
-			gs 'reks', 'rexRep'
-			'Rex comes up to you. "<<$pcs_nickname>>, I looked like a real chump waiting for you alone in the park yesterday! That wasn''t very nice..."'
-			act 'Continue to drink beer':gt 'annafrends', 'scene2'
-		elseif rexCar = 1 and rexCarDay < daystart and rexSisTalk = 3:
-			cla
-			minut += 5
-			rex = 50
-			rexCar = 0
-			gs 'reks'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			*nl
-			gs 'reks', 'rexRep'
-			'Rex comes up to you. "<<$pcs_nickname>>, I was waiting at your door for almost two hours last night! It wasn''t very nice to ditch me like that..."'
-			act 'Continue to drink beer':gt 'annafrends', 'scene2'
-		elseif rexCar = 1 and rexCarDay < daystart and rexSisTalk = 4:
-			cla
-			minut += 5
-			rex = 50
-			rexCar = 0
-			gs 'reks'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			*nl
-			gs 'reks', 'rexRep'
-			'Rex comes up to you. "<<$pcs_nickname>>, you could have at least told me you didn''t want to go out... last night was a disaster! Next time, please just tell me if you can''t make it."'
-			act 'Continue to drink beer':gt 'annafrends', 'scene2'
-		elseif temp > 50 and rex >= 30:
-			cla
-			minut += 5
-			gs 'reks'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			*nl
-			gs 'reks', 'rexRep'
-			'Rex is drinking a glass of beer.'
-			act 'Chat':
-				cla
-				rex += 1
-				minut += 5
-				gt 'reks', 'rexGdkTalk'
-			end
-			act 'Continue to drink beer':gt 'annafrends', 'scene2'
-
-!sisboyparty
-!-1 - don''t go to the party
-!0 - don''t know about the parties
-!1 - knows about the parties
-!2 - agreed to go to the party
-
-		elseif sisboypartyQW >= 2 and sisboyparty = 1:
-			'Roma looks up at you, suddenly remembering something.'
-			if sisboyparty_day = daystart:
-				'"<<$pcs_nickname>>, Rex''s apartment is available tomorrow and he''s having a party, do you want to go?"'
-			elseif week + sisboyparty_day - daystart = 4:
-				'"<<$pcs_nickname>>, Rex''s apartment is available on Friday and he''s having a party, do you want to go?"'
-			elseif week + sisboyparty_day - daystart = 5:
-				'"<<$pcs_nickname>>, Rex''s apartment is available on Saturday and he''s having a party, do you want to go?"'
-			elseif week + sisboyparty_day - daystart = 6:
-				'"<<$pcs_nickname>>, Rex''s apartment is available on Sunday and he''s having a party, do you want to go?"'
-			else
-				'"<<$pcs_nickname>>, you should come to Rex''s party next week, we find out when they are held on Tuesday morning so ask me during the week so you don''t miss it."'
-				sisboyparty = -1
-				killvar 'temp'
-				exit
-			end
-	
-			act 'Yes':
-				*clr & cla
-				minut += 5
-				sisboyparty = 2
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				*nl
-				'You agree to go to the party.'
-				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here, don''t forget to be there before 18:00, otherwise we will leave without you."'
-				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt'sister'
-			end
-
-			act 'No (study)':
-				*clr & cla
-				minut += 5
-				sisboyparty = -1
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
-				*nl
-				'You turn down the invitation.'
-				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt'sister'
-			end
-
-			if bronzebeg > 0 or silverbeg > 0 or goldbeg > 0:
-				act 'No (training)':
-					*clr & cla
-					minut += 5
-					sisboyparty = -1
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
-					*nl
-					'You turn down the invitation.'
-					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt'sister'
-				end
-			end
-
-			if volleysostav > 0:
-				act 'No (volleyball)':
-					*clr & cla
-					minut += 5
-					sisboyparty = -1
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
-					*nl
-					'You turn down the invitation.'
-					'"I can''t, the coach does not allow my to stay out late, and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt'sister'
-				end
-			end
-		end
-		killvar 'temp'
-	end
-end
-
-if $ARGS[0] = 'scene2':
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-
-	'The bottle of beer was quickly drained and the guys go to fetch a new bottle.'
-
-	if rand(0, 1) = 0:
-		gennpc = rand(0, 2)
-
-		if gennpc = 0:
-			'Anya walks up to you and asks "<<$pcs_nickname>>, let''s go to the toilet."'
-			act 'Go together':gt 'annafrends', 'scene3', 'Anya'
-		elseif gennpc = 1:
-			'Lena walks up to you and asks "<<$pcs_nickname>>, do you want to go to the toilet?"'
-			act 'Go together':gt 'annafrends', 'scene3', 'Lena'
-		elseif gennpc = 2:
-			'Ira walks up to you and asks "<<$pcs_nickname>>, do you want to go somewhere?"'
-			act 'Go together':gt 'annafrends', 'scene3', 'Ira'
-		end
-		killvar 'gennpc'
-	else
-		'The boys went around the corner of the club to empty their bladder, leaving the girls alone.'
-	end
-
-	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt'gdk'
-end
-
-if $ARGS[0] = 'scene3':
-	*clr & cla
-	menu_off = 1
-	gs 'arousal', 'voyeur', 5
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/piss.jpg"></center>'
-	*nl
-	'You follow <<$ARGS[1]>> to the bushes behind the club. <<$ARGS[1]>> looks around, lifts her skirt, pulls down her panties, squats and begins to pee.'
-
-	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt'gdk'
-
-end
-
-
---- annafrends ---------------------------------
-

+ 2 - 1
locations/anushapt.qsrc

@@ -390,6 +390,7 @@ if $ARGS[0] = 'bathroom':
 			end
 			act 'Get out of the shower': gt 'anushapt','bathroom'
 		end
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		killvar 'temp'
 	end
 	dynamic $bath
@@ -844,7 +845,7 @@ if $ARGS[0] = 'computer':
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/caughtmast/les2.jpg"></center>'
 										'Once in bed you waste no time in pulling her clothes off, she returns the favor and starts removing your clothes as well. It would go a lot faster if the two of you were''t also passionately kissing and caressing each others bodies. Regardless before long, you are both naked.'
 										gs 'arousal', 'foreplay', 10, 'lesbian'
-										act 'Get pleasured': gt 'anuskaev1', 'getpleasured'
+										act 'Get pleasured': gt 'anushkaev1', 'getpleasured'
 									end
 								end
 							else

+ 5 - 1
locations/anushka.qsrc

@@ -244,7 +244,11 @@ if $ARGS[0] = 'Her turn':
 				*clr & cla
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/locations/pavlovsk/school/detention/sex/detcanal.jpg"></center>'
-				'She gets up and has you lay down in her place, straddling your face almost as soon as you''re on your back. After the enthusiasm with which she treated you, you have no reservations about giving her pussy a thorough licking as well and you go to town immediately. Meanwhile, she lifts up your legs and spreads them apart, having Valentin kneel down between your legs. You feel him rubbing the tip of his dick against your asshole for a moment before pushing the tip of his <<dick>>cm <<$dick_girth>> cock past your anus into your ass.'
+				'She gets up and has you lay down in her place, straddling your face almost as soon as you''re on your back. After the enthusiasm with which she treated you, you have no reservations about giving her pussy a thorough licking as well and you go to town immediately. Meanwhile, she lifts up your legs and spreads them apart, having Valentin kneel down between your legs.'
+				*nl
+				gs 'arousal', 'auto_lube', 'anal'
+				*nl
+				'You feel him rubbing the tip of his dick against your asshole for a moment before pushing the tip of his <<dick>>cm <<$dick_girth>> cock past your anus into your ass.'
 				*nl
 				'Not knowing how much experience you might have, he starts off slow and gentle for a moment, allowing you to get used to it. As soon as he feels you relax a bit though, he starts hammering your ass just as hard and fast as he was pounding Anushka''s. She grinds her twat against your face as he claims your ass, each of them taking turns playing with your nipples, adding another tune to the orchestra of pain and pleasure that is filling your mind. You have completely lost all sense of time by now, but you don''t really care.'
 				gs 'arousal', 'anal', 15, 'group'

+ 2 - 2
locations/anushkaev1.qsrc

@@ -472,7 +472,7 @@ if $ARGS[0] = 'rad3some':
 					'You roll over on your back and spread your legs. He gives your butt a slap as he says, "Yeah, now that is fine looking little ass." Anushka gets the cue and grabs a bottle of lube from her nightstand. Radomir growls as he sees it but grabs the bottle from her. "Fuck, you girls are obsessed with lube. If it was up to you, you would use so much you couldn''t feel anything." He complains as he grudgingly squirts just a little onto his finger tip and rubs it briefly against your asshole. There''s barely any real lubrication beyond your own pussy juices on his dick.'
 					*nl
 					'He tosses the bottle aside and lines his dick up with your asshole, until you feel the head of his cock pressing against it. The pressure builds up until the head of his cock painfully pops into your asshole, making you cry out a little. Nope, Radomir is wrong. This is not enough lube. Once inside though, he keeps shoving his <<dick>>cm <<$dick_girth>> dick deeper into your ass until he finally works it balls deep, then starts hammering away at your ass painfully. Anushka starts licking your pussy, which helps a bit, letting her spit run down from your pussy to your ass as further lubrication'
-					gs 'arousal', 'anal', 3, 'group', 'lesbian'
+					gs 'arousal', 'anal', 3, 'group', 'lesbian', 'lube'
 					gs 'arousal', 'cuni', -3, 'group', 'lesbian'
 					gs 'stat'
 					act 'It hurts not so rough':
@@ -866,7 +866,7 @@ if $ARGS[0] = 'val3some':
 													'You nod at the request to be fucked in the ass. "Sure, you can fuck my ass." You tell him. With that Anushka rolls off the top of you, as Valentin moves up behind you. He grabs you by the hips and pulls you up into a doggy position. As he does Anushka moves around in front of you and lays on her back with her legs spread. She places her hand on the back of your head and pulls your face to her crotch. As you lower your face to her crotch, you feel Valentin cock pressing against you ass, along with a squirt of the lube. He rubs the tip of his dick against your asshole, while you start to lick Anushka sopping wet pussy.'
 													*nl
 													'You groan a bit as Valentin <<dick>>cm <<$dick_girth>> cock pops into your ass. He pauses a moment to let you adjust and then he slowly starts fucking your ass, as you moan more he starts picking up speed and fucking you a bit harder and faster. The louder you moan the harder and rougher he gets, he seems to be really getting into it making you think he is close when he says. "Fuck I''m about to cum.".'
-													gs 'arousal', 'cuni_give', 5, 'group', 'lesbian'
+													gs 'arousal', 'cuni_give', 5, 'group', 'lesbian', 'lube'
 													gs 'arousal', 'anal', -5, 'group', 'lesbian'
 													gs 'stat'
 													act '100 percent chance of cum showers':

+ 61 - 12
locations/arousal.qsrc

@@ -41,6 +41,7 @@ Format to use: gs 'arousal', 'act', 'duration', 'fetish', 'fetish', 'fetish', 'f
 eg: gs 'arousal', 'trib', 10, 'bound', 'sub'
 In this case lesbianism is automatically added, much as feet would be applied to 'footjob'
 Lubrication - if one of the arguments $ARGS[2] - [8] is set to 'lube', it supposes that it is used some kind of lubricant - preferably from PCs supply of lube.
+The lube will remain applied to the orifice in question until 'end' is called. The usage of Svetas lube and checks for her having any must be done in the sex act.
 Unaware - if one of the arguments $ARGS[2] - [8] is set to 'unaware', Sveta is not aware of this Sexact. Sveta will never know she had Sex!
 The lubrication is binded with anal or vaginal action. I think that the best combo is with 'anal_finger' and 'vaginal_finger'
 Only call one at a time, if more required, use multiple calls
@@ -78,15 +79,17 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	!! first let us determine how slippery are pc''s holes
 	if vaginal_slip < pcs_horny / 10: vaginal_slip = pcs_horny / 10
 	if strpos($ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+ $ARGS[7]+ $ARGS[8],'lube') > 0:
-		if mid($ARGS[0],1,4) = 'anal':
-			anal_slip += iif(lubri = 0,2,8)
-			if anal_slip > 10: anal_slip=10
-			if lubri > 0: lubri -= 1
+		if ar_anal_lube = 0:
+			if mid($ARGS[0],1,4) = 'anal':
+				anal_slip = 8
+				ar_anal_lube = 1
+			end
 		end
-		if mid($ARGS[0],1,4) = 'vagi':
-			vaginal_slip += iif(lubri = 0,2,8)
-			if vaginal_slip > 12: vaginal_slip=12
-			if lubri > 0: lubri -= 1
+		if ar_vag_lube = 0:
+			if mid($ARGS[0],1,4) = 'vagi':
+				vaginal_slip = 8
+				ar_vag_lube = 1
+			end
 		end
 	end
 	!!	This is to allow a Succubus with the right skill level to handle any size then go back to original size
@@ -129,8 +132,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 !!		!! No idea where else to put this. This is used for breast stimulation which will eventually cause lactation in sveta without her knowledge. If anyone knows a better place for this, please let me know. - milky_boobs.
 !!		milkedvolume += func('lact_lib','$get_breastmilk', 8, ARGS[1])
 	elseif $ARGS[0] = 'massage':
+		count['massage'] = 1
 		stim['act'] = 25
 	elseif $ARGS[0] = 'foreplay':
+		count['foreplay'] = 1
 		stim['act'] = 20
 	elseif $ARGS[0] = 'cuni':
 		orgasm_flag = 1
@@ -352,8 +357,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['pee'] = 1
 		stim['act'] = 10
 	elseif $ARGS[0] = 'massage_give':
+		count['massage_give'] = 1
 		stim['act'] = 10
 	elseif $ARGS[0] = 'foreplay_give':
+		count['foreplay_give'] = 1
 		stim['act'] = 20
 	elseif $ARGS[0] = 'cuni_give':
 		count['cuni_give'] = 1
@@ -473,8 +480,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			if stim_les = 1 and $ARGS[i] = 'lesbian':i += 1 & jump 'stimloop'
 			if stim_foot = 1 and $ARGS[i] = 'feet':i += 1 & jump 'stimloop'
 			if $ARGS[i] = 'bound':
-				stim['kink'] += bondage['exp']
-				stim['pref'] += bondage['pref']
+				stim['kink'] += bound['exp']
+				stim['pref'] += bound['pref']
 				stim['kinkno'] += 1
 				stim['bound'] = 1
 			elseif $ARGS[i] = 'beast':
@@ -701,9 +708,11 @@ if $ARGS[0] = 'end':
 	if stim['prostitution'] = 1: slutty += 1
 	if stim['hidden_prostitution'] = 1: hidden_slutty += 1
 	
+	killvar 'anal_slip'
+	killvar 'ar_anal_lube'
+	killvar 'vagi_slip'
+	killvar 'ar_vag_lube'
 	killvar '$orgasm_or'
-	anal_slip = 0
-	vaginal_slip = 0
 
 !!Updating fetish exp for acts carried out and clearing data
 	gs 'arousal', 'checks', 'maso'
@@ -758,6 +767,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'vaginal_vibe'
 	gs 'arousal', 'count', 'BDSM'
 	gs 'arousal', 'count', 'pee'
+	gs 'arousal', 'count', 'massage'
 
 	gs 'arousal', 'count', 'foreplay_give'
 	gs 'arousal', 'count', 'cuni_give'
@@ -782,6 +792,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'hidden_titjob'
 	gs 'arousal', 'count', 'BDSM_give'
 	gs 'arousal', 'count', 'pee_give'
+	gs 'arousal', 'count', 'massage_give'
 
 	gs 'arousal', 'count2', 'flashlite'
 	gs 'arousal', 'count2', 'flash'
@@ -817,5 +828,43 @@ if $ARGS[0] = 'checks':
 		dynamic '<<$ARGS[1]>>[''exp''] += 1'
 	end
 end
+
+!!The auto lube application
+!!to use enter gs 'arousal', 'auto_lube', 'anal' or 'vag'
+!!add 'custom' to display a custom or no text by setting $lube_txt, if $lube_txt is '' no text will be displayed
+if $ARGS[0] = 'auto_lube':
+	if $ARGS[1] = 'anal' and auto_anal_lube = 1:
+		if lubri > 0:
+			if $ARGS[2] ! 'custom': 
+				'You rub some lube in and around you anus.'
+			elseif $lube_txt ! '':
+				$lube_txt
+			end
+			gs 'arousal', 'anal_finger', 1
+			anal_slip = 8
+			ar_anal_lube = 1
+			lubri -= 1
+		elseif $ARGS[2] ! 'custom' or ($ARGS[2] = 'custom' and $lube_txt ! ''):
+			'You do not have any lube left so cannot use it during this sex act.'
+		end
+	end
+	if $ARGS[1] = 'vag' and auto_vag_lube = 1:
+		if lubri > 0:
+			if $ARGS[2] ! 'custom': 
+				'You rub some lube in and around your vagina.'
+			elseif $lube_txt ! '':
+				$lube_txt
+			end
+			gs 'arousal', 'vaginal_finger', 1
+			vagi_slip = 8
+			ar_vag_lube = 1
+			lubri -= 1
+		elseif $ARGS[2] ! 'custom' or ($ARGS[2] = 'custom' and $lube_txt ! ''):
+			'You do not have any lube left so cannot use it during this sex act.'
+		end
+	end
+	killvar '$lube_txt'
+end
+
 --- arousal ---------------------------------
 

+ 27 - 22
locations/artemEv.qsrc

@@ -379,7 +379,7 @@ if $ARGS[0] = 'artdryhump':
 		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
 		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
-		gs 'cum_call','clothes', 'A2'
+		gs 'cum_call','clothes', 'A2', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -401,7 +401,7 @@ if $ARGS[0] = 'artdryhump1':
 		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught him dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
 		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
-		gs 'cum_call','pantyrear', 'A2'
+		gs 'cum_call','pantyrear', 'A2', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -423,7 +423,7 @@ if $ARGS[0] = 'artdryhump2':
 		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
 		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
-		gs 'cum_call','butt', 'A2'
+		gs 'cum_call','butt', 'A2', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -450,7 +450,7 @@ if $ARGS[0] = 'hj':
 		end
 		artemhj += 1
 		gs 'arousal', 'hj', 5
-		gs 'cum_call', 'hands', 'A2'
+		gs 'cum_call', 'hands', 'A2', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Clean up':
@@ -473,7 +473,7 @@ if $ARGS[0] = 'hj':
 			'You smile to him. "It''s ok, I like the way it tastes." He just smiles to you and looks at you as if you are the most amazing thing in the world. You finish cleaning off your hands then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
-			gs 'cum_call', 'mouth', 'A2'
+			gs 'cum_call', 'mouth', 'A2', 1
 			gs 'stat'
 			act 'Talk to him': gt 'artemhome', 'chat'
 			act 'Wander around his room': gt 'artemhome', 'artemroom'
@@ -484,7 +484,6 @@ end
 if $ARGS[0] = 'artem_bj':
 	*clr & cla
 	if artdate = 5: artdate = 6
-	artembj + 1
 	artdate += 1
 	npc_rel['A2'] += 1
 	gs 'stat'
@@ -519,8 +518,8 @@ if $ARGS[0] = 'artem_bj':
 					'He smiles but is still beet red. "Oh... ok."'
 					gs 'arousal', 'bj', 2
 					gs 'arousal', 'end'
-					gs 'cum_call', 'face', 'A2'
-					gs 'cum_call', 'mouth', 'A2'
+					gs 'cum_call', 'face', 'A2', 1
+					gs 'cum_call', 'mouth', 'A2', 1
 					gs 'stat'
 					act 'Talk to him': gt 'artemhome', 'chat'
 					act 'Wander around his room': gt 'artemhome', 'artemroom'
@@ -549,7 +548,7 @@ if $ARGS[0] = 'artem_bj':
 						'"You''re the best girlfriend a guy could hope for <<$pcs_nickname>>." He says as he grabs a tissues to clean up his dick and clean up the few drops of cum that landed on the floor.'
 						gs 'arousal', 'bj', 5
 						gs 'arousal', 'end'
-						gs 'cum_call', 'face', 'A2'
+						gs 'cum_call', 'face', 'A2', 1
 						gs 'stat'
 						act 'Talk to him': gt 'artemhome', 'chat'
 						act 'Wander around his room': gt 'artemhome', 'artemroom'
@@ -740,6 +739,8 @@ if $ARGS[0] = 'sex':
 								'"I... No, I don''t have any... I haven''t exactly had any use for those yet." He says a bit defensively.'
 								'Not wanting to hurt his feelings you tell him it''s ok.'
 							end
+						else
+							noprotect = 1
 						end
 						'You quickly roll over onto your back and spread your legs wide for him, offering yourself to him. He gets up and crawls over to you, crawling between your legs as he kneels before you. He rubs the tip of his dick against your wet slit getting the head of his dick wet, along with your twat. Then he slowly and gently pushes himself inside of you, you feel his <<dick>>cm <<$dick_girth>> cock stretching your pussy and filling it, in that wonderful sensation. After a few minutes of he slowly, making love to your, the whole time looking in your eyes with love and caring, he says. "I want to try doggy style please."'
 						gs 'arousal', 'vaginal', 5
@@ -774,12 +775,12 @@ if $ARGS[0] = 'cum_surprise':
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tense up and you realize that he is cumming too late. You can feel his cum shooting into you. As you lift yourself up, you can feel his cum oozing out of your pussy.'
 		'Then it hits him and he suddenly looks alarmed as he realizes he just came inside of you. "Oh my god, I am so sorry <<$pcs_nickname>>, I didn''t mean to do that."'
 		'You smile to him as you get off him. "It''s ok, don''t worry about it." He looks relieved obviously thinking your are on birth control.'
-		gt 'artemEv', 'after_sex', 'cp'
+		act 'Continue': gt 'artemEv', 'after_sex', 'cp'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tenses up, before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. Just as a stream of his sperm hits you in the face, you keep jerking him off. Causing several more streams of cum to land on your face, once the last of his cum has been drained you stop jerking him off and open your eyes.'
-		gt 'artemEv', 'after_sex', 'facial'
+		act 'Continue': gt 'artemEv', 'after_sex', 'facial'
 	end
 end
 
@@ -791,13 +792,15 @@ if $ARGS[0] = 'after_sex':
 	end
 	'With that you get up and start getting dressed and cleaned up. As you tell him. "I should probably get going."'
 	if $ARGS[1] = 'cp':
-		gs 'cum_call', 'vaginal', 'A2'
+		gs 'cum_call', 'vaginal', 'A2', 1
 	elseif $ARGS[1] = 'facial':
-		gs 'cum_call', 'face', 'A2'
+		gs 'cum_call', 'face', 'A2', 1
 	end
-	gs 'arousal', 'vaginal',2
+	gs 'arousal', 'vaginal', 2
 	gs 'arousal', 'end'
 	minut += 10
+	cumspclnt = 11
+	gs 'cum_cleanup'
 	gs 'stat'
 	act 'Leave': gt 'pod_ezd', 'etaj_1'
 end
@@ -819,7 +822,7 @@ if $ARGS[0] = 'bj':
 		'He happily nods: "It was great! Thanks <<$pcs_nickname>>, you''re the best."'
 		'With that you get up and start getting dressed and cleaned up. As you tell him. "I should probably get going."'
 		gs 'arousal', 'bj', 2
-		gs 'cum_call', 'face', 'A2'
+		gs 'cum_call', 'face', 'A2', 1
 		gs 'arousal', 'end'
 		minut += 10
 		gs 'stat'
@@ -848,7 +851,7 @@ if $ARGS[0] = 'anal':
 		'You nod and look back over your shoulder at him. "Yes, it feels great, just go slow and easy ok?"'
 	end
 	'He smiles to you. "I will, I promise." Then he slowly pushes his <<dick>>cm <<$dick_girth>> cock a little further into your ass, he takes slow shallow strokes letting you get used to him.'
-	gs 'arousal', 'anal', 5
+	gs 'arousal', 'anal', 5, 'lube'
 	gs 'stat'
 	act 'Anal bliss':
 		*clr & cla
@@ -868,9 +871,11 @@ if $ARGS[0] = 'anal':
 			end
 			'With that you get up and start getting dressed and cleaned up. As you tell him. "I should probably get going."'
 			gs 'arousal', 'hj', 2
-			gs 'cum_call', 'face', 'A2'
+			gs 'cum_call', 'face', 'A2', 1
 			gs 'arousal', 'end'
 			minut += 10
+			cumspclnt = 11
+			gs 'cum_cleanup'
 			gs 'stat'
 			act 'Leave': gt 'pod_ezd', 'etaj_1'
 		end
@@ -879,7 +884,7 @@ end
 
 if $ARGS[0] = 'slut_bj':
 	*clr & cla
-	artembj + 1
+	artembj += 1
 	npc_rel['A2'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj3.jpg"></center>'
 	'You slide off the bed onto your knees in front of him, he stiff erect cock is right in front of your face. You grab hold of it with your hand and start stroking his dick while you kiss the head of it. As you stroke his cock with on hand you start licking the head of his dick, you can taste his precum as you. He moans softly as you play with his dick.'
@@ -905,7 +910,7 @@ if $ARGS[0] = 'slut_bj':
 				'"I think we''re done for the day <<$pcs_nickname>>, I have some things I need to do, so can you please leave now." He says as he grabs a tissues to clean up his dick and clean up the few drops of cum that landed on the floor. He obviously wants you to leave so you gather up your clothes and get dressed.'
 				gs 'arousal', 'hj', 2, 'sub'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'face', 'A2'
+				gs 'cum_call', 'face', 'A2', 1
 				minut += 10
 				gs 'stat'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -950,7 +955,7 @@ if $ARGS[0] = 'slut_fuck':
 					'"I think we''re done for the day <<$pcs_nickname>>, I have some things I need to do, so can you please leave now." He says as he grabs a tissues to clean up his dick and clean up the few drops of cum that landed on the floor. He obviously wants you to leave so you gather up your clothes and get dressed.'
 					gs 'arousal', 'hj', 2, 'sub'
 					gs 'arousal', 'end'
-					gs 'cum_call', 'face', 'A2'
+					gs 'cum_call', 'face', 'A2', 1
 					minut += 10
 					gs 'stat'
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -973,7 +978,7 @@ if $ARGS[0] = 'slut_anal':
 		'Once you are on fours he grabs some lotion and rubs it on your asshole, then rubs some all along his dick. He scoots up behind you and you feel the tip of his dick pressing against your anus, the pressure keeps building up, in his haste it takes several tries as he keeps letting it slip and miss, until the head of his dick suddenly pops into your ass. You hiss in pain as he moans in pleasure. "<<$pcs_nickname>> your ass is tighter than I was expecting."'
 		'You nod and look back over your shoulder at him. "Yes, just go slow and easy ok?"'
 		'He snorts. "Like you don''t get your ass pounded every day, everyone know sluts love it or they wouldn''t do it." Then he starts fucking your ass with hard, fast strokes, he grabs ahold of your hips so you can''t pull away.'
-		gs 'arousal', 'anal', 5, 'sub'
+		gs 'arousal', 'anal', 5, 'sub', 'lube'
 		gs 'stat'
 		act 'Get butt fucked':
 			*clr & cla
@@ -989,7 +994,7 @@ if $ARGS[0] = 'slut_anal':
 				'"I think we''re done for the day <<$pcs_nickname>>, I have some things I need to do, so can you please leave now." He says as he grabs a tissues to clean up his dick and clean up the few drops of cum that landed on the floor. He obviously wants you to leave so you gather up your clothes and get dressed.'
 				gs 'arousal', 'hj', 2, 'sub'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'face', 'A2'
+				gs 'cum_call', 'face', 'A2', 1
 				minut += 10
 				gs 'stat'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'

+ 0 - 66
locations/artemEv3.qsrc

@@ -1,66 +0,0 @@
-# ArtemEv3
-
-if $ARGS[0] = 'slut_talk':
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk1.jpg"></center>'
-	'You quietly walk past Artem and enter his room. You sit down on the couch, without saying a word.'
-	'Artem looks at you questioningly: "<<$pcs_nickname>>..."'
-	'Tears roll down your cheeks, but you still don''t know what to say and just sit there, crying softly.'
-	'Artem is clueless as to what he should do, and just hugs you. You''re fairly sure he knows about your reputation. Surely he must...'
-	'Eventually, you sniffle: "They all know... Everyone in Pavlovsk knows!"'
-	'Artem keeps hugging you: "<<$pcs_nickname>>, I..."'
-	'You break away from him, and shout hysterically: "What do you mean, <<$pcs_nickname>>?! No one calls me that any more! It''s just <<$gnikname>> now..."'
-	'Artem wipes the tears from your face, and hugs you tightly.'
-	'He whispers: "I still love you..."'
-	'You smirk at him: "Are you sure you want to be seen with a whore? Everyone will look down on you too!"'
-	'Artem tells you: "I don''t care what others call you, or what they think... I just want to be with you."'
-	if soniaPS > 0:
-		'You continue: "You saw what happened to Sonia! She used to get along with everyone... but ever since the incident at the disco they all treat her like dirt! That will happen to me too, I just know it! And you, if people see you near me!"'
-	else
-		'You shake your head sadly: "I know you think that now, but it won''t be the same. People will treat me like dirt, Artem! And they would do the same to you!"'
-	end
-	'You hear his voice crack when he tries to reassure you things will be okay: "<<$pcs_nickname>>, please calm down! We''ll figure something out! Just give it some time..."'
-	'You can tell it has been on his mind as well, and that he''s having a difficult time with it too. Nevertheless, he''s willing to support you.'
-	minut += rand(10,15)
-	gs 'stat'
-
-	act 'Kiss him':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk2.jpg"></center>'
-		'You lean towards Artem and kiss him amorously.'
-		'You mutter: "Thank you, Artem... I don''t know what to say, besides... I love you!"'
-		'Artem replies: "I love you too, <<$pcs_nickname>>."'
-		'You press your lips against his again, and kiss him. He embraces you and kisses you back.'
-		'You just lay silent in each other''s arms for a minute, just thinking about the implications of it all. After that, you realize you need to get on with your day and he probably does too. You give Artem a quick kiss on his cheek and thank him for his support as you get up and gather your things. At least you know you''re not alone in this.'
-		artQW = 22
-		minut += rand(5,10)
-		gs 'stat'
-
-		act 'Leave Artem''s apartment':minut += 5 & gt 'pod_ezd','etaj_1'
-	end
-	act 'Tell him you can''t see him any more':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk3.jpg"></center>'
-		'You quietly get up, and begin to gather your things.'
-		'Artem looks at you questioningly: "<<$pcs_nickname>>, what are you doing?"'
-		'You shake your head as you softly mutter through your tears: "I''m sorry, Artem... I can''t ask this from you. I can''t ask this from anyone. I''m really sorry... but I don''t think we should see each other any more."'
-		'After you gather your things you leave his apartment, ignoring his pleas.'
-		minut += rand(5,10)
-		gs 'stat'
-		act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
-	end
-end
-
-if $ARGS[0] = 'home_start':
-	menu_off = 1
-	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-	*nl
-	'Well, it seems that this part of story is unfinished, I''ve no idea what should be here so I give you a chance to escape'
-	gs 'stat'
-	artQW = 21
-	act 'Try it once more': gt 'artemhome','inside'
-end
-
---- ArtemEv3 ---------------------------------
-

+ 12 - 12
locations/artemdate.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'stand_up':
 				gs 'willpower', 'pay', 'resist'
 				*clr & cla
 				npc_rel['A2'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walkgop_udar2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar2.jpg"></center>'
 				'Wait, what!?'
 				'You answer: "No way, you perverts! Just leave us alone!"'
 				'The Gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back, soon they all join in kicking him. You can''t take it anymore and quickly throw yourself on top of Artem, so they can''t kick him any more.'
@@ -242,11 +242,11 @@ if $ARGS[0] = 'stand_up':
 				*clr & cla
 				inhib_exp += rand(0,1)
 				gs 'fame', 'pav', 'sex', 3
-				mood - 20
+				pcs_mood -= 20
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip2.jpg"></center>'
 				if hotcat <= 4:
-					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. The leader walks up to you and say. "Fuck you are even uglier naked. I didn'' think that was even possible. Put some clothes on before I throw up." The others all burst out laughing at that. Then they all walk off laughing apparently done with their fun, you quickly get dressed again as Artem struggles to his feet. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "You didn''t have to do that."'
+					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. The leader walks up to you and say. "Fuck you are even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing at that. Then they all walk off laughing apparently done with their fun, you quickly get dressed again as Artem struggles to his feet. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "You didn''t have to do that."'
 					'You smile to him. "I couldn''t let them hurt you like that."'
 					'He frowns. "I would have healed, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
 					gs 'stat'
@@ -474,7 +474,7 @@ if $ARGS[0] = 'fight_gang':
 		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others ways, then taking your shots in their confusion. It took awhile and they got in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. First one, then another just turn and run off and that is all it took. Soon, the rest turned tail and ran off as well. Leaving you huffing and puffing, still naked. You check on Artem who is barely conscious and moaning, then you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "I can''t believe you won."'
 		'You laugh and say. "I can''t either, but I couldn''t let them hurt you like that."'
 		'He shakes his head and seems to have mixed feelings on the subject. "Thanks, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
-		minut += f
+		minut += 5
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
 	else
@@ -488,7 +488,7 @@ end
 
 if $ARGS[0] = 'gang_rape':
 	*clr & cla
-	minut + 5
+	minut += 5
 	gs 'fame', 'pav', 'sex', 10
 	rape += 1
 	gang += 1
@@ -524,7 +524,7 @@ if $ARGS[0] = 'gang_rape':
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
 			gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
-			pcs_arousal = 0
+			pcs_horny = 0
 			gs 'stat'
 			act 'Next':
 				*clr & cla
@@ -533,7 +533,7 @@ if $ARGS[0] = 'gang_rape':
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
 				gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
-				pcs_arousal = 0
+				pcs_horny = 0
 				gs 'stat'
 				act 'Too loose':
 					*clr & cla
@@ -542,7 +542,7 @@ if $ARGS[0] = 'gang_rape':
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
 					gs 'arousal', 'anal', 5, 'gangbang', 'rape', 'rough', 'bound'
-					pcs_arousal = 0
+					pcs_horny = 0
 					gs 'stat'
 					act 'Two at a time':
 						*clr & cla
@@ -555,7 +555,7 @@ if $ARGS[0] = 'gang_rape':
 						gs 'boystat', $boy3
 						gs 'arousal', 'bj', -5, 'gangbang', 'rape', 'rough', 'bound'
 						gs 'cum_call', 'anus', 'Gopnik rapist 1', 0, 0, 10000, 40
-						pcs_arousal = 0
+						pcs_horny = 0
 						gs 'stat'
 						act 'Airtight':
 							*clr & cla
@@ -570,7 +570,7 @@ if $ARGS[0] = 'gang_rape':
 							gs 'boystat', $boy6
 							gs 'arousal', 'bj', -10, 'gangbang', 'rape', 'rough', 'bound'
 							gs 'cum_call', '', 'Gopnik rapist 2', 0, 0, 10000, 40
-							pcs_arousal = 0
+							pcs_horny = 0
 							gs 'stat'
 							act 'Overflowing with cum':
 								*clr & cla
@@ -587,7 +587,7 @@ if $ARGS[0] = 'gang_rape':
 								gs 'cum_call', '', 'Gopnik rapist 3', 0, 0, 10000, 40
 								gs 'cum_call', 'anus', 'Gopnik rapist 4', 0, 0, 10000, 40
 								gs 'cum_call', 'mouth', 'Gopnik rapist 5', 0, 0, 10000, 40
-								pcs_arousal = 0
+								pcs_horny = 0
 								gs 'stat'
 								act 'Last one':
 									*clr & cla
@@ -599,7 +599,7 @@ if $ARGS[0] = 'gang_rape':
 									gs 'boystat', $boy4
 									gs 'arousal', 'bj', 5, 'gangbang', 'rape', 'rough', 'bound'
 									gs 'cum_call', 'mouth', 'Gopnik rapist 6', 0, 0, 10000, 40
-									pcs_arousal = 0
+									pcs_horny = 0
 									gs 'stat'
 									act 'Aftermath':
 										*clr & cla

+ 0 - 207
locations/artemev2.qsrc

@@ -1,207 +0,0 @@
-# artemev2
-
-gs 'boyStat','A2'
-if artQW = 1:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-	'Out of nowhere, Artem suddenly produces a bouquet of flowers and offers it to you.'
-
-	act 'Accept the flowers':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'What a nice gesture! You smile at him and mutter: "Awww, they''re beautiful! You shouldn''t have!"'
-		'You move in and give him a kiss. When you reach out for him you accidentally run your hand over his groin, and feel quite the bulge down there.'
-		'Artem blushes when he tells you: "Not as beautiful as you..."'
-		'He returns your kiss, and gently begins to caress your breasts through your clothes.'
-		minut += 5
-		gs 'stat'
-
-		act 'Tell him to stop it':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You push his hands away: "Wait... you''re going too fast, please stop!"'
-			'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
-			minut += 5
-			artQW = 2
-			gs 'stat'
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-
-		act 'Enjoy his touch and jerk him off':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cum.jpg"></center>'
-			'You keep kissing and remove your top so he has easier access to your <<$titsize>> boobs.'
-			'Meanwhile, you reach down and unbutton his pants, taking his cock in your hand. After a few quick jerks, Artem already cums on your clothes.'
-			'You notice your soiled clothes, and smile at him as you ask: "It''s okay. But that''ll leave a stain if I don''t do something... where''s your bathroom?"'
-			'Artem apologetically points at the door, and you bring your bag to cover up the stain with as you head for the bathroom. Just when you''re almost there, you hear a cheerful voice behind you: "Oh hello! I thought I heard a girl''s voice in Artem''s room!"'
-			'It''s his mother! You quickly mumble a greeting and enter the bathroom, hoping she didn''t see the sperm on your clothes. You rinse it off and return to his bedroom.'
-			'You smile at him: "That was fun... shall we study now?"'
-			gs 'arousal','hj',5
-			gs 'cum_call','clothes_hidden',$boy,1
-			artQW = 3
-			hja += 1
-			npc_sex[$boy] += 1
-			gs 'arousal','end'
-			gs 'stat'
-
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-	end
-
-	act 'Reject the flowers':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'You look at Artem compassionately, but don''t take the flowers: "Thank you... they''re very nice, but we''re just friends... I don''t want to give you the wrong idea by accepting them, you know?"'
-		'Artem sighs, and disappointedly throws flowers into the trash.'
-		minut += 5
-		gs 'stat'
-
-		act 'Run and pick them up from the trash':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You try to stop him: "No! What are you doing, they''re so beautiful!"'
-			'You take the flowers from the trash and burst into tears. Artem kneels down next to you and hugs you: "I''m sorry, please don''t cry! I didn''t think you wanted them... I... you''re so..."'
-			'You don''t object when he kisses you. You kiss him back, and a few seconds later you feel his hands on your boobs.'
-			minut += 5
-			gs 'stat'
-
-			act 'Push his hands away':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-				'You push his hands away: "Wait... you''re going too fast, please stop!"'
-				'Artem does as you ask and pulls his hands back while he apologizes: "Sorry..."'
-				minut += 5
-				artQW = 2
-				gs 'stat'
-
-				act 'Do homework with Artem': gt 'artemEv','learn'
-			end
-
-			act 'Enjoy his touch and jerk him off':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cum.jpg"></center>'
-				'You keep kissing and remove your top so he has easier access to your <<$titsize>> boobs.'
-				'Meanwhile, you reach down and unbutton his pants, taking his cock in your hand. After a few quick jerks, Artem already cums on your clothes.'
-				'You notice your soiled clothes, and smile at him as you ask: "It''s okay. But that''ll leave a stain if I don''t do something... where''s your bathroom?"'
-				'Artem apologetically points at the door, and you bring your bag to cover up the stain with as you head for the bathroom. Just when you''re almost there, you hear a cheerful voice behind you: "Oh hello! I thought I heard a girl''s voice in Artem''s room!"'
-				'It''s his mother! You quickly mumble a greeting and enter the bathroom, hoping she didn''t see the sperm on your clothes. You rinse it off and return to his bedroom.'
-				'You smile at him: "That was fun... shall we study now?"'
-				gs 'arousal','hj',5
-				gs 'cum_call','clothes_hidden',$boy,1
-				artQW = 3
-				hja += 1
-				npc_sex[$boy] += 1
-				gs 'arousal','end'
-				gs 'stat'
-
-				act 'Do homework with Artem': gt 'artemEv','learn'
-			end
-		end
-
-		act 'Leave them in the trash and study':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You quietly walk past him and say: "Come on, let''s study?"'
-			'You can tell he''s unhappy, and he mutters: "Fine..."'
-			'You really hurt his feelings.'
-			minut += 5
-			artQW = 4
-			gs 'stat'
-
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-	end
-elseif artQW = 10:
-	menu_off = 1
-	'When you enter the room, you immediately notice the table: it has several lighted candles on it, and a bottle of wine with two glasses.'
-	'You look at Artem, slightly confused: "What''s the meaning of this, Artem?"'
-	'He smiles at you as he says: "Well, we''ve spent a lot of time studying together, and I think it''s obvious from your school results that it''s paying off. I figured it would be nice to celebrate your achievements!"'
-	'You''re still not sold on the idea, and question him further: "I don''t know... does your mother know about this? And where did you get that wine from?"'
-	'Artem reassures you: "Relax, <<$pcs_nickname>>... my mother went to see her friend, to give us some privacy. And she gave me that wine, to share with you! She''s very happy I met you, and picked this one herself. So please... let''s just sit down and chat?"'
-	'You relax a bit and nod at him: "Okay... I have to admit, that does sound nice."'
-	'You spend the next half hour talking about your plans after you finish school, with your good grades. The bottle of wine is empty before you know it, and you feel a bit tipsy.'
-	'Artem looks at you greedily, and when the conversation hits a break he suddenly moves in and kisses you. You kiss him back, but then Artem''s hands are tugging at your clothes, trying to take them off.'
-	minut += 30
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	gs 'drugs', 'alcohol', 'wine', 2
-	gs 'stat'
-
-	act 'Tell him to stop it':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'You smile at him as you push his hands away: "Artem, wait! All in good time, okay? We''ll get there, just please... slow down a little."'
-		'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
-		'You finish the bottle of wine with Artem, and thank him for a nice time before you gather your things and leave.'
-		minut += 5
-		if artQW = 2:artQW = 4
-		if artQW = 3:artemtimes = 20
-		gs 'stat'
-
-		act 'Leave Artem''s apartment':gt 'artemhome','leave',5
-	end
-
-	act 'Enjoy his fondling':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj42.jpg"></center>'
-		'You keep kissing him, and uncover your breasts to give him better access. He happily plays with your <<$titsize>> boobs, and his touch excites you. Then again, maybe the wine also has something to do with that.'
-		'You smile at him and tell him to take off his pants, which he happily does.'
-		'You rub your hand over his foreskin for a second, before pulling it back and slowly spreading his precum out with your fingers. You then clasp your fingers around the head of his cock and slowly jerk him off. Maybe it''s because of the wine, but you feel giddy. You guide his cock to your mouth and suck him off enthusiastically.'
-		'Artem mutters: "<<$pcs_nickname>>... I want you..."'
-		gs 'arousal','bj',5
-		bja += 1
-		npc_sex[$boy] += 1
-		artQW = 20
-		gs 'stat'
-
-		act 'Let him fuck you':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/sex2.jpg"></center>'
-			'You quickly remove your clothes and lie down on your back, giving him your best ''come hither'' look.'
-			gs 'shortgs','undress'
-
-			gs 'dinsex','boy_puts_his_condom'
-			gs 'dinsex','vaginal_sex',10
-			gs 'dinsex','sexcum'
-			sexa += 1
-
-			if artemsex = 0:
-				artemsex = 1
-				'After he finishes, you run your hand over his chest and smile at him: "So, you''re a man now..."'
-				'Artem is not sure what to say, and mutters: "<<$pcs_nickname>>... I... I love you..."'
-				'You don''t say anything, but just cuddle with him for a while before getting dressed. You can tell it means a lot to him.'
-			else
-				'After he finishes, you don''t say anything, but just cuddle with him for a while before getting dressed.'
-			end
-			gs 'arousal','end'
-			gs 'shortgs','dress'
-			gs 'stat'
-
-			act 'Leave Artem''s apartment':gt 'artemhome','leave',15
-		end
-
-		act 'Continue to suck':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum48.jpg"></center>'
-			'You pick up the pace, redoubling your efforts on getting him to cum with your mouth while pretending you didn''t hear him.'
-			'You fondle yourself with your hand while you suck Artem''s cock, and you orgasm when he does. You do your best to swallow his sperm while you suppress your own spasms, and after a while you regain your senses and look into his eyes.'
-			'You smile at him: "Did you like it?"'
-			'Artem nods: "Oh yes, I liked it a lot! It''s not exactly what I had in mind, but this was even better... I''m so lucky to have met you!"'
-			gs 'arousal', 'bj', 5
-			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', -5
-			gs 'cum_call','mouth',$boy,1
-			swallow += 1
-			gs 'arousal','end'
-			gs 'stat'
-
-			act 'Gather your things and leave':gt 'artemhome','leave',10
-		end
-	end
-end
-
---- artemev2 ---------------------------------
-

+ 49 - 48
locations/artemhome.qsrc

@@ -119,12 +119,13 @@ if $ARGS[0] = 'home':
 					if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 						'When she hears your name her demeanor changes swiftly. Frowning she says: "Oh, it''s you. I don''t know what you did to my sweet Artem but he says he never wants to see you again, so please leave." With that she closes the door in your face.'
 						act 'Leave': gt'pod_ezd','etaj_1'
+					else
+						'She keeps up her smile. "Is he going to tutor you dear?" Obviously expecting the answer to be yes.'
+						'You smile a bit. "Something like that, is he here?"'
+						'Her face tightens ever so slightly. "Yes he is in his room." Then she turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." Before turning back to you. "Go on back he is in his room."'
+						act 'Leave': gt'pod_ezd','etaj_1'
+						act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
 					end
-					'She keeps up her smile. "Is he going to tutor you dear?" Obviously expecting the answer to be yes.'
-					'You smile a bit. "Something like that, is he here?"'
-					'Her face tightens ever so slightly. "Yes he is in his room." Then she turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." Before turning back to you. "Go on back he is in his room."'
-					act 'Leave': gt'pod_ezd','etaj_1'
-					act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
 				else
 					if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 						'"Who should I tell him is here?"'
@@ -326,7 +327,7 @@ if $ARGS[0] = 'artemroom':
 						*clr & cla
 						npc_rel['A2'] += 3
 						if artkissing ! daystart:
-							artfall + 1
+							artfall += 1
 							artkissing = daystart
 						end
 						gs 'willpower', 'pay', 'self'
@@ -392,13 +393,13 @@ if $ARGS[0] = 'artemroom':
 									'His hands roam all over you body, but he pays special attention to your breasts kneading and squeezing them repeatedly. As you keep making out after a bit you can feel the bulge growing in his pants as you sit on his lap.'
 									gs 'arousal', 'kiss', 5
 									gs 'stat'
-									if artemhj > 0:
+									if artemhj > 0 or artembf = 1:
 										act 'Give him a handjob': gt 'artemEv', 'hj'
 									end
-									if artembj > 0:
+									if artembj > 0 or artembf = 1:
 										act 'Give him a blowjob': gt 'artemEv', 'bj'
 									end
-									if artemsex > 0:
+									if artemsex > 0 or artembf = 1:
 										act 'Have sex with him': gt 'artemEv', 'sex'
 									end
 									gs 'willpower', 'bj', 'resist', 'medium'
@@ -606,8 +607,7 @@ if $ARGS[0] = 'livingroom':
 	elseif hour > 22:
 		gt 'artemhome', 'timecheck'
 	else
-		act 'Leave the room': gt 'artemhome', 'hallway'
-		if ArtemLoc = 5 and ArtemParentsLoc = 5 and artemmeetdad = 0 and hour < 22:
+		if ArtemLoc = 5 and ArtemParentsLoc = 5 and metArtemDad = 0 and hour < 22:
 			metArtemDad = 1
 			menu_off = 1
 			minut += 10
@@ -663,7 +663,7 @@ if $ARGS[0] = 'livingroom':
 				act 'Talk to Masharin':
 					*clr & cla
 					menu_off = 1
-					minut +10
+					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					if pav_slut >= 100 or grupTipe = 4:
@@ -726,12 +726,13 @@ if $ARGS[0] = 'livingroom':
 						end
 					end
 				end
+				act 'Leave':gt 'artemhome','hallway'
 			else
 				'Artem''s dad and mom are here watching tv. You could disturb them and talk to them, maybe it would be better if you snuck back out before they see you.'
 				act 'Sneak out':
 					*clr & cla
 					menu_off = 1
-					minut +1
+					minut += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					'You turn and carefully tread out of the living room while they are busy watching the tv, you quietly make it to the doorway to the hallway, with a final glance back you see them still sitting there watching tv, obviously not having noticed you coming in at all.'
@@ -740,7 +741,7 @@ if $ARGS[0] = 'livingroom':
 				act 'Talk to them':
 					*clr & cla
 					menu_off = 1
-					minut +10
+					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					if pav_slut >= 100 or grupTipe = 4:
@@ -750,7 +751,7 @@ if $ARGS[0] = 'livingroom':
 						'"Is there something we can help you with <<$pcs_firstname>>?" Glinina asks you.'
 						act 'Yes':
 							*clr & cla
-							minut +10
+							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina, "I just need to see the first part of that scandalous show they''re showing right now."'
@@ -775,7 +776,7 @@ if $ARGS[0] = 'livingroom':
 						'Glinina slowly turns around, "You''re not a bother at all, we were just watching the news on TV, it was nothing important. You can join us if you want."'
 						act 'Yes':
 							*clr & cla
-							minut +10
+							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You face shines up as you quickly walk over and take a seat, "Thank you for inviting me."'
@@ -855,7 +856,7 @@ if $ARGS[0] = 'livingroom':
 			end
 		else
 			'Nobody''s here right now.'
-			!act 'Leave':gt 'artemhome','hallway'
+			act 'Leave':gt 'artemhome','hallway'
 		end
 	end
 end
@@ -1228,7 +1229,7 @@ if $ARGS[0] = 'chat':
 		'Artem looks away from you, with a blank stare in his eyes. He mutters: "You know... I watched that video you wanted me to delete from Dimka''s computer. I can''t believe it... I was willing to do anything for you. Anything!"'
 		'He continues: "Ever since I''ve seen that video... Now I can''t even look at you, how could you?" He looks away from you in disgust. "Please leave, I never want to see you again."'
 		'You don''t know what to say, you just nod your head and then get up and walk out.'
-		act 'Leave his apartment':gt 'artemhome','leave'
+		act 'Leave his apartment': gt'pod_ezd','etaj_1'
 	elseif artlie = -1 and artdimhelp ! daystart:
 		artdim = 1
 		DimaRudeBlock = 1
@@ -1292,8 +1293,18 @@ if $ARGS[0] = 'chat':
 		end
 	elseif artdate = 0 and artfall >= 10 and pav_slut < 75:
 		*clr & cla
-		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you, and suggests: "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
+		act 'Stay here': 
+			*clr & cla
+			artfall -= 4
+			npc_rel['A2'] -= 3
+			gs 'stat'
+			'You shake your head. "No thanks, but thank you for asking."'
+			'He looks a little disappointed. "Oh, ok."'
+			act 'Keep talking': gt 'artemhome', 'chat'
+			act 'Stop talking': gt 'artemhome', 'artemroom'
+		end
 		act 'Agree to go for a walk':
 			*clr & cla
 			npc_rel['A2'] += 5
@@ -1303,20 +1314,19 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
 			act 'Walk in the park': gt 'artemdate','firstdate'
 		end
+	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
+		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
 		act 'Stay here': 
 			*clr & cla
-			artfall -= 4
-			npc_rel['A2'] -= 3
+			npc_rel['A2'] -= 2
 			gs 'stat'
 			'You shake your head. "No thanks, but thank you for asking."'
 			'He looks a little disappointed. "Oh, ok."'
 			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
-	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
-		*clr & cla
-		gs 'stat'
-		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
 		act 'Agree to go on a date':
 			*clr & cla
 			npc_rel['A2'] += 5
@@ -1326,15 +1336,6 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-		act 'Stay here': 
-			*clr & cla
-			npc_rel['A2'] -= 2
-			gs 'stat'
-			'You shake your head. "No thanks, but thank you for asking."'
-			'He looks a little disappointed. "Oh, ok."'
-			act 'Keep talking': gt 'artemhome', 'chat'
-			act 'Stop talking': gt 'artemhome', 'artemroom'
-		end
 	elseif artdate = 4 and pav_slut < 100:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -1382,7 +1383,7 @@ if $ARGS[0] = 'chat':
 				gs 'arousal', 'kiss', 5
 				gs 'stat'
 				act 'Give him a handjob': gt 'artemEv', 'hj'
-				act 'Give him a blowjob': gt 'artemEv', 'bj'
+				act 'Give him a blowjob': gt 'artemEv', 'artem_bj'
 				gs 'willpower', 'bj', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Pull away and stop (<<will_cost>> Willpower)':
@@ -1404,11 +1405,11 @@ if $ARGS[0] = 'chat':
 			*clr & cla
 			artdate -= 1
 			npc_rel['A2'] -= 5
+			minut += 5
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/flowerstrash.jpg"></center>'
 			'You look at Artem compassionately, but don''t take the flowers: "Thank you... they''re very nice, but we''re just friends... I don''t want to give you the wrong idea by accepting them, you know?"'
 			'Artem sighs, and disappointedly throws the flowers into the trash.'
-			minut += 5
-			gs 'stat'
 			act 'Leave them in the trash and study':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1420,17 +1421,8 @@ if $ARGS[0] = 'chat':
 		end
 	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100:
 		*clr & cla
-		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Agree to go on a date':
-			*clr & cla
-			npc_rel['A2'] += 5
-			artdate += 1
-			gs 'stat'
-			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
-			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
-		end
 		act 'Stay here': 
 			*clr & cla
 			npc_rel['A2'] -= 2
@@ -1440,6 +1432,15 @@ if $ARGS[0] = 'chat':
 			act 'Keep talking': gt 'artemhome', 'chat'
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
+		act 'Agree to go on a date':
+			*clr & cla
+			npc_rel['A2'] += 5
+			artdate += 1
+			gs 'stat'
+			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
+			'You quickly pack up your things and leave the apartment with him.'
+			act 'Go on a date': gt 'artemdate','artem_date'
+		end
 	elseif artdate = 9:
 		*clr & cla
 		artdate += 1
@@ -1645,8 +1646,8 @@ if $ARGS[0] = 'askedstrip':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 					'You shake your head. "I''m sorry Artem I am just not comfortable doing that."'
 					'He frowns deeply but nods his head. "Yeah ok..."'
-					act 'Keep talking': gt 'artemhome', 'chat'
 					act 'Stop talking': gt 'artemhome', 'artemroom'
+					act 'Keep talking': gt 'artemhome', 'chat'
 				end
 			else
 				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 12 - 1
locations/arturRinok.qsrc

@@ -100,8 +100,19 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave':gt 'pavtrain_market', 'start'
+	gs 'willpower', 'bj', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Leave (<<will_cost>> Willpower)':
+			gs 'willpower', 'bj', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'pavtrain_market', 'start'
+		end
+	else
+		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
+
 if $ARGS[0] = 'work_1':
 	*clr & cla
 	menu_off = 1

+ 2 - 2
locations/arturdin.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'anal':
 	gs 'arousal', 'anal', 5
 	gs 'stat'
 	
-	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+	gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 	act 'Continue': gt 'arturdin', iif(rand(0, 1) = 0, 'bed', 'bedmiss')
 end
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'anal_cum':
 	gs 'arousal', 'anal', 5
 	gs 'stat'
 	
-	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+	gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 
 	act 'Continue':
 		cls

+ 1 - 1
locations/avb.qsrc

@@ -26,7 +26,7 @@ elseif car >= 6 and car < 11:
 		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(80000, 120000)
 		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 90000)
 	end
-elseif car >= 11 and car <= 12:
+elseif car >= 11 and car <= 13:
 	if wrek = 1 or teh <= 0:bupay = rand(10000, 20000)
 
 	if wrek = 0:

+ 1 - 1
locations/bass.qsrc

@@ -137,7 +137,7 @@ if $ARGS[0] = 'a':
 		gs 'exercise', 'tier1', 60, 'stren_exp'
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
-		if pregchem < 3600:	
+		if func('body_din','pregnancyVisibility') = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/poolswim.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/poolswimpreg.jpg"></center>'

+ 2 - 2
locations/bed2.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'sleep':
 	end
 	gs 'stat'
 	*nl
-	if budilnikOn = 1 and week < 6:
+	if budilnikOn = 1 and ((hour => timer and week + 1 < 6) or (hour < timer and week < 6)):
 		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b>, you undress, and prepare for sleep:'
 	elseif budilnikOn = 1:
 		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b>, you undress, and prepare for sleep:'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'wake_horny':
 	end
 
 	if $loc = 'bedrPar' and SisterLesb = 5 and hour < 6:
-		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep'
+		act 'Wake Anya and see if she''s in the mood': strip_here = 0 & InSleep = 0 & gt 'sistersleep', 'sister_sleep'
 	elseif $loc = 'FedorEv4':
 		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?

+ 4 - 6
locations/bedrPar.qsrc

@@ -38,7 +38,7 @@ end
 
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'tobiQW', 'start'
 
-if sisboyday + 1 = daystart and hour = 18:gt'sisterQW','sisboyQW_expel'
+if sisboyday + 1 = daystart and hour = 18: gt 'sisterQW', 'sisboyQW_expel'
 
 if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
 	*clr & cla
@@ -118,10 +118,8 @@ gad = 0
 
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
-gs'dinsister'
-
 act 'Exit the room':
-	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 :gt'sister','pargone'
+	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 : gt 'sister_chat', 'pargone'
 	gt'korrPar'
 end
 
@@ -130,7 +128,7 @@ if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
 else
 	gs'family'
 
-	if rexCarCount >= 9 and sisterHere = 1 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13: act 'Send Rex a SMS message':gt 'reks','sms'
+	if rexCarCount >= 9 and sisterHere = 1 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13: act 'Send Rex a SMS message': gt 'reks','sms'
 
 	if student > 0 and kursovik < 100:
 		act 'Do coursework (1:00)':
@@ -231,7 +229,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'korrPar'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	monthbabkapay = month
+	grandmaQW['month_paid'] = month
 	menu_off = 1
 	hour = 6
 	gs 'stat'

+ 130 - 88
locations/beg1.qsrc

@@ -75,7 +75,12 @@ if $ARGS[0] = 'br':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -92,33 +97,30 @@ if $ARGS[0] = 'br':
 	'Go! - You''re away!'
 	wait 725
 	
-	if begresult <= 18:  
+	if begresult < 10:  
 		'Sadly, you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
-	elseif begresult <= 23:
+	elseif begresult < 15:
 		gs 'fame', 'city', 'running', 1
 		'You performed well for an amateur but still only came in last (8th place).'
-	elseif begresult < 19:
-		gs 'fame', 'city', 'running', 1
-		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
 	elseif begresult < 20:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 21:
+	elseif begresult < 25:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 22:
+	elseif begresult < 30:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 23:
+	elseif begresult < 35:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 24:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 3
 		bronzebeg += 1 & money += 100 & 'You fought hard and managed to take 3rd place, earning a prize: You receive a bronze bade and a prize of 100 <b>₽</b>'
-	elseif begresult < 25:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 3
 		silverbeg += 1 & money += 500 & 'You fought hard and managed to take 2nd place, earning a prize: You receive a silver badge and a prize of 500 <b>₽</b>'
-	elseif begresult >= 25:
+	else
 		gs 'fame', 'city', 'running', 4
 		razradbeg = 1 & goldbeg += 1 & money += 1000 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 1,000 <b>₽</b> and are now part of your club''s junior squad.'
 	end
@@ -133,7 +135,12 @@ if $ARGS[0] = '3':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -150,30 +157,30 @@ if $ARGS[0] = '3':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 15:
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
-	elseif begresult < 26:
+	elseif begresult < 20:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 27:
+	elseif begresult < 25:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 28:
+	elseif begresult < 30:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 29:
+	elseif begresult < 35:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 30:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 31:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 3
 		bronzebeg += 1 & money += 300 & 'You fought hard and managed to take 3rd place, earning a prize: You receive a bronze badge and a prize of 300 <b>₽</b>'
-	elseif begresult < 32:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 3
 		silverbeg += 1 & money += 750 & 'You fought hard and managed to take 2nd place, earning a prize: You receive a silver badge and a prize of 750 <b>₽</b>'
-	elseif begresult >= 32:
+	else
 		gs 'fame', 'city', 'running', 4
 		razradbeg = 2 & goldbeg += 1 & money += 1500 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 1,500 <b>₽</b> and are now part of your club''s senior squad, representing it at the next city championship!'
 	end
@@ -187,7 +194,12 @@ if $ARGS[0] = '2':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -204,31 +216,31 @@ if $ARGS[0] = '2':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 20:
 		gs 'fame', 'city', 'running', 1
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
-	elseif begresult < 33:
+	elseif begresult < 25:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 34:
+	elseif begresult < 30:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 35:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 36:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 37:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 38:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 4
 		bronzebeg += 1 & money += 750 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 750 <b>₽</b>'
-	elseif begresult < 39:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 4
 		silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,5000 <b>₽</b>'
-	elseif begresult >= 39:
+	else
 		gs 'fame', 'city', 'running', 5
 		razradbeg = 3 & goldbeg += 1 & money += 2500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,500 <b>₽</b> and became the "Track Champion of the City of Saint Petersburg", which qualifies you for the next oblast championship!'
 	end
@@ -242,7 +254,12 @@ if $ARGS[0] = '1':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -260,31 +277,31 @@ if $ARGS[0] = '1':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 25:
 		gs 'fame', 'city', 'running', 1
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right?'
-	elseif begresult < 40:
+	elseif begresult < 30:
 		gs 'fame', 'city', 'running', 2
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 41:
+	elseif begresult < 35:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 42:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 43:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 44:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 4
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 45:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 5
 		bronzebeg += 1 & money += 1500 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1,5000 <b>₽</b>'
-	elseif begresult < 46:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 5
 		silverbeg += 1 & money += 2000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 2,000 <b>₽</b>'
-	elseif begresult >= 46:
+	else
 		gs 'fame', 'city', 'running', 6
 		razradbeg = 4 & goldbeg += 1 & money += 3000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 3,000 <b>₽</b> and became the "Track Champion of the Leningrad Oblast", not only putting you on the list of the 50 best track athletes in the Russian Federation but also qualifying you for the next district championship!'
 	end
@@ -298,7 +315,12 @@ if $ARGS[0] = 'kms':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -316,31 +338,31 @@ if $ARGS[0] = 'kms':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 30:
 		gs 'fame', 'city', 'running', 2
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right?'
-	elseif begresult < 47:
+	elseif begresult < 35:
 		gs 'fame', 'city', 'running', 3
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 48:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 4
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 49:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 4
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 4
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 51:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 5
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 52:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 6
 		bronzebeg += 1 & money += 2000 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 2,000 <b>₽</b>'
-	elseif begresult < 53:
+	elseif begresult < 65:
 		gs 'fame', 'city', 'running', 8
 		silverbeg += 1 & money += 3000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 3,000 <b>₽</b>'
-	elseif begresult >= 53:
+	else
 		gs 'fame', 'city', 'running', 10
 		razradbeg = 5 & goldbeg += 1 & money += 4000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 4,000 <b>₽</b> and became the "Track Champion of the Northwest District". You are now one of the 8 best track athletes in the Russian Federation and qualified for the next national championship!'
 	end
@@ -354,7 +376,12 @@ if $ARGS[0] = 'ross':
 	gs 'sweat', 'add', 30
 	pcs_stam -= 30
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -373,31 +400,31 @@ if $ARGS[0] = 'ross':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 35:
 		gs 'fame', 'city', 'running', 4
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right?'
-	elseif begresult < 54:
+	elseif begresult < 40:
 		gs 'fame', 'city', 'running', 6
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 55:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 56:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 57:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 58:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 59:
+	elseif begresult < 65:
 		gs 'fame', 'city', 'running', 15
 		bronzebeg += 1 & money += 3000 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 3,000 <b>₽</b>'
-	elseif begresult < 60:
+	elseif begresult < 70:
 		gs 'fame', 'city', 'running', 15
 		silverbeg += 1 & money += 4000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 4,000 <b>₽</b>'
-	elseif begresult >= 60:
+	else
 		gs 'fame', 'city', 'running', 20
 		razradbeg = 6 & goldbeg += 1 & money += 5000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 5,000 <b>₽</b> and became the "Track Champion of the Russian Federation". You are the single best track athlete in Russia - maybe you should try to qualify for the European championship?'
 	end
@@ -412,7 +439,12 @@ if $ARGS[0] = 'kval':
 	pcs_stam -= 30
 	razradbeg += 1
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -429,31 +461,31 @@ if $ARGS[0] = 'kval':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 18:
+	if begresult < 40:
 		gs 'fame', 'city', 'running', 4
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself.'
-	elseif begresult < 61:
+	elseif begresult < 45:
 		gs 'fame', 'city', 'running', 6
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 62:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 63:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 64:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 65:
 		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 66:
+	elseif begresult < 70:
 		gs 'fame', 'city', 'running', 15
 		razradbegK += 1 & bronzebeg += 1 & money += 4000 & 'You fought hard and managed to take 3rd place, earning a prize. You get a bronze badge and a prize of 4,000 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
-	elseif begresult < 67:
+	elseif begresult < 75:
 		gs 'fame', 'city', 'running', 15
 		razradbegK += 1 & silverbeg += 1 & money += 6000 & 'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 7,000 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
-	elseif begresult >= 67:
+	else
 		gs 'fame', 'city', 'running', 25
 		razradbegK += 1 & goldbeg += 1 & money += 8500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 8,500 <b>₽</b> and are one step closer to qualifying for the European championship.'
 	end
@@ -468,7 +500,12 @@ if $ARGS[0] = 'evro':
 	pcs_stam -= 30
 	razradbeg += 1
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/begsor.jpg"></center>'
@@ -487,25 +524,25 @@ if $ARGS[0] = 'evro':
 	'Go! - You''re away!'
 	wait 725
 
-	if begresult <= 16:
+	if begresult < 45:
 		gs 'fame', 'city', 'running', 6
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right?'
-	elseif begresult < 68:
+	elseif begresult < 50:
 		gs 'fame', 'city', 'running', 8
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 70:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 10
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 72:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 74:
+	elseif begresult < 65:
 		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 76:
+	elseif begresult < 70:
 		gs 'fame', 'city', 'running', 15
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 78:
+	elseif begresult < 75:
 		gs 'fame', 'city', 'running', 20
 		razradbegEB += 1
 		money += 5000
@@ -515,7 +552,7 @@ if $ARGS[0] = 'evro':
 		razradbegES += 1
 		money += 10000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 10,000 <b>₽</b>'
-	elseif begresult >= 80: 
+	else 
 		gs 'fame', 'city', 'running', 30
 		razradbegEG += 1
 		money += 15000
@@ -533,7 +570,12 @@ if $ARGS[0] = 'Int':
 	pcs_stam -= 30
 	razradbeg += 1
 	
-	if salo > 40: begminus = ((salo - 35)/5)
+	begminus = 0
+	if bmi_calc > 25: 
+		begminus = ((bmi_calc - 25)*4)
+	elseif bmi_calc < 18:
+		begminus = ((25 - bmi_calc)*6)
+	end
 	begresult = pcs_run - begminus
 	
 	'Your discipline: The Women''s 400 Meter Dash.' 
@@ -551,35 +593,35 @@ if $ARGS[0] = 'Int':
 	'Go! - You''re away!'
 	wait 725
 	
-	if begresult < 18:
+	if begresult < 50:
 		gs 'fame', 'city', 'running', 10
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right?'
-	elseif begresult < 82:
+	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 15
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-	elseif begresult < 85:
+	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 20
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-	elseif begresult < 88:
+	elseif begresult < 65:
 		gs 'fame', 'city', 'running', 20
 		'You fought hard, but only managed to take 6th place.'
-	elseif begresult < 91:
+	elseif begresult < 70:
 		gs 'fame', 'city', 'running', 20
 		'You fought hard, but only managed to take 5th place.'
-	elseif begresult < 94:
+	elseif begresult < 80:
 		gs 'fame', 'city', 'running', 25
 		'You fought hard, but only managed to take 4th place.'
-	elseif begresult < 97:
+	elseif begresult < 90:
 		gs 'fame', 'city', 'running', 30
 		razradbegIB += 1
 		money += 10000
 		'You fought hard and managed to take 3rd place, earning a prize. You get a bronze medal and a prize of 10,000 <b>₽</b>'
-	elseif begresult < 100:
+	elseif begresult < 95:
 		gs 'fame', 'city', 'running', 35
 		razradbegIS += 1
 		money += 20000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 20,000 <b>₽</b>'
-	elseif begresult >= 100:
+	else
 		gs 'fame', 'city', 'running', 50
 		razradbegIG += 1
 		money += 50000

+ 33 - 0
locations/begin.qsrc

@@ -71,6 +71,39 @@ if $ARGS[0] = 'start':
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 
+if $ARGS[0] = 'warning':
+	'<center><b><font color = maroon>WARNING</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/system/gl3.jpg" ></center>'
+	*nl
+	'This game contains, but is not limited to the following:'
+	'Pornographic images;'
+	'Desriptions of sexual acts;'
+	'Rape;'
+	'Incest;'
+	'Violent assaults;'
+	'Backmail for sex;'
+	'Drug use;'
+	'Extreme character weight (both very skinny and massively obese);'
+	'Urination as sexual fetish;'
+	'Underage sex 15 - 17 years old (in the text, sexual images used only contain performers 18+ years old);'
+	'Theft;'
+	'Drug use;'
+	'Prostitution;'
+	'BDSM;'
+	'Kidnap;'
+	'Death;'
+	'Alcohol abuse.'
+	*nl
+	'If any of these things upset you or you are under the age of 18 you must not continue.'
+	*nl
+	'Although many of these things are illegal in various places around the world this is a work of fiction and there are no people actually harmed in the making of this game.'
+	'Exhausted and frustrated by the code for sure but no bruises above the neck or below the elbow.'
+	'This means that with the exception of rather vague laws in Russia playing this game is not breaking any laws relating to the acts depicted.'
+	'Your local laws might be different to those we have checked and if you are worried you should not continue without checking your legal position.'
+	
+	act 'Continue': gt 'begin','real_character'
+end
+	
 if $ARGS[0] = 'real_character':
 	cls
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'

+ 1 - 1
locations/belpicknick.qsrc

@@ -347,7 +347,7 @@ if $ARGS[0] = 'doggy':
 		
 		'You find yourself being on elbows and knees as you''re fully aware he is about to penetrate your ass. <<$boydesc>> leans the tip of his cock against your anus and pushes it into you. It is a little painful, but the desire to pleasure him outweighs it. <<$boydesc>> gradually accelerates his pace, you can feel his balls slap against your wet clit. After a while your anus relaxes and stretches making his cock slide in and out easily now.'
 		
-		gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+		gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 		
 		gs 'arousal', 'anal', 5, 'sub'
 		gs 'stat'

+ 4 - 8
locations/bobka.qsrc

@@ -75,16 +75,12 @@ if ARGS[0] = 2:
 		cls
 		gs 'boyStat', 'A49'
 		gs 'dinSex', 'std_trigger'
-		sexpartkno = 1
-		spafinloc = 3
-		gs 'cum_manage'
+		gs 'dinsex', 'boy_puts_condom'
+		gs 'dinSex','boy_wants_anal','','lubri'
+		gs 'dinsex','analsex'
+
 		'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/anal.jpg"></center>'
-		
-		gs 'arousal', 'anal', 5, 'sub'
-		gs 'stat'
 	
-		gs 'dinsex', 'boy_puts_condom'
-		gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
 		gs 'stat'
 		'You feel <<$boydesc>>''s sperm spread inside you when he finally stops thrusting. When he pulls out of you, some of his sperm slowly trickles out of your gaping butthole.'
 		'Bobka tosses you a syringe, and tells you to get lost.'

+ 1 - 1
locations/body_din.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'pregnancyVisibility':
 	clothingwornnumberTemp = iif(ARGS[3] = 0,clothingwornnumber,ARGS[3])
 	
 	gs 'clothing_attributes',$clothingworntypeTemp,clothingwornnumberTemp
-	if (CloThinness >= 5 or $clothingworntypeTemp = 'nude') and pregchemTemp > 2000: 
+	if (CloThinness >= 5 or $clothingworntypeTemp = 'nude') and pregchemTemp > 2688: 
 		RESULT = 1
 	elseif CloThinness = 4 and pregchemTemp > 3460: 
 		RESULT = 1

+ 1 - 0
locations/brothel.qsrc

@@ -248,6 +248,7 @@ if $ARGS[0] = 'abducted':
 		'His dick is not the biggest one, but it is quite thick.'
 		'Your pussy is a first victim of the phallus, and after short while he moves to your anus.'
 		'Another jolt of pain runs through your bottom, but this time you fade away for sure..'
+		anal_slip += 4
 		gs 'pain', 6, 'asshole', 'stretch'
 		guy += 4
 		temp = 4

+ 1 - 1
locations/brother.qsrc

@@ -851,7 +851,7 @@ if $ARGS[0] = 'fuckanal':
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/anal,<<rand(0,4)>>.mp4"></video></center>'
 	'You lie back on the sofa, pulling your knees up to your chest and expose your <<$pcdesc_anus>> asshole to your sibling. "I want you to fuck my ass, Kolka," you tell him. Your brother practically pounces you, not needing more encouragement from you.'
 
-	gs 'dinSex','boy_wants_anal','Kolka' & gs 'dinsex','analsex'
+	gs 'dinSex','boy_wants_anal','Kolka', 'lubri' & gs 'dinsex','analsex'
 
 	gs 'brother', 'brotherSexEnd'
 end

+ 123 - 101
locations/buklinik.qsrc

@@ -10,15 +10,24 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b>Mercy clinic</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli.jpg"></center>'
-	'Working hours: 9 to 17'
+	'A quite run-down building with a large sign above the entrance displaying the name Mercy Clinic. Known for taking care of the homeless and providing shelter for domestic abuse victims.'
+	'Walking up to the door you notice a note on the door.'
+	'Working hours: 09:00 to 17:00'
 	temp = rand(1, 10)
-	if temp = 9:'You see the crowd of homeless people trying to get to a shelter.'
-	if temp = 2:'You see a homeless person trying to get into a shelter.'
-	if temp = 3:'You see an old man who came to the shelter.'
+	if temp = 9:'There is a crowd of homeless people huddled together trying to find a shelter...'
+	if temp = 2:'There is a homeless person trying to get into the shelter...'
+	if temp = 3:'There is an older man standing outside the shelter...'
+	if temp = 4:'There is a woman standing outside trying to console her crying child...'
+	if temp = 5:'There is a bruised woman standing outside the shelter having a smoke...'
+	if temp = 1:'There is a man walking up and down the path outside, yelling profanities...'
+	if temp = 8:'There is a young woman with tears in her eyes, sitting on a bench right next to the shelter...'
+	if temp = 7:'There is a couple loudly discussing if they really want to enter the shelter tonight...'
+	if temp = 6:'There is a woman crying, arguing on the phone, probably with her husband...'
+	if temp = 10:'Surprisingly, there is no one standing outside the shelter...'
 
 	act 'Leave':gt 'nord'
 	
-	if hour >= 9 and hour <= 17: act 'Go to the clinic':gt 'buklinik', 'holl'
+	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'holl':
@@ -29,25 +38,25 @@ if $ARGS[0] = 'holl':
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. hall</b></center>'
+	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
-	'Hospital corridor.'
+	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
 	if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
-		if bumtolik > 4:'Things are stored on<a href="exec:gt ''buklinik'', ''sklad''"> stock</a>.'
-		if bumtolik > 5:'The entrance is located<a href="exec:gt ''buklinik'', ''registr3''"> Registry</a>.'
-		if bumtolik > 5:'Opposite the registry is<a href="exec:gt ''buklinik'', ''olga2''"> Olga Account</a>.'
-		if bumtolik > 5:'At the end of the corridor<a href="exec:gt ''buklinik'', ''shower''"> shower room</a>.'
-		if bumtolik = 6:'<a href="exec:gt ''buklinik'', ''spal''">Number of people</a>.'
-		if bumtolik > 6:'Sleeps. (I go there any more naked)'
-		if bumtolik > 5:'<a href="exec:gt ''buklinik'', ''stol''">Family Dining Room</a> residents.'
-		if bumtolik > 5:'office in charge<a href="exec:gt ''buklinik'', ''sec''"> Jeanne</a>.'
-		if bumtolik > 5:'Account coordinator<a href="exec:gt ''buklinik'', ''dir''"> faith</a>.'
+		if bumtolik > 4:'There is a lock on the <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room.'
+		if bumtolik > 5:'You can find the <a href="exec:gt ''buklinik'', ''registr3''">office</a> right by the entrance.'
+		if bumtolik > 5:'Opposite the office you can find the <a href="exec:gt ''buklinik'', ''olga2''">accountants''</a> office.'
+		if bumtolik > 5:'At the end of the corridor, you can find the <a href="exec:gt ''buklinik'', ''shower''">showers</a>.'
+		if bumtolik = 6:'There are several doors leading into the <a href="exec:gt ''buklinik'', ''spal''">dormitory</a>.'
+		if bumtolik > 6:'I shouldn''t interact with the people staying there right now...'
+		if bumtolik > 5:'Visit the <a href="exec:gt ''buklinik'', ''stol''">canteen</a>.'
+		if bumtolik > 5:'Behind the solid door you find the <a href="exec:gt ''buklinik'', ''sec''">Managers''</a> office.'
+		if bumtolik > 5:'The <a href="exec:gt ''buklinik'', ''dir''">coordinators''</a> office is next to the canteen.'
 	end
 
 	act 'Leave':gt 'nord'
-	if (SchoolAtestat = 0 and bumtolik = 0) or bumtolik = 4: act 'Apply to the registry':gt 'buklinik', 'registr'
+	if (SchoolAtestat = 0 and bumtolik = 0) or bumtolik = 4: act 'Volunteer':gt 'buklinik', 'registr'
 end
 
 if $ARGS[0] = 'registr':
@@ -56,22 +65,23 @@ if $ARGS[0] = 'registr':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. desk</b></center>'
+	'<center><b>Counter</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
-	'In registature sit two women in white coats.'
+	'You approach the counter as you see two women in white coats sitting and chatting with each other, laughing.'
 
 	if StoryLine = 1 and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
-		'You: - Hello, my name is <<$pcs_firstname>>, I heard that you can volunteers...'
-		'Registrar: - Hello! We are very happy to see you. We really need volunteers, but the work will be very difficult. And have the aged care and homeless to feed and clothe.'
-		'In addition, apparently, you are still in high school, so that the law can only work outside school hours - on weekends, on weekdays you should not be here.'
+		'You clear you throat to get their attention, "Hello, my name is <<$pcs_firstname>>, I read on that note that you were looking for volunteers..."'
+		'The two women cheerfully reply, "Hello! Welcome to our little humble shelter. As you probably noticed we really need some volunteers, just a fair warning the job is not always fun and there''s always lots to do. What you see here is just a small part of it, we even help out the elderly and the less fortunate ones outside the shelter.'
+		'You nod your head, "I''m not afraid to get dirty and I''m sure that I''ll manage..."'
+		'The woman behind the counter continues, "In addition, since you are still in high school, that the law states that you can only volunteer outside school hours, during the weekends."'
 	else
-		'You:- Hello, my name is <<$pcs_firstname>>, I am with the work. Girl named Olga gave me this card, said that you need employees.'
-		'Registrar:- Hello! We are very pleased to see you. But I''m afraid you refuse, the fact is that we need volunteers, ie your work will not be paid. A job to be very complicated. Will have to take care of the elderly and the homeless to feed and clothe.'
+		'You clear your throat, "Hello, my name is <<$pcs_firstname>>, I met a girl named Olga who said that you need volunteers. So here I am..."'
+		'The woman quickly comes over, "Hello! We are very pleased to have you here. Just a couple of heads up before you make your mind up. The work hours are long and ungrateful, what you see here is just a small part of it, we even do some work outside the shelter with the less fortunate."'
 	end
 
 	act 'I have to think about it':gt 'nord'
-	act 'agree':gt 'buklinik', 'registr2'
+	act 'Accept':gt 'buklinik', 'registr2'
 end
 
 if $ARGS[0] = 'registr2':
@@ -81,14 +91,14 @@ if $ARGS[0] = 'registr2':
 	bumtolik = 5
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. desk</b></center>'
+	'<center><b>Counter</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
-	'You:- Well, I think I can handle it. Where do I start?'
-	'Registrar:- I am happy to hear that. Fill out the form. And me, store copies of your passport and if there is documentation of education diploma courses, all that is, perhaps, in the future, you can find paid work.'
-	'(You fill out the form)'
-	'Registator:- Well, there you have a membership card. The corridor the first door on the right, get to the warehouse, where she will meet Olga show you everything.'
+	'You smile, "I think I can handle it. Where do I start?'
+	'The woman sighs a sigh of relief, "I am happy to hear that. Fill out this form. We give all our volunteers documentation that they''ve worked here in case of you need it for a future reference.'
+	'You take some time to fill out the form and hand it back to the woman.'
+	'The woman skims through it, "Great, so you see the the first door on the right down the corridor, enter there and you should find Olga there, she''ll show you around.'
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Continue down the corridor':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'registr3':
@@ -97,11 +107,11 @@ if $ARGS[0] = 'registr3':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. desk</b></center>'
+	'<center><b>Counter</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
-	'At register desk usually sit either Karina or Regina.'
+	'You can usually find either Karina or Regina sitting by the counter, welcoming both volunteers and people needing help.'
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Continue down the corridor':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'sklad':
@@ -110,13 +120,14 @@ if $ARGS[0] = 'sklad':
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. warehouse</b></center>'
+	'<center><b>Storage room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_sklad.jpg"></center>'
-	'Warehouse all packages littered with things.'
+	'The storage room is filled with all sort of things. From clothing and food, to toys for the children and there is even a medicine box where a note says to <i>keep locked at all times!!!</i>'
+	'You see several people sorting all the stuff, trying to make sense of the current chaos.'
 
-	if bumtolik = 5:act 'Find Olga':gt 'buklinik', 'olga'
+	if bumtolik = 5:act 'Look for Olga':gt 'buklinik', 'olga'
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Head back to the corridor':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'olga':
@@ -125,19 +136,27 @@ if $ARGS[0] = 'olga':
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Your colleague Olga</b></center>'
+	'<center><b>Olga</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
-	'(Olga - groomed and cute brunette with a kind smile.)'
-
+	
 	if bumtolik = 5:
-		'- Olga, hello. I am <<$pcs_nickname>>, you remember me? I decided to respond to your call. And ready for duty. At the reception told me that you show here.'
-		'- <<$pcs_nickname>>, good afternoon! Good for you, welcome! Let me briefly tell you how we work. We are volunteers and therefore our work is not paid. You can come at any time during working hours. Work is very different, because you attached to me, the first time the job will receive from me.'
-		'Olga:- You do not mind go to you?'
-		'You:- I am in favor.'
-		'Olga:- Well, let me spend a tour for you. Here we have a warehouse that we bought for the needy. We packed up his boxes and transported to the destination.'
+		'You see Olga and walk up to her, "Hi Olga! I don''t know if you remember me, I am <<$pcs_nickname>>, you told me about this place and that you were looking for people to volunteer so I decided to come over and help out. The women at the reception told me that I would find you here."'
+		'Olga looks at you, not really remembering who you are, "<<$pcs_nickname>>..., good afternoon! Good for you, welcome! Well as you can see we are swamped so any help is very welcome!" Olga smiles and continues, "Since you got sent to me I''ll be your mentor so feel free to ask me if you have any questions."'
+		'You nod, "I understand!"'
+		'Olga smiles, "Good, well, lets start off with a tour. We can start off here, the storage room. We pack up every donatation we get and sort it out and put it into boxes and if needed we transport it to the needy. Next up the managers'' office!"'
+		
+		act 'Visit the managers office':gt 'buklinik', 'sec'
+	
+	else
+		'You look around the room, "So I was supposed to find an Olga here?"'
+		'A woman looks up, "Right here, honey! And who might you be?" she asks.'
+		'"<<$pcs_nickname>>" you answer, "The lady at the counter told me to find you."'
+		'Olga crosses her arms, "Is that so?! Nothing to worry about, so I''m guessing you''re a new volunteer?"'
+		'You nod.'
+		'Olga smiles, "Good, well, lets start off with a tour. We can start off here, the storage room. We pack up every donatation we get and sort it out and put it into boxes and if needed we transport it to the needy. Next up the managers'' office!"'
+		
+		act 'Visit the managers office':gt 'buklinik', 'sec'
 	end
-
-	act 'By office manager':gt 'buklinik', 'sec'
 end
 
 if $ARGS[0] = 'sec':
@@ -146,19 +165,18 @@ if $ARGS[0] = 'sec':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Your colleague Jeanne</b></center>'
+	'<center><b>Jeanne</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_sec.jpg"></center>'
-	'(Jeanne and cheerful young blonde)'
 
 	if bumtolik = 5:
-		'Olga:- Meet, it is our office manager Joan. Zhannochka we responsible for everything. If there are organizational issues addressed her.'
-		'Olga:- Zhannochka <<$pcs_nickname>> is our new volunteer.'
-		'Jeanne:- Wow! And you young <<$pcs_nickname>> bold. Very pleased to meet you!'
-		'You:- Thank you, mutually.'
-		act 'To the head':gt 'buklinik', 'dir'
+		'The two of you knock on the door and walk right in, "<<$pcs_nickname>> meet our office manager Jeanne. She is responsible for everything operational here. If you find any organizational issues take it up with her and she''ll sort it out. Jeanne this is <<$pcs_nickname>> and is our new volunteer."'
+		'Jeanne gives you a warm smile, "Welcome, I hope you will find our shelter not too demanding. And I really hope that Olga doesn''t give you too much trouble..." she jokingly says.'
+		'Before you''re able to say anything Olga chimes in, "And that''s the thanks I get for recruiting volunteers. It''s clear we''re not welcome here <<$pcs_nickname>> so lets move on..."'
+		'You manage to give a friendly nod before you and Olga head out the office, "Next stop, the coordinators'' office!"'
+		act 'Head to the coordinator':gt 'buklinik', 'dir'
 	elseif bumtolik > 5:
-		'- Hello, <<$pcs_nickname>>!'
-		act 'In the corridor':gt 'buklinik', 'holl'
+		'"Hello, <<$pcs_nickname>>! Is there anything I can help you with?"'
+		act 'Head back to the corridor':gt 'buklinik', 'holl'
 	end
 end
 
@@ -168,21 +186,20 @@ if $ARGS[0] = 'dir':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Your colleague Vera</b></center>'
+	'<center><b>Vera</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_dir.jpg"></center>'
-	'(Vera overbearing and well-groomed lady)'
-
-
+	
 	if bumtolik = 5:
-		'Olga:- And this is our coordinator Vera ...'
-		'Vera:- Simply Vera.'
-		'Olga:- Vera is not only our coordinator, but the mastermind, she came up with it and created our organization.'
-		'You:- Very nice, <<$pcs_nickname>>!'
-		'Vera:- Welcome to contact us. (Vera you smile)'
-		act 'complete familiarity':gt 'buklinik', 'olga2'
+		'Olga just barges in without even knocking, "And this is our coordinator Vera..."'
+		'Vera sighs, "Again Olga? Haven''t I told you to knock when you''re entering the office and I told you before it''s only Vera."'
+		'Olga brushes her off, "I heard you, I heard you." she turns to you, "Vera is not only the coordinator, but the mastermind behind this whole operation, she is one of the founders and also created the organization."'
+		'You politely greet her, "My name is <<$pcs_nickname>> and I look forward to help you out the best I can!"'
+		'Vera smiles, "Glad to hear that <<$pcs_nickname>>! You''re certainly most welcome, you''ve probably heard that we could use all the hands we can get hold of."'
+		'The three of you chat for a while and before you know it it''s time to move on...'
+		act 'Continue the tour':gt 'buklinik', 'olga2'
 	elseif bumtolik > 5:
-		'- Hello, <<$pcs_nickname>>!'
-		act 'In the corridor':gt 'buklinik', 'holl'
+		'"Hello, <<$pcs_nickname>>! Is there anything I can help you with?"'
+		act 'Head back to the corridor':gt 'buklinik', 'holl'
 	end
 end
 
@@ -192,12 +209,16 @@ if $ARGS[0] = 'shower':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. shower room</b></center>'
+	'<center><b>Showers</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_show.jpg"></center>'
-	'Shared shower for guests'
-	'Here guests take a shower. Better unnecessarily here not to meddle.'
-
-	act 'In the corridor':gt 'buklinik', 'holl'
+	'Shared showers for the people staying here. There''s a note put up by the staff:'
+	'Men: Every even hour. Do not enter if you''re a female!!!'
+	'Women: Every odd hour. Do not enter if you''re a male!!!'
+	'Note: Staff might enter during any hours!'
+	*nl
+	'You better not stay here all too long some of the people staying here might take offense to you being there.'
+
+	act 'Head back to the corridor':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'stol':
@@ -206,12 +227,15 @@ if $ARGS[0] = 'stol':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. dining room</b></center>'
+	'<center><b>Canteen</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_stol.jpg"></center>'
-	'Dining room for guests'
-	'Here guests take their food. Very lean diet, but they do.'
+	'There''s a large canteen with lots of tables and chairs with lots of space. This is probably the biggest room in this building.'
+	*nl
+	'There is a sign by the entrance:'
+	'Breakfast: 08:00 - 09:30'
+	'Dinner: 17:00 - 19:00'
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Leave the canteen':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'spal':
@@ -220,14 +244,14 @@ if $ARGS[0] = 'spal':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Mercy Clinic. bedrooms</b></center>'
+	'<center><b>Dormitory</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_spal.jpg"></center>'
-	'Sleeping space for guests.'
-	'Who are there only. Alcoholics and homeless, vagrants and drug addicts. There are just people who have nowhere to sleep.'
+	'A shared dormitory with plenty of beds where you can find all kind of people. There are plenty of alcoholics, vagrants and drug addicts which are homeless. Mixed in with women with their children that have ran away from their abusive husbands.'
+	'Within the dormitory there is a small divide where the male population stick to one side while the women keep on the other.'
 
-	if bumtolik = 6: act 'hello':gt 'buklinik_event', 'pos1'
+	if bumtolik = 6: act 'Introduce yourself':gt 'buklinik_event', 'pos1'
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Leave the dormitory':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'olga2':
@@ -236,31 +260,29 @@ if $ARGS[0] = 'olga2':
 	minut += 15
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b>Your colleague Olga</b></center>'
+	'<center><b>Olga</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
-	'(Olga - groomed and cute brunette with a kind smile.)'
 
-	if bumtolik > 5:'- Hello, <<$pcs_nickname>>!'
-	if buklinikDay = daystart:'- Today there is no more work, we can relax.'
-	if bumtolik >= 7 and buklinikDay ! daystart:'- <<$pcs_nickname>>, We need help <a href="exec:gt ''buklinik_event'', ''pos6''">feed the needy</a>.'
-	if bumtolik >= 8 and buklinikDay ! daystart: '- <<$pcs_nickname>>, here is the address of one <a href="exec:gt ''buklinik_event'',''pos8''">elderly man</a>, go see him help with the housework.'
-	if bumtolik = 9 and buklinikDay ! daystart: '- <<$pcs_nickname>>, Need help persuade a wino not wander the streets, and come to live with <a href="exec:gt ''buklinik_event'',''pos9''">to_us</a>.'
-	if bumtolik = 10 and buklinikDay ! daystart: '- We need a babysitter for one very <a href="exec:gt ''buklinik_event'',''event0''">a strange man</a>.'
-	if bumtolik = 11 and buklinikDay ! daystart: '- <<$pcs_nickname>>, you need to go to <a href="exec:gt ''buklinik_event'',''entrance'',0">Michael</a>.'
-	if bumtolik = 12 and buklinikDay ! daystart: '- Waiting for you again <a href="exec:gt ''buklinik_event'',''entrance'',1">Michael</a>.'
-	if bumtolik = 13 and buklinikDay ! daystart: '- <<$pcs_nickname>>, waiting for you again <a href="exec:gt ''buklinik_event'',''entrance'',2">Michael</a>.'
-	if bumtolik = 14 and buklinikDay ! daystart: '- <<$pcs_nickname>>, <a href="exec:gt ''buklinik_event'',''entrance'',3">Michael</a> is waiting for you.'
-	if bumtolik = 15 and buklinikDay ! daystart: '- <a href="exec:gt ''buklinik_event'',''entrance'',4">Michael</a> is Waiting for you.'
-	if bumtolik = 16 and week = 1 and buklinikDay ! daystart: '- <a href="exec:gt ''buklinik_event'',''entrance'',5">Michael</a> is Waiting for you.'
+	if bumtolik > 5:'"Hello, <<$pcs_nickname>>! Is there anything I can help you with?"'
+	if buklinikDay = daystart:'"All the assignments are done for today. Finally we can relax a bit..."'
+	if bumtolik >= 7 and buklinikDay ! daystart:'"<<$pcs_nickname>>, we need help to <a href="exec:gt ''buklinik_event'', ''pos6''">feed the needy</a>."'
+	if bumtolik >= 8 and buklinikDay ! daystart: '"<<$pcs_nickname>>, here is the address of one the <a href="exec:gt ''buklinik_event'',''pos8''">elderly men</a>, would you be so kind and help him out with some housework.'
+	if bumtolik = 9 and buklinikDay ! daystart: '"<<$pcs_nickname>>, I''m going to need some help persuade an alcoholic to stop wandering the streets, and come stay at the <a href="exec:gt ''buklinik_event'',''pos9''">shelter</a>."'
+	if bumtolik = 10 and buklinikDay ! daystart: '"We need a babysitter for one very <a href="exec:gt ''buklinik_event'',''event0''">strange man</a>. Can you please go visit him?"'
+	if bumtolik = 11 and buklinikDay ! daystart: '"<<$pcs_nickname>>, would you be kind and visit <a href="exec:gt ''buklinik_event'',''entrance'',0">Michael</a>?"'
+	if bumtolik = 12 and buklinikDay ! daystart: '"<a href="exec:gt ''buklinik_event'',''entrance'',1">Michael</a> is asking for you, <<$pcs_nickname>>. You must''ve made a great impression."'
+	if bumtolik = 13 and buklinikDay ! daystart: '"<<$pcs_nickname>>, <a href="exec:gt ''buklinik_event'',''entrance'',2">Michael</a> won''t stop nagging us about you... Can you please go and see him?"'
+	if bumtolik = 14 and buklinikDay ! daystart: '"<<$pcs_nickname>>, <a href="exec:gt ''buklinik_event'',''entrance'',3">Michael</a> is expecting you."'
+	if bumtolik = 15 and buklinikDay ! daystart: '"Why the hell is <a href="exec:gt ''buklinik_event'',''entrance'',4">Michael</a> always asking for you to visit him?'
+	if bumtolik = 16 and week = 1 and buklinikDay ! daystart: '"Guess who is asking for you, you guessed it, <a href="exec:gt ''buklinik_event'',''entrance'',5">Michael</a>."'
 	!bumtolik = 3000 if michael events stoped.
 	if bumtolik = 5:
 		bumtolik = 6
-		'Olga:- Continue along the corridor beds, showers and a dining room where guests can eat for free. See there is nothing special. Well, that''s all. At the reception we sit two girls - Regina and Karina, you''ve seen them.'
-		'We were still coming the other volunteers, but you yourself to meet them at the meeting.'
-		'You can look around here, if that appeals to me.'
+		'Olga shows you around, "Over here we have the corridor beds, showers and the dining room where guests eat for free. I think that''s all, ask away if I forgot something to show you. Oh yeah, at the reception we have Regina and Karina, whom you''ve already met. There are plently of other volunteers but I''ll let you meet them."'
+		'You thank Olga for the tour as she quickly heads back to the storage room.'
 	end
 
-	act 'In the corridor':gt 'buklinik', 'holl'
+	act 'Head back to the corridor':gt 'buklinik', 'holl'
 end
 
 --- buklinik ---------------------------------

+ 1 - 1
locations/cafe3.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = '0':
 			cla
 			guy += 1
 
-			if lubri > 0:lubri = lubri - 1
+			gs 'arousal', 'auto_lube', 'anal'
 
 			picrand = rand(1, 10)
 			'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal2<<picrand>>.jpg"></center>'

+ 2 - 2
locations/cikl.qsrc

@@ -1492,8 +1492,8 @@ gs 'body_shape', 'basebeautycalc'
 !! vovan, from 1.2.5
 hunters_check = 0
 mushroom_pickers = 0
-horse_river = 0
-haying_time = 0
+grandpaQW['horse_river'] = 0
+grandpaQW['haying_time'] = 0
 mira_go_river = 0
 forestpicnic = 0
 if Mira_no > 0: Mira_no -= 1

+ 4 - 3
locations/clener.qsrc

@@ -468,11 +468,12 @@ if $ARGS[0] = 'borodachSex':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
 			'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> cm dick, his fingers begin to caress your pussy, preparing it for entry.'
 			
+			gs 'dinsex', 'boy_puts_condom'
 			gs 'arousal', 'vaginal_finger', 5
-			gs 'arousal', 'vaginal', 15
+			gs 'dinsex', 'vaginal_sex', 15
+			gs 'dinsex', 'sexcum'
+			gs 'arousal', 'end'
 			gs 'stat'
-			
-			gs 'orgazm', 'start'
 
 			act 'Leave':gt 'street'
 		end

+ 40 - 10
locations/clothing.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'view_clothing_list':
 		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
 	end
 
-	if $ARGS[2] = 'gm':
+	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_cheap' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 		!'<center><b><font color="maroon">Viewing clothes from G&M</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 	elseif $ARGS[2] = 'kats':
@@ -210,22 +210,46 @@ if $ARGS[0] = 'view_clothing_list':
 		end
 
 		if $ARGS[2] = 'gm':
-			$ward_list_store = $ARGS[2]
+			if ARRSIZE('cheap') > 0:'<center><a href="exec:$ward_list_store = ''gm_cheap'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_cheap''">Regular G&M clothing</a></center>'
 
-			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
+			if ARRSIZE('office') > 0:'<center><a href="exec:$ward_list_store = ''gm_office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_office''">Office wear</a></center>'
+
+			if ARRSIZE('school') > 0:'<center><a href="exec:$ward_list_store = ''gm_school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_school''">School uniforms</a></center>'
+
+			if ARRSIZE('uniform') > 0:'<center><a href="exec:$ward_list_store = ''gm_uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_uniform''">Work uniforms</a></center>'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+		end
 
+		if $ARGS[2] = 'gm_cheap':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopcheap
 				if cheap[i] = 1 and cheapS[i] = cloc and ($clothingworntype ! 'cheap' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cheap', i)
 				i += 1
 			if i <= ARRSIZE('cheap'):jump 'loopcheap'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_office':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
 				if office[i] = 1 and officeS[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
 				i += 1
 			if i <= ARRSIZE('office'):jump 'loopoffice'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_school':
+			$ward_list_store = $ARGS[2]
+
+			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
+
 			i = 1
 			:loopschool
 				if school[i] = 1 and schoolS[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
@@ -233,18 +257,18 @@ if $ARGS[0] = 'view_clothing_list':
 				if i = 6: i = 7
 			if i <= ARRSIZE('school'):jump 'loopschool'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_uniform':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopuniform
 				if uniform[i] = 1 and uniformS[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
 				i += 1
 			if i <= ARRSIZE('uniform'):jump 'loopuniform'
 
-			i = 1
-			:loopswimwear
-				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
-				i += 1
-			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
-
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end
@@ -339,6 +363,12 @@ if $ARGS[0] = 'view_clothing_list':
 				i += 1
 			if i <= ARRSIZE('exercise'):jump 'loopexercise'
 
+			i = 1
+			:loopswimwear
+				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+				i += 1
+			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
+
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end
@@ -738,7 +768,7 @@ if $ARGS[0] = 'recover_lost_clothes':
 	findLocInd = ARRPOS('CloLosDay', CloLosDay[$cloLoc])
 	KILLVAR 'CloLosDay', findLocInd
 	findLocInd = ARRPOS('$CloLosLoc', $cloLoc)
-	KILLVAR '$CloLosLoc', findLocationIndex
+	KILLVAR '$CloLosLoc', findLocInd
 	KILLVAR 'findLocInd'
 
 	if cloAction = 1:

+ 58 - 0
locations/clothing_QV.qsrc

@@ -42,10 +42,26 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		*nl
+
+		if ARRSIZE('cheap') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_cheap''">Regular G&M clothing</a></center>'
+
+		if ARRSIZE('office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
+
+		if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''">School uniforms</a></center>'
+
+		if ARRSIZE('uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
+	end
+
+	if $ARGS[1] = 'gm_cheap':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Regular G&M clothing</center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
@@ -69,6 +85,20 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('cheap'):jump 'loopcheap'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_office':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Office wear</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopoffice
 		if office[i] = 1:
@@ -80,6 +110,20 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('office'):jump 'loopoffice'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_school':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>School uniforms</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopschool
 		if school[i] = 1:
@@ -92,6 +136,20 @@ if $ARGS[0] = 'list':
 		if i = 6: i = 7
 		if i <= ARRSIZE('school'):jump 'loopschool'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_uniform':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Work uniforms</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopuniform
 		if uniform[i] = 1:

+ 13 - 18
locations/club.qsrc

@@ -1213,9 +1213,8 @@ if $ARGS[0] = 'work':
 	if clubr = 0:
 		'"OK <<$pcs_nickname>>, I want you to go around the city center and find some customers, bring them to the door and give the bouncer a nod so he knows they are yours. See you in an hour."'
 		act 'Look for customers':
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 			'You spend an hour searching for customers in the city center.'
 			act 'Return to Erik':
@@ -1243,31 +1242,28 @@ if $ARGS[0] = 'work':
 		'"OK <<$pcs_nickname>>, I want you to go around the club getting people to try and hopefully switch to these spirits. You can''t go wrong here, just smile and give out free drinks."'
 		'"No need to hold back with it, the suppliers are paying and if you''re curious and want to try it, don''t its horrible. I''ll see you back here in an hour."'
 		act 'Get to work':
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club6.jpg"></center>'
 			'You spend an hour giving away unpleasant shots.'
 			act 'Return to Erik':
-				cla
-				*clr
+				*clr & cla 
 				money += 200
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 				'You hand Erik the empty bottles, he gives you 200 <b>₽</b>.'
-				if hour < 1 or hour >= 18:
-					act 'Get another job from Erik':gt 'club', 'work'
-				end
+				if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
 
-			act 'Go to dancefloor':gt 'club', 'inside'
+				act 'Go to dancefloor':gt 'club', 'inside'
 			end
 		end
 	elseif clubr = 2:
 		'"OK <<$pcs_nickname>>, we''re short a dancer, get in that cage there and dance. If you put on a good show you get a bonus."'
 		act 'Get in the cage':
 			if pcs_inhib < 60:inhib_exp += rand(1,2)
-			cla
-			*clr
-			hour += 1
+			*clr & cla
+			minut += 60
 			danc_exp += rand (1,3)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club12.jpg"></center>'
 			if pcs_danc > rand (30, 100):
@@ -1279,9 +1275,8 @@ if $ARGS[0] = 'work':
 				'You try hard, but you are mostly ignored by the customers.'
 				'Erik thanks you for helping when he was short and pays you 200 <b>₽</b>, but doesn''t even mention your dancing.'
 			end
-			if hour < 1 or hour >= 18:
-				act 'Get another job from Erik':gt 'club', 'work'
-			end
+			gs 'stat'
+			if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
 
 			act 'Go to dancefloor':gt 'club', 'inside'
 		end

+ 13 - 0
locations/dachamy.qsrc

@@ -19,6 +19,19 @@ act 'Exit the alley':minut += 15 & gt 'dachi'
 
 act 'Go into the house':gt 'dachain'
 
+if sunWeather = 1:
+	if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+		if $clothingworntype = 'exercise':
+			*nl
+			'You can do some exercises here.'
+			act 'Exercise': gt 'exercise', 'workout'
+		else
+			*nl
+			'You could do some exercises here if you were wearing exercise clothes.'
+		end
+	end
+end
+
 if hour < 23 and hour >= 7:
 	act 'Inspect garden':
 		cla

+ 5 - 0
locations/dachi.qsrc

@@ -25,6 +25,11 @@ act 'Go to the highway':minut += 15 & nroad = 5 & gt 'road'
 if home_owned[3] > 0:
 	'Enter <a href="exec:gt ''dachamy'', ''start''">your yard</a>.'
 	'Across the street from your cottage is another <a href="exec:gt ''etoexhib'', ''pos8''">cottage</a> almost identical to yours.'
+	if hour = meethour:
+		if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & gt ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
+		if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & gt ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
+		if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
+	end
 end
 
 if etoexhib < 13:'You feel a slight presence of magic.'

+ 6 - 5
locations/dimalina.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'watch':
 					if pcs_mood > 5: pcs_mood -= 5
 					gs 'dimalina', 'bindpain'
 					gs 'pain', 3, 'throat', 'choke'
-					pcs_arousal += 20
+					pcs_horny += 20
 					minut += rand(30,60)
 					gs 'stat'
 					!!need to reset dimbadgirl to 0 after this so it starts over for each args scene set.
@@ -307,7 +307,7 @@ if $ARGS[0] = 'dimkalina2':
 					'Lina and You are kneeling on the floor. Your underwear is nowhere to be found. She smiles as your last bout of sex has confirmed that being your lover is the best decision in her life. With skilled fingers you tease her inner thighs, making her moan in frustrated anticipation. She begs, pleads and supplicates for more... and finally you caress her lower lips. She cums and the smell of her arousal fills the room. You begin a fast masturbation, giving her what she needs. She cums again and again under your expertise. Finally, you stop and look at her... waiting. Wasted, she asks you to make love to her.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
 					
-					pcs_arousal += 20
+					pcs_horny += 20
 					gs 'stat'
 					
 					gs 'willpower', 'misc', 'self', 'medium'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'dimkalina2':
 					'What the fuck is wrong with him? Why doesn''t he understand that this is all he is good for: licking your boots. You''re tired of him trying to be coy. You could be doing so much more, be instead you have to sit here and train him to be a proper sub bitch. Dimka must sense your growing frustration with him because you hear him whimper and tremble. Not in the mood for his games, you take your other foot and step on his fingers as he kneels beneath you on all fours. You ignore his cries of pain, instead you look out a nearby window and notice a couple walking by. The two are smiling, the woman is giggling and hanging on to him while they whisper to each other. You know as soon as they''re alone, they''ll be fucking each other, and the thought of that makes you both jealous and a bit horny. You wanted to have some fun today, but no, instead you have to deal with this.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
 					
-					pcs_arousal += 20
+					pcs_horny += 20
 					gs 'stat'
 					
 					gs 'willpower', 'misc', 'self', 'medium'
@@ -459,7 +459,7 @@ if $ARGS[0] = 'watch3':
 			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, You are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.' 
 			'Just as you begin to thrust the beads in and out of her ass a bit, you''re pulled back to reality by the sound of grunting from Dimka'
 			*clr & cla
-			pcs_arousal += 10
+			pcs_horny += 10
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Dream of Dimka':
@@ -468,7 +468,7 @@ if $ARGS[0] = 'watch3':
 			'Seeing Dimka drug and rape Lina, your mind drifts and you''re comforted by a dream much better than the reality you''re currently facing.'
 			'You are too good for this bitch. Eventually, you resign to indulging the little shit and have him worship your honey pot. He kneels and licks your sacred pussy and clit, causing you to squirm a bit with pleasure in your seat. Of course you are not going to oblige him, saying that it feels good. He isn''t a lover. But for the moment, he can continue trying to appease you...'
 			'Just as the pleasure begins to build closer to your climax, the needy moans of Lina bring you back to reality.'
-			pcs_arousal += 10
+			pcs_horny += 10
 			gs 'stat'
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
@@ -957,6 +957,7 @@ if $ARGS[0] = 'walklina':
 			'She cries and then turns, running with all her strength and leaving you far behind.'
 			if pcs_mood > 10: pcs_mood -= 10
 			gs 'stat'
+			act 'Leave': gt 'pavResidential'
 		elseif npc_rel['A19'] < 50:
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up to her, she stops and gives you a questioning gaze.'
 			'"Let''s go home Lina."'

+ 154 - 162
locations/dinParty.qsrc

@@ -3,33 +3,32 @@
 !A random event in the toilet
 if $ARGS[0] = 'party_toilet_event':
 	menu_off = 1
-	evt = rand(1,8)
-	if toiletEvent_Girls = daystart:evt += 1
-	if toiletEvent_Rex = daystart:evt += 1
-	if toiletEvent_Sis = daystart:evt += 1
-	if toiletEvent_SisBoy = daystart:evt = 1
+	temp = rand(1,8)
+	if toiletEvent_Girls = daystart: temp += 1
+	if toiletEvent_Rex = daystart: temp += 1
+	if toiletEvent_Sis = daystart: temp += 1
+	if toiletEvent_SisBoy = daystart: temp = 1
 	*clr & cla
 	minut += 5
-	gs'stat'
-	if evt = 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_2_' + rand(1,2) + '.jpg"></center>'
+	gs 'stat'
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_2_<<rand(1,2)>>.jpg"></center>'
 		'A girl sits on the toilet drinking.'
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 2:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_3_' + rand(1,5) + '.jpg"></center>'
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_3_<<rand(1,5)>>.jpg"></center>'
 		'A girl sits on the toilet peeing and she seems oddly happy to see you.'
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 3:
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_4.jpg"></center>'
 		'A wasted girl sits on the toilet masturbating.'
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 4:
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_1.jpg"></center>'
 		'You go into the bathroom, only to find Rex standing in there completely naked with a raging hard on.'
 		act 'Help':
 			*clr & cla
 			toiletEvent_Rex = daystart
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_2.jpg"></center>'
 			'You walk over to Rex and when you are with in arms reach he grabs you by the neck and pulls you close kisses your lips, you take his dick in hand and gently stroke it.'
 			
@@ -38,8 +37,7 @@ if $ARGS[0] = 'party_toilet_event':
 			
 			act 'Masturbate':
 				*clr & cla
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_' + rand(3,4) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_<<rand(3,4)>>.jpg"></center>'
 				'Breaking the kiss you put your full attention on jerking Rex off.'
 				
 				gs 'arousal', 'hj', 5
@@ -51,22 +49,20 @@ if $ARGS[0] = 'party_toilet_event':
 					gs 'boyStat', 'A57'
 					spafinloc = 15
 					gs 'cum_manage'
-					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_5.jpg"></center>'
 					'As you jerk him off he moans and sperm starts spewing everywhere getting on your hands. "Ooh, <<$pcs_nickname>>, you saved me, but next time use your mouth." He said with a wink.'
 					
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Move away':gt $loc,$metka
+					act 'Move away': gt $loc, $metka
 				end
 			end
 			act 'Suck':
 				*clr & cla
-				if reksMeet = 1:bja += 1
+				if reksMeet = 1: bja += 1
 				gs 'boyStat', 'A57'
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_' + rand(6,10) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_<<rand(6,10)>>.jpg"></center>'
 				'You feel Rex''s hands on your shoulders gently pushing you down, you instantly obey and drop to your knees. Once your eye and more importantly mouth level with Rex''s <<dick>>cm <<$dick_girth>> dick, you take his head into your mouth and wrap your lips tightly around his shaft as you begin to stroke him off with your mouth.'
 				'He moans as you suck his cock, he is already tensing up, you can tell he is already about to cum.'
 				
@@ -82,7 +78,6 @@ if $ARGS[0] = 'party_toilet_event':
 					spafinloc = 11
 					gs 'cum_manage'
 					facial += 1
-					gs'stat'
 					i = rand(11,18)
 					if i = 11:
 						'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_<<i>>.mp4"></video></center>'
@@ -94,12 +89,12 @@ if $ARGS[0] = 'party_toilet_event':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Move away':gt $loc,$metka
+					act 'Move away': gt $loc, $metka
 				end
 			end
 		end
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 5:
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_6_1.jpg"></center>'
 		'Coming into the bathroom you find your sister Anna sitting on the toilet, you notice cum on her face.'
 		'When she see''s you, she smiles, then opens up her mouth and sticks out her tongue, showing her tongue completely coated in cum.'
@@ -111,7 +106,7 @@ if $ARGS[0] = 'party_toilet_event':
 			sexvolume = 5
 			spafinloc = 12
 			gs 'cum_manage'
-			gs'stat'
+			gs 'stat'
 			i = rand(2,5)
 			if i = 2 or i = 4:
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_6_<<i>>.mp4"></video></center>'
@@ -121,17 +116,16 @@ if $ARGS[0] = 'party_toilet_event':
 			'Seeing this little display you smile and kneel down in front of her. You start licking the sperm off her face, once you have licked it all up, you kiss her. The two of you share a long kiss where you trade the cum back and forth in your mouths before you both end up swallowing a portion of it.'
 			'"So who''s dick or should I say dicks, have you been sucking to get all that cum, all over you?" You ask with a smile.'
 			'"Roma tried to make up again." You sister responded angrily, once she finished peeing she got up and left. Obviously not wanting to talk about it.'
-			act 'Move away':gt $loc,$metka
+			act 'Move away': gt $loc, $metka
 		end
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 6:
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 6:
 		toiletEvent_Girls = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_1.jpg"></center>'
 		'You just opened the door and saw Lena and Ira kissing, while Ira sat on the toilet. Lena pushes Ira''s legs apart and then breaks the kiss, lowering her facshe begins to lick her pussy, while Ira is still sitting on the toilet.'
 		'"Ahaha, Lena, your such a bitch sometimes and that''s why I love you." Moaned Ira.'
 		act 'Watch':
 			*clr & cla
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_2.jpg"></center>'
 			'A few moments later they both get up and strip naked, Lena sits Ira on the edge of the sink. Lena drops back to her knees while Ira spreads her legs wide, giving her friend easy access. Lena starts licking her friends pussy at once, Ira closes her eyes and moans softly at her friends attention.'
 			
@@ -140,7 +134,6 @@ if $ARGS[0] = 'party_toilet_event':
 			
 			act 'Watch':
 				*clr & cla
-				gs'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_3.mp4"></video></center>'
 				'Ira moans louder, her breathe coming quicker, she grabs Lena''s head and pushes it against her crotch as she grinds herself against her friends face. Her body begins to tremble as she lets out a finally load moan of pleasure as she orgasms, coating her friends face with her pussy juices.'
 				
@@ -150,7 +143,7 @@ if $ARGS[0] = 'party_toilet_event':
 				act 'Go in':
 					*clr & cla
 					minut += 5
-					gs'stat'
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_4.jpg"></center>'
 					'Once they finish you walk in. Ira and Lena look at each other and then smile at you.'
 					'"Oh, it''s you <<$pcs_nickname>>, glad it is not some guy. We do not know what we would have done with him."'
@@ -158,7 +151,6 @@ if $ARGS[0] = 'party_toilet_event':
 					'Lena came up to you and leaned in close as she whispered in your ear: "You liked watching what we were doing, right?. Stay with us, and you''ll like it even more."'
 					act 'Stay':
 						*clr & cla
-						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_5.jpg"></center>'
 						'Looking at the naked girls you bite your lower lip as your eyes roam over their bodies with a lustful look. Ira and Lena start taking your clothes off as they start kissing you all over.'
 						'"Mmm, Oh yes, don''t stop." You moan out. With these words, Lena sucks your clit and began licking your wet pussy.'
@@ -169,7 +161,6 @@ if $ARGS[0] = 'party_toilet_event':
 						act 'Enjoy':
 							*clr & cla
 							pcs_mood = 100
-							gs'stat'
 							'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_6.mp4"></video></center>'
 							'From the gentle caresses of girls you feel incredible pleasure, completely trusting them you feel totally relaxed. Then Ira takes Lena''s place licking your pussy, while Lena slides her tongue to your asshole as she begins to lick it.'
 							'From this dual tongue lashing you don''t last long. You start moaning loudly and your body spasms hard with an orgasm, coating Ira''s face from the wetness of your pussy. Once you orgasm passes both girls stand up and Lena starts licking Ira''s face, licking your wetness off her. You quickly join in licking Lena''s face licking Ira''s juices off her face. While Ira''s kisses you both in turns.'
@@ -181,7 +172,6 @@ if $ARGS[0] = 'party_toilet_event':
 							act 'Chat':
 								*clr & cla
 								minut += 5
-								gs'stat'
 								'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_7.mp4"></video></center>'
 								'"Well, <<$pcs_nickname>>, did you like it?"'
 								'"Oh, it was amazing girls, makes me think we never need the touch of a man."'
@@ -190,18 +180,18 @@ if $ARGS[0] = 'party_toilet_event':
 								gs 'arousal', 'end'
 								gs 'stat'
 								
-								act 'Move away':gt $loc,$metka
+								act 'Move away': gt $loc, $metka
 							end
 						end
 					end
-				act 'Go to the living room':gt'sbReksHome','party_gost'
+				act 'Go to the living room': gt 'sbReksHome', 'party_gost'
 				end
-			act 'Go to the living room':gt'sbReksHome','party_gost'
+			act 'Go to the living room': gt 'sbReksHome', 'party_gost'
 			end
-		act 'Go to the living room':gt'sbReksHome','party_gost'
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
 		end
-	act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 7:
+	act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 7:
 		i = rand(1,3)
 		if i = 2:
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_8_<<i>>.mp4"></video></center>'
@@ -209,12 +199,12 @@ if $ARGS[0] = 'party_toilet_event':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_8_<<i>>.jpg"></center>'
 		end
 		'From the sounds of the groans, moans and cries of passion the bathroom is in use again. Peeking inside you see a sweet couple fucking like rabbits.'
-		act 'Go to the living room':gt'sbReksHome','party_gost'
-	elseif evt = 8:
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	elseif temp = 8:
 		toiletEvent_SisBoy = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_9.jpg"></center>'
 		'Looking inside the bathroom you find your sister with her back against the wall, her skirt pulled up and panties around her ankles, while Roma''s face is buried between her legs. He''s apparently asking for forgiveness from your sister again.'
-		act 'Go to the living room':gt'sbReksHome','party_gost'
+		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
 	end
 end
 
@@ -224,7 +214,6 @@ if $ARGS[0] = 'toilet_mast':
 	*clr
 	menu_off = 1
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
-	gs'stat'
 	i = rand(1,3)
 	if i < 3:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_1_<<i>>.jpg"></center>'
 	if i = 3:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_1_<<i>>.mp4"></video></center>'
@@ -235,7 +224,7 @@ if $ARGS[0] = 'toilet_mast':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Move away':gt $loc,$metka
+	act 'Move away': gt $loc, $metka
 end
 
 !Speakers for DJ
@@ -244,11 +233,11 @@ if $ARGS[0] = 'dj':
 	*clr
 	menu_off = 1
 	minut += 5
-	dj_beer =1
-	gs'stat'
+	dj_beer = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_2_3.jpg"></center>'
 	'You take two bottles of booze to the DJ and his friend'
-	act 'Move away':gt $loc,$metka
+	act 'Move away': gt $loc, $metka
 end
 
 if $ARGS[0] = 'dj_beer':
@@ -256,13 +245,14 @@ if $ARGS[0] = 'dj_beer':
 	*clr
 	menu_off = 1
 	minut += 5
-	dj_thank =1
+	dj_thank = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy.jpg"></center>'
 	'You take two beers to the guys, they gratefully appreciated your offer.'
 	'"<<$pcs_nickname>>, you ever use one of these before?" The DJ asks you indicating the turntable.'
 	'Shaking your head. "No, never."'
-	'He smiles to you. "While everyone is still sitting and drinking you can give it a little <a href="exec:gt ''dinParty'', ''dj_thank''">twist</a>, lets see what you can do girl."'
-	act 'Move away':gt $loc,$metka
+	'He smiles to you. "While everyone is still sitting and drinking you can give it a little <a href="exec: gt ''dinParty'', ''dj_thank''">twist</a>, lets see what you can do girl."'
+	act 'Move away': gt $loc, $metka
 end
 
 if $ARGS[0] = 'dj_thank':
@@ -270,12 +260,12 @@ if $ARGS[0] = 'dj_thank':
 	*clr
 	menu_off = 1
 	minut += 5
-	dj_bad =1
+	dj_bad = 1
 	instrmusic_exp += rand(0,2) 
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy_1.jpg"></center>'
 	'You are happy to take this opportunity, putting your fingers on the records you move them around, making god awful noises. The guys stop you before to long. "Ok I think that''s enough, I think you made my ears bleed." He says with a laugh.'
-	act 'Move away':gt $loc,$metka
+	act 'Move away': gt $loc, $metka
 !why not add in an option here to start the series below?
 end
 
@@ -283,14 +273,14 @@ if $ARGS[0] = 'dj_boobs':
 	cla
 	*clr
 	menu_off = 1
-	minut += 5
+	gs 'arousal', 'flash', 5
 	dj_boobs = 1
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy_2.jpg"></center>'
 	'"Like this boys?" You ask as you put your breasts on the turn table and move it a bit with your breasts.'
 	'Not much sound comes out form your attempt, but guys seem to love the attempt all the same.'
-	act 'Move away':gt $loc,$metka
-	act 'Take off your top':gt 'dinParty', 'dj_cock'
+	act 'Move away': gt $loc, $metka
+	act 'Take off your top': gt 'dinParty', 'dj_cock'
 end
 
 if $ARGS[0] = 'dj_cock':
@@ -298,31 +288,30 @@ if $ARGS[0] = 'dj_cock':
 	*clr
 	menu_off = 1
 	minut += 5
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy_3.jpg"></center>'
 	'Seeing the interest from the smiling guys watching you, you get rid of your top and take off your bra and then place your naked breasts on the turntable and try to play it topless. "I think I did better that time, what do you think?"'
 	'The guy pulled out his erection as he said "Not bad, maybe try this instead."'
-	act 'Move away':gt $loc,$metka
-	act 'Give his dick a try':gt 'dinParty', 'dj_suck'
+	act 'Move away': gt $loc, $metka
+	act 'Give his dick a try': gt 'dinParty', 'dj_suck'
 end
 
 if $ARGS[0] = 'dj_suck':
 	cla
 	*clr
 	menu_off = 1
-	minut += 5
-	gs'stat'
+	gs 'arousal', 'foreplay', 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy_4.jpg"></center>'
 	'You grab his hard cock and place the head on the spinning record, barely touching it. The guy started a bit, perhaps it was a little painful for him.'
-	if Rex_Love = 1:'You don''t think Rex would like you playing these games with the DJ, you had a little fun but that''s enough.'
-	act 'Move away':gt $loc,$metka
+	if Rex_Love = 1: 'You don''t think Rex would like you playing these games with the DJ, you had a little fun but that''s enough.'
+	act 'Move away': gt $loc, $metka
 	if Rex_Love = 0:
 		act 'Kiss it and make it better':
 			cla
 			*clr
 			gs 'npcgeneratec', 0, 'The DJ at Rex''s Party', rand(17,22)
 			gs 'boyStat', $npclastgenerated
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy_5.jpg"></center>'
 			'You decide to make amends to guy, and kiss the head of his cock.'
 			'You find you don''t want to stop and passionately start sucking his <<dick>>cm <<$dick_girth>> dick right there in front of everyone.'
@@ -337,7 +326,6 @@ if $ARGS[0] = 'dj_suck':
 				guy += 1
 				pcs_vag += 1
 				gs 'cum_manage'
-				gs'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_boy_6.mp4"></video></center>'
 				'You let him bend you over, as he begins to rub the head of his dick against your pussy lips.'
 				'He abruptly pushes his <<dick>>cm <<$dick_girth>> dick inside of you and starts fucking you with a fast pace.'
@@ -348,7 +336,7 @@ if $ARGS[0] = 'dj_suck':
 				gs 'stat'
 				
 				gs 'cuminsidereact'
-				act 'Move away':gt $loc,$metka
+				act 'Move away': gt $loc, $metka
 			end
 		end
 	end
@@ -359,15 +347,15 @@ if $ARGS[0] = 'dance':
 	cla
 	*clr
 	minut += 5
-	if pcs_inhib < 40:inhib_exp += rand(1,2)
-	gs'stat'
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_gost_1_' + rand(1,7) + '.mp4"></video></center>'
+	if pcs_inhib < 40: inhib_exp += rand(1,2)
+	gs 'stat'
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_gost_1_<<rand(1,7)>>.mp4"></video></center>'
 	'Moving to the rhythmic sounds, you indulge in an unrestrained dance.'
 	'You jump, sway your body, and rock your booty, losing yourself in the general merriment.'
-	if pcs_danc >= 50:'You move your body perfectly with the rhythm of the music in an erotic way. This gets you a lot of attention from the others and you love their attention.'
-	if pcs_danc < 50:'Your ridiculous movements during the dance does not bother anyone, You dance badly, but you do not care.'
-	act 'Have a rest':gt $loc,$metka
-	act 'Dance more':gt 'dinParty', 'dance' 
+	if pcs_danc >= 50: 'You move your body perfectly with the rhythm of the music in an erotic way. This gets you a lot of attention from the others and you love their attention.'
+	if pcs_danc < 50: 'Your ridiculous movements during the dance does not bother anyone, You dance badly, but you do not care.'
+	act 'Have a rest': gt $loc, $metka
+	act 'Dance more': gt 'dinParty', 'dance' 
 end
 
 
@@ -384,13 +372,13 @@ if $ARGS[0] = 'boys_swalow':
 	gs 'cum_manage'
 	i -= 1
 	if i > 0: jump 'dinPartySwalloop'
-	gs'stat'
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_' + rand(13,15) + '.mp4"></video></center>'
+	gs 'stat'
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_<<rand(13,15)>>.mp4"></video></center>'
 	'You swallowed the tart mixture of several different guys sperm, greedily licking your lips with your tongue.'
 	'"Uhh, <<$pcs_nickname>>, You''re still the best cocksucker around, want more sperm to swallow, Call us."'
 	'The guys helped you back into the apartment and into one of the bedrooms, as you are to drunk to do it yourself.'
 	
-	act 'Fall asleep':gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'dinParty', 'sleep'
 end
 
 if $ARGS[0] = 'boys_spit':
@@ -406,13 +394,13 @@ if $ARGS[0] = 'boys_spit':
 	gs 'cum_manage'
 	i -= 1
 	if i > 0: jump 'dinPartySpitloop'
-	gs'stat'
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_' + rand(16,17) + '.mp4"></video></center>'
+	gs 'stat'
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_<<rand(16,17)>>.mp4"></video></center>'
 	'You spat out the mouthful mixture of cum from several guys from your mouth.'
 	'"What''s wrong <<$pcs_nickname>> didn''t you like it? I thought all the girls loved the taste of cum." One of the guys asked you with a laugh.'
 	'The guys helped you back into the apartment and into one of the bedrooms, as you are to drunk to do it yourself.'
 	
-	act 'Fall asleep':gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'dinParty', 'sleep'
 end
 
 if $ARGS[0] = 'rex_talk':
@@ -420,11 +408,11 @@ if $ARGS[0] = 'rex_talk':
 	menu_off = 1
 	minut += 5
 	rex_talk += 1
-	gs'stat'	
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_' + rand(1,5) + '.mp4"></video></center>'
+	gs 'stat'	
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_<<rand(1,5)>>.mp4"></video></center>'
 	'You find a space to sit and talk to Reks, he''s quite interesting and very handsome so you spend most of the time just nodding and flirting.'
-	act 'Move away':gt $loc,$metka
-	if rex_talk >=2: act 'Hug':gt 'dinParty', 'rex_hug'
+	act 'Move away': gt $loc, $metka
+	if rex_talk >= 2: act 'Hug': gt 'dinParty', 'rex_hug'
 	act 'Ask Rex to dance': gt 'dinParty', 'rex_dance'
 end
 
@@ -433,21 +421,23 @@ if $ARGS[0] = 'rex_hug':
 	menu_off = 1
 	minut += 5
 	if pcs_inhib < 40:inhib_exp += rand(1,2)
-	gs'stat'
+	gs 'stat'
 	if Rex_Love =1:
-		i = rand(1,2)
-		if i = 1:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_4_1.mp4"></video></center>'
-		if i = 2:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_4_' + rand(2,5) + '.jpg"></center>'
+		if rand(1,2) = 1:
+			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_4_1.mp4"></video></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_4_<<rand(2,5)>>.jpg"></center>'
+		end
 		'Rex grabbed you with his strong hands and began to knead your ass with one hand and caress your pussy with the other, in front of everybody.'
 		'You grab his neck and audible groan completely given into his affections.'
 		'You are flooded with the most pleasant feeling in the world, you don''t want it to stop.'
 		act 'Kiss':
 			*clr & cla
-			*clr
-			gs'stat'
-			i = rand(1,2)
-			if i = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_5_1.jpg"></center>'
-			if i = 2:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_5_' + rand(2,4) + '.mp4"></video></center>'
+			if rand(1,2) = 1:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_5_1.jpg"></center>'
+			else
+				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_5_<<rand(2,4)>>.mp4"></video></center>'
+			end
 			'Looking adoring into each others eyes, being to passionately kiss.'
 			'You lips touch in your long kiss, it almost feels like a shock of electricity is running through you body.'
 			'For a long time you continue to enjoying the warm kiss, Rex finally breaks the kiss and says. "Come with me <<$pcs_nickname>>, I think we''ve had enough fun here." Simling he takes you by the hand and leads you away.'
@@ -455,15 +445,17 @@ if $ARGS[0] = 'rex_hug':
 			gs 'arousal', 'kiss', 5, 'exhibitionism'
 			gs 'stat'
 	
-			act 'Move away':gt $loc,$metka
-			act 'Follow Rex':gt 'reks', 'Party_rex_sex'
+			act 'Move away': gt $loc, $metka
+			act 'Follow Rex': gt 'reks', 'Party_rex_sex'
 		end
 	end
 
-	if Rex_Love =0:
-		i = rand(1,2)
-		if i = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_13_' + rand(4,7) + '.jpg"></center>'
-		if i = 2:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_13_' + rand(1,3) + '.mp4"></video></center>'
+	if Rex_Love = 0:
+		if rand(1,2) = 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_13_<<rand(4,7)>>.jpg"></center>'
+		else
+			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_13_<<rand(1,3)>>.mp4"></video></center>'
+		end
 		'Rex grabbed you with his strong hands and began to knead your ass with one hand and caress your pussy with the other, in front of everybody.'
 		'You grab his neck and audible groan completely given into his affections.'
 		'After playing with your pussy for a bit, he stops and takes you by the hand and pulls you away as he says. "Come with me <<$pcs_nickname>>, I think we''ve had enough fun here."'
@@ -471,7 +463,7 @@ if $ARGS[0] = 'rex_hug':
 		gs 'arousal', 'foreplay', 5, 'exhibitionism'
 		gs 'stat'
 		
-		act 'Follow Rex':gt 'reks', 'Party_rex_sex'
+		act 'Follow Rex': gt 'reks', 'Party_rex_sex'
 	end    
 end
 
@@ -479,40 +471,42 @@ if $ARGS[0] = 'rex_dance':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	if pcs_inhib < 40:inhib_exp += rand(1,2)
-	gs'stat'
-	i = rand(1,2)
-	if i = 1:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_3_' + rand(4,6) + '.mp4"></video></center>'
-	if i = 2:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_3_' + rand(1,3) + '.jpg"></center>'
+	if pcs_inhib < 40: inhib_exp += rand(1,2)
+	gs 'stat'
+	if rand(1,2) = 1:
+		'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_3_<<rand(4,6)>>.mp4"></video></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_3_<<rand(1,3)>>.jpg"></center>'
+	end
 	'Rex took you by the hand and dragged you out to dance, you are happily follow him.'
 	'You dance, slowly getting closer to each other and finally grinding a bit against each other.'
 	'You turn around putting your back to him and grind your tight ass against his crotch, you can feel his hard cock against your ass, as you grind against it.'
-	act 'Move away':gt $loc,$metka 
-	if rex_talk >=2: act 'Hug':gt 'dinParty', 'rex_hug'
+	act 'Move away': gt $loc, $metka 
+	if rex_talk >= 2: act 'Hug': gt 'dinParty', 'rex_hug'
 end
 
 if $ARGS[0] = 'sleep':
 	*clr & cla
 	menu_off = 1
 	minut += 5
-	gs'stat'
-	if Rex_save =1 and Rex_Love =1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_13_' + rand(1,4) + '.jpg"></center>'
+	gs 'stat'
+	if Rex_save = 1 and Rex_Love = 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_13_<<rand(1,4)>>.jpg"></center>'
 		'You fall asleep feeling the warmth of his body against you back, he hugs you tightly.'
 		'You feel is hard erection against your butt, it excites you, but you are to tired to do anything with it as you fall fast asleep.'
-	elseif Rex_save =1 and Rex_Love =0:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_12_' + rand(1,11) + '.jpg"></center>'
+	elseif Rex_save = 1 and Rex_Love = 0:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_12_<<rand(1,11)>>.jpg"></center>'
 		'You feel completely safe, as you fall asleep to have sweet dreams.'
-	elseif iralenasleep >=1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_6_' + rand(6,7) + '.jpg"></center>'
+	elseif iralenasleep >= 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_6_<<rand(6,7)>>.jpg"></center>'
 		'Lena, Ira and you lay in the bed, side by side as you fall asleep.'
-	elseif drunk_sveta >=1 and sister_party_dom < 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_4_' + rand(1,3) + '.jpg"></center>'
+	elseif drunk_sveta >= 1 and sister_party_dom < 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_4_<<rand(1,3)>>.jpg"></center>'
 		'Your body could not withstand so much alcohol and you end up passing out. Fortunately friends were close, who dragged you into a bedroom and put you in bed.'
-	elseif sister_party_dom >=1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_9_' + rand(3,5) + '.jpg"></center>'
+	elseif sister_party_dom >= 1:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_9_<<rand(3,5)>>.jpg"></center>'
 		'You fall asleep in the arms of your beloved sister with a final kiss before drifting off.'
-	elseif party_boys_in >=1:
+	elseif party_boys_in >= 1:
 		i = rand(1,3)
 		hidden_guy += 3
 		if i = 1:
@@ -520,17 +514,17 @@ if $ARGS[0] = 'sleep':
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
 			sloc = rand(0,6)
-			if sloc=1:
+			if sloc = 1:
 				spafinloc = 1
-			elseif sloc=2:
+			elseif sloc = 2:
 				spafinloc = 4
-			elseif sloc=3:
+			elseif sloc = 3:
 				spafinloc = 8
-			elseif sloc=4:
+			elseif sloc = 4:
 				spafinloc = 11
-			elseif sloc=5:
+			elseif sloc = 5:
 				spafinloc = 12
-			elseif sloc=6:
+			elseif sloc = 6:
 				spafinloc = 14
 			end
 			gs 'cum_manage'
@@ -538,17 +532,17 @@ if $ARGS[0] = 'sleep':
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
 			sloc = rand(0,6)
-			if sloc=1:
+			if sloc = 1:
 				spafinloc = 1
-			elseif sloc=2:
+			elseif sloc = 2:
 				spafinloc = 4
-			elseif sloc=3:
+			elseif sloc = 3:
 				spafinloc = 8
-			elseif sloc=4:
+			elseif sloc = 4:
 				spafinloc = 11
-			elseif sloc=5:
+			elseif sloc = 5:
 				spafinloc = 12
-			elseif sloc=6:
+			elseif sloc = 6:
 				spafinloc = 14
 			end
 			gs 'cum_manage'
@@ -556,21 +550,21 @@ if $ARGS[0] = 'sleep':
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
 			sloc = rand(0,6)
-			if sloc=1:
+			if sloc = 1:
 				spafinloc = 1
-			elseif sloc=2:
+			elseif sloc = 2:
 				spafinloc = 4
-			elseif sloc=3:
+			elseif sloc = 3:
 				spafinloc = 8
-			elseif sloc=4:
+			elseif sloc = 4:
 				spafinloc = 11
-			elseif sloc=5:
+			elseif sloc = 5:
 				spafinloc = 12
-			elseif sloc=6:
+			elseif sloc = 6:
 				spafinloc = 14
 			end
 			gs 'cum_manage'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_6_' + rand(1,9) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_6_<<rand(1,9)>>.jpg"></center>'
 			'After everything that happened tonight, you feel exhausted and fall asleep, your face and body still smeared and coated in sperm, but you don''t care.'
 		elseif i = 2:
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
@@ -588,13 +582,13 @@ if $ARGS[0] = 'sleep':
 			sexunaware = 1
 			spafinloc = 11
 			gs 'cum_manage'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_8_' + rand(1,5) + '.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_8_<<rand(1,5)>>.jpg"></center>'
 			'After everything that happened tonight, you feel exhausted and fall asleep, you have a dream about warm wet drops landing on your face and lips, like a warm summers rain, you sleepily like at the drops.'
 		elseif i = 3:
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
-			if rand(0,1)=0:
+			if rand(0,1) = 0:
 				spafinloc = 3 & stat['hidden_anal'] += 1
 			else
 				stat['hidden_vaginal'] += 1
@@ -603,7 +597,7 @@ if $ARGS[0] = 'sleep':
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
-			if rand(0,1)=0:
+			if rand(0,1) = 0:
 				spafinloc = 3 & stat['hidden_anal'] += 1
 			else
 				stat['hidden_vaginal'] += 1
@@ -612,14 +606,14 @@ if $ARGS[0] = 'sleep':
 			gs 'npcgeneratec', 0, 'unconcious rapist', rand(17,22)
 			gs 'boyStat', $npclastgenerated
 			sexunaware = 1
-			if rand(0,1)=0:
+			if rand(0,1) = 0:
 				spafinloc = 3 & stat['hidden_anal'] += 1
 			else
 				stat['hidden_vaginal'] += 1
 			end
 			gs 'cum_manage'
 			i = rand(1,2)
-			if i = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_9_' + rand(1,2) + '.jpg"></center>'
+			if i = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_9_<<rand(1,2)>>.jpg"></center>'
 			if i = 2:'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_9_3.mp4"></video></center>'
 			'After everything that happened tonight, you feel exhausted and fall asleep, you have a dream about being impaled on a stake for all your sins, but surprisingly instead of hurting it feels wonderful.'               
 		end
@@ -630,49 +624,47 @@ if $ARGS[0] = 'sleep':
 		act 'Wake up':
 			*clr & cla
 			minut += 90
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_7.jpg"></center>'
 			'Anya shakes, yells and smacks you until you slowly wake up'
 			'She smiles at you. "Well it looks like you had fun tonight, how are you feeling?"'
 			'You groan, feeling sick, your head is pounding, you feel like your about to throw up and you are sore in more places than you can remember. "Go away and let me sleep you evil bitch."'
 			'Anya shakes you again. "Get up stupid, or our parents will kill us both, if you don''t come home tonight."'
-			if Rex_save =1 and Rex_Love =0:'As you leave the apartment, you gently kiss Rex on the cheek, thanking for the evening.'
-			if Rex_Love =1:'As you leave the apartment, you passionate kiss Rex on the lips, "Thank you for a lovely evening."'
-			if party_boys_in >=1:'As you leave the apartment, some drunk guys tell you they will miss you and sleep well, while laughing to each other.'
+			if Rex_save = 1 and Rex_Love = 0: 'As you leave the apartment, you gently kiss Rex on the cheek, thanking for the evening.'
+			if Rex_Love = 1: 'As you leave the apartment, you passionate kiss Rex on the lips, "Thank you for a lovely evening."'
+			if party_boys_in >= 1: 'As you leave the apartment, some drunk guys tell you they will miss you and sleep well, while laughing to each other.'
 			if hour < 22 and  hour > 18:
-				hour = 22
-				minut = 0
+				minut += ((21 - hour) * 60) + (60 - minut)
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Go home':gt 'bedrPar'
+				act 'Go home': gt 'bedrPar'
 			else 
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Go home':minut += 15 & gt'bedrPar'
+				act 'Go home':minut += 15 & gt 'bedrPar'
 			end
 		end
 	else
 		if hour < 9 and hour > 3 :
-			hour=9
+			pcs_sleep += (9 - hour) * 5
+			minut += ((8 - hour) * 60) + (60 - minut)
 			*clr & cla
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_7.jpg"></center>'
 			'Anya shakes you until you slowly wake up'
 			'She smiles at you. "Well it looks like you had fun tonight, how are you feeling?"'
 			'You groan, feeling sick, your head is pounding and you are sore in more places than you can remember. "Let me sleep sis, I''m sick."'
 			'Anya shakes you again. "Get up stupid, or our parents will kill us both, if they find out that we were not at home tonight."'
-			if Rex_save =1 and Rex_Love =0:'As you leave the apartment, you gently kiss Rex on the cheek, thanking for the evening.'
-			if Rex_Love =1:'As you leave the apartment, you passionate kiss Rex on the lips, "Thank you for a lovely evening."'
+			if Rex_save = 1 and Rex_Love = 0: 'As you leave the apartment, you gently kiss Rex on the cheek, thanking for the evening.'
+			if Rex_Love = 1: 'As you leave the apartment, you passionate kiss Rex on the lips, "Thank you for a lovely evening."'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go home':minut += 15 & gt'bedrPar'
+			act 'Go home': minut += 15 & gt 'bedrPar'
 		else
 			*clr & cla
 			minut += 90
-			gs'stat'
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_4_1.jpg"></center>'
 			*nl 'You woke up an hour later, the party was still in full swing.'
-			act 'Return to party':gt $loc,$metka
+			act 'Return to party': gt $loc, $metka
 		end
 	end
 end

+ 2 - 2
locations/dinSex.qsrc

@@ -300,14 +300,14 @@ if $ARGS[0] = 'boy_wants_anal':
 		end
 	end
 	if $ARGS[2] = 'lubri':
-		lubri +=1
 		'<<$bwa_boy>> takes a tube of lubricant, squeezes a little on <<$xyr>> palm and rubs your anus.'
 		gs 'arousal', 'anal_finger', 1,'lube' 
 	else
 		if lubri = 0:
 			'You have no lube, <<$bwa_boy>> spits on his fingers and using saliva he massages your anus.'
 			gs 'arousal', 'anal_finger', 1,'lube' 
-		elseif lubri > 0:
+		else
+			lubri -= 1
 			if rand(0,2) = 0: 
 				'You take a tube of lubricant and hand it to <<$bwa_boy>>, he squeezes a little on his palm and rubs your anus.'
 			elseif rand(0,1) = 0:

+ 14 - 1
locations/din_bad.qsrc

@@ -162,10 +162,23 @@ if $ARGS[0] = 'd_bag':
 		elseif preziktype < 2 and preziksabo = 0:
 			'You have <b><<prezik+prezikcount>></b> <a href="exec:dynamic $din_Switch_Condom_Menu">condoms left in your purse.</a>'
 		end
-		*nl
 	else
 		'You are out of condoms.'
 	end
+	if lubri > 0:
+		'You have <b><<lubri>></b> squirts of lubricant available'
+		if auto_anal_lube = 0:
+			'Automatically use for anal sex: <a href="exec:auto_anal_lube = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">No</a>'
+		else
+			'Automatically use for anal sex: <a href="exec:auto_anal_lube = 0 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Yes</a>'
+		end
+		if auto_vag_lube = 0:
+			'Automatically use for vaginal sex: <a href="exec:auto_vag_lube = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">No</a>'
+		else
+			'Automatically use for vaginal sex: <a href="exec:auto_vag_lube = 0 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Yes</a>'
+		end
+	end
+	*nl
 	if amphetamine > 0:	'You have <b><<amphetamine>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'
 	if joint > 0: 'You have enough weed for <b><<joint>></b> joints.'
 	if tabletki > 0 and pillsleft[ptype] > 0:

+ 2 - 2
locations/din_pav.qsrc

@@ -405,8 +405,8 @@ $pavser9 = {
 								cumprecheck = 1
 								gs 'cum_manage'
                                 '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/07.jpg" ></center>'
-                                'Your consciousness enables and disables in the wild dance of passion...'
-                                'He vashel in you wildly roughly furiously, I strung you on your cock like a cherry on a skewer...'
+                                'Your consciousness fades in and out in the wild passionate dance...'
+                                'He thrusts in you wildly, roughly, furiously. You feel like you are being skewered by the force and depth of his cock...'
 								
 								gs 'arousal', 'vaginal', 10, 'sub'
 								gs 'stat'

+ 1 - 1
locations/din_van.qsrc

@@ -681,7 +681,7 @@ $basin = {
 			minut += 1
 			deodorant -= 1
 			gs 'sweat', 'deo'
-			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
 			act 'Continue': menu_off = 0 & gt $loc, $metka
 		end

+ 0 - 402
locations/dinsister.qsrc

@@ -1,402 +0,0 @@
-# dinsister
-
-$sischecks = {
-	menu_off = 1
-	if npc_rel['A33'] < 20:
-		'Your relationship with your sister is scandalous.'
-	elseif npc_rel['A33'] >= 20 and npc_rel['A33'] < 40:
-		'Your relationship with your sister is tense.'
-	elseif npc_rel['A33'] >= 40 and npc_rel['A33'] < 60:
-		'You and your sister have a normal relationship.'
-	elseif npc_rel['A33'] >= 60 and npc_rel['A33'] < 80:
-		'You and your sister have a good relationship.'
-	elseif npc_rel['A33'] >= 80:
-		'You have a great relationship with your sister.'
-	end
-	*nl
-	if StrongNarkota = 0 and narkossister = 1:narkossister = 0
-
-		
-	if StrongNarkota > 20 and narkossister = 0 and narkossista = 0:
-		temp = RAND(1,100)
-		if temp >= 90:
-			dynamic $narkosisterspalila
-			exit
-		end
-	end
-
-	if narkossister = 1:
-		if StrongNarkota > 20:
-			*clr & cla
-			gs'stat'
-			if pcs_mood > 10: pcs_mood -= 10
-			'<center><img <<$set_imgh>> src="images/pc/newfear.jpg"></center>'
-			*nl
-			'I can not approach her junked up like this.'
-			
-			act 'Move away':gt $loc, $metka
-		end
-		
-		if StrongNarkota <= 20:
-			*clr & cla
-			gs'stat'
-			if pcs_mood > 10: pcs_mood -= 1
-			narkossister = 0
-			'<center><img <<$set_imgh>> src="images/pc/newfear.jpg"></center>'
-			*nl
-			'You tell yourself, "Come on <<$pcs_nickname>>, deep breath, focus, you can do this."'
-			'You feel your head is clear enough to talk to your sister once more.'
-			act 'Move away':gt $loc, $metka
-		end
-	end
-
-	if $clothingworntype = 'nude':
-		if sisterLesb = 0:
-			'Sister looks at you, her eyes wide. "<<$pcs_nickname>>, aren''t you ashamed to go naked here? At times like this, I just don''t understand you.'
-		else
-			'Sister looks at you, her eyes wide. "<<$pcs_nickname>>, you''re so liberated... I wish I could be so free spirited.'
-		end
-	end
-
-	if pirsA > 0 and pirsA < 10000 and pirsAsister = 0 and sisterpirsadaytalk ! daystart:
-		sisterpirsadaytalk = daystart
-		if rand(1,100) >= 75:
-			'Your sister looks you in the mouth. "<<$pcs_nickname>>, and what have you got there in your tongue?"'
-			act 'Nothing':
-				cla
-				'You shake your head. "Nothing." Then turn away, so that your sister does not see your pierced tongue.'
-				act 'Move away':gt $loc, $metka
-			end
-
-			act 'Show her your tongue piercing':
-				*clr & cla
-				pirsAsister = 1
-				npc_rel['A33'] += 1
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg"></center>'
-				*nl
-				'You open your mouth and stick out your tongue, showing your sister your tongue piercing.'
-				'Your sister smiles, "Wow, you go <<$pcs_nickname>>!"'
-				'She seems to approve and spends a few minutes asking you all about it.'
-				act 'Move away':gt $loc, $metka
-			end
-			exit
-		end
-	end
-
-	if pirsB > 0 and pirsB < 10000 and pirsBsister = 0:
-		'Sister looks at your lip, studying your piercing. "That''s so cool, and pretty, I love it!"'
-		act 'Thank you':
-			*clr & cla
-			pirsBsister = 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg"></center>'
-			*nl
-			'You thank your sister for her compliment instinctively playing with your new piercing.'
-			act 'Move away':gt $loc, $metka
-		end
-		exit
-	end
-
-	if pirsC > 0 and pirsC < 10000 and pirsCsister = 0:
-		pirsCsister = 1
-		'Your sister looks at your earrings and reaching up to hold and inspect one closely says, "Well, finally! I thought you would never get your ears pierced."'
-	end
-
-	if pirsD > 0 and pirsD < 10000 and pirsDsister = 0:
-		pirsDsister = 1
-		'Anya is clearly shocked by your nose ring: "Damn, <<$pcs_nickname>>, tell me who did this to you and I''ll get them for you."'
-		'She dances around you shadow boxing and you both end up laughing loudly.'
-	end
-
-	if pirsE > 0 and pirsE < 10000 and pirsEsister = 0:
-		pirsEsister = 1
-		'Your sister takes a good look at your eyebrow piercing and says, "Nice, but be careful, don''t accidentally get it caught on something!"'
-	end
-	
-	if npc_pregtalk['A33'] = 0 and (($clothingworntype = 'nude' and pregchem > 2688) or ($clothingworntype ! 'nude' and pregchem > 3600)):
-		npc_pregtalk['A33'] = 1
-		if $clothingworntype ! 'nude' and pregchem > 3600:
-			'With surprise your sister says, "You''re pregnant, <<$pcs_nickname>>!"'
-			'"How the hell can you tell?"'
-			'With a smile, she says, "I have a bionic eye." As she reaches out and rubs your protruding belly, "So, do you know who the father is?"'
-		else
-			'You sister looks at your belly with surprise. "<<$pcs_nickname>>, are you pregnant? And from whom are you pregnant?'
-		end
-		$tmpstr = ''
-		$tmpstr2 = ''
-		KILLVAR '$specfath'
-		KILLVAR '$regfath'
-
-		if arrpos('$wombpotfath', 'unknown') ! -1 or (arrpos('$wombpotfath', '') ! -1 and arrpos('$wombpotfath', '') < arrsize('$wombpotfath')):
-			$tmpstr = 'I slept with a guy and didn''t even know his name, but '
-		end
-
-		idx = 0
-		sz = arrsize('$wombpotfath')
-		:fathlistloop
-		if idx < sz:
-			$fath = $npc_usedname[$wombpotfath[idx]]
-			if $fath = 'Roma' or $fath = 'Kolka' or $fath = 'Stepfather' or $fath = 'Mikhail, your birthfather':
-				if $fath = 'Mikhail, your birthfather': $fath = 'our real father'
-				$specfath[arrsize('$specfath')] = $fath
-			else
-				if $fath = 'unknown' or $fath = '':
-					$fath = 'someone I don''t know'
-				else
-					if $tmpstr2 ! '': $tmpstr2 = '<<$tmpstr2>> or '
-					$tmpstr2 = '<<$tmpstr2>><<$fath>>'
-				end
-			end
-			idx += 1
-			jump 'fathlistloop'
-		end
-
-		if arrsize('$specfath') > 0 and npc_rel['A33'] > 50:
-			$tmpa = ''
-			if $tmpstr2 ! '':
-				$tmpa = ' You decide to start by telling her the easy news. "Oh, sister, <<$tmpstr>>it''s possible the father is <<$tmpstr2>>. I think it could also be someone we know.'
-			else
-				$tmpa = ' You look at her for a moment and then say, "Oh, sister, I think the father might be someone we know."'
-			end
-			'You realize that telling her who the father might be could be difficult.<<$tmpa>>'
-			idx = 0
-			sz = arrsize('$specfath')
-			if sz > 1:
-				$tmpb = 'begin by telling her '
-			else
-				$tmpb = 'tell her '
-			end
-			$tmpc = ''
-			:hardfathloop
-			if idx < sz:
-				$fath = $specfath[idx]
-				if $fath = 'Roma':
-					'You <<$tmpb>>the father might <<$tmpc>>be Roma.'
-					'"You mean my Roma?"'
-					'You nod with a forced smile.'
-					'"Oh, I am so sorry, <<$pcs_nickname>>! This is probably my fault.", she says and hugs you to her strongly.'
-					pcs_mood += 50
-				elseif $fath = 'Kolka':
-					'You <<$tmpb>>the father could <<$tmpc>>be Kolka.'
-					'"Seriously? Our little brother?" she asks with a little shock, then quietly asks you. "So, how is he in the bed?"'
-					'You feel yourself blushing, as you murmur, "He is really good."'
-				elseif $fath = 'Stepfather':
-					'You <<$tmpb>>the father could <<$tmpc>>be your stepfather.'
-					'"Oh, what a slut you are!" she smiles happily. "Do you think he will notice it too?"'
-				elseif $fath = 'our real father':
-					'You <<$tmpb>> the father might conceivably <<$tmpc>>be your real father.'
-					'Your Sister looks at you with shock - or maybe a little jealousy? "<<$pcs_nickname>>, how did you even find him?"'
-					'You explain how you tracked him down through the truck drivers to the where he works now, and how your relationship quickly grew into something unexpected for both of you. "I haven''t told him," you tell her. "Maybe I should. I don''t know."'
-					'She listens intently to your story and gives you a hug when you finish. "I don''t know either, <<$pcs_nickname>>, but I hope you take me to meet him someday."'
-				end
-				if idx = 0 and sz > 1:
-					$tmpc = 'also '
-					$tmpb = 'continue your confession by telling her '
-				elseif sz > 2 and idx = sz - 2:
-					$tmpb = 'finish your confession by saying that '
-				end
-				idx += 1
-				jump 'hardfathloop'
-			end
-		else
-			if arrsize('$wombpotfath') = 0:
-				'"Oh, sister, I have no idea who the father could be! I''m not even sure how I got pregnant!"'
-			elseif arrsize('$wombpotfath') = 1:
-				if $wombpotfath[0] = '' or $wombpotfath[0] = 'unknown':
-					'"Oh, sister, I have no idea whom the father could be!"'
-				else
-					'"Oh, sister, <<$tmpstr>>I think the father is <<$tmpstr2>>."'
-				end
-			else
-				'"Oh, sister, <<$tmpstr>>I think the father is <<$tmpstr2>>"'
-			end
-		end
-	end
-	
-	if cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pav_slut < 75:
-		sisterknowslut = 1
-		'Your Sister looks at you, "<<$pcs_nickname>>, what is that?". Suddenly, her eyes narrow, "<<$pcs_nickname>>, yes it''s sperm! My little sister, well, well! It''s a good thing I noticed, what if it had been <<$npc_nickname[''A29'']>>?!"'
-	elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pav_slut >= 75 and sisterknowslut = 0:
-		sisterknowslut = 1
-		'Your Sister looks at you, "<<$pcs_nickname>>, so the rumours are true, you are <<$gnikname>>"'
-	elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and pav_slut >= 75 and sisterknowslut > 0:
-		'Your Sister looks at you, "<<$pcs_nickname>>, up to your usual tricks? You could at least wash yourself."'
-	end
-}
-
-$narkosisterspalila = {
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-	!'sister slept on drugs.'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	*nl
-	'"Come on, keep it together, act sober." You think. "I have just got talk normal and not think about it."'
-	'Your sister looks at you quizzically. "Are you stoned <<$pcs_nickname>>?"'
-	act'No':
-		cla
-		set narkossister = 1
-		gs'stat'
-		'You adversely shake your head "No." You back away, but it''s very clear you sister could tell that you are stoned.'
-		act 'Move away':gt $loc, $metka
-	end
-	act'Share':
-		*clr & cla
-		set narkossista = 1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-		*nl
-		'You tell your sister, that you learned where to buy drugs, and you really wanted to try and it is just this once never again.'
-		'Your sister strictly looks at you and says, "<<$pcs_nickname>> I''m not your mother, who would kill you if she found out, but this is the first and last time. It''s not worth it!'
-		'If you continue, then your whole life will not be worth shit.'
-		act 'Move away':gt $loc, $metka
-		exit
-	end
-}
-
-$d_sister[1]={
-	menu_off = 1
-	!scandal with her sister
-	'You are trying to talk to your sister but she refuses to talk to you.'
-	if sistersorryday!daystart:
-		act'Apologize':
-		cla
-		sistersorryday=daystart
-		npc_rel['A33'] +=(pcs_intel/10)+(pcs_apprnc/20)
-		gs'stat'
-		'You apologize to your sister and it seems she forgives you.'
-		act 'Move away':gt $loc, $metka
-		end
-	end
-}
-$d_sister[2]={
-	menu_off = 1
-	!strained relations
-	'You are trying to talk to your sister but she just cuts you off bluntly.'
-	if sistersorryday!daystart:
-		act'Try to smooth your relations':
-		cla
-		sistersorryday=daystart
-		npc_rel['A33'] +=(pcs_intel/10)+(pcs_apprnc/20)
-		gs'stat'
-		'You suck up to your sister and she appears to be slowly treating you better.'
-		act 'Move away':gt $loc, $metka
-		end
-	end
-}
-$d_sister[3]={
-	!good relationship
-	'You start a conversation with your sister.'
-	
-	if trfatherQW = 0 and rand(0,2) = 0:
-		trfatherQW = 1
-		'You ask about your real father, Anya grins, "<<$pcs_nickname>>, I was 4 years old when they broke up. I don''t even remember what he looks like. <<$npc_nickname[''A29'']>> does not like to talk about him, but as you know, our real father went to live in another town. I also remember, he worked as a long-distance truck driver, maybe sometimes he passes through Pavlovsk."'
-	else 
-		sisterTalk = rand (1,18)
-		if sisterTalk = 1:
-			'As you chat with your sister, she says it is possible to rent an apartment in the city and live and work there, but she is happy living in Pavlovsk.'	
-		end
-		if sisterTalk = 2:
-			'You chat with your sister, Anya, she tells you the tailor at the Garment factory is a creep who makes his customers wait around in their underwear.'
-		end
-		if sisterTalk = 3:
-			'You ask Anya about the University. She grins, "I almost went, passed the entrance exam. However, I started working in the summer and got used to having cash. What can I buy with a diploma?"'
-		end
-		if sisterTalk = 4:
-			'You ask Anya about her boyfriend. She smiles, "Well, I have a boyfriend. Although nothing serious. It''s more like friends with benefits."'
-		end
-		if sisterTalk = 5:
-			'You start talking with Anya, she tells you about the boys she met, parties she''s been to and cosmetics.'
-		end
-		if sisterTalk = 6:
-			'You chat with your sister, she tells you about the new dress she brought at the store today.'
-		end
-		if sisterTalk = 7:
-			'You chat with your sister about movie stars, discussing and sharing fantasies about them, and arguing about which ones are sexier.'
-		end
-		if sisterTalk = 8:
-			'Anna talks about sports clubs in the community center, and how sport is very good for the figure, but she is too lazy to go there.'
-		end
-		if sisterTalk = 9:
-			'Anya says, that one of her friends had a kid, but the father denies it and she''s left looking after her kid alone. She says, that if you are smart, you will buy the pill from the pharmacy.'
-		end
-		if sisterTalk = 10:
-			'Anya says, one winter she went out without a coat and caught a bad cold. You remind her that she spend the whole time complaining about it to you.'
-		end
-		if sisterTalk = 11:
-			'You chat with your sister, discussing the latest trends in fashion.'
-		end
-		if sisterTalk = 12:
-			'Anya tells you how used to try various fad diets to make herself beautiful. However she was under weight, her skin looked gaunt and she kept getting acne. Since quitting the diets she is much healthier and looks more beautiful every day.'
-			'The last part has you both laughing.'
-		end
-		if sisterTalk = 13:
-			'You chat with your sister and she tells you that she went dancing before, but she quickly got tired.'
-		end
-		if sisterTalk = 14:
-			'You chat with your sister and she advises you where you can earn some money.'
-		end
-		if sisterTalk = 15:
-			'You chat with your sister and she tells you that you can find a lot of interesting bargains if you wander through the market.'
-		end
-		if sisterTalk = 16:
-			'Anya tells you horror stories about a pretty girl who didn''t wash or shave her legs, and how it became so terrible, that she looked like a bum and had no friends. She advises you to take care of your body.'
-		end
-		if sisterTalk = 17:
-			'You chat with your sister and she tells you about one of her weird ex-boyfriends who was always so poetically dramatic. In particular, she tells you about how he broke up with her. "He said: Anya, my love, I so deeply cherish you, but we are not meant to be. Like water and oil, no matter how hard we try, we cannot be together!"'
-		end
-		if sisterTalk = 18:
-			'You chat with your sister, Anya, she asks you how you feel about women''s sexual rights. You spend some time having a very frank and quite revealing conversation.'
-		end
-	end
-}
-
-$d_sistersexstories[1]={
-gs'stat'
-sisterStories = rand (1,8)
-	if sisterStories = 1:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister1.jpg"></center>'
-	*nl
-	'Your sister boasts to you about how good her boyfriend is in bed.'
-	end
-	if sisterStories = 2:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister2.jpg"></center>'
-	*nl
-	'Your sister tells you a story about her and her girlfriend sucking off their friend on his birthday.'
-	end
-	if sisterStories = 3:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister3.jpg"></center>'
-	*nl
-	'Your sister reveals to you that she just loves it in the ass. With mother having her innocence checked, she cheated a little. With a little blush she tells you that she enjoyed it very much.'
-	end
-	if sisterStories = 4:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister4.jpg"></center>'
-	*nl
-	'Your sister tells you about how she gave her boyfriend a blowjob, "Oh, You should have seen his face!"'
-	end
-	if sisterStories = 5:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister5.jpg"></center>'
-	*nl
-	'Your sister tells you about when in school she got a classmate to help her study foreign languages.'
-	end
-	if sisterStories = 6:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister6.jpg"></center>'
-	*nl
-	'Your sister reveals to you, that she just loves when she is fucked in the mouth.'
-	end
-	if sisterStories = 7:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister7.jpg"></center>'
-	*nl
-	'Your sister reveals to you, that at a party she gave herself to two men at the same time.'
-	end
-	if sisterStories = 8:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister8.jpg"></center>'
-	*nl
-	'Your sister admits to you that she wants to have sex with a black man.'
-	end
-}
-
---- dinsister ---------------------------------
-

+ 1 - 0
locations/dk.qsrc

@@ -261,6 +261,7 @@ if $ARGS[0] = 'holl':
 									'At some point, you feel a sticky, lubed-up finger probing your ass, adding to the sensations from your pussy. With every thrust of your and Alexei''s hips, he pushes his finger deeper into your ass and moves it around in there.' 
 									'Then, without warning, he removes his finger, pulls his dick out of your pussy and sticks pushes it into your prepared anus.'
 									gs 'arousal', 'anal_finger', 10, 'sub'
+									anal_slip += 4
 									gs 'arousal', 'anal', 10, 'sub'
 									minut -= 10
 									gs 'stat'

+ 7 - 1
locations/dorm.qsrc

@@ -261,6 +261,7 @@ if $ARGS[0] = 'demarcusfuck':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra4.jpg"></center>'
 			'DeMarcus pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
+			anal_slip += 4
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal', 20, 'rough'
 		elseif afrand1 = 5:
@@ -280,6 +281,7 @@ if $ARGS[0] = 'demarcusfuck':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra16.jpg"></center>'
 			'DeMarcus pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
+			anal_slip += 4
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal', 20, 'rough'
 		elseif afrand1 = 7:
@@ -290,6 +292,7 @@ if $ARGS[0] = 'demarcusfuck':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra13.jpg"></center>'
 			'DeMarcus throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
 			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
+			anal_slip += 4
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal', 20, 'rough'
 		elseif afrand1 = 8:
@@ -300,6 +303,7 @@ if $ARGS[0] = 'demarcusfuck':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra20.jpg"></center>'
 			'DeMarcus lays on the bed, you stradle him and force your asshole down on his huge black cock.'
 			'You ride his thick cock until you orgasm a few times. He cums inside you and passes out.'
+			anal_slip += 4
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal', 20, 'rough'
 		elseif afrand1 = 9:
@@ -371,11 +375,12 @@ if $ARGS[0] = 'demarcusfuck':
 end
 
 if $ARGS[0] = 'afragangfuck':
+	afrdormgangbang += 1
 	menu_off = 1
 	$location_type = 'event'
 	reccoldorm = 0
 	afraflag = 0
-	hour += 2
+	minut += 120
 	'You knock on door and are greeted by a huge black guy. He grabs you by the arm and drags you into the room, in where you see five Africans. They surround you and immediately begin grabbing your breasts and ass.'
 	'They speak a lot in their native language but there are some words you''re able to pick up, cumdump, whore, white trash, bimbo slut.'
 	afrand = rand(1, afra)
@@ -767,6 +772,7 @@ if $ARGS[0] = 'goshifuck':
 		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh12.jpg"></center>'
 
 		'Gosha lubricates your asshole and starts pushing his fingers in. After a while he deems you ready, he takes out his cock and thrusts deeply into your ass. He fucks you for some time and ends by cumming inside of you.'
+		anal_slip += 4
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_finger', 10
 		gs 'arousal', 'anal', 10, 'rough'

+ 5 - 7
locations/down.qsrc

@@ -59,10 +59,9 @@ gs'street_event','down', 'extras'
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
 if shantpopala > 0:
-	cla
-	*clr
+	*clr & cla
 	menu_off = 0
-	hour += 8
+	minut += 480
 	spafinloc = 14
 	gs 'cum_manage'
 	gs 'cum_manage'
@@ -91,11 +90,10 @@ if shantpopala > 0:
 	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
 	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
 
-	gs 'arousal', 'bj', 60, 'sub', 'gangbang','humiliation', 'rough'
-	gs 'arousal', 'vaginal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
-	gs 'arousal', 'anal', 60, 'sub', 'gangbang', 'humiliation', 'rough'
+	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
+	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
+	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'end'
-	minut -= 60
 	gs 'stat'
 
 	act 'Leave':gt $curloc

+ 53 - 0
locations/ender.qsrc

@@ -223,6 +223,28 @@ if $ARGS[0] = 'loss':
 		*nl
 		'With tears rolling down your face you slowly get up and do your best to pull your clothes into place to cover up. They are just ruined, you gingerly walk away.'
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		mood -= 20
+		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
+		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
+		act 'Do as she says':
+			cla & *clr
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
+			*nl
+			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+			*nl
+			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+			gs 'pain', 1, 'labia', 'kick'
+			act 'Walk off': gt 'gLake'
+		end
 	end
 end
 
@@ -379,6 +401,13 @@ if $ARGS[0] = 'win':
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		fightEnding = 0
+		Win += 1
+		mood += 10
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/losefight.jpg"></center>'
+		'Christina is a hell of a fighter, she is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave it as far as you can out into the lake where it plops into the water. Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
+		act 'Walk off': gt 'gLake'
 	end
 end
 
@@ -659,6 +688,30 @@ if $ARGS[0] = 'surrender':
 
 		if pcs_health < 100: pcs_health = 100
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		mood -= 20
+		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
+		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight.'
+		'In the end you find you are no match for her, you fall onto your back and hold you hands up to signal your surrender. You know you can''t win at this point so you just lay there.'
+		'Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
+		act 'Do as she says':
+			cla & *clr
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
+			*nl
+			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+			*nl
+			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+			gs 'pain', 1, 'labia', 'kick'
+			act 'Walk off': gt 'gLake'
+		end
 	end
 end
 

+ 4 - 9
locations/event.qsrc

@@ -3,8 +3,6 @@ if $ARGS[0] = 'klof 2':
 	cla
 	*clr
 	minut += 5
-	cla
-	*clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/15 1.jpg"></center>'
 	'"Well baby, come and see us if you want more entertainment, and if you behave, you can earn some cash"'
@@ -217,6 +215,7 @@ if $ARGS[0] = 'dima4':
 	gs 'arousal', 'bj', 10, 'sub', 'group', 'deepthroat', 'rough'
 	gs 'arousal', 'vaginal_finger', 10, 'sub', 'group', 'rough'
 	gs 'arousal', 'anal_finger', 10, 'sub', 'group', 'rough'
+	anal_slip += 4
 	gs 'arousal', 'anal', 10, 'sub', 'group', 'rough'
 	minut -= 30
 	gs 'stat'
@@ -478,10 +477,8 @@ if $ARGS[0] = 'dima21':
 end
 
 if $ARGS[0] = 'dima30':
-	cla
-	clr
-	*clr
-	hour += 3
+	*clr & cla
+	minut += 180
 	dimaQW = 2
 	gs 'stat'
 	'I confess, I am a sinner, a writer from me worthless, and all my dark little thoughts went to the recent arrival of women. If there are interesting ideas/scenarios to continue - fling in a personal, zabubenyu'
@@ -490,9 +487,7 @@ if $ARGS[0] = 'dima30':
 end
 
 if $ARGS[0] = 'dima31':
-	cla
-	clr
-	*clr
+	*clr & cla
 	minut += 30
 	dimaQW = 2
 	gs 'stat'

+ 12 - 12
locations/events.qsrc

@@ -215,33 +215,33 @@ if $ARGS[0] = 'snkayf':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'
 	if snkz = 1:
-		hour += 2
+		minut += 120
 		gt'gdk'
 	end
 
 	if snkz = 2:
-		hour += 2
+		minut += 120
 		gt 'gskver', 'start'
 	end
 
 	if snkz = 3:
-		hour += 2
+		minut += 120
 		gt'bedrPar'
 	end
 
 	if snkz = 4:
-		hour += 2
+		minut += 120
 		gt'gopskver'
 	end
 
 	if snkz = 5:
-		hour += 2
+		minut += 120
 		gt 'pavtrainhall', 'female'
 	end
 
 	if snkz = 6:
 		gs 'clothing', 'strip'
-		hour += 2
+		minut += 120
 		gt'Glake'
 	end
 end
@@ -328,32 +328,32 @@ if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	gs 'underwear', 'remove'
 	if snkz = 1:
-		hour += 2
+		minut += 120
 		gt'park','start'
 	end
 
 	if snkz = 2:
-		hour += 2
+		minut += 120
 		gt'down'
 	end
 
 	if snkz = 3:
-		hour += 2
+		minut += 120
 		gt'nord'
 	end
 
 	if snkz = 4:
-		hour += 2
+		minut += 120
 		gt'street'
 	end
 
 	if snkz = 5:
-		hour += 2
+		minut += 120
 		gt'dachi'
 	end
 
 	if snkz = 6:
-		hour += 2
+		minut += 120
 		gt'lake','start'
 	end
 end

+ 5 - 1
locations/exercise.qsrc

@@ -500,6 +500,7 @@ if $ARGS[0] = 'tier1':
 
 	gs 'sweat', 'add', 3
 	fat -= 1
+	pcs_energy -= 3
 	pcs_mood += 3
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += 1'
@@ -536,6 +537,7 @@ if $ARGS[0] = 'tier2':
 
 	gs 'sweat', 'add', 10
 	fat -= 2
+	pcs_energy -= 6
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(2,3)'
@@ -561,7 +563,7 @@ end
 
 if $ARGS[0] = 'tier3':
 	if ARGS[1] = 0:
-		minut += 15
+		minut += 12
 	else
 		minut += ARGS[1]
 	end
@@ -571,6 +573,7 @@ if $ARGS[0] = 'tier3':
 
 	gs 'sweat', 'add', 15
 	fat -= 3
+	pcs_energy -= 9
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(3,5)'
@@ -606,6 +609,7 @@ if $ARGS[0] = 'tier4':
 
 	gs 'sweat', 'add', 25
 	fat -= 4
+	pcs_energy -= 12
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(7,10)'

+ 7 - 7
locations/family.qsrc

@@ -64,25 +64,25 @@ if StoryLine = 1:
 
 			if hour < 7:
 				sisterHere = 1
-				'Your sister <a href="exec:gt ''sistersleep''">Anya</a> is asleep in her bed.'
+				'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 			end
 
 			if week >= 6:
 				if hour >= 7 and hour < 10:
 					sisterHere = 1
-					'Your sister <a href="exec:gt ''sistersleep''">Anya</a> is asleep in her bed.'
+					'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 				end
 
 				if hour = 10:
 					sisterHere = 2
 					sisterdialog = 3
-					'Your sister <a href="exec:gt ''sister''">Anya</a> is getting ready to go for a walk.'
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go for a walk.'
 				end
 			end
 
 			if hour >= 18 and sisboyparty_day + 1 ! daystart:
 				sisterHere = 2
-				'Your sister <a href="exec:gt ''sister''">Anya</a> is sitting on her bed, reading a book.'
+				'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 			elseif sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
 				*clr & cla
 				menu_off = 1
@@ -93,12 +93,12 @@ if StoryLine = 1:
 				'You notice that her hair, and all her clothes are smeared in sticky sperm.'
 				'In this state, she falls on the bed and instantly falls asleep.'
 				sisboyparty = 1
-				act 'Move away':gt $loc
+				act 'Move away': gt $loc
 				exit
 			elseif sisboyparty_day + 1 = daystart and hour >= 22:
 				sisterHere = 1
-				if sisboypartyQW = 1:sisboypartyQW = 2
-				if sisboyparty = -1:sisboyparty = 1
+				if sisboypartyQW = 1: sisboypartyQW = 2
+				if sisboyparty = -1: sisboyparty = 1
 				'Your drunken sister Anya is sound asleep in her bed.'
 			end
 		end

+ 104 - 0
locations/family_schedule.qsrc

@@ -0,0 +1,104 @@
+# family_schdule
+
+!!Each action will use '<name>loc' ie. momloc
+
+momloc = 0
+sdadloc = 0
+anyaloc = 0
+kolloc = 0
+
+!!---ANYA---------------------------------------
+
+if week <= 5:
+	if hour = 6 and minut < 45:
+		!!Asleep
+		anyaloc = 1
+	elseif hour = 7 and minut < 15:
+		!!Family breakfast
+		anyaloc = 2
+	elseif hour = 7 and minut < 30:
+		!!Helping mom clean up
+		anyaloc = 3
+	elseif hour < 8:
+		!!In Bedroom
+		anyaloc = 4
+	elseif hour = 8 and minut < 20:
+		!!Shower*
+        anyaloc = 5
+	elseif hour = 8 and minut < 30:
+		!!Walk to work
+		anyaloc = 6
+	elseif hour < 16:
+		!!Work
+		anyaloc = 7
+	elseif hour = 16 and minut < 10:
+		!!Walk home from work
+		anyaloc = 8
+	elseif hour < 18:
+		!!Personal activities: Relaxing in bedroom, working out at the community center, etc (this is also the time frame Roma comes over some times)
+		anyaloc = rand(9,11)
+	elseif hour = 18 and minut < 30:
+		!!Family dinner
+		anyaloc = 12
+	elseif hour < 22:
+		!!Goes out to hang out with friends/Roma (this could be random so sometimes she stays home to give Sveta more time to talk to her)
+		anyaloc = rand(13,15)
+	else
+		!!In her room
+		anyaloc = 15
+	end
+else
+	if week = 7 and hour < 2:
+		!!Goes to a party
+		anyaloc = 24
+	elseif week = 7 and hour = 2 and minut < 20:
+		!!In her room drunk after party
+		anyaloc = 25
+	elseif hour < 9:
+		!!Asleep
+		anyaloc = 1
+	elseif hour = 9 and minut < 20:
+		!!Eat something in kitchen
+		anyaloc = 16
+	elseif hour = 9 and minut < 40:
+		!!Shower*
+        anyaloc = 5
+	elseif hour < 10:
+		!!In Bedroom
+		anyaloc = 4
+	elseif hour < 16:
+		!!On nice days goes to the beach, sometimes goes to the city with friends, or stays at home watching tv or reading etc
+        anyaloc = rand(17,19)
+	elseif hour = 16 and minut < 15:
+		!!Walk to community center
+		anyaloc = 20
+	elseif hour = 17 and minut < 45:
+		!!Works out at the community center
+		anyaloc = 21
+	elseif hour < 18:
+		!!Walk home
+		anyaloc = 22
+	elseif hour = 18 and minut < 30:
+		!!Family dinner
+		anyaloc = 12
+    elseif hour < 19:
+		if week = 7:
+			!!helps mom clean up after dinner
+			anyaloc = 23
+		else
+			!!Goes to a party
+			anyaloc = 24
+		end
+	else
+		if week = 7:
+			!!in her room 
+			anyaloc = 15
+		else
+			!!Goes to a party
+			anyaloc = 24
+		end
+	end
+end
+
+--- family_schdule ---------------------------------
+

+ 2 - 2
locations/father.qsrc

@@ -134,14 +134,14 @@ if tatlip>0 and fatherTatLip=0 and npc_rel['A28']>=60:
     end
 end
 
-if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 2688:
+if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
     'Your stepfather looks at your belly with a surprised look on his face: "<<$pcs_nickname>>, you''re pregnant?"'
     if npc_sex['A28']!0:
         'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "It''s not mine, I hope?"'
     end
     npc_pregtalk['A28'] = 1
     
-elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 3600:
+elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
     'Your stepfather looks at your belly with a surprised look on his face: "<<$pcs_nickname>>, you''re pregnant?"'
     if npc_sex['A28']!0:
         'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "It''s not mine, I hope?"'

+ 30 - 29
locations/fathersex.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'fathercum_act1':
 		spafinloc = 0
 		gs 'cum_manage'
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie3.mp4"></video></center>'
-		'"Cum inside me Daddy!" you gasp, as you feel your stepfather''s grip on your waist tighten. You slam your hips back against his a few more times and you feel his dick erupting inside your pussy. A few seconds later he pulls out, a trail of his cum slowly leaking from your stretched womb.'
+		'"Cum inside me Daddy!" you gasp, as you feel your stepfather''s grip on your waist tighten. You slam your hips back against his a few more times and you feel his cock erupting inside your pussy. A few seconds later he pulls out, a trail of his cum slowly leaking from your stretched pussy.'
 		$orgasm_or = 'yes'
 		gs 'cuminsidereact'
 		gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -64,7 +64,7 @@ if $ARGS[0] = 'fathercum_act4':
 			pcs_horny = 0
 			gs 'cum_manage'
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
-			'For several minutes he pounds your pussy, as your pleasure mounts, you feel yourself close to climax, and you wrap your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his sperm deep inside you. '
+			'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning louldy as he fills you. '
 			$orgasm_or = 'yes'
 			gs 'cuminsidereact'
 			gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -76,11 +76,11 @@ if $ARGS[0] = 'fathercum_act4':
 				*clr & cla
 				gs 'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
-				'Overcome with desire, you rub his dick against your lips. "Let me clean that for you, Daddy" you say with a cute smile.'
+				'Overcome with desire, you rub his cock against your lips, looking up at him as you tease his cock. "Let me clean that for you, Daddy" you say with a cute smile.'
 				act 'Use your mouth':
 					*clr & cla
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
-					'You feel so good that you take the tip of his dick in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+					'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
 
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -95,7 +95,7 @@ if $ARGS[0] = 'fathercum_act4':
 			spafinloc = 0
 			gs 'cum_manage'
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie2.mp4"></video></center>'
-			'For several minutes he pounds your pussy, as your pleasure mounts, you feel yourself close to climax, and you wrap your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his sperm deep inside you. '
+			'For several minutes he pounds your pussy. As your pleasure mounts, you feel yourself close to climax, wrapping your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his cum deep inside you groaning loudly as he fills you. '
 			$orgasm_or = 'yes'
 			gs 'cuminsidereact'
 			gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -106,12 +106,12 @@ if $ARGS[0] = 'fathercum_act4':
 				*clr & cla
 				gs 'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_2.mp4"></video></center>'
-				'Overcome with desire, you rub his dick against your lips. "Let me clean that for you, Daddy" you say with a cute smile.'
+				'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
 
 				act 'Use your mouth':
 					*clr & cla
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4_3.mp4"></video></center>'
-					'You feel so good that you take the tip of his dick in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+					'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye, rolling your tongue around the head a little. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -123,19 +123,19 @@ if $ARGS[0] = 'fathercum_act4':
 						spafinloc = 0
 						gs 'cum_manage'
 						'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex6.mp4"></video></center>'
-						'Your dad takes you rough against the wall and start pounding your pussy'
+						'Your dad presses you against the wall and starts pounding your pussy, thrusting his throbbing cock deep inside you.'
 						gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex7.mp4"></video></center>'
-							'For several minutes he pounds your pussy, as your pleasure mounts, you feel yourself close to climax...'
+							'For several minutes he pounds your pussy, your pleasure mounting as you feel yourself close to climax...'
 							gs 'stat'
 							act 'fuck me dad...':
 								*clr & cla
 								'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/stairs/sex/sex9.mp4"></video></center>'
-								'"Tell me i fuck better than mom..." you moan as you feel yourself close to climax and you wrap your legs around him to pull him deeper inside. Suddenly he moans and begins pumping his sperm deep inside you. '
+								'"Tell me i fuck better than mom..." you moan as you feel your pleasure building, you wrap your legs around him to pull him deeper inside. Suddenly he moans thrusting his cock deep inside you, holding it there as he begins filling you with his seed. '
 								gs 'stat'
 								act 'Climax':
 									*clr & cla
@@ -144,7 +144,7 @@ if $ARGS[0] = 'fathercum_act4':
 									spafinloc = 0
 									gs 'cum_manage'
 									'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/cumvaginal1.mp4"></video></center>'
-									'while you pull him deeper inside, between his moans and sperm pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>> let''s make a baby."'
+									'With his cock deep inside you and between his moans and cum pumping deep inside you. your dad looks at you and says... "i love you <<$pcs_nickname>>."'
 									$orgasm_or = 'yes'
 									gs 'cuminsidereact'
 									gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -155,11 +155,11 @@ if $ARGS[0] = 'fathercum_act4':
 										pcs_horny += 0
 										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral8.mp4"></video></center>'
-										'Overcome with desire, you rub his dick against your lips. "Let me clean that for you, Daddy" you say with a cute smile.'
+										'Overcome with desire, you rub his cock against your lips, looking up at him as you tease him. "Let me clean that for you, Daddy" you say with a cute smile.'
 										act 'Use your mouth':
 											*clr & cla
 											'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,10.mp4"></video></center>'
-											'You feel so good that you take the tip of his dick in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
+											'You feel so good that you take the tip of his cock in your mouth, and affectionately begin to suck on it while looking him in the eye. The act of adoration renders your stepfather speechless. You give him a moment to recuperate while you gently suck on his cock. Eventually he manages to say: "Wow <<$pcs_nickname>>, that was amazing...", caressing your hair and watching as you slowly pull his cock from your mouth, smiling up at him. He then gathers his things and goes to the bathroom to clean up, leaving you alone in the room.'
 											gs 'arousal', 'end'
 											gs 'stat'
 											act 'Stand up':gt $loc, $metka
@@ -186,7 +186,7 @@ if $ARGS[0] = 'fathercum_act5':
 		gs 'cum_manage'
 		pcs_horny = 0
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim7.jpg"></center>'
-		'You slide off his cock and quickly grab it with your hand to finish him off. You place your other hand on your pussy and rub your clit furiously as you masturbate him. Right when you feel your own orgasm wash over you, jets of cum hit your face. After your orgasm, you fall down on the floor and need a bit to collect yourself. Your stepfather playfully squeezes your ass cheeks with a nod of approval and then goes to the bathroom to clean up, leaving you alone in the room.'
+		'You slide off of his cock and quickly grab it with your hand to finish him off. You place your other hand on your pussy and rub your clit furiously as you masturbate him. Right when you feel your own orgasm wash over you, jets of cum hit your face. After your orgasm, you fall down on the floor and need a bit to collect yourself. Your stepfather playfully squeezes your ass cheeks with a nod of approval and then goes to the bathroom to clean up, leaving you alone in the room.'
 
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'fathercum_act6':
 		gs 'cum_manage'
 		pcs_horny = 0
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim15.jpg"></center>'
-		'As he roughly fucks your throat, you can tell he''s getting close. Suddenly, he pulls his dick out. "<<$pcs_nickname>> baby, stick out your tongue" he orders, and mere seconds later you feel jets of cum. Some land on your tongue, some end up in your mouth. You swallow it all willingly, licking your lips and gently sucking the tip of his dick for a while until he tells you to stop.'
+		'As he roughly fucks your throat, you can tell he''s getting close. Suddenly, he pulls his cock out. "<<$pcs_nickname>> baby, stick out your tongue" he orders, and mere seconds later you feel jets of cum hitting your face. Some land on your tongue, some end up in your mouth. You swallow it all willingly, licking your lips and gently sucking the tip of his cock for a while until he tells you to stop.'
 
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -220,7 +220,7 @@ if $ARGS[0] = 'fatherblow1':
 		*clr & cla
 		if pcs_throat < dick: pcs_throat += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim3.jpg"></center>'
-		'After he plays with your anus for a little while, your stepfather suddenly pulls away from you. He quickly takes off his clothes, sits back in his chair and points down to his cock without saying a word. Not needing any more encouragement, you get down on your knees in front of him and open your mouth, taking most of his cock down your throat in one swift movement. Your stepfather lets out a moan of pleasure and throws back his head. "<<$pcs_nickname>>, you have a minute to lubricate my dick properly. You know where it''s going to go next." Getting giddy with excitement you realize it''s in your best interest to do as he says and continue to suck his cock with increased vigor, spreading as much saliva on it as you can.'
+		'After he plays with your ass for a little while, your stepfather suddenly pulls away from you. He quickly takes off his clothes, sits back in his chair and points down to his cock without saying a word. Not needing any more encouragement, you get down on your knees in front of him and open your mouth, taking most of his cock down your throat in one swift movement. Your stepfather lets out a moan of pleasure and throws back his head. "<<$pcs_nickname>>, you have a minute to lubricate my cock properly. You know where it''s going to go next." Getting giddy with excitement you realize it''s in your best interest to do as he says and continue to suck his cock with increased vigor, spreading as much saliva on it as you can.'
 		gs 'fathersex', 'fathersex_act1'
 		gs 'fathersex', 'fathersex_act2'
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'fatherblow4':
 	*clr & cla
 	if pcs_throat < dick: pcs_throat += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim3.jpg"></center>'
-	'Not needing any more encouragement, you get down on your knees in front of him and start to lick the tip of his cock as you look him in the eyes. "Does this make you feel good, Daddy?" you ask between licks. Then, deciding you have teased him enough, you take his dick in your mouth and diligently start to suck.'
+	'Not needing any more encouragement, you get down on your knees in front of him and start to lick the tip of his cock as you look him in the eyes. "Does this make you feel good, Daddy?" you ask between licks. Then, deciding you have teased him enough, you take his cock in your mouth and diligently start to suck.'
 	gs 'fathersex', 'fathersex_act1'
 	gs 'fathersex', 'fathersex_act2'
 	gs 'fathersex', 'fatherblow3'
@@ -347,7 +347,7 @@ if $ARGS[0] = 'fatherother_act1':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim9.jpg"></center>'
 		'Your stepfather is very much on board with this idea, and his tugging on the plug increases. A few seconds later it comes out with a loud pop, and you feel the cool air of the room filling your rectum. Your stepfather is equally enthusiastic and intimidated by the size of your gape: "Wow <<$pcs_nickname>>! That is one hugely stretched hole... how did you even do that?"'
 		'Knowing he is an ass man and probably has seen more than a few stretched sphincters in his days, you feel an odd sense of accomplishment. "I just want to make you feel good, Daddy..." you mutter, and he nods. "I know you do baby, and I know you will."'
-		'He quickly takes off his clothes and scoots down next to you, his erect dick poking up like a flag mast. "Go on <<$pcs_nickname>>, make Daddy feel good."'
+		'He quickly takes off his clothes and scoots down next to you, his erect cock poking up like a flag mast. "Go on <<$pcs_nickname>>, make Daddy feel good."'
 
 		gs 'arousal', 'anal_dildo', 10, 'sub', 'incest'
 		gs 'stat'
@@ -362,9 +362,9 @@ if $ARGS[0] = 'fatherother_act2':
 		*clr & cla
 		pcs_ass += 2
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim9.jpg"></center>'
-		'You''re so excited that you immediately get on top of him and gently gyrate your hips against his dick. You spit some saliva onto your fingers before reaching back and rubbing it over his rod. Then you rub his dick against your fairly loose asshole. His dick is big though. With a loud moan you slowly lower yourself onto his erect cock, taking about half of it in before pausing. "Just taking a second to get used to the size Daddy, your dick is too big for me to just slam down on right away," you apologize. "That''s okay sweetie, take your time", he replies, still not believing what''s happening. You gently bob your ass a bit, stimulating his dick while you mentally prepare yourself to take the rest in.'
+		'You''re so excited that you immediately get on top of him and gently gyrate your hips against his dick. You spit some saliva onto your fingers before reaching back and rubbing it over his rod. Then you rub his cock against your fairly loose asshole. His cock is big though. With a loud moan you slowly lower yourself onto his erect cock, taking about half of it in before pausing. "Just taking a second to get used to the size Daddy, your cock is too big for me to just slam down on right away," you apologize. "That''s okay sweetie, take your time", he replies, still not believing what''s happening. You gently bob your ass a bit, stimulating his cock while you mentally prepare yourself to take the rest in.'
 		'Your stepfather was not expecting this at all, when he gave you the initiative. Nevertheless, he is delighted by your eagerness to please him and he puts his hands behind his head, content to let you do all the work. Not wanting to disappoint him you continue, and lower yourself onto his cock further and further until you feel his balls resting against your ass cheeks. "One more break, Daddy... it just feels so good", you whisper. He has his eyes closed by now, fully focused on the pleasure you''re giving him. After a few seconds you decide you''re ready and soon the room is filled with the sound of your butt cheeks enthusiastically slapping against his thighs, combined with your high-pitched moans. Before too long your stepfather puts his hands on your hips trying to slow you down, saying he''s ready to cum.'
-
+		anal_slip += 4
 		gs 'arousal', 'anal', 10, 'sub', 'incest'
 		gs 'stat'
 
@@ -383,8 +383,9 @@ if $ARGS[0] = 'fathersex_act1':
 		pcs_ass += 2
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim4.jpg"></center>'
 		'Just as you were getting into the groove of things, your stepfather gently but surely moves your head away from his groin and pulls you up by the shoulder. He gives you a playful slap on the ass and says "Alright <<$pcs_nickname>>, time''s up." You meekly nod. He takes you to their bedroom and unceremoniously throws you face-down onto the bed, immediately mounting you.'
-		'You know what he wants, and spread your ass cheeks with your hands to allow him easier access. You quietly thank yourself for doing such a good job lubing him up when you feel his stiff cock press hard against your sphincter, working its way in. He lets you get used to the feeling at first, but gets impatient after a few seconds and roughly shoves the rest of his dick in. You scream and your asshole unvoluntarily tightens when he does, provoking a moan from him. "You like this, don''t you <<$pcs_nickname>>? You like it when I put my dick in your ass, I can feel your squeezing. Don''t worry baby, I''ll make you feel real good", he whispers into your ear as he begins to fuck your ass with long, slow thrusts.'
+		'You know what he wants, and spread your ass cheeks with your hands to allow him easier access. You quietly thank yourself for doing such a good job lubing him up when you feel his stiff cock press hard against your sphincter, working its way in. He lets you get used to the feeling at first, but gets impatient after a few seconds and roughly shoves the rest of his cock in. You scream and your asshole involuntarily tightens when he does, provoking a moan from him. "You like this, don''t you <<$pcs_nickname>>? You like it when I put my cock in your ass, I can feel your squeezing. Don''t worry baby, I''ll make you feel real good", he whispers into your ear as he begins to fuck your ass with long, slow thrusts.'
 		'His rougher than expected entry hurts a bit at first, but you know that feeling will soon pass. "I love it, Daddy. Just go slow for a moment please, you''re so big", you whisper. Your stepfather grunts and takes pity on you, slowing down his thrusting for a little while. You bite down on the pillow and meekly suffer through it, and soon enough the pain starts to dissipate. "You okay sweetie?" he asks with some concern in his voice, noticing you''re having a rough time with it. When you nod he tests you, slowly increasing the power in his thrusts, and really starts to pound your asshole when he doesn''t notice any objections from you. Within seconds the room is filled with the sounds of flesh slapping against flesh, your high-pitched cries and his low groans. His balls do a nice job of stimulating your pussy as he roughly fucks you on the bed, making you feel all tingly on the inside.'
+		anal_slip += 4
 		gs 'arousal', 'anal', 10, 'sub', 'incest'
 		gs 'stat'
 		set fathercum = rand(1,2)
@@ -393,7 +394,7 @@ if $ARGS[0] = 'fathersex_act1':
 			sexpartkno = 1
 			spafinloc = 3
 			gs 'cum_manage'
-			'The thrusting of your stepfather becomes more erratic and intense and suddenly you feel him bucking against you, his dick throbbing heavily inside you. You feel a pleasant warmth spreading. When he moves away from you and crashes down next to you on the bed, he tells you what a great buttslut you are with a satisfied grin on his face.'
+			'The thrusting of your stepfather becomes more erratic and intense and suddenly you feel him bucking against you, his cock throbbing heavily inside you. You feel a pleasant warmth spreading. When he moves away from you and crashes down next to you on the bed, he tells you what a great buttslut you are with a satisfied grin on his face.'
 			gs 'stat'
 			act 'Wink and get off the bed':gt $loc, $metka
 		else
@@ -401,8 +402,8 @@ if $ARGS[0] = 'fathersex_act1':
 				*clr & cla
 				pcs_horny = 100
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cowgirl/cowgirl_rub.mp4"></video></center>'
-				'"I love you Daddy... Please I want your dick in my ass, fuck me harder than you fuck mom..."'
-                act 'Daddy fill my ass!!!:
+				'"I love you Daddy... Please I want your cock in my ass, fuck me harder than you fuck mom..."'
+                act 'Daddy fill my ass!!!':
 					*clr & cla
 					money += 1000
 					gs 'boyStat', 'A28'
@@ -412,7 +413,7 @@ if $ARGS[0] = 'fathersex_act1':
 					'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampieA1.mp4" ></video></center>'
 					gs 'arousal', 'anal', 10, 'sub', 'incest'
 					gs 'stat'
-					'From his increasingly intense and erratic thrusts, you can tell your stepfather is about to finish.'
+					'From his increasingly intense and erratic thrusts, you can tell your stepfather is about to cum.'
 					'You feel a pleasant warmth spreading. When he moves away from you and crashes down next to you on the bed, he tells you what a great buttslut you are with a satisfied grin on his face.'
 					act 'Dad wants your front door...':
 						*clr & cla
@@ -421,7 +422,7 @@ if $ARGS[0] = 'fathersex_act1':
 						act 'Hard pounding vag':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog2.mp4"></video></center>'
-							'Dad, fucks you nicely, you feel the warm in your body, taking waves of desire at every thrust... of pasion'
+							'Your stepfather slams his cock in to you hard and deep, his unrelenting pounding making your tits bounce. Your moans coming out as half screams of pure pleasure. '
 							act 'Cum...':
 								*clr & cla
 								money += 1000
@@ -460,7 +461,7 @@ if $ARGS[0] = 'fathersex_act2':
 			'Even though it was not part of his plan, your stepfather just grins and gives your exposed ass a hard slap. "Alright <<$pcs_nickname>>, if that''s the way you want to play it...".'
 			'You see him taking position behind you when you look between your legs, and within seconds you have of his two fingers thrusted deep into your ass. Lucky for you, he had the decency to lubricate them first so it doesn''t hurt, even though it does feel a bit uncomfortable at first. He then spits on your asshole a few times and you feel the saliva settling on it. "I''m not sure you did a good enough job for what I''m about to do, <<$pcs_nickname>>... consider this a bonus", he says before rubbing his hard rod against your anus, coating it with the mixture of his and your saliva.'
 			'Despite his tough talk, your stepfather really does try to make this an enjoyable experience for you too. After playing with your asshole a little longer, he puts the head of his penis against your sphincter. Trying to accommodate him, you relax your anus as much as possible, and before you know it he''s all the way inside you. Your stepfather is in no rush, and slowly gyrates his hips a bit as he gives you time to get used to the size of his dick. Once he realizes you''re okay, he focuses more on his own pleasure and increases the tempo more and more until he is roughly pounding you. You cast a slightly concerned look at the doorway, and second guess your decision to tease him in the hallway for a second, but then your arousal takes over and you focus on the pleasurable feelings his rough thrusting provides.'
-
+			anal_slip += 4
 			gs 'arousal', 'anal_finger', 10, 'sub', 'incest'
 			gs 'arousal', 'anal', 10, 'sub', 'incest'
 			minut -= 10
@@ -472,7 +473,7 @@ if $ARGS[0] = 'fathersex_act2':
 				sexpartkno = 1
 				spafinloc = 3
 				gs 'cum_manage'
-				'As your mind tries to process all the sensations, you suddenly feel an intense warmth spreading inside you. Your stepfather pulls out his dick, and a slow trail of his cum slowly drips out of you and onto the carpet. Apparently the feelings of your tight ass milking his cock were too much for him to be able to hold out any longer. You slightly regret not getting to orgasm yourself, but then realize your teasing is what got him into this riled up state in the first place, and can''t really blame him. You would feel awkward asking him to finish you off after he has already had his fun, and just suffer in silence. He gets back up on his feet and looks down at your sprawled position on the floor. Your legs are all wobbly when you try to stand up and he helps you, but then has another request in return: "Show me your asshole, <<$pcs_nickname>>."'
+				'As your mind tries to process all the sensations, you suddenly feel an intense warmth spreading inside you. Your stepfather pulls out his cock, and a slow trail of his cum slowly drips out of you and onto the carpet. Apparently the feelings of your tight ass milking his cock were too much for him to be able to hold out any longer. You slightly regret not getting to orgasm yourself, but then realize your teasing is what got him into this riled up state in the first place, and can''t really blame him. You would feel awkward asking him to finish you off after he has already had his fun, and just suffer in silence. He gets back up on his feet and looks down at your sprawled position on the floor. Your legs are all wobbly when you try to stand up and he helps you, but then has another request in return: "Show me your asshole, <<$pcs_nickname>>."'
 				act 'You show him your used ass':
 					*clr & cla
 					minut += 1
@@ -484,7 +485,7 @@ if $ARGS[0] = 'fathersex_act2':
 					act 'Stand up':gt $loc, $metka
 				end
 			else
-				'From his increasingly intense and erratic thrusts, you can tell your stepfather is about to finish.'
+				'From his increasingly intense and erratic thrusts, you can tell your stepfather is about to cum hard.'
 				gs 'fathersex', 'fathercum_act5'
 			end
 		end

+ 2 - 2
locations/fbDormD.qsrc

@@ -200,7 +200,7 @@ $d_fbd_anal = {
 		ppanal += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbdanal.jpg"></center>'
-		gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+		gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 		tiprand = rand(1, 100)
 		
 		gs 'arousal', 'anal', 5
@@ -404,7 +404,7 @@ $d_fbd_threesome = {
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/fbdranal.jpg"></center>'
 				'You moan around his friend''s cock, while <<$boydesc>> keeps caressing your asshole and slowly pushes two fingers in. After a minute or so he decides you''re ready, and pulls his hand away.'
-				gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 				
 				gs 'arousal', 'bj', 5, 'group', 'sub'
 				gs 'arousal', 'anal_finger', 5, 'group', 'sub'

+ 2 - 2
locations/fight_npcdata.qsrc

@@ -332,9 +332,9 @@ if $args[0] = 'ganggirl':
 	dynamic $setNPCFightStats, 'kick', rand(5,15)
 	dynamic $setNPCFightStats, 'punch', rand(5,15)
 	dynamic $setNPCFightStats, 'jab', rand(5,15)
-	dynamic $setNPCFightStats, 'stren', rand(25,35)
+	dynamic $setNPCFightStats, 'stren', rand(15,30)
 	dynamic $setNPCFightStats, 'agil', rand(25,35)
-	dynamic $setNPCFightStats, 'vital', rand(45,55)
+	dynamic $setNPCFightStats, 'vital', rand(25,35)
 	dynamic $setNPCFightStats, 'react', rand(25,35)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', rand(25,35)

+ 1 - 1
locations/fit.qsrc

@@ -210,7 +210,7 @@ if $ARGS[0] = 'dressing room':
 			minut += 1
 			deodorant -= 1
 			gs 'sweat', 'deo'
-			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
 			act 'Continue': menu_off = 0 & gt $loc, $metka
 		end

+ 0 - 12
locations/foto.qsrc

@@ -1998,7 +1998,6 @@ if $ARGS[0] = 'model':
 					modelfoto_fashion += 1
 					mdlng_exp += rand(5,8)
 					gs 'fame', 'city', 'modelling', rand(7,12)
-					gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 					fashionshoot = rand(1,2)
 					gs 'stat'
 					if fashionshoot = 1:
@@ -2026,7 +2025,6 @@ if $ARGS[0] = 'model':
 						modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
 						modelfoto_bikini += 1
 						gs 'fame', 'city', 'modelling', rand(7,12)
-						gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 						mdlng_exp += rand(6,10)
 						if pcs_inhib < 50:inhib_exp += 1
 						bikinishoot = rand(1,5)
@@ -2064,7 +2062,6 @@ if $ARGS[0] = 'model':
 						modelfoto_lingerie += 1
 						mdlng_exp += rand(6,10)
 						gs 'fame', 'city', 'modelling', rand(7,13)
-						gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 						inhib_exp += 2
 						shoot_type = rand(1,2)
 						gs 'stat'
@@ -2122,7 +2119,6 @@ if $ARGS[0] = 'nude_shoot':
 !!			modelfoto_nip += 1
 !!			mdlng_exp += rand(6,10)
 !!			city_modelling += rand(7,13)
-!!			pav_modelling += rand(1,city_modelling)/10
 !!			inhib_exp += 2
 !!			gs 'stat'
 !!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
@@ -2152,7 +2148,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_ero_clo += 1
 				mdlng_exp += rand(5,10)
 				gs 'fame', 'city', 'modelling', rand(7,12)
-				gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 				inhib_exp += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(2,4)>>.jpg"></center>'
@@ -2177,7 +2172,6 @@ if $ARGS[0] = 'nude_shoot':
 			modelfoto_nip += 1
 			mdlng_exp += rand(6,10)
 			gs 'fame', 'city', 'modelling', rand(7,13)
-			gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 			inhib_exp += rand(1,3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru<<rand(1,6)>>.jpg"></center>'
@@ -2208,7 +2202,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_lingerie += 1
 				mdlng_exp += rand(8,10)
 				gs 'fame', 'city', 'modelling', rand(9,14)
-				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 				inhib_exp += 4
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
@@ -2242,7 +2235,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_topless += 1
 				mdlng_exp += rand(6,10)
 				gs 'fame', 'city', 'modelling', rand(8,14)
-				gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 				inhib_exp += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(1,22)>>.jpg"></center>'
@@ -2274,7 +2266,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				gs 'fame', 'city', 'modelling', rand(10,20)
-				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 				inhib_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,5)>>.jpg"></center>'
 				'Already naked, you step onto the set and begin the shoot immediately.'
@@ -2305,7 +2296,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				gs 'fame', 'city', 'modelling', rand(10,20)
-				gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 				inhib_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(6,26)>>.jpg"></center>'
 				'Already naked, you step onto the set and begin the shoot immediately.'
@@ -2340,7 +2330,6 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_pussy += 1
 				mdlng_exp += rand(9,10)
 				gs 'fame', 'city', 'modelling', rand(10,20)
-				gs 'fame', 'pav', 'modelling', rand(10,15)
 				inhib_exp += 5
 				if pcs_pubes <= 20:
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(27,35)>>.jpg"></center>'
@@ -2379,7 +2368,6 @@ end
 !!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
 !!				mdlng_exp += 10
 !!				city_modelling += rand(10,20)
-!!				pav_modelling += rand(0,city_modelling)/10
 !!				inhib_exp += 3
 !!				modelfoto_glamour += 1
 !!				modelfoto_nip += 1

+ 0 - 2
locations/furi.qsrc

@@ -238,8 +238,6 @@ act 'Try to get a lift':
 				act 'Get into the truck': furisex = 100 & gt 'furisex'
 			end			
 		else
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/highway/furi.jpg"></center>'
 			'"I could... But that depends on how you''re going to return the favor. Actually, wait a minute, you don''t happen to be that girl who shows up by the road and sucks drivers off for a lift do you? We get a lot of girls who do that but not so many repeat customers and someone said she looked like you."'
 			act'Uhh...':
 				cla

+ 1 - 1
locations/gKristinaZv.qsrc

@@ -380,7 +380,7 @@ end
 	
 if $ARGS[0] = '10':
 	'Christina smiles at you: "You''ve been doing such a good job, bitch... it''s about time I reward you."'
-	'She pulls an extra large dildo out of her back and grins: "Oh yes, I can see that greedy look in your eyes. It''s all yours today. Girls, you can help her out if you want" as she sticks it on the floor.'
+	'She pulls an extra large dildo out of her backpack and grins: "Oh yes, I can see that greedy look in your eyes. It''s all yours today. Girls, you can help her out if you want" as she sticks it on the floor.'
 
 	act 'Ride the large dildo':
 		*clr & cla

+ 1 - 1
locations/gLakeNude.qsrc

@@ -200,7 +200,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				if krem = 0:
 					pcs_tan += 1
 					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
-				else:
+				else
 					krem -= 1
 					pcs_tan += 3
 					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'

+ 105 - 32
locations/gadbana.qsrc

@@ -19,10 +19,10 @@ if banya_underwear = 0:
 end
 !!clothesAtLocation = FUNC('lost_clothes_here','gadbana')
 
-'<center><h4>bath</h4></center>'
+'<center><h4>Bath</h4></center>'
 
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/bana.jpg"></center>'
-'Quite a small room with a low smoky ceiling, low stove, stainless steel water tanks and a blackened wooden shelf.'
+'A small room with a low smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
 'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 gs 'stat'
 
@@ -49,9 +49,10 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandma_trouble += 1
+				grandmaQW['trouble'] += 1
 			end
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
 			killvar 'banya_underwear'
@@ -66,9 +67,10 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
-				grandma_trouble += rand(0,1)
+				grandmaQW['trouble'] += rand(0,1)
 			end
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			killvar 'banya_underwear'
@@ -134,7 +136,7 @@ if mira = 0:
 			if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
-			'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
+			'You lather up your washcloth and start scrubbing your body. You rinse off the soap and start to lather your hair with shampoo. After rinsing off the shampoo you feel completely clean.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
 			act 'Finish':gt $loc, $metka
@@ -207,7 +209,7 @@ if mira = 0:
 	end
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
-		act 'Rinse the cum stains off your clothes in luke warm water(0:10)':
+		act 'Rinse the cum stains off your clothes in lukewarm water (0:10)':
 			cla
 			menu_off = 1
 			cumspclnt = 6
@@ -215,7 +217,7 @@ if mira = 0:
 			minut += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/frotsp.jpg"></center>'
-			'You remove traces of cum from the clothes.'
+			'You scrub all the cum from your clothes.'
 
 			act 'Finish':gt $curloc
 		end
@@ -247,7 +249,56 @@ if mira = 0:
 	end
 else
 	!125st
-	act 'Undress':
+	if $clothingworntype = 'nude':
+		act 'Get dressed and leave':
+			minut += 1
+			menu_off = 1
+			!!gs 'clothing', 'recover_lost_clothes', 'gadbana', 1
+			gs 'clothing', 'wear_last_worn'
+			if banya_underwear = 1: gs 'underwear', 'wear'
+			gs 'stat'
+			killvar 'banya_underwear'
+			gt 'gaddvor'
+		end
+	end
+	if $clothingworntype ! 'nude':
+		act 'Go outside':minut += 1 & gt'gaddvor'
+	elseif $clothingworntype = 'nude':
+		act 'Go outside naked':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			if gadbana_stripping ! daystart:
+				gadbana_stripping = daystart
+				inhib_exp += 2
+				grandmaQW['trouble'] += 1
+			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
+			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
+			gs 'arousal', 'flash', 10, 'exhibitionism'
+			killvar 'banya_underwear'
+			gs 'stat'
+			act 'Continue': gt 'gaddvor'
+		end
+	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+		act 'Go outside in your underwear':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			if gadbana_stripping ! daystart:
+				gadbana_stripping = daystart
+				inhib_exp += 1
+				grandmaQW['trouble'] += rand(0,1)
+			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
+			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
+			gs 'arousal', 'flashlite', 10, 'exhibitionism'
+			killvar 'banya_underwear'
+			gs 'stat'
+			act 'Continue': gt 'gaddvor'
+		end
+	end
+	act 'Undress and bathe with Mira':
 		cls
 		menu_off = 1
 		!!gs 'clothing', 'strip', 'gadbana'
@@ -257,7 +308,7 @@ else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
 
-			gs 'arousal', 'voyeur', 10, 'lesbian'
+			gs 'arousal', 'voyeur', 5, 'lesbian'
 			gs 'stat'
 
 			act 'Watch Mira clean herself':
@@ -265,7 +316,7 @@ else
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban1.jpg"></center>'
 			'You feel the hot steam penetrate into your pores while you blissfully watch Mira lather up. She sometimes throws at you short glances and smiles hesitantly in response...'
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur', 5
 			gs 'stat'
 			act 'Steam':
 				cls
@@ -283,36 +334,58 @@ else
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban2.jpg"></center>'
 				'Mira finally finishes lathering herself, you take the loofah and lather yourself from head to toe. You enjoy yourselves in the warm bath, relaxing in each other''s company, occasionally exchanging meaningless anecdotes...'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-				gs 'arousal', 'voyeur', 120
+				gs 'arousal', 'voyeur', 25
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				if clothesAtLocation = 1 and $clothingworntype = 'nude':
+				if $clothingworntype = 'nude':
 					act 'Get dressed and leave':
-						cla
-						mira = 0
 						minut += 1
-						!!gs 'clothing', 'recover_lost_clothes', 'gaddvor', 1
+						menu_off = 1
+						!!gs 'clothing', 'recover_lost_clothes', 'gadbana', 1
+						gs 'clothing', 'wear_last_worn'
 						if banya_underwear = 1: gs 'underwear', 'wear'
+						gs 'stat'
+						killvar 'banya_underwear'
+						gt 'gaddvor'
+					end
+				end
+				if $clothingworntype ! 'nude':
+					act 'Go outside':minut += 1 & gt'gaddvor'
+				elseif $clothingworntype = 'nude':
+					act 'Go outside naked':
+						*clr & cla
+						menu_off = 1
+						minut += 1
+						if gadbana_stripping ! daystart:
+							gadbana_stripping = daystart
+							inhib_exp += 2
+							grandmaQW['trouble'] += 1
+						end
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
+						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
+						gs 'arousal', 'flash', 10, 'exhibitionism'
+						killvar 'banya_underwear'
+						gs 'stat'
+						act 'Continue': gt 'gaddvor'
+					end
+				elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+					act 'Go outside in your underwear':
+						*clr & cla
+						menu_off = 1
+						minut += 1
+						if gadbana_stripping ! daystart:
+							gadbana_stripping = daystart
+							inhib_exp += 1
+							grandmaQW['trouble'] += rand(0,1)
+						end
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
+						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
+						gs 'arousal', 'flashlite', 10, 'exhibitionism'
 						killvar 'banya_underwear'
 						gs 'stat'
 						act 'Continue': gt 'gaddvor'
 					end
-				end
-
-				act 'Go outside naked':
-					*clr & cla
-					mira = 0
-					minut += 1
-					grandma_trouble += rand(0,1)
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-					'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
-					!!gs 'clothing', 'recover_lost_clothes', 'gaddvor'
-					gs 'arousal', 'flash', 10, 'exhibitionism'
-					gs 'arousal', 'end'
-					killvar 'banya_underwear'
-					gs 'stat'
-					act 'Continue': gt 'gaddvor'
 				end
 			end
 		end

+ 58 - 32
locations/gaddvor.qsrc

@@ -13,10 +13,10 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	if hour >= 6 and hour < 22:
-		if grandma_trouble = 10:
+		if grandmaQW['trouble'] = 10:
 			*clr & cla
 			menu_off = 1
-			killvar 'grandma_trouble'
+			grandmaQW['trouble'] = 0
 			'<center><h4>Your grandparents'' yard</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma_trouble.jpg"></center>'
 			'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me AND your grandfather! Unlike you, we have to live in this village, and with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. Go and get dressed immediately!" She then walks off. You are too ashamed to say anything.'
@@ -24,27 +24,11 @@ if $ARGS[0]='':
 			exit
 		end
 	end
-	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
-	if clothesAtLocation = 1:
-		if $clothingworntype = 'nude':
-			act 'Get dressed':
-				gs 'clothing', 'recover_lost_clothes', 'gaddvor', 1
-				gs 'underwear', 'wear'
-				gt 'gaddvor'
-			end
-		else
-			act 'Pick up your clothes':
-				gs 'clothing', 'recover_lost_clothes', 'gaddvor'
-				'You picked up your clothes.'
-				gt 'gaddvor'
-			end
-		end
-	end
 
 	if StoryLine = 1:
 		'<center><h4>Your grandparents'' yard</h4></center>'
 	else
-		'<center><h4>Old Couple''s yard</h4></center>'
+		'<center><h4>Old couple''s yard</h4></center>'
 	end
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -65,23 +49,47 @@ if $ARGS[0]='':
 		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch are a few chairs to sit in.'
 	end
 
-
-	if StoryLine = 1:
-		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-		act 'Enter the banya':minut += 1 & gt 'gadbana'
-	end
-
 	if $clothingworntype = 'nude':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
+		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+		act 'Enter the banya':minut += 1 & gt 'gadbana'
 	else
-		if feed_chickens = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
+		if grandmaQW['feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
 
+		act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
+		if 	grandpaQW['clean_yard'] = 1:
+			act 'Clean up the yard for Grandpa (1:00)':
+				*clr & cla
+				if month >= 4 and month <= 10:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
+					'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
+					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+				end
+				minut += 60
+				grandpaQW['clean_yard'] = 0
+				grandmaQW['help'] += 1
+				if month >= 4 and month <= 10:
+					fat -= rand(1,3)
+				else
+					stren_exp += 1
+					fat -= rand(1,5)
+				end
+				gs'stat'
+
+				act 'Continue':gt'gaddvor'
+			end
+		end
+		if StoryLine = 1:
+			act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+			act 'Enter the banya':minut += 1 & gt 'gadbana'
+		end
 		act 'Go to the barn':minut += 1 & gt 'gadsarai'
 		act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
-		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
 		mira_temp = rand(1,5)
 		if mira_temp = 3 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
@@ -95,9 +103,27 @@ if $ARGS[0]='':
 			mira_guest = 1
 			gs 'stat'
 
-			act 'Further':gt'gaddvor'
+			act 'Continue':gt'gaddvor'
+		end
+	end
+
+	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
+	if clothesAtLocation = 1:
+		if $clothingworntype = 'nude':
+			act 'Get dressed':
+				gs 'clothing', 'recover_lost_clothes', 'gaddvor', 1
+				gs 'underwear', 'wear'
+				gt 'gaddvor'
+			end
+		else
+			act 'Pick up your clothes':
+				gs 'clothing', 'recover_lost_clothes', 'gaddvor'
+				'You picked up your clothes.'
+				gt 'gaddvor'
+			end
 		end
 	end
+
 end
 
 if $ARGS[0] = 'chickens':
@@ -108,14 +134,14 @@ if $ARGS[0] = 'chickens':
 	gs 'stat'
 
 	!job Granny
-	if feed_chickens = 1:
+	if grandmaQW['feed_chickens'] = 1:
 		act 'Feed the chickens':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens2.jpg"></center>'
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
-			*clr & cla
 			minut += 30
-			grandmahelp += 1
-			feed_chickens = 0
+			grandmaQW['help'] += 1
+			grandmaQW['feed_chickens'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 30 - 28
locations/gadfield.qsrc

@@ -44,11 +44,13 @@ if $ARGS[0] = 'field':
 	if flowerday ! daystart and grigory_flower = 10: gt 'grigory', 'flower6'
 	if flowerday ! daystart and grigory_flower > 10: gt 'grigory', 'flower8'
 	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
-	if hour >= 9 and hour <= 19 and graze_cow = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
-	if hour >= 6 and hour <= 20 and graze_cow = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
-	if hour >= 7 and hour <= 20 and haying_time = 1:'You see a crowd of people working on the field.'
+	if hour >= 9 and hour <= 19 and grandpaQW['graze_cow'] = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
+	if hour >= 6 and hour <= 20 and grandpaQW['graze_cow'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
+	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:'You see a crowd of people working on the field.'
 
-	if hour >= 7 and hour <= 20 and haying_time = 1:
+	act 'Head back to the road':minut += 10 & gt'gadroad'
+	
+	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:
 		act 'Go to the hayfield':
 			gs 'food', 'm_meal'
 			*clr & cla
@@ -69,8 +71,8 @@ if $ARGS[0] = 'field':
 			end
 
 			minut += 360
-			grandmahelp += 1
-			haying_time = 0
+			grandmaQW['help'] += 1
+			grandpaQW['haying_time'] = 0
 			hndiwrk_exp += rand(0,2)
 			gs 'stat'
 
@@ -78,7 +80,6 @@ if $ARGS[0] = 'field':
 		end
 	end
 
-	act 'Back to the road':minut += 10 & gt'gadroad'
 end
 
 if $ARGS[0] = 'horse':
@@ -96,6 +97,8 @@ if $ARGS[0] = 'horse':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Your grandfather''s horse Desperado.'
 
+	act 'Go back to the field':gt'gadfield','field'
+
 	if hour = 19:
 		act 'Lead the horse home (1:00)':
 			*clr & cla
@@ -103,14 +106,13 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You spot your grandfather''s horse wandering loose in the field and decide to help out by taking Desperado home. Reaching for the bridle, you start leading Desperado towards the village.'
 			minut += 60
-			grandmahelp += rand(0,1)
+			grandmaQW['help'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			act 'To your grandparent''s barn':gt'gadsarai'
 		end
 	end
-	act 'To the field':gt'gadfield','field'
 end
 
 if $ARGS[0] = 'cow':
@@ -130,28 +132,29 @@ if $ARGS[0] = 'cow':
 	'The cow herd is standing in the middle of the field.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
-	if hour = 19 and graze_cow = 0:
+	if grandpaQW['graze_cow'] = 0:act 'Leave them be':gt'gadfield','field'
+	if hour = 19 and grandpaQW['graze_cow'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
-			grandmahelp += rand(0,1)
+			grandmaQW['help'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			act 'To your grandparent''s barn':gt'gadsarai'
 		end
 	end
-	if graze_cow = 1:
+	if grandpaQW['graze_cow'] = 1:
 		if hour < 10:
 			act 'Wait until the herd is gathered':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if graze_cow_exp = 0:'Some time flies by while waiting for the locals to finish their gathering.'
-				if graze_cow_exp = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
+				if grandpaQW['graze_cow_exp'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
+				if grandpaQW['graze_cow_exp'] = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
@@ -170,8 +173,8 @@ if $ARGS[0] = 'cow':
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				graze_cow_exp = 1
-				grandmahelp += 1
+				grandpaQW['graze_cow_exp'] = 1
+				grandmaQW['help'] += 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -272,7 +275,7 @@ if $ARGS[0] = 'cow':
 			'Looking at his watch, grandpa turns to you and says "The time is around lunchtime so it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
 
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
@@ -280,7 +283,6 @@ if $ARGS[0] = 'cow':
 			act 'Herd the cows to the river':gt'gadfield','cow2'
 		end
 	end
-	if graze_cow = 0:act 'Back':gt'gadfield','field'
 end
 
 !MiaLoc tells us where Mira is Located
@@ -293,7 +295,7 @@ end
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
 
-if graze_cow = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+if grandpaQW['graze_cow'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
@@ -327,7 +329,7 @@ if $ARGS[0] = 'cow2':
 	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I''ll keep an eye on the herd," said your grandfather.'
 
-	if graze_cow = 1:
+	if grandpaQW['graze_cow'] = 1:
 		if hour < 16:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -336,8 +338,8 @@ if $ARGS[0] = 'cow2':
 				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmahelp += 1
-				graze_cow_exp = 1
+				grandmaQW['help'] += 1
+				grandpaQW['graze_cow_exp'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -404,7 +406,7 @@ if $ARGS[0] = 'cow2':
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
 			'Looking at his watch, grandpa says that it''s time to drive the herd back on the field, but now closer to the forest. The two of you begin to gather the scattered herd and head toward the forest.'
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -434,7 +436,7 @@ if $ARGS[0] = 'cow3':
 
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
-	if graze_cow = 1:
+	if grandpaQW['graze_cow'] = 1:
 		if hour < 19:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -443,8 +445,8 @@ if $ARGS[0] = 'cow3':
 				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmahelp += 1
-				graze_cow_exp = 1
+				grandmaQW['help'] += 1
+				grandpaQW['graze_cow_exp'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -545,8 +547,8 @@ if $ARGS[0] = 'cow3':
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			mira = 0
-			graze_cow = 0
-			grandmahelp += 1
+			grandpaQW['graze_cow'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadforest.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'caught':
 	caught_rand = rand(0, 100)
 	if caught_rand > 90:
 		inhib_exp += rand(0,3)
-		grandma_trouble += rand(7,10)
+		grandmaQW['trouble'] += rand(7,10)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by all the women of the village. They are all sitting there scolding you. Your grandparents are definitely going to find out about this.'
 	elseif caught_rand > 70:
 		inhib_exp += rand(0,4)
-		grandma_trouble += rand(1,3)
+		grandmaQW['trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -334,14 +334,14 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by a woman from the village. You want to hope she doesn''t tell your grandparents.'
 	elseif caught_rand > 50:
 		inhib_exp += rand(0,3)
-		grandma_trouble += rand(1,3)
+		grandmaQW['trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
 		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
 	else
-		grandma_trouble += rand(0,1)
+		grandmaQW['trouble'] += rand(0,1)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 31 - 25
locations/gadgarden.qsrc

@@ -27,18 +27,24 @@ if $ARGS[0] = 'garden':
 	end
 
 	'A large vegetable garden that your grandparents are very proud of.'
-	if month >= 4 and month <= 10:'A small land plot is dedicated to a <a href="exec: gt ''gadgarden'',''strawberry'' ">strawberry plot</a> and a <a href="exec: gt ''gadgarden'',''fruit_garden'' ">fruit orchard</a>.'
+	if month >= 4 and month <= 10:
+		'There is also a small land plot is dedicated to growing <a href="exec: gt ''gadgarden'',''strawberry'' ">strawberries</a> and a <a href="exec: gt ''gadgarden'',''fruit_garden'' ">fruit tree orchard</a>.'
+	else
+		'There is also a small plot of land dedicated to growing strawberries and a small fruit tree orchard, but they are not in season right now.'
+	end
+
+	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 
 	!job Granny
-	if work_garden = 1:
+	if grandmaQW['work_garden'] = 1:
 		act 'Work in the garden (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			work_garden = 0
-			grandmahelp += 3
+			grandmaQW['work_garden'] = 0
+			grandmaQW['help'] += 3
 			stren_exp += 1
 			fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
@@ -50,15 +56,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if water_garden = 1:
-		act 'Water the garden (1:00)':
+	if grandmaQW['water_garden'] = 1:
+		act 'Water the plants (1:00)':
 			cla
 			*clr
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			water_garden = 0
-			grandmahelp += 1
+			grandmaQW['water_garden'] = 0
+			grandmaQW['help'] += 1
 			vital_exp += 1
 			fat -= rand(1,2)
 			hndiwrk_exp += rand(0,3)
@@ -70,15 +76,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if harvest_garden = 1:
+	if grandmaQW['harvest_garden'] = 1:
 		act 'Harvest (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			harvest_garden = 0
-			grandmahelp += 3
+			grandmaQW['harvest_garden'] = 0
+			grandmaQW['help'] += 3
 			stren_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -89,7 +95,6 @@ if $ARGS[0] = 'garden':
 			act 'Finish':gt'gadgarden','garden'
 		end
 	end
-	act 'Leave':minut += 1 & gt'gaddvor'
 end
 
 if $ARGS[0] = 'strawberry':
@@ -119,8 +124,10 @@ if $ARGS[0] = 'strawberry':
 
 	'It''s strawberry season, you approach the field where the strawberries grow, searching for some ripe strawberries.'
 
-	if month >= 6 and month <= 7 and strawberriesday ! daystart:
-		act 'Eat the strawberries (1:00)':
+	act 'Go back to the garden':minut += 1 & gt'gadgarden','garden'
+
+	if month >= 7 and month <= 9 and strawberriesday ! daystart:
+		act 'Eat some strawberries (1:00)':
 			cla
 			*clr
 			menu_off = 1
@@ -133,21 +140,21 @@ if $ARGS[0] = 'strawberry':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/eat_strawberries.jpg"></center>'
-			'You spend some time wandering through the plot searching for ripe strawberries. As soon as you notice a strawberry, you immediately pick it up and eat as many as you can.'
+			'You spend some time wandering through the plot searching for ripe strawberries. You walk along, picking off the ones that you find and popping them in your mouth.'
 
 			act 'Finish':gt'gadgarden','strawberry'
 		end
 	end
 	!job Granny
-	if collect_strawberries = 1:
+	if grandmaQW['collect_strawberries'] = 1:
 		act 'Collect strawberries (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			collect_strawberries = 0
-			grandmahelp += 5
+			grandmaQW['collect_strawberries'] = 0
+			grandmaQW['help'] += 5
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
@@ -156,13 +163,11 @@ if $ARGS[0] = 'strawberry':
 			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
 			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
 			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
-			'You wander through the plot collecting ripe strawberries in the basket.'
+			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
 		end
 	end
-
-	act 'Leave':minut += 1 & gt'gadgarden','garden'
 end
 
 
@@ -185,6 +190,8 @@ if $ARGS[0] = 'fruit_garden':
 
 	'There are apples and pears growing in the fruit orchard.'
 
+	act 'Go back to the garden':minut += 1 & gt'gadgarden','garden'
+
 	if month >= 7 and month <= 9 and fruitday ! daystart:
 		act 'Eat the fruit (1:00)':
 			cla
@@ -205,15 +212,15 @@ if $ARGS[0] = 'fruit_garden':
 		end
 	end
 	!job Granny
-	if fruit_collect = 1:
+	if grandmaQW['fruit_collect'] = 1:
 		act 'Collect fruit (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			fruit_collect = 0
-			grandmahelp += 5
+			grandmaQW['fruit_collect'] = 0
+			grandmaQW['help'] += 5
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -227,7 +234,6 @@ if $ARGS[0] = 'fruit_garden':
 			act 'Finish':gt 'gadgarden','fruit_garden'
 		end
 	end
-	act 'Leave':minut += 1 & gt'gadgarden','garden'
 end
 
 --- gadgarden ---------------------------------

+ 99 - 61
locations/gadhouse.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'start':
 	frost = 0
 	mira_temp = rand(1,5)
 
-	if monthbabkapay ! month and monthgrandmahelp ! month and hour >= 6 and hour < 22:
-		monthbabkapay = month
-		monthgrandmahelp = month
-		if grandmahelp > 0: money += grandmahelp*50
+	if grandmaQW['month_paid'] ! month and grandmaQW['month_helped'] ! month and hour >= 6 and hour < 22:
+		grandmaQW['month_paid'] = month
+		grandmaQW['month_helped'] = month
+		if grandmaQW['help'] > 0: money += grandmaQW['help'] * 50
 		money += 2000
 		minut += 10
 
@@ -29,27 +29,27 @@ if $ARGS[0] = 'start':
 			'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
 			'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
 			'"Of course I''ll help out, Grandma." you answer.'
-			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmahelp * 50>>  rubels.'
+			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help''] * 50>>  rubels.'
 			'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
 		else
 			'When you got out of bed, your grandmother called you over to her.'
 			'"I imagine you''ve spent all your allowance on sweets so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
-			if grandmahelp > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmahelp * 50>> rubles." she starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+			if grandmaQW['help'] > 0:
+				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
 			else
-				'"We really could have used your help last month." she says mournfully as she counts out some bills, "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
+				'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
 			end
 			gs 'stat'
 		end
-		grandmahelp = 0
-		act 'Further': gt 'gadhouse', 'start'
+		grandmaQW['help'] = 0
+		act 'Continue': gt 'gadhouse', 'start'
 
-	elseif go_in_boletus = 1 and boletus >= grandpa_boletus and hour >= 6 and hour < 22:
+	elseif $grandpaQW['gather_quest'] = 'mushroom' and boletus >= grandpaQW['mushroom_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
-		boletus -= grandpa_boletus
+		grandmaQW['help'] += 1
+		boletus -= grandpaQW['mushroom_qty']
 		minut += 5
-		go_in_boletus = 0
+		$grandpaQW['gather_quest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -60,15 +60,15 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>." - said your grandpa. "But if I need some help, I''ll be sure to let you know."'
 		'You kiss your grandfather on the cheek and get on with your day.'
 
-		act 'Further': grandpa_boletus = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['mushroom_qty'] = 0 & gt 'gadhouse', 'start'
 
-	elseif go_in_boletus_bilberry = 1 and boletus >= grandpa_boletus and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
+	elseif $grandpaQW['gather_quest'] = 'both' and boletus >= grandpaQW['mushroom_qty'] and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
-		boletus -= grandpa_boletus
-		bilberry -= grandpa_bilberry
+		grandmaQW['help'] += 1
+		boletus -= grandpaQW['mushroom_qty']
+		bilberry -= grandpaQW['berry_qty']
 		minut += 5
-		go_in_boletus_bilberry = 0
+		$grandpaQW['gather_quest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -79,14 +79,14 @@ if $ARGS[0] = 'start':
 		'"You don''t need to do that <<$pcs_nickname>>," your grandpa said. "But I''ll be sure to let you know if something comes up."'
 		'You give your grandpa a smooch on the cheek and go on with your day.'
 
-		act 'Further': grandpa_boletus = 0 & grandpa_bilberry = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['mushroom_qty'] = 0 & grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
 
-	elseif go_in_bilberry = 1 and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
+	elseif $grandpaQW['gather_quest'] = 'berry' and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
-		bilberry -= grandpa_bilberry
+		grandmaQW['help'] += 1
+		bilberry -= grandpaQW['berry_qty']
 		minut += 5
-		go_in_bilberry = 0
+		$grandpaQW['gather_quest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -97,7 +97,7 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>," your grandpa said. "But if your grandma need some more berries, I''ll let you know."'
 		'You kiss your grandfather on the cheek, you go on with your business.'
 
-		act 'Further': grandpa_bilberry = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
 
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
 		*clr & cla
@@ -110,7 +110,7 @@ if $ARGS[0] = 'start':
 		'You notice Mira coming towards your grandparents home.'
 		'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
 
-		act 'Further':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'start'
 
 	else
 		gt 'gadhouse', 'main'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandma_trouble += rand(1,3)
+			grandmaQW['trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandma_trouble += rand(1,3)
+			grandmaQW['trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -219,10 +219,46 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
+	if grandmaQW['cleanfloor'] = 1:
+		act 'Clean the floor for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['cleanfloor'] = 0
+			grandmaQW['help'] += 1
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
+			'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
+			
+			act 'Continue':gt 'gadhouse', 'start'
+		end
+	end
 
-	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
+	if grandmaQW['washclothes'] = 1:
+		act 'Wash Grandpa''s clothes for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['washclothes'] = 0
+			grandmaQW['help'] += 1
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
+			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
+			
+			act 'Hang the Laundry':
+				*clr & cla
+				minut += 10
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
+				'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
+
+				act 'Continue':gt'gaddvor'
+			end    
+		end
+	end
 
+	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
+	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
 	act 'Have a snack (0:15)':gs 'food', 'snack'
 
 	dynamic $sandwich
@@ -287,7 +323,7 @@ if $ARGS[0] = 'grandma':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandmatalkday ! daystart: grandmatalk = 0
+	if grandmaQW['talk_day'] ! daystart: grandmaQW['talk_hour'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
@@ -302,12 +338,12 @@ if $ARGS[0] = 'grandma':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
-		if grandmahelpday ! daystart: act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp', 'start'
+		if grandmaQW['help_day'] ! daystart: act 'Offer to help out': grandmaQW['help_day'] = daystart & gt'grandmahelp', 'start'
 
-		if grandmatalkgad = 0:
+		if grandmaQW['talk_abt_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
-				grandmatalkgad = 1
+				grandmaQW['talk_abt_gadukino'] = 1
 				minut += 10
 				pcs_mood += 5
 				gs 'stat'
@@ -324,15 +360,15 @@ if $ARGS[0] = 'grandma':
 				'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, then go to the garden, have some fruit, it''s as healthy as the diet meals you''re eating, if not more healthier."'
 				'"That''s about it my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin, I don''t want to miss a second of it."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 		!125e
-		if hour >= grandmatalk + 3:
+		if hour >= grandmaQW['talk_hour'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
-				grandmatalk = hour
-				grandmatalkday = daystart
+				grandmaQW['talk_hour'] = hour
+				grandmaQW['talk_day'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -340,14 +376,14 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You spend some time talking with your grandmother. She''s sometimes difficult to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. Most of what she says boils down to the same thing, life is much more fun when you''re young!'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 
-		if grandmastory ! daystart:
+		if grandmaQW['story_day'] ! daystart:
 			act 'Ask her to tell you a story (0:20)':
 				*clr & cla
-				grandmastory = daystart
+				grandmaQW['story_day'] = daystart
 				minut += 20
 				pcs_mood += rand(10,15)
 				gs 'stat'
@@ -407,7 +443,7 @@ if $ARGS[0] = 'grandma':
 					'"Ever since that day the fear I experienced never disappeared, as I''ve felt it through my whole life. I’ll carry on this fear for the remaining days of my life…"'
 				end
 				!125e
-				act 'You thank your grandmother for the story':gt 'gadhouse', 'start'
+				act 'Thank her for the story':gt 'gadhouse', 'grandma'
 			end
 		end
 	end
@@ -417,7 +453,7 @@ if $ARGS[0]='grandpa':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandpatalkday ! daystart:grandpatalk = 0
+	if grandpaQW['talk_day'] ! daystart:grandpaQW['talk_hour'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
@@ -428,23 +464,24 @@ if $ARGS[0]='grandpa':
 
 		act 'Maybe you should get dressed before talking to him':gt 'gadhouse', 'start'
 	else
+		act 'Leave him alone':gt 'gadhouse', 'start'
+		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
-		if go_in_boletus = 1:
-			'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
-		elseif go_in_bilberry = 1:
-			'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
-		elseif go_in_boletus_bilberry = 1:
-			'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
+		if $grandpaQW['gather_quest'] = 'mushroom':
+			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg of mushrooms.'
+		elseif $grandpaQW['gather_quest'] = 'berry':
+			'You promise to bring grandpa <<grandpaQW[''berry_qty'']>> kg of berries.'
+		elseif $grandpaQW['gather_quest'] = 'both':
+			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries.'
 		end
 
-		act 'Leave him alone':gt 'gadhouse', 'start'
 
-		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp', 'start'
-		if grandpatalkforest = 0:
+		if grandpaQW['help_day'] ! daystart:act 'Offer to help':grandpaQW['help_day'] = daystart & gt'grandpahelp', 'start'
+		if grandpaQW['talk_abt_forest'] = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla
-				grandpatalkforest = 1
+				grandpaQW['talk_abt_forest'] = 1
 				minut += 10
 				pcs_mood += 5
 				goforest += 1
@@ -456,15 +493,15 @@ if $ARGS[0]='grandpa':
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything <<$pcs_nickname>>, run along now, and remember what I''ve told you."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 
-		if hour >= grandpatalk + 3:
+		if hour >= grandpaQW['talk_hour'] + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
-				grandpatalk = hour
-				grandpatalkday = daystart
+				grandpaQW['talk_hour'] = hour
+				grandpaQW['talk_day'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -472,7 +509,7 @@ if $ARGS[0]='grandpa':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'Your grandfather stops complaining and smiles at you, he loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past, and reflects on his earlier life.'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 	end
@@ -487,6 +524,8 @@ if $ARGS[0]='villagecat':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat.jpg"></center>'
 	'Your grandparents'' fat tomcat, Boniface, is aware of you approaching him, even though his eyes are closed. He tracks you with his ears and simply ignores you.'
 
+	act 'Leave Boniface alone':minut += 2 & gt 'gadhouse', 'start'
+
 	act 'Pet Boniface':
 		*clr & cla
 		minut += 5
@@ -529,7 +568,6 @@ if $ARGS[0]='villagecat':
 			end
 		end
 	end
-	act 'Leave Boniface alone':minut += 2 & gt 'gadhouse', 'start'
 end
 
 if $ARGS[0] = 'intro':
@@ -537,7 +575,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'gadhouse'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	monthbabkapay = month
+	grandmaQW['month_paid'] = month
 	display_bb = 1
 	menu_off = 1
 	hour = 6

+ 5 - 5
locations/gadmarket.qsrc

@@ -22,11 +22,11 @@ frost = 0
 $gadmarkettab = '<center><table align="center">'
 $gadmarkettab += FUNC ('$stock_item', 10, 'Package of tea biscuits', 400, 'pranik', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Cigarettes', 150, 'siga', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Fashion magazine', 450, 'fashmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 450, 'compmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 450, 'biomag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 450, 'cookmag', 'gadmarket')
-$gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 450, 'knitmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Fashion magazine', 145, 'fashmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Computer magazine', 145, 'compmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Biographical magazine', 145, 'biomag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Cooking magazine', 145, 'cookmag', 'gadmarket')
+$gadmarkettab += FUNC ('$single_stock_item', 1, 'Knitting magazine', 145, 'knitmag', 'gadmarket')
 if preziktype = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezik', 'gadmarket')
 if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')

+ 14 - 11
locations/gadriver.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 					gs 'dinsex','vaginal_sex',20,'sub','gangbang'
 					gs 'dinsex','sexcum'
 				else
-					gs 'dinSex','boy_wants_anal','lubri'
+					gs 'dinSex','boy_wants_anal','','lubri'
 					gs 'dinsex','analsex',20,'sub','gangbang'
 				end
 				gs 'boyStat', 'A62'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 					gs 'dinsex','vaginal_sex',20,'sub','gangbang'
 					gs 'dinsex','sexcum'
 				else
-					gs 'dinSex','boy_wants_anal','lubri'
+					gs 'dinSex','boy_wants_anal','','lubri'
 					gs 'dinsex','analsex',20,'sub','gangbang'
 				end
 				gs 'stat'
@@ -82,7 +82,9 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex18.jpg"></center>'
-				'The boys lead you to Vasyan''s house, where they spend an hour fucking you in the ass...'
+				'The boys lead you to Vasyan''s house and start undressing, following their lead you strip off too, "We''re going to fuck your ass I hope you can enjoy it but I''m not going to be upset if you don''t."'
+				gs 'arousal', 'auto_lube', 'anal'
+				'They don''t say anything more before they spend the next hour fucking you in the ass...'
 				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
 				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
 				gs 'arousal', 'anal', 20, 'gangbang', 'sub'
@@ -288,6 +290,7 @@ if $ARGS[0] = 'gadbitch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex19.jpg"></center>'
 						'As soon as you get out of the river, you meet a grinning Kolyamba. He smiles wickedly and commands you to get down on your hands and knees so he can fuck you in the ass...'
+						gs 'arousal', 'auto_lube', 'anal'
 						gs 'boyStat', 'A61'
 						npc_sex[$boy] += 1
 						pose = 1
@@ -495,7 +498,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if horse_river = 2:
+		if grandpaQW['horse_river'] = 2:
 			act 'Look at Desperado':
 				*clr & cla
 				
@@ -513,8 +516,8 @@ if $ARGS[0] = 'gadbitch':
 						pcs_mood += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
-						grandmahelp += 1
-						horse_river = 3
+						grandmaQW['help'] += 1
+						grandpaQW['horse_river'] = 3
 						gs 'stat'
 						
 						if $clothingworntype = 'nude':
@@ -543,8 +546,8 @@ if $ARGS[0] = 'gadbitch':
 							pcs_mood += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
-							grandmahelp += 1
-							horse_river = 3
+							grandmaQW['help'] += 1
+							grandpaQW['horse_river'] = 3
 							gs 'stat'
 							
 							if $clothingworntype = 'nude':
@@ -570,7 +573,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if horse_river = 3:
+		if grandpaQW['horse_river'] = 3:
 			act 'Lead Desperado back home':
 				if $clothingworntype = 'swimwear':
 					cla
@@ -583,8 +586,8 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmahelp += rand(0,1)
-					horse_river = 0
+					grandmaQW['help'] += rand(0,1)
+					grandpaQW['horse_river'] = 0
 					gs 'stat'
 					
 					gt'gadsarai'

+ 17 - 16
locations/gadroad.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go to Gadukino':minut += 20 & gt'gadukino'
+	act 'Go back to Gadukino':minut += 20 & gt'gadukino'
 	act 'Go into the woods':minut += 30 & gt'gadforest','1'
 	if meadow > 0: act 'Go to the meadow':minut += 20 & gt 'meadow'
 	act 'Go to the fields':minut += 10 & gt'gadfield','field'
@@ -129,6 +129,22 @@ if $ARGS[0] = 'drinking_invite':
 	end
 	'Mitka asks, "Are you ready to go?"'
 	
+	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
+	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
+				gs 'willpower', 'drink', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				gt 'gadroad'
+			end
+		else
+			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+
 	! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
 	if MiraLoc ! 5 and npc_QW['A60'] >= 1:
 		mirarand = rand(1,10)
@@ -149,21 +165,6 @@ if $ARGS[0] = 'drinking_invite':
 	else
 		act 'Go with them': minut += 15 & gt 'mitkabuh'
 	end
-	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
-	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
-		gs 'willpower', 'drink', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
-				gs 'willpower', 'drink', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				
-				gt 'gadroad'
-			end
-		else
-			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-	end
 end
 
 --- gadroad ---------------------------------

+ 55 - 31
locations/gadsarai.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = '':
 		else
 			'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
 		end
-		if hour > 9 and hour < 20 and week < 6 or horse_river = 2:
+		if hour > 9 and hour < 20 and week < 6 or grandpaQW['horse_river'] = 2:
 			'On your left is a horse stable.'
 		else
 			'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
@@ -46,8 +46,28 @@ if $ARGS[0] = '':
 	clr
 	gs 'stat'
 
-	act 'Leave':minut += 1 & gt 'gaddvor'
-
+	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
+	
+	if grandpaQW['fetch_firewood'] = 1:
+		act 'Fetch firewood for Grandpa (0:20)':
+			*clr & cla
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
+			end
+			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
+			'"I''ve brought some firewood grandfather," you said to your grandfather.'
+			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
+			grandpaQW['fetch_firewood'] = 0
+			minut += 20
+			grandmaQW['help'] += 1
+			gs'stat'
+
+			act 'Continue':gt 'gadhouse', 'start'
+		end
+	end
+	
 	act 'Poke around in the barn':
 		if npc_qw['A221'] > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
 		*clr & cla
@@ -164,13 +184,15 @@ if $ARGS[0] = 'boar':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
 	'One of your grandparents dearest possessions, the boar Nickle.'
 
-	if feed_boar = 1:
+	act 'Leave':minut += 5 & gt 'gadsarai'
+
+	if grandpaQW['feed_boar'] = 1:
 		act 'Feed the boar':
 			cla
 			*clr
 			minut += 30
-			grandmahelp += 1
-			feed_boar = 0
+			grandmaQW['help'] += 1
+			grandpaQW['feed_boar'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -180,7 +202,6 @@ if $ARGS[0] = 'boar':
 			act 'Finish':gt 'gadsarai','boar'
 		end
 	end
-	act 'Go':minut += 5 & gt'gadsarai'
 end
 
 if $ARGS[0] = 'cow':
@@ -192,13 +213,15 @@ if $ARGS[0] = 'cow':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	'Grandma''s favorite animal, the cow Dawn.'
 
-	if milk_cow = 1:
+	act 'Leave':minut += 5 & gt 'gadsarai'
+
+	if grandmaQW['milk_cow'] = 1:
 		act 'Milk the cow':
 			cla
 			*clr
 			minut += 30
-			milk_cow = 0
-			grandmahelp += 1
+			grandmaQW['milk_cow'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -208,13 +231,13 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if feed_cow = 1:
+	if grandpaQW['feed_cow'] = 1:
 		act 'Feed the cow':
 			cla
 			*clr
 			minut += 30
-			feed_cow = 0
-			grandmahelp += 1
+			grandpaQW['feed_cow'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -224,25 +247,26 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if cow_field = 1 or graze_cow = 1:
+	if grandpaQW['cow_field'] = 1 or grandpaQW['graze_cow'] = 1:
 		act 'Lead the cow to the field':
 			cla
 			*clr
 			minut += 60
-			cow_field = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
-			if cow_field = 1:'You lead Dawn to the field, where you let the shepherds take over.'
-			if graze_cow = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
+			if grandpaQW['cow_field'] = 1:
+				'You lead Dawn to the field, where you let the shepherds take over.'
+				grandpaQW['cow_field'] = 0
+			end
+			if grandpaQW['graze_cow'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
 			act 'Continue':gt'gadfield','cow'
 		end
 	end
 
-	act 'Go':minut += 5 & gt'gadsarai'
 end
 
 if $ARGS[0] = 'horse':
@@ -252,16 +276,16 @@ if $ARGS[0] = 'horse':
 
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
-	'Grandfather trusted assistant, the horse Desperado.'
+	'Grandfather''s trusted assistant, the horse Desperado.'
 
 
-	if feed_horse = 1:
+	if grandpaQW['feed_horse'] = 1:
 		act 'Feed the horse':
 			cla
 			*clr
 			minut += 30
-			feed_horse = 0
-			grandmahelp += 1
+			grandpaQW['feed_horse'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -271,13 +295,13 @@ if $ARGS[0] = 'horse':
 			act 'Finish':gt 'gadsarai','horse'
 		end
 	end
-	if horse_field = 1:
+	if grandpaQW['horse_field'] = 1:
 		act 'Lead the horse to the field':
 			cla
 			*clr
 			minut += 60
-			horse_field = 0
-			grandmahelp += 1
+			grandpaQW['horse_field'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -287,12 +311,12 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadfield','field'
 		end
 	end
-	if horse_river = 1 and sunWeather = 1 and temper >= 15:
+	if grandpaQW['horse_river'] = 1 and sunWeather = 1 and temper >= 15:
 		act 'Lead the horse to the river':
 			cla
 			*clr
 			minut += 30
-			horse_river = 2
+			grandpaQW['horse_river'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -302,13 +326,13 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadriver', 'gadbitch'
 		end
 	end
-	if comb_horse = 1:
+	if grandpaQW['comb_horse'] = 1:
 		act 'Groom the horse':
 			cla
 			*clr
 			minut += 60
-			comb_horse = 0
-			grandmahelp += 1
+			grandpaQW['comb_horse'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 32 - 30
locations/gadukino.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		if StoryLine = 1:
-			'In the village you are approached by your old friend Mitka.'
+			'As you walk through the village, you are approached by Mitka, your childhood friend.'
 		else
 			if npc_rel['A63'] = 0:
 				'In the village you are approached by a boy about your age.'
@@ -97,27 +97,28 @@ if $ARGS[0] = '':
 		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1:
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a> live.'
-			act 'Grandparent''s house': minut += 5 & gt 'gaddvor'
+			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
+			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
-		if npc_rel['A60'] > 0 and metmira = 1: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s</a> house.'
+		if npc_rel['A60'] > 0 and metmira = 1: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s house</a>.'
 		*nl
 
 		if month >= 6 and month <= 9:
 			if hour >= 9 and hour <= 11:
-				'A truck from the city has come to <a href="exec: gt ''gadukino'',''collection_point''">collect</a> mushrooms and berries. Will stay around until noon.'
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until about noon.'
 			else
-				'Between 9.00 and 12.00, a truck will come to collect mushrooms and berries.'
+				'This time of year, a truck usually comes by in the mornings between 9AM and noon to purchase mushrooms and berries from the locals.'
 			end
 		else
-			'It''s not the right season for mushrooms or berries. The truck which takes them in town won''t come.'
+			'During the summer, a truck usually comes into town from the city to buy fresh mushrooms and berries from the locals. It''s not the right season for it right now though.'
 		end
 
 		!Looks like no reference to Gadmarket exists. Adding it...FinnMacha
 		*nl
 		if hour >= 8 and hour < 20:
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
-			'One of the building facing the square has a sign saying <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			'One of the buildings facing the square has a sign saying <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			act 'Go to the general store': minut += 5 & gt 'gadmarket'
 		else
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the building facing the square has a sign saying General Store. A sign in the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
@@ -144,14 +145,14 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Go to the forest road':minut += 20 & gt 'gadroad'
+		act 'Walk down to the river':minut += 20 & gt 'gadriver', 'start'
+		act 'Walk to the old forest road':minut += 20 & gt 'gadroad'
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
 
-		act 'Go to the highway':minut += 30 & nroad = 10 & gt 'road'
+		act 'Walk to the highway':minut += 30 & nroad = 10 & gt 'road'
 	end
 end
 
@@ -246,8 +247,9 @@ if $ARGS[0] = 'find_meadow':
 	$menu_arg = 'find_meadow'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
-	'Walking around the village you see a small path that leads between some houses, the path leads away from the village into a dense thicket...'
+	'As you walk through the village, you notice a small path that leads between some houses. The path leads away from the village and into a dense thicket...'
 
+	act 'Ignore it and keep walking':gt 'gadukino'
 	act 'Follow the path to see where it goes':
 		*clr & cla
 		meadow = 1
@@ -299,6 +301,7 @@ if $ARGS[0] = 'mira_events':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
 		'Walking around the village you notice a young girl around your own age. You do not recognize her from the last time you were at the village. She is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
+		act 'Walk away': gt 'gadukino'
 		act 'Help her':
 			*clr & cla
 			metmira = 1
@@ -306,19 +309,17 @@ if $ARGS[0] = 'mira_events':
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
-			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
+			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could make your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
 			'Together you are able to guide the calf back into its pen. Mira turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...".'
-			'They were left quite poor and could only afford to buy a house in this run-down dust-covered village.'
+			'They were left quite poor and could only afford to buy a house in this run-down, dust-covered village.'
 			if StoryLine = 1:
-				'You walk with her and chat until you reach her house, which is close by to your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
+				'You walk with her and chat until you reach her house, which turns out to be just down the road from your grandparent''s place. Mira invites you to come and visit her any time. She is just as bored in the village as you are.'
 			else
 				'You walk with her and chat until you reach her house, which is close by to the center of the village. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 			end
 
 			act 'Finish your walk': gt 'gadukino'
 		end
-
-		act 'Walk away': gt 'gadukino'
 	else
 		*clr & cla
 		! mira 2nd wish - pose as prostitute - one time event to fire so check for this first before repeatable mira events
@@ -326,6 +327,7 @@ if $ARGS[0] = 'mira_events':
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
 			'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
 			
+			act 'Walk away': gt 'gadukino'
 			gs 'willpower', 'prostitution', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Approach Mira (<<will_cost>> Willpower)':
@@ -441,7 +443,6 @@ if $ARGS[0] = 'mira_events':
 				act 'Approach Mira (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			
-			act 'Walk away': gt 'gadukino'
 		! mira slut events
 		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
 			miraday = daystart
@@ -451,6 +452,7 @@ if $ARGS[0] = 'mira_events':
 				*nl
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
 				
+				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'You''re feeling naughty (<<will_cost>> Willpower)':
@@ -509,7 +511,6 @@ if $ARGS[0] = 'mira_events':
 					act 'You''re feeling naughty (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act 'Walk away': gt 'gadukino'
 			else
 				*clr & cla
 				
@@ -556,6 +557,7 @@ if $ARGS[0] = 'mira_events':
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
+				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Continue watching (<<will_cost>> Willpower)':
@@ -578,7 +580,6 @@ if $ARGS[0] = 'mira_events':
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act 'Walk away': gt 'gadukino'
 			! mira first wish not done
 			elseif npc_QW['A60'] >= 4:
 				*clr & cla
@@ -587,6 +588,7 @@ if $ARGS[0] = 'mira_events':
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
+				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Continue watching (<<will_cost>> Willpower)':
@@ -609,7 +611,6 @@ if $ARGS[0] = 'mira_events':
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act 'Walk away': gt 'gadukino'
 			end
 		! quest not far along enough yet so just talking to mira or already watched mira have sex today
 		else
@@ -685,7 +686,7 @@ if $ARGS[0] = 'other_events':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-		'You kill time, walking through the village.'
+		'You kill some time walking through the village.'
 
 		act 'Finish your walk': gt 'gadukino'
 	end
@@ -697,11 +698,14 @@ if $ARGS[0] = 'collection_point':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries locals find while out in the nearby woods.'
-	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like yours to buy their mushrooms and berries, too.'
+	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries the locals find while out in the nearby woods.'
+	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like this one to buy their mushrooms and berries, too.'
+	'There is a small sign hanging off of one of the back doors, which says:'
+	'"Buying: mushrooms 150<b>₽</b>/kg, berries 75<b>₽</b>/kg"'
 
+	act 'Go back to the village center':gt 'gadukino'
 	if boletus > 0 and bilberry > 0:
-		act'Sell your mushrooms and berries':
+		act 'Sell your mushrooms and berries':
 			*clr & cla
 			minut += 30
 			money += boletus*150+bilberry*75
@@ -714,7 +718,7 @@ if $ARGS[0] = 'collection_point':
 		end
 	end
 	if boletus > 0:
-		act'Sell your mushrooms':
+		act 'Sell your mushrooms':
 			*clr & cla
 			minut += 30
 			money += boletus*150
@@ -726,19 +730,17 @@ if $ARGS[0] = 'collection_point':
 		end
 	end
 	if bilberry > 0:
-		act'Sell your berries':
+		act 'Sell your berries':
 			*clr & cla
 			minut += 30
 			money += bilberry*75
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to your berries for <<bilberry*75>> <b>₽</b>.'
+			'You decide to sell your berries for <<bilberry*75>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
 		end
 	end
-
-	act'Go back to the village center':gt'gadukino'
 end
 
 --- gadukino ---------------------------------

+ 29 - 28
locations/gadukino_event.qsrc

@@ -100,6 +100,17 @@ if $ARGS[0] = 'gang_apologise':
 	'Walking through the village you suddenly hear someone calling out to you by name. Turning back, you see that it is Uncle Stepan, coming your way. Remembering the recent events you pick up your pace. There is no way you want to experience that again.'
 	'"<<$pcs_nickname>>, wait, I need to speak with you," Stepan yelled from afar, seeing that you are ready run away.'
 
+	act 'Run away':
+		*clr & cla
+		minut += 15
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
+		'You started running away from the road, not stopping before you felt you were in the clear.'
+		'"Good thing I ran away from that evil man." you thought to yourself, looking around.'
+		act 'Continue':gt'meadow'
+	end
+
 	act 'Wait':
 		*clr & cla
 		minut += 5
@@ -164,16 +175,6 @@ if $ARGS[0] = 'gang_apologise':
 			end
 		end
 	end
-	act 'Run away':
-		*clr & cla
-		minut += 15
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
-		'You started running away from the road, not stopping before you felt you were in the clear.'
-		'"Good thing I ran away from that evil man." you thought to yourself, looking around.'
-		act 'Continue':gt'meadow'
-	end
 end
 
 if $ARGS[0] = 'gadriver_gang':
@@ -282,7 +283,7 @@ if $ARGS[0] = 'gadriver_gang':
 								if pcs_ass <= 5:'"Well, well what a tight hole you have here..." you hear a male voice. "Let me help you stretch it out."'
 								if pcs_ass <= 10:'You could only mumble in protest as your mouth was busy.'
 
-								gs 'dinSex','boy_wants_anal','lubri'
+								gs 'dinSex','boy_wants_anal','','lubri'
 								gs 'dinsex','analsex'
 								gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 								gs 'arousal', 'vaginal', 5, 'sub', 'gangbang'
@@ -298,7 +299,7 @@ if $ARGS[0] = 'gadriver_gang':
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_dog2.jpg"></center>'
 									'The next man, not wanting to be outdone by the man before, grabbed his cock, thrust it in your anus and started pounding you relentlessly.'
 
-									gs 'dinSex','boy_wants_anal','lubri'
+									gs 'dinSex','boy_wants_anal','','lubri'
 									gs 'dinsex','analsex'
 									gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 									gs 'arousal', 'anal', 5, 'sub', 'gangbang', 'rough'
@@ -438,7 +439,7 @@ if $ARGS[0] = 'gadriver_gang':
 																	'Then someone uses your ass for his enjoyment.'
 
 																	protect = rand(0,1)
-																	gs 'dinSex','boy_wants_anal','lubri'
+																	gs 'dinSex','boy_wants_anal','','lubri'
 																	gs 'dinsex','analsex'
 																	gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 																	gs 'arousal', 'anal', 5, 'sub', 'gangbang'
@@ -453,7 +454,7 @@ if $ARGS[0] = 'gadriver_gang':
 
 																		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/river/gadriver_gang_dog8.jpg"></center>'
 																		'Next up is a drunk man barely able to stand straight, his cock is pretty limp as he''s having difficult getting an erection. He doesn''t seem to mind too much as he enters your anus.'
-																		gs 'dinSex','boy_wants_anal','lubri'
+																		gs 'dinSex','boy_wants_anal','','lubri'
 																		gs 'dinsex','analsex'
 																		gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 																		gs 'arousal', 'anal', 5, 'sub', 'gangbang'
@@ -469,7 +470,7 @@ if $ARGS[0] = 'gadriver_gang':
 																			if huntersKnow = 0:'You squint a little to see who''s next in line while sucking someone''s cock, you see an unknown village man, penetrating your ass.'
 																			if huntersKnow = 1:'When another man starts penetrating your ass, you squint a little to see who it is, and to your horror there''s Andrei thrusting away. There''s no doubt that Igor and Sergei will find out...'
 
-																			gs 'dinSex','boy_wants_anal','lubri'
+																			gs 'dinSex','boy_wants_anal','','lubri'
 																			gs 'dinsex','analsex'
 																			'Andrei cums and whipspers "You better get prepared to serve me or I''ll tell the others everything..."'
 																			gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
@@ -679,7 +680,6 @@ if $ARGS[0] = 'gadukino_mitka':
 	'Walking through the village you met Mitka. Seeing you, he started rubbing his crotch and said with a grin.'
 	'"Hey, <<$pcs_nickname>>, let''s go have some fun getting rid of this boner you just gave me."'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -697,6 +697,7 @@ if $ARGS[0] = 'gadukino_mitka':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
 end
 
 if $ARGS[0] = 'gadukino_kolyamba':
@@ -709,7 +710,6 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking through the village you met Kolyamba. Seeing you, he reached into his pants and started playing with his balls. He then grabbed you by the arm and dragged into the bushes next to the road.'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -727,6 +727,7 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
 end
 
 if $ARGS[0] = 'gadukino_vasyan':
@@ -739,7 +740,6 @@ if $ARGS[0] = 'gadukino_vasyan':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking through the village you met Vasyan. Seeing you, he smiled and waved you over to him. He kisses you on the lips and asks you to join him as he walked into the bushes next to the road.'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -757,6 +757,7 @@ if $ARGS[0] = 'gadukino_vasyan':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
 end
 
 if $ARGS[0] = 'gadukino_2boys':
@@ -782,7 +783,6 @@ if $ARGS[0] = 'gadukino_2boys':
 		vasyanday = daystart
 		'Walking through the village you met Kolyamba and Vasyan. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	end
-	act 'Go with them': gt 'mitkasex', 'gad2'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -809,6 +809,7 @@ if $ARGS[0] = 'gadukino_2boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'gad2'
 end
 
 if $ARGS[0] = 'mira_mitka':
@@ -822,7 +823,6 @@ if $ARGS[0] = 'mira_mitka':
 	'Walking with Mira in the village you met Mitka. Seeing you and Mira, he starts playing with his balls and said with a grin.'
 	'"Oh hey girls, let''s go have some fun getting rid of this boner you both just gave me."'
 
-	act 'Go with him': gt 'mitkasex', 'forest1', 'A63'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -840,6 +840,7 @@ if $ARGS[0] = 'mira_mitka':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'forest1', 'A63'
 end
 
 if $ARGS[0] = 'mira_kolyamba':
@@ -852,7 +853,6 @@ if $ARGS[0] = 'mira_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking with Mira in the village you met Kolyamba. Seeing you and Mira, he starts playing with his balls, and tries to grab you both by the hand.'
 
-	act 'Go with him': gt 'mitkasex', 'forest1', 'A61'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -870,6 +870,7 @@ if $ARGS[0] = 'mira_kolyamba':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'forest1', 'A61'
 end
 
 if $ARGS[0] = 'mira_vasyan':
@@ -882,7 +883,6 @@ if $ARGS[0] = 'mira_vasyan':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking with Mira in the village you met Vasyan. Seeing you and Mira, he smiles and tries to grab you both by the hand.'
 
-	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
@@ -899,6 +899,7 @@ if $ARGS[0] = 'mira_vasyan':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
 end
 
 if $ARGS[0] = 'mira_2boys':
@@ -924,7 +925,6 @@ if $ARGS[0] = 'mira_2boys':
 		vasyanday = daystart
 		'Walking with Mira in the village you met Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 	end
-	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -951,6 +951,7 @@ if $ARGS[0] = 'mira_2boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
 end
 
 if $ARGS[0] = 'mira_3boys':
@@ -969,7 +970,6 @@ if $ARGS[0] = 'mira_3boys':
 
 	'Walking with Mira in the village you met Mitka, Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 
-	act 'Go with them': gt 'mitkasex', 'forest3'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -989,6 +989,7 @@ if $ARGS[0] = 'mira_3boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest3'
 end
 
 if $ARGS[0] = 'go_home':
@@ -1022,12 +1023,12 @@ if $ARGS[0] = 'go_home_ender':
 	menu_off = 1
 	*clr & cla
 	minut += rand(15,25)
-	if grandmahelp > 0:
+	if grandmaQW['help'] > 0:
 		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		'Before leaving grandma gives you <<grandmahelp*50>> rubles.'
-		money += grandmahelp*50
-		grandmahelp = 0
+		'Before leaving grandma gives you <<grandmaQW[''help'']*50>> rubles.'
+		money += grandmaQW['help'] * 50
+		grandmaQW['help'] = 0
 	end
 	gadstay = 0
 	gs 'stat'

+ 4 - 4
locations/gaptek.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'start' or $message ! '':
 		*P FUNC ('$stock_item', 30, 'Vitamins', 130, 'vitamin', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 50, 'Painkillers', 435, 'painkiller', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', 'gaptek', 'start')
-		*P FUNC ('$stock_item', 1, 'Lubricant', 145, 'lubri', 'gaptek', 'start')
+		*P FUNC ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'gaptek', 'start')
@@ -100,7 +100,7 @@ if $ARGS[0] = 'start' or $message ! '':
 		*P FUNC ('$stock_item', 30, 'Vitamins', 130, 'vitamin', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 50, 'Painkillers', 435, 'painkiller', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', 'gaptek', 'start')
-		*P FUNC ('$stock_item', 1, 'Lubricant', 145, 'lubri', 'gaptek', 'start', StoryLine, '(you have <<lubri>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 1</a>')
+		*P FUNC ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'gaptek', 'start', StoryLine, '(you have <<lubri>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 1</a>')
 		*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'gaptek', 'start')
@@ -277,13 +277,13 @@ if $ARGS[0] = 'buy_lube':
 		*nl
 		gt 'gaptek', 'garden'
 	else
-		lubri += 1
+		lubri += 20
 		money -= 145
 		gap_lub_count += 1
 		galubriday = daystart
 		gs 'stat'
 		if npc_QW['A29'] < 3:gaogorod += 3
-		$gardmess = '<center><font color="green">You bought 1 <b>Lubricant</b>.</font></center><br>You pay for the lubricant and quickly put the tubes in your pocket, before anyone sees you buy them.'
+		$gardmess = '<center><font color="green">You bought 1 <b>Lubricant</b>.</font></center><br>You pay for the lubricant and quickly put the tube in your pocket, before anyone sees you buy them.'
 		*nl
 		gt 'gaptek', 'garden'
 	end

+ 2 - 4
locations/garfather.qsrc

@@ -351,11 +351,9 @@ if pcs_horny > 50 and npc_sex['A28'] ! 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.1,<<rand(0,2)>>.jpg"></center>'
 					'Your stepfather grabs you and pulls you up from your knees, turning you to face the Gazelle. You plant your hands on the car, and arch your back to give him easier access to your ass and pussy. Once you''re in position, he begins caressing your pussy and then slams his dick in.'
 
-					gs 'arousal', 'vaginal', 10, 'sub', 'incest'
-					gs 'stat'
-
 					gs 'dinSex', 'wear_condom'
-					gs 'dinsex','vaginal_sex',10
+					gs 'dinsex','vaginal_sex',10, 'sub', 'incest'
+					gs 'stat'
 					act 'Continue':
 						cla
 						*clr

+ 4 - 4
locations/gdksport.qsrc

@@ -77,7 +77,7 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'sports_outfit'
 
-	if shampoo > 0:
+	if shampoo > 0 or (StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'start':
 			minut += 1
 			deodorant -= 1
 			gs 'sweat', 'deo'
-			iif(pregchem => 2191, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
 			act 'Continue': menu_off = 0 & gt $loc, $metka
 		end
@@ -955,6 +955,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
+	if StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1
@@ -1217,8 +1218,7 @@ if $ARGS[0] = 'Ivan_bored':
 		act 'Let him':
 			*clr & cla
 			lubonus = 2
-			spafinloc = 3
-			gs 'Cum_Manage'
+			gs 'cum_call', 'anus', 'A3', 1
 
 			if pcs_ass + lubonus + 2 < dick:
 				if pcs_makeup > 1:pcs_makeup = 0

+ 1 - 1
locations/gopskver.qsrc

@@ -822,7 +822,7 @@ if $ARGS[0] = 'BjBeerVag':
 	else
 		'Dan runs his hand over your bald pussy, and chuckles with satisfaction: "Very nice, <<$pcs_nickname>>. You got it all nice and smooth for us, so we can see what we''re fucking next."'
 	end
-	if pirsG = 1:
+	if pirsG > 0:
 		pcs_horny += 10
 		'The guys are intrigued by your intimate piercing, and playfully rub and tug at it, making you blush and moan with excitement.'
 	end

+ 61 - 48
locations/grandmahelp.qsrc

@@ -1,79 +1,85 @@
 # grandmahelp
 
 menu_off = 1
-gs'stat'
+gs 'stat'
 
 frost = 0
 
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
 
-'You ask your grandmother if you there was something you could help out with something here at home. Your grandmother turns to you and says:'
+'You ask your grandmother if you there is anything you could help out with. Your grandmother turns to you and says:'
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmahelping = rand(0,2)
+		grandmaQW['help_type'] = rand(0,2)
 	elseif month = 5 or month = 6:
-		grandmahelping = rand(0,5)
+		grandmaQW['help_type'] = rand(0,5)
 	else
-		grandmahelping = rand(0,6)
+		grandmaQW['help_type'] = rand(0,6)
 	end
 
-	if grandmahelping = 0: 
+	if grandmaQW['help_type'] = 0: 
 		gt 'grandmahelp', 'cleanfloor'
-	elseif grandmahelping = 1:
+	elseif grandmaQW['help_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
-	elseif grandmahelping = 2 and hour < 9 and hour > 20:
+	elseif grandmaQW['help_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
-	elseif grandmahelping = 3:
+	elseif grandmaQW['help_type'] = 3:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmahelping = 4 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 4 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmahelping = 5 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 5 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmahelping = 6 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 6 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
 	else
-		'"There is nothing to do today <<$pcs_nickname>>, take a day off.'
-		act 'Go':gt 'gadhouse', 'start'
+		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
+		act 'Continue':gt 'gadhouse', 'grandma'
 	end
 end
 
 if $ARGS[0] = 'cleanfloor':
-	'"There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
+	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
-	act 'Clean the floor (1:00)':
+	grandmaQW['cleanfloor'] = 1
+	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
+	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmahelp += 1
+		grandmaQW['cleanfloor'] = 0
+		grandmaQW['help'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
 		
-		act 'Go':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'start'
 	end
 end
 
 if $ARGS[0] = 'washclothes':
-	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
+	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
-	act 'Wash clothes (1:00)':
+	grandmaQW['washclothes'] = 1
+	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
+	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmahelp += 1
+		grandmaQW['washclothes'] = 0
+		grandmaQW['help'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-		'You pick up grandfathers dirty clothes and take it with you outside where you soak them in the metal basin for an hour.'
+		'You pick up grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
 		
 		act 'Hang the Laundry':
 		    *clr & cla
 		    minut += 10
 		    gs'stat'
 		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-		    'You are done with the washing and walk over to the yard where you carefully hang the clothes to dry.'
+		    'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
-		    act 'Go':gt'gaddvor'
+		    act 'Continue':gt'gaddvor'
 		end    
 	end
 end
@@ -81,41 +87,44 @@ end
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
-	act 'Go to the yard (0:10)':
+	grandmaQW['feed_chickens'] = 1
+	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the yard (0:10)':
 		*clr & cla
-		feed_chickens = 1
 		minut += 10
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
 		'You take the grain mix for the chickens with you and walk over to the yard.'
 
-		act 'Go':gt'gaddvor'
+		act 'Continue':gt'gaddvor','chickens'
 	end
 end
 
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
-	act 'Go to the barn (0:10)':
+	grandmaQW['milk_cow'] = 1
+	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		minut += 10
-		milk_cow = 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where the cows are kept.'
 
-		act 'Further':gt'gadsarai'
+		act 'Continue':gt'gadsarai','cow'
 	end	
 end
 
 if $ARGS[0] = 'checkplants':
-	'"<<$pcs_nickname>>, go to the garden and check on the plants."'
+	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
-	act 'Go to garden (0:10)':
+	grandmaQW['work_garden'] = 1
+	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the garden (0:10)':
 		*clr & cla
-        work_garden = 1
 		minut += 10
 		gs'stat'
 
@@ -127,18 +136,19 @@ if $ARGS[0] = 'checkplants':
 end
 
 if $ARGS[0] = 'waterplants':
-	'"Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
+	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
-	act 'Go to the garden (0:10)':
+	grandmaQW['water_garden'] = 1
+	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the garden (0:10)':
 		*clr & cla
-        water_garden = 1
 		minut += 10
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a bucket along with you to the garden.'
+		'You bring a watering can along with you to the garden.'
 
-		act 'Further':gt'gadgarden','garden'
+		act 'Continue':gt'gadgarden','garden'
 	end
 end
 
@@ -146,44 +156,47 @@ if $ARGS[0] = 'harvest':
 	if month = 7:
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
-		act 'Go to the garden (0:10)':
+		grandmaQW['collect_strawberries'] = 1
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
-			collect_strawberries = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the strawberry plot in the garden.'
 
-			act 'Further':gt'gadgarden','strawberry'
+			act 'Continue':gt'gadgarden','strawberry'
 		end
 	elseif month = 8:
 		'"<<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
 
-		act 'Go to the garden (0:10)':
+		grandmaQW['fruit_collect'] = 1
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
-			fruit_collect = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the fruit garden.'
 
-			act 'Further':gt'gadgarden','fruit_garden'
+			act 'Continue':gt'gadgarden','fruit_garden'
 		end
 	elseif month = 9:
-		'"<<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
+		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
-		act 'Go to garden (0:10)':
+		grandmaQW['harvest_garden'] = 1
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
+		act 'Agree and go to the garden (0:10)':
 			*clr & cla
-			harvest_garden = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring the harvest tools with you and go over to the garden.'
 
-			act 'Further':gt'gadgarden','garden'
+			act 'Continue':gt'gadgarden','garden'
 		end
 	end
 end

+ 93 - 67
locations/grandpahelp.qsrc

@@ -9,19 +9,21 @@ gs'stat'
 if $ARGS[0] = 'start':
 
 	if month <= 4 or month >= 10:
-		grandpahelping = rand(0,5)
+		grandpaQW['help_type'] = rand(0,5)
 	elseif month = 5:
-		grandpahelping = rand(3,8)
+		grandpaQW['help_type'] = rand(3,8)
 	elseif month = 6 or month = 9:
-		grandpahelping = rand(3,12)
+		grandpaQW['help_type'] = rand(3,12)
 	else
-		grandpahelping = rand(3,13)
+		grandpaQW['help_type'] = rand(3,13)
 	end
 
-	if grandpahelping = 0:
-		'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
+	if grandpaQW['help_type'] = 0:
+		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
 
-		act 'Fetch firewood (0:20)':
+		grandpaQW['fetch_firewood'] = 1
+		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
+		act 'Agree and go to fetch firewood (0:20)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
@@ -31,33 +33,37 @@ if $ARGS[0] = 'start':
 			'You put on some warm clothes and run over to the barn to collect some firewood. '
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
+			grandpaQW['fetch_firewood'] = 0
 			minut += 20
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			gs'stat'
 
-			act 'Go':gt 'gadhouse', 'start'
+			act 'Continue':gt 'gadhouse', 'start'
 		end
-	elseif grandpahelping = 1:
+	elseif grandpaQW['help_type'] = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
-		act 'Go to the barn (0:10)':
+		grandpaQW['feed_horse'] = 1
+		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'grandpa'
+		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 			end
-			'You walk over to the barn and where Desperado is kept.'
-			feed_horse = 1
+			'You walk over to the barn where Desperado is kept.'
 			minut += 10
 			gs'stat'
 
-			act 'Continue':gt'gadsarai'
+			act 'Continue':gt'gadsarai','horse'
 		end
-	elseif grandpahelping = 2:
+	elseif grandpaQW['help_type'] = 2:
 		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
-		act 'Go to the barn (0:10)':
+		grandpaQW['feed_cow'] = 1
+		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
+		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -66,36 +72,36 @@ if $ARGS[0] = 'start':
 			end
 			'You walk over to the barn where the cows are kept.'
 			minut += 10
-			feed_cow = 1
 			gs'stat'
 
-			act 'Continue':gt'gadsarai'
+			act 'Continue':gt'gadsarai','cow'
 		end
-	elseif grandpahelping = 3:
+	elseif grandpaQW['help_type'] = 3:
 		gt 'grandpahelp', 'cleanyard'
-	elseif grandpahelping = 4:
+	elseif grandpaQW['help_type'] = 4:
 		gt 'grandpahelp', 'groomhorse'
-	elseif grandpahelping = 5:
+	elseif grandpaQW['help_type'] = 5:
 		gt 'grandpahelp', 'feedhogs'
-	elseif grandpahelping = 6 and hour >= 6 and hour < 9:
+	elseif grandpaQW['help_type'] = 6 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazehorse'
-	elseif grandpahelping = 7 and hour >= 6 and hour < 9:
+	elseif grandpaQW['help_type'] = 7 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'leadcows'
-	elseif grandpahelping = 8 and hour >= 6 and hour < 9:
+	elseif grandpaQW['help_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+	elseif grandpaQW['help_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0 and ARRSIZE('swimwear') > 0:
+	elseif grandpaQW['help_type'] >= 10 and grandpaQW['help_type'] < 13 and $grandpaQW['gather_quest'] = '' and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'pickforest'
-	elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+	elseif grandpaQW['help_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
-		'"Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
+		'"Okay, grandfather," you replied.'
 
-		act 'Go to the field (0:40)':
+		grandpaQW['haying_time'] = 1
+		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
 			'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
-			haying_time = 1
 			minut += 40
 			gs'stat'
 
@@ -125,14 +131,16 @@ if $ARGS[0] = 'start':
 				'"You can take the day off."'
 			end
 		end
-		act 'Leave':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'grandpa'
 	end
 end
 
 if $ARGS[0] = 'cleanyard':
 	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
-	act 'Clean up the yard (1:00)':
+	grandpaQW['clean_yard'] = 1
+	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
+	act 'Agree and go clean up the yard (1:00)':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
@@ -142,7 +150,8 @@ if $ARGS[0] = 'cleanyard':
 			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
-		grandmahelp += 1
+		grandpaQW['clean_yard'] = 0
+		grandmaQW['help'] += 1
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else
@@ -158,7 +167,9 @@ end
 if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
-	act 'Go to the barn (0:10)':
+	grandpaQW['feed_boar'] = 1
+	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -166,33 +177,35 @@ if $ARGS[0] = 'feedhogs':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
 		'You walk over to the barn where the hogs are kept.'
-		feed_boar = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai'
+		act 'Continue':gt'gadsarai','boar'
 	end
 end
 
 if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
-	act 'Go to the barn (0:10)':
+		grandpaQW['horse_river'] = 1
+	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where Desperado is kept.'
-		horse_river = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai'
+		act 'Continue':gt'gadsarai','horse'
 	end
 end
 
 if $ARGS[0] = 'groomhorse':
 	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
-	act 'Go to the barn (0:10)':
+	grandpaQW['comb_horse'] = 1
+	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -200,46 +213,47 @@ if $ARGS[0] = 'groomhorse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
 		'You walk over to the barn where Desperado is kept.'
-		comb_horse = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai'
+		act 'Continue':gt'gadsarai','horse'
 	end
 end
 
 if $ARGS[0] = 'grazehorse':
 	'"<<$pcs_nickname>>, take Desperado to the field, my legs hurt so I need to rest for a bit. I''ll retrieve the horse up in the evening."'
 
-	act 'Go to the barn (0:10)':
+	grandpaQW['horse_field'] = 1
+	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where Desperado is kept.'
-		horse_field = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':& gt'gadsarai'
+		act 'Continue':& gt'gadsarai','horse'
 	end
 end
 
 if $ARGS[0] = 'grazecows':
-	if graze_cow_exp = 0: 
+	if grandpaQW['graze_cow_exp'] = 0: 
 		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
 		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
 	end
 
-	act 'Go to the field (0:40)':
+	grandpaQW['graze_cow'] = 1
+	act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the field (0:40)':
 		*clr & cla
-		if graze_cow_exp = 0:
+		if grandpaQW['graze_cow_exp'] = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
 			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 		end
-		graze_cow = 1
 		pcs_mood += 20
 		pcs_health += 10
 		minut += 40
@@ -252,42 +266,54 @@ if $ARGS[0] = 'grazecows':
 end
 
 if $ARGS[0] = 'leadcows':
-	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
 
-	act 'Go to the barn (0:10)':
+	grandpaQW['cow_field'] = 1
+	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where the cows are kept.'
-		cow_field = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai'
+		act 'Continue':gt'gadsarai','cow'
 	end
 end
 
 if $ARGS[0] = 'pickforest':
-	if grandpahelping = 10:
-		go_in_boletus = 1
-		grandpa_boletus = rand(2,3)
+	if grandpaQW['help_type'] = 10:
+		$grandpaQW['gather_quest'] = 'mushroom'
+		grandpaQW['mushroom_qty'] = rand(2,3)
 		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
 		'"How much should I pick, grandpa?", you ask.'
-		'"<<grandpa_boletus>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	elseif grandpahelping = 11:
-		go_in_bilberry = 1
-		grandpa_bilberry = rand(3,5)
+		'"<<grandpaQW[''mushroom_qty'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
+	elseif grandpaQW['help_type'] = 11:
+		$grandpaQW['gather_quest'] = 'berry'
+		grandpaQW['berry_qty'] = rand(3,5)
 		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
 		'"How much should I pick, grandpa?" you ask.'
-		'"<<grandpa_bilberry>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-	elseif grandpahelping = 12:
-		go_in_boletus_bilberry = 1
-		grandpa_boletus = rand(1,2)
-		grandpa_bilberry = rand(2,3)
+		'"<<grandpaQW[''berry_qty'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+	elseif grandpaQW['help_type'] = 12:
+		$grandpaQW['gather_quest'] = 'both'
+		grandpaQW['mushroom_qty'] = rand(1,2)
+		grandpaQW['berry_qty'] = rand(2,3)
 		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
 		'"How much should I pick, grandpa?"'
-		'"<<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+		'"<<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+	end
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
 	end
-	act 'Go':gt 'gadhouse', 'start'
 end
 
 --- grandpahelp ---------------------------------

+ 1 - 0
locations/gschool_boys_bathroom.qsrc

@@ -467,6 +467,7 @@ if $ARGS[0] = 'boy4':
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 	act 'Help him out':
+		npc_sex['A146'] += 1
 		gs 'boyStat', 'A146'
 		npc_rel['A146'] += 3
 		*clr & cla

+ 3 - 0
locations/gschool_chats.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = 'nerds':
 	*clr & cla
 	minut += 5
 	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_gropeday ! daystart:
+		menu_off = 1
 		gschool_gropeday = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
 		*nl
@@ -29,11 +30,13 @@ if $ARGS[0] = 'nerds':
 		gs 'gschool_groups', 'outcasts'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
+	gs 'stat'
 end
 
 if $ARGS[0] = 'gopniks':
 	*clr & cla
 	minut += 5
+	gs 'stat'
 	if grupTipe = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
 		*nl

Some files were not shown because too many files changed in this diff