69 Commit-ok b7678a72e2 ... 48660ac1c8

Szerző SHA1 Üzenet Dátum
  KevinSmarts 48660ac1c8 Merge remote-tracking branch 'Sicaa/master' 5 éve
  KevinSmarts e2020496c6 Merge remote-tracking branch 'oldentree/master' 5 éve
  KevinSmarts acbe98d750 Merge remote-tracking branch 'sovietmercader/master' 5 éve
  KevinSmarts 3892eb6a14 [added] seeding of voyeur_sex to many files and updated arousal to match the new requirements. Also added new counters for some new catergories 5 éve
  KevinSmarts e4b355126a [changes] Some changes to arousal catergories and fixing the seeding of them - WIP use with care 5 éve
  Sicaa 46e72a77a6 [fixed] made a mistake during seeding 5 éve
  Sicaa ef6640d14c [fixed] willpower seeding, sixth batch + adjusted a few arousal calls and removed sub/dom in natbelapt 5 éve
  oldentree 5e50f2fe46 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 éve
  oldentree ca566987f4 [fixed] willpower seeding qwBarBilliard.qsrc 5 éve
  sovietmercader 27f9f5071d [added] willpower seeding for half of the letter B 5 éve
  KevinSmarts 642c0ebc97 [removed] entry on .qproj not removed with the file 5 éve
  KevinSmarts a3837edd03 Merge remote-tracking branch 'Sicaa/master' 5 éve
  KevinSmarts bb4f642e02 Merge remote-tracking branch 'sovietmercader/master' 5 éve
  KevinSmarts 84cb2cdc10 Merge remote-tracking branch 'julzor/master' 5 éve
  Sicaa 23a3677c4d [fixed] Restored and added willpower to a mistakenly deleted part in Gnpc2 5 éve
  Sicaa 55eb73ae8e [fixed] removed duplicates and changed < to <= to be the same across all train event calls 5 éve
  Sicaa 3ea0c5c044 [fixed] willpower seeding, fifth batch + merged dinBoroda.qsrc with clener.qsrc 5 éve
  KevinSmarts 669cd195cf [removed] Old file nutluck had merge the contents from some time ago 5 éve
  sovietmercader 0e6f0874da [added] willpower for balkon2 and bass 5 éve
  sovietmercader ba79308565 [added] willpower for andrey and artur 5 éve
  sovietmercader f24547df71 [changed] willpower seeding for abduction locations 5 éve
  sovietmercader 5f2b9a2f76 [changed] more added willpower and removed sub/dom from the village 5 éve
  sovietmercader 8c0143d972 [changed] added willpower and removed sub/dom from more of the village 5 éve
  julzor dd8b7c7790 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 éve
  julzor 54fefded7b [changed] willpower additions by nutluck 5 éve
  Sicaa fac62799a1 [fixed] willpower seeding, fourth batch + typos 5 éve
  KevinSmarts 3f3401f5ee [fixed] removed sub/Dom 5 éve
  KevinSmarts e4702591ea [added] Fights now have a variable for endings and have updated them to use this. It is numerical and should be used in all fights for win and lose in the file "ender" 5 éve
  KevinSmarts b53062f3d6 [fixed] Fights now working but ending not connecting 5 éve
  KevinSmarts b48d4fb1b1 [fixed] Ironed out some fight bugs but its still not right 5 éve
  KevinSmarts cd3a56c918 Merge remote-tracking branch 'sovietmercader/master' 5 éve
  KevinSmarts f1e78b0856 Merge remote-tracking branch 'julzor/master' 5 éve
  sovietmercader 78327774b0 [added] willpower for talking and drinking with mitka 5 éve
  julzor a3735a3c4d [removed] soniahome 5 éve
  julzor e386d24833 [fixed] resolved some comments 5 éve
  julzor 401409079d [fixed] & [added] nutlucks niko changes 5 éve
  oldentree a525139895 Merge remote-tracking branch 'upstream/master' 5 éve
  oldentree 265adf79d0 Merge remote-tracking branch 'upstream/master' 5 éve
  KevinSmarts 1b991236d4 Merge remote-tracking branch 'oldentree/willpower_seeding' 5 éve
  KevinSmarts 85d50daa85 Merge remote-tracking branch 'julzor/master' 5 éve
  KevinSmarts fc3d976634 Merge remote-tracking branch 'KeyMasterOfGozer/master' 5 éve
  KevinSmarts 0b79e91e12 Merge remote-tracking branch 'Sicaa/master' 5 éve
  KevinSmarts a421ae7ca0 Merge remote-tracking branch 'Deroc/master' 5 éve
  oldentree 08718fe0de [fixed] more willpower seeding: marking sub/dom dialog that needs fixing 5 éve
  julzor 9cf4392dc8 [changed] increased water bottle uses to 3, because svetas has a magic purse 5 éve
  oldentree ab9dfb8f8e [fixed] willpower seeding, first batch. Leaving some behind after I clarify what can be done 5 éve
  KeyMasterOfGozer 47eba10eaa [Fixed] Damage from spells to be new fight system. 5 éve
  KeyMasterOfGozer 4cf5b38533 Replaced Timer logic for 3 only per team with arbitrary number 5 éve
  Sicaa a0330d890c [fixed] a few typos + some willpower tweaks in postdeliveries + slightly improved text order in the trFatherMisha truck ride sex event 5 éve
  3xpurt f16cc9f242 [fixed] missing ends in willpower additions for postoffice and zsoft_gopskverGorSlut. 5 éve
  3xpurt 5d0f1f291d [fixed] copy and paste error in loadg 5 éve
  3xpurt 19d3cd8913 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 éve
  3xpurt 56e05060b2 [added] shampoo to the gadmarket so sveta can use her own shampoo at her grandparents house. 5 éve
  3xpurt 06f44a2da0 [removed] old ParHomeBlock variable and replaced with home_owned[2], and updated loadg to fix existing saves. 5 éve
  Deroc 03dc24d081 [edit & fix] minor text edits and added missing end 5 éve
  KevinSmarts d1c8f3f9c2 [added] multi-party fights 5 éve
  KevinSmarts a2edb81dfc Merge remote-tracking branch 'Deroc/master' 5 éve
  KevinSmarts e3de2fa778 [fixed] Bug with missing bra check that Deroc spotted 5 éve
  KevinSmarts 17790dca73 Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_2' 5 éve
  KevinSmarts a710190f9a Merge remote-tracking branch 'Sicaa/master' 5 éve
  Deroc c2584bfe21 [edit] willpower seeding 5 éve
  pfffbft b31088b1c3 Willpower seeded for hunter_favors 5 éve
  pfffbft d0395088c5 Merge https://git.catrenelle.com/Kevin_Smarts/glife into phase_2 5 éve
  Sicaa 53a1ef7358 [fixed] changed a willpower call from prostitution to bj 5 éve
  Sicaa f9e630c35a [fixed] willpower seeding, third batch + some minor fixes & adjustments 5 éve
  pfffbft 77635824be Merge branch 'master' into phase_2 5 éve
  pfffbft eabf756062 Merge branch 'master' into phase_2 5 éve
  pfffbft 94828f0184 [added] Igor woods sex scene, finishing up Igor's sex scenes for hunters phase 2 5 éve
  pfffbft e0e7fe475e Finished Igor's woods scene' 5 éve
100 módosított fájl, 4709 hozzáadás és 5257 törlés
  1. 0 3
      glife.qproj
  2. 22 37
      locations/AnalPR.qsrc
  3. 36 33
      locations/BDSM_Club.qsrc
  4. 23 16
      locations/BDSM_training.qsrc
  5. 28 37
      locations/BDsex.qsrc
  6. 13 2
      locations/BMloc.qsrc
  7. 1 1
      locations/BelSex.qsrc
  8. 2 2
      locations/Cheatmenu_din.qsrc
  9. 2 2
      locations/FedorEv3.qsrc
  10. 3 3
      locations/Gadbana.qsrc
  11. 4 4
      locations/Gadhouse.qsrc
  12. 0 28
      locations/Gadsarai.qsrc
  13. 63 43
      locations/Gnpc.qsrc
  14. 509 458
      locations/Gnpc2.qsrc
  15. 17 12
      locations/Gnpc_cinema.qsrc
  16. 2 2
      locations/HotelHole.qsrc
  17. 21 21
      locations/HotelWork.qsrc
  18. 8 8
      locations/IgorHunter.qsrc
  19. 1 1
      locations/IrinaRoom.qsrc
  20. 1 1
      locations/Komp.qsrc
  21. 53 44
      locations/LakeBoyDy.qsrc
  22. 30 10
      locations/LakeBoyZ.qsrc
  23. 19 9
      locations/MBasement.qsrc
  24. 8 8
      locations/MEastbed.qsrc
  25. 3 3
      locations/MHall.qsrc
  26. 1 1
      locations/MLanding.qsrc
  27. 2 2
      locations/MRear.qsrc
  28. 2 2
      locations/MWestbed.qsrc
  29. 1 1
      locations/MartinTalk.qsrc
  30. 31 31
      locations/Meadow.qsrc
  31. 23 20
      locations/Miroslava.qsrc
  32. 236 225
      locations/NikoDates.qsrc
  33. 64 90
      locations/NikoDreams.qsrc
  34. 87 111
      locations/NikoEv.qsrc
  35. 111 208
      locations/NikoEv2.qsrc
  36. 88 141
      locations/NikoPayback.qsrc
  37. 122 608
      locations/NikoSlut.qsrc
  38. 6 20
      locations/NormPR.qsrc
  39. 5 0
      locations/ParChurch2.qsrc
  40. 6 11
      locations/Prostitute.qsrc
  41. 1 1
      locations/Serge_Shulgin.qsrc
  42. 0 512
      locations/SoniaHome.qsrc
  43. 12 6
      locations/Vika.qsrc
  44. 4 4
      locations/Voltrenersex.qsrc
  45. 2 0
      locations/_face_image.qsrc
  46. 127 90
      locations/abduction.qsrc
  47. 172 58
      locations/abductionCustomer.qsrc
  48. 94 64
      locations/andrey.qsrc
  49. 5 5
      locations/anushapt.qsrc
  50. 7 7
      locations/anushka.qsrc
  51. 23 23
      locations/anushkaev1.qsrc
  52. 68 13
      locations/arousal.qsrc
  53. 2 2
      locations/artgar.qsrc
  54. 26 4
      locations/arturHome.qsrc
  55. 60 9
      locations/arturQW.qsrc
  56. 73 24
      locations/arturRinok.qsrc
  57. 14 7
      locations/arturSex.qsrc
  58. 38 10
      locations/balkon2.qsrc
  59. 75 60
      locations/bass.qsrc
  60. 140 2
      locations/belpicknick.qsrc
  61. 7 7
      locations/bicycle.qsrc
  62. 50 25
      locations/billiard.qsrc
  63. 72 8
      locations/billsvid.qsrc
  64. 6 10
      locations/blowPR.qsrc
  65. 24 4
      locations/bobka.qsrc
  66. 56 6
      locations/bordel.qsrc
  67. 85 27
      locations/bordelv.qsrc
  68. 37 5
      locations/bouling.qsrc
  69. 1 1
      locations/brothel.qsrc
  70. 138 109
      locations/brother.qsrc
  71. 0 1
      locations/brother_voyeur.qsrc
  72. 37 37
      locations/cikl.qsrc
  73. 2 2
      locations/cityTrain.qsrc
  74. 281 78
      locations/clener.qsrc
  75. 8 8
      locations/club.qsrc
  76. 6 1
      locations/defence.qsrc
  77. 1 1
      locations/dimaRevenge.qsrc
  78. 0 187
      locations/dinBoroda.qsrc
  79. 3 3
      locations/dinParty.qsrc
  80. 5 3
      locations/din_bad.qsrc
  81. 1 1
      locations/dinnpc.qsrc
  82. 1 1
      locations/dvor.qsrc
  83. 56 67
      locations/ender.qsrc
  84. 201 356
      locations/fight.qsrc
  85. 0 466
      locations/frot.qsrc
  86. 121 96
      locations/gLakeNude.qsrc
  87. 16 16
      locations/gLakeNudeEvent.qsrc
  88. 34 18
      locations/gLakeNudeForest.qsrc
  89. 4 4
      locations/gadforest.qsrc
  90. 21 21
      locations/gadforest_event.qsrc
  91. 1 0
      locations/gadmarket.qsrc
  92. 35 32
      locations/gadprostitutes.qsrc
  93. 6 8
      locations/gadriver.qsrc
  94. 12 1
      locations/gadroad.qsrc
  95. 187 141
      locations/gadukino.qsrc
  96. 194 18
      locations/gadukino_event.qsrc
  97. 392 317
      locations/garfather.qsrc
  98. 5 5
      locations/gargazel.qsrc
  99. 1 1
      locations/gdkin.qsrc
  100. 5 5
      locations/gdksex.qsrc

+ 0 - 3
glife.qproj

@@ -26,7 +26,6 @@
 		<Location name="cikl"/>
 		<Location name="daystart"/>
 		<Location name="dina"/>
-		<Location name="dinBoroda"/>
 		<Location name="MenuLoc"/>
 		<Location name="MenuMainLoc"/>
 		<Location name="starenie"/>
@@ -157,7 +156,6 @@
 	</Folder>
 	<Folder name="Quests">
 		<Location name="event"/>
-		<Location name="frot"/>
 		<Location name="lesbidomhouse"/>
 		<Location name="lesbimistress"/>
 		<Location name="lesbisubhouse"/>
@@ -496,7 +494,6 @@
 		<Location name="NikoDreams"/>
 		<Location name="NikoPayback"/>
 		<Location name="NikoSlut"/>
-		<Location name="SoniaHome"/>
 	</Folder>
 	<Folder name="Anushka">
 		<Location name="anushka"/>

+ 22 - 37
locations/AnalPR.qsrc

@@ -9,24 +9,18 @@ if $ARGS[0] = '1':
 	*clr & cla
 	prosti = 0
 	money += ProsMoney*100
-	analprotect = 1
 	gs'stat'
 
-	dickK = dick*10/100
-	if dickK < 1:dickK = 1
-	pcs_ass = pcs_ass + dickK
-
 	if pcs_ass < dick:
-		fun = 0
 		$analsex = 'Your anus stretches painfully while he fills your ass with his shaft, and you wince and beg him to take it easy for a little while. Fortunately, he listens. Once he feels he gave you enough time to adapt, he begins to move his hips. Slowly at first, but his thrusts accelerate more and more as he gets closer to his orgasm.'
-		gs 'arousal', 'anal', 20, 'rough', 'sub'
+		gs 'arousal', 'anal', 5, 'rough', 'sub', 'unknown', 'prostitution'
 		gs 'stat'
 	end
 
 	if pcs_ass >= dick:
-		pcs_horny = pcs_horny + pcs_ass
+		pcs_horny += pcs_ass
 		$analsex = 'Your anus has no difficulty adjusting to the size of his member, and it actually feels fairly pleasant when he shoves his length in. Your anus clasps around the base of his cock from time to time, and the man begins to thrust his hips against yours enthusiastically when he notices you can take it.'
-		gs 'arousal', 'anal', 20, 'sub'
+		gs 'arousal', 'anal', 5, 'sub', 'unknown', 'prostitution'
 		gs 'stat'
 	end
 
@@ -36,7 +30,7 @@ if $ARGS[0] = '1':
 	'After a few minutes of fucking your ass, the man groans and you feel his hips spasming against yours. He pulls out of you and takes the filled condom off his slowly shrinking cock.'
 	'The man ties a knot in the condom and tosses it out of the window carelessly.'
 	spafinloc = 3
-	gs 'arousal', 'anal', 20, 'sub'
+	gs 'arousal', 'anal', 10, 'sub', 'unknown', 'prostitution'
 	gs 'arousal', 'end'
 	gs 'cum_manage'
 	gs 'stat'
@@ -54,20 +48,15 @@ if $ARGS[0] = '2':
 	prosti = 0
 	gs'stat'
 
-	dickK = dick*10/100
-	if dickK < 1:dickK = 1
-	pcs_ass = pcs_ass + dickK
-
 	if pcs_ass < dick:
-		fun = 0
 		$analsex = 'You feel a sharp pain and wince when the man pushes the tip of his <<dick>> centimeter member past your sphincter, and continues to work most of his length inside you. Fortunately, he listens when you beg him to go slow.<br>The guy holds still for a moment so your ass can get used to how far it''s being stretched out. After a little while you don''t think it''s going to get any better, and you tell the man he can start to fuck you with a forced, fake smile on your face.<br>He''s still careful at first, but soon forgets about your suffering and accelerates more and more. The man groans loudly while he hammers his cock inside your ass, ignoring your crying and mewling underneath him.'
-		gs 'arousal', 'anal', 20, 'rough', 'sub'
+		gs 'arousal', 'anal', -5, 'rough', 'sub', 'unknown', 'prostitution'
 		gs 'stat'
 	end
 	if pcs_ass >= dick:
-		pcs_horny = pcs_horny + pcs_ass
+		pcs_horny += pcs_ass
 		$analsex = 'Your anus has no difficulty adjusting to the size of his member, and it actually feels fairly pleasant when he shoves his length in. Your anus clasps around the base of his cock from time to time, and the man begins to thrust his hips against yours enthusiastically when he notices you can take it.'
-		gs 'arousal', 'anal', 20, 'sub'
+		gs 'arousal', 'anal', -5, 'sub', 'unknown', 'prostitution'
 		gs 'stat'
 	end
 
@@ -80,11 +69,11 @@ if $ARGS[0] = '2':
 	if picanRand = 6:'<center><img <<$set_imgh>> src="images/shared/sex/anal/mis/cowl6.jpg"></center>'
 
 	'As soon as you lie down on the hood of the car, the man parts your legs and eagerly presses the tip of his cock against your anus.'
-	gs 'arousal', 'anal', 15, 'sub'
+	gs 'arousal', 'anal', 10, 'sub', 'unknown', 'prostitution'
 	gs 'stat'
-	if klismaday ! daystart and analprotect = 0:act 'Continue':gt'AnalPR','3'
-
-	if klismaday = daystart:
+	if klismaday ! daystart:
+		act 'Continue':gt'AnalPR','3'
+	else
 		money += 2000
 
 		cumanalRand = RAND(0,2)
@@ -93,18 +82,14 @@ if $ARGS[0] = '2':
 			gs 'cum_manage'
 
 			'Suddenly the man groans loudly, and abruptly pulls his member out of your stretched anus. The sudden emptiness feels strange, but you smile seductively at the man while he jerks himself off over your ass cheeks. When he''s done covering your buttocks with his seed, he lets out a satisfied sigh and gives you your money.'
-			gs 'arousal', 'anal', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
+			
 			act 'Continue':gt $locSex, $metkaSex
 		elseif cumanalRand = 1:
 			spafinloc = 7
 			gs 'cum_manage'
 
 			'Suddenly the man groans loudly, and abruptly pulls his member out of your stretched anus. The sudden emptiness feels strange, but you smile seductively at the man while he jerks himself off over your ass cheeks. Then the bastard suddenly aims his cock at your clothes, and shoots his load all over them!<br>You silently curse him, but force yourself to keep smiling as he lets out a satisfied sigh and gives you your money.'
-			gs 'arousal', 'anal', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
+			
 			act 'Continue':gt $locSex, $metkaSex
 		elseif cumanalRand = 2:
 			spafinloc = 3
@@ -112,11 +97,12 @@ if $ARGS[0] = '2':
 
 			'Suddenly the man groans loudly, and he holds still with his cock deep inside you. Then he very slowly pulls out, and a trickle of his sperm slowly runs out of your slightly gaping ass.'
 			'He admires his work for a moment, before giving the money he owes you with a satisfied smile on his face.'
-			gs 'arousal', 'anal', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
+			
 			act 'Continue':gt $locSex, $metkaSex
 		end
+		gs 'arousal', 'anal', 10, 'sub', 'unknown', 'prostitution'
+		gs 'arousal', 'end'
+		gs 'stat'
 	end
 end
 
@@ -131,7 +117,7 @@ if $ARGS[0] = '3':
 	'The man shouts angrily: "Get lost, whore... you''re lucky I''m letting you leave without beating you up! You can forget about your money!"'
 
 	act 'Leave quietly':gt $locSex, $metkaSex
-	if pcs_intel <= 100:act 'Insist he pays anyway':gt'AnalPR','4'
+	act 'Insist he pays anyway':gt'AnalPR','4'
 	if pcs_intel >= 50:act 'Apologize and make amends':gt'AnalPR','5'
 end
 
@@ -140,8 +126,7 @@ if $ARGS[0] = '4':
 	menu_off = 1
 	money += ProsMoney * 100
 	pcs_mood -= 30
-	pcs_health -= 30
-	pcs_willpwr -= 30
+	pcs_health -= pcs_health/5
 	pcs_throat += 1
 	gs'stat'
 
@@ -154,7 +139,7 @@ if $ARGS[0] = '4':
 	'He scoffs at you when he pulls away, while you roll to your stomach and dry heave a few times. That was disgusting!'
 	'He carelessly throws the money he owes you onto the ground and drives off, without saying another word.'
 	spafinloc = 12
-	gs 'arousal', 'bj', 10, 'sub', 'humiliation', 'rough', 'deepthroat'
+	gs 'arousal', 'bj', 10, 'sub', 'humiliation', 'rough', 'deepthroat', 'unknown', 'prostitution'
 	gs 'arousal', 'end'
 	gs 'cum_manage'
 	gs 'stat'
@@ -173,7 +158,7 @@ if $ARGS[0] = '5':
 	'"I''m sorry, sir! Please allow me to make it up to you..." you tell him, while you drop to your knees obediently. This is going to be unpleasant, but you have to do something to keep him happy!'
 	'The man watches in disgust as you close your lips around his dirty cock. The taste and smell is awful! He''s still upset, but you can see his anger slowly fade away when you lick his dirty cock clean. It''s fully erect again by now, and you can tell he''s still very horny despite your mishap.'
 	'He then says: "Good enough. Lie down in the grass."'
-	gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+	gs 'arousal', 'bj', 5, 'sub', 'humiliation', 'unknown', 'prostitution'
 	gs 'stat'
 	act 'Let him fuck you':gt'AnalPR','6'
 end
@@ -190,7 +175,7 @@ if $ARGS[0] = '6':
 	'The man drives his cock deep inside you and begins to fuck your pussy using long, firm strokes. He groans every time his hips slap against yours, and the intensity with which he fucks you makes you cry out as well.'
 	'After a few minutes, the man groans and you feel his hips spasming against yours. He pulls out of you and takes the filled condom off his slowly shrinking cock.'
 	'While you lay on the grass, recovering from all the things you just had to do to not lose your customer, he theatrically throws a number of bills onto your body one by one. He''s smiling again, and is clearly in a good mood. He even added a little extra!'
-	gs 'arousal', 'vaginal', 20, 'sub', 'humiliation', 'rough'
+	gs 'arousal', 'vaginal', 10, 'sub', 'humiliation', 'rough', 'unknown', 'prostitution'
 	gs 'arousal', 'end'
 	gs 'cum_manage'
 	gs 'stat'

+ 36 - 33
locations/BDSM_Club.qsrc

@@ -87,43 +87,44 @@ if $ARGS[0] = 'in':
 		'"Well," the woman puts her hands together and looks at you. Who do you want to be? Top or bottom?'
 		'"I do not know," you shrug. "What does that mean?"'
 		'"Dominant or submissive?"'
-		if pcs_dom < 50:
-			act 'submissive':
-				*clr & cla
-				minut += 10
-				sub += 1
-				$BDSMrole = 's'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r<<BDSMmeet>>_2.jpg"></center>'
-				'The woman''s eyes light up. She stands up behind the desk and orders you.'
-				'"Stand up!"'
-				'You jump, than understand, why you did. The imperious voice of this Lady holds you in awe.'
-				'"No sitting lower in the presence of top. Understood?"'
-				'"Yes."'
-				'"Wrong! Try again!"'
-				'"Yes, Mistress."'
-				'The woman nods. "Undress!"'
-				'"But..."'
-				'"Undress, now! Or I''ll knock you out!" Mistress has her hand on the table.'
-				'You look to the man you were just talking to, but he just stands there, expressionless. You undress.'
-				'"Sign!"'
-				'You sign the document. The man places the paper in a folder.'
-				'"Listen carefully..."'
-				'She explains to you, that the club costs 20,000 <b>₽</b> per 30 days access, with a 10,000 ruble registration fee. For slaves there is a means for discount, if the slave is well behaved and earns enough merits, the membership will be automatically extended.'
-				'Untrained slaves are not allowed in the Mansion, you will require training. You''ll have to report to me for that, I''m going to enjoy it.'
-				'"Come back when you are ready for training. Be clean, have an enema. You must own a maid outfit, so you will be wearing it. Everything clear?'
-				'"But... what if I don''t have a maid outfit?..." You whisper.'
-				'"Find a branch of G & M and buy one, and don''t forget to bring the first instalment of 10 thousand <b>₽</b>. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
-				'"Clear... Mistress..."'
-				'As you are leaving, you think, where will you get the money for the down payment.'
-				act 'Logout':gt 'BDSM_Club', 'start'
-			end
+		act 'Submissive':
+			*clr & cla
+			minut += 10
+			sub += 1
+			$BDSMrole = 's'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r<<BDSMmeet>>_2.jpg"></center>'
+			'The woman''s eyes light up. She stands up behind the desk and orders you.'
+			'"Stand up!"'
+			'You jump, than understand, why you did. The imperious voice of this Lady holds you in awe.'
+			'"No sitting lower in the presence of top. Understood?"'
+			'"Yes."'
+			'"Wrong! Try again!"'
+			'"Yes, Mistress."'
+			'The woman nods. "Undress!"'
+			'"But..."'
+			'"Undress, now! Or I''ll knock you out!" Mistress has her hand on the table.'
+			'You look to the man you were just talking to, but he just stands there, expressionless. You undress.'
+			'"Sign!"'
+			'You sign the document. The man places the paper in a folder.'
+			'"Listen carefully..."'
+			'She explains to you, that the club costs 20,000 <b>₽</b> per 30 days access, with a 10,000 ruble registration fee. For slaves there is a means for discount, if the slave is well behaved and earns enough merits, the membership will be automatically extended.'
+			'Untrained slaves are not allowed in the Mansion, you will require training. You''ll have to report to me for that, I''m going to enjoy it.'
+			'"Come back when you are ready for training. Be clean, have an enema. You must own a maid outfit, so you will be wearing it. Everything clear?'
+			'"But... what if I don''t have a maid outfit?..." You whisper.'
+			'"Find a branch of G & M and buy one, and don''t forget to bring the first installment of 10 thousand <b>₽</b>. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
+			'"Clear... Mistress..."'
+			'As you are leaving, you think, where will you get the money for the down payment.'
+			act 'Leave':gt 'BDSM_Club', 'start'
 		end
-		if sub < 50:
-			act 'Dominant':
+		gs 'willpower', 'misc', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Dominant (<<will_cost>> Willpower)':
 				*clr & cla
 				minut += 10
 				$BDSMrole = 'd'
+				gs 'willpower', 'misc', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				!'<center><img <<$set_imgh>> src="images/bdsm_club/<<$BDSMrole>><<BDSMmeet>>_2.jpg"></center>'
 				'The woman sighs disappointedly.'
@@ -136,6 +137,8 @@ if $ARGS[0] = 'in':
 				'As you are leaving, you think, where will you get the money for the registration fee and if you can persuade someone to come here as a sub.'
 				act 'Leave':gt 'BDSM_Club', 'start'
 			end
+		else
+			act 'Dominant (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end

+ 23 - 16
locations/BDSM_training.qsrc

@@ -140,21 +140,28 @@ if $ARGS[0] = '1':
 								'"You must earn it!"'
 								$orgasm_or = 'no'
 								gs 'stat'
-								act 'Cheat and cum':
-									*clr & cla
-									minut += 10
-									pcs_horny = 10
-									pcs_mood += 25
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r<<BDSMmeet>>_9.jpg"></center>'
-									'You decide to cheat and, with an incredible force of will, take control of the body. It goes unnoticed, Mistress continues, and you rapidly cum.'
-									'"What''s going on?!" Yells Mistress in your ear. "You bitch, tricking me like that!'
-									'She unhooks you from the cross, puts you on your knees and slaps you a few times. You are so happy, being able to cum, that you laugh.'
-									'"Laugh? Well, I''ll fix that!"'
-									'Mistress picks up a rope and wraps it around your breasts, tightly binding the left and right. The pain makes you start crying, but Mistress is not through, she hangs on you nipple clamps with weights and forces you to crouch, so, the weights are swinging. You hurt, but at the same time it''s nice, and you stay there as instructed.'
-									$orgasm_or = 'yes'
-									gs 'stat'
-									act 'Further':gt 'BDSM_training', 'BDSMend'
+								gs 'willpower', 'hj', 'resist', 'hard'
+								if will_cost <= pcs_willpwr:
+									act 'Cheat and cum (<<will_cost>> Willpower)':
+										*clr & cla
+										minut += 10
+										pcs_horny = 10
+										pcs_mood += 25
+										gs 'willpower', 'hj', 'resist', 'hard'
+										gs 'willpower', 'pay', 'resist'
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r<<BDSMmeet>>_9.jpg"></center>'
+										'You decide to cheat and, with an incredible force of will, take control of the body. It goes unnoticed, Mistress continues, and you rapidly cum.'
+										'"What''s going on?!" Yells Mistress in your ear. "You bitch, tricking me like that!'
+										'She unhooks you from the cross, puts you on your knees and slaps you a few times. You are so happy, being able to cum, that you laugh.'
+										'"Laugh? Well, I''ll fix that!"'
+										'Mistress picks up a rope and wraps it around your breasts, tightly binding the left and right. The pain makes you start crying, but Mistress is not through, she hangs on you nipple clamps with weights and forces you to crouch, so, the weights are swinging. You hurt, but at the same time it''s nice, and you stay there as instructed.'
+										$orgasm_or = 'yes'
+										gs 'stat'
+										act 'Further':gt 'BDSM_training', 'BDSMend'
+									end
+								else
+									act 'Cheat and cum (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
 								act 'Hold back':
 									*clr & cla
@@ -308,7 +315,7 @@ if $ARGS[0] = '2':
 												'Just as you are ready to scream "Red!", mistress takes the dildo out of you. Again the motor buzzes, you kneel on the floor. Madam binds your hands behind your back and puts you on the knees.'
 												'"Rest!"'
 												'Mistresses leg is in your face, and you understand what to do. You kiss and lick the foot, sucking her toes.'
-												gs 'arousal', 'kiss_give', 10, 'sub', 'lesbian', 'maso', 'bound', 'feet'
+												gs 'arousal', 'foreplay', 10, 'sub', 'lesbian', 'maso', 'bound', 'feet'
 												gs 'stat'
 												act 'Adore':
 													*clr & cla

+ 28 - 37
locations/BDsex.qsrc

@@ -5,18 +5,21 @@ menu_off = 1
 if $ARGS[0] = 'start':
 	!!range of interactions
 	!!gs 'BDsex', 'start'
-	minut += 3
 
 	if NoGuy = 0:guy += 1
-
-	pcs_horny += 10
+	
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting1.jpg"></center>'
 
 	if harakBoy = 0:
 		'<<$boydesc>> hugs you and gently caresses your breasts.'
-
-		act 'Order him to lick you':gt 'BDsex', 'kuni'
+		
+		gs 'willpower', 'cuni', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Order him to lick you (<<will_cost>> Willpower)':gs 'willpower', 'pay', 'force' & gt 'BDsex', 'kuni'
+		else
+			act 'Order him to lick you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 		act 'Stroke his cock':gt 'BDsex', 'hj'
 		act 'Suck his dick':gt 'BDsex', 'minet'
 		act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -30,7 +33,7 @@ if $ARGS[0] = 'start':
 
 		if brand < 70:
 			'<<$boydesc>> strokes and caresses your pussy with his fingers.'
-			gs 'arousal', 'vaginal_finger', 10, 'sub'
+			gs 'arousal', 'vaginal_finger', -5, 'sub'
 			gs 'stat'
 			trand = rand(0, 2)
 
@@ -47,8 +50,6 @@ if $ARGS[0] = 'start':
 			act 'Suck him':gt 'BDsex', 'minet'
 		else
 			'<<$boydesc>> asks you to suck his cock.'
-			gs 'arousal', 'bj', 20, 'sub'
-			gs 'stat'
 
 			act 'Stroke his cock':gt 'BDsex', 'hj'
 			act 'Take by mouth':gt 'BDsex', 'minet'
@@ -62,7 +63,7 @@ if $ARGS[0] = 'start':
 
 		if brand < 70:
 			'<<$boydesc>> caresses your pussy with his fingers.'
-			gs 'arousal', 'vaginal_finger', 10, 'sub'
+			gs 'arousal', 'vaginal_finger', -5, 'sub'
 			gs 'stat'
 			trand = rand(0, 2)
 
@@ -115,11 +116,11 @@ if $ARGS[0] = 'kuni':
 	'<center><img <<$set_imgh>> src="images/shared/sex/kuni/kuni.jpg"></center>'
 	'You undress and lay on the bed, bringing his face to your pussy.'
 	'<<$boydesc>> lays down between your legs and begins to work his tongue across your pussy.'
-	gs 'arousal', 'cuni', 15, 'dom'
+	gs 'arousal', 'cuni', 10, 'dom'
 	gs 'stat'
 	if pcs_horny >= 90:
 		pcs_mood += 15
-		pcs_willpwr += 15
+		!pcs_willpwr += 15
 		$orgasm_txt = 'His skill is enough to spark an orgasm deep within you.'
 		$orgasm_or = 'custom'
 		gs 'stat'
@@ -317,7 +318,7 @@ if $ARGS[0] = 'hj':
 
 			if brand < 70:
 				'<<$boydesc>> caresses your pussy with his fingers.'
-				gs 'arousal', 'vaginal_finger', 10, 'sub'
+				gs 'arousal', 'vaginal_finger', -5, 'sub'
 				gs 'stat'
 				trand = rand(0, 2)
 
@@ -407,7 +408,7 @@ if $ARGS[0] = 'minet':
 
 			if brand < 70:
 				'<<$boydesc>> caresses your pussy with his fingers.'
-				gs 'arousal', 'vaginal_finger', 10, 'sub'
+				gs 'arousal', 'vaginal_finger', -10, 'sub'
 				gs 'stat'
 				trand = rand(0, 2)
 
@@ -591,7 +592,7 @@ if $ARGS[0] = 'org':
 	if mesec > 0:
 		!!periods, orgasm is not possible
 		pcs_mood -= 10
-		pcs_willpwr -= 10
+		!pcs_willpwr -= 10
 		'It is your time of the month and, as his member rams into you, vaginal blood flows slowly around his girth. Painful sensations and pleasure mix. You moan while his strong <<dick>> centimeter dick fucks your pussy.'
 		$orgasm_or = 'no'
 		gs 'stat'
@@ -671,55 +672,47 @@ if $ARGS[0] = 'org':
 
 		if orgazm = 0:
 			pcs_mood -= 15
-			pcs_willpwr -= 15
 			'You groan in pain when <<$boydesc>> enters you, tears flowing from your eyes as you endure the feeling of having a red-hot rod between your legs. You cry and moan while his strong <<dick>> centimeter dick fucks your pussy.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		elseif orgazm = 1:
 			pcs_mood -= 10
-			pcs_willpwr -= 10
 			'You bite your lip in pain when <<$boydesc>> enters you, a twinge of pain between your legs. Frowning, you moan in pain while his strong <<dick>> centimeter dick fucks your pussy.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		elseif orgazm = 2:
 			pcs_mood -= 5
-			pcs_willpwr -= 5
 			'You wince at the sudden pain when <<$boydesc>> enters you, the pain between your legs gradually calms and becomes quite tolerable. You try to get aroused while his strong <<dick>> centimeter dick fucks your pussy, but it is not enough.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		elseif orgazm = 3:
 			pcs_mood += 5
-			pcs_willpwr += 5
 			'You are startled by the feeling as your pussy is stretched when <<$boydesc>> enters you. A shiver of pleasure starts from between your legs and travels up your spine as each stroke of his <<dick>> centimeter fucks into your pussy.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		elseif orgazm = 4:
 			pcs_mood += 10
-			pcs_willpwr += 10
 			'You are startled by the feeling as your pussy is stretched when <<$boydesc>> enters you. A shiver of pleasure starts from between your legs and travels up your spine as each stroke of his <<dick>> centimeter fucks into your pussy. Gradually a pleasant warmth and ripple grows in the lower abdomen, but the feeling never peaks, instead decreasing in strength even as it remains with you until the end.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		elseif orgazm = 5:
 			pcs_mood += 15
-			pcs_willpwr += 15
 			'You gasp at the feeling as your pussy spreads for his dick. Your groin becomes very warm and pleasant, when his strong <<dick>> centimeter dick hammers your pussy. Gradually the pleasant warmth ripples in your lower abdomen and then the feeling intensifies and your whole body tenses as the hot waves of orgasm rush over you. You can not help screaming in pleasure as you writhe under the sensation.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			$orgasm_or = 'yes'
 			gs 'stat'
 		elseif orgazm = 6:
 			pcs_mood += 5
-			pcs_willpwr += 5
 			'You feel every inch as his member enters your pussy when <<$boydesc>> slides home. It is a pleasant feeling, but his dick is significantly smaller than you prefer and <<dick>> inches is not enough for you. Gradually, a pleasant ripples grows in your lower abdomen, but the feeling never rises to true orgasm.'
-			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 		end
 
 		if pcs_vag <= dick:pcs_vag += 1
 	elseif pcs_vag = 0 and mesec <= 0:
 		pcs_mood -= 15
-		pcs_willpwr -= 15
 		'You bite your lip in pain and tears gush from your eyes when <<$boydesc>> enters you, breaking your hymen. You moan while weeping as his strong <<dick>> centimeter dick fucks your bloody pussy.'
-		gs 'arousal', 'vaginal', 15, 'sub', 'rough'
+		gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 		gs 'stat'
 	end
 
@@ -741,7 +734,6 @@ if $ARGS[0] = 'cum':
 			gs 'arousal', 'end'
 			gs 'stat'
 			pcs_mood -= 15
-			pcs_willpwr -= 15
 			gs 'cuminsidereact'
 		elseif finrand = 1:
 			!!out
@@ -807,10 +799,9 @@ if $ARGS[0] = 'autobj':
 
 	if pcs_horny >= 100:
 		pcs_mood += 15
-		pcs_willpwr += 15
 
 		'As you suck the dick before you, a fire smolders between your legs, building into a conflagration of orgasm. you moan around the cock in your mouth, never once slowing your pace.'
-		gs 'arousal', 'bj', 5, 'sub'
+		gs 'arousal', 'bj', -5, 'sub'
 		$orgasm_or = 'yes'
 		gs 'stat'
 	end
@@ -838,16 +829,16 @@ if $ARGS[0] = 'an':
 	if pcs_ass + lubonus < dick:'You scream and bite your lip at the sharp pain when the <<dick>> member centimeter enters your ass.'
 	if pcs_ass + lubonus >= dick:'You groan and a satisfying fullness spreads through you as the <<dick>> member centimeter dick forces its way into your ass.'
 	'<<$boydesc>> stops his assault for a moment, giving your ass time to adapt to the cock invading it before he starts you again, this time even more insistent.'
-	gs 'arousal', 'anal', 20, 'sub'
+	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
 	if pcs_ass + lubonus + 2 < dick:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You utter a muffled cry and bite down a pillow when his <<dick>> centimeter cock begins to fuck your ass full force.'
-		gs 'arousal', 'anal', 20, 'sub'
+		gs 'arousal', 'anal',10, 'sub'
 		gs 'stat'
 	elseif pcs_ass + lubonus + 2 >= dick:
 		'You start to moan rhythmically in time with thrusts of the dick buried in your ass.'
-		gs 'arousal', 'anal', 20, 'sub'
+		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
 	end
 end
@@ -875,7 +866,7 @@ if $ARGS[0] = 'ancum':
 	elseif pcs_horny >= 100:
 		'A blazing fire of pleasure explodes from your ass and spreads in waves of ecstasy up your body. Moaning, you instinctively drive yourself to impale your ass on his dick.'
 		$orgasm_or = 'yes'
-		gs 'arousal', 'anal', 20, 'sub'
+		gs 'arousal', 'anal', -5, 'sub'
 		gs 'stat'
 	end
 end

+ 13 - 2
locations/BMloc.qsrc

@@ -31,8 +31,19 @@ act 'Dance':
 	if bmTip[Tboynum] = 0:'After the Dance <<$boydesc>> offers to go out and drink beer.'
 	if bmTip[Tboynum] = 1:'After the Dance <<$boydesc>> offers to go hang out.'
 	if bmTip[Tboynum] = 2:'After the Dance <<$boydesc>> offers to go to his hotel.'
-
-	act 'Refuse': sprt_exp += rand(0,1) & gt 'gdkin'
+	
+	gs 'willpower', 'drink', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			sprt_exp += rand(0,1)
+			gs 'willpower', 'drink', 'resist'
+			gs 'willpower', 'pay'
+			gs 'stat'
+			gt 'gdkin'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	
 	act 'Agree':
 		*clr & cla

+ 1 - 1
locations/BelSex.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'bj1':
 		end
 	end
 	if belact > 0:
-	belyvag = rand(0,3)
+		belyvag = rand(0,3)
 		if belyvag = 0:
 			 '<<$boydesc>> grunts loudly while you suck him off. "Time to give you a real pounding!"'
 			act'Get in position':gt 'BelSex', 'vaginal1'

+ 2 - 2
locations/Cheatmenu_din.qsrc

@@ -1350,8 +1350,8 @@ $cheatmenu['reputation'] = {
 			'Your sister has a good opinion of you.'
 		end
 		*nl
-		if home_owned[2] = 0 or ParHomeBlock = 1:
-			'<a href="exec:home_owned[2] = 1 & ParHomeBlock = 0 & dynamic $cheatmenu[''reputation'']">Restore</a> access to your parent''s apartment.'
+		if home_owned[2] = 0:
+			'<a href="exec:home_owned[2] = 1 & dynamic $cheatmenu[''reputation'']">Restore</a> access to your parent''s apartment.'
 		end
 		if momKnowsKolka = 1:
 			'Your mother knows Kolka is the father. <a href="momKnowsKolka = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>.'

+ 2 - 2
locations/FedorEv3.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'Middle':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/top1.jpg"></center>'	
 			'You pull down your shirt and Fedor begins pawing at your breast giving you an exciting thrill, feeling his strong hands caressing your breasts.' 
 			'After a few seconds Fedor unzips his pants as he whispers in your ear "I want to feel your lips around my dick"'
-			gs 'arousal', 'breasts', 'sub', 'exhibitionism'
+			gs 'arousal', 'foreplay', 'sub', 'exhibitionism'
 			gs'stat'
 			
 			act 'Suck his dick':
@@ -729,7 +729,7 @@ if $ARGS[0] = 'Restroom Lady':
 			'and soon you are both undressed with your nude bodies pressed against one another as you share a passionate kiss.'
 			*nl	
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/kiss1.jpg"></center>'
-			gs 'arousal', 'kiss_give', 5, 'lesbian', 'dom'
+			gs 'arousal', 'kiss', 5, 'lesbian', 'dom'
 			gs 'arousal', 'foreplay_give', 5, 'lesbian', 'dom'
 			gs 'stat'					
 			

+ 3 - 3
locations/Gadbana.qsrc

@@ -53,7 +53,7 @@ if mira = 0:
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
-			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			gs 'arousal', 'flash', 10, 'exhibitionism'
 			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
@@ -70,7 +70,7 @@ if mira = 0:
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
-			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
@@ -304,7 +304,7 @@ else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 					'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
 					!!gs 'clothing', 'recover_lost_clothes', 'Gaddvor'
-					gs 'arousal', 'voyeur', 10, 'exhibitionism'
+					gs 'arousal', 'flash', 10, 'exhibitionism'
 					gs 'arousal', 'end'
 					killvar 'banya_underwear'
 					gs 'stat'

+ 4 - 4
locations/Gadhouse.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'Main':
 	!{
 	!New family system, skip for now.
 	gs 'zz_family', 'father_sheduler'
-	if $father['location'] = $curloc and ParHomeBlock = 0:
+	if $father['location'] = $curloc and home_owned[2] = 1:
 		'Your parents room.'
 		gs 'gadukino_event', 'go_home'
 	end
@@ -184,7 +184,7 @@ if $ARGS[0] = 'Main':
 	if indorf = 1:
 		'Your parents are relaxing inside.'
 
-		if staygad ! daystart and ParHomeBlock = 0: gs 'gadukino_event', 'go_home'
+		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
 	end
 
 	 if $clothingworntype ! 'nude':
@@ -198,7 +198,7 @@ if $ARGS[0] = 'Main':
 			grandma_trouble += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
-			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			gs 'arousal', 'flash', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'Main':
 			inhib_exp += rand(0,2)
 			grandma_trouble += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
-			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'

+ 0 - 28
locations/Gadsarai.qsrc

@@ -25,8 +25,6 @@ if $ARGS[0] = '':
 	end
 	'An old junk filled barn that could hold some useful items.'
 
-	if mira_dog > 0: 'A naked and chained <a href="exec: gt ''Gadsarai'',''mira_dog'' ">Mira</a> sits near the dog house.</a>'
-
 	if month > 4 and month < 10:
 		if hour > 9 and hour < 20:
 			'On your right is a cattle barn.'
@@ -324,31 +322,5 @@ if $ARGS[0] = 'horse':
 	act 'Go':minut += 5 & gt'Gadsarai'
 end
 
-if $ARGS[0] = 'mira_dog':
-	*clr & cla
-	minut += 5
-	gs 'stat'
-
-	'<center><H4>The barn</H4></center>'
-	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_kennel2.jpg"></center>'
-	'You see Mira in chains, naked, in the old dog house depicting a dog.'
-
-	act 'Release':
-		cla
-		*clr
-		minut += 5
-		mira_dog = 0
-		gs 'stat'
-		npc_QW['A60'] = 32 & !back to mira questline by illume
-		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_kennel3.jpg"></center>'
-		'Taking pity, you decide to let go the Mira ahead of time.'
-		'"Okay Mira, I''m feeling mercyfull today. You can consider yourself forgiven." you say, removing Mira''s collar.'
-		'The girl looks nervously at you for a few moments, then quickly gets dressed and runs home.'
-
-		act 'Continue':gt'Gadsarai'
-	end
-	act 'Go':gt'Gadsarai'
-end
-
 --- Gadsarai ---------------------------------
 

+ 63 - 43
locations/Gnpc.qsrc

@@ -131,7 +131,7 @@ if boytimes[numnpc] > 0 and otnBoyFrend[numnpc] > 40:
 end
 'You approach <<$nameBoyfrend[numnpc]>> and greet him<<$bfGreeting>>.'
 
-act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 
 act 'Take a walk through the park':
 	cla
@@ -178,12 +178,12 @@ act 'Take a walk through the park':
 	if gboyrand = 0:
 		'<<$nameBoyfrend[numnpc]>> offers to go to the movies.'
 
-		act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 		act 'Go to the cinema':gt 'Gnpc_cinema'
 	elseif gboyrand = 1:
 		'<<$nameBoyfrend[numnpc]>> suggests to drink some beers in the park.'
 
-		act 'Apologize and leave':otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
 
 		act 'Go for a beer':
 			cla
@@ -228,7 +228,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him and take the money':
 				cla
-				pcs_dom += 2
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				money += 5000
@@ -240,7 +239,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him and throw the money in his face':
 				cla
-				pcs_dom += 5
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
@@ -254,7 +252,6 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 
 			act 'Dump him':
 				cla
-				pcs_dom += 5
 				npc_pregtalk[numnpc] = 1
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
@@ -281,20 +278,24 @@ if GboyBalabol[numnpc] = 1:
 			'<<$nameBoyfrend[numnpc]>> grins, "Relax, <<$pcs_nickname>>. It''s a fact that you''re a <<$gnikname>>. So what?"'
 		end
 
-		act 'Break up with him':
-			cla
-			pcs_dom += 5
-			GboyBalabol[numnpc] = 2
-			otnBoyFrend[numnpc] = 0
-			gs 'stat'
-			'You furiously scream at him that you never want to see him again and storm off.'
+		gs 'willpower', 'misc', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Break up with him (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'pay', 'self'
+				GboyBalabol[numnpc] = 2
+				otnBoyFrend[numnpc] = 0
+				gs 'stat'
+				'You furiously scream at him that you never want to see him again and storm off.'
 
-			act 'Leave':gt $loc, $metka
+				act 'Leave': gt $loc, $metka
+			end
+		else
+			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act 'Forgive him':
 			cla
-			sub += 5
 			GboyBalabol[numnpc] = 2
 			gs 'stat'
 			'You think about what he said. Because of the rumours, a lot of people have already a bad opinion about you and you don''t want to lose your <<$bfTitle[numnpc]>>, too. So you reluctantly decide to forgive him.'
@@ -304,50 +305,69 @@ if GboyBalabol[numnpc] = 1:
 	end
 end
 
-if sub < 20 and ((boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] > 4 and otnBoyFrend[numnpc] < 120)):
+if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] > 4 and otnBoyFrend[numnpc] < 120):
 	act 'End the relationship':
 		cla
 		*nl
 		'You think about how you could approach your <<$bfTitle[numnpc]>> with this delicate matter...'
 		*nl
 
-		if otnBoyFrend[numnpc] < 40 or pcs_dom > 10:
-			act 'Break up with him':
+		if otnBoyFrend[numnpc] < 40:
+			gs 'willpower', 'misc', 'self', 'easy'
+		else
+			gs 'willpower', 'misc', 'self'
+		end
+		if will_cost <= pcs_willpwr:
+			act 'Break up with him (<<will_cost>> Willpower)':
 				cla
-				pcs_dom += 5
+				if otnBoyFrend[numnpc] < 40:
+					gs 'willpower', 'misc', 'self', 'easy'
+				else
+					gs 'willpower', 'misc', 'self'
+				end
+				gs 'willpower', 'pay', 'self'
 				otnBoyFrend[numnpc] = 0
 				gs 'stat'
 				'You tell <<$nameBoyfrend[numnpc]>> that it would be better if you don''t see each other again and that he should''t call you anymore. He just stares at you, so you decide to quickly leave before he overcomes his state of shock.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave': gt $loc, $metka
 			end
+		else
+			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		if otnBoyFrend[numnpc] >= 40 and gnpcSex[numnpc] > 0:
-			act 'Just be friends':
-				cla
-				temprand = rand(0, 4)
-				sub -= 5
-				'You nervously approach <<$nameBoyfrend[numnpc]>>, "Listen, <<$nameBoyfrend[numnpc]>>, I really like you, but I''m not ready for an intimate relationship right now. I think we should forget what happened between us and just be friends, okay?"'
-
-				if boytimes[numnpc] > 4 and otnBoyFrend[numnpc] >= 80 and temprand = 0:
-					otnBoyFrend[numnpc] -= 40
-					gnpcSex[numnpc] = 0
-					gs 'stat'
-
-					'<<$nameBoyfrend[numnpc]>> looks totally dejected as you tell him the bad news. You really feel pity for him. When you finish your speech there''s a moment of painful silence.'
-					'Then <<$nameBoyfrend[numnpc]>> takes a deep breath, looks you in the eyes and says, "That''s really hard on me, <<$pcs_firstname>>. But I respect your feelings. I like you, too... very much in fact! That''s why I''m willing to be your friend, even if it means that we can''t be a couple."'
-					'Wow, you didn''t expect that! Still, you feel touched by his devotion and give him a bear hug, smiling from ear to ear. "Thank you, <<$nameBoyfrend[numnpc]>>! I''m so glad that you can understand me. I think we both need some time now to digest all that. Call me when you''re feeling better."'
-				else
-					otnBoyFrend[numnpc] = 0
-					gs 'stat'
-
-					'<<$nameBoyfrend[numnpc]>> narrows his eyes, "Just friends, huh? That''s a pretty lame excuse, <<$pcs_firstname>>, you know that? If you want to break up with me then why don''t you say so!"'
-					'You try to explain to him, "No, that''s not what I mean, <<$nameBoyfrend[numnpc]>>! I really like you..."'
-					'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
+			gs 'willpower', 'misc', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Just be friends (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'misc', 'self', 'easy'
+					gs 'willpower', 'pay', 'self'
+					temprand = rand(0, 4)
+					'You nervously approach <<$nameBoyfrend[numnpc]>>, "Listen, <<$nameBoyfrend[numnpc]>>, I really like you, but I''m not ready for an intimate relationship right now. I think we should forget what happened between us and just be friends, okay?"'
+
+					if boytimes[numnpc] > 4 and otnBoyFrend[numnpc] >= 80 and temprand = 0:
+						otnBoyFrend[numnpc] -= 40
+						gnpcSex[numnpc] = 0
+						gs 'stat'
+
+						'<<$nameBoyfrend[numnpc]>> looks totally dejected as you tell him the bad news. You really feel pity for him. When you finish your speech there''s a moment of painful silence.'
+						'Then <<$nameBoyfrend[numnpc]>> takes a deep breath, looks you in the eyes and says, "That''s really hard on me, <<$pcs_firstname>>. But I respect your feelings. I like you, too... very much in fact! That''s why I''m willing to be your friend, even if it means that we can''t be a couple."'
+						'Wow, you didn''t expect that! Still, you feel touched by his devotion and give him a bear hug, smiling from ear to ear. "Thank you, <<$nameBoyfrend[numnpc]>>! I''m so glad that you can understand me. I think we both need some time now to digest all that. Call me when you''re feeling better."'
+					else
+						otnBoyFrend[numnpc] = 0
+						pcs_mood -= 10
+						gs 'stat'
+
+						'<<$nameBoyfrend[numnpc]>> narrows his eyes, "Just friends, huh? That''s a pretty lame excuse, <<$pcs_firstname>>, you know that? If you want to break up with me then why don''t you say so!"'
+						'You try to explain to him, "No, that''s not what I mean, <<$nameBoyfrend[numnpc]>>! I really like you..."'
+						'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
+					end
+
+					act 'Leave':gt $loc, $metka
 				end
-
-				act 'Leave':gt $loc, $metka
+			else
+				act 'Just be friends (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 509 - 458
locations/Gnpc2.qsrc


+ 17 - 12
locations/Gnpc_cinema.qsrc

@@ -20,19 +20,24 @@ act 'Watch the movie':
 	if otnBoyFrend[numnpc] < 80:
 		'You watched the movie a couple of hours sitting in a chair next to the guy.'
 
-		act 'Go to the exit':gt 'Gnpc2'
+		act 'Go to the exit': gt 'Gnpc2'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		'You have been watching a movie and suddenly felt a hand on my knee Man.'
 
-		act 'Remove his hands':
-			cls
-			pcs_dom += 1
-			otnBoyFrend[numnpc] -= 20
-			gs 'stat'
-			'You have removed palm guy with his knees and continued to watch the movie. Movie finally ended. In the hall lights went on and the screen went titles.'
-
-			act 'Go to the exit':gt 'Gnpc2'
-		end
+		gs 'willpower', 'misc', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Remove his hands (<<will_cost>> Willpower)':
+				cls
+				gs 'willpower', 'pay', 'self'
+				otnBoyFrend[numnpc] -= 20
+				gs 'stat'
+				'You have removed palm guy with his knees and continued to watch the movie. Movie finally ended. In the hall lights went on and the screen went titles.'
+
+				act 'Go to the exit': gt 'Gnpc2'
+			end
+		else
+			act 'Remove his hands (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 
 		act 'Ignore':
 			cls
@@ -40,12 +45,12 @@ act 'Watch the movie':
 			gs 'stat'
 			'You pretended that nothing happens and the guy started more actively stroking your leg. Movie finally ended. In the hall lights went on and the screen went titles.'
 
-			act 'Go to the exit':gt 'Gnpc2'
+			act 'Go to the exit': gt 'Gnpc2'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'You have been watching the movies, and <<$nameBoyfrend[numnpc]>> put his hand on your foot and began to stroke your knee. Movie finally ended. In the hall lights went on and the screen went titles.'
 
-		act 'Go to the exit':gt 'Gnpc2'
+		act 'Go to the exit': gt 'Gnpc2'
 	end
 end
 

+ 2 - 2
locations/HotelHole.qsrc

@@ -70,7 +70,7 @@ if hour = 0 and $prevloc = 'HotelRoom':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event6.jpg"></center>'
 				'After a few minutes Miss Tanich turned around and started riding him while they faced each other.'
 				'You could see from the manager''s face that he was having trouble keeping up with her.'
-				gs 'arousal', 'voyeur',60
+				gs 'arousal', 'voyeur_sex',60
 				gs 'arousal', 'end'
 				act 'Continue':
 					*clr & cla
@@ -748,7 +748,7 @@ if $ARGS[0] = 'Twins' :
 		'Before you can react, however, the customer buries his head between your sister''s legs and starts licking her tight little snatch after pulling her panties to the side with his teeth.'
 		'Anya immediately starts moaning loudly, caught off-guard and aroused by the sudden violation.'
 		'The sight of your sister getting off on <<$boydesc>>''s skilled tongue brings a tingling to your loins, and in no time you feel your pussy dripping.'
-		gs 'arousal','voyeur',5,'prostitution'
+		gs 'arousal','voyeur_sex',5,'prostitution'
 		gs 'stat'
 		act 'Continue':
 			*clr & cla

+ 21 - 21
locations/HotelWork.qsrc

@@ -316,7 +316,7 @@ if $ARGS[0] = 'maid':
 				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex12.mp4"></video></center>'
 				'You bend your knees and squat in front of the keyhole. You can see one of the guys roughly fucking the girl.'
-				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'voyeur_sex', 2
 				gs 'stat'
 				act 'Leave before someone notices you':
 				threesomewatched = 0
@@ -697,7 +697,7 @@ if $ARGS[0] = 'maid':
 			elseif maidrand <= 85:
 				'<center><video autoplay loop src="images/locations/pavlovsk/hotel/sex/1,'+rand(0,7)+'.mp4"></video></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear a loud moaning coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. You see a couple fucking enthusiastically on the bed, completely oblivious to your presence.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -706,7 +706,7 @@ if $ARGS[0] = 'maid':
 					cla
 					'Making sure you don''t make a sound, you put your things away and watch them for a while, softly fondling yourself through your clothes. It feels great, and the couple on the bed look like they''re having a great time as well. Even though you want to keep watching them, you realize you have to get back to work before you''re missed.'
 
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 					act'Get back to work':gt'hotelwork','maid'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'maid':
 			elseif maidrand <= 95:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event3,'+rand(0,7)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear a loud moaning coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. You carefully put your things away and look around the corner, and you see a girl... but she''s not with one man, but two! They''re fucking her quite roughly.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -724,7 +724,7 @@ if $ARGS[0] = 'maid':
 					'You decide to watch them for a while longer, and idly begin to fondle yourself through your clothes. The men are quite demanding, commanding the girl around like she''s their plaything. They continuously talk her down, using degrading language. She obediently does everything they order her to do, but gets spanked once when she''s not quick enough. In the corner of the room, you see some coils of rope and several cuffs sticking out of an opened bag. It looks like she''s in for a long night...'
 					'You''d love to keep watching and see what else they have in store for her, but you realize you really have to get back to work before you''re missed.'
 					threesomewatched += 1
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 					act'Get back to work':gt'hotelwork','maid'
@@ -733,7 +733,7 @@ if $ARGS[0] = 'maid':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/maid.event4,'+rand(0,6)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear a somewhat desperate moan coming from inside. Curious as you are, you decide to sneak a peek to see what''s happening in the room.'
 				'You carefully put your things away and look around the corner, and you see a girl... but she''s not with one man, but with a whole bunch of them! From what you can see, there are at least five of them, taking turns, fucking her however they like.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -742,7 +742,7 @@ if $ARGS[0] = 'maid':
 					cla
 					'You decide to watch them for a while longer, and idly begin to fondle yourself through the clothes. You notice they''re quite rough with the girl, and sometimes she''s struggling a bit.'
 					'Should you say something to the manager? Then again... how would you explain watching them? You decide against it, figuring the girl will probably be okay.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -916,7 +916,7 @@ if $ARGS[0] = 'maid':
 								'The man completely strips the brunette naked as he takes out a blindfold and covers her eyes. Then he binds her arms and ankles to a wooden pillar in the middle of the room with a rope, while another rope links together her tiptoe and the blindfold...'
 								'"Now for your reward." the man take out a vibrator from the bag laying on the floor and puts it between the brunette''s legs, teasing her clit...'
 							end
-							gs 'arousal', 'voyeur', 3
+							gs 'arousal', 'voyeur_sex', 3
 							gs 'stat'
 
 							act 'Keep watching':
@@ -933,7 +933,7 @@ if $ARGS[0] = 'maid':
 									'Getting too aroused, she looses control and pushes the vibrator too far away and struggles to reach it again. The man quickly jumps up from the chair and immediately push it towards her dripping wet pussy as if he doesn''t want anything but to see her climax.'
 									'Seeing all of this play out is such a turn on... You are not sure of what is peaking your interest, but the whole situation is making you wet. You decide it''s better to let them finish in peace, so you silently close the door and turn back to your duties.'
 								end
-								gs 'arousal', 'voyeur', 3
+								gs 'arousal', 'voyeur_sex', 3
 								gs 'arousal', 'end'
 								gs 'stat'
 
@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'maid':
 				maidcheck_sonia = daystart
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy0,'+rand(0,4)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see a girl giving a guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Wait a minute... that''s Sonia, from your class!'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -1142,7 +1142,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.cum0,'+rand(0,4)+'.jpg"></center>'
 						'The man doesn''t last very long, and within minutes shoots his hot ropes of jizz all over Sonia''s face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'voyeur_sex', 3
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -1153,14 +1153,14 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy1,'+rand(0,3)+'.jpg"></center>'
 						'After a few minutes of Sonia enthusiastically sucking his dick and licking his balls, the guy decides he wants to fuck her now. He spreads Sonia''s legs and slides his cock into her in one fluent motion. Sonia moans eagerly, and begins to buck her hips against him.'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 
 						act'Further':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.cum0,'+rand(0,4)+'.jpg"></center>'
 							'The man doesn''t last very long, and within minutes he tells Sonia to get on her knees before him. Seconds later, he shoots his hot ropes of jizz all over her face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
-							gs 'arousal', 'voyeur', 3
+							gs 'arousal', 'voyeur_sex', 3
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -1173,7 +1173,7 @@ if $ARGS[0] = 'maid':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga0,'+rand(0,2)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see Sonia giving a black guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Obviously it''s not working; his cock is way too big for her.'
 				'She adjusts her strategy, diligently sucking the head of his cock and licking his balls instead.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -1183,7 +1183,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga.cum0,0.jpg"></center>'
 						'The black man doesn''t last very long, and within minutes shoots his hot ropes of jizz all over Sonia''s face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'voyeur_sex', 3
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -1194,14 +1194,14 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga1,'+rand(0,5)+'.jpg"></center>'
 						'After a few minutes of Sonia enthusiastically sucking his dick and licking his balls, the black guy decides he wants to fuck her now. He spreads Sonia''s legs and slides his cock into her in one fluent motion. You can see her pussy lips stretch around his huge cock as Sonia moans loudly, trying to hold him back for a second so she can get used to the size.'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 
 						act'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy.nigga.cum0,0.jpg"></center>'
 							'The black man fucks her for a good while, and just when you thought you should probably get back to work he tells Sonia to get on her knees before him. Seconds later, he shoots his hot ropes of jizz all over her face. She lets it sit for a minute so he can admire his handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see the man give Sonia some money.'
-							gs 'arousal', 'voyeur', 3
+							gs 'arousal', 'voyeur_sex', 3
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -1213,7 +1213,7 @@ if $ARGS[0] = 'maid':
 				maidcheck_sonia = daystart
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.two.nigga0,'+rand(0,1)+'.jpg"></center>'
 				'You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what''s happening in the room. When you look around the corner, you see Sonia with not one, but two huge black guys. She''s happily sucking their enormous dicks in turn, massaging the one she doesn''t currently have in her mouth with her delicate fingers.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				gs 'stat'
 
 				act'Get back to work':gt'hotelwork','maid'
@@ -1223,7 +1223,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/sonia/sex/sonia.cum0,'+rand(0,1)+'.mp4"></video></center>'
 						'Sonia must''ve been doing a really good job. Within minutes, both of them moan and quickly begin to jerk themselves off, shooting thick ropes of jizz all over her face. She lets it sit for a minute so they can admire their handiwork, before greedily wiping it towards her mouth and lapping it up. When you get up to leave, you see one of the men give Sonia some money.'
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'voyeur_sex', 3
 						gs 'arousal', 'end'
 						gs 'stat'
 
@@ -1234,14 +1234,14 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.two.nigga1,'+rand(0,3)+'.jpg"></center>'
 						'After a few minutes, the black guys pull Sonia''s mouth away from their dicks for a second, ignoring her pleas to have them back. One of the men starts to fuck her pussy, while the other stuffs her mouth again with his dick. You''re somewhat amazed at how easily Sonia takes their huge dicks in her pussy... she must''ve had a lot of practise with them already. After a few minutes of giving Sonia a thorough fucking, the black guys tell her to get on her knees.'
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'voyeur_sex', 3
 						gs 'stat'
 
 						act'Keep watching':
 							*clr & cla
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/sonia/sex/sonia.cum0,'+rand(0,1)+'.mp4"></video></center>'
 							'Sonia does as they says, and seconds later the first jet of sperm already hits her face. She licks some of it up, but waits patiently for the other guy to also add his cum to her face. You quickly pull away from the door when you see her looking in your general direction... that was close! You quickly gather your things and leave, before she gets the idea to look if anyone was watching her.'
-							gs 'arousal', 'voyeur', 3
+							gs 'arousal', 'voyeur_sex', 3
 							gs 'arousal', 'end'
 							gs 'stat'
 

+ 8 - 8
locations/IgorHunter.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'creekside':
 				'You hug his neck as he suckles and flicks his tongue around your nipple, eliciting some deep sighs from you.'
 
 				gs 'arousal', 'foreplay', 4
-				gs 'arousal', 'breasts', 2
+				gs 'arousal', 'foreplay', 2
 				minut -= 3
 				gs 'stat'
 
@@ -129,7 +129,7 @@ if $ARGS[0] = 'creekside':
 					'You gently push Igor away, not feeling like doing anything further.'
 					'"Maybe later", you say. Igor gives you another peck on the breasts before walking away.'
 
-					gs 'arousal', 'breasts', 2
+					gs 'arousal', 'foreplay', 2
 					gs 'stat'
 					gs 'arousal', 'end'
 
@@ -187,13 +187,13 @@ if $ARGS[0] = 'creekside':
 				'Igor pulls out of your mouth the last moment, jerking off furiously and covering your chest in his warm spunk.'
 				gs 'cum_call', 'breasts', 'A173', 1
 				gs 'arousal', 'bj', 4
-				gs 'arousal', 'breasts', 4
+				gs 'arousal', 'foreplay', 4
 				minut -= 5
 				gs 'stat'
 
 				act 'Relax and enjoy the view together':
 					cla & *clr
-					gs 'arousal', 'breasts', 4
+					gs 'arousal', 'foreplay', 4
 					minut += 10
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -213,7 +213,7 @@ if $ARGS[0] = 'creekside':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_2.jpg"></center>'
 		'You lean back further as Igor kisses all over your tit, your hand lightly playing with your other breast'
 
-		gs 'arousal', 'breasts', 5
+		gs 'arousal', 'foreplay', 5
 		gs 'arousal', 'foreplay', 5
 		minut -= 7
 		gs 'stat'
@@ -296,7 +296,7 @@ if $ARGS[0] = 'cabin':
 		'You smile and moan as Igor laps up your juices, pulling out and playing with your tit as he flick around your clit, getting you very excited.'
 
 		gs 'arousal', 'foreplay', 4
-		gs 'arousal', 'breasts', 3
+		gs 'arousal', 'foreplay', 3
 		gs 'arousal', 'cuni', 10
 		minut -= 10
 		gs 'stat'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'cabin':
 			gs 'dinsex', 'bj_swallow_random'
 
 			gs 'arousal', 'bj', 7
-			gs 'arousal', 'breasts', 5
+			gs 'arousal', 'foreplay', 5
 			minut -= 8
 			gs 'stat'
 			gs 'arousal', 'end'
@@ -406,7 +406,7 @@ if $ARGS[0] = 'woods':
 				'He pulls your outfit down and kisses down your chest before his lips find your nipple. You gasp when he starts to suckle and nibble, feeling a bit of wetness between your legs'
 
 				gs 'arousal', 'foreplay', 4
-				gs 'arousal', 'breasts', 4
+				gs 'arousal', 'foreplay', 4
 				minut -= 5
 				gs 'stat'
 

+ 1 - 1
locations/IrinaRoom.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'first7':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/sex/irinaqw5.jpg"></center>'
 	'You lower your head to her chest and began to suck and lick her hard nipples as Ira moans in pleasure.'
 
-	gs 'arousal', 'breasts', 5, 'lesbian'
+	gs 'arousal', 'foreplay_give', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Lick pussy':gt 'IrinaRoom', 'first8'

+ 1 - 1
locations/Komp.qsrc

@@ -154,7 +154,7 @@ if $ARGS[0] = 'porno':
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/porno.jpg"></center>'
 			'You find a video you think you''d enjoy, and spend some time watching it. Wow, that girl is so lucky...'
 
-			gs 'arousal', 'voyeur', 60
+			gs 'arousal', 'porn', 60
 			gs 'stat'
 
 			act 'The video ends...':gt 'Komp', 'porno'

+ 53 - 44
locations/LakeBoyDy.qsrc

@@ -21,77 +21,86 @@ if $ARGS[0] = 'ride':
 end
 
 if $ARGS[0] = 'go':
-	act'Try to get away':
+	act 'Try to get away':
 		cls
 		minut+=5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 		'You don''t like where this is going at all. You attempt to get up and walk away, but the bald man immediately grabs your wrist, pulling you back down.'
 		'"Relax girl, you don''t have to go. Are you nervous or something?"'
-		if pcs_dom>0:
-			act'Apologize and leave':
+		gs 'willpower', 'misc', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Apologize and leave (<<will_cost>> Willpower)':
 				cls
-				minut+=5
-				pcs_dom-=1
+				gs 'willpower', 'pay', 'self'
+				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 				'You assure him that you really need to get going, trying to hide the fact that you are indeed scared of him.'
 				'The guy lets go of your wrist and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
-				act 'Get away from him':gt'glake'
+				act 'Get away from him': gt 'glake'
 			end
+		else
+			act 'Apologize and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		act'You''re not nervous...':
+		act 'You''re not nervous...':
 			cls
-			minut+=5
+			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You quietly say: "No... I''m not nervous", even though you''re afraid to look him in the eye. Well, that wasn''t very convincing.'
 			'The guy chuckles, and pulls you against his hairy chest. His sweaty hands are mauling your ass now.'
 			'As he feels you up, he tries to coax you into joining him, as if he owns you already: "I know you''re not, baby. You should come with me, I''ll show you a good time. You won''t regret it."'
 			
-			act 'Resist':gt 'LakeBoyDy', 'slap'
-			 
-			if pcs_dom>0:
-				act'Apologize and leave':
-					cls
-					minut+=5
-					pcs_dom-=1
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-					'You assure him that you really need to get going, trying to hide the fact that you are in fact quite scared of him.'
-					'The guy lets go of your ass and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
-					act 'Get away from him':gt'glake'
-				end
+			act 'Resist': gs 'LakeBoyDy', 'slap'
+			
+			act 'Apologize and leave':
+				cls
+				minut += 5
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+				'You assure him that you really need to get going, trying to hide the fact that you are in fact quite scared of him.'
+				'The guy lets go of your ass and gives you an amicable smile: "Alright, girl. It''s a small world... I''m sure I will see you around". You rub your wrist as you leave, he was really quite rough about it.'
+				act 'Get away from him': gt 'glake'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'slap':
-	if pcs_dom > 0: 
-		act 'Tell him to fuck off':
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Tell him to fuck off (<<will_cost>> Willpower)':
 			cls
-			minut+=5
-			pcs_dom+=2
+			gs 'willpower', 'misc', 'resist', 'easy'
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You yell at him and tell him to get away from you. Your shouting quickly catches the attention of other people nearby and the bald man leaves quickly, not having expected your resistance.'
 			act 'Get away from him':gt'glake'		
 		end
+	else
+		act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	if (pcs_jab + pcs_punch + pcs_kick + pcs_def) > 150:
-		!! simple skill check as long as fight system is so clumsy
-		act 'Kick him in the balls':
+	! Changing these fighting skills to a simple strength check
+	!if (pcs_jab + pcs_punch + pcs_kick + pcs_def) > 150:
+	gs 'willpower', 'skill', 'resist', 'stren_lvl'
+	if will_cost <= pcs_willpwr:
+		act 'Kick him in the balls (<<will_cost>> Willpower)':
 			cls
-			minut+=5
-			pcs_dom+=2
+			gs 'willpower', 'skill', 'resist', 'stren_lvl'
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'You''re angry at this guy and his harassment, so you decide to knee him in the balls. He did not expect such a reaction and you score a perfect hit. The bald man bends over and drops on the ground, whincing from pain.'
 			'You pack up your things and go.'
 			act 'Leave him lying in the sand':gt'glake'			
 		end
+	else
+		act 'Kick him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Tell him to let go':
 		cls
@@ -103,7 +112,7 @@ if $ARGS[0] = 'slap':
 
 		act'Complain about the pain':
 			cls
-			minut+=5
+			minut += 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 			'His hand has your wrist gripped like it''s in a vice, and you involuntarily shriek in pain: "Ow! Please let me go, you''re hurting me!"'
@@ -112,7 +121,7 @@ if $ARGS[0] = 'slap':
 
 			act 'Try to placate him':
 				cls
-				minut+=5
+				minut+=1
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 				'The way his friend is twisting your arm behind your back hurts a lot, combined with the tight grip he still has on your wrist. Your screaming is making the other visitors on the beach uncomfortable, and none of them want to mess with the scary guys who are holding you down. Instead, you notice everyone quickly gathering their belongings and disappearing from the beach, some of them giving you an apologetic look as they run off. Within seconds, it''s just you, him and his scary friend remaining.'
@@ -121,14 +130,14 @@ if $ARGS[0] = 'slap':
 
 				act'Offer him money':
 					cls
-					minut+=5
+					minut += 1
 					npc_QW['A113'] = 1
 					daybelisex = daystart
-					if money<10000:
-						belgangPay=50000
+					if money < 10000:
+						belgangPay = 50000
 					end
-					if money>=10000:
-						belgangPay=money*5
+					if money >= 10000:
+						belgangPay = money * 5
 					end
 					gs'stat'
 					if week = 7:
@@ -145,9 +154,9 @@ if $ARGS[0] = 'slap':
 					'He slaps you in the face, while his friend still has your arm twisted behind your back. "Did you hear me, girl? I said <<belgangPay>> fucking <b>₽</b>."'
 					act'Agree to pay him':
 						cls
-						minut+=5
+						minut += 2
 						gs'stat'
-						belgangday=daystart
+						belgangday = daystart
 						belgangPayWeekAmount = 5000
 						belgangPayWeek = 0
 						belgangPayextension = 0
@@ -161,7 +170,7 @@ if $ARGS[0] = 'slap':
 						end						
 						act 'Accept':
 							cls
-							minut+=5
+							minut += 1
 							belgangProstitute = 0
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
@@ -182,7 +191,7 @@ if $ARGS[0] = 'slap':
 						end
 						act 'Beg him to reduce the weekly rate':
 							cls
-							minut+=5
+							minut += 1
 							gs'stat'
 							belgangPayWeekAmount = 4000
 							belgangPayWeek = 0
@@ -198,7 +207,7 @@ if $ARGS[0] = 'slap':
 				 
 					act 'You can''t afford that':
 						cls
-						minut+=5
+						minut += 2
 						belgangPayWeekAmount = 3000
 						belgangPayWeek = 0
 						belgangPayextension = 0
@@ -219,12 +228,12 @@ end
 
 if $ARGS[0] = 'sucksasha':
 	cls
-	if sashaBeliSex=0:sashaBeliSex=1&guy+=1
+	if sashaBeliSex = 0: sashaBeliSex = 1 & guy += 1
 	spafinloc = 12
 	gs 'cum_manage'
 	belgangday = daystart
 	belgangProstitute = 1
-	swallow +=1
+	swallow += 1
 	gs 'stat'
 	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/beachblow.jpg"></center>'

+ 30 - 10
locations/LakeBoyZ.qsrc

@@ -7,40 +7,50 @@ $gL_boy_z = {
 		randvnesh = rand(40,120)
 		if rand(0,10) = 0 and pcs_apprnc >= randvnesh:
 			'<<$boydesc>> smiles as he says, "You''re a pretty cool girl. Maybe we can hang out again?"'
-			act 'Smile and leave':gt'glake'
+			act 'Smile and leave': gt 'glake'
 			act 'Give him your phone number':
 				cls
 				pcs_mood += 10
 				gs 'boy', 'details'
 				if rand(0,2) = 0: gs 'boyfrend','start'
-				minut += 15
+				minut += 5
 				bmFrend[Tboynum] = 1
 				gs 'stat'
 				'You give <<$boydesc>> your phone number and he adds it to his contact list.'
 				'He then excuses himself and leaves, promising to call you.'
-				act 'Return':gt'glake'
+				act 'Return': gt 'glake'
 			end
 		else
 			'<<$boydesc>> sits closer to you and offers you a cold beer.'
 			act 'Smile and leave':gt'glake'
 			act 'Drink beer':
 				cls
-				minut+=15
+				minut += 15
 				gs 'drugs', 'alcohol', 'beer', 1
-				gs'stat'
+				gs 'stat'
 				'You drink beer with the guy, and the two of you chat for a while.'
 				'Suddenly, he puts his hand on your thigh.'
 				'"Another beer, <<$pcs_nickname>>?"'
-				act 'Thank him for the beer and leave':gt'glake'
+				gs 'willpower', 'drink', 'resist', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Thank him for the beer and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+				else
+					act 'Thank him for the beer and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 				act 'Drink some more beer':
 					cls
 					gs 'drugs', 'alcohol', 'beer', 1
-					gs 'arousal', 'foreplay', 15
+					gs 'arousal', 'foreplay', 5
 					gs 'stat'
 					'You drink more beer with <<$boydesc>>. He begins stroking your leg and puts his hand on your chest as he leans into you.'
 					if rand(1,100) <= 20:
 						'Leaned in he whispers to you, "I need to taste those lips."'
-						act 'Push him away and leave':gt'glake'
+						gs 'willpower', 'misc', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Push him away and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+						else
+							act 'Push him away and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
 						act 'Kiss him':
 							cls
 							gs 'arousal', 'kiss', 5
@@ -48,7 +58,12 @@ $gL_boy_z = {
 							gs 'stat'
 							'You passionately kiss <<$boydesc>>, as he continues to caress your body, paying particular interest to your breasts.'
 							'<<$boydesc>> invites you to his house.'
-							act 'Call it a day and leave':gt'glake'
+							gs 'willpower', 'sex', 'resist', 'easy'
+							if will_cost <= pcs_willpwr:
+								act 'Call it a day and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+							else
+								act 'Call it a day and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end
 							act 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
@@ -75,7 +90,12 @@ $gL_boy_z = {
 							gs'stat'
 							'You quickly get changed into your regular clothes and go for a walk with <<$boydesc>>.'
 							'<<$boydesc>> invites you over to his house.'
-							act 'Call it a day and leave':gt'pavResidential'
+							gs 'willpower', 'sex', 'resist', 'easy'
+							if will_cost <= pcs_willpwr:
+								act 'Call it a day and leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'glake'
+							else
+								act 'Call it a day and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end
 							act 'Follow him to his house':gt'LBZhouse'
 						end
 					end

+ 19 - 9
locations/MBasement.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand1.mp4"></video></center>'
 		'You see a Mistress with two submissives, she is fucking one of them.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 94:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand2.jpg"></center>'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand4.mp4"></video></center>'
 		'You see a Mistress with two submissives, she is fucking one of them.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 85:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand5.jpg"></center>'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand6.mp4"></video></center>'
 		'You see a two submissives being used by 2 dommes.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 79:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand7.jpg"></center>'
@@ -56,31 +56,31 @@ if $ARGS[0] = 'start':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand8.mp4"></video></center>'
 		'You see a submissive woman, tied and gagged and being fucked by a dominant man.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 73:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand9.mp4"></video></center>'
 		'You see a submissive woman, tied and being fucked by a dominant man. Their eyes are locked and they are oblivious to the crowd of people watching them.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 70:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/subbyhubby.jpg"></center>'
 		'A dominate wife wearing a strap-on fucks her husband with another man.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 67:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/3dom.mp4"></video></center>'
 		'Three dommes taking turn fucking their submissive male bent over a padded bench.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 64:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/2domsub.mp4"></video></center>'
 		'Two dommes fuck their subs wearing ball gags roughly, in a contest to see how can make their sub orgasm first.'
 
-		gs 'Mbasement', 'end'
+		gs 'Mbasement', 'end_sex'
 	elseif mbasement_rand > 61:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/stacross.mp4"></video></center>'
@@ -105,6 +105,16 @@ if $ARGS[0] = 'end':
 
 	act 'Continue': gt 'MBasement', 'start'
 end
-	
+
+if $ARGS[0] = 'end_sex':
+	menu_off = 1
+	gs 'arousal', 'voyeur_sex', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+
+	act 'Continue': gt 'MBasement', 'start'
+end
+
+
 --- MBasement ---------------------------------
 

+ 8 - 8
locations/MEastbed.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'guestB':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand1.mp4"></video></center>'
 		'A submissive woman is cleaning up her dom''s cum from another woman''s chest.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 	
 		act 'Return':gt 'MEastbed', 'guestB'
@@ -42,7 +42,7 @@ if $ARGS[0] = 'guestB':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/mis_1.mp4"></video></center>'
 		'A well dressed woman is very much enjoying giving a blowjob, she must be a sub.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Return':gt 'MEastbed', 'guestB'
@@ -90,7 +90,7 @@ if $ARGS[0] = 'guestC':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand2.mp4"></video></center>'
 		'A submissive woman on a leash is being fucked by her dom.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Return':gt 'MEastbed', 'guestC'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'guestC':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand8.mp4"></video></center>'
 		'A man and two women are having a threesome, you can''t tell who is sub or dom, but they are so carried away in their act that you don''t suppose that''s important right now.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -130,7 +130,7 @@ if $ARGS[0] = 'guestC':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_pun1.mp4"></video></center>'
 		'A submissive woman has been tied and gagged with a body massager strapped to her pussy. Poor thing, hopefully someone will let her go soon.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -158,7 +158,7 @@ if $ARGS[0] = 'guestD':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand4.mp4"></video></center>'
 		'A submissive woman is gagged and tied to a stool and the bedstead and her dom is fucking her roughly.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Return':gt 'MEastbed', 'guestD'
@@ -169,7 +169,7 @@ if $ARGS[0] = 'guestD':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand6.mp4"></video></center>'
 		'A submissive woman is tied up and gagged, her domme is fucking her with a strap-on.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Return':gt 'MEastbed', 'guestD'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'guestD':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_b7.mp4"></video></center>'
 		'A submissive woman is having her face fucked by a dom in a suit.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		

+ 3 - 3
locations/MHall.qsrc

@@ -132,7 +132,7 @@ if $ARGS[0] = 'east':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_b5.mp4"></video></center>'
 		'A submissive woman is give her dominant a blowjob while another sub watches from the stairs.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Return': gt 'MHall', 'east'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'east':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_b3.mp4"></video></center>'
 		'One of the maids is giving her dominant a blowjob by the small staircase.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
 		act 'Continue':
@@ -152,7 +152,7 @@ if $ARGS[0] = 'east':
 			'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_b4.mp4"></video></center>'
 			'It looks like she has learnt to overcome her gag-reflex.'	
 
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		

+ 1 - 1
locations/MLanding.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'west':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
 		'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		

+ 2 - 2
locations/MRear.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'garden':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/garrand.mp4"></video></center>'
 		'The gardener is fucking a sub, gagged and tied to a tree.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -60,7 +60,7 @@ if $ARGS[0] = 'garden':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/race.jpg"></center>'
 		'A cluster of people are gathered around five women bent over in a row masturbating, you quickly realize everyone is betting on who will orgasm first. You briefly wonder if their is a prize for winning.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		

+ 2 - 2
locations/MWestbed.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'master':
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/bedrand7.mp4"></video></center>'
 		'A dominant woman is being pleasured by her sub.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -99,7 +99,7 @@ if $ARGS[0] = 'guest':
 	    'You peek in the room when you hear grunts coming from it.'
 		'Inside you a man wearing womens clothes being fucked by his mistress wearing a strap-on.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		

+ 1 - 1
locations/MartinTalk.qsrc

@@ -908,7 +908,7 @@ end
 
 if $ARGS[0] = 'MartinTalkApartment':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'	
-	if housr = 1:
+	if home_owned[1] = 1:
 		'"Actually, I have a small apartment, on the other side of the park."'
 		*nl
 		'"Well, it''s good if you can afford it. Living on your own builds character."'

+ 31 - 31
locations/Meadow.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr2.jpg"></center>'
 				'She pauses for a few seconds before slowly sliding her hand inside her panties to rub her crotch.'
-				gs 'arousal', 'voyeur', 2, 'lesbian'
+				gs 'arousal', 'voyeur_sex', 2, 'lesbian'
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
@@ -243,13 +243,13 @@ if $ARGS[0] = '0':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr5.jpg"></center>'
 							'She begins to fondle her breasts while continuing to finger herself.'
-							gs 'arousal', 'voyeur', 2, 'lesbian'
+							gs 'arousal', 'voyeur_sex', 2, 'lesbian'
 							gs 'stat'
 							act 'Watch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr6.jpg"></center>'
 								'Finally she leans against the nearest tree as she brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-								gs 'arousal', 'voyeur', 10, 'lesbian'
+								gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Hide until she leaves': minut += 10 & gt 'Meadow'
@@ -262,13 +262,13 @@ if $ARGS[0] = '0':
 	elseif temper < 25:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr7.jpg"></center>'
 		'Mira is leaning against a tree and starts to caress herself.'
-		gs 'arousal', 'voyeur', 2, 'lesbian'
+		gs 'arousal', 'voyeur_sex', 2, 'lesbian'
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr8.jpg"></center>'
 			'She plays with herself for a few minutes before she stopping to look at a nearby log...'
-			gs 'arousal', 'voyeur', 5, 'lesbian'
+			gs 'arousal', 'voyeur_sex', 5, 'lesbian'
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
@@ -286,7 +286,7 @@ if $ARGS[0] = '0':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr11.jpg"></center>'
 						'Mira begins to caress herself again and brings herself to orgasm... You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-						gs 'arousal', 'voyeur', 10, 'lesbian'
+						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Hide until she leaves': minut += 10 & gt 'Meadow'
@@ -308,7 +308,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr14.jpg"></center>'
 				'After doing this, she sits down on the stump and continues to caress herself.'
-				gs 'arousal', 'voyeur', 5, 'lesbian'
+				gs 'arousal', 'voyeur_sex', 5, 'lesbian'
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
@@ -320,7 +320,7 @@ if $ARGS[0] = '0':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowmastr16.jpg"></center>'
 						'Finally she takes off her shirt, squats, and brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
-						gs 'arousal', 'voyeur', 10, 'lesbian'
+						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Hide until she leaves': minut += 10 & gt 'Meadow'
@@ -342,14 +342,14 @@ if $ARGS[0] = '1':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowsex1.jpg"></center>'
 		'Mira lies before Mitka on the bedspread and opens her legs invitingly in front of him. Mitka wastes no time and immediately starts roughly fucking her pussy.'
-		gs 'arousal', 'voyeur', 15
+		gs 'arousal', 'voyeur_sex', 15
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
 			if npc_QW['A60'] = 2:npc_QW['A60'] = 3
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowsex2.jpg"></center>'
 			'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -363,19 +363,19 @@ if $ARGS[0] = '2':
 	if temp_md = 0:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 		'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound everytime her butt cheeks hit his thighs...'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal1.jpg"></center>'
 		'Mira get down on all fours and spreads her ass cheeks wide apart.She moans loudly as Mitka drives his cock into her ass.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 	end
 	act 'Watch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal2.jpg"></center>'
 		'After a couple of minutes Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -387,14 +387,14 @@ if $ARGS[0] = '3':
 	if temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj.jpg"></center>'
 		'She enthusiastically sucks his cock and takes his whole member down her throat...'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj1.jpg"></center>'
 			'But, apparently, you''re a little late, because after a couple minutes Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first she gags, but eventually obediently swallows his cum...'
-			gs 'arousal', 'voyeur', 2
+			gs 'arousal', 'voyeur_sex', 2
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -402,7 +402,7 @@ if $ARGS[0] = '3':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj2.jpg"></center>'
 		'All Mira has on is some flip-flops with her face in the ground and her ass in the air. She''s moaning loudly as Kolyamba pounds her pussy and cums inside of her...'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -414,28 +414,28 @@ if $ARGS[0] = '4' or $ARGS[0] = '5':
 	if temper < 12:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj5.jpg"></center>'
 		'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but at the same time, she moves her head farther down his member. After a couple of minutes Vasyan tilts back his head and with a blissful roar cums in her mouth...'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
 	elseif temper >= 12 and temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj3.jpg"></center>'
 		'They are both completely naked and Mira is sticking her ass up in the air as she deepthroats Vasyan. After a couple of minutes you see Mira gulp down his sperm without even removing her mouth from his cock.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
 	elseif temper >= 15 and temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj4.jpg"></center>'
 		'They are both completely naked and Mira squeals with joy as she rides on Vasyan''s member. He does not last long and cums all over her butt as soon as he pulls out of her.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
 	elseif temper >= 20:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj6.jpg"></center>'
 		'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes he pulls out and sprays cum all over back.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -460,11 +460,11 @@ if $ARGS[0] = '6':
 	if temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj7.jpg"></center>'
 		'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
-		gs 'arousal', 'voyeur', 15
+		gs 'arousal', 'voyeur_sex', 15
 	else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj8.jpg"></center>'
 		'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 	end
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -477,15 +477,15 @@ if $ARGS[0] = '7':
 	if temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj11.jpg"></center>'
 		'Mira squats in front of one of the boys and takes his cock in her mouth while another gets ready for his turn.'
-		gs 'arousal', 'voyeur', 15
+		gs 'arousal', 'voyeur_sex', 15
 	elseif temper >= 15 and temper < 25:
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj10.jpg"></center>'
 		'Two boys are fucking Mira in her mouth and pussy at the same time. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later they finish with her and leave.'
-		gs 'arousal', 'voyeur', 15
+		gs 'arousal', 'voyeur_sex', 15
 	else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj9.jpg"></center>'
 		'Mira and the two boys she is with are all naked. She is sucking one of them while another plays with her breasts and pusy from behind.'
-		gs 'arousal', 'voyeur', 15
+		gs 'arousal', 'voyeur_sex', 15
 	end
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -497,7 +497,7 @@ if $ARGS[0] = '8':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj12.jpg"></center>'
 	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching, as the men take turns fucking Mira until they are all tired out.'
-	gs 'arousal', 'voyeur', 30
+	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -507,7 +507,7 @@ if $ARGS[0] = '9':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadows.jpg"></center>'
 	'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes almost hitting you!'
-	gs 'arousal', 'voyeur', 30
+	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Hide until she leaves': minut += 10 & gt 'Meadow'
@@ -526,7 +526,7 @@ if $ARGS[0] = 'mira_mitka':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowsex1.jpg"></center>'
 		'Mira lies before Mitka on the bedspread and opens her legs invitingly in front of him. Mitka wastes no time and immediately starts roughly fucking her pussy.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
@@ -534,7 +534,7 @@ if $ARGS[0] = 'mira_mitka':
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowsex2.jpg"></center>'
 			'Fifteen minutes Mitka finally cums in Mira and leaves. Mira cleans up and then leaves as well.'
-			gs 'arousal', 'voyeur', 15
+			gs 'arousal', 'voyeur_sex', 15
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'mira_gang':
 
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj12.jpg"></center>'
 	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching, as the men take turns fucking Mira until they are all tired out.'
-	gs 'arousal', 'voyeur', 30
+	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Hide until they leave': minut += 10 & gt 'Meadow'
@@ -579,7 +579,7 @@ if $ARGS[0] = 'lesb_mira':
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirakiss1.jpg"></center>'
 	'"I''m glad you came Mira" you say.'
 	'You continue, "Mira, I want you," you whispered in her ear and kissed her passionately on the lips.'
-	gs 'arousal', 'kiss_give', 5, 'lesbian'
+	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 	if mirahorny < 20:act 'Continue':gt 'mirasex','mirakiss'
 	if mirahorny >= 20:act 'Continue':gt 'mirasex','foreplay'

+ 23 - 20
locations/Miroslava.qsrc

@@ -1031,12 +1031,14 @@ if $ARGS[0] = 'miratalk':
 			pcs_horny += 10
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3.jpg"></center>'
 			'You coldly tell Mira that you saw her when she fucked Mitka in your meadow. You remind her that she swore not to tell anyone about your secret place. Mira turns red and flutters her eyes at you trying to look innocent as she mumbles that she''s sorry about breaking her promise. Mira asks if there is any way to make amends. You smile and remind her that she promised you three wishes if she ever revealed the meadow to anyone. Mira meekly nods her head confirming that she does indeed remember making that promise and is ready to fullfil them.'
-
-			act 'She deserves some punishment':
-				cla
-				if pcs_dom >= 25:
+			
+			gs 'willpower', 'exhib', 'force'
+			if will_cost <= pcs_willpwr:
+				act 'She deserves some punishment (<<will_cost>> Willpower)':
 					*clr & cla
 					minut += 5
+					gs 'willpower', 'exhib', 'force'
+					gs 'willpower', 'pay', 'force'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3.jpg"></center>'
 					act 'Tell her to show you her pussy':
@@ -1054,7 +1056,7 @@ if $ARGS[0] = 'miratalk':
 							pcs_horny += 15
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish1.jpg"></center>'
-							'Mentally exulting over your victory, you allow Mira to drag you behind the shed. She stops and turns to you, her face filled with a mix of anger and shame. Mira searches your face for a few secons, hoping that you will relent until she sees that you meant what you said. She stomps her feet a few times on the ground in frustration, and then, with a heavy sigh, she starts to remove her panties.'
+							'Mentally exulting over your victory, you allow Mira to drag you behind the shed. She stops and turns to you, her face filled with a mix of anger and shame. Mira searches your face for a few seconds, hoping that you will relent until she sees that you meant what you said. She stomps her feet a few times on the ground in frustration, and then, with a heavy sigh, she starts to remove her panties.'
 							act 'Watch':
 								*clr & cla
 								minut += 5
@@ -1070,22 +1072,23 @@ if $ARGS[0] = 'miratalk':
 							end
 						end
 					end
-				else
-					act 'Tell her that you want to watch as Mitka fucks her in the ass':
-						*clr & cla
-						minut += 5
-						pcs_horny += 10
-						npc_QW['A60'] = 5
-						npc_rel['A60'] -= 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3.jpg"></center>'
-						'You say you want to see Mitka fuck her ass because she told him your secret. Mira jumps to her feet from the suggestion and just looks at you, but you don`t give her time to recover and continue to emphasize further, Recalling that a deal is a deal, and if your word doesn''t matter, then out friendship will end. Miroslav blushes and hesitantly shifts from foot to foot. You decide to go for broke, turn around and start to leave...'
-						' - Wait, so it`s screaming you in the back of Mira, but you pretend to not notice and go on.'
-						' - Well, <<$pcs_nickname>>, - after a couple of seconds until you hear a hysterical scream from Mira, I`ll think of something!'
-
-						act 'Leave':gt 'Miroslava','Leave'
-					end
 				end
+			else
+				act 'She deserves some punishment (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Tell her that you want to watch as Mitka fucks her in the ass':
+				*clr & cla
+				minut += 5
+				pcs_horny += 10
+				npc_QW['A60'] = 5
+				npc_rel['A60'] -= 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/village/mira/mira3.jpg"></center>'
+				'You say you want to see Mitka fuck her ass because she told him your secret. Mira jumps to her feet from the suggestion and just looks at you, but you don`t give her time to recover and continue to emphasize further, Recalling that a deal is a deal, and if your word doesn''t matter, then out friendship will end. Miroslav blushes and hesitantly shifts from foot to foot. You decide to go for broke, turn around and start to leave...'
+				' - Wait, so it`s screaming you in the back of Mira, but you pretend to not notice and go on.'
+				' - Well, <<$pcs_nickname>>, - after a couple of seconds until you hear a hysterical scream from Mira, I`ll think of something!'
+
+				act 'Leave':gt 'Miroslava','Leave'
 			end
 		end
 	elseif npc_QW['A60'] = 4 and Mira4day ! daystart:

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 236 - 225
locations/NikoDates.qsrc


+ 64 - 90
locations/NikoDreams.qsrc

@@ -1,9 +1,11 @@
 # NikoDreams
 
 menu_off = 1
-
+!!ToDo: add this dream to the dreams Sveta can have at home in bed, trigger below, do this after willpower is seeded.
+!!Problem: Dreams are called in the middle of the sleep cycle and dreams with actions leave the sleep, sleep probably will have to be rewritten so that you go to sleep (start) go to sleep (dreams) and at the end go to sleep (end)
+!!if NikoVolkovQW = 10 and NikoEv = 12:
 if $ARGS[0] =  'Family':
-	cls
+	*clr & cla
 	pcs_hairbsh = 0
 	pcs_makeup = 1
 	cumspclnt = 1
@@ -14,55 +16,50 @@ if $ARGS[0] =  'Family':
 	'You feel hands, patting your leg. You open your eyes to see Anya kneeling next to you. "<<$pcs_firstname>> are you alright? It looks like you were having a bad dream." You quickly look around and realize that you are in your bedroom. Anya stands up then says, "Come on <<$pcs_nickname>>, everyone is waiting for us." You tilt your head as you reply, "Who''s waiting for us?" Anya responds, "You know, <<$npc_nickname[''A29'']>>, Dad, Kolka. Have you hit your head your something? Come on you know that we can''t eat breakfast without you." Anya takes your hand then leads you to the kitchen.'
 
 	act 'Enter kitchen':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="green"><<"Vladimir <<$pcs_lastname>>">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on, as Anya sits down next to you. You look around in relief, <font color=#FF00FF>That whole thing was just a dream. Oh it feels so good to be back home.</font> Your mother backs out of the kitchen with a tray of food then places a dish on food in front of each of you then says, "Nice of you to finally join us <<$pcs_firstname>>. I was beginning to think that you were never going to wake up." You giggle as you begin eating.'
-		'<center><b><h4><font color=#FF00FF><<"Natasha <<$pcs_lastname>>">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
+		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on, as Anya sits down next to you. You look around in relief, That whole thing was just a dream. Your mother backs out of the kitchen with a tray of food then places a dish on food in front of each of you then says, "Nice of you to finally join us <<$pcs_firstname>>. I was beginning to think that you were never going to wake up." You giggle as you begin eating.'
 
 		act 'Eat breakfast':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#FF00FF><<"Natasha <<$pcs_lastname>>">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
-			'Your mother suddenly exclaims, "HEY! No eating until your brother gets here!" You look and see your stepfather whispering in Kolka''s ear, but stopping as soon as you face them. You point to Kolka as you say, "<<$npc_nickname[''A29'']>>, Kolka is right there." Your mother crosses her arms as she replies, "I''m not talking about Kolka." She then walks back to the kitchen as Your brother and stepfather continue cackling while whispering into each others ears. You look around in confusion until you hear light moaning nearby. You then peek over the kitchen doorway to see your mother bent over the stove with a dark burly figure pressing against her bottom. You suddenly feel someone''s hand on one of your breasts.'
+			'Your mother suddenly exclaims, "HEY! No eating until your brother gets here!" You look and see your stepfather whispering in Kolka''s ear, but stopping as soon as you face them. You point to Kolka as you say, "<<$npc_nickname[''A29'']>>, Kolka is right there." Your mother crosses her arms as she replies, "I''m not talking about Kolka." She then walks back to the kitchen as your brother and stepfather continue cackling while whispering into each others ears. You look around in confusion until you hear light moaning nearby. You then peek over the kitchen doorway to see your mother bent over the stove with a dark burly figure pressing against her bottom. You suddenly feel someone''s hand on one of your breasts.'
 
 			act 'Turn around':
-				cls
+				*clr & cla
 				gs'stat'
-				'<center><b><h4><font color="green"><<"Kolka <<$pcs_lastname>>">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
-				'You turn to see Kolka squeezing your breast as he gives your stepfather a thumbs up. You push Kolka away then hear your stepfather shout, "Hey don''t push your little brother like that!" You respond, "But he touched me!" You mother enters the room with her pants at her angles. "Come on <<$pcs_nickname>>, it''s not like all the other boys haven''t already fucked you before. Why not let your brother have a chance?" Kolka quickly adds, "Yeah <<$pcs_firstname>>, don''t be selfish!" You see everyone in the room scolding you then hear a voice shout. "Don''t worry everyone, I will put this bitch in her place!" You see Yurik Volkov without any clothes on, walking into the room before grabbing you by your throat then pushing you against the wall.'
 				'<center><b><h4><font color="red"><<"Yurik Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/avatars/threaten1.jpg"></center>'
+				'You turn to see Kolka squeezing your breast as he gives your stepfather a thumbs up. You push Kolka away then hear your stepfather shout, "Hey don''t push your little brother like that!" You respond, "But he touched me!" You mother enters the room with her pants at her angles. "Come on <<$pcs_nickname>>, it''s not like all the other boys haven''t already fucked you before. Why not let your brother have a chance?" Kolka quickly adds, "Yeah <<$pcs_firstname>>, don''t be selfish!" You see everyone in the room scolding you then hear a voice shout. "Don''t worry everyone, I will put this bitch in her place!" You see Yurik Volkov without any clothes on, walking into the room before grabbing you by your throat then pushing you against the wall.'
 
 				act 'Continue':
-					cls
+					*clr & cla
 					gs'stat'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra8.mp4"></video></center>'
 					'You can faintly feel something entering your vagina, and can feel your tears leaking down your cheeks. You can faintly hear some soft voices in the distance. "Hey watch her head!...Don''t drop her!....Come on get that door open!" A few seconds later, you hear someone whispering in your ear. "It''s ok <<$pcs_firstname>>. This is your place now. You didn''t think that you can keep that precious body to yourself, did you?"'
 
 					act 'Turn around':
-						cls
+						*clr & cla
 						gs'stat'
 						'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-						'You slowly turn to see Niko standing right next to you with a wide grin on his face. You suddenly hear Yurik groan as he begins pumping his cum inside of your pussy before walking away while saying to Niko, "What a worthless whore. Couldn''t even rock her hips a bit. If I wanted to fuck a blow up doll, I would have kept fucking her mother." He then leaves, as you start hearing the soft voices again, but they sound closer. "Is she going to be alright?....She will be fine. She just needs some more rest....She''s moving. Do you think she is?..."'
-						*nl
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4"></video></center>'
+						'You slowly turn to see Niko standing right next to you with a wide grin on his face. You suddenly hear Yurik groan as he begins pumping his cum inside of your pussy before walking away while saying to Niko, "What a worthless whore. Couldn''t even rock her hips a bit. If I wanted to fuck a blow up doll, I would have kept fucking her mother." He then leaves, as you start hearing a beeping noise. Then you suddenly wake up in your own bed, with the alarm going off.'
 
-						act 'Continue':gt 'SoniaHome', 'Aftermath'
+						act 'Get up': gt !!this should be the same as after any dream Sveta had and wake up in her room
 					end
 				end
 			end
 		end
 	end
 end
-
+!!add this dream to the dreams Sveta can have at home in bed, trigger below, do this after willpower is seeded.
+!!if NikoVolkovQW = 10 and NikoEv = 12:
 if $ARGS[0] =  'Woods':
-	cls
+	*clr & cla
 	if music_on = 1:
 		$track_loop = 'sound/happyhome/HappyHome.mp3'
 		volume = 100
@@ -78,7 +75,7 @@ if $ARGS[0] =  'Woods':
 	VKSmiley = 3
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/1.jpg"></center>'
-	'You can feel grass on your face which you quickly brush away before looking around, and noticing that you are in the middle of the woods with a mist that surrounds you. <font color=#FF00FF>What''s going on? Why am I here? How did I get here? Where am I?</font> You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. <font color=#FF00FF>Where is this music coming from? Was that a person laughing? Maybe they can help me.</font> you begin heading in that direction when you suddenly feel a cold chill down your spine. <font color=#FF00FF>Something about that laughter is...unnerving.</font>'
+	'You can feel grass on your face which you quickly brush away before looking around, and noticing that you are in the middle of the woods with a mist that surrounds you. You don''t know where you are or how you got here. You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. You begin heading in that direction when you suddenly feel a cold chill down your spine. Something about that laughter is...unnerving.'
 	*nl
 	'You can hear someone laughing, far away.'
 
@@ -86,12 +83,12 @@ if $ARGS[0] =  'Woods':
 end
 
 if $ARGS[0] =  'Woods 2':
-	cls
+	*clr & cla
 	VKWoods = 2
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/2.jpg"></center>'
-	'<font color=#FF00FF>These woods are so dark. How did I get here?</font>'
+	'These woods are so dark and you have no idea how you got here.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -113,12 +110,12 @@ if $ARGS[0] =  'Woods 2':
 end
 
 if $ARGS[0] =  'Woods 3':
-	cls
+	*clr & cla
 	VKWoods = 3
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/3.jpg"></center>'
-	'<font color=#FF00FF>Still so dark. Am I even going the right way?</font>'
+	'Still so dark. You don''t even know if you are going the right way.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -140,12 +137,12 @@ if $ARGS[0] =  'Woods 3':
 end
 
 if $ARGS[0] =  'Woods 4':
-	cls
+	*clr & cla
 	VKWoods = 4
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/4.jpg"></center>'
-	'<font color=#FF00FF>More woods? At least I can see some light.</font>'
+	'More woods? At least you can see some light.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -167,12 +164,12 @@ if $ARGS[0] =  'Woods 4':
 end
 
 if $ARGS[0] =  'Woods 5':
-	cls
+	*clr & cla
 	VKWoods = 5
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/5.jpg"></center>'
-	'<font color=#FF00FF>Must keep moving. There must be a way out of here.</font>'
+	'You keep moving. Trying to find a way out of here.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -194,12 +191,12 @@ if $ARGS[0] =  'Woods 5':
 end
 
 if $ARGS[0] =  'Woods 6':
-	cls
+	*clr & cla
 	VKWoods = 6
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/6.jpg"></center>'
-	'<font color=#FF00FF>Will this ever end? That freak is still lurking around.</font>'
+	'The woods seem to never end.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -221,13 +218,13 @@ if $ARGS[0] =  'Woods 6':
 end
 
 if $ARGS[0] =  'Woods 7':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/weepee.mp3', 50
 	VKWoods = 7
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/7.jpg"></center>'
-	'<font color=#FF00FF>Will I be trapped here forever? Oh wait, what is that?</font> You can see a pair of train tracks ahead of you, and you can hear the music getting louder, as you approach the tracks.'
+	'You can see a pair of train tracks ahead of you, and you can hear the music getting louder, as you approach the tracks.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -250,13 +247,13 @@ if $ARGS[0] =  'Woods 7':
 end
 
 if $ARGS[0] =  'Woods 8':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/weepee.mp3', 100
 	VKWoods = 8
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/8.jpg"></center>'
-	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest. <font color=#FF00FF>Is this it? Am I out of this forest?</font>'
+	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/smiley.mp3', 100
@@ -279,14 +276,14 @@ if $ARGS[0] =  'Woods 8':
 end
 
 if $ARGS[0] =  'Woods Home':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/weepee.mp3', 100
 	if VKHappyHome = 0:VKHappyHome = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Happy Home">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/mansion/happyhome.jpg"></center>'
 	if VKTeeHee = 0:
-		'You finally approach the end of the forest when you see an old derelict mansion. As you walk toward the mansion, you can see; what appears to be a woman standing in the middle of the path, leading to the house. She appears to be crying with some kind of dark essence surrounding her. <font color=#FF00FF>She must be stranded here like me. Maybe I can help her.</font> you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
+		'You finally approach the end of the forest when you see an old derelict mansion. As you walk toward the mansion, you can see; what appears to be a woman standing in the middle of the path, leading to the house. She appears to be crying with some kind of dark essence surrounding her. You suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
 	else
 		'There is an old derelict mansion in the distance, but the path to the mansion is blocked by a crying woman with a dark essence surrounding her. <a href="exec:gt ''NikoDreams'', ''TeeHee''">TeeHee</a> continuously rubs against your leg while purring softly, obviously wanting your attention.'
 	end
@@ -297,7 +294,7 @@ if $ARGS[0] =  'Woods Home':
 end
 
 if $ARGS[0] =  'TeeHee':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/teehee.mp3', 100
 	gs'stat'
 	if VKTeeHee = 0:
@@ -323,37 +320,38 @@ if $ARGS[0] =  'TeeHee':
 		'You nod your head then say, "Okay, I am ready to go." TeeHee grins as she uses her tail to knock the top off of a jar, sitting next to her, releasing several glowing butterflies that circle around you, covering you with a glowing powder that lifts you in the air before suddenly pulling you back through the mist.'
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/butterfly6.jpg"></center>'
+		
 
-		act 'Continue':VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+		act 'Continue':VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt !!this should be the same as after any dream Sveta had and wake up in her room
 	end
 
 	act 'Walk away':VKTeeHee = 1 & gt 'NikoDreams', 'Woods Home'
 end
 
 if $ARGS[0] =  'Smiley 1':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/rip1.mp3', 90
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Smiley">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/smiley2.jpg"></center>'
 	'As you are walking through the forest you hear loud laughing behind you then suddenly feel something rubbing across your throat, causing a stream of blood to begin pouring out of your neck. You let out a scream as your energy fades, and the ground rushes toward you...'
 
-	act 'Rest in peace': VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+	act 'Rest in peace': VKSmiley = 3 & gt !!this should be the same as after any dream Sveta had and wake up in her room
 end
 
 if $ARGS[0] =  'WeePee 1':
-	cls
+	*clr & cla
 	PLAY 'sound/happyhome/rip2.mp3', 100
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"WeePee">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/weepee.jpg"></center>'
 	'As you approach the crying woman, she instantly turns around then lunges toward you, shoving her hand into your chest, and pulling out your heart, as she stares into your eyes, watching your life slowly drain away...'
 
-	act 'Rest in peace': VKWeePeeHeart = 1 & VKHappyHome = 0 & gt 'SoniaHome', 'Aftermath 2'
+	act 'Rest in peace': VKWeePeeHeart = 1 & VKHappyHome = 0 & gt !!this should be the same as after any dream Sveta had and wake up in her room
 end
 
 if $ARGS[0] =  'Woods Hide':
-	cls
+	*clr & cla
 	gs'stat'
 	if VKSmiley = 1:
 		'<center><b><h4><font color="red"><<"Smiley">></font></h4></b></center>'
@@ -373,22 +371,20 @@ if $ARGS[0] =  'Woods Hide':
 end
 
 if $ARGS[0] =  'Friends':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/soniawake.jpg"></center>'
 	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess...Where am I?" Sonia replies, "After what happened at school, we were bored, so we decided to have you dance for us." You tilt your head. "Dance..for us?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "Come on <<$pcs_firstname>>. What are you waiting for?" Julia adds, "Don''t worry, I threw away all your clothes. Whores don''t need clothes." You look down and notice that you are naked. Katja suddenly slams the bed frame. "Enough messing around! DANCE WHORE!"'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
 
 	act 'Dance':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/cam/cam2.mp4"></video></center>'
-		'You quickly stand up then begin dancing. <font color=#FF00FF>I need to keep dancing because ...Umm...Why am I dancing?</font> Sonia reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Julia walks up to you then begins squeezing your breasts. Sonia says, "And they call me a whore." Katja giggles, as she responds, "That''s just silly <<$pcs_firstname>> is the only whore here." Julia replies, "I agree, I don''t even know why she thought that she could hide it." <font color=#FF00FF>Why are they being so mean to me? and why can''t I stop dancing?</font> Sonia gives your ass a firm smack, as she says, "Alright, we kept the boys waiting long enough."'
+		'You quickly stand up then begin dancing. <font color=#FF00FF>I need to keep dancing because ...Umm...Why am I dancing?</font> Sonia reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Julia walks up to you then begins squeezing your breasts. Sonia says, "And they call me a whore." Katja giggles, as she responds, "That''s just silly <<$pcs_firstname>> is the only whore here." Julia replies, "I agree, I don''t even know why she thought that she could hide it." You don''t know why are they being so mean to you and why you can''t stop dancing. Sonia gives your ass a firm smack, as she says, "Alright, we kept the boys waiting long enough."'
 
 		act 'Boys?':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/exposed1.jpg"></center>'
 			'Sonia pulls you toward the door which opens on its own, and you end up in the school cafeteria with all the boys hollering. "Hey everyone! The whore is here!" The boys all charge you and begin rubbing on your body while making lude comments,'
@@ -396,39 +392,30 @@ if $ARGS[0] =  'Friends':
 			'Petka: I know right? She is such a worthless whore. I almost don''t even want her anymore.'
 			'Radomir: I know right? Her pussy is probably all stretched out by now. It''s like ground zero.'
 			'Lesko: It may be used up but I might as well try it. Lesko then grabs you by your hair then pulls out his dick then shoves it in your mouth.'
-			'<center><b><h4><font color=#ffa200><<"Lesco Tsarev">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big7.jpg"></center>'
 
 			act 'Suck Lesco''s dick':
-				cls
+				*clr & cla
 				gs'stat'
-				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob3.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/hall1.mp4"></video></center>'
 				'You begin sucking Lesko''s dick as the boys around you begin hollering.'
 				'Ivan: Wow <<$pcs_firstname>> is even sucking Lesko''s dick. What the fuck?'
 				'Petia: She seems to be enjoying it too. Gross!'
 				'Mr Anatoly: Don''t look at me. I never taught her that.'
-				'Lesko then pulls you up on top of him, and you begin riding his dick while tears stream down your face. <font color=#FF00FF>Why is this happening? Why are they all laughing at me? Please someone make this stop!</font>'
-				*nl
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/hall1.mp4"></video></center>'
+				'Lesko then pulls you up on top of him, and you begin riding his dick while tears stream down your face.'
 
 				act 'Continue':
-					cls
+					*clr & cla
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4"></video></center>'
 					'Lesko groans then begin pumping his cum inside of you. You look down to see an almost endless stream of cum filling you up, causing your belly to inflate. Suddenly Anya grabs you by your hair then leads you to the door, as she says, "<<$pcs_firstname>> <<$npc_nickname[''A29'']>> needs to speak with you."'
-					'<center><b><h4><font color=#00eaff><<"Anya <<$pcs_lastname>>">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/progulka.jpg"></center>'
 
 					act 'Walk through the door':
-						cls
+						*clr & cla
 						gs'stat'
-						'<center><b><h4><font color=#FF00FF><<"Natasha <<$pcs_lastname>>">></font></h4></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
 						'You enter the room, recognizing it as your apartment. Your mother is standing in front of you with a sneer on her face. "<<$pcs_firstname>> You let those boys get you prenant? I can''t believe you!" Anya adds, "Not only that but she has also been eating my pussy." Your mother''s eyes widen, "SHE WHAT?" Kolka speaks up too. "She also had sex with me, and is the mother of my child." Your mother is seething with rage, as she grabs onto a knife then drives it into your stomach, causing a large stream of cum to leak out.'
 						*nl
-						'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. <font color=#FF00FF>Where did everyone go? Where am I? It''s so dark.</font> You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
-						*nl
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
+						'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
 
 						act 'Continue':minut += 120 & gt 'NikoEv2', 'Niko Wake'
 					end
@@ -439,7 +426,7 @@ if $ARGS[0] =  'Friends':
 end
 
 if $ARGS[0] =  'Classroom Dream':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/rest.jpg"></center>'
 	'You can feel yourself getting tired, so you lay your head down on your desk to rest, as you wait for the school period to end. After a few seconds, you hear, "Who''s that sleeping in my class?" You immediately sit up, pretending that you weren''t laying down, as you continue listening to the teacher teach the lesson, "Always remember to double check the problem, so that you can be confident with your solution." Now let''s move on to the next lesson... How to treat a whore. For this lesson I will need a volunteer. Miss <<$pcs_lastname>>, come up in front of the class."'
@@ -447,31 +434,25 @@ if $ARGS[0] =  'Classroom Dream':
 	'You recoil in shock. "Wha...Me?" The teacher places both hands on the desk then says, "Of course I mean you. Do you know of any other whores that haven''t already volunteered?" You can just barely make out Sonia under the table sucking on the teacher''s dick.'
 
 	act 'Walk to the front of the class':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/stand.jpg"></center>'
 		'As you reach the front of the class you feel your clothes falling off, you quickly try to grab them, but they dissolve in your hands. You try covering your body, but then the teacher shouts, "STOP COVERING YOURSELF YOUNG LADY! Whores should always keep their fuckholes on display." You can feel your body trembling, as you finally approach the front of the class. The teacher says, "Now this is what you do to a whore. Notice her pussy here? This is the best place to fuck, but don''t get carried away, or she could end up pregnant with a whore baby." He then motions you to come toward him.'
 
 		act 'Move closer':
-			cls
+			*clr & cla
 			gs'stat'
-			'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob1.mp4"></video></center>'
-			'As soon as you get close the teacher grabs you then pushes you onto your knees. He pushes his penis against your lips, and says, "Open up, for your reward." You open your mouth, allowing his penis to enter. You begin sucking his dick eagerly, for what feels like a few minutes before he grabs your waist then lifts you up, dropping you on top of his desk. He then pushes you over then rams his dick inside of you, and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class.'
-			*nl
-			'<font color=#FF00FF>Why is this happening. Why me? Will I never have a normal life again? Will I always be...</font> You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you ok? Come on, get up..."'
-			*nl
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/sex.jpg"></center>'
+			'As soon as you get close the teacher grabs you then pushes you onto your knees. He pushes his penis against your lips, and says, "Open up, for your reward." You open your mouth, allowing his penis to enter. You begin sucking his dick eagerly, for what feels like a few minutes before he grabs your waist then lifts you up, dropping you on top of his desk. He then pushes you over then rams his dick inside of you, and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class. You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you ok? Come on, get up..."'
 
 			act 'Continue':
-				cls
+				*clr & cla
 				NikoEv = 13
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/leave.jpg"></center>'
 				'You open your eyes then see all of the students getting out of their chairs and leaving the class while chatting with each other. You feel a hand on your shoulder shaking you, so you quickly turn to see Julia with a concerned look on her face. "Are you alright <<$pcs_firstname>>?" You take a second to collect your thoughts before responding, "I don''t know why I keep having these terrible nightmares." Julia rubs your back, as she responds, "Things must be, so hard for you. I''m so sorry." not wanting to worry Julia, you give her a fake smile then say, "They''re just dreams, I''ll be fine."'
 				*nl
 				'Julia rubs on your forehead when you suddenly hear heavy breathing then turn to see Petia who says, "Are you two gonna kiss?" Julia recoils in shock then shouts, "Go away, you perv!" Petia quickly walks away. Julia looks back to you then says, "We can talk later." You smile as you respond, "That sounds great." You both walk out of the class.'
-				'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/smile1.jpg"></center>'
 
 				act 'Leave Classroom':minut += 5 & gt 'NikoEv2', 'Lunch Chat'
 			end
@@ -490,7 +471,7 @@ if $ARGS[0] = 'Puppeteer':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/class/1.jpg"></center>'
-		'You awake then slowly lift your head, looking around the room, but immediately recoil in shock when you notice how dark the classroom is. You quickly think to yourself, <font color=#FF00CC>Whoa, how long did I sleep? Ohh shit, I must have slept through the whole day. I should probably get home before the school doors are locked up for the day.</font> You quickly shove your books into your bag then quickly walk for the door.'
+		'You awake then slowly lift your head, looking around the room, but immediately recoil in shock when you notice how dark the classroom is. You must have slept through the whole day. You should probably get home before the school doors are locked up for the day. You quickly shove your books into your bag then quickly walk for the door.'
 
 		act 'Go to the hallway':
 			*clr & cla
@@ -507,21 +488,21 @@ if $ARGS[0] = 'Puppeteer':
 			PLAY 'sound/happyhome/puppet.mp3', 25
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/class/2.jpg"></center>'
-			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. <font color=#FF00CC>Who could that be? Maybe someone is flooding one of the bathrooms again, but that music though. Where is it coming from? Maybe outside?</font>'
+			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away.'
 
 			act 'Head downstairs':
 				*clr & cla
 				PLAY 'sound/happyhome/puppet.mp3', 50
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/class/3.jpg"></center>'
-				'You reach the bottom of the stairs to hear the laughing getting louder. <font color=#FF00CC>Hmm I must be getting closer to whoever is laughing.</font> The hallway is so dark but you can see a light at the end.'
+				'You reach the bottom of the stairs to hear the laughing getting louder. The hallway is so dark but you can see a light at the end.'
 
 				act 'Continue down the hallway':
 					*clr & cla
 					PLAY 'sound/happyhome/puppet.mp3',75
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
-					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. <font color=#FF00CC>What is this stuff? Did someone have a drink in their locker which spilled?</font> When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
+					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
 
 					act 'Open the locker':
 						*clr & cla
@@ -529,7 +510,7 @@ if $ARGS[0] = 'Puppeteer':
 						gs'stat'
 						'<center><b><h4><font color=#FFA200><<"Puppet">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppet.jpg"></center>'
-						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. <font color=#FF00CC>Who left this doll here? and why is it all wet? What is this stuff?</font> The doll is heavier than it looks and seems to be covered in a thick warm liquid. <font color=#FF00CC>What is this?</font> You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of its wrists and ankles. <font color=#FF00CC>Maybe it''s a puppet?</font> You look into its eyes and notice your own reflection next to something else...'
+						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. The doll is heavier than it looks and seems to be covered in a thick warm liquid. You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of its wrists and ankles. You look into its eyes and notice your own reflection next to something else...'
 
 						act 'Turn around':
 							*clr & cla
@@ -551,7 +532,7 @@ if $ARGS[0] = 'Puppeteer':
 								'Arkadi: "Whoa, what is her problem?"'
 								'Niko: "Maybe <<$pcs_nickname>> is on the pipe or something?"'
 								'Julia: "I hope that she is okay."'
-								'Christina: "I bet she was just looking for attention. i wouldn''t put it past her."'
+								'Christina: "I bet she was just looking for attention. I wouldn''t put it past her."'
 
 								act 'Quickly leave the classroom': gt 'gschool_lessons', 'short_break'
 							end
@@ -563,12 +544,5 @@ if $ARGS[0] = 'Puppeteer':
 	end
 end
 
-if $ARGS[0] = 'Night Out':
-	gt 'NikoDreams','Puppeteer'
-end
-if $ARGS[0] = 'Toilet Time':
-	gt 'NikoDreams','Puppeteer'
-end
-
 --- NikoDreams ---------------------------------
 

+ 87 - 111
locations/NikoEv.qsrc

@@ -4,7 +4,7 @@
 menu_off = 1
 
 if $ARGS[0] = 'Intro':
-	cls
+	*clr & cla
 	NikoIntro = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -12,7 +12,7 @@ if $ARGS[0] = 'Intro':
 	'As you are walking out of school, you bump into one of your schoolmates Niko Volkov, who immediately gives you a warm smile. "Hello there, My name is Niko Volkov, may I ask you your name?"'
 
 	act 'I am <<$pcs_firstname>>':	
-		cls
+		*clr & cla
 		if npc_rel['A189'] < 50:npc_rel['A189'] = 50
 		NikoLuv += 2
 		minut += 5
@@ -25,7 +25,7 @@ if $ARGS[0] = 'Intro':
 	end
 	
 	act 'Beat it!':
-		cls
+		*clr & cla
 		if npc_rel['A189'] > 25:npc_rel['A189'] = 25
 		NikoLuv -= 2
 		minut += 5
@@ -39,7 +39,7 @@ if $ARGS[0] = 'Intro':
 end
 
 if $ARGS[0] = 'Lunch Intro':
-	cls
+	*clr & cla
 	if NikoIntro = 0:NikoIntro = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -47,7 +47,7 @@ if $ARGS[0] = 'Lunch Intro':
 	'You approach Niko, he turns to you with a warm smile on his face. "Hello there, My name is Nikolai Volkov, may I ask you your name?'
 
 	act 'I am <<$pcs_firstname>>':
-		cls
+		*clr & cla
 		if npc_rel['A189'] < 50:npc_rel['A189'] = 50
 		NikoLuv += 2
 		minut += 5
@@ -57,7 +57,7 @@ if $ARGS[0] = 'Lunch Intro':
 		'You return the smile as you reply. "Hello yourself, my name is <<$pcs_firstname>>. Nice to meet you." Niko responds, "Ahh <<$pcs_firstname>> what a beautiful name, very suitable for you. I need to get going, but I am always here at lunchtime, and would be very grateful if you would grace me with your presence." He then gently grabs onto your fingers then raises it to his face before giving your hand a gently kiss. "Now may I get to know you better?"'
 
 		act 'Chat with Niko':
-			cls
+			*clr & cla
 			npc_rel['A189'] += rand(5,10)
 			minut += 10
 			gs'stat'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'Lunch Intro':
 	end
 	
 	act 'Beat it!':
-		cls
+		*clr & cla
 		if npc_rel['A189'] > 25:npc_rel['A189'] = 25
 		NikoLuv -= 2
 		minut += 5
@@ -84,7 +84,7 @@ if $ARGS[0] = 'Lunch Intro':
 end
 
 if $ARGS[0] = 'Lunch Chat':
-	cls
+	*clr & cla
 	numnpc = 189
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoLuv > -4 and NikoPayback = 0:
 		act 'Chat':	
-			cls
+			*clr & cla
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
 			minut += 10
@@ -131,7 +131,7 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoLuv > -4 and NikoVolkovQW = 0 and NikoPayback = 0:
 		act 'Insult':	
-			cls	
+			*clr & cla	
 			npc_rel['A189'] -= 5
 			NikoLuv -= 1
 			minut += 5
@@ -145,7 +145,7 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoPayback = 2 and NikoPayed ! daystart:
 		act 'Money (200 <b>₽</b>)':	
-			cls
+			*clr & cla
 			money -= 200
 			NikoPayed = daystart
 			minut += 5
@@ -158,7 +158,7 @@ if $ARGS[0] = 'Lunch Chat':
 		end
 		
 		act 'Sex':	
-			cls
+			*clr & cla
 			NikoPayed = daystart
 			minut += 5
 			gs'stat'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'Lunch Chat':
 		
 	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
 		act 'Offer Niko sex':	
-			cls
+			*clr & cla
 			NikoPayback_Sex = daystart
 			minut += 5
 			gs'stat'
@@ -185,7 +185,7 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoPayback = 2 and NikoPayed = daystart:
 		act 'Chat':	
-			cls
+			*clr & cla
 			minut += 10
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -198,19 +198,13 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoVolkovQW = 5 and NikoEv = 9:
 		act '<font color=#FF00FF><b>Special Activity</b></font>':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins, as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine, as he says that. <font color=#FF00FF>Why do I feel so nervous? I can''t shake the feeling that something big is going to happen.</font>'
+			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins, as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine, as he says that.'
 			
-			act '<font color=#FF00FF>Go with Niko</font>':
-				if soniaPS = 0:
-					gt 'NikoDates', 'Sonia Block'
-				else
-					gt 'NikoDates', 'Locker Room'
-				end	
-			end	
+			act '<font color=#FF00FF>Go with Niko</font>': gt 'NikoDates', 'Locker Room'
 
 			act 'Maybe later':gt 'NikoEv', 'Lunch Chat'
 		end
@@ -218,7 +212,7 @@ if $ARGS[0] = 'Lunch Chat':
 	
 	if NikoLuv <= -2 and NikoPayback = 0:
 		act 'Walk away':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos4.jpg"></center>'
 			VK = rand(1,3)
@@ -237,7 +231,7 @@ if $ARGS[0] = 'Lunch Chat':
 		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	elseif NikoPayback = 0:
 		act 'Leave':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
@@ -251,7 +245,7 @@ if $ARGS[0] = 'Lunch Chat':
 end
 
 if $ARGS[0] = 'Date Intro':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
@@ -260,7 +254,7 @@ if $ARGS[0] = 'Date Intro':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/jewelry/necklace1.jpg"></center>'
 
 	act 'Accept the gift':	
-		cls
+		*clr & cla
 		if npc_rel['A189'] < 80:npc_rel['A189'] = 80
 		NikoDateIntro = 1
 		NikoNecklace1 = 1
@@ -275,17 +269,22 @@ if $ARGS[0] = 'Date Intro':
 
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end	
-	
-	act 'Decline the gift':	
-		cls
-		NikoLuv = 1
-		minut += 5
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/nodate.jpg"></center>'
-		'"I''m sorry Niko, but I''m not really looking for any kind of relationship right now." Niko gives you a warm smile, as he responds "Don''t worry about it milady, I will just wait for the time where you feel yourself ready, for such a venture." You giggle as you respond, "You''re so weird but thanks for understanding. I''ll see you later." You turn around and walk away.'
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Decline the gift (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			NikoLuv = 1
+			minut += 5
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/nodate.jpg"></center>'
+			'"I''m sorry Niko, but I''m not really looking for any kind of relationship right now." Niko gives you a warm smile, as he responds "Don''t worry about it milady, I will just wait for the time where you feel yourself ready, for such a venture." You giggle as you respond, "You''re so weird but thanks for understanding. I''ll see you later." You turn around and walk away.'
 
-		act 'Go to class':gt 'gschool_lessons', 'short_break'
-	end
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
+		end
+	else
+		act 'Decline the gift (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 if $ARGS[0] = 'Niko Dates':
@@ -309,27 +308,25 @@ if $ARGS[0] = 'Niko Dates':
 end	
 
 if $ARGS[0] =  'Date 1':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'You walk up to Niko, and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope that you are ready to have a good time."'
 
 	act 'I''m ready':	
-		cls
+		*clr & cla
 		NikoEv = 2
 		minut += 5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk1.jpg"></center>'
 		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand, and walks you to the train station where you both board the train and get seated.'	
-		*nl
-		'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
 		
 		act 'Go with Niko':gt 'NikoDates', 'Date 1_1'
 	end
 	
 	act 'Not yet':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -341,28 +338,26 @@ if $ARGS[0] =  'Date 1':
 end
 
 if $ARGS[0] =  'Date 2':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko2.jpg"></center>'
 	'You walk up to Niko, and he lowers his cigarette before saying, "Hello <<$pcs_firstname>> I wanted to tell you that I am sorry, for how I acted yesterday. I just wanted to you leave your shell a bit. You always seem so tense." You reply, "Tense? I guess I could try to lighten up a bit. Maybe." Niko smiles as he responds, "Good enough. So are you ready for a surprise I have you? We could be out all afternoon."'
 
 	act 'I''m ready':	
-		cls
+		*clr & cla
 		NikoEv = 3
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'
-		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk2.jpg"></center>'
+		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'
 		
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
 	
 	act 'Not yet':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -374,28 +369,26 @@ if $ARGS[0] =  'Date 2':
 end
 
 if $ARGS[0] =  'Date 3':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko3.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I have a surprise activity for today, We could be out all afternoon. Are you up for it?"'
 
 	act 'I''m ready':	
-		cls
+		*clr & cla
 		NikoEv = 4
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist, as he leads you toward the lake.'	
-		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk3.jpg"></center>'
+		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist, as he leads you toward the lake.'	
 		
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
 	
 	act 'Not yet':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -407,28 +400,26 @@ if $ARGS[0] =  'Date 3':
 end
 
 if $ARGS[0] =  'Date 4':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
 	'You walk up to Niko, and his eyes light up as he sees you. "Ahhh <<$pcs_firstname>>, I''m so glad to see you. Are you up for a nice relaxing day at the beach?"'
 
 	act 'I''m ready':	
-		cls
+		*clr & cla
 		NikoEv = 5
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen. You happily grab onto his hand then say, "What are we waiting for? Let''s go!" You then lead Niko toward the lake.'	
-		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
-		
+		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen. You happily grab onto his hand then say, "What are we waiting for? Let''s go!" You then lead Niko toward the lake.'	
+
 		act 'Enter train station':gt 'NikoDates', 'Date 3'
 	end
 	
 	act 'Not yet':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -440,14 +431,14 @@ if $ARGS[0] =  'Date 4':
 end
 
 if $ARGS[0] =  'New Life':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'As you approach Niko, he nods then motions you over, "Are you ready to head out?"'
 	
 	act 'Yes':
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -465,7 +456,7 @@ end
 !!!!!!!!!!!
 
 if $ARGS[0] = 'Disco Intro':
-	cls
+	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/upset.jpg"></center>'
@@ -475,7 +466,7 @@ if $ARGS[0] = 'Disco Intro':
 end
 
 if $ARGS[0] = 'Disco Chat':
-	cls
+	*clr & cla
 	if NikoIntro = 0:NikoIntro = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -509,7 +500,7 @@ if $ARGS[0] = 'Disco Chat':
 		
 	if NikoLuv > -4 and  NikoPayback = 0:
 		act 'Drink':	
-			cls
+			*clr & cla
 			NikoAlko = 2
 			gs 'drugs', 'alcohol', 'vodka'
 			NikoLuv += 1
@@ -517,9 +508,7 @@ if $ARGS[0] = 'Disco Chat':
 			minut += 10
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_2.mp4"></video></center>'
-			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle, as he gives you a wink. You both spend the next few minutes drinking, and sharing stories.'
-			*nl
-			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_1.mp4"></video></center>'			
+			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle, as he gives you a wink. You both spend the next few minutes drinking, and sharing stories.'			
 			
 			act 'Get up':gt 'gdkin'
 		end	
@@ -527,7 +516,7 @@ if $ARGS[0] = 'Disco Chat':
 	
 	if NikoLuv > -4 and  NikoPayback = 0:
 		act 'Dance':	
-			cls
+			*clr & cla
 			danc_exp += rand(1,3)
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
@@ -542,7 +531,7 @@ if $ARGS[0] = 'Disco Chat':
 	
 	if NikoLuv > -4 and NikoVolkovQW = 0 and  NikoPayback = 0:
 		act 'Insult':	
-			cls	
+			*clr & cla	
 			npc_rel['A189'] -= 5
 			NikoLuv -= 1
 			minut += 5
@@ -556,7 +545,7 @@ if $ARGS[0] = 'Disco Chat':
 	
 	if NikoPayback = 2 and NikoPayed ! daystart:
 		act 'Money (200 <b>₽</b>)':	
-			cls
+			*clr & cla
 			money -= 200
 			NikoPayed = daystart
 			minut += 5
@@ -569,7 +558,7 @@ if $ARGS[0] = 'Disco Chat':
 		end
 		
 		act 'Sex':	
-			cls
+			*clr & cla
 			NikoPayed = daystart
 			NikoPayback_Sex = daystart
 			NikoDiscoPay = 1
@@ -584,7 +573,7 @@ if $ARGS[0] = 'Disco Chat':
 		
 	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
 		act 'Offer Niko sex':	
-			cls
+			*clr & cla
 			NikoDiscoPay = 1
 			NikoPayback_Sex = daystart
 			minut += 5
@@ -599,7 +588,7 @@ if $ARGS[0] = 'Disco Chat':
 	
 	if NikoPayback = 2 and NikoPayed = daystart:
 		act 'Chat':	
-			cls
+			*clr & cla
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -612,7 +601,7 @@ if $ARGS[0] = 'Disco Chat':
 	
 	if NikoLuv <= -2 and NikoPayback = 0:
 		act 'Walk away':	
-			cls
+			*clr & cla
 			NikoAlko = 0
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/pc/glare.jpg"></center>'
@@ -632,7 +621,7 @@ if $ARGS[0] = 'Disco Chat':
 		act 'Walk away':gt 'gdkin'
 	elseif NikoPayback = 0:
 		act 'Leave':
-			cls
+			*clr & cla
 			NikoAlko = 0
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -652,7 +641,7 @@ end
 !!!!!!!!!!!!!
 
 if $ARGS[0] =  'Lunch Breakup':
-	cls
+	*clr & cla
 	NikoFightDay = daystart
 	NikoPayback = 1
 	NikoBreakup = 2
@@ -666,20 +655,18 @@ if $ARGS[0] =  'Lunch Breakup':
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, You disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'	
 		'Niko then gets noticeably angry, as he responds, "After all the time and money I spent on you? You wiull not leave me. I will get what I deserve!" You reply, "You got that right." You then wind up your leg before ramming it in between his legs, smashing on his balls, causing him to drop to the ground squirming in pain. You spit on Niko before walking away.'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
-	
+
 		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	end	
 end		
 	
 if $ARGS[0] =  'Disco Breakup':
-	cls
+	*clr & cla
 	NikoBreakupDay = daystart
 	NikoPayback = 1
 	NikoBreakup = 2
@@ -693,20 +680,18 @@ if $ARGS[0] =  'Disco Breakup':
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, You disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'		
 		'Niko then gets noticeably angry, as he responds, "After all the time and money that I spent on you? You will not leave me! I will get what I deserve!" You reply, "You got that right." You then wind up your leg before ramming it in between his legs, smashing against his balls, causing him to drop to the ground, squirming in pain. You spit on Niko before walking away.'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
-	
+
 		act 'Step away':gt 'gdkin'
 	end	
 end	
 
 if $ARGS[0] =  'Disco Breakup 2':
-	cls
+	*clr & cla
 	minut += 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -721,7 +706,7 @@ end
 !!!!!!!!!!!!!!!
 
 if $ARGS[0] =  'Fyodor':
-	cls
+	*clr & cla
 	NikoVsFedor = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -729,64 +714,55 @@ if $ARGS[0] =  'Fyodor':
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope you are ready to have a good time." You suddenly feel a hand gently but firmly grab onto your arm.'
 
 	act 'Turn around':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."' 
-		'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with an embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'		
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'		
+		'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with an embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'				
 
 		act 'Turn back toward Niko':gt 'NikoEv', 'Niko Dates'
 	end
 end
 
 if $ARGS[0] =  'Viktor':
-	cls
+	*clr & cla
 	NikoVsVitek = 1
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine." Niko chuckles as he raises his hands, "I was just helping <<$pcs_firstname>> with finding the person spreading mean rumors about her." Vitek responds, "What rumors?" Niko replies, "Someone said that <<$pcs_firstname>> here is dating a fat, brain dead, gopnik. I wonder who that rumor was referring to." Vitek begins seething with anger as he ask, "Who the fuck said that shit?" Niko replies, "It took some digging, but I found out that it was him." Niko points to Lesco Tsarev, causing Vitek to turn to Lesco then shout, "You fucking little bitch! I will tear your arm off!" He then charges at Lesco, who begins running for his life. While they were distracted, Niko takes your hand then leads you out of the school grounds.'
-	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9>.jpg"></center>'
 	
 	act 'Follow Niko''s lead':gt 'NikoEv', 'Niko Dates'
 end
 
 if $ARGS[0] =  'Dimka':
-	cls
+	*clr & cla
 	NikoVsDimka = 1
 	gs'stat'
 	'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
-	'You walk up to Niko and give him a smile then see Dimka approach you then gives Niko a puzzled look. "What are you with <<$pcs_firstname>>. She is my girl." Niko gives Dimka a blank stare as he responds, "Sure she is...Why don''t you just piss off before I get pissed off?" Dimka then says, "Why don''t we ask her who she''s dating?" Niko replies, "Because asking a girl to kiss and tell is rude." Dimka looks shocked as he responds, "You don''t care? But would you care if I told you that <<$pcs_nickname>> here is a cocksucker?" Niko raises an eyebrow. "Well do you have proof of that, or are you just blowing smoke?"'
-	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
+	'You walk up to Niko and give him a smile then see Dimka approach you then gives Niko a puzzled look. "What are you with <<$pcs_firstname>>. She is my girl." Niko gives Dimka a blank stare as he responds, "Sure she is...Why don''t you just piss off before I get pissed off?" Dimka then says, "Why don''t we ask her who she''s dating?" Niko replies, "Because asking a girl to kiss and tell is rude." Dimka looks shocked as he responds, "You don''t care? But would you care if I told you that <<$pcs_nickname>> here is a cocksucker?" Niko raises an eyebrow. "Well do you have proof of that, or are you just blowing smoke?"'	
 
 	act 'See what Dimka does':	
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
-		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: <font color=#FF00FF>Oh shit! How am I going to explain this to Niko. I''m really screwed now.</font> Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'		
+		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, you don''t know how you are going to explain this to Niko. Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'	
 		
 		act 'Continue':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'			
-			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane!...Whatever...Keep her!" Dimka then quickly walks away.'
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/pissoff.mp4"></video></center>'		
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/pissoff.mp4"></video></center>'			
+			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane!...Whatever...Keep her!" Dimka then quickly walks away.'		
 		
 			act 'Thank Niko':
-				cls
+				*clr & cla
 				dimafilm = 0
 				DimaRudeBlock = 1
 				minut += 5

+ 111 - 208
locations/NikoEv2.qsrc

@@ -19,12 +19,11 @@ if $ARGS[0] =  'Park':
 		minut += 10
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/shady.jpg"></center>'
 		'"I figured out a great way to make money fast, just bear with me." You sigh then say, "Alright what do I need to do exactly?" Niko replies, "Just follow me." Niko leads you through the park then behind the cinema. When you both arrive then you see two men looking at you with a lustful gaze while rubbing on their crotches. Niko stops you for a few seconds then says, "Listen <<$pcs_firstname>>, Those guys over there are going to help us by giving us money, but they kind of, need you to do something first." You look back at Niko with a frown, "Do I have to have sex with them?" Niko wraps his arm around your neck, "You only need to suck them off. That''s all."'
 		*nl
 		'You lower your head, as you reply, "I don''t want to please anyone but you Niko." Niko rubs your cheek, as he replies, "You will be pleasing me by doing this. The money you earn will go toward restoring your reputation. After you''re done then you and I could head back to my place, for some "quality time," Doesn''t that sound good?"'
-		*nl
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/shady.jpg"></center>'
+
 
 		act 'Okay':
 			cls
@@ -34,9 +33,7 @@ if $ARGS[0] =  'Park':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile3.jpg"></center>'
 			'You give Niko a forced smile as you reply, "Okay, I''ll do it for you." Niko gives you a warm smile as he responds, "That''s my girl, so beautiful, loving, daring, and smart." You both continue walking toward the two men. As you both arrive, one of the men says, "She looks good." He then reaches out to touch you, but his hand is pushed away by Niko. "You need to pay up before you start touching." The guy chuckles, "Of course, of course. Where is my head?" He then nods to the other man, who reaches into his pocket then gives Niko some ruble which Niko counts before nodding to the men then taking a step back, signaling the men to use you.'
 			*nl
-			'The men begin fondling your breasts, as they kiss your neck. <font color=#FF00FF>This feels so wrong, but Niko needs me to do this. He is counting on me. I must not let him down. I won''t let you down Niko.</font> One of the men takes off your shirt then throws it to the ground. Niko immediately picks it up. One of the men begins pushing you to your knees.'
-			*nl
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/shady.jpg"></center>'
+			'The men begin fondling your breasts, as they kiss your neck. One of the men takes off your shirt then throws it to the ground. Niko immediately picks it up. One of the men begins pushing you to your knees.'
 
 			act 'Drop to your knees':
 				cls
@@ -46,8 +43,6 @@ if $ARGS[0] =  'Park':
 				'You drop down to your knees in front of them then one of the men shoves his penis into your mouth, as the other pulls out then begins stroking his. You close your eyes, and pretend that you are sucking Niko''s dick. Enjoying the warmth of it on your tongue, the occasional throbs as it leaks pre-cum into your mouth. The other man begins pulling at your hair which tells you that he wants his dick sucked too, You obediently switch dicks, and begin sucking the second man vigorously. After a few seconds, one of the men begins groaning, as he fills your mouth with his cum which you quickly spit out, not knowing if this guy has any STD''s or not.'
 				*nl
 				'The second man soon groans too then begins covering your hair in his cum. Once both men are done, they look down to you then say, "Wow you are really good, girl." Niko approaches you then says, "Great job Princess, I am very proud of you." One of the guys asks, "Can we have her again sometime?" Niko grins as he replies, "Sure you can, just call me when you have the money ready, and I''ll do the rest." The two guys high five, as they walk away.'
-				*nl
-				'<center><img <<$set_imgh>> src="images/pc/body/cum/cumhair/cumhair1.jpg"></center>'
 				gs 'cum_call', 'mouth'
 				gs 'cum_call', 'hair'
 				gs 'arousal', 'bj', 5
@@ -62,7 +57,7 @@ if $ARGS[0] =  'Park':
 					gs 'fame'
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/walk1.jpg"></center>'
-					'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. <font color=#FF00FF>My reward? He is going to reward me? What could it be? I really want to know.</font> You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles, as he begins walking you toward his house.'
+					'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles, as he begins walking you toward his house.'
 
 					act 'Follow Niko':gt 'NikoEv2', 'Home Date'
 				end
@@ -88,9 +83,7 @@ if $ARGS[0] =  'Reward':
 	gs 'fame'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/niko/bedroom.jpg"></center>'
-	'As soon as you enter the bedroom, you look around, but don''t see Niko. <font color=#FF00FF>Where did Niko go...</font> Niko grabs you from behind then begins passionately kissing, and licking your neck. You tilt your head back, and give in to Niko''s passionate embrace. Niko begins walking you toward the bed while removing your top. You help Niko undress you, as you both inch closer to the bed. After you are fully undressed then Niko lifts you up then drops you onto the bed. Niko immediately pounces on top of you then begins passionately kissing you, as he rubs his penis against your vagina.'
-	*nl
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
+	'As soon as you enter the bedroom, you look around, but don''t see Niko. Niko grabs you from behind then begins passionately kissing, and licking your neck. You tilt your head back, and give in to Niko''s passionate embrace. Niko begins walking you toward the bed while removing your top. You help Niko undress you, as you both inch closer to the bed. After you are fully undressed then Niko lifts you up then drops you onto the bed. Niko immediately pounces on top of you then begins passionately kissing you, as he rubs his penis against your vagina.'
 	gs 'arousal', 'kiss', 5
 	gs'stat'
 
@@ -101,8 +94,6 @@ if $ARGS[0] =  'Reward':
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/vag.mp4"></video></center>'
 		'You spread your legs and Niko immediately rams his penis inside of you, causing a jolt of pleasure. You scream out as Niko begins pumping you firmly for a few seconds before wrapping his hand around your neck lightly, "Who''s your man?" You reply, "You are my man, Nikolai." He grins then asks, "Who do you belong too?" You reply, "Only you, Nikolai." He then replies, "Fuck yeah! Who''s my bitch?" You reply, "I''m your bitch Niko and I will always be your bitch!" Niko starts pumping you even faster, as he gets more excited. You tilt your head back, enjoying Niko''s hard cock; ramming inside you, His strong arms wrapped around you, His dominance as he rams his dick roughly into your vagina.'
-		*nl
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/vag2.mp4"></video></center>'
 		gs 'arousal', 'vaginal', 5
 		gs'stat'
 
@@ -111,11 +102,9 @@ if $ARGS[0] =  'Reward':
 			minut += 5
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat.mp4"></video></center>'
-			'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth, as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. <font color=#FF00FF>I''m chocking. Should I pull away? No! Niko is so happy right now. I must let him finish. I just want you to be happy Niko.</font> You endure the chocking, as your eyes tear up.'
+			'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth, as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. You endure the chocking, as your eyes tear up.'
 			*nl
 			'You do your best to hold back from gagging, not wanting to interrupt Niko''s orgasm. After Niko is finished, he catches his breath then says, "<<$pcs_nickname>> you are simply divine." You take a few seconds to catch you breath before leaning forward to kiss Niko.'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
 			gs 'cum_call', 'mouth', $boy
 			gs 'arousal', 'vaginal', 5
 			gs 'arousal', 'end'
@@ -127,8 +116,6 @@ if $ARGS[0] =  'Reward':
 				'<center><b><h4><font color="red"><<"Yurik Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/avatars/threaten1.jpg"></center>'
 				'You lean forward to kiss Niko then the door suddenly slams open, as Yurik storms into the room. He grabs you by your hair then pulls you toward the door. Niko jumps out of the bed then shouts, "Yurik what the fuck? I told you that I would repay you as soon as..." Yurik cuts him off, "Shut it boy! I know better than to trust you. I''m taking my prize now, but don''t worry, I will return her when I''m done." Yurik continues pulling you through the hallway, as Niko follows closely behind while constantly trying to get Yurik to back down. "Come on Yurik...Just calm down man." Yurik replies, "I am calm." You then reach a bedroom with a partially open door. Yurik tosses you inside then pushes Niko back before closing the door in his face.'
-				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
 
 				act 'Continue':
 					cls
@@ -136,8 +123,7 @@ if $ARGS[0] =  'Reward':
 					gs'stat'
 					'<center><b><h4><font color="red"><<"Yurik Volkov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/intrude/yurik1.jpg"></center>'
-					'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. <font color=#FF00FF>What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?</font> Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?" You meekly nod, and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. <font color=#FF00FF>Ohh wow. his dick is so big. There is no way that will fit inside me.</font> Yurik approaches your face, as you lay still, in complete shock.'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/deek/deek.jpg"></center>'
+					'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. <font color=#FF00FF>What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?</font> Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?" You meekly nod, and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. Yurik approaches your face, as you lay still, in complete shock.'
 
 					act 'See what Yurik does':
 						cls
@@ -146,7 +132,6 @@ if $ARGS[0] =  'Reward':
 						'Yurik rams his dick into your mouth, forcing it down your throat. The force of his massive penis entering your throat is too much for you to take. You gag helplessly then begin pleading with Yurik. "Please sir, your dick is too big. It won''t fit." Yurik grunts before responding, "It will fit just, keep your mouth open, and shut up." Yurik re-aligns his penis with your mouth then shoves it back in. You do your best to relax your throat, knowing that you have no choice, but to let Yurik have his way with you.'
 						*nl
 						'You can feel Yurik''s hand rubbing on your sensitive parts. You close your eyes, trying to think of anything but the pain you feel, as Yurik roughly fucks your throat. You then open your eyes, and try looking around the room, but your vision is all blurry from the tears streaming from your eyes, so you close them again, waiting for this torment to be over.'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/throat/bed2.mp4"></video></center>'
 						gs 'arousal', 'bj', 5
 						gs'stat'
 
@@ -167,9 +152,7 @@ if $ARGS[0] =  'Reward':
 								gs'stat'
 								'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-								'You begin coughing erratically, as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are ok." Niko begins rubbing on your back gently. You continue coughing for almost a full minute, as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug, and begin crying in his arms, <font color=#FF00FF>He was so rough with me. I couldn''t stop him. He might do that again to me. Please no. Never again. Please.</font> Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
-								*nl
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/bathroom.jpg"></center>'
+								'You begin coughing erratically, as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are ok." Niko begins rubbing on your back gently. You continue coughing for almost a full minute, as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug, and begin crying in his arms, Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
 
 								act 'Enter Niko''s room':
 									cls
@@ -178,8 +161,6 @@ if $ARGS[0] =  'Reward':
 									'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer3.jpg"></center>'
 									'As you enter the room, Niko lays you down then climbs in next to you. Niko begins running his fingers through your hair while staring into your eyes. You feel incredibly lightheaded, as your nerves have really drained you of any focused thought. You begin closing your eyes then feel your energy slowly fade away...'
-									*nl
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/home/bedroom/laying.jpg"></center>'
 
 									act 'Sleep':gt 'NikoDreams', 'Friends'
 								end
@@ -201,11 +182,9 @@ if $ARGS[0] =  'Niko Wake':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-	'You open your eyes, and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, <font color=#FF00FF>It was a dream. It was only a dream. Oh my. I can''t keep doing this. Why does this keep happening to me? Why me?</font> Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."'
+	'You open your eyes, and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."'
 	*nl
 	'Niko continues kissing your forehead before responding, "I will do everything in my power to protect you. Just stay strong. Okay <<$pcs_firstname>>?" You nod your head again before saying, "Thank you Niko. I always feel safe in your arms." Niko smiles as he wraps his arms around you.'
-	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
 
 	act 'Relax':
 		cls
@@ -213,8 +192,6 @@ if $ARGS[0] =  'Niko Wake':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/home/bedroom/relaxing1.jpg"></center>'
 		'After relaxing for a few minutes, You get up then stretch your body before saying, "I should head home. It is getting late." Niko places his hand on your shoulder. "Will you be alright on your own?" You reply, "Of course. I''ll see you tomorrow." You lean forward and kiss Niko on the cheek before getting up, getting dressed then leaving Niko''s house.'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
 
 		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pavResidential'
 	end
@@ -242,31 +219,26 @@ if $ARGS[0] =  'Lunch Chat':
 			gs 'boyStat', 'A155'
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
-			'As soon, as you enter the locker room, you see Lavrenti Romanov waiting, for you. Niko says, "Here she is." Lavrenti responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" Lavrenti replies, "I heard that you are Niko''s whore, and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
+			'As soon, as you enter the locker room, you see some gopnik waiting, for you. Niko says, "Here she is." He responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" He replies, "I heard that you are Niko''s whore, and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.'
 			*nl
-			'You reply, "I am Niko''s whore." Lavrenti smiles, as he responds, "Good, well should we get started?" In your heart, you know what he wants, but you ask Niko anyway, "What do I need to do?" Niko replies, "Just suck his dick. It should be easy, for you." You know that you''ve come too far to go back now, so you approach Lavrenti then drop to your knees in front of him, as he unbuttons his pants."'
+			'You reply, "I am Niko''s whore." He smiles, as he responds, "Good, well should we get started?" In your heart, you know what he wants, but you ask Niko anyway, "What do I need to do?" Niko replies, "Just suck his dick. It should be easy, for you." You know that you''ve come too far to go back now, so you approach him then drop to your knees in front of him, as he unbuttons his pants."'
 
-			act 'Suck Lavrenti''s dick':
+			act 'Suck his dick':
 				cls
 				gs'stat'
 				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob1.mp4"></video></center>'
-				'You wrap your lips around Lavrenti''s dick then begin licking, and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness, and warmth of his Lavrenti''s dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the occasional moan he lets out. <font color=#FF00FF>I must continue pleasing him. He need me to please him. He needs me.</font> You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by Lavrenti''s squirming that he is close to cumming.'
-				*nl
-				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob3.mp4"></video></center>'
+				'You wrap your lips around his dick then begin licking, and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness, and warmth of his his dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the occasional moan he lets out.  You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by he''s squirming that he is close to cumming.'
 				gs 'arousal', 'bj', 5
 				gs'stat'
 
-				act 'Make Lavrenti cum':
+				act 'Make him cum':
 					cls
 					gs'stat'
 					'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
-					'<font color=#FF00FF>Now is my chance. The moment he and I have been waiting for. The time that he cums, for me. Cum for me, Lavrenti. Cum for me.</font> You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let Lavrenti''s cum fills your mouth, as you push it around with your tongue, enjoying the warmth, and texture of his cum, as it slides down your chin. Lavrenti catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. I have to have you again sometime."'
+					'You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let his cum fill your mouth, as you push it around with your tongue, enjoying the warmth, and texture of his cum, as it slides down your chin. He catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. I have to have you again sometime."'
 					*nl
-					'Niko responds, "If you have the cash then I have the girl for you. Speaking of cash..." Niko extends his hand. Lavrenti nods then says, "<<$pcs_nickname>> was worth every ruble." He then hands Niko some money then buttons his pant, and rubs your cheek before leaving the locker room.'
-					'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
+					'Niko responds, "If you have the cash then I have the girl for you. Speaking of cash..." Niko extends his hand. He nods then says, "<<$pcs_nickname>> was worth every ruble." He then hands Niko some money then buttons his pant, and rubs your cheek before leaving the locker room.'
 					gs 'cum_call', 'mouth', $boy
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -279,20 +251,16 @@ if $ARGS[0] =  'Lunch Chat':
 						gs 'boyStat', 'A189'
 						gs'stat'
 						'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-						'You look up to Niko, who counts the money before saying, "You were outstanding <<$pcs_firstname>>. We will have the money we need in no time." Niko then kisses you on your forehead before saying, "Do you think that you can give me a quickie before we head back?" You eagerly nod, as you say, "Of course Niko, I''m always happy to please you." You quickly begin unbuttoning his pants then wrap your lips around his dick, licking, and sucking, as best you can, only wishing to please Niko.'
-						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj4.mp4"></video></center>'
+						'You look up to Niko, who counts the money before saying, "You were outstanding <<$pcs_firstname>>. We will have the money we need in no time." Niko then kisses you on your forehead before saying, "Do you think that you can give me a quickie before we head back?" You eagerly nod, as you say, "Of course Niko, I''m always happy to please you." You quickly begin unbuttoning his pants then wrap your lips around his dick, licking, and sucking, as best you can, only wishing to please Niko.'
 						gs 'arousal', 'bj', 5
 						gs'stat'
 
 						act 'Suck Niko''s dick':
 							cls
 							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj5.mp4"></video></center>'
-							'You can feel your heart all aflutter, as you continue sucking Niko''s dick. <font color=#FF00FF>Nikolai you are the only one I want to please. The only one love. Please realize that everything I do, I do for you. Please let me be the only one to please you. I will never fail you.</font> You can feel tears running down your cheeks, as you lose yourself in the moment. Niko suddenly begins groaning, as he fills your mouth with his warm seed which you try your best to swallow every drop of, wanting any part of Niko to stay inside you.'
-							*nl
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'
+							'You can feel your heart all aflutter, as you continue sucking Niko''s dick. Niko suddenly begins groaning, as he fills your mouth with his warm seed which you try your best to swallow every drop of, wanting any part of Niko to stay inside you.'
 							gs 'cum_call', 'mouth', $boy
 							gs 'arousal', 'bj', 5
 							gs 'arousal', 'end'
@@ -315,49 +283,22 @@ if $ARGS[0] =  'Lunch Chat':
 			end
 		end
 	end
-
-	act 'I can''t right now':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
-		'"I''m sorry to hear that. I will try to continue finding ways, for us to earn money. I might have something, for you tomorrow." You nod then say, "Thank you for all your help. I will talk to you tomorrow." You then give Niko a kiss on the cheek then walk away.'
-
-		act 'Go to the cafeteria':gt 'gschool_lunch', 'lunch'
-	end
-end
-
-if $ARGS[0] =  'Sonia Talk':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	'As you are leaving the cafeteria, you suddenly hear someone say, "I saw what you did in the locker room."'
-
-	act 'Turn around':
-		cls
-		gs'stat'
-		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-		'You turn around to see Sonia Ivanko with a very pleased smile on her face. Sonia says, "I saw how much you were enjoying yourself back there." You lower your head, feeling ashamed. Sonia giggles as she says, "No need to be embarrassed. You are just getting closer to accepting your role. It took me 2 weeks to accept what I am." You tilt your head sideways, as you ask, "My role?" Sonia answers, "You are Niko''s whore of course, and don''t worry, that isn''t a bad thing, despite what some people may have you believe. When you accept your role then you will finally find peace of mind, and begin enjoying your new life." You take a few seconds to ponder what Sonia said.'
-
-		act 'Ponder':
-			cls
-			NikoEv = 15
+	gs 'willpower', 'prostitution', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'I can''t right now (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-			*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-			'<font color=#FF00FF>So I am Niko''s whore, but what does that mean for me? Maybe it is my job to keep Niko happy. I want that. I can use my body to please him, and get satisfaction in the process. I don''t need to care what others think of me. I only need to care about what Niko thinks. I understand now. Ohh Niko, I am your whore, and I always will be...I feel so liberated. I don''t need to care about what anyone other than Niko thinks of me. I only need to follow his lead.</font>'
-			*nl
-			'Sonia''s smile grows even wider, "Judging by that peaceful smile, I assume that you have accepted your role. I am so proud of you. Please your man, and he will please you." Sonia gives you a kiss on the cheek then walks away, leaving you to think further.'
-			'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
+			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
+			'"I''m sorry to hear that. I will try to continue finding ways, for us to earn money. I might have something, for you tomorrow." You nod then say, "Thank you for all your help. I will talk to you tomorrow." You then give Niko a kiss on the cheek then walk away.'
 
-			act 'Continue toward the hallway':gt 'gschool_lunch', 'break'
+			act 'Go to the cafeteria':gt 'gschool_lunch', 'lunch'
 		end
-	end
+	else
+		act 'I can''t right now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 if $ARGS[0] =  'Lunch Chat 2':
@@ -374,40 +315,35 @@ if $ARGS[0] =  'Lunch Chat 2':
 		cls
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
-		'Niko leans forward, and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. <font color=#FF00FF>His lips are so soft, and his kiss, so passionate. He really does love me. Oh Niko, keep kissing me. Please.</font> You surrender yourself to Niko''s firm passionate kiss, for what feels like a full minute. Niko then slowly pulls away then gently grabs your hand then leads you toward the locker room.'
-		*nl
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
+		'Niko leans forward, and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. You surrender yourself to Niko''s firm passionate kiss, for what feels like a full minute. Niko then slowly pulls away then gently grabs your hand then leads you toward the locker room.'
 
 		act 'Enter locker room':
 			cls
 			gs 'boyStat', 'A155'
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
-			'As you enter the locker room you see Lavrenti waiting for you. You immediately know what he wants, and you turn to Niko then ask, "Do you want me to suck his dick again?" But you say it with a smile. Niko looks at you with a surprised, but pleased look on his face, "You really seem to be getting into this, good, but no he want to fuck you this time. Don''t worry, he will pay a lot more this time. so take off your clothes." You obediently nod then remove your clothes. Lavrenti watches you undress while removing his pants then stroking his penis.'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
+			'As you enter the locker room you see the gopnik again waiting for you. You immediately know what he wants, and you turn to Niko then ask, "Do you want me to suck his dick again?" But you say it with a smile. Niko looks at you with a surprised, but pleased look on his face, "You really seem to be getting into this, good, but no he want to fuck you this time. Don''t worry, he will pay a lot more this time. so take off your clothes." You obediently nod then remove your clothes. He watches you undress while removing his pants then stroking his penis.'
 			*nl
-			'After fully undressing, you walk up to Lavrenti then ask him, "How do you want me?" He points to the wall then says, "Face against the wall." You do as he says then feel his penis rubbing against your vagina, and you quickly brace yourself against the wall, as his penis rams inside of your vagina.'
+			'After fully undressing, you walk up to him then ask him, "How do you want me?" He points to the wall then says, "Face against the wall." You do as he says then feel his penis rubbing against your vagina, and you quickly brace yourself against the wall, as his penis rams inside of your vagina.'
 
-			act 'Let Lavrenti fuck you':
+			act 'Let him fuck you':
 				cls
 				gs 'clothing', 'strip'
 				gs'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/3doggy.mp4"></video></center>'
-				'You feel a jolt of pleasure, causing you to moan loudly, as Lavrenti continues fucking you. Lavrenti occasionally reach around, and squeezes your breast firmly, before giving your nipples an occasional pinch. After a few minutes of fucking, Lavrenti begin moaning loudly as his breath stops. <font color=#FF00FF>Oh shit! Is he about to cum inside me? What do I do? I''ll get pregnant.</font>'
+				'You feel a jolt of pleasure, causing you to moan loudly, as he continues fucking you. he occasionally reach around, and squeezes your breast firmly, before giving your nipples an occasional pinch. After a few minutes of fucking, he begin moaning loudly as his breath stops.'
 				gs 'arousal', 'vaginal', 5
 				gs'stat'
 
-				act 'Please don''t':
+				act 'He''s about to cum':
 					cls
 					gs'stat'
 					'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/4.jpg"></center>'
-					'Niko suddenly lunges forward then pulls Lavrenti off of you, as Lavrenti begins shooting his load all over your ass. Lavrenti spends a few seconds stroking his penis, trying to milk himself before Niko shouts, "What the fuck were you doing? Getting <<$pcs_firstname>> pregnant, wasn''t part of the deal!" Lavrenti quickly catches his breath before replying, "I''m sorry man. I got so lost in the moment. <<$pcs_firstname>> is fucking hot." Niko sneers at him. "I know she''s hot, but you told me earlier that you knew what you were doing, and this shit is unacceptable!"'
+					'Niko suddenly lunges forward then pulls him off of you, as he begins shooting his load all over your ass. He spends a few seconds stroking his penis, trying to milk himself before Niko shouts, "What the fuck were you doing? Getting <<$pcs_firstname>> pregnant, wasn''t part of the deal!" He quickly catches his breath before replying, "I''m sorry man. I got so lost in the moment. <<$pcs_firstname>> is fucking hot." Niko sneers at him. "I know she''s hot, but you told me earlier that you knew what you were doing, and this shit is unacceptable!"'
 					*nl
-					'Lavrenti backs off. "Whoa take it easy, I''ll pay double the amount we agreed on, okay?" Niko calms himself as he replies, "Alright fine, let''s just not do this again, alright?" Niko wraps his arm around Lavrenti''s neck then they both begin laughing it off. Lavrenti gives Niko the money he owes him then puts his pants back on before leaving the restroom.'
-					'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
+					'He backs off. "Whoa take it easy, I''ll pay double the amount we agreed on, okay?" Niko calms himself as he replies, "Alright fine, let''s just not do this again, alright?" Niko wraps his arm around his neck then they both begin laughing it off. He gives Niko the money he owes him then puts his pants back on before leaving the restroom.'
 					gs 'cum_call', 'butt', $boy
 					gs 'arousal', 'vaginal', 5
 					gs'stat'
@@ -419,13 +355,10 @@ if $ARGS[0] =  'Lunch Chat 2':
 						gs 'boyStat', 'A189'
 						minut -= 10
 						gs'stat'
-						'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scene6.jpg"></center>'
 						'After Lavrenti leaves, Niko walks up to you then gives you a passionate kiss before saying, "You did great today. We made some good money today." You reply, "Thank you for protecting me back there Niko. I always feel so safe with you." Niko begins rubbing his hands over your body as he replies, "I will always keep my girl safe. No one will hurt you while I''m around. How about we have a little fun?" You let out a moan as Niko begins rubbing your clitoris. You look Niko in the eyes then say, "I''m always ready to please you."'
 						*nl
 						'Niko quickly pulls down his pants then pushes you against the wall where he rams his penis inside of your vagina, evoking a loud moan from you. Niko begins ramming his penis inside of your pussy, causing a gradual build of please to fill your body.'
-						*nl
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scene6.jpg"></center>'
 						gs 'arousal', 'foreplay', 5
 						gs 'arousal', 'kiss', 5
 						gs 'arousal', 'vaginal', 5
@@ -444,9 +377,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 								NikoEv = 16
 								gs'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/anal.mp4"></video></center>'
-								'Feeling so turned on, and blinded by the pleasure you scream out, "Cum inside me Niko! Please cum inside me!" Niko thrust one more time before shaking his head, and saying, "No!" Niko then pulls out of you and begins cumming on your ass, adding to Lavrenti''s cum on your ass. Niko catches his breath before saying, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile, as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money, and I would like you to meet me <font color=#FF00FF>after school</font> where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
-								*nl
-								'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></video></center>'
+								'Feeling so turned on, and blinded by the pleasure you scream out, "Cum inside me Niko! Please cum inside me!" Niko thrust one more time before shaking his head, and saying, "No!" Niko then pulls out of you and begins cumming on your ass, adding to Lavrenti''s cum on your ass. Niko catches his breath before saying, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile, as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money, and I would like you to meet me after school where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
 								gs 'cum_call', 'butt', $boy
 								gs 'arousal', 'vaginal', 5
 								gs 'arousal', 'end'
@@ -460,33 +391,22 @@ if $ARGS[0] =  'Lunch Chat 2':
 			end
 		end
 	end
+	gs 'willpower', 'prostitution', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'I can''t right now (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
+			gs'stat'
+			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
+			'"I''m sorry to hear that. I will try to continue finding ways, for us to earn money. I might have something, for you tomorrow." You nod then say, "Thank you for all your help. I will talk to you tomorrow." You then give Niko a kiss on the cheek then walk away.'
 
-	act 'I can''t right now':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
-		'"I''m sorry to hear that. I will try to continue finding ways, for us to earn money. I might have something, for you tomorrow." You nod then say, "Thank you for all your help. I will talk to you tomorrow." You then give Niko a kiss on the cheek then walk away.'
-
-		act 'Enter the cafeteria':gt 'gschool_lunch', 'lunch'
-	end
-end
-
-if $ARGS[0] =  'Julia Talk':
-	cls
-	NikoEv = 17
-	minut += 5
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/sad1.jpg"></center>'
-	'As you are leaving the cafeteria, you bump into Julia Milov, she quickly says, "Oh <<$pcs_firstname>>. How are you doing? I''ve been really worried about you. I asked my mother about how to stop repeated nightmares, and she gave me 2 dissolvable tablets to give you. They are designed to help ease..." You place your hand on Julia''s shoulder then say, "You don''t need to worry about me. I don''t get the nightmares anymore. I found the source of my nightmares, and faced it head on." Julia''s eyes light up,'
-	*nl
-	'"Really? That''s great! I was really worried that it would only get worst. Please let me know, if they come back." You rub her arm gently, as you reply, "I will. Thank you Julia. You are very sweet." Julia blushes, as she says, "I''m...just happy to help." She then waves, as she walk away while looking back at you.'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/smile1.jpg"></center>'
-
-	act 'Continue toward the hallway':gt 'gschool_lunch', 'break'
+			act 'Go to the cafeteria':gt 'gschool_lunch', 'lunch'
+		end
+	else
+		act 'I can''t right now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 if $ARGS[0] =  'Events':
@@ -522,8 +442,6 @@ if $ARGS[0] =  'Diner 1':
 		'Niko approaches one of the bikers sitting in the corner, and says to the biker, "Riding a bike all day must be tough work, I bet you could use some relief, right about now." The biker stares at Niko with a very angry look on his face. "You''re cruising for a bruising kid." Niko looks puzzled. "So you aren''t interested?"'
 		*nl
 		'the biker responds, "Of course I''m not interested because I''m not a fucking faggot!" Niko pauses for a second then bursts into laughter. "Oh  no. i didn''t mean....I meant my girl here, will take care of you...for a price of course." The biker chuckles for a few seconds before responding. "I see now. I thought you were hitting on me, kid. You''re lucky you weren''t, but let me take a look at her."'
-		*nl
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
 
 		act 'Let the biker examine you':
 			cls
@@ -539,11 +457,9 @@ if $ARGS[0] =  'Diner 1':
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bj1.jpg"></center>'
-				'You walk in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking, and sucking his dick, doing your best to please him. The man begins moaning loudly. <font color=#FF00FF>This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.</font> You increase the pace while seeing him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming, as he sprays his load into your mouth, you look up at the biker, and see an adoring look on his face, as he looks down at you.'
+				'You walk in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking, and sucking his dick, doing your best to please him. The man begins moaning loudly. <font color=#FF00FF>This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.</font> You increase the pace while seeing him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming, as he sprays his load into your mouth and on your face, you look up at the biker, and see an adoring look on his face, as he looks down at you.'
 				*nl
-				'You give him a friendly smile, as the cum leaks from your mouth. The biker says, "You are an amazing girl. You were definitely worth every ruble." You give the tip of the mans penis a kiss before he buttons his pants then gives you a wink before leaving the restroom. You wait for him to leave before spitting out the cum into the sink then shortly follow him out of the restroom.'
-				*nl
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bjcum1.jpg"></center>'
+				'You give him a friendly smile, as the cum leaks from your mouth. The biker says, "You are an amazing girl. You were definitely worth every ruble." You give the tip of the mans penis a kiss before he buttons his pants then gives you a wink before leaving the restroom.'
 				gs 'cum_call', 'face'
 				gs 'arousal', 'bj', 5
 				gs 'arousal', 'end'
@@ -554,9 +470,7 @@ if $ARGS[0] =  'Diner 1':
 					minut += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/npc/1.jpg"></center>'
-					'You see the biker shake hands with Niko then give him the money. Niko counts the money then gives the biker an approving nod before the biker takes his seat again. Niko turns to you, and says, "Good job <<$pcs_nickname>>. We are making some good progre..." A nearby trucker begins examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum plastering her face!" You freeze in place. <font color=#FF00FF>Oh shit! I forgot to wash up. How did I forget that? I''m walking around with cum leaking off my chin. How could I forget?</font> the truckers, and bikers in the room surround you then begin talking to each other.'
-					*nl
-					'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
+					'You see the biker shake hands with Niko then give him the money. Niko counts the money then gives the biker an approving nod before the biker takes his seat again. Niko turns to you, and says, "Good job <<$pcs_nickname>>. We are making some good progre..." A nearby trucker begins examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum plastering her face!" You freeze in place. The truckers, and bikers in the room surround you then begin talking to each other.'
 
 					act 'Listen to them':
 						cls
@@ -568,7 +482,7 @@ if $ARGS[0] =  'Diner 1':
 						'Trucker1: A slut huh? I wouldn''t mind trying out her services.'
 						'Biker3: I wonder how much she''s chargin''?'
 						*nl
-						'Niko chuckles, as he replies, "She is my girl, and it will be 2000 <b>₽</b>, per customer." All of the truckers, and bikers begin lining up in front of Niko giving him money, before approaching you. <font color=#FF00FF>Am I about to have sex with all these men? How can I satisfy that many men? I don''t know if I can even handle that.</font> The men begin undressing you, as they roughly finger your holes. You close your eyes, as one of the men pushes you down on your knees, as another shoves his dick into your mouth.'
+						'Niko chuckles, as he replies, "She is my girl, and it will be 2000 <b>₽</b>, per customer." All of the truckers, and bikers begin lining up in front of Niko giving him money, before approaching you. The men begin undressing you, as they roughly finger your holes. You close your eyes, as one of the men pushes you down on your knees, as another shoves his dick into your mouth.'
 
 						act 'Suck their dicks':
 							cls
@@ -581,8 +495,6 @@ if $ARGS[0] =  'Diner 1':
 							'Trucker1: This girl is smokin'' hot. I hope she comes around here more often.'
 							'Waiter: Oh she can cum around here as much, as she wants.'
 							'The guys begin laughing as the man who''s dick you are sucking groans, giving you barely enough time to pull his penis out of your mouth where it covers your face with his warm cum. You feel the man''s cum dripping down your face, as another biker approaches you then takes a close look at you before saying, "I''m not sticking my dick in her cum covered mouth." He then lifts you up, and places you down on a nearby stool.'
-							*nl
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/2.jpg"></center>'
 							gs 'cum_call', 'face'
 							gs 'arousal', 'bj', 5
 							gs 'arousal', 'bj', 5
@@ -602,12 +514,8 @@ if $ARGS[0] =  'Diner 1':
 								*nl
 								if sexcontra >= 3 or protect >= 2:
 									'You close your eyes, and only focus on the pleasure building up inside you. The man fucking you, suddenly groans, and you can feel his warm seed filling the condom inside you. The man continues thrusting, trying to milk himself dry inside of you. Another trucker approaches you then says "Looks like that hole is all used up. I guess I will have to take this one." The man rubs his dick against your anus.'
-									*nl
-									'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 								else
 									'You close your eyes, and only focus on the pleasure building up inside you. The man fucking you, suddenly groans, and you can feel his warm seed filling your pussy. The man continues thrusting inside you, trying to milk himself dry inside of you. Another trucker approaches you then says "Looks like that hole is all used up. I guess I will have to take this one." The man rubs his dick against your anus.'
-									*nl
-									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum5.mp4"></video></center>'
 								end
 								gs 'cum_call'
 								gs 'arousal', 'vaginal', 5
@@ -619,9 +527,7 @@ if $ARGS[0] =  'Diner 1':
 									minut -= 5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/4.jpg"></center>'
-									'The man suddenly shoves his dick into your ass, causing a surge of pain to fill your ass. You scream out in pain, as Niko shouts, "Hey take it easy! She is not a fucking blow up doll!" The man nods then gives your ass a few seconds to adjust to his dick before casually fucking it. <font color=#FF00FF>That man was so rough, but Niko...My Niko protected me like he said he would.</font> As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking, and sucking it eagerly. The pain in your ass fades, as pleasure takes its place. You close your eyes, and submit to the pleasure when another man approaches you.'
-									*nl
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/5.jpg"></center>'
+									'The man suddenly shoves his dick into your ass, causing a surge of pain to fill your ass. You scream out in pain, as Niko shouts, "Hey take it easy! She is not a fucking blow up doll!" The man nods then gives your ass a few seconds to adjust to his dick before casually fucking it. As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking, and sucking it eagerly. The pain in your ass fades, as pleasure takes its place. You close your eyes, and submit to the pleasure when another man approaches you.'
 									gs 'arousal', 'bj', 5
 									gs 'arousal', 'anal', 5
 									gs'stat'
@@ -636,8 +542,6 @@ if $ARGS[0] =  'Diner 1':
 										else
 											'The man shoves his dick into your vagina at the same time that the man fucking your ass cums, filling your ass with his warm seed. Shortly after the man leaves, another takes his place, fucking your ass, so now you have both of your holes being fucked simultaneously. You moan loudly, fully submitting to the pleasure of the men''s big hard dicks, fucking both of your holes. As you are moaning another man shoves his dick in your mouth, almost gagging you.'
 										end
-										*nl
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/7.jpg"></center>'
 										gs 'cum_call', 'anus'
 										gs 'arousal', 'bj', 5
 										gs 'arousal', 'anal', 5
@@ -663,8 +567,6 @@ if $ARGS[0] =  'Diner 1':
 												*nl
 												'You look around to see who is next when you notice that everyone is sitting down, chatting with each other, as if nothing had happened. Niko helps you onto your feet then says, "You did amazing today! I am so proud of you. Get washed up then I will take you home, but don''t worry. I will give you a nice reward tomorrow." You meekly nod, as Niko walks you to the bathroom.'
 											end
-											*nl
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum2.jpg"></center>'
 											gs 'cum_call', 'face'
 											gs 'arousal', 'bj', 5
 											gs 'cum_call', 'anus'
@@ -685,17 +587,22 @@ if $ARGS[0] =  'Diner 1':
 			end
 		end
 	end
+	gs 'willpower', 'prostitution', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'I can''t right now (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
+			gs'stat'
+			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
+			'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Oh well. I guess it could wait, for another day. Visit me here when you are ready." You wave at Niko, and he returns the wave, as you walk away.'
 
-	act 'I can''t go right now':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Oh well. I guess it could wait, for another day. Visit me here when you are ready." You wave at Niko, and he returns the wave, as you walk away.'
-
-		act 'Walk away':gt 'gschool_grounds', 'main'
-	end
+			act 'Walk away':gt 'gschool_grounds', 'main'
+		end
+	else
+		act 'I can''t right now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 if $ARGS[0] =  'Diner Washup':
@@ -727,8 +634,6 @@ if $ARGS[0] =  'Diner Exit':
 	'You walk out of the diner to find Niko waiting for you. "You did great today <<$pcs_nickname>>. I am so proud of you. Here is your share of the profits." Niko hands you 2400 <b>₽</b> You look up to Niko then say, "I thought that you would give me half. There were at least six men in there." Niko places his hand on your shoulder with a sympathetic look on his face. "I wanted to split it half way, but it would take us too long to pay up on that dept. You don''t want your reputation to remain this way, do you?" You lower your head, as you reply. "I don''t..I''m sorry. I was just being greedy."'
 	*nl
 	'Niko wraps his arm around your neck then replies, "No need to apologize. I will always look after you. I love you <<$pcs_firstname>>." You look up to him with a wide smile then kiss him passionately for a minute. Niko then takes you home while chatting with you the whole way there.'
-	*nl
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 
 	act 'Enter apartment':gt 'korrPar'
 end
@@ -747,7 +652,7 @@ if $ARGS[0] =  'Reward 2':
 		minut += 10
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
-		'As soon, as you enter Niko''s house he pulls you toward him then gives you another passionate kiss, as he begins undressing you. <font color=#FF00FF>Oh his kisses are so passionate. He wants me so bad. I want him too. Please take me Nikolai. Take me!</font> Niko finishes undressing you then begins removing his clothes, as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'
+		'As soon, as you enter Niko''s house he pulls you toward him then gives you another passionate kiss, as he begins undressing you. Niko finishes undressing you then begins removing his clothes, as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'
 
 		act 'Lay back':
 			cls
@@ -762,11 +667,9 @@ if $ARGS[0] =  'Reward 2':
 			act 'Suck Niko''s dick':
 				cls
 				gs'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/lick1.mp4"></video></center>'
-				'You raise to your knees, and crawl up to Niko then lightly grip the shaft of his penis then lick up the shaft to the top where you gently kiss the tip of Niko''s penis while staring into his eyes to let him know how much he mean to you. Niko places his hand on your face, "You are so beautiful <<$pcs_firstname>>, the perfect girl." You can feel your heart beating faster, as Niko''s loving words warm your rapidly beating heart.'
-				'You begin sucking on Niko''s dick. <font color=#FF00FF>Oh Niko you are so perfect. I only want to please you. To see you happy. To give you the bliss that you give me. I love you Nikolai.</font> Niko tilts his head back, as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
-				*nl
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/bj.mp4"></video></center>'
+				'You raise to your knees, and crawl up to Niko then lightly grip the shaft of his penis then lick up the shaft to the top where you gently kiss the tip of Niko''s penis while staring into his eyes to let him know how much he mean to you. Niko places his hand on your face, "You are so beautiful <<$pcs_firstname>>, the perfect girl." You can feel your heart beating faster, as Niko''s loving words warm your rapidly beating heart.'
+				'You begin sucking on Niko''s dick. Niko tilts his head back, as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
 				gs 'arousal', 'bj', 5
 				gs'stat'
 
@@ -777,8 +680,6 @@ if $ARGS[0] =  'Reward 2':
 					'You crawl up to Niko''s face then give him a passionate kiss, as you grab onto his penis, and guide it inside of your vagina. You begin thrusting yourself on top of Niko''s dick, pushing it deeper inside you. Niko suddenly grabs onto your back then kisses you more firmly while pushing himself deeper inside you. After a few seconds, Niko ends the kiss to catch his breath, and you take this time to look him in the eyes, as you say, "I love you Nikolai. I love you with all my heart, and every fiber of my being."'
 					*nl
 					'Niko has a guilty look on his face, as he says, "I love you too <<$pcs_firstname>>. You a very precious to me." You continue staring into Niko''s eyes, as he continues thrusting his penis inside of you. Niko''s grunts, as he says, "I have to pull out now."'
-					*nl
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/cowgirlkiss.mp4"></video></center>'
 					gs 'arousal', 'vaginal', 5
 					gs'stat'
 
@@ -822,8 +723,6 @@ if $ARGS[0] =  'Yurik BJ':
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/abuse/slap1.mp4"></video></center>'
 			'Yurik suddenly give you a firm, but not very powerful slap, as he says, "Hey don''t go fucking around down there. I told you to suck, not play with my dick, so get back to sucking." You meekly nod then continue sucking his dick. After a few seconds, Yurik looks down to you, and says, "You don''t need to worry girl. You''re doing good." You suddenly feel a lot more confident, knowing that he actually does enjoy what you are doing for him. After a few seconds, you can hear Yurik breathing loudly then he begins rubbing on your head.'
-			*nl
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'
 			gs 'arousal', 'bj', 5
 			gs'stat'
 
@@ -831,7 +730,7 @@ if $ARGS[0] =  'Yurik BJ':
 				cls
 				minut += 5
 				gs'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'
 				'You quicken your pace then suddenly Yurik groans, as he begins pumping your mouth full of his warm cum which you do your best to swallow every drop of. After Yurik is spent, he says to you, "I''m done girl. You can go back to Niko now." You get up then start walking away when you hear Yurik say, "And good job girl." You walk back up the stairs with a smile on your face.'
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5
@@ -869,8 +768,6 @@ if $ARGS[0] =  'Diner 2':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/walk1.jpg"></center>'
 		'Niko says, "Excellent, today we a going back to the diner to make a lot of money. We are making great progress, and I would like us to keep it up." You give Niko a nervous smile then he places his hands on your cheeks. "Don''t worry <<$pcs_nickname>>, I will make sure that the customer only go one, or two at a time. No more group activities, unless you are cool with it." You give Niko a grateful nod, as he takes your hand then leads you toward the diner while you both chat about various topic on the way.'
-		*nl
-		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/exterior1.jpg"></center>'
 
 		act 'Enter diner':
 			cls
@@ -913,17 +810,22 @@ if $ARGS[0] =  'Diner 2':
 			end
 		end
 	end
+	gs 'willpower', 'prostitution', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'I can''t right now (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
+			gs'stat'
+			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
+			'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Oh well. I guess it could wait, for another day. Visit me here when you are ready." You wave at Niko, and he returns the wave, as you walk away.'
 
-	act 'I can''t go right now':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Oh well. I guess it could wait for another day. Visit me here when you are ready." You wave at Niko, and he returns the wave, as you walk away.'
-
-		act 'Walk away':gt 'gschool_grounds', 'main'
-	end
+			act 'Walk away':gt 'gschool_grounds', 'main'
+		end
+	else
+		act 'I can''t right now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 if $ARGS[0] =  'Diner Exit 2':
@@ -945,8 +847,6 @@ if $ARGS[0] =  'Diner Exit 2':
 		'<center><b><h4><font color=#E600FB><<"Lera Tsarev & Lena Kotov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/bully/park/1.jpg"></center>'
 		'You look back and recognize the ones following you, as Lena Kotov, and Lera Tsarev. They simply stare at you while occasionally whispering to each other. They don''t seem to care that you notice them, and occasionally give you lude gestures while continuing to follow you home. You try to ignore them, as you continue your conversation with Niko. Once you arrive at your apartment, Niko grabs onto your shoulder then flips you around before giving you a very passionate kiss. Afterward Niko whispers in your ear, "I love you <<$pcs_firstname>>. Never forget it." You can feel your face growing flushed, as you reply, "I love you too Nikolai. I love you with all my heart." You then give him another passionate kiss before backing into your apartment.'
-		*nl
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/endkiss.mp4"></video></center>'
 
 		act 'Enter apartment':gt 'korrPar'
 	end
@@ -968,8 +868,6 @@ if $ARGS[0] =  'Diner Slut':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/walk1.jpg"></center>'
 		'Niko says, "You''re always making me so proud. Let''s get going." Niko then takes your hand, and leads you toward the diner while you both chat about various topic on the way.'
-		*nl
-		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/exterior1.jpg"></center>'
 
 		act 'Walk to Diner':
 			cls
@@ -985,17 +883,22 @@ if $ARGS[0] =  'Diner Slut':
 			act 'Wait for customers':gt 'NikoSlut', 'Customers'
 		end
 	end
+	gs 'willpower', 'prostitution', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'I can''t right now (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			minut += 5
+			gs'stat'
+			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad1.jpg"></center>'
+			'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Oh well. I guess it could wait, for another day. Visit me here when you are ready." You wave at Niko, and he returns the wave, as you walk away.'
 
-	act 'I can''t go right now':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"That sounds great, but I really need to be somewhere very soon." Niko shrugs, as he replies "Well you got to do, what you got to do. Feel free to visit me here when you feel ready to make some cash." You wave at Niko, and he returns the wave, as you walk away.'
-
-		act 'Walk away':gt 'gschool_grounds', 'main'
-	end
+			act 'Walk away':gt 'gschool_grounds', 'main'
+		end
+	else
+		act 'I can''t right now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 end
 
 --- NikoEv2 ---------------------------------

+ 88 - 141
locations/NikoPayback.qsrc

@@ -1,9 +1,9 @@
 # NikoPayback
 
 menu_off = 1
-
+!!needs to be expanded with options added to allow for willpower and a few more people to help Sveta added. 
 if $ARGS[0] = 'Payback':
-	cls
+	*clr & cla
 	NikoPayback_Day = daystart
 	NikoPayback = 2
 	minut += 5
@@ -12,7 +12,7 @@ if $ARGS[0] = 'Payback':
 	'As you are walking toward the hallway, you feel hands covering your mouth then you feel your ribs being struck, causing you to recoil in pain, as you are dragged into the nearby bathroom.'
 
 	act 'Continue':	
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scene.jpg"></center>'
 		if NikoVolkovQW = -1:
@@ -20,12 +20,9 @@ if $ARGS[0] = 'Payback':
 		else
 			'As soon as you reach the bathroom, you feel your shirt being pulled up, as someone whispers in your ear, "You have been running your fucking mouth, for far too long, and now I have a few other uses for it. You will now be my bitch, whether you like it or not." You recognize Niko''s voice, as he continues stripping you.'
 		end		
-		*nl
-		'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
 
 		act 'Plead':	
-			cls
+			*clr & cla
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -37,7 +34,7 @@ if $ARGS[0] = 'Payback':
 			end	
 
 			act 'I understand':	
-				cls
+				*clr & cla
 				minut += 5
 				gs'stat'
 				'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -46,7 +43,7 @@ if $ARGS[0] = 'Payback':
 				
 				if money >= 200:
 					act 'Money (200 <b>₽</b>)':	
-						cls
+						*clr & cla
 						money -= 200
 						minut += 5
 						gs'stat'
@@ -59,20 +56,18 @@ if $ARGS[0] = 'Payback':
 				end
 				
 				act 'Sex (Blowjob)':	
-					cls
+					*clr & cla
 					minut += 5
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj1.mp4"></video></center>'
 					'You lower your head, as you slowly drop to your knees in front of Niko, he gives you a confident grin, as he begins unbuttoning his pants. You soon feel Niko''s penis rubbing against your lips, so you take a deep breath then wrap your lips around it, sucking it intently trying to make Niko cum, as quicly, as possible. Niko leans back while griping your head with one hand.'
 
 					act 'Make Niko cum':	
-						cls
+						*clr & cla
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj2.mp4"></video></center>'
-						'You increase your pace as you look up at Niko, noticing how much he is enjoying your performance. You stare him in the eyes, as you hear him begin groaning. You suddenly feel Niko''s warm seed filling your mouth, one squirt at a time. You look up to Niko with his cum slowly leaking out of your mouth, Niko then looks down to you, and says, "What are you waiting for? Swallow my cum bitch!" You give Niko a meek nod then begin swallowing his cum, and after you finish, Niko pulls your head to the ground and says, "You missed a few drops, Lick it off the floor!" not wanting to anger Niko further, you obediently begin licking the last drops of cum off the floor. "Now that''s better, I''ll see you tomorrow. Remember what I said, and don''t ever try to avoid me."'	
-						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/facial1.mp4"></video></center>'
-						
+						'You increase your pace as you look up at Niko, noticing how much he is enjoying your performance. You stare him in the eyes, as you hear him begin groaning. You suddenly feel Niko''s warm seed filling your mouth, one squirt at a time. You look up to Niko with his cum slowly leaking out of your mouth, Niko then looks down to you, and says, "What are you waiting for? Swallow my cum bitch!" You give Niko a meek nod then begin swallowing his cum, and after you finish, Niko pulls your head to the ground and says, "You missed a few drops, Lick it off the floor!" not wanting to anger Niko further, you obediently begin licking the last drops of cum off the floor. "Now that''s better, I''ll see you tomorrow. Remember what I said, and don''t ever try to avoid me."'	
+
 						act 'Stand up':gt 'FedorMisc', 'Restroom'
 					end	
 				end				
@@ -82,7 +77,7 @@ if $ARGS[0] = 'Payback':
 end
 
 if $ARGS[0] =  'Payback 2':
-	cls
+	*clr & cla
 	NikoPayback_Day = daystart
 	minut += 5
 	gs'stat'
@@ -91,7 +86,7 @@ if $ARGS[0] =  'Payback 2':
 	'You walk out of the cafeteria, and see Niko standing in the hallway on his phone.'
 	
 	act 'Approach Niko':	
-		cls
+		*clr & cla
 		npc_rel['A189'] += rand(1,5)
 		gs'stat'
 		'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -100,7 +95,7 @@ if $ARGS[0] =  'Payback 2':
 
 		if money >= 200:
 			act 'Money (200 <b>₽</b>)':	
-				cls
+				*clr & cla
 				NikoPayed = daystart
 				money -= 200
 				minut += 5
@@ -114,7 +109,7 @@ if $ARGS[0] =  'Payback 2':
 		end	
 		
 		act 'Sex':	
-			cls
+			*clr & cla
 			NikoPayed = daystart
 			minut += 5
 			gs'stat'
@@ -129,7 +124,7 @@ if $ARGS[0] =  'Payback 2':
 	act 'Try to avoid Niko':
 		VK = rand(1,3)
 		if VK = 1:
-			cls
+			*clr & cla
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall01.jpg"></center>'
@@ -137,7 +132,7 @@ if $ARGS[0] =  'Payback 2':
 
 			act 'Continue':gt 'gschool_lunch', 'break'
 		else
-			cls
+			*clr & cla
 			npc_rel['A189'] -= 5
 			minut += 5
 			gs'stat'
@@ -150,7 +145,7 @@ if $ARGS[0] =  'Payback 2':
 end
 
 if $ARGS[0] =  'Payback 3':
-	cls
+	*clr & cla
 	NikoPayback_Sex = daystart
 	gs 'boyStat', 'A189'
 	minut += 5
@@ -160,7 +155,7 @@ if $ARGS[0] =  'Payback 3':
 	'After you enter the restroom, Niko smacks your ass then says, "Since you came here without any fuzz, I will let you choose how I fuck you today, so what will it be?"'
 			
 	act 'Blowjob':	
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj1.mp4"></video></center>'
 		'You drop down to your knees then begin unbuttoning Niko''s pants. Niko looks down at you with a confident grin, as you finish pulling down his pants. Niko rubs his dick against your lips, signaling you to suck on it. You wrap your lips around Niko''s dick then begin licking and sucking it firmly, not wanting to anger him. Niko then looks down at you and says, "Good girl. Keep it up." You continue sucking Niko''s dick at a moderate pace, not wanting to overdo it.'
@@ -168,7 +163,7 @@ if $ARGS[0] =  'Payback 3':
 		gs 'stat'	
 									
 		act 'Continue sucking':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj2.mp4"></video></center>'
 			'After a few more seconds, Niko begins moaning, as he runs his fingers through your hair before grabbing your head with both hands, and pushes his penis down your throat, as he begin spraying his warm seed down your throat. You try your best not to gag, as Niko continues to pump his warm cum down your throat while you swallow every drop of it. After Niko finishes, he looks down to you then says, "You are really good at that. I will see you again soon. Niko buttons his pants then walks out of the restroom."'
@@ -189,22 +184,19 @@ if $ARGS[0] =  'Payback 3':
 	
 	if pcs_vag = 0:
 		act 'Vaginal [<font color=#FF00FF>Lose Virginity</font>]':
-			cls
+			*clr & cla
 			gs'stat'
-			'You downcast your eyes as you tell Niko. "I''m a virgin but I don''t want to be one anymore." Niko recoils in shock before responding, "Wow you are? I guess I can help you with that. Thanks for offering." Niko then gently guides you toward the sink then undresses you from the waist down before unbuttoning his pants, and pressing his dick against you vagina. Niko whispers in your ear, "I will take this slow for you ok?" You gratefully nod as Niko slowly pushes his penis inside of your vagina, causing your hymen to stretch for his dick, and after a few seconds, you feel your hymen give. You can feel a slight pain in your vagina, as your hymen breaks, and is soon increase slightly when Niko thrusts his hips, pushing his penis deeper inside you, and fucking you at a moderate rate.'
-			*nl
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/virgin.mp4"></video></center>'
+			'You downcast your eyes as you tell Niko. "I''m a virgin but I don''t want to be one anymore." Niko recoils in shock before responding, "Wow you are? I guess I can help you with that. Thanks for offering." Niko then gently guides you toward the sink then undresses you from the waist down before unbuttoning his pants, and pressing his dick against you vagina. Niko whispers in your ear, "I will take this slow for you ok?" You gratefully nod as Niko slowly pushes his penis inside of your vagina, causing your hymen to stretch for his dick, and after a few seconds, you feel your hymen give. You can feel a slight pain in your vagina, as your hymen breaks, and is soon increase slightly when Niko thrusts his hips, pushing his penis deeper inside you, and fucking you at a moderate rate.'
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'	
 			
 			act 'Continue':
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyvag.mp4"></video></center>'
-				'After a minute, all the pain fades and is replaced by pleasure. You try you best to give in to the pleasure. <font color=#FF00FF>Ohh this feel so good. I never thought that I would lose my virginity like this but I feel great. Niko may be an asshole but his dick feels so good inside me.</font> Niko begins fucking you harder before quickly pulling out of you then groaning, as he begin milking his penis over your ass. Squirt by squirt, Niko''s cum covers your asscheeks. Niko takes a few seconds to catch his breath before saying, "You were great <<$pcs_firstname>>, I can''t wait to fuck you again." Niko then buttons his pants before leaving the restroom.'
-				*nl
-				'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></video></center>'			
+				'After a minute, all the pain fades and is replaced by pleasure. You try you best to give in to the pleasure. Niko begins fucking you harder before quickly pulling out of you then groaning, as he begin milking his penis over your ass. Squirt by squirt, Niko''s cum covers your asscheeks. Niko takes a few seconds to catch his breath before saying, "You were great <<$pcs_firstname>>, I can''t wait to fuck you again." Niko then buttons his pants before leaving the restroom.'			
 				gs 'cum_call', 'butt', $boy
 				gs 'arousal', 'vaginal', 5, 'sub'
 				gs 'arousal', 'end'
@@ -219,21 +211,18 @@ if $ARGS[0] =  'Payback 3':
 		end
 	else
 		act 'Vaginal':	
-			cls
+			*clr & cla
 			gs'stat'
-			'You grab onto Niko''s hand then place it between your legs, as you say, "I want you to fuck my pussy." Niko''s eyes light up as he replies, "Good girl. That was just what I wanted to hear." Niko then begin undressing you before spinning you around then pulling you toward him. You can feel Niko penis pressed against your vagina then suddenly feel it enter you, causing a jolt of pleasure to fill your vagina. Niko lightly grips your neck as he pushes you down on his rock hard cock, filling your vagina almost completely with his dick. You close your eyes, and give in to the pleasure filling you, as Niko continues to fuck your pussy.'
-			*nl
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/vaginal1.mp4"></video></center>'
+			'You grab onto Niko''s hand then place it between your legs, as you say, "I want you to fuck my pussy." Niko''s eyes light up as he replies, "Good girl. That was just what I wanted to hear." Niko then begin undressing you before spinning you around then pulling you toward him. You can feel Niko penis pressed against your vagina then suddenly feel it enter you, causing a jolt of pleasure to fill your vagina. Niko lightly grips your neck as he pushes you down on his rock hard cock, filling your vagina almost completely with his dick. You close your eyes, and give in to the pleasure filling you, as Niko continues to fuck your pussy.'
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 				
 			act 'Continue':	
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/vaginal2.mp4"></video></center>'
-				'Niko suddenly grabs onto your stomach and leg, lifting you up in the air, as he continues pushing you onto his hard penis. <font color=#FF00FF>Wow Niko is so strong, and his dick feels so amazing inside me. He may be an asshole, but he really knows how to fuck a girl.</font> You start moaning out loud, as Niko whispers in your ear. "You are really liking it, aren''t you <<$pcs_firstname>>." You turn to Niko then nod, and that seems to excite Niko, resulting in him greatly increasing his pace. Niko continues fucking you until he suddenly pulls out of you then begin rubbing his penis in between your thighs, milking his dick on the ground in front of you. After Niko catches his breath, he turns to you and says, "You are a great fuck <<$pcs_nickname>>. I''ll see you again soon." Niko buttons his pants before walking out of the restroom.'
-				*nl
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/thighs.mp4"></video></center>'			
+				'Niko suddenly grabs onto your stomach and leg, lifting you up in the air, as he continues pushing you onto his hard penis. You start moaning out loud, as Niko whispers in your ear. "You are really liking it, aren''t you <<$pcs_firstname>>." You turn to Niko then nod, and that seems to excite Niko, resulting in him greatly increasing his pace. Niko continues fucking you until he suddenly pulls out of you then begin rubbing his penis in between your thighs, milking his dick on the ground in front of you. After Niko catches his breath, he turns to you and says, "You are a great fuck <<$pcs_nickname>>. I''ll see you again soon." Niko buttons his pants before walking out of the restroom.'		
 				gs 'cum_call', 'legs', $boy
 				gs 'arousal', 'vaginal', 5, 'sub'
 				gs 'arousal', 'end'
@@ -249,21 +238,18 @@ if $ARGS[0] =  'Payback 3':
 	end	
 	
 	act 'Ride him':
-		cls
+		*clr & cla
 		gs'stat'
-		'You approach Niko then place your hand on his crotch, as you say, "I want to ride your cock, so why don''t you make yourself comfortable?" Niko''s eyes light up as he replies, "You really are a naughty little minx, aren''t you?" Niko then unbuttons his pants then sits on top of a nearby toilet. You quickly undress, before approaching Niko''s hard penis before aliening it with your vagina then pushing Niko''s dick inside you. Niko begins lightly moaning as you begin riding his hard cock. You begin moaning with NIko, feeling only his hard penis, pushing its way deeper inside you.'
-		*nl
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/ride.mp4"></video></center>'
+		'You approach Niko then place your hand on his crotch, as you say, "I want to ride your cock, so why don''t you make yourself comfortable?" Niko''s eyes light up as he replies, "You really are a naughty little minx, aren''t you?" Niko then unbuttons his pants then sits on top of a nearby toilet. You quickly undress, before approaching Niko''s hard penis before aliening it with your vagina then pushing Niko''s dick inside you. Niko begins lightly moaning as you begin riding his hard cock. You begin moaning with NIko, feeling only his hard penis, pushing its way deeper inside you.'
 		gs 'arousal', 'vaginal', 5, 'sub'
 		gs 'stat'
 				
 		act 'Continue':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/sex/bimbo.boy1,7.mp4"></video></center>'
-			'You begin riding his hard cock while closing your eyes, and focusing on the pleasure building up inside of you. Niko begins spanking your ass while saying to you, "You really seem to be getting the hang of this <<$pcs_nickname>>. Good girl." Niko begins breathing heavier for a few seconds before his breath stops, as Niko pushes you forward then pulls out of you, covering your ass with his seed. You let out a needed moan, as Niko seed covers your lower back. Niko finishes milking himself on your ass when he says, "You are getting better. Well you are all payed up for today. See you next time." Niko then smacks your ass before buttoning his pants then leaving the restroom.'
-			*nl
-			'<center><video autoplay loop src="images/shared/sex/cum/cum3.mp4"></video></center>'		
+			'You begin riding his hard cock while closing your eyes, and focusing on the pleasure building up inside of you. Niko begins spanking your ass while saying to you, "You really seem to be getting the hang of this <<$pcs_nickname>>. Good girl." Niko begins breathing heavier for a few seconds before his breath stops, as Niko pushes you forward then pulls out of you, covering your ass with his seed. You let out a needed moan, as Niko seed covers your lower back. Niko finishes milking himself on your ass when he says, "You are getting better. Well you are all payed up for today. See you next time." Niko then smacks your ass before buttoning his pants then leaving the restroom.'		
 			gs 'cum_call', 'butt', $boy
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'arousal', 'end'
@@ -278,7 +264,7 @@ if $ARGS[0] =  'Payback 3':
 	end		
 	
 	act 'Anal':	
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyanal.mp4"></video></center>'
 		'You lean forward then whisper in Niko''s ear, "I want you to fuck my ass." Niko''s eyes light up, as he replies, "I always knew that you were a wild girl. Let''s do this." He then gives your ass a firm smack, as he begins wetting his hand in the sink then lubing up his dick. You pulls down your pants then bend over, getting yourself ready for Niko. You close your eyes, and focus on Niko''s dick firmly pushing its way inside of your ass, evoking moans from you and Niko both.'
@@ -286,14 +272,12 @@ if $ARGS[0] =  'Payback 3':
 		gs 'stat'
 			
 		act 'Continue':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal1.mp4"></video></center>'
-			'Niko begins thrusting his dick deeper in your ass, as you lift your leg up, placing it on the nearby toilet seat, givng Niko better access. <font color=#FF00FF>Niko may be a fucking asshole, but he really does know how to fuck a girl...What are you saying <<$pcs_firstname>>? i can''t let myself enjoy this too much.</font> You continue staring into Niko''s eyes when they suddenly squint. Niko groans as he begins pumping your ass with his warm seed.' 
-			*nl
-			'You can feel his penis throbbing inside of you, filling you with a pleasant warmth. Niko catches his breath before saying, "You did good today. Keep it up." Niko smacks your ass before buttoning his pants then leaving the restroom.'
+			'Niko begins thrusting his dick deeper in your ass, as you lift your leg up, placing it on the nearby toilet seat, givng Niko better access. You continue staring into Niko''s eyes when they suddenly squint. Niko groans as he begins pumping your ass with his warm seed.' 
 			*nl
-			'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal1.mp4"></video></center>'		
+			'You can feel his penis throbbing inside of you, filling you with a pleasant warmth. Niko catches his breath before saying, "You did good today. Keep it up." Niko smacks your ass before buttoning his pants then leaving the restroom.'	
 			gs 'cum_call', 'anus', $boy
 			gs 'arousal', 'anal', 5, 'sub'
 			gs 'arousal', 'end'
@@ -309,7 +293,7 @@ if $ARGS[0] =  'Payback 3':
 end
 
 if $ARGS[0] =  'Payback 4':
-	cls
+	*clr & cla
 	NikoPayback_Sex = daystart
 	VK = rand(1,6)
 	gs 'boyStat', 'A189'
@@ -337,7 +321,7 @@ if $ARGS[0] =  'Payback 4':
 
 	if VK = 1:
 		act 'Blowjob':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj3.mp4"></video></center>'
 			'You wrap your lips around Niko'' penis then begin sucking it firmly. Niko looks down to you then spits on your face before saying, "You are my fucking bitch! Don''t you ever forget that." You continue sucking his dick while trying to ignore Niko, as he occasionally spits in your face.'		
@@ -345,12 +329,10 @@ if $ARGS[0] =  'Payback 4':
 			gs 'stat'
 			
 			act 'Continue sucking':	
-				cls
+				*clr & cla
 				gs'stat'
-				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj6.mp4"></video></center>'
-				'Niko grabs the back of your head then begins fucking your throat. You try to relax your throut as NIko continues fucking it. Niko says to you, "Remember <<$pcs_firstname>> this is your place. You are my fucking bitch and nothing more." You are too focused on not gagging to respond. After a few more seconds, Niko groans, filling your throat with his warm seed which you swallow as much of it as you can, knowing that you have no choice. Niko then buttons his pants and walks out of the restroom, without saying another word.'
-				*nl
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4"></video></center>'
+				'Niko grabs the back of your head then begins fucking your throat. You try to relax your throut as NIko continues fucking it. Niko says to you, "Remember <<$pcs_firstname>> this is your place. You are my fucking bitch and nothing more." You are too focused on not gagging to respond. After a few more seconds, Niko groans, filling your throat with his warm seed which you swallow as much of it as you can, knowing that you have no choice. Niko then buttons his pants and walks out of the restroom, without saying another word.'
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -362,20 +344,16 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 2:		
 		act 'Open your mouth':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/piss1.mp4"></video></center>'
-			'You open your mouth and close your eyes, waiting for Niko to start. A few seconds later you feel warm liquid spraying in your face, filling your mouth, and getting in your nose. Niko shouts, "SWALLOW IT ALL BITCH!" You try your best not to gag, as you attempt to swallow all of him bitter tasting urine. You can''t keep your self from gagging as Niko continues shooting his urine down your throat. Niko suddenly rubs his penis against your lips before shoving it into your mouth.'
-			*nl
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/piss2.mp4"></video></center>'			
+			'You open your mouth and close your eyes, waiting for Niko to start. A few seconds later you feel warm liquid spraying in your face, filling your mouth, and getting in your nose. Niko shouts, "SWALLOW IT ALL BITCH!" You try your best not to gag, as you attempt to swallow all of him bitter tasting urine. You can''t keep your self from gagging as Niko continues shooting his urine down your throat. Niko suddenly rubs his penis against your lips before shoving it into your mouth.'			
 
 			act 'Suck Niko''s dick':	
-				cls
+				*clr & cla
 				gs'stat'
-				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj1.mp4"></video></center>'
-				'You know exactly what he want, and begin sucking Niko''s dick, trying your best to get him off as quickly as possible, knowing that the sooner he finishes, the sooner you can wash up and leave. You lick and suck Niko''s dick while trying your best to ignore the rotten taste in your mouth and the mildly burning of Niko''s urine on your face. Niko looks down to you then says, "There you go <<$pcs_firstname>>. Keep behaving like this, and we will get along just fine." He then tilts his head back and begins moaning. Niko suddenly grabs the back of your head, and begin filling your throat with his warm cum, as you try your best to swallow every drop of it. After Niko finishes, he turn to you and says, "You are learning, Good keep it up." Niko then buttons his pants before leaving the restroom.'
-				*nl
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
+				'You know exactly what he want, and begin sucking Niko''s dick, trying your best to get him off as quickly as possible, knowing that the sooner he finishes, the sooner you can wash up and leave. You lick and suck Niko''s dick while trying your best to ignore the rotten taste in your mouth and the mildly burning of Niko''s urine on your face. Niko looks down to you then says, "There you go <<$pcs_firstname>>. Keep behaving like this, and we will get along just fine." He then tilts his head back and begins moaning. Niko suddenly grabs the back of your head, and begin filling your throat with his warm cum, as you try your best to swallow every drop of it. After Niko finishes, he turn to you and says, "You are learning, Good keep it up." Niko then buttons his pants before leaving the restroom.'
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -387,21 +365,19 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 3 and pcs_vag = 0 or VK = 4 and pcs_vag = 0:
 		act 'Do as Niko says':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyvag.mp4"></video></center>'
-			'You slowly approach the sink then spread your legs, as Niko approaches behind you. <font color=#FF00FF>Is this really happening? Am I about to lose my virginity to this bastard? How could I let this happen? Why?</font> You can feel tears streaming down your face, as Niko drops his pants then rubs his penis against your vagina before forcing it inside, causing a powerful jolt of pain to fill your vagina. Niko waste no time, and begin thrusting his penis inside you very roughly, as he whispers in your ear, "Oops there goes your virginity. How does it feel to be a real woman?" You lower your head in silence while trying to focus on anything, but the pain.'		
+			'You slowly approach the sink then spread your legs, as Niko approaches behind you. You can feel tears streaming down your face, as Niko drops his pants then rubs his penis against your vagina before forcing it inside, causing a powerful jolt of pain to fill your vagina. Niko waste no time, and begin thrusting his penis inside you very roughly, as he whispers in your ear, "Oops there goes your virginity. How does it feel to be a real woman?" You lower your head in silence while trying to focus on anything, but the pain.'		
 			gs 'arousal', 'vaginal', 5, 'rough', 'sub'
 			gs 'stat'
 			
 			act 'Continue':	
-				cls
+				*clr & cla
 				if pcs_vag = 0:pcs_vag += 1
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/virgin.mp4"></video></center>'
 				'Niko quickly increases the pace of his thrusts, fucking you harder, as you close your eyes, waiting for it to be over. Niko''s breathing hastens before stopping, as he pulls out of you then begins spraying his warm seed over your ass. You wait for Niko to finish milking his penis on your ass before asking, "May I please go now?" Niko catches his breath before replying, "Yeah sure. You''re all payed up for today." You quickly grab a few paper towels then clean the blood off of your legs before grabbing your clothes, and getting dressed. After you are fully dressed, you quickly run out of the boys restroom.'
-				*nl
-				'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></video></center>'
 				gs 'cum_call', 'butt', $boy
 				gs 'arousal', 'vaginal', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -413,7 +389,7 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 3:
 		act 'Vaginal':
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/vaginal1.mp4"></video></center>'
 			'You slowly approach the sink then spread your legs, as Niko approaches behind you. You can feel Niko''s penis pressing against your vagina before he shoves it inside, evoking a moan from you, feeling his dick rapidly entering you. Niko whispers in your ear, "You like it when I shove my dick inside you, don''t you <<$pcs_nickname>>?"'
@@ -421,12 +397,10 @@ if $ARGS[0] =  'Payback 4':
 			gs 'stat'
 			
 			act 'Continue':	
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/vaginal2.mp4"></video></center>'
 				'You turn to Niko, as he points toward the mirror and says, "Look in that mirror. Do you know what you see? A filthy whore, getting what she deserves. Get used to that sight." You do as he says, as you feel, and see tears running down your cheeks. Watching you in tears must have pushed Niko to the edge, as he pulls out of you then begins covering your back with his warm seed. After Niko milks his penis on your back, he says, "Remember your place <<$pcs_firstname>>, and never try to avoid me again." He then buttons his pants before leaving the restroom.'
-				*nl
-				'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></video></center>'
 				gs 'cum_call', 'butt', $boy
 				gs 'arousal', 'vaginal', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -438,7 +412,7 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 4:		
 		act 'Vaginal':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/vaginal1.mp4"></video></center>'
 			'You can feel Niko penis pushing its way inside of your vagina, causing a jolt of pleasure to fill you. Niko continues fucking you as he leans forward, and whispers in your ear. "Who do you belong to bitch?" Knowing better than to anger Niko, you reluctantly reply, "I belong to you Niko." Niko chuckles as he responds, "Yes you do, and never forget it." Niko wraps one of his arms around your stomach, and the other on your leg then lifts you up.'
@@ -446,12 +420,10 @@ if $ARGS[0] =  'Payback 4':
 			gs 'stat'
 			
 			act 'Continue':	
-				cls
+				*clr & cla
 				gs'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/vaginal2.mp4"></video></center>'
-				'Niko continues fucking you as he keeps you off the ground. You can''t help but feel somewhat impressed at his strength, as he holds you up. You can hear Niko whispering in your ear. "How are you liking your fucking?" You look back at him then nod which seems to turn him on ,as he begins breathing faster. Niko''s breath suddenly stops as he pulls his dick out of you then begins rubbing his dick between your legs, milking his penis on the floor in front of you. After Niko finishes, you turn to him then ask, "Are you satisfied Niko? May I leave now?" Niko gives your ass a firm smack as he replies, "You can go now, but never forget that you belong to me." You quickly pick up your clothes then get dressed before leaving the boys restroom.'
-				*nl
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/thighs.mp4"></video></center>'
+				'Niko continues fucking you as he keeps you off the ground. You can''t help but feel somewhat impressed at his strength, as he holds you up. You can hear Niko whispering in your ear. "How are you liking your fucking?" You look back at him then nod which seems to turn him on ,as he begins breathing faster. Niko''s breath suddenly stops as he pulls his dick out of you then begins rubbing his dick between your legs, milking his penis on the floor in front of you. After Niko finishes, you turn to him then ask, "Are you satisfied Niko? May I leave now?" Niko gives your ass a firm smack as he replies, "You can go now, but never forget that you belong to me." You quickly pick up your clothes then get dressed before leaving the boys restroom.'
 				gs 'arousal', 'vaginal', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -462,7 +434,7 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 5:		
 		act 'Anal':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyanal.mp4"></video></center>'
 			'You feel Niko''s penis pressing against your anus then feel him suddenly force it inside you, evoking a groan of pain to escape you. Niko wastes no time, as he begins fucking your ass roughly. You let out a few groans of pain, as Niko continues fucking your ass before leaning forward then whispering in your ear. "How does it feel to know that you belong to me?" You look back at him in silence, not knowing what he wants you to say. Niko grins as he smacks your ass firmly.'
@@ -470,12 +442,10 @@ if $ARGS[0] =  'Payback 4':
 			gs 'stat'
 			
 			act 'Continue':	
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal1.mp4"></video></center>'
 				'Knowing that the faster Niko cums, the quicker this torment will be over, turn to face Niko then stare into his eyes. Niko begins struggling to hold back from cumming then begins groaning, filling up your ass with his warm seed. You focus on the throbbing of his hard penis in your ass, filling you with his warm cum. After Niko finishes, he pulls out of you, causing a stream of cum to leak out of your ass, and onto the floor. Niko then says, "You did good <<$pcs_nickname>>. I''ll see you tomorrow." You then gather your clothes, and get dressed before leaving the boys restroom.'
-				*nl
-				'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal1.mp4"></video></center>'
 				gs 'cum_call', 'anus', $boy
 				gs 'arousal', 'anal', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -487,22 +457,20 @@ if $ARGS[0] =  'Payback 4':
 		
 	elseif VK = 6:		
 		act 'Anal':	
-			cls
+			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal2.mp4"></video></center>'
-			'You look back at Niko, as he pushes his penis inside you, causing a sharp pain to fill your ass, evoking a groan from you, as you hold onto the bottom of the urinal. You can only feel the pain building up in your ass, as Niko continues roughly fucking you. Niko leans forward and grabs onto your hair, as he says, "You really shouldn''t have tried to avoid me bitch. This could have been quick and painless, but you had to piss me off." <font color=#FF00FF>He''s right. I shouldn''t have tried to avoid him. Why am I so stupid?</font>'
+			'You look back at Niko, as he pushes his penis inside you, causing a sharp pain to fill your ass, evoking a groan from you, as you hold onto the bottom of the urinal. You can only feel the pain building up in your ass, as Niko continues roughly fucking you. Niko leans forward and grabs onto your hair, as he says, "You really shouldn''t have tried to avoid me bitch. This could have been quick and painless, but you had to piss me off."'
 			gs 'arousal', 'anal', 5, 'rough', 'sub'
 			gs 'stat'
 			
 			act 'Continue':	
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/anal3.mp4"></video></center>'
-				'Niko suddenly lifts you up by your hair then pulls you toward one of the stalls before shoving your head into the toilet. You hold your breath as the water covers your face, hoping that Niko lets you out to breath soon. <font color=#FF00FF>I need to breath. Please Niko, let me go.</font> Niko pulls you out of the toilet for a few seconds to catch your breath before shoving you back in. All you can think about is not drowning, even as your anus is growing sore from Niko hard penis ramming inside. After a few more seconds, Niko suddenly pulls you out of the toilet, as he begins groaning, filling your ass with his warm seed.' 
+				'Niko suddenly lifts you up by your hair then pulls you toward one of the stalls before shoving your head into the toilet. You hold your breath as the water covers your face, hoping that Niko lets you out to breath soon. Niko pulls you out of the toilet for a few seconds to catch your breath before shoving you back in. All you can think about is not drowning, even as your anus is growing sore from Niko hard penis ramming inside. After a few more seconds, Niko suddenly pulls you out of the toilet, as he begins groaning, filling your ass with his warm seed.' 
 				*nl
 				'Niko continues thrusting his penis inside you, milking it completely. After Niko finishes, he says, "Now hopefully you''ve learned your lesson, and won''t try to avoid me again." You turn to him then meekly nod, as he buttons his pants then leaves the restroom while you remain to catch your breath.'
-				*nl
-				'<center><video autoplay loop src="images/characters/pavlovsk/resident/leonid/sex/cumanal1.mp4"></video></center>'
 				gs 'cum_call', 'anus', $boy
 				gs 'arousal', 'anal', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -515,7 +483,7 @@ if $ARGS[0] =  'Payback 4':
 end	
 
 if $ARGS[0] = 'Fedor Help':
-	cls
+	*clr & cla
 	if fedorKozlovQW < -10:
 		FyodorVsNiko = 1
 	else
@@ -527,7 +495,7 @@ if $ARGS[0] = 'Fedor Help':
 	'You move toward Fedor then wrap your arms around him as you say, "Fyodor I...I need your help." Fedor gently rubs your back, as he responds, "Please <<$pcs_firstname>>, tell me what''s wrong." You can feel tears streaming down your face, as you reply, "Nikolai Volkov has been bullying me at lunch everyday. Please make him stop." Fedor clenches his fist, "That little gopnik shit! I will make him pay. Don''t worry <<$pcs_nickname>> the next time he tries I will bash his face in!"'
 	
 	act 'Thank Fedor':
-		cls
+		*clr & cla
 		minut += 5
 		gs'stat'	
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console2.jpg"></center>'		
@@ -538,7 +506,7 @@ if $ARGS[0] = 'Fedor Help':
 end
 
 if $ARGS[0] = 'Fedor Help 2':
-	cls
+	*clr & cla
 	FedorVsNiko = 2
 	NikoPayback = 3
 	NikoFightDay = daystart
@@ -548,7 +516,7 @@ if $ARGS[0] = 'Fedor Help 2':
 	'You approach Niko, and a confident grin covers his face, as he says, "You showed up? Good. How will you be paying today?" You reply, "I...I want you to leave me alone." Niko chuckles as he replies, "Well that''s not up to you now is it? For wasting my time, you will be paying me in both, money and pleasure. Now let''s get moving." Niko grabs your hand then begins pulling you into the restroom...'
 	
 	act 'Continue':	
-		cls
+		*clr & cla
 		minut += 1
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
@@ -556,27 +524,27 @@ if $ARGS[0] = 'Fedor Help 2':
 		'After turning the corner, Niko suddenly recoils back, as Fedor''s fist makes contact, causing Niko to drop to the ground, holding his face. Fedor shouts, "HOW DARE YOU TOUCH <<$pcs_firstname>>! I WILL SHOW YOU WHAT HAPPENS WITH SHITHEADS LIKE YOU." Fedor begins punching Niko as he tries to block the blows. Suddenly Fedor gets tackled.'		
 
 		act 'Turn to Fedor':	
-			cls
+			*clr & cla
 			minut += 1
 			gs'stat'
-			'<center><b><h4><font color="red"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
-			'You turn to see Lavrenti Romanov trying to hold Fedor down while Niko holds his face in pain, still unable to recover. Lavrenti punches Fedor before Fedor returns the blow, knocking Lavrenti off of him before Niko finally recovers then kicks Fedor in the face, knocking him to the ground then Lavrenti grabs onto Fedor''s arms then holds him down while Niko begins kicking him in the ribs. You grab Niko by his shirt then pull him away before he slaps you across the face. Niko winds up to kick Fedor again when someone''s fist rams into his face.'
+			'<center><b><h4><font color="red"><<"Roman Yakovlev">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big157.jpg"></center>'
+			'You turn to see Roman Yakovlev trying to hold Fedor down while Niko holds his face in pain, still unable to recover. Roman punches Fedor before Fedor returns the blow, knocking Roman off of him before Niko finally recovers then kicks Fedor in the face, knocking him to the ground then Roman grabs onto Fedor''s arms then holds him down while Niko begins kicking him in the ribs. You grab Niko by his shirt then pull him away before he slaps you across the face. Niko winds up to kick Fedor again when someone''s fist rams into his face.'
 
 			act 'See who it was':	
-				cls
+				*clr & cla
 				minut += 1
 				gs'stat'
 				'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
-				'You turn to see Ivan Prokhorov standing over Niko. Ivan immediately rushes toward Lavrenti, grabbing him by his arms then lifting him up before slamming him onto the ground. "Teaming up on my friend, and his girl? Not on my watch." Ivan then helps Fedor up before lifting up his foot then driving it into Lavrenti''s face. Fedor takes a second to recover before immediately climbing on Niko then repeatedly punching him. After a few punches, Ivan pulls Fedor off then says, "Come on man, it''s done."'
+				'You turn to see Ivan Prokhorov standing over Niko. Ivan immediately rushes toward Roman, grabbing him by his arms then lifting him up before slamming him onto the ground. "Teaming up on my friend, and his girl? Not on my watch." Ivan then helps Fedor up before lifting up his foot then driving it into Roman''s face. Fedor takes a second to recover before immediately climbing on Niko then repeatedly punching him. After a few punches, Ivan pulls Fedor off then says, "Come on man, it''s done."'
 				
 				act 'Place your hand on Fedor''s shoulder':
-					cls
+					*clr & cla
 					minut += 1
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
-					'Fedor takes a few seconds to catch his breath before asking you, "Are you alright <<$pcs_firstname>>? You took quite a hit there." You quickly hug Fedor, as you reply, "I''m great, thanks to you two." Ivan replies, "It was nothing special. I just won''t let punks like them, hurt my friends." Fedor wraps his arms around you then says, "This is the last time that punk will ever hurt you. You are safe." You return the hug then hear the class bell, signaling the beginning of class. Fedor takes your hand then leads you toward you next class. While Ivan stays behind to "Chat" with Niko and Lavrenti.'
+					'Fedor takes a few seconds to catch his breath before asking you, "Are you alright <<$pcs_firstname>>? You took quite a hit there." You quickly hug Fedor, as you reply, "I''m great, thanks to you two." Ivan replies, "It was nothing special. I just won''t let punks like them, hurt my friends." Fedor wraps his arms around you then says, "This is the last time that punk will ever hurt you. You are safe." You return the hug then hear the class bell, signaling the beginning of class. Fedor takes your hand then leads you toward you next class. While Ivan stays behind to "Chat" with Niko and Roman.'
 
 					act 'Return to the hallway':gt 'gschool_lessons', 'short_break'
 				end
@@ -586,7 +554,7 @@ if $ARGS[0] = 'Fedor Help 2':
 end
 
 if $ARGS[0] = 'Fyodor Help':
-	cls
+	*clr & cla
 	FyodorVsNiko = 2
 	NikoPayback = 3
 	NikoFightDay = daystart
@@ -596,23 +564,19 @@ if $ARGS[0] = 'Fyodor Help':
 	'You approach Niko, and a confident grin covers his face, as he says, "You showed up? Good. How will you be paying today?" You reply, "I...I want you to leave me alone." Niko chuckles as he replies, "Well that''s not up to you now is it? For wasting my time, you will be paying me in both, money and pleasure. Now let''s get moving." Niko grabs your hand then begins pulling you into the restroom...'
 	
 	act 'Continue':	
-		cls
+		*clr & cla
 		minut += 2
 		gs'stat'
-		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
-		'As you reach the restroom, Niko tosses you to the ground then approaches you when suddenly, Fedor quickly walks into the room, and punches Niko in his face, knocking him to the ground before climbing on him, and punching him repeatedly. After a few punches Niko says, "Whoa chill out man, <<$pcs_firstname>> and I were just playing a game. Do you see? She is laughing right now." Fedor turns to you just as Niko winds up his fist, ramming it into Fedor''s face before quickly pushing Fedor off of him then running to the door. <font color=#FF00FF>Niko''s running away?...No! I''m finished with this shit!</font> You quickly grab Niko''s shirt turning him to you before scratching him in his face then pushing him onto the ground, giving Fedor enough time to recover then climb on top of Niko again, punching him in the face.'	
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
+		'As you reach the restroom, Niko tosses you to the ground then approaches you when suddenly, Fedor quickly walks into the room, and punches Niko in his face, knocking him to the ground before climbing on him, and punching him repeatedly. After a few punches Niko says, "Whoa chill out man, <<$pcs_firstname>> and I were just playing a game. Do you see? She is laughing right now." Fedor turns to you just as Niko winds up his fist, ramming it into Fedor''s face before quickly pushing Fedor off of him then running to the door. You quickly grab Niko''s shirt turning him to you before scratching him in his face then pushing him onto the ground, giving Fedor enough time to recover then climb on top of Niko again, punching him in the face.'	
 
 		act 'Enjoy the show':	
-			cls
+			*clr & cla
 			minut += 2
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console2.jpg"></center>'
 			'You watch in satisfaction at Niko getting what he deserves, for a few seconds before Fedor finally calms down then climbs off of Niko then walks up to you, and wraps his arms around you before asking, "Are you alright? He didn''t hurt you did he?" You reply, "No but I did enjoy you hurting him." Fedor chuckles, "Anyone who messes with you, wil share the same treatment.." You lean forward then give Fedor a passionate kiss which lasts for almost a full minute. After the kiss, Fedor says, "You should get back to recess before you miss it. I will have a chat with NIko. Go on, enjoy your recess." You give Fedor a kiss on the cheek before walking out of the restroom.'
-			*nl
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss2.mp4"></video></center>'
 			
 			act 'Return to the hallway':gt 'gschool_lunch', 'break'
 		end	
@@ -620,7 +584,7 @@ if $ARGS[0] = 'Fyodor Help':
 end
 
 if $ARGS[0] = 'Ivan Help':
-	cls
+	*clr & cla
 	IvanVsNiko = 1
 	minut += 5
 	gs'stat'
@@ -631,44 +595,38 @@ if $ARGS[0] = 'Ivan Help':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/hug1.jpg"></center>'	
 	
 	act 'Tell Ivan':	
-		cls
+		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/angry1.jpg"></center>'
-		'You try to collect your thoughts before saying, "Ever since I broke up with Niko, he has been raping me at lunchtime and I..." Ivan agrily slams one of the lockers, as he says, "That slimy little shit! This will not continue <<$pcs_firstname>>, I will put an end to it. You don''t need to worry. I will end this." You wrap your arms around Ivan then say, "Thank you so much. I didn''t know what to do." Ivan replies, "That kind of shit is unacceptable. You will be safe again, I promise you that." You give Ivan a soft kiss on the cheek then walk away while he angrily begins cracking his knuckles.'		
-		*nl
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/hug1.jpg"></center>'	
+		'You try to collect your thoughts before saying, "Ever since I broke up with Niko, he has been raping me at lunchtime and I..." Ivan agrily slams one of the lockers, as he says, "That slimy little shit! This will not continue <<$pcs_firstname>>, I will put an end to it. You don''t need to worry. I will end this." You wrap your arms around Ivan then say, "Thank you so much. I didn''t know what to do." Ivan replies, "That kind of shit is unacceptable. You will be safe again, I promise you that." You give Ivan a soft kiss on the cheek then walk away while he angrily begins cracking his knuckles.'			
 	
 		act 'Return to the hallway':gt 'gschool_lessons', 'short_break'
 	end
 end
 
 if $ARGS[0] = 'Ivan Help 2':
-	cls
+	*clr & cla
 	IvanVsNiko = 2
 	NikoPayback = 3
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'	
 	'You approach Niko, and a confident grin covers his face, as he says, "You showed up? Goo..." Niko quickly pauses when he notices Ivan approaching. Ivan drives his fist into Niko''s stomach then says, "I hear that you have been giving <<$pcs_firstname>> a hard time. Allow me to return the favor." Ivan then begins chocking Niko, as Niko tries to squirm out of Ivan steel grasp. After a few seconds, Ivan releases Niko, causing Niko to drop to the ground. Ivan stands over Niko and says, "That was a warning. Give <<$pcs_firstname>> a hard time again, and I won''t hold back."'
-	'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 	
 	act 'Continue':
-		cls
+		*clr & cla
 		minut += 2
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/hug1.jpg"></center>'
 		'Niko quickly nods, obviously frightened of Ivan. Ivan then gives you a hug as he says, "You''ll be fine now. If he bothers you again then let me know, and I will set him straight." You gratefully nod, as Ivan turns around then walks away. You turn around to leave when you notice Vitek walking up to Niko then lightly places his foot on his back, as he says, "I always told you that your big mouth would get you into trouble." Vitek then steps off of Niko then laughs, as he walks away.'		
-		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 
 		act 'Go to class':gt 'gschool_lunch', 'break'
 	end
 end	
 
 if $ARGS[0] = 'Vitek Help':
-	cls
+	*clr & cla
 	VitekVsNiko = 1
 	NikoPayback = 3
 	NikoFightDay = daystart
@@ -679,52 +637,41 @@ if $ARGS[0] = 'Vitek Help':
 	'You say to Vitek, "Um Viktor I need..." Dan unintentionally cuts you off, "Oh yeah, have you guys seen that big breasted bitch handing out freebies by..." Vitek says, "Hold that thought. <<$pcs_nickname>> we''re having guy talk right now, you and I can chat later." You try add, "But I really need..." Vasily suddenly intentionally falls to the ground then says, "You need to cheer up, you look so glum. Here, I will tell you a joke rated everyone..." Dan adds, "You mean rated immature, right?" The guys begin laughing, as you get more agitated at them ignoring you.'
 	
 	act 'Scream out':	
-		cls
+		*clr & cla
 		gs'stat'
-		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
-		'You suddenly scream, "NIKO RAPED ME!!!" The guys freeze in place before Vitek says, "He did what?" Niko suddenly stands up then begins sprinting toward the door when Vasily shoulder tackles him into the wall, knocking slamming him against it. Lavrenti tries to help Niko when Dan stands in front of him, blocking him from interfering. Vitek suddenly lunges forward then drives his foot into Niko''s face, slamming his head against the wall before shouting, "YOU FUCKING WORTHLESS SACK OF SHIT!!! HOW DARE YOU TOUCH MY GIRL!!!"'	
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised1.jpg"></center>'
+		'You suddenly scream, "NIKO RAPED ME!!!" The guys freeze in place before Vitek says, "He did what?" Niko suddenly stands up then begins sprinting toward the door when Vasily shoulder tackles him into the wall, knocking slamming him against it. Roman tries to help Niko when Dan stands in front of him, blocking him from interfering. Vitek suddenly lunges forward then drives his foot into Niko''s face, slamming his head against the wall before shouting, "YOU FUCKING WORTHLESS SACK OF SHIT!!! HOW DARE YOU TOUCH MY GIRL!!!"'	
 		
 		act 'Continue watching':
-			cls
+			*clr & cla
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
-			'Vitek continuously kicks Niko in the ribs, as Vasily joins him while saying, "We''ll show you what happens to those who fuck with <<$pcs_firstname>>." After a few minutes, Vitek takes a few seconds to catch his breath before approaching you, wrapping his arms around you, and saying, "I''m sorry that I didn''t listen to you, but don''t worry, I will make this sack of shit pay for touching you. You shouldn''t stick around for this. Go on, and I''ll see you later." You lean forward, and give Vitek a passionate kiss before saying, "Thank you Viktor. I always feel so safe with you." Vitek gives you ass a light smack before responding, "You know it <<$pcs_nickname>>. Now get going, I have some business to finish here." You happily nod before leaving the restroom.'	
-			*nl
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
-
+			'Vitek continuously kicks Niko in the ribs, as Vasily joins him while saying, "We''ll show you what happens to those who fuck with <<$pcs_firstname>>." After a few minutes, Vitek takes a few seconds to catch his breath before approaching you, wrapping his arms around you, and saying, "I''m sorry that I didn''t listen to you, but don''t worry, I will make this sack of shit pay for touching you. You shouldn''t stick around for this. Go on, and I''ll see you later." You lean forward, and give Vitek a passionate kiss before saying, "Thank you Viktor. I always feel so safe with you." Vitek gives you ass a light smack before responding, "You know it <<$pcs_nickname>>. Now get going, I have some business to finish here." You happily nod before leaving the restroom.'	
+			
 			act 'Continue toward the hallway':gt 'gschool_lessons', 'short_break'
 		end	
 	end
 end
 
 if $ARGS[0] = 'Vitek Help 2':
-	cls
+	*clr & cla
 	VitekVsNiko = 1
 	NikoPayback = 3
 	NikoFightDay = daystart
 	minut += 5
 	gs'stat'
-	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
-	'You approach Vitek and he says, "Hey <<$pcs_nickname>>, want a drink?" You reply, "I need to ask for your help, Niko has been raping me at lunch and..." Vitek''s eyes widen as he says, "He did what?" You remain quite, as you feel tears dripping down your cheek. Vitek tosses his bottle to the ground, causing a loud shatter which draws everyone in the discos attention. Vitek angrily walks over the broken glass, as he approaches Niko. Niko suddenly asks, "Whoa what''s going on?" Vitek replies, "You have been fucking with my girl?"'
-	*nl
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
+	'You approach Vitek and he says, "Hey <<$pcs_nickname>>, want a drink?" You reply, "I need to ask for your help, Niko has been raping me at lunch and..." Vitek''s eyes widen as he says, "He did what?" You remain quite, as you feel tears dripping down your cheek. Vitek tosses his bottle to the ground, causing a loud shatter which draws everyone in the discos attention. Vitek angrily walks over the broken glass, as he approaches Niko. Niko suddenly asks, "Whoa what''s going on?" Vitek replies, "You have been fucking with my girl?"'
 	
 	act 'Continue':	
-		cls
+		*clr & cla
 		gs'stat'
-		'<center><b><h4><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
 		'Niko immediately tries to run away when Vasily drives his fist into Niko''s face before saying, "You don''t fuck with <<$pcs_nickname>> without dealing with us." You can feel your heart warming up, as you realize how safe you are with Vitek, and Vasily around. Niko continuously tries to crawl away, but is grabbed by Vitek, who lifts him up then slams him onto the ground before climbing on top of him then repeatedly punching him in the face. Vasily approaches you then says, "You are safe now <<$pcs_firstname>>. We will make sure that Niko never touches you again."' 
 		*nl
 		'You give Vasily a hug as you respond, "Thank you all so much for your help. You''re the best." Vasily gives you a pat on the back before saying, "You don''t need to thank us. It''s a mans job to keep girls safe. Here have a drink on me." Vasily hands you a bottle of beer then turns back around to join Vitek, and Dan in beating Niko.'		
-		*nl
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
 	
 		act 'Walk away':gt 'gdkin'
 		act 'Have a drink then walk away': gs 'drugs', 'alcohol', 'beer' & gt 'gdkin'

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 122 - 608
locations/NikoSlut.qsrc


+ 6 - 20
locations/NormPR.qsrc

@@ -14,18 +14,14 @@ if $ARGS[0] = '1':
 	if RAND(0,1) = 0:
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
 		'You obediently lie down on your back in the back seat, and the man pounces you eagerly. Within seconds, his cock is deep inside you.'
-		gs 'arousal', 'vaginal', 15, 'sub'
-		gs 'stat'
-		gs 'orgazm','start'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar2.jpg"></center>'
 		'You immediately feel the man''s hands on your ass cheeks when you get on your hands and knees in the back seat. The man confidently guides his cock to your pussy, and slowly thrusts it inside you.'
-		gs 'arousal', 'vaginal', 15, 'sub'
-		gs 'stat'
-		gs 'orgazm','start'
 	end
 
 	'After a few minutes of fucking you, the man groans and you feel his hips spasming against yours. He pulls out of you and takes the filled condom off his slowly shrinking cock.'
+	gs 'arousal', 'vaginal', 15, 'sub', 'unknown', 'prostitution'
+	gs 'orgazm','start'
 	'The man ties a knot in the condom and tosses it out of the window carelessly, very satisfied with your performance.'
 	
 	gs 'arousal', 'end'
@@ -43,39 +39,29 @@ if $ARGS[0] = '2':
 	prosti = 0
 	gs'stat'
 
+	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<picpRand>>.jpg"></center>'
+	
 	prostRand = RAND(1,100)
 	if prostRand <= 50:
 		picpRand = RAND(3,9)
 		pose = 1
 
 		'You lean against the car and expose your bare ass to the man. He''s not wasting any time and immediately gets behind you, eagerly rubbing his cock against your vagina.'
-
-		gs 'arousal', 'vaginal', 15, 'sub'
-		gs 'stat'
-		gs'orgazm','start'
 	elseif prostRand <= 75:
 		picpRand = RAND(10,12)
 		pose = 1
 
 		'You get down on your hands and knees like he wants, and brace yourself when you feel him pressing his cock against your pussy in a none too gentle fashion.'
-
-		gs 'arousal', 'vaginal', 15, 'sub'
-		gs 'stat'
-		gs'orgazm','start'
 	else
 		pose = 0
 		picpRand = RAND(13,19)
 
 		'He groans in your ear: "Get on the hood, on your back!"'
 		'You quickly do as he says, and let out a soft moan when he rubs his cock against your pussy lips.'
-
-		gs 'arousal', 'vaginal', 15, 'sub'
-		gs 'stat'
-		gs'orgazm','start'
 	end
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar<<picpRand>>.jpg"></center>'
-
+	gs 'arousal', 'vaginal', 15, 'sub', 'unknown', 'prostitution'
+	gs 'orgazm', 'start'
 	gs 'arousal', 'end'
 	gs 'stat'
 	

+ 5 - 0
locations/ParChurch2.qsrc

@@ -285,6 +285,7 @@ if $ARGS[0] = 'confession':
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to give the father a blow job (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -348,6 +349,7 @@ if $ARGS[0] = 'confession':
 				gs 'willpower', 'anal', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to let the father fuck your ass (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -411,6 +413,7 @@ if $ARGS[0] = 'confession':
 				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to let the father fuck you (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -514,6 +517,7 @@ if $ARGS[0] = 'confession':
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to masturbate in front of the father (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -797,6 +801,7 @@ if $ARGS[0] = 'secrets':
 				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to let the father fuck you (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'

+ 6 - 11
locations/Prostitute.qsrc

@@ -57,7 +57,6 @@ if $ARGS[0] = 'start':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				prostitutFight = 1
 
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500}
@@ -79,6 +78,7 @@ if $ARGS[0] = 'start':
 				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 				opp_willpwr[0] = 50
 				opp_shoot[0] = 10
+				fightEnding = 4
 
 				gt 'fight', 'start'
 			end
@@ -167,7 +167,6 @@ if $ARGS[0] = 'start':
 								BonusDefV = 0
 								!!Programme of Action
 								program = 0
-								prostitutFight = 2
 
 								if spellavtoklon = 1:klon = 3
 								if spellbefshild = 1:defence = 500}
@@ -189,6 +188,7 @@ if $ARGS[0] = 'start':
 								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 								opp_willpwr[0] = 100
 								opp_shoot[0] = 10
+								fightEnding = 5
 
 								gt 'fight', 'start'
 							end
@@ -240,7 +240,6 @@ if $ARGS[0] = 'start':
 								BonusDefV = 0
 								!!Programme of Action
 								program = 0
-								prostitutFight = 3
 
 								if spellavtoklon = 1:klon = 3
 								if spellbefshild = 1:defence = 500}
@@ -263,6 +262,7 @@ if $ARGS[0] = 'start':
 								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 								opp_willpwr[0] = 50
 								opp_shoot[0] = 10
+								fightEnding = 6
 
 								gt 'fight', 'start'
 							end
@@ -310,7 +310,6 @@ if $ARGS[0] = 'start':
 	act 'Go back to the park':
 		cla
 		minut += 5
-		prosta = 0
 		gt 'park', 'start'
 	end
 end
@@ -412,8 +411,7 @@ if $ARGS[0] = 'work2':
 		gs 'boyStat', $npclastgenerated
 		slutty += 1
 		guy += 1
-		pcs_throat += 1
-		prosta = 1
+		if pcs_throat < dick: pcs_throat += 1
 
 		
 
@@ -506,7 +504,6 @@ if $ARGS[0] = 'work2':
 						gs 'arousal', 'anal', 10, 'prostitution', 'unknown'
 						gs 'stat'
 						if pcs_ass < dick:
-							fun = 0
 							'Your anus stretches painfully while he fills your ass with his shaft, and you wince and beg him to take it easy for a little while. Fortunately, he listens.'
 							'Once he feels he gave you enough time to adapt, he begins to move his hips. Slowly at first, but his thrusts accelerate more and more as he gets closer to his orgasm.'
 							gs 'arousal', 'anal', 10, 'prostitution', 'unknown'
@@ -540,7 +537,7 @@ if $ARGS[0] = 'work2':
 				picrand = rand(8, 13)
 				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bjp<<picrand>>.jpg"></center>'
 				'You close your lips around his member and flick your tongue over the tip of his cock teasingly.'
-				gs 'arousal', 'foreplay', 10, 'prostitution'
+				gs 'arousal', 'bj', 5, 'prostitution', 'unknown'
 				gs 'stat'
 				act 'Suck on his cock':
 					*clr
@@ -685,7 +682,6 @@ if $ARGS[0] = 'work2':
 							gs 'arousal', 'foreplay', 1, 'prostitution', 'unknown'
 							gs 'stat'
 							if pcs_ass < dick:
-								fun = 0
 								'You feel a sharp pain and wince when the man pushes the tip of his <<dick>> centimeter member past your sphincter, and continues to work most of his length inside you. Fortunately, he listens when you beg him to go slow.'
 								'The guy holds still for a moment so your ass can get used to how far it''s being stretched out. After a little while you don''t think it''s going to get any better, and you tell the man he can start to fucking you now with a forced, fake smile on your face.'
 								'He''s still careful at first, but soon forgets about your suffering and accelerates more and more. The man groans loudly while he hammers his cock inside your ass, ignoring your crying and mewling underneath him.'
@@ -718,8 +714,7 @@ if $ARGS[0] = 'work2':
 										*clr
 										money += ProsMoney * 100
 										pcs_mood -= 30
-										pcs_health -= 30
-										pcs_willpwr -= 30
+										pcs_health -= pcs_health/5
 										pcs_throat += 1
 										spafinloc = 12
 										gs 'cum_manage'

+ 1 - 1
locations/Serge_Shulgin.qsrc

@@ -137,7 +137,7 @@ if $ARGS[0] = 'hide':
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvporn'+rand(1,5)+'.mp4" width="748" height="540"></video></center>' 
 					'You switch to the porn channel and put the remote away. Sergey is a bit surprised you would want to watch this, but says nothing.'
 					if pcs_horny > 30: 'You feel Sergey''s body shifting a lot during a particularly rough part of the porn scene, and he''s awkwardly covering his groin with his hands. The large bulge in his pants gives away his obvious erection anyway.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'porn', 10
 					gs 'arousal', 'end'
 					act 'Get out of bed': gt 'shulgabed'
 					if npc_rel['A112'] > 70 and pcs_horny > 30 and mesec <= 0: 

+ 0 - 512
locations/SoniaHome.qsrc

@@ -1,512 +0,0 @@
-# SoniaHome
-!! This house was created for the Niko Volkov romance, but I made sure to make it compatible for, use on its own, but it is VERY IMPORTANT that all new acts, or code added to this location has a "if NikoAftermath = 0" requirement added to them, or else it will break my quest. Please don''t break my quest. Please.  :(	<3 Violet Kitten   Feel free to PM me, if you have any further questions. ^_^
-
-if $ARGS[0] = 'Aftermath':
-	cls
-	if npc_rel['A25'] < 90:npc_rel['A25'] = 90
-	if npc_rel['A12'] < 90:npc_rel['A12'] = 90
-	if npc_rel['A14'] < 90:npc_rel['A14'] = 90
-	pcs_hairbsh = 0
-	pcs_makeup = 1
-	pcs_sleep += 45
-	cumspclnt = 1
-	gs 'cum_cleanup'
-	gs 'sweat', 'add', 5
-	minut += 270
-	NikoAftermath = 1
-	$location_type = 'private'
-	$locclass = 'bedr'
-	menu_off = 1
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/soniawake.jpg"></center>'
-	'You slowly open your eyes, and see Sonia Ivanko holding a weird doll, with a goofy look on her face, causing you to giggle. "Hello sleepy head. Did you sleep well?" You give Sonia a warm smile. "I guess but...Where am I?" Sonia replies, "After what happened at school, we couldn''t just leave you alone, to be abused by the boys, so we brought you back to my house." You scratch your head. "We?" Sonia giggles, as she points to her right. You turn to see Katja Meynold, and Julia Milov sitting on the seats right next to the bed. Katja says, "I''m so glad that you are ok. I was worried when you didn''t wake up after we kept splashed your face with water." Julia adds, "I also cleaned your hair for you."'
-	*nl
-	'You look around the room then back at Sonia. "Thank you all, for helping me. I can''t believe what happened in school was not a dream. I want it to be a dream, so bad." You can feel tears forming under your eyes. Katja hugs you, as she says, "I don''t know what caused it, but we will find a way to make things better. You didn''t deserve what they did to you." Sonia whispers to herself, "Do any of us?" Julia downcasts her eyes, not knowing how to console Sonia while Katja sighs, "What is going at school these days, first Sonia then <<$pcs_firstname>>. These boys are vicious." You reply, "Yes they are." Julia places her hand on your leg, "<<$pcs_firstname>> what happened exactly?"'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-
-	act 'Tell them your story':
-		cls
-		minut += 5
-		gs'stat'
-		'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-		'You take a deep breath, "It all stared when I met a boy named Nikolai. He..." Katja cuts you off, "Wait, do you mean that gopnik punk, Niko? You can''t trust that loser." Julia nods, "She''s right. That boy is bad news. He is always lying to everyone. Even the other boys know, not to trust him." You look up, surprised by their opinions of Niko. "But he treats me with such love and compassion. He always calls me his princess." Katja places her arms around you neck. "Listen <<$pcs_nickname>>, you can go out with whoever you want. I am just concerned that he will use you." You lay back, as you consider your options, Julia asks, "So how did you end up...naked at school?"'
-		*nl
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
-
-		act 'Continue your story':
-			cls
-			minut += 5
-			gs'stat'
-			'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
-			'"Niko is always teaching me how to be more confident, and daring. He tells me to do things that are very scary at first, but end up being very exciting. I don''t know why it excites me so much, but I feel so alive when I am with Niko. He always makes me feel safe, and he tells me..." Katja cuts you off. "Makes you feel safe? Like how he kept you safe today?" You lower your head, and remain silent, for a few seconds before Katja says, "I''m sorry <<$pcs_firstname>>, I just get so angry when I see good people getting used by assholes like him. Continue your story, please."'
-			*nl
-			'You take a second before continuing your story. "He helps me find my confidence, and break out of my safety bubble. I''m alway trying something new, and facing my fears. I...I just don''t know what to do without him. Niko always guides me in bettering myself, and feeling so alive." Sonia places her hand on your shoulder, "If Niko is the one in your heart then stay with him..." Katja immediately cuts Sonia off, "Stay with that freak who striped her down, and let those gopnik punks, rape her?" Julia calms her. "We might not like him, but it is <<$pcs_firstname>>''s decision, and we can''t control her. We can only give her our advice, and hope that she makes the right decision, on her own."'
-			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/julia.jpg"></center>'
-
-			act 'Continue':
-				cls
-				gs'stat'
-				'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-				'You lightly grip your hair, as you respond, "I just...need to think about this, for a while." Sonia stands up, and says, "Well I''ll make us something to eat, I hope you all have a sweet tooth." Sonia then walks to the door then motions the other girls to follow her. Katja gets up then tells you, "I''m sorry that I have been a bit stern, I just don''t want to see what happened today repeat itself. When you finish resting then come see me ok? We can have a nice chat together, and don''t worry, I won''t lecture you again." Julia adds, "Come see me too, I would like to speak with you. Now get some rest." The girls leave the room, and you lay down then close your eyes...'
-				'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-
-				act 'Rest':gt 'NikoDreams', 'Woods'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'Aftermath 2':
-	cls
-	music_loop = 0
-	close all
-	pcs_sleep += 10
-	gs 'sweat', 'add', 10
-	minut += 60
-	gs'stat'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	'You quickly jump up, and see Katja with a concerned look on her face. "It''s ok <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope this doesn''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. Don''t worry." You giggle when you notice the goofy doll that Sonia had was tucked in right next to you. Katja responds, "Now that''s what I like to see, a fresh smile."'
-	*nl
-	'You both giggle before Katja tells you, "Sonia should be done soon making whatever she''s cooking in there. Every time I ask, the only reply she gives me is: "All in good time." So I guess that it''s a mystery. You should wash up in the shower before we eat because Sonia told me that she wants us out before her mother gets home. You should also speak with Julia. She seems very worried about you." You give Katja a nod, as you climb out of bed.'
-
-	act 'Get up':gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Hallway':
-	cls
-	if NikoAftermath = 0:minut += 5
-	$location_type = 'private'
-	killvar '$locclass'
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hallway.jpg"></center>'
-	'This is the central hallway that connect the house. There is a lot of artwork on the walls, and the house smells lovely.'
-	if VKSoniaChat = 1 and SoniaCupcake = 2 and NikoAftermath = 1:
-		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat''">Sonia</a> is standing next to the front door, as she adjusts her bra.'
-		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	elseif VKSoniaChat = 2 and SoniaCupcake = 2 and VKJuliaChat < 4 and NikoAftermath = 1:
-		'<a href="exec:gt ''SoniaHome'', ''Sonia Chat 2''">Sonia</a> is standing next to the front door, as she browses the web, on her phone.'
-		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	elseif VKJuliaChat = 4 and NikoAftermath = 1:
-		'Sonia is standing next to the front door, as she browses the web, on her phone.'
-		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	end
-
-	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-
-	act 'Kitchen':
-		$locclass = 'kitr'
-		if SoniaCupcake = 0 and NikoAftermath = 1:
-			gt 'SoniaHome', 'Sonia Cooking'
-		elseif SoniaCupcake = 1 and NikoAftermath = 1:
-			gt 'SoniaHome', 'Cupcake Time'
-		else
-			gt 'SoniaHome', 'Kitchen'
-		end
-	end
-
-	act 'Livingroom':gt 'SoniaHome', 'Livingroom'
-end
-
-if $ARGS[0] = 'Bedroom':
-	cls
-	$metka = 'Bedroom'
-	$loc = 'SoniaHome'
-	$metkaM = 'Bedroom'
-	$locM = 'SoniaHome'
-	$location_type = 'private'
-	$locclass = 'bedr'
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bedroom/bedroom.jpg"></center>'
-	'Sonia has such a cute bedroom, so clean and well organized. Sonia has an expensive standing <a href="exec:gt ''mirror'', ''start''">mirrors</a>, and she even has a packed <a href="exec:gt ''SoniaHome'', ''Shoe Closet''">shoe closet</a>.'
-	if VKKatjaChat = 0 and NikoAftermath = 1:
-		'<a href="exec:gt ''SoniaHome'', ''Katja Chat''">Katja</a> is standing in front of a mirror, checking herself out from different angles.'
-	elseif SoniaCupcake < 2 and VKKatjaChat = 1 and NikoAftermath = 1:
-		'<a href="exec:gt ''SoniaHome'', ''Katja Chat''">Katja</a> is standing in front of a mirror, tweezing her eyes brows while humming a soothing tune.'
-	elseif SoniaCupcake = 2 and VKKatjaChat = 1 and NikoAftermath = 1:
-		'<a href="exec:gt ''SoniaHome'', ''Katja Chat 2''">Katja</a> is laying on the bed while humming a sweet melody.'
-	end
-
-	act 'Sonia Bathroom':
-		if VKKatjaChat = 0 and NikoAftermath = 1:
-			gt 'SoniaHome', 'Katja Chat'
-		elseif VKSoniaChat = 0 or VKJuliaChat = 0 and NikoAftermath = 1:
-			gt 'SoniaHome', 'Katja Reminder'
-		else
-			gt 'SoniaHome', 'Sonia Bathroom'
-		end
-	end
-
-	act 'Leave room':gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Sonia Cooking':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake1.jpg"></center>'
-	if VKSoniaChat = 1:
-		'As soon, as you enter the kitchen Sonia shoos you away. "No peeking. It will be ready when it''s ready. Be patient."'
-	else
-		'You walk into the kitchen, and smell something lovely, Sonia notices you enter then stands in front of a tray while saying, "Hey no peeking!" She giggles before saying, "I''m glad that you rested well, I am making us a special treat, and it won''t be ready for another 20 minutes, so why don''t you jump in the shower, and get washed up? I should be done by then." You give Sonia a warm smile as you walk out of the kitchen.'
-	end
-
-	act 'Leave':VKSoniaChat = 1 & gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Cupcake Time':
-	cls
-	minut += 15
-	pcs_health += 10
-	pcs_willpwr += 25
-	pcs_mood += 25
-	pcs_energy += 40
-	pcs_hydra += 40
-	fat += 2
-	cumspclnt = 2
-	$locclass = 'kitr'
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/kitchen/soniacupcake2.jpg"></center>'
-	'You walk into the kitchen, as Katja, and Juila enter. You all take a seat at the table just as Sonia approaches with a tray of cupcakes. Katja says, "So.. cupcakes were your secret treat." Sonia responds, "Sometimes the most simple treat, can be the greatest surprise." Julia takes a bite of a cupcake then responds, "Thank you Sonia. These cupcakes are so tasty." Sonia nods with a warm smile on her face. "I''m glad that you like them. now eat up everyone." You all spend the next 15 minutes, eating cupcakes while chatting about various topics.'
-
-	act 'Finish eating':
-		cls
-		SoniaCupcake = 2
-		gs'stat'
-		'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
-		'After you all finish your cupcakes, Katja stands up and says, "I had a great time but it''s getting late. I better get going. I''m going to use the restroom before I go." Katja walks out of the room as she waves at everyone. Julia gets up next and says, "We should get going too <<$pcs_firstname>>. Sonia''s mother should be coming home soon, and we''d only disturb her." Sonia nods, as she responds, "I''ll be waiting by the front door when you are ready to go, and before you go, can you do me a favor and make sure that Katja doesn''t use all my hair care products. I told her she can use some, but that girl keeps "Sampling" each one." Julia adds, "When you have a moment please see me in the living room. I have something I would like to ask you." You nod at Julia, as she, and Sonia walk out of the kitchen.'
-		'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-
-		act 'Stand up':gt 'SoniaHome', 'Kitchen'
-	end
-end
-
-if $ARGS[0] = 'Kitchen':
-	cls
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen/kitchen.jpg"></center>'
-	if NikoAftermath = 1:
-		'Sonia''s kitchen is nice, and clean with plenty of potted plants, and other decorations. There seems to be a lot of cooking ingredients scattered around. Sonia must have been making these cupcakes in a hurry.'
-	else
-		'Sonia''s kitchen is nice, and clean with plenty of potted plants, and other decorations.'
-	end
-
-	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Livingroom':
-	cls
-	$locclass = 'livingr'
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/livingroom/livingroom.jpg"></center>'
-	'Sonia''s living room look quite elegant, and refined. It almost looks like it had an interior decorator design it.'
-	if SoniaCupcake < 2 and NikoAftermath = 1:
-		'You can see <a href="exec:gt ''SoniaHome'', ''Julia Chat''">Julia</a>, leaning against the fireplace. She appears lost in thought.'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia1.jpg"></center>'
-	elseif SoniaCupcake = 2 and VKJuliaChat < 3 and NikoAftermath = 1:
-		'You can see <a href="exec:gt ''SoniaHome'', ''Julia Chat 2''">Julia</a>, leaning against the fireplace, as she runs her fingers through her hair.'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
-	elseif VKJuliaChat = 4 and NikoAftermath = 1:
-		'You can see <a href="exec:gt ''SoniaHome'', ''Julia Chat 3''">Julia</a>, leaning against the fireplace. She look to you with a warm smile.'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
-	end
-
-	act 'Hallway':gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Sonia Bathroom':
-	cls
-	$metka = 'Sonia Bathroom'
-	$loc = 'SoniaHome'
-	$metkaM = 'Sonia Bathroom'
-	$locM = 'SoniaHome'
-	$location_type = 'bathroom'
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom/bathroom.jpg"></center>'
-	'This bathroom is very clean, and well organized with a sink, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and a shower.'
-
-	if SoniaCupcake = 0 and NikoAftermath = 1:
-		act 'Take a shower':SoniaCupcake = 1 & gt 'SoniaHome', 'Sonia Shower'
-	elseif NikoAftermath = 0:
-		act 'Take a shower':gt 'SoniaHome', 'Sonia Shower'
-	end
-
-	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-end
-
-if $ARGS[0] = 'Sonia Shower':
-	cls
-	pcs_hairbsh = 0
-	pcs_makeup = 1
-	minut += 20
-	cumspclnt = 1
-	gs 'cum_cleanup'
-	if sweat > 14: sweat = 10 + rand(0,4)
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/shower/wash.jpg"></center>'
-	'You climb into the shower, and begin lathering your body, cleaning yourself, as thoroughly, as possible before turning off the water. You grab a spare towel, and begin drying yourself off before getting dressed then leaving the bathroom.'
-	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-	act 'Bedroom':gt 'SoniaHome', 'Bedroom'
-end
-
-if $ARGS[0] = 'Shoe Closet':
-	cls
-	if SoniaShoesDay ! daystart:pcs_mood += 20 & SoniaShoesDay = daystart
-	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bedroom/shoes.jpg"></center>'
-	'Sonia has so many shoes. She must be very wealthy, and everything is so well organized. I wonder which is her favorite pair of heels.'
-
-	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end
-
-if $ARGS[0] = 'Sonia Chat':
-	cls
-	VKSoniaChat = 2
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	'As you are approaching Sonia, she looks up from her phone then flashes you a warm smile, as she says, "I hope that you are holding up alright. I remember the time at the disco. I was so terrified when I got home, and the next day at school was...terrible. All of my friends turned on me. No one lent me a hand, or even cared about what happened to me. Imagine losing all of your friends overnight. I made sure that same didn''t happen to you. At least you will still have some of your friends to support you." You lightly grab onto Sonia''s arm, as you feel tears dripping down your cheeks. "Thank you Sonia. I''m...I''m so sorry for not helping you at the disco. I was so scared of the boys, and...I was a coward." Sonia brushes your tears away.'
-	*nl
-	'"Don''t worry, there was nothing you could do anyway. I have come to terms with my situation, and even have fun sometimes. Everyone likes to be in control of their body, and make all choices themself, but sometimes letting someone else make choices for you, can lead to a much simpler, and exciting life. I never know what tomorrow will bring. That is why I believe that if you want to truly live your life then you need to throw caution to the wind, and accept any opportunities that come your way." You nod, as you reply, "I think I understand, By letting someone else choose my path then I can make things easier for me, and I will have the freedom to sleep with anyone I want, without worry of my reputation being ruined."'
-	*nl
-	'Sonia nods, "Exactly, living a life of freedom, and mystery with no fear of ever being bored." You think to yourself, <font color=#FF00FF>With Niko, I can live this life. A life of freedom and excitement. By destroying my reputation Niko may have freed me from my shackles. I have really enjoyed being fucked by all those boys. I just didn''t know it at the time. This could be my new life.</font> You smile, as you say, "Thank you again Sonia, I have much to think about." Sonia replies, "I''m sure you do."'
-	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-
-	act 'Walk away':gt 'SoniaHome', 'Hallway'
-end
-
-if $ARGS[0] = 'Sonia Chat 2':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/sonia.jpg"></center>'
-	if VKKatjaChat < 2 or VKJuliaChat < 2:
-		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go or would you like to talk to the other girls before leaving?"'
-		act 'Stay to chat with Julia, and Katja':gt 'SoniaHome', 'Hallway'
-		act 'Leave house':gt 'SoniaHome', 'Sonia Goodbye'
-	else
-		'You walk up to Sonia, and she flashes you a warm smile. "So are you ready to go?"'
-		act 'Not yet':gt 'SoniaHome', 'Hallway'
-		act 'I''m ready':gt 'SoniaHome', 'Sonia Goodbye'
-	end
-end
-
-if $ARGS[0] = 'Sonia Goodbye':
-	cls
-	if grupTipe[61] = 4:grupTipe[61] = 600
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-	'You walk out of the door, as Sonia says, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. what''s the point of living a boring life?" You nod at Sonia, "Thank you for everything Sonia. I owe you all so much." Sonia replies, "It was no trouble at all. Goodbye <<$pcs_firstname>>." Sonia then closes the door.'
-
-	act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
-end
-
-if $ARGS[0] = 'Katja Chat':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja2.jpg"></center>'
-	if VKKatjaChat = 0:
-		pcs_makeup = 3
-		'As you approach Katja, she waves you over. You stand next to her before she walks around you while keeping her eyes on the mirror. "Let''s gussy you up." Katja reaches into her hand bag then takes out her compact makeup case. She pulls out her brush then begins applying some makeup on you, for a few seconds before saying, "Look at that pretty girl in the mirror. Isn''t she lovely?" You reply, "I agree, she is so pretty, but what about me?" Katja smirks, as she places her fingertip on your nose. "I was referring to you, silly." You both giggle before Katja asks, "So, how are you holding up?" You reply, "I have a lot to think about." Katja responds, "Make sure that you take your time, and think carefully about your future because one wrong decision, can go a long way." You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders,'
-		*nl
-		'"No one can change who you are beside you. Remember that. Anyway you should take a shower before Sonia finishes making her "Secret Treat." That she won''t tell me about. You would think that she is preparing human flesh...You don''t think...?" You poke Katja in her arm as you reply, "Oh stop." She giggles, as she pulls out her tweezers then begins plucking her eyebrows while telling you, "Oh, by the way, Julia wanted to speak to you, she seems very worried about you. She is such a sweet girl. It''s a shame that she isn''t more talkative in school." You reply, "I agree. I will go speak with her." You then give Katja a nod before stepping away.'
-		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-		act 'Walk away':VKKatjaChat = 1 & gt 'SoniaHome', 'Bedroom'
-	else
-		'You approach Katja and she continues tweezing her eyebrow as she tells you, "You should talk to Julia then shower before Sonia''s mother gets home. You also check up on Sonia. I''m sure that she will be glad to see you walking around." You nod as you walk toward the hallway.'
-		act 'Walk away':gt 'SoniaHome', 'Hallway'
-	end
-end
-
-if $ARGS[0] = 'Katja Chat 2':
-	cls
-	VKKatjaChat = 2
-	gs'stat'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	'You sit down next to Katja, and she turns to you. "I know that I said that I wouldn''t lecture you, but that boy Niko is not what he seems. He doesn''t care about you, he is just trying to use you. I only tell you this because I care about you. Don''t let this punk corrupt you." You look at your feet whie you consider what she said. Katja begins rubbing on your shoulders, "You can do better then him <<$pcs_firstname>>. Don''t let him trick you into believing otherwise. I just needed to tell you that before I left. Please stay safe <<$pcs_firstname>>. You are too good a girl to be used like that." Katja gets up then waves goodbye, as she walks out of the bedroom.'
-
-	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end
-
-if $ARGS[0] = 'Katja Reminder':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#ff0090><<"Katja Meynold">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/bedroom/katja.jpg"></center>'
-	'As you approach the bathroom door, Katja turns to you then says, "Have you spoken to Julia and Sonia? They were both worried about you, and would love to see you up and about." You reply, "I haven''t yet but I will visit them right now. i wouldn''t want to leave them to worry about me." You turn around, and walk away.'
-
-	act 'Walk away':gt 'SoniaHome', 'Bedroom'
-end
-
-if $ARGS[0] = 'Julia Chat':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	if VKJuliaChat = 0:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
-		'As soon as you approach, Julia turns to you before flashing you a smile. "<<$pcs_firstname>> you''re up. How are you feeling?" You return the smile, as you reply, "I''m feeling much better. i hope I didn''t worry you." Julia giggles before replying, "I''m just glad that you''re ok. I have never seen anyone go through as much as you did today, but I''m sure everything will work out in the end." You reply, "I can only hope." Julia responds, "Try not to let things get to you." You reply, "Don''t worry I won''t." Julia says, "Good, I will always be around, if you want to talk."'
-		*nl
-		'You respond, "Thank you, for everything you all have done for me. I shutter to think of what would have happened to me, if you weren''t around." Julia replies with a warm smile before saying, "You are very welcome. Now you should take a relaxing shower before Sonia finishes with her treats."'
-		act 'Walk away':VKJuliaChat = 1 & gt 'SoniaHome', 'Livingroom'
-	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
-		'When you approach Julia, she says, "Is there something else you need?" You reply, "I just wanted to know where the bathroom is." Julia points toward the bedroom. "Sonia''s bathroom is in her bedroom...I wish I had a bathroom in my bedroom." You reply, "As do I." You both giggle before you walk back into the hallway.'
-		act 'Walk away':gt 'SoniaHome', 'Hallway'
-	end
-end
-
-if $ARGS[0] = 'Julia Chat 2':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
-	'As you approach Julia, she asks, "How did you like the cupcakes? I found them very tasty." You reply, "They were super yummy, Sonia could win a cooking contest, if we had those, that is." Julia giggles before asking, "We are going to be leaving in a bit, and I wanted to ask you...Would you like to walk home with me?"'
-
-	act 'I would love too':
-		cls
-		VKJuliaChat = 4
-		gs'stat'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia3.jpg"></center>'
-		'Julia''s eyes light up, as she responds, "Great are you ready to head out now or would you like to speak to Sonia, or Katja first?"'
-
-		act 'Stay to chat with Sonia, and Katja':gt 'SoniaHome', 'Livingroom'
-
-		act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-	end
-
-	act 'I can''t right now':
-		cls
-		VKJuliaChat = 3
-		gs'stat'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
-		'"I would love too, but I have other places I need to be today, maybe next time." Julia lowers her head, "Ok I guess...Just stay safe <<$pcs_firstname>>. I...I''m concerned for you." You reply, "That is really sweet Julia, but I''m fine." Julia responds, "I''m glad to hear that. Goodbye <<$pcs_firstname>>." Julia then walks out of the house while giving both, you, and Sonia a friendly smile.'
-
-		act 'Wave goodbye':gt 'SoniaHome', 'Livingroom'
-	end
-end
-
-if $ARGS[0] = 'Julia Chat 3':
-	cls
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/livingroom/julia2.jpg"></center>'
-	'As you walk up to Julia, she asks, "Would you like to leave now?"'
-
-	act 'Leave house with Julia':gt 'SoniaHome', 'Julia Walk'
-
-	act 'Not yet':gt 'SoniaHome', 'Livingroom'
-end
-
-if $ARGS[0] = 'Julia Walk':
-	cls
-	minut += 5
-	NikoAftermath = 0
-	gs'stat'
-	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/soniahome/soniasmile.jpg"></center>'
-	'You, and Julia begin walking toward the front door. Sonia asks, "Are you two ready to head out?" You both nod simultaneously as Sonia holds the door open for you. As you are walking past Sonia, she leans forward then whispers in your ear, "Don''t forget what I said earlier. Whatever makes you happier, is the path you should follow. What''s the point of living a boring life?" She then gives you a wink, as you and Julia head into town.'
-
-	act 'Continue walking':
-		cls
-		gs'stat'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
-		'You and Julia continue walking in silence until you begin walking past the park when Julia asks, "Would you like to stop by the park?"'
-
-		act 'Sure':gt 'SoniaHome', 'Julia Park'
-
-		act 'It''s getting too late':
-			cls
-			minut += 10
-			gs'stat'
-			'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/sad1.jpg"></center>'
-			'Julia lowers her head, "Oh, ok then, sorry for asking." You both walk home in silence. When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to do whatever you feel is right. Goodbye." You wave goodbye to Julia, as she walks away.'
-
-			act 'Enter your apartment':gt 'korrPar'
-		end
-	end
-end
-
-if $ARGS[0] = 'Julia Park':
-	cls
-	minut += 5
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
-	'You, and Julia walk through the park while having small talk until you sit down on a bench, and Julia sits down next to you. Julia smiles, as she asks, "What do you plan to do with Niko?" You reply, "I don''t know yet. I need to sleep on it." Julia nods slowly, "I guess that''s fair, I''m just worried about you. No one can go through what you did, and be unphased." You nod, as you reply, "Nothing will be the same, I know that, but I can still choose where I go from here." Julia places her hand on your knee. "You don''t need to be alone in this. If you ever need anything then you can always talk to me." You give Julia a warm smile as you reply, "That''s so sweet of you, but why do you care so much about what happens to me? I''m no one special."'
-	*nl
-	if SexTalkJulia = 4 or JuliaMilovQW >= 10:
-		'"I..um..care for you, I..." Julia remains silent for a few seconds, as she rubs her arm while staring at the ground, in front of her.'
-		act 'Kiss her':VKJuliaKiss = 1 & gt 'SoniaHome', 'Julia Kiss'
-		act 'Change subject':gt 'SoniaHome', 'Julia Park 2'
-	else
-		'"I just couldn''t leave you like that. You looked so scared, and helpless. I needed to help in any way I can." You place your hand on her knee, "Thank you Julia. You saved me." Julia''s face grows red, as she replies, "I didn''t do it alone, but you''re welcome." Julia gives you a meek smile.'
-		act 'Continue talking':gt 'SoniaHome', 'Julia Park 2'
-	end
-end
-
-if $ARGS[0] = 'Julia Park 2':
-	cls
-	minut += 15
-	gs'stat'
-	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
-	'You, and Julia continue chatting for a few minutes before Julia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home.  When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Julia, as she walks away.'
-
-	act 'Enter your apartment':gt 'korrPar'
-end
-
-if $ARGS[0] = 'Julia Kiss':
-	cls
-	gs'stat'
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
-	'You place your hand on Julia''s cheek then gently pull her face to yours. You both share a passionate kiss for what feels like two minutes. After you finish, you both stare into each others eyes, as you whisper to her, "Thank you for saving me Julia. i will never forget what you have done for me." Julia''s face is very red, as she replies, "I would do anything for you. You only need to ask." You reply, "You''re so sweet Julia, and I am so lucky to have you." Julia gives you a trembling smile before she quickly darts forward, giving you another passionate kiss.'
-	*nl
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/park/kiss1.mp4"></video></center>'
-	gs 'arousal', 'kiss', 5
-	gs'stat'
-
-	act 'Finish kissing':
-		cls
-		gs'stat'
-		'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/love/park/julia1.jpg"></center>'
-		'After a long passionate kiss, Julia begins giggling playfully then checks her phone before saying, "It''s getting late, maybe we should start heading home." You reply, "Sure, let''s walk home." As you are walking home, Julia wraps her fingers around yours then gives you an innocent smile. When you arrive at your apartment, Julia says, "Please stay safe <<$pcs_firstname>>, I care for you so much... Just remember to follow your heart, and I''m sure that everything will work out for you. Have a good night." Julia then gives you a soft kiss before walking away while looking back at you with an innocent smile.'
-		*nl
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/julia/love/kiss1.mp4"></video></center>'
-		gs 'arousal', 'kiss', 10
-		gs 'arousal', 'end'
-		gs'stat'
-
-		act 'Enter your apartment':gt 'korrPar'
-	end
-end
-
---- SoniaHome ---------------------------------
-

+ 12 - 6
locations/Vika.qsrc

@@ -83,11 +83,17 @@ if hour < 20:
 	end
 
 	if vikasex > 0 and npc_rel['A220'] > 40:
-		act 'Suggest you do something fun':
-			minut += 60
-			npc_rel['A220'] += 5
-			$sexloc = 'obroom'
-			gt'lezbsex','start'
+		gs 'willpower', 'cuni', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Suggest you do something fun (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
+				minut += 60
+				npc_rel['A220'] += 5
+				$sexloc = 'obroom'
+				gt'lezbsex','start'
+			end
+		else
+			act 'Suggest you do something fun (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 
@@ -152,7 +158,7 @@ if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut
 	'You''re a little embarrassed, but you quickly strip off your clothes until you are naked and put the teddy on. It looks even more sheer on your body, it hides absolutely nothing, your nipples, even your pussy lips are clearly visible. You turn and model it for Vika, a nice gift but definitely not for everyday life gift.'
 	'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on, we need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room, as you struggle to get the robe on in time.'
 
-	act'Where are we heading?':gt'univer_din','b_vika_present_start'
+	act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
 	exit
 end
 

+ 4 - 4
locations/Voltrenersex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex1.jpg"></center>'
-	'You go to the coaches office just as you open the door an arm reaches out and grabs you by the hand and pulls you inside.'
+	'You go to the coaches office. Just as you open the door, an arm reaches out and grabs you by the hand and pulls you inside.'
 
 	gs 'boyStat', 'A69'
 	silavag = 2
@@ -32,17 +32,17 @@ end
 
 if $ARGS[0] = 'talk':
 	if Voltrenersee = 1:
-		'With a puzzled look on face you look at your coach, he looks at you then let''s go of your hand, and mumbles something: "You have a good technique <<$pcs_lastname>>", with each word his voice becomes more confident "You need to train more. At some point later, I will show you some more techniques, to improve your game." With an even more puzzled look on your face, you turned around and walked out'
+		'With a puzzled look on your face you look at your coach, he looks at you then let''s go of your hand and mumbles something, "You have a good technique <<$pcs_lastname>>." With each word his voice becomes more confident, "You need to train more. At some later point, I will show you some more techniques, to improve your game." With an even more puzzled look on your face, you turn around and walk out'
 	end
 	if Voltrenersee = 2:
-		'Pulling you in and closing the door the coach whispered angrily: "<<$pcs_lastname>> is this what you asking for?", blushing you ran out of the coaches office away from Mikhail Nikolaevich. Although you desire to play on the first team. You''re not ready for something more.'
+		'Pulling you in and closing the door the coach whispered angrily: "<<$pcs_lastname>> is this what you''re asking for?" blushing you run out of the coaches office, away from Mikhail Nikolaevich. Although you desire to play on the first team, you''re not ready for something more.'
 	end
 	if Voltrenersee => 3:
 		cls
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex2.jpg"></center>'
-		'Vigorously shaking his head Mikhail Nikolaevich, closes the door, the coach turned to you and did not say a word, grabbed you and began to lift up your shirt, and paw at your <<$titsize>> breasts.'
+		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you and doesn''t say a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
 		if guy < 3 and pav_slut <= 25: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
 		if (guy >= 3 and guy < 7) or pav_slut > 25: 'You stand and wait until the coach is done playing with your breasts.'
 		if guy >= 7  or pav_slut > 50:

+ 2 - 0
locations/_face_image.qsrc

@@ -1,5 +1,7 @@
 # $face_image
 
+!!use with - <img <<$set_imgh>> src="<<FUNC(''$face_image'')>>">
+
 if player_avatar = 1:$RESULT = 'images/avatar.jpg' & exit
 
 !! These images are missing from my copy of the image folder, so I am commenting them out for now

+ 127 - 90
locations/abduction.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	'"Shut up, slut. Usually we torture you for fun as long as we want. When you become broken enough, we sell you to the highest bidder."'
 	'"You cannot do this to me! It''s illegal!'
 	'"Ha, who do you think are our best customers? Politicians, police officers, businessmen... We have our cover. So you should shut up and get used to it!"'
-	'The man leaves without saying another word, even as you are cry and yell at him...'
+	'The man leaves without saying another word, even as you cry and yell at him...'
 	gs 'underwear', 'remove'
 	painkiller_bak = painkiller
 	prezik_bak = prezik
@@ -106,7 +106,7 @@ if $ARGS[0] = 'abdSomeoneComing':
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/downstairs2.jpg"></center>'
-	'Steps can be heard - someone is coming down the stairs.'
+	'You hear the sound of footsteps getting louder - someone is coming down the stairs.'
 
 	if pcs_leghair > 3 or pcs_pubes > 3:
 		minut += 20
@@ -128,30 +128,31 @@ if $ARGS[0] = 'abdSomeoneComing':
 		if broken = 0:
 			'You start to tremble in fear of what is going to happen to you next.'
 			act 'Cower in panic on your bed':gt 'abduction', 'abdRape'
+			
+			if rapeCount >= 5: act 'Plead that you cannot bear anymore rough treatment':gt 'abduction', 'abdBreak1'
+		else
+		
 		end
 
-		if rapeCount >= 5 and broken = 0:
-			act 'Plead that you cannot bear anymore rough treatment':gt 'abduction', 'abdBreak1'
-		end
-
-		saleChance = (broken + tortureCount + rapeCount + abdCustomerCount) - 20
-		if broken >= 1:
-			saleChanceRand = rand(1, 100)
-			customerChance = rand(1, 100)
-			painkillerChance = rand(1, 100)
-			buyoutChance = rand(1, 100)
+		buyoutChance = (broken + tortureCount + rapeCount + abdCustomerCount) - 20
+		saleChance = (broken + tortureCount + rapeCount + abdCustomerCount) - 10
+		if broken > 0:
+			saleChanceRand = rand(1,100)
+			customerChance = rand(1,100)
+			painkillerChance = rand(1,100)
+			buyoutChanceRand = rand(1,100)
 			if broken < 10:
 				act 'Welcome back, Master.':gt 'abduction', 'abdBrokenAsk'
 			elseif (broken >= 10 and abdTools = 0):
 				act 'Welcome back, Master.':gt 'abduction', 'abdBrokenGiveTools'
 			else
 				if customerChance <= 50:
-					act 'Welcome back, master':gt 'abductionCustomer', 'abdCustomerGate'
+					act 'Welcome back, Master':gt 'abductionCustomer', 'abdCustomerGate'
 					abdCustomerCount += 1
-				elseif abdCustomerCount > 5 and buyoutChance <= (2 * abdCustomerCount):
+				elseif abdCustomerCount > 5 and buyoutChanceRand <= (2 * buyoutChance):
 					act 'Welcome back, Master':gt 'abductionCustomer', 'abdCustomerGateBuyout'
 				else
-					if abdCustomerCount > 5 and saleChanceRand <= (2 * abdCustomerCount):
+					if abdCustomerCount > 5 and saleChanceRand <= (2 * saleChance):
 						'Master: "I have some good news for you slave."'
 						act 'Yes Master?':gt 'abduction', 'abdBeSold'
 					else
@@ -172,10 +173,21 @@ if $ARGS[0] = 'abdExamStart':
 	menu_off = 1
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/examroom.jpg"></center>'
-	'You are unblinded in a very bright room, at first not able to see anything.'
+	'The blindfold is removed and you find yourself in a small white room. It is very bright and at first you can barely see.'
 	'As your eyes adjust, you can see that it is some kind of examination room, distantly reminding you of a gynecologists office.'
 	'The man orders you to sit in the chair.'
-	act 'Resist':gt 'abduction', 'abdExamResist'
+	
+	gs 'willpower', 'misc', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Resist (<<will_cost>> Willpower)':
+			gs 'willpower', 'misc', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'abduction', 'abdExamResist'
+		end
+	else
+		act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Obey':gt 'abduction', 'abdExamObey'
 end
 
@@ -185,10 +197,10 @@ if $ARGS[0] = 'abdExamResist':
 	'<center><video autoplay loop src="images/locations/shared/abduction/examslap.mp4"></video></center>'
 	'Being scared of what they''ll do to you, you start yelling and shaking to get loose of the leash.'
 	'Your captor is very strong and your leash and cuffs make your attempt futile.'
-	'He catches you, knocks you down to the ground and slaps your face hard.'
+	'He grabs you, knocks you down to the ground and slaps your face hard.'
 	'"You''re only making it harder, bitch."'
-	'With these words he grabs you like you weigh nothing and throws you on the chair and restrains you.'
-	'He then sits down in a chair opposite to you, located in the far corner of the room.'
+	'With these words he picks you up like you weigh nothing, pushes you in the chair and restrains you.'
+	'He then sits down in a chair over in the far corner of the room.'
 	act 'Continue':gt 'abduction', 'abdExam1'
 end
 
@@ -198,7 +210,7 @@ if $ARGS[0] = 'abdExamObey':
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/examsit.jpg"></center>'
 	'Willingly, like a slave you obviously just became, you climb up the chair and lie there, wondering what perverse things are going to happen to you.'
 	'The man ties you up anyway, probably to make sure you don''t try to escape after they start. It makes you even more nervous.'
-	'He then sits down in a chair opposite to you, located in the far corner of the room.'
+	'He then sits down in a chair over in the far corner of the room.'
 	act 'Continue':gt 'abduction', 'abdExam1'
 end
 
@@ -217,7 +229,9 @@ if $ARGS[0] = 'abdExam1':
 		'"Heh, I see."'
 		'He continues in the usual report of his findings.'
 	end
-	"Regarding her usage levels, her throat is <<$throattipe>>. <<$pcs_ass>>."
+	'He continues to examine every inch of you. "Regarding her usage levels:"'
+	'He shines a light in your mouth, and says, "Her throat is <<$throattipe>>."'
+	'Next he feels a finger around your ass, "And her ass is <<$anustipe>>."'
 	'He pulls his finger out of your ass and finally reaches for your pussy.'
 	if pcs_vag = 0:
 		'"Oh, and you''ll like this; Her pussy is a virgin one."'
@@ -225,7 +239,7 @@ if $ARGS[0] = 'abdExam1':
 	else
 		'"And her pussy is <<$vaginatipe>>.'
 	end
-	'The doctor leaves your body alone and prepares several needles filled with unknown fluids.'
+	'The doctor finally takes his hands off of you and prepares several needles filled with unknown fluids.'
 
 	act 'Continue':gt 'abduction', 'abdExam2'
 end
@@ -234,10 +248,9 @@ if $ARGS[0] = 'abdExam2':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/exam2.jpg"></center>'
-	'The doctor leaves your body alone and prepares several needles filled with unknown fluids.'
 	'"Now there, our little slave, we will make sure you are healthy and ready to be trained."'
-	'He injects all the solutions into you.'
-	'The examination is at an end. The doctor leaves, you are untied, blindfolded again and led back down into the basement.'
+	'He quickly injects all the solutions into one of your arms, "The examination is now over."'
+	'The doctor leaves, and the man puts your shackles and blindfold back on and leads you back down into the basement.'
 	gs 'medical_din','healSTDs'
 
 	examed = 1
@@ -277,24 +290,33 @@ if $ARGS[0] = 'abdBreak1':
 	'"You don''t understand bitch. You will leave this place, in the end. As a broken sex slave or as a dead body."'
 	'"But..."'
 	'"You will be sold to someone as a slave. Or if you won''t accept that role, you will be utilized for the more perverted needs of our customers. Those girls usually don''t survive for long.'
-	'(you nervously gulp)'
-	'"Now show me what sex slave you are."'
+	'You feel a slight sense of dread as your mind races to think of what horrors might await you.'
+	'"Now show me what a good sex slave you are."'
 
 	tortureType = rand(1,3)
-	act 'Spit in his face':gt 'abduction', 'abdTorture'
+	gs 'willpower', 'misc', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Spit in his face (<<will_cost>> Willpower)':
+			gs 'willpower', 'misc', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'abduction', 'abdTorture'
+		end
+	else
+		act 'Spit in his face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	if rapeCount <= 10:
-		act 'Say nothing and crawl back to your bed':gt 'abduction', 'abdRape'
+		act 'Say nothing and crawl back to your bed': gt 'abduction', 'abdRape'
 	end
 
 	if tortureCount >= 5 or rapeCount >= 10:
-		if broken = 1 and pcs_vag > 0:
-			act 'Please fuck my pussy, Master':gt 'abduction', 'abdBreak2FuckA1'
+		if broken > 0:
 			act 'Please fuck my mouth, Master':gt 'abduction', 'abdBreak2FuckB1'
-		elseif pcs_vag > 0:
-			act 'You... you are my master. Please use me...':gt 'abduction', 'abdBreak2FuckA1'
+			if pcs_vag > 0: act 'Please fuck my pussy, Master':gt 'abduction', 'abdBreak2FuckA1'
 		else
-			act 'You... you are my master. Please use me...':gt 'abduction', 'abdBreak2FuckB1'
+			act 'You... you are my master. Please accept my mouth for your use...':gt 'abduction', 'abdBreak2FuckB1'
+			if pcs_vag > 0: act 'You... you are my master. Please accept my pussy for your use...':gt 'abduction', 'abdBreak2FuckA1'
 		end
 	end
 end
@@ -303,11 +325,21 @@ if $ARGS[0] = 'abdBrokenGivePainkiller':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/pill1.jpg"></center>'
-	'Master: "You have been a good slave so far. Good slaves are rewarded."'
+	'Your master approaches you, "You have been a good slave so far. Good slaves are rewarded."'
 	'He hands you a single painkiller pill.'
 
 	act 'Take and swallow it':gt 'abduction', 'abdBrokenGivePainkillerYes'
-	act 'Refuse and keep your mouth shut':gt 'abduction', 'abdBrokenGivePainkillerNo'
+	gs 'willpower', 'misc', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse and keep your mouth shut (<<will_cost>> Willpower)':
+			gs 'willpower', 'misc', 'resist', 'easy'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'abduction', 'abdBrokenGivePainkillerNo'
+		end
+	else
+		act 'Refuse and keep your mouth shut (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end		
 end
 
 if $ARGS[0] = 'abdBrokenGivePainkillerYes':
@@ -315,7 +347,6 @@ if $ARGS[0] = 'abdBrokenGivePainkillerYes':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/pill2.jpg"></center>'
 	'You happily take the pill and swallow it immediately.'
-	sub += 2
 	gs 'stat'
 	painkillerGive = rand(1,100)
 	if painkillerGive > 20 and broken >= 10:
@@ -329,8 +360,8 @@ if $ARGS[0] = 'abdBrokenGivePainkillerNo':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/pill1.mp4"></video></center>'
-	'Master: "Refusing a gift? It seems like this slaveslut needs to be reminded of her place."'
-	'He ties you down ontop of a table, securing your head.'
+	'You see anger flash across your master''s face. "Refusing a gift? It seems like this slave slut needs to be reminded of her place."'
+	'He ties you down on top of a table, securing your head.'
 	'Some devious device is attached to your nose, pulling your head backwards. It forces you to open your mouth slightly.'
 	'Your master takes a clamp and a pulls your tongue out, tightly and painfully sqeezing it.'
 	'He then secures the pill on top of a dildo and pushes the tip down your throat.'
@@ -342,38 +373,30 @@ if $ARGS[0] = 'abdBrokenGivePainkillerNo':
 	pain['tongue'] += 5
 	pain['throat'] += 5
 	pain['nose'] += 5
-	sub -= 2
 	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTorture'
 end
 
 if $ARGS[0] = 'abdBrokenAsk':
 	menu_off = 1
-	'Master: "Good. What do you want me to do to you, slaveslut?"'
-	sub += 5
 	gs 'stat'
-	if pcs_vag > 0:
-		act 'Please fuck my pussy, Master':gt 'abduction', 'abdBreak2FuckA1'
-	end
+	
+	'Your master responds, "Very good. What do you want me to do to you, slave slut?"'
+	
 	act 'Please fuck my mouth, Master':gt 'abduction', 'abdBreak2FuckB1'
-	if broken >= 3 and sub >= 70:
-		sub += 3
-		gs 'stat'
-		act 'Please rape me, Master':gt 'abduction', 'abdRape'
-	end
-	if broken >= 5 and sub >= 90:
-		sub += 5
-		gs 'stat'
-		act 'Please punish me, Master':gt 'abduction', 'abdTorture'
-	end
+	
+	if pcs_vag > 0: act 'Please fuck my pussy, Master':gt 'abduction', 'abdBreak2FuckA1'
+	
+	if broken >= 5: act 'Please rape me, Master':gt 'abduction', 'abdRape'
+
+	if broken >= 10: act 'Please punish me, Master':gt 'abduction', 'abdTorture'
 end
 
 if $ARGS[0] = 'abdBreak2FuckA1':
 	*clr & cla
 	menu_off = 1
-	sub += 5
 	broken += 1
-	gs 'cum_call', '', 'master', 0,'', spot, svol
+	gs 'cum_call', '', 'Master', 0,'', spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena1.jpg"></center>'
 	'Your tormentor unchains you and throws you on your dirty bed.'
 	'Spreading your legs wide apart, you spit on your hand and smear it on your pussy, saying: "Come, take me, Master."'
@@ -388,12 +411,12 @@ end
 if $ARGS[0] = 'abdBreak2FuckA2':
 	*clr & cla
 	menu_off = 1
-	gs 'cum_call', 'mouth', 'master', 0,'', spot, svol
+	gs 'cum_call', 'mouth', 'Master', 0,'', spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena2.jpg"></center>'
 	'Fucking you wildly for some time, your master stops before he orgasms.'
 	'He unties your hands and legs and instead ties your hands behind your back.'
 	'Knowing what he expects you to do, you open your mouth wide and await his cock.'
-	'After some mouthfucking and gagging, he comes in your mouth.'
+	'After some mouthfucking and gagging, he cums in your mouth.'
 	if broken = 1:
 		*nl
 		'"Very good, slave. You are on a path to redeem yourself." With these words he releases your arms, secures you back in your usual location and then leaves.'
@@ -409,10 +432,9 @@ if $ARGS[0] = 'abdBreak2FuckB1':
 	*clr & cla
 	menu_off = 1
 	broken += 1
-	sub += 5
 	gs 'cum_call', 'mouth', 'Master'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokenb1.jpg"></center>'
-	'Your tormentor unchains you and leads you to a device.'
+	'Your master unchains you and leads you to a device.'
 	'You can see that it''s meant to restrain a person in a lying position, with their head at the same height as someone''s crotch.'
 	'You want to please your master, so you lie down on it straight away and dutifully await the attaching of the restraints.'
 	'After your master ties you, he walks up to your head. Your already open mouth is then roughly fucked by his member.'
@@ -427,12 +449,16 @@ if $ARGS[0] = 'abdBreak2FuckB2':
 	*clr & cla
 	menu_off = 1
 	pain['asshole'] += 1
-	broken += 1
-	gs 'cum_call', 'anus', 'Master'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokenb2.jpg"></center>'
 	'Surprisingly his dick is not wearing out. He moves behind you and starts to penetrate your ass.'
 	'Trying to relax your anus as much as you can, he enters you quite easily. Just a small reminder of pain goes through your muscles.'
 	'Fucking you furiously for some time, your master cums deep inside you.'
+	if broken = 1:
+		*nl
+		'"Very good, slave. You are on a path to redeem yourself." With these words he releases your arms, secures you back in your usual location and then leaves.'
+	end
+	broken += 1
+	gs 'cum_call', 'anus', 'Master'
 	gs 'arousal', 'anal', 20, 'sub', 'bound'
 	gs 'stat'
 
@@ -459,7 +485,7 @@ if $ARGS[0] = 'abdEscape':
 	minut += 5
 	gs 'stat'
 	act 'Try to break the lock':gt 'abduction', 'abdEscapeWindow1'
-	act 'Go back to your bed and fix your leash back to the wall':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed and reattach your leash to the wall':gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdEscapeWindow1':
@@ -471,13 +497,13 @@ if $ARGS[0] = 'abdEscapeWindow1':
 	gs 'stat'
 	breakChance = rand(1, 100)
 	if breakChance <= 50:
-		'You hear someone slam a door. Maybe your captors are coming!'
+		'You hear someone slam a door nearby. Maybe your master is returning!'
 		'But you are so close to unscrewing the window! You decide to...'
-		act 'Run back to your bed and leash your chain back':gt 'abduction', 'abdSomeoneComing'
+		act 'Run back to your bed and reattach your leash to the wall':gt 'abduction', 'abdSomeoneComing'
 		act 'Try to unscrew it desperately':gt 'abduction', 'abdEscapeWindow2'
 	else
 		'No luck, the window is screwed in very tight.'
-		act 'Go back':gt 'abduction', 'abdEscape'
+		act 'Go back':gt 'abduction', 'abdFood'
 	end
 end
 
@@ -488,7 +514,7 @@ if $ARGS[0] = 'abdEscapeWindow2':
 	'You continue in your attempts to break the window.'
 	minut += 5
 	gs 'stat'
-	breakChance = rand(1, 100)
+	breakChance = rand(1,100)
 	if breakChance <= 90:
 		'You desperately try to unscrew it, but you run out of time and luck.'
 		'Your master comes into the basement and catches you running around unleashed. This won''t end well for you...'
@@ -555,8 +581,8 @@ if $ARGS[0] = 'abdFood':
 	'There are some water bottles and dried food beneath your bed.'
 	'A half broken, dirty mirror provides some means to inspect your appearance.'
 	'In the corner there is something remotely similar to a shower, with cold water only, though.'
-	'There''s enough space to do some basic <a href="exec:gt ''abduction'', ''abdpushup''">exercise</a>.'
-	chainChance = rand(1, 100)
+	'There''s enough space to do some basic <a href="exec:gt ''abduction'', ''abdexercise''">exercise</a>.'
+	chainChance = rand(1,100)
 	if chainChance <= 20 and (rapeCount > 5 or tortureCount > 5):
 		'Suddenly you spot a loose chainlink on your leash. You try to manipulate it and you manage to free yourself from the wall.'
 		'<a href="exec:gt ''abduction'', ''abdEscape''">Go to the window</a>'
@@ -653,42 +679,54 @@ if $ARGS[0] = 'abdFood':
 	act 'Get back to your bed':gt 'abduction', 'abdRoom'
 end
 
-if $ARGS[0] = 'abdpushup':
-	$loc = 'abduction'
-	$metka = 'abdFood'
+if $ARGS[0] = 'abdexercise':
 	*clr & cla
 	menu_off = 1
-	'<center><video autoplay loop src="images/pc/activities/push_naked.mp4"></video></center>'
 	gs 'exercise', 'tier2', 30, 'stren_exp'
+	
+	'<center><video autoplay loop src="images/pc/activities/push_naked.mp4"></video></center>'
+	*nl
 	'You do push-ups for <<$timestring>> minutes, improving your strength.'
 
 	randpushfact = rand(-5,5)
-	if pcs_energy < 40: randpushfact -= RAND(1,10)
+	if pcs_energy < 40: randpushfact -= rand(1,10)
 
 	pushnum = (pcs_stren * pcs_sleep * pcs_health)  / ( 1 * 67 *  healthmax) + randpushfact
 
 	if pushnum < 1: pushnum = rand(1,5)
-	KILLVAR 'randpushfact'
+	killvar 'randpushfact'
 	'<br>You managed to do <<pushnum>> push-ups. Your previous record is <<pushrecord>>.'
 
 	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
 	gs 'stat'
-	act 'Finish': gt $loc, $metka
+	
+	act 'Continue':
+		*clr & cla
+		menu_off = 1
+		gs 'exercise', 'tier2', 30, 'vital_exp'
+		
+		'<center><video autoplay loop src="images/pc/activities/abdominal_naked.mp4"></video></center>'
+		*nl
+		'You do a series of abdominal exercises for <<$timestring>> minutes, improving your endurance.'
+		
+		gs 'stat'
+	
+		act 'Finish': gt 'abduction', 'abdFood'
+	end
 end
 
 if $ARGS[0] = 'abdRape':
 	*clr & cla
 	menu_off = 1
 	rapeCount += 1
-	rapeType = rand(1, 5)
-	sub += 3
+	rapeType = rand(1,5)
 	if broken < 10:pcs_mood = 5
 
 	if rapeType = 1:
 		pain['mouth'] += 3
-		gs 'cum_call', 'mouth', 'torturer'
-		i = rand(1, 4)
-		gifornot = rand (1, 100)
+		gs 'cum_call', 'mouth', 'Master'
+		i = rand(1,4)
+		gifornot = rand(1,100)
 		if gifornot > 50:
 			'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/mouthgagblow<<i>>.jpg"></center>'
 		else
@@ -702,8 +740,8 @@ if $ARGS[0] = 'abdRape':
 		act 'Continue':gt 'abduction', 'abdRoom'
 	elseif rapeType = 2 and pcs_vag > 0:
 		pain['vaginal'] += 10
-		gs 'cum_call', '', 'torturer', 0
-		i = rand(1, 5)
+		gs 'cum_call', '', 'Master', 0
+		i = rand(1,5)
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/fucktiedpussy<<i>>.jpg"></center>'
 		'Your hands are tied and you''re bent over the bed.'
 		'The guy starts to penetrate your pussy without warning. Sharp pain goes through your belly as your pussy is not wet enough to receive a dick.'
@@ -713,8 +751,8 @@ if $ARGS[0] = 'abdRape':
 		act 'Continue':gt 'abduction', 'abdRoom'
 	elseif rapeType = 3:
 		pain['asshole'] += 10
-		gs 'cum_call', 'anus', 'torturer'
-		gifornot = rand (1, 100)
+		gs 'cum_call', 'anus', 'Master'
+		gifornot = rand (1,100)
 		if gifornot > 50:
 			'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/fucktiedanal'+rand(1,4)+'.jpg"></center>'
 		else
@@ -758,7 +796,7 @@ if $ARGS[0] = 'abdRape':
 	else
 		pcs_throat += 1
 		pain['mouth'] += 5
-		gs 'cum_call', 'mouth', 'Torturer'
+		gs 'cum_call', 'mouth', 'Master'
 
 		i = rand(1, 4)
 		gifornot = rand (1, 100)
@@ -777,7 +815,6 @@ if $ARGS[0] = 'abdRape':
 end
 
 if $ARGS[0] = 'abdTorture':
-	sub += 5
 	tortureType = rand(1,4)
 	tortureCount += 1
 	gs 'stat'
@@ -1005,7 +1042,7 @@ if $ARGS[0] = 'abdTortureD5':
 	pain['vaginal'] += 5
 	pcs_vag += 1
 	pcs_ass += 1
-	gs 'cum_call', 'mouth', 'Torturer'
+	gs 'cum_call', 'mouth', 'Master'
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/tortured5.mp4"></video></center>'
 	'Even though your head is spinning and everything is aching inside you, you are able to make him cum in few minutes.'

+ 172 - 58
locations/abductionCustomer.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'abdCustomerGate':
 	menu_off = 1
-	'Master: "Hello, slave slut."'
+	'Your master approaches you, "Hello, slave slut."'
 	'"I have a customer here, who came to rent you for a while. Do whatever he asks of you."'
 	buyout = 0
 	act 'Yes, Master.':gt 'abductionCustomer', 'abdCustomerGo'
@@ -10,7 +10,7 @@ end
 
 if $ARGS[0] = 'abdCustomerGateBuyout':
 	menu_off = 1
-	'Master: "Hello, slave slut."'
+	'Your master approaches you, "Hello, slave slut."'
 	'"I have a customer here, who came to rent you for a while. Do whatever he asks of you."'
 	buyout = 1
 	act 'Yes, Master.':gt 'abductionCustomer', 'abdCustomerGo'
@@ -20,7 +20,7 @@ if $ARGS[0] = 'abdCustomerGo':
 	menu_off = 1
 	minut += 5
 	gs 'stat'
-	i = rand(1, 3)
+	i = rand(1,3)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/ledonfour<<i>>.mp4"></video></center>'
 	'Your master removes your regular chains and puts you on a leash.'
 	'You are being led up the stairs into the house above your cellar.'
@@ -57,21 +57,21 @@ if $ARGS[0] = 'abdCustomer':
 	if RaceRand = 0:
 		$raceType = 'white'
 		dickChance = 30
-		charTypeRand += rand(-3, 2)
-		bodyTypeRand += rand(-2, 8)
-		heightTypeRand += rand(-1, 6)
+		charTypeRand += rand(-3,2)
+		bodyTypeRand += rand(-2,8)
+		heightTypeRand += rand(-1,6)
 	elseif RaceRand = 1:
 		$raceType = 'black'
 		dickChance = 40
-		charTypeRand += rand(0, 2)
-		bodyTypeRand += rand(0, 6)
-		heightTypeRand += rand(0, 6)
+		charTypeRand += rand(0,2)
+		bodyTypeRand += rand(0,6)
+		heightTypeRand += rand(0,6)
 	elseif RaceRand = 2:
 		$raceType = 'asian'
 		dickChance = 20
-		charTypeRand += rand(-2, 2)
-		bodyTypeRand += rand(-6, 2)
-		heightTypeRand += rand(-4, 1)
+		charTypeRand += rand(-2,2)
+		bodyTypeRand += rand(-6,2)
+		heightTypeRand += rand(-4,1)
 	end
 
 	if pcs_vag = 0:
@@ -79,7 +79,7 @@ if $ARGS[0] = 'abdCustomer':
 	elseif buyout = 1:
 		dick = 24
 	else
-		dickRand = rand(1, 100)
+		dickRand = rand(1,100)
 		if dickRand <= dickChance:
 			dick = rand(15, 40)
 		elseif dickRand <= (dickChance * 2):
@@ -96,25 +96,25 @@ if $ARGS[0] = 'abdCustomer':
 	! customer dick size
 	if dick >= 30:
 		$dick_girth = 'monstrous'
-		cumVol = rand(4, 5)
+		cumVol = rand(4,5)
 	elseif dick >= 25:
 		$dick_girth = 'huge'
 		cumVol += 1
-		cumVol = rand(3, 5)
+		cumVol = rand(3,5)
 	elseif dick >= 20:
 		$dick_girth = 'very big'
-		cumVol = rand(2, 5)
+		cumVol = rand(2,5)
 	elseif dick >= 15:
 		$dick_girth = 'big'
-		cumVol = rand(2, 4)
+		cumVol = rand(2,4)
 	elseif dick >= 10:
 		$dick_girth = 'regular'
 		cumVol -= 1
-		cumVol = rand(1, 4)
+		cumVol = rand(1,4)
 	else
 		$dick_girth = 'tiny'
 		cumVol -= 2
-		cumVol = rand(1, 3)
+		cumVol = rand(1,3)
 	end
 
 	! customer cum volume
@@ -180,7 +180,7 @@ if $ARGS[0] = 'abdCustomer':
 		'Right away you can see that he is just another bastard coming here to use your <<age>> years young body.'
 		'Your master leaves you in the center of the room, still kneeling with the leash attached to your collar.'
 		'As the door closes behind him, the customer slowly turns and you can finally see his face.'
-		act 'Look to his face':gt 'abductionCustomer', 'abdCustomer-buyout1'
+		act 'Look at his face':gt 'abductionCustomer', 'abdCustomer-buyout1'
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorekneelmaster.mp4"></video></center>'
 		'The customer is a <<$heightType>> <<$bodyType>> <<$raceType>>.'
@@ -223,8 +223,18 @@ if $ARGS[0] = 'abdCustomer-buyout1':
 	'Then suddenly the look on <<$bName>>''s face changes from surprised to something else.'
 	'He comes up to you and gently caresses your face: "Plaything, you say? And do you like it?"'
 	'Surprised by such a question you wait with your answer:'
-	if sub > 95:
-		act 'Admit you like to be dominated, but this is too much':gt 'abductionCustomer', 'abdCustomer-buyout2'
+	
+	gs 'willpower', 'misc', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Admit you like to be dominated, but this is too much (<<will_cost>> Willpower)':
+			gs 'willpower', 'misc', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+
+			gt 'abductionCustomer', 'abdCustomer-buyout2'
+		end
+	else
+		act 'Admit you like to be dominated, but this is too much (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Say you hate it':gt 'abductionCustomer', 'abdCustomer-buyout3'
 end
@@ -250,7 +260,18 @@ if $ARGS[0] = 'abdCustomer-buyout3':
 	'Stepping above you as you helplessly lay on the floor, he opens his zipper and pulls his dick out of his pants.'
 	'You can clearly see his <<dick>> cm long <<$dick_girth>> dick swing above you in the air.'
 	act 'Suck on it':gt 'abductionCustomer', 'abdCustomer-suckTip'
-	act 'Do nothing':gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Do Nothing (<<will_cost>> Willpower)':
+			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
+		end
+	else
+		act 'Do Nothing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 if $ARGS[0] = 'abdCustomer-buyout4':
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhorefuckanalroughleonid2.jpg"></center>'
@@ -291,7 +312,7 @@ if $ARGS[0] = 'abdCustomer-virgin2':
 	pcs_mood = 5
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorevirgin2.mp4"></video></center>'
 	'He starts to undress, finishing off with his pants. As he pulls them down, you can finally can see his naked member fall out.'
-	'"With renewed terror you start to cry, because the sight of his <<dick>> cm thick <<$dick_girth>> fallus is just terrifying."'
+	'"With renewed terror you start to cry, because the sight of his <<dick>> cm thick <<$dick_girth>> phallus is just terrifying."'
 	gs 'stat'
 	act 'Continue':gt 'abductionCustomer', 'abdCustomer-virgin3'
 end
@@ -379,7 +400,7 @@ if $ARGS[0] = 'abdCustomer-virgin10':
 	minut += 15
 	pcs_mood = 5
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorevirgin10.mp4"></video></center>'
-	'A sound of the master coming from upstairs wakes you up.'
+	'The sound of your master coming downstairs wakes you up.'
 	'You must have fallen asleep from the exhaustion.'
 	*nl
 	'Kneel and stick your ass high in the air, slut.'
@@ -416,17 +437,39 @@ if $ARGS[0] = 'abdCustomer-unzip':
 	if pcs_throat < dick:
 		'It''s obvious that his <<$dick_girth>> dick is above your skill and you know you wouldn''t be able to swallow it whole.'	
 		act 'Suck the tip':gt 'abductionCustomer', 'abdCustomer-suckTip'
-		act 'Force yourself on his cock':gt 'abductionCustomer', 'abdCustomer-suckForceself'
+		gs 'willpower', 'bj', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Force yourself on his cock (<<will_cost>> Willpower)':
+				gs 'willpower', 'bj', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-suckForceself'
+			end
+		else
+			act 'Force yourself on his cock (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else
 		'Even though his dick is <<$dick_girth>>, you know you''d be able to take it all the way to the balls.'
 		act 'Suck the tip':gt 'abductionCustomer', 'abdCustomer-suckTip'
-		act 'Deepthroat':gt 'abductionCustomer', 'abdCustomer-suckDeep'
+		gs 'willpower', 'bj', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Deepthroat his cock (<<will_cost>> Willpower)':
+				gs 'willpower', 'bj', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-suckDeep'
+			end
+		else
+			act 'Deepthroat his cock (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
 if $ARGS[0] = 'abdCustomer-show':
 	minut += 10
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoretease<<i>>.mp4"></video></center>'
 	'You decide to tease the customer by showing him your sexy assets by jiggling your girly parts.'
 	'After some time behaving like a slut, it is obvious that he wants something more.'
@@ -434,8 +477,9 @@ if $ARGS[0] = 'abdCustomer-show':
 end
 
 if $ARGS[0] = 'abdCustomer-suckTip':
+	gs 'arousal', 'bj', 15, 'sub'
 	gs 'stat'
-	i = rand(1, 5)	
+	i = rand(1,5)	
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjobtip<<i>>.mp4"></video></center>'
 	'You try as best as you can to suck the head of his <<dick>> cm sized <<$dick_girth>> dick.'
 	if pcs_throat < dick:
@@ -465,22 +509,43 @@ if $ARGS[0] = 'abdCustomer-suckTip':
 			act 'Continue sucking the tip':gt 'abductionCustomer', 'abdCustomer-fuck'
 		end
 		if pcs_throat < dick:
-			act 'Force yourself on his cock':gt 'abductionCustomer', 'abdCustomer-suckForceself'
+			gs 'willpower', 'bj', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Force yourself on his cock (<<will_cost>> Willpower)':
+					gs 'willpower', 'bj', 'self'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					
+					gt 'abductionCustomer', 'abdCustomer-suckForceself'
+				end
+			else
+				act 'Force yourself on his cock (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 		else
-			act 'Deepthroat':gt 'abductionCustomer', 'abdCustomer-suckDeep'
+			gs 'willpower', 'bj', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Deepthroat his cock (<<will_cost>> Willpower)':
+					gs 'willpower', 'bj', 'self'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					
+					gt 'abductionCustomer', 'abdCustomer-suckDeep'
+				end
+			else
+				act 'Deepthroat his cock (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 		end
 	elseif $charType = 'kind':
 		'The customer seems pleased by your sucking skills, so you continue to tease the tip of his <<$dick_girth>> cock, looking at him with as much sensual abandon that you can muster under the present conditions.'
 		act 'Continue sucking the tip':gt 'abductionCustomer', 'abdCustomer-fuck'
 	end
-	gs 'arousal', 'bj', 15, 'sub'
 end
 
 if $ARGS[0] = 'abdCustomer-suckForceself':
 	pcs_throat += 1
 	pain['throat'] += throatDMG
 	gs 'stat'
-	i = rand(1, 3)
+	i = rand(1,3)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjobselfforced<<i>>.mp4"></video></center>'
 	'Knowing you will probably hurt yourself, you force yourself on his <<dick>> cm long cock all the way down to the balls anyway.'
 	'You start gagging and saliva is everywhere, but the customer seems more content now.'
@@ -491,9 +556,10 @@ end
 if $ARGS[0] = 'abdCustomer-suckForced':
 	pain['throat'] += throatDMG * 2
 	pcs_throat += 2
+	gs 'arousal', 'bj', 15, 'sub', 'rough', 'deepthroat', 'humiliation'
 	gs 'stat'
 	endPunishment = 1
-	i = rand(1, 6)
+	i = rand(1,6)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjobforced<<i>>.mp4"></video></center>'
 	if buyout = 1:
 		'<<$bName>> starts growling and suddenly pulls his cock out of your mouth.'
@@ -503,7 +569,7 @@ if $ARGS[0] = 'abdCustomer-suckForced':
 	'"What kind of slave are you when you can''t swallow my <<$dick_girth>> dick?"'
 	'He ties you up and forces his cock down your throat, showing you little to no concern.'
 	'You start to gag as he keeps pushing his member deep inside you, sometimes leaving you on the brink of passing out.'
-	vagOrAss = rand (0, 1)
+	vagOrAss = rand (0,1)
 	if buyout = 1:
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 	else
@@ -513,16 +579,15 @@ if $ARGS[0] = 'abdCustomer-suckForced':
 			act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 		end
 	end
-	gs 'arousal', 'bj', 15, 'sub', 'rough', 'deepthroat', 'humiliation'
 end
 
 if $ARGS[0] = 'abdCustomer-suckDeep':
 	pcs_throat += 1
+	gs 'arousal', 'bj', 15, 'sub', 'deepthroat'
 	gs 'stat'
-	i = rand(1, 6)
+	i = rand(1,6)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjob<<i>>.mp4"></video></center>'
 	'You swallow his <<$dick_girth>> cock all the way down to the balls.'
-	gs 'arousal', 'bj', 15, 'sub', 'deepthroat'
 	act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuck'
 end
 
@@ -536,7 +601,7 @@ if $ARGS[0] = 'abdCustomer-fuck':
 	if charType = 'sadistic':
 		'"What should I do to you next, bitch?"'
 	else
-		'So how do you want it next, luv?'
+		'So how do you want it next, love?'
 	end
 	'You are not entirely sure if he means that as a question or if he''s just saying that to himself.'
 
@@ -546,7 +611,7 @@ if $ARGS[0] = 'abdCustomer-fuck':
 		'"You thought I''m really interested in your slutty opinion?" He says laughing.'
 		'"A whore, and on top of that a slave whore, has no right to have an opinion."'
 		'You are unable to do anything except whimper like a small child. He ties you up and you know that it''s going to get even worse now.'
-		vagOrAss = rand (0, 1)
+		vagOrAss = rand (0,1)
 		if vagOrAss = 0:
 			act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckRough'
 		else
@@ -555,7 +620,18 @@ if $ARGS[0] = 'abdCustomer-fuck':
 	else
 		'You decide to:'
 		act 'Be quiet':gt 'abductionCustomer', 'abdCustomer-decide'
-		act 'Beg him to be kind':gt 'abductionCustomer', 'abdCustomer-beg'
+		gs 'willpower', 'sex', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Beg him to be kind (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-beg'
+			end
+		else
+			act 'Beg him to be kind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
@@ -588,10 +664,8 @@ if $ARGS[0] = 'abdCustomer-beg':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhorebeg1.jpg"></center>'
-	'Please be kind to me Sir, I''m so afraid and sore... please!'
-	if dick >= 15:
-		'"I''m very afraid of your <<$dick_girth>> penis Sir!"'
-	end
+	'Please be kind to me sir, I''m so afraid and sore... please!'
+	if dick >= 15:'"I''m very afraid of your <<$dick_girth>> penis sir!"'
 	*nl
 	bekindChance = rand(1, 100)
 	endPunishment = 0
@@ -627,7 +701,7 @@ end
 if $ARGS[0] = 'abdCustomer-fuckAnal':
 	pcs_ass += 1
 	gs 'stat'
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefuckanal<<i>>.mp4"></video></center>'
 	'The customer puts some lubricant on his <<$dick_girth>> cock and penetrates your ass.'
 	'He doesn''t care much about your feelings but he''s also not exactly hurting you on purpose.'
@@ -636,10 +710,12 @@ if $ARGS[0] = 'abdCustomer-fuckAnal':
 		pain['asshole'] += assDMG
 		pain['tummy'] += assDMG
 		gs 'arousal', 'anal', 30, 'sub', 'rough'
+		gs 'stat'
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalDeep'
 	else
 		'You have no problems accommodating his <<$dick_girth>> member.'
 		gs 'arousal', 'anal', 30, 'sub'
+		gs 'stat'
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-cumGate'
 	end
 
@@ -647,8 +723,9 @@ end
 
 if $ARGS[0] = 'abdCustomer-fuckAnalRough':
 	pcs_ass += 2
+	gs 'arousal', 'anal', 30, 'sub', 'rough', 'bound'
 	gs 'stat'
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefuckanalrough<<i>>.mp4"></video></center>'
 	if buyout = 1:
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhorefuckanalroughleonid1.jpg"></center>'
@@ -682,8 +759,7 @@ if $ARGS[0] = 'abdCustomer-fuckAnalRough':
 		pain['tummy'] += assDMG
 		gs 'stat'
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalDeep'
-	end
-	gs 'arousal', 'anal', 30, 'sub', 'rough', 'bound'
+	end	
 end
 
 if $ARGS[0] = 'abdCustomer-fuckAnalDeep':
@@ -723,7 +799,7 @@ end
 if $ARGS[0] = 'abdCustomer-fuckNormal':
 	pcs_vag += 1
 	gs 'stat'
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefucknormal<<i>>.mp4"></video></center>'
 	'The customer penetrates your pussy and fucks you.'
 	if vagDMG <= 0:
@@ -752,7 +828,7 @@ end
 if $ARGS[0] = 'abdCustomer-fuckRough':
 	pcs_vag += 2
 	gs 'stat'
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefuckrough<<i>>.mp4"></video></center>'
 	'The man takes you by your leash and positions your body as if it''s just meat to be used.'
 	'What comes next is an excruciatingly rough fuck that clearly shows he has no regard for all the pain you have to endure, whatsoever.'	
@@ -820,17 +896,55 @@ if $ARGS[0] = 'abdCustomer-cumGate':
 		'"Now <<$pcs_firstname>> you will be filled with my seed for the first time, so be sure to cherish the memory of this moment!"'
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cumAss'		
 	else
-		'"So where do you want me to put the deposit, luv?"'
+		'"So where do you want me to put the deposit, love?"'
+		
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
-		act 'Ask him to cum inside your pussy':gt 'abductionCustomer', 'abdCustomer-cumPussy'
-		act 'Ask him to cum inside your ass':gt 'abductionCustomer', 'abdCustomer-cumAss'
-		act 'Ask him to cum into your mouth':gt 'abductionCustomer', 'abdCustomer-cumMouth'
+		
 		act 'Ask him to cum on your face':gt 'abductionCustomer', 'abdCustomer-cumFace'
+		
+		gs 'willpower', 'cum_inside', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Ask him to cum inside your pussy (<<will_cost>> Willpower)':
+				gs 'willpower', 'cum_inside', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-cumPussy'
+			end
+		else
+			act 'Ask him to cum inside your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		gs 'willpower', 'cum_inside_anal', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Ask him to cum inside your ass (<<will_cost>> Willpower)':
+				gs 'willpower', 'cum_inside_anal', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-cumAss'
+			end
+		else
+			act 'Ask him to cum inside your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		gs 'willpower', 'swallow', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Ask him to cum into your mouth (<<will_cost>> Willpower)':
+				gs 'willpower', 'swallow', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				
+				gt 'abductionCustomer', 'abdCustomer-cumMouth'
+			end
+		else
+			act 'Ask him to cum into your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
 if $ARGS[0] = 'abdCustomer-cum':
-	cumRand = rand(1, 100)
+	cumRand = rand(1,100)
 	if cumRand > 75 and cumRand <= 100:
 		'He decides to cum inside your vagina.'
 		act 'Endure it':gt 'abductionCustomer', 'abdCustomer-cumPussy'
@@ -847,7 +961,7 @@ if $ARGS[0] = 'abdCustomer-cum':
 end
 
 if $ARGS[0] = 'abdCustomer-cumPussy':
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorecumpussy<<i>>.mp4"></video></center>'
 	if vagDMG > 0:
 		'As he delivers his <<$cumType>> amount of cum inside your vagina, you can feel the tip of his <<$dick_girth>> cock at your cervix and even a bit inside it.'
@@ -887,7 +1001,7 @@ if $ARGS[0] = 'abdCustomer-cumPussy':
 end
 
 if $ARGS[0] = 'abdCustomer-cumAss':
-	i = rand(1, 5)
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorecumass<<i>>.mp4"></video></center>'
 	if assDMG > 0:
 		'As he cums inside your anus, you can feel the banging of his <<$dick_girth>> cock against your intestinal wall.'

+ 94 - 64
locations/andrey.qsrc

@@ -212,12 +212,21 @@ if $ARGS[0] = 'punish':
 			'Mr. Sobulyagin scoffs at you, obviously not swayed so easily by tears. He looks at you in silence, his dark eyes roaming over your body slowly as he licks his lips. "Listen, I''m not a bad guy," he says as he stands from his chair and walks to the door. "I''m willing to give you another chance, but you need to <i>show me</i> how important this job really is to you..." He cups his balls through his slacks and gives them a light squeeze.'
 			*nl
 			'"Or you can leave and lose your job. It''s up to you, but those are your only options." He opens the door for you, allowing you to leave and lose your job if you don''t accept his offer.'
-			act 'Leave':
-				work = 0
-				young_shop_work = 2
-				young_shop_miss = 0
-				minut += 2
-				gt 'young_shop', 'start'
+			gs 'willpower', 'bj', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					work = 0
+					young_shop_work = 2
+					young_shop_miss = 0
+					minut += 2
+					gs 'willpower', 'bj', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					
+					gt 'young_shop', 'start'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Accept his offer': gt 'andrey', 'fired1'
 		end
@@ -228,33 +237,41 @@ if $ARGS[0] = 'punish':
 		'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
 		*nl
 		'"Well look who decided to drag their ass into work today!" Mr. Sobulyagin''s expression twists into a scowl as he greets you at the store entrance. "I realize coming to work is difficult for you, but do you think you can spare me a moment and come into my office?" he says dryly. You sigh and follow him as he takes you into his office and closes the door. He nods and seems to be talking to himself as much as he is talking to you. He leans against his desk and cupping his crotch as he is smiling at you. "Well you know the deal if you want to keep your job."'
-		act 'Agree': gt 'andrey', 'fired1'
-		act 'Refuse and get fired':
-			cla
-			*clr
-			young_shop_work = 2
-			young_shop_miss = 0
-			char_honest += 5
-			work = 0
-			bonus_mood -= 50
-			minut +=15
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
-			*nl
-			'"You''re right, and I''ve decided that I''m not doing you anymore favors to keep my job." Mr. Sobulyagin scowls at you but puts his dick away and pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them in silence.'
-			msg 'You are no longer employed at this store.'
-			if young_shop_salary > 0 or young_shop_bonus > 0:
-				money += young_shop_salary * 205 + young_shop_bonus * 205
-				'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 205>></b>, with a bonus of <b><<young_shop_bonus * 205>></b> <b>₽</b>. Total income is <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b>'
-				'Mr. Sobulyagin. counts <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b> and hands it over to you.'
-				! reset money,young_shop_salary,young_shop_bonus to zero for a new week
-				young_shop_salary = 0
-				young_shop_bonus = 0
-			end
-			act 'Leave':
-				minut += 2
-				gt 'young_shop', 'start'
+		gs 'willpower', 'bj', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse and get fired (<<will_cost>> Willpower)':
+				cla
+				*clr
+				young_shop_work = 2
+				young_shop_miss = 0
+				char_honest += 5
+				work = 0
+				bonus_mood -= 50
+				minut +=15
+				gs 'willpower', 'bj', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				*nl
+				'"You''re right, and I''ve decided that I''m not doing you anymore favors to keep my job." Mr. Sobulyagin scowls at you but puts his dick away and pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them in silence.'
+				msg 'You are no longer employed at this store.'
+				if young_shop_salary > 0 or young_shop_bonus > 0:
+					money += young_shop_salary * 205 + young_shop_bonus * 205
+					'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 205>></b>, with a bonus of <b><<young_shop_bonus * 205>></b> <b>₽</b>. Total income is <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b>'
+					'Mr. Sobulyagin. counts <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b> and hands it over to you.'
+					! reset money,young_shop_salary,young_shop_bonus to zero for a new week
+					young_shop_salary = 0
+					young_shop_bonus = 0
+				end
+				act 'Leave':
+					minut += 2
+					gt 'young_shop', 'start'
+				end
 			end
+		else
+			act 'Refuse and get fired (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
+		act 'Agree': gt 'andrey', 'fired1'
 !!this happens if Sveta misses 3 days of work but kept her job by sucking his dick 5 times, so this would trigger on the 6th time and each time after.
 	else
 		cla
@@ -264,33 +281,41 @@ if $ARGS[0] = 'punish':
 		'"Well look who decided to drag their ass into work today!" Mr. Sobulyagin''s expression twists into a scowl as he greets you at the store entrance. "I realize coming to work is difficult for you, but do you think you can spare me a moment and come into my office?" he says dryly. You sigh and follow him, he takes you into his office and closes the door. "You are missing too much work, the other employees are noticing. I am going to need something more from you to prove your deserve to keep your job."'
 		*nl
 		'He leans against his desk and cupping his crotch as he is smiling at you. "You can start of by sucking my cock then you can bend over and let me fuck you in the ass. That''s the only way you can prove to me that you still deserve to keep your job, got it? If not then you''re just another lazy brat, and I don''t need someone like that working for me."'
-		act 'Agree': gt 'andrey', 'fired2'
-		act 'Refuse and get fired':
-			cla
-			*clr
-			young_shop_work = 2
-			young_shop_miss = 0
-			char_honest += 5
-			work = 0
-			bonus_mood -= 50
-			minut +=15
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
-			*nl
-			'"You''re right, I''ve skipped out on work too many times and I''m not doing that anymore to keep my job." Mr. Sobulyagin scowls at you but puts his dick away and pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them without a word.'
-			msg 'You are no longer employed at this store.'
-			if young_shop_salary > 0 or young_shop_bonus > 0:
-				money += young_shop_salary * 205 + young_shop_bonus * 205
-				'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 205>></b>, with a bonus of <b><<young_shop_bonus * 205>></b> <b>₽</b>. Total income is <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b>'
-				'Mr. Sobulyagin. counts out <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b> and hands it over to you.'
-				! reset money,young_shop_salary,young_shop_bonus to zero for a new week
-				young_shop_salary = 0
-				young_shop_bonus = 0
-			end
-			act 'Leave':
-				minut += 2
-				gt 'young_shop', 'start'
+		gs 'willpower', 'anal', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				cla
+				*clr
+				young_shop_work = 2
+				young_shop_miss = 0
+				char_honest += 5
+				work = 0
+				bonus_mood -= 50
+				minut +=15
+				gs 'willpower', 'anal', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				*nl
+				'"You''re right, I''ve skipped out on work too many times and I''m not doing that anymore to keep my job." Mr. Sobulyagin scowls at you but puts his dick away and pulls out a document from his desk drawer and begins to fill in the blanks. A few minutes later he hands you some papers and you sign them without a word.'
+				msg 'You are no longer employed at this store.'
+				if young_shop_salary > 0 or young_shop_bonus > 0:
+					money += young_shop_salary * 205 + young_shop_bonus * 205
+					'For working <b><<young_shop_salary>></b> days you get paid <b><<young_shop_salary * 205>></b>, with a bonus of <b><<young_shop_bonus * 205>></b> <b>₽</b>. Total income is <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b>'
+					'Mr. Sobulyagin. counts out <b><<young_shop_salary * 205 + young_shop_bonus * 205>></b> <b>₽</b> and hands it over to you.'
+					! reset money,young_shop_salary,young_shop_bonus to zero for a new week
+					young_shop_salary = 0
+					young_shop_bonus = 0
+				end
+				act 'Leave':
+					minut += 2
+					gt 'young_shop', 'start'
+				end
 			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
+		act 'Agree': gt 'andrey', 'fired2'
 	end
 
 	if cheatWork = 1:
@@ -325,14 +350,19 @@ if $ARGS[0] = 'beg':
 		'"And why in the hell would I do that?" Mr. Sobulyagin scoffs.'
 		'"Oh please! I''ll do anything you want, I really need this job!" You say, trying your absolute best to convince him.'
 		'"Anything? Ha! Fine, I know what you could do!" The manager says as his eyes begin to wander all over your body. "You can start off by sucking my cock and then bend over and let me stick my cock into your ass. That''s the only way you can prove to me you''re a hard worker, got it? If not then you''re just another lazy brat, and I don''t need someone like that working for me."'
-		act 'Tell him you would never do this':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
-			*nl
-			'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob...and then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
-			'"Fine, then there''s the door!" Mr. Sobulyagin snaps, clearly upset with your answer.'
-			act 'Leave':gt 'young_shop', 'start'
+		gs 'willpower', 'anal', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				cla
+				*clr
+				'<center><img <<$set_imgh>> src="images\locations\city\citycenter\mall\cats\fired.jpg"></center>'
+				*nl
+				'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob...and then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
+				'"Fine, then there''s the door!" Mr. Sobulyagin snaps, clearly upset with your answer.'
+				act 'Leave':gt 'young_shop', 'start'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Agree': gt 'andrey', 'rehired'
 	end

+ 5 - 5
locations/anushapt.qsrc

@@ -516,7 +516,7 @@ if $ARGS[0] = 'computer':
 			'You start the computer up. It loads quickly, much faster than what you are used to, it must be a pretty high end laptop. Once it''s done loading you click on the internet browser and look through her browsing history and bookmarks.'
 			*nl
 			'There are all kinds of porn sites and videos she''s watched. There is a lot of public exhibitionist porn in a variety of different sex acts, the rest is mostly kinky boy girl stuff, some with dominant girls, some with dominant boys, some anal, a lot of lesbian sex, especially those with strapons. As you keep on browsing you feel yourself getting a bit aroused.'
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'porn', 10
 			act 'Turn the computer off':gt 'anushapt','anushroom'
 			if AnushkaLoc = 0:
 				act 'Masturbate':
@@ -524,7 +524,7 @@ if $ARGS[0] = 'computer':
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushcmast.mp4"></video></center>'
 					'While browsing her huge list of porno''s, you find one that you like and lean back in the chair and start masturbating. Before long you completely forget that you are in someone else''s bedroom masturbating to their porn on their laptop.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'porn', 10
 					act 'Continue':
 						*clr & cla
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -597,7 +597,7 @@ if $ARGS[0] = 'agreeporn':
 	'She grins and then connects the TV to the laptop and starts playing some lesbian porn. You can''t help but notice the porno is about two teenage girls having a sleepover in one of their bedrooms. They talk for a bit and as the conversation continues it quickly leads to them having sex.'
 	*nl
 	'You feel yourself getting really aroused watching the porno, then you glance over and notice Anushka has her hand in her panties and her pants around her knees masturbating with you sitting right next to her. You are stunned at her apparent ease with the situation and quickly look away. At first you try to pretend she isn''t playing with herself, but you can''t help yourself from sneaking the occasional peek at her. It looks like she''s having fun and if she doesn''t think there is anything wrong with it, then it''s probably not a big deal.'
-	gs 'arousal', 'voyeur', 10
+	gs 'arousal', 'porn', 10
 	gs 'stat'
 	act 'Leave Anushka''s room': gt 'anushapt','hallway'
 	act 'Just watch':
@@ -605,7 +605,7 @@ if $ARGS[0] = 'agreeporn':
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/watchporn.jpg"></center>'
 		'You do your best to ignore the fact that Anushka is lying right next to you, with her hand between her legs and masturbating for all she''s worth while the two of you continue watching the porno. Long before the video is over Anushka''s breathing gets faster and she starts moaning, softly at first, then louder and louder until finally she arches her back and has a shuddering orgasm. After giving herself a few moments to come down from her little pleasure high, she pulls her pants back up, gets off the bed and turns the porno off. Then she turns to look at you. "I don''t know about you, but I could use a snack. Come on, let''s go raid the kitchen." She heads out of her room waving for you to follow. Not sure what else to do, you get up and follow along behind her.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'porn', 10
 		gs 'stat'
 		gs 'arousal', 'end'
 		act 'Follow her': gt 'anushapt','snack'
@@ -618,7 +618,7 @@ if $ARGS[0] = 'agreeporn':
 		'You think, well fuck it. The video has really turned you on and she obviously doesn''t think it''s big deal to masturbate in your company. With that thought, you start to masturbate as well; though you find it a little hard to get into it properly, knowing she is right next to you. After a while you start to relax, getting more comfortable with the situation as you begin to give in to the sensations, your arousal growing more and more. You glance over at Anushka and see her looking at you with a huge grin on her face, she is clearly enjoying the fact that the two of you are playing with yourselves together. At this point neither of you is really watching the porno anymore and instead you just lay back on the bed side by side, looking at each other while you masturbate.'
 		*nl
 		'Some time later you feel Anushka speed up a bit next to you, her soft moans suddenly get louder and then she starts shuddering in orgasm. This is just enough to get you right on the edge and you quicken your own pace. Within moments a huge orgasm rocks your body, completely overwhelming your senses. By the time you have fully recovered Anushka has already turned off the porno and is standing there with her pants back up, smiling at you. She nods towards the door. "I don''t know about you but I could really use a snack. Come on, lets go raid the kitchen." She heads out of her room waving for you to follow. She is acting like everything is completely normal and who knows, maybe for her, it is. You get up and follow her out.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'porn', 10
 		$orgasm_or = 'yes'
 		gs 'arousal', 'masturbate', 10, 'exhibitionism'
 		gs 'arousal', 'end'

+ 7 - 7
locations/anushka.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'plan':
 								'Anushka seems completely unfazed and before you even finish speaking she lowers her head and starts sucking Valentin''s cock.'
 								'Valentin gives his head a little jerk, indicating that you should move away. "If you don''t want to party, then get lost."'
 								'After that the two of them completely ignores you from that point on. Feeling a bit uncomfortable, you get up and move away a bit farther. You spend the rest of your time keeping yourself busy by playing on your phone and trying very hard to ignore the sounds of the two of them having sex on the couch.'
-								gs 'arousal', 'voyeur', 20
+								gs 'arousal', 'voyeur_sex', 20
 								act 'Go home': gt 'gschool_detention', 'end'
 							end
 						else
@@ -108,7 +108,7 @@ if $ARGS[0] = 'plan':
 					else
 						'As Anushka and Valentin make out she reaches down to close her hand around his cock, immediately starting to jerk him. After she has him good and hard, she lowers her head and starts sucking Valentin''s cock.'
 						'Valentin gives his head a little jerk, indicating that you should move away. Feeling a bit uncomfortable, you get up and move away a bit farther. You spend the rest of your time keeping yourself busy by playing on your phone and trying very hard to ignore the sounds of the two of them having sex on the couch.'
-						gs 'arousal', 'voyeur', 20
+						gs 'arousal', 'voyeur_sex', 20
 						act 'Go home': gt 'gschool_detention', 'end'
 					end
 				end
@@ -144,7 +144,7 @@ if $ARGS[0] = 'plan':
 							'Anushka seems completely unfazed and before you even finish speaking she lowers her head and starts sucking Valentin''s cock.'
 							'Valentin shakes his head a little. "Then be quiet and watch, maybe you''ll learn something today."'
 							'After that the two of them completely ignores you from that point on. Feeling a bit uncomfortable, you get up and move away a bit farther. You spend the rest of your time keeping yourself busy by playing on your phone or watching the two of them fuck on the couch, wondering if you made the right decision.'
-							gs 'arousal', 'voyeur', 20
+							gs 'arousal', 'voyeur_sex', 20
 							act 'Go home': gt 'gschool_detention', 'end'
 						end
 					else
@@ -162,7 +162,7 @@ if $ARGS[0] = 'plan':
 				else
 					'As Anushka and Valentin make out she reaches down to close her hand around his cock, immediately starting to jerk him. After she has him good and hard, she lowers her head and starts sucking Valentin''s cock.'
 					'Valentin gives his head a little jerk, indicating that you should move away. Feeling a bit uncomfortable, you get up and move away a bit farther. You spend the rest of your time keeping yourself busy by playing on your phone and trying very hard to ignore the sounds of the two of them having sex on the couch.'
-					gs 'arousal', 'voyeur', 20
+					gs 'arousal', 'voyeur_sex', 20
 					act 'Go home': gt 'gschool_detention', 'end'
 				end
 			end
@@ -187,7 +187,7 @@ if $ARGS[0] = 'Her turn':
 		'<center><img src="images/locations/pavlovsk/school/detention/sex/detcowgirl.jpg"></center>'
 		'You shake your head. "Sorry, I will suck him or lick you. But I don''t want to get fucked."'
 		'Anushka doesn''t say a word to you, she just climbs on top of him herself, mounting him cowgirl style and starts riding him hard and fast. You kneel down next to them on the couch, squeezing and kissing her lovely ass as she continues to ride him.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		act 'Suck him again':
 			*clr & cla
 			'<center><b><font color="maroon">Detention</font></b></center>'
@@ -200,7 +200,7 @@ if $ARGS[0] = 'Her turn':
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img src="images/locations/pavlovsk/school/detention/sex/detcowanal.jpg"></center>'
 				'You watch as she rides him hard and fast, bucking and grinding against him with his cock deep up her ass. Many minutes later she really picks up the pace, moaning loudly, she is obviously about to have a orgasm. She hammers herself down on his cock, impaling herself, taking his cock as deep in her asshole as it can go. Then she takes a loud shuddering breath, shaking all over with her eyes rolling up as she slowly comes to a stop, with his dick still buried up her ass.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'voyeur_sex', 10
 				act 'Finish':
 					*clr & cla
 					gs 'cum_call', 'mouth', $boy
@@ -241,7 +241,7 @@ if $ARGS[0] = 'Her turn':
 			*nl
 			'Her tongue laps at your clit and slit as soon as they are within reach and every now and then, her tongue darts inside of you as well. Meanwhile, Valentin lays himself down on his side and pounds her ass from behind, allowing him to lick and suck on your nipples while she eats you out. This goes on for some time, all three of you audibly content with this position, until Anushka makes the two of you move again.'
 			gs 'arousal', 'cuni', 10, 'group'
-			gs 'arousal', 'breasts', 10, 'group'
+			gs 'arousal', 'foreplay', 10, 'group'
 			minut -= 10
 			gs 'stat'
 			act 'Continue':

+ 23 - 23
locations/anushkaev1.qsrc

@@ -307,23 +307,23 @@ if $ARGS[0] = 'watch_nushrad':
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad2.jpg"></center>'
 		'"Fuck I am so hard, come on and suck my dick." He says after giving her bare ass a slap hard enough to leave a red outline of his hand on her ass. She yelps a little and then turns around on the bed. While lying on the bed, she starts sucking his dick, before to long he grabs her by the sides of the head and starts just fucking her mouth with his dick, often gagging her, as he shoves his dick balls deep down her throat. Then he forces his dick balls deep into her mouth and holds her there as she gags for several moments. He finally pulls his dick out of her mouth leaving her choking and gasping for breath.'
-		gs 'arousal', 'voyeur', 5, 'rough'
+		gs 'arousal', 'voyeur_sex', 5, 'rough'
 		gs 'stat'
 		act 'Leave apartment': gt 'pavComplex','start'
 		act 'Keep watching':
 			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad3.jpg"></center>'
 			'While she is catching her breath, he reaches past her and grabs her by the leg, then spins her around on the bed, and drags her towards him until her butt is almost hanging off the edge of the bed. He pushes her legs apart just as she seems to have finally caught her breath, and then he just shoves his dick in her pussy. She winces a little bitting her lower lip. Obviously not as wet and ready as she would have liked to be before starting sex. He doesn''t seem to notice or doesn''t care, as he just starts hammering away at her pussy balls deep. Each thrust making her grunt, though her grunts slowly turn into moans of pleasure.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave apartment': gt 'pavComplex','start'
 			act 'Keep watching':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad4.jpg"></center>'
-				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her ass and giving her ass a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use to much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
+				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her ass and giving her ass a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use too much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
 				*nl
 				'He pushes her down until she is laying on her stomach, as he tosses the bottle aside and then leans forward, pushing his dick between her butt cheeks as struggles a bit. "Rad you didn''t use enough lube." She says as she winces as he keeps struggling to push his dick between her butt cheeks. "Shut up Nush, this feels better, you feel really tight." He says just as shoves his hips forward hard, which causes her to jump a little and cry out in pain. "Ow fuck Rad, that hurt, you need to use more lube." She says in a obviously pain stressed voice. He pushes her head against the mattress. You can see her wincing in pain and white knuckling her grip on the bed sheets. "See I knew you didn''t need much lube, fuck your ass is tight." He says as he struggles to force himself balls deep into her ass, moaning in pleasure as he does.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave apartment': gt 'pavComplex','start'
 				act 'Keep watching':
@@ -331,21 +331,21 @@ if $ARGS[0] = 'watch_nushrad':
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad5.jpg"></center>'
 					'He pulls his dick almost all the way out of her ass and then slams it back in balls deep, moaning with pleasure as he does. Meanwhile she cries out a little, wincing in pain, she tries to pull away a little, but he just pulls her back. "Oh fuck! Not so hard Rad."'
 					'"Oh please all you bitches love being roughly fucked by a man, like the sluts you are. So just shut up and enjoy it." He says as he starts hammering her ass, with long full length hard strokes. She grunts in pain a lot more than she moans in pleasure, but you don''t think Rad can tell the difference or maybe he just doesn''t care.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Leave apartment': gt 'pavComplex','start'
 					act 'Keep watching':
 						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad6.jpg"></center>'
 						'He grabs ahold of her hips and pulls her hips up until she is on her knees. Then he shoves her face back into the mattress, before he goes back to hammering away at her ass. She places a hand on his hip in a effort to slow him down a little and keep him from going balls deep in her ass, he just roughly shoves her hand away and slaps her hard on the ass. She tries several more times to reach back and slow him down and keep him from going so deep, each time he roughly shoves her hands away. "Please Rad not so rough or use more lube." She pleads with him. "Fucking take it bitch, take it!" He growls, as redoubles his efforts and just seems to fuck her ass even harder'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						act 'Leave apartment': gt 'pavComplex','start'
 						act 'Keep watching':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad7.jpg"></center>'
-							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
-							gs 'arousal', 'voyeur', 5
+							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on her hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
+							gs 'arousal', 'voyeur_sex', 5
 							gs 'stat'
 							act 'Leave apartment': gt 'pavComplex','start'
 							act 'The cum prize':
@@ -353,8 +353,8 @@ if $ARGS[0] = 'watch_nushrad':
 								'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad8.jpg"></center>'
 								'He suddenly pulls his dick out of her ass and starts cumming all over her ass cheeks, moaning loudly as he does. While she lets out a relieved sigh, as a relieved look washes over her face, obviously glad he is finally finished. When he finishes cumming on her ass, he lets go of her and steps away. "Fuck Nush you are the best fucking slut, I have ever fucked. I''ll never get tired of fucking your tight little ass."'
 								*nl
-								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in laugh." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
-								gs 'arousal', 'voyeur', 5
+								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in life." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
+								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								gs 'arousal', 'end'
 								act 'Leave apartment': gt 'pavComplex','start'
@@ -375,7 +375,7 @@ if $ARGS[0] = 'watch_nushrad':
 											'"Well you could not be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries about it she is always ready for another good ass fucking."'
 											*nl
-											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you was thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
+											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you were thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 									else
@@ -392,7 +392,7 @@ if $ARGS[0] = 'watch_nushrad':
 											'"Well you don''t have to be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries she is always ready for another good ass fucking." Then pauses a moment. "Well you will understand if you ever find a guy willing to fuck you at least." He says as if the meer thought of it disgusts him.'
 											*nl
-											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you was thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
+											'You are not really sure what to say, if what he saying is true it is kinda hard to dispute it. If she didn''t on some level like it, why would she keep letting him do it? You don''t get to find out, while you were thinking about it. He walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 									end
@@ -414,14 +414,14 @@ if $ARGS[0] = 'watch_nushval':
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval1.jpg"></center>'
 	'As you watch Anushka leans forward and starts sucking on the hard cock, you can hear the guy moaning in pleasure. "Fuck Nush you suck cock better than anyone." You can now tell by the voice it is Valentin'
 	'She keeps bobbing her head up and down sucking his dick, while she flips him off as a reply to his comment which just makes him laugh. Though you have to agree with him, she really looks like she knows how to suck a cock. While she sucks his dick she slowly strips off all her clothes.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
 	act 'Leave apartment': gt 'pavComplex','start'
 	act 'Keep watching':
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval2.jpg"></center>'
 		'Once she is naked she turns around so they are 69ing each other. You push the door open just a tiny bit more so you can see all the action, Valentin is eagerly lapping at her pussy as she continues to give him head. You know you really shouldn''t be spying and that you could be caught at any moment.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		act 'Leave apartment': gt 'pavComplex','start'
 		act 'Keep watching':
@@ -429,7 +429,7 @@ if $ARGS[0] = 'watch_nushval':
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval3.jpg"></center>'
 			'He slaps her ass. "Come on get up, I want to fuck you."'
 			'She turns around again laughing. "Who said you are the one going to do the fucking?" With that she stands up and straddles him, slowly lowering herself down until his dick slides into her wet pussy. They both moan in pleasure, as she slowly starts riding him reverse cowgirl style. She slowly picks up speed fucking him harder and faster. After a few minutes she seems to be getting tired and starts slowing down'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave apartment': gt 'pavComplex','start'
 			act 'Keep watching':
@@ -437,7 +437,7 @@ if $ARGS[0] = 'watch_nushval':
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval4.jpg"></center>'
 				'Once she slows down enough he lifts her off him and tosses her to the side. She lets out a slight squeal as he tosses her aside, where she lands on her side slightly bouncing on the bed. He rolls up onto his knees and slaps her on the ass again. "Roll over on your hands and knees."'
 				'She rolls over like he tells her, once she is on all fours. He scoots up behind her and slips his dick back in her wet pussy and starts fucking her doggy style. She moans loudly as he does and the louder she moans the harder and faster he fucks her. Until she has a immense orgasm that rocks her whole body, leaving her bitting the sheets to keep from crying out to loudly.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave apartment': gt 'pavComplex','start'
 				act 'Keep watching':
@@ -446,7 +446,7 @@ if $ARGS[0] = 'watch_nushval':
 					'Once her orgasm has passed he slaps her ass again, as he pulls his dick out of her pussy. "Spread your ass for me baby." She grabs a bottle of lube out of her dresser, putting some of the lube on his dick and some on her ass, then reaches back with one hand, grabbing one of her butt cheeks and spreads it wide. He pushes his dick gently into her ass, which elicits a loud moan of pain and pleasure for her.'
 					*nl
 					'He is fairly slow and not to deep at first, but once she starts moaning loudly and saying. "Yes!, Yes, fuck yes! Oh god yes!" He starts fucking her a lot harder and faster, finally slamming himself balls deep into her ass. She grips the sheets tightly, just as her body is rocked by another massive orgasm. She buries her face in her own shoulder partially muffling her cries of pleasure. You glance around to make sure no one else heard that and is coming to find out what is going on.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Leave apartment': gt 'pavComplex','start'
 					act 'Chance for cum showers':
@@ -482,14 +482,14 @@ if $ARGS[0] = 'watch_nushmar':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar1.jpg"></center>'
 	'You push the door open just a tiny bit more to get a better look. You can now tell it is Marcus from school, his dick already rock hard. She takes the head of his cock into her mouth and she starts sucking on it, slowly working her lips further and further down his shaft. He starts really moaning and grabs her by the hair and starts to fuck her mouth, not to rough, but he takes control of the action.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
 	act 'Leave apartment': gt 'pavComplex','start'
 	act 'Keep watching':
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar2.jpg"></center>'
 		'She pulls away until his dick comes out of her mouth, she looks up at him. "Please fuck me with your... big... black... dick..." she purrs, drawing out the last words with a breathy moan in accented English. As she gets up he helps lift her, half setting and half tossing her onto the bed which gets a giggle out of her. She lays on her back with her legs spread wide, he moves up between her legs and slides his black dick into her pale pussy, causing them both to moan. "Fuck you''re so tight Nush." He moans out as he starts fucking her, not to fast or hard. But he takes cues from her moans and body language picking up the pace the more into it she gets.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		act 'Leave apartment': gt 'pavComplex','start'
 		act 'Keep watching':
@@ -498,21 +498,21 @@ if $ARGS[0] = 'watch_nushmar':
 			'She starts breathing heavy and biting her lower lip, looking at him with pure lust in her eyes. "I want you to fuck my tight little white ass with your... big... black... cock..." she purrs, drawing out the last words with a breathy moan, in accented English. He doesn''t have to be told twice. He lays down on the bed next to her, while she grabs a bottle of lube out of her dresser, putting some on his dick and some on her ass. With them both lubed up he lines his dick up against her asshole, he presses against it until the head pops in which elicits a squeal of a mixture of pain and pleasure from her.'
 			*nl
 			'He waits a moment while she gets use to his dick and then slowly starts fucking her ass with his big dick. "Oh god yes, that feels so good Marcus, fuck my little white ass." Again talking to him in English, apparently she pays attention in school after all, though you doubt this is what Mrs Braakman hand in mind during English class. He picks up the pace a little but is still fairly gentle with her. She seems to be really loving it and seems to really like the race play.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave apartment': gt 'pavComplex','start'
 			act 'Keep watching':
 				*clr & cla
 				'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar4.jpg"></center>'
 				'"Please I want more of your... big... black... cock... in my ass." You think she is playing up the accent while speaking English. He grabs ahold of her and rolls her up, as he rolls up to his knees, after a few moments of them adjusting their position while his dick stays in her ass. She finally ends up on her knees with her shoulder against the mattress. Giving him much better access to her ass, in this position. He starts fucking her again, but it takes a little prodding from her for him to start going deeper and faster. Once he is sure she is into it, he starts being less gentle about it. Once she has a hard orgasm from it, he starts really fucking her.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave apartment': gt 'pavComplex','start'
 				act 'Keep watching':
 					*clr & cla
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar5.jpg"></center>'
 					'Now he is really starting to hammer away on her ass, she reaches between her legs and rubs her clits moaning louder and louder the harder he fucks her ass. Only a couple of minutes later and she has another massive orgasm, almost falling over from her body quivering so hard. He has to practically hold her up himself. But then he suddenly pulls his dick out of her ass and slides off the bed. "I''m going to cum."'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Leave apartment': gt 'pavComplex','start'
 					act 'Salty snack':
@@ -521,7 +521,7 @@ if $ARGS[0] = 'watch_nushmar':
 						'She slides off the bed in front of him, going to her knees. She tilts her head back and opens her mouth, while taking a firm grip on his dick and starts jerking him off. It doesn''t take long before he groans loudly and his cum starts raining down on her face. Some of it ends up on her cheeks but most of it manages to make it in her mouth. Pretty good aim if you have to say so yourself. She gives his cock several more hard long strokes milking out every last drop of cum from him, letting it fall onto her tongue. She doesn''t stop until he is dry, then she wiggles her tongue around showing the cum on it before swallowing it down, followed by her licking her lips clean of any stray cum. "God I love Russian girls, you are just so amazing Nush."'
 						*nl
 						'He bends over and gives her a kiss on the lips, then they both get up and start getting dressed, while she also cleans up the bit of cum that missed her mouth off the rest of her face. Once they are both dressed, she pats him on the chest with her hand. "That was amazing Marcus, I really needed that." Switching back to Russian, in a fairly dismissive tone. Just the way she said it, makes it clear she is done and is ready for him to leave. He seems to have picked up on the tone as well. "Oh yeah anytime, well I guess I better get going. See you at school yeah?" She nods and sits down on the bed. "Yeah sure, see you at school." You can hear the what ever in her tone even if she doesn''t say it. He seems to notice it too, then he turns towards the door, you quickly step away from the door before you get seen, softly shutting it.'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						gs 'arousal', 'end'
 						act 'Leave apartment': gt 'pavComplex','start'

+ 68 - 13
locations/arousal.qsrc

@@ -2,10 +2,36 @@
 
 !!{For checking arousal and when applicable triggering orgasms.
 $ARGS[0] the action causing arousal can be when receiving any of the following:
-'masturbate' 'porn' 'voyeur' 'kiss' 'breasts' 'massage' 'foreplay' 'cuni' 'rimming' 'trib' 'anal' 'anal_finger' 'anal_fist' 'anal_dildo' 'anal_strap' 'anal_vibe' 'vaginal' 'vaginal_finger' 'vaginal_fist' 'vaginal_dildo' 'vaginal_strap' 'vaginal_vibe'
+'masturbate' - self stimulation
+'porn' - viewing pornographic material
+'voyeur_sex' - watching people have sex
+'voyeur' - observing erotic acts or nudity
+'trib' - rubbing pussy against another pussy
+'massage' - rubbing your body, back, feet, etc. with their hands/arms
+'cuni' - stimulation of your pussy by someones toungue
+'rimming' - stimulation of your anus by someones toungue
+'vaginal' 'vaginal_finger' 'vaginal_fist' 'vaginal_dildo' 'vaginal_strap' 'vaginal_vibe' - stimulation of your vagina with a penis and various others
+'anal' 'anal_finger' 'anal_fist' 'anal_dildo' 'anal_strap' 'anal_vibe' - stimulation of your anus with a penis and various others
+'kiss' - snogging, tonsil tennis, lip locking, etc.
+'BDSM' - receiving candle wax, flogging, leash play, bondage etc
+'pee' - being peed upon
 also when giving any of the following:
-'flashlite' 'flash' 'kiss_give' 'breasts_give' 'massage_give' 'foreplay_give' 'cuni_give' 'rimming_give' 'anal_finger_give' 'anal_fist_give' 'anal_dildo_give' 'anal_vibe_give' 'anal_strap_give'
-'vaginal_finger_give' 'vaginal_fist_give' 'vaginal_dildo_give' 'vaginal_strap_give' 'vaginal_vibe_give' 'hj' 'bj' 'footjob'
+'flashlite' - flashing underwear
+'flash' - flashing naked breasts/arse/vagina
+'massage_give' - rubbing their body, back, feet, etc. with your hands/arms
+'cuni_give' - stimulating someones pussy with your toungue
+'rimming_give' - stimulating someones anus with your toungue
+'vaginal_finger_give' 'vaginal_fist_give' 'vaginal_dildo_give' 'vaginal_strap_give' 'vaginal_vibe_give' - stimulating someones vagina in various ways
+'anal_finger_give' 'anal_fist_give' 'anal_dildo_give' 'anal_vibe_give' 'anal_strap_give' - stimulating someones anus in various ways
+'hj' - jerking a guy off with your hand
+'bj' - sucking a guy off
+'titjob' - using boobs to jerk off a guy
+'footjob' - using feet to jerk off a guy
+'BDSM_give' - giving candle wax, flogging, leash play, bondage etc
+'pee_give' - peeing on somone
+finally
+'foreplay' - receiving other stuff
+'foreplay_give' - giving other stuff
 All acts are from Sveta''s perspective and in cases of both giving and receiving, receiving should be used.
 ARGS[1] for time taken in minutes - it is use partly for arousal calculation and partly for moving time ahead. If you want to calculate just the arousal and do not move time (simultaneous stimulation), use negative value.
 $ARGS[2] can be used for passing the name of boys dick variable .. 'dick' is default, which belong to $boy, else can be passed 'dick1' .. 'dick4' or 'dick[i]' along the boys parameters activation 
@@ -87,16 +113,20 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 100
 	elseif $ARGS[0] = 'porn':
 		count['porn'] = 1
-		stim['act'] = 20
+		stim['act'] = 25
 	elseif $ARGS[0] = 'voyeur':
 		count['voyeur'] = 1
-		stim['act'] = 30
+		stim['act'] = 20
+	elseif $ARGS[0] = 'voyeur_sex':
+		count['voyeur_sex'] = 1
+		stim['act'] = 35
 	elseif $ARGS[0] = 'kiss':
+		count['kiss'] = 1
 		stim['act'] = 10
-	elseif $ARGS[0] = 'breasts':
-		stim['act'] = 30
-		!! No idea where else to put this. This is used for breast stimulation which will eventually cause lactation in sveta without her knowledge. If anyone knows a better place for this, please let me know. - milky_boobs.
-		milkedvolume += func('lact_lib','$get_breastmilk', 8, ARGS[1])
+!!	elseif $ARGS[0] = 'breasts':
+!!		stim['act'] = 30
+!!		!! No idea where else to put this. This is used for breast stimulation which will eventually cause lactation in sveta without her knowledge. If anyone knows a better place for this, please let me know. - milky_boobs.
+!!		milkedvolume += func('lact_lib','$get_breastmilk', 8, ARGS[1])
 	elseif $ARGS[0] = 'massage':
 		stim['act'] = 25
 	elseif $ARGS[0] = 'foreplay':
@@ -314,10 +344,12 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	elseif $ARGS[0] = 'flash':
 		count['flash'] = 1
 		stim['act'] = 30
-	elseif $ARGS[0] = 'kiss_give':
-		stim['act'] = 20
-	elseif $ARGS[0] = 'breasts_give':
+	elseif $ARGS[0] = 'BDSM':
+		count['BDSM'] = 1
 		stim['act'] = 20
+	elseif $ARGS[0] = 'pee':
+		count['pee'] = 1
+		stim['act'] = 10
 	elseif $ARGS[0] = 'massage_give':
 		stim['act'] = 10
 	elseif $ARGS[0] = 'foreplay_give':
@@ -387,6 +419,20 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 		stim['act'] = 25
 		stim_foot = 1
+	elseif $ARGS[0] = 'titjob':
+		if temp_unaware = 1:
+			count['hidden_titjob'] = 1
+		else
+			count['titjob'] = 1
+		end
+		stim['act'] = 45
+		stim_titjob = 1
+	elseif $ARGS[0] = 'BDSM_give':
+		count['BDSM_give'] = 1
+		stim['act'] = 20
+	elseif $ARGS[0] = 'pee_give':
+		count['pee_give'] = 1
+		stim['act'] = 10
 	end
 
 	if stim['mag'] > 9: stim['mag'] = 9
@@ -708,6 +754,9 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'vaginal_dildo'
 	gs 'arousal', 'count', 'vaginal_strap'
 	gs 'arousal', 'count', 'vaginal_vibe'
+	gs 'arousal', 'count', 'BDSM'
+	gs 'arousal', 'count', 'pee'
+
 	gs 'arousal', 'count', 'cuni_give'
 	gs 'arousal', 'count', 'rimming_give'
 	gs 'arousal', 'count', 'anal_finger_give'
@@ -721,14 +770,20 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'vaginal_strap_give'
 	gs 'arousal', 'count', 'vaginal_vibe_give'
 	gs 'arousal', 'count', 'hj'
-	gs 'arousal', 'count', 'bj'
 	gs 'arousal', 'count', 'hidden_hj'
+	gs 'arousal', 'count', 'bj'
 	gs 'arousal', 'count', 'hidden_bj'
 	gs 'arousal', 'count', 'footjob'
 	gs 'arousal', 'count', 'hidden_footjob'
+	gs 'arousal', 'count', 'titjob'
+	gs 'arousal', 'count', 'hidden_titjob'
+	gs 'arousal', 'count', 'BDSM_give'
+	gs 'arousal', 'count', 'pee_give'
+
 	gs 'arousal', 'count2', 'flashlite'
 	gs 'arousal', 'count2', 'flash'
 	gs 'arousal', 'count2', 'voyeur'
+	gs 'arousal', 'count2', 'voyeur_sex'
 	
 	!! Thats here because there is currently a variable zoo.
 		if zoo > stat['beast']: stat['beast'] = zoo

+ 2 - 2
locations/artgar.qsrc

@@ -209,7 +209,7 @@ elseif apmeet = 3:
 		'Then Artem begins to move, and Peter slaps his belt down onto your ass before you realize that was your cue to follow him. You quickly pick up the pace and follow Artem, trying to guess what he wants to do next. Whenever you fail Peter whips you with his belt, and after a few minutes you can only guess you have red welts all across your butt cheeks. It certainly feels like you do.'
 		act 'Continue your training':
 			*clr & cla
-			gs 'arousal', 'breasts', 5, 'sub', 'humiliation', 'bound', 'rough'
+			gs 'arousal', 'foreplay_give', 5, 'sub', 'humiliation', 'bound', 'rough'
 			gs 'arousal', 'end'
 			gs 'pain', 1, 'neck', 'bind'
 			gs 'pain', 2, 'nipples', 'bind'
@@ -382,7 +382,7 @@ elseif apmeet = 4:
 		gs 'arousal', 'end'
 		gs 'pain', 4, 'asscheeks', 'spank'
 		gs 'pain', 2, 'asshole', 'stretch'
-		gs 'pain', 3, 'breasts', 'bind'
+		gs 'pain', 3, 'foreplay', 'bind'
 		gs 'pain', 2, 'armL', 'bind'
 		gs 'pain', 2, 'armR', 'bind'
 		gs 'stat'

+ 26 - 4
locations/arturHome.qsrc

@@ -17,13 +17,11 @@ act 'Go to his home':
 	$boydesc = $npc_usedname['A73']
 	silavag = npc_sexskill['A73']
 	dick = npc_dick['A73']
-	arturTimes += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 	'Arthur has generously set the table with food and you eat meat wrapped in grape leaves and roasted on skewers. You drink strong Chacha with your food and quickly find yourself getting tipsy. Once you''re nearly done with your meal Arthur turns on some music before approaching, a look of lust on his face. "Come to me girl." He says authoritatively'
 
-	act 'Further':gt 'arturSex'
-
+	act 'Go with him':arturTimes += 1 & gt 'arturSex'
 	if condomtalkartur = 0 and arturSex > 0:
 		act 'Ask him to wear a condom':
 			*clr & cla
@@ -33,8 +31,32 @@ act 'Go to his home':
 			'You ask Arthur to wear a condom. He scoffs loudly at the suggestion and shakes his head."What? Sex with a condom is like breathing through a mask. No!"'
 			! Choosing to give Artur a little accent to emphasize that he is not from the same ethnic group as the rest of town. AB
 
-			act 'Further':gt 'arturSex'
+			act 'Go with him':arturTimes += 1 & gt 'arturSex'
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					
+					gt 'pavCommercial'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+	end
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Leave (<<will_cost>> Willpower)':
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			gt 'pavCommercial'
 		end
+	else
+		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 

+ 60 - 9
locations/arturQW.qsrc

@@ -21,9 +21,19 @@ if $ARGS[0] = 'arturQW_1':
 			'"Well, if you''re really going to pay that well, then I can hardly refuse." You say smiling at the handsome Armenian.'
 			'My beauty, I will not only pay you that well, but I will treat you like the treasure you are." He assures you.'
 			'Excitedly Arthur comes over and gives your ass a hard squeeze, his fingers sinking into your plump flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek. "Now that the business is settled, let''s go eat barbecue, drink Chacha brandy!" He declares happily.'
-
+			
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					gt 'pavtrain_market', 'start'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 		act 'Refuse':
 			*clr & cla
@@ -33,18 +43,38 @@ if $ARGS[0] = 'arturQW_1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 			'You smile sadly at him. "Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I simply don''t have any free time as it is.'
 			'"As you like beautiful." He responds somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze, his fingers sinking into your soft flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek.'
-
+			
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					gt 'pavtrain_market', 'start'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	else
 		*clr & cla
 		gs 'stat'
 
 		'Arthur smiles kindly and hands you a tangerine. "Come to eat barbecue, drink Chacha brandy!"'
-
+		
+		gs 'willpower', 'sex', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'pavtrain_market', 'start'
+			end
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 		act 'Go with Arthur':gt 'arturHome'
-		act 'Leave':gt 'pavtrain_market', 'start'
 	end
 end
 
@@ -71,7 +101,18 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_5.jpg"></center>'
 		'You smile at him, a mix of joy and lust. "Well, Arthur, that changes everything, I would love to keep the books for you."'
 		'"Yes! I knew you would." The Armenian exclaims happily. "Come my beauty, let''s go eat barbecue and drink Chaha brandy." He says as he roughly grabs your ass, palming your soft cheeks with his thick, muscular hands.'
-
+		
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'pavtrain_market', 'start'
+			end
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 		act 'Go with Arthur':gt 'arturHome'
 	end
 	act 'Refuse':
@@ -82,9 +123,19 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 		'"Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I don''t have any free time as it is. It''s just too much." You say, sad to have to turn down such a generous opportunity.'
 		'"As you like beautiful." He said somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze.'
-
+		
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'pavtrain_market', 'start'
+			end
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 		act 'Go with Arthur':gt 'arturHome'
-		act 'Leave':gt 'pavtrain_market', 'start'
 	end
 end
 

+ 73 - 24
locations/arturRinok.qsrc

@@ -13,31 +13,59 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 			'You take the delicious looking fruit and return his smile with one of your own. The man grins and says in a thick accent "You are so beautiful girl! Come to my place and eat barbecue, I have Chacha brandy for us to enjoy together, it will be wonderful time."'
-
-			act 'Refuse':
-				*clr & cla
-				minut += 2
-
-				if bag = 0:$arturgift = 'handbag'
-				if bag > 0:$arturgift = 'cosmetics'
-
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-				'Sensing the man has "other" intentions, you start to refuse and back away from the Armenian. He puts his hand out to stop your retreat and says "Hey, I mean no offense. Perhaps my Russian is no good. Nothing bad will happen I swear! I''ll even give you <<$arturgift>> if you come and spend some time with me."'
-
-				act 'Leave':gt 'pavtrain_market', 'start'
-
-				act 'Show interest':
+			
+			gs 'willpower', 'drink', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
 					*clr & cla
 					minut += 2
+
+					if bag = 0:$arturgift = 'handbag'
+					if bag > 0:$arturgift = 'cosmetics'
+					gs 'willpower', 'drink', 'resist'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
+					
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-					'You can''t help but show interested in the gift the unfamiliar Armenian is offering. Suddenly another Armenian comes up to you and leans in with an equally friendly smile. "Do not fear girl, Uncle Arturik does not bite. He is good man." The second stranger insists.'
-
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Go with Arthur':gt 'arturHome'
+					'Sensing the man has "other" intentions, you start to refuse and back away from the Armenian. He puts his hand out to stop your retreat and says "Hey, I mean no offense. Perhaps my Russian is no good. Nothing bad will happen I swear! I''ll even give you <<$arturgift>> if you come and spend some time with me."'
+					
+					gs 'willpower', 'drink', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Leave (<<will_cost>> Willpower)':
+							gs 'willpower', 'drink', 'resist'
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							gt 'pavtrain_market', 'start'
+						end
+					else
+						act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Show interest':
+						*clr & cla
+						minut += 2
+						gs 'stat'
+						
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
+						'You can''t help but show interested in the gift the unfamiliar Armenian is offering. Suddenly another Armenian comes up to you and leans in with an equally friendly smile. "Do not fear girl, Uncle Arturik does not bite. He is good man." The second stranger insists.'
+						
+						gs 'willpower', 'drink', 'resist', 'hard'
+						if will_cost <= pcs_willpwr:
+							act 'Leave (<<will_cost>> Willpower)':
+								gs 'willpower', 'drink', 'resist', 'hard'
+								gs 'willpower', 'pay', 'resist'
+								gs 'stat'
+								gt 'pavtrain_market', 'start'
+							end
+						else
+							act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Go with Arthur':gt 'arturHome'
+					end
 				end
+			else
+				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			act 'Go with Arthur':gt 'arturHome'
 		end
 	else
 		if arturday ! daystart:
@@ -49,12 +77,23 @@ if $ARGS[0] = 'start':
 
 			if arturblowday ! daystart:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-				'Arthur smiles kindly and hand you a particularly juicy looking tangerine. "Sorry, girl, but I have work to do. Unless we make it quick."'
-
+				'Arthur smiles kindly and hands you a particularly juicy looking tangerine. "Sorry, girl, but I have work to do. Unless we make it quick."'
+				
+				gs 'willpower', 'bj', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Leave (<<will_cost>> Willpower)':
+						gs 'willpower', 'bj', 'resist', 'hard'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'pavtrain_market', 'start'
+					end
+				else
+					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 				act 'Go with Arthur':gt 'arturkiosk'
 			elseif arturblowday = daystart:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
-				'Arthur smile amiably you. "There is much work to do, I''m sorry."'
+				'Arthur smiles kindly at you. "There is much work to do, I''m sorry."'
 
 				act 'Leave':gt 'pavtrain_market', 'start'
 			end
@@ -132,9 +171,19 @@ if $ARGS[0] = 'work_2':
 			'"Yes, but you''ve still got a lot I haven''t finished yet. There is far more to do." You say, concerned.'
 			'"Oh well, we will have time to figure it all out. Some other night, perhaps." He says nonchalantly.'
 			'"Now let''s go eat barbecue and drink Chacha brandy. Then I can grab you by that fine ass of yours." Arthur suggests as he walks over and begins roughly palming your ass.'
-
+			
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					gt 'pavtrain_market', 'start'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	end
 end

+ 14 - 7
locations/arturSex.qsrc

@@ -31,13 +31,20 @@ act 'Kneel down':
 			act 'Continue': gt 'arturdin', 'facefuck'
 		end
 	end
-
-	act 'Masturbate him':
-		*clr & cla
-		'You began to slowly stroke his large member, but as you look up at Arthur, you see him roll his eyes with impatience before reaching for you.'
-		gs 'arousal', 'hj', 5
-		gs 'stat'
-		act 'Continue': gt 'arturdin', 'facefuck'
+	
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Masturbate him (<<will_cost>> Willpower)':
+			*clr & cla
+			'You began to slowly stroke his large member, but as you look up at Arthur, you see him roll his eyes with impatience before reaching for you.'
+			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'arousal', 'hj', 5
+			gs 'stat'
+			act 'Continue': gt 'arturdin', 'facefuck'
+		end
+	else
+		act 'Masturbate him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 

+ 38 - 10
locations/balkon2.qsrc

@@ -22,12 +22,16 @@ if $ARGS[0] = 'demo1':
 	gs 'stat'
 	'<center><font size="5" color="maroon"><b>Balcony</b></font></center>'
 
-	if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/balcony_underwear3.jpg"></center>'
-	if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/balcony_naked3.jpg"></center>'
+	if $pantyworntype ! 'none':
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/balcony_underwear3.jpg"></center>'
+		gs 'arousal', 'flashlite', 5, 'exhibitionism'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/balcony_naked3.jpg"></center>'
+		gs 'arousal', 'flash', 5, 'exhibitionism'
+	end
 
 	'<center>You defiantly pose on the balcony, to the delight of your neighbor. He eagerly looks at you while furiously masturbating. 5 minutes later he cums and returns to his apartment.</center>'
 	
-	gs 'arousal', 'voyeur', 5, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
 
@@ -37,7 +41,7 @@ end
 if $ARGS[0] = 'palec1':
 	cla
 	*clr
-	pcs_horny += rand(10, 30)
+	pcs_horny += rand(10,30)
 	minut += 1
 	sosedBalDay = daystart
 	gs 'stat'
@@ -93,9 +97,35 @@ if $ARGS[0] = 'sosed':
 	'<center><b><font color="maroon">Balcony</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sosed.jpg"></center>'
 	'<center>You notice your neighbor to the left standing on his balcony. As he notices that you''re naked he begins staring at you…</center>'
-
-	act 'Show off your body':gt 'balkon2', 'demo1'
-	act 'Flip him off':gt 'balkon2', 'palec1'
+	
+	if exhibitionist_lvl > 0:
+		act 'Show off your body':gt 'balkon2', 'demo1'
+		gs 'willpower', 'exhib', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Flip him off (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'balkon2', 'palec1'
+			end
+		else
+			act 'Flip him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	else
+		gs 'willpower', 'exhib', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Show off your body (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'balkon2', 'demo1'
+			end
+		else	
+			act 'Show off your body (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Flip him off ':gt 'balkon2', 'palec1'
+	end
+	
 end
 
 !!!Probably CV edition
@@ -208,10 +238,8 @@ if $ARGS[0] = 'finger':
 					'As you open your eyes, you lock eyes with one of your neighbors peering out the window in the house across...'
 					'You can''t help but smile as there''s someone enjoying the show...'
 					
-					act 'Give him a show':gt 'balkon2', 'finger_solo'
-					
+					act 'Give him a show':gt 'balkon2', 'finger_solo'					
 				else
-					
 					$orgasm_or = 'yes'
 					$orgasm_txt = 'Overtaken by the thrill of the risk of being caught in such a compromising act and the diligent work of your skilled fingers brings you to an intense orgasm. Before you know it you grip the railing for support as your juices squirt hard out of you.'
 					'The orgasm is so intense that you''re seeing stars and it almost feels like you''re going to pass out. Somehow you manage to keep your composure as you quickly head back inside as you feel too exposed.'

+ 75 - 60
locations/bass.qsrc

@@ -59,70 +59,86 @@ if $ARGS[0] = 'a':
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 				act 'Next':gt 'kisameQW', 'start'
 			end
-
-			act 'Tell Kisame to fuck off':
-				cla
-				'"I don''t care who you are, fuck off!"'
-				'"That''s not nice!" he replies.'
-				'Before you''re able to blink, he grabs you by the waist and throws you into the middle of the pool.'
-				'As you surface, you notice Kisame rapidly approaching you...'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-				act 'Next':gt 'kisameQW', 'start'
+			
+			gs 'willpower', 'misc', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Tell Kisame to fuck off (<<will_cost>> Willpower)':
+					cla
+					'"I don''t care who you are, fuck off!"'
+					'"That''s not nice!" he replies.'
+					'Before you''re able to blink, he grabs you by the waist and throws you into the middle of the pool.'
+					'As you surface, you notice Kisame rapidly approaching you...'
+					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+					gs 'willpower', 'misc', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					act 'Next':gt 'kisameQW', 'start'
+				end
+			else
+				act 'Tell Kisame to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	elseif kisameQW = 1 and KisameDead < 1:
 		'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisamev.jpg"></center>'
 		'Noticing you observing him, Kisame smiles and tells you, "Hi baby. Want me to fill your hot mouth with my shark-seed?"'
-
-		act 'Attack Kisame':
-			cla
-			pcs_horny += 10
-			gs 'boyStat', 'A40'
-			!!stats {
-			strenV = 300
-			speedV = 100
-			agilV = 100
-			reactV = 100
-			vitalV = 200
-			intelV = 100
-			willV = 50
-			!!skills
-			magikV = 10
-			boxingV = 100
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * magikV + magikV * 100 + vitalV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 5
-			KisaFight = 1
-			klonV = 5
-			defenceV = 800
-
-			if spellavtoklon = 1:klon = 3}
-
-			gs 'fight','initFight'
-
-			$opp_name[0] = 'Kisame'
-			$opp_image[0] = 'images/characters/city/kisame/kisamev.jpg'
-			opp_def[0] = 100
-			opp_run[0] = 100
-			opp_wrstlng[0] = 75
-			opp_kick[0] = 0
-			opp_punch[0] = 100
-			opp_jab[0] = 100
-			opp_stren[0] = 200
-			opp_agil[0] = 100
-			opp_vital[0] = 200
-			opp_react[0] = 100
-			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
-			opp_willpwr[0] = 100
-			opp_shoot[0] = 100
-
-			gt 'fight', 'start'
+		
+		gs 'willpower', 'bj', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Attack Kisame (<<will_cost>> Willpower)':
+				cla
+				pcs_horny += 10
+				gs 'willpower', 'bj', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gs 'boyStat', 'A40'
+				!!stats {
+				strenV = 300
+				speedV = 100
+				agilV = 100
+				reactV = 100
+				vitalV = 200
+				intelV = 100
+				willV = 50
+				!!skills
+				magikV = 10
+				boxingV = 100
+				shootV = 100
+				!!parameters
+				healthV = vitalV * 10 + strenV * 5
+				manaV = intelV * magikV + magikV * 100 + vitalV * 10
+				willpowerV = willV * 10
+				BonusAtakV = 0
+				BonusDefV = 0
+				!!Programme of Action
+				program = 5
+				klonV = 5
+				defenceV = 800
+
+				if spellavtoklon = 1:klon = 3}
+
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Kisame'
+				$opp_image[0] = 'images/characters/city/kisame/kisamev.jpg'
+				opp_def[0] = 100
+				opp_run[0] = 100
+				opp_wrstlng[0] = 75
+				opp_kick[0] = 0
+				opp_punch[0] = 100
+				opp_jab[0] = 100
+				opp_stren[0] = 200
+				opp_agil[0] = 100
+				opp_vital[0] = 200
+				opp_react[0] = 100
+				opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+				opp_willpwr[0] = 100
+				opp_shoot[0] = 100
+				fightEnding = 7
+
+				gt 'fight', 'start'
+			end
+		else
+			act 'Attack Kisame (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act 'Give him a blowjob under water':
@@ -133,7 +149,6 @@ if $ARGS[0] = 'a':
 			gs 'cum_cleanup'
 			if pcs_sweat > 15 : pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5
-			pcs_willpwr += 5
 
 			if pcs_stren < 40:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			if KisameSex = 0:KisameSex = 1 & Set guy += 1

+ 140 - 2
locations/belpicknick.qsrc

@@ -18,6 +18,17 @@ if $ARGS[0] = '':
 		'You drink the vodka as you were told, and feel a shiver run down your spine. Your throat burns when you swallow it, but soon after a pleasant warmth spreads throughout your body. A few minutes later, you feel absolutely hammered.'
 		act'Continue':gt 'belpicknick', '1'
 	end
+	gs 'willpower', 'drink', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Run away from them (<<will_cost>> Willpower)':
+			gs 'willpower', 'drink', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			nroad = rand(1,19)
+			gt 'road'
+		end
+	else
+		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = '1':
@@ -42,6 +53,25 @@ if $ARGS[0] = '1':
 		end
 		if pcs_danc >= 40:gt 'belpicknick', 'dance'
 	end
+	if pcs_danc < 40:
+		gs 'willpower', 'mast', 'resist', 'hard'
+	else
+		gs 'willpower', 'voyeur', 'resist', 'hard'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Run away from them (<<will_cost>> Willpower)':
+			if pcs_danc < 40:
+				gs 'willpower', 'mast', 'resist', 'hard'
+			else
+				gs 'willpower', 'voyeur', 'resist', 'hard'
+			end
+			gs 'willpower', 'pay', 'resist'
+			nroad = rand(1,19)
+			gt 'road'
+		end
+	else
+		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'vb_light':
@@ -55,18 +85,39 @@ if $ARGS[0] = 'vb_light':
 	if rand(1,100) <= 10:		
 		'Even though the criminals seem enthralled by your show, one of them is getting frustrated: "Whatever. You shouldn''t be putting bottles up there, but our cocks! Get over here whore, it''s time you get fucked."'
 		act'Continue':gt 'belpicknick', 'gang'
+		gs 'willpower', 'gangbang', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'gangbang', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else
 		'The guys are not impressed however. "What kind of weak shit is this? You''d better put some more effort into it, otherwise we''re going to do it for you."'
 		act'Shove the bottom into your vagina':gt 'belpicknick', 'vb_hard'
 		act'Shove the neck into your ass':gt 'belpicknick', 'ab_light'
 		act'Shove the bottom into your ass':gt 'belpicknick', 'ab_hard'
+		gs 'willpower', 'mast', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'mast', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
 if $ARGS[0] = 'vb_hard':
 	cls
 	dick1 = 40
-	prevdance = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bottle2.jpg"></center>'
 	gs 'dinsex2', 'd_vag_sex_bottle', 5, 'dick1'
@@ -78,17 +129,38 @@ if $ARGS[0] = 'vb_hard':
 	if rand(1,100) <= 80:
 		'Even though the criminals seem enthralled by your show, one of them is getting frustrated: "Whatever. You shouldn''t be putting bottles up there, but our cocks! Get over here whore, it''s time you get fucked."'
 		act'Continue':gt 'belpicknick', 'gang'
+		gs 'willpower', 'gangbang', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'gangbang', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else	
 		'The bandits look at each other for a second, and then shake their heads: "Not good enough, slut. Put it in your ass and be quick about it, otherwise we''re doing it for you."'
 		act'Shove the neck into your ass':gt 'belpicknick', 'ab_light'
 		act'Shove the bottom into your ass':gt 'belpicknick', 'ab_hard'
+		gs 'willpower', 'mast', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'mast', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
 if $ARGS[0] = 'ab_light':
 	cls
 	dick1 = 10
-	prevdance = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bottle3.jpg"></center>'
 	gs 'dinsex2', 'd_analsex_bottle',5,'dick1'
@@ -100,9 +172,31 @@ if $ARGS[0] = 'ab_light':
 	if rand(1,100) <= 70:	
 		'Even though the criminals seem enthralled by your show, one of them is getting frustrated: "Whatever. You shouldn''t be putting bottles up there, but our cocks! Get over here whore, it''s time you get fucked."'
 		act'Continue':gt 'belpicknick', 'gang'
+		gs 'willpower', 'gangbang', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'gangbang', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else
 		'The bandits look at each other for a second, and then shake their heads: "Not good enough, slut. Use the other end and be quick about it, otherwise we''re doing it for you."'
 		act'Shove the bottom into your ass':gt 'belpicknick', 'ab_hard'
+		gs 'willpower', 'mast', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'mast', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
@@ -119,6 +213,17 @@ if $ARGS[0] = 'ab_hard':
 	end
 	'The guys slap each other on the back, thoroughly impressed: "What an ass, look at it stretch! It''s gonna take all of our cocks combined in there to even feel something!"'
 	act'Continue':gt 'belpicknick', 'gang'
+	gs 'willpower', 'gangbang', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Run away from them (<<will_cost>> Willpower)':
+			gs 'willpower', 'gangbang', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			nroad = rand(1,19)
+			gt 'road'
+		end
+	else
+		act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'dance':
@@ -150,6 +255,17 @@ if $ARGS[0] = 'dance':
 			'Suddenly the cock you''re currently sucking on is pulled away from you, and <<$boydesc>> tells you to get on all fours saying he wants to try another hole now.'
 			act'Get on your hands and knees':gt 'belpicknick', 'doggy'
 		end
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Run away from them (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				nroad = rand(1,19)
+				gt 'road'
+			end
+		else
+			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
@@ -191,6 +307,17 @@ if $ARGS[0] = 'missionary':
 				'You stay in position for the next guy.'
 				act'Continue':gt 'belpicknick', 'missionary'
 			end
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Run away from them (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
+					nroad = rand(1,19)
+					gt 'road'
+				end
+			else
+				act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 		end
 	end
 end
@@ -246,6 +373,17 @@ if $ARGS[0] = 'doggy':
 				'You stay in position for the next guy.'
 				act'Continue':gt 'belpicknick', 'doggy'
 			end
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Run away from them (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
+					nroad = rand(1,19)
+					gt 'road'
+				end
+			else
+				act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 		end
 	end
 end

+ 7 - 7
locations/bicycle.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'sarai':
 				findvelrand = RAND(0,100)
 				if $clothingworntype = 'nude':
 					pcs_horny += 20
-					pcs_willpwr += 10
+					pcs_mood += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
 					'You ride nude, avoiding crowded places, exulting from this newfound courage. It''s hard to say what excites you more, fear or desire to be noticed.'
@@ -44,21 +44,21 @@ if $ARGS[0] = 'sarai':
 				end
 				if CloSkirtShortness > 0 and findvelrand > 70:
 					if $pantyworntype ! 'none':
-						pcs_willpwr+=5
+						pcs_mood+=5
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
 						'During your ride you lift your skirt several times, showing a glimpse of your panties to the passers-by.'
 
-						gs 'arousal', 'voyeur', 5, 'exhibitionism'
+						gs 'arousal', 'flashlite', 5, 'exhibitionism'
 						gs 'stat'
 
 					else
-						pcs_willpwr += 10
+						pcs_mood += 10
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
 						'During your ride you lift your skirt several times, showing your bare ass to the passers-by.'
 
-						gs 'arousal', 'voyeur', 10, 'exhibitionism'
+						gs 'arousal', 'flashlite', 10, 'exhibitionism'
 						minut -= 5
 						gs 'stat'
 					end
@@ -70,7 +70,7 @@ if $ARGS[0] = 'sarai':
 					exit
 				end
 				if CloSkirtShortness > 0 and findvelrand <= 70:
-					pcs_willpwr += 5
+					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 					'You take out the old bike for a ride. You ride by the endless fields enjoying the freedom you''re experiencing.'
@@ -78,7 +78,7 @@ if $ARGS[0] = 'sarai':
 					exit
 				end
 				if CloSkirtShortness = 0:
-					pcs_willpwr += 5
+					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
 					'You ride your bike, enjoying the surrounding country-side.'

+ 50 - 25
locations/billiard.qsrc

@@ -14,57 +14,82 @@ gs 'stat'
 act 'Leave':gt 'torgcentr'
 
 if hour >= 8 and hour <= 20:
-	if money >= 250:
-		act 'Play (250 <b>₽</b>) (1:00)':
+	if money >= 125:
+		act 'Play (125 <b>₽</b>) (1:00)':
 			menu_off = 1
-			money -= 250
+			money -= 125
 			minut += 60
 			billvar = 0
-			pool_exp += rand(0, 3)
-			billrand = rand(0, 5)
-
+			pool_exp += rand(0,3)
+			billrand = rand(0,5)
+			gs 'stat'
+			
 			if billrand = 0:
 				cla
 				'You play one of the guys here and he asks if you want to make it more interesting.'
 
 				if money >= 1000:act 'Bet on the game (1000 <b>₽</b>)':billvar = 0 & gt 'billiard', 'randwin'
 
-				if pcs_dom > 20 and strapon = 1:
-					act 'Play for his ass, sex if you lose':
-						billvar = 1
-						gt 'billiard', 'randwin'
+				if strapon = 1:act 'Play for his ass, sex if you lose':billvar = 1 & gt 'billiard', 'randwin'
+				
+				gs 'willpower', 'anal', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Stick to practice games (<<will_cost>> Willpower)':
+						gs 'willpower', 'anal', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'billiard'
 					end
+				else
+					act 'Stick to practice games (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+				
+				act 'Let him have the table instead':
+					money += 125
+					pool_exp -= rand(0,3)
+					gs 'stat'
+					gt 'billiard'
 				end
-
-				act 'Stick to practice games':gt 'billiard'
 			elseif billrand = 1:
 				cla
 				'You play a couple of the guys here and they ask if you want to make it more interesting.'
 
 				if money >= 1000:act 'Bet on the game (1000 <b>₽</b>)':billvar = 0 & gt 'billiard', 'randwin'
 
-				if pcs_dom > 20 and strapon = 1:
-					act 'Play for his ass, sex if you lose':
-						billvar = 2
-						gt 'billiard', 'randwin'
+				if strapon = 1:act 'Play for their asses, sex if you lose':billvar = 2 & gt 'billiard', 'randwin'
+
+				gs 'willpower', 'anal', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Stick to practice games (<<will_cost>> Willpower)':
+						gs 'willpower', 'anal', 'resist', 'hard'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'billiard'
 					end
+				else
+					act 'Stick to practice games (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-
-				act 'Stick to practice games':gt 'billiard'
-			elseif billrand > 1:
+				
+				act 'Let him have the table instead':
+					money += 125
+					pool_exp -= rand(0,3)
+					gs 'stat'
+					gt 'billiard'
+				end
+			elseif billrand >= 2:
 				cla
-				'You played billiards.'
+				'You played billiards by yourself.'
 
 				act 'Leave':gt 'billiard'
 			end
 		end
 	end
 
-	if money >= 300:
-		act 'Play for money (300 <b>₽</b>)':
+	if money >= 250:
+		act 'Play for money (250 <b>₽</b>)':
 			menu_off = 1
 			minut += 60
-			pool_exp += rand(0, 1)
+			pool_exp += rand(0,1)
 			billvar = 3
 			gt 'billiard', 'randwin'
 		end
@@ -112,8 +137,8 @@ if $ARGS[0] = 'randwin':
 		
 		act 'Leave':gt 'billiard'
 	elseif billwin > 10 and billvar = 3:
-		money += 300
-		'You won and received 300 <b>₽</b>.'
+		money += 250
+		'You won and received 250 <b>₽</b>.'
 
 		act 'Get_Away':gt 'billiard'
 	elseif billwin <= 10 and billvar = 0:

+ 72 - 8
locations/billsvid.qsrc

@@ -71,7 +71,17 @@ if $ARGS[0] = '1':
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	
-	act 'Not now <<$telsob>>':gt 'billsvid', '3'
+	gs 'willpower', 'cuni', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Not now <<$telsob>> (<<will_cost>> Willpower)':
+			gs 'willpower', 'cuni', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'billsvid', '3'
+		end
+	else
+		act 'Not now <<$telsob>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	act 'Kiss her':
 		*clr & cla
@@ -79,11 +89,21 @@ if $ARGS[0] = '1':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/2.jpg"></center>'
 		'You turn around and kiss her, in response <<$telsob>> quickly takes off her clothes, helps you strip and throws you against the table, you jump on it, and continue to kiss.'
 
-		gs 'arousal', 'kiss_give', 5, 'lesbian'
+		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
 	
 		act 'Lick her':gt 'billsvid', '10'
-		act 'Get licked':gt 'billsvid', '11'
+		gs 'willpower', 'cuni', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Get licked (<<will_cost>> Willpower)':
+				gs 'willpower', 'cuni', 'force'
+				gs 'willpower', 'pay', 'force'
+				gs 'stat'
+				gt 'billsvid', '11'
+			end
+		else
+			act 'Get licked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 
@@ -95,7 +115,17 @@ if $ARGS[0] = '10':
 	gs 'arousal', 'cuni_give', 5, 'lesbian'
 	gs 'stat'
 		
-	act 'Get licked':gt 'billsvid', '11'
+	gs 'willpower', 'cuni', 'force'
+	if will_cost <= pcs_willpwr:
+		act 'Get licked (<<will_cost>> Willpower)':
+			gs 'willpower', 'cuni', 'force'
+			gs 'willpower', 'pay', 'force'
+			gs 'stat'
+			gt 'billsvid', '11'
+		end
+	else
+		act 'Get licked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	if bilsvidkiy = 0:act 'Play with a cue':gt 'billsvid', '12'
 	if bilsvidukiy = 0:act 'Ask her to play with a cue':gt 'billsvid', '13'
@@ -112,7 +142,19 @@ if $ARGS[0] = '11':
 	act 'Lick her':gt 'billsvid', '10'
 
 	if bilsvidkiy = 0:act 'Play with a cue':gt 'billsvid', '12'
-	if bilsvidukiy = 0:act 'Ask her to play with a cue':gt 'billsvid', '13'
+	if bilsvidukiy = 0:
+		gs 'willpower', 'sex', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Ask her to play with a cue (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'force'
+				gs 'willpower', 'pay', 'force'
+				gs 'stat'
+				gt 'billsvid', '13'
+			end
+		else
+			act 'Ask her to play with a cue (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
 end
 
 if $ARGS[0] = '12':
@@ -124,7 +166,19 @@ if $ARGS[0] = '12':
 	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian'
 	gs 'stat'
 	
-	if bilsvidukiy = 0:act 'Ask her to play with a cue':gt 'billsvid', '13'
+	if bilsvidukiy = 0:
+		gs 'willpower', 'sex', 'force'
+		if will_cost <= pcs_willpwr:
+			act 'Ask her to play with a cue (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'force'
+				gs 'willpower', 'pay', 'force'
+				gs 'stat'
+				gt 'billsvid', '13'
+			end
+		else
+			act 'Ask her to play with a cue (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
 
 	act 'Finish':gt 'billsvid', '3'
 end
@@ -153,14 +207,24 @@ if $ARGS[0] = '2':
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	
-	act 'Continue to play':gt 'billsvid', '3'
+	gs 'willpower', 'cuni', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Continue to play <<$telsob>> (<<will_cost>> Willpower)':
+			gs 'willpower', 'cuni', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'billsvid', '3'
+		end
+	else
+		act 'Continue to play <<$telsob>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	act 'Kiss her':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/11.jpg"></center>'
 		'When <<$telsob>> once again put her hand on your stomach, you move closer to her and kiss. Her hand immediately slipped under your clothes and massages your breast.'
 
-		gs 'arousal', 'kiss_give', 5, 'lesbian'
+		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
 	
 		act 'Proceed':

+ 6 - 10
locations/blowPR.qsrc

@@ -6,12 +6,8 @@ if $ARGS[0] = 'start':
     $location_type = 'event'
 	menu_off = 1
 	*clr & cla
-	minut += 1
 	guy += 1
-	stat['bj'] += 1
-	pcs_throat += 1
-	prosta += 1
-	!pcs_sleep = pcs_sleep - 1
+	gs 'arousal', 'bj', 1, 'unknown', 'prostitution'
 	if RAND(0,100) >= 70:gs 'dinSex', 'std_trigger'
 	gs'stat'
 
@@ -30,8 +26,8 @@ if $ARGS[0] = '1':
 	gs 'dinSex', 'std_trigger_oral'
 	protect = 0
 	*clr & cla
-	minut = minut + 5
-	prezik = prezik - 1
+	prezik -= 1
+	gs 'arousal', 'bj', 5, 'unknown', 'prostitution'
 	gs'stat'
 	menu_off = 1
 	picrand = RAND(0,6)
@@ -70,7 +66,7 @@ if $ARGS[0] = '2':
 	*clr & cla
 	menu_off = 1
 	gs 'dinSex', 'std_trigger_oral'
-	minut = minut + 5
+	gs 'arousal', 'bj', 5, 'unknown', 'prostitution'
 	gs'stat'
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bjp'+rand(8,13)+'.jpg"></center>'
@@ -84,10 +80,9 @@ if $ARGS[0] = '12':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
     $location_type = 'event'
-
 	*clr & cla
 	menu_off = 1
-
+	gs 'stat'
 	if prosti = 0:
 		bjrand = RAND(1,100)
 		if bjrand <= 50:
@@ -157,6 +152,7 @@ if $ARGS[0] = '12':
 				act 'Continue':gt $locSex, $metkaSex
 			end
 		end
+		gs 'arousal', 'end'
 	elseif prosti = 1:
 		'After you suck him off for a while, the guy reminds you that that''s not why you''re here. He''s ready to fuck you now.'
 

+ 24 - 4
locations/bobka.qsrc

@@ -113,8 +113,18 @@ if ARGS[0] = 3:
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/rimming.jpg"></center>'
 	'<<$tempval>> drop to your knees before Bobka and look at him questioningly, softly muttering you''ll do whatever he wants you to do.'
 	'Bobka lies back and lifts his legs, exposing his ass to you. He grunts: "Start licking, bitch! If you know what''s good for you..."'
-
-	act 'Lick his ass reluctantly':gt 'bobka', 'rimming2'
+	
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Lick his ass reluctantly (<<will_cost>> Willpower)':
+			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'bobka', 'rimming2'
+		end
+	else
+		act 'Lick his ass reluctantly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Lick his ass enthusiastically':gt 'bobka', 'rimming3'
 end
 
@@ -130,8 +140,18 @@ if ARGS[0] = 4:
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/knees.jpg"></center>'
 	'<<$tempval>> drop to your knees before Bobka and look at him questioningly, softly muttering you''ll do whatever he wants you to do.'
 	'"I don''t need you today", he tells you, and your heart sinks. Then he continues: "I do need to piss, though... might as well use you. I''ll even give you a chance to earn some extra money: I''ll give you 100 <b>₽</b> if you open your mouth and swallow it all", and pulls his cock out of his pants.'
-
-	act 'Let him pee on your face':gt 'bobka', 'peeface'
+	
+	gs 'willpower', 'swallow', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Let him pee on your face (<<will_cost>> Willpower)':
+			gs 'willpower', 'bj', 'resist'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			gt 'bobka', 'peeface'
+		end
+	else
+		act 'Let him pee on your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 	act 'Open your mouth for him':gt 'bobka', 'peeswallow'
 end
 

+ 56 - 6
locations/bordel.qsrc

@@ -118,8 +118,18 @@ if $ARGS[0] = 'var':
 
 	if borrand = 0:
 		'Customer orders one girl (1,000 <b>₽</b>).'
-
-		act 'Refuse':gt 'bordel', 'brothel'
+		
+		gs 'willpower', 'sex', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'bordel', 'brothel'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
 		act 'Agree':
 			borsexkol += 1
@@ -137,7 +147,17 @@ if $ARGS[0] = 'var':
 	elseif borrand = 1:
 		'Customer orders two girls (1,000 <b>₽</b>).'
 
-		act 'Refuse':gt 'bordel', 'brothel'
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'bordel', 'brothel'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
 		act 'Agree':
 			borsexkol += 1
@@ -154,7 +174,17 @@ if $ARGS[0] = 'var':
 	elseif borrand = 2:
 		'Two clients book one girl (1,500 <b>₽</b>).'
 
-		act 'Refuse':gt 'bordel', 'brothel'
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'bordel', 'brothel'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
 		act 'Agree':
 			borsexkol += 1
@@ -171,7 +201,17 @@ if $ARGS[0] = 'var':
 	elseif borrand = 3:
 		'Two clients book two girls (1,500 <b>₽</b>).'
 
-		act 'Refuse':gt 'bordel', 'brothel'
+		gs 'willpower', 'sex', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'bordel', 'brothel'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
 		act 'Agree':
 			borsexkol += 1
@@ -188,7 +228,17 @@ if $ARGS[0] = 'var':
 	elseif borrand = 4:
 		'Group of customers order one girl, price 2,000 <b>₽</b>.'
 
-		act 'Refuse':gt 'bordel', 'brothel'
+		gs 'willpower', 'sex', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				gt 'bordel', 'brothel'
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
 		act 'Agree':
 			borsexkol += 1

+ 85 - 27
locations/bordelv.qsrc

@@ -12,7 +12,7 @@ gs 'stat'
 'While you''re pondering this information, Vika enters the room, dressed in a pink combination, and lies on the bed.'
 'She looks at you through the glass and with one hand massages her pussy through her panties. Observing her is turning you on.'
 
-act 'Keep on watching':
+act 'Watch Vika work':
 	cla
 	*clr
 	picrand = 2
@@ -20,33 +20,54 @@ act 'Keep on watching':
 	'A few minutes later, two men enter the room. Vika jumps off the bed and kneels between them, grabs hold of their members while still looking in your direction, and begins sucking them both at once.'
 	'You look on in amazement as her mouth makes one of the cocks disappears down the throat then moves on to the other member. She diligently continues to satisfy the men not taking her eyes from the mirror. This sight has your pussy dripping wet wanting to join them.'
 
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur_sex', 5
 	gs 'arousal', 'masturbate', 5
 	minut -= 5
 	gs 'stat'
 	
 	act 'Leave':gt 'bordelv', 'out'
-	act 'Keep watching':gt 'bordelv', 'sex'
+	
+	gs 'willpower', 'voyeur', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Keep watching (<<will_cost>> Willpower)':
+			gs 'willpower', 'voyeur', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			gt 'bordelv', 'sex'
+		end
+	else
+		act 'Keep watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'sex':
 	cla
 	*clr
-	picrand = rand(3, 7)
+	picrand = rand(3,7)
 	dviksex += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika<<picrand>>.jpg"></center>'
 	'You continue to watch on as the men start to fuck Vika. They keep changing positions alternately entering her pussy, then switching her anus, and letting her taste it all. Vika moans loudly and struggles to please them, she tries her hardest to keep looking towards you behind the mirror.'
 	'Even though you knew that she could not see you, if felt she could see you right in the eyes, searching for your approval.'
 
-	gs 'arousal', 'voyeur', 10
+	gs 'arousal', 'voyeur_sex', 10
 	gs 'arousal', 'masturbate', 10
 	minut -= 10
 	gs 'stat'
 	
-	act 'Keep watching':gt 'bordelv', 'sex'
+	gs 'willpower', 'voyeur', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Keep watching more (<<will_cost>> Willpower)':
+			gs 'willpower', 'voyeur', 'self'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			gt 'bordelv', 'sex'
+		end
+	else
+		act 'Keep watching more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
-	if dviksex >= 3:act 'Leave':gt 'bordelv', 'end'
+	act 'Leave':gt 'bordelv', 'end'
 end
 
 if $ARGS[0] = 'end':
@@ -77,13 +98,37 @@ if $ARGS[0] = 'end':
 					vikaend = 1
 					gt 'street'
 				end
-
-				act 'Comfort her':
+				
+				gs 'willpower', 'misc', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Comfort her (<<will_cost>> Willpower)':
+						cla
+						npc_rel['A220'] += 5
+						gs 'willpower', 'misc', 'self'
+						gs 'willpower', 'pay', 'self'
+						gs 'stat'
+						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
+						act 'Leave':gt 'street'
+					end
+				else
+					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Comfort her (<<will_cost>> Willpower)':
 					cla
 					npc_rel['A220'] += 5
-					'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
+					'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
+
 					act 'Leave':gt 'street'
 				end
+			else
+				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			act 'Comfort her':
@@ -94,15 +139,23 @@ if $ARGS[0] = 'end':
 
 				act 'Leave':gt 'street'
 			end
+			
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Ask about a job at the brothel (<<will_cost>> Willpower)':
+					cla
+					npc_rel['A220'] += 5
+					bordel = 1
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
+					'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
 
-			act 'Ask about a job at the brothel':
-				cla
-				npc_rel['A220'] += 5
-				bordel = 1
-				'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
-				'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
-
-				act 'Leave':gt 'street'
+					act 'Leave':gt 'street'
+				end
+			else
+				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	end
@@ -129,16 +182,21 @@ if $ARGS[0] = 'out':
 	
 		gt 'street'
 	end
-
-	act 'Comfort her':
-		cla
-		npc_rel['A220'] += 15
-		'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
-
-		gs 'arousal', 'end'
-		gs 'stat'
 	
-		act 'Leave':gt 'street'
+	gs 'willpower', 'misc', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Comfort her (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A220'] += 15
+			gs 'willpower', 'misc', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
+			gs 'arousal', 'end'
+			gs 'stat'
+			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
+			act 'Leave':gt 'street'
+		end
+	else
+		act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 

+ 37 - 5
locations/bouling.qsrc

@@ -20,8 +20,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			menu_off = 1
 			minut += 60
 			boulvar = 0
-			boulingnav += rand(0, 3)
-			boulrand = rand(0, 9)
+			boulingnav += rand(0,3)
+			boulrand = rand(0,9)
 			gs 'npcgeneratec', 0, 'Bowling Player', rand(18,40)
 			$boy[0] = $npclastgenerated
 			$boydesc[0] = $npc_usedname[$npclastgenerated]
@@ -34,10 +34,32 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				
 			if boulrand = 0:
 				'You see two guys and they challenge you to a game.'
-				act 'Gamble (2000 <b>₽</b>)':boulvar = 1 & gt 'bouling', 'randwin'	
+				act 'Gamble (2000 <b>₽</b>)':boulvar = 1 & gt 'bouling', 'randwin'
+				gs 'willpower', 'sex', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse and play a normal game (<<will_cost>> Willpower)':
+						gs 'willpower', 'sex', 'resist', 'hard'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'bouling', 'randwin'
+					end
+				else
+					act 'Refuse and play a normal game (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 			elseif boulrand = 1:
 				'You meet two girls and they suggest challenging two guys to a game: Prize 5000 <b>₽</b>, lose and they have sex with you.'
 				act 'Play':boulvar = 2 & gt 'bouling', 'randwin'
+				gs 'willpower', 'sex', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse and play a normal game (<<will_cost>> Willpower)':
+						gs 'willpower', 'sex', 'resist', 'hard'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'bouling', 'randwin'
+					end
+				else
+					act 'Refuse and play a normal game (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 			elseif boulrand > 1:
 				gt 'bouling', 'randwin' 
 			end
@@ -83,8 +105,18 @@ if $ARGS[0] = 'randwin':
 
 		if money >= 2000:
 			'You lose and have to pay 2,000 <b>₽</b>.'
-
-			act 'Offer sex instead':xgt 'sexdvoe', 'var'
+			
+			gs 'willpower', 'sex', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Offer sex instead (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					xgt 'sexdvoe', 'var'
+				end
+			else
+				act 'Offer sex instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Pay': money -= 2000 & gt 'bouling'
 		else
 			'You lost, but you do not have money to pay, only one thing for it.'

+ 1 - 1
locations/brothel.qsrc

@@ -1634,7 +1634,7 @@ if $ARGS[0] = 'brothel:section1:session:play:hangbytits':
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/hangbytits.mp4"></video></center>'
 	'Client attaches anoter rope to your already bound tits, using a pulley attached to the ceiling.'
-	'You start to shake in the moment you connect the ropes attached to your breats and the pulley above you..'
+	'You start to shake in the moment you connect the ropes attached to your breasts and the pulley above you..'
 	'<font color=#<<$pcs_font>>>"No Master, you can''t be serious!! You will tear the off! It is against the rules, stop it!</font> you desparetly try to avoid whats coming.'
 	'<font color=#<<$mas_font>>>"NO, it''s not against the rules. They won''t tear off, you''ll see!"</font> with those words he starts to pull the rope up, leveling you from the ground just by your tits.'
 	'<font color=#<<$pcs_font>>>"AYYYEEEEEEEEEEEE!</font> you yell more from horror than actual pain, as you slowly realize..'

+ 138 - 109
locations/brother.qsrc

@@ -220,12 +220,12 @@ if $ARGS[0] = 'start':
 				'Your brother, dumbfounded by your suggestion, hesitantly touches the piercing on one of your nipples, causing you to moan softly.'
 				if brotherSex = 0:
 					'He abruptly withdraws his hand and apologizes for his rudeness. You have no choice but to apologize back; that wasn''t fair. You cover your chest.'
-					gs 'arousal', 'breasts', 1, 'incest'
+					gs 'arousal', 'foreplay', 1, 'incest'
 					gs 'stat'
 				else
 					'Seeing the pleasure playing with your nipples brings you, he begins to play harder with your piercings, sometimes squeezing your exposed breasts.'
 					'After a minute, he releases your <<$titsize>> boobs, saying, "I really like your new additions."'
-					gs 'arousal', 'breasts', 1, 'incest'
+					gs 'arousal', 'foreplay', 1, 'incest'
 					gs 'stat'
 				end
 				gs 'arousal', 'end'
@@ -258,7 +258,7 @@ if $ARGS[0] = 'start':
 					act 'Leave':gt 'sitrPar'
 					exit
 				elseif father_go = 0 and hour >= 18 and hour < 23:
-					gs 'arousal','breasts', 1
+					gs 'arousal','foreplay', 1
 					'"Beautiful," Kolka whispers while gently cupping your breasts and stroking your pierced nipples.'
 					npc_rel['A34'] += 3
 					brothersawpirsF=1
@@ -296,61 +296,63 @@ if $ARGS[0] = 'start':
 
 			if hour >= 23 and hour < 24 and brotherSex > 4 and brotherNightSex ! daystart:
 				'As you approach your sleeping brother, he suddenly opens his eyes and looks at you.'
-				if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
-					'"<<$pcs_nickname>>, help me sleep," he begs while throwing back the blanket, revealing his erection.'
+				!!sub/dom dialog needs fixing
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!	'"<<$pcs_nickname>>, help me sleep," he begs while throwing back the blanket, revealing his erection.'
+				!!	gs 'boyStat', 'A34'
+				!!	brotherSexCount -= 1
+				!!	brotherNightSex = daystart
+
+				!!	gs 'brother', 'brotherSexStart'
+				!!else
+				'He points to the mound under his blanket, "Sis, I can''t get any sleep, can you help?"'
+				cla
+				act 'Help him out':
 					gs 'boyStat', 'A34'
+					'"Yes, I know what to do," you say with a smile while he pulls down his pants, showing you his hard cock.'
 					brotherSexCount -= 1
 					brotherNightSex = daystart
 
 					gs 'brother', 'brotherSexStart'
-				else
-					'He points to the mound under his blanket, "Sis, I can''t get any sleep, can you help?"'
+				end
+				act 'He''s on his own there':
+					'"You''ve got two perfectly good hands for that," you reply with a smile as you turn around to leave.'
 					cla
-					act 'Help him out':
-						gs 'boyStat', 'A34'
-						'"Yes, I know what to do," you say with a smile while he pulls down his pants, showing you his hard cock.'
-						brotherSexCount -= 1
-						brotherNightSex = daystart
-
-						gs 'brother', 'brotherSexStart'
-					end
-					act 'He''s on his own there':
-						'"You''ve got two perfectly good hands for that," you reply with a smile as you turn around to leave.'
-						cla
-						act 'Leave':gt 'sitrPar'
-						exit
-					end
+					act 'Leave':gt 'sitrPar'
+					exit
 				end
+				!!end
 			end
 
 			if father_go = 1 and hour >= 18 and hour < 23 and brotherSex > 4 and brotherEvSex ! daystart:
 				'When you get close, Kolka turns to you.'
-				if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!sub/dom dialog needs fixing
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+					!!gs 'boyStat', 'A34'
+					!!'"Come on, <<$pcs_nickname>>, you have work to do!" Your brother drops his pants, exposing his hard <<npc_dick[''A34'']>> cm dick. "And be quiet, you don''t want to wake up <<$npc_nickname[''A29'']>> and dad."'
+					!!brotherSexCount -= 1
+					!!brotherEvSex = daystart
+
+					!!gs 'brother', 'brotherSexStart'
+				!!else
+				'"Sis, I''ve got a problem," he points to the lump in his pants. "Can you help me solve it?"'
+				cla
+				act 'Help him out':
 					gs 'boyStat', 'A34'
-					'"Come on, <<$pcs_nickname>>, you have work to do!" Your brother drops his pants, exposing his hard <<npc_dick[''A34'']>> cm dick. "And be quiet, you don''t want to wake up <<$npc_nickname[''A29'']>> and dad."'
+					'A huge smile crosses your face, "I know what will solve this problem. Take off your pants, but be quiet."'
+					'Kolka starts to take off his pants, his erect <<npc_dick[''A34'']>> cm cock quickly popping out.'
 					brotherSexCount -= 1
 					brotherEvSex = daystart
 
 					gs 'brother', 'brotherSexStart'
-				else
-					'"Sis, I''ve got a problem," he points to the lump in his pants. "Can you help me solve it?"'
+				end
+				act 'That is so his problem':
+					'"Poor little Kolka, they sell porn in the local shops. I''m sure you can work out the rest," you chuckle quietly as you leave.'
 					cla
-					act 'Help him out':
-						gs 'boyStat', 'A34'
-						'A huge smile crosses your face, "I know what will solve this problem. Take off your pants, but be quiet."'
-						'Kolka starts to take off his pants, his erect <<npc_dick[''A34'']>> cm cock quickly popping out.'
-						brotherSexCount -= 1
-						brotherEvSex = daystart
-
-						gs 'brother', 'brotherSexStart'
-					end
-					act 'That is so his problem':
-						'"Poor little Kolka, they sell porn in the local shops. I''m sure you can work out the rest," you chuckle quietly as you leave.'
-						cla
-						act 'Leave':gt 'sitrPar'
-						exit
-					end
+					act 'Leave':gt 'sitrPar'
+					exit
 				end
+				!!end
 			end
 		end
 	end
@@ -416,26 +418,28 @@ if $ARGS[0] = 'playfootball':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 			'The boys hesitate before one of them responds, "Err... nothing."'
 
-			if pcs_dom > 0 and kolkaseepornday ! daystart:
-				'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
-				'They glare at you and shout, "No!"'
-				'"We wanted to—" Mishan starts before getting cut off when your brother elbows him in the side.'
-				'"Shut up! Don''t tell her," Kolka says sharply. Next thing you know, Kolka and Mishan are arguing, while Zhendos stands there watching them with an annoyed look.'
-				'"Hey, it’s not a big deal. I was just kidding," you say.'
-				'"Porn!" Zhendos blurts out, causing your brother and his friend to stop arguing and fall silent. "We wanted to go watch some porn but you’re here."'
-				'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
-				'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
-				act 'Leave':gt $loc, $metka
-				act 'Prove them wrong':
-					*clr & cla
-					gs 'stat'
-					'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
-					'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-					act 'Go watch porn':minut += 5 & gt 'seeporn'
-				end
-
-			elseif npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
+			!!sub/dom dialog needs fixing
+			!!if pcs_dom > 0 and kolkaseepornday ! daystart:
+				!!'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
+				!!'They glare at you and shout, "No!"'
+				!!'"We wanted to—" Mishan starts before getting cut off when your brother elbows him in the side.'
+				!!'"Shut up! Don''t tell her," Kolka says sharply. Next thing you know, Kolka and Mishan are arguing, while Zhendos stands there watching them with an annoyed look.'
+				!!'"Hey, it’s not a big deal. I was just kidding," you say.'
+				!!'"Porn!" Zhendos blurts out, causing your brother and his friend to stop arguing and fall silent. "We wanted to go watch some porn but you’re here."'
+				!!'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
+				!!'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
+				!!act 'Leave':gt $loc, $metka
+				!!act 'Prove them wrong':
+					!!*clr & cla
+					!!gs 'stat'
+					!!'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
+					!!'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
+
+					!!act 'Go watch porn':minut += 5 & gt 'seeporn'
+				!!end
+
+			!!elseif npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
+			if npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
 				'Kolka hesitates for a moment before giving you a funny look, "Actually, <<$pcs_nickname>>, we want to go watch some porn but we weren''t sure with having you around... But I think a girl like you could handle it."'
 				act 'Leave':gt $loc, $metka
 				act 'Show interest':
@@ -510,7 +514,7 @@ if $ARGS[0] = 'kiss_talk':
 					'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', 'kiss', 3, 'incest'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -542,7 +546,7 @@ if $ARGS[0] = 'kiss_talk':
 				'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', 'kiss', 3, 'incest'
 				gs 'arousal', 'end'
 				gs 'stat'
 
@@ -569,7 +573,7 @@ if $ARGS[0] = 'kiss_talk':
 				'"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', 'kiss', 3, 'incest'
 				gs 'arousal', 'end'
 				gs 'stat'
 
@@ -655,13 +659,17 @@ if $ARGS[0] = 'showbody':
 		'As you finish studying, Kolka, flush red with excitement, turns to you, "<<$pcs_nickname>>, I have to learn about human anatomy, but I am having trouble with it. Can you help me?"'
 		'Confused, you ask, "What do you mean?"'
 		'"Well, um..." Kolka hesitates. "Can you show me what girls look like..."'
-		if sub < 30:
-			act'Refuse':
+		gs 'willpower', 'exhib', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act'Refuse (<<will_cost>> Willpower)':
 				cla
+				gs 'willpower', 'pay', 'resist'
 				'Incredulously, you ask, "How the fuck can I do that? Should I just take off my clothes in front of you and let you gawk at me? I''m your sister!"'
 				'Kolka backs down in embarrassment, "You''re right, I''m sorry. I shouldn''t have asked."'
 				act 'Finish':gt $loc, $metka
 			end
+		else
+  			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act'"Huh..."':
@@ -680,7 +688,15 @@ if $ARGS[0] = 'showbody':
 	elseif npc_QW['A34'] > 3:
 		act'Undress again':gt'brother','brother_voyeur_ev4'
 
-		if sub < 30: act'Enough for today':gt $loc, $metka
+		gs 'willpower', 'exhib', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Enough for today (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
+				gt $loc, $metka
+			end
+		else
+			act 'Enough for today (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 		exit
 	else
 		act 'Finish':gt $loc, $metka
@@ -839,39 +855,40 @@ if $ARGS[0] = 'brotherSexEnd':
 	minut += 15
 	gs 'arousal', 'end'
 	gs 'stat'
-	if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
-		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
-			'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
-			act 'Leave': gt 'sitrPar'
-		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
-			'Kolka lets out a deep yawn, "Ah, thanks <<$pcs_nickname>>. You''re the best." The words barely leave his lips before he''s back under the blanket and dozing off.'
-			act 'Leave': gt 'sitrPar'
-		elseif $loc = 'sitrPar':
-			'Still somewhat out of breath, Kolka pats your head gently and says, "Nice one, <<$pcs_nickname>>, you''re well trained. Now remember, don''t tell anyone!" He quickly falls asleep.'
-			act 'Leave': gt 'sitrPar'
-		else
-			minut -= 15
-			gs 'stat'
-			'Kolka gives you an appreciative nod, "Nice one, <<$pcs_nickname>>, you''re well trained. Now, don''t tell anyone!"'
-			act 'Continue':gt $loc, $metka
-		end
+	!!sub/dom dialog needs fixing
+	!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+		!!if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
+			!!'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
+			!!act 'Leave': gt 'sitrPar'
+		!!elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
+			!!'Kolka lets out a deep yawn, "Ah, thanks <<$pcs_nickname>>. You''re the best." The words barely leave his lips before he''s back under the blanket and dozing off.'
+			!!act 'Leave': gt 'sitrPar'
+		!!elseif $loc = 'sitrPar':
+			!!'Still somewhat out of breath, Kolka pats your head gently and says, "Nice one, <<$pcs_nickname>>, you''re well trained. Now remember, don''t tell anyone!" He quickly falls asleep.'
+			!!act 'Leave': gt 'sitrPar'
+		!!else
+			!!minut -= 15
+			!!gs 'stat'
+			!!'Kolka gives you an appreciative nod, "Nice one, <<$pcs_nickname>>, you''re well trained. Now, don''t tell anyone!"'
+			!!act 'Continue':gt $loc, $metka
+		!!end
+	!!else
+	if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
+		'With a wide grin on his face, Kolka tells you, "Many thanks, <<$pcs_nickname>>, you''ve helped me a lot." He resumes his prior business.'
+		act 'Leave': gt 'sitrPar'
+	elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
+		'Completely sated, Kolka mumbles to you, "Thanks <<$pcs_nickname>>, you''re the best..." In just a few seconds, he''s already dozing off into a blissfull sleep.'
+		act 'Leave': gt 'sitrPar'
+	elseif $loc = 'sitrPar':
+		'Kolka gives his deflating member a quick shake, "Thanks, <<$pcs_nickname>>, you saved me. Now I can finally sleep..." He slides under his covers and promptly falls asleep.'
+		act 'Leave': gt 'sitrPar'
 	else
-		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
-			'With a wide grin on his face, Kolka tells you, "Many thanks, <<$pcs_nickname>>, you''ve helped me a lot." He resumes his prior business.'
-			act 'Leave': gt 'sitrPar'
-		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
-			'Completely sated, Kolka mumbles to you, "Thanks <<$pcs_nickname>>, you''re the best..." In just a few seconds, he''s already dozing off into a blissfull sleep.'
-			act 'Leave': gt 'sitrPar'
-		elseif $loc = 'sitrPar':
-			'Kolka gives his deflating member a quick shake, "Thanks, <<$pcs_nickname>>, you saved me. Now I can finally sleep..." He slides under his covers and promptly falls asleep.'
-			act 'Leave': gt 'sitrPar'
-		else
-			minut -= 15
-			gs 'stat'
-			'Kolka lets out a very satisfied sigh, "Ah, thanks so much for that, <<$pcs_nickname>>. I gotta go." He puts his drained cock back into his pants and leaves.'
-			act 'Continue':gt $loc, $metka
-		end
+		minut -= 15
+		gs 'stat'
+		'Kolka lets out a very satisfied sigh, "Ah, thanks so much for that, <<$pcs_nickname>>. I gotta go." He puts his drained cock back into his pants and leaves.'
+		act 'Continue':gt $loc, $metka
 	end
+	!!end
 end
 
 if $ARGS[0] = 'brotherSexCount':
@@ -956,7 +973,7 @@ if $ARGS[0] = 'brother_voyeur_ev1':
 	'<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 'arousal','foreplay', 2, 'incest'
 	gs 'stat'
 
 	act 'Wipes':gt 'brother','brother_voyeur_end'
@@ -970,13 +987,13 @@ if $ARGS[0] = 'brother_voyeur_ev2':
 	gs 'stat'
 	temp_var = rand(5,10)
 	minut += temp_var
-	gs 'arousal','breasts', temp_var
+	gs 'arousal','foreplay', temp_var
 	picrand = rand(1,7)
 	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 'arousal','foreplay', 3, 'incest'
 	gs 'stat'
 
 	act 'Continue your shower':gt 'brother','brother_voyeur_end'
@@ -1232,16 +1249,24 @@ if $ARGS[0] = 'brother_voyeur_ev6':
 		'"You know," Kolka points at your naked bottom.'
 		'"I don''t know, I think this has gone too far already," you answer indignantly.'
 		'"Please, show me!" Kolka pleads.'
-		if sub < 30:
-			act'Refuse and get dressed':gt $loc, $metka
+
+		gs 'willpower', 'exhib', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+		else
+			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act'Give Kolka a closer look':gt 'brother','brother_voyeur_ev7'
 	elseif npc_QW['A34'] > 4:
 		'Your brother points to your legs, "<<$pcs_nickname>>, can you show me?" He moves his arms apart, mimicking you spreading your legs.'
 		'A small thrill runs up your spine, "Again?"'
 		'"Again," he grins. "Please?"'
-		if sub < 30:
-			act'Refuse and get dressed':gt $loc, $metka
+
+		gs 'willpower', 'exhib', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+		else
+			act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act'Give Kolka another close up look':gt 'brother','brother_voyeur_ev7'
 	end
@@ -1317,8 +1342,12 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				'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?"'
 			end
-			if sub < 30:
-				act'Refuse and get dressed':gt $loc, $metka
+
+			gs 'willpower', 'exhib', 'resist', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse and get dressed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt $loc, $metka
+			else
+				act 'Refuse and get dressed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act'Get down on the floor':gt 'brother','brother_voyeur_ev8'
 		end
@@ -1347,7 +1376,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'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'
+		gs 'arousal','foreplay', 10, 'incest'
 		minut -= 10
 		gs 'stat'
 
@@ -1396,7 +1425,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'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...'
 
-		gs 'arousal','breasts', 5, 'incest'
+		gs 'arousal','foreplay', 5, 'incest'
 		gs 'arousal','masturbate', 5, 'incest'
 		gs 'arousal','bj', 5, 'incest'
 		minut -= 5
@@ -1434,7 +1463,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		'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...'
 
-		gs 'arousal','breasts', 5, 'incest'
+		gs 'arousal','foreplay', 5, 'incest'
 		gs 'arousal','masturbate', 5, 'incest'
 		gs 'arousal','bj', 5, 'incest'
 		minut -= 5

+ 0 - 1
locations/brother_voyeur.qsrc

@@ -46,7 +46,6 @@ if $ARGS[0] = 'showertalk1':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk1.jpg"></center>'
 	'Through the crack in the door you make eye contact with your brother.'
-	'Through the crack in the door you make eye contact with your brother.'
 	'"Hey Kolka!"'
 	'You see the shock in his eyes as he realizes he''s been caught and moves away, trying to close the door. "Wait! Come in here a sec!" you say, a bright and good-humored smile on your face. "And shut the door behind you! Quick! Before <<$npc_nickname[''A29'']>> or dad see!"'
 

+ 37 - 37
locations/cikl.qsrc

@@ -1270,7 +1270,7 @@ if storyline = 1:
 
 
 	if SchoolAtestat = 0:
-		if kanikuli = 0 and week < 6:			
+		if kanikuli = 0 and week < 6:
 			!!Maximum increase for grupvalues is 5 (6 - 1 decay)
 			if oldgrupvalue_set = 0:
 				oldgrupvalue_set = 1
@@ -1284,7 +1284,7 @@ if storyline = 1:
 				if old_grupvalue[3] + 6 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 6
 				if old_grupvalue[4] + 6 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 6
 			end
-			
+
 			!!Decay for the school groups
 			if grupvalue[1] > 0:
 				grupvalue[1] -= 1
@@ -1305,12 +1305,12 @@ if storyline = 1:
 				grupvalue[4] -= 1
 			else
 				grupvalue[4] = 0
-			end		
+			end
 
 			old_grupvalue[1] = grupvalue[1]
 			old_grupvalue[2] = grupvalue[2]
 			old_grupvalue[3] = grupvalue[3]
-			old_grupvalue[4] = grupvalue[4]			
+			old_grupvalue[4] = grupvalue[4]
 		end
 		if month = 12 and day > 25:
 			if day < 31:
@@ -1346,7 +1346,7 @@ if storyline = 1:
 			if (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018):
 				if day = 25:
 					kanikuli = 6
-                    SchoolAtestat = -1
+					SchoolAtestat = -1
 					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
 				elseif day = 24:
 					$holyday = '<b>Your graduation is tomorrow. Be there by 8:00.</b>'
@@ -1387,18 +1387,18 @@ if storyline = 1:
 			elseif day = 11:
 				kanikuli = 1
 				$holyday = '<b>Last day of Autumn Break.</b>'
-			end 
+			end
+		end
+	elseif SchoolAtestat = -1:
+		if home_owned[2] = 0:
+			$holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'
+		else
+			$holyday = '<b>You missed your graduation. Maybe your mother picked up your diploma.</b>'
 		end
-    elseif SchoolAtestat = -1:
-        if ParHomeBlock = 1:
-            $holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'
-        else
-            $holyday = '<b>You missed your graduation. Maybe your mother picked up your diploma.</b>'
-        end
 	end
 	!!Brother''s dick growth as he gets older
 	!Commented out till some future time
-	!if kolka_dick_day + 30 < daystart and npc_dick['A34'] < 26: 
+	!if kolka_dick_day + 30 < daystart and npc_dick['A34'] < 26:
 	!	kolka_dick_day = daystart
 	!	npc_dick['A34'] += 1
 	!end
@@ -1430,11 +1430,11 @@ if natholi = 1:
 end
 
 if bcream_used >= 1:
-        bcream_used = 0
-        temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
-        if temp > 0: temp = 1
-        nbsize += temp
-        if temp > 0:'Feels like your breasts have grown slightly.'
+		bcream_used = 0
+		temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
+		if temp > 0: temp = 1
+		nbsize += temp
+		if temp > 0:'Feels like your breasts have grown slightly.'
 end
 if steroid_dose >= 1:
 	if lashair < 1:
@@ -1490,13 +1490,13 @@ if blizoruk < 0: blizoruk = 0
 
 !First look is there any cum in the womb,when womb is empty random genereted npc record are cleaningare deleted
 
-! mid($npclastgenerated[0],2,9)  number of the last random created npcs
+! mid($npclastgenerated[0],2,9)	 number of the last random created npcs
 norandomdads = 1
 !checking if Sveta have children or babies
 if arrsize('$ChildFath') > 0:
 		!Yes she have... cheking if random NPC is the dady
 		!'Sveta have <<$ChildFath>> children'
-		
+
 		childtmp = 0
 		:childloop
 		if mid($ChildFath[childtmp],1,1) = 'C':
@@ -1504,7 +1504,7 @@ if arrsize('$ChildFath') > 0:
 			norandomdads = 0
 		else
 			!child is not from random genereted npc
-			
+
 			childtmp += 1
 			if childtmp < arrsize('$ChildFath'): jump 'childloop'
 		end
@@ -1517,11 +1517,11 @@ number = 0
 
 !checking if there is some cum in womb.
 if arrsize('$cumarrnam') > 0:
-	!there is cum in womb	
+	!there is cum in womb
 
 	:cleaning_records_cum
 	$tmp = 'C' + '<<number>>'
-		
+
 	cum_number = 0
 	:cumloop
 	!look if cum in womb is from random created npc
@@ -1529,7 +1529,7 @@ if arrsize('$cumarrnam') > 0:
 		!'cum from <<$tmp>> is in the womb'
 		number +=1
 		if number < mid($npclastgenerated[0],2,9): jump 'cleaning_records_cum'
-	else	
+	else
 		cum_number += 1
 		if cum_number < arrsize('$cumarrnam'):
 			jump 'cumloop'
@@ -1543,7 +1543,7 @@ if arrsize('$cumarrnam') > 0:
 				!checking if selected npc is a dady
 				childtmp = 0
 				:childloop3
-				
+
 				if $ChildFath[childtmp] = $tmp:
 					!selected npc is father of the child, he will stay in record or now
 					!moving npc from C array to B array,
@@ -1557,40 +1557,40 @@ if arrsize('$cumarrnam') > 0:
 				else
 					!child is not from random genereted npc
 					childtmp += 1
-					if childtmp < arrsize('$ChildFath'): 
+					if childtmp < arrsize('$ChildFath'):
 						jump 'childloop3'
 					else
 						!children are not from seleted random npc, we are cleaning his redords
 						gs 'npccleanc',$tmp
 						number += 1
 						if number < mid($npclastgenerated[0],2,9): jump 'cleaning_records_cum'
-						
+
 					end
 				end
-				
-				
+
+
 			end
-			
+
 		end
 	end
-	
+
 else
 	!there is no cum in womb, cleaning random created npc redords
-		
+
 	if norandomdads = 0:
-	
+
 		:cleaning_with_babies
 		$tmp = 'C' + '<<number>>'
 		!cheking if random NPC is the dady
 		childtmp2 = 0
-		
+
 		:childloop2
-		
+
 		if $ChildFath[childtmp2] = $tmp:
 			!selected random NPC is dady selected child
 			number +=1
-			if number < mid($npclastgenerated[0],2,9): jump 'cleaning_with_babies' 
-		
+			if number < mid($npclastgenerated[0],2,9): jump 'cleaning_with_babies'
+
 		else
 			!selected random NPC is not dady selected child
 			childtmp2 += 1

+ 2 - 2
locations/cityTrain.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'village':
 	menu_off = 1
 	minut += 25
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'After 25 minutes, the train stops at the small station near the village of Gadukino.'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'oldtown':
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
+	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'After 35 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'

+ 281 - 78
locations/clener.qsrc

@@ -28,11 +28,11 @@ if $ARGS[0] = 'start':
 		act 'Talk to Yuri':
 			cla
 			menu_off = 1
-			minut += 15
+			minut += 5
 			gs 'stat'
 			'Still smiling he says, "<<$pcs_nickname>>, want to grab a cup of coffee?"'
 
-			act 'Decline':jouryQwNo = 1 & gt 'clener', 'start'
+			act 'Decline': jouryQwNo = 1 & gt 'clener', 'start'
 
 			act 'Accept':
 				*clr & cla
@@ -41,9 +41,9 @@ if $ARGS[0] = 'start':
 				'You nod and the two of you head off to the café, where Yuri orders coffee. You sit down at the table and begin to sip on your coffee. Yuri is painfully quiet, he has no sense of humor and is very stiff.'
 				'It''s pretty clear that he likes you, but he does not know how to put a move on you. As you finish the coffee Yuri finally suggests if you want to follow him to his home.'
 
-				act 'No':jouryQwNo = 1 & gt 'clener', 'start'
+				act 'No': jouryQwNo = 1 & gt 'clener', 'start'
 
-				act 'Go with Yuri':gt 'youry', 'quest'
+				act 'Go with Yuri': gt 'youry', 'quest'
 			end
 		end
 	end
@@ -71,50 +71,51 @@ if $ARGS[0] = 'start':
 
 					act 'Have a drink':
 						cla
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'vodka'
+						pcs_energy += 10
+						fat += 2
+						gs 'stat'
 						'You drink the shitty vodka and it burns your throat. Your throat is on fire and you quickly grab some cheese to help soothe it. Sasha casually downs the glass and doesn''t even blink. "Ah, good one."'
 						'While you are leaning over to eat the sausage, you feel a light touch as the guard pats you on the buttocks.'
 
 						act 'Smile':
 							cla
-							minut += 15
+							minut += 10
 							pcs_horny += 10
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
+							gs 'drugs', 'alcohol', 'vodka'
 							gs 'stat'
 							'You smile and Sasha pours more vodka, not stopping his caressing of your buttocks.'
 
-							if pcs_horny < 50:dynamic $borodachNo2
+							if pcs_horny < 50: gs 'clener', 'borodachNo2'
 
-							dynamic $borodachDrink
+							gs 'clener', 'borodachDrink'
 						end
 
-						act 'Put your hand on his pants':
-							*clr & cla
-							borodachTimes += 1
-							gs 'stat'
-
-							picrand = rand(0, 2)
-
-							if picrand = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj.jpg"></center>'
-							if picrand = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj1.jpg"></center>'
-							if picrand = 2:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj2.jpg"></center>'
-
-							'You put your hand on his crotch and feel his erection harden. Your thin fingers slide over his hardon and find the zipper. You unzip him and get his cock out of his pants. Sasha relaxes on the couch waiting for you to continue what you started.'
-							
-							gs 'arousal', 'foreplay', 15
-							gs 'stat'
-							
-							
-							dynamic $ohrhj
-							dynamic $ohrbj
+						gs 'willpower', 'hj', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'Put your hand on his pants (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'self'
+								borodachTimes += 1
+								gs 'stat'
+
+								picrand = rand(0, 2)
+
+								if picrand = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj.jpg"></center>'
+								if picrand = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj1.jpg"></center>'
+								if picrand = 2:'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hj2.jpg"></center>'
+
+								'You put your hand on his crotch and feel his erection harden. Your thin fingers slide over his hardon and find the zipper. You unzip him and get his cock out of his pants. Sasha relaxes on the couch waiting for you to continue what you started.'
+								
+								gs 'arousal', 'foreplay', 5
+								gs 'stat'
+								
+								
+								gs 'clener', 'ohrhj'
+								gs 'clener', 'ohrbj'
+							end
+						else
+							act 'Put your hand on his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
 				end
@@ -146,9 +147,14 @@ if $ARGS[0] = 'start':
 				'You nod, "Yes, the pay is pretty bad but I need the job..."'
 				'"By the way, I''m Sasha, and you''re?"'
 				'"<<$pcs_nickname>>." you politely answer.'
-				'"Nice name... I was just thinking about heading on a break, would you like to join me?"'
+				'"Nice name... I was just thinking about heading on a break, would you like to join me for a drink?"'
 
-				act 'Sorry, I have to go':gt 'clener', 'start'
+				gs 'willpower', 'drink', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+				else
+					act 'Sorry, I have to go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 
 				act 'Why not':
 					cla
@@ -158,40 +164,40 @@ if $ARGS[0] = 'start':
 
 					act 'Have a drink':
 						cla
-						if pcs_hydra >= 100:
-							pcs_hydra -= 5
-						else
-							pcs_hydra -= 10
-						end
+						gs 'drugs', 'alcohol', 'vodka'
+						pcs_energy += 10
+						fat += 2
+						gs 'stat'
 						'You drink the shitty vodka and it burns your throat. Your throat is on fire and you quickly grab some cheese to help soothe it. Sasha casually downs the glass and doesn''t even blink. "Ah, good one."'
 						'While you are leaning over to eat the sausage, you feel a light touch as the guard pats you on the buttocks.'
 
-						act 'React':
-							cla
-							minut += 15
-							pcs_horny += 10
-							gs 'stat'
-							'"Hey! What are you doing?" you ask.'
-							'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
+						gs 'willpower', 'misc', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'React (<<will_cost>> Willpower)':
+								cla
+								gs 'willpower', 'pay', 'self'
+								minut += 10
+								pcs_horny += 10
+								gs 'stat'
+								'"Hey! What are you doing?" you ask.'
+								'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
 
-							if pcs_horny < 50:dynamic $borodachNo
+								if pcs_horny < 50: gs 'clener', 'borodachNo'
 
-							dynamic $borodachDrink
+								gs 'clener', 'borodachDrink'
+							end
+						else
+							act 'React (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 
 						act 'Pretend not to notice':
 							cla
-							if pcs_hydra >= 100:
-								pcs_hydra -= 5
-							else
-								pcs_hydra -= 10
-							end
-							minut += 15
-							pcs_horny += 15 + SUB
+							minut += 10
+							pcs_horny += 15
 							gs 'stat'
 							'You continue on as usual, trying not to pay attention to it, since it was only a casual touch. Sasha pours more vodka and says, "The second shot always tastes better." as he takes another quaff.'
-							if pcs_horny < 50:dynamic $borodachNo
-							dynamic $borodachDrink
+							if pcs_horny < 50: gs 'clener', 'borodachNo'
+							gs 'clener', 'borodachDrink'
 						end
 					end
 				end
@@ -230,7 +236,7 @@ if $ARGS[0] = 'start':
 				clener = 2
 				'You agree to work as a cleaner.'
 
-				act 'Leave':gt 'clener', 'start'
+				act 'Leave': gt 'clener', 'start'
 			end
 		end
 	end
@@ -248,7 +254,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 
 			if clener < 5:
-				if hour >= 9 and hour <= 16:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor.'
+				if hour >= 9 and hour <= 16: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor.'
 			elseif clener >= 5 and clener < 10:
 				if hour >= 9 and hour <= 16:
 					jouryQw += 1
@@ -268,10 +274,10 @@ if $ARGS[0] = 'start':
 					act 'No':
 						cla
 						jouryQwNo = 1
-						'You look angerly at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
+						'You look angrily at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-						act 'Leave':gt 'clener', 'start'
+						act 'Leave': gt 'clener', 'start'
 					end
 
 					act 'Yes':
@@ -282,19 +288,19 @@ if $ARGS[0] = 'start':
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 						'As you leave, you notice Yuri awiting you. He''s pretty nervous and it seems as if he doesn''t know what to do. Not knowing what to say, he blurts out, "How about we head over to my place, watch some movies, drink champagne and talk."'
 
-						act 'No':jouryQwNo = 1 & gt 'clener', 'start'
+						act 'No': jouryQwNo = 1 & gt 'clener', 'start'
 
-						act 'Go with Yuri':gt 'youry', 'quest'
+						act 'Go with Yuri': gt 'youry', 'quest'
 					end
 
 					exit
 				end
 
-				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex = 0:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri looks at you studying every inch of your figure.'
-				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex > 0:'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri pretends not to notice you in the office.'
+				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex = 0: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri looks at you studying every inch of your figure.'
+				if jouryQw > 7 and hour >= 9 and hour <= 16 and jourySex > 0: 'You fill a bucket of water and head over to the office with a mop. The office staff keeps out of the way while you clean the floor. Yuri pretends not to notice you in the office.'
 			end
 
-			if hour < 9 or hour > 16:'The office is empty of people, you quietly wash the floor and wipe the floor in the office.'
+			if hour < 9 or hour > 16: 'The office is empty of people, you quietly wash the floor and wipe the floor in the office.'
 
 			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
@@ -322,19 +328,23 @@ if $ARGS[0] = 'start':
 					'You let go off your cleaning stuff and look straight into Yuri''s eyes, asking him, "Are you ashamed of me?"'
 					'Yuri stammers, "I-I''m not embarrassed by you being a cleaner, but you must understand, I''m a manager, and you''re the cleaning lady. We must not be seen together. But I want you to keep seeing you. You know where I live, come by my place after 16:00."'
 
-					act 'Fuck you':
-						cla
-						pcs_dom += 1
-						jouryResult = 1
-						'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
-						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
+					gs 'willpower', 'misc', 'self'
+					if will_cost <= pcs_willpwr:
+						act 'Fuck you (<<will_cost>> Willpower)':
+							cla
+							gs 'willpower', 'pay', 'self'
+							jouryResult = 1
+							'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
+							'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-						act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'clener', 'start'
+						end
+					else
+						act 'Fuck you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 
 					act 'Okay.':
 						cla
-						sub += 1
 						jouryResult = 10
 						'Yuri only sees you as a simple fuck whore. But you''re willing to put up with it and agree to visit him afterwards. Yuri nods in satisfaction and leaves the toilet.'
 						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
@@ -388,5 +398,198 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'borodachNo':
+	menu_off = 1
+	act 'I''ve had enough':
+		cla
+		minut += 5
+		gs 'stat'
+		'You refuse to drink and start to leave. The guard tries to persuade you to stay with him and continue.'
+
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		gs 'clener', 'borodachDrink'
+	end
+end
+
+if $ARGS[0] = 'borodachNo2':
+	menu_off = 1
+	act 'I have to go now':
+		cla
+		minut += 5
+		gs 'stat'
+		'You gather your things and start to leave, Sasha tries to persuade you to stay with him and continue.'
+
+		gs 'willpower', 'sex', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		gs 'clener', 'borodachSex'
+	end
+end
+
+if $ARGS[0] = 'borodachDrink':
+	menu_off = 1
+	act 'Another drink':
+		cla
+		minut += 15
+		pcs_horny += 20
+		gs 'stat'
+		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
+		gs 'clener', 'borodachNo2'
+		gs 'clener', 'borodachSex'
+	end
+end
+
+if $ARGS[0] = 'borodachSex':
+	menu_off = 1
+	act 'Relax':
+		cla
+
+		if borodachSex = 0:borodachSex = 1 & guy += 1
+		'You calm down and begin to enjoy the hands caressing you. Sasha has openly embraced and started kissing you.'
+		'His hands slide under your clothes, unbuttoning and removing them. Soon he has exposed your chest and begins to suck your nipples.'
+
+		gs 'arousal', 'foreplay', 5 
+		gs 'stat'
+		
+		act 'Lie down on the sofa':
+			*clr & cla
+			gs 'stat'
+			borodachSexDay = daystart
+			pose = 0
+			gs 'boyStat', 'A39'
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
+			'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> cm dick, his fingers begin to caress your pussy, preparing it for entry.'
+			
+			gs 'arousal', 'vaginal_finger', 5
+			gs 'arousal', 'vaginal', 15
+			gs 'stat'
+			
+			gs 'orgazm', 'start'
+
+			act 'Leave':gt 'street'
+		end
+	end
+end
+
+if $ARGS[0] = 'ohrhj':
+	menu_off = 1
+	act 'Masturbate him':
+		cla
+		'You start stroking his cock with your delicate hands. Quickly Sasha groans, "I can''t hold on much longer."'
+		
+		gs 'arousal', 'hj', 5, 'dom'
+		gs 'stat'
+		
+		gs 'clener', 'ohrbj'
+		gs 'clener', 'ohrhjcum'
+		gs 'clener', 'ohrsex'
+	end
+end
+
+if $ARGS[0] = 'ohrhjcum':
+	menu_off = 1
+	act 'Masturbate him more':
+		*clr & cla
+		borodachSexDay = daystart
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hjcum.jpg"></center>'
+		'Sasha groans and his cock enthusiastically paints your hand white.'
+
+		gs 'arousal', 'hj', 5, 'dom'
+		gs 'stat'
+		
+		act 'Leave':gt 'street'
+	end
+end
+
+if $ARGS[0] = 'ohrbj':
+	menu_off = 1
+	act 'Suck him':
+		*clr & cla
+		picrand = rand(1, 4)
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bj<<picrand>>.jpg"></center>'
+
+		'You wrap your <<$liptalk>> around his strong and warm 15 cm cock and quickly begin by sucking the head, caressing it with your tongue and lips. Sasha groans, "I''m going to come."'
+		
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+		
+		gs 'clener', 'ohrbjcum'
+		gs 'clener', 'ohrsex'
+	end
+end
+
+if $ARGS[0] = 'ohrbjcum':
+	menu_off = 1
+	act 'Suck harder':
+		*clr & cla
+		spafinloc = 12
+		gs 'cum_manage'
+		gs 'stat'
+		picrand = rand(1, 4)
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bjcum<<picrand>>.jpg"></center>'
+		'You redouble your efforts, sucking his hard cock with your <<$liptalk>>. Hot sperm hits your mouth, again and again. You continue to suck, ignoring your mouth full of viscous sperm. Until he finally nothing left.'
+		
+		gs 'arousal', 'bj', 5, 'sub'
+		gs 'stat'
+
+		act 'Swallow sperm':
+			*clr & cla
+			borodachSexDay = daystart
+			gs 'stat'
+			picrand = rand(1, 3)
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/swallow<<picrand>>.jpg"></center>'
+			'You open your sperm filled mouth and show off your hard work, then swallow it.'
+
+			gs 'arousal', 'bj', 1, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+		
+			act 'Leave':gt 'street'
+		end
+
+		act 'Spit it out':
+			*clr & cla
+			borodachSexDay = daystart
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/spit.jpg"></center>'
+			'You open your sperm filled mouth and show off your hard work, then quickly find the sink and spit it out.'
+
+			gs 'arousal', 'bj', 1, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			
+			act 'Leave':gt 'street'
+		end
+	end
+end
+
+if $ARGS[0] = 'ohrsex':
+	menu_off = 1
+	act 'Sex':
+		*clr & cla
+		gs 'stat'
+		borodachSexDay = daystart
+		pose = 0
+		gs 'boyStat', 'A39'
+		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
+		'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> centimeter dick. His fingers begin to caress your pussy, preparing it for entry.'
+
+		gs 'arousal', 'vaginal_finger', 5
+		gs 'arousal', 'vaginal', 15, 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
+			
+		act 'Leave':gt 'street'
+	end
+end
 --- clener ---------------------------------
 

+ 8 - 8
locations/club.qsrc

@@ -499,7 +499,7 @@ if $ARGS[0] = 'bar':
 			'The last thing you remember, is a sex scene at the tables, where a girl is bent over one and fucked by a guy from behind.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -509,7 +509,7 @@ if $ARGS[0] = 'bar':
 		elseif temp = 10:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand7.jpg"></center>'
-			'You see a small group of girl loosing it on the dancefloor. They''re moving like there''s no tomorrow.'
+			'You see a small group of girls letting loose on the dancefloor. They''re moving like there''s no tomorrow.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
 			gs 'arousal', 'voyeur', 10
@@ -551,7 +551,7 @@ if $ARGS[0] = 'bar':
 			'You notice a women who is giving a guy a blowjob, then the women opens her mouth, with the cock in her hand and the guy pours champangne into her mouth.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -564,7 +564,7 @@ if $ARGS[0] = 'bar':
 			'You happen to notice a small group of drunken girls giggling. One of which is fingering the pussy of another girl.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -616,7 +616,7 @@ if $ARGS[0] = 'bar':
 			'You see a guy and a girl on the dancefloor kissing each other. The guy however uses one of his hands to have some fun with the girls pussy.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -629,7 +629,7 @@ if $ARGS[0] = 'bar':
 			'You can see a drunken girl spreading her legs on one of the bar stools, she''s not wearing any panties and the bloke next to her takes the opportunity and fingers the girl.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -642,7 +642,7 @@ if $ARGS[0] = 'bar':
 			'You can see a guy hugging and kissing a drunken girl, while another guy sucks on her exposed tits.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'voyeur_sex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -691,7 +691,7 @@ if $ARGS[0] = 'bar':
 		elseif temp = 24:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club24.jpg"></center>'
-			'The last thing you''re able to remember is, that used the mens bathroom to pee.'
+			'The last thing you''re able to remember is, that you used the mens bathroom to pee.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
 			gs 'arousal', 'voyeur', 10

+ 6 - 1
locations/defence.qsrc

@@ -1,4 +1,9 @@
 # defence
+
+
+
+!! Old code commented out but there for reference
+!!{
 if defence <= 0:
 	defence = 0
 	defenceM = 0
@@ -97,6 +102,6 @@ if defAtkMV > 0:
 
 	if unmaterial > 0:'<b><font color="red">The enemy''s protection shield is trying to absorb your mana but it does not work.</font></b>'
 end
-
+}
 --- defence ---------------------------------
 

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -301,7 +301,6 @@ if ARGS[0] = 3:
 									BonusDefV = 0
 									!!Programme of Action
 									program = 0
-									DimaFight = 1
 									if spellavtoklon = 1:klon = 3
 									if spellbefshild = 1:defence = 500}
 									gs 'fight','initFight'
@@ -321,6 +320,7 @@ if ARGS[0] = 3:
 									opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 									opp_willpwr[0] = 100
 									opp_shoot[0] = 100
+									fightEnding = 10
 
 									gt 'fight', 'start'
 								end

+ 0 - 187
locations/dinBoroda.qsrc

@@ -1,187 +0,0 @@
-# dinBoroda
-$borodachNo = {
-	menu_off = 1
-	act 'I''ve had enough':
-		cla
-		minut += 15
-		gs 'stat'
-		'You refuse to drink and start to leave. The guard tries to persuade you to stay with him and continue.'
-
-		if SUB < 10:act 'Leave':pcs_dom += 1 & gt 'clener', 'start'
-		dynamic $borodachDrink
-	end
-}
-
-$borodachNo2 = {
-	menu_off = 1
-	act 'I have to go now':
-		cla
-		minut += 15
-		gs 'stat'
-		'You gather your things and start to leave, Sasha tries to persuade you to stay with him and continue.'
-
-		if pcs_dom > 0 and pcs_horny < 50:act 'Leave':pcs_dom += 1 & gt 'clener', 'start'
-		dynamic $borodachSex
-	end
-}
-$borodachDrink = {
-	menu_off = 1
-	act 'Another drink':
-		cla
-		minut += 15
-		pcs_horny += 20
-		gs 'stat'
-		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
-		dynamic $borodachNo2
-		dynamic $borodachSex
-	end
-}
-
-$borodachSex = {
-	menu_off = 1
-	act 'Relax':
-		cla
-
-		if borodachSex = 0:borodachSex = 1 & guy += 1
-		'You calm down and begin to enjoy the hands caressing you. Sasha has openly embraced and started kissing you.'
-		'His hands slide under your clothes, unbuttoning and removing them. Soon he has exposed your chest and begins to suck your nipples.'
-
-		gs 'arousal', 'foreplay', 5 
-		gs 'stat'
-		
-		act 'Lie down on the sofa':
-			*clr & cla
-			gs 'stat'
-			borodachSexDay = daystart
-			pose = 0
-			gs 'boyStat', 'A39'
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
-			'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> cm dick, his fingers begin to caress your pussy, preparing it for entry.'
-			
-			gs 'arousal', 'vaginal_finger', 5
-			gs 'arousal', 'vaginal', 25
-			gs 'stat'
-			
-			gs 'orgazm', 'start'
-
-			act 'Leave':gt 'street'
-		end
-	end
-}
-
-$ohrhj = {
-	menu_off = 1
-	act 'Masturbate him':
-		cla
-		'You start stroking his cock with your delicate hands. Quickly Sasha groans, "I can''t hold on much longer."'
-		
-		gs 'arousal', 'hj', 15, 'dom'
-		gs 'stat'
-		
-		dynamic $ohrbj
-		dynamic $ohrhjcum
-		dynamic $ohrsex
-	end
-}
-
-$ohrhjcum = {
-	menu_off = 1
-	act 'Masturbate him more':
-		*clr & cla
-		borodachSexDay = daystart
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/hjcum.jpg"></center>'
-		'Sasha groans and his cock enthusiastically paints your hand white.'
-
-		gs 'arousal', 'hj', 15, 'dom'
-		gs 'stat'
-		
-		act 'Leave':gt 'street'
-	end
-}
-
-$ohrbj = {
-	menu_off = 1
-	act 'Suck him':
-		*clr & cla
-		picrand = rand(1, 4)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bj<<picrand>>.jpg"></center>'
-
-		'You wrap your <<$liptalk>> around his strong and warm 15 cm cock and quickly begin by sucking the head, caressing it with your tongue and lips. Sasha groans, "I''m going to come."'
-		
-		gs 'arousal', 'bj', 15, 'sub'
-		gs 'stat'
-		
-		dynamic $ohrbjcum
-		dynamic $ohrsex
-	end
-}
-
-$ohrbjcum = {
-	menu_off = 1
-	act 'Suck harder':
-		*clr & cla
-		spafinloc = 12
-		gs 'cum_manage'
-		gs 'stat'
-		picrand = rand(1, 4)
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/bjcum<<picrand>>.jpg"></center>'
-		'You redouble your efforts, sucking his hard cock with your <<$liptalk>>. Hot sperm hits your mouth, again and again. You continue to suck, ignoring your mouth full of viscous sperm. Until he finally nothing left.'
-		
-		gs 'arousal', 'bj', 15, 'sub'
-		gs 'stat'
-
-		act 'Swallow sperm':
-			*clr & cla
-			borodachSexDay = daystart
-			gs 'stat'
-			picrand = rand(1, 3)
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/swallow<<picrand>>.jpg"></center>'
-			'You open your sperm filled mouth and show off your hard work, then swallow it.'
-
-			gs 'arousal', 'bj', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
-		
-			act 'Leave':gt 'street'
-		end
-
-		act 'Spit it out':
-			*clr & cla
-			borodachSexDay = daystart
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/sex/guard/spit.jpg"></center>'
-			'You open your sperm filled mouth and show off your hard work, then quickly find the sink and spit it out.'
-
-			gs 'arousal', 'bj', 15, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
-			
-			act 'Leave':gt 'street'
-		end
-	end
-}
-
-$ohrsex = {
-	menu_off = 1
-	act 'Sex':
-		*clr & cla
-		gs 'stat'
-		borodachSexDay = daystart
-		pose = 0
-		gs 'boyStat', 'A39'
-		'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
-		'<<$boydesc>> lays you on the sofa, spreads your legs and pulls out his <<dick>> centimeter dick. His fingers begin to caress your pussy, preparing it for entry.'
-
-		gs 'arousal', 'vaginal', 30, 'sub'
-		gs 'arousal', 'end'
-		gs 'stat'
-			
-		act 'Leave':gt 'street'
-	end
-}
-
-rikudootvet = 1415
-
---- dinBoroda ---------------------------------
-

+ 3 - 3
locations/dinParty.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'party_toilet_event':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_2.jpg"></center>'
 			'A few moments later they both get up and strip naked, Lena sits Ira on the edge of the sink. Lena drops back to her knees while Ira spreads her legs wide, giving her friend easy access. Lena starts licking her friends pussy at once, Ira closes her eyes and moans softly at her friends attention.'
 			
-			gs 'arousal', 'voyeur', 5, 'lesbian'
+			gs 'arousal', 'voyeur_sex', 5, 'lesbian'
 			gs 'stat'
 			
 			act 'Watch':
@@ -144,7 +144,7 @@ if $ARGS[0] = 'party_toilet_event':
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_3.mp4"></video></center>'
 				'Ira moans louder, her breathe coming quicker, she grabs Lena''s head and pushes it against her crotch as she grinds herself against her friends face. Her body begins to tremble as she lets out a finally load moan of pleasure as she orgasms, coating her friends face with her pussy juices.'
 				
-				gs 'arousal', 'voyeur', 5, 'lesbian'
+				gs 'arousal', 'voyeur_sex', 5, 'lesbian'
 				gs 'stat'
 			
 				act 'Go in':
@@ -364,7 +364,7 @@ if $ARGS[0] = 'dance':
 	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_gost_1_' + rand(1,7) + '.mp4"></video></center>'
 	'Moving to the rhythmic sounds, you indulge in an unrestrained dance.'
 	'You jump, sway your body, and rock your booty, losing yourself in the general merriment.'
-	if pcs_danc >= 50:'You move your body perfectly with the rhythm of the music in an erotic way, getting you a lot of attention from others and you love they attention.'
+	if pcs_danc >= 50:'You move your body perfectly with the rhythm of the music in an erotic way. This gets you a lot of attention from the others and you love their attention.'
 	if pcs_danc < 50:'Your ridiculous movements during the dance does not bother anyone, You dance badly, but you do not care.'
 	act 'Have a rest':gt $loc,$metka
 	act 'Dance more':gt 'dinParty', 'dance' 

+ 5 - 3
locations/din_bad.qsrc

@@ -187,10 +187,12 @@ if $ARGS[0] = 'd_bag':
 	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
 	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
-	if refillable_bottle = 3: 
-		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	if refillable_bottle = 4: 
+		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: refillable_bottle = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+	elseif refillable_bottle = 3:
+		'You carry your sports water bottle in your purse. It''s two-thirds full. <a href="exec: refillable_bottle = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif refillable_bottle = 2:
-		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: refillable_bottle = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
+		'You carry your sports water bottle in your purse. It''s one-third full. <a href="exec: refillable_bottle = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
 	elseif refillable_bottle = 1:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end

+ 1 - 1
locations/dinnpc.qsrc

@@ -229,7 +229,7 @@ $din_igor__disco = {
 						'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 						'You tell Igor to get back on his feet and, meeting his eyes, kiss him. He responds with passion. It seems that your dominance has aroused him a little.'
 
-						gs 'arousal', 'kiss_give', 5, 'dom'
+						gs 'arousal', 'kiss', 5, 'dom'
 						gs 'arousal', 'end'
 						gs 'stat'
 		

+ 1 - 1
locations/dvor.qsrc

@@ -29,7 +29,7 @@ if psi1day =1 and pavserpsiday ! daystart:
     act 'Enter the house':gt'koncepod1','krr2x'
 end
 
-!if housr = 3: act '<b>Enter the house</b>':gt 'koncepod'
+!if home_owned[1] = 3: act '<b>Enter the house</b>':gt 'koncepod'
 !end
 
 --- dvor ---------------------------------

+ 56 - 67
locations/ender.qsrc

@@ -9,39 +9,38 @@ if $ARGS[0] = 'loss':
 		exit
 	end
 
-	if jugoFight = 1:
+	if fightEnding = 1:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		jugoFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor and feel your consciousness slipping away.'
 
 		act 'Further': gt 'preTG', 'tatianaPRE'
 		exit
-	elseif jugoFight = 2:
+	elseif fightEnding = 2:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		jugoFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor as you''re not longer able to fight Juugo.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif tatianaFight = 1:
+	elseif fightEnding = 3:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		tatianaFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor as you''re not longer able to fight Tatiana.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif prostitutFight = 1:
+	elseif fightEnding = 4:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
-		SUB = SUB + 1
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
 
@@ -50,12 +49,11 @@ if $ARGS[0] = 'loss':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 2:
+	elseif fightEnding = 5:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
-		SUB = SUB + 1
 		Loss += 1
 		bandfight = bandfight - 1
 		if rikudo > 10:rikudo = rikudo - 10
@@ -66,10 +64,10 @@ if $ARGS[0] = 'loss':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 3:
+	elseif fightEnding = 6:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
 		Loss += 1
 		stellfight = stellfight - 1
@@ -86,11 +84,10 @@ if $ARGS[0] = 'loss':
 		
 		act 'Further':gt'park','start'
 		exit
-	elseif KisaFight = 1:
+	elseif fightEnding = 7:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		KisaFight = 0
-		SUB = SUB + 1
+		fightEnding = 0
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
 		if KisameSex = 0:KisameSex = 1 & guy = guy + 1
@@ -112,12 +109,11 @@ if $ARGS[0] = 'loss':
 
 		act 'Crawl out of the pool':gt'street'
 		exit
-	elseif RapistFight = 1:
+	elseif fightEnding = 8:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		if succubusQW >= 4: gt 'succubus', 'RapistFight'
-		RapistFight = 0
-		sub += 1
+		fightEnding = 0
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		pcs_vag += 1
@@ -156,20 +152,19 @@ if $ARGS[0] = 'loss':
 
 		act 'Cry': gt $loc, $metka
 		
-	elseif ThiefFight = 1:
+	elseif fightEnding = 9:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		ThiefFight = 0
-		sub += 1
+		fightEnding = 0
 		Loss += 1
 		money = 0
 		'He knocks you down with one final hit. The moment he puts you out of commission he grabs the money and runs away.'
 		act 'Get back on your feet': gt $loc, $metka
 		exit
-	elseif DimaFight = 1:
+	elseif fightEnding = 10:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		DimaFight = 0
+		fightEnding = 0
 		grupvalue[4] -= 2
 		if Loss < 0: Loss = 0
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
@@ -178,21 +173,20 @@ if $ARGS[0] = 'loss':
 		'Lena turns to you and says tauntingly, "You either need to learn how to fight or get used to serving us, little bunny." Before you can say anything, the bell rings for class.'
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
-	elseif gangrapeFight = 1:
+	elseif fightEnding = 11:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		gangrapeFight = 0
-		sub += 1
+		fightEnding = 0
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
 
 		'In their drunken state they throw you on the spit-covered porch and began tearing your clothes as you no longer have the strength to resist.'
 
 		act 'Cry':gt'sexm','gangbang'
-	elseif ZverevaFight = 1:
+	elseif fightEnding = 12:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		ZverevaFight = 0
+		fightEnding = 0
 		zverRageQW = 10
 		Loss += 1
 
@@ -202,18 +196,18 @@ if $ARGS[0] = 'loss':
 		'Christina then again spits on you this time on your face. While making fun of you, Christina kicks you a few times more in the ribs before turning around and walking away.'
 
 		act 'Leave':gs 'gschool_grounds', 'main'
-	elseif stallionfight = 1:
+	elseif fightEnding = 13:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		stallionfight = 0
+		fightEnding = 0
 		Loss += 1
 		'You breath deeply, totally exhausted as the naked man advances upon you. You no longer have the strength to fight him off.'
 		
 		act 'Lose':gt 'stallion', 'rape'
-	elseif BitchFight = 1:
+	elseif fightEnding = 14:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		BitchFight = 0
+		fightEnding = 0
 		Loss += 1
 		gs 'pain', 5, 'tummy', 'kick'
 		gs 'pain', 5, 'cheeks', 'hit'
@@ -240,19 +234,19 @@ if $ARGS[0] = 'win':
 		exit
 	end
 
-	if jugoFight = 2:
+	if fightEnding = 2:
 		pcs_health = pcs_vital*10
 		rikudo = rikudo + 10
-		jugoFight = 0
+		fightEnding = 0
 		if winJugo = 0:winJugo = 1
 
 		'Juugo fell to the floor and can no longer keep on fighting.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif tatianaFight = 1:
+	elseif fightEnding = 3:
 		pcs_health = pcs_vital*10
-		tatianaFight = 0
+		fightEnding = 0
 		rikudo = rikudo + 10
 		if wintatiana = 0:wintatiana = 1
 
@@ -260,10 +254,9 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif prostitutFight = 1:
-		prostitutFight = 0
+	elseif fightEnding = 4:
+		fightEnding = 0
 		whoreQW = 1
-		pcs_dom += 1
 		Win += 1
 		rikudo = rikudo + 10
 
@@ -271,9 +264,8 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 2:
-		prostitutFight = 0
-		pcs_dom += 1
+	elseif fightEnding = 5:
+		fightEnding = 0
 		Win += 1
 		bandfight = bandfight + 1
 		rikudo = rikudo + 10
@@ -283,9 +275,8 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 3:
-		prostitutFight = 0
-		pcs_dom += 1
+	elseif fightEnding = 6:
+		fightEnding = 0
 		Win += 1
 		stellfight = stellfight + 1
 		rikudo = rikudo + 10
@@ -295,10 +286,9 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif KisaFight = 1:
+	elseif fightEnding = 7:
 		KisameDead = 1
-		KisaFight = 2
-		pcs_dom += 1
+		fightEnding = 2
 		Win += 1
 		if rikudo > 10:rikudo = rikudo + 3000
 		money = money + 5000
@@ -307,8 +297,7 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'street'
 		exit
-	elseif RapistFight = 1 or ThiefFight = 1:
-		ThiefFight = 0
+	elseif fightEnding = 8 or fightEnding = 9:
 		if succubusQW >= 4 and scpopt < 2:
 			$sclocrt = 'ender'
 			$scargrt = 'win'
@@ -316,20 +305,21 @@ if $ARGS[0] = 'win':
 			scpopt = 1
 			gt 'succubus', 'RapistFight'
 		end
-		RapistFight = 0
+
+		'You fought back the '+iif(fightEnding = 8, 'rapist', 'thief')+' and took his wallet.'
+
+		fightEnding = 0
+		fightEnding = 0
 		scpopt = 0
 		if rikudo > 10:rikudo += 100
-		pcs_dom += 1
 		Win += 1
 		money += rand(500,2000)
 
-		'You fought back the '+iif(RapistFight = 1, 'rapist', 'thief')+' and took his wallet.'
-						
 		act 'Leave': gt $loc, $metka
 		exit
-	elseif DimaFight = 1:
+	elseif fightEnding = 10:
 		money += 10000
-		DimaFight = 0
+		fightEnding = 0
 		grupvalue[4] += 3
 		Win += 1
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy1.jpg"></center>'
@@ -340,10 +330,9 @@ if $ARGS[0] = 'win':
 		'You check his pockets and find 10000 rubles in his wallet. Fucking rich kid. This should teach him. "The teacher is coming," says Lera, "Let''s get out of here."'
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
-	elseif gangrapeFight = 1:
-		gangrapeFight = 0
+	elseif fightEnding = 11:
+		fightEnding = 0
 		if rikudo > 10:rikudo += 100
-		pcs_dom += 1
 		Win += 1
 		money += rand(500,2000)
 		gs 'stat'
@@ -359,11 +348,11 @@ if $ARGS[0] = 'win':
 				gt 'street'
 			end
 		end
-	elseif ZverevaFight = 1:
+	elseif fightEnding = 12:
 		zverSlutQW = 1
 		lariskaQwestStart = daystart + 7
 		Win += 1
-		ZverevaFight = 0
+		fightEnding = 0
 
 		$npc_notes['A13'] = 'Lariska, who is very dependent on other people''s opinions. After you managed to win the fight against Christina Lariska looks more cheerful. She''s a good volleyball player, and could go pro if she keeps it up even though she doesn''t believe it herself. But with the help of Mikhail Nikolayevich, the volleyball coach, she might make it.'
 
@@ -373,13 +362,13 @@ if $ARGS[0] = 'win':
 		'Christina fell to the ground, and you grabbed her by the hair. "Well bitch, tell the whole school, have you ever sucked a cock or not?" Christine squealed as she admitted to the whole school that she loved sucking cock.'
 
 		act 'Leave':gs 'gschool_grounds', 'main'
-	elseif stallionfight = 1:
-		stallionfight = 0
+	elseif fightEnding = 13:
+		fightEnding = 0
 		Win += 1
 		'The naked man staggers back, all bloody. You''ve beaten him, and it is pretty clear he is finished. You look down and see something odd...'
 		act 'What is that?':gt 'stallion', 'end'
-	elseif BitchFight = 1:
-		BitchFight = 0
+	elseif fightEnding = 14:
+		fightEnding = 0
 		Win += 1
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'

+ 201 - 356
locations/fight.qsrc

@@ -27,6 +27,9 @@ opp_init[0] = (initBonus): attack faster/first
 opp_stun[0] = (stunner): make target unable to act for some amount of time
 }
 
+!! Use the above with [1] and [2] for extra opponents
+!! Use pcs_ prefix for Sveta and add [1] and [2] for allies. ie. $pcs_name[1] = 'Reinhold'
+
 if $ARGS[0] = 'initFight':
 	!! Clear Opponents from previous battle
 	killvar '$opp_name'
@@ -52,6 +55,7 @@ if $ARGS[0] = 'initFight':
 	killvar 'opp_dambonus'
 	killvar 'opp_init'
 	killvar 'opp_stun'
+	killvar 'opp_timer'
 
 	!! Clear any allies from previous battle
 	i = arrsize('pcs_health')
@@ -97,6 +101,7 @@ if $ARGS[0] = 'clearPCSArray':
 	killvar 'pcs_dambonus', i
 	killvar 'pcs_init', i
 	killvar 'pcs_stun', i
+	killvar 'pcs_timer', i
 
 	killvar 'i'
 end
@@ -166,23 +171,23 @@ if $ARGS[0] = 'start':
 
 	$HTMLText = '<table>
 		<tr>
-			<th align="right">Allies</td>
-			<th align="center" valign="center" rowspan=<<tableSize*2+1>> >vs.</td>
-			<th align="left">Opponents</td>
+			<th align="left">Allies</left></td>
+			<th align="center" valign="center" rowspan=<<tableSize*2+1>> >vs.</center></td>
+			<th align="right">Opponents</right></td>
 		</tr>'
 	i = 0
 	:FightPoster
 	if i < tableSize:
 		$HTMLText += '
 		<tr>
-			<td align="right"><img HEIGHT=400 src="<<$pcs_image[i]>>"></td>
+			<td align="left"><img HEIGHT=400 src="<<$pcs_image[i]>>"></left></td>
 
-			<td align="left"><img HEIGHT=400 src="<<$opp_image[i]>>"></td>
+			<td align="right"><img HEIGHT=400 src="<<$opp_image[i]>>"></right></td>
 		</tr>
 		<tr>
-			<td align="right"><<$pcs_name[i]>></td>
+			<td align="left"><<$pcs_name[i]>></left></td>
 
-			<td align="left"><<$opp_name[i]>></td>
+			<td align="right"><<$opp_name[i]>></right></td>
 		</tr>'
 		i += 1
 		jump 'FightPoster'
@@ -191,8 +196,21 @@ if $ARGS[0] = 'start':
 
 	*pl func('cleanHTML',$HTMLText)
 
-	pcs_timer = 100 - pcs_react
-	opp_timer = 100 - opp_react[0]
+	i=0
+	:PCSTimerInit
+	if i < arrsize('pcs_health'):
+		pcs_timer[i] = 100 - pcs_react[i]
+		i +=1
+		jump 'PCSTimerInit'
+	end
+
+	i=0
+	:OppTimerInit
+	if i < arrsize('opp_health'):
+		opp_timer[i] = 100 - opp_react[i]
+		i +=1
+		jump 'OppTimerInit'
+	end
 
 	act 'Engage': gt 'fight', 'main'
 
@@ -201,17 +219,51 @@ if $ARGS[0] = 'start':
 	killvar 'i'
 end
 
+if $ARGS[0] = 'findActiveTimer':
+!! Find the participant with the lowest Timer
+!	These values are passed back via two global variables.
+!
+!	$fightTimType = 'player' or 'opponent' depending on which group has the lowest member
+!	fightTimNum = the array number of the lowest participant
+
+	$fightTimType = 'player'
+	fightTimNum = 0
+	!! set this to high so that everyone will be lower.
+	fightTimLow = 99999
+
+	!! Find lowest of pcs participants
+	i = 0
+	:LowTimerLoop1
+	if i < arrsize('pcs_timer'):
+		if pcs_timer[i] < fightTimLow:
+			fightTimLow = pcs_timer[i]
+			fightTimNum = i
+		end
+		i += 1
+		jump 'LowTimerLoop1'
+	end
+
+	!!Find if any Opponents have lower than best PCS
+	i = 0
+	:LowTimerLoop2
+	if i < arrsize('opp_timer'):
+		if opp_timer[i] < fightTimLow:
+			fightTimLow = opp_timer[i]
+			fightTimNum = i
+			$fightTimType = 'opponent'
+		end
+		i += 1
+		jump 'LowTimerLoop2'
+	end
+
+	killvar 'i'
+end
+
 if $ARGS[0] = 'main':
+
 	gs 'fight', 'result_check'
-	if pcs_timer > opp_timer:
-		pcs_timer = pcs_timer - opp_react[0]
-		opp_timer = 0
-		gt 'fight', 'opponent'
-	else
-		opp_react[0] = opp_react[0] - pcs_timer
-		pcs_timer = 0
-		gt 'fight', 'player'
-	end
+	gs 'fight', 'findActiveTimer'
+	gt 'fight', $fightTimType, fightTimNum
 end
 
 if $ARGS[0] = 'printStats':
@@ -274,7 +326,7 @@ end
 if $ARGS[0] = 'result_check':
 !!cheat to auto-win fights check
 	if fight_cheat = 1:
-		!xgt 'ender', 'win'
+		xgt 'ender', 'win'
 		gt $loc, $metka
 		exit
 	end
@@ -284,19 +336,19 @@ if $ARGS[0] = 'result_check':
 	if pcs_health <= 0:
 		'<b><font color = red> You lost!</font></b>'
 
-		!xgt'ender','loss'
+		xgt'ender','loss'
 		gt $loc, $metka
 		exit
 	elseif opp_health[0] <= 0:
 		'<b><font color = green><<$boydesc>> You won!</font></b>'
 
-		!xgt'ender','win'
+		xgt'ender','win'
 		gt $loc, $metka
 		exit
 	elseif pcs_willpwr <= 0:
 		'<b><font color = red> You cannot summon the will to fight!</font></b>'
 
-		!xgt'ender','loss'
+		xgt'ender','loss'
 		gt $loc, $metka
 		exit
 	end
@@ -307,20 +359,20 @@ end
 !! Kick
 $AttackType[0] = 'Kick'
 $AttackSkill[0] = 'kick'
-AttackMin[0] = 3
-AttackMax[0] = 4
+AttackMin[0] = 5
+AttackMax[0] = 8
 AttackTime[0] = 40
 !! Hard Punch
 $AttackType[1] = 'Hard Punch'
 $AttackSkill[1] = 'punch'
-AttackMin[1] = 2
-AttackMax[1] = 3
+AttackMin[1] = 4
+AttackMax[1] = 6
 AttackTime[1] = 30
 !! Jab
 $AttackType[2] = 'Jab'
 $AttackSkill[2] = 'jab'
-AttackMin[2] = 1
-AttackMax[2] = 2
+AttackMin[2] = 2
+AttackMax[2] = 3
 AttackTime[2] = 15
 
 !!{Attack a target
@@ -329,81 +381,160 @@ AttackTime[2] = 15
 	 ARGS[2] = Which target
 	 ARGS[3] = Which Attacker
 }
-$fight['Attack'] = {
-	$fightAtk['Type'] = $ARGS[0]
-	$fightAtk['TargetType'] = $ARGS[1]
-	fightAtk['TargetNumber'] = ARGS[2]
-	fightAtk['AttackerNumber'] = ARGS[3]
-
-	if $fightAtk['TargetType'] = 'opp':
-		$fightAtk['AttackerType'] = 'pcs'
-		$fightAtk['AttackerPronoun'] = 'You'
-		$fightAtk['TargetPronoun'] = 'They'
+
+if $ARGS[0] = 'Attack':
+	$fightAtk_Type = $ARGS[1]
+	$fightAtk_TargetType = $ARGS[2]
+	fightAtk_TargetNumber = ARGS[3]
+	fightAtk_AttackerNumber = ARGS[4]
+
+	if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+		$fightAtk_AttackerType = 'pcs'
+		$fightAtk['DefenderName'] = $opp_name[fightAtk_TargetNumber]
+		$fightAtk['AttackerName'] = 'You'
+	elseif $fightAtk_TargetType = 'opp':
+		$fightAtk['AttackerName'] = $pcs_name[fightAtk_AttackerNumber]
+		$fightAtk['DefenderName'] = $opp_name[fightAtk_TargetNumber]
+		$fightAtk_AttackerType = 'pcs'
 	else
-		$fightAtk['AttackerType'] = 'opp'
-		$fightAtk['AttackerPronoun'] = 'They'
-		$fightAtk['TargetPronoun'] = 'You'
+		$fightAtk_AttackerType = 'opp'
+		$fightAtk['AttackerName'] = $opp_name[fightAtk_AttackerNumber]
+		$fightAtk['DefenderName'] = $pcs_name[fightAtk_TargetNumber]
 	end
 
-	fightAtk['Type'] = arrpos('$AttackType',$fightAtk['Type'])
-	fightAtk['AttackerSkillValue'] = dyneval("result = <<$fightAtk['TargetType']>>_<<$AttackSkill[fightAtk['Type']]>>[<<fightAtk['TargetNumber']>>]")
-	fightAtk['TargetReactValue'] = dyneval("result = <<$fightAtk['TargetType']>>_react[<<fightAtk['AttackerNumber']>>]")
-	fightAtk['TargetAgilValue'] = dyneval("result = <<$fightAtk['TargetType']>>_agil[<<fightAtk['TargetNumber']>>]")
-	fightAtk['MinDamage'] = AttackMin[fightAtk['Type']]
-	fightAtk['MaxDamage'] = AttackMax[fightAtk['Type']]
+	fightAtk_Type = arrpos('$AttackType',$fightAtk_Type)
+	fightAtk['AttackerSkillValue'] = dyneval('result = <<$fightAtk_AttackerType>>_<<$AttackSkill[fightAtk_Type]>>[<<fightAtk_AttackerNumber>>]')
+	fightAtk['TargetReactValue'] = dyneval('result = <<$fightAtk_TargetType>>_react[<<fightAtk_TargetNumber>>]')
+	fightAtk['TargetAgilValue'] = dyneval('result = <<$fightAtk_TargetType>>_agil[<<fightAtk_TargetNumber>>]')
+	fightAtk['MinDamage'] = AttackMin[fightAtk_Type]
+	fightAtk['MaxDamage'] = AttackMax[fightAtk_Type]
 
-	'<<$fightAtk["AttackerPronoun"]>> attempt a <<$fightAtk["Type"]>>!'
+	if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+		'You attempt to <<$fightAtk_Type>> <<$fightAtk["DefenderName"]>>!'
+	else
+		'<<$fightAtk["AttackerName"]>> attempts to <<$fightAtk_Type>> <<$fightAtk["DefenderName"]>>!'
+	end
 	*nl
 	if fightAtk['AttackerSkillValue'] + rand(0,30) > fightAtk['TargetReactValue'] / 4 + 3 * fightAtk['TargetAgilValue'] / 4:
 		!!Calculate Damage
-		dynamic "fightAtk['Damage'] = <<$fightAtk['AttackerType']>>_stren[<<fightAtk['AttackerNumber']>>] * rand(<<fightAtk['MinDamage']>>,<<fightAtk['MaxDamage']>>) / 15"
+		dynamic "fightAtk['Damage'] = <<$fightAtk_AttackerType>>_stren[<<fightAtk_AttackerNumber>>] * rand(<<fightAtk['MinDamage']>>,<<fightAtk['MaxDamage']>>) / 15"
 		!!Apply Damage
-		gs 'fight', 'applyDamage', $fightAtk['TargetType'], fightAtk['TargetNumber'], fightAtk['Damage']
+		gs 'fight', 'applyDamage', $fightAtk_TargetType, fightAtk_TargetNumber, fightAtk['Damage']
 		if fightAtk['Damage'] > 10:
-			'The hit is hard and <<$fightAtk["TargetPronoun"]>> reel in pain.'
+			if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+				'The hit is hard and <<$fightAtk["DefenderName"]>> reels in pain.'
+			else
+				'The hit is hard and you reel in pain.'
+			end
 		else
 			'Its a glancing blow, but still hurts.'
 		end
 	else
-		'<<$fightAtk["TargetPronoun"]>> avoid the blow.'
+		if $fightAtk_TargetType = 'pcs' and fightAtk_AttackerNumber = 0:
+			'You avoid the blow.'
+		else
+			'<<$fightAtk["DefenderName"]>> avoids the blow.'
+		end
 	end
-	dynamic "<<$fightAtk['AttackerType']>>_timer += AttackTime[fightAtk['Type']]"
+	dynamic "<<$fightAtk_AttackerType>>_timer += AttackTime[fightAtk_Type]"
 	cla
 	act 'Next': gt 'fight', 'main'
-
-	killvar 'fightAtk'
-	killvar '$fightAtk'
-}
+end
 
 if $ARGS[0] = 'opponent':
 	gs 'fight', 'statDisplay'
-	if opp_magik[0] > 0: gs 'fight', 'opp_spellcast'
+	if pcs_health[0] > 0 and pcs_health[1] > 0 and pcs_health[2] > 0:
+		TargetNumber = rand(0,2)
+	elseif pcs_health[0] > 0 and pcs_health[1] > 0:
+		TargetNumber = rand(0,1)
+	elseif pcs_health[0] > 0 and pcs_health[2] > 0:
+		if rand(0,1) = 0:
+			TargetNumber = 0
+		else
+			TargetNumber = 2
+		end
+	elseif pcs_health[1] > 0 and pcs_health[2] > 0:
+		TargetNumber = rand(1,2)
+	elseif pcs_health[0] > 0:
+		TargetNumber = 0
+	elseif pcs_health[1] > 0:
+		TargetNumber = 1
+	else
+		TargetNumber = 2
+	end		
+!!	if opp_magik[0] > 0: gs 'fight', 'opp_spellcast'
 	if rand(0,opp_kick[0]) > 40:
-		dynamic $fight['Attack'], 'Kick', 'pcs', 0, 0
+		gs 'fight', 'Attack', 'Kick', 'pcs', ARGS[2], TargetNumber
 	elseif rand(0,opp_punch[0]) > 40:
-		dynamic $fight['Attack'], 'Hard Punch', 'pcs', 0, 0
+		gs 'fight', 'Attack', 'Hard Punch', 'pcs', ARGS[2], TargetNumber
 	else
-		dynamic $fight['Attack'], 'Jab', 'pcs', 0, 0
+		gs 'fight', 'Attack', 'Jab', 'pcs', ARGS[2], TargetNumber
 	end
 end
 
 if $ARGS[0] = 'player':
 	gs 'fight', 'statDisplay'
+	if opp_health[0] > 0 and opp_health[1] > 0 and opp_health[2] > 0:
+		TargetNumber = rand(0,2)
+	elseif opp_health[0] > 0 and opp_health[1] > 0:
+		TargetNumber = rand(0,1)
+	elseif opp_health[0] > 0 and opp_health[2] > 0:
+		if rand(0,1) = 0:
+			TargetNumber = 0
+		else
+			TargetNumber = 2
+		end
+	elseif opp_health[1] > 0 and opp_health[2] > 0:
+		TargetNumber = rand(1,2)
+	elseif opp_health[0] > 0:
+		TargetNumber = 0
+	elseif opp_health[1] > 0:
+		TargetNumber = 1
+	else
+		TargetNumber = 2
+	end	
 	if pcs_magik > 0:
 		act 'Cast a Spell': gs 'fight', 'spellcast'
 	end
+	if opp_health[0] > 0:
+		act 'Kick <<$opp_name[0]>>':
+			gs 'fight', 'Attack', 'Kick', 'opp', 0, 0
+		end
 
-	act 'Kick them':
-		dynamic $fight['Attack'], 'Kick', 'opp', 0, 0
-	end
+		act 'Punch <<$opp_name[0]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, 0
+		end
 
-	act 'Hard punch':
-		dynamic $fight['Attack'], 'Hard Punch', 'opp', 0, 0
+		act 'Jab <<$opp_name[0]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 0, 0
+		end
 	end
+	if opp_health[1] > 0:
+		act 'Kick <<$opp_name[1]>>':
+			gs 'fight', 'Attack', 'Kick', 'opp', 0, 1
+		end
 
-	act 'Jab them':
-		dynamic $fight['Attack'], 'Jab', 'opp', 0, 0
+		act 'Punch <<$opp_name[1]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, 1
+		end
+
+		act 'Jab <<$opp_name[1]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 0, 1
+		end
 	end
+	if opp_health[2] > 0:
+		act 'Kick <<$opp_name[2]>>':
+			gs 'fight', 'Attack', 'Kick', 'opp', 0, 2
+		end
+
+		act 'Punch <<$opp_name[2]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, 2
+		end
+
+		act 'Jab <<$opp_name[2]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 0, 2
+		end
+	end	
 end
 
 
@@ -413,305 +544,18 @@ end
 if $ARGS[0] = 'pcs_spellcast':
 end
 
-!!{
 
-	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and manaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
-		SasoriBody = SasoriBody - 1
-		gs'priziv','sasori'
 
-		'<b><font color = red>The doll parts scatter all over and immediately head into battle mode.</font></b>'
-		'<b><font color = red>You hear the sonorous voice of Sasori, "I have a lots of dolls, you can''t beat me."</font></b>'
-	elseif SasoriBody = 2 and healthV <= 0 or SasoriBody = 2 and manaV <= 0 or SasoriBody = 2 and willpowerV <= 0:
-		SasoriBody = SasoriBody - 1
-		gs'priziv','sasori1'
 
-		'<b><font color = red>The last doll crumbles into pieces and you''ve finally reached Sasori.</font></b>'
-	end
 
-	if stunV > 0 and SasoriBody > 1:
-		stunV = 0
 
-		'<b><font color = red>The doll began to move again.</font></b>'
-	end
 
-	if stunV > 0 and SasoriBody = 1:
-		stunV = 0
 
-		'<b><font color = red>Sasori moves again.</font></b>'
-	end
 
-	if GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and manaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
-		GedoMazo = 2
-		barierV = 0
 
-		'<b><font color = green><<$boydesc>> He fell to the ground and turned to dust.</font></b>'
 
-		gs'priziv','tobi'
+!!--------------------------------------------------old shit--------------------------------------------------
 
-		'<b><font color = green><<$boydesc>>Attack</font></b>'
-	end
-
-	if pcs_health <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red> You lost!</font></b>'
-
-		xgt'ender','loss'
-		exit
-	elseif healthV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> You won!</font></b>'
-
-		xgt'ender','win'
-		exit
-	elseif pcs_mana <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red> You won!</font></b>'
-
-		xgt'ender','loss'
-		exit
-	elseif manaV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> lost!</font></b>'
-
-		xgt'ender','win'
-		exit
-	elseif pcs_willpwr <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red> You lost!</font></b>'
-
-		xgt'ender','loss'
-		exit
-	elseif willpowerV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> won!</font></b>'
-
-		xgt'ender','win'
-		exit
-	end
-
-	if izanagiV > 0 and healthV <= 0 or izanagiV > 0 and manaV <= 0 or izanagiV > 0 and willpowerV <= 0:
-		izanagiV = izanagiV - 1
-
-		'<b><font color = red><<$boydesc>> disappeared.</font></b>'
-
-		healthV = vitalV*10 + strenV*5
-		manaV = intelV*magikV + magikV*100 + vitalV*10
-		willpowerV = willV*10
-		stunV = 0
-		if program = 6 and izanagiOnce = 0:izanagiOnce = 1 & unmaterialV = 40 & tobizanagi = 0
-
-		'<b><font color = red><<$boydesc>> appeared in front of you, completely healthy. He folded his arms and made the magic sign for Izanagi, the perfect illusion.</font></b>'
-		'<b><font color = red>The price for this spell was to sacrifice one of my eyes.</font></b>'
-	elseif heartV > 0 and healthV <= 0 or heartV > 0 and manaV <= 0 or heartV > 0 and willpowerV <= 0:
-		heartV = heartV - 1
-
-		'<b><font color = red><<$boydesc>> staggered, as his heart burst.</font></b>'
-
-		healthV = vitalV*10 + strenV*5
-		manaV = intelV*magikV + magikV*100 + vitalV*10
-		willpowerV = willV*10
-		stunV = 0
-
-		'<b><font color = red><<$boydesc>> stood up and got in a frenzy. He must have another heart.</font></b>'
-	elseif izanagi > 0 and pcs_health <= 0 or izanagi > 0 and pcs_mana <= 0 or izanagi > 0 and pcs_willpwr <= 0:
-		izanagi = izanagi - 1
-
-		'<b><font color = green>He vanishes.</font></b>'
-
-		pcs_health = pcs_vital*10 + pcs_stren*5
-		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
-		stun = 0
-		zerkaloV = 0
-		poisonV = 0
-		bloodV = 0
-
-		'<b><font color = green>All of a sudden he appears in front of you completely healthy.</font></b>'
-	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_mana <= 0 or heart > 0 and pcs_willpwr <= 0:
-		heart = heart - 1
-		zerkaloV = 0
-		poisonV = 0
-		bloodV = 0
-
-		'<b><font color = green>Your heart took too much of a beating and gave up.</font></b>'
-
-		pcs_health = pcs_vital*10 + pcs_stren*5
-		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
-		stun = 0
-
-		'<b><font color = green>You open your eyes as you''re not dead...</font></b>'
-	end
-
-	gs'before'
-	'<b>= = = = = = = = = = = = = (ROUND <<round>>) = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
-	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
-	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
-	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
-	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
-	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
-	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'
-	if defenceAct > 0:'<b><font color = green><<defenceAct>> Regeneration</font></b>'
-	if defenceActM > 0:'<b><font color = green><<defenceActM>> Mana recovery protection</font></b>'
-	if unmaterial > 0:'<b><font color = green>You''re <<unmaterial>> strokes are not material.</font></b>'
-	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
-	gs'init'
-
-	if hod = 0:
-		!player attacks
-		'<font color = green>Choose your attack</font>'
-
-		if gun > 0:
-			!Boomstick
-			if bulletIn > 0:
-				'You have <<bulletIn>> bullets loaded in the gun.'
-
-				act 'Pistol shot':
-					cla
-					bulletIn -= 1
-					gunpower = 150
-					buu = 1
-					gunpricel = 1
-					Gcrime += 1
-					gt'strelba'
-				end
-			elseif bulletIn <= 0:
-				if bullet = 0:
-					'You''re out of ammunition.'
-				elseif bullet>0:
-					'You have <<bullet>> left.'
-
-					act 'Reload':
-						cla
-						if bullet < 7:
-							bulletIn = bullet
-							bullet = 0
-
-							'You reload the empty gun.'
-						end
-						if bullet >= 7:
-							bullet -= 7
-							bulletIn = 7
-
-							'You reload all the 7 bullets in the gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
-
-		if Mgun > 0:
-			!Boomstick
-			if mbulletIn > 0:
-				'You have <<mbulletIn>> bullets left in the machine gun.'
-
-				act 'Single shot':
-					cla
-					mbulletIn -= 1
-					buu = 1
-					gunpower = 300
-					gunpricel = 2
-					Gcrime += 1
-					gt'strelba'
-				end
-
-				if mbulletIn >= 3:
-					act 'Burst shot':
-						cla
-						mbulletIn -= 3
-						buu = 3
-						gunpower = 300
-						gunpricel = 1
-						Gcrime += buu
-						gt'strelba'
-					end
-					act 'Automatic shot':
-						cla
-						buu = mbulletIn
-						mbulletIn = 0
-						gunpower = 300
-						gunpricel = 0
-						Gcrime += buu
-						gt'strelba'
-					end
-				end
-			elseif mbulletIn <= 0:
-				if mbullet = 0:
-					'You''ve run out of ammunition.'
-				elseif mbullet > 0:
-					'You have <<mbullet>> bullets left in the machine gun.'
-
-					act 'Reload':
-						cla
-						if mbullet < 7:
-							mbulletIn = mbullet
-							mbullet = 0
-
-							'You reload the empty gun.'
-						end
-						if mbullet >= 30:
-							mbullet -= 30
-							mbulletIn = 30
-
-							'You''ve reloaded 30 bullets for the machine gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
-
-		if tragun > 0:
-			!travmatik
-			if tbulletIn > 0:
-				'You have <<mbulletIn>> bullets left in the non-lethal gun.'
-
-				act 'Pistol shot':
-					cla
-					tbulletIn -= 1
-					gunpower = 50
-					buu = 1
-					gunpricel = 0
-					gt'strelba'
-				end
-			elseif tbulletIn <= 0:
-				if tbullet = 0:
-					'You''ve run out of ammunition.'
-				elseif tbullet > 0:
-					'You have <<mbullet>> bullets left in the non-lethal gun.'
-
-					act 'Charge':
-						cla
-						if tbullet >= 1:
-							tbullet -= 1
-							tbulletIn = 1
-
-							'You reload the empty gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
-		if autocombat_cheat = 0 or pcs_magick > 0:
-			act 'Physical Attack':xgt'boxing'
-			if pcs_magik > 0: act 'Magical Attack':gt'magik'
-			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
-		elseif autocombat_cheat = 1 and pcs_magick = 0:
-			xgt'boxing'
-		end
-	elseif hod = 1:
-		!enemy attacks
-		'<font color = red><<$boydesc>> attacks</font>'
-		if autocombat_cheat = 0:
-			act 'Continue': xgt'enemy','start'
-			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
-		elseif autocombat_cheat = 1:
-			xgt'enemy','start'
-		end
-	end
-end
-}
 
 if $ARGS[0] = 'sta':
 	menu_off = 1
@@ -791,5 +635,6 @@ if $ARGS[0] = 'Wrestlergen':
 		!!fat[1] = 100
 	end
 end
+
 --- fight ---------------------------------
 

+ 0 - 466
locations/frot.qsrc

@@ -1,466 +0,0 @@
-# frot
-
-menu_off = 1
-
-if $ARGS[0] = 'a':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot.jpg"></center>'
-	'You feel something solid against your ass, stirring you realize that rising up between your buttocks a penis comes to rest.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		clr
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot1.jpg"></center>'
-		'The guy standing behind you, with no regard for other passengers, grabs your butt with his hand and presses his member harder against your ass.'
-
-		gs 'arousal', 'foreplay', 5, 'sub'
-		gs 'stat'
-		
-		act 'Move away':gt 'frot', 'fin'
-
-		act 'Disregard':
-			cla
-			*clr
-			clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot2.jpg"></center>'
-			'You feel like the man behind you has got his penis out and begun to rub it on your ass, clinging on to you and squeezing your buttocks with his hands.'
-
-			gs 'arousal', 'foreplay', 5, 'sub'
-			gs 'stat'
-		
-			act 'Move away':gt 'frot', 'fin'
-
-			act 'Disregard':
-				cla
-				*clr
-				pcs_horny += 10
-				frot += 1
-				gs 'cum_call', 'pantyrear', 'stranger on the metro', 0, 0, spot, svol
-				sub += 3
-				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] -= 1'
-				clr
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotc1.jpg"></center>'
-				'The man jerks back and you feel something warm and viscous flow over you. The guy finished you on your ass, then moved away to another section.'
-
-				act 'Get out of the car':gt 'frot', 'fin2'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'b':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot.jpg"></center>'
-	'You feel something solid against your ass, stirring you realize that rising up between your buttocks a penis comes to rest.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		clr
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot1.jpg"></center>'
-		'The guy standing behind you, with no regard for other passengers, grabs your butt with his hand and presses his member harder against your ass.'
-
-		gs 'arousal', 'foreplay', 5, 'sub'
-		gs 'stat'
-		
-		act 'Move away':gt 'frot', 'fin'
-
-		act 'Disregard':
-			cla
-			*clr
-			clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frota1.jpg"></center>'
-			'The man lifts your skirt and starts to caress your bare buttocks with his strong hands.'
-			
-			gs 'arousal', 'foreplay', 5, 'sub'
-			gs 'stat'
-		
-			act 'Move away':gt 'frot', 'fin'
-
-			act 'Disregard':
-				cla
-				*clr
-				pcs_horny += 10
-				sub += 1
-				clr
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frota2.jpg"></center>'
-				'The man lowers your panties and slides his hand between your naked buttocks to caress your wet pussy.'
-				
-				gs 'arousal', 'vaginal_finger', 5, 'sub'
-				gs 'stat'
-		
-				act 'Move away':gt 'frot', 'fin'
-
-				act 'Disregard':
-					*clr & cla
-					gs 'stat'
-					frot += 1
-					gs 'cum_call', 'clothesgroin', 'stranger on the metro', 0, 0, spot, svol
-					dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] -= 1'
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotc2.jpg"></center>'
-					'The man pull your panties down to your knees, then letting your skirt fall back into place takes your hand in his. He forces his dick into your hand.'
-					'You cup the hot and hard cock and begin stroking it. After a couple of minutes you feel the man cumming on your skirt.'
-
-					gs 'arousal', 'hj', 5, 'sub'
-					gs 'stat' 
-		
-					act 'Get out of the car':gt 'frot', 'fin2'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'c':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp.jpg"></center>'
-	'You feel a man standing behind you start poking his hand down the back of your pants.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp1.jpg"></center>'
-		'You enjoy the nice sensation of the stranger caressing your ass under your pants, when suddenly you see he has pulled out a small pair of scissors and is trying to reach your bra strap.'
-
-		gs 'arousal', 'foreplay', 5, 'sub'
-		gs 'stat'
-		
-		act 'Move away':gt 'frot', 'fin'
-
-		act 'Disregard':
-			cla
-			*clr
-			gs 'bras', 'dispose'
-			clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp2.jpg"></center>'
-			'The man cut the straps of your bra and removes it from you. Freed from your bra, he now fondles your breasts.'
-			
-			gs 'arousal', 'foreplay', 5, 'sub'
-			gs 'stat'
-		
-			act 'Move away':gt 'frot', 'fin'
-
-			act 'Enjoy':
-				cla
-				*clr
-				gs 'arousal', 'foreplay', 5, 'sub'
-				clr
-				gs 'stat'
-!!Image needed				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp3.jpg"></center>'
-				if PCloSkirt = 0:
-					'You are bent forward and the man begins to caress your ass, you feel his hands clutching your pants trying to tear them.'
-				else
-					'You are bent forward and the man begins to caress your ass, you feel his hands start to lift your skirt.'
-				end
-					
-
-				act 'Move away':gt 'frot', 'fin'
-
-				act 'Allow him':
-					cla
-					*clr
-					pcs_horny += 10
-					clr
-					gs 'stat'
-					pcs_horny += 10
-					sub += 2
-					dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] -= 5'
-					clr
-					gs 'stat'
-!!Image needed					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp4.jpg"></center>'
-					if PCloSkirt = 0:
-						'The man rips your pants between your legs, thereby exposing your wet pussy.'
-					elseif $pantyworntype = 'none':
-						'The man raises your skirt and you feel his hard cock brushing against your pussy lips.'
-					else
-						'The man rips aside your panties, thereby exposing your wet pussy.'
-					end
-					
-					if pcs_dom > 0:act 'Move away':gt 'frot', 'fin'
-
-					act 'Submit':
-						cla
-						*clr
-
-!!Image needed						'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp5.jpg"></center>'
-
-						if stat['vaginal'] = 0:
-							'The idea of letting some stranger take your virginity makes you feel like a dirty slut, but also excites you more than you care to admit.'
-						end
-						'You widen your stance as much as possible in the crowded car and push back against him as he thrusts into your sweaty pussy.'
-						if pcs_horny >= 100:
-							pcs_mood += 15
-							pcs_willpwr += 15
-							$orgasm_or = 'custom'
-							$orgasm_txt = 'The wild excitement of sex with a stranger in a public place is too much and you start to cum almost immediately as he enters you.'
-						else
-							$orgasm_or = 'custom'
-							$orgasm_txt = 'You are overwhelmed by the wild excitement of sex with a stranger in a public place.'
-						end
-
-						guy += 1
-						pcs_vag += 1
-						cumprecheck = 1
-						gs 'cum_call', '', 'stranger on the metro', 0, 0, spot, svol
-						gs 'arousal', 'vaginal', 5, 'sub'
-						gs 'stat'
-						
-						if pcs_dom > 0:act 'Move away':gt 'frot', 'fin'
-
-						act 'Further':
-							cla
-							*clr
-							sub += 3
-							pcs_horny += 10
-							frot += 1
-							gs 'cum_call', '', 'stranger on the metro', 0, 0, spot, svol
-							gs 'stat'
-!!Image needed							'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp6.jpg"></center>'
-							'The stranger does not pull out of your pussy, your juices flow and he finishes inside you. You feel like a strong jet of sperm filled your uterus.'
-							gs 'cuminsidereact', 'some guy whose face you haven''t even seen'
-							act 'Get out of the car':gt 'frot', 'fin2'
-						end
-					end
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'd':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp.jpg"></center>'
-	'You feel a man standing behind you start poking his hand down the back of your pants.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		clr
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd.jpg"></center>'
-		'The man pulls your pants off you leaving you with a bare ass in a crowded subway car, he takes your hand and makes you hold his penis in your hand.'
-
-		gs 'arousal', 'foreplay', 5, 'sub'
-		gs 'stat'
-		
-		act 'Move away':gt 'frot', 'fin'
-
-		act 'Stroke his cock':
-			cla
-			*clr
-			gs 'cum_call', 'butt', 'stranger on the metro', 0, 0, spot, svol
-			frot += 1
-			clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-			'You caress his dick and rub it on your bare skin, you rub it more vigorously as it stiffens and sperm splashes onto your bare ass. After the man was satisfied, he pulls your pants over your sperm covered ass, pats you on the bum and disappears.'
-
-			gs 'arousal', 'hj', 5, 'sub'
-			gs 'stat'
-		
-			act 'Get out of the car':gt 'frot', 'fin2'
-		end
-	end
-end
-
-if $ARGS[0] = 'e':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp.jpg"></center>'
-	'You feel a man standing behind you start poking his hand down the back of your pants.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		clr
-		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote.jpg"></center>'
-		'The man pulls your pants off you leaving you with a bare ass in a crowded subway car, you feel his hand reach between your legs and start to masturbate your pussy from behind.'
-
-		gs 'arousal', 'vaginal_finger', 5, 'sub'
-		gs 'stat'
-		
-		if pcs_horny >= 90:
-			pcs_mood += 15
-			pcs_willpwr += 15
-			$orgasm_or = 'custom'
-			$orgasm_txt = 'You can''t take any more and you explode in a powerful orgasm. Your legs give way.'
-
-			act 'Squat':
-				cla
-				*clr
-				pcs_horny += 10
-				clr
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote1.jpg"></center>'
-				'You can no longer stand and squat. The man moves to your side, pulls out his member and taking you head in his hand, turns your face to meet it.'
-
-				if pcs_dom > 0:act 'Move away':gt 'frot', 'fin'
-				
-				act 'Suck it':
-					cla
-					*clr
-					guy += 1
-					frot += 1
-					clr
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote2.jpg"></center>'
-					'The man taunts you by bringing his cock to your lips, then moving back. Soon, timing it just right, you catch his purple head between your lips.'
-					'You obediently suck his hard cock. You are sitting on your haunches in the middle of a crowded subway car and sucking a stranger dick.'
-					
-					gs 'arousal', 'bj', 5, 'sub'
-					gs 'stat'
-		
-					if pcs_dom > 0:act 'Move away':gt 'frot', 'fin'
-
-					act 'Continue to suck':
-						cla
-						*clr
-						pcs_horny += 10
-						gs 'cum_call', 'face', 'stranger on the metro', 0, 0, spot, svol
-						facial += 1
-						sub += 3
-						clr
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote3.jpg"></center>'
-						'The man pulls his cock out of your mouth and ends against your lips, hot cum splatters on your lips chin.'
-						
-						if pcs_dom > 0:act 'Move away':gt 'frot', 'fin'
-
-						act 'Sit on the floor':
-							cla
-							*clr
-							pcs_horny += 10 + sub
-							gs 'cum_call', 'mouth', 'stranger on the metro', 0, 0, spot, svol
-							swallow += 1
-							sub += 3
-							gs 'stat'
-!!Image needed							'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote4.jpg"></center>'
-							'Male fingers collect the sperm from your face and they push into your mouth, and you dutifully lick them and swallow the sperm.'
-
-							act 'Get out of the car':gt 'frot', 'fin2'
-						end
-					end
-				end
-			end
-
-			exit
-		else
-			'You are very nervous the thought crosses your mind to masturbate his penis.'
-
-			act 'Stroke his cock':
-				cla
-				*clr
-				gs 'cum_call', 'butt', 'stranger from the metro', 0, 0, spot, svol
-				frot += 1
-				clr
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-				'You caress his dick and rub it on your bare skin, you rub it more vigorously as it stiffens and sperm splashes onto your bare ass. After the man was satisfied, he pulls your pants over your sperm covered ass, pats you on the bum and disappears.'
-
-				gs 'arousal', 'hj', 5, 'sub'
-				gs 'stat'
-		
-				act 'Get out of the car':gt 'frot', 'fin2'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'd1':
-	cla
-	*clr
-	svol = rand(30,50)
-	spot = 500*rand(16,24)
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd2.jpg"></center>'
-	'You feel a man standing behind you playing with your skirt.'
-
-	act 'Move away':gt 'frot', 'fin'
-
-	act 'Disregard':
-		cla
-		*clr
-		clr
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd.jpg"></center>'
-		'The man pulls your pants off you leaving you with a bare ass in a crowded subway car, he takes your hand and makes you take his penis in your hand.'
-
-		gs 'arousal', 'foreplay', 5, 'sub'
-		gs 'stat'
-		
-		act 'Move away':gt 'frot', 'fin'
-
-		act 'Stroke his cock':
-			cla
-			*clr
-			gs 'cum_call', 'butt', 'stranger on the metro', 0, 0, spot, svol
-			frot += 1
-			clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-			'You caress his dick and rub it on your bare skin, you rub it more vigorously as it stiffens and sperm splashes onto your bare ass. After the man was satisfied, he pulls your pants over your sperm covered ass, pats you on the bum and disappears.'
-
-			gs 'arousal', 'hj', 5, 'sub'
-			gs 'stat'
-		
-			act 'Get out of the car':gt 'frot', 'fin2'
-		end
-	end
-end
-
-if $ARGS[0] = 'fin':
-	cla
-	'You barely manage to escape to another place, away from the horny idiot. After a while you get to your station.'
-	
-	gs 'arousal', 'end'
-	gs 'stat'
-	
-	act 'Get out of the car':gt 'metro', 'start'
-end
-
-if $ARGS[0] = 'fin2':
-	gt 'metro', 'start'
-end
-
---- frot ---------------------------------
-

+ 121 - 96
locations/gLakeNude.qsrc

@@ -8,9 +8,9 @@ $menu_arg = ''
 $locclass = 'beach'
 menu_off = 0
 *clr & cla
-gs'stat'
+gs 'stat'
 !!check to make sure I did the sound call correct
-if sound = 0:PLAY 'sound/lakeshore2.mp3',20
+if sound = 0: PLAY 'sound/lakeshore2.mp3',20
 '<center><H4>Secluded beach</H4></center>'
 if month >= 3 and month <= 5:
 	if hour >= 6 and hour <= 17:
@@ -58,10 +58,10 @@ act'Leave the secluded beach<<$tmp_lakenude_leave>>':
 	if $clothingworntype ! 'nude' or ($clothingworntype = 'nude' and pcs_inhib >= 60):
 		cla
 		minut += 10
-		gt'glake'
+		gt 'glake'
 	else
 		msg '<center>You are not willing to show off your naked body on the main beach, what would people say?</center>'
-		gt'gLakeNude'
+		gt 'gLakeNude'
 	end
 end
 killvar '$tmp_lakenude_leave'
@@ -76,43 +76,49 @@ if month >= 5 and month <= 9:
 	end
 		
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		act'Take off your clothes':
-			menu_off = 1
-			if pcs_inhib > 30:
-				*clr & cla
-				minut+=5
-				inhib_exp += rand(1,3)
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
-					'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
-				elseif pcs_inhib >= 60:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-					'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
-				elseif pcs_inhib < 60:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
+		gs 'willpower', 'exhib', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Take off your clothes (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				if pcs_inhib > 30:
+					*clr & cla
+					minut += 5
+					inhib_exp += rand(1,3)
+					gs 'clothing', 'strip'
+					gs 'underwear', 'remove'
+					if pcs_horny >= 80 and exhibitionist_lvl > 1:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
+						'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
+					elseif pcs_inhib >= 60:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+						'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
+					elseif pcs_inhib < 60:
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+						'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
+					end
+				else
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
+					'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
 				end
-			else
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
-				'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
+				act 'Continue': gt 'gLakeNude'
 			end
-			act'Continue':gt'gLakeNude'
+		else
+			act 'Take off your clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif $clothingworntype = 'nude':
-		act'Put your clothes back on':
+		act 'Put your clothes back on':
 			*clr & cla
 			menu_off = 1
-			minut+=5
+			minut += 5
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			nudelake = rand(1,10)
 			if nudelake <= 2:
 				minut += 5
 				pcs_mood -= 5
-				pcs_willpwr -= 5
 				gs 'exhibitionism', 4
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/noclothes.jpg"></center>'
@@ -120,7 +126,7 @@ if month >= 5 and month <= 9:
 				act 'Run home naked': gt 'glake', 'nude_home'
 			else
 				'You return to the place where you left your clothes, and put them back on.'
-				act'Continue': gt 'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			end
 		end
 	end
@@ -133,9 +139,8 @@ if temper >= 15 and month >= 5 and month <= 9:
 		*clr & cla
 		menu_off = 1
 		minut += 30
-		pcs_willpwr += 5
 		pcs_mood += 5
-		gs'stat'
+		gs 'stat'
 
 		if $clothingworntype = 'swimwear' and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
@@ -156,7 +161,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 	end
 	
 	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
-		act'Go swimming (30 minutes)':
+		act 'Go swimming (30 minutes)':
 			menu_off = 1
 			*clr & cla
 			cumspclnt = 4
@@ -182,12 +187,12 @@ if temper >= 15 and month >= 5 and month <= 9:
 			'You play around and have fun in the lake, enjoying the feel of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Get out of the water':gt'gLakeNude'
+			act 'Get out of the water': gt 'gLakeNude'
 		end
 	end
 	
 	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
-		act'Go sunbathing (30 minutes)':
+		act 'Go sunbathing (30 minutes)':
 			menu_off = 1
 			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 				*clr & cla
@@ -209,76 +214,90 @@ if temper >= 15 and month >= 5 and month <= 9:
 					pcs_tan = pcs_tan + 3
 					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 				end
-				act 'Continue':gt'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			else
 				cla
 				'You have to take off your clothes before you can lay down to sunbath.'
-				act'Continue':gt'gLakeNude'
+				act 'Continue': gt 'gLakeNude'
 			end
 		end
 	end
 	
 	if voyeurism_start = 0:
-		act'Look around the beach':
+		act 'Look around the beach':
 			*clr & cla
 			menu_off = 1
-			minut += 5
 			voyeurism_start_view = rand(1,3)
 			gs 'stat'
 			if voyeurism_start_view <= 2:
+				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/shared/lake/lake_beach1.jpg"></center>'
 				'You look around, but see nothing interesting. Just a few others in swimwear or relaxing on the beach.'
 			else
 				voyeurism_start = 1
 				voyeurism += 1
+				gs 'arousal', 'voyeur_sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
 				'You look around and notice that a little ways off at the end of the small beach is a pair of lovers laying on the sand. The girl is completely naked and her hand is stroking the guy''s cock through his white pants. The guy turns his head and notices that you look at them. You immediately turn away, blushing terribly and begin to explore your feet as if seeing them for the first time.'
 			end
 			act'Back': gt 'gLakeNude'
 		end
 	elseif voyeurism_start = 1:
-		act'Watch couple on the beach':
-			*clr & cla
-			menu_off = 1
-			if voyeurism = 0:
-				minut += 5
-				voyeurism += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
-				act'Stop Watching!': gt'gLakeNude'
-			else
-				voyeurism_start = 2
-				minut += 50
-				pcs_horny += 75
-				voyeurism += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
-				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
-				act'Watch the couple': 	gs'gLakeNudeEvent','gLakeNude_sex'
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Watch couple on the beachs (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'voyeur', 'self'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				if voyeurism = 0:
+					gs 'arousal', 'voyeur_sex', 5
+					voyeurism += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/lake_legs.jpg"></center>'
+					'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> You can''t remember a single instance in your life when you were watching someone. So is it worth to start doing it now? YES!'
+					act'Stop Watching!': gt'gLakeNude'
+				else
+					voyeurism_start = 2
+					gs 'arousal', 'voyeur_sex', 30
+					voyeurism += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
+					'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
+					act'Watch the couple': 	gs'gLakeNudeEvent','gLakeNude_sex'
+				end
 			end
+		else
+			act 'Watch couple on the beach (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif voyeurism_start = 2 and (pcs_horny < 90 or pav_slut < 50):
-		act 'Spy on other nudists on the beach':
-			menu_off = 1
-			gs 'stat'
-			if voyeurism_nudist <= 14 or pav_slut > 50:
-				voyeurism_nudist += 1
-				gs'gLakeNudeEvent','gLakeNude_nudist'
-				act'Continue': gt 'gLakeNude'
-			else
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>'
-				'You want to watch for nudists, but suddenly notice that you start to feel weird.<br><dh>"Probably spying too much."</dh> you think and look straight ahead.'
-				act'Continue': gt'gLakeNude'
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on other nudists on the beach (<<will_cost>> Willpower)':
+				gs 'willpower', 'voyeur', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				menu_off = 1
+				gs 'stat'
+				if voyeurism_nudist <= 14 or pav_slut > 50:
+					voyeurism_nudist += 1
+					gs 'gLakeNudeEvent','gLakeNude_nudist'
+					act 'Continue': gt 'gLakeNude'
+				else
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>'
+					'You want to watch for nudists, but suddenly notice that you start to feel weird.<br><dh>"Probably spying too much."</dh> you think and look straight ahead.'
+					act 'Continue': gt'gLakeNude'
+				end
 			end
 		end
-	end
+		else
+			act 'Spy on other nudists on the beach (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	if voyeurism >= 17 and voyeurism_start = 2:
 		if voyeurism_forest = 0:
-			act'Explore the forest': gt'gLakeNudeForest'
+			act 'Explore the forest': gt 'gLakeNudeForest'
 		else
-			act'Hide in the woods near the beach': gt'gLakeNudeForest'
+			act 'Hide in the woods near the beach': gt 'gLakeNudeForest'
 		end
 	end
 end
@@ -312,7 +331,7 @@ if $ARGS[0] = 'sauna':
 	end
 		
 	if $clothingworntype ! 'nude' and (pcs_inhib > 25 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		act'Take off your clothes':
+		act 'Take off your clothes':
 			*clr & cla
 			menu_off = 1
 			minut +=  5
@@ -323,14 +342,14 @@ if $ARGS[0] = 'sauna':
 			act 'Continue': gt 'gLakeNude', 'sauna'
 		end
 	else
-		act'Put your clothes back on':
+		act 'Put your clothes back on':
 			cla
 			menu_off = 1
 			minut += 5
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
 			'You put your clothes back on.'
-			act'Continue': gt 'gLakeNude', 'sauna'
+			act 'Continue': gt 'gLakeNude', 'sauna'
 		end
 	end
 	
@@ -345,7 +364,7 @@ if $ARGS[0] = 'sauna':
 				'It appears to be empty at the moment.'
 			else
 				saunarand = rand(1,5)
-				if saunarand = 1:
+				if saunarand = 4:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/womennude.jpg"></center>'
 					'You find several other girls inside completely naked using the sauna.'
 				elseif saunarand > 4:
@@ -382,7 +401,7 @@ if $ARGS[0] = 'sauna':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
 			'It appears to be empty at the moment.'
-			act 'Leave': gt 'gLakeNude', 'sauna' 
+			act 'Leave': gt 'gLakeNude', 'sauna'
 			act 'Use the sauna':
 				*clr & cla
 				minut += 30
@@ -410,7 +429,7 @@ if $ARGS[0] = 'sauna':
 				'It appears to be empty at the moment.'
 			else
 				saunarand = rand(1,5)
-				if saunarand = 1:
+				if saunarand = 4:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/coednude.jpg"></center>'
 					'You find several other people in here, men and women. All of them completely naked.'
 				elseif saunarand > 4:
@@ -421,26 +440,32 @@ if $ARGS[0] = 'sauna':
 					'It appears to be empty at the moment.'
 				end
 			end
+			gs 'willpower', 'exhib', 'self', 'easy'
+			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 0
+			if will_cost <= pcs_willpwr:
+				act iif(saunarand < 4 or $clothingworntype = 'swimwear', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					minut += 30
+					pcs_mood += 10
+					if $clothingworntype = 'swimwear':
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
+						if pcs_inhib < 40: inhib_exp += rand(0,1)
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
+						if pcs_inhib < 60: inhib_exp += rand(1,3)
+					end
+					gs 'stat'
+					'You spend 30 minutes relaxing in the sauna.'
 
-			act 'Leave': gt 'gLakeNude', 'sauna'
-			act 'Use the sauna':
-				*clr & cla
-				minut +=30
-				pcs_mood += 10
-				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
-					if pcs_inhib < 40: inhib_exp += rand(0,1)
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
-					if pcs_inhib < 60: inhib_exp += rand(1,3)
-				end
-				gs 'stat'
-				'You spend 30 minutes relaxing in the sauna.'
-
-				act 'Leave': gt 'gLakeNude', 'sauna'
+					act 'Leave': gt 'gLakeNude', 'sauna'
 
-				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+					if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+				end
+			else
+				act 'Use the sauna (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			act 'Leave': gt 'gLakeNude', 'sauna'
 		end
 	else
 		*nl

+ 16 - 16
locations/gLakeNudeEvent.qsrc

@@ -6,14 +6,14 @@ if $args[0] = 'gLakeNude_sex':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_0.jpg"></center>'
 	'You tear your eyes from their beautiful legs and look around. You see that no one else is on the beach except you and the couple that''s getting hot and heavy. By now they are too into each other to pay attention to you. The girl slowly wraps her plump lips around the head of her man''s cock, pushing her ass into the air in a seductive pose.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur_sex', 1
 	gs 'stat'
 	act 'Continue watching':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_1.jpg"></center>'
 		'The gorgeous blonde wraps a delicate hand around the shaft of the engorged cock. She slowly begins pumping the base of her boyfriend''s dick as she sucks and licks around the head, never breaking eye contact. The stud''s abs tighten visibly as he draws in a breath of pleasure from blonde''s ministrations. You find yourself enthralled; unable to look away as a heat begins to build just below your belly.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 		act 'Further':
 			cla
@@ -21,7 +21,7 @@ if $args[0] = 'gLakeNude_sex':
 			gs 'clothing','strip'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_2.jpg"></center>'
 			'Leaving your clothes lying on the sand, you move a little closer to the sexy couple, pretending that you''re just walking on the beach. You see the girl push her man''s legs further apart, allowing her to dip her head down and take one ball into her mouth, then the other. Once she returns to his throbbing cock, she opens her tight throat and takes it in further than before, almost 3/4 of the way down the impressive member'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 2
 			gs 'stat'
 			act 'Further':
 				cla
@@ -29,7 +29,7 @@ if $args[0] = 'gLakeNude_sex':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_3.jpg"></center>'
 				'Suddenly a strong wave rushes on shore and drenches them both. The water crashes up over the cock-hungry blonde''s legs and thighs, causing her throw her head up and gasp, the meaty phallus popping out her mouth. The couple make eye contact with each other and giggle lightly. "Let''s go swimming" you hear the hot woman say in a sultry voice.
 				As the pair start to get up a wave of panic rushes over you. You need to do duck away quickly; otherwise they''ll surely take notice of you and how you''re shaking from excitement.' 
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 1
 				gs 'stat'
 				act 'Further':
 					cla
@@ -52,28 +52,28 @@ if $args[0] = 'gLakeNude_sex':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_6.jpg"></center>'
 							'The hot Adonis of a man gives his girl one hard smack on her plump ass. He then spreads his feet wide apart and bends his knees, lining up his still rock hard member with the blonde girl''s waiting orifice. As he slides his thick pole into her pussy, you catch sight of her eyes as they roll back into her head. She bites down on her lower lip, stifling a moan.'							
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur_sex', 1
 							gs 'stat'
 							act 'Further':
 								cla
 								*clr
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_7.jpg"></center>'
 								'The chiseled statue of a man continues pounding into his girlfriend for several more minutes, continually changing angles and speed to keep her at the peak of passion. You continue rubbing your dripping vagina, feeling shame and excitement in equal measure. Even from this distance you can hear the blonde girl''s breaths as they become shorter and more erratic. Suddenly her breathe catches in her throat for a moment before she lets out a wailing cry of pleasure. "Oh my god, she just came so hard!" you think as your own arousal continues to build.'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 4
 								gs 'stat'
 								act 'Further':
 									cla
 									*clr
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_8.jpg"></center>'
 									'After her orgasm subsides, the blond rolls over onto her back, letting the massive cock slide out of her for just a moment. Before long, however, her boyfriend is sliding his knees up to her ass in the sand. The hormone driven man pushes his girlfriend''s knees back, exposing her used hole to him once more. Without giving her more than a moment to prepare the strong brute thrusts his mighty dick back into her waiting pussy.'
-									gs 'arousal', 'voyeur', 5
+									gs 'arousal', 'voyeur_sex', 2
 									gs 'stat'
 									act 'Further':
 										cla
 										*clr
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_9.jpg"></center>'
 										'"It seems that the time for tender loving is over" you think as you watch the ripped man drive his veiny cock into her without mercy. He thrusts hard and fast, his tight balls swinging violently with every thrust.'
-										gs 'arousal', 'voyeur', 5
+										gs 'arousal', 'voyeur_sex', 1
 										gs 'stat'
 										act 'Further': gt 'gLakeNudeEvent', 'gLakeNude_sex2'
 									end
@@ -92,7 +92,7 @@ if $args[0] = 'gLakeNude_sex2':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_10.jpg"></center>'
 	'Another unexpected wave crashes onto the beach and flows over the fucking couple. This time it seems like they will pay it no mind, too enraptured by each other''s bodies to care about the sandy water.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'voyeur_sex', 1
 	gs 'stat'
 	act 'Further':
 		cla
@@ -100,28 +100,28 @@ if $args[0] = 'gLakeNude_sex2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_11.jpg"></center>'
 		'As the sexy man drives his cock ever deeper into his subservient girlfriend you notice a wince of pain cross her face as she cries out. You reason that her tight, young pussy must not be used to taking in such a huge piece of meat. Her lustful man seems too aroused to notice the discomfort as he continues to plow into her abused hole as deep as he can push it. With her legs still pinned back by his powerful arms the blonde presses her hands against his muscular thighs, trying to slow his pace. After a few more agonizing thrusts she asks him switch positions.'
 		'The girl stands up and walks a bit farther from the water, her legs quaking along the way.  After the short respite, the hot blonde girl drops back down to her stomach and knees, back arched with her beautiful ass in the air.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		act 'Further':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_12.jpg"></center>'
 			'The horny, impatient man wastes no time getting himself back into position. He grips both of the girl''s perfect ass cheeks in either hand, flesh pillowing through is fingers, as he thrusts himself back into her sopping hole.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 1
 			gs 'stat'
 			act 'Further':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_13.jpg"></center>'
 				'You can tell that the fit young guy doen''t lack for endurance as he furiously fucks his sweet girlfriend for several more minutes. As he continues pounding into her, you begin to hear both of their breathing becoming less regular, more frantic.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Further':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_14.jpg"></center>'
 					'Without warning the man suddenly crosses his arms over his girlfriend''s hips and flips her onto her back. In a moment he''s back inside of her, never breaking the rhythm of his thrusts. You marvel at the power in his body, as well as the possessiveness he has over his girlfriend. She is his and he will do what he wants with her.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 1
 					gs 'stat'
 					act 'Further':
 						cla
@@ -130,14 +130,14 @@ if $args[0] = 'gLakeNude_sex2':
 						'"Do it!" the gruff man commands as his girlfriend vigorously rubs her clit while he fucks her.'
 						'"Do It now!" he threatens just a moment before the blonde girl throws her head back and screams in orgasm, her body and legs shaking uncontrollably.'
 						'The dominant man thrusts hard just a few more times before...'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 1
 						gs 'stat'
 						act 'Further':
 							cla
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_16.jpg"></center>'
 							'he pulls his pussy juice soaked cock out of his girlfriend''s snatch and erupts a volcano of cum all over her.'
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur_sex', 1
 							gs 'stat'
 							act 'Further':
 								cla
@@ -145,7 +145,7 @@ if $args[0] = 'gLakeNude_sex2':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_17.jpg"></center>'
 								'The sperm and sand mix to form a coarse paste as they cover the blonde girl''s belly. She obediently attempts to lean her head forward to catch a few drops in her mouth as it flies out, but she is too spent to really make the effort.'
 								'The couple collapse next to each other, exhausted from their romance session, and begin quietly talking.'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 1
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Further':

+ 34 - 18
locations/gLakeNudeForest.qsrc

@@ -19,26 +19,42 @@ end
 
 if temper >= 20 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 	if voyeurism_forest = 0:
-		set voyeurism_forest = 1
-		act'Follow the girl': gt'gLakeNudeEvent','gLakeNudeForest_piss'
+		voyeurism_forest = 1
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Follow the girl (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'gLakeNudeEvent', 'gLakeNudeForest_piss'
+		else
+			act 'Follow the girl (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	else
-		act'Spy on nudists':
-			menu_off = 1
-			gs 'gLakeNudeEvent','gLakeNude_nudist'
-			act 'Look': gt 'gLakeNudeForest'
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on nudists (<<will_cost>> Willpower)':
+				menu_off = 1
+				gs 'willpower', 'voyeur', 'self', 'easy'
+				gs 'willpower', 'pay', 'self'
+				gs 'gLakeNudeEvent','gLakeNude_nudist'
+				act 'Look': gt 'gLakeNudeForest'
+		else
+			act 'Spy on nudists (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act'Spy on girl going for a pee':
-			cla
-			*clr
-			menu_off = 1
-			minut += 10
-			pcs_horny += 10
-			voyeurism += 1
-			kol_foto_piss = 169
-			viewforestpiss = rand(1,kol_foto_piss)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/piss_forest/piss_forest_<<rand(1,kol_foto_piss)>>.jpg"></center>'
-			'You slip behind a tree and watch as a cute girl looks for a private spot to do her business. She finally decides on a patch of dirt near some bushes and squats down. You dare to peek your head around the tree trunk for a better look as the girl finds her balance and appears to relax. A torrent of hot piss begins to flow from the young woman''s nether lips. You hear a light moan escape her mouth. "Wow, she must have been holding it awhile.", you think as heat radiates through your groin from the naughtiness of what you just saw.'
-			act'Back': gt 'gLakeNudeForest'
+		gs 'willpower', 'voyeur', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Spy on girl going for a pee (<<will_cost>> Willpower)':
+				*clr & cla
+				menu_off = 1
+				gs 'willpower', 'voyeur', 'self'
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'voyeur', 10
+				voyeurism += 1
+				kol_foto_piss = 169
+				viewforestpiss = rand(1,kol_foto_piss)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/piss_forest/piss_forest_<<rand(1,kol_foto_piss)>>.jpg"></center>'
+				'You slip behind a tree and watch as a cute girl looks for a private spot to do her business. She finally decides on a patch of dirt near some bushes and squats down. You dare to peek your head around the tree trunk for a better look as the girl finds her balance and appears to relax. A torrent of hot piss begins to flow from the young woman''s nether lips. You hear a light moan escape her mouth. "Wow, she must have been holding it awhile.", you think as heat radiates through your groin from the naughtiness of what you just saw.'
+				act'Back': gt 'gLakeNudeForest'
+			end
+		else
+			act 'Spy on girl going for a pee (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end

+ 4 - 4
locations/gadforest.qsrc

@@ -324,7 +324,7 @@ if $ARGS[0] = 'caught':
 	if caught_rand > 90:
 		inhib_exp += rand(0,3)
 		grandma_trouble += rand(7,10)
-		gs 'arousal', 'voyeur', 10, 'exhibitionism'
+		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman.jpg"></center>'
@@ -332,7 +332,7 @@ if $ARGS[0] = 'caught':
 	elseif caught_rand > 70:
 		inhib_exp += rand(0,4)
 		grandma_trouble += rand(1,3)
-		gs 'arousal', 'voyeur', 10, 'exhibitionism'
+		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman'+rand(1,5)+'.jpg"></center>'
@@ -340,14 +340,14 @@ if $ARGS[0] = 'caught':
 	elseif caught_rand > 50:
 		inhib_exp += rand(0,3)
 		grandma_trouble += rand(1,3)
-		gs 'arousal', 'voyeur', 10, 'exhibitionism'
+		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
 		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
 	else
 		grandma_trouble += rand(0,1)
-		gs 'arousal', 'voyeur', 10, 'exhibitionism'
+		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'

+ 21 - 21
locations/gadforest_event.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'gopforest_mitka':
 								else
 									'Eventually, you arrive at your not-so-secret meadow. You already know what is about to happen having seen it all before. After a couple of minutes Mira lays down on a blanket in front of Mitka spreading her legs invitingly. He doesn''t waste a second before he is on her. He takes his place between her legs and starts slamming his cock into her eager vagina roughly. In no time Mira starts moaning and begging for more.'
 								end
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								act 'Watch':
 									cla
@@ -96,7 +96,7 @@ if $ARGS[0] = 'gopforest_mitka':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/mirameadowsex2.jpg"></center>'
 									'After a few more minutes Mitka pulls out and cums on her stomach. They rest for a little while and then get dressed and go towards the village...'
-									gs 'arousal', 'voyeur', 5
+									gs 'arousal', 'voyeur_sex', 5
 									gs 'stat'
 									act 'Leave':gt 'gadforest','1'
 								end
@@ -110,12 +110,12 @@ if $ARGS[0] = 'gopforest_mitka':
 							if temp_gadf = 0:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 								'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
-								gs 'arousal', 'voyeur', 2
+								gs 'arousal', 'voyeur_sex', 2
 								gs 'stat'
 							else
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal1.jpg"></center>'
 								'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock all the way in her wide open hole.'
-								gs 'arousal', 'voyeur', 2
+								gs 'arousal', 'voyeur_sex', 2
 								gs 'stat'
 							end
 							act 'Watch':
@@ -125,7 +125,7 @@ if $ARGS[0] = 'gopforest_mitka':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal2.jpg"></center>'
 								'After a couple of minutes Mitka strongly slaps her ass and Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he spill his warm cum all over her face.'
-								gs 'arousal', 'voyeur', 10
+								gs 'arousal', 'voyeur_sex', 10
 								gs 'stat'
 								act 'Leave':gt 'gadforest','1'
 							end
@@ -153,12 +153,12 @@ if $ARGS[0] = 'gopforest_mitka':
 						if temp_gadf = 0:
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 							'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
-							gs 'arousal', 'voyeur', 2
+							gs 'arousal', 'voyeur_sex', 2
 							gs 'stat'
 						else
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal1.jpg"></center>'
 							'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock all the way in her wide open hole.'
-							gs 'arousal', 'voyeur', 2
+							gs 'arousal', 'voyeur_sex', 2
 							gs 'stat'
 						end
 						act 'Watch':
@@ -168,7 +168,7 @@ if $ARGS[0] = 'gopforest_mitka':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal2.jpg"></center>'
 							'After a couple of minutes Mitka strongly slaps her ass and Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he spill his warm cum all over her face.'
-							gs 'arousal', 'voyeur', 10
+							gs 'arousal', 'voyeur_sex', 10
 							gs 'stat'
 							act 'Leave':gt 'gadforest','1'
 						end
@@ -399,12 +399,12 @@ if $ARGS[0] = 'gopforest_mitka':
 								if temp_gadf = 0:
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal.jpg"></center>'
 									'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
-									gs 'arousal', 'voyeur', 2
+									gs 'arousal', 'voyeur_sex', 2
 									gs 'stat'
 								else
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal1.jpg"></center>'
 									'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock all the way in her wide open hole.'
-									gs 'arousal', 'voyeur', 2
+									gs 'arousal', 'voyeur_sex', 2
 									gs 'stat'
 								end
 								act 'Watch':
@@ -414,7 +414,7 @@ if $ARGS[0] = 'gopforest_mitka':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowanal2.jpg"></center>'
 									'After a couple of minutes Mitka strongly slaps her ass and Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he spill his warm cum all over her face...'
-									gs 'arousal', 'voyeur', 10
+									gs 'arousal', 'voyeur_sex', 10
 									gs 'stat'
 									act 'Leave':gt 'gadforest','1'
 								end
@@ -562,7 +562,7 @@ if $ARGS[0] = 'gopforest_kolyamba':
 
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj2.jpg"></center>'
 						'Mira is still wearing her flip-flops, you see them sticking out, pressed right at Kolyamba''s ass, as Mira has her legs wrapped around him. She groans loudly as Kolyamba keeps slapping her crotch with his balls, driving his hard penis deep into her vagina. Mira is scratching the ground with her hands, her back arched like a cat''s, it looks like she is saying something to Kolyamba. But he is not paying any attention, as he keeps battering her pussy, soon he brought her to orgasm and then he cums too...'
-						gs 'arousal', 'voyeur', 10
+						gs 'arousal', 'voyeur_sex', 10
 						gs 'stat'
 						act 'Leave':gt 'gadforest','1'
 					end
@@ -921,7 +921,7 @@ if $ARGS[0] = 'gopforest_vasyan':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj6.jpg"></center>'
 						'Mira is fully naked, bent over, right in front of Vasyan. She is exposing her ass as he drives his cock deep inside it. Judging by her lustful moans, she quite likes having him fuck her from behind, but after a couple of minutes Vasyan pulls out of her and lowers her ass...'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						act 'Leave':gt 'gadforest','1'
 					end
@@ -1298,17 +1298,17 @@ if $ARGS[0] = 'gopforest_2boys':
 						if mitboyrand = 1:
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj11.jpg"></center>'
 							'Mira squats in front of one of the boys and takes his cock in her mouth. Licking and stroking him until he cums. She then does the same with the to other guy...'
-							gs 'arousal', 'voyeur', 5, 'group'
+							gs 'arousal', 'voyeur_sex', 5, 'group'
 							gs 'stat'
 						elseif mitboyrand = 2:
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj10.jpg"></center>'
 							'Two guys are fucking Mira, one in her pussy and the other in the mouth. They are chatting and laughing while Mira is moaning spread out beneath them... Fifteen minutes later they have all finished and start leaving...'
-							gs 'arousal', 'voyeur', 5, 'group'
+							gs 'arousal', 'voyeur_sex', 5, 'group'
 							gs 'stat'
 						else
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj9.jpg"></center>'
 							'Both of the guys are almost naked. Mira sucks one of them, the second, apparently, already finished, is behind her fondling her breasts...'
-							gs 'arousal', 'voyeur', 5, 'group'
+							gs 'arousal', 'voyeur_sex', 5, 'group'
 							gs 'stat'
 						end
 						act 'Continue':gt 'gadforest','1'
@@ -1578,17 +1578,17 @@ if $ARGS[0] = 'gopforest_2boys':
 								if mitboyrand = 1:
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj11.jpg"></center>'
 									'Mira squats in front of one of the boys and takes his cock in her mouth. Licking and stroking him until he cums. She then does the same with the to other guys...'
-									gs 'arousal', 'voyeur', 5
+									gs 'arousal', 'voyeur_sex', 5
 									gs 'stat'
 								elseif mitboyrand = 2:
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj10.jpg"></center>'
 									'Two guys are fucking Mira, one in her pussy and the other in the mouth. They are chatting and laughing while Mira is moaning spread out beneath them... Fifteen minutes later they have all finished and start packing...'
-									gs 'arousal', 'voyeur', 5
+									gs 'arousal', 'voyeur_sex', 5
 									gs 'stat'
 								else
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj9.jpg"></center>'
 									'Both of the guys are almost naked. Mira sucks one of them, the second, apparently, already finished, is behind her fondling her breasts...'
-									gs 'arousal', 'voyeur', 5, 'group'
+									gs 'arousal', 'voyeur_sex', 5, 'group'
 									gs 'stat'
 								end
 								act 'Continue':gt 'gadforest','1'
@@ -1755,7 +1755,7 @@ if $ARGS[0] = 'gopforest_3boys':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj8.jpg"></center>'
 						'Mira squats between the three friends and happily sucks their members. You watch as they take turns cumming in her mouth, and on her face...'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						act 'Continue':gt 'gadforest','1'
 					end
@@ -1970,7 +1970,7 @@ if $ARGS[0] = 'gopforest_3boys':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirameadowbj8.jpg"></center>'
 								'Mira squats between the three friends and happily sucks their members. You watch as they take turns cumming in her mouth, and on her face...'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								act 'Continue':gt 'gadforest','1'
 							end

+ 1 - 0
locations/gadmarket.qsrc

@@ -31,6 +31,7 @@ if preziktype = 0: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'pre
 if preziktype = 1 or preziktype = 2: $gadmarkettab += FUNC ('$stock_item', 5, 'Condoms', 600, 'prezikcount', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 20, 'Tampons', 250, 'tampon', 'gadmarket')
 $gadmarkettab += FUNC ('$stock_item', 40, 'Razors', 700, 'stanok', 'gadmarket')
+$gadmarkettab += FUNC ('$stock_item', 30, 'Shampoo', 250, 'shampoo', 'gadmarket')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Bottle of water', 100, 'bottle', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Sandwich', 100, 'buterbrod', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')
 $gadmarkettab += FUNC ('$single_stock_item', 1, 'Cheap Bottle of wine', 200, 'wine', 'gadmarket', '', iif(bag > 0, 0, 1), 'You need a purse')

+ 35 - 32
locations/gadprostitutes.qsrc

@@ -32,12 +32,11 @@ if $ARGS[0] = 'start':
 	!	end
 	!end
 	if hour >= 16 and hour <= 23:
-		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore, or a sub
-		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 10 or gadriver_gang = 2 or sub > 10):
+		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
+		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 10 or gadriver_gang = 2):
 			*clr & cla
 			
 			mirapimp = 0
-			sub += 5
 			minut += 5
 			gs 'stat'
 			
@@ -51,8 +50,6 @@ if $ARGS[0] = 'start':
 				'Mira continues, "Look at you, just another slut. Mitka, Kolyamba, and Vasyan told me now much they all love fucking and sharing you now. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting shared by a group of friends."'
 			elseif gadriver_gang = 2:
 				'Mira continues, "Look at you, just another whore. All the village men can talk about is how much you moaned for each and every one of them. You thought you were so much better than me, well no more! I''m not working for you anymore. You have proven yourself perfectly capable of enjoying getting gangbanged by multiple groups of strangers."'
-			elseif sub > 0:
-				'Mira continues, "Look at you, so meek and submissive. I''ve heard rumors of how you love to submit yourself to others. You thought you were so much better than me, well no more! I''m not working for you anymore. You cannot make me."'
 			end
 			'After Mira is done with her preaching, you try to think of something witty to say or raise your hand to slap her back, but you just can''t bring yourself to do it.'
 			'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
@@ -61,27 +58,33 @@ if $ARGS[0] = 'start':
 		else
 			if MiraLoc = 8:
 				'You see Mira standing below a streetlight a little ways down the road.'
-				! event to become miras pimp if not the boys slut, not the village whore, and a dom
-				if mirapimp = 0 and npc_QW['A63'] < 10 and gadriver_gang = 0 and pcs_dom > 10:
-					act 'Make Mira your prostitute':
-						*clr & cla
-						
-						mirapimp = 1
-						pcs_dom += 5
-						minut += 5
-						gs 'stat'
-						
-						gs 'Miroslava', 'miraclothes'
-						
-						'You call her over to you. Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
-						'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 500 <b>₽</b> per customer you have each night."  You tell her earnestly.'
-						'Mira looks up in shock and with a hurt look on her face.  "What are you talking about?  Do you think I am a hooker?"'
-						'You step up to her and place your hand on her face.  Mira closes her eyes and leans into your hand.  You look into her eyes once she opens them and then SLAP her hard across the face.  Mira falls to the ground and starts to cry.  "You''re my property whore.  You will do whatever I tell you.  You will never lie to me ever again, or I swear I will make you pay.  Understand me?!"'
-						'Mira nods and she wipes away tears.'
-						'You reach down and help her back to her feet.  You brush her off and help her fix her makeup.  "Good, now get that cute ass back out on that road and earn us some money."'
-						'You give Mira a little slap on the ass and smile as you watch Mira start a new chapter of her life as your prostitute.'
-						
-						act 'Finish':gt'gadprostitutes','start'
+				! event to become miras pimp if not the boys slut, not the village whore
+				if mirapimp = 0 and npc_QW['A63'] < 10 and gadriver_gang = 0:
+					gs 'willpower', 'misc', 'force', 'hard'
+					if will_cost <= pcs_willpwr:
+						act 'Make Mira your prostitute (<<will_cost>> Willpower)':
+							*clr & cla
+							
+							mirapimp = 1
+							minut += 5
+							gs 'willpower', 'misc', 'force', 'hard'
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							
+							gs 'Miroslava', 'miraclothes'
+							
+							'You call her over to you. Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
+							'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 500 <b>₽</b> per customer you have each night."  You tell her earnestly.'
+							'Mira looks up in shock and with a hurt look on her face.  "What are you talking about?  Do you think I am a hooker?"'
+							'You step up to her and place your hand on her face.  Mira closes her eyes and leans into your hand.  You look into her eyes once she opens them and then SLAP her hard across the face.  Mira falls to the ground and starts to cry.  "You''re my property whore.  You will do whatever I tell you.  You will never lie to me ever again, or I swear I will make you pay.  Understand me?!"'
+							'Mira nods and she wipes away tears.'
+							'You reach down and help her back to her feet.  You brush her off and help her fix her makeup.  "Good, now get that cute ass back out on that road and earn us some money."'
+							'You give Mira a little slap on the ass and smile as you watch Mira start a new chapter of her life as your prostitute.'
+							
+							act 'Finish':gt'gadprostitutes','start'
+						end
+					else
+						act 'Make Mira your prostitute (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 				end
 				! events to prostitute just Mira
@@ -128,7 +131,7 @@ if $ARGS[0] = 'just_mira':
 					temp_gadpro = rand(0,1)
 					if temp_gadpro = 0:
 						*clr & cla
-						gs 'arousal', 'voyeur', 10, 'exhibitionism'
+						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'stat'
 						
 						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
@@ -137,7 +140,7 @@ if $ARGS[0] = 'just_mira':
 						
 						act 'Hide':
 							*clr & cla
-							gs 'arousal', 'voyeur', 10, 'exhibitionism'
+							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
 							
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
@@ -146,7 +149,7 @@ if $ARGS[0] = 'just_mira':
 							
 							act 'Keep watching':
 								*clr & cla
-								gs 'arousal', 'voyeur', 10, 'exhibitionism'
+								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
 								
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
@@ -166,7 +169,7 @@ if $ARGS[0] = 'just_mira':
 						end
 					elseif temp_gadpro = 1:
 						*clr & cla
-						gs 'arousal', 'voyeur', 10, 'exhibitionism'
+						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'stat'
 						
 						'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
@@ -174,7 +177,7 @@ if $ARGS[0] = 'just_mira':
 						
 						act 'Keep watching':
 							*clr & cla
-							gs 'arousal', 'voyeur', 10, 'exhibitionism'
+							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
 							
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
@@ -183,7 +186,7 @@ if $ARGS[0] = 'just_mira':
 							
 							act 'Hide':
 								*clr & cla
-								gs 'arousal', 'voyeur', 10, 'exhibitionism'
+								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
 								
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'

+ 6 - 8
locations/gadriver.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 
 	if temp_gr = 1 and hour < 5 and month >= 5 and month <= 9 and npc_QW['A60'] >= 20: 'Right next to the path leading to the river, you see <a href="exec: gt ''gadriver'', ''mirapunish'' ">Mira</a> naked, bound with ropes between two trees...'
 
-	if temp_gr = 4 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
+	if temp_gr = 4 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
 			mitkaguysriver = daystart
 			'While going to the river you meet Kolyamba and Vasyan. They first invite you to join them, then insist you go with them.'
@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 		end
-	elseif temp_gr = 5 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
+	elseif temp_gr = 5 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
 			mitkaguysriver = daystart
 			'While walking towards the river you meet the village boys, whom you''ve been drinking with recently. They ask you to go with them.'
@@ -105,7 +105,7 @@ if $ARGS[0] = 'start':
 			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
 			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 		end
-	elseif temp_gr = 6 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5 and sub > 0:
+	elseif temp_gr = 6 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
 			mitkaguysriver = daystart
 			'On your way to the river you meet Vasyan, he insists you follow him home...'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'gadbitch':
 						gs 'stat'
 
 						act 'Finish':gt'gadriver', 'gadbitch'
-					elseif MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 1 and hour >= 8 and hour < 20 and sub > 0:
+					elseif MiraLoc ! 1 and npc_QW['A63'] >= 13 and temp_gr = 1 and hour >= 8 and hour < 20:
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex19.jpg"></center>'
 						'As soon as you get out of the river, you meet a grinning Kolyamba. He smiles wickedly and commands you to get down on your hands and knees so he can fuck you in the ass...'
@@ -483,7 +483,7 @@ if $ARGS[0] = 'gadbitch':
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex16.jpg"></center>'
 								'After a while, you hear voices rapidly approaching from the village, in a couple of minutes you see the village boys emerge from the bushes. Seeing Mira they smile obscenely, and without hesitation they quickly surround her as she lays on the sand. You sit up and watch as they fuck her in all her holes...'
 
-								gs 'arousal', 'voyeur', 30, 'gangbang', 'dom'
+								gs 'arousal', 'voyeur_sex', 30, 'gangbang', 'dom'
 								gs 'arousal', 'end'
 								gs 'stat'
 
@@ -998,9 +998,7 @@ if $ARGS[0] = 'GuysRiver':
 			end
 		end
 	end
-	if pcs_dom > 0:
-		act 'Leave':gt'gadriver', 'gadbitch'
-	end
+	act 'Leave':gt'gadriver', 'gadbitch'
 end
 
 if $ARGS[0] = 'fishers':

+ 12 - 1
locations/gadroad.qsrc

@@ -151,7 +151,18 @@ if $ARGS[0] = 'drinking_invite':
 	end
 	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
 	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
-		act 'No thanks, not tonight': gt 'gadroad'
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
+				gs 'willpower', 'drink', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				gt 'gadroad'
+			end
+		else
+			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 	end
 end
 

+ 187 - 141
locations/gadukino.qsrc

@@ -206,7 +206,6 @@ if $ARGS[0] = 'succubus_hunt':
 				stat['vaginal'] += 1
 				guy += 1
 				pcs_horny = 0
-				pcs_dom += scfeed
 				orgasm += 1 + scfeed
 				pcs_willpwr += 15 * (1 + scfeed)
 				succubxp += 6
@@ -325,106 +324,110 @@ if $ARGS[0] = 'mira_events':
 		if npc_QW['A60'] = 15 and temper >= 10 and sunWeather = 1 and miraprost = 0:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
 			'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
-
-			act 'You approach slowly':
-				*clr & cla
-				minut += 15
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/characters/village/mira/mira0,<<rand(0,5)>>.jpg"></center>'
-				'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you two wishes and you''re ready to collect your second wish. You tell Mira to sit down and she reluctantly agrees. When she is finally sitting, you order her to show you her pussy. Mira grumbles and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
-				
-				act 'Watch':
+			
+			gs 'willpower', 'prostitution', 'force'
+			if will_cost <= pcs_willpwr:
+				act 'Approach Mira (<<will_cost>> Willpower)':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
-					'You enjoy the view, then snap your fingers as an amazing idea comes to mind for your second wish. Mira says she thought her second wish was over, but you wouldn''t make it that easy. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile and tell her to follow you.'
+					minut += 15
+					gs 'willpower', 'prostitution', 'force'
+					gs 'willpower', 'pay', 'force'
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira0,<<rand(0,5)>>.jpg"></center>'
+					'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you two wishes and you''re ready to collect your second wish. You tell Mira to sit down and she reluctantly agrees. When she is finally sitting, you order her to show you her pussy. Mira grumbles and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
 					
-					act 'Lead her to the road':
+					act 'Watch':
 						*clr & cla
-						minut += 45
-						pcs_dom += 2
-						gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
-						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
+						'You enjoy the view, then snap your fingers as an amazing idea comes to mind for your second wish. Mira says she thought her second wish was over, but you wouldn''t make it that easy. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile and tell her to follow you.'
 						
-						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-						'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing no one else watching begins to pose by the roadside for passing cars...'
-						
-
-						act 'Wait for a car...':
+						act 'Lead her to the road':
 							*clr & cla
-							minut += 30
-							pcs_horny += 20
-							miraprost += 1
-							npc_QW['A60'] = 16
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-							'It isn''t long before Mira''s first customer pulls up in a nice vehicle. She takes a deep breath, looks you in the eyes, winks and approaches the vehicle and starts talking to the driver.'
-							'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+							minut += 45
+							gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
 							gs 'stat'
-
-							act 'Watch her with the customer':
-								if rand(0,1) = 0:
-									*clr & cla
-									'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
-									'You walk up and look into the car. You see Mira giving one hell of a blowjob to her first customer. Her head is bobbing up and down on his 17cm cock.'
-									gs 'arousal', 'voyeur', 5, 'exhibitionism'
-									gs 'stat'
-
-									act 'Hide':
+							
+							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
+							'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing no one else watching begins to pose by the roadside for passing cars...'
+							
+
+							act 'Wait for a car...':
+								*clr & cla
+								minut += 30
+								pcs_horny += 20
+								miraprost += 1
+								npc_QW['A60'] = 16
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
+								'It isn''t long before Mira''s first customer pulls up in a nice vehicle. She takes a deep breath, looks you in the eyes, winks and approaches the vehicle and starts talking to the driver.'
+								'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
+								gs 'stat'
+
+								act 'Watch her with the customer':
+									if rand(0,1) = 0:
 										*clr & cla
-										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
-										'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
-										gs 'arousal', 'voyeur', 10, 'exhibitionism'
+										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
+										'You walk up and look into the car. You see Mira giving one hell of a blowjob to her first customer. Her head is bobbing up and down on his 17cm cock.'
+										gs 'arousal', 'voyeur_sex', 5, 'exhibitionism'
 										gs 'stat'
 
-										act 'Keep watching':
+										act 'Hide':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
-											'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
-											'Mira walks back towards town counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
-											gs 'arousal', 'voyeur', 10, 'exhibitionism'
+											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
+											'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
+											gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 											gs 'stat'
 
-											act 'Walk back to the village together':
+											act 'Keep watching':
 												*clr & cla
-												minut += 10
-												miraloc = 0
-												gs 'arousal', 'end'
+												'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
+												'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
+												'Mira walks back towards town counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
+												gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 												gs 'stat'
 
-												gt 'gadukino'
+												act 'Walk back to the village together':
+													*clr & cla
+													minut += 10
+													miraloc = 0
+													gs 'arousal', 'end'
+													gs 'stat'
+
+													gt 'gadukino'
+												end
 											end
 										end
-									end
-								else
-									*clr & cla
-									'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
-									'You walk up and look into the van. You see Mira showing her first customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
-									gs 'arousal', 'voyeur', 20, 'exhibitionism'
-									gs 'stat'
-
-									act 'Keep watching':
+									else
 										*clr & cla
-										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-										'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
-										gs 'arousal', 'voyeur', 10, 'exhibitionism'
+										'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
+										'You walk up and look into the van. You see Mira showing her first customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
+										gs 'arousal', 'voyeur_sex', 20, 'exhibitionism'
 										gs 'stat'
 
-										act 'Hide':
+										act 'Keep watching':
 											*clr & cla
-											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
-											'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
-											'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and says thanks.'
-											gs 'arousal', 'voyeur', 10, 'exhibitionism'
+											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
+											'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
+											gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 											gs 'stat'
 
-											act 'Walk back to the village together':
+											act 'Hide':
 												*clr & cla
-												minut += 10
-												miraloc = 0 
-												gs 'arousal', 'end'
+												'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
+												'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
+												'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and says thanks.'
+												gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 												gs 'stat'
-												
-												gt 'gadukino'
+
+												act 'Walk back to the village together':
+													*clr & cla
+													minut += 10
+													miraloc = 0 
+													gs 'arousal', 'end'
+													gs 'stat'
+													
+													gt 'gadukino'
+												end
 											end
 										end
 									end
@@ -433,57 +436,82 @@ if $ARGS[0] = 'mira_events':
 						end
 					end
 				end
+			else
+				act 'Approach Mira (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+			
+			act 'Walk away': gt 'gadukino'
 		! mira slut events
 		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
 			miraday = daystart
+
 			if pcs_horny > 50 and rand(0,1) = 0:
 				gs 'Miroslava', 'miraclothes'
+				*nl
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
-				act 'You''re feeling naughty':
-					*clr & cla
-					if mirasextimes < 50:
-						temp = rand(0,3)
-						if temp = 0:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t even wearing any panties!'
-						elseif temp = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp1.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually sits down on the fence and slightly spreads her legs, showing you her bare pussy. She isn''t even wearing any panties!'
-						elseif temp = 2:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp2.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'	
-						elseif temp = 3:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually and gets on her hands and knees on the bench. She quickly glances around before pulling up her skirt and arching her back, showing you her naked pussy. She isn''t even wearing any panties!'
-						end
-						npc_rel['A60'] += 1
-						gs 'arousal', 'voyeur', 5, 'lesbian'
-						gs 'arousal', 'end'
-						gs 'stat'
+				
+				gs 'willpower', 'exhib', 'force'
+				if will_cost <= pcs_willpwr:
+					act 'You''re feeling naughty (<<will_cost>> Willpower)':
+						*clr & cla						
+						if mirasextimes < 50:
+							temp = rand(0,3)
+							if temp = 0:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually and rests her hands on the bench, giving you a view of her bare pussy. She isn''t even wearing any panties!'
+							elseif temp = 1:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp1.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually sits down on the fence and slightly spreads her legs, showing you her bare pussy. She isn''t even wearing any panties!'
+							elseif temp = 2:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp2.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'	
+							elseif temp = 3:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually and gets on her hands and knees on the bench. She quickly glances around before pulling up her skirt and arching her back, showing you her naked pussy. She isn''t even wearing any panties!'
+							end
+							npc_rel['A60'] += 1
+							gs 'willpower', 'exhib', 'force'
+							gs 'willpower', 'pay', 'force'
+							gs 'arousal', 'voyeur', 5, 'lesbian'
+							gs 'arousal', 'end'
+							gs 'stat'
 
-						act 'Finish your walk':	gt 'gadukino'
-					else
-						temp = rand(0,1)
-						if temp = 0:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp3.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and her gaping pussy is oozing cum. She must have just been fucked.'
-							'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
-						elseif temp = 1:
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp4.jpg"></center>'
-							'You ask Mira to show you her pussy. She smiles casually and squats down... You immediately notice how much her cunt and asshole gape. She must have just been fucked in both holes.'
-							'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
-						end
-						npc_rel['A60'] += 1
-						gs 'arousal', 'voyeur', 10, 'lesbian'
-						gs 'arousal', 'end'
-						gs 'stat'
+							act 'Finish your walk':	gt 'gadukino'
+						else
+							temp = rand(0,1)
+							if temp = 0:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp3.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually and sits down on a nearby fence. Mira glances around and spreads her legs... You are surprised to see, she isn''t wearing panties and her gaping pussy is oozing cum. She must have just been fucked.'
+								'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
+							elseif temp = 1:
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp4.jpg"></center>'
+								*nl
+								'You ask Mira to show you her pussy. She smiles casually and squats down... You immediately notice how much her cunt and asshole gape. She must have just been fucked in both holes.'
+								'"Who did that to you?" you ask her. Mira just smiles devilishly and tells you that it''s a secret.'
+							end
+							npc_rel['A60'] += 1
+							gs 'willpower', 'exhib', 'force'
+							gs 'willpower', 'pay', 'force'
+							gs 'arousal', 'voyeur', 10, 'lesbian'
+							gs 'arousal', 'end'
+							gs 'stat'
 
-						act 'Finish your walk':	gt 'gadukino'
+							act 'Finish your walk':	gt 'gadukino'
+						end
 					end
+				else
+					act 'You''re feeling naughty (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				
+				act 'Walk away': gt 'gadukino'
 			else
 				*clr & cla
+				
 				temp = rand(0,7)
 				if temp = 0:
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
@@ -510,7 +538,7 @@ if $ARGS[0] = 'mira_events':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
 					'Walking through the village, you meet Mira. You notice she is not wearing panties and the white thread of a tampon is sticking out of her pussy...'
 				end		
-				gs 'arousal', 'voyeur', 5, 'exhibitionism'
+				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 
@@ -524,45 +552,63 @@ if $ARGS[0] = 'mira_events':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad2.jpg"></center>'
 				'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinds his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just squeals and laughs.'
-				gs 'arousal', 'voyeur', 10, 'exhibitionism'
+				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
-				act 'Watch':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
-					if rand(0,1) = 0:
-						'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
-					else	
-						'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks. Mitka begins to shudder from his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
+				gs 'willpower', 'voyeur', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Continue watching (<<will_cost>> Willpower)':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
+						if rand(0,1) = 0:
+							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
+						else	
+							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks. Mitka begins to shudder from his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
+						end
+						gs 'willpower', 'voyeur', 'self'
+						gs 'willpower', 'pay', 'self'
+						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+						gs 'arousal', 'end'
+						gs 'stat'
+						
+						act 'Finish your walk': gt 'gadukino'
 					end
-					gs 'arousal', 'voyeur', 10, 'exhibitionism'
-					gs 'arousal', 'end'
-					gs 'stat'
-					
-					act 'Finish your walk': gt 'gadukino'
+				else
+					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				
+				act 'Walk away': gt 'gadukino'
 			! mira first wish not done
 			elseif npc_QW['A60'] >= 4:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad.jpg"></center>'
 				'Walking through the village, you happen to notice Mira, sucking Mitka''s cock in the backyard. She wraps her lips around it, almost completely taking the dick into her mouth. Sometimes she glances to the side...'
-				gs 'arousal', 'voyeur', 10, 'exhibitionism'
+				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
-				act 'Watch':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad1.jpg"></center>'
-					if rand(0,1) = 0:
-						'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in her hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallows it all, and licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
-					else
-						'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in her hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallows it all, and licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
+				gs 'willpower', 'voyeur', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Continue watching (<<will_cost>> Willpower)':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad1.jpg"></center>'
+						if rand(0,1) = 0:
+							'A couple of times you think, she''s about to notice you watching, but she never does, continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in her hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallows it all, and licks Mitka''s cock clean before tucking it back into his pants. You see she is about to rise from her knees, so you hastily depart.'
+						else
+							'Until she finally spots you watching her. You see she blushes crimson, but she does not stop sucking, only occasionally shifts her eyes in your direction. You continue to watch as if not seeing anything unusual, as Mira''s head bobs up and down continuing to suck Mitka''s cock. Finally, he tilts his head back and Mira, quickly seeing this takes his dick in her hand and directs it into in her mouth, taking a mouth full of sperm. She greedily swallows it all, and licks Mitka''s cock clean before tucking it back into his pants. You smile at Mira with the most peaceful of expressions and walk away...'
+						end
+						gs 'willpower', 'voyeur', 'self'
+						gs 'willpower', 'pay', 'self'
+						gs 'arousal', 'voyeur_sex', 5, 'exhibitionism'
+						gs 'arousal', 'end'
+						gs 'stat'
+						
+						act 'Finish your walk': gt 'gadukino'
 					end
-					gs 'arousal', 'voyeur', 5, 'exhibitionism'
-					gs 'arousal', 'end'
-					gs 'stat'
-					
-					act 'Finish your walk': gt 'gadukino'
+				else
+					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				
+				act 'Walk away': gt 'gadukino'
 			end
 		! quest not far along enough yet so just talking to mira or already watched mira have sex today
 		else

+ 194 - 18
locations/gadukino_event.qsrc

@@ -127,7 +127,6 @@ if $ARGS[0] = 'gang_apologise':
 			act 'Take the money':
 				*clr & cla
 				minut += 5
-				pcs_dom -= 5
 				gadriver_gang = 2
 				money += 10000
 				gs 'stat'
@@ -141,21 +140,27 @@ if $ARGS[0] = 'gang_apologise':
 				'"I understand..." you answer, turning away and walking away from him.'
 				act 'Walk back to the village':gt 'gadukino'
 			end
-			act 'Refuse':
-				*clr & cla
-				minut += 5
-				pcs_dom += 5
-				gadriver_gang = 3
-				gs 'stat'
+			gs 'willpower', 'prostitution', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					minut += 5
+					gadriver_gang = 3
+					gs 'willpower', 'prostitution', 'resist', 'hard'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
-				'"I don''t need your fucking money, I''m not a prostitute or a whore" you said in a firm voice, clearly annoyed, looking straight into Uncle Stepan eyes. "You think you can buy my silence with some money, are you really that dumb?"'
-				'He starts acting anxiously telling you once more to take the money. "I''ve already said it, I don''t want your money! But you don''t need to worry I won''t tell anyone what happened." you sternly tell him.'
-				'"That''s a relief..." Stepan says. "I''ll be on my way."'
-				'Just as you were leaving, Uncle Stepan added:'
-				'"One last thing <<$pcs_nickname>>. None of the men will try to fuck you anymore. Mitka warned everyone that if it happens again their cannon would be shooting blanks for the rest of their life... If anyone approaches you, you come to me and I''ll sort it out."'
-				'"I understand..." you answer, turning away and walking away from him.'
-				act 'Walk back to the village':gt 'gadukino'
+					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
+					'"I don''t need your fucking money, I''m not a prostitute or a whore" you said in a firm voice, clearly annoyed, looking straight into Uncle Stepan eyes. "You think you can buy my silence with some money, are you really that dumb?"'
+					'He starts acting anxiously telling you once more to take the money. "I''ve already said it, I don''t want your money! But you don''t need to worry I won''t tell anyone what happened." you sternly tell him.'
+					'"That''s a relief..." Stepan says. "I''ll be on my way."'
+					'Just as you were leaving, Uncle Stepan added:'
+					'"One last thing <<$pcs_nickname>>. None of the men will try to fuck you anymore. Mitka warned everyone that if it happens again their cannon would be shooting blanks for the rest of their life... If anyone approaches you, you come to me and I''ll sort it out."'
+					'"I understand..." you answer, turning away and walking away from him.'
+					act 'Walk back to the village':gt 'gadukino'
+				end
+			else
+				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	end
@@ -177,7 +182,6 @@ if $ARGS[0] = 'gadriver_gang':
 	gadriver_gang = 1
 	gadboyday = daystart
 	npc_QW['A63'] = 21
-	pcs_dom -= 10
 	if pcs_health <= 100:pcs_health += 100
 	gs 'stat'
 
@@ -676,6 +680,23 @@ if $ARGS[0] = 'gadukino_mitka':
 	'"Hey, <<$pcs_nickname>>, let''s go have some fun getting rid of this boner you just gave me."'
 
 	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A63'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'gadukino_kolyamba':
@@ -689,6 +710,23 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	'Walking through the village you met Kolyamba. Seeing you, he reached into his pants and started playing with his balls. He then grabbed you by the arm and dragged into the bushes next to the road.'
 
 	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A61'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'gadukino_vasyan':
@@ -702,6 +740,23 @@ if $ARGS[0] = 'gadukino_vasyan':
 	'Walking through the village you met Vasyan. Seeing you, he smiled and waved you over to him. He kisses you on the lips and asks you to join him as he walked into the bushes next to the road.'
 
 	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A62'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'gadukino_2boys':
@@ -728,6 +783,32 @@ if $ARGS[0] = 'gadukino_2boys':
 		'Walking through the village you met Kolyamba and Vasyan. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	end
 	act 'Go with them': gt 'mitkasex', 'gad2'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			if $ARGS[1] = 1:
+				npc_rel['A63'] -= 3
+				npc_rel['A61'] -= 3
+			elseif $ARGS[1] = 1:
+				npc_rel['A63'] -= 3
+				npc_rel['A62'] -= 3
+			elseif $ARGS[1] = 1:
+				npc_rel['A61'] -= 3
+				npc_rel['A62'] -= 3
+			end
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You tell them to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'mira_mitka':
@@ -742,6 +823,23 @@ if $ARGS[0] = 'mira_mitka':
 	'"Oh hey girls, let''s go have some fun getting rid of this boner you both just gave me."'
 
 	act 'Go with him': gt 'mitkasex', 'forest1', 'A63'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A63'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'mira_kolyamba':
@@ -752,9 +850,26 @@ if $ARGS[0] = 'mira_kolyamba':
 
 	'<center><b><font color = maroon>Kolyamba Pyut</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
-	'Walking with Mira in the village you met Kolyamba. Seeing you and Mira, he starts playing with his balls, and drags you both into the bushes next to the road.'
+	'Walking with Mira in the village you met Kolyamba. Seeing you and Mira, he starts playing with his balls, and tries to grab you both by the hand.'
 
 	act 'Go with him': gt 'mitkasex', 'forest1', 'A61'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A61'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'mira_vasyan':
@@ -765,9 +880,25 @@ if $ARGS[0] = 'mira_vasyan':
 
 	'<center><b><font color = maroon>Vasyan Paket</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
-	'Walking with Mira in the village you met Vasyan. Seeing you and Mira, he smiles and drags you both into the bushes next to the road.'
+	'Walking with Mira in the village you met Vasyan. Seeing you and Mira, he smiles and tries to grab you both by the hand.'
 
 	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A62'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'mira_2boys':
@@ -794,6 +925,32 @@ if $ARGS[0] = 'mira_2boys':
 		'Walking with Mira in the village you met Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 	end
 	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			if $ARGS[1] = 1:
+				npc_rel['A63'] -= 3
+				npc_rel['A61'] -= 3
+			elseif $ARGS[1] = 1:
+				npc_rel['A63'] -= 3
+				npc_rel['A62'] -= 3
+			elseif $ARGS[1] = 1:
+				npc_rel['A61'] -= 3
+				npc_rel['A62'] -= 3
+			end
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'mira_3boys':
@@ -813,6 +970,25 @@ if $ARGS[0] = 'mira_3boys':
 	'Walking with Mira in the village you met Mitka, Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 
 	act 'Go with them': gt 'mitkasex', 'forest3'
+	gs 'willpower', 'sex', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			cla
+			npc_rel['A63'] -= 3
+			npc_rel['A62'] -= 3
+			npc_rel['A61'] -= 3
+			gs 'willpower', 'sex', 'resist', 'hard'
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+			
+			*nl
+			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
+			
+			act 'Walk away': gt 'gadukino'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end
 
 if $ARGS[0] = 'go_home':

+ 392 - 317
locations/garfather.qsrc

@@ -19,12 +19,12 @@ dynamic $fatherRep
 
 act 'Leave': gt 'gargazel'
 
-if hour >= 21:exit
+if hour >= 21: exit
 
 act 'Chat':
 	cls
 	menu_off = 1
-	minut+=rand(10,15)
+	minut += rand(10,15)
 	gs 'stat'
 	'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
@@ -32,51 +32,61 @@ act 'Chat':
 
 	dynamic $fatherRep
 
-	if npc_rel['A28']<20:
+	if npc_rel['A28'] < 20:
 		!He hates you
 		'You try to have a conversation with your stepfather, but he dislikes you too much to even pretend to be interested in what you have to say.'
-		if sorryday!daystart:
-			act 'Apologize':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Apologize (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Apologize (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
-	elseif npc_rel['A28']>=20 and npc_rel['A28']<40:
+		act 'Move away':gt $loc, $metka
+	elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
 		!He doesn''t like you very much
 		'You try to have a conversation with your stepfather, but he''s not really interested and barely has anything to contribute while you do all the talking.'
-		if sorryday!daystart:
-			act 'Try to get on his good side':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to get on his good side (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Try to get on his good side (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
-	elseif npc_rel['A28'] >=40:
+		act 'Move away':gt $loc, $metka
+	elseif npc_rel['A28'] >= 40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			!good relations but he is not attracted to you
 			gs 'dinfather', 'garchat'
 		else
 			!good relations and he finds you attractive
-			talkrand=rand(1,100)
-			if talkrand >=20:
+			talkrand = rand(1,100)
+			if talkrand >= 20:
 				gs 'dinfather', 'garchat'
 			elseif talkrand < 20:
 				'You relax and share funny stories with your stepfather.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
-				if FatherMolest=1:
+				if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60: FatherMolest = rand(1,8)
+				if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80: FatherMolest = rand(1,4)
+				if npc_rel['A28'] >= 80: FatherMolest = rand(1,2)
+				if FatherMolest = 1:
 					gs 'dinfather', 'gar_act1'
 					gs 'dinfather', 'gar_act2'
 					gs 'dinfather', 'gar_act3'
@@ -104,123 +114,154 @@ act 'Help':
 	if npc_rel['A28'] < 20:
 		!scandal stepfather
 		'You offer to help your stepfather out in the garage. He waves you away and grumpily says "Get out of the way <<$pcs_nickname>>, can''t you see I''m busy? Besides, why would I want to be around you?"'
-		if sorryday!daystart:
-			act 'Apologize':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Apologize (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You profusely apologize to your stepfather, and after a while you can tell his attitude towards you is slightly milder.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Apologize (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
+		act 'Move away':gt $loc, $metka
 	elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
 		!strained relations
 		'You ask your stepfather if there''s anything you can do to help him out in the garage, but he shrugs and shakes his head. "And what would you even do? Maybe you should go help your mother in the kitchen, that seems to suit your skill set better."'
-		if sorryday!daystart:
-			act 'Try to get on his good side':
-				cla
-				sorryday=daystart
-				npc_rel['A28']+=(pcs_intel/10)+(pcs_apprnc/20)
-				gs 'stat'
-				'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
-				act 'Move away':gt $loc, $metka
+		if sorryday ! daystart:
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to get on his good side (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					sorryday = daystart
+					npc_rel['A28'] += (pcs_intel/10) + (pcs_apprnc/20)
+					gs 'stat'
+					'You spend some time trying to get on your stepfather''s good side, and you feel like he likes you a bit more after you show interest in the things he enjoys.'
+					act 'Move away':gt $loc, $metka
+				end
+			else
+				act 'Try to get on his good side (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Move away':gt $loc, $metka
 		end
+		act 'Move away':gt $loc, $metka
 	elseif npc_rel['A28'] >= 40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			!gg good relations but he is not attracted to you
 			gs 'dinfather', 'garhelpchat'
 		else
 			!good relations and Messrs attractive
-			talkrand=rand(1,100)
-			if talkrand>=20:
+			talkrand = rand(1,100)
+			if talkrand >= 20:
 				gs 'dinfather', 'garhelpchat'
 			else
 				'You help your stepfather while he works on the Gazelle, handing him the bolts and tools he needs.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
-				if FatherMolest=1:
-					if pcs_horny >= 50 or TouchedByFather=1:
-						act '''Accidentally'' drop the wrench':
-							cla
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
-
-							'Feeling horny, you decide to tease your stepfather while you help him in the garage. You let the wrench slip out of your hand, the loud clattering of metal on the stone floor ringing throughout the garage. "Oops! I can be so clumsy sometimes..." you say with a smile, bending over to pick up the wrench without bending your knees. In this pose, you give your stepfather a great view of your ass.'
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust >=2:
+				if npc_rel['A28'] >= 40 and npc_rel['A28']<60: FatherMolest = rand(1,8)
+				if npc_rel['A28'] >= 60 and npc_rel['A28']<80: FatherMolest = rand(1,4)
+				if npc_rel['A28'] >= 80: FatherMolest = rand(1,2)
+				if FatherMolest = 1:
+					if pcs_horny >= 60 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self'
+						if will_cost <= pcs_willpwr:
+							act 'Spread your legs (<<will_cost>> Willpower)':
 								cls
-								pcs_horny -= RAND(1,5)
+								gs 'willpower', 'exhib', 'self'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel uncomfortable.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>' & 'The sight of your ass makes your stepfather uncomfortable. "Clumsy you say? It seems like that wrench is not the only thing you let slip today", he snarks, referring to your lack of underwear. His snarky tone and disapproving look make you feel a bit awkward.'
-							else
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>'
-								'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								'While pretending not to notice, you slowly spread your legs as you talk.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60: fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. You look down and notice your skimpy underwear did a very poor job of hiding your pussy. Your stepfather is clearly embarrassed and surprised. He loudly clears his throat and says "<<$pcs_nickname>> don''t do that, that''s no way for a lady to behave. And go put some normal underwear on."'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim24.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. "What''s wrong?" you ask him innocently, knowing full well you''re not wearing underwear and that he has a great view of your bare pussy. You''re not fooling him though, and he doesn''t appreciate your teasing in the slightest. "<<$pcs_nickname>>, stop that at once and go put some pants on."'
+								end
+								if fatherLust = 1:
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim26.jpg"></center>' & 'Your stepfather gets a glimpse of your bare pussy and realizes what you''re up to. "<<$pcs_nickname>>... are you not wearing panties? Get down on the ground and spread your legs for me, Daddy has to know now." You do as he says, lie down on the ground and spread your legs wide. He kneels in front of you, pulls your clothes to the side and rubs your pussy and thighs with his rough calloused hands. "Just as I thought, you little minx!" he says with a grin on his face. After he had his fun he helps you get back up and even helps you straighten your clothes, his hands lingering on your hips and ass a few seconds longer than is needed.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act 'Spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
-					if pcs_horny >= 30 or TouchedByFather=1:
-						act 'Fondle your breasts as you talk':
-							cls
-							gs 'arousal', 'flashlite', 5
-							gs 'arousal', 'breasts', 5, 'incest', 'exhibitionism'
-							gs 'arousal', 'end'
-							minut -= 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
-							'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing your stepfather with an amazing view of your <<$titsize>> breasts.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+					if pcs_horny >= 50 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act '''Accidentally'' drop the wrench (<<will_cost>> Willpower)':
+								cla
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
-							elseif fatherLust=1:
-								'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
+
+								'Feeling horny, you decide to tease your stepfather while you help him in the garage. You let the wrench slip out of your hand, the loud clattering of metal on the stone floor ringing throughout the garage. "Oops! I can be so clumsy sometimes..." you say with a smile, bending over to pick up the wrench without bending your knees. In this pose, you give your stepfather a great view of your ass.'
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+								if fatherLust >=2:
+									cls
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel uncomfortable.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>' & 'The sight of your ass makes your stepfather uncomfortable. "Clumsy you say? It seems like that wrench is not the only thing you let slip today", he snarks, referring to your lack of underwear. His snarky tone and disapproving look make you feel a bit awkward.'
+								else
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim29.jpg"></center>'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim27.jpg"></center>'
+									'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act '''Accidentally'' drop the wrench (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
-					if pcs_horny >= 60 or TouchedByFather=1:
-						act 'Spread your legs':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'You, while pretending to not notice, slowly spread your legs as you talk.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+					if pcs_horny >= 30 or TouchedByFather = 1:
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Fondle your breasts as you talk (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flashlite', 5
+								gs 'arousal', 'foreplay', 5, 'incest', 'exhibitionism'
+								gs 'arousal', 'end'
+								minut -= 5
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. You look down and notice your skimpy underwear did a very poor job of hiding your pussy. Your stepfather is clearly embarrassed and surprised. He loudly clears his throat and says "<<$pcs_nickname>> don''t do that, that''s no way for a lady to behave. And go put some normal underwear on."'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim24.jpg"></center>' & 'You notice your stepfather''s eyes darting down while you talk, and suddenly his face turns beet red. "What''s wrong?" you ask him innocently, knowing full well you''re not wearing underwear and that he has a great view of your bare pussy. You''re not fooling him though, and he doesn''t appreciate your teasing in the slightest. "<<$pcs_nickname>>, stop that at once and go put some pants on."'
-							end
-							if fatherLust=1:
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim26.jpg"></center>' & 'Your stepfather gets a glimpse of your bare pussy and realizes what you''re up to. "<<$pcs_nickname>>... are you not wearing panties? Get down on the ground and spread your legs for me, Daddy has to know now." You do as he says, lie down on the ground and spread your legs wide. He kneels in front of you, pulls your clothes to the side and rubs your pussy and thighs with his rough calloused hands. "Just as I thought, you little minx!" he says with a grin on his face. After he had his fun he helps you get back up and even helps you straighten your clothes, his hands lingering on your hips and ass a few seconds longer than is needed.'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
+								'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing your stepfather with an amazing view of your <<$titsize>> breasts.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
+								if fatherLust>=2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
+								elseif fatherLust=1:
+									'Even though he did not expect this from you, you can tell by the spark in his eyes and his heavier breathing that he definitely likes what he sees.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act 'Fondle your breasts as you talk (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					else
 						gs 'dinfather', 'garhelpchat'
@@ -233,126 +274,124 @@ act 'Help':
 	end
 end
 
-if pcs_horny > 50 and npc_sex['A28']!0:
-
-	act 'Seduce your stepfather':
-		gs 'boyStat', 'A28'
-		cla
-		*clr
-		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
-		'You walk up to the Gazelle and pick up a sponge. Bending slightly forwards, you begin washing the car and simultaneously putting your ass on display for your stepfather.'
-		'"- Oh..." - Stepfather did not expect this from you, but his involuntary exhalation and kindled eyes tell you he is enjoying it very much.'
-		'Your stepfather walks up behind you and puts his hands on your ass. He leisurely begins to knead your butt.'
-
-		gs 'arousal', 'foreplay', 3, 'sub', 'incest'
-		gs 'stat'
-
-		act 'Get down on your knees':
-			cla
-			*clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees<<rand(1,3)>>.jpg"></center>'
-			'You fall on your knees in front of your stepfather and place the palm of your hand on his crotch. You can feel his erection through the fabric of his jeans, and begin to caress him. After a while you unzip his pants and pull out his cock, taking a firm grasp on it with one hand.'
-
-			gs 'arousal', 'hj', 3, 'sub', 'incest'
+if pcs_horny > 50 and npc_sex['A28'] ! 0:
+
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Seduce your stepfather (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			gs 'boyStat', 'A28'
+			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.pre<<rand(0,5)>>.jpg"></center>'
+			'You walk up to the Gazelle and pick up a sponge. Bending slightly forwards, you begin washing the car and simultaneously putting your ass on display for your stepfather.'
+			'"- Oh..." - Stepfather did not expect this from you, but his involuntary exhalation and kindled eyes tell you he is enjoying it very much.'
+			'Your stepfather walks up behind you and puts his hands on your ass. He leisurely begins to knead your butt.'
+
+			gs 'arousal', 'foreplay', 3, 'sub', 'incest'
 			gs 'stat'
 
-			act 'Take his dick in your mouth':
-				cla
-				*clr
+			act 'Get down on your knees':
+				*clr & cla
 				gs 'stat'
-				if pcs_throat < dick:pcs_throat += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.0,<<rand(0,4)>>.jpg"></center>'
-				'Your stepfather opens the passenger side door of the Gazelle, and you sit down on the seat. He places a hand on your head and guides his dick towards your mouth.'
-				'You leisurely lick your stepfather''s dick, caress his balls, and then take his cock in your mouth. Soon the cock began to throb, giving signs of an early end.'
+				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees<<rand(1,3)>>.jpg"></center>'
+				'You fall on your knees in front of your stepfather and place the palm of your hand on his crotch. You can feel his erection through the fabric of his jeans, and begin to caress him. After a while you unzip his pants and pull out his cock, taking a firm grasp on it with one hand.'
 
-				gs 'arousal', 'bj', 5, 'sub', 'incest'
+				gs 'arousal', 'hj', 3, 'sub', 'incest'
 				gs 'stat'
 
-				act 'Suck him off and swallow his sperm':
-					cls
-					if npc_rel['A28']<100:npc_rel['A28']+=2
-					fatherSuck+=1
-					sexpartkno = 1
-					spafinloc = 12
-					gs 'cum_manage'
-					swallow += 1
-					pcs_hydra += 5
+				act 'Take his dick in your mouth':
+					*clr & cla
 					gs 'stat'
-					'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,10)>>.mp4"></video></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.0,<<rand(0,4)>>.jpg"></center>'
+					'Your stepfather opens the passenger side door of the Gazelle, and you sit down on the seat. He places a hand on your head and guides his dick towards your mouth.'
+					'You leisurely lick your stepfather''s dick, caress his balls, and then take his cock in your mouth. Soon the cock began to throb, giving signs of an early end.'
 
-					'You continue to suck your stepfather''s dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon your <<$boydesc>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$liptalk3>> are wet with cum.'
-
-					gs 'arousal', 'bj', 10, 'sub', 'incest'
-					gs 'arousal', 'end'
+					gs 'arousal', 'bj', 5, 'sub', 'incest'
 					gs 'stat'
 
-					act 'Move away':gt 'gargazel'
-				end
-
-				act 'Take his load on your face':
-					cls
-					if npc_rel['A28']<100:npc_rel['A28']+=2
-					fatherSuck+=1
-					sexpartkno = 1
-					spafinloc = 11
-					gs 'cum_manage'
-					facial += 1
-					gs 'stat'
-					gar_rand1 = rand(0,100)
-					if gar_rand1 < 49:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
-					if gar_rand1 => 50:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
-					'You stop sucking on your stepfather''s cock just as he reaches orgasm, and a jet of sperm immediately hits you in the face. You squeeze your eyes shut for fear of getting cum in your eyes and feel another jet of hot sperm land on your face.'
-
-					gs 'arousal', 'bj', 10, 'sub', 'incest'
-					gs 'arousal', 'end'
-					gs 'stat'
+					act 'Suck him off and swallow his sperm':
+						cls
+						if npc_rel['A28'] < 100: npc_rel['A28'] += 2
+						fatherSuck += 1
+						sexpartkno = 1
+						spafinloc = 12
+						gs 'cum_manage'
+						swallow += 1
+						pcs_hydra += 5
+						gs 'stat'
+						'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,<<rand(0,10)>>.mp4"></video></center>'
 
-					act 'Move away':gt 'gargazel'
-				end
-			end
+						'You continue to suck your stepfather''s dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon your <<$boydesc>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$liptalk3>> are wet with cum.'
 
-			act 'Bend over, leaning against the Gazelle':
-				cla
-				*clr
-				if pcs_vag < dick:pcs_vag += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.1,<<rand(0,2)>>.jpg"></center>'
-				'Your stepfather grabs you and pulls you up from your knees, turning you to face the Gazelle. You plant your hands on the car, and arch your back to give him easier access to your ass and pussy. Once you''re in position, he begins caressing your pussy and then slams his dick in.'
+						gs 'arousal', 'bj', 10, 'sub', 'incest'
+						gs 'arousal', 'end'
+						gs 'stat'
 
-				gs 'arousal', 'vaginal', 10, 'sub', 'incest'
-				gs 'stat'
+						act 'Move away':gt 'gargazel'
+					end
 
-				gs 'dinSex', 'wear_condom'
-				gs 'dinsex','vaginal_sex',10
-				act 'Continue':
-					cla
-					*clr
-					gs 'stat'
-					sexpartkno = 1
-					if npc_rel['A28'] < 100:npc_rel['A28'] += 3
-					if fathersex = 0:guy += 1
-					FatherSex += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.cum1,0.jpg"></center>'
-					if protect = 0:
-						'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling your pussy with his sperm.'
-						gs 'arousal', 'vaginal', 10, 'sub', 'incest'
-						gs 'cum_manage'
-						pcs_mood -= 15
-						pcs_willpwr -= 15
-						gs 'cuminsidereact', 'your stepfather'
-					else
-						'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling the condom with his sperm.'
-						gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+					act 'Take his load on your face':
+						cls
+						if npc_rel['A28'] < 100: npc_rel['A28'] += 2
+						fatherSuck += 1
+						sexpartkno = 1
+						spafinloc = 11
 						gs 'cum_manage'
+						facial += 1
+						gs 'stat'
+						gar_rand1 = rand(0,100)
+						if gar_rand1 < 49:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
+						if gar_rand1 => 50:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial0,<<rand(0,8)>>.jpg"></center>'
+						'You stop sucking on your stepfather''s cock just as he reaches orgasm, and a jet of sperm immediately hits you in the face. You squeeze your eyes shut for fear of getting cum in your eyes and feel another jet of hot sperm land on your face.'
+
+						gs 'arousal', 'bj', 10, 'sub', 'incest'
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Move away':gt 'gargazel'
 					end
-					gs 'arousal', 'end'
+				end
+
+				act 'Bend over, leaning against the Gazelle':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.1,<<rand(0,2)>>.jpg"></center>'
+					'Your stepfather grabs you and pulls you up from your knees, turning you to face the Gazelle. You plant your hands on the car, and arch your back to give him easier access to your ass and pussy. Once you''re in position, he begins caressing your pussy and then slams his dick in.'
+
+					gs 'arousal', 'vaginal', 10, 'sub', 'incest'
 					gs 'stat'
 
-					act 'Move away':gt 'gargazel'
+					gs 'dinSex', 'wear_condom'
+					gs 'dinsex','vaginal_sex',10
+					act 'Continue':
+						cla
+						*clr
+						gs 'stat'
+						sexpartkno = 1
+						if npc_rel['A28'] < 100:npc_rel['A28'] += 3
+						if fathersex = 0:guy += 1
+						FatherSex += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/garage/father/sex/father.gar.cum1,0.jpg"></center>'
+						if protect = 0:
+							'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling your pussy with his sperm.'
+							gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+							gs 'cum_manage'
+							gs 'cuminsidereact', 'your stepfather'
+						else
+							'After a thorough fucking, you feel your stepfather''s cock begin to throb within you. Your stepfather''s body spasms, his cock filling the condom with his sperm.'
+							gs 'arousal', 'vaginal', 10, 'sub', 'incest'
+							gs 'cum_manage'
+						end
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Move away':gt 'gargazel'
+					end
 				end
 			end
 		end
+	else
+		act 'Seduce your stepfather (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -372,141 +411,177 @@ if fatherdrunk=1:
 		!scandal stepfather
 		'You approach your stepfather and uncle Misha and try to ask if you can join them, but your stepfather cuts you off before you can even finish your sentence. "<<$pcs_nickname>>, get out of here! This is a no bitch zone!" he shouts, laughing drunkenly as he waves you off. Uncle Misha finds your stepfather''s degrading talk hilarious, and joins in. You''re clearly not welcome in the garage.'
 		if sorryday!daystart:
-			act 'Persist and ask if you can join them':
-				cla
-				menu_off = 1
-				gs 'stat'
-				'You try to get your stepfather to let you join them but he''s equally persistent in telling you to get lost, being quite rude about it too. He really doesn''t like you at all.'
-				act 'Move away':gt 'gargazel'
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Persist and ask if you can join them (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					gs 'stat'
+					'You try to get your stepfather to let you join them but he''s equally persistent in telling you to get lost, being quite rude about it too. He really doesn''t like you at all.'
+					act 'Move away':gt 'gargazel'
+				end
+			else
+				act 'Persist and ask if you can join them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
+		act 'Move away':gt 'gargazel'
 	elseif npc_rel['A28']>=20 and npc_rel['A28']<40:
 		!strained relations
 		'You ask your stepfather if you can join them, but he''ll have none of it. "<<$pcs_nickname>>, isn''t it past your bedtime? *Hic!* Shoo, go home! *Hic!*"'
 		if sorryday!daystart:
-			act 'Try to persuade him':
-				cla
-				menu_off = 1
-				gs 'stat'
-				'You do your best, but your stepfather remains adamant and sends you home.'
-				act 'Move away':gt 'gargazel'
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Try to persuade him (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'self'
+					cla
+					menu_off = 1
+					gs 'stat'
+					'You do your best, but your stepfather remains adamant and sends you home.'
+					act 'Move away':gt 'gargazel'
+				end
+			else
+				act 'Try to persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
+		act 'Move away':gt 'gargazel'
 	elseif npc_rel['A28'] >=40:
 		if pcs_apprnc + (npc_rel['A28']/10) <= 60:
 			gs 'dinfather', 'gardrunkchat'
 		else
 			!good relations and Messrs attractive
-			talkrand=rand(0,100)
-			if talkrand>=20:gs 'dinfather', 'gardrunkchat'
-			if talkrand<20:
+			talkrand = rand(0,100)
+			if talkrand >= 20: gs 'dinfather', 'gardrunkchat'
+			if talkrand < 20:
 				'You relax and have some drinks with the guys, happy to just sit back and listen to the funny stories they exchange.'
-				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = RAND (1,8)
-				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = RAND (1,4)
-				if npc_rel['A28']>=80:FatherMolest = RAND (1,2)
+				if npc_rel['A28']>=40 and npc_rel['A28']<60:FatherMolest = rand(1,8)
+				if npc_rel['A28']>=60 and npc_rel['A28']<80:FatherMolest = rand(1,4)
+				if npc_rel['A28']>=80:FatherMolest = rand(1,2)
 				if FatherMolest=1:
 					'You can''t help but notice that your uncle Misha is staring at you the whole time. You feel like he''s not just undressing you in his mind, but that he''s fucking you in all sorts of positions with reckless abandon.'
 					 if pcs_horny >= 50 and sosedknow=1:
-						act 'Show him your breasts':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim33.jpg"></center>'
-							'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing uncle Misha with an amazing view of your <<$titsize>> breasts.'
-
-							if (pcs_apprnc + (npc_rel['A54']/10)) < 60:mishalust = 2
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 60 and (pcs_apprnc + (npc_rel['A54']/10)) < 120:mishalust = Rand (1,4)
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 120 and (pcs_apprnc + (npc_rel['A54']/10)) < 200:mishalust = Rand (1,2)
-							if (pcs_apprnc + (npc_rel['A54']/10)) >= 200:mishaLust = 1
-							if mishaLust>=2:
-								pcs_horny -= RAND(1,5)
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Show him your breasts (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								'Uncle Misha is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. You''re happy he at least had enough decency to not clue in your stepfather, who happened to have his back turned against you.'
-							else
-								'You try to be discrete so your stepfather doesn''t notice what you just did, and uncle Misha is quite flustered by the show you just gave him. He stumbles over his words while your stepfather talks to him about bumpers, as you smile mischievously and give uncle Misha a wink when your stepfather looks away.'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim33.jpg"></center>'
+								'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing uncle Misha with an amazing view of your <<$titsize>> breasts.'
+
+								if (pcs_apprnc + (npc_rel['A54']/10)) < 60: mishalust = 2
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 60 and (pcs_apprnc + (npc_rel['A54']/10)) < 120: mishalust = rand(1,4)
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 120 and (pcs_apprnc + (npc_rel['A54']/10)) < 200: mishalust = rand(1,2)
+								if (pcs_apprnc + (npc_rel['A54']/10)) >= 200: mishaLust = 1
+								if mishaLust>=2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									'Uncle Misha is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. You''re happy he at least had enough decency to not clue in your stepfather, who happened to have his back turned against you.'
+								else
+									'You try to be discrete so your stepfather doesn''t notice what you just did, and uncle Misha is quite flustered by the show you just gave him. He stumbles over his words while your stepfather talks to him about bumpers, as you smile mischievously and give uncle Misha a wink when your stepfather looks away.'
+								end
+								act 'Move away':gt $loc, $metka
 							end
-							act 'Move away':gt $loc, $metka
+						else
+							act 'Show him your breasts (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					 end
 					if pcs_horny >= 60 or TouchedByFather=1:
-						act 'Get their attention by dropping your bottle':
-							cls
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-							gs 'stat'
-							'Even though you''re horny and want the guys to notice you, they are paying more attention to their booze and their conversation. You can change that. Making sure it doesn''t break, you ''accidentally'' drop your bottle and bend over to pick it up without bending your knees, giving them a spectacular view of your ass. You make a show of trying to reduce the spillage, wiping the floor while staying in your current position.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Get their attention by dropping your bottle (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								gs 'arousal', 'flash', 5
+								gs 'arousal', 'end'
 								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
-							else
-								if $pantyworntype ! 'none':
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim37.jpg"></center>'
-									'You stick your ass out as much as you can, showing off your ass as much as you can. As you turn around, you notice that both your stepfather and uncle''s gazes are glued to your ass. You simply smile and return to the table as they blubber and try to find excuses.'
-									act 'Tease them some more':
-										cls
-										gs 'arousal', 'flash', 5
-										gs 'arousal', 'end'
-										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim38.jpg"></center>'
-										'You sit back down, still having their full attention. You try to excuse your behavior: "I''m sorry guys, my clothes rub my pussy raw, bending over normally makes me feel very uncomfortable."'
-										act 'Show them your pussy when they ask':
+								'Even though you''re horny and want the guys to notice you, they are paying more attention to their booze and their conversation. You can change that. Making sure it doesn''t break, you ''accidentally'' drop your bottle and bend over to pick it up without bending your knees, giving them a spectacular view of your ass. You make a show of trying to reduce the spillage, wiping the floor while staying in your current position.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim35.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Uncle Misha just has a smug grin on his face.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'&'Your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable. Neither of them seem to have noticed you''re not wearing panties.'
+								else
+									if $pantyworntype ! 'none':
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim37.jpg"></center>'
+										'You stick your ass out as much as you can, showing off your ass as much as you can. As you turn around, you notice that both your stepfather and uncle''s gazes are glued to your ass. You simply smile and return to the table as they blubber and try to find excuses.'
+										act 'Tease them some more':
 											cls
 											gs 'arousal', 'flash', 5
 											gs 'arousal', 'end'
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim39.jpg"></center>'
-											'Uncle Misha is onto your act, and decides to push you to your limits. He smiles and says: "Oh really, <<$pcs_nickname>>? Why don''t you show us, maybe we can help you. Isn''t that right, Vladimir?" Too turned on to decline, you pull your panties to the side and show them your pussy. It''s really not all that sore, but your arousal has coloured it nice and red and it makes your pussy lips look a bit more puffy. The guys didn''t think you would actually follow through with this, and are flabbergasted when you do.'
-											act 'Move away':gt $loc, $metka
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim38.jpg"></center>'
+											'You sit back down, still having their full attention. You try to excuse your behavior: "I''m sorry guys, my clothes rub my pussy raw, bending over normally makes me feel very uncomfortable."'
+											act 'Show them your pussy when they ask':
+												cls
+												gs 'arousal', 'flash', 5
+												gs 'arousal', 'end'
+												gs 'stat'
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim39.jpg"></center>'
+												'Uncle Misha is onto your act, and decides to push you to your limits. He smiles and says: "Oh really, <<$pcs_nickname>>? Why don''t you show us, maybe we can help you. Isn''t that right, Vladimir?" Too turned on to decline, you pull your panties to the side and show them your pussy. It''s really not all that sore, but your arousal has coloured it nice and red and it makes your pussy lips look a bit more puffy. The guys didn''t think you would actually follow through with this, and are flabbergasted when you do.'
+												act 'Move away':gt $loc, $metka
+											end
 										end
+									elseif $pantyworntype = 'none':
+										cls
+										gs 'arousal', 'flash', 5
+										gs 'arousal', 'flash', 5
+										gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'rough'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim40.jpg"></center>'
+										'Slightly disappointed, you move away from the table. Lost in your own thoughts, you don''t notice your uncle Misha''s legs and trip over them. Since you''re not wearing any underwear, you''re giving your uncle one hell of a show as you fall down onto your hands and knees. He immediately reaches out and runs his fingers over your wet pussy lips. He fingers you briefly, then returning his fingers to his nose to take a deep whiff. "You have nice holes, <<$pcs_nickname>>, young and juicy..." Realizing he won''t do anything more with your stepfather right there in the room, you get up and fix your clothes before sitting back down at the table.'
+										gs 'arousal', 'end'
+										minut -= 10
+										gs 'stat'
 									end
-								elseif $pantyworntype = 'none':
-									cls
-									gs 'arousal', 'flash', 5
-									gs 'arousal', 'flash', 5
-									gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'rough'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim40.jpg"></center>'
-									'Slightly disappointed, you move away from the table. Lost in your own thoughts, you don''t notice your uncle Misha''s legs and trip over them. Since you''re not wearing any underwear, you''re giving your uncle one hell of a show as you fall down onto your hands and knees. He immediately reaches out and runs his fingers over your wet pussy lips. He fingers you briefly, then returning his fingers to his nose to take a deep whiff. "You have nice holes, <<$pcs_nickname>>, young and juicy..." Realizing he won''t do anything more with your stepfather right there in the room, you get up and fix your clothes before sitting back down at the table.'
-									gs 'arousal', 'end'
-									minut -= 10
-									gs 'stat'
 								end
+								act 'Continue':gt $loc, $metka
 							end
-							act 'Continue':gt $loc, $metka
+						else
+							act 'Get their attention by dropping your bottle (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					 end
 					if pcs_horny >= 75 or TouchedByFather=1:
-						act 'Spread your legs':
-							cls
-							minut+=5
-							pcs_horny += RAND(1,5)
-							'You, pretending to not notice, slowly spread your legs while you talk with the guys.'
-
-							if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-							if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
-							if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
-							if fatherLust>=2:
-								pcs_horny -= RAND(1,5)
-								gs 'stat'
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'Trying to direct Uncle Misha''s attention to something across the room, your stepfather signals you to cover yourself up with agitated hand movements.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim52.jpg"></center>' & 'Your stepfather notices what you''re trying to do. After he distracts uncle Misha for long enough, he turns to you and whispers: "<<$pcs_nickname>>, don''t... just don''t. You have no idea what you''re getting yourself into." Intimidated by the gravity of his voice, you do as he says and cover up.'
-							else
-								if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response. He pulls away his hand just in time, before uncle Misha notices what''s going on.'
-								if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Noticing your stepfather''s blush, you realize at least one person at the table noticed you''re not wearing any underwear. When your uncle Misha looks away, he quickly reaches for you and fingers your wet pussy. A needy moan escapes your lips as he pulls his hand way, and he quickly starts a conversation about wind shield wipers. Your uncle Misha has no idea what just went down.'
+						gs 'willpower', 'exhib', 'self', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Spread your legs (<<will_cost>> Willpower)':
+								cls
+								gs 'willpower', 'exhib', 'self', 'easy'
+								gs 'willpower', 'pay', 'self'
+								minut += 5
+								pcs_horny += rand(1,5)
+								'You, pretending to not notice, slowly spread your legs while you talk with the guys.'
+
+								if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
+								if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120: fatherLust = rand(1,4)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200: fatherLust = rand(1,2)
+								if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather = 1: fatherLust = 1
+								if fatherLust >= 2:
+									pcs_horny -= rand(1,5)
+									gs 'stat'
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim31.jpg"></center>' & 'Trying to direct Uncle Misha''s attention to something across the room, your stepfather signals you to cover yourself up with agitated hand movements.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim52.jpg"></center>' & 'Your stepfather notices what you''re trying to do. After he distracts uncle Misha for long enough, he turns to you and whispers: "<<$pcs_nickname>>, don''t... just don''t. You have no idea what you''re getting yourself into." Intimidated by the gravity of his voice, you do as he says and cover up.'
+								else
+									if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim20.jpg"></center>' & 'Your stepfather realizes what you''re up to and pulls you closer to him, desire burning in his eyes. He runs his hands over your ass cheeks and thighs, petting and kneading them, and then pushes your panties to the side. Two of his fingers are exploring your sphincter, rubbing and teasing you. "Is there something you want, <<$pcs_nickname>>?" he asks with a smug grin on his face, knowing he turned the tables on you. All you can do is whimper in response. He pulls away his hand just in time, before uncle Misha notices what''s going on.'
+									if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim25.jpg"></center>' & 'Noticing your stepfather''s blush, you realize at least one person at the table noticed you''re not wearing any underwear. When your uncle Misha looks away, he quickly reaches for you and fingers your wet pussy. A needy moan escapes your lips as he pulls his hand way, and he quickly starts a conversation about wind shield wipers. Your uncle Misha has no idea what just went down.'
+								end
+								act 'Continue':gt $loc, $metka
 							end
-							act 'Continue':gt $loc, $metka
+						else
+							act 'Spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					end
 				else
-				gs 'dinfather', 'gardrunkchat'
+					gs 'dinfather', 'gardrunkchat'
 				end
 			end
 		end

+ 5 - 5
locations/gargazel.qsrc

@@ -2,12 +2,12 @@
 
 CLOSE ALL
 $metka = $ARGS[0]
-$loc = $CURLOC
+$loc = $curloc
 $menu_loc = 'gargazel'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'secluded'
-fatherdrunk=0
+fatherdrunk = 0
 clr
 gs 'stat'
 '<center><h4>Garage</h4></center>'
@@ -26,9 +26,9 @@ if father_go = 1 and hour >= 16 and hour < 20:
 	'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
 end
 
-if father_go=1 and hour>=20 and hour<21:
+if father_go = 1 and hour >= 20 and hour < 21:
 	'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
-	set fatherdrunk=1
+	fatherdrunk = 1
 end
 
 if YouCanGar > 0:
@@ -37,7 +37,7 @@ if YouCanGar > 0:
 	if tovarL >= 30:
 		'You already have too much stored at home and do not have any more space.'
 	elseif tovarL < 30:
-		perenGarTov = 30-tovarL
+		perenGarTov = 30 - tovarL
 		'You can bring <<perenGarTov>> trinkets home and store them somewhere, until you have time to collect and sell them at the train station.'
 
 		if GarTorgItem > 0:

+ 1 - 1
locations/gdkin.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'Katja_dance':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance5.jpg"></center>'
 			inhib_exp += rand(1,2)
 			'During the dance you turn to face Katja, the two of you dance close together, faces near each other. You lean in and give her a passionate kiss, you can hear the cheering of the guys. You barely notice the guys, more of a faint background noise, as you lose yourself in the moment.'
-			gs 'arousal', 'kiss_give', 5, 'lesbian'
+			gs 'arousal', 'kiss', 5, 'lesbian'
 			gs 'stat'
 		elseif dancerand = 5:
 			'<center><b><font color="maroon">Disco</font></b></center>'

+ 5 - 5
locations/gdksex.qsrc

@@ -1682,7 +1682,7 @@ if $ARGS[0] = 'dance2':
 	'When Sonia opens her eyes again, she recoils a bit from the hard cock right in front of her face. She giggles, but stays on her knees in front of him without any intentions of getting up.'
 	'Vitek softly says in a reassuring voice: "You can touch it if you want. It feels much nicer than a popsicle!"'
 	
-	gs 'arousal', 'voyeur', 3
+	gs 'arousal', 'voyeur_sex', 3
 	gs 'stat'
 		
 	act 'Watch':
@@ -1692,7 +1692,7 @@ if $ARGS[0] = 'dance2':
 		'Sonia stares at the erection in front of her face for a while, spellbound. Then she slowly extends her hand and pokes the cock with her finger. It twitches and some precum leaks from the head, making Sonia giggle with glee. Fascinated by it all, she hesitantly closes her slender fingers around the head and jerks him off carefully.'
 		'Vitek groans, totally not expecting his plan to actually get this far. He quickly clears his mind and tells her: "Now have a taste... I bet you will love it!"'
 		
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 		
 		act 'Watch':
@@ -1702,7 +1702,7 @@ if $ARGS[0] = 'dance2':
 			'Sonia nods and leans in closer, and sticks out her tongue before carefully licking the head. You can tell the other guys around you are getting restless, watching Vitek about to get a blowjob from one of the better looking girls in school... who, until now, had always behaved like a total prude.'
 			'Sonia slowly closes her lips around the head and begins to suck on it. The loud smacking sounds she makes while she''s sucking on the head of Vitek''s cock is the final straw for the other guys, and they all unbutton their pants too. They surround her, eager to get in on the action while she is too drunk to know better.'
 			
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'voyeur_sex', 3
 			gs 'stat'
 		
 			act 'Watch':
@@ -1714,7 +1714,7 @@ if $ARGS[0] = 'dance2':
 				'Too drunk to know better, she mumbles: "Sowwy," with a cock still in her mouth and puts her hands on two more. She does her best to please them all, sucking and stroking them in turns.'
 				'The boys don''t last long, and dump their warm loads of sperm all over her face one by one. By the time the last guy is finished, her face is covered completely.'
 				
-				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'voyeur_sex', 3
 				gs 'stat'
 		
 				act 'Watch':
@@ -1730,7 +1730,7 @@ if $ARGS[0] = 'dance2':
 					'Meanwhile, Sonia drunkenly rises to her feet and leans against a tree, trying to keep her balance. Thick gobs of cum are slowly dripping down from her face, and when you look closely you can see tears forming in the corners of her eyes. It looks like reality has finally caught up with her, and she now realizes what she just did. She softly whispers, more to herself than anyone else: "What have I done... I''m such an idiot!" between sobs.'
 					'She''s not given much time to recover from the initial shock. Vitek grabs her arm and announces to the other guys that it''s time to show her off. When he drags Sonia back to the disco with the rest of the boys in tow, you can''t help but feel a bit sorry for her. Knowing your classmates, they will judge her very harshly.'
 					
-					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'voyeur_sex', 3
 					gs 'arousal', 'end'
 					gs 'stat'
 		

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott