Browse Source

[fixed] merge conflict

jhawkkaw 5 years ago
parent
commit
a928a128dc
100 changed files with 3239 additions and 5556 deletions
  1. 0 55
      CONTRIBUTING.md
  2. 0 48
      README.md
  3. 0 5
      common_typos.license.md
  4. 9 0
      glife.qproj
  5. 1 1
      insanity.sh
  6. 12 12
      locations/Cheatmenu_din.qsrc
  7. 4 4
      locations/Gnpc.qsrc
  8. 5 5
      locations/HotelHole.qsrc
  9. 12 12
      locations/KatjaHomeTalk.qsrc
  10. 41 3
      locations/MagEncounterFairy.qsrc
  11. 21 21
      locations/NatBelHome.qsrc
  12. 18 13
      locations/Sgrup.qsrc
  13. 18 13
      locations/Sgrup1.qsrc
  14. 18 13
      locations/Sgrup2.qsrc
  15. 18 13
      locations/Sgrup3.qsrc
  16. 18 13
      locations/Sgrup4.qsrc
  17. 18 13
      locations/Sgrup5.qsrc
  18. 40 27
      locations/SgrupDisco.qsrc
  19. 3 0
      locations/anushapt.qsrc
  20. 1 1
      locations/backwater.qsrc
  21. 1 1
      locations/bass.qsrc
  22. 3 3
      locations/bed2.qsrc
  23. 80 0
      locations/beg1.qsrc
  24. 2 0
      locations/body.qsrc
  25. 1 1
      locations/bras.qsrc
  26. 28 37
      locations/brosh.qsrc
  27. 85 83
      locations/brother.qsrc
  28. 4 4
      locations/brother2.qsrc
  29. 110 92
      locations/brother_voyeur.qsrc
  30. 1 0
      locations/budgetclothes.qsrc
  31. 67 0
      locations/castSpell.qsrc
  32. 23 18
      locations/cikl.qsrc
  33. 1 1
      locations/clothing.qsrc
  34. 6 6
      locations/club.qsrc
  35. 3 0
      locations/cum_arrcheat.qsrc
  36. 42 45
      locations/din_van.qsrc
  37. 3 3
      locations/dinsister.qsrc
  38. 48 33
      locations/etoexhib.qsrc
  39. 73 8
      locations/experiment.qsrc
  40. 1 1
      locations/fame.qsrc
  41. 4 4
      locations/father.qsrc
  42. 6 1
      locations/foto.qsrc
  43. 7 1
      locations/gadforest.qsrc
  44. 3 2
      locations/gadukino.qsrc
  45. 75 77
      locations/gdksex.qsrc
  46. 6 6
      locations/gdksport.qsrc
  47. 55 51
      locations/gevent.qsrc
  48. 19 9
      locations/gopskver.qsrc
  49. 4 4
      locations/gpoli.qsrc
  50. 2 2
      locations/grandpahelp.qsrc
  51. 1 1
      locations/gschool_boys_bathroom.qsrc
  52. 149 2
      locations/gschool_lessons.qsrc
  53. 27 2
      locations/hunter_ambient.qsrc
  54. 376 0
      locations/hunter_favors.qsrc
  55. 244 173
      locations/hunter_interactions.qsrc
  56. 4 2
      locations/husbSex.qsrc
  57. 2 2
      locations/kafesvid.qsrc
  58. 8 5
      locations/lact_lib.qsrc
  59. 213 210
      locations/lake.qsrc
  60. 7 0
      locations/lug.qsrc
  61. 8 8
      locations/mod_setting.qsrc
  62. 22 22
      locations/mother.qsrc
  63. 2 2
      locations/natbelEv.qsrc
  64. 21 18
      locations/natbelapt.qsrc
  65. 83 708
      locations/npcstatic1.qsrc
  66. 21 836
      locations/npcstatic2.qsrc
  67. 12 844
      locations/npcstatic3.qsrc
  68. 42 814
      locations/npcstatic4.qsrc
  69. 21 606
      locations/npcstatic5.qsrc
  70. 25 0
      locations/npcstaticdefaults.qsrc
  71. 19 16
      locations/obj_din.qsrc
  72. 3 2
      locations/onobjsel.qsrc
  73. 2 2
      locations/outdoors.qsrc
  74. 1 1
      locations/panties.qsrc
  75. 8 1
      locations/park.qsrc
  76. 1 1
      locations/pavCommercial.qsrc
  77. 54 30
      locations/pavtrain_market.qsrc
  78. 1 1
      locations/pavtrainhall.qsrc
  79. 53 24
      locations/phone_selfies.qsrc
  80. 8 0
      locations/placer_gskver.qsrc
  81. 53 36
      locations/pod_ezd.qsrc
  82. 6 6
      locations/poli.qsrc
  83. 1 1
      locations/pornstudio.qsrc
  84. 2 0
      locations/preCUST.qsrc
  85. 18 0
      locations/preSYS.qsrc
  86. 4 3
      locations/shop.qsrc
  87. 41 0
      locations/spellTeleport.qsrc
  88. 1 1
      locations/sportShop.qsrc
  89. 10 7
      locations/stat.qsrc
  90. 1 1
      locations/stat_display.qsrc
  91. 1 1
      locations/street.qsrc
  92. 1 1
      locations/stwork.qsrc
  93. 304 0
      locations/swamp_woods.qsrc
  94. 169 227
      locations/swamp_yard.qsrc
  95. 19 159
      locations/swamphouse.qsrc
  96. 27 7
      locations/telefon.qsrc
  97. 4 4
      locations/trFatherMisha.qsrc
  98. 4 4
      locations/trainBimbo.qsrc
  99. 26 0
      locations/treeCircActs.qsrc
  100. 89 0
      locations/treeCircle.qsrc

+ 0 - 55
CONTRIBUTING.md

@@ -1,55 +0,0 @@
-# Girl Life - ECV: Contribution Guide
-
-## Branches
-
-*master*  - This is where we develop most of the game.
-
-*release* - Current release bug fix.
-
-## Remember
-
-- Try to keep the game playable ... always. Bugs will happen but obvious mistakes can be eliminated in a simple testing run.
-- **Be careful! Do not erase other people work.**
-    - Git offer some help with that but sometimes we have to resolve conflicts ourselves.
-- Try to make **meaningful** commit messages.
-    - You can use emojis like: :wrench:, :up:, :recycle:, :new:, :x:, :shower:. Just dont overload :smile:
-    - emoji cheat sheet: http://www.emoji-cheat-sheet.com/
-- Commit **often** and in **small** chunks. 
-    - If revert is needed we don't lose much.
-
-### How to contribute?
-
-- Fork our repository clicking that "fork" button near the star button above.
-- **Read the code** to see how we do things.
-    - There is a developer guide, a coding guide and a QSP reference in our wiki.
-- Make your changes.
-- Submit merge requests.
-
-## Instructions
-
-### SSH Keys
-
-#### Windows:
-
-To generate you SSH Key you may use **puttygen** (http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)  to generate them.
-
-Open the program and follow:
-
-- Make sure the middle option (SSH-2 RSA) in the bottom is marked.
-- Make sure the number of bits in a generated key is 2048 (just below those options).
-- Click generate and follow instructions.
-- Copy the content in the big rectangle there.
-- Go to your profile >> profile settings >> ssh keys and paste it in the key field (another big rectangle).
-- Save the public key in a file.
-- Save the private file.
-
-### Using SourceTree client to manage your fork.
-
-- Download and install SourceTree (https://www.sourcetreeapp.com/). Let it install everything.
-- Create your own fork of project if you haven't already. 
-- Go to the project tab of your fork and copy SSH/HTTP link there.
-- Run SourceTree and Clone/New button. Paste in the SSH/HTTP link of your fork. You will probably get a prompt to log into GitLab. Do so. Project files will be copied to your drive.
-- You search and edit files in working copy. 
-- Since files in /location have no extension its best to open them using custom actions. Tools/Options/Custom actions. Enter $FILE in parameters and link to your text editor of choice in scripts. Will need to restart SourceTree for new actions to become available.
-- Commits you make will not appear on your project web page until you Push them.
-- To sync your fork with main fork when there are new commits go to Repository/Repository Settings in SourceTree menu bar and click add. Enter ssh://[email protected]:9000/mjsmagalhes/girllife-ecv.git (or http://) into Url/Path. Name it whatever you want. Once that is done click Pull button and select it from the dropdown list. Your fork will be updated.

+ 0 - 48
README.md

@@ -1,48 +0,0 @@
-# Girl Life (ЭТО) [English Community Version] - github edition
-
-## Formatting comments when posting commits
-Please use one of the following terms:
-* fixed
-* changed
-* added
-* removed
-* text edit
-Added and removed are for files being added or removed, fixed is for bug/code fixes, changed is for when events are changed and text edit is for changes to the text that'll appear on screen.
-These are for searching to aid those working on the files.
-Can you also include filenames (unless its a large number of files) and include any description you feel will help.
-If adding content that is disabled (due to being WIP) can you comment in the file that its disabled and include your name so that it doesn't get activated in error.
-
-## Quick start (for Unixy machines)
-* clone/fork the repo
-* make edits to the files in `locations`
-* run `./txtmerge.py locations glife.txt`
-* run `wine txt2gam.exe glife.txt glife.qsp`
-* test that it works
-* commit your changes
-* push and/or send a pull request
-
-## Quick start (for Windows machines)
-* Double click the MakeQSP.bat
-* Enjoy :)
-
-## What exactly is all this?
-In an effort to make editing the text of Girl Life easier, I set up this repo. This is based on the english community version. There are two branches: `master` and `releases`. On the `master` branch I will keep my version of the game as I make edits, merge pull requests, etc. while the `releases` is where you'd get things that you expect to actually work.
-
-## Where are the images?
-Not here. Shouldn't you know this already?
-
-## What is `glife.txt`?
-It turns out that `glife.qsp` is not the friendliest format for this game, but if you use `qgen` you can export the game in what they call `TXT2GAM` format. This is how `glife.txt` is obtained. Note that this is a large text file encoded in UTF-16, so git still has some trouble with it.
-
-## What are the python scripts?
-Since `glife.txt` is large and in UTF-16, I wrote two scripts, one that splits this file into one file per location, and puts them in `locations` after turning them to UTF-8, another that takes the UTF-8 files from `locations` and generates a UTF-16 file in `TXT2GAM` format.
-
-## I modified something in `locations`, ran the `txtmerge.py` script, now what?
-Assuming you ran something like
-    ./txtmerge.py locations glife.txt
-you now need to turn `glife.txt` into a `qsp` file. On my system, I use `wine` to run `txt2gam.exe`, works quite well:
-    wine txt2gam.exe glife.txt glife.qsp
-
-## Where do I get `qgen` and `txt2gam.exe`?
-* [qgen](http://qsp.su/index.php?option=com_content&task=view&id=46&Itemid=56)
-* [txt2gam](http://qsp.su/index.php?option=com_content&task=view&id=52&Itemid=56)

+ 0 - 5
common_typos.license.md

@@ -1,5 +0,0 @@
-List of words uses material from the wikipedia article [List of common misspellings][1], which is released under [Creative Commons Attribution-Share-Alike License 3.0][2].
-
-
-[1]: https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines
-[2]: https://creativecommons.org/licenses/by-sa/3.0/

+ 9 - 0
glife.qproj

@@ -56,6 +56,7 @@
 		<Location name="food"/>
 		<Location name="food_menu"/>
 		<Location name="virginity_call"/>
+		<Location name="willpower"/>
 	</Folder>
 	<Folder name="Body">
 		<Location name="body"/>
@@ -182,6 +183,7 @@
 		<Location name="npcpreservec"/>
 		<Location name="npcrnamefile"/>
 		<Location name="npcbreeder"/>
+		<Location name="npcstaticdefaults"/>
 		<Location name="npcstatic1"/>
 		<Location name="npcstatic2"/>
 		<Location name="npcstatic3"/>
@@ -528,6 +530,7 @@
 		<Location name="hunter_favors"/>
 		<Location name="hunter_ambient"/>
 		<Location name="hunter_interactions"/>
+		<Location name="swamp_woods"/>
 		<Location name="AndreiHunter"/>
 		<Location name="IgorHunter"/>
 		<Location name="SergeiHunter"/>
@@ -1101,5 +1104,11 @@
 	</Folder>
 	<Location name="LBZhouse"/>
 	<Location name="BanSexType"/>
+	<Folder name="Magic">
+		<Location name="castSpell"/>
+		<Location name="spellTeleport"/>
+		<Location name="treeCircle"/>
+		<Location name="treeCircActs"/>
+	</Folder>
 	</Structure>
 </QGen-project>

+ 1 - 1
insanity.sh

@@ -75,7 +75,7 @@ else
 fi
 
 _build_negative_match() {
-    _output=""
+    output=""
     for arg in "$@"
     do
         output+=" --and --not -e \"${arg}\""

+ 12 - 12
locations/Cheatmenu_din.qsrc

@@ -241,27 +241,27 @@ $cheatmenu['bodyMod'] = {
 			''
 		end
 		if (pregchem >= 3696 and pregchem < 4200) = 0:
-			'<a href="exec:pregchem = 3696 & pregtime = 133 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
 			''
 		end
 		if (pregchem >= 4200 and pregchem < 4704) = 0:
-			'<a href="exec:pregchem = 4200 & pregtime = 154 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
 			''
 		end
 		if (pregchem >= 4704 and pregchem < 5208) = 0:
-			'<a href="exec:pregchem = 4704 & pregtime = 175 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
 			''
 		end
 		if (pregchem >= 5208 and pregchem < 5712) = 0:
-			'<a href="exec:pregchem = 5208 & pregtime = 196 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
 			''
 		end
 		if (pregchem >= 5712 and pregchem < 6216) = 0:
-			'<a href="exec:pregchem = 5712 & pregtime = 217 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
 			''
 		end
 		if (pregchem >= 6216) = 0:
-			'<a href="exec:pregchem = 6216 & pregtime = 238 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
+			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
 			''
 		end
 	end
@@ -445,8 +445,8 @@ $cheatmenu['permanent'] = {
 	if cumeater_cheat = 1:$cheatcumtrait = 'Disabled'
 	if exhib_cheat = 0:$cheatexhib = 'Enabled'
 	if exhib_cheat = 1:$cheatexhib = 'Disabled'
-	if cheatConsole = 0:$cheatConsole = 'Disabled'
-	if cheatConsole = 1:$cheatConsole = 'Enabled'
+	if cheatConsole = 0:$cheatConsole = 'Visible'
+	if cheatConsole = 1:$cheatConsole = 'Hidden'
 	if cheatTime = 0:$cheatTime = 'Disabled'
 	if cheatTime = 1:$cheatTime = 'Enabled'
 
@@ -512,7 +512,7 @@ $cheatmenu['permanent'] = {
 		'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end & !1.2.3 new function
 	*nl
-	'Console input in Objects window: <a href="exec:dynamic $cheatmenu[''consolecheat'']"><<$cheatConsole>></a>'
+	'Hide Console input in objects window: <a href="exec:dynamic $cheatmenu[''consolecheat'']"><<$cheatConsole>></a>'
 	'Time Cheat in Objects window: <a href="exec:dynamic $cheatmenu[''timecheat'']"><<$cheatTime>></a>'
 	*nl
 
@@ -1660,9 +1660,9 @@ $cheatmenu['force_preg'] = {
 $cheatmenu['remove_preg'] = {
 	pregtime = 0
 	pregtalk = 0
-	pregTalkPC = 0
-	pregTalkNat = 0
-	pregTalkbrother = 0
+	pcs_pregtalk = 0
+	npc_pregtalk['A16'] = 0
+	npc_pregtalk['A34'] = 0
 	preg = 0
 	thinkpreg = 0
 	knowpreg = 0

+ 4 - 4
locations/Gnpc.qsrc

@@ -214,7 +214,7 @@ act 'Take a walk through the park':
 	end
 end
 
-if preg = 1 and pregtime <= 80 and pregTalk[numnpc] = 0 and gnpcSex[numnpc] > 0 and knowpreg = 1:
+if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc] > 0 and knowpreg = 1:
 	if $father ! $nameBoyfrend[numnpc]:
 		$pregLie = '(Lie) '
 	else
@@ -233,7 +233,7 @@ if preg = 1 and pregtime <= 80 and pregTalk[numnpc] = 0 and gnpcSex[numnpc] > 0
 			act 'Dump him and take the money':
 				cla
 				pcs_dom += 2
-				pregTalk[numnpc] = 1
+				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				money += 5000
 				gs 'stat'
@@ -245,7 +245,7 @@ if preg = 1 and pregtime <= 80 and pregTalk[numnpc] = 0 and gnpcSex[numnpc] > 0
 			act 'Dump him and throw the money in his face':
 				cla
 				pcs_dom += 5
-				pregTalk[numnpc] = 1
+				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and throw the money in his face before storming off.'
@@ -259,7 +259,7 @@ if preg = 1 and pregtime <= 80 and pregTalk[numnpc] = 0 and gnpcSex[numnpc] > 0
 			act 'Dump him':
 				cla
 				pcs_dom += 5
-				pregTalk[numnpc] = 1
+				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and storm off.'

+ 5 - 5
locations/HotelHole.qsrc

@@ -382,7 +382,7 @@ if $ARGS[0] = 'Pavlin' :
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
 			'"<<$pcs_firstname>>, today I received a request for a pregnant girl. A Pregnant Girl! How the hell am I going to find a girl that is pregnant and willing to do this shit." he says, shaking his head.'
-			if knowpreg = 1 and pregtime >= 150:
+			if knowpreg = 1 and pregchem >= 3600:
 				cla
 				'You feel anger towards <<$npc_nickname[''A217'']>> rising up inside you. "Do you ever pay attention to me? Can''t you see I am pregnant?" You ask, gesturing at your obviously swollen belly.'
 				'"Of course I know that!" <<$npc_nickname[''A217'']>>''s brows furrow, letting you know he''s getting mad. Butterflies flutter in your stomach, fear trying to match up with the anger.'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'Pavlin' :
 				end
 				act '"Of course I am, for the right price..."': gt 'HotelHole','PregBDSM'
 			end
-			if knowpreg = 1 and pregtime < 150:
+			if knowpreg = 1 and pregchem < 3600:
 				cla
 				'"Actually I am pregnant but unfortunately not really showing yet."'
 				'"That''s great, Once you are showing come to me again and I''ll introduce you."'
@@ -617,9 +617,9 @@ if $ARGS[0] = 'PregBDSM' :
 									'The nurse turns around, slightly startled, and says, "Oh you are awake. Just one minute, I will get the doctor for you." The nurse quickly exits the room.'
 									pregtime = 0
 									pregtalk = 0
-									pregTalkPC = 0
-									pregTalkNat = 0
-									pregTalkbrother = 0
+									pcs_pregtalk = 0
+									npc_pregtalk['A16'] = 0
+									npc_pregtalk['A34'] = 0
 									preg = 0
 									abortionbirthdate = daystart
 									cycle = 4

+ 12 - 12
locations/KatjaHomeTalk.qsrc

@@ -223,8 +223,8 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pregTalkKatja = 0 and KatjaConflict = 0 and kid = 0:
-		if knowKatjaPreg = 1 and pregtime >= 150:
+	if npc_pregtalk['A14'] = 0 and KatjaConflict = 0 and kid = 0:
+		if knowKatjaPreg = 1 and pregchem >= 3600:
 			cla
 			gs 'stat'
 			minut += 5
@@ -233,7 +233,7 @@ if $ARGS[0] = '':
 			'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I told you that I was pregnant. I need to think. We''ll talk later"'
 
 			act 'Say goodbye and go home':gt 'pavResidential'
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -242,7 +242,7 @@ if $ARGS[0] = '':
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
 			end
-		elseif KatjaPreg = 0 and pregtime >= 150:
+		elseif KatjaPreg = 0 and pregchem >= 3600:
 			cla
 			*nl
 			minut += 5
@@ -251,7 +251,7 @@ if $ARGS[0] = '':
 			'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later"'
 
 			act 'Say goodbye and go home':gt 'pavResidential'
-		elseif KatjaPreg = 0 and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -263,8 +263,8 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pregTalkKatja = 0 and (KatjaConflict = 0 or katjaconflict = 2) and kid > 0:
-		if knowKatjaPreg = 1 and pregtime >= 150:
+	if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and kid > 0:
+		if knowKatjaPreg = 1 and pregchem >= 3600:
 			cla
 			gs 'stat'
 			minut += 5
@@ -272,7 +272,7 @@ if $ARGS[0] = '':
 			KatConCheck = daystart
 			'"You''re pregnant again?" Her face turns red and her expression is far angrier than you''ve ever seen her. "After everything, you still didn''t trust me enough to tell me," she screams. "I thought there was something special between us." Tears begin rolling down her cheeks. "Just leave me alone, I don''t even want to see you right now."'
 			act 'Say goodbye and go home':gt 'pavResidential'
-		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregtime > 0 and (KatjaConflict = 0 or katjaconflict = 2) and pregtime < 150:
+		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and pregchem < 3600:
 			act 'Tell her you''re pregnant':
 				cls
 				gs 'stat'
@@ -285,7 +285,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pregTalkKatja = 0 and KatjaConflict = 1 and KatConCheck ! daystart and kid = 0:
+	if npc_pregtalk['A14'] = 0 and KatjaConflict = 1 and KatConCheck ! daystart and kid = 0:
 		act 'Apologize':
 			cls
 			gs 'stat'
@@ -299,7 +299,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if pregTalkKatja = 0 and KatjaConflict = 1 and KatConCheck ! daystart and kid > 0:
+	if npc_pregtalk['A14'] = 0 and KatjaConflict = 1 and KatConCheck ! daystart and kid > 0:
 		act 'Apologize':
 			cls
 			gs 'stat'
@@ -318,7 +318,7 @@ end
 
 if $ARGS[0] = 'katjaknows':
    cla
-   pregTalkKatja = 1
+   npc_pregtalk['A14'] = 1
 	*nl
 	if KatjaSlut < 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
 		minut += 10
@@ -416,7 +416,7 @@ end
 
 if $ARGS[0] = 'katjaknows1':
 	cla
-	pregTalkKatja = 1
+	npc_pregtalk['A14'] = 1
 	if KatjaSlut < 60: 
 		'"So, hot stuff. Same father as last time?"'
 	else

+ 41 - 3
locations/MagEncounterFairy.qsrc

@@ -175,7 +175,7 @@ if $ARGS[0] = 'fairy_chat':
 					if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
 					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
-				elseif fairy_surprise <= 7:
+				elseif fairy_surprise <= 6:
 					min_arousal += rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
 					'You suddenly feel flustered and more aroused then before.'
@@ -194,7 +194,7 @@ killvar '$din_fairy_chat_no1' & killvar '$din_fairy_shoo' & killvar '$din_fairy_
 
 if $ARGS[0] = 'fairychattopic':
 !!	These are the random chat texts for the Fairy from UsagiTripleSix
-	frandchat = rand(0,14)
+	frandchat = rand(0,16)
 
 	if frandchat = 1:
 		'You spend a while chatting with the fairy. She openly wonders why human children need to go to school, and brags about how fairies already know everything there is to know.'
@@ -224,8 +224,46 @@ if $ARGS[0] = 'fairychattopic':
 		'You have a scary thought while talking to the fairy. Since she''s real, you ask her how many other mythical creatures are real as well. She tells you that she''s sure that there are others out there, but she usually doesn''t stray far from the park.'
 	elseif frandchat = 14:
 		'You get into a pretty heated discussion with the fairy over whether dogs or cats are better. Well, it''s mostly the fairy that gets heated. It would be a mundane discussion for anyone else, but she takes it very seriously.'
-	else
+	elseif frandchat = 15:
 		'Today the fairy introduces you to fairy knock-knock jokes. She spends almost half an hour telling joke after joke, but you failed to understand a single one. By the time you''re ready to leave, she''s complaining about how humans have no sense of humor.'
+	else:
+		! Teleport event
+		if spellKnown['teleport'] = 0:
+			!show and teach Teleport spell
+			'The Fairy wraps her arms around your thumb and lightly tugs you over to a mysterious circle of trees.'
+			''
+			'She says, "You may have seen these circles of trees around the lands.  Fairies planted them long ago and used their magic to tether them together.  Since you also have Fae magic, I can show you how to use them."'
+			''
+			'She continues,"Most of the work was already done in the binding.  In a way, the trees of each circle are the same trees.  You just have to stand inside the circle, then hold in your mind a picture of another circle that you have been to before.  Then you say the word <i>inla</i>.  If your will is strong enough and you have enough magical energy, your energy can be used to enact your will."'
+			''
+			'She giggles.  "This lets you dance through any field you like!  "Let''s go!"'
+			''
+			'She grunts and give you a nudge into the circle.'
+			act 'Stumble into Circle':
+				''
+				'The view outside the circle seems blurry and a little indistinct.  The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that.  Though you can''t tell exactly where you are now in the blurriness, it does look different.'
+				''
+				'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
+				''
+				'You decide it would be wise to memorize your surroundings.'
+				spellKnown['teleport'] = 1
+				tpKnown['GadForest'] = 1
+				cla
+				act 'You step out of the circle...':gt 'gadforest', '1'
+			end
+		else:
+			!take the user to random location
+
+			'The Fairy nudges you into the nearby tree circle, and giggles as you hear her incant "inla", then flies out of the ring.'
+
+			$tpRand[0]='GadForest'
+			$tpRand[1]='PushkinPark'
+			$tpRand[2]='Village'
+
+			gt 'treeCircle', $tpRand[rnd(0,2)]
+
+			killvar $tpRand
+		end
 	end
 
 	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka

+ 21 - 21
locations/NatBelHome.qsrc

@@ -291,14 +291,14 @@ elseif lernHome = 0:
 									'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t seems to bother her that Kolka may knock her up.'
 								elseif natpregday > 0 and (daystart-natpregday) >= 84:
 									'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t really matter now, since Kolka has already knocked her up.'
-								elseif natpregday = 0 and pregtalknat = 1 and natbabycount = 0:
+								elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount = 0:
 									'Natasha looks at you and almost inaudably whispers "Please let him cum inside me. I want a baby too."'
-								elseif natpregday = 0 and pregtalknat = 1 and natbabycount > 0:
+								elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount > 0:
 									'Natasha looks at you and moans "Please let him cum inside me. I need him to give me another baby."'		
 								else
 									'Natasha looks at you questioningly, whether will you let him cum inside of her and risking her getting pregnant with your niece or nephew, or letting her pull away from you brother.'
 								end
-								if natsub >= 20 and pcs_dom > 20 and natcp > 0 and pregtalknat = 0:
+								if natsub >= 20 and pcs_dom > 20 and natcp > 0 and npc_pregtalk['A16'] = 0:
 									act 'Let him cum inside her':
 										cla
 										natcp += 1
@@ -311,7 +311,7 @@ elseif lernHome = 0:
 										gs 'stat'
 										act 'Next':gt $curloc
 									end
-								elseif natsub >= 20 and pcs_dom > 20 and natcp > 0 and pregtalknat = 1:
+								elseif natsub >= 20 and pcs_dom > 20 and natcp > 0 and npc_pregtalk['A16'] = 1:
 									act 'Let him cum inside her':
 										cla
 										natcp += 1
@@ -475,14 +475,14 @@ elseif lernHome = 0:
 	end
 end
 
-if pregTalkNat = 0 and kid = 0:
-	if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregtime >= 150:
+if npc_pregtalk['A16'] = 0 and kid = 0:
+	if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregchem >= 3600:
 		*clr & cla
 		gs 'stat'
 		'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
 
 		act 'Next':gt 'NatBelhome', 'natknows'
-	elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+	elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 		act 'Tell her you''re pregnant':
 			*clr & cla
 			'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
@@ -490,15 +490,15 @@ if pregTalkNat = 0 and kid = 0:
 			*nl
 			act 'Next':gt 'NatBelhome', 'natknows'
 		end
-	elseif pregtime > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
+	elseif pregchem > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
 		act 'Tell her you''re pregnant':
 			cla
 			*nl
 			'"<<$pcs_nickname>>, you''re," she pauses momentarily before continuing in a tone of shock mixed with disgust, "pregnant? Have you been sleeping around? This will definitely impact your studies."'
 			act 'Continue' :gt 'NatBelhome'
-			pregTalkNat = 1
+			npc_pregtalk['A16'] = 1
 		end
-	elseif pregtime > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
+	elseif pregchem > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
 		act 'Tell her you''re pregnant':
 			cla
 			*nl
@@ -508,26 +508,26 @@ if pregTalkNat = 0 and kid = 0:
 				'"Honestly, I don''t even know."'
 				'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
 				act 'Continue' :gt 'NatBelhome'
-				pregTalkNat = 1
+				npc_pregtalk['A16'] = 1
 			else
 				'You tell her that <<$wombthfath>> is the father and then give her brief details as to how you got pregnant, without getting too explicit.'
 				*nl
 				'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
 				act 'Continue' :gt 'NatBelhome'
-				pregTalkNat = 1
+				npc_pregtalk['A16'] = 1
 			end
 		end
 	end
 end
 
-if pregTalkNat = 0 and kid > 0:
-	if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregtime >= 150:
+if npc_pregtalk['A16'] = 0 and kid > 0:
+	if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregchem >= 3600:
 		*clr & cla
 		gs 'stat'
 		'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
 
 		act 'Next':gt 'NatBelhome', 'natknows1'
-	elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+	elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 		act 'Tell her you''re pregnant':
 			*clr & cla
 			'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'
@@ -535,28 +535,28 @@ if pregTalkNat = 0 and kid > 0:
 			*nl
 			act 'Next':gt 'NatBelhome', 'natknows1'
 		end
-	elseif pregtime > 0 and natsub = 0 and knowpreg = 1:
+	elseif pregchem > 0 and natsub = 0 and knowpreg = 1:
 		act 'Tell her you''re pregnant':
 			*clr & cla
 			*nl
 			'"Really? You''re pregnant again? You should really try to be more careful."'
 			act 'Continue' :gt 'NatBelhome'
-			pregTalkNat = 1
+			npc_pregtalk['A16'] = 1
 		end
-	elseif pregtime > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
+	elseif pregchem > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
 		act 'Tell her you''re pregnant':
 			*clr & cla
 			*nl
 			'"You got pregnant again. It must be wonderful…" She trails off, clearly envious.'
 			act 'Continue' :gt 'NatBelhome'
-			pregTalkNat = 1
+			npc_pregtalk['A16'] = 1
 		end
 	end
 end
 
 if $ARGS[0] = 'natknows':
 	cla
-	pregTalkNat = 1
+	npc_pregtalk['A16'] = 1
 	if pav_slut < 125: '"So, who''s the father?"'
 	if pav_slut >= 125: '"So, do you know who the father is?"'
 	*nl
@@ -578,7 +578,7 @@ end
 !When pregnancy fetish is added, another reaction will be added here
 if $ARGS[0] = 'natknows1':
 	cla
-	pregTalkNat = 1
+	npc_pregtalk['A16'] = 1
 	if pav_slut < 125: '"Is it the same father as last time?"'
 	if pav_slut >= 125: '"Do you know if it''s the same father as last time?"'
 	*nl

+ 18 - 13
locations/Sgrup.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You stay in the cafeteria where some of the teachers are eating or watching over the kids making sure there is no trouble.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 6:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 6 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 6:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 6 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 6:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 6:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup1.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 3:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 3 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 3:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 3 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 3:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 3:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup2.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 2:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 2 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 2:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 2 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 2:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 2:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup3.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. The cool kids are hanging out in one area, and on the other side of the hallway the sporty kids are talking about their upcoming competitions.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 1:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 1 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 1:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 1 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 1:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 1:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup4.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You need to use the restroom and as you enter you notice a lot of beautiful girls from your school there. They check their make-up, doing minor touch-ups while they gossip about their classmates who happen to not be there. Some people are standing by the windows, smoking. The Gopniks from your class are standing near the toilets.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
-
-if grupTipe[i] = 4:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1< 6 and grupTipe[i] = 4 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 4:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 4 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 4:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 4:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 18 - 13
locations/Sgrup5.qsrc

@@ -12,21 +12,26 @@ if $loc = 'gschool_grounds' or $loc = 'gschool_lunch':
 	'You decide to spend your break in a classroom. As you enter, you find several of your classmates already sitting there: the smart kids decided to get an early start on their homework assignments, while the outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
 end
 *nl
+
+gs 'gschool_lessons', 'npc_data'
+$textgrup = ''
 count1 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-
-if count1 = 6 : $textgrup += '<tr>'
-if grupTipe[i] = 5:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1 < 6 and grupTipe[i] = 5 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 5:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
-
-if i < ARRSIZE('school_static_num'):jump 'markgruploop'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
+
+	if grupTipe[i] = 5 and schoolenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 5:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 5:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
 '<<$textgrup>>'
 

+ 40 - 27
locations/SgrupDisco.qsrc

@@ -3,43 +3,55 @@
 *clr & cla
 gs 'themes', 'food_menu'
 gs 'stat'
-$textgrup = ''
-$textgrup2 = ''
 
 act 'Move away':gt $loc, $metka
 
 '<center><b><font color="maroon">Disco</font></b></center>'
-!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_yaho.jpg"></center>'
-*nl
+
+gs 'gschool_lessons', 'npc_data'
+
+!! First string for popular kids
+$textgrup = ''
 count1 = 0
-count2 = 0
-i = 0
+i = 1
 '<center><table cellspacing="3">'
-:markgruploop
-i += 1
-if count1 = 6 : $textgrup += '<tr>'
+:gruploop	
+	if count1 = 6 : $textgrup += '<tr>'
 
-if grupTipe[i] = 1:count1 += 1 & $textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-if count1 < 6 and grupTipe[i] = 1 :
-	$textgrup += '</td>'
-elseif count1 = 6 and grupTipe[i] = 1:
-	$textgrup +='</td></tr><tr>' & count1 = 0
-end
+	if grupTipe[i] = 1 and discoenable[i] = 1:
+		count1 += 1
+		$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 1:
+		$textgrup += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 1:
+		$textgrup +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop'
 
-!hack to force a new section for gopniks
-if i = 9 : $textgrup2 += '<tr></tr>'
-!end hack
+!! Force new line for gopniks
+$textgrup +='</td></tr><tr>'
 
-if count2 = 6 : $textgrup2 += '<tr>'
-if grupTipe[i] = 4: count2 += 1 & $textgrup2 += '' + '<td bgcolor=<<$bcolor1>> align="center"><img height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcGo[i]
-
-if count2 < 6 and grupTipe[i] = 4:
-	$textgrup2 += '</td>'
-elseif count2 = 6 and grupTipe[i] = 4:
-	$textgrup2 +='</td></tr><tr>' & count2 = 0
-end
+!! Second string for gopniks
+$textgrup2 = ''
+count1 = 0
+i = 1
+'<center><table cellspacing="3">'
+:gruploop2	
+	if count1 = 6 : $textgrup2 += '<tr>'
 
-if i < 61:jump 'markgruploop'
+	if grupTipe[i] = 4 and discoenable[i] = 1:
+		count1 += 1
+		$textgrup2 += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcGo[i]
+	end
+	if count1< 6 and grupTipe[i] = 4:
+		$textgrup2 += '</td>'
+	elseif count1 = 6 and grupTipe[i] = 4:
+		$textgrup2 +='</td></tr><tr>' & count1 = 0
+	end
+	i += 1
+if i <= maxnpcs:jump 'gruploop2'
 
 '<<$textgrup>>'
 *nl
@@ -48,5 +60,6 @@ if i < 61:jump 'markgruploop'
 if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec:gt ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
 '</table><center>'
 
+
 --- SgrupDisco ---------------------------------
 

+ 3 - 0
locations/anushapt.qsrc

@@ -248,6 +248,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'anushapt','bathroom'
 		end
 	end

+ 1 - 1
locations/backwater.qsrc

@@ -178,7 +178,7 @@ else
 			'You pick up your clothes laying on the ground.'
 			gt $loc, $metka
 		end
-	else
+	elseif forced_naked_day < daystart:
 		act 'Get dressed':
 			cla
 			*clr

+ 1 - 1
locations/bass.qsrc

@@ -143,7 +143,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 pregtime < 150:	
+		if pregchem < 3600:	
 			'<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>'

+ 3 - 3
locations/bed2.qsrc

@@ -494,9 +494,9 @@ if $ARGS[0] = 'succubinit':
 		preg = 0
 		pregtime = 0
 		pregtalk = 0
-		pregTalkPC = 0
-		pregTalkNat = 0
-		pregTalkbrother = 0
+		pcs_pregtalk = 0
+		npc_pregtalk['A16'] = 0
+		npc_pregtalk['A34'] = 0
 		thinkpreg = 0
 		knowpreg = 0
 		pregchem = 0

+ 80 - 0
locations/beg1.qsrc

@@ -87,22 +87,31 @@ if $ARGS[0] = 'br':
 	if begresult <= 18:  
 		'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:
+		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:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 22:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 23:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 24:
+		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:
+		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:
+		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
 	
@@ -128,20 +137,28 @@ if $ARGS[0] = '3':
 	if begresult <= 18:
 		'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:
+		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:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 28:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 29:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 30:
+		gs 'fame', 'city', 'running', 2
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 31:
+		gs 'fame', 'city', 'running', 3
 		bronzebeg += 1 & money += 500 & 'You fought hard and managed to take 3rd place, earning a prize: You receive a bronze badge and a prize of 500 <b>₽</b>'
 	elseif begresult < 32:
+		gs 'fame', 'city', 'running', 3
 		silverbeg += 1 & money += 1000 & 'You fought hard and managed to take 2nd place, earning a prize: You reveice a silver badge and a prize of 1, 000 <b>₽</b>'
 	elseif begresult >= 32:
+		gs 'fame', 'city', 'running', 4
 		razradbeg = 2 & goldbeg += 1 & money += 2000 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 2, 000 <b>₽</b> and are now part of your club''s senior squad, representing it at the next city championship!'
 	end
 	act 'Leave':gt 'fit', 'dressing room'
@@ -164,22 +181,31 @@ if $ARGS[0] = '2':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 18:
+		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:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 37:
+		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 38:
+		gs 'fame', 'city', 'running', 4
 		bronzebeg += 1 & money += 1000 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1, 000 <b>₽</b>'
 	elseif begresult < 39:
+		gs 'fame', 'city', 'running', 4
 		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 >= 39:
+		gs 'fame', 'city', 'running', 5
 		razradbeg = 3 & goldbeg += 1 & money += 3000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 3000 <b>₽</b> and became the "Track Champion of the City of Saint Petersburg", which qualifies you for the next oblast championship!'
 	end
 	act 'Leave':gt 'fit', 'dressing room'
@@ -203,22 +229,31 @@ if $ARGS[0] = '1':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 18:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 3
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 42:
+		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 43:
+		gs 'fame', 'city', 'running', 3
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 44:
+		gs 'fame', 'city', 'running', 4
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 45:
+		gs 'fame', 'city', 'running', 5
 		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 < 46:
+		gs 'fame', 'city', 'running', 5
 		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 >= 46:
+		gs 'fame', 'city', 'running', 6
 		razradbeg = 4 & goldbeg += 1 & money += 4000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 4000 <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
 	act 'Leave':gt 'fit', 'dressing room'
@@ -242,22 +277,31 @@ if $ARGS[0] = 'kms':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 18:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 4
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 49:
+		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:
+		gs 'fame', 'city', 'running', 5
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 52:
+		gs 'fame', 'city', 'running', 6
 		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 < 53:
+		gs 'fame', 'city', 'running', 8
 		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 >= 53:
+		gs 'fame', 'city', 'running', 10
 		razradbeg = 5 & goldbeg += 1 & money += 5000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 5000 <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
 	act 'Leave':gt 'fit', 'dressing room'
@@ -282,22 +326,31 @@ if $ARGS[0] = 'ross':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 18:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 8
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 56:
+		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 57:
+		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 58:
+		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 59:
+		gs 'fame', 'city', 'running', 15
 		bronzebeg += 1 & money += 4000 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 4, 000 <b>₽</b>'
 	elseif begresult < 60:
+		gs 'fame', 'city', 'running', 15
 		silverbeg += 1 & money += 5000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 5, 000 <b>₽</b>'
 	elseif begresult >= 60:
+		gs 'fame', 'city', 'running', 20
 		razradbeg = 6 & goldbeg += 1 & money += 6000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 6000 <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
 	act 'Leave':gt 'fit', 'dressing room'
@@ -321,22 +374,31 @@ if $ARGS[0] = 'kval':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 18:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 8
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 63:
+		gs 'fame', 'city', 'running', 8
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 64:
+		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:
+		gs 'fame', 'city', 'running', 15
 		razradbegK += 1 & bronzebeg += 1 & money += 5000 & 'You fought hard and managed to take 3rd place, earning a prize. You get a bronze badge and a prize of 5,000 <b>₽</b>, but sadly, only the 1st place adds to your qualification for the European championship.'
 	elseif begresult < 67:
+		gs 'fame', 'city', 'running', 15
 		razradbegK += 1 & silverbeg += 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>, but sadly, only the 1st place adds to your qualification for the European championship.'
 	elseif begresult >= 67:
+		gs 'fame', 'city', 'running', 25
 		razradbegK += 1 & goldbeg += 1 & money += 15000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 15,000 <b>₽</b> and are one step closer to qualifying for the European championship.'
 	end
 	act 'Leave':gt 'fit', 'dressing room'
@@ -362,26 +424,35 @@ if $ARGS[0] = 'evro':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 
 	if begresult <= 16:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 10
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 72:
+		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 74:
+		gs 'fame', 'city', 'running', 10
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 76:
+		gs 'fame', 'city', 'running', 15
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 78:
+		gs 'fame', 'city', 'running', 20
 		razradbegEB += 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 < 80:
+		gs 'fame', 'city', 'running', 20
 		razradbegES += 1
 		money += 15000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 15,000 <b>₽</b>'
 	elseif begresult >= 80: 
+		gs 'fame', 'city', 'running', 30
 		razradbegEG += 1
 		money += 20000
 		'You fought hard and managed to take 1st place. You get a gold medal, a prize of 20,000 <b>₽</b> and are now the "European Track Champion"!'
@@ -409,26 +480,35 @@ if $ARGS[0] = 'Int':
 	'You get in position. Then, you hear the starting shot: The race begins!'
 	
 	if begresult < 18:
+		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:
+		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:
+		gs 'fame', 'city', 'running', 20
 		'You fought hard, but managed to only take the penultimate place (7th place).'
 	elseif begresult < 88:
+		gs 'fame', 'city', 'running', 20
 		'You fought hard, but only managed to take 6th place.'
 	elseif begresult < 91:
+		gs 'fame', 'city', 'running', 20
 		'You fought hard, but only managed to take 5th place.'
 	elseif begresult < 94:
+		gs 'fame', 'city', 'running', 25
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 97:
+		gs 'fame', 'city', 'running', 30
 		razradbegIB += 1
 		money += 30000
 		'You fought hard and managed to take 3rd place, earning a prize. You get a bronze medal and a prize of 30,000 <b>₽</b>'
 	elseif begresult < 100:
+		gs 'fame', 'city', 'running', 35
 		razradbegIS += 1
 		money += 50000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 50,000 <b>₽</b>'
 	elseif begresult >= 100:
+		gs 'fame', 'city', 'running', 50
 		razradbegIG += 1
 		money += 100000
 		'You fought hard and managed to take 1st place. You get a gold medal, a prize of 100,000 <b>₽</b> and the title "World Track Champion" - YOU are the fastest woman alive!'

+ 2 - 0
locations/body.qsrc

@@ -1794,6 +1794,8 @@ end
 !!Moved to base calculation in "body_shape"; bimbobeauty = Bimbo bonus; pcs_lip = lip size; skin = skin condition; pcs_lashes = eyelashes; pcs_eyesize = eyes; bodykoef = hips:waist ratio; pcs_teeth = missing teeth; vidagebonus = youth
 !!Removed as primary appearance factors; will be eventually used in an NPC preference system instead; tanKoef = suntan
 pcs_apprnc = pcs_apprncbase + CloAdjustedBeauty + mopkoef + (pcs_hairbsh * 10) + lipbalmKoef + (pcs_breath * 5) - sweatKoef - glassvnesh - dyevmod - hairkoef - legkoef + panty_beautybounus + bra_beautybounus
+!!adjustment to make max achievable
+pcs_apprnc = pcs_apprnc*200/170
 
 if pcs_apprnc >= 200: pcs_apprnc = 200
 pcs_apprnc = pcs_apprnc + supnatvnesh

+ 1 - 1
locations/bras.qsrc

@@ -20,8 +20,8 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'wear':
+	bra_none = 0
 	if $ARGS[1] = '':
-		bra_none = 0
 		if $lastwornbratype ! '':
 			$braworntype = $lastwornbratype
 			brawornnumber = lastwornbranumber

+ 28 - 37
locations/brosh.qsrc

@@ -7,13 +7,13 @@ gs 'stat'
 evgentipe = rand(0,3)
 
 if evgentipe = 0:
-	'During the break you are greeted by Zhendos, a friend of your brother "<<$pcs_nickname>>! My little pet, meet me after school."'
+	'During the break you are greeted by Zhendos, a friend of your brother "<<$pcs_nickname>>! My little pet, come with me."'
 
-	act 'After school "meeting"':
+	act 'Go with him':
 		cls
 		gs'stat'
 
-		'You meet Zhendos after school, behind the bike sheds.'
+		'You follow Zhendos behind the bike sheds.'
 
 		act 'Suck Zhendos':
 			cls
@@ -27,31 +27,30 @@ if evgentipe = 0:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Zhendos', 1
 				swallow += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum50.jpg"></center>'
-				'Zhendos did not last long and fills you mouth with sperm, you quickly swallow it down.'
+				'Zhendos doesn''t last long and fills you mouth with sperm, you quickly swallow it down.'
 
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Go back inside': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
 
 	exit
 elseif evgentipe = 1:
-	'During the break you are greeted by Mishan, a friend of your brother "<<$pcs_nickname>>! Let''s meet up school, I have sweetie for you."'
+	'During the break you are greeted by Mishan, a friend of your brother "<<$pcs_nickname>>! Come with me, I have a treat for you."'
 
-	act 'After school "meeting"':
+	act 'Go with him':
 		cls
 		gs'stat'
 
-		'You meet Mishan after school, behind the bike sheds'
+		'You follow Mishan behind the bike sheds.'
 
 		act 'Suck Mishanya':
 			cls
@@ -65,31 +64,30 @@ elseif evgentipe = 1:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Mishan', 1
 				swallow += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/bscum'+rand(1,2)+'.jpg"></center>'
-				'Mishan did not last long and fills you mouth with sperm, you quickly swallow it down.'
+				'Mishan doesn''t last long and fills you mouth with sperm, you quickly swallow it down.'
 
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Go back inside': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
 
 	exit
 elseif evgentipe = 2:
-	'During the break you see your brother Kolka "<<$pcs_nickname>>! Let''s meet after school, I need to relieve some tension."'
+	'During the break you see your brother Kolka "<<$pcs_nickname>>! Follow me, I need to relieve some tension."'
 
-	act 'After school "meeting"':
+	act 'Go with him':
 		cls
 		gs'stat'
 
-		'You meet Kolka after school, behind the bike sheds'
+		'You follow Kolka behind the bike sheds'
 		gs 'boyStat', 'A34'
 		act 'Suck Kolka':
 			cls
@@ -103,23 +101,22 @@ elseif evgentipe = 2:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Kolka', 1
 				swallow += 1
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum43.jpg"></center>'
-				'Kolka did not last long and fills you mouth with sperm, you make a show of swallowing it.'
+				'Kolka doesn''t last long and fills you mouth with sperm, you make a show of swallowing it.'
 
 				gs 'arousal', 'bj', 10, 'sub', 'incest'
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Go back inside': gt 'gschool_lessons', 'short_break'
 			end
 		end
 		if brotherSex > 6:
-			act 'Bend':
+			act 'Bend over':
 				cls
 				pose = 1
 				brosh_rand1 = rand(0,100)
@@ -139,42 +136,36 @@ elseif evgentipe = 2:
 
 				gs 'brother', 'brotherSexEnd'
 
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Go back inside': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	end
 
 	exit
 elseif evgentipe = 3:
-	'During the break you are greeted by Zhendos and Mishan, friends of your brother. "<<$pcs_nickname>>! You are our after school entertainment."'
+	'During the break you are greeted by Zhendos and Mishan, friends of your brother. "<<$pcs_nickname>>! Come with ust."'
 
-	act 'After school "meeting"':
+	act 'Go with them':
 		cls
 		gs'stat'
 
-		'You meet Zhendos and Mishan after school, behind the bike sheds'
+		'You follow Zhendos and Mishan behind the bike sheds'
 
 		act 'Suck Guys':
 			cls
-			gs 'boyStat', 'A58'
-			spafinloc = 12
-			sexpartkno = 1
-			gs 'cum_manage'
-			gs 'boyStat', 'A59'
-			spafinloc = 12
-			sexpartkno = 1
-			gs 'cum_manage'
-			swallow += 1
+			gs 'cum_call', 'mouth', 'Zhendos', 1
+			gs 'cum_call', 'mouth', 'Mishan', 1
+			swallow += 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/bs2.jpg"></center>'
-			'You crouch down in front of the guys as they pull out their cocks, you take turns stroking and suck each of them. The guys don''t last long and take turns finishing in your mouth, you swallow their seed hungrily.'
+			'You crouch down in front of the guys as they pull out their cocks, you take turns stroking and sucking each of them. The guys don''t last long and take turns finishing in your mouth, you swallow their seed hungrily.'
 
 			gs 'arousal', 'bj', 10, 'sub', 'group'
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Continue': gt 'gschool_lessons', 'short_break'
+			act 'Go back inside': gt 'gschool_lessons', 'short_break'
 		end
 	end
 

+ 85 - 83
locations/brother.qsrc

@@ -23,7 +23,7 @@ if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 ! npc_QW['A34']: Quest stages
 ! brotherAge: your age - 2
 ! brotherknowslut: brother knowledge of your sexual activity (1 = seen cum, 2 = groupsex in park)
-! pregTalkBrother: Flag 0/1 Do your brother know you are pregnant
+! npc_pregtalk['A34']: Flag 0/1 Do your brother know you are pregnant
 ! brotherDay:
 ! brotherSexCount: the number of times left that you can have sex with your brother today (resets to 5 each day)
 ! brotherMorningSex: Last day this happend. Used to block to once a day.
@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Kolka</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 	'Kolka, your brother, is <<brotherAge>> years old. While you share the same mother, Kolka''s dad is your and Anya''s stepfather. He is a student at the same school as you. When not in school, he is either at home playing video games or out playing football with his friends.'
-	
+
 	if brotherSex >= 10 and npc_rel['A34'] >= 80:
 		'You and your brother are lovers.'
 	elseif brotherSex >= 10 and npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
@@ -158,7 +158,7 @@ if $ARGS[0] = 'start':
 				act 'Go with the boys':minut += 5 & gt 'seeporn'
 			elseif evgenQW >= 4 and kolkaseepornday ! daystart:
 				'The guys gather around you. Kolka speaks up, "We just finished playing, so let''s go watch some porn."'
-				
+
 				act 'Go watch porn':minut += 5 & gt 'seeporn'
 			elseif evgenQW < 4 or kolkaseepornday = daystart:
 				'Your brother grins, "Hi, <<$pcs_nickname>>. Fancy a game of football?"'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if $loc = 'sitrPar':
-		if pregTalkBrother = 0: gs 'brother', 'pregreact'
+		if npc_pregtalk['A34'] = 0: gs 'brother', 'pregreact'
 		gs 'brother', 'brotherSexCount'
 
 		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and father_go = 1 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
@@ -366,12 +366,12 @@ if $ARGS[0] = 'start':
 			'Kolka, your brother, is <<brotherAge>> years old. While you share the same mother, Kolka''s dad is your and Anya''s stepfather. He is a student at the same school as you. When not in school, he is either at home playing video games or out playing football with his friends.'
 			*pl
 			'Kolka turns to you and asks, "<<$pcs_nickname>>, can you help me with my homework?"'
-			act'Agree to help him':gt 'brother_lessons', 'homework'
 			act'Decline':
 				cla
 				'You shake your head, "Sorry, little brother. I''m busy right now."'
 				act 'Leave': gt 'sitrPar'
 			end
+			act'Agree to help him':gt 'brother_lessons', 'homework'
 		else
 			act'Offer help with homework': gt 'brother_lessons', 'homework'
 		end
@@ -392,6 +392,7 @@ if $ARGS[0] = 'playfootball':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football<<picrand>>.jpg"></center>'
 		end
 		'You spend an hour sitting on the bench, watching the guys play football.'
+		act 'Leave':gt $loc, $metka
 	else
 		*clr & cla
 		minut += 60
@@ -403,9 +404,11 @@ if $ARGS[0] = 'playfootball':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'
+		act 'Leave':gt $loc, $metka
 	end
 	if rand(0, 1) = 0 and seepornofut = 0:
 		'The three boys gather together and begin whispering between themselves while giving you conspiratorial looks.'
+		act 'Leave':gt $loc, $metka
 		act 'Ask what they''re talking about':
 			*clr & cla
 			gs 'stat'
@@ -449,11 +452,10 @@ if $ARGS[0] = 'playfootball':
 
 	if seepornofut >= 1 and kolkaseepornday ! daystart:
 		'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
-
+		
+		act 'Leave':gt $loc, $metka
 		act 'Go watch porn':minut += 5 & gt 'seeporn'
 	end
-
-	act 'Leave':gt $loc, $metka
 end
 
 if $ARGS[0] = 'kiss_talk':
@@ -464,14 +466,14 @@ if $ARGS[0] = 'kiss_talk':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 	'"Hey..." you say awkwardly. "Can we talk? About... you know..." you blush and look away awkwardly, the memory of your brother''s lips pressing at your mind.'
 	'Kolka immediately blushes back and swallows, "Uh... yeah. We can talk... about... you know..."'
-	
+
 	act'Sit down':
 		minut += 3
 		cla & *clr
 		'<center><b><font color = maroon>Kolka</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 		'You sit down next to him and continue to sit there awkwardly not saying anything for several minutes, trying to think of what you''re going to say.'
-		
+
 		act'Try to explain':
 			cla & *clr
 			minut += 3
@@ -483,7 +485,7 @@ if $ARGS[0] = 'kiss_talk':
 			'"I just don''t want you getting any ideas," you say, looking away. "It''s not like we''re going to start dating or do... other stuff... It''s not like we could anyways. We''re blood family. Your my brother and that''s it."'
 			'"R-right..." he says. You look back towards him and find yourself shocked by his expression. Even though all this is wrong and taboo, you can''t help but feel bad about the wounded look on his face. His hurt hurts you too.'
 			'You look away again, mulling over what you should say next...'
-			
+
 			act'Continue':
 				cla & *clr
 				minut += 3
@@ -494,7 +496,7 @@ if $ARGS[0] = 'kiss_talk':
 				'"So..." With a fast beating heart and feeling the heat flush to your face, you force out your next words. "So... if I want to show you how much I love you in the future, there''s nothing wrong with that."'
 				'You turn back towards your brother to see him looking at you with wide eyes.'
 				'"If I want to kiss my brother to show him that I love him, then I''m allowed to do that," you say firmly. Before you can convince yourself to change your mind, you lean forward towards him.'
-				
+
 				act'Kiss him':
 					cla & *clr
 					brotherkiss += 1
@@ -505,16 +507,16 @@ if $ARGS[0] = 'kiss_talk':
 					'"I love you too, sis..." he murmurs back.'
 					'Looking into his eyes one more time, you quickly pull back and stand up to walk out of the room. You pause at the door to look back at him.'
 					'"I''ll, uh... see you later," you say awkwardly before hurrying out into the hallway.'
-					
+
 					gs 'arousal', 'kiss_give', 3, 'incest'
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act'Leave':gt 'korrPar'
 				end
 			end
 		end
-		
+
 		act'Apologize':
 			cla & *clr
 			'<center><b><font color = maroon>Kolka</font></b></center>'
@@ -527,7 +529,7 @@ if $ARGS[0] = 'kiss_talk':
 			'"But I''m your sister!" you say, tears held back behind your eyes. "It wasn''t right of me to do that. I shouldn''t have..."'
 			'"It''s okay, <<$pcs_nickname>>," he repeats as he turns back towards you. "Really, it is. You''re a beautiful girl," he says, causing you to blush even harder. "Anyone would be made happy if you kissed them like that. Even your brother. And if that''s wrong..."'
 			'He starts to lean forward towards you. Your breath hitches because you know what he''s about to do but you''re frozen in place, unable bring yourself to move away, "If that''s wrong, then I don''t want to be right..."'
-			
+
 			act'Continue':
 				cla & *clr
 				brotherkiss += 1
@@ -537,11 +539,11 @@ if $ARGS[0] = 'kiss_talk':
 				'When he finally pulls away, you find yourself breathless. He smiles back at you, "See? No harm done."'
 				'Chewing on your lip to suppress a larger smile, you sheepishly simper back at him. "I guess you''re right..." you say. "No harm done."'
 				'You get up to leave, looking back at him before you do. "Thanks, Kolka. For... you know," you say, before escaping into the hallway.'
-				
+
 				gs 'arousal', 'kiss_give', 3, 'incest'
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act'Leave':gt 'korrPar'
 			end
 		end
@@ -555,7 +557,7 @@ if $ARGS[0] = 'kiss_talk':
 			'"Maybe, it''s not so bad to have a little fun now and then..." you say, casually inching towards him. "I mean, it''s not like we''re doing anything that wrong are we?"'
 			'"No..." he says, mimicking your casual posture and motion. "We''re teenagers with raging hormones or something right? We need to enjoy ourselves now and then or we''ll go crazy, right?"'
 			'"Right..." you say, leaning in towards his face.'
-			
+
 			act'Kiss him':
 				cla & *clr
 				brotherkiss += 1
@@ -564,11 +566,11 @@ if $ARGS[0] = 'kiss_talk':
 				'You press your lips hard against his, letting yourself be consumed by the kiss for a moment. Just as eager, he presses back and you suddenly find yourself surprised by the intrusion of his tongue in your mouth. You find yourself particularly surprised by how welcome it is. You pull back briefly for gasps of breath and single words between kisses, "Maybe-! It isn''t-! So-! Mmmrph! Bad-! If we-! Cut-! Loose-! Now and-! Mmmmmmm! Again-!"'
 				'"Mmm mmm!" Your brother doesn''t say anything back except to hum in agreement and keep kissing you. The two of you continue making out for several more minutes before you finally break apart and you get up to leave. As you stand by the door, you look back towards your brother.'
 				'"I''m glad we had this talk," you say, licking your lips and departing.'
-				
+
 				gs 'arousal', 'kiss_give', 3, 'incest'
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act'Leave':gt 'korrPar'
 			end
 		end
@@ -584,7 +586,7 @@ if $ARGS[0] = 'sleepsexcum':
 
 		if rand(0, 100) < pcs_horny:
 			!!Inside
-			gs 'cum_call', '', 'Kolka', 1
+			gs 'cum_call', '', 'A34', 1
 			'<<$boydesc>> groans and you feel a jet of sperm fill your pussy.'
 			pcs_mood -= 15
 			pcs_willpwr -= 15
@@ -594,18 +596,18 @@ if $ARGS[0] = 'sleepsexcum':
 			!!Outside
 			if pose = 0:
 				if rand(0,1) = 0:
-					gs 'cum_call', 'stomach', 'Kolka', 1
+					gs 'cum_call', 'stomach', 'A34', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your stomach.'
 				else
-					gs 'cum_call', 'labia', 'Kolka', 1
+					gs 'cum_call', 'labia', 'A34', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your exposed pussy.'
 				end
 			elseif pose = 1:
 				if rand(0,1) = 0:
-					gs 'cum_call', 'back', 'Kolka', 1
+					gs 'cum_call', 'back', 'A34', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your back.'
 				else
-					gs 'cum_call', 'butt', 'Kolka', 1
+					gs 'cum_call', 'butt', 'A34', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your ass.'
 				end
 			end
@@ -614,7 +616,7 @@ if $ARGS[0] = 'sleepsexcum':
 		protect = 0
 
 		if rand(0, 89) = 0:sexcontra = 4
-		gs 'cum_call', '', 'Kolka', 1
+		gs 'cum_call', '', 'A34', 1
 		if sexcontra = 4:
 			'You pull off of <<$boydesc>>, look at his dick and think, <i>Oh shit! The condom ripped.</i>'
 		elseif sexcontra = 5:
@@ -634,7 +636,7 @@ if $ARGS[0] = 'sleepsexcum':
 	'You catch your breath then carefully climb off your still sleeping, though smiling, brother. You gently replace the blanket and quietly step away.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Leave':gt $loc, $metka
 end
 
@@ -714,12 +716,12 @@ if $ARGS[0] = 'brotherSexStart':
 	act 'Jerk your brother off':
 		*clr & cla
 		npc_rel['A34'] += 2
-		gs 'cum_call', 'hands', 'Kolka', 1
+		gs 'cum_call', 'hands', 'A34', 1
 		if brotherSex < 5:brotherSex = 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj1.jpg"></center>'
 		'You take his hard <<npc_dick[''A34'']>> cm cock in your hand and begin masturbating him. It only takes a few minutes of gliding your hand up and down his shaft for him to cum. Kolka quietly groans as jets of hot cum erupt from his throbbing member all over your hand.'
-		
+
 		gs 'arousal', 'hj', 5, 'incest'
 		gs 'stat'
 		gs 'brother', 'brotherSexEnd'
@@ -734,25 +736,25 @@ if $ARGS[0] = 'brotherSexStart':
 
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/blow0,<<rand(0,6)>>.mp4"></video></center>'
 			'You drop to your knees in front of your brother and move your face towards his waiting member. Kolka takes a deep breath in anticipation.'
-			
+
 			gs 'arousal', 'bj', 5, 'incest'
 			gs 'stat'
 			gs 'dinsex','dinrandbj'
 
 			'It isn''t long before you hear your brother moan, "I''m gonna cum, <<$pcs_nickname>>!"'
-			
+
 			act 'Keep sucking':
 				*clr & cla
 				gs 'boyStat', 'A34'
-				gs 'cum_call', 'mouth', 'Kolka', 1
+				gs 'cum_call', 'mouth', 'A34', 1
 				swallow += 1
 				gs 'stat'
 
 				'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,11)>>.mp4"></video></center>'
-				
+
 				gs 'arousal', 'bj', 5, 'incest'
 				gs 'stat'
-				
+
 				gs 'dinsex','dinrandswallow'
 
 				gs 'brother', 'brotherSexEnd'
@@ -765,13 +767,13 @@ if $ARGS[0] = 'brotherSexStart':
 				brotherfuck += 1
 				npc_rel['A34'] += 5
 				gs 'boyStat', 'A34'
-				gs 'cum_call', 'face', 'Kolka', 1
+				gs 'cum_call', 'face', 'A34', 1
 				facial += 1
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 				'Just as you take his dick out of your mouth, you''re hit with a hot blast of cum across your face, followed by several more spurts. Your face is covered in your brother''s jism when he is finally finished with his orgasm.'
-				
+
 				gs 'brother', 'brotherSexEnd'
 			end
 			if brotherSex >= 6:
@@ -803,7 +805,7 @@ if $ARGS[0] = 'fuckvaginal':
 
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/sex,<<rand(0,11)>>.mp4"></video></center>'
 	'You lie back on the sofa and spread your legs. You slip a finger inside yourself and smile seductively at Kolka. You push your digit in and out a few times before adding a second, your brother staring at you hypnotically. You remove your slickened fingers and use them to beckon Kolka closer, before licking them clean. You embrace your sibling as he lies on top of you.'
-					
+
 	$risk_boy = 'your own brother'
 	gs 'dinsex', 'boy_puts_condom'
 	gs 'dinsex','vaginal_sex',10
@@ -825,7 +827,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 'brother', 'brotherSexEnd'
@@ -898,7 +900,7 @@ if $ARGS[0] = 'brother_go_away':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/b (13).jpg"></center>'
 	'You cover your pussy with your hands and yell at your brother, "Kolka!? What the <i>fuck</i>? Get the fuck out of here, you small fry!"'
 	'Caught red-handed, Kolka slams the door and runs away. You finish showering quietly and dry yourself off.'
-	
+
 	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
 end
 
@@ -913,7 +915,7 @@ if $ARGS[0] = 'brother_go_away2':
 	'Turning to look at him, you give your brother a hard stare, "Kolka, if you don''t leave right now, I''m gonna spray you with the shower head."'
 	'Caught red-handed, Kolka backs away slowly and the door clicks shut.'
 	'<i>Ugh, boys...</i> you think to yourself, rolling your eyes in annoyance. You finish showering and dry yourself off.'
-	
+
 	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
 end
 
@@ -937,7 +939,7 @@ if $ARGS[0] = 'brother_voyeur_end':
 !	end
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
 end
 
@@ -951,12 +953,12 @@ if $ARGS[0] = 'brother_voyeur_ev1':
 	if npc_QW['A34'] < 1: npc_QW['A34'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/b (<<picrand>>).jpg"></center>'
 	'You continue to wash as if nothing has happened, glancing at your brother. You carefully wash your body, paying particular attention to your breasts and pussy, feeling the excitement grow in your abdomen.'
-	
+
 	gs 'arousal','breasts', 2, 'incest'
 	gs 'stat'
-	
+
 	act 'Wipes':gt 'brother','brother_voyeur_end'
-	
+
 	if pcs_horny >= 40: act 'Play with your tits': gt 'brother','brother_voyeur_ev2'
 end
 
@@ -971,10 +973,10 @@ if $ARGS[0] = 'brother_voyeur_ev2':
 	if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/c (<<picrand>>).jpg"></center>'
 	'You turn to face the door, giving Kolka a better view of your body and then erotically squeeze your <<$titsize>> tits. Your fingers graze over your <<pcdesc_nipples>> nipples and you can''t help but give them a slight pinch. You reach for the detachable shower head and begin spraying water over your chest, all the way gazing at your awestruck sibling. You close your eyes and in the heat of the moment, your heart flutters and you let out a light moan.'
-	
+
 	gs 'arousal','breasts', 3, 'incest'
 	gs 'stat'
-	
+
 	act 'Continue your shower':gt 'brother','brother_voyeur_end'
 	if pcs_horny >= 80:
 		act 'Direct the water at your pussy':gt 'brother','brother_voyeur_ev3'
@@ -993,13 +995,13 @@ if $ARGS[0] = 'brother_voyeur_ev3':
 	pcs_mood += 15
 	pcs_willpwr += 15
 	$orgasm_or = 'yes'
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/d (<<picrand>>).jpg"></center>'
 	'You move your feet a little wider apart and move the shower head down your body until it hovers just over your aching pussy. The spray of water is intense against your oh-so-sensitive lips and <<$pcdesc_clit>> clit. It doesn''t take long before the sensation is too much and you orgasm - wave after wave hitting your entire body, you bite down on your tongue to muffle your moans, but are unable to keep completely silent; the occasional gasp escaping your lips.'
-	
+
 	gs 'arousal','masturbate', 5, 'incest'
 	gs 'stat'
-	
+
 	act 'Dry yourself off':gt 'brother','brother_voyeur_end'
 end
 
@@ -1015,7 +1017,7 @@ if $ARGS[0] = 'brother_voyeur_ev3_2':
 	$orgasm_or = 'yes'
 	gs 'cum_call', '', 'A34', 1
 	gs 'stat'
-	
+
 	'<center><video src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></center>'
 	'After you gesture for Kolka to enter the room, he closes the latch on the door.'
 	if brother_knows_not_virgin = 1:
@@ -1051,7 +1053,7 @@ if $ARGS[0] = 'brother_voyeur_ev3_2':
 	'The two of you stay latched together for a few more seconds. You finally release Kolka''s hands and he slowly withdraws his softening penis. You turn to face your younger sibling, the two of you blushing as your eyes meet. Kolka grins, "Thank you, <<$pcs_nickname>>. You''ve made me very happy."'
 	'Kolka steps out of the shower and begins to dry off. You stay under the water, still somewhat out of breath, as he gets dressed. He heads for the bathroom door, checking momentarily to see if the coast is clear, before turning back to you one last time, "Thanks again, <<$pcs_nickname>>, I really mean it."'
 	'"That was one of the best thing I have ever done. Thank you!" he says, then he quitely listens at the door for any movement outside, opens the door and leave you alone.'
-	
+
 	act 'Finish your shower':gt 'brother','brother_sex_end'
 end
 
@@ -1070,10 +1072,10 @@ if $ARGS[0] = 'brother_sex_end':
  	else
 		'It''s hard to believe, but you just had sex with your little brother. You''re somewhat shocked but also wonder how something so <i>wrong</i> can feel so <i>right</i>.'
 	end
-	
+
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Exit the shower':mirror_steam = hour & gt $loc, $metka
 end
 
@@ -1300,7 +1302,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				gs 'arousal','vaginal_finger', 5, 'incest'
 				gs 'arousal','masturbate', 5, 'incest'
 				gs 'stat'
-				
+
 				act'Continue':gt 'brother','brother_voyeur_ev8'
 			end
 		else
@@ -1311,7 +1313,7 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				'A small grin grows on his face, "Just lie on the floor and don''t move! I''ll do everything myself!"'
 			elseif npc_QW['A34'] > 5:
 				'You ask him, "What now?" You smile at him, because you''re pretty sure you know what''s coming.'
-				'Kolka smiles back, "Will you lie on the floor again?"'		
+				'Kolka smiles back, "Will you lie on the floor again?"'
 			end
 			if sub < 30:
 				act'Refuse and get dressed':gt $loc, $metka
@@ -1341,12 +1343,12 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'You get off the chair and lie down on the carpet. Overcome with lust, you instinctively begin to rub your pussy and breast.'
 		if pcs_vag > 0:'You slip your fingers into your burning pussy, the sensation causing you to moan.'
 		'You watch as Kolka pulls down his pants and his fully erect <<npc_dick[''A34'']>> cm cock pops free. He kneels between your spread knees and starts to jerk himself off while he watches you play with yourself. Your heart begins to beat faster and faster, you start panting as you feel a primitive heat bubbling up deep from within. Moments later, you hear Kolka groan and watch as ropes of hot cum fly out of his cock, splashing over your crotch, stomach and even your breasts. It''s too much for you and soon you join your brother in ecstasy when your own release finally peaks. It takes everything inside of you to keep from screaming in bliss as your hips buck up and down, your fingers rubbing faster as you ride wave after wave of your orgasm.'
-		
+
 		gs 'arousal','masturbate', 10, 'incest'
 		gs 'arousal','breasts', 10, 'incest'
 		minut -= 10
 		gs 'stat'
-					
+
 		act'Continue':
 			*clr & cla
 			cla
@@ -1371,10 +1373,10 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 				'"Lucky we didn''t get caught!" you tell him as your fingers play with some of his cum splattered across your abdomen.'
 				'He pulls his pants back up and starts reaching for your clothes, "Come on, <<$pcs_nickname>>... that was fun!" He tosses your stuff at you, careful to miss the mess he''s left on you.'
 			end
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act'Get dressed':gt $loc, $metka
 		end
 	elseif brotherSex >= 4:
@@ -1390,14 +1392,14 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'You get off the chair and lie down on the carpet. Overcome with lust, you instinctively begin to rub your pussy and breast.'
 		if pcs_vag > 0:'You slip your fingers into your burning pussy, the sensation causing you to moan.'
 		'You watch as Kolka pulls down his pants and his fully erect <<npc_dick[''A34'']>> cm cock pops free. You follow his movements as he walks up to your head and kneels, his hardened member mere inches from your face. You open your mouth, ready to accept him orally. Kolka pushes forward slowly, your <<$liptalk>> moving over his head and inching down his shaft more and more until he stops. He holds you for a moment before he begins gently thrusting into your mouth. Your fingers continue to play with your own body, as you focus on your sibling. You swirl your tongue around his cock and suck, his moans growing deeper all the while.'
-		'A fire had been building inside you since you disrobed and now your body is nearly engulfed when you feel Kolka stiffen, his penis twitching inside your mouth. He whispers your name as he cums, his jism filling your mouth and you begin to greedily swallow. Your own orgasm isn''t far behind; your entire body begins to convulse and you start to suck your brother''s throbbing dick harder, hoping for more of his delicious cum. The world fades for a few moments...' 
-		
+		'A fire had been building inside you since you disrobed and now your body is nearly engulfed when you feel Kolka stiffen, his penis twitching inside your mouth. He whispers your name as he cums, his jism filling your mouth and you begin to greedily swallow. Your own orgasm isn''t far behind; your entire body begins to convulse and you start to suck your brother''s throbbing dick harder, hoping for more of his delicious cum. The world fades for a few moments...'
+
 		gs 'arousal','breasts', 5, 'incest'
 		gs 'arousal','masturbate', 5, 'incest'
 		gs 'arousal','bj', 5, 'incest'
 		minut -= 5
 		gs 'stat'
-					
+
 		act'Continue':
 			*clr & cla
 			cla
@@ -1408,10 +1410,10 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 			'Your brother pulls his softening cock out of your mouth. You give it a quick peck.'
 			'Kolka catches his breath and looks down at you, "Nice one, <<$pcs_nickname>>! Good job! Just remember: this is our little secret!" He stands and pulls his pants up before going over to the couch.'
 			'You don''t say anything as you get slowly gather your clothes.'
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act'Get dressed':gt $loc, $metka
 		end
 	elseif brotherConfidence > 10 and brotherSex < 4:
@@ -1428,14 +1430,14 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'You get off the chair and lie down on the carpet. Overcome with lust, you instinctively begin to rub your pussy and breast.'
 		if pcs_vag > 0:'You slip your fingers into your burning pussy, the sensation causing you to moan.'
 		'You watch as Kolka pulls down his pants and his fully erect <<npc_dick[''A34'']>> cm cock pops free. You follow his movements as he walks up to your head and kneels, his hardened member mere inches from your face. You open your mouth, ready to accept him orally. Kolka pushes forward slowly, your <<$liptalk>> moving over his head and inching down his shaft more and more until he stops. He holds you for a moment before he begins gently thrusting into your mouth. Your fingers continue to play with your own body, as you focus on your sibling. You swirl your tongue around his cock and suck, his moans growing deeper all the while.'
-		'A fire had been building inside you since you disrobed and now your body is nearly engulfed when you feel Kolka stiffen, his penis twitching inside your mouth. He whispers your name as he cums, his jism filling your mouth and you begin to greedily swallow. Your own orgasm isn''t far behind; your entire body begins to convulse and you start to suck your brother''s throbbing dick harder, hoping for more of his delicious cum. The world fades for a few moments...' 
-		
+		'A fire had been building inside you since you disrobed and now your body is nearly engulfed when you feel Kolka stiffen, his penis twitching inside your mouth. He whispers your name as he cums, his jism filling your mouth and you begin to greedily swallow. Your own orgasm isn''t far behind; your entire body begins to convulse and you start to suck your brother''s throbbing dick harder, hoping for more of his delicious cum. The world fades for a few moments...'
+
 		gs 'arousal','breasts', 5, 'incest'
 		gs 'arousal','masturbate', 5, 'incest'
 		gs 'arousal','bj', 5, 'incest'
 		minut -= 5
 		gs 'stat'
-		
+
 		act'Continue':
 			*clr & cla
 			cla
@@ -1446,10 +1448,10 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 			'You slowly move your mouth away from your brother''s member, your face flushed with shame.'
 			'Kolka signs contently, clearly out of breath. He pulls his pants up and plops down on the couch.'
 			'Slowly you get up, refusing to make eye contact. The room is very quiet as you gather your clothes.'
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act'Get dressed':gt $loc, $metka
 		end
 	end
@@ -1459,19 +1461,19 @@ if $ARGS[0] = 'pregreact':
 	if knowpreg = 1 and kid = 0:
 		if $clothingworntype = 'nude' and pregchem > 2000 and brotherSex < 7 and kid = 0:
 			'Surprised, your brother looks at your stomach. "<<$pcs_nickname>>, are you pregnant? <<$npc_nickname[''A29'']>> and dad are going to be pissed!" After a moments pause he adds, "You do still look good, though."'
-			pregTalkbrother = 1
+			npc_pregtalk['A34'] = 1
 
 			act 'Continue' :gt 'sitrPar'
 		exit
 
 		elseif $clothingworntype ! 'nude' and pregchem > 3460 and brotherSex < 7 and kid = 0:
 			'Surprised, your brother looks at your stomach, "<<$pcs_nickname>>, why didn''t you tell me I''m going to be an uncle?"'
-			pregTalkbrother = 1
+			npc_pregtalk['A34'] = 1
 
 			act 'Continue' :gt 'sitrPar'
 			exit
 
-		elseif brotherSex >= 7 and kid = 0 and pregTalkMom = 0 and (($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460) or ($clothingworntype = 'nude' and pregchem < 2000) or ($clothingworntype ! 'nude' and pregchem < 3460)):
+		elseif brotherSex >= 7 and kid = 0 and npc_pregtalk['A29'] = 0 and (($clothingworntype = 'nude' and pregchem > 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460) or ($clothingworntype = 'nude' and pregchem < 2000) or ($clothingworntype ! 'nude' and pregchem < 3460)):
 			cla
 			'Surprised, your brother looks at your stomach, "Are you really pregnant? It... it''s not mine, is it?"'
 			*nl
@@ -1495,8 +1497,8 @@ if $ARGS[0] = 'pregreact':
 		'You''re briefly taken aback by his uncharacteristic sincerity, "Thanks, really. I love you, too."'
 		'You leave your brother to what he was doing before, glad that the two of you have the relationship that you do.'
 
-		act 'Continue' :pregTalkbrother = 1 & gt 'sitrPar'
-	elseif brotherSex >= 7 and kid > 0 and pregTalkMom = 0 and (($clothingworntype = 'nude' and pregchem >= 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460)):
+		act 'Continue' :npc_pregtalk['A34'] = 1 & gt 'sitrPar'
+	elseif brotherSex >= 7 and kid > 0 and npc_pregtalk['A29'] = 0 and (($clothingworntype = 'nude' and pregchem >= 2000) or ($clothingworntype ! 'nude' and pregchem >= 3460)):
 		cla
 		'Kolka looks at your stomach for moment before asking, "Wow, you''re pregnant again? Is it mine?"'
 		*nl
@@ -1512,7 +1514,7 @@ end
 
 if $ARGS[0] = 'brotherknows1':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	'"Yeah, this baby is yours," you say, rubbing your belly. "And after it''s born, I might let you help me make another one," you add before giving your brother a kiss. You look down at him and notice a lump starting to form in his pants.'
 	'Kolka''s eyes suddenly go wide, "Wait! You''re not going to tell <<$npc_nickname[''A29'']>> I got you pregnant, are you?"'
@@ -1541,7 +1543,7 @@ end
 
 if $ARGS[0] = 'brotherknows2':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	'"Yes, it is and you''re going to take responsibility. I am not going to be a single mother raising this child on my own."'
 	'Kolka stares at you in shock, "But I don''t know anything about raising a kid!"'
@@ -1567,7 +1569,7 @@ end
 
 if $ARGS[0] = 'brotherknows3':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	'"It could be, I''m still not sure yet. I just wanted to give you a heads up." You then add with a wink, "Honestly, I kind of hope it is."'
 	'"Me too," he states just a little too eagerly. He then quickly moves his lips to yours and you share a passionate kiss.'
@@ -1577,7 +1579,7 @@ end
 
 if $ARGS[0] = 'brotherknows4':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	'"I''m still not sure," you say. "But if it is, you had better take responsibility."'
 	'Your brother rolls his eyes, "Then I really hope it''s someone else''s problem."'
@@ -1588,7 +1590,7 @@ end
 
 if $ARGS[0] = 'brotherknows5':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	'"No, you got lucky this time. It''s actually <<$wombthfath>>''s," you tell him. "I just wanted to share the news with my little brother."'
 	'"Oh, well congratulations!" He tries to sound happy, but you detect a note of disappointment in his voice.'
@@ -1598,7 +1600,7 @@ end
 
 !Once pregnancy fetish is added, these will be expanded
 if $ARGS[0] = 'brotherknows6':
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	if arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherHappy = 1:
 		cla
@@ -1684,7 +1686,7 @@ end
 
 if $ARGS[0] = 'brotherknows7':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	if arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherHappy = 1:
 		'"It could be, I''m still not sure yet. I just wanted to give you a heads up." You then add with a wink, "Honestly, I''m kind of hoping it is. I would love to be carrying another one of my brother''s children."'
@@ -1705,7 +1707,7 @@ end
 
 if $ARGS[0] = 'brotherknows8':
 	cla
-	pregTalkbrother = 1
+	npc_pregtalk['A34'] = 1
 	*nl
 	if $ChildThFath = 'Kolka':
 		'"Not this time. It''s actually <<$wombthfath>>''s. Why, were you hoping you''d give me more children? Sorry, but this body is just too good to limit myself to one man, even if that man is my cute younger brother," you giggle.'

+ 4 - 4
locations/brother2.qsrc

@@ -309,7 +309,6 @@ if $ARGS[0] = 'wakeup':
 	*nl
 	act'Leave him alone':
 		cla
-		*nl
 		'You shrug, realizing that you''re not going to find a way to wake him up any time soon without him being mad at you and decide to leave him be.'
 		act'Move away':gt $loc, $metka
 	end
@@ -317,7 +316,6 @@ if $ARGS[0] = 'wakeup':
 	act'Yank his blanket off':
 		brotherMorningSex = daystart
 		cla
-		*nl
 		'"Come on Kolka! Wake. UP!"'
 		if $clothingworntype = 'nude':
 			'With a mighty tug, you yank the blanket off of him, leaving him clutching himself and shivering on the couch. After a few moments, he forces his eyes open, blinking wearily as he sits up on the couch and shamelessly glances up and down your naked body.'
@@ -351,8 +349,8 @@ if $ARGS[0] = 'wakeup':
 		
 	if brotherSex >= 2 or pcs_inhib >= 35 or npc_rel['A34'] >= 75:
 		act'Tell him you''ll show him your tits':
-			cla	
-			*nl
+			cla
+			brotherMorningSex = daystart
 			'"I''ll tell you what Kolka, if you get up now, I''ll let you look at my tits."'
 			gs 'brother2', 'wakeupresponse', 'tits'
 			if $clothingworntype ! 'nude':
@@ -551,6 +549,7 @@ end
 
 if $ARGS[0] = 'morninghj':
 	cla & *clr
+	brotherMorningSex = daystart
 	gs 'arousal', 'hj', 5
 	gs 'cum_call','hands', $boy
 	npc_rel['A34'] += 5
@@ -569,6 +568,7 @@ if $ARGS[0] = 'morninghj':
 end
 
 if $ARGS[0] = 'morningbj':
+	brotherMorningSex = daystart
 	brotherwakeup += 1
 	cla & *clr
 	gs 'arousal', 'hj', 5

+ 110 - 92
locations/brother_voyeur.qsrc

@@ -16,7 +16,7 @@ if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 ! npc_QW['A34']: Quest stages
 ! brotherAge: your age - 2
 ! brotherknowslut: brother knowledge of your sexual activity (1 = seen cum, 2 = groupsex in park)
-! pregTalkBrother: Flag 0/1 Do your brother know you are pregnant
+! npc_pregtalk['A34']: Flag 0/1 Do your brother know you are pregnant
 ! brotherDay:
 ! brotherSexCount: the number of times left that you can have sex with your brother today (resets to 5 each day)
 ! brotherMorningSex: Last day this happend. Used to block to once a day.
@@ -2045,12 +2045,14 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 			'	"Is... is that cum? Did you cum inside me?!" you pant.'
 			'	"Y-yeah... I was trying to tell you that I was cumming but you didn''t say anything so..."'
 
-			if pillcon >= 30000 or tabletkishot >= 1:
-				'	<i>Well,</i> you think to yourself, <i>It''s a good thing I''m on birth control.</i>'
-			elseif mesec > 0:
-				'	<i>Well,</i> you think to yourself, <i>I don''t think I can get pregnant when I''m on my period... right...?</i>'
-			else
-				'	<i>Shit...</i> You close your eyes, sighing as you feel another glob of Kolka''s cum drip from your pussy. <i>I fucked up...</i>'
+			if succubusflag = 0:
+				if pillcon >= 30000 or tabletkishot >= 1:
+					'	<i>Well,</i> you think to yourself, <i>It''s a good thing I''m on birth control.</i>'
+				elseif mesec > 0:
+					'	<i>Well,</i> you think to yourself, <i>I don''t think I can get pregnant when I''m on my period... right...?</i>'
+				else
+					'	<i>Shit...</i> You close your eyes, sighing as you feel another glob of Kolka''s cum drip from your pussy. <i>I fucked up...</i>'
+				end
 			end
 			act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 		else
@@ -2145,16 +2147,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 			'	Your cries push him over the edge and Kolka can''t hold back any longer. He groans and pulls you tight against him. His cock plunges deep and you feel his cum spurting deep inside you. The sensation brings you to orgasm, body spasming and your pussy tightening up around him, squeezing him to the last drop.	As your orgasm winds down and your legs stop quivering, you lean forward against the shower wall, Kolka''s cock slipping from between your legs.'
 			'	Pressing your face against the wall, you feel Kolka''s cum drip from your pussy.'
 			*nl
-			if knowpreg = 1 or thinkpreg = 1:
-				'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-			elseif pillcon >= 30000 or tabletkishot >= 1:
-				'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-				'	<i>It''s a good thing I''m on birth control...</i>'
-			elseif mesec > 0:
-				'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-				'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-			else
-				'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+			if succubusflag = 0:
+				if knowpreg = 1 or thinkpreg = 1:
+					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+				elseif pillcon >= 30000 or tabletkishot >= 1:
+					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+					'	<i>It''s a good thing I''m on birth control...</i>'
+				elseif mesec > 0:
+					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+				else
+					'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+				end
 			end
 			act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 		end
@@ -2166,7 +2170,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				gs 'cum_call', 'stomach', 'A34', 1
 				'<center><video src="images/shared/home/bathroom/showercum.mp4"></center>'
 				'	"No! Not inside me!" you cry out. You push him off you and turn around. Grabbing his cock, you jerk him vigorously until he groans, spraying hot cum that spatters all over your stomach.'
-				if pillcon < 30000 and pillday < 18 and tabletkishot < 1:'	Feeling his spunk on your stomach, you suddenly grow annoyed and wonder why you even finished him off. "What the fuck Kolka?! Are you <i>trying</i> to get me pregnant?"'
+				if pillcon < 30000 and pillday < 18 and tabletkishot < 1 and succubusflag = 0:'	Feeling his spunk on your stomach, you suddenly grow annoyed and wonder why you even finished him off. "What the fuck Kolka?! Are you <i>trying</i> to get me pregnant?"'
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
 		end
@@ -2199,16 +2203,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			else
 				'	You smile mischievously and suddenly speed up, causing your brother to erupt inside you. He groans and you curl your toes in pleasure, feeling his cum spurting deep inside you. It''s not enough to bring you to orgasm, but it still feels good. You tighten up on him and work your hips a little more, trying to milk him for a couple more shots. Finally, Kolka pulls away and as his cock slips from inside you, cum bursts out like your pussy was a champagne bottle uncorked.'
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'	<i>It''s a good thing I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-				else
-					'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+				if succubusflag = 0:
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+						'	<i>It''s a good thing I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+						'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+					else
+						'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+					end
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
@@ -2224,16 +2230,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 			'	Your cries push him over the edge and Kolka can''t hold back any longer. He groans and pulls you tight against him. His cock plunges deep and you feel his cum spurting deep inside you. The sensation brings you to orgasm, body spasming and your pussy tightening up around him, squeezing him to the last drop. As your orgasm winds down and your legs stop quivering, you lean forward against the shower wall, Kolka''s cock slipping from between your legs.'
 			'	Pressing your face against the cool wall, you feel Kolka''s cum drip from your pussy, splashing on the bottom of the tub. You think to yourself...'
 			*nl
-			if knowpreg = 1 or thinkpreg = 1:
-				'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-			elseif pillcon >= 30000 or tabletkishot >= 1:
-				'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-				'	<i>It''s a good thing I''m on birth control...</i>'
-			elseif mesec > 0:
-				'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-				'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-			else
-				'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+			if succubusflag = 0:
+				if knowpreg = 1 or thinkpreg = 1:
+					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+				elseif pillcon >= 30000 or tabletkishot >= 1:
+					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+					'	<i>It''s a good thing I''m on birth control...</i>'
+				elseif mesec > 0:
+					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+				else
+					'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+				end
 			end
 			act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 		end
@@ -2264,16 +2272,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'	"But that''s not fair! So what I want doesn''t count for anything?"'
 				'	"Nope! But I get to decide if I''m feeling generous."'
 				'	With Kolka''s hands balled into fists at his side and your hands on your hips, the two of you glare at each other, scowling. This turned into a much bigger argument than you meant it to.'
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-					'	<i>At least I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-					'	<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
-				else
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Fuck. I shouldn''t have done this anyways. This gets me pregnant?</i>'
+				if succubusflag = 0:	
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
+						'	<i>At least I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
+						'	<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
+					else
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Fuck. I shouldn''t have done this anyways. This gets me pregnant?</i>'
+					end
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
@@ -2283,34 +2293,38 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'	"I''m sorry Kolka! Your cock just felt so good, I couldn''t stop! You can''t be mad at me for being too addicted to your cock to stop, right?" You kneel down, trying to apologize by cleaning him up with your tongue.'
 				'	He grumbles a bit but you can tell that he''s not mad at you. "I guess I can''t be mad about that... But next time I ask, I want to cum on your face!"'
 				'	"Okay, it''s a promise!" you say, standing back up and kissing him on the cheek. "So long as I can stop myself that is."'
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Fuck, that felt good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-					'	<i>It''s a good thing I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Fuck, that felt good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-				else
-					'	<i>Shit... I probably should have had more self control...</i> you think to yourself, watching another glob of cum dribble from your pussy. <i>What if this gets me pregnant?</i>'
+				if succubusflag = 0:	
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Fuck, that felt good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
+						'	<i>It''s a good thing I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Fuck, that felt good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+						'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+					else
+						'	<i>Shit... I probably should have had more self control...</i> you think to yourself, watching another glob of cum dribble from your pussy. <i>What if this gets me pregnant?</i>'
+					end
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
-
-			act'Too much mess':
-				cla
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-					'	<i>It''s a good thing I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-				else
-					'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+			
+			if succubusflag = 0:
+				act'Too much mess':
+					cla
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
+						'	<i>It''s a good thing I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+						'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+					else
+						'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>What if I get pregnant?</i>'
+					end
+					act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 				end
-				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
 		end
 
@@ -2343,16 +2357,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'	"But that''s not fair! So what I want doesn''t count for anything?"'
 				'	"Nope! But I get to decide if I''m feeling generous."'
 				'	With Kolka''s hands balled into fists at his side and your hands on your hips, the two of you glare at each other, scowling. This turned into a much bigger argument than you meant it to.'
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-					'	<i>At least I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
-					'	<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
-				else
-					'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Fuck. I shouldn''t have done this anyways. This gets me pregnant?</i>'
+				if succubusflag = 0:
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
+						'	<i>At least I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Only my idiot brother could ruin a perfectly good creampie like this.</i>'
+						'	<i>At least I don''t have to worry about getting pregnant on my period... right...?</i>'
+					else
+						'	<i>Goddamn it,</i> you think, looking down to watch another glob of cum drips from your snatch. <i>Fuck. I shouldn''t have done this anyways. This gets me pregnant?</i>'
+					end
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
@@ -2378,16 +2394,18 @@ if $ARGS[0] = 'brother_fuck_cum':
 				cla
 				'	"Too messy," you say. "Sorry Kolka, but I don''t feel like cleaning that off my face. You understand don''t you?"'
 				'	"Yeah I guess..."'
-				if knowpreg = 1 or thinkpreg = 1:
-					'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
-				elseif pillcon >= 30000 or tabletkishot >= 1:
-					'	<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
-					'	<i>It''s a good thing I''m on birth control...</i>'
-				elseif mesec > 0:
-					'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
-					'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
-				else
-					'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>Maybe I should have let him cum on my face after all... What if I get pregnant?</i>'
+				if succubusflag = 0:
+					if knowpreg = 1 or thinkpreg = 1:
+						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
+					elseif pillcon >= 30000 or tabletkishot >= 1:
+						'	<i>Fuck, that feels good...</i> you think to yourself, looking down to watch another glob dribbles out of you with satisfaction.'
+						'	<i>It''s a good thing I''m on birth control...</i>'
+					elseif mesec > 0:
+						'	<i>Fuck, that feels good...</i> you think to yourself as another glob dribbles out, plopping onto the tub floor.'
+						'	<i>It''s a good thing I can''t get pregnant when I''m on my period... right...?</i>'
+					else
+						'	<i>Shit...</i> Another glob of cum dribbles from your pussy, plopping onto the tub floor. <i>Maybe I should have let him cum on my face after all... What if I get pregnant?</i>'
+					end
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end

+ 1 - 0
locations/budgetclothes.qsrc

@@ -125,6 +125,7 @@ if $ARGS[0] = 'clothes':
 			gs 'clothing_QV', 'shop_filter'
 				
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''cheapclo''"><img src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="250" /></a>'
+			
 		end
 		i += 6
 		if i = 3: i = 9

+ 67 - 0
locations/castSpell.qsrc

@@ -0,0 +1,67 @@
+# castSpell
+! Used to cast a spell.  Use as a function.  Returns 1 OR 0 for Success or Failure.
+!
+! ARGS[0] is the spell being cast
+!	Valid Spells are
+!		teleport
+
+!teleport
+spellMana['teleport'] = 1000
+spellTime['teleport'] = 20
+spellWill['teleport'] = 20
+spellDiff['teleport'] = 20
+!glamour
+spellMana['glamour'] = 500
+spellTime['glamour'] = 1
+spellWill['glamour'] = 15
+spellDiff['glamour'] = 30
+
+spellSuccess = 0
+
+if spellKnown[$ARGS[0]] = 1:
+	!Make a Skill Check to see if the Spell succeeds
+	spellRoll = pcs_splcstng - spellDiff[$ARGS[0]] - (pcs_horny/5) + rand(1,100)
+	if spellRoll > 50:
+		!Critical Success
+		spellSuccess = 2
+		splcstng_exp += rand(1,spellDiff[$ARGS[0]]) + rand(0,5)
+	elseif spellRoll > 10:
+		!Success
+		spellSuccess = 1
+		splcstng_exp += rand(1,spellDiff[$ARGS[0]])
+	elseif spellRoll > -20:
+		!Failure
+		spellSuccess = 0
+		splcstng_exp += rand(1,spellDiff[$ARGS[0]]) / 2
+	else:
+		!Critical Failure
+		spellSuccess = -1
+		splcstng_exp += rand(1,spellDiff[$ARGS[0]]) / 2
+	end
+	killvar 'spellRoll'
+
+	!Incur the costs of casting the spell
+	if spellSuccess = 2:
+		manaCost = spellMana[$ARGS[0]] / 2
+	elseif spellSuccess = -1:
+		manaCost = spellMana[$ARGS[0]] * 2
+	else:
+		manaCost = spellMana[$ARGS[0]]
+	end
+	pcs_manna -= manaCost
+	!pcs_willpwr -= spellWill[$ARGS[0]]
+	arouseVal = manaCost / 50
+	gs 'arousal', 'voyeur', arouseVal
+	minut -= arouseVal
+	killvar 'arouseVal'
+	killvar 'manaCost'
+
+end
+
+minut += spellTime[$ARGS[0]]
+
+gs 'stat'
+
+result = spellSuccess
+
+--- castSpell ---------------------------------

+ 23 - 18
locations/cikl.qsrc

@@ -604,7 +604,13 @@ end
 lipkoef -= rand(0,1)
 if lipkoef <= 0: lipkoef = 0
 
-if Enable_autotampon = 0 and isprok = 1:isprok = 0 & 'You threw away your used tampon.'
+if isprok = 1 or isprokp = 1:
+	isprok_lastday = 1
+else
+	isprok_lastday = 0
+end
+
+if Enable_autotampon = 0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
 if Enable_autotampon = 0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:
@@ -625,21 +631,20 @@ elseif preg = 2 and pregminut < totminut:
 		pregminut = totminut + 1440
 	end
 elseif preg = 0:
-	KILLVAR 'pregTalkBrother'
-	KILLVAR 'pregTalkSister'
-	KILLVAR 'pregTalkFather'
-	!{KILLVAR 'pregTalkFamily' -- Do not kill this (Abortion talk).}
-	KILLVAR 'pregTalkMom'
-	KILLVAR 'pregTalk'
-	KILLVAR 'pregTalkNat'
-	KILLVAR 'pregTalkKatja'
-	KILLVAR 'pregTalkAlbina'
-	KILLVAR 'pregTalkPC'
-	KILLVAR 'pregTalkStarlets'
-	KILLVAR 'pregTalkvball'
-	KILLVAR 'pregTalkTrack'
-	killvar 'pregtalkStarlets'
-	killvar 'pregtalkvball'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A14'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A16'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A23'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A28'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A29'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A33'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A34'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A69'
+	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A131'
+
+	!{killvar 'pregTalkFamily' -- Do not kill this (Abortion talk).}
+
+	killvar 'pcs_pregtalk'
+	killvar 'pregTalk'
 	killvar 'pregtime'
 	killvar 'knowpreg'
 	killvar 'denypreg'
@@ -701,7 +706,7 @@ else
 			elseif preg > 0:
 				razeba = 6
 
-				if pcs_horny < 100:pcs_horny += pregtime / 10
+				if pcs_horny < 100:pcs_horny += pregchem / 240
 			end
 		end
 	end
@@ -765,7 +770,7 @@ elseif nark > 0:
 	nark -= 1
 end
 
-if pregtime > 10:fat += 1
+if pregchem > 240:fat += 1
 
 !!------------------------------------------------------------------------------------------------------------
 !!	Pain

+ 1 - 1
locations/clothing.qsrc

@@ -17,7 +17,7 @@ $clothing_list_line = {
 	else
 		clothing_temp = 150 & !clothing widdefault to 150
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"><p><<$ARGS[1]>> outfit</p></a></TD>'
 	killvar 'clothing_temp'
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 

+ 6 - 6
locations/club.qsrc

@@ -254,7 +254,7 @@ if $ARGS[0] = 'dance':
 	gs 'stat'
 	'<center><b><font color="maroon">The dance floor</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
-	'The club is filled to the brink with people. Most of which are dancing on the dancefloor.'
+	'The club is filled to the brink with people. Most of whom are on the dance floor having a great time.'
 	
 	act 'Leave the dance floor':gt 'club', 'inside'
 	
@@ -272,7 +272,7 @@ if $ARGS[0] = 'dance':
 			pcs_willpwr += 10
 			clrand = rand(0, 400)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club4.jpg"></center>'
-			'On the dance floor very closely, you can put a hand on his shoulder one guy to make a couple of steps and pressed her chest already to another, and in the dance, how much one can do in dance.'
+			'The dance floor is packed and everyone is dancing very closely, you could put your hand on the shoulder of the guy in front of you but you when you turn around your chest is right up against another. You don''t let it bother you as everyone is forced to dance this close.'
 
 			if pcs_apprnc >= clrand:
 				pcs_horny += 1
@@ -284,7 +284,7 @@ if $ARGS[0] = 'dance':
 				act 'Dance with him':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club8.jpg"></center>'
-					'You continue to dance with the guy on the dancefloor, but he doesn''t stop touching your. It somehow gets you excited, when a random guy is touching you in public.'
+					'You continue to dance with the guy on the dance floor, but he doesn''t stop touching your butt. It gets you quite excited having a random guy feeling you up in public.'
 
 					gs 'arousal', 'foreplay', 30, 'sub'
 					gs 'stat'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'dance':
 						dansexclub = rand(0, 1)
 
 						if dansexclub = 1:
-							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Why don''t we go to the VIP-Area. There we''ll have a bit more privacy.", he says inbetween kisses.'
+							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Why don''t we go to the VIP-Area. There we''ll have a bit more privacy.", he says inbetween kisses.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'dance':
 							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to Vip-room with the guy':$sexloc = 'vipclub' & xgt 'sex', 'var'
 						elseif dansexclub = 0:
-							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
+							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'dance':
 				if clrand > 85:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/dancelezb.jpg"></center>'
-					'While you''re dancing you a hand groping your ass. You turn around to see who touched your, but you''re surprised to see women smiling at you, she seems to be biting her lips.'
+					'While you''re dancing you a hand groping your ass. You turn around to see who touched your butt, but you''re surprised to see a woman smiling at you, she is seductively biting her lip.'
 					dansexclub = rand(0, 1)
 
 					act 'Stop dancing':gt 'club', 'inside'

+ 3 - 0
locations/cum_arrcheat.qsrc

@@ -1,5 +1,8 @@
 # cum_arrcheat
 
+!! npc_pregtalk[] 0/1: Does character A# know that you are currently pregnant
+!! pcs_pregtalk 0/1: Has PC been told she is pregnant
+
 *clr & cla
 '<center><h2>Cheat Menu - OOX Debug</h2></center>'
 if cycle = 0:

+ 42 - 45
locations/din_van.qsrc

@@ -33,8 +33,7 @@ $bteeth = {
 	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:05)':
 		menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			cumspclnt = 2
 			gs 'cum_cleanup'
@@ -130,8 +129,7 @@ $shower = {
 		if pcs_horny >= 40:
 			act 'Use the shower head on your pussy':
 				menu_off = 1
-				cla
-				*clr
+				*clr & cla
 				if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 				*nl
@@ -154,6 +152,10 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -163,8 +165,7 @@ $shower = {
 $bath = {
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
-		cla
-		*clr
+		*clr & cla
 		shampoo -= 1
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
@@ -178,7 +179,11 @@ $bath = {
 
 		if frost > 0:frost = 0
 
-		pcs_skin += 1
+		if bath_daystart ! daystart:
+			bath_daystart = daystart
+			pcs_skin += rand(1,2)
+		end
+		
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
 		*nl
@@ -210,8 +215,7 @@ $bath = {
 
 		act '"Wash" your pussy':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
 			minut += 10
 
@@ -228,6 +232,10 @@ $bath = {
 
 			dynamic $dryOff
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -393,8 +401,7 @@ $tampon = {
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			sanpad -= 1
 			isprokp = 1
 			minut += 5
@@ -408,8 +415,7 @@ $tampon = {
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			tampon -= 1
 			isprok = 1
 			minut += 5
@@ -426,8 +432,7 @@ $quickwash = {
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 
 			cumspclnt = 4
 			gs 'cum_cleanup'
@@ -654,8 +659,7 @@ $basin = {
 }
 
 $pir_title = {
-	cla
-	*clr
+	*clr & cla
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
 	*nl
 }
@@ -1063,7 +1067,7 @@ if $ARGS[0] = 'private':
 			minut += 5
 			pregtest -= 1
 			gs 'stat'
-			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
+			 if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and huband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
@@ -1072,7 +1076,7 @@ if $ARGS[0] = 'private':
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
-			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pregTalkPC = 0:
+			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and huband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
@@ -1080,20 +1084,20 @@ if $ARGS[0] = 'private':
 				'The test shows two strips. You are pregnant. As you look at the test in your hand, you are?'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
 				act 'Aroused':gt 'din_van', 'ArousedReact1'
-			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid = 0 and pregTalkPC = 0:
+			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid = 0 and pcs_pregtalk = 0:
 				knowpreg = 1
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact1'
-			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid > 0 and pregTalkPC = 0:
+			elseif pregchem > 120 and knowpreg = 0 and huband = 1 and kid > 0 and pcs_pregtalk = 0:
 				knowpreg = 1
 				thinkpreg = 1
 				gt 'din_van', 'WifeReact2'
-			elseif pregTalkPC = 1 and pregchem > 120 and knowpreg = 0:
+			elseif pcs_pregtalk = 1 and pregchem > 120 and knowpreg = 0:
 				*nl
 				knowpreg = 1
 				thinkpreg = 1
 				'The test shows two strips. You are pregnant.'
-			elseif pregTalkPC = 1 or (knowpreg = 1 and preg = 1):
+			elseif pcs_pregtalk = 1 or (knowpreg = 1 and preg = 1):
 				*nl
 				knowpreg = 1
 				thinkpreg = 1
@@ -1136,8 +1140,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
 		act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			poroshok -= 2
 			minut += 60
@@ -1153,8 +1156,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and huspolday ! daystart:
 		act 'Clean the apartment (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			minut += 60
 			huspolday = daystart
@@ -1181,7 +1183,7 @@ end
 if $ARGS[0] = 'HorrifiedReact1':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 	'You stare in disbelief at the test in your hand. The two strips displayed can only mean one thing: you are pregnant. You sink to the floor, mind spinning. Tears well in your eyes. How could this happen?'
@@ -1204,7 +1206,7 @@ end
 if $ARGS[0] = 'ConcernedReact1':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 	'Your mind races as you gaze at the test in your hand. The two strips clearly show that you''re pregnant. You know this isn''t the worst thing that could happen to you, but your life is definitely going to change. Are you even ready for that kind of change?'
@@ -1224,7 +1226,7 @@ end
 if $ARGS[0] = 'ExcitedReact1':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 	'You''re overcome with glee as you look at the pregnancy test in your hand. Its two strips confirm that your wish has been granted: you are pregnant. You giggle as you clutch the pregnancy test, excited to share the news with everyone you know.'
@@ -1244,28 +1246,26 @@ end
 if $ARGS[0] = 'ArousedReact1':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 	'You rub your thighs together as you stare at the pregnancy test in your hand. The two strips displayed confirm that you’ve been knocked up. You excitedly recount every load of cum blast into your fertile womb, wondering which one found purchase. You gently rub your clit in a circular motion as you think about the fact that, in a few months, everyone who sees your large, pregnant belly will know what a slut you are.'
 		if rape > 0 and stat['vaginal'] > 1 and incest['exp'] = 0:
 			'You pick up speed as you recall your rapist forcefully pumping you full of his wonderful semen without any concern for your desires. You loved having your agency stripped away as a complete stranger decided to make you a mother.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		elseif incest['exp'] > 0:
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		else
-			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
+			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'	
 		end
+		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $metka
 end
 
 if $ARGS[0] = 'WifeReact1':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 		'A wide smile spreads across your face as you look down at the pregnancy test. The two strips displayed exclaim that you’re finally starting a family. You begin to shake with excitement as you think about how you are going to tell your husband. Should you just tell him as soon as you see him, or do you want to make it an even more special occasion and tell him over a fancy dinner? Maybe you should just nonchalantly drop the test in front of him to see his reaction. Regardless of how you decide to do it, you can''t keep the excitement to yourself any longer. You take a brief moment to freshen up before leaving the room. '
@@ -1276,7 +1276,7 @@ end
 if $ARGS[0] = 'WifeReact2':
 	menu_off = 1
 	cla
-	pregTalkPC = 1
+	pcs_pregtalk = 1
 	minut += 10
 	*nl
 	'You smile warmly at the test in your hand. You are definitely pregnant again. Your chest swells with joy, knowing that your wonderful family is about to get a little bit larger. You contentedly sigh as you envision your pregnant belly swelling again, proclaiming your motherhood to the world. Having a child is the greatest thing that has ever happened to you, and you’re thrilled at the opportunity to experience it again. You can’t wait any longer to tell your husband. You quickly spruce yourself up before going to share the fantastic news with your spouse.'
@@ -1319,8 +1319,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
 			act 'Change tampon':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1331,8 +1330,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
 			act 'Change pad':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1346,8 +1344,7 @@ end
 
 if $ARGS[0] = 'prvt_pee_end':
 	act 'Finish and wipe':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,2)
 		if rand_pee = 0:
@@ -1393,7 +1390,7 @@ if $ARGS[0] = 'pblc_pee':
 			if rand_pee = 0:
 				'Albina and her Starlettes are a bunch of dirty whores.'
 			elseif rand_pee = 1:
-				'<<$rand_girl>>''s vagina smells like throw-up!'
+				'<<$rand_girl>>''s vagina smells like puke!'
 			elseif rand_pee = 2:
 				'Beware of Dimka! He''s not as nice as he seems!'
 			elseif rand_pee = 3:
@@ -1409,7 +1406,7 @@ if $ARGS[0] = 'pblc_pee':
 			elseif rand_pee = 8:
 				'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote “Freebleeder for life!” Ewww.'
 			elseif rand_pee = 9:
-				'Petras cock is smaller than my lipstick tube, LOL!'
+				'Petra''s cock is smaller than my lipstick tube, LOL!'
 			elseif rand_pee = 10:
 				'You''re beautiful! Believe that!'
 			elseif rand_pee = 11:

+ 3 - 3
locations/dinsister.qsrc

@@ -114,9 +114,9 @@ $sischecks = {
 		'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 pregTalkSister = 0 and (($clothingworntype = 'nude' and pregtime > 90) or ($clothingworntype ! 'nude' and pregtime > 150)):
-		pregTalkSister = 1
-		if $clothingworntype ! 'nude' and pregtime > 150:
+	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?"'

+ 48 - 33
locations/etoexhib.qsrc

@@ -214,6 +214,13 @@ if $ARGS[0] = 'pos6':
 
 		act 'Leave':gt 'dachi'
 	end
+
+	! Setup for teleport circle
+	if tpKnown['Village'] = 1:
+		act 'Enter the hidden circle of trees': gt 'treeCircle', 'Village'
+	else:
+		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'Village'
+	end
 end
 
 if $ARGS[0] = 'pos7':
@@ -297,7 +304,7 @@ if $ARGS[0] = 'pos9':
 		'Work:"For some shoveling work, 3000<b>₽</b>."'
 
 		act 'Agree':
-			cls
+			*clr & cla
 			etoexhib = 11
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/suburban/dachastroy.jpg"></center>'
@@ -366,7 +373,7 @@ if $ARGS[0] = 'pos12':
 		'Work:"Sorry young lady. Some motivation would help us work harder."'
 
 		act 'Decline':
-			cls
+			*clr & cla
 			etoexhib = 15
 			temp = daystart
 			gs 'stat'
@@ -377,7 +384,7 @@ if $ARGS[0] = 'pos12':
 		end
 
 		act 'Accept and give half the amount':
-			cls
+			*clr & cla
 			money -= 1500
 			etoexhib = 14
 			temp = daystart
@@ -701,7 +708,7 @@ if $ARGS[0] = 'pos19':
 	'The Lyceum entrance hall. It''s pretty clean and quiet. There is a desk and office for the personnel department. On the wall hangs a timetable.'
 
 	if workPTU = 2:
-		cls
+		*clr & cla
 		pcs_mood -= 50
 		workPTU = 1
 		teachlevel = 0
@@ -814,13 +821,13 @@ if $ARGS[0] = 'pos21':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_fight.jpg"></center>'
 		'You see a group of girls, mocking and kicking a young man.'
 
 		act 'Interfere for the man':
-			cls
+			*clr & cla
 			teachlevel += 1
 			'"What are you doing? Immediately stop, I''ll call the police!" You yell at the girls. And they snort:"He''s an ssshole, he deserved it!" but they still leave the guy alone.'
 			'You are a good example by helping the helpless man. This will positively impact your reputation.'
@@ -844,7 +851,7 @@ if $ARGS[0] = 'pos22':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_rand.jpg"></center>'
@@ -869,7 +876,7 @@ if $ARGS[0] = 'pos23':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_korr1.jpg"></center>'
@@ -915,7 +922,7 @@ if $ARGS[0] = 'pos24tk':
 	'In one corner there is a small old sofa.'
 
 	$prositdirizv = {
-		cls
+		*clr & cla
 		cla
 		gs'stat'
 		set izvad = 1
@@ -943,7 +950,7 @@ if $ARGS[0] = 'pos24tk':
 	if hour >= 14 and hour <= 15:
 		temp = RAND(1,100)
 		if temp >= 90:
-			cls
+			*clr & cla
 			minut += 6
 			pcs_mood -= 10
 			pcs_willpwr -= 10
@@ -996,7 +1003,7 @@ if $ARGS[0] = 'pos25':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_klass.jpg"></center>'
 	'Your class.'
 	if workPTU = 3:
-		cls
+		*clr & cla
 		hour = 14
 		workPTU = 4
 		gs 'stat'
@@ -1008,7 +1015,7 @@ if $ARGS[0] = 'pos25':
 
 		act 'Next':gt 'etoexhib', 'pos25'
 	elseif workPTU = 4 and gor_dorm = 4:
-		cls
+		*clr & cla
 		hour = 14
 		gor_dorm = 5
 		gs 'stat'
@@ -1080,7 +1087,7 @@ if $ARGS[0] = 'pos27':
 
 		if temp >= 95:
 			act 'Drop your pencil on the ground':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 5
@@ -1104,7 +1111,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 85 and temp < 90:
 			act 'Sit on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1117,7 +1124,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 75 and temp < 80:
 			act 'Drop the chalk':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 5
@@ -1141,7 +1148,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 65 and temp < 70:
 			act 'Sit sexily on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1154,7 +1161,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 55 and temp < 60:
 			act 'Show stockings':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1170,7 +1177,7 @@ if $ARGS[0] = 'pos27':
 
 	if hour < 16:
 		act 'Teach':
-			cls
+			*clr & cla
 			minut += 60
 			pcs_mood -= 5
 
@@ -1243,7 +1250,7 @@ if $ARGS[0] = 'pos34':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 20
 		gs 'stat'
@@ -1282,7 +1289,7 @@ if $ARGS[0] = 'pos36':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1308,7 +1315,7 @@ if $ARGS[0] = 'pos37':
 
 	if temp >= 90:
 		act 'Say hello to the Director':
-			cls
+			*clr & cla
 			minut += 15
 			teachlevel += 1
 			gs 'stat'
@@ -1340,7 +1347,7 @@ if $ARGS[0] = 'pos38':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1353,7 +1360,7 @@ if $ARGS[0] = 'pos38':
 
 	if gor_dorm = 5:
 		act 'Search the Web for "Tetrodotoxin"':
-			cls
+			*clr & cla
 			minut += 120
 			gor_dorm = 6
 			gs 'stat'
@@ -1398,7 +1405,7 @@ if $ARGS[0] = 'pos39':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1540,25 +1547,28 @@ if $ARGS[0] = 'pos50':
 end
 
 if $ARGS[0] = 'pos51':
-	cla
-	*clr
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos51'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/podezd.jpg"></center>'
 	'Entrance to the 5-floors building in which you live. The lock on the door leading to the attic is broken.'
 
 	if sosedQW = 0:
+		menu_off = 1
 		'<br>Suddenly in the stairwell you are faced with a young guy who is climbing up the stairs. He runs into you and is noticeably embarrassed.<font color="#1589FF">"I''m sorry, I did not see you there. You''ve moved into apartment 69, right?"</font>'
 
 		act 'Yes, I live in the apartment 69':
-			cls
+			*clr & cla
 			sosedQW = 1
 			minut += 5
 			gs 'stat'
 			'You nod, confirming that you live in apartment 69. The guy looks visibly delighted and says, <font color="#1589FF">"Wonderful. I lived there before Petrovich. He tormented the whole building. By the way I''m Timothy, and you are?"</font> '
 
 			act '<<$pcs_nickname>>':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<font color="magenta">"My name is <<$pcs_nickname>>,"</font> you say. He nodded his head and began to get the key to open the door of the apartment 68. "Very nice. I live in the next apartment." The guy opened the door and on the threshold appeared the curious face of an elderly woman. She pointed her sharp nose at you and began to curiously look you. Timothy entered the apartment and said irritably, "Mother, stop hanging around the front door!" and closed the door.'
 
@@ -1574,8 +1584,7 @@ if $ARGS[0] = 'pos51':
 	end
 
 	act 'Leave the building':
-		cls
-
+		*clr & cla
 		if $clothingworntype = 'nude':
 			'<b><font color="red">You need to get dressed.</font></b>'
 			xgt $curloc
@@ -1593,7 +1602,10 @@ if $ARGS[0] = 'pos51':
 end
 
 if $ARGS[0] = 'pos52':
-	cls
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos52'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/cherdak.jpg"></center>'
@@ -1614,8 +1626,11 @@ end
 if $ARGS[0] = 'pos53':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos53'
+	menu_off = 0
 	$location_type = 'secluded'
-	cls
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof.jpg"></center>'
@@ -1751,7 +1766,7 @@ if $ARGS[0] = 'pos90':
 	end
 
 	act 'Leave':
-		cls
+		*clr & cla
 		gt 'etoexhib', 'pos24'
 	end
 end

+ 73 - 8
locations/experiment.qsrc

@@ -90,6 +90,8 @@ end
 
 if $ARGS[0] = 'deskTalk:shout':
 	shouted = 1
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\shout.jpg"></center>'
 	*nl
 	'"Calm damn miss <<$pcs_lastname>>, or I will be forced to call a security!" the woman yells as she tries to calm you down.'
@@ -99,6 +101,8 @@ if $ARGS[0] = 'deskTalk:shout':
 end
 
 if $ARGS[0] = 'deskTalk:refuse':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"I understand miss <<$pcs_lastname>>. I guess being used by those extra large sized cocks is not an experience that a woman would like to go through repeatedly." she understandingly replies.'
@@ -115,14 +119,16 @@ if $ARGS[0] = 'deskTalk:refuse':
 end
 
 if $ARGS[0] = 'deskTalk:admitWhore':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"You see miss <<$pcs_lastname>>, acceptance is the first step. Now do you want to rejoin the experiment, or not?" she grins as she asks.'
 	'"I am not sure, nurse..." you hesitantly answer.'
 	'"Just think about all those big black cocks, ready to fill you up... And all the orgasms you would be experiencing!" she is trying her best to tempt you.'
 
-	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 	act 'No, I have to fight this..':gt 'poli', 'start'
+	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 end
 
 if $ARGS[0] = 'deskTalk:volunteer':
@@ -130,6 +136,7 @@ if $ARGS[0] = 'deskTalk:volunteer':
 	impreg = 0
 	expVolunteer = 1
 	expVolunteerExam = 0
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -139,6 +146,7 @@ end
 
 if $ARGS[0] = 'deskTalk:volunteer:start':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -154,6 +162,7 @@ end
 
 if $ARGS[0] = 'form':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<h2>Research project #667 - "Fruit of Eden"</h2>'
 
@@ -183,6 +192,7 @@ end
 if $ARGS[0] = 'form:filled':
 	exp_form = 1
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\desk.jpg"></center>'
 	*nl
@@ -195,6 +205,7 @@ end
 
 if $ARGS[0] = 'testarea:start':
 	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -582,8 +593,9 @@ if $ARGS[0] = 'testarea:start:treatmentStart':
 	'She takes out a syringe, pushing the remaining air bubbles out. Holding you by the arm she is about to inject it into you...'
 
 	act 'Brace for the pinch':
-		if preg = 0: gt 'experiment', 'testarea:start:treatmentStart:injection'
-		if preg > 0:
+		if pregchem = 0: 
+			gt 'experiment', 'testarea:start:treatmentStart:injection'
+		elseif pregchem > 0:
 			cla & *clr
 			minut += 120
 			thinkpreg = 1
@@ -761,9 +773,26 @@ if $ARGS[0] = 'testarea:start:treatmentStart:dream3':
 		if interr = 3:'<<$doc1>>: "Indeed. And she has had sex with both an asian AND an african male."'
 	end
 	*nl
-	'Unable to stay awake anymore you fade out back to the world of unknowing...'
+	
+	if venera = 0 and GerpesOnce = 0 and Gerpes = 0 and SifacOnce = 0 and Sifilis = 0 and TriperOnce = 0 and Triper = 0 and TriperOral = 0 and KandidozOnce = 0 and Kandidoz = 0:
+		'Unable to stay awake anymore you fade out back to the world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+	else
+		'"But she has a STD," is the last thing you here before you fade out back to world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup:std'
+	end
+end
 
-	act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+if $ARGS[0] = 'testarea:start:treatmentStart:wakeup:std':
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\lights.jpg"></center>'
+	'You''re finally awake, feeling as if you''ve slept for days.'
+	'Your eyes slowly adjust to the light coming from the ceiling lamps. It looks as if there are no windows at all and only artificial light illuminates the room.'
+	*nl
+	'A nurse stands next to your bed. "Sorry, we can''t let you be part of the experiment. You have a STD," she says. "You can get dressed here before you leave."'
+	
+	act 'Get dressed and leave': gt 'poli', 'start'	
 end
 
 if $ARGS[0] = 'testarea:start:treatmentStart:wakeup1':
@@ -1116,7 +1145,7 @@ if $ARGS[0] = 'testarea:treatment:bed:wait:event':
 				act 'Continue':gt 'experiment', 'testarea:treatment:bed:doctor1'
 			else
 				if pregchem > 30:
-					pregTalkPC = 1
+					pcs_pregtalk = 1
 					impreg = 1
 					*nl
 					'"Very well you little cum bucket, you have finally managed to finish the impregnation process. You will proceed to the final stage in a short time." the doctor tells you.'
@@ -1202,6 +1231,8 @@ if $ARGS[0] = 'testarea:treatment:sex3':
 	gs 'arousal', 'vaginal', 4, 'bound', 'sub', 'rough', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 	*nl
 	'At last his ejaculation ends. He does not pull immediately out, instead he signals for the nurse. As she arrives, he finally pulls his sticky, cum covered cock out. And you don''t feel empty for too long...'
@@ -1278,6 +1309,8 @@ if $ARGS[0] = 'testarea:treatment:deflower':
 		gs 'arousal', 'vaginal', 5, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 		*nl
 		act '(endure)':experi_stage = 5 & gt 'experiment', 'testarea:treatment:deflower'
@@ -1914,6 +1947,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal cowgirl, 1v1
@@ -1930,6 +1965,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 45, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal missionary, 1v1
@@ -1945,6 +1982,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'bj', 15, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal + mouth, 2v1
@@ -1962,6 +2001,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal doggy, 1v1
@@ -1978,6 +2019,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal missionary, 1v1
@@ -1994,6 +2037,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bj, 1v1
@@ -2013,6 +2058,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 70
 		gs 'cum_call', 'face', 'Some african male', 0, '', 250000, 20
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, anal, 1v1
@@ -2031,6 +2078,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, whip, 1v1
@@ -2223,6 +2272,7 @@ end
 if $ARGS[0] = 'testarea:treatment:room:event:nurse:check':
 	minut += 5
 	! STATUS CHECK: nurse
+	gs 'experiment', 'std_block'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'She takes a sample of your blood, measures your temperature, blood pressure and proceeds to examine insides of your vagina.'
 
@@ -2235,7 +2285,7 @@ if $ARGS[0] = 'testarea:treatment:room:event:nurse:check':
 	'<i>The cold medical mirror is nothing compared to the abuse endured by the giant black cocks.</i>'
 	'When she''s done, she packs up her equipment and says,'
 	if pregchem > 30:
-		pregTalkPC = 1
+		pcs_pregtalk = 1
 		impreg = 1
 		'Very well miss <<$pcs_lastname>>, you have finally managed to complete the impregnation process. You will proceed to the final stage in a short time.'
 	else
@@ -2481,6 +2531,7 @@ if $ARGS[0] = 'testarea:treatment:impreg:leave':
 	minut += 5
 	money += 50000
 	experimentAbsolved += 1
+	gs 'experiment', 'std_block'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'The nurse speaks up, "And the last matter to be settled is your payment."'
@@ -2557,7 +2608,8 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish':
 	gs 'cum_call', 'breasts', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'butt', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'labia', 'Some african male', 0, '', 250000, 50
-
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 
 	act 'Continue':gt 'experiment', 'testarea:treatment:impreg:shout:punish:kickout'
@@ -2585,5 +2637,18 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish:kickout':
 	act 'Get up':gt 'poli', 'start'
 end
 
+if $ARGS[0] = 'std_block':
+	venera = 0
+	GerpesOnce = 0
+	Gerpes = 0
+	SifacOnce = 0
+	Sifilis = 0
+	TriperOnce = 0
+	Triper = 0
+	TriperOral = 0
+	KandidozOnce = 0
+	Kandidoz = 0
+end
+
 --- experiment ---------------------------------
 

+ 1 - 1
locations/fame.qsrc

@@ -9,7 +9,7 @@
 
 if $ARGS[0] ! 'deg':
 
-	dynamic '<<$ARGS[0]>>_<<ARGS[1]>> += <<ARGS[2]>>'
+	dynamic '<<$ARGS[0]>>_<<$ARGS[1]>> += <<ARGS[2]>>'
 
 	fame_performer = 0
 	fame_sexind = 0

+ 4 - 4
locations/father.qsrc

@@ -134,19 +134,19 @@ if tatlip>0 and fatherTatLip=0 and npc_rel['A28']>=60:
     end
 end
 
-if $clothingworntype = 'nude' and pregTalkFather = 0 and pregtime > 90:
+if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 2688:
     '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
-    pregTalkFather = 1
+    npc_pregtalk['A28'] = 1
     
-elseif $clothingworntype ! 'nude' and pregTalkFather = 0 and pregtime > 150:
+elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and pregchem > 3600:
     '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
-    pregTalkFather = 1
+    npc_pregtalk['A28'] = 1
 end
 
 !!----------------------------------------end reaction block---------------------------------------------

+ 6 - 1
locations/foto.qsrc

@@ -2503,7 +2503,12 @@ if $ARGS[0] = 'blackm':
 										studiaday = 7
 										'"You can keep your presents from the guys." says Victor as he quickly makes you dress and leads you to the exit.'
 										'"I hope you''ve learned your lesson. I will be here to teach stupid girls like you that you cannot get away with such behaviour and if needed I will put you through this all over again."'
-										act 'Leave': minut += 1 & gt 'down'
+										act 'Leave':
+											minut += 1
+											gs 'clothing', 'wear_last_worn'
+											gs 'underwear', 'wear'
+											gt 'down'
+										end
 									end
 								end
 							end

+ 7 - 1
locations/gadforest.qsrc

@@ -120,6 +120,13 @@ if $ARGS[0] = '1':
 		end
 	end
 
+	! Setup for teleport circle
+	if tpKnown['GadForest'] = 1:
+		act 'Enter the hidden circle of trees': gt 'treeCircle', 'GadForest'
+	else:
+		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'GadForest'
+	end
+
 	! can only be naked if successfully complete Mira gadforest_event, nude_event
 	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 		act'Strip naked':
@@ -205,7 +212,6 @@ if $ARGS[0] = '1':
 			menu_off = 1
 			minut += 60
 			pcs_mood += 20
-			pcs_willpwr += willpowermax/5
 			if $clothingworntype = 'nude':
 				pcs_health += healthmax/5 & pcs_horny += 5
 				inhib_exp += rand(1,5)

+ 3 - 2
locations/gadukino.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = '':
 			'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'
 		end
-		if npc_rel['A60'] > 0: '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</a> house.'
 		*nl
 
 		if month >= 6 and month <= 9:
@@ -301,7 +301,8 @@ if $ARGS[0] = 'mira_events':
 		'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 'Help her':
 			*clr & cla
-			npc_rel['A60'] = 10
+			metmira = 1
+			npc_rel['A60'] += 10
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'

+ 75 - 77
locations/gdksex.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'outside':
 						if DPtipe = 2:
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/grab.jpg"></center>'
 							'The guy is too drunk to notice your objections and slides a hand underneath your clothes, squeezing your boobs in his hands.'
-							gs 'gdksex', 'blowjob', 'unpaid'
+							act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 
 							act 'Don''t say anything':
 								*clr & cla
@@ -139,7 +139,7 @@ if $ARGS[0] = 'outside':
 							end
 
 							'Your horniness has made you rather frisky as well! You moan softly when <<$boydesc>> exposes your boobs and begins to lick and suck on your nipples.'
-							gs 'gdksex', 'blowjob', 'unpaid'
+							act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 						end
 
 						gs 'gdksex', 'handjob'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'outside':
 									if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 
 									gs 'gdksex', 'handjob'
-									gs 'gdksex', 'blowjob', 'unpaid'
+									act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 								end
 							end
 						end
@@ -420,21 +420,21 @@ if $ARGS[0] = 'outside':
 		end
 			gs 'gdksex', 'decline'
 			gs 'gdksex', 'handjob'
-			gs 'gdksex', 'blowjob', 'unpaid'
+			act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 	elseif (gdk_nice_guy = 1 and pav_slut >= 100 and pav_slut < 125) or (gdk_nice_guy = 0 and pav_slut >= 65 and pav_slut < 75):
 		'<<$boydesc>> says: "<<$pcs_nickname>>, my buddies told me you''re a <<$gnikname>>. I want to have some fun with you too!"'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		gs 'gdksex', 'decline'	
 		gs 'gdksex', 'handjob'
-		gs 'gdksex', 'blowjob', 'unpaid'	
+		act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'	
 	elseif (gdk_nice_guy = 1 and pav_slut >= 125) or (gdk_nice_guy = 0 and pav_slut >= 75):
 		gs 'boymass', 'B'
 		'<<$boydesc>> says: "<<$pcs_nickname>>, let''s cut the crap: the whole town knows you''re a <<$gnikname>>. I want a blowjob, here''s 100 <b>₽</b>."'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		gs 'gdksex', 'decline'
-		gs 'gdksex', 'blowjob', 'paid'
+		act 'Squat down before him': gt 'gdksex', 'blowjob', 'paid'
 	end
 
 	if (gdk_nice_guy = 1 and pav_slut >= 65) or (gdk_nice_guy = 0 and pav_slut >= 35):
@@ -479,7 +479,7 @@ if $ARGS[0] = 'outside':
 				if slutty > 10: 'You have done worse. You only say: "200 <b>₽</b>."'
 				'<<$boydesc>> looks a bit confused for a moment, but gives you 200 <b>₽</b>.'
 			
-				gs 'gdksex', 'blowjob', 'unpaid'
+				act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 			end
 		end
 	end
@@ -501,94 +501,92 @@ if $ARGS[0] = 'decline':
 end
 
 if $ARGS[0] = 'blowjob':
-	act 'Squat down before him':
+	*clr & cla
+	minut += 5
+	pcs_horny += 10
+	stat['bj'] += 1
+	if $ARGS[1] = 'paid': 
+		slutty += 1
+		money += 100
+		if gdk_nice_guy = 1:
+			pav_prostitute += rand (1,3)
+		elseif gdk_nice_guy = 0:
+			pav_prostitute += rand (3,9)
+		end
+	end
+	if boynumBlock = 0:guy += 1
+	if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
+
+	sub += 1
+	gs 'boymass', 'B'
+	bmBJ[Tboynum] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj.jpg"></center>'
+	'You squat before him as you wrap your fingers around his shaft, and slowly begin to jerk him off.'
+
+	act 'Suck his dick':
 		*clr & cla
 		minut += 5
 		pcs_horny += 10
-		stat['bj'] += 1
-		if $ARGS[1] = 'paid': 
-			slutty += 1
-			money += 100
-			if gdk_nice_guy = 1:
-				pav_prostitute += rand (1,3)
-			elseif gdk_nice_guy = 0:
-				pav_prostitute += rand (3,9)
-			end
+
+		if gdk_nice_guy = 1:
+			pav_sex += rand(1,3)
+		elseif gdk_nice_guy = 0:
+			pav_sex += rand(3,9)
 		end
-		if boynumBlock = 0:guy += 1
-		if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
+			
+		bmGossip[Tboynum] = 2
 
-		sub += 1
-		gs 'boymass', 'B'
-		bmBJ[Tboynum] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj.jpg"></center>'
-		'You squat before him as you wrap your fingers around his shaft, and slowly begin to jerk him off.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj2.jpg"></center>'
+		gs 'dinsex','dinrandbj'
 
-		act 'Suck his dick':
+		act 'Continue':
 			*clr & cla
 			minut += 5
 			pcs_horny += 10
-
-			if gdk_nice_guy = 1:
-				pav_sex += rand(1,3)
-			elseif gdk_nice_guy = 0:
-				pav_sex += rand(3,9)
-			end
-			
-			bmGossip[Tboynum] = 2
-
+			swallow += 1
+			spafinloc = 11
+			gs 'cum_manage'
+			spafinloc = 12
+			gs 'cum_manage'
+			spafinloc = 7
+			gs 'cum_manage'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj2.jpg"></center>'
-			gs 'dinsex','dinrandbj'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj3.jpg"></center>'
+			gs 'dinsex','dinrandswallow'
 
-			act 'Continue':
-				*clr & cla
-				minut += 5
-				pcs_horny += 10
-				swallow += 1
-				spafinloc = 11
-				gs 'cum_manage'
-				spafinloc = 12
-				gs 'cum_manage'
-				spafinloc = 7
-				gs 'cum_manage'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj3.jpg"></center>'
-				gs 'dinsex','dinrandswallow'
-
-				act 'Leave':gt 'gdk'
-			end
+			act 'Leave':gt 'gdk'
 		end
+	end
 
-		act 'Turn around and let him fuck you':
-			*clr & cla
-			minut += 5
-			pcs_horny += 10
+	act 'Turn around and let him fuck you':
+		*clr & cla
+		minut += 5
+		pcs_horny += 10
 
-			if boynumBlock = 0:guy += 1
+		if boynumBlock = 0:guy += 1
 
-			bmSEX[Tboynum] += 1
-			gs 'boyStat', $bmNane[Tboynum]
-			pose = 1
+		bmSEX[Tboynum] += 1
+		gs 'boyStat', $bmNane[Tboynum]
+		pose = 1
 
-			if gdk_nice_guy = 1:
-				pav_sex += rand(1,3)
-			elseif gdk_nice_guy = 0:
-				pav_sex += rand(3,9)
-			end
+		if gdk_nice_guy = 1:
+			pav_sex += rand(1,3)
+		elseif gdk_nice_guy = 0:
+			pav_sex += rand(3,9)
+		end
 			
-			bmGossip[Tboynum] = 1
+		bmGossip[Tboynum] = 1
 
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/public/boysex.jpg"></center>'
-			'You turn around, bend over, pull down your panties, and lean your hands against a wall for support. <<$boydesc>> immediately gets behind you.'
-			dynamic $sexstart
-			gs 'dinsex','vaginal_sex',10
-			gs 'dinsex','sexcum'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/shared/sex/public/boysex.jpg"></center>'
+		'You turn around, bend over, pull down your panties, and lean your hands against a wall for support. <<$boydesc>> immediately gets behind you.'
+		dynamic $sexstart
+		gs 'dinsex','vaginal_sex',10
+		gs 'dinsex','sexcum'
 
-			act 'Leave':gt 'gdk'
-		end
+		act 'Leave':gt 'gdk'
 	end
 end
 
@@ -616,7 +614,7 @@ if $ARGS[0] = 'handjob':
 				'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 				'You begin to move your hand up and down his shaft slowly, but slowly pick up the pace while you kiss him dominantly.'
 				'<<$boydesc>> wants more however, and suddenly places his hands on your shoulder. He firmly pushes downwards, forcing you to squat before him.'
-				gs 'gdksex', 'blowjob', 'unpaid'
+				act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 			end
 		end
 	end
@@ -809,7 +807,7 @@ if $ARGS[0] = 'kissing':
 					if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 
 					gs 'gdksex', 'handjob'
-					gs 'gdksex', 'blowjob', 'unpaid'
+					act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 				end
 			end
 		end

+ 6 - 6
locations/gdksport.qsrc

@@ -74,10 +74,10 @@ if $ARGS[0] = 'start':
 	*nl
 
 	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour < 18:
-		if gsAboBeg > 0 and pregTalkTrack = 0:
+		if gsAboBeg > 0 and npc_pregtalk['A131'] = 0:
 			act 'Take a track lesson, you have <<gsAboBeg>> lessons remaining':gt 'gdksport', 'racing2'
 		end
-		if gsAboVolley > 0 and volleysostav = 0 and pregTalkvball = 0:
+		if gsAboVolley > 0 and volleysostav = 0 and npc_pregtalk['A69'] = 0:
 			if week ! 5:
 				act 'Take a volleyball lesson, you have <<gsAboVolley>> lessons remaining':gt 'gdksport', 'vball2'
 			else
@@ -98,10 +98,10 @@ if $ARGS[0] = 'start':
 				act 'Play with the team':gt 'gdksport', 'vballreact'
 			end
 		end
-		if gsAboDance > 0 and albinaQWdance = 0 and pregTalkStarlets = 0:
+		if gsAboDance > 0 and albinaQWdance = 0 and npc_pregtalk['A23'] = 0:
 			act 'Take a dance lesson, you have <<gsAboDance>> lessons remaining':gt 'gdksport', 'dance2'
 		end
-		if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and pregTalkStarlets = 0 and startletsday ! daystart:
+		if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and npc_pregtalk['A23'] = 0 and startletsday ! daystart:
 			if pregtime >= 90:
 				act 'Train with Starlets':gt 'gdksport', 'Starletsreact'
 			else
@@ -1232,14 +1232,14 @@ if $ARGS[0] = 'Starletsreact':
 	cla
 	menu_off = 1
 	'As you approach the Starlets, Albina looks at you in disgust. Loudly enough for the whole team to hear, she says "<<$pcs_nickname>>, no one wants to see some pregnant whore dance. Leave. You''re done." Tears welling in your eyes, you leave, the sound of laughter and taunting following your departure.'
-	act 'Continue':pregtalkStarlets = 1 & gt 'gdk'
+	act 'Continue':npc_pregtalk['A23'] = 1 & gt 'gdk'
 end
 
 if $ARGS[0] = 'vballreact':
 	cla
 	menu_off = 1
 	'As you approach the team, your coach notices you and calls you aside. "<<$pcs_firstname>>, are you pregnant? I can''t let you play like that. Also, a pregnant teenager would definitely reflect poorly on me and the rest of the team. Sorry, but off the team." Tears welling in your eyes, you leave.'
-	act 'Continue':pregtalkvball = 1 & gt 'gdk'
+	act 'Continue':npc_pregtalk['A69'] = 1 & gt 'gdk'
 end
 
 

+ 55 - 51
locations/gevent.qsrc

@@ -7,61 +7,65 @@ if $ARGS[0] = '1':
 	*clr & cla
 	menu_off = 1
 	dyadyamishaevent = 1
-	dick = 18
 	gs 'themes', 'indoors'
+	gs 'boyStat', 'A54'
 
-	'You agree to help, and leave the cafe with uncle Misha. When you reach his apartment, he takes you by the hand and pulls you to his bedroom, locking the door with a key behind him. Roughly grabbing you by your hair, he pulls you down to your knees and unbuttons his pants with his other hand. His erect cock springs to life, which he impatiently pushes against your pursed lips.'
-	'"Open your mouth, whore. You know why you are here", he commands, slapping your cheeks with his hand.'
-	'As you try to resist and keep your mouth shut, he starts rubbing the head of his engorged dick against your lips, spreading his precum over it with a lewd grin on his face. When he realizes you have no intentions of opening your mouth he slaps you harder and harder. After one particularly hard slap he leans over and snarls menacingly: "Stop testing my patience and open up, bitch. I''m not going to ask again."'
-	'Reluctantly you open your mouth, allowing his vile smelling dick access past your lips. He places the head of his dick firmly inside your mouth and continues to pressure you: "Go on bitch, suck it. You''ll regret it if you make me do all the work."'
-	'Thoroughly intimidated by his demands, you begin to suck him off obediently. He can tell your heart is not really into it and decides to help out, shoving his cock further and further down your throat until you''re nuzzling his hairy crotch. He leaves it in a few seconds more than you are comfortable with, making you gag. Watching you struggle puts an evil grin on his face and after a while he pulls his dick out of your mouth, a thick strand of saliva slowly dripping off it.'
-	'"Not bad <<$pcs_nickname>>, not bad. Lie down, I''m going to have some fun with you."'
-
-	act 'Lie down on the bed':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/rape.jpg"></center>'
+	'You agree to help, and leave the cafe with uncle Misha. When you reach his apartment, he takes you by the hand and pulls you to his bedroom, locking the door with a key behind him. Roughly grabbing you by your hair, he pulls you down to your knees and unbuttons his pants with his other hand.'
+	act 'Continue':
 		*clr & cla
-		'You are no longer resisting, having lost all hope of getting yourself out of this situation. Lying wearily on the bed, he quickly takes your clothes off and sits down at your feet, examining your pussy with his fingers as much as his eyes.'
-
-		if pcs_vag = 0 and stat['vaginal'] = 0:
-			cumprecheck = 1
-			gs 'cum_manage'
-			'"You''re still a virgin? We''ll have to fix that."'
-			'He mounts you and guides the head of his cock towards your virgin pussy, rubbing it against you for a little while before slamming his cock in all the way, breaking your hymen. It hurts so much! With no concerns for your feelings, he starts hammering his dick in you, while you meekly try to resist but fail to even inconvenience him. After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to do instead. You quietly lick your blood off his dick trying to hide the disgust, and when he cums he pulls back just a bit. You can feel it spasm just as a warm liquid hits your tongue.'
-		else
-			cumprecheck = 1
-			gs 'cum_manage'
-			'"No longer a virgin, eh? No need for me to take it slow, then!"'
-			'He mounts you and guides the head of his cock towards your pussy, rubbing it against your opening for a little while before slamming his cock in all the way. He begins to fuck you with short, intense strokes.'
-
-			if dick - pcs_vag > 10 and dick - pcs_vag <= 7:'The rough handling uncle Misha gives you is feeling quite good, and you wish he''d fuck you even harder.'
-			if dick - pcs_vag > 6 and dick - pcs_vag <= 3:'Uncle Misha''s thrusts hurt a lot, and you wish for it to be over soon.'
-
-			'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to try instead. When he cums he pulls back just a bit, and you can feel it spasm as a warm liquid hits your tongue.'
-		end
-		
-		act 'Swallow his cum':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/bj.jpg"></center>'
+		'His erect cock springs to life, which he impatiently pushes against your pursed lips.'
+		'"Open your mouth, whore. You know why you are here", he commands, slapping your cheeks with his hand.'
+		'As you try to resist and keep your mouth shut, he starts rubbing the head of his engorged dick against your lips, spreading his precum over it with a lewd grin on his face. When he realizes you have no intentions of opening your mouth he slaps you harder and harder. After one particularly hard slap he leans over and snarls menacingly: "Stop testing my patience and open up, bitch. I''m not going to ask again."'
+		'Reluctantly you open your mouth, allowing his vile smelling dick access past your lips. He places the head of his dick firmly inside your mouth and continues to pressure you: "Go on bitch, suck it. You''ll regret it if you make me do all the work."'
+		'Thoroughly intimidated by his demands, you begin to suck him off obediently. He can tell your heart is not really into it and decides to help out, shoving his cock further and further down your throat until you''re nuzzling his hairy crotch. He leaves it in a few seconds more than you are comfortable with, making you gag. Watching you struggle puts an evil grin on his face and after a while he pulls his dick out of your mouth, a thick strand of saliva slowly dripping off it.'
+		'"Not bad <<$pcs_nickname>>, not bad. Lie down, I''m going to have some fun with you."'
+		gs 'arousal', 'bj', 25, 'rough', 'rape'
+
+		act 'Lie down on the bed':
 			*clr & cla
-			stat['vaginal'] += 1
-			stat['bj'] += 1
-			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
-			pcs_throat += 1
-
-			if pcs_vag < dick:pcs_vag += 1
-
-			rape += 1
-			minut += 75
-			money += 500
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/1.jpg"></center>'
-			'His sperm tastes quite bitter as it hits your tongue. Nevertheless, knowing it is what he expects you to do, you swallow it and lick your lips clean like an obedient girl.'
-			'"You swallowed it, girl?" he asks, melodramatically patting your head as a sign of approval. He continues: "Very nice. Go ahead and get dressed, I''ll give you a present for your efforts."'
-			'Uncle Misha leaves the room as you get dressed, and while you quickly put your clothes back on you hope that ''present'' is not more punishment in some shape or form. To your surprise, his present is actually a bank note worth 500 <b>₽</b>.'
-			'"Go on child, go buy yourself some ice cream. I know you''re from a poor family, so if you''re ever in need of money you can come pay me a visit. There''s more where that came from."'
-			'Having had his fun, he gestures that you should get lost now. You quietly take the money from uncle Misha''s hand, and leave as he says.'
-
-			act 'Leave uncle Misha''s apartment':gt 'pod_ezd','etaj_2'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/sex.jpg"></center>'
+			'You are no longer resisting, having lost all hope of getting yourself out of this situation. Lying wearily on the bed, he quickly takes your clothes off and sits down at your feet, examining your pussy with his fingers as much as his eyes.'
+
+			if pcs_vag = 0 and stat['vaginal'] = 0:
+				cumprecheck = 1
+				gs 'cum_manage'
+				'"You''re still a virgin? We''ll have to fix that."'
+				'He mounts you and guides the head of his cock towards your virgin pussy, rubbing it against you for a little while before slamming his cock in all the way, breaking your hymen. It hurts so much! With no concerns for your feelings, he starts hammering his dick in you, while you meekly try to resist but fail to even inconvenience him.'
+				gs 'arousal', 'vaginal', 25, 'rough'
+				'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to do instead. You quietly lick your blood off his dick trying to hide the disgust, and when he cums he pulls back just a bit. You can feel it spasm just as a warm liquid hits your tongue.'
+			else
+				cumprecheck = 1
+				gs 'cum_manage'
+				'"No longer a virgin, eh? No need for me to take it slow, then!"'
+				'He mounts you and guides the head of his cock towards your pussy, rubbing it against your opening for a little while before slamming his cock in all the way. He begins to fuck you with short, intense strokes.'
+
+				if dick - pcs_vag > 10 and dick - pcs_vag <= 7:'The rough handling uncle Misha gives you is feeling quite good, and you wish he''d fuck you even harder.'
+				if dick - pcs_vag > 6 and dick - pcs_vag <= 3:'Uncle Misha''s thrusts hurt a lot, and you wish for it to be over soon.'
+				gs 'arousal', 'vaginal', 25, 'rough', 'rape'
+
+				'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to try instead. When he cums he pulls back just a bit, and you can feel it spasm as a warm liquid hits your tongue.'
+			end
+			
+			act 'Swallow his cum':
+				*clr & cla
+				swallow += 1
+				gs 'cum_call', 'mouth', 'A54'
+				minut += 5
+				money += 500
+				gs 'arousal', 'end'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/cum.jpg"></center>'
+				'His sperm tastes quite bitter as it hits your tongue. Nevertheless, knowing it is what he expects you to do, you swallow it and lick your lips clean like an obedient girl.'
+				'"You swallowed it, girl?" he asks, melodramatically patting your head as a sign of approval. He continues: "Very nice. Go ahead and get dressed, I''ll give you a present for your efforts."'
+				'Uncle Misha leaves the room as you get dressed, and while you quickly put your clothes back on you hope that ''present'' is not more punishment in some shape or form. To your surprise, his present is actually a bank note worth 500 <b>₽</b>.'
+				'"Go on child, go buy yourself some ice cream. I know you''re from a poor family, so if you''re ever in need of money you can come pay me a visit. There''s more where that came from."'
+				'Having had his fun, he gestures that you should get lost now. You quietly take the money from uncle Misha''s hand, and leave as he says.'
+
+				act 'Leave uncle Misha''s apartment':gt 'pod_ezd','etaj_2'
+			end
 		end
 	end
 end

+ 19 - 9
locations/gopskver.qsrc

@@ -12,6 +12,8 @@ gs 'stat'
 gs 'dinsexFX'
 if $prevloc = 'gkafe':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+elseif $prevloc = 'pavtrainhall':
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 else
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 end
@@ -21,6 +23,8 @@ if kotovLoveQW > 0:
 	if hour < 20:
 		if $prevloc = 'gkafe':
 			'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
+		elseif $prevloc = 'pavtrainhall':
+			'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
 		else
 			'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
 		end
@@ -207,8 +211,8 @@ else
 				iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
 
 				act 'Decline the beer and leave':
-					if $prevloc = 'gkafe':
-						gt 'gkafe'
+					if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+						gt $prevloc
 					else
 						gt 'gskver', 'start'
 					end
@@ -231,8 +235,8 @@ else
 					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 							
 					act 'Continue':
-						if $prevloc = 'gkafe':
-							gt 'gkafe'
+						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+							gt $prevloc
 						else
 							gt 'gskver', 'start'
 						end
@@ -260,17 +264,21 @@ else
 						'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
 						act 'Continue':
-							if $prevloc = 'gkafe':
-								gt 'gkafe'
+							if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+								gt $prevloc
 							else
 								gt 'gskver', 'start'
 							end
 						end
 					end
 				elseif pav_slut < 75:
-					if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+					if $prevloc = 'gkafe':
+						'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'			
+					elseif $prevloc = 'pavtrainhall':
+						'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'	
+					end
 					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
-
+					
 					act '"Yes that''s true"':
 						*clr & cla
 						gs 'stat'
@@ -381,7 +389,9 @@ else
 			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 			
 			if $prevloc = 'gkafe':
-				act 'Blush and quickly leave the cafe':gt'pavtrain'
+				act 'Blush and quickly leave the cafe': gt $prevloc
+			elseif $prevloc = 'pavtrainhall':
+				act 'Blush and quickly leave the train station': gt $prevloc
 			else
 				act 'Blush and keep walking':gt 'gskver', 'start'
 				if BjBeerQW >= 5:

+ 4 - 4
locations/gpoli.qsrc

@@ -57,9 +57,9 @@ if $ARGS[0] = '':
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
-			pregTalkPC = 0
-			pregTalkNat = 0
-			pregTalkbrother = 0
+			pcs_pregtalk = 0
+			npc_pregtalk['A16'] = 0
+			npc_pregtalk['A34'] = 0
 			pregchem = 0
 			cycle = 4
 			gs 'cum_cleanup', 'reset'
@@ -313,7 +313,7 @@ if $ARGS[0] = '':
 
 					'"That''s it, you might still feel a bit off but the infection is now cured".'
 
-					act 'Leave':gt 'poli', 'start'
+					act 'Leave':gt 'gpoli'
 				end
 			end
 		end

+ 2 - 2
locations/grandpahelp.qsrc

@@ -109,7 +109,7 @@ elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and
 	end
 else
 	if hour >= 9:
-		randmsg = rand(0,5):
+		randmsg = rand(0,5)
 		if randmsg = 0:
 			'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
 		elseif randmsg = 1:
@@ -124,7 +124,7 @@ else
 			'"- You can take the day off to rest up."'
 		end
 	else
-		randmsg = rand(0,1):
+		randmsg = rand(0,1)
 		if randmsg = 0:
 			'"- You don''t need to help out today <<$pcs_nickname>>."'
 		else

+ 1 - 1
locations/gschool_boys_bathroom.qsrc

@@ -1248,7 +1248,7 @@ if $ARGS[0] = 'companyb4':
 	act 'Masturbate': gt 'gschool_boys_bathroom', 'masturbateb4'
 end
 
-if $ARGS[0]  'masturbateb4':
+if $ARGS[0] = 'masturbateb4':
 	cla & *clr
 	stat['mast'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(1,3)

+ 149 - 2
locations/gschool_lessons.qsrc

@@ -3085,6 +3085,9 @@ if $ARGS[0] = 'npc_data':
 !!7 - Family
 !!8 - Pavlovsk
 
+!!===========================General=============================
+maxnpcs = 231
+
 !!
 !!===========================Male Students=======================
 !!
@@ -3093,6 +3096,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[1] = 0
 	grupTipe[1] = 1
 	selfieenable[1] = 1
+	schoolenable[1] = 1
+	discoenable[1] = 1
 	$npcGo[1] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 	$npcSelfie[1] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 
@@ -3101,6 +3106,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[2] = 0
 	grupTipe[2] = 3
 	selfieenable[2] = 1
+	schoolenable[2] = 1
+	discoenable[2] = 1
 	$npcGo[2] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
 	$npcSelfie[2] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
 
@@ -3109,6 +3116,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[3] = 0
 	grupTipe[3] = 2
 	selfieenable[3] = 1
+	schoolenable[3] = 1
+	discoenable[3] = 1
 	$npcGo[3] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
 	$npcSelfie[3] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
 
@@ -3117,6 +3126,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[4] = 0
 	grupTipe[4] = 1
 	selfieenable[4] = 1
+	schoolenable[4] = 1
+	discoenable[4] = 1
 	$npcGo[4] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
 	$npcSelfie[4] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
 
@@ -3126,6 +3137,8 @@ if $ARGS[0] = 'npc_data':
 	if fedormasha = 1: grupTipe[5] = 5
 	if fedormasha = 0: grupTipe[5] = 2
 	selfieenable[5] = 1
+	schoolenable[5] = 1
+	discoenable[5] = 1
 	$npcGo[5] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
 	$npcSelfie[5] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
 
@@ -3134,6 +3147,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[6] = 0
 	grupTipe[6] = 3
 	selfieenable[6] = 1
+	schoolenable[6] = 1
+	discoenable[6] = 1
 	$npcGo[6] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
 	$npcSelfie[6] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
 
@@ -3142,6 +3157,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[7] = 0
 	grupTipe[7] = 5
 	selfieenable[7] = 1
+	schoolenable[7] = 1
+	discoenable[7] = 1
 	$npcGo[7] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
 	$npcSelfie[7] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
 
@@ -3150,6 +3167,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[8] = 0
 	grupTipe[8] = 2
 	selfieenable[8] = 1
+	schoolenable[8] = 1
+	discoenable[8] = 1
 	$npcGo[8] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
 	$npcSelfie[8] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
 
@@ -3158,6 +3177,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[9] = 0
 	grupTipe[9] = 4
 	selfieenable[9] = 1
+	schoolenable[9] = 1
+	discoenable[9] = 1
 	$npcGo[9] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
 	$npcSelfie[9] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
 
@@ -3166,6 +3187,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[10] = 0
 	grupTipe[10] = 4
 	selfieenable[10] = 1
+	schoolenable[10] = 1
+	discoenable[10] = 1
 	$npcGo[10] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
 	$npcSelfie[10] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
 
@@ -3174,6 +3197,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[11] = 0
 	grupTipe[11] = 4
 	selfieenable[11] = 1
+	schoolenable[11] = 1
+	discoenable[11] = 1
 	$npcGo[11] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
 	$npcSelfie[11] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
 
@@ -3182,6 +3207,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[146] = 0
 	grupTipe[146] = 1
 	selfieenable[146] = 1
+	schoolenable[146] = 1
+	discoenable[146] = 1
 	$npcGo[146] = '<a href="exec:numnpc = 146 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
 	$npcSelfie[146] = '<a href="exec:numnpc = 146 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
 
@@ -3190,6 +3217,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[147] = 0
 	grupTipe[147] = 1
 	selfieenable[147] = 1
+	schoolenable[147] = 1
+	discoenable[147] = 1
 	$npcGo[147] = '<a href="exec:numnpc = 147 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
 	$npcSelfie[147] = '<a href="exec:numnpc = 147 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
 
@@ -3198,6 +3227,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[148] = 0
 	grupTipe[148] = 1
 	selfieenable[148] = 1
+	schoolenable[148] = 1
+	discoenable[148] = 1
 	$npcGo[148] = '<a href="exec:numnpc = 148 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
 	$npcSelfie[148] = '<a href="exec:numnpc = 148 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
 
@@ -3206,6 +3237,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[149] = 0
 	grupTipe[149] = 2
 	selfieenable[149] = 1
+	schoolenable[149] = 1
+	discoenable[149] = 1
 	$npcGo[149] = '<a href="exec:numnpc = 149 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
 	$npcSelfie[149] = '<a href="exec:numnpc = 149 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
 
@@ -3214,6 +3247,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[150] = 0
 	grupTipe[150] = 2
 	selfieenable[150] = 1
+	schoolenable[150] = 1
+	discoenable[150] = 1
 	$npcGo[150] = '<a href="exec:numnpc = 150 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
 	$npcSelfie[150] = '<a href="exec:numnpc = 150 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
 
@@ -3222,6 +3257,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[151] = 0
 	grupTipe[151] = 3
 	selfieenable[151] = 1
+	schoolenable[151] = 1
+	discoenable[151] = 1
 	$npcGo[151] = '<a href="exec:numnpc = 151 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
 	$npcSelfie[151] = '<a href="exec:numnpc = 151 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
 
@@ -3230,6 +3267,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[152] = 0
 	grupTipe[152] = 3
 	selfieenable[152] = 1
+	schoolenable[152] = 1
+	discoenable[152] = 1
 	$npcGo[152] = '<a href="exec:numnpc = 152 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
 	$npcSelfie[152] = '<a href="exec:numnpc = 152 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
 
@@ -3238,6 +3277,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[153] = 0
 	grupTipe[153] = 3
 	selfieenable[153] = 1
+	schoolenable[153] = 1
+	discoenable[153] = 1
 	$npcGo[153] = '<a href="exec:numnpc = 153 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
 	$npcSelfie[153] = '<a href="exec:numnpc = 153 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
 
@@ -3246,6 +3287,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[154] = 0
 	grupTipe[154] = 4
 	selfieenable[154] = 1
+	schoolenable[154] = 1
+	discoenable[154] = 1
 	$npcGo[154] = '<a href="exec:numnpc = 154 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
 	$npcSelfie[154] = '<a href="exec:numnpc = 154 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
 
@@ -3254,6 +3297,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[155] = 0
 	grupTipe[155] = 4
 	selfieenable[155] = 1
+	schoolenable[155] = 1
+	discoenable[155] = 1
 	$npcGo[155] = '<a href="exec:numnpc = 155 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
 	$npcSelfie[155] = '<a href="exec:numnpc = 155 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
 
@@ -3262,6 +3307,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[156] = 0
 	grupTipe[156] = 4
 	selfieenable[156] = 1
+	schoolenable[156] = 1
+	discoenable[156] = 1
 	$npcGo[156] = '<a href="exec:numnpc = 156 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
 	$npcSelfie[156] = '<a href="exec:numnpc = 156 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
 
@@ -3270,6 +3317,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[157] = 0
 	grupTipe[157] = 4
 	selfieenable[157] = 1
+	schoolenable[157] = 1
+	discoenable[157] = 1
 	$npcGo[157] = '<a href="exec:numnpc = 157 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
 	$npcSelfie[157] = '<a href="exec:numnpc = 157 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
 
@@ -3278,6 +3327,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[158] = 0
 	grupTipe[158] = 4
 	selfieenable[158] = 1
+	schoolenable[158] = 1
+	discoenable[158] = 1
 	$npcGo[158] = '<a href="exec:numnpc = 158 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
 	$npcSelfie[158] = '<a href="exec:numnpc = 158 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
 
@@ -3286,6 +3337,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[159] = 0
 	grupTipe[159] = 5
 	selfieenable[159] = 1
+	schoolenable[159] = 1
+	discoenable[159] = 1
 	$npcGo[159] = '<a href="exec:numnpc = 159 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
 	$npcSelfie[159] = '<a href="exec:numnpc = 159 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
 
@@ -3294,6 +3347,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[165] = 0
 	grupTipe[165] = 2
 	selfieenable[165] = 1
+	schoolenable[165] = 1
+	discoenable[165] = 1
 	$npcGo[165] = '<a href="exec:numnpc = 165 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 	$npcSelfie[165] = '<a href="exec:numnpc = 165 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 	
@@ -3302,6 +3357,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[189] = 0
 	grupTipe[189] = 4
 	selfieenable[189] = 1
+	schoolenable[189] = 1
+	discoenable[189] = 1
 	$npcGo[189] = '<a href="exec:numnpc = 189 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
 	$npcSelfie[189] = '<a href="exec:numnpc = 189 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
 
@@ -3313,6 +3370,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[12] = 1
 	grupTipe[12] = 3
 	selfieenable[12] = 1
+	schoolenable[12] = 1
+	discoenable[12] = 1
 	$npcGo[12] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
 	$npcSelfie[12] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
 
@@ -3321,6 +3380,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[13] = 1
 	grupTipe[13] = 2
 	selfieenable[13] = 1
+	schoolenable[13] = 1
+	discoenable[13] = 1
 	$npcGo[13] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
 	$npcSelfie[13] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
 
@@ -3329,6 +3390,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[14] = 1
 	grupTipe[14] = 1
 	selfieenable[14] = 1
+	schoolenable[14] = 1
+	discoenable[14] = 1
 	$npcGo[14] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
 	$npcSelfie[14] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
 
@@ -3337,6 +3400,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[15] = 1
 	grupTipe[15] = 1
 	selfieenable[15] = 1
+	schoolenable[15] = 1
+	discoenable[15] = 1
 	$npcGo[15] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
 	$npcSelfie[15] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
 
@@ -3345,6 +3410,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[16] = 1
 	grupTipe[16] = 3
 	selfieenable[16] = 1
+	schoolenable[16] = 1
+	discoenable[16] = 1
 	$npcGo[16] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
 	$npcSelfie[16] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
 
@@ -3353,6 +3420,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[17] = 1
 	grupTipe[17] = 1
 	selfieenable[17] = 1
+	schoolenable[17] = 1
+	discoenable[17] = 1
 	$npcGo[17] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
 	$npcSelfie[17] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
 
@@ -3360,11 +3429,13 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[18] = 'A18'
 	npcPol[18] = 1
 	if zverSlutQW >= 2:
-		grupTipe[18] = 0
+		grupTipe[18] = 5
 	else
 		grupTipe[18] = 2
 	end
 	selfieenable[18] = 1
+	schoolenable[18] = 1
+	discoenable[18] = 1
 	$npcGo[18] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
 	$npcSelfie[18] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
 
@@ -3373,6 +3444,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[19] = 1
 	grupTipe[19] = 2
 	selfieenable[19] = 1
+	schoolenable[19] = 1
+	discoenable[19] = 1
 	$npcGo[19] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
 	$npcSelfie[19] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
 
@@ -3381,6 +3454,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[20] = 1
 	grupTipe[20] = 4
 	selfieenable[20] = 1
+	schoolenable[20] = 1
+	discoenable[20] = 1
 	$npcGo[20] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
 	$npcSelfie[20] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
 
@@ -3389,6 +3464,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[21] = 1
 	grupTipe[21] = 4
 	selfieenable[21] = 1
+	schoolenable[21] = 1
+	discoenable[21] = 1
 	$npcGo[21] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
 	$npcSelfie[21] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
 
@@ -3397,13 +3474,18 @@ if $ARGS[0] = 'npc_data':
 	npcPol[22] = 1
 	grupTipe[22] = 2
 	selfieenable[22] = 1
+	schoolenable[22] = 1
+	discoenable[22] = 1
 	$npcGo[22] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
 	$npcSelfie[22] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
 
 !!Albina Barlovskaya
 	$school_static_num[23] = 'A23'
 	npcPol[23] = 1
+	selfieenable[23] = 1
 	grupTipe[23] = 1
+	schoolenable[23] = 1
+	discoenable[23] = 1
 	$npcGo[23] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
 	$npcSelfie[23] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
 
@@ -3412,6 +3494,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[24] = 1
 	grupTipe[24] = 4
 	selfieenable[24] = 1
+	schoolenable[24] = 1
+	discoenable[24] = 1
 	$npcGo[24] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
 	$npcSelfie[24] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
 
@@ -3424,6 +3508,8 @@ if $ARGS[0] = 'npc_data':
 		grupTipe[25] = 1
 	end
 	selfieenable[25] = 1
+	schoolenable[25] = 1
+	discoenable[25] = 1
 	$npcGo[25] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
 	$npcSelfie[25] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
 
@@ -3432,6 +3518,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[139] = 1
 	grupTipe[139] = 1
 	selfieenable[139] = 1
+	schoolenable[139] = 1
+	discoenable[139] = 1
 	$npcGo[139] = '<a href="exec:numnpc = 139 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
 	$npcSelfie[139] = '<a href="exec:numnpc = 139 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
 
@@ -3440,6 +3528,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[140] = 1
 	grupTipe[140] = 1
 	selfieenable[140] = 1
+	schoolenable[140] = 1
+	discoenable[140] = 1
 	$npcGo[140] = '<a href="exec:numnpc = 140 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
 	$npcSelfie[140] = '<a href="exec:numnpc = 140 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
 
@@ -3448,6 +3538,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[141] = 1
 	grupTipe[141] = 2
 	selfieenable[141] = 1
+	schoolenable[141] = 1
+	discoenable[141] = 1
 	$npcGo[141] = '<a href="exec:numnpc = 141 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
 	$npcSelfie[141] = '<a href="exec:numnpc = 141 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
 
@@ -3456,6 +3548,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[142] = 1
 	grupTipe[142] = 3
 	selfieenable[142] = 1
+	schoolenable[142] = 1
+	discoenable[142] = 1
 	$npcGo[142] = '<a href="exec:numnpc = 142 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
 	$npcSelfie[142] = '<a href="exec:numnpc = 142 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
 	
@@ -3464,6 +3558,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[143] = 1
 	grupTipe[143] = 4
 	selfieenable[143] = 1
+	schoolenable[143] = 1
+	discoenable[143] = 1
 	$npcGo[143] = '<a href="exec:numnpc = 143 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
 	$npcSelfie[143] = '<a href="exec:numnpc = 143 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
 
@@ -3472,6 +3568,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[144] = 1
 	grupTipe[144] = 4
 	selfieenable[144] = 1
+	schoolenable[144] = 1
+	discoenable[144] = 1
 	$npcGo[144] = '<a href="exec:numnpc = 144 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
 	$npcSelfie[144] = '<a href="exec:numnpc = 144 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
 
@@ -3480,18 +3578,23 @@ if $ARGS[0] = 'npc_data':
 	npcPol[145] = 1
 	grupTipe[145] = 4
 	selfieenable[145] = 1
+	schoolenable[145] = 1
+	discoenable[145] = 1
 	$npcGo[145] = '<a href="exec:numnpc = 145 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	$npcSelfie[145] = '<a href="exec:numnpc = 145 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	
 !! Aleksandra Kirilenko
 	$school_static_num[231] = 'A231'
 	$npcPol[231] = 1
+
 	if npc_QW['A231'] = -2:
 		grupTipe[231] = 5
 	else
 		grupTipe[231] = 3
 	end
-	selfieenable[231] = 1
+	selfieenable[231] = 0
+	schoolenable[231] = 1
+	discoenable[231] = 0
 	$npcGo[231] = '<a href="exec:numnpc = 231 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 	$npcSelfie[231] = '<a href="exec:numnpc = 231 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 
@@ -3503,6 +3606,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[26] = 0
 	grupTipe[26] = 6
 	selfieenable[26] = 1
+	schoolenable[26] = 1
+	discoenable[26] = 0
 	$npcGo[26] = '<a href="exec:numnpc = 26 & gt ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
 	$npcSelfie[26] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
 
@@ -3511,6 +3616,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[69] = 0
 	grupTipe[69] = 6
 	selfieenable[69] = 1
+	schoolenable[69] = 1
+	discoenable[69] = 1
 	$npcGo[69] = '<a href="exec:numnpc = 69 & gt ''Snpc''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
 	$npcSelfie[69] = '<a href="exec:numnpc = 69 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
 
@@ -3519,6 +3626,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[128] = 0
 	grupTipe[128] = 6
 	selfieenable[128] = 1
+	schoolenable[128] = 1
+	discoenable[128] = 0
 	$npcGo[128] = '<a href="exec:numnpc = 128 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 	$npcSelfie[128] = '<a href="exec:numnpc = 128 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 
@@ -3527,6 +3636,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[129] = 0
 	grupTipe[129] = 6
 	selfieenable[129] = 1
+	schoolenable[129] = 1
+	discoenable[129] = 0
 	$npcGo[129] = '<a href="exec:numnpc = 129 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
 	$npcSelfie[129] = '<a href="exec:numnpc = 129 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
 	
@@ -3535,6 +3646,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[130] = 0
 	grupTipe[130] = 6
 	selfieenable[130] = 1
+	schoolenable[130] = 1
+	discoenable[130] = 0
 	$npcGo[130] = '<a href="exec:numnpc = 130 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 	$npcSelfie[130] = '<a href="exec:numnpc = 130 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 
@@ -3543,6 +3656,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[131] = 0
 	grupTipe[131] = 6
 	selfieenable[131] = 1
+	schoolenable[131] = 1
+	discoenable[131] = 0
 	$npcGo[131] = '<a href="exec:numnpc = 131 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
 	$npcSelfie[131] = '<a href="exec:numnpc = 131 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
 
@@ -3551,6 +3666,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[132] = 0
 	grupTipe[132] = 6
 	selfieenable[132] = 1
+	schoolenable[132] = 1
+	discoenable[132] = 0
 	$npcGo[132] = '<a href="exec:numnpc = 132 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 	$npcSelfie[132] = '<a href="exec:numnpc = 132 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 
@@ -3559,6 +3676,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[133] = 0
 	grupTipe[133] = 6
 	selfieenable[133] = 1
+	schoolenable[133] = 1
+	discoenable[133] = 0
 	$npcGo[133] = '<a href="exec:numnpc = 133 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 	$npcSelfie[133] = '<a href="exec:numnpc = 133 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 	
@@ -3567,6 +3686,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[134] = 1
 	grupTipe[134] = 6
 	selfieenable[134] = 1
+	schoolenable[134] = 1
+	discoenable[134] = 0
 	$npcGo[134] = '<a href="exec:numnpc = 134 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 	$npcSelfie[134] = '<a href="exec:numnpc = 134 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 
@@ -3575,6 +3696,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[135] = 1
 	grupTipe[135] = 6
 	selfieenable[135] = 1
+	schoolenable[135] = 1
+	discoenable[135] = 0
 	$npcGo[135] = '<a href="exec:numnpc = 135 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 	$npcSelfie[135] = '<a href="exec:numnpc = 135 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 
@@ -3583,6 +3706,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[136] = 1
 	grupTipe[136] = 6
 	selfieenable[136] = 1
+	schoolenable[136] = 1
+	discoenable[136] = 0
 	$npcGo[136] = '<a href="exec:numnpc = 136 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 	$npcSelfie[136] = '<a href="exec:numnpc = 136 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 
@@ -3591,6 +3716,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[137] = 1
 	grupTipe[137] = 6
 	selfieenable[137] = 1
+	schoolenable[137] = 1
+	discoenable[137] = 0
 	$npcGo[137] = '<a href="exec:numnpc = 137 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 	$npcSelfie[137] = '<a href="exec:numnpc = 137 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 
@@ -3599,6 +3726,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[138] = 1
 	grupTipe[138] = 6
 	selfieenable[138] = 1
+	schoolenable[137] = 1
+	discoenable[137] = 0
 	$npcGo[138] = '<a href="exec:numnpc = 138 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 	$npcSelfie[138] = '<a href="exec:numnpc = 138 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 
@@ -3610,6 +3739,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[28] = 0
 	grupTipe[28] = 7
 	selfieenable[28] = 1
+	schoolenable[28] = 0
+	discoenable[28] = 0
 	$npcGo[28] = '<a href="exec:numnpc = 28 & gt ''Snpc''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
 	$npcSelfie[28] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
 	
@@ -3618,6 +3749,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[29] = 1
 	grupTipe[29] = 7
 	selfieenable[29] = 1
+	schoolenable[29] = 0
+	discoenable[29] = 0
 	$npcGo[29] = '<a href="exec:numnpc = 29 & gt ''Snpc''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
 	$npcSelfie[29] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
 	
@@ -3626,6 +3759,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[33] = 1
 	grupTipe[33] = 7
 	selfieenable[33] = 1
+	schoolenable[33] = 0
+	discoenable[33] = 0
 	$npcGo[33] = '<a href="exec:numnpc = 33 & gt ''Snpc''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
 	$npcSelfie[33] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
 	
@@ -3634,6 +3769,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[34] = 0
 	grupTipe[34] = 7
 	selfieenable[34] = 1
+	schoolenable[34] = 0
+	discoenable[34] = 0
 	$npcGo[34] = '<a href="exec:numnpc = 34 & gt ''Snpc''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
 	$npcSelfie[34] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
 
@@ -3642,6 +3779,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[35] = 0
 	grupTipe[35] = 7
 	selfieenable[35] = 1
+	schoolenable[35] = 0
+	discoenable[35] = 0
 	$npcGo[35] = '<a href="exec:numnpc = 35 & gt ''Snpc''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
 	$npcSelfie[35] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
 
@@ -3650,6 +3789,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[54] = 0
 	grupTipe[54] = 7
 	selfieenable[54] = 1
+	schoolenable[54] = 0
+	discoenable[54] = 0
 	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A54'']>> <<$npc_lastname[''A54'']>></a>'
 	$npcSelfie[54] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_nickname[''A54'']>>'
 	
@@ -3661,6 +3802,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[56] = 0
 	grupTipe[56] = 8
 	selfieenable[56] = 1
+	schoolenable[56] = 0
+	discoenable[56] = 0
 	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
 	$npcSelfie[56] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
 
@@ -3669,6 +3812,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[57] = 0
 	grupTipe[57] = 8
 	selfieenable[57] = 1
+	schoolenable[57] = 0
+	discoenable[57] = 0
 	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A57'']>> <<$npc_lastname[''A57'']>></a>'
 	$npcSelfie[57] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A57'']>>'
 
@@ -3677,6 +3822,8 @@ if $ARGS[0] = 'npc_data':
 	npcPol[112] = 0
 	grupTipe[112] = 8
 	selfieenable[112] = 1
+	schoolenable[112] = 0
+	discoenable[112] = 0
 	$npcGo[112] = '<a href="exec:numnpc = 112 & gt ''Snpc''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
 	$npcSelfie[112] = '<a href="exec:numnpc = 112 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
 

+ 27 - 2
locations/hunter_ambient.qsrc

@@ -238,8 +238,32 @@ if $ARGS[0] = 'yard_convo':
 end
 
 !Behavior events
+if $ARGS[0] = 'schedule':
+
+    hunters_breakfast = 0
+    hunters_off = 0
+    hunters_lunch = 0
+    hunters_evening = 0
+    hunters_drink = 0
+    hunters_sleep = 0
+
+    if hour = 5: 
+        hunters_breakfast = 0
+    elseif (hour >=6 and hour < 12) or (hour >= 14 and hour < 18):
+        hunters_off = 1
+    elseif hour >=12 and hour < 14:
+        hunters_lunch = 1
+    elseif hour >= 18 and hour < 20:
+        hunters_evening = 1
+    elseif hour >= 20 and hour < 23:
+        hunters_drink = 1
+    else
+        hunters_sleep = 1    
+    end
+end    
+
 if $ARGS[0] = 'bring_food':
-    if hour >= 9 and hour < 17:
+    if (hunters_lunch = 1 or hunters_evening = 1) and rand(1,10) = 1:
         !TODO: Show the name of the hunter bringing the food. Also add variety besides rabbit
         cla & *clr
         '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/bunny_butcher.jpg"></center>'
@@ -248,6 +272,7 @@ if $ARGS[0] = 'bring_food':
 
         act 'Further': gt 'swamp_yard'
     end
-end    
+end
+
 
 --- hunter_ambient ---------------------------------

+ 376 - 0
locations/hunter_favors.qsrc

@@ -412,4 +412,380 @@ if $ARGS[0] = 'creekside_gangbang_request':
     end
 end
 
+if $ARGS[0] = 'yard_bondage':
+	if $ARGS[1] = '':
+		yard_bound_temprand = rand(1,9)
+
+		if hour >= 22 or hour < 5:
+			gs 'arousal', 'end'
+
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
+			'Finally with the hour getting so late, Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel blood rushing back to your hands.'
+			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy'
+
+			act 'Further': gt 'swamp_yard'
+		end	
+
+		cla & *clr
+
+		hunter_sexual_comfort  += 1
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors4.jpg"></center>'
+		'You are bound completely naked to some trees by the yard. Just the thought of being so helpless and exposed makes you feel butterflies in your stomach'
+	    'Anyone could do anything they wanted with your body right now. You are especially aware of the nakedness of your most intimate areas, and how they are available for the hunters to do anything they might want.'
+
+		gs 'arousal', 'flash', 5, 'bound', 'exhibitionism', 'sub'
+		gs 'arousal', 'end'
+
+		minut += 5
+		gs 'stat'
+
+		hunter_selector_temprand = rand(1,3)
+		if hunter_selector_temprand = 1:
+			gs 'boyStat', 'A172'
+		elseif hunter_selector_temprand = 2:
+			gs 'boyStat', 'A173'
+		elseif hunter_selector_temprand = 3:
+			gs 'boyStat', 'A174'
+		end	
+
+		if yard_bound_temprand = 4:
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_bj'
+		elseif yard_bound_temprand = 5:
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_fuck'
+		elseif yard_bound_temprand = 6:
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'clamp_fuck'
+		elseif yard_bound_temprand = 8:
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'unbound_fuck'
+		!elseif yard_bound_temprand = 9:
+			!act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_gangbang'
+		!elseif yard_bound_temprand = 10:
+			!act 'Further': gs 'hunter_favors', 'yard_bondage', 'bound_gangbang'	
+		else
+			act 'Wait': gt 'hunter_favors', 'yard_bondage'						
+		end	
+	end
+
+	if $ARGS[1] = 'lost_bet':
+		*clr & cla
+
+		hunter_collective_opinion -= 20
+        hunter_sexual_comfort += 40
+		gs 'arousal', 'flash', 15, 'bound', 'exhibitionism', 'humiliation'
+		gs 'arousal', 'end'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors2.jpg"></center>'
+		'You let Andrei bind you right by the yard. After he is done, he leaves you hanging there to take care of something'
+		'You are completely helpless and feel your nipples start to harden as you feel the breeze on your bare skin.'
+
+		act 'Wait for him to come back': gt 'hunter_favors', 'yard_bondage'
+	end	
+	
+	!TODO: Add variety per hunter as opposed to the same event for all
+	if $ARGS[1] = 'passing_bj':
+		cla & *clr 
+		hunter_sexual_comfort += 6
+		hunter_collective_opinion -= 3
+		gs 'arousal', 'bj', 10, 'sub', 'bound', 'deepthroat'
+		gs 'arousal', 'end'
+			
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth1.jpg"></center>'
+		'You notice <<$boydesc>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
+		'He does not waste too much time unzipping his cock and pushing it on your face. You comply and start sucking his dick.'
+		'After a minute grabs your head and starts fucking your mouth. You struggle between trying to breathe and trying not to puke as his cock rams in and out of your throat'
+			
+		act 'Try and match his rythm':
+				cla & *clr
+				*nl
+				hunter_sexual_comfort += 4
+				hunter_collective_opinion -= 2
+				gs 'arousal', 'bj', 5, 'sub', 'bound', 'deepthroat'
+				gs 'arousal', 'end'
+				spafinloc = 12
+				gs 'cum_manage'
+				swallow += 1
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth2.jpg"></center>'
+				'You decide to make it some more fun for for him. You start bobbing your head in rhythm with his pumping.'
+				'Whenever he is all the way down your throat, you swallow to massage his cock.'
+
+				gs 'dinsex', 'dinrandbj'
+				*nl 
+				'Your efforts start paying off pretty quickly as he grabs your head and starts pumping even more quickly before he buries his cock all the way in'
+
+				gs 'dinsex', 'dinrandswallow'
+				'He gives you a pat on the head and says "Now that''s a good girl" before tying you upright and walking off, satisfied and drained.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+		act 'Let him have his way':
+				cla & *clr
+				*nl
+				gs 'arousal', 'bj', 10, 'rough', 'bound', 'deepthroat'
+				gs 'arousal', 'end'
+				spafinloc = 11
+				gs 'cum_manage'
+				spafinloc = 15
+				gs 'cum_manage'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth3.jpg"></center>'
+				'You decide if you relax your throat and face it will be easier not to puke all over his dick.'
+				'He strokes your hair as he keeps furiously ramming his cock up and down your throat, fucking your face like as if it was a sex toy.' 
+
+				gs 'dinsex', 'dinrandbj'
+				*nl 
+				'After a few minutes he pulls out of your mouth and jerks off to your face, splattering your face and chest with his spunk.'
+				'As you blink the cum off your eyes, he zips up and ties you back upright before walking away without saying anything else.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+	end	
+	
+	if $ARGS[1] = 'passing_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 10
+		hunter_collective_opinion -= 5
+			
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked2.jpg"></center>'
+		'You notice <<$boydesc>> walking towards you. Without saying a word, he unzips and bends you over.'
+		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boydesc>>''s cock fills your pussy'
+		'After letting you settle in to the sensation for a second he slowly starts pumping your pussy. In a minute you are screaming and moaning as he picks his pace up.'
+			
+		gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound'
+
+		act 'Start pumping your hips to match him':
+			cla & *clr
+			*nl
+			hunter_sexual_comfort += 5
+			hunter_collective_opinion -= 2
+
+			gs 'arousal', 'vaginal', 5, 'sub', 'bound'
+			gs 'arousal', 'end'
+			spafinloc = 0
+			pose = 3
+			gs 'cum_manage'
+			gs 'stat'
+
+			'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
+			'You cannot get enough of the sensation of <<$boydesc>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
+			
+			*nl
+			'<<$boydesc>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
+			gs 'dinsex', 'sexcum'
+			'After catching his breath, <<$boydesc>> gives your ass a fondle before walking away, leaving you hanging.'
+
+			act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+		act 'Let him have his way':
+				cla & *clr
+				*nl
+				gs 'arousal', 'vaginal', 10, 'rough', 'bound'
+				gs 'arousal', 'end'
+				spafinloc = 1
+				gs 'cum_manage'
+				spafinloc = 4
+				gs 'cum_manage'
+				spafinloc = 9
+				gs 'cum_manage'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked1.jpg"></center>'
+				'You are pretty much overwhelmed by <<$boydesc>> pumping your pussy while you are bound helpless and naked like this.'
+				'You decide to give in and enjoy the sensation of being casually fucked like a blow-up doll.'
+				*nl
+				'He roughly grabs your ass to brace himself as he picks his pace even further, pounding your pussy with near fury.'
+				'Sounds of his hips rhythmically slamming against your ass fills your surrondings, mixed with the lewd smacking sounds of his cock pumping in your pussy and your loud moans and screams' 
+
+				*nl
+				'Just as you start feeling his cock throbbing in your pussy, he pulls out and blows his load all over your ass and pussy.'
+				'Without saying anything, <<$boydesc>> zips up and walks away, leaving you with cum running down your legs.'
+
+				act 'Further': gt 'hunter_favors', 'yard_bondage'
+		end
+	end	
+	
+	if $ARGS[1] = 'clamp_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 15
+		hunter_collective_opinion -= 10
+		gs 'boyStat', 'A172'
+		gs 'pain', 6, 'pinch', 'nipples'
+		gs 'pain', 3, 'pinch', 'breasts'
+
+		gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps3.jpg"></center>'
+		'You are so proccupied with thinking how you are tied up to some tree completely naked and exposed, you do not hear Andrei approaching from behind.'
+		'Not missing the opportunity, he yanks you by the nipple, making you yelp loudly.'
+		'"Hey now, don''t fall asleep just yet. I have something special for you." he says before showing you a piece of leather strap and a clamp with a weight attached.'
+		'"Hope you are into a bit of fun. Or, at least we will find out." he says. You do not object, having already agreed to ''anything'''
+		
+		act 'Further':
+			cla & *clr
+			gs 'pain', 3, 'spank', 'nipples'
+			gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+			gs 'arousal', 'end'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps2.jpg"></center>'
+			'Andrei does not lose time starting to pay some special attention to your nipples.'
+			'The leather strip really stings and you cannot help but yelp with each hit. But you somehow actually enjoy the sensation.'
+
+			act 'Further':
+				cla & *clr
+				gs 'pain', 10, 'pinch', 'nipples'
+				gs 'arousal', 'breasts', 10, 'rough', 'masochism', 'sub'
+				minut -= 5
+				gs 'arousal', 'end'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
+				'Satisfied with the ''warm-up'', Andrei picks up the clamps and attaches them to your nipples'
+				'The mix of pain and pleasure from the clamps biting on your nipples is almost unbearable.'
+				'It really hurts and you want to shake them off, but yet you feel your pussy throbbing and getting wet the more you think about the pain.'
+				*nl
+				'"Please, I can''t take it anymore!" you plead.'
+				'"''Please'' what, little princess?" Andrei asks'
+				
+				act 'Seriousy, please let me go!':
+					cla & *clr
+					hunter_collective_opinion += 10
+					hunter_sexual_comfort -= 15
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
+					'"Well, alright, you are no fun" says Andrei before releasing you from your bonds.'
+					'You rub your sore breasts for a few seconds before shooing away Andrei staring at you giving him a last show.'
+					act 'Further': gt 'swamp_yard'
+				end
+				act 'Please fuck me!':
+					cla & *clr
+					hunter_collective_opinion -= 5
+					hunter_sexual_comfort += 25
+
+					gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound', 'masochism', 'humiliation'
+					gs 'arousal', 'vaginal', 5, 'sub', 'bound', 'masochism', 'humiliation'
+				
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_clamps_fuck.jpg"></center>'
+					'"You really like this don''t you now." says Andrei before roughly penetrating you.'
+					'You let out a loud moan from the relief of finally having your aching pussy filled. It does not take Andrei long to cum with you pumping your hips and doing most of the fucking,'
+					
+					gs 'arousal', 'end'
+					spafinloc = 0
+					pose = 3
+					gs 'cum_manage'
+					gs 'stat'
+
+					gs 'dinsex', 'sexcum'
+					
+					*nl
+					'After catching his breath, Andrei releases you from your bonds. "We should do this again" he says, before walking away.'
+					act 'Further': gt 'swamp_yard'
+				end
+			end		
+		end	
+	end	
+
+	if $ARGS[1] = 'unbound_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 15
+		hunter_collective_opinion += 15
+
+		gs 'boyStat', 'A173'
+
+		gs 'arousal', 'foreplay', 5, 'sub', 'exhibitionism'
+		gs 'arousal', 'kiss', 5, 'sub', 'exhibitionism'
+		gs 'arousal', 'end'
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked2.jpg"></center>'
+		'You do not notice Igor approaching you from behind before he starts stroking your body as he rubs his cock over your pussy lips.'
+		'"You are driving me crazy, <<$pcs_nickname>>" he says. "I cannot help it any longer, I need to have you."'
+		'You turn your head to give him a kiss as he undoes the last of the ropes'
+
+		act 'Further':
+			cla & *clr
+			gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
+			'Igor settles on the ground and you settle on his crotch, mounting him.'
+			'You start bouncing up and down, gasping from the feeling of his cock pumping inside you'
+			gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism'
+
+			act 'Further':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
+				'After some minutes, Igor pushes you on your hands and starts fucking you from behind.'
+				'He really picks up the pace as you start moaning and screaming like a wanton whore, getting fucked like that right out in the open.'
+
+				gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism', 'rough', 'humiliation'
+				spafinloc = 4
+				gs 'cum_manage'
+				spafinloc = 8
+				gs 'cum_manage'
+				gs 'stat'
+
+				*nl 'After a few more minutes of railing your pussy, you feel Ifor pulling out and cumming all over your ass and back'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck1.jpg"></center>'
+
+				act 'Further':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/unbound_nude.jpg"></center>'
+					'After a couple of seconds catching your breath, you both get up. Before you walk away, Igor asks:'
+					'"Sveta, can I ask you for a favor? All of us have rather gotten used to seeing you in the nude."'
+					'"So," he says "Can you just walk around like that all the time?"'
+					'"You mean, never wear clothes around and stay naked the whole time?" you ask, surprised'
+					'"Yes, at least while it is only us around." he says. "So what do you say?"'
+
+					act 'Agree':
+						cla
+						*nl
+						hunter_collective_opinion += 20
+						hunter_sexual_comfort += 10
+						forced_naked_day = 999999999999999
+						gs 'stat'
+
+						'"Well," you respond. "At this point we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
+						'"Thanks <<$pcs_nickname>>" he says, before walking away'
+						act 'Further': gt 'swamp_yard'
+					end
+					act 'Refuse':
+						cla
+						*nl
+						hunter_collective_opinion -= 5
+						hunter_sexual_comfort += 15
+						gs 'stat'
+
+						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next, you just randomly fuck me whenever?"'
+						'"You are not exactly all pure and innocent, <<$pcs_nickname>>" he says. "I think you are just being a bitchy cocktease" and walks away'
+						act 'Further': gt 'swamp_yard'
+					end
+				end			
+			end
+		end
+	end
+
+	!if $ARGS[1] = 'unbound_gangbang':
+	!end
+
+	!if $ARGS[1] = 'bound_gangbang':
+	!end
+
+		
+		!gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
+		!gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'group'
+		!gs 'arousal', 'end'
+		!gs 'stat'
+			
+		!gs 'dinsex','vaginal_sex',10,'sub'
+
+		!gs 'arousal', 'bj', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'hj', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'vaginal', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'anal', 240, 'sub', 'gangbang', 'humiliation' 
+		!minut -= 720
+end	
+
 --- hunter_favors ---------------------------------

+ 244 - 173
locations/hunter_interactions.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'drink_with_hunters':
 			*nl
 			'You take a shot of vodka. The men laugh at the funny face you''re making after the shot.'
 
-			act 'Continue': gs 'swamphouse', 'meal_table'
+			act 'Continue': gs 'swamp_yard', 'fireside'
 		end
 		act 'Drink beer':
 			*clr & cla
@@ -267,7 +267,7 @@ if $ARGS[0] = 'drink_with_hunters':
 			*nl
 			'You take a bottle of bear, open it and start drinking it.'
 
-			act 'Continue': gs 'swamphouse', 'meal_table'
+			act 'Continue': gs 'swamp_yard', 'fireside'
 		end
 end
 
@@ -275,26 +275,129 @@ if $ARGS[0] = 'chat_with_hunters':
     *clr & cla
     minut += rand (30,90)
     pcs_mood += rand(10,20)
-    if huntersAndreiQw < 10:huntersAndreiQw += 1
-    if huntersIgorQw < 10:huntersIgorQw += 1
-    if huntersSergeiQw < 10:huntersSergeiQw += 1
+    
+    hunter_collective_opinion += 2
     gs 'stat'
 
-    if CloSkirtShortness > 0 and $pantyworntype = 'none':
-        *clr & cla
-        if huntersKnowSlut > 0:hunterslut += 1
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'
-        'You are sitting in front of the men, not wearing any panties, so the stories they tell get jumbled and most of the time is spent on throwing sideways glances at your naked vagina.'
-        gs 'arousal', 5, 'flashlite'
-        gs 'stat'
-    else
-        !TODO: Add more interactivity to the conversations. Make it point ot another dialogue event blog with new content even
+    act 'Finish chatting': gt 'swamp_yard'
+
+    if $ARGS[1] = '':
+        if boy_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
+            gs 'hunter_interactions', 'chat_with_hunters', 'boy_talk'
+        elseif boy_talk = 1 and virginity_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
+            gs 'hunter_interactions', 'chat_with_hunters', 'virginity_talk'
+        elseif CloSkirtShortness > 0 and $pantyworntype = 'none' and rand(1,5) = 1:
+            gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
+        elseif $clothingworntype = 'nude' and rand(1,2) = 1:
+            gs 'hunter_interactions', 'chat_with_hunters', 'nude'
+        else
+            gs 'hunter_interactions', 'chat_with_hunters', 'generic'
+        end
+
+    end
+
+    if $ARGS[1] = 'generic':
         '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
         'You enthusiastically listen to the their hunting stories and even share some of your stories.'
         gs 'hunter_ambient', 'generic_convo'
         'You get so caught up in the conversation, you don''t even notice how fast the time flies by.'
+    end    
+
+    if $ARGS[1] = 'pantiless_flash':
+        *clr
+        hunter_sexual_comfort += 5
+        hunter_collective_opinion -= 4
+    
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'
+        'You are sitting in front of the men, not wearing any panties, so the stories you tell are mostly ignored by the men throwing not-so-subtle glances at your exposed pussy.'
+        gs 'arousal', 5, 'flashlite'
+        gs 'stat'
+    end  
+    
+    if $ARGS[1] = 'boy_talk':
+        *clr
+        
+        boy_talk = 1
+        
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+        '"So, Sveta, anyone special in your life?" Igor asks, slurring noticably'
+        
+        act 'Yes, actually':
+            cla 
+            act 'Finish chatting': gt 'swamp_yard'
+            hunter_sexual_comfort -= 5
+            hunter_collective_opinion += 3
+            '"Yeah I have been seeing someone for a while", you answer'
+            if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
+                '"Now that''s a lucky guy heh." says Andrei. "Let us know if he dares upset you though, we  will show him"'
+            elseif hunter_sexual_comfort > 50:
+                cla
+                '"Bet he is not as fun as us" says Andrei'
+                '"Can he fuck you in all your holes at the same time like we can?" asks Sergey before the hunters get up and approach you'
+                if hunter_collective_opinion > 40 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                act 'You freeze in place, anticipating what is coming': gt 'hunter_interactions', 'fireside_gangbang'    
+            end    
+        end    
+        act 'No, not really': 
+            cla
+            act 'Finish chatting': gt 'swamp_yard'
+            hunter_sexual_comfort += 1
+            hunter_collective_opinion += 1
+            '"No, I do not really have someone. At least no one special.", you answer'
+            if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
+                '"How come?" says Igor. "Those... uh... boys in your class musssss... be stipud" drunkenly slurs Igor'
+            elseif hunter_sexual_comfort > 45 and hunter_collective_opinion > 30:
+                cla
+                '"Well guess it is better that way. You do not have someone to think about while having some fun" says Andrei'
+                '"Talking about fun, why don''t you get up and give us a little show" says Sergey before taking out his radio and putting on some music.'
+                gt 'hunter_interactions', 'dance_show'    
+            end 
+        end
+    end
+    
+    if $ARGS[1] = 'virginity_talk':
+        *clr
+
+        virginity_talk = 1
+
+        !TODO: Add event branch with no panties and short skirt or nude
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+        '"So, Sveta, have you ever done it with a boy" Andrei asks, grinning mischievously.'
+        act '...no':
+            cla 
+            hunter_sexual_comfort -= 5
+            hunter_collective_opinion += 1
+            '"Huh...what? No I have not!" you answer, blushing to your ears'
+            if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
+                '"Stop embarrassing the little lady" says Sergey. "She is our guest, we have to be polite"'
+            elseif hunter_sexual_comfort > 50:
+                '"Wow so you really are a full on tease." says Igor'
+                '"Since you are such an innocent young lady why don''t you give us a little show without clothes blocking your innocence'
+                !TODO: Implement event
+                !if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                !act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
+                act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'fireside'    
+            end    
+        end    
+        act 'Uhh... kinda...': 
+            cla
+            hunter_sexual_comfort += 5
+            'You blurt out a small "yeah!" before going all red in the face. Why are you even telling these men that you have had sex? You look down embarrassed.'
+            if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
+                '"Well uhhh... it is normal at your age. You are not a little kid anymore" says Sergey'
+            elseif hunter_sexual_comfort > 50:
+                '"That means you know how to have fun. say, how about we play together a bit?" says Andrei before the hunters get up and start approaching you'
+                !TODO: Implement event
+                !if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+                !act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'fireside_gangbang'    
+                act 'Maybe another time boys, not feeling it now': gt 'swamp_yard'
+            end  
+        end
+    end
+
+    if $ARGS[1] = 'nude':
+        !TODO: Fill this in
     end
-    act 'Move away': gt 'swamp_yard'
 end
 
 if $ARGS[0] = 'meet_hunters':
@@ -386,161 +489,106 @@ if $ARGS[0] = 'meet_hunters_after_rescue':
 	end
 end
 
-!TODO: Revamp this
-if $ARGS[0] = 'shooting_practice':
-    if huntersKnowSlut = 0:
-        if shooting = 0:
-            act 'Ask to learn how to shoot the rifle':
-                *clr & cla
-                minut += 5
-                shootingday = daystart
-                gs 'stat'
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                '"Can''t you guys teach me how to shoot a rifle?'
-                '"You''re a girl, why would you want to learn something like that <<$pcs_nickname>>?" Andrei said smiling. "You should pursue sewing or maybe a girly sport instead. Shooting is for boys."'
-                '"Pretty please." you look at them while making puppy eyes.'
-                if pcs_apprnc >= 60:
-                    shooting = 1
-                    if huntersAndreiQw < 20:huntersAndreiQw += 1
-                    if huntersIgorQw < 20:huntersIgorQw += 1
-                    if huntersSergeiQw < 20:huntersSergeiQw += 1
-                    '"Okay <<$pcs_nickname>>, we give up", they say smiling. "You''ve persuaded us, we''ll teach you how to shoot...'
-                else
-                    huntersAndreiQw -= 1
-                    huntersIgorQw -= 1
-                    huntersSergeiQw -= 1
-                    '"No, <<$pcs_nickname>>, that will not work." they answer. "And don''t assume that those puppy eyes will work on us.'
-                    'You frown your lips and turn your back on the men. "You guys are no fun, I''m leaving." you say angrily while moving away from the hunters.'
+if $ARGS[0] = 'shooting_bet':
+    if $clothingworntype ! 'nude':
+        '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting.mp4"></video></center>'
+    else
+        '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting_nude.mp4"></video></center>'
+    end    
+    
+    !This beautiful snippet is from park.qsrc
+    tirkoef = pcs_agil + pcs_shoot
+	tirmin = tirkoef * 20 / 100
+    tirand = rand(tirkoef - tirmin, tirkoef + tirmin)
+    
+    act 'Further':
+        if tirand > 70:
+            gt 'hunter_interactions', 'shooting_bet', 'win'
+        else
+            gt 'hunter_interactions', 'shooting_bet', 'lose'
+        end        
+    end
+
+    if $ARGS[1] = 'win':
+        cla & *clr
+        !TODO: Make this part have mroe stuff
+        '"Hah!" you exclaim. "I win!", before looking back.'
+        'Andrei is nowhere to be seen. That bastard ran away!'
+        
+        hunter_collective_opinion += 15
+        act 'Further': gt 'swamp_woods'
+    end    
+
+    if $ARGS[1] = 'lose':
+        cla & *clr
+        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/AndreiHanter.jpg"></center>'
+        '"Well seems like that did not work out as expected. Now, give me a moment while I think" says Andrei.'
+        'Just a second after you start thinking about what perverted scheme he can come up with, "Oh I know!" he says.'
+
+        !lost_bet_temprand = rand(1,4)
+        lost_bet_temprand = 1
+
+        if lost_bet_temprand = 1:
+            if $clothingworntype = 'nude':
+                '"I am going to tie you to that tree right next to the yard and then you will allow me to do whatever you want me to."'
+                '"Or the others..." he adds.'
+                act 'No fucking way!':
+                    cla
+
+                    hunter_collective_opinion -= 5
+                    hunter_sexual_comfort -= 20
+
+                    '"No fucking way! You really are getting ahead of yourself now." you angrily respond.'
+                    '"Damn you are such a cocktease. You are all fine walking around displaying yourself like that but the moment someone wants some fun you turn into an absolute prude." he says, somewhat annoyed.'
+                    act 'Walk away': gt 'swamp_woods'
                 end
-                if shooting = 1:
 
-                    act 'Learn how to shoot the rifle (0:30)':
-                        *clr & cla
-                        minut += 30
-                        '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-                        'The hunters explain how to hold the rifle, aim, and when to squeeze the trigger. You feel that you are ready and decide to take a...'
-                        gs 'stat'
+                act 'Let him lead you to the trees': gt 'hunter_favors', 'yard_bondage', 'lost_bet'
+            else:
+                '"I want you to lose the clothes for today and tomorrow. Be more in touch with nature and all that. You can put em back on the day after of course"'
 
-                        act 'Shot':
-                            *clr & cla
-                            minut += 1
-                            fingal +=  rand(1,3)
-                            shoot_exp += 1
-                            '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting1.mp4"></video></center>'
-                            'The recoil wasn''t at all as you expected it to be. You hear a loud bang, and the last thing you remember is something hitting you on the forehead...'
-                            gs 'stat'
+                act 'Strip naked':
 
-                            act 'Pass out':gt 'hunters', 'huntersgroupfaint'
-                        end
-                    end
-                else
-                    act 'Go':gt 'swamp_yard'
-                end
-            end
-        else
-            act 'Ask to shoot the rifle':
-                if fingal = 0:
-                    *clr & cla
-                    minut += 5
-                    shootingday = daystart
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                    'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
-                    if shooting = 1:
-                        shooting = 2
-                        '"Okay, <<$pcs_nickname>>, just don''t end up like the first time," Andrei said jokingly.'
-                    elseif pcs_shoot <= 10:
-                        '"Sure, <<$pcs_nickname>>, just be careful." Andrei said smiling.'
-                    else
-                        '"Here, <<$pcs_nickname>>, just don''t shoot too much, the bullets are expensive." Andrei said smiling.'
-                    end
-                    if pcs_shoot >= 1 and pcs_shoot <= 10:
+                    !TODO: Add flavor 
+                    hunter_collective_opinion -= 5
+                    hunter_sexual_comfort += 10
 
-                        act 'Go shooting (1:00)':
-                            if (pcs_stren + pcs_shoot > 20) or (pcs_stren + pcs_shoot < 20 and rand(1,2) = 1):
-                                *clr & cla
-                                minut += 60
-                                shoot_exp += 1
-                                gs 'stat'
-                                '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
-                                'You fire the rifle for an hour under the hunters watchful eyes.'
+                    forced_naked_day = daystart + 1
 
-                                act'Further':gt 'swamp_yard'
-                            else
-                                *clr & cla
-                                minut += 5
-                                shoot_exp += 1
-                                gs 'stat'
-                                '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting1.mp4"></video></center>'
-                                'Everything went wrong just like the first time. You take a shot and got hit once again by the rifle on the forehead...'
-                                '"<<$pcs_nickname>>, are you still alive?" Igor asked you with some concern in his voice.'
-                                '"Yeah, I think so..." you reply, holding your bruised forehead.'
-                                '"I''m glad to hear that," Andrei said laughing. "Go get some rest, little Rambo".'
+                    gs 'clothing', 'strip', 'swamphouse'
+				    gs 'underwear', 'remove'
 
-                                act'Further':
-                                    *clr & cla
-                                    minut += 1
-                                    gs 'stat'
-                                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tongue.jpg"></center>'
-                                    '"I''m not Rambo, I''m Lara Croft," you reply. Andrei, stands there looking confused not understanding the reference.'
+				    gs 'arousal', 'flash', 10, 'exhibitionism', 'sub'
+				    gs 'arousal', 'end'
 
-                                    act'Further':gt 'swamp_yard'
-                                end
-                            end
-                        end
-                    else
-                        act 'Go shooting (1:00)':
-                            *clr & cla
-                            minut += 60
-                            shoot_exp += 1
-                            gs 'stat'
-                            '<center><video autoplay loop src="images/locations/gadukino/hunters/shooting2.mp4"></video></center>'
-                            'You fire the rifle for an hour under the hunters watchful eyes.'
+    			    gs 'stat'
+                    gt 'swamp_woods'
+                end
+                
+                act 'Refuse':
+                    cla 
 
-                            act'Further':gt 'swamp_yard'
-                        end
-                    end
-                else
-                    *clr & cla
-                    minut += 5
-                    shootingday = daystart
-                    gs 'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-                    'You approach the hunters sitting in a clearing. "Guys, could you give me the rifle? I want to try it out again." You ask the hunters.'
-                    '"You need to heal your forehead first." Andrei says smiling. "You have the spirit of an Amazon, you need to relax."'
+                    hunter_collective_opinion += 5
+                    hunter_sexual_comfort -= 15
 
-                    act'Further':gt 'swamp_yard'
+                    '"I am not sure..." you respond. "I would be prancing around completely naked for three men I barely know, that''s just too much"'
+                    '"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just having some silly fun together" he responds.'
+                    '"Besides, it is not fair to just back down from a bet like that." he adds.'
+                    '"Sorry, but I will not just prance around naked for your viewing pleasure." you firmly respond.'
+                    act 'Walk away': gt 'swamp_woods'
                 end
             end
-        end
-    else
-        if huntslutsex = 0:
-            *clr & cla
-            minut += 5
-            shootingday = daystart
-            huntersexnude = 1
-            gs 'stat'
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-            'You approach the hunters sitting in the meadow. "Guys, let me shoot the rifle," you look at them with your puppy eyes.'
-            '"<<$pcs_nickname>>, come closer," replied Andrei. "If you want to shoot you need to repay us somehow."'
-
-            act'Approach':gt 'hunters', 'start'
-        else
-            *clr & cla
-            minut += 5
-            shootingday = daystart
-            gs 'stat'
 
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/claps_eyes.jpg"></center>'
-            '"Please guys, I really want to shoot with the rifle."'
-            '"Don''t you worry <<$pcs_nickname>>, you have other talents that are more needed." Andrei replied.'
-            'He scoffs, pleased with the joke.'
+        !TODO: Implement these additional options
+        elseif lost_bet_temprand = 2:
+        elseif lost_bet_temprand = 3:
+        elseif lost_bet_temprand = 4:
+        end    
+    end 
 
-            act'Move away':gt 'swamp_yard'
-        end
-    end
 end    
 
+
 !Sexual interactions
 if $ARGS[0] = 'andrei_quick_fuck':
 	cla & *clr
@@ -554,7 +602,7 @@ if $ARGS[0] = 'andrei_quick_fuck':
 		'Andrei walks up to you without saying another word and forcefully pulls you closer by your nipples.'
 		gs 'pain', 10, 'pinch', 'nipples'
 		'You yelp but it is cut short when he shoves his tongue down your throat, roughly fondling you all over'
-		gs 'arousal', 'foreplay', 25, 'sub'
+		gs 'arousal', 'foreplay', 15, 'sub'
 		act 'You feel your pussy starting to get wet':
 			cla & *clr
             '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_finger.jpg"></center>'
@@ -563,8 +611,10 @@ if $ARGS[0] = 'andrei_quick_fuck':
             *nl
             '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_fuck.jpg"></center>'
             'He starts fucking you rough and hard, not caring what you are getting out of it. You are merely a cocksleeve for him.'
-			gs 'arousal', 'vaginal_finger', '15', 'sub'
-			gs 'arousal', 'vaginal', '30', 'sub', 'rough'
+            gs 'arousal', 'vaginal_finger', 15, 'sub'
+            gs 'dinsex','vaginal_sex', 30,'sub', 'rough'
+            minut -= 25
+
 			act '...':
 				cla & *clr
                 '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/andrei_naked_encounter_cum.jpg"></center>'
@@ -575,10 +625,18 @@ if $ARGS[0] = 'andrei_quick_fuck':
 				gs 'arousal', 'end'
 				gs 'cum_call', 'breasts', 'A172', 1
 				gs 'cum_call', 'stomach', 'A172', 1
-				gs 'stat'
-				
-				act 'Further': gt 'swamp_yard'
-			end 
+                gs 'stat'
+                
+                minut -= 10
+                
+                act 'Further':
+                    if $loc = 'swamp_woods':
+                        gt 'swamp_woods', 'shooting_practice', 'practice'    
+                    else
+                        if $loc = 'swamp_yard': gt 'swamp_yard'
+                    end    
+                end
+            end 
 		end
 	!end
 end
@@ -622,35 +680,38 @@ if $ARGS[0] = 'igor_demonstration':
 	end
 end
 
+if $ARGS[0] = 'indoors_naked_encounter':
+    gt $loc
+end    
+
 if $ARGS[0] = 'naked_encounter':
-	if huntersKnowSlut = 0 and $clothingworntype = 'nude':
-		cla
-		*clr
+	if huntersKnowSlut = 0 and $clothingworntype = 'nude' and hour < 23 and hour >= 7:
+		cla & *clr
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude.jpg"></center>'
 		'You notice the hunters ogling your body while you are walking around naked. You subconsciously cover up your private parts'
 
-		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude':
-			act 'Run inside and get dressed':
+		if FUNC('lost_clothes_here','swamphouse') = 1 and $lastwornclothingtype ! 'nude' and forced_naked_day < daystart:
+			act 'Run and get dressed':
 				*clr & cla
 				minut += 5
 				gs 'underwear', 'wear'
 				gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude1.jpg"></center>'
-				'You rush inside the hut so you can get dressed.'
-				act'Further':gt 'swamphouse'
+				'You rush to get your stuff in the hut so you can get dressed.'
+				act'Further': gt 'swamphouse'
 			end
-		else
-			act 'Run inside and cover up with a burlap sack':
+        elseif forced_naked_day < daystart:
+			act 'Cover up with a burlap sack you found':
 				*clr & cla
 				minut+=5
 				gs 'clothing', 'swamp_clothes', 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-				'You quickly rush inside the hut and wear a sack... It''s not much, but at least it''s better than nothing.'
-				act'Further':gt 'swamphouse'
+				'You look around and put on a piece of burlap sack you see... It''s not much, but at least it''s better than nothing.'
+				act'Further': gt $loc
 			end
 		end
 
@@ -744,13 +805,23 @@ if $ARGS[0] = 'naked_encounter':
 					'"What in the hell are you doing you dumb girl, put something on" says Sergei'
 					'"Leave her Sergei, she is not useful for anything else anyway. Might as well be eye candy and easy acccess for a quick fuck." says Andrei'
 					'"In fact, let me demonstrate" he says before looking at you, grinning wolfishly"'
-					gs 'hunter_interactions', 'andrei_quick_fuck'
+					gt 'hunter_interactions', 'andrei_quick_fuck'
 				end
 			end
 		end	
 	end
 end
 
+if $ARGS[0] = 'dance_show':
+    gt $loc
+    !TODO: Fill this in
+end
+
+if $ARGS[0] = 'fireside_gangbang':
+    gt $loc
+    !TODO: Fill this in
+end
+
 if $ARGS[0] = 'striptease':
     if alko >= 8 and huntersKnowSlut > 0:
         *clr & cla

+ 4 - 2
locations/husbSex.qsrc

@@ -472,8 +472,10 @@ if $ARGS[0] = 'miss':
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
 	'<<$husName>> spreads your legs and uses his fingers to caress your pussy.'
+	'After a few minutes you are practically begging him to take you and he is more than willing, it is slow and gentle making you feel full and satisfied.'
 
-	gs 'arousal', 'vaginal_finger', 20
+	gs 'arousal', 'vaginal_finger', 5
+	gs 'arousal', 'vaginal', 15
 	gs 'stat'
 	
 	gs'orgazm','start'
@@ -497,7 +499,7 @@ if $ARGS[0] = 'dog':
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
 	'<<$husName>> turns you around into the doggy style position and spreads your buttcheeks before he enters you.'
 
-	gs 'arousal', 'anal', 30, 'sub'
+	gs 'arousal', 'vaginal', 30, 'sub'
 	gs 'stat'
 	
 	gs'orgazm','start'

+ 2 - 2
locations/kafesvid.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = '11':
 	
 	if kafesvidsex < 3:
 		act 'Her ass':gt 'kafesvid', '12'
-		act 'Her pussy':gt 'kafesvid', '13'
+		act 'Your pussy':gt 'kafesvid', '13'
 	end
 
 	act 'Finish':gt 'kafesvid', '3'
@@ -166,7 +166,7 @@ if $ARGS[0] = '12':
 	
 	if kafesvidsex < 3:
 		act 'Her pussy':gt 'kafesvid', '11'
-		act 'Their pussy':gt 'kafesvid', '13'
+		act 'Your pussy':gt 'kafesvid', '13'
 	end
 
 	act 'Finish':gt 'kafesvid', '3'

+ 8 - 5
locations/lact_lib.qsrc

@@ -622,15 +622,18 @@ if $ARGS[0] = 'breastcycle':
 	!!	things that happen when Sveta is lactating lactation['active'] > 1
 		if lactation['milkgrowday'] < daystart:
 			!!	Lactation rate growth. The higher the lactationrate is, the slower it will grow. I have not found a study on this, so this is pure asumption and common sense.
+			!!	funny parabelfunction for the lactrategrowth > 65 - ((1/1466)*((lactrate-304)*(lactrate-304)))
+			lactation['prolactinlvl'] += (lactation['dailyoverdemand']/10000)
 			if lactation['dailyoverdemand'] > 0 and lactation['breastpumped'] >= 0:
-				if lactation['lactaterate'] > 350000:
-					lactation['lactaterate'] += (5*lactation['prolactinlvl'])/2
-				elseif lactation['lactaterate'] > 600000:
-					lactation['lactaterate'] += lactation['prolactinlvl']/2
+				lactation['max_lactrate_growth'] = (65 - ((((lactation['lactaterate']/1000) - 304)*((lactation['lactaterate']/1000) - 304))/1466))*1000
+				if lactation['max_lactrate_growth'] < ((10*lactation['prolactinlvl'])/2) and lactation['max_lactrate_growth'] >= 1000:
+					lactation['lactaterate'] += lactation['max_lactrate_growth']
+				elseif lactation['max_lactrate_growth'] < ((10*lactation['prolactinlvl'])/2) and lactation['max_lactrate_growth'] < 1000:
+					lactation['lactaterate'] += 1000
 				else
 					lactation['lactaterate'] += (10*lactation['prolactinlvl'])/2
 				end
-				prolactinlvl = 100
+				lactation['prolactinlvl'] = 100
 			elseif lactation['dailyoverdemand'] <= 0 and lactation['breastpumped'] > 0:
 			!!	If there was no milk overdemand, sveta will keep her lactationrate level.
 				lactation['prolactinlvl'] = 100

+ 213 - 210
locations/lake.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 			'Also you can sunbathe or swim.'
 
 			act 'Walk on the beach':
-				cls
+				cla & *clr
 				minut += 60
 				pcs_mood += 5
 				gs 'stat'
@@ -215,7 +215,7 @@ end
 if $ARGS[0] = 'aquapark':
 	$location_type = 'public_outdoors'
 	minut += 5
-	cls
+	cla & *clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
 	'You go to the attractions.'
@@ -226,7 +226,7 @@ end
 
 if $ARGS[0] = 'gidro':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
 	gs 'stat'
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'gidro':
 			pcs_mood += 10
 			pcs_willpwr += 10
 			money -= 100
-			cls
+			cla & *clr
 			minut += 30
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/gidro.jpg"></center>'
 			'You take a jet ski, and spend 30 minutes having loads of fun.'
@@ -256,7 +256,7 @@ end
 
 if $ARGS[0] = 'banan':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
 	gs 'stat'
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'banan':
 		act 'Go for a ride (100 <b>₽</b>)':
 			pcs_mood += 10
 			pcs_willpwr += 10
-			cls
+			cla & *clr
 			minut += 30
 			money -= 100
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/banan.jpg"></center>'
@@ -286,7 +286,7 @@ end
 
 if $ARGS[0] = 'gorka':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
 	gs 'stat'
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'gorka':
 		act 'Go for a ride (50 <b>₽</b>)':
 			pcs_mood += 10
 			pcs_willpwr += 10
-			cls
+			cla & *clr
 			minut += 15
 			money -= 50
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/gorka.jpg"></center>'
@@ -312,7 +312,7 @@ end
 
 if $ARGS[0] = 'horse':
 	$location_type = 'event_outdoors'
-	cls
+	cla & *clr
 	gs 'stat'
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/horse0.jpg"></center>'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'horse':
 		act 'Go for a ride (100 <b>₽</b>)':
 			pcs_mood += 10
 			pcs_willpwr += 10
-			cls
+			cla & *clr
 			minut += 30
 			money -= 100
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/horse.jpg"></center>'
@@ -351,7 +351,7 @@ if $ARGS[0] = 'walklake1':
 	$dinribak = {
 		gs 'boyStat', 'A177'
 		act 'Leave the idiot alone':
-			cls
+			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -360,7 +360,7 @@ if $ARGS[0] = 'walklake1':
 			act 'Leave':gt 'lake', 'start'
 
 			act 'Money first':
-				cls
+				cla & *clr
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'walklake1':
 				act 'Change your mind and leave':gt 'lake', 'start'
 
 				act 'Take the money':
-					cls
+					cla & *clr
 					minut += 2
 					money += 2000
 
@@ -387,7 +387,7 @@ if $ARGS[0] = 'walklake1':
 					'Time slows to a halt and you have start to think that this torment will never end, when the guy pulls his cock out of your mouth.'
 
 					act '...':
-						cls
+						cla & *clr
 						minut += 2
 						sub += 1
 						sexvolume = 35
@@ -402,7 +402,7 @@ if $ARGS[0] = 'walklake1':
 						'The guy starts to cum on your face, a jet of his semen flies into your mouth and you feel awful taste of his sperm.'
 
 						act 'Wait for the man':
-							cls
+							cla & *clr
 							minut += 2
 							sub += 1
 							$ribakName = 'whore'
@@ -418,7 +418,7 @@ if $ARGS[0] = 'walklake1':
 		end
 
 		act 'Go closer':
-			cls
+			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'walklake1':
 			act 'Faint compliance then run':gt 'lake', 'start'
 
 			act 'Kneel in front of the guy':
-				cls
+				cla & *clr
 				minut += 2
 
 				if ribakSex = 0:ribakSex = 1 & guy += 1
@@ -443,7 +443,7 @@ if $ARGS[0] = 'walklake1':
 				'"Open your fucking mouth," Growls the man "and stick out your tongue."'
 
 				act 'Comply':
-					cls
+					cla & *clr
 					minut += 2
 					sub += 1
 					sexvolume = 35
@@ -458,7 +458,7 @@ if $ARGS[0] = 'walklake1':
 					'You obediently open your mouth and stick out your tongue. Immediately you are slapped in the face with a jet of sperm. Then another and another, covering your face. The sperm gets into your mouth and you feel its nasty taste.'
 
 					act 'Wait for the man':
-						cls
+						cla & *clr
 						minut += 2
 						sub += 1
 						swallow += 1
@@ -467,7 +467,7 @@ if $ARGS[0] = 'walklake1':
 						'Your face is dripping with semen, you feel no taste in your mouth and look at the guy. The guy smile and with his finger collects some sperm from your face. Then he puts his finger in your mouth causing you to lick sperm. When his finger is clean, he gathers the remnants of sperm from your face on his finger and stuck it back in your mouth. Once again you suck his finger and swallow cum.'
 
 						act 'Wait for the man':
-							cls
+							cla & *clr
 							minut += 2
 							sub += 1
 							$ribakName = 'lowered whore'
@@ -481,7 +481,7 @@ if $ARGS[0] = 'walklake1':
 				end
 
 				act 'Try to move out of the way':
-					cls
+					cla & *clr
 					minut += 2
 					spafinloc = 11
 					gs 'cum_manage'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'walklake1':
 		act 'Leave':gt 'lake', 'start'
 
 		act 'Approach':
-			cls
+			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -518,14 +518,14 @@ if $ARGS[0] = 'walklake1':
 
 			if pcs_apprnc >= 60:
 				act 'What do you want?':
-					cls
+					cla & *clr
 					minut += 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 					'You asked what the guy wants. The guy looks at you again with a smirk. "You have written on his face that you are a whore. Here to earn your living?"'
 
 					act 'How dare you? (Troubled)':
-						cls
+						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -534,7 +534,7 @@ if $ARGS[0] = 'walklake1':
 					end
 
 					act 'What? (Wonder)':
-						cls
+						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -543,7 +543,7 @@ if $ARGS[0] = 'walklake1':
 					end
 
 					act 'hmm (thinking)':
-						cls
+						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -560,7 +560,7 @@ if $ARGS[0] = 'walklake1':
 
 		if $ribakName = 'whore':
 			act 'Two pieces!':
-				cls
+				cla & *clr
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
@@ -569,7 +569,7 @@ if $ARGS[0] = 'walklake1':
 				act 'Leave':gt 'lake', 'start'
 
 				act 'Take the money':
-					cls
+					cla & *clr
 					minut += 2
 					money += 2000
 					ribakSex += 1
@@ -584,7 +584,7 @@ if $ARGS[0] = 'walklake1':
 					'Time slows to a halt and you have start to think that this torment will never end, when the guy pulls his cock out of your mouth.'
 
 					act '...':
-						cls
+						cla & *clr
 						minut += 2
 						sub += 1
 						sexvolume = 35
@@ -599,7 +599,7 @@ if $ARGS[0] = 'walklake1':
 						'The guy starts to cum on your face, a jet of his semen flies into your mouth and you feel awful taste of his sperm.'
 
 						act 'Wait for the man':
-							cls
+							cla & *clr
 							minut += 2
 							sub += 1
 							$ribakName = 'whore'
@@ -614,7 +614,7 @@ if $ARGS[0] = 'walklake1':
 			end
 		elseif $ribakName ! 'whore':
 			act 'Kneel in front of the man':
-				cls
+				cla & *clr
 				minut += 2
 				ribakSex += 1
 				stat['bj'] += 1
@@ -628,7 +628,7 @@ if $ARGS[0] = 'walklake1':
 				'"Open your fucking mouth," Growls the man "and stick out your tongue."'
 
 				act 'Comply':
-					cls
+					cla & *clr
 					minut += 2
 					sub += 1
 					sexvolume = 35
@@ -643,7 +643,7 @@ if $ARGS[0] = 'walklake1':
 					'You obediently open your mouth and stick out your tongue. Immediately you are slapped in the face with a jet of sperm. Then another and another, covering your face. The sperm gets into your mouth and you feel its nasty taste.'
 
 					act 'Wait for the man':
-						cls
+						cla & *clr
 						minut += 2
 						sub += 1
 						swallow += 1
@@ -652,7 +652,7 @@ if $ARGS[0] = 'walklake1':
 						'Your face is dripping with semen, you feel no taste in your mouth and look at the guy. The guy smile and with his finger collects some sperm from your face. Then he puts his finger in your mouth causing you to lick sperm. When his finger is clean, he gathers the remnants of sperm from your face on his finger and stuck it back in your mouth. Once again you suck his finger and swallow cum.'
 
 						act 'Wait for the man':
-							cls
+							cla & *clr
 							minut += 2
 							sub += 1
 							$ribakName = 'lowered whore'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'walklake1':
 				end
 
 				act 'Try to move out of the way':
-					cls
+					cla & *clr
 					minut += 2
 					spafinloc = 11
 					gs 'cum_manage'
@@ -740,200 +740,35 @@ if $ARGS[0] = 'walklake2':
 
 	act 'Leave':gt 'lake', 'start'
 
-	$din_stasValera4 = {
-		act 'Relax':
-			cls
-			minut += 2
-			pcs_horny += 20
-
-			npc_sex['A50'] += 1
-			if ValeraSex = 0:ValeraSex = 1 & guy += 1
-
-			StVaGang = 1
-			gang += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/lake.jpg"></center>'
-			'You are relaxed and begin to enjoy the caressing of your breasts and pussy.'
-			gs 'boyStat', 'A47'
-			pose = 0
-			sexpartkno = 1
-			dynamic $sexstart
-			'You feel ready as Stasik holding your feet, spreads your legs and brings his hard penis down to your soft pussy.'
-			gs 'dinsex','vaginal_sex',10
-			'While you fuck Stasik, Valera slumps to your face and brings his erect cock to your lips.'
-			gs 'boyStat', 'A48'
-			stat['bj'] += 1
-			dynamic $dinrandbj
-			gs 'boyStat', 'A47'
-			gs 'dinsex','sexcum'
-			'Valera groans and his cock shudders in your mouth.'
-			swallow += 1
-			gs 'boyStat', 'A48'
-			sexpartkno = 1
-			spafinloc = 12
-			gs 'cum_manage'
-			gs 'dinsex','dinrandswallow'
-
-			act 'Further':
-				cls
-				minut += 2
-				gs 'stat'
-				'The tired men dismount and help dress you as they dress themselves. Stasik lifts you back on to your feet, "You''re a cool girl <<$pcs_nickname>>, let us walk you home."'
-
-				act 'I''ll manage':
-					cls
-					minut += 2
-					gs 'stat'
-					'You refuse and Stasik shrugs, "Well, as you wish."'
-
-					act 'Leave':gt 'lake', 'start'
-				end
-
-				act 'Agree':
-					cls
-					minut += 5
-					cumface = 0
-					StasValeraKnow = 1
-					gs 'stat'
-					if $clothingworntype = 'swimwear':
-						gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-						'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
-					end
-					'The boys walk either side of you like bodyguards as you make your way home. Along the way they keep silent, even the more sprightly Stasik seems to be at a loss for words. Finally you stop before the door of your apartment. You say goodbye to the guys and they go.'
-
-					act 'Leave':gt 'korr'
-				end
-			end
-		end
-	}
-
-	$din_stasValera3 = {
-		act 'Further':
-			cls
-			minut += 2
-			pcs_horny += 20
-			gs 'stat'
-			'You are relaxed and begin to enjoy the sensations in your chest arising from Stasiks touching. With a well honed movement he lowers the cups of your bra freeing your breasts. You do not have time to blink as Stasiks lips cover your nipple.'
-
-			act 'Hey! What are you doing?':
-				cls
-				minut += 2
-				gs 'stat'
-				'You jump to your feet adjusting your bra. Stasik smiles, "Do not be afraid girl."'
-
-				act 'Leave':gt 'lake', 'start'
-			end
-
-			act 'Feebly protest':
-				cls
-				minut += 2
-				pcs_horny += 20
-				gs 'stat'
-				'You try to pull your bra back and whisper, "No." Stasik smiles, "Do not be shy girl."'
-				dynamic $din_stasValera4
-			end
-
-			act 'Be silent':
-				cls
-				minut += 2
-				pcs_horny += 30
-				gs 'stat'
-				'You get comfortable enjoying the skillful way Staik sucks your breast, his hands begin to passionately caress your body. His strong fingers penetrate your panties and began to caress your pussy.'
-				dynamic $din_stasValera4
-			end
-		end
-	}
-
-	$din_stasValera2 = {
-		act 'Remove Stasiks hands from you':
-			cls
-			minut += 2
-			gs 'stat'
-			'You angrily remove his hands from your body. Stasik grins, "C''mon baby, relax."'
-
-			act 'Rebel and go':
-				cls
-				minut += 2
-				gs 'stat'
-				'You angrily stand up and began to leave. Stasik gets to his feet and tries to persuade you to go with the guys to the cafe.'
-
-				act 'Leave':gt 'lake', 'start'
-			end
-
-			act 'Keep silent':
-				cls
-				minut += 2
-				pcs_horny += 20
-				gs 'stat'
-				'You say nothing and Stasik immediately takes advantage of your confusion. His hands gently squeeze your chest and you feel a pleasant warmth and tenderness from your breasts being stimulated.'
-				dynamic $din_stasValera3
-			end
-		end
-
-		act 'Smile and pretend nothing is happening.':
-			cls
-			minut += 2
-			pcs_horny += 20
-			gs 'stat'
-			'You start to smile, feeling a Stasiks touch excite you. You close your eyes for a moment and suddenly feel a hand on your chest. You open your eyes in surprise and see how completely unflappable Stasik is squeezing your chest with a dreamy smile on his face.'
-			dynamic $din_stasValera3
-		end
-	}
-
-	$din_stasValera = {
-		act '<<$pcs_nickname>>':
-			cls
-			minut += 2
-			gs 'stat'
-			'You tell Stasik that your name is <<$pcs_nickname>>. He smiles even wider and says, "Nice to meet you." Valera also comes over and says hello to you. The men settle on the shore near you.'
-
-			act 'Lie on the sand':
-				cls
-				minut += 2
-				pcs_horny += 15
-				gs 'stat'
-				'You lay down on the sand and the men settle on either side of you. Stasik begins to tell you that he works with Valera as sales representatives of a major company, and boasts about their seniority and importance. Without breaking conversation, Stasik puts his hand on your stomach and begins stroking.'
-				dynamic $din_stasValera2
-			end
-
-			act 'Sit on the sand':
-				cls
-				minut += 2
-				pcs_horny += 15
-				gs 'stat'
-				'You sat down on the sand and the men settle on either side of you. Stasik begins to tell you that he works with Valera as sales representatives of a major company, and boasts about their seniority and importance. Without breaking conversation, Stasik puts his hand on your ass and starts stroking.'
-				dynamic $din_stasValera2
-			end
-		end
-	}
-
 	if StasikValera = 0:
 		act 'Look at them':
-			cls
+			cla & *clr
 			minut += 1
 			StasikValera = 1
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
 			'You look at the men and notice that they are whispering to each other. Then one of the men comes up to you. He says smiling, "Hey beautiful, I am Stasik, and this is my friend Valera. What''s your name?"'
-			dynamic $din_stasValera
+			act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
 
-			act 'I have to go.':
-				cls
+			act 'I have to go':
+				cla & *clr
 				minut += 1
 				gs 'stat'
 				'You''re not going to get acquainted with these fellows and began to leave. Stasik tries to persuade you. "Come on, babe. Do we look like savages? We just wanted to talk, but I understand if you''re frightened. I just wanted to ask you your name."'
-				dynamic $din_stasValera
+				act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
 
 				act 'Leave':gt 'lake', 'start'
 			end
 		end
 	end
 
-	if npc_sex['A50'] > 0 or ValeraSex > 0:
+	if npc_sex['A48'] > 0:
+		npc_sex['A48'] += 1
+		npc_sex['A49'] += 1
 		act 'Wave to them':
 			cla
 			*clr
 			!!guy += 2
-			dynamic $venerasiak
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk2/walk2.jpg"></center>'
 			'Looking directly at them you pull off your panties and wave to them. The men almost run toward you, you threw off the rest and kneel.'
 
@@ -941,7 +776,6 @@ if $ARGS[0] = 'walklake2':
 				cla
 				*clr
 				stat['bj'] += 1
-				dynamic $venerasiakOral
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk2/walk3.jpg"></center>'
 				'the men unbutton their pants as they run to you, you take their members alternately sucking one then the other. One of the men roughly grabs your ass and tries to put you on all fours.'
 
@@ -1023,6 +857,175 @@ if $ARGS[0] = 'walklake2':
 	end
 end
 
+if $ARGS[0] = 'stasValera':
+	cla & *clr
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/talk1.jpg"></center>'
+	'You tell Stasik that your name is <<$pcs_nickname>>. He smiles even wider and says, "Nice to meet you." Valera also comes over and says hello to you. The men stand by the shore near you.'
+
+	act 'Chat with them':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/talk6.jpg"></center>'
+		'You stand aroundtalking to the men. Stasik begins to tell you that he works with Valera as sales representatives of a major company, and boasts about their seniority and importance. Throughout the conversation, both men are making lewd gestures and Stasik moves his hand to your chest.'
+		act 'Remove Stasik''s hands from you': gt 'lake', 'stasValera2a'
+		act 'Smile and pretend nothing is happening': gt 'lake', 'stasValera2b'
+	end
+end
+
+if $ARGS[0] = 'stasValera2a':
+	cla & *clr
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse1.jpg"></center>'
+	'You angrily remove his hands from your body. Stasik grins, "C''mon baby, relax."'
+
+	act 'Rebel and go':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse3.jpg"></center>'
+		'You angrily stand up and began to leave. Stasik gets to his feet and tries to persuade you to go with the guys to the cafe.'
+
+		act 'Leave':gt 'lake', 'start'
+	end
+
+	act 'Keep silent':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/tits1.jpg"></center>'
+		'You say nothing and Stasik immediately takes advantage of your confusion. His hands gently squeeze your chest and you feel a pleasant warmth and tenderness from your breasts being stimulated.'
+		gs 'arousal', 'foreplay', 5
+		minut -= 3
+		gs 'stat'
+		act 'Further': gt 'lake', 'stasValera3'
+	end
+end
+
+if $ARGS[0] = 'stasValera2b':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/tits1.jpg"></center>'
+	'You start to smile, feeling a Stasiks touch excite you. You close your eyes for a moment and suddenly feel a hand on your chest. You open your eyes in surprise and see how completely unflappable Stasik is squeezing your chest with a dreamy smile on his face.'
+	gs 'arousal', 'foreplay', 5
+	minut -= 3
+	gs 'stat'
+	act 'Further': gt 'lake', 'stasValera3'
+end
+
+if $ARGS[0] = 'stasValera3':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/tits2.jpg"></center>'
+	'You are relaxed and begin to enjoy the sensations in your chest arising from Stasiks touching. With a well honed movement he lowers the cups of your bra freeing your breasts. You do not have time to blink as Stasiks lips cover your nipple.'
+	gs 'arousal', 'foreplay', 5
+	minut -= 3
+	gs 'stat'
+
+	act 'Hey! What are you doing?':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse4.jpg"></center>'
+		'You jump to your feet adjusting your bra. Stasik smiles, "Do not be afraid girl."'
+
+		act 'Leave':gt 'lake', 'start'
+	end
+
+	act 'Feebly protest':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/talk5.jpg"></center>'
+		'You try to pull your bra back and whisper, "No." Stasik smiles, "Do not be shy girl."'
+		gs 'arousal', 'foreplay', 5
+		minut -= 3
+		gs 'stat'
+		act 'Relax': gt 'lake', 'stasValera4'
+	end
+
+	act 'Be silent':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/tits3.jpg"></center>'
+		'You get comfortable enjoying the skillful way Staik sucks your breast, his hands begin to passionately caress your body. His strong fingers penetrate your panties and began to caress your pussy.'
+		gs 'arousal', 'foreplay', 5
+		minut -= 3
+		gs 'stat'
+		act 'Relax': gt 'lake', 'stasValera4'
+	end
+end
+
+if $ARGS[0] = 'stasValera4':
+	cla & *clr
+
+	npc_sex['A48'] += 1
+	npc_sex['A49'] += 1
+	guy += 2
+	gang += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/oral<<rand(1,6)>>.jpg"></center>'
+	'The guys pull out they cocks and you kneel down to get them warmed up. It doesn''t take long before you are in the mood for more and it is clear they are too.'
+	gs 'arousal', 'bj', 5
+	minut -= 3
+	gs 'stat'
+	act 'Get fucked':
+		gs 'boyStat', 'A47'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(7,9)>>.jpg"></center>'
+		'You feel ready as Stasik holding your feet, spreads your legs and brings his hard penis down to your soft pussy.'
+		gs 'dinsex','vaginal_sex',10
+		act 'Don''t forget Valera':
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<rand(1,6)>>.jpg"></center>'
+			'While you fuck Stasik, Valera slumps to your face and brings his erect cock to your lips.'
+			gs 'boyStat', 'A48'
+			dynamic $dinrandbj
+			gs 'boyStat', 'A47'
+			pose = 1
+			gs 'dinsex','sexcum'
+			act 'Finish Valera off':
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/sex<<cum(1,4)>>.jpg"></center>'
+				'Valera groans and his cock shudders in your mouth.'
+				swallow += 1
+				gs 'boyStat', 'A48'
+				gs 'cum_call', 'mouth' 'A48', 1
+				gs 'arousal', 'bj', 5
+				gs 'dinsex','dinrandswallow'
+
+				act 'Further':
+					cla & *clr
+					minut += 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/undress.jpg"></center>'
+					'The tired men dismount and help dress you as they dress themselves. Stasik lifts you back on to your feet, "You''re a cool girl <<$pcs_nickname>>, let us walk you home."'
+
+					act 'I''ll manage':
+						cla & *clr
+						minut += 2
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse2.jpg"></center>'
+						'You refuse and Stasik shrugs, "Well, as you wish."'
+
+						act 'Leave':gt 'lake', 'start'
+					end
+
+					act 'Agree':
+						cla & *clr
+						minut += 5
+						cumface = 0
+						StasValeraKnow = 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
+						if $clothingworntype = 'swimwear':
+							gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+							'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
+						end
+						'The boys walk either side of you like bodyguards as you make your way home. Along the way they keep silent, even the more sprightly Stasik seems to be at a loss for words. Finally you stop before the door of your apartment. You say goodbye to the guys and they go.'
+
+						act 'Leave':gt 'korr'
+					end
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'vlake1':
 	$location_type = 'event_outdoors'
 	cla

+ 7 - 0
locations/lug.qsrc

@@ -122,6 +122,13 @@ if $ARGS[0] = 'prut2':
         gt 'lug', 'prut'
     end
 
+	! Setup for teleport circle
+	if tpKnown['PushkinPark'] = 1:
+		act 'Enter the hidden circle of trees': gt 'treeCircle', 'PushkinPark'
+	else:
+		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'PushkinPark'
+	end
+
 	if MagikDostup ! 1 and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
 		if knowsfairy < 1 and fairyskip = 0:
 			$metka = 'prut2'

+ 8 - 8
locations/mod_setting.qsrc

@@ -48,7 +48,7 @@ act ''+iif(settingmode = 1, '<center><b>Install new mod</b></center>','Install n
 	killvar 'mod_info'
 	$mod_temp=input('input mod name (as for the example image above, input <B>isample</B>)')
 	if $mod_temp='':exit
-	ADDQST 'mod/<<$mod_temp>>.qsp'
+	addqst 'mod/<<$mod_temp>>.qsp'
 	gs 'mod_<<$mod_temp>>_setup'
 	if $mod_info[0] = '':
 		msg '<b><<$mod_temp>>.qsp</b> is not a Girl life ECV mod, please contract its author for help'
@@ -59,19 +59,19 @@ act ''+iif(settingmode = 1, '<center><b>Install new mod</b></center>','Install n
 	$mod_version[mod_list] = $mod_info[1]
 	$mod_author[mod_list] = $mod_info[2]
 	$mod_desc[mod_list] = $mod_info[3]
-	gt curloc
+	gt $loc, $metka
 end
 act ''+iif(settingmode = 1, '<center><b>Disable all mods</b></center>','Disable all mods')+'':
 	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
-		KILLQST
+		killqst
 		set mod_list=0
-		KILLVAR '$mod_name'
-		KILLVAR '$mod_version'
-		KILLVAR '$mod_author'
-		KILLVAR '$mod_desc'
+		killvar '$mod_name'
+		killvar '$mod_version'
+		killvar '$mod_author'
+		killvar '$mod_desc'
 		'All mod disabled. You can re-install them later.'
 		cla
-		act 'Continue':goto curloc
+		act 'Continue':gt $loc, $metka
 	end
 end
 --- mod_setting ---------------------------------

+ 22 - 22
locations/mother.qsrc

@@ -753,8 +753,8 @@ end
 if $ARGS[0] = 'pregreact':
 	menu_off = 1
 	*nl
-	if pregTalkFamily = 0 and pregtalkmom = 0 and kid = 0:
-		if ($clothingworntype = 'nude' and pregtime > 90) or ($clothingworntype ! 'nude' and pregtime > 150):
+	if pregTalkFamily = 0 and npc_pregtalk['A29'] = 0 and kid = 0:
+		if ($clothingworntype = 'nude' and pregchem > 2688) or ($clothingworntype ! 'nude' and pregchem > 3600):
 			cla
 			gs 'stat'
 			minut += 5
@@ -763,19 +763,19 @@ if $ARGS[0] = 'pregreact':
 			if $clothingworntype ! 'nude':
 				'"I do want to know who the father is, though."'
 
-				act 'Tell her':pregTalkFamily = 1 & pregTalkMom = 1 & gt 'mother', 'pregreact1'
+				act 'Tell her':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreact1'
 			elseif $clothingworntype = 'nude':
 				'"And go put on some clothes and then come back to talk to me. I need you to tell me who the father is"'
 
-				act 'Go get dressed':pregTalkFamily = 1 & pregTalkMom = 1 & gt 'mother', 'pregreactnude'
+				act 'Go get dressed':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreactnude'
 			end
-		elseif knowpreg = 1 and $clothingworntype ! 'nude' and pregtime <= 150:
+		elseif knowpreg = 1 and $clothingworntype ! 'nude' and pregchem <= 3600:
 			act 'Tell your mother you are pregnant':
 				*clr & cla
 				minut += 5
 				npc_rel['A29'] -= 20
 				pregTalkFamily = 1
-				pregtalkmom = 1
+				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 				if motherKnowSpravka = 0:motherKnowSpravka = 1
 				gs 'stat'
@@ -787,15 +787,15 @@ if $ARGS[0] = 'pregreact':
 				'"Of course you can sweetie, we''ll get through this together", she reassures you, returning your hug. Despite her supportive attitude, you can tell she''s very disappointed in you. You''ll have to put in some work if you want to get back on her good side.'
 				'"So, who''s the father?"'
 
-				act 'Tell her':pregTalkFamily = 1 & pregTalkMom = 1 & gt 'mother', 'pregreact1'
+				act 'Tell her':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreact1'
 			end
-		elseif knowpreg = 1 and $clothingworntype = 'nude' and pregtime <= 90:
+		elseif knowpreg = 1 and $clothingworntype = 'nude' and pregchem <= 2688:
 			act 'Tell your mother you are pregnant':
 				*clr & cla
 				minut += 5
 				npc_rel['A29'] -= 20
 				pregTalkFamily = 1
-				pregtalkmom = 1
+				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
 				if motherKnowSpravka = 0:motherKnowSpravka = 1
 				gs 'stat'
@@ -808,7 +808,7 @@ if $ARGS[0] = 'pregreact':
 
 				'"And go put on some clothes and then come back to talk to me. I need you to tell me who the father is."'
 
-				act 'Go get dressed':pregTalkFamily = 1 & pregTalkMom = 1 & gt 'mother', 'pregreactnude'
+				act 'Go get dressed':pregTalkFamily = 1 & npc_pregtalk['A29'] = 1 & gt 'mother', 'pregreactnude'
 			end
 		end
 	end
@@ -904,7 +904,7 @@ end
 !!When Sveta has another place to stay in Pav, there will be a follow-up to this conversation that restores access to the family apartment, if <<$npc_nickname[''A29'']>> relationship is high enough.
 if $ARGS[0] = 'pregreactbrother':
 	menu_off = 1
-	if npc_rel['A29'] < 60 and pregtalkbrother = 1 and brothersecret = 0:
+	if npc_rel['A29'] < 60 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
 		'"What the fuck is wrong with you?" she screams in your face. "I knew you were a worthless whore, but this? Even I didn''t think you’d go so far as to try corrupting your brother, too."'
 		'Kolka tries to speak up. "<<$npc_nickname[''A29'']>>, <<$pcs_nickname>>-"'
@@ -928,7 +928,7 @@ if $ARGS[0] = 'pregreactbrother':
 
 			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and pregtalkbrother = 1 and brothersecret = 0:
+	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
 		'When she finally speaks, it''s through gritted teeth, and she just says "Get out."'
 		'You stare at her dumbfounded, unsure where she expects you to go.'
@@ -947,7 +947,7 @@ if $ARGS[0] = 'pregreactbrother':
 
 			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] > 80 and pregtalkbrother = 1 and brothersecret = 0:
+	elseif npc_rel['A29'] > 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
 		'After several moments of silence that feel like an eternity, your mother says "Please tell me I just misheard you. Did you really just say your brother''s name?"'
 		'You stare at the floor, only giving your mother the smallest nod you can manage as a reply.'
@@ -976,7 +976,7 @@ if $ARGS[0] = 'pregreactbrother':
 
 			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] < 60 and (pregtalkbrother = 0 or brothersecret = 1):
+	elseif npc_rel['A29'] < 60 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
 		'"What the fuck is wrong with you?" she screams in your face. "I knew you were a worthless whore, but this? Even I didn''t think you’d go so far as to try corrupting your brother, too."'
 		'Your mother releases your hair as tears begin to stream down your face.'
@@ -996,7 +996,7 @@ if $ARGS[0] = 'pregreactbrother':
 
 			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (pregtalkbrother = 0 or brothersecret = 1):
+	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
 		'When she finally speaks, it''s through gritted teeth, and she just says "Get out."'
 		'You stare at her dumbfounded, unsure where she expects you to go.'
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'pregreactbrother':
 
 			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] > 80 and (pregtalkbrother = 0 or brothersecret = 1):
+	elseif npc_rel['A29'] > 80 and (npc_pregtalk['A34'] = 0 or brothersecret = 1):
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
 		'After several moments of silence that feel like an eternity, your mother says "Please tell me I just misheard you. Did you really just say your brother''s name?"'
 		'You stare at the floor, only giving your mother the smallest nod you can manage as a reply.'
@@ -1044,7 +1044,7 @@ end
 !!When Sveta has another place to stay in Pav, there will be a follow-up to this conversation that restores access to the family apartment, if <<$npc_nickname[''A29'']>> relationship is high enough.
 if $ARGS[0] = 'pregreactstepdad':
 	menu_off = 1
-	if npc_rel['A29'] < 60 and pregtalkstepdad = 1 and stepdadSecret = 0:
+	if npc_rel['A29'] < 60 and npc_pregtalk['A28'] = 1 and stepdadSecret = 0:
 		'As soon as your step-father''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair and starts draging you around.'
 		'"What the fuck is wrong with you?" she screams in your face. "I know you are a worthless whore, but this? Even I didn''t think you''d stoop this low as seducting your own step-father... What kind of sick people are you two?"'
 		'Vladimir begins clearing his throat, "Honey, <<$pcs_nickname>> and I-"'
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'pregreactstepdad':
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
 			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and pregtalkbrother = 1 and brothersecret = 0:
+	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and npc_pregtalk['A34'] = 1 and brothersecret = 0:
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
 		'When she finally manages to speak up, through gritted teeth, only saying, "Get out!"'
 		'You stare at her dumbfounded, unsure where she expects you to go.'
@@ -1086,7 +1086,7 @@ if $ARGS[0] = 'pregreactstepdad':
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
 			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] > 80 and pregtalkstepdad = 1 and stepdadSecret = 0:
+	elseif npc_rel['A29'] > 80 and npc_pregtalk['A28'] = 1 and stepdadSecret = 0:
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
 		'After long period of silence that feels like an eternity, your mother finally manages to speak up, "Please tell me I just misheard you. Did I really hear you just say your step-father''s name?"'
 		'You stare shamefully at the floor, only giving your mother the smallest nod you can manage as a reply.'
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'pregreactstepdad':
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
 			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] < 60 and (pregtalkstepdad = 0 or stepdadSecret = 1):
+	elseif npc_rel['A29'] < 60 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'As soon as your step-father''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair and starts draging you around.'
 		'"What the fuck is wrong with you?" she screams in your face. "I know you are a worthless whore, but this? Even I didn''t think you''d stoop this low as seducting your own step-father... What kind of sick people are you two?"'
 		'Vladimir begins clearing his throat, "Honey, <<$pcs_nickname>> and I-"'
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'pregreactstepdad':
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
 			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (pregtalkstepdad = 0 or stepdadSecret = 1):
+	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
 		'When she finally manages to speak up, through gritted teeth, only saying, "Get out!"'
 		'You stare at her dumbfounded, unsure where she expects you to go.'
@@ -1157,7 +1157,7 @@ if $ARGS[0] = 'pregreactstepdad':
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
 			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
-	elseif npc_rel['A29'] > 80 and (pregtalkstepdad = 0 or stepdadSecret = 1):
+	elseif npc_rel['A29'] > 80 and (npc_pregtalk['A28'] = 0 or stepdadSecret = 1):
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
 		'After long period of silence that feels like an eternity, your mother finally manages to speak up, "Please tell me I just misheard you. Did I really hear you just say your step-father''s name?"'
 		'You stare shamefully at the floor, only giving your mother the smallest nod you can manage as a reply.'

+ 2 - 2
locations/natbelEv.qsrc

@@ -75,9 +75,9 @@ if $ARGS[0] = 'natcumresponse':
 		'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t seems to bother her that Kolka may knock her up.'
 	elseif natpregday > 0 and (daystart-natpregday) >= 84:
 		'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t really matter now, since Kolka has already knocked her up.'
-	elseif natpregday = 0 and pregtalknat = 1 and natbabycount = 0:
+	elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount = 0:
 		'Natasha looks at you and almost inaudably whispers "Please let him cum inside me. I want a baby too."'
-	elseif natpregday = 0 and pregtalknat = 1 and natbabycount > 0:
+	elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount > 0:
 		'Natasha looks at you and moans "Please let him cum inside me. I need him to give me another baby."'		
 	else
 		'Natasha looks at you questioningly, whether will you let him cum inside of her and risking her getting pregnant with your niece or nephew, or letting her pull away from you brother.'

+ 21 - 18
locations/natbelapt.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'ask_state':
 		'"<<$NatashaMotherNickname>>... You uhm... don''t look very pleased to see me. Did I... Is it something I did?"'
 		if (daystart-svetapregday) > 120:
 			'"Well <<$pcs_nickname>>, I''m still trying to adjust to the fact that my daughter is pregnant. Excuse me if I haven''t embraced that little fact yet."'
-			if pregtime > 150:
+			if pregchem > 3600:
 				'"I don''t know what you girls were thinking. The least you could have done was use protection. Getting pregnant when you''re <<age>>, you''re not ready to raise a baby!" She says angrily, looking at your obviously swollen belly.'
 				'You lower your head at the accusation in her tone and mumble "S-Sorry..." as you pass her into the hallway.'
 			else
@@ -335,6 +335,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'natbelapt','bathroom'
 		end
 	end
@@ -1908,12 +1911,12 @@ if $ARGS[0] = 'chat':
 	
 	act 'Stop talking': gt 'natbelapt','natroom'
 	
-	if pregTalkNat = 0 and kid = 0:
-		if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregtime >= 150:
+	if npc_pregtalk['A16'] = 0 and kid = 0:
+		if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregchem >= 3600:
 			*clr & cla
 			'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
 			act 'Continue':gt 'natbelapt', 'natknows'
-		elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+		elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
@@ -1921,15 +1924,15 @@ if $ARGS[0] = 'chat':
 				*nl
 				act 'Continue':gt 'natbelapt', 'natknows'
 			end
-		elseif pregtime > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
+		elseif pregchem > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
 				'"<<$pcs_nickname>>, you''re," she pauses momentarily before continuing in a tone of shock mixed with disgust, "pregnant? Have you been sleeping around? This will definitely impact your studies."'
-				pregTalkNat = 1
+				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregtime > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
+		elseif pregchem > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
@@ -1938,25 +1941,25 @@ if $ARGS[0] = 'chat':
 				if $wombthfath = '':
 					'"Honestly, I don''t even know."'
 					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-					pregTalkNat = 1
+					npc_pregtalk['A16'] = 1
 					act 'Continue' :gt 'natbelapt', 'natroom'
 				else
 					'You tell her that <<$wombthfath>> is the father and then give her brief details as to how you got pregnant, without getting too explicit.'
 					*nl
 					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-					pregTalkNat = 1
+					npc_pregtalk['A16'] = 1
 					act 'Continue' :gt 'natbelapt', 'natroom'
 				end
 			end
 		end
 	end
 	
-	if pregTalkNat = 0 and kid > 0:
-		if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregtime >= 150:
+	if npc_pregtalk['A16'] = 0 and kid > 0:
+		if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregchem >= 3600:
 			*clr & cla
 			'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
 			act 'Next':gt 'natbelapt', 'natknows1'
-		elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregtime > 0 and pregtime < 150:
+		elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'
@@ -1964,20 +1967,20 @@ if $ARGS[0] = 'chat':
 				*nl
 				act 'Next':gt 'natbelapt', 'natknows1'
 			end
-		elseif pregtime > 0 and natsub = 0 and knowpreg = 1:
+		elseif pregchem > 0 and natsub = 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				*nl
 				'"Really? You''re pregnant again? You should really try to be more careful."'
-				pregTalkNat = 1
+				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregtime > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
+		elseif pregchem > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				*nl
 				'"You got pregnant again. It must be wonderful…" She trails off, clearly envious.'
-				pregTalkNat = 1
+				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
 		end
@@ -2157,7 +2160,7 @@ end
 
 if $ARGS[0] = 'natknows':
 	cla
-	pregTalkNat = 1
+	npc_pregtalk['A16'] = 1
 	if pav_slut < 125: '"So, who''s the father?"'
 	if pav_slut >= 125: '"So, do you know who the father is?"'
 	*nl
@@ -2179,7 +2182,7 @@ end
 !When pregnancy fetish is added, another reaction will be added here
 if $ARGS[0] = 'natknows1':
 	cla
-	pregTalkNat = 1
+	npc_pregtalk['A16'] = 1
 	if pav_slut < 125: '"Is it the same father as last time?"'
 	if pav_slut >= 125: '"Do you know if it''s the same father as last time?"'
 	*nl

File diff suppressed because it is too large
+ 83 - 708
locations/npcstatic1.qsrc


File diff suppressed because it is too large
+ 21 - 836
locations/npcstatic2.qsrc


File diff suppressed because it is too large
+ 12 - 844
locations/npcstatic3.qsrc


File diff suppressed because it is too large
+ 42 - 814
locations/npcstatic4.qsrc


File diff suppressed because it is too large
+ 21 - 606
locations/npcstatic5.qsrc


+ 25 - 0
locations/npcstaticdefaults.qsrc

@@ -0,0 +1,25 @@
+# npcstaticdefaults
+
+if $ARGS[0] = 'defaults':
+	npc_run['A<<npctemp>>'] = rand(1,10)
+	npc_vball['A<<npctemp>>'] = rand(1,10)
+	npc_shoot['A<<npctemp>>'] = rand(1,10)
+	npc_sewing['A<<npctemp>>'] = rand(1,10)
+	npc_serving['A<<npctemp>>'] = rand(1,10)
+	npc_chess['A<<npctemp>>'] = rand(1,10)
+	npc_dance['A<<npctemp>>'] = rand(1,10)
+	npc_danceero['A<<npctemp>>'] = rand(1,10)
+	npc_jab['A<<npctemp>>'] = rand(1,10)
+	npc_punch['A<<npctemp>>'] = rand(1,10)
+	npc_kick['A<<npctemp>>'] = rand(1,10)
+	npc_def['A<<npctemp>>'] = rand(1,10)
+	npc_vokal['A<<npctemp>>'] = rand(1,10)
+	npc_teach['A<<npctemp>>'] = rand(1,10)
+	$npc_dad['A<<npctemp>>'] = 'U'
+	$npc_mom['A<<npctemp>>'] = 'U'
+	$npc_pic['A<<npctemp>>'] = 'xPICx'
+	$npc_PersType['A<<npctemp>>'] = 'XXXX'
+end
+
+--- npcstaticdefaults ---------------------------------
+

+ 19 - 16
locations/obj_din.qsrc

@@ -167,28 +167,28 @@ if $ARGS[0] = 'description':
 	'<<$nipplesize>>'
 	*nl
 	if preg = 1:
-		if denypreg = 1 and pregtime > 75:
+		if denypreg = 1 and pregchem > 2688:
 			'You seem to be putting on a bit of weight, your belly is definitely bigger.'
 			*nl
-		elseif pregtime > 196:
+		elseif pregchem > 4704:
 			'You''re rapidly approaching the finish line and have entered the third trimester. Your belly is so big now that you can barely remember what your toes look like. Your back hurts most of the time and it is a struggle to get to your feet if you sit down. The baby seems to think that your bladder makes a nice punching bag.'
 			*nl
-		elseif pregtime > 130:
+		elseif pregchem > 3696:
 			'Your belly is quite swollen now and shows under even the loosest of clothes. You find yourself constantly caressing your belly without realizing it.'
 			*nl
-		elseif pregtime > 90 and knowpreg = 1:
+		elseif pregchem > 3192 and knowpreg = 1:
 			'You are showing for sure now. Your tummy is starting to become rounder as it grows larger each day, although you can still wear baggy clothes to hide it. At least the morning sickness and nausea seem to have gone away for the most part.'
 			*nl
-		elseif pregtime > 90 and knowpreg = 0:
+		elseif pregchem > 3192 and knowpreg = 0:
 			'You can''t seem to stop gaining weight and your belly looks like it is getting bigger everyday, although you can still wear baggy clothes to hide it. At least the flu you''ve been fighting lately seems to have finally gone away for the most part.'
 			*nl
-		elseif pregtime > 75 and knowpreg = 1:
-			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach. Speaking of your stomach, you can definitely feel a baby bump now, although it is still hard to see.'
+		elseif pregchem > 1800 and knowpreg = 1:
+			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
 			*nl
-		elseif pregtime > 75 and knowpreg = 0:
-			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach. Speaking of your stomach, you have developed a bit of a paunch, although it is still hard to see.'
+		elseif pregchem > 1800 and knowpreg = 0:
+			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
 			*nl
-		elseif pregtime > 50:
+		elseif pregchem > 1200:
 			'You''ve noticed that your breasts seem firmer lately and your nipples seem to be sticking out more.'
 			*nl
 		end
@@ -2635,25 +2635,28 @@ if $ARGS[0] = 'old':
 	addobj '<center>Refresh</center>'
 	!addobj '<center>Settings</center>'
 	!addobj '<center>Cheats</center>'
-	if cheatConsole = 1:
-		addobj '<center>Console</center>'
-	end
+	if cheatConsole = 0: addobj '<center>Console</center>'
 	! if disable_autosave = 1:
 		! addobj '<center><font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font></center>'
 	! else
 		! addobj '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>'
 	! end
 	if cheatTime = 1:
-		addobj '<center><i>-1 Hour</i></center>'
-		addobj '<center><i>+1 Hour</i></center>'
+		addobj '<center>-1 Hour</center>'
+		addobj '<center>+1 Hour</center>'
 	end
 	addobj ''
 	addobj '<center><font color = red>Emergency</font></center>'
+	addobj ''
+	if debug_warning_closed = 0:
+		addobj '<center>This window is for debug only and can be safely closed.</center>'
+		addobj '<center>Remove debug info</center>'
+	end
 end
 
 if $ARGS[0] = 'wait':
 	cla
-	waiting = input ("How long would you like to wait?<br>(Default 15 minutes, maximum 120 minutes)")
+	waiting = input ("How long would you like to wait?<br>(maximum 120 minutes, leave blank or press cancel to wait 15 minutes)")
 
 	if waiting = '':
 		minut += 15

+ 3 - 2
locations/onobjsel.qsrc

@@ -30,9 +30,10 @@ if $selobj = '<center>Refresh</center>':gs '$menu_obnovit'
 	! if $selobj = '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>':gs 'obj_din', 'autosave'
 ! end
 if $selobj = '<center>Console</center>':dynamic $cheatmenu['dynamic']
-if $selobj = '<center><i>-1 Hour</i></center>':gs 'obj_din', '-1 Hour'
-if $selobj = '<center><i>+1 Hour</i></center>':gs 'obj_din', '+1 Hour'
+if $selobj = '<center>-1 Hour</center>':gs 'obj_din', '-1 Hour'
+if $selobj = '<center>+1 Hour</center>':gs 'obj_din', '+1 Hour'
 if $selobj = '<center><font color = red>Emergency</font></center>':gs 'obj_din', 'emergency'
+if $selobj = '<center>Remove debug info</center>': debug_warning_closed = 1 & gs 'stat'
 
 !The old menu: end
 

+ 2 - 2
locations/outdoors.qsrc

@@ -358,8 +358,8 @@ if $ARGS[0] = 'main':
 !!15 minute check to stop refreshes causing early gameover and cheating at exhibitionism
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
-			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0:
-				'<b><font color="red">You have the blood flowing down your legs and staining your clothes.</font></b>'
+			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'Gaddvor' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
+				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
 
 				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'
 

+ 1 - 1
locations/panties.qsrc

@@ -22,8 +22,8 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'wear':
+	panty_none = 0
 	if $ARGS[1] = '':
-		panty_none = 0
 		if $lastwornpantytype ! '':
 			$pantyworntype = $lastwornpantytype
 			pantywornnumber = lastwornpantynumber

+ 8 - 1
locations/park.qsrc

@@ -84,6 +84,13 @@ if $ARGS[0] = 'start':
 
 	act 'Walk around the park (1:00)': gt 'parkdin'
 
+	! Setup for teleport circle
+	if tpKnown['CentralPark'] = 1:
+		act 'Enter the hidden circle of trees': gt 'treeCircle', 'CentralPark'
+	else:
+		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'CentralPark'
+	end
+
 	if hour >= 10 and hour <= 22:
 		act 'Have some food in the cafe': minut += 5 & gt 'ParkKafe', 'start'
 	end
@@ -402,7 +409,7 @@ if $ARGS[0] = 'luna':
 						'You couldn''t even hit the target once.'
 					end
 
-					shoot_exp += 1
+					shoot_lvl += 1
 
 					act 'Move away':gt 'park', 'luna'
 				end

+ 1 - 1
locations/pavCommercial.qsrc

@@ -137,7 +137,7 @@ else
 	$desc_txt2 = '<a href="exec:msg ''vocational school, which is closed right now. It will reopen again at 7:00''">vocational school</a>.'
 end
 
-'<br>If you continue past the shops, you''ll eventually find a <<$desc_txt2>>.'
+'<br>If you continue past the shops, you''ll eventually find a <<$desc_txt2>>'
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 

+ 54 - 30
locations/pavtrain_market.qsrc

@@ -239,8 +239,8 @@ if $ARGS[0] = 'events':
 	gs 'stat'
 	rinevrand = rand(1,19)
 
-	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if rand(0,3) ! 0: 
 		gs 'pavtrain_market', rinevrand
 	else
@@ -273,6 +273,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the beggar and pretend not to hear him.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 	act 'Give some money': 
@@ -283,6 +284,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles which he kindly thanks you for.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 end
@@ -294,6 +296,8 @@ if ARGS[0] = 2:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 3:
@@ -306,10 +310,11 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -320,7 +325,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a science fiction book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -331,7 +336,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a romance novel (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			w_book += 1
@@ -348,10 +353,11 @@ if ARGS[0] = 4:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 5
 			money -= 699
 			card = 2
@@ -367,7 +373,7 @@ if ARGS[0] = 4:
 	if porndeal = 1:
 		if money >= 400:
 			act 'Buy a porn magazine for the Chinese boy (400 <b>₽</b>)':
-				cls
+				*clr & cla
 				minut += 5
 				money -= 400
 				haveporn = 1
@@ -380,7 +386,7 @@ if ARGS[0] = 4:
 		end
 	else
 		act 'Browse the porn magazines':
-			cls
+			*clr & cla
 			pcs_horny += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -394,7 +400,7 @@ if ARGS[0] = 4:
 					act 'Leave':gt 'pavtrain_market', 'start'
 					act 'Look for something else':gt 'pavtrain_market', 4
 					act 'Ask for the price':
-						cls
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -403,7 +409,7 @@ if ARGS[0] = 4:
 						act 'Look for something else':gt 'pavtrain_market', 4
 						if money >= 400:
 							act 'Buy magazine (400 <b>₽</b>)':
-								cls
+								*clr & cla
 								minut += 5
 								money -= 400
 								pornMagazine = 40
@@ -426,7 +432,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -448,7 +454,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -465,7 +471,7 @@ if ARGS[0] = 4:
 		end
 	end
 	act 'Ask to see the sex toys':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
 		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
@@ -549,6 +555,8 @@ if ARGS[0] = 5:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 6:
@@ -558,7 +566,8 @@ if ARGS[0] = 6:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/nenavizublyadcigan.jpg"></center>'
 	'You meet a Gypsy woman. She offers to tell your fortune.'
-	act 'Agree':
+	act 'Decline': gt 'pavtrain_market', 'start'
+	act 'Accept':
 		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gadaet'+rand(1,2)+'.jpg"></center>'
@@ -571,8 +580,7 @@ if ARGS[0] = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pusto.jpg"></center>'
 			'With a sneaking suspicion you start looking through your stuff. Your wallet is nowhere to be found!'
 			act 'Find the Gypsy':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
 				'You search the area hoping to find the thief, but she has already disappeared into the crowd.'
 				act 'Back': gt 'pavtrain_market', 'start'
@@ -589,13 +597,13 @@ if ARGS[0] = 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
-			cls
 			minut += 15
 			money -= tovpay
 			kosmetica += 50
-			gs 'stat'
 			gt 'pavtrain_market', 'start'
 		end
 	end
@@ -609,9 +617,10 @@ if ARGS[0] = 8:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
-			cls
 			minut += 15
 			vitamin += 20
 			money -= tovpay
@@ -628,14 +637,15 @@ if ARGS[0] = 9:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/condoms.jpg"></center>'
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
-			cls
 			minut += 15
 			prezik += 5
 			i = 5
 			:cndmlp
-				if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
+			if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
@@ -652,9 +662,11 @@ if ARGS[0] = 10:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			lipbalm += 30
 			money -= tovpay
@@ -684,10 +696,11 @@ if ARGS[0] = 12:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
-			cla
-			*clr
+			*clr & cla
 			fat+=3
 			frost = 0
 			pcs_health += 5
@@ -713,7 +726,6 @@ if ARGS[0] = 13:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dropwallet.jpg"></center>'
 	'You see a wallet fall out of a woman''s purse.'
-	cla
 	act 'Tell her':
 		*clr & cla
 		minut += 2
@@ -730,10 +742,9 @@ if ARGS[0] = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/zaglanut.jpg"></center>'
 		'You open the wallet and you see that there''s <<i>> <b>₽</b>'
 		act 'Take the money and throw away the wallet':
-			*clr & cla
 			money += i
 			pcs_mood += 10
-			gs 'stat'
+			killvar 'i'
 			gt 'pavtrain_market', 'start'
 		end
 		act 'Catch up with the woman and return her purse':
@@ -742,7 +753,8 @@ if ARGS[0] = 13:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
-			act 'Continue walking through the market': gt 'pavtrain_market','events'
+			act 'Stop wandering': gt 'pavtrain_market', 'start'
+			act 'Wander around the market': gt 'pavtrain_market','events'
 		end
 	end
 end
@@ -754,6 +766,8 @@ if ARGS[0] = 14:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 15:
@@ -763,6 +777,8 @@ if ARGS[0] = 15:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 16:
@@ -772,6 +788,8 @@ if ARGS[0] = 16:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
 	'Looking around, you almost collide with a man pulling a small cart.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 17:
@@ -781,6 +799,8 @@ if ARGS[0] = 17:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
 	'You wander past a the meet seller and see a butcher working with an axe.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 18:
@@ -790,6 +810,8 @@ if ARGS[0] = 18:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Look through the hole':
 		*clr & cla
 		if girl > 1: pcs_horny += 5
@@ -807,9 +829,11 @@ if ARGS[0] = 19:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/birthcontrolpills.jpg"></center>'
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			tabletki += 1
 			if rand(0,49) - (6*(8-tovpay/50)) <= 0: 

+ 1 - 1
locations/pavtrainhall.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = '':
 	*nl
 	if StoryLine = 1 and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:
-			'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
+			'You see your classmates <a href="exec:minut += 3 & $prevloc = $loc & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
 		end
 	end
 	*nl

+ 53 - 24
locations/phone_selfies.qsrc

@@ -9,6 +9,8 @@ if $ARGS[0] = 'selfies':
 	clovar = 1
 	undvar = 1
 	nudvar = 1
+	bathvar = 0
+	showervar = 0
 	
 	!!This variable will switch to bikini for beach selfies
 	$undname = 'underwear'
@@ -82,6 +84,34 @@ if $ARGS[0] = 'listretrieve':
 			temp_nudcnt += 1
 		if temp_nudcnt <= temp_total: jump'temp_loop2'
 	end
+	
+	!!loop for bath selfies
+	if bathvar = 1:
+		'<center><b>Bath selfies</b></center>'
+		*nl
+		temp_bathcnt = 1
+		dynamic 'temp_loop2 = <<$phone_loc>>_bathloop'
+		dynamic 'temp_total = <<$phone_loc>>_bathtot'
+		:temp_loop3
+			dynamic '$phone_locval = <<$phone_loc>>_bathselfie[<<temp_bathcnt>>]'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/bath/<<temp_bathcnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/bath/<<temp_bathcnt>>.jpg"     height="150" /></a>  '
+			temp_bathcnt += 1
+		if temp_bathcnt <= temp_total: jump'temp_loop3'
+	end
+	
+	!!loop for shower selfies
+	if showervar = 1:
+		'<center><b>Shower selfies</b></center>'
+		*nl
+		temp_showercnt = 1
+		dynamic 'temp_loop2 = <<$phone_loc>>_showerloop'
+		dynamic 'temp_total = <<$phone_loc>>_showertot'
+		:temp_loop4
+			dynamic '$phone_locval = <<$phone_loc>>_showerselfie[<<temp_showercnt>>]'
+			if $phone_locval = 1: *p '<a href="exec:view''images/pc/selfies/<<$phone_loc>>/shower/<<temp_showercnt>>.jpg''"><img src="images/pc/selfies/<<$phone_loc>>/shower/<<temp_showercnt>>.jpg"     height="150" /></a>  '
+			temp_showercnt += 1
+		if temp_showercnt <= temp_total: jump'temp_loop4'
+	end
 end
 
 if $ARGS[0] = 'listretrieve2':
@@ -628,6 +658,9 @@ end
 if $ARGS[0] = 'bathroom':
 	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
 	$phone_loc = 'bathroom'
+	gs 'telefon', 'Phone_selfie_totals'
+	bathvar = 1
+	showervar = 1
 	*nl
 	gs 'phone_selfies', 'listretrieve'
 	
@@ -755,7 +788,6 @@ end
 
 if $ARGS[0] = 'family':
 	'<center><h4><font color="maroon">Family members</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -763,17 +795,17 @@ if $ARGS[0] = 'family':
 	:familygruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 7 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 7 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 7:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 7:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 7:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 7:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'familygruploop'
+	if i <= aarraynumber:jump 'familygruploop'
 
 	'<<$textgrup>>'
 	
@@ -784,7 +816,6 @@ end
 
 if $ARGS[0] = 'school':
 	'<center><h4><font color="maroon">School friends</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -792,17 +823,17 @@ if $ARGS[0] = 'school':
 	:schoolgruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5) and selfieenable[i] = 1:
+		if (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5) and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+		if count1< 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
 			$textgrup += '</td>'
-		elseif count1 = 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+		elseif count1 = 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'schoolgruploop'
+	if i <= aarraynumber:jump 'schoolgruploop'
 
 	'<<$textgrup>>'
 	
@@ -813,7 +844,6 @@ end
 
 if $ARGS[0] = 'teacher':
 	'<center><h4><font color="maroon">Teachers</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -821,17 +851,17 @@ if $ARGS[0] = 'teacher':
 	:teachergruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 6 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 6 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 6:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 6:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 6:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 6:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'teachergruploop'
+	if i <= aarraynumber:jump 'teachergruploop'
 
 	'<<$textgrup>>'
 	
@@ -842,7 +872,6 @@ end
 
 if $ARGS[0] = 'pavlovsk':
 	'<center><h4><font color="maroon">Pavlovsk friends</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
 	$textgrup = ''
 	count1 = 0
 	i = 1
@@ -850,17 +879,17 @@ if $ARGS[0] = 'pavlovsk':
 	:pavgruploop	
 		if count1 = 6 : $textgrup += '<tr>'
 
-		if grupTipe[i] = 8 and selfieenable[i] = 1:
+		if npc_grupTipe['A<<i>>'] = 8 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
 		end
-		if count1< 6 and grupTipe[i] = 8:
+		if count1< 6 and npc_grupTipe['A<<i>>'] = 8:
 			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] = 8:
+		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 8:
 			$textgrup +='</td></tr><tr>' & count1 = 0
 		end
 		i += 1
-	if i <= 231:jump 'pavgruploop'
+	if i <= aarraynumber:jump 'pavgruploop'
 
 	'<<$textgrup>>'
 	

+ 8 - 0
locations/placer_gskver.qsrc

@@ -148,6 +148,14 @@ end
 !_________________Change the date/nights, seasons. End.___________________________
 
 
+!Setup for teleport circle
+if tpKnown['PavlovskPark'] = 1:
+	act 'Enter the hidden circle of trees': gt 'treeCircle', 'PavlovskPark'
+else:
+	act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'PavlovskPark'
+end
+
+
 if soniaPS=5 and rand(1,10)=>9 and hour>14 and hour<20:
 	''
 	'<b>While you walk past a row of bushes, you hear some strange sounds coming from behind them.</B>'

+ 53 - 36
locations/pod_ezd.qsrc

@@ -1041,22 +1041,24 @@ end
 !game events in the attic (fifth floor)
 if $ARGS[0] = 'etaj5_cherdak_ev1':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur', 7
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev1_1.jpg"></center>'
 	'When you walk up the stairs to the fifth floor, you see some unfamiliar boys fucking a girl. Currently, one guy is fucking her while the other one films everything with his camera.'
 	gs 'gopsex', 'masturb_gg'
 	act 'Hide and keep watching':
 		*clr & cla
-		gs 'arousal', 'voyeur', 4
+		gs 'arousal', 'voyeur', 6
+		minut -= 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev1_2.jpg"></center>'
 		'Suddenly you see the guy holding the camera reach down undoes pants, before telling her to take his cock out and give him a blowjob. She happily does and takes the large cock in her mouth, while the guy behind her is still pounding her. He slaps her ass a few times, knowing her moans will make the other guy feel great.'
 		gs 'gopsex', 'masturb_gg'
-		minut -=2
 		gs 'stat'
 		act 'Stay hidden and keep watching':
 			*clr & cla
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur', 8
+			minut -= 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev1_3.jpg"></center>'
 			'The guys switch places now, and the other guy now holds the camera while the girl keeps sucking on one cock while getting fucked by the other. He makes sure to zoom in on her face while the other guy spanks her hard, trying to provoke a cute reaction for the video.'
@@ -1070,25 +1072,27 @@ end
 
 if $ARGS[0] = 'etaj5_cherdak_ev2':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 4
+	gs 'arousal', 'voyeur', 6
+	minut -= 4
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_1.jpg"></center>'
 	'When you walk up the stairs to the fifth floor, you see a guy and a girl having sex. Currently, the girl is giving him an enthusiastic blowjob while a second guy films everything with his camera.'
 	act 'Hide and keep watching':
 		*clr & cla
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur', 5
+		minut -= 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_2.jpg"></center>'
 		'After a moment she decides that one cock is not enough and, with a lewd voice, asks: "Please, I need more cocks, let me suck yours too."'
 		'The other guy is happy to oblige, and soon she is struggling to take both cocks in her mouth. You can tell this is definitely not the first time she has done this.'
 		act 'Continue':
 			*clr & cla
-			gs 'arousal', 'voyeur', 2
+			gs 'arousal', 'voyeur', 5
+			minut -= 3
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_3.jpg"></center>'
 			'Suddenly, the boys pull away from the girl. They tell her: "Alright, time to fuck. Show your ass to the camera, Maria."'
 			'She obediently does, pulling her ass cheeks aside to show the boys her puckered anus. It doesn''t look very tight, but does look ready for anal sex, maybe they had been planning this?'
 			gs 'gopsex', 'masturb_gg'
-			minut -=3
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -1098,7 +1102,7 @@ if $ARGS[0] = 'etaj5_cherdak_ev2':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					gs 'arousal', 'voyeur', 2
+					gs 'arousal', 'voyeur', 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_5.jpg"></center>'
 					'After a while, the couple changes position and you see the guy rubbing his dick against her ass. As you expected, his cock slides in her ass quite easily, and the guy takes the initiative now and begins to thrust his dick deeper inside her ass while she tries to steady herself against the wall.'
 					gs 'gopsex', 'masturb_gg'
@@ -1113,7 +1117,7 @@ if $ARGS[0] = 'etaj5_cherdak_ev2':
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							gs 'arousal', 'voyeur', 2
+							gs 'arousal', 'voyeur', 5
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_7.jpg"></center>'
 							'The guys tell her to get on her knees, and eagerly jerk off over her while the camera guy films the jets of cum land on her face.'
 							gs 'gopsex', 'masturb_gg'
@@ -1127,7 +1131,7 @@ if $ARGS[0] = 'etaj5_cherdak_ev2':
 								gs 'stat'
 								act 'Continue':
 									*clr & cla
-									minut +=2
+									minut += 2
 									gs 'arousal', 'end'
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev2_9.jpg"></center>'
@@ -1153,7 +1157,8 @@ end
 
 if $ARGS[0] = 'etaj5_cherdak_ev3':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 4
+	gs 'arousal', 'voyeur', 6
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev3_1.jpg"></center>'
 	'When you walk up the stairs to the fifth floor, you see a girl giving two guys an enthusiastic blowjob at the same time. One of the guys is filming everything with his camera.'
@@ -1165,12 +1170,12 @@ if $ARGS[0] = 'etaj5_cherdak_ev3':
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
-			gs 'arousal', 'voyeur', 4
+			gs 'arousal', 'voyeur', 5
+			minut -= 3
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev3_3.jpg"></center>'
 			'The man holding the camera is tired of being left out, and he asks his friend to swing her around she can use her mouth at the same time. He does, and tells the girl to lean against the other man''s chest while she sucks him off. The girl does, and from the look in her eyes you can tell she''s thrilled by all this.'
 			'After about five minutes the body of the guy behind her tenses, and from his grunting you can only assume he finished right in her pussy.'
 			gs 'gopsex', 'masturb_gg'
-			minut -=3
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -1180,7 +1185,8 @@ if $ARGS[0] = 'etaj5_cherdak_ev3':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					gs 'arousal', 'voyeur', 2
+					gs 'arousal', 'voyeur', 5
+					minut -= 3
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev3_5.jpg"></center>'
@@ -1199,17 +1205,18 @@ end
 
 if $ARGS[0] = 'etaj5_cherdak_ev4':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur', 7
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev4_1.jpg"></center>'
 	'When you walk up the stairs to the fifth floor, you see an unfamiliar girl showing off her boobs to two guys. One of them is holding a camera. You''re fairly sure you have never seen any of them before.'
 	act 'Hide and keep watching':
 		*clr & cla
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'voyeur', 5
+		minut -= 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev4_2.jpg"></center>'
 		'One of the guys boldly walks up to the girl, his dicking hanging out of his pants already. She unashamedly squats before him and takes the dick in her mouth, giving him a skillful blowjob while the other guy keeps filming everything. Are they shooting a porn video!?'
 		gs 'gopsex', 'masturb_gg'
-		minut -=3
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
@@ -1219,7 +1226,7 @@ if $ARGS[0] = 'etaj5_cherdak_ev4':
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
-				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'voyeur', 5
 				minut -=3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev4_4.jpg"></center>'
 				'The girl then stands up straight and gets between the two guys, presenting her ass to one of them while she leans over to take the dick of the other back in her mouth. Soon she''s being spit-roasted, taking in dicks on both ends.'
@@ -1233,7 +1240,8 @@ if $ARGS[0] = 'etaj5_cherdak_ev4':
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
-						gs 'arousal', 'voyeur', 2
+						gs 'arousal', 'voyeur', 5
+						minut -= 3
 						gs 'arousal', 'end'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev4_6.jpg"></center>'
@@ -1256,13 +1264,15 @@ end
 if $ARGS[0] = 'event_1':
 	menu_off = 1
 	*clr & cla
-	gs 'arousal', 'voyeur', 2
+	gs 'arousal', 'voyeur', 5
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev1_1.jpg"></center>'
 	'As you walk around a corner in the stairwell, you''re suddenly looking straight at a woman''s bare pussy! She''s sitting on some stairs and is casually smoking a cigarette. Her partner chats her up, while he has a great look at her naked pussy and her widely spread legs.'
 	act 'Keep watching':
 		*clr & cla
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur', 6
+		minut -= 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev1_2.jpg"></center>'
 		'The girl notices you, and gives you a cute wink. She keeps talking with her partner, and pulls her boobs out of her shirt while spreading her legs even further. You''re confused is she doing this for you, or for him?'
@@ -1275,7 +1285,8 @@ end
 if $ARGS[0] = 'event_2':
 	menu_off = 1
 	*clr & cla
-	gs 'arousal', 'voyeur', 7
+	gs 'arousal', 'voyeur', 10
+	minut -= 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev3.jpg"></center>'
 	'As you walk around a corner in the stairwell, you run into two boys fucking some random girl dressed in lingerie and a coat. She looks familiar.'
 	'You hide for a second and try to look if you can recognize her in some way, but she''s squeezed between the boys and her face is hidden the whole time.'
@@ -1288,13 +1299,15 @@ end
 if $ARGS[0] = 'event_3':
 	menu_off = 1
 	*clr & cla
-	gs 'arousal', 'voyeur', 3
+	gs 'arousal', 'voyeur', 6
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_1.jpg"></center>'
 	'As you walk around a corner in the stairwell, you see Yelena Kotov, a girl from your class. She''s taking off her panties in front of several guys. If her brother Vitek could see this, he''d probably be beating the crap out of them right now he''s really protective of his sister.'
 	act 'Hide and watch them':
 		*clr & cla
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur', 6
+		minut -= 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_2.jpg"></center>'
 		'Lena turns her back to the guys next, and pulls up her skirt slightly. She shows off her well-toned ass, slowly wagging it as she asks seductively over her shoulder: "Do you like what you see, boys?"'
@@ -1306,11 +1319,11 @@ if $ARGS[0] = 'event_3':
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
-				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'voyeur', 5
+				minut -= 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_4.jpg"></center>'
 				'Lena really gets into it, posing seductively for the camera now while she lets her skirt ride up a little more. You can tell the stares of the guys turn her on a lot, and you realize Vitek''s little sister is not as innocent as she looks.'
 				gs 'gopsex', 'masturb_gg'
-				minut -=3
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
@@ -1320,7 +1333,7 @@ if $ARGS[0] = 'event_3':
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'voyeur', 5
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_6.jpg"></center>'
 						'Lena turns her back to the guys again, her skirt pulled up so far now that she''s showing off all her holes to the camera.'
 						gs 'gopsex', 'masturb_gg'
@@ -1344,7 +1357,8 @@ end
 
 if $ARGS[0] = 'event_4':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 3
+	gs 'arousal', 'voyeur', 6
+	minut -= 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev5_1.jpg"></center>'
 	'You see a cute girl in a nightie standing on a flight of stairs, in the stairwell, doing several poses for a strong looking man holding a camera.'
@@ -1356,11 +1370,11 @@ if $ARGS[0] = 'event_4':
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'voyeur', 5
+			minut -= 3
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev5_3.jpg"></center>'
 			'He continues: "Okay, now raise your nightie, I want some photos of your body too. Excellent babe, you''re doing great."'
 			gs 'gopsex', 'masturb_gg'
-			minut -=3
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -1373,7 +1387,8 @@ if $ARGS[0] = 'event_4':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'voyeur', 5
+					minut -= 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev5_5.jpg"></center>'
 					'He encourages her further: "Wow, that''s hot. Bend over babe, show me your pretty ass."'
 					'She leans over and pulls her nightie up, showing the camera her bare ass cheeks and pulls one to the side a bit with her hand to show off her holes more: "Like this?"'
@@ -1383,15 +1398,16 @@ if $ARGS[0] = 'event_4':
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
-						gs 'arousal', 'masturbate', 3
+						gs 'arousal', 'masturbate', 5
+						minut -= 3
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev5_6.jpg"></center>'
 						'He walks up a bit closer to her: "Almost done babe, I just need a few close-ups. Just bend over and show me your ass."'
 						gs 'gopsex', 'masturb_gg'
-						minut -=3
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							gs 'arousal', 'voyeur', 3
+							gs 'arousal', 'voyeur', 5
+							minut -= 3
 							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev5_7.jpg"></center>'
@@ -1415,7 +1431,8 @@ end
 
 if $ARGS[0] = 'event_5':
 	menu_off = 1
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur', 10
+	minut -= 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/luda/event/ev2.jpg"></center>'
 	'You greet aunt Luda in the stairwell, she''s on her way back up after throwing away some garbage. She greets you back, but says she has no time to chat and it looks like she''s in a hurry to get back to her apartment. When you look up, you see she''s not even wearing any pants or underwear! She can be so slutty sometimes.'

+ 6 - 6
locations/poli.qsrc

@@ -151,9 +151,9 @@ if $ARGS[0] = 'start':
 			money -= 15000
 			pregtime = 0
 			pregtalk = 0
-			pregTalkPC = 0
-			pregTalkNat = 0
-			pregTalkbrother = 0
+			pcs_pregtalk = 0
+			npc_pregtalk['A16'] = 0
+			npc_pregtalk['A34'] = 0
 			preg = 0
 			thinkpreg = 0
 			knowpreg = 0
@@ -245,9 +245,9 @@ if $ARGS[0] = 'start':
 			knowpregrecover = 1
 			vidage += 1
 			pregtalk = 0
-			pregTalkPC = 0
-			pregTalkNat = 0
-			pregTalkbrother = 0
+			pcs_pregtalk = 0
+			npc_pregtalk['A16'] = 0
+			npc_pregtalk['A34'] = 0
 			pregchem = 0
 			cycle = 4
 			gs 'cum_cleanup', 'reset'

+ 1 - 1
locations/pornstudio.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'manager':
 
 	if firstkasting = 0:gt 'pornstudio', 'first'
 
-	if pregtime >= 90 and pregtalkpornstudio = 0:gt 'pornstudio', 'pregreact'
+	if pregchem >= 2688 and pregtalkpornstudio = 0:gt 'pornstudio', 'pregreact'
 
 	if pfilmNO = 1:
 	! Banned from shooting porn

+ 2 - 0
locations/preCUST.qsrc

@@ -231,6 +231,7 @@ if $ARGS[0] = 'Done':
 		pcs_energy = 100
 		pcs_hydra = 100
 		pcs_sleep = 100
+		willpowermax = 150
 
 !!		Starting Option Adjustments
 !!		The TG Background options would be aplied here
@@ -297,6 +298,7 @@ if $ARGS[0] = 'Done':
 		pcs_energy = 100
 		pcs_hydra = 100
 		pcs_sleep = 100
+		willpowermax = 100
 
 !!		Starting Option Adjustments
 !!		The TG Background options would be aplied here

+ 18 - 0
locations/preSYS.qsrc

@@ -475,6 +475,7 @@ if $ARGS[0] = 'charselect':
 				pcs_skin = 40
 				genbsize = 17
 				salo = 60
+				willpowermax = 90
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -495,6 +496,7 @@ if $ARGS[0] = 'charselect':
 				grupvalue[6] = 30
 				npc_rel['A29'] += 20
 				if player_avatar ! 1: pcs_hairlng = 200
+				willpowermax = 80
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -519,6 +521,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A129'] += 10
 				komp = 1
 				if player_avatar ! 1: pcs_hairlng = 120
+				willpowermax = 90
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -540,6 +543,7 @@ if $ARGS[0] = 'charselect':
 				chessmonth = month
 				npc_rel['A151'] += 20
 				if player_avatar ! 1: pcs_hairlng = 200
+				willpowermax = 90
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -568,6 +572,7 @@ if $ARGS[0] = 'charselect':
 				gsAboVolley += 30
 				npc_rel['A13'] += 10
 				npc_rel['A69'] += 10
+				willpowermax = 140
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -602,6 +607,7 @@ if $ARGS[0] = 'charselect':
 				gsAboDance += 30
 				npc_rel['A23'] += 20
 				grupvalue[1] = 20
+				willpowermax = 140
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -626,6 +632,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A8'] += 5
 				npc_rel['A18'] -= 30
 				npc_rel['A131'] += 10
+				willpowermax = 140
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -647,6 +654,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A131'] += 10
 				npc_rel['A149'] += 10
 				npc_rel['A34'] += 10
+				willpowermax = 140
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -679,6 +687,7 @@ if $ARGS[0] = 'charselect':
 				gs 'preSYS', 'socialgroup_setting', 10, 5, 0, 0, 0, 0
 				npc_rel['A140'] += 10
 				salo = 80
+				willpowermax = 110
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -719,6 +728,7 @@ if $ARGS[0] = 'charselect':
 				gs 'preSYS', 'socialgroup_setting_boys', 20, 20, 20, 20, 20, 0
 				salo = 60
 				pav_sex = 20
+				willpowermax = 110
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -759,6 +769,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A33'] -= 10
 				npc_rel['A34'] -= 10
 				grupvalue[4] = 40
+				willpowermax = 130
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -794,6 +805,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A29'] -= 20
 				npc_rel['A33'] -= 10
 				npc_rel['A34'] -= 10
+				willpowermax = 120
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -856,6 +868,7 @@ if $ARGS[0] = 'charselect':
 				kotovLoveQW = 1
 				vitekvisit = 5
 				npc_sex['A9'] += 5
+				willpowermax = 100
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -915,6 +928,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A28'] -= 10
 				npc_rel['A29'] -= 10
 				npc_rel['A33'] += 10
+				willpowermax = 120
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -941,6 +955,7 @@ if $ARGS[0] = 'charselect':
 				pcs_observ = 20
 				pcs_skin = 10
 				npc_rel['A11'] -= 20
+				willpowermax = 80
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -964,6 +979,7 @@ if $ARGS[0] = 'charselect':
 					pcs_lashes = 2
 				end
 				salo = 20
+				willpowermax = 70
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -995,6 +1011,7 @@ if $ARGS[0] = 'charselect':
 				npc_rel['A28'] += 10
 				npc_rel['A29'] += 10
 				npc_rel['A11'] -= 20
+				willpowermax = 150
 				gt 'preCUST', 'SGStart'
 			end
 		end
@@ -1061,6 +1078,7 @@ if $ARGS[0] = 'charselect':
 				orgasm = 15
 				swallow = 20
 				trt_cumeater = 1
+				willpowermax = 50
 				gt 'preCUST', 'SGStart'
 			end
 		end

+ 4 - 3
locations/shop.qsrc

@@ -22,6 +22,7 @@ if $shoplocation = 'main':
 	if hour < 8 or hour > 20:
 		'The supermarket is currently closed.'
 
+		if $loc = 'shop': $loc = $loc_bak
 		act 'Leave the store':minut += 3 & gt $loc
 		exit
 	end
@@ -378,13 +379,13 @@ if $shoplocation = 'clothing':
 				'Coat 1'
 				func('$clothing_name', 'coat', 1)
 				if CloInhibit > pcs_inhib:'You don''t feel daring enough to buy an outfit this revealing.'
-				'Costs 5,000 <b>₽</b>.'
+				'Costs 1,400 <b>₽</b>.'
 
 				act 'Leave':gt 'shop'
-				if money >= 5000 and CloInhibit <= pcs_inhib:
+				if money >= 1400 and CloInhibit <= pcs_inhib:
 					act 'Buy':
 						cla
-						money -= 5000
+						money -= 1400
 						coat[1] = 1
 						coatH[1] = 60
 						gt 'shop', '<font color="green">You bought <b>coat 1</b>.</font>'

+ 41 - 0
locations/spellTeleport.qsrc

@@ -0,0 +1,41 @@
+#spellTeleport
+! Do the stuff of a Teleport
+!	ARGS[0] = the Target Location
+
+$NewLocation = $ARGS[0]
+
+:RandLocLoop
+$randomLoc = $tpLocations[rand(0,arrsize($tpLocations) - 1)]
+if $randomLoc = $NewLocation or $randomLoc = $EntryPoint:
+	jump 'RandLocLoop'
+end
+
+didItWork = func("castSpell", "teleport")
+
+if didItWork > 0:
+	*nl
+	"The blur you see just outside the ring seems to shift."
+	wait 1000
+	if $treeCircArg[$NewLocation] = "":
+		gt $treeCircLoc[$NewLocation]
+	else:
+		gt $treeCircLoc[$NewLocation], $treeCircArg[$NewLocation]
+	end
+elseif didItWork < 0:
+	*nl
+	"The blur you see just outside the ring seems to shift.  Something did not go right!"
+	wait 1000
+	if $treeCircArg[$randomLoc] = "":
+		gt $treeCircLoc[$randomLoc]
+	else:
+		gt $treeCircLoc[$randomLoc], $treeCircArg[$randomLoc]
+	end
+else:
+	'You feel drained, but the energy fizzles out and nothing happens'
+end
+
+killvar '$randomLoc'
+killvar '$NewLocation'
+killvar didItWork
+
+-- spellTeleport ---------------------------------

+ 1 - 1
locations/sportShop.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feeling pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes is motivating as hell.'
 	*nl
 	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
-		'You can buy a high-quality <a href="exec:minut += 5 & money -= 1000 & refillable_bottle = 1 & gt ''sportShop'', ''start''">water bottle</a> that you can carry around in your purse.'
+		'You could buy a high-quality <a href="exec:minut += 5 & money -= 1000 & refillable_bottle = 1 & gt ''sportShop'', ''start''">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'
 	elseif refillable_bottle = 0 and (money < 1000 or bag = 0):
 		'The shop sells high-quality water bottles for 1,000 <b>₽</b>. You could carry one around in '+iif(bag > 0, 'your', 'a')+' purse.'
 	end

+ 10 - 7
locations/stat.qsrc

@@ -192,12 +192,11 @@ elseif pcs_inhib > 100:
 end
 
 healthmax = (pcs_vital * 10 + pcs_stren * 5)
-willpowermax = (pcs_intel * 5 + pcs_sprt * 5)
 stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
 mannamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
 if healthmax < 1: healthmax = 1
-if willpowermax < 1: willpowermax = 1
+if willpowermax < 50: willpowermax = 50
 if stammax < 1: stammax = 1
 if mannamax < 1: mannamax = 1
 
@@ -424,6 +423,10 @@ if minut >= 60:
 		pcs_sleep -= 4
 	end
 
+	pcs_willpwr += willpowermax/50
+	if pcs_willpwr > willpowermax: pcs_willpwr = willpowermax
+	if pcs_willpwr < 20: will_degrade += 1
+	if will_degrade >= 20: willpowermax -= 1 & will_degrade = 0
 	if pcs_stam > stammax: pcs_stam = stammax
 
 	gs 'femcyc'
@@ -935,15 +938,15 @@ else
 end
 
 if pcs_willpwr >= willpowermax:
-	$pcs_willpwr = '<font color="green">Your mind is clear.</font>'
+	$pcs_willpwr = '<font color="green">You feel in charge of your actions.</font>'
 elseif pcs_willpwr >= willpowermax * 75 / 100:
-	$pcs_willpwr = '<font color=#0064FF>You are mostly clear of mind.</font>'
+	$pcs_willpwr = '<font color=#0064FF>You are mostly in control.</font>'
 elseif pcs_willpwr >= willpowermax * 50 / 100:
-	$pcs_willpwr = '<font color="brown">You are depressed.</font>'
+	$pcs_willpwr = '<font color="brown">You might have to make some concessions.</font>'
 elseif pcs_willpwr >= willpowermax * 25 / 100:
-	$pcs_willpwr = '<font color="red">You have depression.</font>'
+	$pcs_willpwr = '<font color="red">You will have to toe the line.</font>'
 else
-	$pcs_willpwr = '<font color="red">You are on the verge of madness.</font>'
+	$pcs_willpwr = '<font color="red">You are completely at our people''s mercy.</font>'
 end
 
 !!stop auto birth control pill taking if the player believes they are pregnant or are pregnant

+ 1 - 1
locations/stat_display.qsrc

@@ -1283,7 +1283,7 @@ if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec
 if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
 if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
 if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
-if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the Pavlovsk clinic. Your shift starts at 8:00.</font></b>'
+if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
 if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
 if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
 

+ 1 - 1
locations/street.qsrc

@@ -68,7 +68,7 @@ housrA = 0
 if car > 0 and cardrive = 1: 'In the parking lot is <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 
 if home_owned[1] > 0:
-	act '<b>GO HOME</b>':
+	act '<b>Go home</b>':
 		gorand = rand(0, 100)
 
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80:

+ 1 - 1
locations/stwork.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/striprazd.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'

+ 304 - 0
locations/swamp_woods.qsrc

@@ -0,0 +1,304 @@
+# swamp_woods
+
+!TODO: Break into more arg blocks
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+    $loc = 'swamp_woods'
+	$metka = ''
+	$menu_loc = 'swamp_woods'
+	$menu_arg = ''
+	menu_off = 0
+	$location_type = 'secluded'
+
+	gs 'gadukino_event', 'sound'
+    gs 'stat'
+	
+	gs 'hunter_ambient', 'schedule'
+
+    cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
+	'You are in the woods near the hut. You can see it not too far in the distance.'
+	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
+
+	!TODO: Make schedule more dynamic e.g. more factors
+	
+	if hunters_evening = 1: *nl & 'You hear some gunshots and see <a href="exec: gt ''swamp_woods'', ''shooting_practice'' ">Andrei</a> not too far in the distance shooting some bottles.'
+	*nl
+
+	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
+	if firewood < 25:
+		'You can pick up some firewood around here to keep the fire going.'
+
+		act 'Collect firewood (0:45)':
+			cla & *clr
+			if $clothingworntype ! 'nude':
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
+			end
+
+			firewood += 10
+			minut += 45
+			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
+			
+			if firewood < 10:
+				'You think you might need to pick some more to get a fire going'
+			else:
+				'You think you have enough firewood to get a fire going'
+			end		
+
+			act 'Further': gt 'swamp_yard', 'nearby_woods'
+		end
+	else
+		'You think about picking up some firewood before you remember you have plenty back at the yard.'
+	end
+	
+	act 'Try to circle around the swamp':
+		*clr & cla
+		if pcs_bushcraft < 15:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
+			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
+			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
+
+			act 'Further': gt 'swamp_yard', 'nearby_woods'
+		elseif pcs_bushcraft < 30:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
+			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
+
+			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
+			act 'Try anyway':
+				*clr & cla
+				minut += 180
+				nearby_woods_check = rand(1,10)
+
+				if nearby_woods_check = 1:
+					!Make it to the other side fine
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success_nude.jpg"></center>'
+					end
+					'You stick as close to the swamp as possible and follow the edge in one direction.'
+					'Even though you occassionally step into the swamp you manage to not get stuck'
+					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
+
+					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
+				elseif nearby_woods_check <= 3:
+					!End up stuck in the swamp
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck_nude.jpg"></center>'
+					end
+					'You stick as close to the swamp as possible and follow the edge in one direction.'
+					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
+					
+					*nl
+					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
+					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+				else
+					if $clothingworntype ! 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
+					end
+
+					if nearby_woods_check <= 5:
+						!Circle back to where the pcs started
+						'You start going into the woods in a direction you think will take you around the swamp.'
+						'After a few hours walking you realize your surroundings are a bit familiar.'
+						'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
+
+						*nl
+						'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
+						act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
+					else	
+						!Get lost in the woods
+						'You start going into the woods in a direction you think will take you around the swamp.'
+						'After a few hours walking you realize you have no idea where you are going.'
+						'You look back to see if you can get back to the hut but nothing around seems familiar'
+
+						act 'This can''t be good': gt 'gadforestlost','1'
+					end
+				end	
+			end	
+		else
+			minut += 120
+
+			!Make it back without effort
+			if $clothingworntype ! 'nude':
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder_nude.jpg"></center>'
+			end
+			
+			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
+			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
+			'After a couple hours you are on the other edge of the forest'
+
+			act 'Further': gt 'gadforest','4'
+		end	 	
+	end
+end
+
+if $ARGS[0] = 'shooting_practice':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+	'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
+
+	act 'Walk away': gt 'swamp_woods'
+	act 'Ask if you can shoot too':
+		if hunter_collective_opinion > 50 and rand(1,4) = 1:
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+			'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
+			'"And what if I cannot?" you ask.'
+			'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
+			'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
+			
+			act 'Take the bet':
+				cla & *clr
+				
+				hunter_collective_opinion += 6
+				gs 'stat'
+
+				if $clothingworntype ! 'nude':
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
+				end	
+				'You line up your sights and aim at the bottle. You inhale and hold your breath before...'
+				act 'Pull the trigger': gt 'hunter_interactions', 'shooting_bet'
+			end
+			act 'Refuse':
+				cla
+
+				hunter_collective_opinion -= 2
+				gs 'stat'
+
+				'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
+				act 'Further': gt 'swamp_woods'
+			end
+		elseif hunter_collective_opinion > 35:
+			gt 'swamp_woods', 'shooting_practice', 'practice'
+		elseif hunter_sexual_comfort > 20:
+			gt 'swamp_woods', 'shooting_practice', 'andrei_request'
+		else
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+			'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
+			act 'Further': gt 'swamp_woods'
+		end
+	end
+
+	if $ARGS[1] = 'practice':
+		cla & *clr
+		minut += 60
+		shoot_lvl += 2
+
+		gs 'stat'
+
+		if $clothingworntype ! 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
+		end	
+		'"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
+		act 'Walk away': gt 'swamp_woods'
+	end	
+
+	if $ARGS[1] = 'andrei_request':
+		cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+			'"You see, these bullets don''t come free" says Andrei. "My time looking over your shoulder also doesn''t come free. You gotta pay me back somehow"' 
+			'"What do you mean?" you ask, with a vague idea of where this is going.'
+			
+			act 'Walk away': gt 'swamp_woods'
+
+			if $clothingworntype = 'nude':
+				'"Since you are all naked might as well let me fuck your little pussy right here." he says. "Then I will let you shoot a bit"'
+				!TODO: if pcs_inhib < x
+				act 'Let him fuck you': gt 'hunter_interactions', 'andrei_quick_fuck'
+			else
+				andrei_shooting_request = rand(1,4)
+				
+				if andrei_shooting_request = 1:
+					'"I want you to show me your tits. Just lift your top and let me have a good look at em. You can shoot the rifle then."'
+					act 'Flash your tits':
+						cla & *clr
+						hunter_sexual_comfort += 3
+						gs 'arousal', 'flashlite', 3
+						gs 'arousal', 'end'
+
+						gs 'stat'
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
+						'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+						'"Would appreciate a longer look but I will take it" responds Andrei'
+
+						act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					end
+				
+				elseif andrei_shooting_request = 2:
+					'"I want you to show me your pussy. Go sit on that log and lift up your bottom. You can shoot the rifle then."'
+					act 'Flash your pussy':
+						cla & *clr
+						hunter_sexual_comfort += 5
+						gs 'arousal', 'flashlite', 5
+						gs 'arousal', 'end'
+
+						gs 'stat'
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
+						'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+						'"Would appreciate a longer look but I will take it" responds Andrei'
+
+						act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					end
+				
+				elseif andrei_shooting_request = 3:
+					'"I want you to take off all your clothes. Then hand them all to me. If you wanna shoot my rifle, you gotta be in your birthday suit."'
+					act 'Strip naked':
+						cla & *clr
+						hunter_sexual_comfort += 7
+
+						gs 'clothing', 'strip', 'swamphouse'
+						gs 'underwear', 'remove'
+
+						gs 'arousal', 'flash', 10, 'exhibitionism'
+						gs 'arousal', 'end'
+
+						gs 'stat'
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
+						'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
+						'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
+						'"This  naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
+
+						act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					end
+				
+				elseif andrei_shooting_request = 4:
+					'"Seeing a young pretty thing like you prancing around gives me a boner. I want you to suck my dick." demands Andrei.'
+					act 'Suck his dick':
+						cla & *clr
+						hunter_sexual_comfort += 8
+
+						gs 'boyStat', 'A172'
+						gs 'arousal', 'bj', 15, 'sub', 'exhibitionism'
+						gs 'cum_call', 'mouth', 'A172', 1
+						swallow += 1
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
+						'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
+						'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
+
+						act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
+					end
+				end	
+			end
+	end
+end
+
+--- swamp_woods ---------------------------------

+ 169 - 227
locations/swamp_yard.qsrc

@@ -43,26 +43,25 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'The yard in front of the hut.'
 	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 	if findvel = 3:'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-	if hunters > 0 and huntersKnow = 0:'You spot some unfamiliar people standing in front of the hut.'
-	if hunters > 0 and huntersKnow > 0 and hour >= 8 and hour < 20:'You notice the <a href="exec: gt ''hunters'', ''check_opinion'' ">hunters</a> standing in the front yard.'
-
+	if hunters_off = 0 and hunters_sleep = 0 and huntersKnow = 0:'You spot some unfamiliar people standing in front of the hut.'
+	if hunters_off = 0 and hunters_sleep = 0 and huntersKnow = 1:'You notice the <a href="exec: gt ''hunters'', ''check_opinion'' ">hunters</a> standing in the front yard.'
+	if hunters_off = 1 and huntersKnow = 1:'Hunters are probably off hunting. Maybe you can find stuff to do around in the meantime?'
+	if hunters_sleep = 1 and huntersKnow = 1:'Hunters are in the hut sleeping. Maybe you should go to sleep too'
+	
 	if huntersknow = 1:
 		act 'Go into the hut':
 			minut += 2
 			gt 'swamphouse'
 		end	
 	end	
-	act 'Sit by the firepit': gt 'swamp_yard', 'campfire'
+	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
 	act 'Look around the nearby woods': minut += 10 & gt 'swamp_yard', 'nearby_woods'
 
 	!Conditional acts
-	if dirty_swamp_yard > 5:act 'Clean up the trash outside': gs 'hunter_favors', 'yard_cleanup'
+	if dirty_swamp_yard > 5:  act 'Clean up the trash outside': gs 'hunter_favors', 'yard_cleanup'
 	if hunter_collective_opinion < 10: act '<b>Escape to the swamp</b>': gs 'swamp_yard', 'swamp_escape'
 
-	! TODO: Figure how to remove the sneaky gotos if not tied to other locations
-	if hunterhelp = 1: 
-		gs 'swamp_yard', 'rescued_from_swamp'
-	end
+	if hunterhelp = 1: gs 'swamp_yard', 'rescued_from_swamp'	
 
 	if hunterhelp = 2 and huntersKnow = 0:
 		gs 'hunter_interactions', 'meet_hunters_after_rescue'
@@ -70,9 +69,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		act 'Approach the men': gt 'hunter_interactions', 'meet_hunters'
 	end
 
-	if hour >= 8 and hour < 20: 
-		gs 'swamp_yard', 'daytime_flavor_events'
-	end
+	gs 'hunter_ambient', 'schedule'
+
+	if hour >= 8 and hour < 20: gs 'swamp_yard', 'daytime_flavor_events'
+	if hour >= 20 and hour < 24: gs 'swamp_yard', 'nighttime_flavor_events'
 end	
 
 !Code blocks for leaf events (events not calling other  events)
@@ -197,67 +197,6 @@ if $ARGS[0] = 'skirt_breeze':
 	end
 end
 
-!TODO: This will be revamped. Temporary to keep the dialogue for now
-if $ARGS[0] = 'hunter_group_sex':
-	! sex if GG whore
-	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 1 and huntslutsex = 0:
-		*clr & cla
-		minut += 5
-		temphunt = rand(1,3)
-		! the choice of who will fuck GG
-		slutgosex = 1
-		gs 'stat'
-
-		if temphunt = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-		if temphunt = 2:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
-		if temphunt = 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
-		if temphunt = 1:'Andrei steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, walk with me..." without uttering another word he grabs you by the arm and leads you to the nearest tree...'
-		if temphunt = 2:'Sergei steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, let''s go a bit aside you need to help me out with my itch," he said and lead you in the direction of the nearest thicket.'
-		if temphunt = 3:'Igor steps out of the hut, heading straight towards you. "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin, leading you away from the yard...'
-		if pcs_horny < 40:' You obediently follow along, well knowing the reason he wanted you to tag along.'
-		if pcs_horny >= 40 and pcs_horny < 70:'"I need you to take me..." is all you manage to say while he''s leading you away.'
-		if pcs_horny >= 70:'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto him, taking charge, leaving him stunned about who wants it more, you or him.'
-
-		act 'Go':gt 'hunters', 'start'
-	end
-		
-	! trio if GG whore
-	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 2 and huntslutsex = 0:
-		*clr & cla
-		minut += 5
-		temphunt = rand(1,3)
-		slutgosex = 2
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.2.jpg"></center>'
-		if temphunt = 1:
-			'You see Andrei talking with Sergei in the yard. They notice you, and start moving towards you. "Come with us <<$pcs_nickname>>," without uttering another word Andrei grabs you by the arm and leads you to the nearest tree.... Sergei follows after.'
-		elseif temphunt = 2:
-			'Andrei and Igor notice you enter the yard, they call you over. "Come with us <<$pcs_nickname>>, you need to help us out with our itch," said Andrei pulling you in the direction of the nearest thicket. Igor follows behind.'
-		elseif temphunt = 3:
-			'You notice Igor and Sergei standing in the yard whispering something to each other. Igor approaches you and says "<<$pcs_nickname>>, "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin. He calls Sergei over and they start leading you away from the yard...'
-		end
-		if pcs_horny < 40: 
-			'You obediently follow along, well knowing the reason they wanted you to tag along.'
-		elseif pcs_horny >= 40 and pcs_horny < 70:
-			'"I need you to take me..." is all you manage to say while they''re leading you away.'
-		elseif pcs_horny >= 70:
-			'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto one of them, taking charge, leaving the other one stunned about who wants it more, they or you.'
-		end
-
-		act 'Go with the guys':
-			*clr & cla
-			minut += 5
-			pcs_horny += 5
-
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/doublehanterlove.jpg"></center>'
-			'You go along with the men holding their hands, knowing where they''re about to lead you. You don''t mind you want them as bad as they wants you...'
-			act 'Further':gt 'huntersex', 'sluthomesex'
-		end
-	end
-end
 
 !Code blocks for branch events (events calling other  events)
 if $ARGS[0] = 'campfire':
@@ -269,6 +208,7 @@ if $ARGS[0] = 'campfire':
 		gs 'stat'
 
 		act 'Move away': gt 'swamp_yard', 'start'
+		act 'Sit by the fire': gt 'swamp_yard', 'fireside'
 
 		if campfire = 1:
 			if hour >= 8 and hour < 20:
@@ -309,12 +249,19 @@ if $ARGS[0] = 'campfire':
 					minut += 30
 					bucket -= 5
 					hotwater = 1
+
+					water_heated += 1
 					gs 'stat'
 		
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 					*nl
-					'With the now heated water, you can bathe yourself in the tub.'
-		
+					
+					if water_heated > 5 and (inhibition < 85 or hunter_sexual_comfort > 25):
+						'"It is too tedious to keep heatiing up water", you think to yourself.'
+					else
+						'With the now heated water, you can bathe yourself in the tub.'
+					end
+
 					act 'Continue': gt 'swamp_yard', 'campfire'
 				end
 			end	
@@ -353,178 +300,173 @@ if $ARGS[0] = 'campfire':
 				'You do not see any firewood nearby. You will probably need to collect some branches, chop some or ask a hunter to do so.'		
 			end	
 		end
-		
-		!TODO: Initial fireside chat dynamics, to be fleshed out 
-		!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
-			'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff'
-			act 'Chat (1:00)':
-				*clr & cla
-				minut += 60
-				hunter_collective_opinion += 2
-				gs 'stat'
 
-				*nl
-				'You start chating with the guys about trivial stuff...'
+end	
 
-				act 'Further': gt 'swamp_yard', 'campfire'
-			end
-			
-			!TODO: Flesh out the learning content here
-			act 'Ask for some tips on how to survive in the woods (1:00)':
-				hunter_lessons += 1
-				*clr & cla
-			
-				if hunter_collective_opinion > 25:
-					hunter_collective_opinion -= 1
-					pcs_bushcraft += 1
-					gs 'stat'
+if $ARGS[0] = 'fireside':
+	cla & *clr
 
-					minut += 60
+	act 'Get up':
+		gt 'swamp_yard', 'start'
+	end
 
-					*nl
-					'Hunters talk to you about some of their experiences when they first started out'
-				else
-					if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
-						!TODO: Prototype implementation for the creekside event, to be revamped
-						'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
-						hunter_lessons -= 8
-						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
-					else		
-						minut += 20
-						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
-					end		
-				end
+	if hunter_breakfast = 1 or hunter_lunch = 1:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
+		'Hunters are also sitting around the campfire, talking and joking about all kinds of stuff before heading out hunting'
+		act 'Chat (1:00)':
+			gt 'hunter_interaction', 'chat_with_hunters'
+		end
+		
+		!TODO: Flesh out the learning content here
+		act 'Ask for some tips on how to survive in the woods (1:00)':
+			hunter_lessons += 1
+			*clr & cla
+		
+			if hunter_collective_opinion > 25:
+				hunter_collective_opinion -= 1
+				pcs_bushcraft += 1
+				gs 'stat'
 
-				act 'Further': gt 'swamp_yard', 'campfire'
+				minut += 60
+
+				*nl
+				'Hunters talk to you about some of their experiences when they first started out'
+			else
+				if hunter_lessons > 10 AND hunter_sexual_comfort > 25:
+					!TODO: Prototype implementation for the creekside event, to be revamped
+					'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
+					hunter_lessons -= 8
+					act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
+				else		
+					minut += 20
+					'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
+				end		
 			end
+
+			act 'Further': gt 'swamp_yard', 'campfire'
 		end
-end	
+	end		
 
-!Auxilliary locations
-if $ARGS[0] = 'nearby_woods':
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
-	'You are in the woods near the hut. You can see it not too far in the distance.'
-	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
+	if hunters_drink = 1:
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
+		'Hunters are drinking and chatting loudly. You can join them for a chat, or maybe a drink or two if you would like'		
+		act 'Chat (1:00)':
+			gt 'hunter_interactions', 'chat_with_hunters'
+		end
 
-	*nl
+		act 'Have a drink': 
+		 	gs 'hunter_interactions', 'drink_with_hunters'
+		end
+	end
 
-	act 'Go back to the hut': minut += 10 & gt 'swamp_yard'
-	if firewood < 25:
-		'You can pick up some firewood around here to keep the fire going.'
+	act 'Eat a meal':	
+		cla & *clr
+		act 'Stop eating': gt 'swamp_yard', 'fireside'
+		act 'Eat jerky and trail mix':
+			!gs 'food', 'snack'
+			*clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/jerky_mix.jpg"></center>'
+		
+			'You munch on some dried meat and trail mix. Not a full hot meal by any means but it''s better than nothing'
+			pcs_hydra -= 15
 
-		act 'Collect firewood (0:45)':
-			cla & *clr
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
+			if pcs_energy >= 85:
+					fat += 1
+					pcs_energy += 20
 			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
+				pcs_energy += 30
 			end
 
-			firewood += 10
-			minut += 45
-			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
-			
-			if firewood < 10:
-				'You think you might need to pick some more to get a fire going'
-			else:
-				'You think you have enough firewood to get a fire going'
-			end		
-
-			act 'Further': gt 'swamp_yard', 'nearby_woods'
+			gs 'stat'
 		end
-	else
-		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end
-	
-	act 'Try to circle around the swamp':
-		*clr & cla
-		if pcs_bushcraft < 15:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks1.jpg"></center>'
-			'You consider trying to circle around the swamp but then think it is better if you did not get too far from the hut.'
-			'If only you were a skilled pathfinder or knew nearby people that could help you get back...'
-
-			act 'Further': gt 'swamp_yard', 'nearby_woods'
-		elseif pcs_bushcraft < 30:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/thinks2.jpg"></center>'
-			'You consider trying to circle around the swamp. You have a vague idea on how to accomplish that but there is a good chance you may get lost.'
-
-			act 'Stay around for now': gt 'swamp_yard', 'nearby_woods'
-			act 'Try anyway':
-				*clr & cla
-				minut += 180
-				nearby_woods_check = rand(1,10)
-
-				if nearby_woods_check = 1:
-					!Make it to the other side fine
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success_nude.jpg"></center>'
-					end
-					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Even though you occassionally step into the swamp you manage to not get stuck'
-					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
+		if meat_stew > 0:
+			act 'Eat meat stew':
+				gs 'food', 'm_meal'
+				*clr
+				meat_stew -= 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
+				*nl
 
-					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'	
-				elseif nearby_woods_check <= 3:
-					!End up stuck in the swamp
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck_nude.jpg"></center>'
-					end
-					'You stick as close to the swamp as possible and follow the edge in one direction.'
-					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
-					
-					*nl
-					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
-					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+				if pcs_energy >= 100:
+					fat += 5
+					'After having a healthy serving of meat stew, you feel stuffed.'
+				elseif pcs_energy >= 80:
+					fat += 3
+					pcs_energy += 40
+					'You force yourself to have another sip of the meat stew.'
 				else
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
-					end
-
-					if nearby_woods_check <= 5:
-						!Circle back to where the pcs started
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize your surroundings are a bit familiar.'
-						'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
-
-						*nl
-						'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
-						act 'That''s interesting...': pcs_bushcraft += 2 & gt 'swamp_yard','nearby_woods'
-					else	
-						!Get lost in the woods
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize you have no idea where you are going.'
-						'You look back to see if you can get back to the hut but nothing around seems familiar'
-
-						act 'This can''t be good': gt 'gadforestlost','1'
-					end
-				end	
+					fat += 1
+					pcs_energy += 30
+					'You''re enjoing some warm meat stew. Just what you needed.'
+				end
+				if pcs_hydra >= 100:
+					pcs_hydra += 10
+				else
+					pcs_hydra += 20
+				end
+				*nl
+				if meat_stew > 0:
+					'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
+				else
+					'You have finished the last of the stew, the pot is empty.'
+				end
+				gs 'stat'
 			end	
-		else
-			minut += 120
+		end	
+		if mushroom_soup > 0:
+			act 'Eat mushroom soup':
+				gs 'food', 'm_meal'
+				*clr
+				mushroom_soup -= 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
+				*nl
 
-			!Make it back without effort
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder_nude.jpg"></center>'
+				if pcs_energy >= 100:
+					fat += 3
+					'After having a healthy serving of mushroom soup, you feel stuffed.'
+				elseif pcs_energy >= 80:
+					fat += 1
+					pcs_energy += 30
+					'You force yourself to have another sip of the mushroom soup.'
+				else
+					pcs_energy += 20
+					'You''re enjoing some warm mushroom soup. Just what you needed.'
+				end
+				if pcs_hydra >= 100:
+					pcs_hydra += 20
+				else
+					pcs_hydra += 40
+				end
+				*nl
+				if mushroom_soup > 0:
+					'There''s <<mushroom_soup>> '+iif(mushroom_soup > 1, 'servings','serving')+' of soup left in the pot'
+				else
+					'You have finished the last of the soup, the pot is empty.'
+				end
+				gs 'stat'
 			end
-			
-			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
-			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
-			'After a couple hours you are on the other edge of the forest'
+		end
+		if bilberry > 0:
+			act 'Eat berries':
+				*clr
+				minut += 20
+				pcs_energy += 10
+				pcs_hydra += 10
+				bilberry -= 1
+				pcs_willpwr += 5
+				pcs_health += 5
+				pcs_mood += 10
+				gs 'stat'
+				'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
+				'You ate a few berries.'
+			end
+		end
+	end	
+end
 
-			act 'Further': gt 'gadforest','4'
-		end	 	
-	end
+!Auxilliary locations
+if $ARGS[0] = 'nearby_woods':
+	gt 'swamp_woods'
 end	
 
 if $ARGS[0] = 'daytime_flavor_events': 
@@ -534,7 +476,7 @@ if $ARGS[0] = 'daytime_flavor_events':
 		gs 'hunter_favors', 'housekeeping_request'
 	elseif rand(1,25) = 1: 
 		gs 'hunter_ambient' , 'yard_convo'
-	elseif rand(1,10) = 1:
+	elseif rand(1, hunter_sexual_comfort / 4 + 2) = 1:
 		gs 'hunter_interactions', 'naked_encounter'
 	elseif rand(1,15) = 1:
 		gs 'hunter_ambient', 'bring_food'

+ 19 - 159
locations/swamphouse.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	temp_sh = rand(1,5)
 	clothesAtLocation = FUNC('lost_clothes_here','swamphouse')
 
+	gs 'hunter_ambient', 'schedule'
+
 	'<center><H4>Hut</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampizba.jpg"></center>'
 	*nl
@@ -43,16 +45,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	else
 		'The hunters aren''t here right now'
 	end
+
 	*nl
 	
 	act 'Go outside':
 		minut += 2 & gt 'swamp_yard'
 	end	
 
-	act 'Sit on the table':
-		gt 'swamphouse', 'meal_table'
-	end
-
 	!re-arrange it, there should be no logic error now by illume
 	if $clothingworntype ! 'nude':
 		!have cloth, or rag on
@@ -82,7 +81,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	
 	if clothesAtLocation = 1 and swamp_clothes = 0:
 		!clothes are ready
-		if $clothingworntype = 'nude':
+		if $clothingworntype = 'nude' and forced_naked_day < daystart:
 			act 'Get dressed':
 				cla
 				*clr
@@ -94,7 +93,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				gs 'stat'
 				act 'Back': gt 'swamphouse', 'start'
 			end
-		else
+		elseif $clothingworntype ! 'nude':
 			act 'Pick up your clothes':
 				cla
 				*clr
@@ -103,7 +102,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				act 'Back': gt 'swamphouse', 'start'
 			end
 		end
-	elseif swamp_clothes = 1:
+	elseif swamp_clothes = 1 and forced_naked_day < daystart:
 		if $clothingworntype = 'nude':
 			act 'Wear hessian sack':
 				cla
@@ -120,13 +119,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if pcs_horny >= 50 and hunters = 0 or pcs_horny >= 50 and hunters = 1 and hour >= 8 and hour < 20:
-		!TODO: Add content for hunters being aroundd or walking in
+		!TODO: Add content for hunters being around or walking in
 		act 'Masturbate':
 			gt 'selfplay', 'start'
 		end
 	end
 	
-	if $clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0:
+	if $clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0 and forced_naked_day < daystart:
 		act 'Look for some clothes':
 			cla
 			*clr
@@ -439,156 +438,6 @@ if $ARGS[0] = 'washstand':
 	act 'Move away': gt 'swamphouse', 'start'
 end
 
-if $ARGS[0] = 'meal_table':
-	cla & *clr
-
-	act 'Get off the table':
-		gt 'swamphouse', 'start'
-	end
-
-	if hour >= 21 and hour < 23 :
-		huntersdrink = 1
-	else
-		huntersdrink = 0
-	end
-	!TODO: Do a hunter in hut behavior check rather than hard coding it into the time 
-	if (hour >= 20 and hour < 23) or (hour >= 7  and hour < 8):
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-		'You join the hunters on the meal table.'
-		act 'Chat (1:00)':
-			*clr & cla
-			minut += 60
-			hunter_collective_opinion += 1
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-			*nl
-			'You start chating with the guys about trivial stuff...'
-
-			act 'Move away from the table': gt 'swamphouse', 'start'
-		end
-	else
-		if $clothingworntype ! 'nude':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/table_lone.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/table_lone_nude.jpg"></center>'
-		end		
-		'You sit on the table by yourself'
-	end		
-
-	if huntersdrink = 1:
-		'Hunters are drinking and chatting loudly. You can join them for a drink or two if you would like'		
-		act 'Have a drink': 
-		 	gs 'hunter_interactions', 'drink_with_hunters'
-		end
-	end
-
-	act 'Eat a meal':	
-		cla & *clr
-		act 'Get up from the table': gt 'swamphouse', 'start'
-		act 'Eat jerky and trail mix':
-			!gs 'food', 'snack'
-		
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/jerky_mix.jpg"></center>'
-		
-			'You munch on some dried meat and trail mix. Not a full hot meal by any means but it''s better than nothing'
-			pcs_hydra -= 15
-
-			if pcs_energy >= 85:
-					fat += 1
-					pcs_energy += 20
-			else
-				pcs_energy += 30
-			end
-
-			gs 'stat'
-		end
-		if meat_stew > 0:
-			act 'Eat meat stew':
-				gs 'food', 'm_meal'
-				*clr
-				meat_stew -= 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
-				*nl
-
-				if pcs_energy >= 100:
-					fat += 5
-					'After having a healthy serving of meat stew, you feel stuffed.'
-				elseif pcs_energy >= 80:
-					fat += 3
-					pcs_energy += 40
-					'You force yourself to have another sip of the meat stew.'
-				else
-					fat += 1
-					pcs_energy += 30
-					'You''re enjoing some warm meat stew. Just what you needed.'
-				end
-				if pcs_hydra >= 100:
-					pcs_hydra += 10
-				else
-					pcs_hydra += 20
-				end
-				*nl
-				if meat_stew > 0:
-					'There''s <<meat_stew>> '+iif(meat_stew > 1, 'servings','serving')+' of stew left in the pot'
-				else
-					'You have finished the last of the stew, the pot is empty.'
-				end
-				gs 'stat'
-			end	
-		end	
-		if mushroom_soup > 0:
-			act 'Eat mushroom soup':
-				gs 'food', 'm_meal'
-				*clr
-				mushroom_soup -= 1
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
-				*nl
-
-				if pcs_energy >= 100:
-					fat += 3
-					'After having a healthy serving of mushroom soup, you feel stuffed.'
-				elseif pcs_energy >= 80:
-					fat += 1
-					pcs_energy += 30
-					'You force yourself to have another sip of the mushroom soup.'
-				else
-					pcs_energy += 20
-					'You''re enjoing some warm mushroom soup. Just what you needed.'
-				end
-				if pcs_hydra >= 100:
-					pcs_hydra += 20
-				else
-					pcs_hydra += 40
-				end
-				*nl
-				if mushroom_soup > 0:
-					'There''s <<mushroom_soup>> '+iif(mushroom_soup > 1, 'servings','serving')+' of soup left in the pot'
-				else
-					'You have finished the last of the soup, the pot is empty.'
-				end
-				gs 'stat'
-			end
-		end
-		if bilberry > 0:
-			act 'Eat berries':
-				cla
-				*clr
-				minut += 20
-				pcs_energy += 10
-				pcs_hydra += 10
-				bilberry -= 1
-				pcs_willpwr += 5
-				pcs_health += 5
-				pcs_mood += 10
-				gs 'stat'
-				'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
-				'You ate a few berries.'
-			end
-		end
-	end	
-end
-
 if $ARGS[0] = 'tub':
 	cla
 	*clr
@@ -743,4 +592,15 @@ if $ARGS[0] = 'huntersrelax':
 
 end
 
+
+if $ARGS[0] = 'daytime_flavor_events': 
+	!TODO: Add stuff here
+end
+
+if $ARGS[0] = 'nighttime_flavor_events':
+	if rand(1,10) = 1:
+		gs 'hunter_interactions', 'indoors_naked_encounter'
+	end	
+end
+
 --- swamphouse ---------------------------------

+ 27 - 7
locations/telefon.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 		'"Pretty good, you?"'
 		'<<$loverdesc[lover_number]>>, "Great, but I kind of miss you, can we meet today?"'
 
-		if pregtime <= lover_days and knowpreg = 1 and pregtalk = 0:
+		if (pregchem / 24) <= lover_days and knowpreg = 1 and pregtalk = 0:
 			act 'Tell him he''s going to be a dad':
 				cla
 				pregtalk = 1
@@ -351,7 +351,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 					act 'Hang up':gt 'telefon', 'fin'
 				end
 			end
-		elseif pregtime > lover_days and knowpreg = 1 and pregtalk = 0:
+		elseif (pregchem / 24) > lover_days and knowpreg = 1 and pregtalk = 0:
 			act 'Honey, you will soon become a dad':
 				cla
 				loverrelation[lover_number] = 0
@@ -669,7 +669,6 @@ if $ARGS[0] = 'Phone_notebook':
 	rent4 = -1
 	if home_owned[1] > 0 and ArendHouseSL > 0:rent1 = ArendHouseSL
 	if home_owned[4] > 0 and ArendHouseSL4 > 0:rent4 = ArendHouseSL4
-	preg1 = pregtime
 	d1 = day
 	w1 = week
 	m1 = month
@@ -708,7 +707,7 @@ if $ARGS[0] = 'Phone_notebook':
 
 		if daynum >= lastmens+28 and daynum < lastmens+31:$calendarday += $list + '<font color=''red''><b>Menstruation!</b></font>'
 		if daynum >= lastmens+12 and daynum < lastmens+14:$calendarday += $list + '<font color=#336600><b>Ovulation!</b></font>'
-		if preg1 = 280:$calendarday += $list + '<font color=''red''><b>Birthing day!</b></font>'
+		if pregchem >= 6720:$calendarday += $list + '<font color=''red''><b>Birthing day!</b></font>'
 
 		if w1 < 5 and (workSec >= 1 or PersSecWork = 1):$calendarday += $list + 'Working as a secretary. <i>(9:00 - 17:00)</i>'
 		if w1 < 5 and workFabrika = 1:
@@ -744,7 +743,6 @@ if $ARGS[0] = 'Phone_notebook':
 			pl $calendarday
 		end
 	if i < 14:
-		preg1 += 1
 		rent1 -= 1
 		rent4 -= 1
 		i += 1
@@ -760,7 +758,6 @@ if $ARGS[0] = 'Phone_notebook':
 	killvar 'calendarday'
 	killvar 'rent1'
 	killvar 'rent4'
-	killvar 'preg1'
 	killvar 'd1'
 	killvar 'w1'
 	killvar 'm1'
@@ -776,6 +773,8 @@ if $ARGS[0] = 'Phone_selfie_totals':
 	bathroom_clotot = 20
 	bathroom_undtot = 20
 	bathroom_nudtot = 20
+	bathroom_bathtot = 24
+	bathroom_showertot = 25
 	bedroom_clotot = 27
 	bedroom_undtot = 20
 	bedroom_nudtot = 20
@@ -807,7 +806,7 @@ end
 !!picking the selfie image when taking photos, this sets the location variable
 if $ARGS[0] = 'Phone_camera_selfie':
 	gs 'telefon', 'Phone_selfie_totals'
-	minut += RAND(5,7)
+	minut += rand(5,7)
 	if $location_type = 'bathroom':
 		$phone_loc = 'bathroom'
 		gs 'telefon', 'Phone_selfie_image'
@@ -865,6 +864,27 @@ if $ARGS[0] = 'Phone_selfie_image':
 	end
 end
 
+!!taking selfies in the shower or bath
+if $ARGS[0] = 'Phone_selfie_image_bathing':
+	gs 'telefon', 'Phone_selfie_totals'
+	minut += rand(5,7)
+	if $ARGS[1] = 'shower':
+		!!changing to and unmixed variable so the rng will work
+		dynamic 'temp_showertot = bathroom_showertot'
+		phone_rand = rand(1,temp_showertot)
+		!!Setting the image owned flag to 1
+		dynamic '<<$phone_loc>>_showerselfie[<<phone_rand>>] = 1'
+		gs 'stat'
+		view 'images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg'
+	elseif $ARGS[1] = 'bath':
+		dynamic 'temp_bathtot = bathroom_bathtot'
+		phone_rand = rand(1,temp_bathtot)
+		dynamic '<<$phone_loc>>_bathselfie[<<phone_rand>>] = 1'
+		gs 'stat'
+		view 'images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg'
+	end
+end
+
 !!for taking photos - only selfies for now
 if $ARGS[0] = 'Phone_camera':
 	clr

+ 4 - 4
locations/trFatherMisha.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 			act 'Try a fair game':
 				cls
 				minut += 15
-				shoot_exp += 1
+				shoot_lvl += 1
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_29.jpg"></center>'
 				'You suggest that you want to try one of the games they have at the fair. Your father is more than happy to comply with your wishes.'
@@ -319,7 +319,7 @@ if $ARGS[0] = '':
 				act 'Learn to shoot':
 					cls
 					minut += 10
-					shoot_exp += 1
+					shoot_lvl += 1
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_33.jpg"></center>'
 					'After he''s shows how it''s supposed to be done he tells you to try it out once again. Your accuracy improves a little bit.'
@@ -342,7 +342,7 @@ if $ARGS[0] = '':
 						cls
 						minut += 10
 						pcs_mood += 50
-						shoot_exp += 3
+						shoot_lvl += 3
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_35.jpg"></center>'
 						'You are focused and enthusiastically listen to what Mikhail has to say.'
@@ -354,7 +354,7 @@ if $ARGS[0] = '':
 				act 'Refuse help':
 					cls
 					minut += 10
-					shoot_exp += 1
+					shoot_lvl += 1
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_36.jpg"></center>'
 					'You refuse listening to your fathers advice. You loudly sigh as he continues explaining...'

+ 4 - 4
locations/trainBimbo.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'pos3333':
 	'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/sex/bimbo3,'+rand(0,7)+'.mp4"></video></center>'
 	'He turns your face to the wall and enters your ass from behind. You are not prepared for this, with no lubrication on your ass and only your slavia on his dick the pain is sharp, you wince and tear up. You try to pull away, but strong hands hold you firm, as you struggle more he pushes you tight up against the wall leaving you no where to go.'
 	'He pounds your ass furiously, balls deep with out mercy, the more you whimper the harder he pounds you. He seems to have a supernatural stamina as he ravishes your ass, you completely lose track of time, as tears start to stream down your face.'
-	'"Like that girl? Yeah I know a little slut like you, loves having your ass tore up, you can be my ass whore anytime, ha ha!" With these words began to twitch and you can feel his spurts of hot sperm shooting deep into your ass. Once he has finished cumming in you ass, he pushes your head against the wall while he pulls his dick out of you and wipes it off on your butt cheeks, with a final laugh he lets you go and leaves.'
+	'"Like that girl? Yeah I know a little slut like you, loves having your ass tore up, you can be my ass whore anytime, ha ha!" With these words began to twitch and you can feel his spurts of hot sperm shooting deep into your ass. Once he has finished cumming in your ass, he pushes your head against the wall while he pulls his dick out of you and wipes it off on your butt cheeks, with a final laugh he lets you go and leaves.'
 	if horand > pcs_horny:
 		pcs_horny += 10 & 'You have not managed to cum.'
 	else
@@ -249,9 +249,9 @@ if $ARGS[0] = 'pos33333':
 	body_write = 1
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/sex/bimbo.cum.body0.mp4"></video></center>'
-	'He pushes you down on the dirty floor and he starts jerking off standing over you. Soon his spurts of hot sperm start raining down all over you body. Once he is finished cumming on you, he pulls out a marker and writes on your chest Pussy Whore. "This way it will be clear to everyone what you really are, ha ha ha!" He pulled up his pants and left you there lying on the floor covered in cum.'
+	'He pulls out a marker and writes on your chest Pussy Whore. "This way it will be clear to everyone what you really are, ha ha ha!" He pulled up his pants and left you there lying on the floor covered in cum.'
 
-	act 'dress':gt 'trainbimbo', 'pos1'
+	act 'Dress': gt 'trainbimbo', 'pos1'
 end
 
 if $ARGS[0] = 'pos4':
@@ -262,7 +262,7 @@ if $ARGS[0] = 'pos4':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo4.jpg"></center>'
 	'You pretend not to notice anything. Maybe they will just think you are so stupid, that you mixed up the women''s room with the mens room.'
 
-	act 'wait':gt 'trainbimbo', 'pos1'
+	act 'Wait':gt 'trainbimbo', 'pos1'
 	act 'Leave':gt 'pavtrainhall', 'male'
 end
 

+ 26 - 0
locations/treeCircActs.qsrc

@@ -0,0 +1,26 @@
+#treeCircActs
+! Handles making Action Entries for Different Tree Circle Entry Points
+!	Call as a GoSub with ARGS:
+!	ARGS[0] = Location Identifier	['CentralPark']
+!	ARGS[1] = Localtion Label		['Central Park']
+!	ARGS[2] = location leaving to	['park']
+!	ARGS[3] = parameter for prev	['start']
+
+
+
+if $EntryPoint = $ARGS[0]:
+	act 'Leave the circle to <<$treeCircName[$ARGS[0]]>>':
+		if $treeCircArg['<<$ARGS[0]>>'] = '':
+			gt $treeCircLoc['<<$ARGS[0]>>']
+		else:
+			gt $treeCircLoc['<<$ARGS[0]>>'], $treeCircArg['<<$ARGS[0]>>']
+		end
+	end
+else:
+	if canTeleport = 1 and tpKnown[$ARGS[0]] = 1:
+		$dynAction = "act 'Will yourself to <<$treeCircName[$ARGS[0]]>>': gs 'spellTeleport', '<<$ARGS[0]>>'"
+		dynamic $dynAction
+	end
+end
+
+--- treeCircActs ---------------------------------

+ 89 - 0
locations/treeCircle.qsrc

@@ -0,0 +1,89 @@
+#treeCircle
+! The Magical Teleport Tree Circle
+!
+! ARGS[0] is your entrance point as those listed below.  If the user doesn''t have the magical ability,
+!		they will only be allowed to leave back from their entry point.
+
+! Locations
+$tpLocations[0] = 'CentralPark'
+$tpLocations[1] = 'PavlovskPark'
+$tpLocations[2] = 'GadForest'
+$tpLocations[3] = 'PushkinPark'
+$tpLocations[4] = 'Village'
+
+! Build Info Arrays for Locations
+!	treeCircName = The Pretty Name of the Location
+!	treeCircLoc  = The Location to send the user to when leaving Circle
+!	treeCircArg  = An argument to get the user to the right spot in the location.
+!Central Park Location
+$treeCircName['CentralPark'] = 'Central Park'
+$treeCircLoc['CentralPark'] = 'park'
+$treeCircArg['CentralPark'] = 'start'
+!Pavlovsk Park Location
+$treeCircName['PavlovskPark'] = 'Pavlovsk Park'
+$treeCircLoc['PavlovskPark'] = 'placer_gskver'
+$treeCircArg['PavlovskPark'] = ''
+!Gadukino Forest Location
+$treeCircName['GadForest'] = 'Gadukino Forest'
+$treeCircLoc['GadForest'] = 'gadforest'
+$treeCircArg['GadForest'] = '1'
+!Pushkin Park Location
+$treeCircName['PushkinPark'] = 'Pushkin Park'
+$treeCircLoc['PushkinPark'] = 'lug'
+$treeCircArg['PushkinPark'] = 'prut2'
+!Communal Village Spring Location
+$treeCircName['Village'] = 'Communal Village Spring'
+$treeCircLoc['Village'] = 'etoexhib'
+$treeCircArg['Village'] = 'pos6'
+
+$EntryPoint = $ARGS[0]
+
+*clr & cla
+
+'<center><h2>Mysterious Circle of Trees</h2></center>'
+'<center><img <<$set_imgh>> src="images/locations/shared/park/tree_circle.jpg"></center>'
+
+'The small clearing in the center of the tree circle is two body lengths wide.  The ground is covered with a soft, sponging moss.  Everything is surprisingly visible considering you cna barely see the sky through the overhead cover of leaves and branches.  As you look to the outside of the circle, everything seems to be vague and indistinct.  This makes it hard to comprehend what lies outside the ring.'
+*nl
+
+! Determine if this user can teleport at all.
+canTeleport = 0
+if spellKnown['teleport'] = 1:
+	'You take the Fairy''s advice and get to know this Circle.'
+	minut += 15
+	if pcs_manna > spellMana['teleport']:
+		canTeleport = 1
+	else:
+		*nl
+		'You feel too tired to pull off a shift right now.'
+	end
+else:
+	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing, though, so you take your time and loook the place over to try to understand it.'
+	minut += 15
+end
+
+! Learn the current entry point
+tpKnown[$EntryPoint] = 1
+
+! Setup Actions for locations when applicable
+i = 0
+:LocLoop
+if i < ARRSIZE('$tpLocations'):
+	gs 'treeCircActs', $tpLocations[i]
+	i += 1
+	jump 'LocLoop'
+end
+killvar 'i'
+
+act 'Masturbate to clear your head.':
+	*nl
+	'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
+	*nl
+	'That''s better!'
+	orgasm_or = 'yes'
+	gs 'arousal', 'masturbate', 15
+	gs 'arousal', 'end'
+	gs 'stat'
+end
+
+--- treeCircle ---------------------------------

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