Browse Source

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

CroWke 5 years ago
parent
commit
2fa2ea414a
54 changed files with 1854 additions and 1010 deletions
  1. 0 48
      README.md
  2. 7 0
      glife.qproj
  3. 1 1
      insanity.sh
  4. 3 3
      locations/Cheatmenu_din.qsrc
  5. 41 3
      locations/MagEncounterFairy.qsrc
  6. 80 0
      locations/beg1.qsrc
  7. 2 0
      locations/body.qsrc
  8. 17 17
      locations/brosh.qsrc
  9. 70 68
      locations/brother.qsrc
  10. 4 4
      locations/brother2.qsrc
  11. 109 91
      locations/brother_voyeur.qsrc
  12. 67 0
      locations/castSpell.qsrc
  13. 14 13
      locations/cikl.qsrc
  14. 6 6
      locations/club.qsrc
  15. 5 1
      locations/din_van.qsrc
  16. 48 33
      locations/etoexhib.qsrc
  17. 1 1
      locations/fame.qsrc
  18. 6 1
      locations/foto.qsrc
  19. 7 1
      locations/gadforest.qsrc
  20. 75 77
      locations/gdksex.qsrc
  21. 55 51
      locations/gevent.qsrc
  22. 19 9
      locations/gopskver.qsrc
  23. 1 1
      locations/gpoli.qsrc
  24. 189 55
      locations/hunter_favors.qsrc
  25. 16 6
      locations/hunter_interactions.qsrc
  26. 4 2
      locations/husbSex.qsrc
  27. 8 5
      locations/lact_lib.qsrc
  28. 213 210
      locations/lake.qsrc
  29. 7 0
      locations/lug.qsrc
  30. 8 8
      locations/mod_setting.qsrc
  31. 50 50
      locations/npcstatic1.qsrc
  32. 50 50
      locations/npcstatic2.qsrc
  33. 49 49
      locations/npcstatic3.qsrc
  34. 49 49
      locations/npcstatic4.qsrc
  35. 31 31
      locations/npcstatic5.qsrc
  36. 9 6
      locations/obj_din.qsrc
  37. 3 2
      locations/onobjsel.qsrc
  38. 7 0
      locations/park.qsrc
  39. 1 1
      locations/pavCommercial.qsrc
  40. 1 1
      locations/pavtrainhall.qsrc
  41. 8 0
      locations/placer_gskver.qsrc
  42. 53 36
      locations/pod_ezd.qsrc
  43. 2 0
      locations/preCUST.qsrc
  44. 18 0
      locations/preSYS.qsrc
  45. 4 3
      locations/shop.qsrc
  46. 41 0
      locations/spellTeleport.qsrc
  47. 1 1
      locations/sportShop.qsrc
  48. 10 7
      locations/stat.qsrc
  49. 1 1
      locations/stat_display.qsrc
  50. 1 1
      locations/street.qsrc
  51. 0 7
      locations/swamphouse.qsrc
  52. 26 0
      locations/treeCircActs.qsrc
  53. 89 0
      locations/treeCircle.qsrc
  54. 267 0
      locations/willpower.qsrc

+ 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)

+ 7 - 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"/>
@@ -1098,5 +1099,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}\""

+ 3 - 3
locations/Cheatmenu_din.qsrc

@@ -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
 

+ 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

+ 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

+ 17 - 17
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
@@ -37,20 +37,20 @@ if evgentipe = 0:
 				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 after school, I have a treat 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
@@ -74,20 +74,20 @@ elseif evgentipe = 1:
 				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
@@ -112,7 +112,7 @@ elseif evgentipe = 2:
 				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:
@@ -136,20 +136,20 @@ 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
@@ -165,7 +165,7 @@ elseif evgentipe = 3:
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Continue': gt 'gschool_lessons', 'short_break'
+			act 'Go back inside': gt 'gschool_lessons', 'short_break'
 		end
 	end
 

+ 70 - 68
locations/brother.qsrc

@@ -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?"'
@@ -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

+ 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

+ 109 - 91
locations/brother_voyeur.qsrc

@@ -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

+ 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 ---------------------------------

+ 14 - 13
locations/cikl.qsrc

@@ -631,19 +631,20 @@ elseif preg = 2 and pregminut < totminut:
 		pregminut = totminut + 1440
 	end
 elseif preg = 0:
-	KILLVAR 'npc_pregtalk[''A34'']'
-	KILLVAR 'npc_pregtalk[''A33'']'
-	KILLVAR 'npc_pregtalk[''A28'']'
-	!{KILLVAR 'pregTalkFamily' -- Do not kill this (Abortion talk).}
-	KILLVAR 'npc_pregtalk[''A29'']'
-	KILLVAR 'pregTalk'
-	KILLVAR 'npc_pregtalk[''A16'']'
-	KILLVAR 'npc_pregtalk[''A14'']'
-	KILLVAR 'pcs_pregtalk'
-	KILLVAR 'npc_pregtalk[''A69'']'
-	KILLVAR 'npc_pregtalk[''A131'']'
-	killvar 'npc_pregtalk[''A23'']'
-	killvar 'npc_pregtalk[''A69'']'
+	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'

+ 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'

+ 5 - 1
locations/din_van.qsrc

@@ -179,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

+ 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

+ 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

+ 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)

+ 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

+ 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:

+ 1 - 1
locations/gpoli.qsrc

@@ -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

+ 189 - 55
locations/hunter_favors.qsrc

@@ -414,14 +414,14 @@ end
 
 if $ARGS[0] = 'yard_bondage':
 	if $ARGS[1] = '':
-		yard_bound_temprand = rand(1,10)
+		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.'
+			'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'
@@ -431,14 +431,15 @@ if $ARGS[0] = 'yard_bondage':
 
 		hunter_sexual_comfort  += 1
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors_4.jpg"></center>'
+		'<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. Maybe shove their dick in your available ass or pussy and have their way, or fuck your mouth as if you are a blow-up doll...'
+	    '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', 2, 'bound', 'exhibitionism', 'sub'
+		gs 'arousal', 'flash', 5, 'bound', 'exhibitionism', 'sub'
 		gs 'arousal', 'end'
 
-		minut += 3
+		minut += 5
+		gs 'stat'
 
 		hunter_selector_temprand = rand(1,3)
 		if hunter_selector_temprand = 1:
@@ -450,22 +451,20 @@ if $ARGS[0] = 'yard_bondage':
 		end	
 
 		if yard_bound_temprand = 4:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_bj'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_bj'
 		elseif yard_bound_temprand = 5:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_fuck'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_fuck'
 		elseif yard_bound_temprand = 6:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'clamp_fuck'
-		elseif yard_bound_temprand = 7:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'quick_fuck'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'clamp_fuck'
 		elseif yard_bound_temprand = 8:
-			act 'Further': gs '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'						
+			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	
-
-		act 'Wait': gt 'hunter_favors', 'yard_bondage'
 	end
 
 	if $ARGS[1] = 'lost_bet':
@@ -478,21 +477,21 @@ if $ARGS[0] = 'yard_bondage':
 
 		'<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 pussy starten to moisten as you feel the breeze on your bare skin.'
+		'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 <<$boy>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
+		'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'
 			
@@ -546,12 +545,13 @@ if $ARGS[0] = 'yard_bondage':
 	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 <<$boy>> 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 <<$boy>>''s cock fills your pussy'
+		'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'
@@ -570,12 +570,12 @@ if $ARGS[0] = 'yard_bondage':
 			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 <<$boy>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
+			'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
-			'<<$boy>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
+			'<<$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, <<$boy>> gives your ass a fondle before walking away, leaving you hanging.'
+			'After catching his breath, <<$boydesc>> gives your ass a fondle before walking away, leaving you hanging.'
 
 			act 'Further': gt 'hunter_favors', 'yard_bondage'
 		end
@@ -593,65 +593,199 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked1.jpg"></center>'
-				'You are pretty much overwhelmed by <<$boy>> pumping your pussy while you are bound helpless and naked like this.'
-				'You decide to give in to the sensations and enjoy being fucked like an absolute whore.'
+				'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, <<$boy>> zips up and walks away, leaving you with cum running down your legs.'
+				'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'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_clamps_fuck.jpg"></center>'
+		gs 'pain', 6, 'pinch', 'nipples'
+		gs 'pain', 3, 'pinch', 'breasts'
 
-	end	
+		gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
 
-	if $ARGS[1] = 'quick_fuck':
-		gs 'boyStat', 'A174'
-		'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
+		'<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'
 
-	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.'
 
-	if $ARGS[1] = 'unbound_fuck':
-		gs 'boyStat', 'A173'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck2.jpg"></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck1.jpg"></center>'
+			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_gangbang':
-	end
+	if $ARGS[1] = 'unbound_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 15
+		hunter_collective_opinion += 15
 
-	if $ARGS[1] = 'bound_gangbang':
-	end
+		gs 'boyStat', 'A173'
 
-		
-		gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
-		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'group'
+		gs 'arousal', 'foreplay', 5, 'sub', 'exhibitionism'
+		gs 'arousal', 'kiss', 5, 'sub', 'exhibitionism'
 		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
+		'<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
-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 ---------------------------------

+ 16 - 6
locations/hunter_interactions.qsrc

@@ -510,6 +510,13 @@ if $ARGS[0] = 'shooting_bet':
     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':
@@ -561,12 +568,12 @@ if $ARGS[0] = 'shooting_bet':
                 act 'Refuse':
                     cla 
 
-                    hunter_collective_opinion -= 10
+                    hunter_collective_opinion += 5
                     hunter_sexual_comfort -= 15
 
                     '"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 being silly together" he responds.'
-                    '"Besides, it is not fair to just back down from a bet liek that." he adds.'
+                    '"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
@@ -623,8 +630,11 @@ if $ARGS[0] = 'andrei_quick_fuck':
                 minut -= 10
                 
                 act 'Further':
-                    if $loc = 'swamp_yard': gt 'swamp_yard'
-                    if $loc = 'swamp_woods': gt 'swamp_woods', 'shooting_practice', 'practice'    
+                    if $loc = 'swamp_woods':
+                        gt 'swamp_woods', 'shooting_practice', 'practice'    
+                    else
+                        if $loc = 'swamp_yard': gt 'swamp_yard'
+                    end    
                 end
             end 
 		end
@@ -795,7 +805,7 @@ 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	

+ 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'

+ 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 ---------------------------------

+ 50 - 50
locations/npcstatic1.qsrc

@@ -2,7 +2,7 @@
 !{
 Example
 npctemp = 1
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
 $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
@@ -105,7 +105,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'',
 
 
 npctemp = 1
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
 $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
@@ -137,7 +137,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'',
 
 
 npctemp = 2
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1993665716 1616738815 1589755494 1229942753 1120816404 1371564141 1910586302'
 $npc_firstname['A<<npctemp>>'] = 'Artyom'
 $npc_nickname['A<<npctemp>>'] = 'Artem'
@@ -167,7 +167,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'',
 
 
 npctemp = 3
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1580777525 1747887345 8321006077 1970922187 1029352130 7921283143 7765736018'
 $npc_firstname['A<<npctemp>>'] = 'Ivan'
 $npc_nickname['A<<npctemp>>'] = 'Ivan'
@@ -197,7 +197,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'',
 
 
 npctemp = 4
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1438762189 1855175944 1123617000 1817906848 1390916310 1459640815 1436321833'
 $npc_firstname['A<<npctemp>>'] = 'Igor'
 $npc_nickname['A<<npctemp>>'] = 'Igor'
@@ -228,7 +228,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'',
 
 
 npctemp = 5
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1379973003 1196687437 1136761140 2107449234 1973361988 1939869341 1786180096'
 $npc_firstname['A<<npctemp>>'] = 'Fyodor'
 $npc_nickname['A<<npctemp>>'] = 'Fedor'
@@ -259,7 +259,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'',
 
 
 npctemp = 6
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1490744069 1013739636 1009283243 1951857582 1559659111 1792925326 1086487692'
 $npc_firstname['A<<npctemp>>'] = 'Peter'
 $npc_nickname['A<<npctemp>>'] = 'Petka'
@@ -289,7 +289,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'',
 
 
 npctemp = 7
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1689930319 1973226357 2129134392 2090450913 1513523102 2063456541 1533040976'
 $npc_firstname['A<<npctemp>>'] = 'Lesco'
 $npc_nickname['A<<npctemp>>'] = 'Lesco'
@@ -319,7 +319,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'',
 
 
 npctemp = 8
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1004746288 1743479356 1890053138 1336365224 1893621358 1730538237 1325162654'
 $npc_firstname['A<<npctemp>>'] = 'Svyatoslav'
 $npc_nickname['A<<npctemp>>'] = 'Svyatoslav'
@@ -349,7 +349,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'',
 
 
 npctemp = 9
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1851794364 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
 $npc_firstname['A<<npctemp>>'] = 'Viktor'
 $npc_nickname['A<<npctemp>>'] = 'Vitek'
@@ -380,7 +380,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'',
 
 
 npctemp = 10
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2049084127 1470960834 1280333156 1706598464 1268389504 1227431573 2132916352'
 $npc_firstname['A<<npctemp>>'] = 'Denis'
 $npc_nickname['A<<npctemp>>'] = 'Dan'
@@ -411,7 +411,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'',
 
 
 npctemp = 11
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2092485270 1750615492 1357552191 1799649757 1558588590 1808035750 1644370082'
 $npc_firstname['A<<npctemp>>'] = 'Vasily'
 $npc_nickname['A<<npctemp>>'] = 'Shulga'
@@ -448,7 +448,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'',
 
 
 npctemp = 12
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1898622449 1904538322 8321006077 1825474042 1063577851 7921283143 7765736018'
 $npc_firstname['A<<npctemp>>'] = 'Julia'
 $npc_nickname['A<<npctemp>>'] = 'Julia'
@@ -477,7 +477,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'',
 
 
 npctemp = 13
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1731087833 1604487809 1464859113 1561062144 1440871037 1347904523 1150306572'
 $npc_firstname['A<<npctemp>>'] = 'Lariska'
 $npc_nickname['A<<npctemp>>'] = 'Lariska'
@@ -512,7 +512,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'',
 
 
 npctemp = 14
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
 $npc_firstname['A<<npctemp>>'] = 'Katja'
 $npc_nickname['A<<npctemp>>'] = 'Katja'
@@ -541,7 +541,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'',
 
 
 npctemp = 15
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
 $npc_firstname['A<<npctemp>>'] = 'Viktoria'
 $npc_nickname['A<<npctemp>>'] = 'Vicky'
@@ -570,7 +570,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'',
 
 
 npctemp = 16
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1119464721 1614037462 1646642112 1959746313 1085890273 1009333823 1238937878'
 $npc_firstname['A<<npctemp>>'] = 'Natasha'
 $npc_nickname['A<<npctemp>>'] = 'Natasha'
@@ -600,7 +600,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'',
 
 
 npctemp = 17
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1736016429 1462897715 2010810526 1845581584 1266092607 1950870951 1153689245'
 $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Inna'
@@ -629,7 +629,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'',
 
 
 npctemp = 18
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1695885007 2098494473 1893236781 1197776866 1613803510 1095093401 1877459340'
 $npc_firstname['A<<npctemp>>'] = 'Christina'
 $npc_nickname['A<<npctemp>>'] = 'Christina'
@@ -668,7 +668,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'',
 
 
 npctemp = 19
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1868882449 1367396730 1179635869 1781589830 2141637715 1988698459 1710383168'
 $npc_firstname['A<<npctemp>>'] = 'Avelina'
 $npc_nickname['A<<npctemp>>'] = 'Lina'
@@ -697,7 +697,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'',
 
 
 npctemp = 20
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1851794365 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
 $npc_firstname['A<<npctemp>>'] = 'Yalena'
 $npc_nickname['A<<npctemp>>'] = 'Lena'
@@ -728,7 +728,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'',
 
 
 npctemp = 21
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1027294118 1526664895 1047167563 1146573782 1562782691 2063456541 1533040976'
 $npc_firstname['A<<npctemp>>'] = 'Valeria'
 $npc_nickname['A<<npctemp>>'] = 'Lera'
@@ -761,7 +761,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'',
 
 
 npctemp = 22
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648'
 $npc_firstname['A<<npctemp>>'] = 'Bella'
 $npc_nickname['A<<npctemp>>'] = 'Bella'
@@ -786,7 +786,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'',
 
 
 npctemp = 23
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1410862429 1854775733 1705291842 1147504758 1609009238 1203561941 1602837590'
 $npc_firstname['A<<npctemp>>'] = 'Albina'
 $npc_nickname['A<<npctemp>>'] = 'Albina'
@@ -814,7 +814,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'',
 
 
 npctemp = 24
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1989757424 1370351107 1337196420 1362464918 1383218762 1045638336 1960389781'
 $npc_firstname['A<<npctemp>>'] = 'Pauline'
 $npc_nickname['A<<npctemp>>'] = 'Pauline'
@@ -841,7 +841,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'',
 
 
 npctemp = 25
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1633731691 1389436996 1448312616 1738900889 1051507305 1144473144 1251857548'
 $npc_firstname['A<<npctemp>>'] = 'Sonia'
 $npc_nickname['A<<npctemp>>'] = 'Sonia'
@@ -875,7 +875,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'',
 
 
 npctemp = 26
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1047167563 2063456541 1533040976 1303801542 1620497680 1042269021 1659592524'
 $npc_firstname['A<<npctemp>>'] = 'Anatoly E.'
 $npc_nickname['A<<npctemp>>'] = 'Anatoly E.'
@@ -901,7 +901,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'',
 
 
 npctemp = 27
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1526664895 1146573782 1562782691 1262684992 1354837515 1727531312 2004326261'
 $npc_firstname['A<<npctemp>>'] = 'Vera'
 $npc_nickname['A<<npctemp>>'] = 'Vera'
@@ -925,7 +925,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 28
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1085730943 1931034853 1979821791 1720869809 1405982728 2119519439 2110201703'
 $npc_firstname['A<<npctemp>>'] = 'Vladimir'
 $npc_nickname['A<<npctemp>>'] = 'Dad'
@@ -953,7 +953,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'',
 
 
 npctemp = 29
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1545843327 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
 $npc_firstname['A<<npctemp>>'] = 'Natasha'
 $npc_nickname['A<<npctemp>>'] = 'Mother'
@@ -981,7 +981,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'',
 
 
 npctemp = 30
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1545843328 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
 $npc_firstname['A<<npctemp>>'] = 'Lyudmila'
 $npc_nickname['A<<npctemp>>'] = 'Luda'
@@ -1006,7 +1006,7 @@ npc_rel['A<<npctemp>>'] = 20
 
 
 npctemp = 31
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1843607237 1942499229 1221585640 1038127602 1700766678 1100784200 1819267918'
 $npc_firstname['A<<npctemp>>'] = 'Elena'
 $npc_nickname['A<<npctemp>>'] = 'Grandma'
@@ -1031,7 +1031,7 @@ npc_rel['A<<npctemp>>'] = 100
 
 
 npctemp = 32
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1675779774 1167755546 1500737294 1443097159 1423316671 1056299351 1530143067'
 $npc_firstname['A<<npctemp>>'] = 'Zlatek'
 $npc_nickname['A<<npctemp>>'] = 'Grandpa'
@@ -1056,7 +1056,7 @@ npc_rel['A<<npctemp>>'] = 100
 
 
 npctemp = 33
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1429755064 1545843327 1198040660 1962976090 1780199176 1936146603 2049979334'
 $npc_firstname['A<<npctemp>>'] = 'Anya'
 $npc_nickname['A<<npctemp>>'] = 'Sister'
@@ -1087,7 +1087,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'',
 
 
 npctemp = 34
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1588599246 1545843327 1085730943 1962976090 1780199176 1931034853 1979821791'
 $npc_firstname['A<<npctemp>>'] = 'Kolka'
 $npc_nickname['A<<npctemp>>'] = 'Kolka'
@@ -1116,7 +1116,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'',
 
 
 npctemp = 35
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1198040660 1936146603 2049979334 1276791698 1325847789 1379325296 1029736884'
 $npc_firstname['A<<npctemp>>'] = 'Mikhail'
 $npc_nickname['A<<npctemp>>'] = 'Biological Father'
@@ -1144,7 +1144,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'',
 
 
 npctemp = 36
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1902637322 1870968508 1231095894 1330096941 1541087381 1973617911 1386337081'
 $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Rimma'
@@ -1166,7 +1166,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 37
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1389808807 1404442169 1642165848 1673620649 1531597159 1430968975 1536241074'
 $npc_firstname['A<<npctemp>>'] = 'Margaret'
 $npc_nickname['A<<npctemp>>'] = 'Margo'
@@ -1190,7 +1190,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 38
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1226305314 1430928850 1144576786 1435600997 1537092669 1301461802 1167005269'
 $npc_firstname['A<<npctemp>>'] = 'Yuri'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1214,7 +1214,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 39
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1792509661 1994108013 1588492806 1200642788 1785136518 1482855645 1903324752'
 $npc_firstname['A<<npctemp>>'] = 'Sasha'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1238,7 +1238,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 40
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1378982990 1311934118 1904514436 1282506111 1725049043 1341280625 1250233099'
 $npc_firstname['A<<npctemp>>'] = 'Kisame'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1261,7 +1261,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 41
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1331452063 2012109105 1708557162 1857346873 1496187449 1611414481 1133537624'
 $npc_firstname['A<<npctemp>>'] = 'Givi'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1284,7 +1284,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 42
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1684075531 1825751910 1655527813 1683610108 1813375771 2012109105 1708557162'
 $npc_firstname['A<<npctemp>>'] = 'Ashot'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1307,7 +1307,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 43
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1707750779 1605673218 1243222430 1619197534 1698231949 1043436410 1967334561'
 $npc_firstname['A<<npctemp>>'] = 'Tamara'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1329,7 +1329,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 44
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1313155229 1195459649 1517554507 1714940250 1195812044 1410182720 1106787557'
 $npc_firstname['A<<npctemp>>'] = 'Jora'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1352,7 +1352,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 45
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2120036389 1608902916 1608360250 1348006946 1295114181 1691995142 1058262054'
 $npc_firstname['A<<npctemp>>'] = 'Semyon'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1375,7 +1375,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 46
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1730012364 1640374953 1450067760 1963836408 1594339112 1081934143 1987109342'
 $npc_firstname['A<<npctemp>>'] = 'Andrew'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1398,7 +1398,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 47
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1093558586 1874182199 1860051813 1894735696 2013967885 1566236664 1861552325'
 $npc_firstname['A<<npctemp>>'] = 'Stasik'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1422,7 +1422,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 48
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1399171137 1247493113 1072511322 1204732676 1430581863 1194553758 1926427252'
 $npc_firstname['A<<npctemp>>'] = 'Valera'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -1445,7 +1445,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 49
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1801121147 1596587819 1688642091 1202650974 1577509272 1059659374 1678770230'
 $npc_firstname['A<<npctemp>>'] = 'Bobka'
 $npc_nickname['A<<npctemp>>'] = 0

+ 50 - 50
locations/npcstatic2.qsrc

@@ -2,7 +2,7 @@
 
 
 npctemp = 50
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1435367511 1891990398 1521901210 1459906326 1825460937 1413691134 1744017772'
 $npc_firstname['A<<npctemp>>'] = 'Stas'
 $npc_notes['A<<npctemp>>'] = 'Supermarket Manager'
@@ -22,7 +22,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 51
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1852796600 2106532432 1184050637 1847025401 1606707948 1039681085 1957750328'
 $npc_firstname['A<<npctemp>>'] = 'Vitali'
 $npc_usedname['A<<npctemp>>'] = 'Vitali'
@@ -41,7 +41,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 52
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1571713339 1381421911 1129274296 1580593240 1693511984 1798824352 1655802955'
 $npc_firstname['A<<npctemp>>'] = 'Nicholas'
 $npc_usedname['A<<npctemp>>'] = 'Nicholas'
@@ -60,7 +60,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 53
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1987201506 1646392419 1036777300 1820041031 1625967645 1373112497 1790005211'
 $npc_firstname['A<<npctemp>>'] = 'Joe'
 $npc_notes['A<<npctemp>>'] = 'Joe the Plumber'
@@ -79,7 +79,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 54
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2134980269 1704535752 1434251081 1076620970 1443727294 1838260118 1205245791'
 $npc_firstname['A<<npctemp>>'] = 'Mikhail'
 $npc_nickname['A<<npctemp>>'] = 'Uncle Misha'
@@ -103,7 +103,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'',
 
 
 npctemp = 55
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731'
 $npc_firstname['A<<npctemp>>'] = 'Olu'
 $npc_usedname['A<<npctemp>>'] = 'Olu'
@@ -122,7 +122,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 56
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1731740316 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
 $npc_firstname['A<<npctemp>>'] = 'Roma'
 $npc_nickname['A<<npctemp>>'] = 'Roma'
@@ -147,7 +147,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'',
 
 
 npctemp = 57
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109'
 $npc_firstname['A<<npctemp>>'] = 'Rex'
 $npc_usedname['A<<npctemp>>'] = 'Rex'
@@ -169,7 +169,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'',
 
 
 npctemp = 58
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1443401856 1151112047 8321006077 1153217734 1305220298 7921283143 7765736018'
 $npc_firstname['A<<npctemp>>'] = 'Zhendos'
 $npc_usedname['A<<npctemp>>'] = 'Zhendos'
@@ -189,7 +189,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 59
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1670044870 1746541889 1939734844 1792989216 1320934850 1111430962 2142228809'
 $npc_firstname['A<<npctemp>>'] = 'Mishan'
 $npc_usedname['A<<npctemp>>'] = 'Mishan'
@@ -209,7 +209,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 60
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1277459319 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
 $npc_firstname['A<<npctemp>>'] = 'Miroslava'
 $npc_nickname['A<<npctemp>>'] = 'Mira'
@@ -231,7 +231,7 @@ $npc_pic['A<<npctemp>>'] = 'images/characters/village/mira/mira.jpg'
 
 
 npctemp = 61
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1674740055 1616332471 1238320018 1885547841 1948804143 1271878978 1383881679'
 $npc_firstname['A<<npctemp>>'] = 'Kolyamba'
 $npc_usedname['A<<npctemp>>'] = 'Kolyamba'
@@ -251,7 +251,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 62
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1461313531 1705318453 1315320361 1648677747 1742189125 1337017581 1188201934'
 $npc_firstname['A<<npctemp>>'] = 'Vasyanya'
 $npc_nickname['A<<npctemp>>'] = 'Vasyan'
@@ -272,7 +272,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 63
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1262037798 1489580076 1482201365 1230199953 1331830585 1923429750 1570327975'
 $npc_firstname['A<<npctemp>>'] = 'Dimitriy'
 $npc_nickname['A<<npctemp>>'] = 'Mitka'
@@ -296,7 +296,7 @@ $npc_pic['A<<npctemp>>'] = 'images/locations/gadukino/village/mitka.jpg'
 
 
 npctemp = 64
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2011848683 2053109941 2123319868 1126381092 1930867160 1481040265 1607304091'
 $npc_firstname['A<<npctemp>>'] = 'Afanasiy'
 $npc_usedname['A<<npctemp>>'] = 'Afanasiy'
@@ -318,7 +318,7 @@ $npc_pic['A<<npctemp>>'] = 'images/locations/gadukino/village/mirafather.jpg'
 
 
 npctemp = 65
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1407717462 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
 $npc_firstname['A<<npctemp>>'] = 'Evel'
 $npc_nickname['A<<npctemp>>'] = 'Evel'
@@ -339,7 +339,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 66
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '3769808989 3791424895 3388660888 3670612592 3668879713 3274794097 3877226585'
 $npc_firstname['A<<npctemp>>'] = 'Bandit'
 $npc_nickname['A<<npctemp>>'] = 'Bandit'
@@ -361,7 +361,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 67
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1770994710 1045056456 1630291439 1823144512 2022969490 1003713468 1769557695'
 $npc_firstname['A<<npctemp>>'] = 'Big C'
 npc_cyc['A<<npctemp>>'] = -1
@@ -379,7 +379,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 68
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1180829350 1861722783 1533731343 2060083553 1474192936 1030861215 1441974536'
 $npc_firstname['A<<npctemp>>'] = 'Perth'
 $npc_nickname['A<<npctemp>>'] = 'Peter'
@@ -401,7 +401,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 69
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1497408906 2062794580 1954918340 1284438971 1189615485 1330569260 1356806209'
 $npc_firstname['A<<npctemp>>'] = 'Mikhail'
 $npc_nickname['A<<npctemp>>'] = 'Coach'
@@ -427,7 +427,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 69 & gt ''phone_selfies'',
 
 
 npctemp = 70
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1625103852 1058929809 1950538836 1778016905 1380420827 1079863842 1745265049'
 $npc_lastname['A<<npctemp>>'] = 'Katalkin'
 $npc_usedname['A<<npctemp>>'] = 'Captain Katalkin'
@@ -447,7 +447,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 71
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2132719934 1311181050 1171683829 1946919542 1528886114 2035827969 1077439399'
 $npc_firstname['A<<npctemp>>'] = 'Pasha'
 $npc_usedname['A<<npctemp>>'] = 'Officer Pasha'
@@ -467,7 +467,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 72
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1416935739 1965395103 1375203982 1925522281 1102922011 2030344556 1049774393'
 $npc_firstname['A<<npctemp>>'] = 'Sergi'
 $npc_usedname['A<<npctemp>>'] = 'Officer Sergi'
@@ -487,7 +487,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 73
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2012922376 1037502234 1553944791 1481530732 1811451079 1396452842 1984210226'
 $npc_firstname['A<<npctemp>>'] = 'Arthur'
 $npc_nickname['A<<npctemp>>'] = 'Arthur'
@@ -508,7 +508,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 74
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1770755490 1681513008 1124194992 1296486173 1065745146 1634914638 1526211903'
 $npc_firstname['A<<npctemp>>'] = 'Anatoly'
 $npc_nickname['A<<npctemp>>'] = 'Chubais'
@@ -530,7 +530,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 75
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2039225506 1786885929 1179834057 1525285053 1729741476 1870377171 1879004056'
 $npc_firstname['A<<npctemp>>'] = 'Sergei'
 $npc_usedname['A<<npctemp>>'] = 'Sergei'
@@ -556,7 +556,7 @@ $npc_dad['A<<npctemp>>'] = 'A72'
 
 
 npctemp = 76
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1008510370 1518299135 1584717411 1093601930 1547392081 1332335506 1589745960'
 $npc_firstname['A<<npctemp>>'] = 'Ivan'
 $npc_usedname['A<<npctemp>>'] = 'Ivan'
@@ -576,7 +576,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 77
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1971687970 1162271469 1942122372 1675574199 1926720739 1720477118 2120304425'
 $npc_firstname['A<<npctemp>>'] = 'Timothy'
 $npc_usedname['A<<npctemp>>'] = 'Timothy'
@@ -596,7 +596,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 78
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1129198910 2123899265 2070826103 1263408683 1266342598 1852602642 1659580757'
 $npc_firstname['A<<npctemp>>'] = 'Vic'
 $npc_usedname['A<<npctemp>>'] = 'Vic'
@@ -615,7 +615,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 79
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1493775493 1711020559 1913087213 1896156768 1664736488 1487004190 1687464440'
 $npc_firstname['A<<npctemp>>'] = 'Lena'
 $npc_notes['A<<npctemp>>'] = 'Coworker at the Burger Bistro.'
@@ -633,7 +633,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 80
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1043237462 1787303410 2015535291 1536406969 1119401804 1423821092 1202659815'
 $npc_lastname['A<<npctemp>>'] = 'Borisovich'
 $npc_usedname['A<<npctemp>>'] = 'Mrs. Borisovich'
@@ -652,7 +652,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 81
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1781969758 1233736852 1968991800 1271757488 1003619294 1186735786 1089618370'
 $npc_firstname['A<<npctemp>>'] = 'Alexei'
 $npc_usedname['A<<npctemp>>'] = 'Alexey'
@@ -672,7 +672,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 82
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1518919857 1263522764 1853362558 1903972455 1560042249 1858587108 1920541253'
 $npc_firstname['A<<npctemp>>'] = 'DeMarcus'
 $npc_usedname['A<<npctemp>>'] = 'DeMarcus'
@@ -692,7 +692,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 83
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1473539500 1300272748 1849153490 1148245338 1587757384 1435094984 1944660918'
 $npc_firstname['A<<npctemp>>'] = 'Goshi'
 $npc_usedname['A<<npctemp>>'] = 'Goshi'
@@ -712,7 +712,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 84
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2106927598 1295208699 1791495642 1377661124 2006483992 1113518034 1579903219'
 $npc_firstname['A<<npctemp>>'] = 'Kendra'
 $npc_notes['A<<npctemp>>'] = 'A female student in the University'
@@ -730,7 +730,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 85
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
 $npc_firstname['A<<npctemp>>'] = 0
 $npc_nickname['A<<npctemp>>'] = 'Kas'
@@ -750,7 +750,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 86
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1292901057 1445078354 1576836749 1579962358 1713996320 2046365622 1579166032'
 $npc_firstname['A<<npctemp>>'] = 'Yaroslav'
 $npc_usedname['A<<npctemp>>'] = 'Yaroslav'
@@ -770,7 +770,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 87
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
 $npc_nickname['A<<npctemp>>'] = 0
@@ -791,7 +791,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 88
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1072747711 1893613779 1095190471 1168304377 1119586478 1317838894 1161492926'
 $npc_firstname['A<<npctemp>>'] = 'Alexander'
 $npc_usedname['A<<npctemp>>'] = 'Alexander E.'
@@ -811,7 +811,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 89
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1686681956 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
 $npc_firstname['A<<npctemp>>'] = 'Eugene'
 $npc_nickname['A<<npctemp>>'] = 'Eugene'
@@ -831,7 +831,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 90
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1551794736 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
 $npc_firstname['A<<npctemp>>'] = 'Angela'
 $npc_notes['A<<npctemp>>'] = 'Sister of Eugene, works as a cook at the barbecue by the lake.'
@@ -851,7 +851,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 91
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1091682576 2037714665 1534661263 1602294938 1206288726 1612990215 1456060861'
 $npc_firstname['A<<npctemp>>'] = 'Abdul'
 $npc_usedname['A<<npctemp>>'] = 'Abdul'
@@ -871,7 +871,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 92
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1215179226 1132967920 1233565533 2074043785 1042603573 1361029355 2138150185'
 $npc_firstname['A<<npctemp>>'] = 'Hassan'
 $npc_usedname['A<<npctemp>>'] = 'Hassan'
@@ -891,7 +891,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 93
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1419539166 1635112879 1449039561 1653076316 1282274667 1815783068 1891294665'
 $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Ira'
@@ -910,7 +910,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 94
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1867223522 1532675696 1762275784 1308084289 2089817449 1807718763 1325197727'
 $npc_firstname['A<<npctemp>>'] = 'Nadia'
 $npc_notes['A<<npctemp>>'] = 'Saleswoman of Hassan''s Stall in the Residential Area marketplace.'
@@ -928,7 +928,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 95
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1665716568 1089177521 1951416857 1629130965 1139147327 1335392254 1729246241'
 $npc_firstname['A<<npctemp>>'] = 'Anna'
 $npc_notes['A<<npctemp>>'] = 'Saleswoman of Abdul''s Stall'
@@ -946,7 +946,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 96
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1460502649 1673367532 1417003328 1868999426 1609397406 1943603327 1181997081'
 $npc_firstname['A<<npctemp>>'] = 'Katya'
 $npc_usedname['A<<npctemp>>'] = 'Aunt Katya'
@@ -965,7 +965,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 97
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1094943856 1353290235 1572450107 1956501688 1542692525 1988448865 1619643443'
 $npc_firstname['A<<npctemp>>'] = 'Camille'
 $npc_notes['A<<npctemp>>'] = 'A Sexually agressive caucasian from the Residential Area marketplace.'
@@ -984,7 +984,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 98
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1236168432 1165329555 1245952733 1661287661 1117236841 1677164094 1151987548'
 $npc_firstname['A<<npctemp>>'] = 'Aslan'
 $npc_usedname['A<<npctemp>>'] = 'Aslan'
@@ -1004,7 +1004,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 99
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1510466089 1004233017 1279999730 1803351444 1641046743 1766586587 1960434703'
 $npc_firstname['A<<npctemp>>'] = 'Mukhtar'
 $npc_usedname['A<<npctemp>>'] = 'Mukhtar'

+ 49 - 49
locations/npcstatic3.qsrc

@@ -6,7 +6,7 @@ npctemp = 100
 
 
 npctemp = 101
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1316262053 1139860599 1054558181 1564591207 1897612229 1770085065 1904973185'
 $npc_firstname['A<<npctemp>>'] = 'Andrew'
 $npc_lastname['A<<npctemp>>'] = 'Sobulyagin'
@@ -26,7 +26,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 102
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1543553151 1178430341 1325302453 1973698959 1957668534 1742596417 1164209202'
 $npc_firstname['A<<npctemp>>'] = 'Vasan'
 $npc_nickname['A<<npctemp>>'] = 'Nails'
@@ -46,7 +46,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 103
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1067395578 2076484645 1105399915 1907879678 1427565612 1490215506 1150379156'
 $npc_firstname['A<<npctemp>>'] = 'Bereza'
 $npc_nickname['A<<npctemp>>'] = 'Birch'
@@ -65,7 +65,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 104
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1043823602 2024518232 1177653510 1378276310 1952592877 1519571965 1344291245'
 $npc_firstname['A<<npctemp>>'] = 'Konstantin'
 $npc_nickname['A<<npctemp>>'] = 'Witek'
@@ -84,7 +84,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 105
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1142923155 1109221512 1878952508 1385940310 1720623901 2002904662 1060291391'
 $npc_firstname['A<<npctemp>>'] = 'Kostil'
 $npc_nickname['A<<npctemp>>'] = 'Spike'
@@ -103,7 +103,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 106
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1417673067 1028156270 1577447008 1963640062 1937710404 1257008617 1439724726'
 $npc_firstname['A<<npctemp>>'] = 'Udmurt'
 $npc_nickname['A<<npctemp>>'] = 'Udmurt'
@@ -122,7 +122,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 107
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1844078701 1752959121 1178966198 1524261234 1583340322 1917049302 1492514745'
 $npc_firstname['A<<npctemp>>'] = 'Seri'
 $npc_nickname['A<<npctemp>>'] = 'Gray'
@@ -141,7 +141,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 108
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1643991188 1952232493 1071028063 2074038111 1147795375 2118341095 1847972590'
 $npc_firstname['A<<npctemp>>'] = 'Vladimir'
 $npc_usedname['A<<npctemp>>'] = 'Vladimir'
@@ -160,7 +160,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 109
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1746569371 1346237388 1813218844 1467700105 1086609823 1654865621 1715437717'
 $npc_firstname['A<<npctemp>>'] = 'Glory'
 $npc_nickname['A<<npctemp>>'] = 'Banzai'
@@ -179,7 +179,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 110
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1382385133 2015745814 1777689033 1679307387 1776217771 1917449428 2071160465'
 $npc_firstname['A<<npctemp>>'] = 'Vitaly'
 $npc_usedname['A<<npctemp>>'] = 'Vitaly'
@@ -197,7 +197,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 111
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1089725928 1899475061 1329520737 1102315698 1749072929 1621723771 1753154554'
 $npc_firstname['A<<npctemp>>'] = 'Isolde'
 npc_dob['A<<npctemp>>'] = 19970410
@@ -216,7 +216,7 @@ $npc_pic['A<<npctemp>>'] = 'images/characters/city/isolde/izolda.jpg'
 
 
 npctemp = 112
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1357552191 1808035750 1644370082 1970842460 1776176573 1211917555 1776040163'
 $npc_firstname['A<<npctemp>>'] = 'Sergey'
 $npc_lastname['A<<npctemp>>'] = 'Shulgin'
@@ -240,7 +240,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 112 & gt ''phone_selfies''
 
 
 npctemp = 113
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1774396206 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
 $npc_firstname['A<<npctemp>>'] = 'Vadim'
 $npc_lastname['A<<npctemp>>'] = 'Bely'
@@ -261,7 +261,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 114
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1774396205 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
 $npc_firstname['A<<npctemp>>'] = 'Georgiy'
 $npc_lastname['A<<npctemp>>'] = 'Bely'
@@ -281,7 +281,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 115
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1074209213 1187173282 1211031753 1535474248 1134590256 1026540873 1721369948'
 $npc_firstname['A<<npctemp>>'] = 'Siple'
 $npc_notes['A<<npctemp>>'] = 'One of Vadim Bely''s henchmen.'
@@ -300,7 +300,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 116
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1542399937 1905241817 1701426477 1002823534 1464267474 1011697976 1988839911'
 $npc_firstname['A<<npctemp>>'] = 'Tatar'
 $npc_notes['A<<npctemp>>'] = 'One of Vadim Bely''s henchmen.'
@@ -319,7 +319,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 117
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '4542399937 4905241817 4701426477 4002823534 4464267474 4011697976 4988839911'
 $npc_firstname['A<<npctemp>>'] = 'Dimitrij'
 $npc_nickname['A<<npctemp>>'] = 'Stallion'
@@ -340,7 +340,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 118
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1705291842 1203561941 1602837590 1811774530 1215541632 1893678025 1991423109'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
 $npc_nickname['A<<npctemp>>'] = 'Boris'
@@ -363,7 +363,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 119
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2031631571 1995569440 1450381571 1372658726 1715345534 1718505125 1736791711'
 $npc_firstname['A<<npctemp>>'] = 'Borislav'
 $npc_nickname['A<<npctemp>>'] = 'Slava'
@@ -383,7 +383,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 120
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1288672090 1312650625 1126852365 1579537441 1050383706 1530771556 1757833025'
 $npc_usedname['A<<npctemp>>'] = 'Mistress'' companion'
 npc_cyc['A<<npctemp>>'] = -1
@@ -401,7 +401,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 121
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1145156791 1748081183 1137690401 1121192373 1440194064 1029860550 1346974726'
 $npc_usedname['A<<npctemp>>'] = 'That Guy'
 $npc_notes['A<<npctemp>>'] = 'The Man from the park bench.'
@@ -419,7 +419,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 122
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2130577244 1640932093 1191659262 1340043332 1009313498 1205807037 1759548391'
 $npc_usedname['A<<npctemp>>'] = 'Adrik'
 $npc_notes['A<<npctemp>>'] = 'Boy from the Stairwell'
@@ -437,7 +437,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 123
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1213144477 1393767889 1853481730 1216131062 1625069235 1446669832 1709998708'
 $npc_usedname['A<<npctemp>>'] = 'Petr'
 $npc_notes['A<<npctemp>>'] = 'Boy from the Stairwell'
@@ -455,7 +455,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 124
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1665174694 1988944116 1807917594 1254176734 2064239242 1643819573 1392786112'
 $npc_usedname['A<<npctemp>>'] = 'Kolyan'
 $npc_notes['A<<npctemp>>'] = 'Boy from the Stairwell'
@@ -473,7 +473,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 125
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1782310214 1854425806 1138563924 1277981120 1771674321 1225102514 1034678700'
 $npc_usedname['A<<npctemp>>'] = 'Yakov'
 $npc_notes['A<<npctemp>>'] = 'Boy from the Stairwell'
@@ -491,7 +491,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 126
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1464522854 1308604424 1705249327 1562011617 1043225628 1849417361 1015855202'
 $npc_usedname['A<<npctemp>>'] = 'Mikhail'
 $npc_notes['A<<npctemp>>'] = 'Boy from the Stairwell'
@@ -509,7 +509,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 127
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1797467433 2003489967 1798597247 1058757155 1598996372 1954728943 1657496532'
 $npc_usedname['A<<npctemp>>'] = 'Gosha'
 $npc_notes['A<<npctemp>>'] = 'Dimka''s friend Gosha.'
@@ -527,7 +527,7 @@ npc_hymen['A<<npctemp>>'] = -1
 
 
 npctemp = 128
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1329445270 1353015030 1000782701 1036165668 1639583614 1529658078 1975679453'
 $npc_firstname['A<<npctemp>>'] = 'Makar'
 $npc_nickname['A<<npctemp>>'] = 'Makar'
@@ -551,7 +551,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 128 & gt ''phone_selfies''
 
 
 npctemp = 129
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1440577620 1404493595 1159165013 1229533074 1597914660 1301026307 1275667543'
 $npc_firstname['A<<npctemp>>'] = 'Serafim'
 $npc_nickname['A<<npctemp>>'] = 'Serafim'
@@ -575,7 +575,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 129 & gt ''phone_selfies''
 
 
 npctemp = 130
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1726870149 1624130023 1044618711 1429525298 1800638929 1340956737 1405979189'
 $npc_firstname['A<<npctemp>>'] = 'Ilya'
 $npc_nickname['A<<npctemp>>'] = 'Ilya'
@@ -599,7 +599,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 130 & gt ''phone_selfies''
 
 
 npctemp = 131
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1290761368 1731705745 1556198951 1402252861 1318878286 1783536035 1235327987'
 $npc_firstname['A<<npctemp>>'] = 'Viktor'
 $npc_nickname['A<<npctemp>>'] = 'Viktor'
@@ -623,7 +623,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 131 & gt ''phone_selfies''
 
 
 npctemp = 132
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1845705457 1671776475 1432615990 2143340423 1777183626 1122316963 1021792548'
 $npc_firstname['A<<npctemp>>'] = 'Ruslan'
 $npc_nickname['A<<npctemp>>'] = 'Ruslan'
@@ -647,7 +647,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 132 & gt ''phone_selfies''
 
 
 npctemp = 133
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1771221536 2027750396 2089544713 1734369517 1759135620 1433377965 1088177703'
 $npc_firstname['A<<npctemp>>'] = 'Rolan'
 $npc_nickname['A<<npctemp>>'] = 'Rolan'
@@ -671,7 +671,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 133 & gt ''phone_selfies''
 
 
 npctemp = 134
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1837796316 1436860618 1699933821 1423519204 1271493655 1566380915 1482989416'
 $npc_firstname['A<<npctemp>>'] = 'Aleksandrina'
 $npc_nickname['A<<npctemp>>'] = 'Aleksandrina'
@@ -695,7 +695,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 134 & gt ''phone_selfies''
 
 
 npctemp = 135
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1482962188 1063482733 1488899248 1806709653 1901966276 1373982700 1143695253'
 $npc_firstname['A<<npctemp>>'] = 'Yeva'
 $npc_nickname['A<<npctemp>>'] = 'Yeva'
@@ -719,7 +719,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 135 & gt ''phone_selfies''
 
 
 npctemp = 136
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1323009327 1170828061 1350671739 1453635383 1122377435 1922441585 1637692781'
 $npc_firstname['A<<npctemp>>'] = 'Olga'
 $npc_nickname['A<<npctemp>>'] = 'Olga'
@@ -743,7 +743,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 136 & gt ''phone_selfies''
 
 
 npctemp = 137
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1366158823 1463494144 1620282105 1806630761 1949066883 1679902075 1297964182'
 $npc_firstname['A<<npctemp>>'] = 'Raven'
 $npc_nickname['A<<npctemp>>'] = 'Raven'
@@ -767,7 +767,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 137 & gt ''phone_selfies''
 
 
 npctemp = 138
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1041262937 1103319358 1212009691 1617547174 1655867289 1930930487 1952353548'
 $npc_firstname['A<<npctemp>>'] = 'Arina'
 $npc_nickname['A<<npctemp>>'] = 'Arina'
@@ -791,7 +791,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 138 & gt ''phone_selfies''
 
 
 npctemp = 139
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077'
 $npc_firstname['A<<npctemp>>'] = 'Stasya'
 $npc_nickname['A<<npctemp>>'] = 'Stasya'
@@ -815,7 +815,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 139 & gt ''phone_selfies''
 
 
 npctemp = 140
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038'
 $npc_firstname['A<<npctemp>>'] = 'Lizaveta'
 $npc_nickname['A<<npctemp>>'] = 'Lizaveta'
@@ -839,7 +839,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 140 & gt ''phone_selfies''
 
 
 npctemp = 141
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018'
 $npc_firstname['A<<npctemp>>'] = 'Veronika'
 $npc_nickname['A<<npctemp>>'] = 'Veronika'
@@ -863,7 +863,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 141 & gt ''phone_selfies''
 
 
 npctemp = 142
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730'
 $npc_firstname['A<<npctemp>>'] = 'Zinaida'
 $npc_nickname['A<<npctemp>>'] = 'Zinaida'
@@ -887,7 +887,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 142 & gt ''phone_selfies''
 
 
 npctemp = 143
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1483702075 1521949936 1508959207 1971565483 1258438946 1771252769 1861114888'
 $npc_firstname['A<<npctemp>>'] = 'Alyona'
 $npc_nickname['A<<npctemp>>'] = 'Alyona'
@@ -911,7 +911,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 143 & gt ''phone_selfies''
 
 
 npctemp = 144
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681'
 $npc_firstname['A<<npctemp>>'] = 'Anushka'
 $npc_nickname['A<<npctemp>>'] = 'Anushka'
@@ -935,7 +935,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 144 & gt ''phone_selfies''
 
 
 npctemp = 145
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1353721655 1926973992 1103624951 1850596792 1430454682 1886117868 1618747491'
 $npc_firstname['A<<npctemp>>'] = 'Ekaterina'
 $npc_nickname['A<<npctemp>>'] = 'Katyusha'
@@ -959,7 +959,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 145 & gt ''phone_selfies''
 
 
 npctemp = 146
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1970425464 1559405118 2117548142 1930104143 1673957846 1166458305 1888536480'
 $npc_firstname['A<<npctemp>>'] = 'Marcus'
 $npc_nickname['A<<npctemp>>'] = 'Marcus'
@@ -983,7 +983,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 146 & gt ''phone_selfies''
 
 
 npctemp = 147
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1457300123 1918120099 1967335170 1056889039 1290544338 1170828061 1350671739'
 $npc_firstname['A<<npctemp>>'] = 'Andrey'
 $npc_nickname['A<<npctemp>>'] = 'Andrey'
@@ -1007,7 +1007,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 147 & gt ''phone_selfies''
 
 
 npctemp = 148
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1110871039 1215316528 1439574498 1881549627 1043257862 2062098828 1713844818'
 $npc_firstname['A<<npctemp>>'] = 'Mefodiy'
 $npc_nickname['A<<npctemp>>'] = 'Mefodiy'
@@ -1031,7 +1031,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 148 & gt ''phone_selfies''
 
 
 npctemp = 149
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1299436863 1261698091 1686799294 1465620552 1949917866 1150154188 1072586683'
 $npc_firstname['A<<npctemp>>'] = 'Lazar'
 $npc_nickname['A<<npctemp>>'] = 'Lazar'

+ 49 - 49
locations/npcstatic4.qsrc

@@ -2,7 +2,7 @@
 
 
 npctemp = 150
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1912077115 1054317172 1216715520 1272636005 1666248718 2044828734 1577551516'
 $npc_firstname['A<<npctemp>>'] = 'Erast'
 $npc_nickname['A<<npctemp>>'] = 'Erast'
@@ -27,7 +27,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 150 & gt ''phone_selfies''
 
 
 npctemp = 151
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1668638992 1214865459 1808776698 1612495094 1514793001 1654481226 1823327274'
 $npc_firstname['A<<npctemp>>'] = 'Evgeny'
 $npc_nickname['A<<npctemp>>'] = 'Evgeny'
@@ -52,7 +52,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 151 & gt ''phone_selfies''
 
 
 npctemp = 152
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1786501093 1834879963 1390361698 1051572151 1608736325 1790512075 1070782218'
 $npc_firstname['A<<npctemp>>'] = 'Feofan'
 $npc_nickname['A<<npctemp>>'] = 'Feofan'
@@ -77,7 +77,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 152 & gt ''phone_selfies''
 
 
 npctemp = 153
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1907002748 2085207351 1100129632 1342689598 1745456331 1873513432 1485648419'
 $npc_firstname['A<<npctemp>>'] = 'Gerasim'
 $npc_nickname['A<<npctemp>>'] = 'Gerasim'
@@ -102,7 +102,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 153 & gt ''phone_selfies''
 
 
 npctemp = 154
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1942572074 1700154733 1692821756 1194715785 1803063877 2081935270 2014274394'
 $npc_firstname['A<<npctemp>>'] = 'Radomir'
 $npc_nickname['A<<npctemp>>'] = 'Radomir'
@@ -127,7 +127,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 154 & gt ''phone_selfies''
 
 
 npctemp = 155
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1153126939 1063403218 1979820912 1002904260 1380666059 1009730022 1657156801'
 $npc_firstname['A<<npctemp>>'] = 'Lavrenti'
 $npc_nickname['A<<npctemp>>'] = 'Lavrenti'
@@ -152,7 +152,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 155 & gt ''phone_selfies''
 
 
 npctemp = 156
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1108429212 1130146285 1800931785 1571774683 1841942137 1677995681 1796981560'
 $npc_firstname['A<<npctemp>>'] = 'Arkadi'
 $npc_nickname['A<<npctemp>>'] = 'Arkadi'
@@ -178,7 +178,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 156 & gt ''phone_selfies''
 
 
 npctemp = 157
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1663800525 1510572542 1424729633 1976950271 1830743114 1783648027 1763271904'
 $npc_firstname['A<<npctemp>>'] = 'Roman'
 $npc_nickname['A<<npctemp>>'] = 'Roman'
@@ -203,7 +203,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 157 & gt ''phone_selfies''
 
 
 npctemp = 158
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1776510699 1586206108 1731953841 1110012478 1584998429 1767532419 1060614101'
 $npc_firstname['A<<npctemp>>'] = 'Valentin'
 $npc_nickname['A<<npctemp>>'] = 'Valentin'
@@ -228,7 +228,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 158 & gt ''phone_selfies''
 
 
 npctemp = 159
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1426757610 1675195614 1268203516 1506174629 1153117090 1007713575 1605966541'
 $npc_firstname['A<<npctemp>>'] = 'Petia'
 $npc_nickname['A<<npctemp>>'] = 'Petia'
@@ -253,7 +253,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 159 & gt ''phone_selfies''
 
 
 npctemp = 160
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1428796224 1909315069 1882255348 1835514071 1201593987 2123583560 1823246593'
 $npc_firstname['A<<npctemp>>'] = 'Leonid'
 $npc_nickname['A<<npctemp>>'] = 'Leonid'
@@ -275,7 +275,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 161
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1259280312 1641879774 1467473525 1487343721 1544500481 1151521798 1048594742'
 $npc_usedname['A<<npctemp>>'] = 'Nicholas''s Friend'
 $npc_notes['A<<npctemp>>'] = 'Nicholas''s Friend.'
@@ -294,7 +294,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 162
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1582727702 1056494408 1939172326 1376797215 1875600726 1724112980 1453206350'
 $npc_firstname['A<<npctemp>>'] = 'Victor'
 $npc_usedname['A<<npctemp>>'] = 'Mistress''s Driver'
@@ -314,7 +314,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 163
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1748187802 2032789191 1711627574 1292957633 1111654803 1788616009 1772047830'
 $npc_firstname['A<<npctemp>>'] = 'Arsen'
 $npc_nickname['A<<npctemp>>'] = 'Arsen'
@@ -334,7 +334,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 164
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1034557513 1185767528 1251220411 1486489711 1093403292 1015320258 1011612550'
 $npc_firstname['A<<npctemp>>'] = 'Maksim'
 $npc_nickname['A<<npctemp>>'] = 'Maksim'
@@ -354,7 +354,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 165
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1081104871 1359076800 1939413889 1911496040 1098487725 1546780075 1860974284'
 $npc_firstname['A<<npctemp>>'] = 'Vanya'
 $npc_nickname['A<<npctemp>>'] = 'Vanya'
@@ -379,7 +379,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 165 & gt ''phone_selfies''
 
 
 npctemp = 166
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '3081104871 3359076800 3939413889 3911496040 3098487725 3546780075 3860974284'
 $npc_firstname['A<<npctemp>>'] = 'Rex'
 $npc_nickname['A<<npctemp>>'] = 'Rex'
@@ -401,7 +401,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 167
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1784699091 1203401906 1216561919 1916388994 1239904750 1929086392 1148871462'
 $npc_firstname['A<<npctemp>>'] = 'Reinhold'
 
@@ -422,7 +422,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 168
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '4784699091 4203401906 4216561919 4916388994 4239904750 4929086392 4148871462'
 $npc_firstname['A<<npctemp>>'] = 'Gedo'
 $npc_lastname['A<<npctemp>>'] = 'Mazo'
@@ -443,7 +443,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 169
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1772564507 1547200105 1796704229 1583509569 1596894846 1745220169 1973652650'
 $npc_firstname['A<<npctemp>>'] = 'Dmitry'
 $npc_nickname['A<<npctemp>>'] = 'Dima'
@@ -464,7 +464,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 170
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1526522684 1795996217 1368402599 1642220203 1021143397 1273163614 1531835829'
 $npc_firstname['A<<npctemp>>'] = 'Aleksei'
 $npc_nickname['A<<npctemp>>'] = 'Alex'
@@ -485,7 +485,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 171
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1014091374 1918559552 1896341252 1052968279 1674912040 1758379740 1721466153'
 $npc_firstname['A<<npctemp>>'] = 'Styopa'
 $npc_nickname['A<<npctemp>>'] = 'Stepan'
@@ -507,7 +507,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 172
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2035042362 1045516320 1994842543 1052417530 1977000071 1331823092 1986866420'
 $npc_firstname['A<<npctemp>>'] = 'Andrei'
 $npc_nickname['A<<npctemp>>'] = 'Andrew'
@@ -529,7 +529,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 173
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1140758667 1773455079 2123382286 1650309847 1391480172 1829299044 1187608522'
 $npc_firstname['A<<npctemp>>'] = 'Igor'
 $npc_nickname['A<<npctemp>>'] = 'Igor'
@@ -552,7 +552,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 174
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1008006962 1236637588 1489896373 1580273620 1293163913 1709107929 1173381311'
 $npc_firstname['A<<npctemp>>'] = 'Sergey'
 $npc_nickname['A<<npctemp>>'] = 'Sergey'
@@ -575,7 +575,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 175
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1762171071 1281651668 1794224566 1962137201 1525806840 1010897683 1463472358'
 $npc_firstname['A<<npctemp>>'] = 'Gustav'
 $npc_nickname['A<<npctemp>>'] = 'Gustav'
@@ -596,7 +596,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 176
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1006991833 1781290821 1894478819 1893358116 2127290034 1137830776 1241388413'
 $npc_firstname['A<<npctemp>>'] = 'Tatiana'
 $npc_nickname['A<<npctemp>>'] = 'Tatiana'
@@ -616,7 +616,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 177
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2002591333 1925818575 1969997487 1060579504 1586877100 1553666549 1966601880'
 $npc_nickname['A<<npctemp>>'] = 'Rude Fisherman'
 $npc_usedname['A<<npctemp>>'] = 'Rude Fisherman'
@@ -637,7 +637,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 178
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1144646462 1823244872 1843355586 1217893778 1897895542 1393527413 1969377528'
 $npc_firstname['A<<npctemp>>'] = 'Natalya'
 $npc_nickname['A<<npctemp>>'] = 'Natalya'
@@ -658,7 +658,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 179
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1346361049 1328639709 1291363881 1317513795 1888589910 1014862870 1205798028'
 $npc_firstname['A<<npctemp>>'] = 'Ilari'
 $npc_nickname['A<<npctemp>>'] = 'Ilari'
@@ -681,7 +681,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 180
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '4346361049 4328639709 4291363881 4317513795 4888589910 4014862870 4205798028'
 $npc_firstname['A<<npctemp>>'] = 'Sasori'
 $npc_nickname['A<<npctemp>>'] = 'Sasori'
@@ -703,7 +703,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 181
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1546478363 1040873558 1970652586 1531682310 1996463487 1293805943 1036689614'
 $npc_usedname['A<<npctemp>>'] = 'Sexshop Cashier'
 $npc_notes['A<<npctemp>>'] = 'Cashier at the sexshop.'
@@ -723,7 +723,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 182
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1020750214 1760012487 1196272894 1622978428 1628391634 2022138491 2071033872'
 $npc_firstname['A<<npctemp>>'] = 'Conan'
 $npc_nickname['A<<npctemp>>'] = 'Conan'
@@ -745,7 +745,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 183
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1372778085 1912011495 1743459319 1874701039 1361625511 1281898844 1820485903'
 $npc_firstname['A<<npctemp>>'] = 'Hidan'
 $npc_nickname['A<<npctemp>>'] = 'Hidan'
@@ -767,7 +767,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 184
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1102236119 1140436145 1903631040 1307987303 1672604281 1932459933 1381024294'
 $npc_firstname['A<<npctemp>>'] = 'Eugene'
 $npc_nickname['A<<npctemp>>'] = 'Eugene'
@@ -788,7 +788,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 185
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1688667877 1444143245 1971085394 1614262160 1304657108 2094208929 1374312201'
 $npc_firstname['A<<npctemp>>'] = 'Michael'
 $npc_nickname['A<<npctemp>>'] = 'Misha'
@@ -810,7 +810,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 186
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '8321006077 7921283143 7765736018 1382438126 1034093203 1265299630 1118945982'
 $npc_firstname['A<<npctemp>>'] = 'Ivan'
 $npc_nickname['A<<npctemp>>'] = 'Master'
@@ -833,7 +833,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 187
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1828318755 1912110768 1763625475 1700953844 1635556809 1788400335 1891647424'
 $npc_firstname['A<<npctemp>>'] = 'Elisabeta'
 $npc_nickname['A<<npctemp>>'] = 'Liz'
@@ -854,7 +854,7 @@ npc_danceero['A<<npctemp>>'] = rand(20,40)
 
 
 npctemp = 188
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1437373624 1498180021 1914707319 1923163911 1520364264 2110725762 1260967419'
 $npc_notes['A<<npctemp>>'] = 'Bely''s cousin'
 npc_cyc['A<<npctemp>>'] = -1
@@ -873,7 +873,7 @@ npc_nips['A<<npctemp>>'] = 1
 
 
 npctemp = 189
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1492342621 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
 $npc_firstname['A<<npctemp>>'] = 'Nikolai'
 $npc_nickname['A<<npctemp>>'] = 'Niko'
@@ -904,7 +904,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 189 & gt ''phone_selfies''
 	
 
 npctemp = 190
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1492342626 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
 $npc_firstname['A<<npctemp>>'] = 'Yurik'
 $npc_nickname['A<<npctemp>>'] = 'Yurik'
@@ -935,7 +935,7 @@ npctemp = 191
 !!{ Empty, used to be pet dog. Freely usable, if reserved }
 
 npctemp = 192
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1893727481 1167237604 1303192980 1478078827 1870699157 1379809405 1569436993'
 $npc_firstname['A<<npctemp>>'] = 'Anastasia'
 $npc_nickname['A<<npctemp>>'] = 'Nastja'
@@ -955,7 +955,7 @@ npc_nips['A<<npctemp>>'] = 4
 
 
 npctemp = 193
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7140667332 7978651826 7440682263 1631105202 2145357995 1540785413 1172036362'
 $npc_firstname['A<<npctemp>>'] = 'Alexander'
 $npc_nickname['A<<npctemp>>'] = 'Alexei'
@@ -987,7 +987,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 194
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7008670756 7958693370 7059741341 1566986214 1732880506 1281239619 1634169768'
 $npc_firstname['A<<npctemp>>'] = 'Sergei'
 $npc_nickname['A<<npctemp>>'] = 'Seryozha'
@@ -1021,7 +1021,7 @@ npc_dance['A<<npctemp>>'] = 25
 
 
 npctemp = 195
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1086487692 7476661390 7698010724 1870038241 1870978496 1236988759 1677200479'
 $npc_firstname['A<<npctemp>>'] = 'Egor'
 $npc_nickname['A<<npctemp>>'] = 'Egori'
@@ -1053,7 +1053,7 @@ npc_eyecol['A<<npctemp>>'] = 1
 
 
 npctemp = 196
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7955917440 7472108604 7013900784 1016721320 1968096832 1240781467 1387541183'
 $npc_firstname['A<<npctemp>>'] = 'Ignatio'
 $npc_nickname['A<<npctemp>>'] = 'Ignat'
@@ -1093,7 +1093,7 @@ npc_run['A<<npctemp>>'] = 30
 
 
 npctemp = 197
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7169919752 7587835065 7871488903 1779229534 1159101193 1247015884 1571810481'
 $npc_firstname['A<<npctemp>>'] = 'Simeon'
 $npc_nickname['A<<npctemp>>'] = 'Syoma'
@@ -1127,7 +1127,7 @@ npc_glasses['A<<npctemp>>'] = 1
 
 
 npctemp = 198
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7086114440 7277581517 7759004439 7806044180 7847240421 7645177267 7010982243'
 $npc_firstname['A<<npctemp>>'] = 'Vasilij'
 $npc_nickname['A<<npctemp>>'] = 'Vasya'
@@ -1158,7 +1158,7 @@ npc_dance['A<<npctemp>>'] = 30
 
 
 npctemp = 199
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7320830648 7530535660 7541232906 7105571576 7804090027 7350795193 7275790780'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
 $npc_nickname['A<<npctemp>>'] = 'Borya'

+ 31 - 31
locations/npcstatic5.qsrc

@@ -1,7 +1,7 @@
 # npcstatic5
 
 npctemp = 200
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7894193659 7682081397 7204840012 1999784485 1457862984 1446965385 1706290392'
 $npc_firstname['A<<npctemp>>'] = 'Daniil'
 $npc_nickname['A<<npctemp>>'] = 'Danek'
@@ -31,7 +31,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 201
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7997566748 7105919378 7895527285 1850847152 1168395089 1748895937 1871858376'
 $npc_firstname['A<<npctemp>>'] = 'Pyotr'
 $npc_nickname['A<<npctemp>>'] = 'Pepik'
@@ -61,7 +61,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 202
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7241994349 7588712776 7761775617 1033432556 1882492358 1835705225 1697690427'
 $npc_firstname['A<<npctemp>>'] = 'Oleg'
 $npc_nickname['A<<npctemp>>'] = 'Alusha'
@@ -91,7 +91,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 203
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7086114441 7277581517 7759004439 7806044180 7847240421 7645177267 7010982243'
 $npc_firstname['A<<npctemp>>'] = 'Rozalina'
 $npc_nickname['A<<npctemp>>'] = 'Roza'
@@ -137,7 +137,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 204
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1207762572 1494175825 2017959069 1121952704 1881785832 1188695069 2103222232'
 $npc_firstname['A<<npctemp>>'] = 'Savva'
 $npc_nickname['A<<npctemp>>'] = 'Savva'
@@ -168,7 +168,7 @@ npc_rel['A<<npctemp>>'] = 30
 
 
 npctemp = 205
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1456495926 1825013001 1426346332 1658350924 1416940928 1235168107 1641113022'
 $npc_firstname['A<<npctemp>>'] = 'Viola'
 $npc_nickname['A<<npctemp>>'] = 'Viola'
@@ -215,7 +215,7 @@ npc_rel['A<<npctemp>>'] = 30
 
 
 npctemp = 206
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1445996359 2043177567 2087825407 1125768621 1193670508 1546731603 1153010368'
 $npc_firstname['A<<npctemp>>'] = 'Anastasia'
 $npc_nickname['A<<npctemp>>'] = 'Ana'
@@ -260,7 +260,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 207
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1566905938 1595812743 1264814903 1202807569 1219918665 1918355781 1112562700'
 $npc_firstname['A<<npctemp>>'] = 'Krystal'
 $npc_nickname['A<<npctemp>>'] = 'K'
@@ -305,7 +305,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 208
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1932253601 1542500697 1805737576 1647512030 1421214633 1204476129 1337037542'
 $npc_firstname['A<<npctemp>>'] = 'Emily'
 $npc_nickname['A<<npctemp>>'] = 'Emily'
@@ -350,7 +350,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 209
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1740246374 1919208009 1680455685 1053484462 1109927912 1261930787 1696559936'
 $npc_firstname['A<<npctemp>>'] = 'Jeff'
 $npc_nickname['A<<npctemp>>'] = 'Jeff'
@@ -439,7 +439,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 211
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1443139130 1162250781 1085782363 1683139508 1069866801 1832385584 1943117010'
 $npc_firstname['A<<npctemp>>'] = 'Lily'
 $npc_nickname['A<<npctemp>>'] = 'Lily'
@@ -484,7 +484,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 212
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1015649095 2130854423 1178171947 1162133847 1279076969 1411612180 1259864846'
 $npc_firstname['A<<npctemp>>'] = 'Mila'
 $npc_nickname['A<<npctemp>>'] = 'Mila'
@@ -529,7 +529,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 213
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1196820157 1491541486 1231314034 1944307266 1012640921 1225217068 1797663802'
 $npc_firstname['A<<npctemp>>'] = 'Mariya'
 $npc_nickname['A<<npctemp>>'] = 'Mari'
@@ -574,7 +574,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 214
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1706592901 1601659001 1072073515 1446208368 1788494018 1754604560 1645525487'
 $npc_firstname['A<<npctemp>>'] = 'Olga'
 $npc_nickname['A<<npctemp>>'] = 'Olga'
@@ -619,7 +619,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 215
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1841305338 1934557807 2127062159 2015882090 2056884118 1132783555 1576490435'
 $npc_firstname['A<<npctemp>>'] = 'Alisa'
 $npc_nickname['A<<npctemp>>'] = 'Alisa'
@@ -664,7 +664,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 216
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1542858357 1009682026 2043057884 1700422516 1825246284 1473718491 1145465003'
 $npc_firstname['A<<npctemp>>'] = 'Martin'
 $npc_nickname['A<<npctemp>>'] = 'Martin'
@@ -709,7 +709,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 217
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1293492227 1092251557 1817170283 1188737490 1962390512 1811716752 1347276837'
 $npc_firstname['A<<npctemp>>'] = 'Varsonofy'
 $npc_nickname['A<<npctemp>>'] = 'Pavlin'
@@ -734,7 +734,7 @@ npc_dom['A<<npctemp>>'] = 50
 
 
 npctemp = 218
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7845565703 9732666365 5079835231 4099096300 1653287931 7271394997 0865417545'	
 $npc_firstname['A<<npctemp>>'] = 'Tanya'
 $npc_nickname['A<<npctemp>>'] = 'Tanya'
@@ -779,7 +779,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 219
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '3363881169 9173549929 4285014077 5418012627 3214080232 5741158606 9206523653'
 $npc_firstname['A<<npctemp>>'] = 'Katja'
 $npc_nickname['A<<npctemp>>'] = 'Kat'
@@ -824,7 +824,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 220
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '6675506212 5051737442 5740356104 9947679629 3042231652 6247569074 1233026260'
 $npc_firstname['A<<npctemp>>'] = 'Vika'
 $npc_nickname['A<<npctemp>>'] = 'Vika'
@@ -869,7 +869,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 221
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1948232040 5876497260 6370729556 6591408199 9948768808 2245632532 3569109223'
 $npc_firstname['A<<npctemp>>'] = 'Grigory'
 $npc_nickname['A<<npctemp>>'] = 'Grigory'
@@ -894,7 +894,7 @@ npc_dom['A<<npctemp>>'] = 50
 
 
 npctemp = 222
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7241994349 7588712776 7761775617 1033432556 1882492358 1835705225 1697690427'
 $npc_firstname['A<<npctemp>>'] = 'Gennadily'
 $npc_nickname['A<<npctemp>>'] = 'Gena'
@@ -924,7 +924,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 223
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1207762572 1494175825 2017959069 1121952704 1881785832 1188695069 2103222232'
 $npc_firstname['A<<npctemp>>'] = 'Artur'
 $npc_nickname['A<<npctemp>>'] = 'Art'
@@ -955,7 +955,7 @@ npc_rel['A<<npctemp>>'] = 30
 
 
 npctemp = 224
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1542858357 1009682026 2043057884 1700422516 1825246284 1473718491 1145465003'
 $npc_firstname['A<<npctemp>>'] = 'Dimitry'
 $npc_nickname['A<<npctemp>>'] = 'Dima'
@@ -1000,7 +1000,7 @@ npc_def['A<<npctemp>>'] = 30
 
 
 npctemp = 225
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1293492227 1092251557 1817170283 1188737490 1962390512 1811716752 1347276837'
 $npc_firstname['A<<npctemp>>'] = 'Ilyich'
 $npc_nickname['A<<npctemp>>'] = 'Ilyich'
@@ -1025,7 +1025,7 @@ npc_dom['A<<npctemp>>'] = 50
 
 
 npctemp = 226
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1948232040 5876497260 6370729556 6591408199 9948768808 2245632532 3569109223'
 $npc_firstname['A<<npctemp>>'] = 'Arseni '
 $npc_nickname['A<<npctemp>>'] = 'Arseni '
@@ -1050,7 +1050,7 @@ npc_dom['A<<npctemp>>'] = 50
 
 
 npctemp = 227
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7894193659 7682081397 7204840012 1999784485 1457862984 1446965385 1706290392'
 $npc_firstname['A<<npctemp>>'] = 'Daniil'
 $npc_nickname['A<<npctemp>>'] = 'Dan'
@@ -1080,7 +1080,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 228
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7997566748 7105919378 7895527285 1850847152 1168395089 1748895937 1871858376'
 $npc_firstname['A<<npctemp>>'] = 'David'
 $npc_nickname['A<<npctemp>>'] = 'David'
@@ -1110,7 +1110,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 229
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7241994349 7588712776 7761775617 1033432556 1882492358 1835705225 1697690427'
 $npc_firstname['A<<npctemp>>'] = 'Andrei'
 $npc_nickname['A<<npctemp>>'] = 'Andrei'
@@ -1140,7 +1140,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 230
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '7241994349 7588712776 7761775617 1033432556 1882492358 1835705225 1697690427'
 $npc_firstname['A<<npctemp>>'] = 'Leonid'
 $npc_nickname['A<<npctemp>>'] = 'Leonid'
@@ -1170,7 +1170,7 @@ npc_dom['A<<npctemp>>'] = 10
 
 
 npctemp = 231
-gs 'npstaticdefaults', 'defaults'
+gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1263221443 9149303548 9924295213 3412488451 0692260208 9156586673 648903478'
 $npc_firstname['A<<npctemp>>'] = 'Aleksandra'
 $npc_nickname['A<<npctemp>>'] = 'Alex'

+ 9 - 6
locations/obj_din.qsrc

@@ -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
 

+ 7 - 0
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

+ 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'
 

+ 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

+ 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.'

+ 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:

+ 0 - 7
locations/swamphouse.qsrc

@@ -46,13 +46,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'The hunters aren''t here right now'
 	end
 
-	if hour >= 8 and hour < 20: 
-		gs 'swamp_yard', 'daytime_flavor_events'
-	else
-		gs 'swamp_yard', 'nighttime_flavor_events'
-	end
-
-
 	*nl
 	
 	act 'Go outside':

+ 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 ---------------------------------

+ 267 - 0
locations/willpower.qsrc

@@ -0,0 +1,267 @@
+# willpower
+
+!!To use call with gs 'willpower', '<type>'
+!!type is the nature of the demand and can be any of the following:
+!!
+!!Sex acts, this is for the cost to refuse advances or force another to partake
+!!'hj', 'bj', 'sex', 'anal', 'gangbang', 'prostitution', 'swallow', 'cum_inside'
+!!Bridging a gap in skill, for succeeding when not quite meeting the required skill/attribute, must include skill with _lvl postfix in $ARGS[1]
+!!'skill'
+!!Standing up to unwanted sex
+!!'rape'
+!!Refusing peer pressure
+!!'drink', 'drugs', 'crime', 'exhib'
+!!Forcing Sveta to stay awake
+!!'sleep'
+!!The value returned as will_cost can be used to inform the player of cost and limit actions
+!!To apply the cost just call gs 'willpower', 'resist' or gs 'willpower', 'force'
+!!Force is for Sveta forcing someone else and will slowly increase the will stat, otherwise its the same as resist
+
+if $ARGS[0] = 'calc':
+	gs 'willpower', 'dnd'
+	will_calc = will_dnd
+!!fatigue
+	if pcs_sleep < 5:
+		will_calc += 50
+	elseif pcs_sleep < 10:
+		will_calc += 25
+	elseif pcs_sleep < 20:
+		will_calc += 10
+	elseif pcs_sleep < 30:
+		will_calc += 5
+	end
+!!hunger
+	if pcs_energy < 5:
+		will_calc += 50
+	elseif pcs_energy < 10:
+		will_calc += 25
+	elseif pcs_energy < 20:
+		will_calc += 10
+	elseif pcs_energy < 30:
+		will_calc += 5
+	end
+!!thirst
+	if pcs_hydra < 5:
+		will_calc += 50
+	elseif pcs_hydra < 10:
+		will_calc += 25
+	elseif pcs_hydra < 20:
+		will_calc += 10
+	elseif pcs_hydra < 30:
+		will_calc += 5
+	end
+!!Very horny
+	if pcs_horny >= 90: will_calc += 10
+!!Bad syphilis, you is mental
+	if Sifilis >= 50: will_calc += 100
+!!feeling sick
+	if sick > 72:
+		will_calc += 35
+	elseif sick > 48:
+		will_calc += 20
+	elseif sick > 24:
+		will_calc += 10
+	elseif sick > 1:
+		will_calc += 5
+	end
+
+end
+
+if $ARGS[0] = 'hj':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if stat['hj'] <= 90:
+		will_cost = ((100 - stat['hj']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+
+if $ARGS[0] = 'bj':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if stat['bj'] <= 90:
+		will_cost = ((100 - stat['bj']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+	
+if $ARGS[0] = 'sex':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if stat['vaginal'] <= 90:
+		will_cost = ((100 - stat['vaginal']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+	
+if $ARGS[0] = 'anal':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if stat['anal'] <= 90:
+		will_cost = ((100 - stat['anal']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+	
+if $ARGS[0] = 'gangbang':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if stat['group'] <= 90:
+		will_cost = ((100 - stat['group']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+	
+if $ARGS[0] = 'prostitution':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	prost_will = pav_prostitute + city_prostitute + oldtown_prostitute + village_prostitute
+	if prost_will <= 90:
+		will_cost = ((100 - prost_will) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+	
+if $ARGS[0] = 'swallow':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if trt_cumeater = 0:
+		will_cost = (100 + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+
+!! no stat for this currently so just a baseline figure and reduction if cum already inside
+if $ARGS[0] = 'cum_inside':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if cumloc[0] <= 0:
+		will_cost = (100 + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+
+!! requires the skill to be named with the _lvl postfix
+if $ARGS[0] = 'skill':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	dynamic 'will_cost = <<$ARGS[1]>> + will_calc)/10'
+end
+	
+if $ARGS[0] = 'rape':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	if stat['bj'] <= 90:
+		will_cost = ((100 - stat['bj']) + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
+	end
+end
+
+if $ARGS[0] = 'drink':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if alko > 10:
+		will_cost = (60 + will_calc)/10
+	elseif alko > 6:
+		will_cost = (100 + will_calc)/10
+	elseif alko > 3:
+		will_cost = (80 + will_calc)/10
+	end
+end
+
+!!Drug needs already included in the will_calc so just a small base cost here
+if $ARGS[0] = 'drugs':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	will_cost = (20 + will_calc)/10
+end
+
+!!There is no related stat so just a base cost of 6
+if $ARGS[0] = 'crime':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	will_cost = (60 + will_calc)/10
+end
+
+if $ARGS[0] = 'exhib':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if stat['bj'] <= 90:
+	if Exhibitionist_lvl = 3:
+		will_cost = (0 + will_calc)/10
+	elseif Exhibitionist_lvl = 2:
+		will_cost = (1 + will_calc)/10
+	elseif Exhibitionist_lvl = 1:
+		will_cost = (2 + will_calc)/10
+	elseif pcs_inhib > 70:
+		will_cost = (3 + will_calc)/10
+	else
+		will_cost = (100 - pcs_inhib + will_calc)/10
+	end
+end
+
+!!this is to force you to stay wake so will cost nothing if you have more than 5 sleep, it has no base cost as there will always be a sleep cost in calc
+if $ARGS[0] = 'sleep':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if pcs_sleep <= 5: will_cost = will_calc/10
+end
+
+!!modifiers for drink an drugs
+if $ARGS[0] = 'dnd':
+	will_dnd = 0
+	if alko > 10:
+		will_dnd += 80
+	elseif alko > 6:
+		will_dnd += 40
+	elseif alko > 3:
+		will_dnd += 20
+	end
+
+	!!cigarettes
+	if smokerNeed > 10: will_dnd += 10
+	!!amphetamines
+	if amphWithdrawl > 2:
+		will_dnd += 40
+	elseif amphHigh > 0:
+		will_dnd += 60
+	end
+	!!heroine
+	if SLomka > 0:
+		will_dnd += 80
+	elseif StrongNarkota > 0:
+		will_dnd += 50
+	end
+	!!cocaine
+	if narkoman = 1:
+		will_dnd += 40
+	elseif nark < 0:
+		will_dnd -= 20
+	end
+end
+
+if $ARGS[0] = 'resist': pcs_willpwr -= will_cost
+
+if $ARGS[0] = 'force':
+	pcs_willpwr -= will_cost
+	will_counter += 1
+	if will_counter > 10: pcs_will += 1
+end
+
+--- willpower ---------------------------------
+