Browse Source

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

# Conflicts:
#	locations/cikl.qsrc
3xpurt 5 years ago
parent
commit
19d3cd8913
66 changed files with 3865 additions and 3581 deletions
  1. 1 0
      locations/AlbStarsWhore.qsrc
  2. 22 37
      locations/AnalPR.qsrc
  3. 28 37
      locations/BDsex.qsrc
  4. 2 1
      locations/FedorEv.qsrc
  5. 305 229
      locations/FedorEv4.qsrc
  6. 2 2
      locations/IgorEv.qsrc
  7. 38 40
      locations/LariskaHome.qsrc
  8. 4 4
      locations/LariskaStart.qsrc
  9. 0 607
      locations/NatBelHome.qsrc
  10. 0 23
      locations/NatBelVhod.qsrc
  11. 6 20
      locations/NormPR.qsrc
  12. 28 23
      locations/ParChurch2.qsrc
  13. 64 14
      locations/Prostitute.qsrc
  14. 1 1
      locations/Snpc.qsrc
  15. 1 3
      locations/WorkHosp.qsrc
  16. 504 395
      locations/albinahome.qsrc
  17. 6 6
      locations/artgar.qsrc
  18. 20 2
      locations/bass.qsrc
  19. 5 5
      locations/bicycle.qsrc
  20. 6 10
      locations/blowPR.qsrc
  21. 1 1
      locations/dimaEv.qsrc
  22. 354 279
      locations/dimaHome.qsrc
  23. 90 114
      locations/dimaRevenge.qsrc
  24. 6 6
      locations/dinnpc.qsrc
  25. 1 1
      locations/etoexhib.qsrc
  26. 484 405
      locations/fight.qsrc
  27. 2 1
      locations/gaptek.qsrc
  28. 1 1
      locations/gdksport.qsrc
  29. 8 8
      locations/gopskver.qsrc
  30. 1 1
      locations/gschool_chats2.qsrc
  31. 129 81
      locations/gschool_grounds.qsrc
  32. 13 36
      locations/gschool_lessons1.qsrc
  33. 21 19
      locations/gschool_lessons2.qsrc
  34. 5 5
      locations/gschool_lessonsev1.qsrc
  35. 3 3
      locations/gschool_sex.qsrc
  36. 87 243
      locations/hunter_favors.qsrc
  37. 2 3
      locations/katjaEv.qsrc
  38. 19 2
      locations/kisameQW.qsrc
  39. 39 2
      locations/lab.qsrc
  40. 105 73
      locations/natbelEv.qsrc
  41. 25 16
      locations/natbelapt.qsrc
  42. 38 31
      locations/natkolEv.qsrc
  43. 106 69
      locations/nyp_school.qsrc
  44. 3 4
      locations/orgazm.qsrc
  45. 13 2
      locations/pain.qsrc
  46. 78 8
      locations/park.qsrc
  47. 20 2
      locations/parkivent.qsrc
  48. 18 11
      locations/pavComplex.qsrc
  49. 68 13
      locations/pavaptcourtev.qsrc
  50. 1 1
      locations/pharmacy.qsrc
  51. 296 184
      locations/postdeliveries.qsrc
  52. 208 165
      locations/postevents.qsrc
  53. 69 63
      locations/postmaster.qsrc
  54. 104 77
      locations/postoffice.qsrc
  55. 129 117
      locations/preNT.qsrc
  56. 20 2
      locations/preTG.qsrc
  57. 12 21
      locations/ptu_dush.qsrc
  58. 10 0
      locations/saveupdater.qsrc
  59. 19 2
      locations/sexm.qsrc
  60. 2 2
      locations/sny.qsrc
  61. 20 2
      locations/stallion.qsrc
  62. 80 8
      locations/street_event.qsrc
  63. 0 1
      locations/swamp_yard.qsrc
  64. 11 6
      locations/webcam_site.qsrc
  65. 59 20
      locations/willpower.qsrc
  66. 42 11
      locations/zsoft_gopskverGorSlut.qsrc

+ 1 - 0
locations/AlbStarsWhore.qsrc

@@ -1,5 +1,6 @@
 # AlbStarsWhore
 
+!!needs complete revamp, add willpower during revamp.
 menu_off = 1
 
 if $ARGS[0] = 'whore1':

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

+ 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

+ 2 - 1
locations/FedorEv.qsrc

@@ -25,6 +25,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'Start':
 		gt 'FedorEv2', 'Fedor Breakup'
 	elseif fedorKozlovQW >= 10 and dimaFilm = 1 and FedorvsDimka = 1:
 		gt 'FedorMisc', 'Fedor Vs Dimka'
+!!ToDo: sub and dom have to replaced, they can''t be changed into willpower in this case		
 	elseif fedorKozlovQW >= 20 and GorSlut < 2 and sub > 0:
 		gt 'FedorEv', 'Fedor Date 2'
 	elseif fedorKozlovQW >= 20 and GorSlut < 2 and pcs_dom >= 0:
@@ -135,7 +136,7 @@ if $ARGS[0] = 'Gorslut':
 			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>'
-			'"It was a stupid mistake that I wish I could take back, I had too many drinks and..." Fedor raises his hand and says, "You don''t need to tell me more, let''s just put this behind us." You lean forward and greatfully kiss Fedor on the cheek he then hugs you for a few moments and walks away.'
+			'"It was a stupid mistake that I wish I could take back, I had too many drinks and..." Fedor raises his hand and says, "You don''t need to tell me more, let''s just put this behind us." You lean forward and gratefully kiss Fedor on the cheek he then hugs you for a few moments and walks away.'
 
 			act 'Move away':
 				if $loc = 'gschool_lunch':

File diff suppressed because it is too large
+ 305 - 229
locations/FedorEv4.qsrc


+ 2 - 2
locations/IgorEv.qsrc

@@ -189,9 +189,9 @@ if $ARGS[0] = 'din_sex':
 		gs 'stat'
 		'Both of you quickly undress, kissing, as you pull the clothes off each other.'
 		act 'Squat':
-			cls
+			*clr & cla
 			bja += 1
-			if npcSex[4] = 0: npcSex[4] = 1 & guy += 1
+			if npc_Sex['A4'] = 0: npc_Sex['A4'] = 1 & guy += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/home/tinydick.jpg"></center>'
 			'You go down on your knees in front of him, playing with his small hard cock. You slide his skin back and forth, as you lick the penis head. You continue on caressing his cock. Igor is breathing hard whispering, "<<$pcs_nickname>>, don''t stop, I''m right on the edge!"'

+ 38 - 40
locations/LariskaHome.qsrc

@@ -93,51 +93,49 @@ if $ARGS[0] = 'in':
 		act 'Say goodbye and go home':gt'pavResidential'
 		exit
 	end
-	if pcs_energy <= 60:
-		act 'Ask for a drink':
+	act 'Ask for a drink':
+		cls
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
+		'Lariska casually waves towards the door, "You know where the kitchen is, help yourself"'
+		act 'Go and get a drink':
 			cls
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
-			'Lariska casually waves towards the door, "You know where the kitchen is, help yourself"'
-			act 'Go and get a drink':
-				cls
-				minut += 5
-				pcs_energy += 40
-				pcs_hydra += 60
-				gs'stat'
-
-				if week < 6 and doorpeek = 0:
-					doorlocked = 1
-					'On your way back from the kitchen, you notice that the room next to the toilet is closed, curiosity takes over and you try to open it but it is locked.'
-					act 'Return to Lariska''s room':gt 'LariskaHome','in'
-				elseif week < 6 and doorpeek ! 0:
-					'On your way back from the kitchen, you notice that the room with the BDSM stuff is closed, you try to open it but it is locked again.'
-					act 'Return to Lariska''s room':gt 'LariskaHome','in'
-				elseif week >= 6:
-					lariskaRand = rand(1,100)
-					doorpeek = 1
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_2.jpg"></center>'
-					if doorlocked = 1 or lariskaBDSM > 0:
-						doorlocked = 0
-						'On your way back from the kitchen, you notice that the room next to the toilet is closed, curiosity takes over and you try to open it. You open the door and you see a room full of what appears to be BDSM accessories and toys.'
-					elseif lariskaRand <= 10 and lariskaBDSM < 10:
-						'You open the door and you see that the room is full of what appears to be BDSM accessories and toys. In the center of the room stands Lariska''s mother, Anna Igorevna, in a suit of leather. She is doing something with a rope. You quietly close the door, hoping she didn''t notice you.'
-						lariskaBDSM += 1
-					elseif lariskaRand >= 90 and lariskaBDSM < 10:
-						'You open the door and you see that the room is full of what appears to be BDSM accessories and toys. In the center of the room stands Lariska''s mother, Anna Igorevna, in a suit of leather. She is doing something with a rope. She obviously notices you and smiles. You quickly shut the door.'
-						lariskaBDSM += 1
-					elseif lariskaRand <= 10 and lariskaBDSM >= 10:
-						'You open the door to the room full of BDSM accessories and toys. In the center of the room stands Anna Igorevna in a suit of leather, she is doing something with a rope. She invites you to have fun.'
-						lariskaBDSM += 1
-					else
-						'You open the door to the room full of BDSM accessories and toys. Anna Igorevna is not there so you close the door.'
-					end
+			minut += 5
+			pcs_energy += 40
+			pcs_hydra += 60
+			gs'stat'
 
-					act 'Return to Lariska''s room':gt 'LariskaHome','in'
+			if week < 6 and doorpeek = 0:
+				doorlocked = 1
+				'On your way back from the kitchen, you notice that the room next to the toilet is closed, curiosity takes over and you try to open it but it is locked.'
+				act 'Return to Lariska''s room':gt 'LariskaHome','in'
+			elseif week < 6 and doorpeek ! 0:
+				'On your way back from the kitchen, you notice that the room with the BDSM stuff is closed, you try to open it but it is locked again.'
+				act 'Return to Lariska''s room':gt 'LariskaHome','in'
+			elseif week >= 6:
+				lariskaRand = rand(1,100)
+				doorpeek = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_2.jpg"></center>'
+				if doorlocked = 1 or lariskaBDSM > 0:
+					doorlocked = 0
+					'On your way back from the kitchen, you notice that the room next to the toilet is closed, curiosity takes over and you try to open it. You open the door and you see a room full of what appears to be BDSM accessories and toys.'
+				elseif lariskaRand <= 10 and lariskaBDSM < 10:
+					'You open the door and you see that the room is full of what appears to be BDSM accessories and toys. In the center of the room stands Lariska''s mother, Anna Igorevna, in a suit of leather. She is doing something with a rope. You quietly close the door, hoping she didn''t notice you.'
+					lariskaBDSM += 1
+				elseif lariskaRand >= 90 and lariskaBDSM < 10:
+					'You open the door and you see that the room is full of what appears to be BDSM accessories and toys. In the center of the room stands Lariska''s mother, Anna Igorevna, in a suit of leather. She is doing something with a rope. She obviously notices you and smiles. You quickly shut the door.'
+					lariskaBDSM += 1
+				elseif lariskaRand <= 10 and lariskaBDSM >= 10:
+					'You open the door to the room full of BDSM accessories and toys. In the center of the room stands Anna Igorevna in a suit of leather, she is doing something with a rope. She invites you to have fun.'
+					lariskaBDSM += 1
+				else
+					'You open the door to the room full of BDSM accessories and toys. Anna Igorevna is not there so you close the door.'
 				end
-			end
 
-			act 'Change Your mind':gt 'LariskaHome','in'
+				act 'Return to Lariska''s room':gt 'LariskaHome','in'
+			end
 		end
+
+		act 'Change Your mind':gt 'LariskaHome','in'
 	end
 !!	if lariskaMotherKnown > 0:
 !!		act 'Go to my mother Lariska':

+ 4 - 4
locations/LariskaStart.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = 'end':
 						'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 						'You walk slowly to Ivan and incline your face towards his. You hug and kiss and Ivan starts stroking gently your back.'
 						act 'Run your hand into his pants':
-							cls
+							*clr & cla
 							pcs_horny += 10
 							minut += 3
 							gs'stat'
@@ -252,9 +252,9 @@ if $ARGS[0] = 'end':
 							'You shove your hand deeper into Ivan''s pants and your fingers are touching his big hard cock.'
 
 							act 'Masturbate':
-								cls
+								*clr & cla
 								minut += 5
-								if npcSex[numnpc] = 0:npcSex[numnpc] = 1 & guy += 1
+								if npc_Sex['A3'] = 0: npc_Sex['A3'] = 1 & guy += 1
 								stat['hj'] += 1
 								gs'stat'
 								laris_rand1 = rand(0,2)
@@ -498,7 +498,7 @@ if $ARGS[0] = 'IvanHelp_sex':
 
 	gs 'boyStat', 'A3'
 	pose = 1
-	if npcSex[numnpc] = 0:npcSex[numnpc] = 1 & guy += 1
+	if npc_Sex['A3'] = 0: npc_Sex['A3'] = 1 & guy += 1
 
 	laris_rand1 = rand(0,50)
 	if laris_rand1<5:'<center><img <<$set_imgh>> src="images/shared/sex/public/boysex.jpg"></center>'

+ 0 - 607
locations/NatBelHome.qsrc

@@ -1,607 +0,0 @@
-# NatBelHome
-
-$location_type = 'indoors'
-menu_off = 1
-CLOSE ALL
-if BeInNatBelHome = 0:BeInNatBelHome = 1
-
-gs 'stat'
-'<center><b><font color="maroon"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></font></b></center>'
-if natpregday > 0 and (daystart-natpregday) > (280 + rand(-2,2)):
-	!!baby born
-	natbabycount += 1
-	natpregday = 0
-end
-if (daystart-natpregday) > 84 and natpregday > 0:
-	if (daystart-natpregday) < 200:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(2).jpg" width="356"></center>'
-	else 
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(3).jpg" width="356"></center>'
-	end
-	'The state of the room and the whole apartment shows, that the occupant is very poor.'
-	'Looking at Natasha, it is obvious that she is pregnant; you have a strong suspicion that she carries your niece or nephew.'
-	''
-	act 'Touch her belly':
-		if nataskedbaby = 1:
-			delact 'Touch her belly'
-			nataskedbaby = 0
-		end
-		''
-		'She looks at you with a strange smile.'
-		'"Yes", she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
-		'Her tone is a lot less accusing than you expected. In fact, she seems... happy.'
-		nataskedbaby = 1
-	end
-else 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-	'The state of the room and the whole apartment shows that the occupants are very poor: The color and even parts of the plaster are coming down everywhere, there are cracks in the floor and the furniture seems to have been bought secondhand and with no direction or style in mind.'
-end
-
-if lernHome ! 0:
-	'Natasha arranges her books on the table and looks at you expectantly. After all, you came here to study with her, right?'
-
-	act 'Study with Natasha':
-		*clr & cla
-		minut += 60
-		npc_rel['A16'] += 5
-		lernHome = 0
-		lern += rand(3, 6)
-		intel_exp += rand(1, 2)
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-		'You spend an hour doing your homework with Natasha and reading up on what you did in class. Natasha might be poor but she''s a great study partner.'
-
-		act 'Next':gt $curloc
-	end
-elseif lernHome = 0:
-	'Natasha sits down on her bed and, polite as she is, offers you a seat in her semi-hospitable room.'
-
-	act 'Chat with Natasha':
-		*clr & cla
-		minut += 15
-		NatBelBestFrend += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-		'You talk with Natasha about this and that, passing fifteen minutes with ease.'
-
-		if NatBelBestFrend = 1:'Natasha knows that she lives in a very poor family. She has no father and her mother works for a pittance at the garment factory. You feel sorry for her.'
-		if NatBelBestFrend >= 2:'Natasha is envious that other girls can dress smartly and buy cosmetics while she has to wear her mother''s things.'
-
-		act 'Continue':gt $curloc
-	end
-
-	if NatDolg <= 0 and money >= 2000 and natsub > 0:
-		'Hesitantly, Natasha asks you, "<<$pcs_nickname>>, can you lend me a couple of thousand <b>₽</b>? I''ll pay you back, I promise."'
-
-		act 'Give Natasha some money (2000 <b>₽</b>)':
-			*clr & cla
-			minut += 15
-			NatDolg = 2000
-			money -= 2000
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-			'You get your purse and give Natasha the money. At this point, both of you know very well that she is not going to be able to repay you and that you will treat her like a sextoy as long as she is in your debt. Doesn''t this make her a prostitute?'
-
-			act 'Next':gt $curloc
-		end
-	elseif NatBelBestFrend >= 3 and NatDolg = 0 and money >= 5000 and natsub = 0:
-		'Natasha looks down in embarrassment, "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
-
-		act 'Lend Natasha the 5000 <b>₽</b>':
-			*clr & cla
-			minut += 15
-			NatDolg = 5000
-			money -= 5000
-			NatDolgDay = daystart+30
-			NatBelBestFrend += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-			'You get your purse and give Natasha the money. Natasha is delighted and says that she will pay it back in a month.'
-
-			act 'rest':gt $curloc
-		end
-	elseif NatDolg > 0 and NatDolgDay > daystart:
-		'Natasha promises you to repay the <<NatDolg>> <b>₽</b> in <<NatDolgDay-daystart>> days.'
-	elseif NatDolg > 0 and NatDolgDay <= daystart:
-		'Natasha looks at the floor, "<<$pcs_nickname>>, I... I''m sorry, I don''t have your money."'
-
-		act 'Forgive Natasha''s debt':
-			*clr & cla
-			minut += 15
-			NatDolg = 0
-			NatDolgDay = 0
-			NatBelBestFrend += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-			'You decide to forgive the Natasha''s debt. She is delighted and thanks you with all her heart.'
-
-			act 'Rest':gt $curloc
-		end
-
-		if pcs_dom >= 10 and natotrab = 0:
-			act 'Demand repayment':
-				*clr & cla
-				minut += 15
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-				'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"' 
-				''
-				'Natasha looks at you with fearful eyes and you are getting some ideas as to how you could "use" her. She did say "anything", after all...' 
-				'You snarl at her with an evil hiss: "You''ll be my little pet until you''ve worked off every last kopeck. And don''t you dare tell anyone about this!"' 
-				'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
-
-				act 'On your knees! Open your mouth!':
-					*clr & cla
-					minut += 5
-					natotrab += 1
-					natsub += 1
-					pcs_dom += 1
-					!!natknee
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natknee.jpg"></center>'
-					'You bark at Natasha to get on her knees. She immediately kneels down at your feet and obediently opens her mouth.'
-
-					act 'Spit in her face':
-						*clr & cla
-						minut += 5
-						natsub += 1
-						pcs_dom += 1
-						NatDolg -= 500
-						!!natknee
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natknee.jpg"></center>'
-						'You collect the saliva in your mouth and, with relish spit in Natasha''s face. She jerks and squeezes her eyes shut but makes no move to wipe the spittle away.' 
-						'You smile, "Fair enough, you are forgiven."'
-						'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"' 
-						'You laugh, "500 <b>₽</b> of debt is forgiven, fool. You will do everything I tell you until the entire debt is gone."'
-
-						act 'Next':gt $curloc
-					end
-				end
-			end
-		elseif natotrab > 0 and NatDolg > 0:
-			'Natasha still doesn''t have the <<NatDolg>> <b>₽</b>.'
-
-			act 'On your knees! Open your mouth!':
-				*clr & cla
-				minut += 5
-				natotrab += 1
-				natsub += 1
-				pcs_dom += 1
-				!!natknee
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natknee.jpg"></center>'
-				'You bark at Natasha to get on her knees. She immediately kneels down at your feet and obediently opens her mouth.'
-
-				act 'Spit in her face':
-					*clr & cla
-					minut += 5
-					natsub += 1
-					pcs_dom += 1
-					NatDolg -= 500
-					!!natknee
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natspit.jpg"></center>'
-					'You collect the saliva in your mouth and, with relish spit in Natasha''s face. She jerks and squeezes her eyes shut but makes no move to wipe the spittle away.'
-
-					act 'Next':gt $curloc
-				end
-				if natsub >= 4:
-					act 'Make her lick':
-						*clr & cla
-						minut += 5
-						natsub += 1
-						pcs_dom += 1
-						NatDolg -= 500
-
-						if npcSex[16] = 0:npcSex[16] = 1 & girl += 1
-
-						lesbian += 1
-						!!pcs_horny = 0
-						!!orgasm += 1
-						natlesb += 1
-						!!natknee
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natlick.jpg"></center>'
-						'You force Natasha to undress you and then watch as she undresses herself before she returns to kneeling at your feet. You pull her face into your pussy and snarl at her, "Now lick!". Natasha fearfully starts to work.'
-
-						if natsub < 10:
-							'This useless cunt can''t even find your clitoris and only sluggishly works her mouth on your pussy without any enthusiasm.'
-
-							if pcs_dom >= 20 and NatDolg >= 500:
-								act 'Piss in her mouth':
-									*clr & cla
-									minut += 5
-									natsub += 1
-									pcs_dom += 1
-									NatDolg -= 500
-									natpee += 1
-									!!natknee
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natpee.jpg"></center>'
-									'You are angry at this bitch so you release your urine in Natasha''s face. She closes her eyes and bows her head down but does not recoil and silently accepts your golden shower until the very end.'
-									
-									act 'Next':gt $curloc
-								end
-							else 
-								act 'Make her stop':
-									*clr & cla
-									minut += 5
-									pcs_horny -= 10
-									money -= 50
-									
-									gs 'stat'
-									$ImageNeededPlaceholder
-									'<center><img <<$set_imgh>> src="images/shared/food/icecreem.jpg"></center>'
-									'You get tired of her lackluster attempts to get you off, in fact, she is doing such a bad job that it is actually turning you off.'
-									'"You are hopeless. Here, go buy an icecream and practice licking. You''d better do better next time, bitch." You throw a 50 ruble note at her as she stops licking you.'
-									
-									act 'Next':gt $curloc
-								end
-							end
-						else
-							orgasm += 1
-							pcs_horny = 0
-							gs 'stat'
-							'Natasha enthusiastically goes to work on your pussy, using her mouth and tongue. She fucks you with her tongue then switches to sucking on your now engorged clitoris. You grab her head and roughly grind your pussy on her face as your orgasm rolls over your body.'
-						end
-
-						act 'Next':gt $curloc
-					end
-				end
-			
-				if hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart:
-					act 'Call your brother':
-						*clr & cla
-						minut += 15
-						natsub += 1
-						pcs_dom += 1
-						NatDolg -= 500
-						natbj += 1
-						natbro += 1
-						natfuckday = daystart
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natbj.jpg"></center>'
-					
-						'You call your brother and he quickly comes up to Natasha''s apartment. You briefly explain the situation to your brother.'
-						'"And you, bitch, you''re going to use that mouth of yours to make Kolka feel good, you got it?" You hiss at Natasha, grabbing her jaw and staring into her eyes.'
-						'Natasha jerkily nods and kneels at Kolka''s feet. She reaches up with trembling hands to unfasten Kolka''s pants and pulls out his semi-hard dick. She tentatively begins to lick it and after a moment takes the now fully hard shaft into her mouth. Kolka starts fucking her in the mouth.'
-
-						if natsub >= 10 and brotherSex > 0 and NatDolg > 0 and natbro > 0:
-							act 'Make her fuck your brother for 500':
-								*clr & cla
-								pcs_dom += 2
-								NatDolg -= 500
-								minut += 15
-								natsub += 1
-								natfuck += 1
-								npc_rel['A34'] += 5
-								gs 'stat'
-								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natfuck.mp4"></video></center>'
-								'In a few minutes your brother is hard and panting, but you stop him, and pull away Natasha to whisper into her ear.'
-								'"I''ll forgive another 500 of your debt if you fuck him."'
-								'Natasha stares at you, then nods her head without a glance at Kolka, then she gets in doggie position. Still staring at you, she says "He can fuck me."'
-								'You smile at your brother, and playfully slap her very nice ass to incite him. "She is yours, bro. Fuck her hard!"'
-								'He pushes inside her pussy, insistently but patiently, then starts to fuck her fast and hard. As Natasha''s body moves with the thrusts, you lean forward and start kissing her.'
-								if natcp = 0:
-									'She responds eagerly, and you keep kissing until Kolka says, "I''m cumming!"'
-									'Natasha suddenly tries to pull away from Kolka, saying "Pull out, not inside! I don''t want to end up pregnant!"'
-								elseif natpregday > 0 and (daystart-natpregday) > 20 and (daystart-natpregday) < 84:
-									'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t seems to bother her that Kolka may knock her up.'
-								elseif natpregday > 0 and (daystart-natpregday) >= 84:
-									'Natasha looks at you questioningly, whether will you let him cum inside of her. It doesn''t really matter now, since Kolka has already knocked her up.'
-								elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount = 0:
-									'Natasha looks at you and almost inaudably whispers "Please let him cum inside me. I want a baby too."'
-								elseif natpregday = 0 and npc_pregtalk['A16'] = 1 and natbabycount > 0:
-									'Natasha looks at you and moans "Please let him cum inside me. I need him to give me another baby."'		
-								else
-									'Natasha looks at you questioningly, whether will you let him cum inside of her and risking her getting pregnant with your niece or nephew, or letting her pull away from you brother.'
-								end
-								if natsub >= 20 and pcs_dom > 20 and natcp > 0 and npc_pregtalk['A16'] = 0:
-									act 'Let him cum inside her':
-										cla
-										natcp += 1
-										natsub += 1
-										pcs_dom += 3
-										'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natcp.mp4"></video></center>'
-										'You grab her head, and say to her, "He will not pull out. The deal was a fuck, so that''s what he gets."'
-										'She looks at you submissively then nods, just as Kolka groans and fills her womb with his semen.'
-										if rand(1,100) >= 93 and natpregday = 0:natpregday = daystart
-										gs 'stat'
-										act 'Next':gt $curloc
-									end
-								elseif natsub >= 20 and pcs_dom > 20 and natcp > 0 and npc_pregtalk['A16'] = 1:
-									act 'Let him cum inside her':
-										cla
-										natcp += 1
-										natsub += 1
-										pcs_dom += 3
-										'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natcp.mp4"></video></center>'
-										'You grab her head and say, "That''s right, whore. Take his cum deep in your slutty pussy and get knocked up."'
-										'She looks at you joyfully as Kolka groans and fills her womb with his semen.'
-										if rand(1,100) >= 93 and natpregday = 0:natpregday = daystart
-										gs 'stat'
-										act 'Next':gt $curloc
-									end
-								end
-								if natsub >= 20 and pcs_dom > 30:
-									act 'Have Kolka fuck and cum in Natasha''s ass instead':
-										cla
-										natsub += 2
-										npc_rel['A34'] += 5
-										gs 'stat'
-										'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal11.mp4"></video></center>'
-										'You tell your brother to stop moving, put a finger under her chin and look at her imperiously. "How would you like to get fucked in the ass by my brother?"'
-										''
-										if natanal = 0:
-											natanal += 1
-											pcs_dom += 3
-											'She whimpers. "But... but I''ve never had anal sex before."'
-											'Instead of dissuading you, her words cause you to smile cruelly. "Well, if you''d rather have Kolka cum inside your pussy and knock you up..."'
-											''
-											if natcp = 0:
-												'"No!", she cries, "no, please don''t! He... he can fuck my ass."'
-											elseif natcp >= 1:
-												'"I... I don''t know." She seems to be pondering back and forth. He''s come inside her before so the thought doesn''t scare her as much as it used to. Maybe she''s a little bit curious about anal too because after only a few more seconds, she nods. "I... I guess he can fuck my ass, if he wants to."'
-											end
-											''
-											'You are a little disappointed, actually. You expected her to resist more, especially when it was about popping her anal cherry, but Natasha was so used to being dominated by you that defying you never really was an option. Her debt to you was basically just a formality at this point.'
-											''
-											'Kolka lines his dick up with her puckered hole and pushes. Natasha''s cries of pain aside, it goes surprisingly well. Fast, too. Afterwards, you were wondering if it was Kolka''s first anal, too - it would explain why he was so rough and excited.'
-											'Tears are streaming down your girl toy''s face but she doesn''t protest beyond her sobs. She doesn''t have to hold out for long: The sex and tightness of her anus are too much for Kolka and he groans loudly as he cums in her ass for the first time.'
-											''
-											'You gently kiss Natasha''s tears away and gently speak to her, praise her, encourage her. By the time Kolka leaves, she''s stopped crying at least.'
-										
-										elseif natanal >= 1:
-											'"I... I guess he can fuck my ass again, if he wants to."'
-											'"Then ask him to", you order.'
-											'Natasha remains silent for a while. Even after quite a bit of humiliation by you and Kolka, she doesn''t seem all that comfortable with demeaning herself. There''s no doubt as to her submissive streak or her enjoyment of it, however. All she needs is a little nudge here and there.'
-											''
-											'"Please fuck my ass", she whispers, barely audible. You consider having her repeat it but that''s all the encouragement your brother needs: Before you know it, his well-lubricated dick is pushing against her sphincter, causing her to groan in pain.'
-											''
-											'It''s nowhere near as difficult as the first time he took her ass - perhaps because he''s also a little more experienced now than he was before. His movements are slow and gentle at first so she can get used to the cock in her ass.'
-											'And after a while, it sounds like she does - her groans more and more turn into soft coos of pleasure and when you kiss Natasha, she excitedly breathes into your mouth. As if on command, your brother picks up the pace. Caught between pain and pleasure, Natasha doesn''t try to escape his rough treatment but instead moves with him.'
-											'The sex before and the tightness of her anus soon prove too much for your younger brother and Natasha''s moans tell you that he''s cum into her ass.' 
-											''
-											'Natasha doesn''t even pretend to be unhappy with that.'
-										
-										
-										end
-										act 'Next': gt $curloc
-									end
-								end
-								act 'Let her pull away':
-									cla
-									if rand(0,9) = 0:
-										natcp += 1
-										'You let her pull away from your brother, but it appears Kolka was really close, and before anyone could do anything, your brother pumps his seed in Natasha''s body.'
-										'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natcp.mp4"></video></center>'
-										'"Fuck, I really am sorry, Natasha!", he says apologetically. "It is just, you are so hot!"'
-										'Natalia doesn''t even listen to him, just looks at you with a strange expression on her face. You can''t really decide whether she is scared that Kolka came in her pussy, or enjoyed it. Maybe both at the same time?'
-										'You quietly signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
-										if rand(1,100) >= 95 and natpregday = 0:natpregday = daystart
-									else
-										'You let her pull away from your brother, so that you brother''s dick slips out of her just in time. His seed sprays Natasha''s ass, back and hair, and it even reaches your face and hair.'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natkolfacial.jpg"></center>'
-										'"Nice shot, bro!", you say laughing, wiping his seed away from your eyelid. "That was quite the distance!"'
-										'"That was close," whispers Nat, with a strange look in her face. You actually can''t decide whether she is relieved or disappointed that Kolka didn''t cum in her pussy.'
-										'You quietly signal your brother to dress up and leave while you kiss her deeply. "I hope you enjoyed it, pet. We may repeat it."'
-										gs 'boyStat', 'A34'
-										spafinloc = 11
-										sexpartkno = 1
-										gs 'cum_manage'
-										spafinloc = 16
-										sexpartkno = 1
-										gs 'cum_manage'
-									end
-									gs 'stat'
-									act 'Next':gt $curloc
-								end
-							end
-						end
-
-						act 'Continue':
-							*clr & cla
-							minut += 5
-						
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum50.jpg"></center>'
-						
-							'Kolka holds Natasha by the hair as he pistons his cock into her mouth rapidly. Natasha''s chin is covered with her drool and it is soaking the front of her shirt. With a grunt, Kolka pulls his dick from Natasha''s mouth and she automatically opens her mouth and sticks out her tongue. Kolka pumps his dick a few times then shoots his cum into Natasha''s waiting mouth.'
-							'"Swallow it, slut." You command, when Kolka is done, before Natasha can spit the sperm out.'
-							'Natasha grimaces but complies, swallowing Kolka''s load then opening her mouth to show that it is all gone.'
-					
-							act 'Next':gt $curloc
-						end
-					end	
-				end
-				if olufirst = 3 and oluuosegunday ! daystart:
-					act 'Take her to see Olu for 500':
-						oluuosegunday = daystart
-						gs 'boystat', 'A55'
-						*clr & cla
-						pcs_dom += 2
-						NatDolg -= 500
-						minut += 5
-						natsub += 1
-						natfuck += 1
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
-						'You know you need to help out with Olu soon, but your ass is still too sore. Then you get a great idea, kill two birds with one stone. Have Natasha have sex with him, she owes you anyways, besides it might be fun to make the little bitch squeal.'
-						'"Since I know you don''t have my money, I have a way you can help me out and pay off some of that debt. We are going to see my Aunt''s boyfriend Olu, he has a massive... sex drive and she can''t keep up and I need a break too."'
-						'Natasha seems a little unsure about this and perhaps a bit confused but she nods her head, you smile to her and lead her across the hall to your Aunts place.'
-						act 'Introduce Olu':
-							*clr
-							cla
-							minut += 5
-							'<center><b><font color=maroon>Apartment Aunt</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/olu.jpg"></center>'
-							'You take off your shoes and go straight to the living room, where you find Olu resting on the couch.'
-							'He looks at you, that perpetual smile still on his face. "Hi, <<$pcs_nickname>>! Who''s your friend?"'
-							'"Hello, Olu! This is my friend Natasha, she wants you to fuck her." You say to him, pointing at his crotch and then slapping Natasha on the ass. He seems to understand quickly and nods with a huge grin holding up the bottle of lube.'
-							'You glance at Natasha. "Well take off your clothes." She nods and does as you ask.'
-							act 'Undress Natasha':
-								*clr & cla
-								minut += 5
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/olu4.jpg"></center>'
-								'You can''t help but smile, when you glance over and see Olu already naked with his massive dick swinging. She looks up and catches sight of his huge dick and freezes looking at you with a slightly panicked look.'
-								'You smile at her. "Yep it''s huge I know, my ass needs a break and you need to pay me back so..." you trail off, it only takes a moment for Natasha to understand and then it hits her you said ass.'
-								'She squeaks a reply. "You want him to fuck me in the ass with that thing?" she says in disbelief.'
-								'"Yes I do, my ass could use a break and you owe me..."'
-								'After a moment she lowers her gaze and then nods her head. You pat her shoulder. "Good girl and it won''t be too bad, we have plenty of lube, wink, wink."'
-								act 'Let the fun begin':
-									*clr & cla
-									minut += 15
-									natanal += 1
-									pcs_horny += 10
-									Olu_pay += 1
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/olunat.jpg"></center>'
-									'You help Natasha get undressed and then get her down on all fours in front of Olu, while he lubes up his dick and her ass, you get undressed as well. No reason he should have all the fun. You kneels down beside Natasha and grab her butt cheeks with your hands and spread them wide for Olu. Not needing any more invitation than that, she squeals loudly as his <<dick>>cm <<$dick_girth>> cock slides in her ass.'
-									'He starts fucking her slowly at first but you encourage him to go faster and deeper, pulling on her hips. You feel your pussy getting wet listening to Natasha cry out and watching the <<dick>>cm <<$dick_girth>> cock rip up her ass. You start rubbing your clit as you watch.'
-									'Getting up, you move to sit in front of Natasha and spread your legs, you pull her face to your pussy and she wastes no time and starts licking your pussy. You''re loving it, grinding your pussy into her face, her muffled cries as she eats you, while Olu pounds her ass. You keep encouraging Olu to fuck her harder. The more she squeals the more turned on you get. Before long you are cumming, apparently seeing this is a turn on for Olu as well. As he shoots his load deep in her ass with in a few moments of watching you cum.'
-									'Once you are dressed you help Natasha back to her apartment, as she seems to be having a little trouble walking. You feel a little bad for her. "You did great, it gets better I promise. Next time it won''t hurt as much, I promise." Then you give her a passionate kiss on the lips. She gives you a smile at that and nods her head and goes back into her apartment walking quite painfully.'
-
-									act 'Finish':gt 'pod_ezd','etaj_4'
-								end
-							end
-						end
-					end
-				end
-			end
-		end
-	end
-end
-
-if npc_pregtalk['A16'] = 0 and kid = 0:
-	if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregchem >= 3600:
-		*clr & cla
-		gs 'stat'
-		'"<<$pcs_nickname>>, are you pregnant, too? Well, I guess I don''t have to worry about being the only pregnant girl at school," she giggles.'
-
-		act 'Next':gt 'NatBelhome', 'natknows'
-	elseif natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
-		act 'Tell her you''re pregnant':
-			*clr & cla
-			'"If you were worried about being the only pregnant girl at school, that won''t be a problem anymore." You smirk while rubbing your midriff. "It looks like I got myself knocked up as well."'
-			'Natasha smiles at you excitedly. "Really? Congratulations!"'
-			*nl
-			act 'Next':gt 'NatBelhome', 'natknows'
-		end
-	elseif pregchem > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
-		act 'Tell her you''re pregnant':
-			cla
-			*nl
-			'"<<$pcs_nickname>>, you''re," she pauses momentarily before continuing in a tone of shock mixed with disgust, "pregnant? Have you been sleeping around? This will definitely impact your studies."'
-			act 'Continue' :gt 'NatBelhome'
-			npc_pregtalk['A16'] = 1
-		end
-	elseif pregchem > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
-		act 'Tell her you''re pregnant':
-			cla
-			*nl
-			'"You''re pregnant? Who''s the father?"'
-			*nl
-			if $wombthfath = '':
-				'"Honestly, I don''t even know."'
-				'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-				act 'Continue' :gt 'NatBelhome'
-				npc_pregtalk['A16'] = 1
-			else
-				'You tell her that <<$wombthfath>> is the father and then give her brief details as to how you got pregnant, without getting too explicit.'
-				*nl
-				'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
-				act 'Continue' :gt 'NatBelhome'
-				npc_pregtalk['A16'] = 1
-			end
-		end
-	end
-end
-
-if npc_pregtalk['A16'] = 0 and kid > 0:
-	if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregchem >= 3600:
-		*clr & cla
-		gs 'stat'
-		'"Wow, <<$pcs_nickname>>, you''re pregnant again? You''re really committed to making sure I''m not the only young mother around here, huh?" She playfully smiles and puts a hand on your shoulder. "It''s good to know you''re looking out for me."'
-
-		act 'Next':gt 'NatBelhome', 'natknows1'
-	elseif (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and knowpreg = 1 and pregchem > 0 and pregchem < 3600:
-		act 'Tell her you''re pregnant':
-			*clr & cla
-			'"Hey, guess who''s pregnant again. You know, I''m glad I forced you to let Kolka impregnate you so that I could have someone I can relate to."'
-			'Natasha stares at you for a moment, stunned, trying to determine if the second half of your statement was a joke, before the first half clicks in her mind. "Oh my God, that''s wonderful!" she exclaims as she throws her arms around you and hugs you. When she finally lets go, she asks'
-			*nl
-			act 'Next':gt 'NatBelhome', 'natknows1'
-		end
-	elseif pregchem > 0 and natsub = 0 and knowpreg = 1:
-		act 'Tell her you''re pregnant':
-			*clr & cla
-			*nl
-			'"Really? You''re pregnant again? You should really try to be more careful."'
-			act 'Continue' :gt 'NatBelhome'
-			npc_pregtalk['A16'] = 1
-		end
-	elseif pregchem > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
-		act 'Tell her you''re pregnant':
-			*clr & cla
-			*nl
-			'"You got pregnant again. It must be wonderful…" She trails off, clearly envious.'
-			act 'Continue' :gt 'NatBelhome'
-			npc_pregtalk['A16'] = 1
-		end
-	end
-end
-
-if $ARGS[0] = 'natknows':
-	cla
-	npc_pregtalk['A16'] = 1
-	if pav_slut < 125: '"So, who''s the father?"'
-	if pav_slut >= 125: '"So, do you know who the father is?"'
-	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
-		'You smile. "I''m sure you won''t be surprised to hear Kolka got me pregnant."'
-		'"Wow. He really has a thing for knocking girls up," she says touching her own pregnant belly. "I didn''t expect him to extend that to his own sister, though."'
-		'"Yeah, you know how it is. Some men just want to conquer as many wombs as they can, It doesn''t matter who they''re attached to," you reply. "But don''t worry, he still has a permanent claim on yours. We''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
-		'Natasha''s face goes completely red with embarrassment and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
-	elseif $wombthfath = '':
-		'"I don''t actually know." You laugh. "I guess my life has gotten a little out of hand recently."'
-		'"Yeah, it sounds like it has." She smiles. "Regardless, I''m glad I won''t be going through pregnancy alone."'
-	else
-		'"It looks like I got knocked up by <<$wombthfath>>"'
-		'"Well, I hope for the best for both of you. After our babies are both born, we should start setting up play dates." She pauses for a moment before adding "Honestly, I''m really glad I won''t be going through this alone."'
-	end
-	act 'Continue':gt 'NatBelhome'	
-end
-
-!When pregnancy fetish is added, another reaction will be added here
-if $ARGS[0] = 'natknows1':
-	cla
-	npc_pregtalk['A16'] = 1
-	if pav_slut < 125: '"Is it the same father as last time?"'
-	if pav_slut >= 125: '"Do you know if it''s the same father as last time?"'
-	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"Yeah, I think you’re right. I’m not sure if I’ll let him get me pregnant again after this though." You pull your face as close to Natasha’s as you can without actually touching her and sultrily whisper, "You, on the other hand, are going to be his personal breeding bitch. There won’t be a single moment where your womb doesn’t contain either his baby or his cum. He is going to keep you knocked up until he gets bored of you and leaves you a single mother."'
-		'As soon as you finish speaking you give Natasha a deep, passionate kiss. You pull away, a string of saliva still hanging between you. Natasha just stares at you, unable to respond, but very visibly aroused.'
-	elseif arrpos('$ChildThFath','Kolka') = arrsize('$ChildThFath')-1:
-		'"Not this time. My body is far too fantastic to limit myself. My brother can''t be the only person to put a baby in me," you joke. "Plus, he already has a baby factory. That''s your job." You punctuate your sentence by kissing Natasha. After you pull away, she stares at you in silence, face red, trying to determine if you were serious.'
-	elseif $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1:
-		'"No, this time it''s Kolka''s," you inform her.'
-		'"Wow. He really has a thing for knocking girls up," she says.'
-		'"Yeah, it seems like he does," you reply. "But don''t worry, we''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
-		'Natasha''s face goes completely red with embarrassment and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"Yeah. I guess I needed him to give me another baby before I could be satisfied," you jest.' 
-		'"Well, I hope you find satisfaction," she laughs.'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"No, I needed to test drive someone else before I could decide what father I like best."'
-		'"If you''re going that route, you might as well keep shopping around." You laugh together for a while before moving on to another topic.'
-		end
-	act 'Continue':gt 'NatBelhome'	
-end
-
-act 'Go home':gt 'pod_ezd','etaj_4'
-
---- NatBelHome ---------------------------------
-

+ 0 - 23
locations/NatBelVhod.qsrc

@@ -1,23 +0,0 @@
-# NatBelVhod
-
-CLOSE ALL
-menu_off = 1
-*clr & cla
-
-if BeInNatBelHome = 0:BeInNatBelHome = 1
-gs'stat'
-
-act 'Leave':gt'pod_ezd','etaj_4'
-if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
-	'You knock on the door, but nobody answers.'
-elseif hour > 20 :
-	'It''s too late in the day to visit.'
-elseif hour < 8:
-	'It''s too early in the day to visit.'
-else
-	'You knock on the door. Natasha answers and invites you in.'
-	act 'Go into the apartment':gt'NatBelHome'
-end
-
---- NatBelVhod ---------------------------------
-

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

+ 28 - 23
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>'
@@ -835,13 +840,13 @@ if $ARGS[0] = 'mast':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/mast2.jpg"></center>'
 		'You start rubbing your clit as the priest watches you, after a few moments he starts to pray, but his eyes never leave your pussy. The more you rub your pussy the louder he starts to pray.'
-		gs 'arousal', 'mast', 5, 'exhibitionism'
+		gs 'arousal', 'masturbate', 5, 'exhibitionism'
 		gs 'stat'
 		act 'Keep masturbating':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/mast3.jpg"></center>'
 			'As you start to really get in a rhythm and begin to moan he says. "Lord forgive her of her sins, cleans her soul with your divine love." He continues to pray as you keep masturbating.'
-			gs 'arousal', 'mast', 5, 'exhibitionism'
+			gs 'arousal', 'masturbate', 5, 'exhibitionism'
 			gs 'stat'
 			act 'Orgasm':
 				*clr & cla
@@ -849,7 +854,7 @@ if $ARGS[0] = 'mast':
 				'You feel yourself getting close to orgasming. Apparently the father can tell or just guessed. "Yes you must purge this lust from your body, let it all out before God."'
 				$orgasm_or = 'yes'
 				$orgasm_txt = 'Then your body is wracked by a powerful orgasm, you feel your whole body shaking from the spasms.'
-				gs 'arousal', 'mast', 5, 'exhibitionism'
+				gs 'arousal', 'masturbate', 5, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 				killvar '$orgasm_txt'
@@ -871,25 +876,25 @@ if $ARGS[0] = 'hj':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/hj1.jpg"></center>'
 	'He directs you to kneel on the floor and you do as you are told. Then he frees his dick from his pants, you can see it is already hard and says. "Now take my penis into your hands."'
 	'You do as he asks and take his cock into your hand, you full it''s hardness as you begin to stroke it.'
-	gs 'arousal', 'hj', 3, 'unknown'
+	gs 'arousal', 'hj', 3
 	gs 'stat'
 	act 'Stroke him':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/hj2.jpg"></center>'
 		'You feel it grow slightly more in your hand, you stroke the full length of his <<dick>>cm <<$dick_girth>> cock with your hand. He moans and prays for your soul and for god to take away your sin. "Please lord release this child from the lust she is consumed by."'
-		gs 'arousal', 'hj', 5, 'unknown'
+		gs 'arousal', 'hj', 5
 		gs 'stat'
 		act 'Keep stroking it':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/hj3.jpg"></center>'
 			'As you keep stroking him he gets louder in his prayers. "Yes Lord, I feel your presence, let her lust be taken from her, leaving behind nothing but pureness again."'
-			gs 'arousal', 'hj', 5, 'unknown'
+			gs 'arousal', 'hj', 5
 			gs 'stat'
 			act 'On the face':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/hj4.jpg"></center>'
 				'As you keep stroking him he says. "Forgive us your children for our sins." With that cum starts spurting from his dick, mostly hitting you in the face as you keep stroking him until it finally stops.'
-				gs 'arousal', 'hj', 5, 'unknown'
+				gs 'arousal', 'hj', 5
 				gs 'cum_call', 'face', 'A166'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -917,19 +922,19 @@ if $ARGS[0] = 'bj':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/bj2.jpg"></center>'
 		'You do as he tells you and open your mouth. Once your mouth is fully open he slides his <<dick>>cm <<$dick_girth>> dick into your mouth and you close your lips around it. He lets out a moan which turns into a moaning prayer. "Oh heavily father forgive the sins of this child." He says as he starts to slowly and gently fuck your mouth.'
-		gs 'arousal', 'bj', 5, 'unknown'
+		gs 'arousal', 'bj', 5
 		gs 'stat'
 		act 'Keep sucking':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/bj3.jpg"></center>'
 			'As you suck his cock you can feel his hand go to the back of your hand, you can feel his restraint as he keeps himself for forcing himself down your throat, allowing you to guide the action. While you suck him he gets louder in his prayers. "Yes Lord I feel your presence, let her lust be taken from her, leaving behind nothing but pureness again."'
-			gs 'arousal', 'bj', 5, 'unknown'
+			gs 'arousal', 'bj', 5
 			gs 'stat'
 			act 'Suck him off':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/cum.jpg"></center>'
 				'As you suck his cock he prays more. "Forgive us, your children, for our sins." With that pulls his dick out of your mouth just in time for cum to start spurting from his dick, mostly hitting you in the face until it finally stops.'
-				gs 'arousal', 'bj', 5, 'unknown'
+				gs 'arousal', 'bj', 5
 				gs 'cum_call', 'face', 'A166'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -951,45 +956,45 @@ if $ARGS[0] = 'sex':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay2.jpg"></center>'
 	'He stands up and gently pushes you against the wall. His hands roam your body, slowly removing your clothes until your breasts are exposed and his hand is rubbing your clit. "We must purge the lust from your body and banish your sexual desires." As he says that you feel one of his fingers slide inside of your wet pussy, he slowly fucks you with one finger before adding a second.'
-	gs 'arousal', 'vaginal_finger', 5, 'unknown'
+	gs 'arousal', 'vaginal_finger', 5
 	gs 'stat'
 	act 'Open to purging':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay3.jpg"></center>'
 		'Once you are nice and wet from the fingering he drops down to his knees and places his face between your legs, as you lean back against the wall. He begins to eagerly lick at you clit and pussy, causing you to moan in pleasure. After several minutes he stops and stands back up and ask you. "Kneel my child."'
-		gs 'arousal', 'cuni', 5, 'unknown'
+		gs 'arousal', 'cuni', 5
 		gs 'stat'
 		act 'Kneel':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/foreplay4.jpg"></center>'
 			'As you kneel down he pulls his dick out of his pants, it is already hard, but he strokes it several times as he says. "Open your mouth my child."'
-			gs 'arousal', 'mast', 5, 'unknown'
+			gs 'arousal', 'masturbate', 5
 			gs 'stat'
 			act 'Open your mouth':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/bj2.jpg"></center>'
 				'You open your mouth, once it is fully open he slides his dick in and you close your lips around his shaft. Slowly and steadily, you start to suck him off. He lets out a moan which turns into a moaning prayer. "Oh heavily father, forgive the sins of this child."'
 				'After a few minutes of sucking his dick he pulls it out of your mouth. "Undress and lean forward, placing your hands on the ground."'
-				gs 'arousal', 'bj', 5, 'unknown'
+				gs 'arousal', 'bj', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Undress and bend over':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/sex1.jpg"></center>'
 					'You remove all your clothes as he watches, stroking his dick with one hand. Once you are fully naked on your knees you lean forward until your hands touch the floor. Father Kirill kneels down behind you, he rubs your pussy a few times with his fingers at first. Then you feel the head of is dick rubbing against your wet slit, he gently pushes it into you. You both moan as his <<dick>>cm <<$dick_girth>> dick slides into you. He begins to gentle fuck you, holding onto your hips with one hand.'
-					gs 'arousal', 'vaginal', 5, 'unknown'
+					gs 'arousal', 'vaginal', 5
 					gs 'stat'
 					act 'Have the sin fucked out of you':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/sex2.jpg"></center>'
 						'He starts fucking you a bit harder but then slows down to a slower, steady pace. "Forgive us, your children, for our sins." He prays as he fucks you steadily. Several minutes goes by and then he suddenly pulls out of you. "Rise," He says.'
-						gs 'arousal', 'vaginal', 5, 'unknown'
+						gs 'arousal', 'vaginal', 5
 						gs 'stat'
 						act 'Rise up':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/cum.jpg"></center>'
 							'As you get off your hands to rise into a kneeling position he stands up with his pants still around his ankles. You turn your face toward him right into him stroking his cock, just as a blast of cum hits you right in the face, followed by several more, coating most of your face in his cum.'
-							gs 'arousal', 'vaginal', 5, 'unknown'
+							gs 'arousal', 'vaginal', 5
 							gs 'cum_call', 'face', 'A166'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -1020,27 +1025,27 @@ if $ARGS[0] = 'anal':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/anal2.jpg"></center>'
 		'You do as he tells you and open your mouth. Once your mouth is fully open, he slides his dick in and you close your lips around it. He lets out a moan which turns into a moaning prayer. "Oh heavily father forgive the sins of this child." He says as he starts to slowly and gently fuck your mouth.'
-		gs 'arousal', 'bj', 5, 'unknown'
+		gs 'arousal', 'bj', 5
 		gs 'stat'
 		act 'Keep sucking':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/anal1.jpg"></center>'
 			'As you suck his cock you can feel his hand go to the back of your head. You can feel his restraint as he keeps himself for forcing himself down your throat, allowing you to guide the action. While you suck him he gets louder in his prayers. "Yes Lord I feel your presence, let her lust be taken from her, leaving behind nothing but pureness again."'
 			'He pulls his dick from your mouth and walks over to his desk. "Please bend over the bench, we must now purge the sin of sodomy from you." He says as he begins to apply lubrication to his dick as he walks back over to you. You have no idea why a priest has lubrication, but you''re glad he does.'
-			gs 'arousal', 'bj', 3, 'unknown'
+			gs 'arousal', 'bj', 3
 			gs 'stat'
 			act 'Bend over':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/anal3.jpg"></center>'
 				'Once you are bent over he applies some lube to your anus and rubs it in with his fingers. He presses the head of his dick against your asshole, you feel the pressure build up until the tip pops into your ass, causing you to cry out slightly in a little pain and pleasure. He pauses a moment to let you get use to it before he slowly and gently begins fucking your ass with his <<dick>>cm <<$dick_girth>> dick.'
 				gs 'pain', 1, 'asshole', 'stretch'
-				gs 'arousal', 'anal', 5, 'unknown'
+				gs 'arousal', 'anal', 5
 				gs 'stat'
 				act 'It''s starting to feel good':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/anal4.jpg"></center>'
 					'As he gently fucks your ass he prays. "Lord help me guide this lost lamb back from the sins of sodomy and into your loving light once more." As he gets into it, he starts to fucking a little harder and faster, but each time he notices any discomfort from you, he slows down once more.'
-					gs 'arousal', 'anal', 5, 'unknown'
+					gs 'arousal', 'anal', 5
 					gs 'stat'
 					act 'Yes, Father':
 						*clr & cla
@@ -1048,14 +1053,14 @@ if $ARGS[0] = 'anal':
 						'It starts feeling good and you start moaning louder and louder in pleasure. "Yes, Father! Fuck my ass," You tell him.'
 						'"Lord forgive her, for she knows not what she says," He says loudly as he keeps fucking your ass with renewed vigor after hearing you moan in pleasure.'
 						'After a few minutes he suddenly pulls out of your ass and urgently says. "Turn around and kneel."'
-						gs 'arousal', 'anal', 5, 'unknown'
+						gs 'arousal', 'anal', 5
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Turn around and kneel':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/sex/anal6.jpg"></center>'
 							'You turn around, kneeling and opening your mouth. Your knees barely touch the floor before spurts of cum start splattering on your face. Most of his cum ends up on your face but a little ends up in your mouth. He groans out as he squeezes the last drop of cum from his cock. "God forgive us for our sins."'
-							gs 'arousal', 'anal', 5, 'unknown'
+							gs 'arousal', 'anal', 5
 							gs 'cum_call', 'face', 'A166'
 							gs 'arousal', 'end'
 							gs 'stat'

+ 64 - 14
locations/Prostitute.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 				minut += 15
 				gs 'npcgeneratec', 1, 'stoned prostitute', rand(18,28)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 20
 				speedV = 30
 				agilV = 30
@@ -60,7 +60,25 @@ if $ARGS[0] = 'start':
 				prostitutFight = 1
 
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
+
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Prostitute'
+				$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+				opp_def[0] = 30
+				opp_run[0] = 30
+				opp_wrstlng[0] = 20
+				opp_kick[0] = 0
+				opp_punch[0] = 10
+				opp_jab[0] = 10
+				opp_stren[0] = 20
+				opp_agil[0] = 30
+				opp_vital[0] = 50
+				opp_react[0] = 30
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 50
+				opp_shoot[0] = 10
 
 				gt 'fight', 'start'
 			end
@@ -129,7 +147,7 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 0, 'Bandit', rand(18,45)
 								gs 'boyStat', $npclastgenerated
-								!!stats
+								!!stats{
 								strenV = 200
 								speedV = 30
 								agilV = 20
@@ -152,7 +170,25 @@ if $ARGS[0] = 'start':
 								prostitutFight = 2
 
 								if spellavtoklon = 1:klon = 3
-								if spellbefshild = 1:defence = 500
+								if spellbefshild = 1:defence = 500}
+
+								gs 'fight','initFight'
+
+								$opp_name[0] = 'Bandit'
+								$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+								opp_def[0] = 10
+								opp_run[0] = 30
+								opp_wrstlng[0] = 10
+								opp_kick[0] = 0
+								opp_punch[0] = 10
+								opp_jab[0] = 10
+								opp_stren[0] = 200
+								opp_agil[0] = 20
+								opp_vital[0] = 150
+								opp_react[0] = 20
+								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+								opp_willpwr[0] = 100
+								opp_shoot[0] = 10
 
 								gt 'fight', 'start'
 							end
@@ -184,7 +220,7 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 1, 'prostitute', rand(18,28)
 								gs 'boyStat', $npclastgenerated
-								!!stats
+								!!stats{
 								strenV = 50
 								speedV = 50
 								agilV = 40
@@ -207,7 +243,26 @@ if $ARGS[0] = 'start':
 								prostitutFight = 3
 
 								if spellavtoklon = 1:klon = 3
-								if spellbefshild = 1:defence = 500
+								if spellbefshild = 1:defence = 500}
+
+
+								gs 'fight','initFight'
+
+								$opp_name[0] = 'Prostitute'
+								$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+								opp_def[0] = 10
+								opp_run[0] = 50
+								opp_wrstlng[0] = 10
+								opp_kick[0] = 0
+								opp_punch[0] = 10
+								opp_jab[0] = 10
+								opp_stren[0] = 50
+								opp_agil[0] = 40
+								opp_vital[0] = 60
+								opp_react[0] = 30
+								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+								opp_willpwr[0] = 50
+								opp_shoot[0] = 10
 
 								gt 'fight', 'start'
 							end
@@ -255,7 +310,6 @@ if $ARGS[0] = 'start':
 	act 'Go back to the park':
 		cla
 		minut += 5
-		prosta = 0
 		gt 'park', 'start'
 	end
 end
@@ -357,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
 
 		
 
@@ -451,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'
@@ -485,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
@@ -630,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.'
@@ -663,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/Snpc.qsrc

@@ -557,7 +557,7 @@ if numnpc = 16:
 				*clr & cla
 				minut += 15
 				NatDolg -= 500
-				if npcSex[16] = 0:npcSex[16] = 1 & girl += 1
+				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & guy += 1
 				lesbian += 1
 				pcs_horny = 0
 				orgasm += 1

+ 1 - 3
locations/WorkHosp.qsrc

@@ -199,9 +199,7 @@ if $ARGS[0] = '1':
 		'As you lose yourself in pleasure, two doctors come into the room. You are so distracted, that you only notice them when they start to openly masturbate in front of you.'
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
-		
-		if pcs_horny < 50:
-			
+					
 		act 'Leave':
 			gs 'arousal', 'end'
 			gt 'WorkHosp', 'start'

+ 504 - 395
locations/albinahome.qsrc

@@ -1,4 +1,5 @@
 # albinahome
+
 CLOSE ALL
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
@@ -6,147 +7,160 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*clr & cla
 	menu_off = 1
 	frost = 0
+	albroom = rand(1,2)
 	gs 'stat'
-
 	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	''
+	if hour >= 20 and week >= 5 and week < 7:
+		'Albina says that she wants to go to the disco.'
 
-	if hour < 20:
-		if npcSex[23] = 0:
-			'Albina smiles at you affably and says, "<<$pcs_firstname>> I have a bottle of fine wine here, let''s drink."'
-
-			act 'Drink':
+		act 'Say goodbye and go home':gt 'pavResidential'
+		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
+	elseif hour < 20 and npc_sex['A23'] = 0:
+		'Albina smiles at you affably and says, "<<$pcs_firstname>> I have a bottle of fine wine here, let''s drink."'
+		act 'Drink':
+			*clr & cla
+			minut += 15
+			gs 'drugs', 'alcohol', 'wine'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
+			'You sat down at the table while Albina grabs a bottle of wine. She deftly opens the bottle and pours wine in two glasses.'
+			'You drink together with Albina. She smiles and says "Once again, you warned me. They still have a case on me, but they''ll have to work very hard to get enough evidence.'
+			'My father is of course not very happy. His political career was doomed to fail anyway, regardless of what I did or didn''t do."'
+			act 'Ask her how her father reacted when he learned of her business':
 				*clr & cla
 				minut += 15
 				gs 'drugs', 'alcohol', 'wine'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-				'You sat down at the table while Albina grabs a bottle of wine. She deftly opens the bottle and pours wine in two glasses.'
-				'You drink together with Albina. She smiles and says "Once again, you warned me. They still have a case on me, but they''ll have to work very hard to get enough evidence.'
-				'My father is of course not very happy. His political career was doomed to fail anyway, regardless of what I did or didn''t do."'
-
-				act 'Ask her how her father reacted when he learned of her business':
+				'You ask Albina "And how did he react when he found out about your business?"'
+				'Albina laughs and pours more wine in both glasses. "He knew from the beginning."'
+				'Surprised, you look at Albina and ask "How do you know?"'
+				'Laughing, Albina answers "I have a very strange little family, so it''s perhaps not easy for you to understand. Let''s have another drink."'
+				'You sit quietly for a while, sipping on your wine and thinking about what Albina has just told you.'
+				'Suddenly, Albina says: "Actually, my dad is a bastard. If there is a hell, my dad has a special place reserved for him there to atone for what he''s done."'
+				act 'Ask her what she''s talking about':
 					*clr & cla
 					minut += 15
 					gs 'drugs', 'alcohol', 'wine'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-					'You ask Albina "And how did he react when he found out about your business?"'
-					'Albina laughs and pours more wine in both glasses. "He knew from the beginning."'
-					'Surprised, you look at Albina and ask "How do you know?"'
-					'Laughing, Albina answers "I have a very strange little family, so it''s perhaps not easy for you to understand. Let''s have another drink."'
-					'You sit quietly for a while, sipping on your wine and thinking about what Albina has just told you.'
-					'Suddenly, Albina says: "Actually, my dad is a bastard. If there is a hell, my dad has a special place reserved for him there to atone for what he''s done."'
-
-					act 'Ask her what she''s talking about':
+					'You shake your head in amazement, "What are you talking about?"'
+					'Albina suddenly sobers up and her face turns dark and grim. With a hiss she answers:'
+					'"Fine, you want to get into the belly of the beast, be my guest.'
+					'My dad has raped and abused me from an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything.'
+					'When my mother found out, my bastard father went to Durkee. Yes, he even had some connections there.'
+					*nl
+					'The truth is now the scum is losing ground constantly. All his life he was a senior cop, but now that he is retired he doesn''t have any money left. All his businesses went bankrupt.'
+					'His political career is his last chance to get back to where he once was." She stops talking for a few seconds to pour more wine in the glasses, and as she does you can clearly see her hands shaking violently. "You see this rich house? Guard at the entrance, expensive furniture, all this luxury? It''s all a charade. My father isn''t even on the verge of bankruptcy, he is already far beyond. Without my business bringing in money, we would be begging for scraps and sleeping under bridges."'
+
+					act 'Ask her how she knows her father is bankrupt':
 						*clr & cla
 						minut += 15
 						gs 'drugs', 'alcohol', 'wine'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-						'You shake your head in amazement, "What are you talking about?"'
-						'Albina suddenly sobers up and her face turns dark and grim. With a hiss she answers:'
-						'"Fine, you want to get into the belly of the beast, be my guest.'
-						'My dad has raped and abused me from an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything.'
-						'When my mother found out, my bastard father went to Durkee. Yes, he even had some connections there.'
-						'The truth is now the scum is losing ground constantly. All his life he was a senior cop, but now that he is retired he doesn''t have any money left. All his businesses went bankrupt.'
-						'His political career is his last chance to get back to where he once was." She stops talking for a few seconds to pour more wine in the glasses, and as she does you can clearly see her hands shaking violently. "You see this rich house? Guard at the entrance, expensive furniture, all this luxury? It''s all a charade. My father isn''t even on the verge of bankruptcy, he is already far beyond. Without my business bringing in money, we would be begging for scraps and sleeping under bridges."'
+						'You asked Albina "How do you know your fathers businesses are bankrupt?"'
+						'Albina shrugged "I''m just guessing. Dad poured all our assets into his election campaign. We still have some money left, but not much. And now it''s over. My business is gone, and so is his political career. There is only a mountain of debts and bad creditors."'
+						'She grabs the bottle and pours more wine.'
 
-						act 'Ask her how she knows her father is bankrupt':
+						act 'Tell Albina that you didn''t get the whole picture':
 							*clr & cla
 							minut += 15
 							gs 'drugs', 'alcohol', 'wine'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-							'You asked Albina "How do you know your fathers businesses are bankrupt?"'
-							'Albina shrugged "I''m just guessing. Dad poured all our assets into his election campaign. We still have some money left, but not much. And now it''s over. My business is gone, and so is his political career. There is only a mountain of debts and bad creditors."'
-							'She grabs the bottle and pours more wine.'
+							'You murmur "I''m not quite sure I understand everything."'
+							'Albina smirks and says, "What is there to understand. Dad is a pedophile and fucked me ever since I was a child. His connections were enough to cover his tracks."'
+							'She paused and added, "The worst part is, he made me a monster. I just have not had a chance to grow up like a normal person.'
+							'I understand all this, but there''s nothing I can do about it. I like to fuck, and I don''t care with whom. I''m down and out, a pervert not quite capable of being a normal mother and wife."'
+							'The always cold and ironic Albina has tears in her eyes as she pours more wine into your glasses.'
 
-							act 'Tell Albina that you didn''t get the whole picture':
+							act 'Drink':
 								*clr & cla
 								minut += 15
 								gs 'drugs', 'alcohol', 'wine'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-								'You murmur "I''m not quite sure I understand everything."'
-								'Albina smirks and says, "What is there to understand. Dad is a pedophile and fucked me ever since I was a child. His connections were enough to cover his tracks."'
-								'She paused and added, "The worst part is, he made me a monster. I just have not had a chance to grow up like a normal person.'
-								'I understand all this, but there''s nothing I can do about it. I like to fuck, and I don''t care with whom. I''m down and out, a pervert not quite capable of being a normal mother and wife."'
-								'The always cold and ironic Albina has tears in her eyes as she pours more wine into your glasses.'
-
-								act 'Drink':
+								'Once again you sit quietly for a while, sipping your wine.'
+								'After a while Albina speaks again. "Sorry about getting all bleedy. I''m just tired of it all. Anyone would be in this backwater town. Everyone is a bigot here. They all want to shove their dicks down your throat and face-fuck you. But the men rarely want to use their tongues, they just want to get in your pants without permission or excuse. You feel like a piece of meat. And most don''t know anything about giving pleasure, although they all have an ego the size of a planet. And kissing! Almost no one knows how to kiss properly."'
+								'She smiles as she tilts her head towards your face.'
+								gs 'willpower', 'cuni', 'resist', 'medium'
+								if will_cost <= pcs_willpwr:
+									act 'Pull away (<<will_cost>> Willpower)':
+										*clr & cla
+										minut += 5
+										npc_rel['A23'] -= 5
+										gs 'willpower', 'pay', 'resist'
+										gs 'drugs', 'alcohol', 'wine'
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
+										'You pull away from her, not wanting to kiss her. "Sorry I just..." She places her finger to your lips to stop you.'
+										'"It''s ok <<$pcs_nickname>>." You continue to drink some wine but now things feel a little akward and once you finish your glass of wine you put the empty glass down.'
+										'"I should really get going, I''m sorry, I wish I could help." Albina nods her head in understanding. "I will see you later ok?" You tell her.'
+										'She smiles. "Of course, <<$pcs_nickname>>." Then you get up and leave her house.'
+										
+										act 'Continue':gt 'pavResidential'
+									end
+								else
+									act 'Pull away (<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
-									minut += 15
-									gs 'drugs', 'alcohol', 'wine'
+									npc_rel['A23'] += 2
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss2.jpg"></center>'
+									'Unsure if it''s the alcohol or just the fact that she''s so beautiful, you lean towards Albina and pucker your lips.'
+									'She gives you a hot and tender kiss on the lips, and you feel your excitement growing as your skin becomes flush with heat.'
+									gs 'arousal', 'kiss', 2
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-									'Once again you sit quietly for a while, sipping your wine.'
-									'After a while Albina speaks again. "Sorry about getting all bleedy. I''m just tired of it all.'
-									'Anyone would be in this backwater town. Everyone is a bigot here. They all want to shove their dicks down your throat and face-fuck you.'
-									'But the men rarely want to use their tongues, they just want to get in your pants without permission or excuse. You feel like a piece of meat.'
-									'And most don''t know anything about giving pleasure, although they all have an ego the size of a planet.'
-									'And kissing! Almost no one knows how to kiss properly."'
-									'She smiles as she tilts her head towards your face.'
-
 									act 'Kiss':
 										*clr & cla
 										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss2.jpg"></center>'
-										'Unsure if it''s the alcohol or just the fact that she''s so beautiful, you lean towards Albina and pucker your lips.'
-										'She gives you a hot and tender kiss on the lips, and you feel your excitement growing as your skin becomes flush with heat.'
-										gs 'arousal', 'kiss', 5
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kiss2.jpg"></center>'
+										'As you continue kissing Albina, you feel her hand slowly working its way up your inner thigh.'
+										'Reaching your crotch, she moves it gently over the front of your panties before slowly sliding your panties to the side.'
+										'As her fingers begin exploring your pussy, you moan into her mouth and move your hips to give her easier access.'
+										gs 'arousal', 'kiss', 2
+										gs 'arousal', 'vaginal_finger', 2
+										minut -= 5
 										gs 'stat'
-
 										act 'Kiss':
 											*clr & cla
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kiss2.jpg"></center>'
-											'As you continue kissing Albina, you feel her hand slowly working its way up your inner thigh.'
-											'Reaching your crotch, she moves it gently over the front of your panties before slowly sliding your panties to the side.'
-											'As her fingers begin exploring your pussy, you moan into her mouth and move your hips to give her easier access.'
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kiss3.jpg"></center>'
+											'Without breaking your kiss, Albina slowly inserts a finger in your wet vagina, and a rush of pleasure runs through your body.'
+											'As her finger caresses the inside of your pussy, it creates a wet, sloppy sound.'
+											'Albina''s free hand slowly works its way down your body, stopping only to lightly pinch your nipples through your clothing.'
+											'When her hand makes its way down to your legs, she gently pushes them further apart.'
 											gs 'arousal', 'kiss', 5
 											gs 'arousal', 'vaginal_finger', 5
 											minut -= 5
 											gs 'stat'
-
-											act 'Kiss':
+												
+											act 'Spread your legs':
 												*clr & cla
+												if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
+												lesbian += 1
 												gs 'stat'
-												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kiss3.jpg"></center>'
-												'Without breaking your kiss, Albina slowly inserts a finger in your wet vagina, and a rush of pleasure runs through your body.'
-												'As her finger caresses the inside of your pussy, it creates a wet, sloppy sound.'
-												'Albina''s free hand slowly works its way down your body, stopping only to lightly pinch your nipples through your clothing.'
-												'When her hand makes its way down to your legs, she gently pushes them further apart.'
-												gs 'arousal', 'kiss', 5
-												gs 'arousal', 'vaginal_finger', 5
-												minut -= 5
-												gs 'stat'
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lesb.jpg"></center>'
+												'Kneeling down in front of you, Albina begins trailing kisses up your inner thigh.'
+												'As she gets closer and closer to your pussy, you move one hand up to your breasts and begin kneading and pulling on your nipples.'
+												'Soon you feel the warm touch of her lips on your labia, and shudder with pleasure as her tongue finds its way to your clitoris.'
+												*nl
+												'Moaning, you feel a fire begin to burn in your abdomen and you buck your hips to get Albina''s face buried in your pussy.'
+												'Then an intense pleasure overtakes you, and you momentarily lose control of your body. Moaning loudly, you grab hold of Albina''s hair as an intense orgasm washes over you.'
+												'During your orgasm, you black out for a few seconds and when you regain your senses you find yourself sitting next Albina, who''s smiling prettily.'
 												
-												act 'Further':
-													*clr & cla
-
-													if npcSex[23] = 0:npcSex[23] = 1 & girl += 1
-
-													lesbian += 1
-													gs 'stat'
-													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lesb.jpg"></center>'
-													'Kneeling down in front of you, Albina begins trailing kisses up your inner thigh.'
-													'As she gets closer and closer to your pussy, you move one hand up to your breasts and begin kneading and pulling on your nipples.'
-													'Soon you feel the warm touch of her lips on your labia, and shudder with pleasure as her tongue finds its way to your clitoris.'
-													'Moaning, you feel a fire begin to burn in your abdomen and you buck your hips to get Albina''s face buried in your pussy.'
-													'Then an intense pleasure overtakes you, and you momentarily lose control of your body. Moaning loudly, you grab hold of Albina''s hair as an intense orgasm washes over you.'
-													'During your orgasm, you black out for a few seconds and when you regain your senses you find yourself sitting next Albina, who''s smiling prettily.'
-													
-													gs 'arousal', 'kiss', 30
-													$orgasm_or = 'yes'
-													gs 'arousal', 'cuni', 30
-													gs 'arousal', 'end'
-													minut -= 30
-													gs 'stat'
+												gs 'arousal', 'kiss', 30
+												$orgasm_or = 'yes'
+												gs 'arousal', 'cuni', 30
+												gs 'arousal', 'end'
+												minut -= 30
+												gs 'stat'
 													
-													act 'Say goodbye and go home':gt 'pavResidential'
-												end
+												act 'Say goodbye and go home':gt 'pavResidential'
 											end
 										end
 									end
@@ -156,247 +170,152 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 					end
 				end
 			end
+		end
+	elseif albroom = 1
+		if albsporthome = 0:
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
+			'Albina is training in her room, doing some stretching exercises.'
+			act 'Ask why she doesn''t train at the gym.':
+				*clr & cla
+				albsporthome = 1
+				minut += 15
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
+				'Albina smiles at you and says, "I can''t afford to pay the gym, so I have to exercise at home if I want to stay in shape.'
+				'By the way, I could teach you to about stripping and poledancing if you want."'
+				act 'Tell Albina that you don''t want to.':albsportday = daystart & gt 'albinahome'
+				act 'Teach me stripping': gt 'albinahome', 'stripping'
+				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
+			end
 		else
-			if albsporthome = 0:
+			if albsportday ! daystart:
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
 				'Albina is training in her room, doing some stretching exercises.'
-
-				act 'Chat':
-					*clr & cla
-					albsporthome = 1
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
-					'Albina smiles at you and says, "I can''t afford to pay the gym, so I have to exercise at home if I want to stay in shape.'
-					'By the way, I could teach you to about stripping and poledancing if you want."'
-
-					act 'Further':gt 'albinahome'
-				end
-			else
-				if albsportday ! daystart:
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
-					'Albina is training in her room, doing some stretching exercises.'
-					'She smiles at you and asks "Well? Want me to teach you?"'
-
-					act 'Learn striptease (2:00)':
-						cla
-						*clr
-						albsportday = daystart
-						minut += 120
-						fat -= 5
-						agil_exp += rand (1, 3)
-						pcs_mood -= 8
-						gs 'sweat', 'add', 30
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
-						if pcs_inhib < 60:inhib_exp += rand(2,3)
-
-						if pcs_danc >= 40:
-							dancero_exp += rand(2, 10)
-							'Albina taught you how to passionately dance to the music while stripping.'
-
-							if pcs_dancero >= 100:'But you could not learn anything new, you already know everything she could teach you.'
-						else
-							danc_exp += rand(5, 15)
-							'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
-							'Albina recommends that you start with learning to dance.'
-						end
-
-						act 'Rest':gt 'albinahome'
-					end
-					if pcs_stren >= 40 and pcs_dancero > 50:
-						act 'Learn poledancing (2:00)':
-							cla
-							*clr
-							albsportday = daystart
-							if pcs_inhib < 60:inhib_exp += rand(2,3)
-							timemult = 8
-							loopcount = 1
-							:timeloop1
-							gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp', 'dancpol_exp'
-							if loopcount < timemult: loopcount += 1 & jump 'timeloop1'
-							loopcount = 0
-							timemult = 0
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/poledance.jpg"></center>'
-
-							'Albina taught you various acrobatic moves on the pole.'
-
-							if pcs_dancpol >= 100:
-								'You could not learn anything new, you already know everything she could teach you.'
-							end
-
-							act 'Rest':gt 'albinahome'
-						end
-					elseif pcs_stren < 40:
-						'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
-
-						act 'Develop strength (2:00)':
-							*clr & cla
-							albsportday = daystart
-							timemult = 8
-							loopcount = 1
-							:timeloop2
-							gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp'
-							if loopcount < timemult: loopcount += 1 & jump 'timeloop2'
-							loopcount = 0
-							timemult = 0
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
-							'Albina shows you how to develop your strength using various exercises.'
-
-							act 'Rest':gt 'albinahome'
-						end
-					end
-
-					act 'Tell Albina that you are not in the mood':albsportday = daystart & gt 'albinahome'
-				elseif albsportday = daystart:
-					if pcs_sweat <= 20:
-						if pcs_hairbsh <= 0:
-							pcs_hairbsh = 1
-							gs 'stat'
-							'Looking at your tousled hair, Albina smiles, picks up a comb and proceeds to do your hair.'
-						end
-
-						if albdinday ! daystart:
-							albdinday = daystart
-							temp = rand(0, 3)
-
-							if temp = 0:
-								'Albina offers to play a video game.'
-
-								gt 'albinahome', 'game'
-							elseif temp = 1:
-								'Albina offers to try on clothes with her.'
-
-								gt 'albinahome', 'dressing'
-							elseif temp = 2:
-								'Albina offers to chat.'
-
-								gt 'albinahome', 'chat'
-							else
-								'Albina offers a glass of wine.'
-
-								gt 'albinahome', 'vine'
-							end
-						end
-					elseif pcs_sweat > 20:
-						'Albina grins and says, "Go take a shower <<$pcs_nickname>>, you are all sweaty now."'
-
-						act 'Get in the shower (0:15)':
-							*clr & cla
-							noShampoo = 1
-							dynamic $showerdin
-							minut += 15
-							! WD: Remove old Cheat code
-							pcs_horny += 1
-							pcs_hairbsh = 0
-							pcs_makeup = 1
-							if frost > 0:frost = 0
-
-							gs 'stat'
-							'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-							'You get in the shower and begin to lather your body with a washcloth, and then shampoo your hair.'
-							'After washing off the soap and rinsing off the shampoo you feel completely clean.'
-							if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-							act 'Get out of the shower':gt 'albinahome'
-						end
-					end
-				end
+				'She smiles at you and asks "Well? Want me to teach you?"'
+				act 'Tell Albina that you don''t want to.':albsportday = daystart & gt 'albinahome'
+				act 'Teach me stripping': gt 'albinahome', 'stripping'
+				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
 			end
 		end
+	elseif albroom = 2
+		*clr & cla
+		menu_off = 1
+		minut += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Just chat': gt 'albinahome', 'chat'
+		act 'Talk about video games': gt 'albinahome', 'game'
+		act 'Talk about clothes': gt 'albinahome', 'dressing'
 	end
+end
 
-	if hour >= 20 and week >= 5 and week < 7:
-		'Albina says that she wants to go to the disco.'
-
-		if money >= 25:act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
+if $ARGS[0] = 'stripping':
+	*clr & cla
+	albsportday = daystart
+	minut += 120
+	fat -= 5
+	agil_exp += rand (1, 3)
+	npc_rel['A23'] += 1
+	gs 'sweat', 'add', 30
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
+	if pcs_inhib < 60:inhib_exp += rand(2,3)
+
+	if pcs_danc >= 40:
+		dancero_exp += rand(2, 10)
+		'Albina taught you how to passionately dance to the music while stripping.'
+
+		if pcs_dancero >= 100:'But you could not learn anything new, you already know everything she could teach you.'
+	else
+		danc_exp += rand(5, 15)
+		'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
+		'Albina recommends that you start with learning to dance.'
 	end
-
 	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Rest':gt 'albinahome'
 end
 
-if $ARGS[0] = 'game':
-	act 'Play':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood += 15
-		pcs_willpwr += 20
-		react_exp += rand(0, 1)
+if $ARGS[0] = 'poledancing':
+	*clr & cla
+	albsportday = daystart
+	npc_rel['A23'] += 1
+	if pcs_stren >= 40 and pcs_dancero > 50:
+		if pcs_inhib < 60:inhib_exp += rand(2,3)
+		timemult = 8
+		loopcount = 1
+		:timeloop1
+		gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp', 'dancpol_exp'
+		if loopcount < timemult: loopcount += 1 & jump 'timeloop1'
+		loopcount = 0
+		timemult = 0
 		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/poledance.jpg"></center>'
+		'Albina taught you various acrobatic moves on the pole.'
+		if pcs_dancpol >= 100: 'You could not learn anything new, you already know everything she could teach you.'
 
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
-		'You and Albina laid down in front of a huge TV with a set-top box.'
-		'Albina turned on the game and you started playing together with her.'
-
-		if albsexday = daystart:
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Rest':gt 'albinahome'
+	elseif pcs_stren < 40 and pcs_dancero > 50:		
+		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
+		act 'Develop strength (2:00)':
+			*clr & cla
+			timemult = 8
+			loopcount = 1
+			:timeloop2
+			gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp'
+			if loopcount < timemult: loopcount += 1 & jump 'timeloop2'
+			loopcount = 0
+			timemult = 0
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
+			'Albina shows you how to develop your strength using various exercises.'
 			act 'Rest':gt 'albinahome'
+			act 'Say goodbye and go home':gt 'pavResidential'
+		end
+	else		
+		minut += 120
+		fat -= 5
+		agil_exp += rand (1, 3)
+		gs 'sweat', 'add', 30
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
+		if pcs_inhib < 60:inhib_exp += rand(2,3)
+		'Albina grins "You''re still can''t strip well enough for poledancing, we should practice that first."'
+		if pcs_danc >= 40:
+			dancero_exp += rand(2, 10)
+			'Albina taught you how to passionately dance to the music while stripping.'
+
+			if pcs_dancero >= 100:'But you could not learn anything new, you already know everything she could teach you.'
 		else
-			'Albina winks at you and says "<<$pcs_firstname>>, let''s have a wager. If I win, I can do anything I want with you, and if you win you can do anything you want with me"'
-
-			act 'Refuse':gt 'albinahome'
-
-			act 'Bring it on':
-				*clr & cla
-				albsexday = daystart
-
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
-
-				temp = rand(1, 100)
-				if pcs_react >= 75 and temp >= 40:
-					albplay = 1
-				elseif pcs_react >= 50 and temp >= 50:
-					albplay = 1
-				elseif pcs_react >= 25 and temp >= 75:
-					albplay = 1
-				else
-					albplay = 0
-				end
-
-				if albplay = 0:
-					'Although you tried your best, Albina proved a worthy opponent. Laughing like the villain of a theater play, she slaps you on the ass with the palm of her hand, saying "Show me your ass, <<$pcs_firstname>>! You are my bitch now!"'
-
-					if rand(0, 1) = 0:
-						gt 'albinahome', 'vag_strapon'
-					else
-						gt 'albinahome', 'anal_strapon'
-					end
-				else
-
-					'Looking slightly disappointed, Albina hands you a strap-on. "On, Bey do not regret Chapaya."'
-
-					gt 'albinahome', 'akt_vag'
-					gt 'albinahome', 'akt_anal'
-				end
-			end
+			danc_exp += rand(5, 15)
+			'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
+			'Albina recommends that you start with learning to dance.'
 		end
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Rest':gt 'albinahome'
 	end
 end
 
-
 if $ARGS[0] = 'dressing':
 	act 'Go try on some clothes':
 		*clr & cla
 		minut += 60
-		pcs_mood += 20
-		pcs_willpwr += 20
+		pcs_mood += 10
+		pcs_willpwr += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/dressing.jpg"></center>'
 		'You and Albina open her huge wardrobe and begin digging into her various dresses.'
 		'As you rummage around in her wardrobe, you are amazed by how many different clothes she can fit in there. It feels like her wardrobe is a bottomless pit filled with dresses, leggings, jeans, and all kinds of other clothes!'
 		'You end up spending an hour trying on various dresses with Albina.'
-
-		if albsexday ! daystart:
-			act 'Rest':gt 'albinahome'
-		elseif albsexday = daystart:
-			act 'Rest':gt 'albinahome'
-		end
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Chat some': gt 'albinahome', 'chat'
+		act 'Talk about video games': gt 'albinahome', 'game'
 	end
 end
 
@@ -404,132 +323,322 @@ if $ARGS[0] = 'chat':
 	act 'Chat':
 		*clr & cla
 		menu_off = 1
-		minut += 60
-		pcs_mood += 10
-		pcs_willpwr += 20
+		minut += 20
+		pcs_mood += 5
+		pcs_willpwr += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-		'You chat with Albina.'
-
-		if albsexday ! daystart:
-			act 'Rest':gt 'albinahome'
-		elseif albsexday = daystart:
-			act 'Rest':gt 'albinahome'
-		end
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'You chat with Albina about school, love interest, family, makeup up, even the latest tv shows or movies you have watched.'
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Keep chatting': gt 'albinahome', 'chat'
+		act 'Talk about video games': gt 'albinahome', 'game'
+		act 'Talk about clothes': gt 'albinahome', 'dressing'
 	end
 end
 
-if $ARGS[0] = 'vine':
-	act 'Drink wine':
+if $ARGS[0] = 'game':
+	*clr & cla
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'Having noticed the big flat screen tv and both a x-box and playstation in front of it, with a rows of video games just under the tv you decide to comment on it. "You have a lot of games, I wish I could afford a console."'
+	'She smiles to you. "Do you want to play some?"'
+	act 'No':
 		*clr & cla
 		menu_off = 1
-		minut += 60
-		gs 'drugs', 'alcohol', 'wine'
+		minut += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-		'You drink a glass of wine with Albina.'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'You shake your head no. "Not right now, thanks. I was just noticed all of them is all, maybe some other time."'
+		'She shrugs. "Sure if you ever want to, all you have to do is ask."'
+		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Just chat': gt 'albinahome', 'chat'
+		act 'Talk about clothes': gt 'albinahome', 'dressing'
+	end
+	act 'Yes':
+		*clr & cla
+		menu_off = 1
+		minut += 30
+		pcs_mood += 15
+		react_exp += rand(0, 1)
+		pcs_gaming_exp += rand(1, 2)
+		npc_rel['A23'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
+		if gamebet = 1:
+			'You and Albina lay down in front of a huge flat screen TV, after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
+			act 'Accept the bet': gt 'albinahome', 'game_bet'
+			gs 'willpower', 'sex', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse the bet (<<will_cost>> Willpower)':
+					*clr & cla
+					menu_off = 1
+					minut += 60
+					pcs_mood += 15
+					react_exp += rand(0, 1)
+					pcs_gaming_exp += rand(1, 2)
+					npc_rel['A23'] -= 1
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'You shake your head no. "Not this time, maybe next time.."'
+					'You can tell she is a little disappointed, but then turns her attention to the game instead. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
+					'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
+					act 'Say goodbye and go home':gt 'pavResidential'
+				end
+			else
+				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You and Albina lay down in front of a huge flat screen TV, after picking one of the games. The two of you play as you chat about varies things and trash talk, though neither one of you is giving your full attention to the game, instead you are just having fun together.'
+			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Keep playing video games': gt 'albinahome', 'playgame'
+			act 'Just chat': gt 'albinahome', 'chat'
+			act 'Talk about clothes': gt 'albinahome', 'dressing'
+		end
+	end
+end
 
-		if albsexday ! daystart:
-			act 'Rest':gt 'albinahome'
-		elseif albsexday = daystart:
-			act 'Rest':gt 'albinahome'
+if $ARGS[0] = 'playgame':
+	*clr & cla
+	menu_off = 1
+	minut += 30
+	pcs_mood += 15
+	react_exp += rand(0, 1)
+	pcs_gaming_exp += rand(1, 2)
+	npc_rel['A23'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
+	'The two of you keep playing video games and trash talking each other, even bumping each other to try and screw the other one up, but neither of you are still taking it all that seriously though. Mostly you just laugh at the silly mistakes you both make while only partially paying attention to the game.'
+	if hotcat >= 5:
+		'Once you finished the last game. Albina turns towards you instead of starting another one. "How about we see who is actually better and actually try and win." She says with a confident smile.'
+		'You laugh at that and nods. "Sure but you are so going down."'
+		'She laughs in response. "You''re that sure? Then how about we make it interesting then?"'
+		'You arch you brow a bit curious. "Just what do you have in mind?"'
+		'She gives you a big grin, then gets up and goes over to her dresser and rummages around in it for a moment before lifting out a strapon harness with a attached dildo. "The winner gets to use this on the loser how ever they want."'
+		
+		gs 'willpower', 'sex', 'resist', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse the bet (<<will_cost>> Willpower)':
+				*clr & cla
+				menu_off = 1
+				minut += 60
+				pcs_mood += 15
+				react_exp += rand(0, 1)
+				pcs_gaming_exp += rand(1, 2)
+				npc_rel['A23'] -= 2
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'You shake your head no. "Uh that''s ok. I really am not intersted in that."'
+				'Albina puts the strapon away, but you can tell she is a little disappointed. Then she comes back over and lays down beside you again. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
+				'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
+				act 'Say goodbye and go home':gt 'pavResidential'
+			end
+		else
+			act 'Refuse the bet (<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 the bet': gt 'albinahome', 'game_bet'
+	else
+		'Albina turns to you. "So want to lose again?"'
+		'You shove her gently. "Oh please I was winning."'
+		act 'Keep playing video games': gt 'albinahome', 'playgame'
+		act 'Just chat': gt 'albinahome', 'chat'
+		act 'Talk about clothes': gt 'albinahome', 'dressing'
+		act 'Say goodbye and go home':gt 'pavResidential'	
 	end
 end
 
-if $ARGS[0] = 'vag_strapon':
-	act 'Get on all fours':
+if $ARGS[0] = 'game_bet':
+	*clr & cla
+	menu_off = 1
+	gamebet = 1
+	minut += 30
+	pcs_mood += 15
+	react_exp += rand(0, 1)
+	pcs_gaming_exp += rand(1, 2)
+	npc_rel['A23'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
+	'You give her your most confident look. "You''re on and you are so going to get fucked."'
+	'Albina laughs at that as she brings the strapon over and a bottle of lube, playing it on the floor, as she lays back down beside you and picks the control up. "Please you are so going to lose." She starts the game and you both focus on just the game trying as hard as you both can to be the winner.'
+	act 'Play until someone wins':
 		*clr & cla
 		menu_off = 1
-		albsexday = daystart
-		gs 'boystat', 'A23'
-
-		if pcs_vag < 10:gs 'boyStat', 'D1'
-		if pcs_vag >= 10:gs 'boyStat', 'D<<pcs_vag/7>>'
-		npc_sex['A23'] += 1
-		lesbian += 1
-		straponVagPass += 1
+		gameresult = rand(1, 100) + pcs_gaming
+		if gameresult >= 150:
+			albplay = 3
+		elseif gameresult  >= 100:
+			albplay = 2
+		elseif gameresult  >= 75:
+			albplay = 1
+		else
+			albplay = 0
+		end
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/strapon.jpg"></center>'
-		'Albina takes a <<dick>> cm strap-on harness and attaches it to herself.'
-		'Having strapped herself in, you feel her hands gently stroking the inside of your thighs, slowly working their way to your pussy.'
-		gs 'dinsex2', 'd_strapon_vag', 15, 'sub', 'lesbian'
-		act 'Rest':gt 'albinahome'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
+		if albplay = 3:
+			'You complete trounce her, she isn''t even close to you in score. Before the end she finally gives a exacerbated sigh and tosses the control down giving up, knowing she has no chance of beating you, you give her a gloating smirk. She reaches over and grabs the strapon harness and hands it to you. You grin as you start putting the harness on and she starts taking off her clothes.'
+			act 'Fuck her with the strapon': gt 'albinahome', 'wear_strapon'
+		elseif albplay = 2:
+			'It is really close it could go either way, but finally at the end you just manage to do better than her and win the game. "Yes!" You exclaim as you just manage to beat her and taunt her a little. She laughs a little at that but reaches over and grabs the strapon harness and hands it to you. You grin as you start putting the harness on and she starts taking off her clothes.'
+			act 'Fuck her with the strapon': gt 'albinahome', 'wear_strapon'
+		elseif albplay = 1:
+			'Although you tried your best, Albina proved a worthy opponent and manages to just barely beat you at the end. Laughing like the villain of a theater play, she slaps you on the ass with the palm of her hand, saying "Show me your ass, <<$pcs_nickname>>! You are my bitch now!" Well a bets a bet, you start talking off your clothes as she start putting the harness on.'
+			act 'Get fucked by a strapon': gt 'albinahome', 'receive_strapon'
+		elseif albplay = 0:
+			'Although you tried your best, Albina is just simply outplays you at every turn. You really stand no chance and she easily beats you. Laughing like the villain of a theater play, she slaps you on the ass with the palm of her hand, saying "Show me your ass, <<$pcs_nickname>>! You are my bitch now!" Well a bets a bet, you start talking off your clothes as she start putting the harness on.'
+			act 'Get fucked by a strapon': gt 'albinahome', 'receive_strapon'
+		end
 	end
 end
 
-if $ARGS[0] = 'anal_strapon':
-	act 'Get on all fours':
+if $ARGS[0] = 'wear_strapon':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
+	'With the strapon firmly in place you get on the bed with her and pull her head down to the dildo. "Suck my dick, like a good little slut." You tell her with a giggle.'
+	'She gets down on all fours and takes the dildo in her mouth and starts sucking on it and stroking the shaft with one hand. It looks like she has had a lot of practice sucking on things. You spend several minutes making her suck on the dildo, getting it nice and wet with her slobber.'
+	gs 'arousal', 'foreplay', 5, 'lesbian'
+	gs 'stat'
+	act 'Fuck her pussy':
 		*clr & cla
-		menu_off = 1
-		albsexday = daystart
-		gs 'boystat', 'A23'
-		if pcs_ass < 10: gs 'boyStat', 'D1'
-		if pcs_ass >= 10:gs 'boyStat', 'D<<pcs_ass/7>>'
-		npc_Sex['A23'] += 1
-		lesbian += 1
-		straponAnalPass += 1
+		gs 'boyStat', 'D3' 
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/analstrapon.jpg"></center>'
-		'Albina takes a <<dick>> cm strap-on harness and attaches it to herself.'
-		'Having strapped herself in, you feel her hands gently stroking your butt, slowly working their way to your anus.'
-		gs 'dinsex2', 'd_strapon_anal', 15, 'sub', 'lesbian'
-
-		act 'Rest':gt 'albinahome'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag1.jpg"></center>'
+		'You pull away till the dildo slides out of her mouth and then you lay on your back. "Come on and ride''m cowgirl." You tell her, she crawls up and straddles you, lowering herself down until the <<dick>>cm <<$dick_girth>> dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding your slow but start to slowly pick up speed as she starts moaning louder and louder.'
+		gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
+		gs 'stat'
+		act 'Fuck her ass': gt 'albinahome', 'fuck_ablina_ass'
+		act 'Ride it like you mean it':
+			*clr & cla 
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag2.jpg"></center>'
+			'You slap her on the ass. "Come on Albina, ride it like you mean it." You tell her. With your encouragement she starts really riding you hard and fast, moaning louder and louder until several minutes later she cries out in ecstasy and nearly collapses on you as a orgasm shakes her body. Once the shudders pass she gives you a huge smile, obviously having enjoyed herself very much.'
+			gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
+			gs 'stat'
+			act 'Fuck her ass': gt 'albinahome', 'fuck_ablina_ass'
+			act 'Finish': gt 'albinahome', 'strapon_finish'
+		end
 	end
+	act 'Fuck her ass': gt 'albinahome', 'fuck_ablina_ass'
 end
 
-if $ARGS[0] = 'akt_vag':
-	act 'Put Albina on all fours and fuck her pussy':
+if $ARGS[0] = 'fuck_ablina_ass':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'boyStat', 'D3' 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal1.jpg"></center>'
+	'You slap her on the butt. "Get up and get on all fours, I''m not finished with you yet." She arches a brow at that but does as you command. She gets up on all fours. You grab the bottle of lube she had brought it and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick and well lubricated.'
+	'You kneel down behind her and line the head of the dildo up with her asshole and then push forward. There is a bit of resistance but with a little more pressure the <<dick>>cm <<$dick_girth>> dildo pops into her ass. Causing her to moan and groan in a mixture of pain and pleasure. You start off slow, taking slow shallow strokes, as her groans of pain turn into moans of pleasure you take deeper and faster strokes. After a bit you pull out of her ass, she looks back over her shoulder obviously wondering why you stopped.'
+	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
+	gs 'stat'
+	act 'Finish': gt 'albinahome', 'strapon_finish'
+	act 'Keep fucking her ass':
 		*clr & cla
-		menu_off = 1
-		albsexday = daystart
-
-		if npcSex[23] = 0:npcSex[23] = 1 & girl += 1
-		straponVagAkt += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/straponakt.jpg"></center>'
-		'You begin gently probing Albina''s nether regions with the strap-on, and soon enough she''s moaning and bucking her hips.'
-		'Deciding it''s time to give her the real deal, you spit on your plastic phallus, give it a nice rub to coat it in saliva and line it up with Albina''s pussy.'
-		'As you enter her, you can see her tense up from pleasure and hear soft moans escape her mouth.'
-		'Slowly ramping up the speed of your thrusts, Albina''s moans get louder and louder and her butt moves in rhythm with you as she nears orgasm.'
-		'Finally Albina cums. Trying to stifle a scream, she grabs on to the sheets and shoves her face down into them as her body shakes slightly from the intense pleasure.'
-		'Done dispensing your punishment, you climb out of the strap-on harness and lie down next to Albina for a few seconds to catch your breath.'
-		
-		gs 'arousal', 'anal_strap_give', 15, 'dom', 'lesbian'
-		gs 'arousal', 'end'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal2.jpg"></center>'
+		'You can tell by the way she looks at you, that she wants you to keep fucking her butt. So you slide the dildo back in and this time it slides in easily, making her moan in pleasure. You grab onto her hips and start giving her full length balls deep strokes, filling her ass completely with the dildo. Several minutes of this gets her crying out, as her body is rocked by a intense orgasm. You keep fucking her throughout the whole orgasm only stopping and pulling out once her shudders have passed.'
+		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
-		act 'Rest':gt 'albinahome'
+		act 'Finish': gt 'albinahome', 'strapon_finish'
 	end
 end
 
-if $ARGS[0] = 'akt_anal':
-	act 'Put Albina on all fours and fuck her ass':
+if $ARGS[0] = 'receive_strapon':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
+	'You strip off your clothes while she tightens the straps on the strapon, with the strapon firmly in place you get on the bed with her and she pulls your head down to the dildo. "Suck my dick." She commands.'
+	'You get down on all fours and takes the dildo in your mouth and start sucking on it, while stroking the shaft with one hand. "You look like you have done this a lot before <<$pcs_nickname>>, your a real pro at sucking cock." You spend several minutes sucking on the dildo, getting it nice and wet with your slobber. Then she pulls it out of your mouth. "Ok I want to fuck you now!"'
+	gs 'arousal', 'foreplay', 5, 'lesbian'
+	gs 'stat'
+	if pcs_vag = 0: 
+		act 'Tell her you''re a virgin':
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
+			'You blush deeply at her comment. She seems to notice. "What is it?" She asks you.'
+			'Blushing even more you tell her. "I''m still a virgin."'
+			'She looks surprised at this. "Oh... well I can just fuck your ass if you want." Then pauses and grins. "Unless you want me to pop your cherry that is."'
+			act 'Just fuck my ass': gt 'albinahome', 'ablina_ass_fucks_you'
+			act 'Pop my cherry':
+				*clr & cla
+				gs 'boyStat', 'D3' 
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
+				'She nods "Ok don''t worry I will be gentle, since it is your first time. Lay on your back and spread you legs." You do as she commands, she scoots up between your legs and rubs your pussy with her fingers a bit to make sure it is wet enough. She adds a little lube to the dildo anyways, before she guides it to your slit. You feel the dildo rubbing against your slit causing it to open a bit. Then she gentle and slowly slide the <<dick>>cm <<$dick_girth>> dildo in your virgin pussy, it hurts and feels great at the same time. You moan a bit as she slowly fucks your pussy. After a bit it starts to feel better and hurt less but it still hurts a little. Then she stops. "Ok that''s enough, don''t want to wear it out the first time, but I''m not finished with you. Roll over so I can fuck that tight little butt of yours."'
+				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
+				gs 'stat'
+				act 'Take it up the ass': gt 'albinahome', 'ablina_ass_fucks_you'
+			end
+		end
+	else
+		act 'Get your pussy fucked':
+			*clr & cla
+			gs 'boyStat', 'D3' 
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
+			'"Lay on your back and spread you legs." You do as she commands, she scoots up between your legs and rubs your pussy with her fingers a bit to make sure it is wet enough, before she guides it to your slit. You feel the dildo rubbing against your slit causing it to open a bit. Then she gentle and slowly slide the <<dick>>cm <<$dick_girth>> dildo in your pussy. You moan a bit as she slowly fucks your pussy. As you start to moan louder she starts fucking you a little faster.'
+			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
+			gs 'stat'
+			act 'Keep getting your pussy fucked':
+				*clr & cla 
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
+				'She reads your body well, she fucks you harder and faster the more you moan, but when it starts to get a little rough she backs off a bit. She then just fucks you at a near perfect rhythm, you can feel youself getting wetter and wetter. Then she stops. "Ok that''s enough that, but I''m not finished with you just yet. Roll over so I can fuck that tight little butt of yours."'
+				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
+				gs 'stat'
+				act 'Take it up the ass': gt 'albinahome', 'ablina_ass_fucks_you'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'ablina_ass_fucks_you':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'boyStat', 'D3' 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal1.jpg"></center>'
+	'As you roll over onto all fours you glance back and see her applying lube to the dildo. She squirts plenty on the dildo and strokes the shaft with it, getting it nice and lubed up. Then she rubs the excess lube off her hand onto your asshole. Once both the dildo and your anus is lubed up, she knee walks up behind you, you feel the tip of the dildo press against your anus a few moments later. The pressure builds up into the tip pops into your ass causing your to groan slightly in pain. She slowly starts to sroke the <<dick>>cm <<$dick_girth>> dildo up your butt, steadily working it just a little deeper with each stroke.'
+	gs 'arousal', 'anal_strap', 5, 'lesbian'
+	gs 'stat'
+	act 'Get your ass ploughed':
 		*clr & cla
-		menu_off = 1
-		albsexday = daystart
-		if npcSex[23] = 0:npcSex[23] = 1 & girl += 1
-		straponVagAkt += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/straponaktanal.jpg"></center>'
-		'You begin gently kneading Albina''s butt, letting your hands roam all over her supple butt-cheeks and grazing her tight anus.'
-		'As you explore her bum, you realize her anus might be too tight for the strap-on. You lick your index finger and insert it in Albina''s anus. Slowly pushing your finger further in, you can hear her moaning softly.'
-		'As you finger-fuck Albina''s anus, you slowly introduce more and more fingers until three of your fingers are inside her.'
-		'Deciding it''s time to give her the real deal, you spit on your plastic phallus, give it a nice rub to coat it in saliva and line it up with Albina''s anus.'
-		'As you enter her, you can see her tense up from pleasure and hear soft moans escape her mouth. You notice she is gently rubbing her clitoris with one of her hands.'
-		'Slowly ramping up the speed of your thrusts, Albina''s moans get louder and louder and her butt moves in rhythm with you as she nears orgasm.'
-		'Finally Albina cums. Trying to stifle a scream, she grabs on to the sheets and shoves her face down into them as her body shakes slightly from the intense pleasure.'
-		'Done dispensing your punishment, you climb out of the strap-on harness and lie down next to Albina for a few seconds to catch your breath.'
-		
-		gs 'arousal', 'anal_finger_give', 15, 'lesbian'
-		gs 'arousal', 'anal_strap_give', 15, 'dom', 'lesbian'
-		gs 'arousal', 'end'
-		minut -= 15
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal2.jpg"></center>'
+		'After you seem to be use to the dildo all the way up you ass, she stands up over you and starts getting harder and faster with the ass fucking she is giving you. When it starts getting a little to rough she seems to notice and backs off just a little and then gets into a nice rhythm of slaming the dildo up your butt. Just as it is starting to hurt a little she suddenly stops and pulls out of you. "You was such a good little butt slut <<$pcs_nickname>>" She tells you as she takes off the harness, apparently finished with you.'
+		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'stat'
-		
-		act 'Rest':gt 'albinahome'
+		act 'Finish': gt 'albinahome', 'strapon_finish'
 	end
 end
 
+if $ARGS[0] = 'strapon_finish':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+	'Once finished the two of you meet for a long passionate kiss. With the moment passed the two of you start to get dressed again, she takes the strapon and cleans it up as well. Not long after the two of you finish getting cleaned up and dressed her phone buzzes. She looks at it obviously reading a text message, she frowns a bit. "Sorry I need to go <<$pcs_nickname>>, catch you later ok."'
+	'You nod in understanding. "Sure not a problem, I had fun, see you later." With that you to share a quick final kiss before you leave.'
+	gs 'arousal', 'foreplay', 5, 'lesbian'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Say goodbye and go home':gt 'pavResidential'
+end
+
+
 --- albinahome ---------------------------------
 

+ 6 - 6
locations/artgar.qsrc

@@ -24,8 +24,8 @@ if apmeet = 0:
 	act 'Stay on your back':
 		*clr & cla
 		minut += 15
-		if npcSex[2] = 0:npcSex[2] = 1 & guy += 1
-		if npcSex[6] = 0:npcSex[6] = 1 & guy += 1
+		if npc_Sex['A2'] = 0: npc_Sex['A2'] = 1 & guy += 1
+		if npc_Sex['A6'] = 0: npc_Sex['A6'] = 1 & guy += 1
 		cumface += 2
 		facial += 1
 		gs 'pain', 1, 'eyes', 'burn'
@@ -73,8 +73,8 @@ elseif apmeet = 1:
 
 		act 'Give them a blowjob':
 			*clr & cla
-			if npcSex[2] = 0:npcSex[2] = 1 & guy += 1
-			if npcSex[6] = 0:npcSex[6] = 1 & guy += 1
+			if npc_Sex['A2'] = 0: npc_Sex['A2'] = 1 & guy += 1
+			if npc_Sex['A6'] = 0: npc_Sex['A6'] = 1 & guy += 1
 			cumface += 2
 			facial += 1
 			gs 'arousal', 'bj', 10, 'sub', 'humiliation', 'group'
@@ -156,8 +156,8 @@ elseif apmeet = 2:
 					pcs_hydra += 20
 					spafinloc = 12
 					gs 'cum_manage'
-					if npcSex[2] = 0:npcSex[2] = 1 & guy += 1
-					if npcSex[6] = 0:npcSex[6] = 1 & guy += 1
+					if npc_Sex['A2'] = 0: npc_Sex['A2'] = 1 & guy += 1
+					if npc_Sex['A6'] = 0: npc_Sex['A6'] = 1 & guy += 1
 					gs 'arousal', 'bj', 10, 'sub', 'humiliation', 'group', 'rough', 'deepthroat', 'bound'
 					gs 'arousal', 'end'
 					gs 'pain', 2, 'throat', 'stretch'

+ 20 - 2
locations/bass.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'a':
 			cla
 			pcs_horny += 10
 			gs 'boyStat', 'A40'
-			!!stats
+			!!stats {
 			strenV = 300
 			speedV = 100
 			agilV = 100
@@ -102,7 +102,25 @@ if $ARGS[0] = 'a':
 			klonV = 5
 			defenceV = 800
 
-			if spellavtoklon = 1:klon = 3
+			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'
 		end

+ 5 - 5
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,7 +44,7 @@ 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.'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'sarai':
 						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.'
@@ -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.'

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

+ 1 - 1
locations/dimaEv.qsrc

@@ -1,6 +1,6 @@
 # dimaEv
 
-!!files that can be deleted dima, dimagohome2, dimahome, dimkawarning, dimaev, dimaRudeEV
+!!needs a revamp to add options and choices add willpower then. unable to as their is no choices currently.
 
 menu_off = 1
 

+ 354 - 279
locations/dimaHome.qsrc

@@ -210,8 +210,7 @@ if $ARGS[0] = 'bathroom2':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the bath.'
 
 			act '"Wash" your pussy':
-				cla
-				*clr
+				*clr & cla
 				if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
 				minut += 10
 
@@ -221,7 +220,6 @@ if $ARGS[0] = 'bathroom2':
 
 				if pcs_inhib < 30:inhib_exp += rand(1,3)
 				pcs_mood += 15
-				pcs_willpwr += 15
 				$orgasm_or = 'yes'
 				gs 'arousal', 'masturbate', 10
 				gs 'arousal', 'end'
@@ -258,7 +256,7 @@ if $ARGS[0] = 'dimkaroom':
 		'Dimka''s room is surprisingly clean and organized for a boy, you think. The decorations are fairly tasteful and every object has an air of quality about it. Along one wall next to the bed is a wardrobe with mirrored doors, a small zebra pattern love seat sits along a wall near the bed. Next to the love seat is a mini fridge and just above that on a shelf is a high-end stereo system. There is also a fancy, masculine desk with a top-of-the-line computer setup on it and a laptop lying nearby as well. You can''t help but wonder how expensive it all is. Sitting at the desk is Dimka, he turns to face you as you enter the room.'
 		act 'Talk to Dimka':gt 'dimaHome','dimka_chat'
 		act 'Look around':
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 10
 			'<center><b><font color = maroon>Dimka''s room</font></b></center>'
@@ -581,18 +579,24 @@ if $ARGS[0] = 'study3':
 				'"That sounds like you''re really enjoying yourself. But if you excuse me now I have to go back to work. I have some important stuff that need some serious planning..." he tells you.'
 				act 'Goodbye':gt 'dimaHome','hallway'
 			end
-			act 'Not his business':
-				*clr & cla
-				minut += 1
-				gs 'stat'
-				'<center><h4><font color="maroon">Study</font></h4></center>'
-				'<center><img  src="images/characters/pavlovsk/resident/leonid/leonid.jpg"></center>'
-				'You cross your arms, "That''s something I would like to keep to myself and I don''t want to talk about it with you."'
-				'Leonid has noticed that he crossed the line and backs off, "Aren''t you feisty. If you don''t feel talking about it, don''t worry we don''t have to."'
-				'By now the whole situation is getting awkward and you just want to leave the room, "I need to head out now. I had a pleasant time talking to you."'
-				'Leonid, dejected, "I understand. I hope I didn''t make things too awkward between us. Come visit me whenever you like."'
-				act 'Goodbye':gt 'dimaHome','hallway'
-			end
+			gs 'willpower', 'misc', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Not his business (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					minut += 1
+					gs 'stat'
+					'<center><h4><font color="maroon">Study</font></h4></center>'
+					'<center><img  src="images/characters/pavlovsk/resident/leonid/leonid.jpg"></center>'
+					'You cross your arms, "That''s something I would like to keep to myself and I don''t want to talk about it with you."'
+					'Leonid has noticed that he crossed the line and backs off, "Aren''t you feisty. If you don''t feel talking about it, don''t worry we don''t have to."'
+					'By now the whole situation is getting awkward and you just want to leave the room, "I need to head out now. I had a pleasant time talking to you."'
+					'Leonid, dejected, "I understand. I hope I didn''t make things too awkward between us. Come visit me whenever you like."'
+					act 'Goodbye':gt 'dimaHome','hallway'
+				end
+			else
+				act 'Not his business (<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
@@ -632,8 +636,7 @@ if $ARGS[0] = 'dimka_chat':
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/dimkadesk.jpg"></center>'
 	'As you enter his room, Dimka walks over and sits on the love seat. He pats the cushion next to him. You walk over and take a seat on the comfy love seat as well.'
 	act 'Make small talk':
-		cla
-		*clr
+		*clr & cla
 		npc_rel['A1'] += 1
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 		'<center><img  src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
@@ -642,22 +645,19 @@ if $ARGS[0] = 'dimka_chat':
 		act 'Stop talking': gt 'dimaHome', 'dimkaroom'
 	end
 	act 'Ask about Igor':
-		cla
-		*clr
+		*clr & cla
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 		if igor_DimaNos = 4:
 			'He looks at you with disgust. "That faggot? What about him?"'
 			act 'What happened?':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 				'"I thought you guys were friends, what happened?"'
 				'His scowl grows as he begins to look even more pissed off answering the question. "The fucking faggot dressed up like a girl and tricked me into dating him." He gives you a dirty look. "Don''t think I don''t know about the part you played in it. He admitted everything to me."'
 				act 'We weren''t trying to trick you':
-					cla
-					*clr
+					*clr & cla
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 					'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 					'You shake your head and speak calmly, trying to get him to see from Igor''s point of view. "We weren''t trying to trick you. I was just helping Igor come to terms with how he feels and who he really is. I know the last thing he wanted was to hurt you."'
@@ -676,14 +676,12 @@ if $ARGS[0] = 'dimka_chat':
 		act 'Stop talking': gt 'dimaHome', 'dimkaroom'
 	end
 	act 'Ask about Lavrenti':
-		cla
-		*clr
+		*clr & cla
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 		'He busts up laughing and then shakes his head, it takes him a few minutes to get himself back under control. "Oh, that drama? Well, turned out the girl he was dating was a complete slut and he blames me."'
 		act 'So what happened?':
-			cla
-			*clr
+			*clr & cla
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 			'He seems to consider whether he wants to tell you or not and then shrugs before launching into the story. "So I was throwing one of my parties and he brought this girl he had been seeing. She was a year younger than us, I have no idea what he saw in her. She looked alright, I guess, but nothing special. I knew my boy could do better, but whatever. Anyway, after the party had been jumping a while I felt like I needed a break. So I headed up here to my room and his girl follows me. Before I knew it, she was on her knee''s sucking my dick like there''s no tomorrow. So I was like, Fuck it. If this is the kinda whore she is then I should have fun and tell Lavrenti to dump this slut in the morning. So I turned her around and started fucking her. I could tell she had been well used and recently, she was pretty loose even for me."'
@@ -692,8 +690,7 @@ if $ARGS[0] = 'dimka_chat':
 			*nl
 			'He pauses and shakes his head. "After some of the others broke up the fight, I tried to explain to him that she came onto me. He wouldn''t hear it, though. This bitch is barely even paying attention and he starts whining about how he loves her and shit. She just straight up ignores him, it was pathetic and he blames me for it to this day!"'
 			act 'What happened to her?':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 				'Being curious what happened to the girl, you decided to ask. "So what happened to her?"'
@@ -707,15 +704,13 @@ if $ARGS[0] = 'dimka_chat':
 	end
 	if met_DimkaMother ! 0:
 		act 'Ask about his mother':
-			cla
-			*clr
+			*clr & cla
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 			'You decide to ask about his mother after having meet her. "Your mother seems nice."'
 			'He shrugs a bit. "Yeah I guess." He answers in a dismissive tone.'
 			act 'What do you think of her?':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 				'You decided to press on anyways, as you want to know more about her. "She seems, well I don''t mean to be rude but, overly subservient I guess." You say, trying not to sound rude.'
@@ -729,8 +724,7 @@ if $ARGS[0] = 'dimka_chat':
 	end
 	if met_DimkaDad ! 0:
 		act 'Ask about his dad':
-			cla
-			*clr
+			*clr & cla
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 			if hotcat > 6:
@@ -745,8 +739,7 @@ if $ARGS[0] = 'dimka_chat':
 		end
 	end
 	act 'Ask about the future':
-		cla
-		*clr
+		*clr & cla
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 		'You are curious what his plans are for the future. "What do you plan to do once we graduate?"'
@@ -755,73 +748,85 @@ if $ARGS[0] = 'dimka_chat':
 		act 'Stop talking': gt 'dimaHome', 'dimkaroom'
 	end
 	act 'Ask if he has a girlfriend':
-		cla
-		*clr
+		*clr & cla
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 		'You know many of the girls think he is cute and you are pretty sure he has dated some of them, but you don''t know if he is serious with anyone. "So do you have a girlfriend?"'
 		'He shakes his head no. "Not really, I date a few girls and we have fun, but nothing serious." Then he smirks a little bit and looks at you. "Why? You interested that position?"'
 		act 'Maybe':
-			cla
-			*clr
+			*clr & cla
 			npc_rel['A1'] += 1
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 			'Your cheeks flush read as you suddenly feel put on the spot. That is not what you meant... but he is awfully cute and all the other girls would be so jealous. "I don''t know, maybe..." You trail off hoping he feels the same way.'
 			act 'Wait for his reply':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/locations/pavlovsk/resident/dimkahome/cocaine.jpg"></center>'
 				'He looks you over for a moment before answering with a smirk. "Well any girl that wants to be my girl has to know how to party." With that said he leans over and digs in a drawer. As moves back you see him holding a bag of white power. He dangles it between his fingers, letting it sway back and forth enticingly. "Take a hit of this and prove you''re you know how to have fun."'
-				act 'No':
-					cla
-					*clr
-					npc_rel['A1'] -= 1
-					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-					'<center><img src="images/pc/no.jpg"></center>'
-					'You shake your head meekly. "No thanks, I can''t."'
-					'He looks disappointed, but maintains a sympathetic smile. "Ok, it''s too much. I get it. How about you drink some alcohol with me then?"'
-					act 'No':
-						cla
-						*clr
-						npc_rel['A1'] -= 5
+				gs 'willpower', 'drugs', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'No (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						npc_rel['A1'] -= 1
+						gs 'stat'
 						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 						'<center><img src="images/pc/no.jpg"></center>'
-						'You shake your head again. "No thanks."'
-						'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-						act 'Leave Dimka''s home': gt 'pavResidential'
-					end
-					act 'Ok':
-						cla
-						*clr
-						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-						'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
-						'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
-						act 'Change your mind':
-							cla
-							*clr
-							npc_rel['A1'] -= 5
-							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-							'<center><img src="images/pc/no.jpg"></center>'
-							'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
-							'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
-						end
-						act 'Drink':
-							cla
-							*clr
-							npc_rel['A1'] += 1
+						'You shake your head meekly. "No thanks, I can''t."'
+						'He looks disappointed, but maintains a sympathetic smile. "Ok, it''s too much. I get it. How about you drink some alcohol with me then?"'
+						gs 'willpower', 'drink', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'No (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								npc_rel['A1'] -= 5
+								gs 'stat'
+								'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+								'<center><img src="images/pc/no.jpg"></center>'
+								'You shake your head again. "No thanks."'
+								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+								act 'Leave Dimka''s home': gt 'pavResidential'
+							end
+						else
+							act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end	
+						act 'Ok':
+							*clr & cla
 							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 							'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
-							'You take the offered glass of booze. Dimka raises his glass and clinks it against yours before quickly taking a drink. You follow suit and swallow a large gulp of the liquor. You almost gasp. He made it really strong, you can barely taste anything but the vodka. You continue drinking and, after several more sips, you start to feel light headed. It''s like your brain is fuzzy and you feel like everything is moving underwater. Your head swims as you look over at him and see a huge grin on his face.'
-							act 'Further': gt 'dimaEv', 'drugged'
+							'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
+							gs 'willpower', 'drink', 'resist'
+							if will_cost <= pcs_willpwr:
+								act 'Change your mind (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'resist'
+									npc_rel['A1'] -= 5
+									gs 'stat'
+									'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+									'<center><img src="images/pc/no.jpg"></center>'
+									'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
+									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+									act 'Leave Dimka''s home': gt 'pavResidential'
+								end
+							else
+								act 'Change your mind (<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':
+								*clr & cla
+								npc_rel['A1'] += 1
+								'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+								'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
+								'You take the offered glass of booze. Dimka raises his glass and clinks it against yours before quickly taking a drink. You follow suit and swallow a large gulp of the liquor. You almost gasp. He made it really strong, you can barely taste anything but the vodka. You continue drinking and, after several more sips, you start to feel light headed. It''s like your brain is fuzzy and you feel like everything is moving underwater. Your head swims as you look over at him and see a huge grin on his face.'
+								act 'Further': gt 'dimaEv', 'drugged'
+							end
 						end
 					end
-				end
+				else
+					act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 				act 'Ok':
-					cla
-					*clr
+					*clr & cla
 					npc_rel['A1'] += 1
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 					'<center><img src="images/locations/pavlovsk/resident/dimkahome/doaline.jpg"></center>'
@@ -830,81 +835,100 @@ if $ARGS[0] = 'dimka_chat':
 				end
 			end
 		end
-		act 'No':
-			cla
-			*clr
-			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-			'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
-			'You shake your head, confused. This conversation really went off the rails and not in a direction you intended. "No. I mean, I like you, but not like that, not that..."'
-			'He interrupts you. "Hey it''s cool, I am not looking either. I just want to have some fun. So, how about you and I have some fun?"'
-			'Fun sounds all well and good, but what does he mean? "What kind of fun?" You ask him as you eye him suspiciously.'
-			act 'Wait for his reply':
-				cla
-				*clr
+		gs 'willpower', 'misc', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'No (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-				'<center><img src="images/locations/pavlovsk/resident/dimkahome/cocaine.jpg"></center>'
-				'He looks you over for a moment before he leans over and digs in a drawer. As moves back you see him holding a bag of white power. He dangles it between his fingers, letting it sway back and forth enticingly. "Take a hit of this and we can have some real fun."'
-				act 'No':
-					cla
-					*clr
-					npc_rel['A1'] -= 1
+				'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
+				'You shake your head, confused. This conversation really went off the rails and not in a direction you intended. "No. I mean, I like you, but not like that, not that..."'
+				'He interrupts you. "Hey it''s cool, I am not looking either. I just want to have some fun. So, how about you and I have some fun?"'
+				'Fun sounds all well and good, but what does he mean? "What kind of fun?" You ask him as you eye him suspiciously.'
+				act 'Wait for his reply':
+					*clr & cla
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-					'<center><img src="images/pc/no.jpg"></center>'
-					'You shake your head no. "No thanks."'
-					'He looks disappointed. "Ok, it''s too much. I get it. How about you drink some alcohol with me then?"'
-					act 'No':
-						cla
-						*clr
-						npc_rel['A1'] -= 5
-						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-						'<center><img src="images/pc/no.jpg"></center>'
-						'You shake your head no. "No thanks."'
-						'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-						act 'Leave Dimka''s home': gt 'pavResidential'
-					end
-					act 'Ok':
-						cla
-						*clr
-						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-						'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
-						'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
-						act 'Change your mind':
-							cla
-							*clr
-							npc_rel['A1'] -= 5
+					'<center><img src="images/locations/pavlovsk/resident/dimkahome/cocaine.jpg"></center>'
+					'He looks you over for a moment before he leans over and digs in a drawer. As moves back you see him holding a bag of white power. He dangles it between his fingers, letting it sway back and forth enticingly. "Take a hit of this and we can have some real fun."'
+					gs 'willpower', 'drugs', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'No (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							npc_rel['A1'] -= 1
+							gs 'stat'
 							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 							'<center><img src="images/pc/no.jpg"></center>'
-							'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
-							'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
-						end
-						act 'Drink':
-							cla
-							*clr
-							npc_rel['A1'] += 1
-							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-							'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
-							'You take the offered glass of booze. Dimka raises his glass and clinks it against yours before quickly taking a drink. You follow suit and swallow a large gulp of the liquor. You almost gasp. He made it really strong, you can barely taste anything but the vodka. You continue drinking and, after several more sips, you start to feel light headed. It''s like your brain is fuzzy and you feel like everything is moving underwater. Your head swims as you look over at him and see a huge grin on his face.'
-							act 'Further': gt 'dimaEv', 'drugged'
+							'You shake your head meekly. "No thanks, I can''t."'
+							'He looks disappointed, but maintains a sympathetic smile. "Ok, it''s too much. I get it. How about you drink some alcohol with me then?"'
+							gs 'willpower', 'drink', 'resist'
+							if will_cost <= pcs_willpwr:
+								act 'No (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'resist'
+									npc_rel['A1'] -= 5
+									gs 'stat'
+									'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+									'<center><img src="images/pc/no.jpg"></center>'
+									'You shake your head again. "No thanks."'
+									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+									act 'Leave Dimka''s home': gt 'pavResidential'
+								end
+							else
+								act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end	
+							act 'Ok':
+								*clr & cla
+								'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+								'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
+								'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
+								gs 'willpower', 'drink', 'resist'
+								if will_cost <= pcs_willpwr:
+									act 'Change your mind (<<will_cost>> Willpower)':
+										*clr & cla
+										gs 'willpower', 'pay', 'resist'
+										npc_rel['A1'] -= 5
+										gs 'stat'
+										'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+										'<center><img src="images/pc/no.jpg"></center>'
+										'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
+										'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+										act 'Leave Dimka''s home': gt 'pavResidential'
+									end
+								else
+									act 'Change your mind (<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':
+									*clr & cla
+									npc_rel['A1'] += 1
+									'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+									'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
+									'You take the offered glass of booze. Dimka raises his glass and clinks it against yours before quickly taking a drink. You follow suit and swallow a large gulp of the liquor. You almost gasp. He made it really strong, you can barely taste anything but the vodka. You continue drinking and, after several more sips, you start to feel light headed. It''s like your brain is fuzzy and you feel like everything is moving underwater. Your head swims as you look over at him and see a huge grin on his face.'
+									act 'Further': gt 'dimaEv', 'drugged'
+								end
+							end
 						end
+					else
+						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end	
+					act 'Ok':
+						*clr & cla
+						npc_rel['A1'] += 1
+						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+						'<center><img src="images/locations/pavlovsk/resident/dimkahome/doaline.jpg"></center>'
+						'You nod ok, still unsure about the decision. Dimka sprinkles some of the cocaine on the table and cuts it up into lines using a credit card he removed from his wallet. He hands you a drinking straw and leans back, giving you room to do a line. Tentatively you bend over with the straw held to your nostril. You snort up a line of coke and then throw your head back as the feeling hits you almost all at once. A rush of adrenaline and endorphins surges through your body, making it tingle and pulse in the most delightful of ways. Through the sensation you feel your pussy immediately begin to leak it''s juices.'
+						act 'Further': gt 'dimaEv', 'cocaine'
 					end
 				end
-				act 'Ok':
-					cla
-					*clr
-					npc_rel['A1'] += 1
-					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-					'<center><img src="images/locations/pavlovsk/resident/dimkahome/doaline.jpg"></center>'
-					'You nod ok, still unsure about the decision. Dimka sprinkles some of the cocaine on the table and cuts it up into lines using a credit card he removed from his wallet. He hands you a drinking straw and leans back, giving you room to do a line. Tentatively you bend over with the straw held to your nostril. You snort up a line of coke and then throw your head back as the feeling hits you almost all at once. A rush of adrenaline and endorphins surges through your body, making it tingle and pulse in the most delightful of ways. Through the sensation you feel your pussy immediately begin to leak it''s juices.'
-					act 'Further': gt 'dimaEv', 'cocaine'
-				end
 			end
-		end
+		else
+			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 		!! I changed the else condition so it matches up with generic boyfriends, because i think the variable boyfriend doesnt exist ... if it does a third elseif must be added for boyfirend or generic boyfriends and the if conditions must be changed
 		if NikoVolkovQW >= 5 or fedorKozlovQW >= 1 or pcs_lovers ! 0:
 			act 'I have a boyfriend':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 				if NikoVolkovQW >= 5:
@@ -917,53 +941,68 @@ if $ARGS[0] = 'dimka_chat':
 					'You tell him. "I have a boyfriend you know, I''m dating <<$loverdesc[0]>>."'
 					'He busts out laughing. "<<$loverdesc[0]>>? Oh god I thought you had more sense than that. You know you could do much better than him, right?" He says as he strokes your hair.'
 				end
-				act 'No':
-					cla
-					*clr
-					npc_rel['A1'] -= 5
-					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-					'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
-					'You shake your head no and push his hand away. "I doubt that, he makes me happy."'
-					'Dimka gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "You know what? I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
-				end
+				gs 'willpower', 'misc', 'self', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'No I don''t think I can (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'self'
+						npc_rel['A1'] -= 5
+						gs 'stat'
+						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+						'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
+						'You shake your head no and push his hand away. "I doubt that, he makes me happy."'
+						'Dimka gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "You know what? I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+						act 'Leave Dimka''s home': gt 'pavResidential'
+					end
+				else
+					act 'No I don''t thnk I can (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 				act 'Maybe':
-					cla
-					*clr
+					*clr & cla
 					npc_rel['A1'] += 1
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 					'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 					'You blush slightly. "You think so?" You ask, looking up into his captivating eyes.'
 					'He strokes your hair a bit more deeply. "A girl like you? Any guy would die to have you as his girlfriend, and most would treat you like a queen. How about we have a drink to celebrate?"'
-					act 'No':
-						cla
-						*clr
-						npc_rel['A1'] -= 5
-						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-						'<center><img src="images/pc/no.jpg"></center>'
-						'You shake your head no. "No thanks."'
-						'He gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-						act 'Leave Dimka''s home': gt 'pavResidential'
-					end
-					act 'Ok':
-						cla
-						*clr
-						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-						'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
-						'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
-						act 'Change your mind':
-							cla
-							*clr
+					gs 'willpower', 'drink', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'No (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
 							npc_rel['A1'] -= 5
+							gs 'stat'
 							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 							'<center><img src="images/pc/no.jpg"></center>'
-							'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
-							'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+							'You shake your head no. "No thanks."'
+							'He gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
 							act 'Leave Dimka''s home': gt 'pavResidential'
 						end
+					else
+						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Ok':
+						*clr & cla
+						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+						'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
+						'He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.'
+						gs 'willpower', 'drink', 'resist'
+						if will_cost <= pcs_willpwr:
+							act 'Change your mind (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								npc_rel['A1'] -= 5
+								gs 'stat'
+								'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+								'<center><img src="images/pc/no.jpg"></center>'
+								'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
+								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
+								act 'Leave Dimka''s home': gt 'pavResidential'
+							end
+						else
+							act 'Change your mind (<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':
-							cla
-							*clr
+							*clr & cla
 							npc_rel['A1'] += 1
 							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 							'<center><img src="images/locations/pavlovsk/resident/dimkahome/drink.jpg"></center>'
@@ -975,33 +1014,44 @@ if $ARGS[0] = 'dimka_chat':
 			end
 		end
 		act 'Kiss him':
-			cla
-			*clr
+			*clr & cla
 			npc_rel['A1'] += 1
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss.jpg"></center>'
 			'You decide that, instead of answering him, you will show him. You lean over and press your lips against his. He quickly pulls you closer as the two of you start to kiss.'
-			gs 'arousal', 'foreplay', 10, 'unknown'
-			act 'Stop kissing':
-				cla
-				*clr
-				npc_rel['A1'] -= 1
-				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-				'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-				'You make out for a minute or two before you choose to pull away so that things don''t go too far. You have to push him away with your hands to make him stop as he tries to lean in to continue. "Sorry, I got carried away. Can we just go back to talking?" You tell him.'
-				'He frowns a little. "Come on baby, you started this. Don''t leave me hanging." He says before attempting to lean into you again.'
-				act 'Give in': gt 'dimaHome', 'dimka_makeout'
-				act 'Stop kissing':
-					cla
-					*clr
-					npc_rel['A1'] -= 5
+			gs 'arousal', 'foreplay', 5, 'unknown'
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Stop kissing (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					npc_rel['A1'] -= 1
+					gs 'stat'
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-					'You push him away with all your strength and finally force him to back up. "I said no."'
-					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					'You make out for a minute or two before you choose to pull away so that things don''t go too far. You have to push him away with your hands to make him stop as he tries to lean in to continue. "Sorry, I got carried away. Can we just go back to talking?" You tell him.'
+					'He frowns a little. "Come on baby, you started this. Don''t leave me hanging." He says before attempting to lean into you again.'
+					act 'Give in': gt 'dimaHome', 'dimka_makeout'
+					gs 'willpower', 'sex', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Stop kissing (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							npc_rel['A1'] -= 5
+							gs 'stat'
+							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+							'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
+							'You push him away with all your strength and finally force him to back up. "I said no."'
+							'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
+							act 'Leave Dimka''s home': gt 'pavResidential'
+						end
+					else
+						act 'Stop kissing (<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
+			else
+				act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end	
 			act 'Make out': gt 'dimaHome', 'dimka_makeout'
 		end
 	end
@@ -1009,34 +1059,45 @@ if $ARGS[0] = 'dimka_chat':
 end
 
 if $ARGS[0] = 'dimka_makeout':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss1.jpg"></center>'
 	'He wraps his arms around your neck and pulls you in close and soon the two of you are kissing passionately. The kisses are full of eager lust and urgent need. You feel yourself getting more and more aroused. Then he starts pulling your clothes off.'
 	gs 'arousal', 'foreplay', 3, 'unknown'
 	gs 'stat'
-	act 'Stop him':
-		cla
-		*clr
-		npc_rel['A1'] -= 3
-		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-		'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-		'You pull away before things go too far and catch your breath, as you start pulling your clothes back in place. You have to push him away with your hands several times to make him stop trying to undress you. "Sorry, I got carried away. Can we just go back to talking?" You tell him.'
-		'He frowns a little. "Come on baby, you started this. Don''t leave me hanging."'
-		act 'Give in': gt 'dimaHome', 'dimka_knees'
-		act 'I said no':
-			cla
-			*clr
-			npc_rel['A1'] -= 5
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Stop him (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'type'
+			npc_rel['A1'] -= 3
+			gs 'stat'
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-			'With that he reaches back in and tries to pull your top off again, You push him away with all your strength and you barely manage to force him to back up. "I said no."'
-			'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			'You pull away before things go too far and catch your breath, as you start pulling your clothes back in place. You have to push him away with your hands several times to make him stop trying to undress you. "Sorry, I got carried away. Can we just go back to talking?" You tell him.'
+			'He frowns a little. "Come on baby, you started this. Don''t leave me hanging."'
+			act 'Give in': gt 'dimaHome', 'dimka_knees'
+			gs 'willpower', 'action', 'type', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'I said no (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'type'
+					npc_rel['A1'] -= 5
+					gs 'stat'
+					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
+					'With that he reaches back in and tries to pull your top off again, You push him away with all your strength and you barely manage to force him to back up. "I said no."'
+					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
+					act 'Leave Dimka''s home': gt 'pavResidential'
+				end
+			else
+				act 'I said no (<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
+	else
+		act 'Stop 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 'To your knees': gt 'dimaHome', 'dimka_knees'
 end
 
@@ -1047,64 +1108,86 @@ if $ARGS[0] = 'dimka_seduce':
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss.jpg"></center>'
 	'As you sit together you turn to say something to him as he suddenly leans in and starts kissing you. His hands stroke your face and hair gently as his kisses you passionately.'
-	gs 'arousal', 'foreplay', 10, 'unknown'
-	act 'Stop kissing':
-		cla
-		*clr
-		npc_rel['A1'] -= 1
-		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-		'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-		'You pull away before things go too far and catch your breath. You have to push him away with your hands to make him stop, as he tries to lean in as you pull away. "Sorry, Can we just go back to talking?" You tell him.'
-		'He frowns a little. "Come on baby, I like you. Don''t leave me hanging."'
-		act 'Give in': gt 'dimaHome', 'dimka_makeout2'
-		act 'Stop kissing':
-			cla
-			*clr
-			npc_rel['A1'] -= 5
+	gs 'arousal', 'foreplay', 5, 'unknown'
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Stop kissing (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			npc_rel['A1'] -= 1
+			gs 'stat'
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-			'You push him away with all your strength and finally manage to force him to back up. "I said no."'
-			'Dimka''s face suddenly turns into anger and confusion, obviously upset. "I thought you liked me, but whatever! I think you should leave." With that he gets up and escorts you to his bedroom door and closes it firmly behind you. Unsure what else to do you leave his house.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			'You pull away before things go too far and catch your breath. You have to push him away with your hands to make him stop, as he tries to lean in as you pull away. "Sorry, Can we just go back to talking?" You tell him.'
+			'He frowns a little. "Come on baby, I like you. Don''t leave me hanging."'
+			act 'Give in': gt 'dimaHome', 'dimka_makeout2'
+			gs 'willpower', 'bj', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Stop kissing (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					npc_rel['A1'] -= 5
+					gs 'stat'
+					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
+					'You push him away with all your strength and finally manage to force him to back up. "I said no."'
+					'Dimka''s face suddenly turns into anger and confusion, obviously upset. "I thought you liked me, but whatever! I think you should leave." With that he gets up and escorts you to his bedroom door and closes it firmly behind you. Unsure what else to do you leave his house.'
+					act 'Leave Dimka''s home': gt 'pavResidential'
+				end
+			else
+				act 'Stop kissing (<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
+	else
+		act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 	act 'Make out': gt 'dimaHome', 'dimka_makeout2'
 end
 
 if $ARGS[0] = 'dimka_makeout2':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 	'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss1.jpg"></center>'
 	'He wraps his arms around your neck and pulls you in close and soon the two of you are kissing passionately. Dimka smothers your mouth with his, kisses full of eager lust and urgent need. You feel yourself getting progressively aroused as a heat builds inside you. Dimka begins pulling at your clothes, attempting to remove them.'
 	gs 'arousal', 'foreplay', 3, 'unknown'
 	gs 'stat'
-	act 'Stop him':
-		cla
-		*clr
-		npc_rel['A1'] -= 3
-		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
-		'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-		'You pull away before things go too far and catch your breath. You have to push him away with your hands to make him stop, as he tries to lean in as you pull away. "Sorry, Can we just go back to talking?" You tell him.'
-		'He frowns a little. "Come on baby, I like you. Don''t leave me hanging."'
-		act 'Give in': gt 'dimaHome', 'dimka_knees'
-		act 'I said no':
-			cla
-			*clr
-			npc_rel['A1'] -= 5
+	gs 'willpower', 'bj', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Stop him (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			npc_rel['A1'] -= 3
+			gs 'stat'
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
-			'With that, he reaches back in and tries to pull your top off again, You push him away with all your strength and finally manage to force him to back up. "I said no."'
-			'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			'You pull away before things go too far and catch your breath. You have to push him away with your hands to make him stop, as he tries to lean in as you pull away. "Sorry, Can we just go back to talking?" You tell him.'
+			'He frowns a little. "Come on baby, I like you. Don''t leave me hanging."'
+			act 'Give in': gt 'dimaHome', 'dimka_knees'
+			gs 'willpower', 'bj', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'I said no (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					npc_rel['A1'] -= 5
+					gs 'stat'
+					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
+					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
+					'With that, he reaches back in and tries to pull your top off again, You push him away with all your strength and finally manage to force him to back up. "I said no."'
+					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
+					act 'Leave Dimka''s home': gt 'pavResidential'
+				end
+			else
+				act 'I said no(<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
+	else
+		act 'Stop 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
 
 if $ARGS[0] = 'dimka_knees':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	gs 'clothing', 'strip'
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
@@ -1118,8 +1201,7 @@ if $ARGS[0] = 'dimka_knees':
 	gs 'arousal', 'hj', 3, 'unknown'
 	gs 'stat'
 	act 'Suck him':
-		cla
-		*clr
+		*clr & cla
 		npc_rel['A1'] += 3
 		gs 'boyStat', 'A1'
 		'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
@@ -1136,8 +1218,7 @@ if $ARGS[0] = 'dimka_knees':
 		gs 'arousal', 'bj', 5, 'deepthroat',  'rough'
 		gs 'stat'
 		act 'Take a seat':
-			cla
-			*clr
+			*clr & cla
 			gs 'boyStat', 'A1'
 			'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss4.jpg"></center>'
@@ -1146,28 +1227,25 @@ if $ARGS[0] = 'dimka_knees':
 			gs 'arousal', 'vaginal', 5, 'unknown'
 			gs 'stat'
 			act 'Get fucked':
-				cla
-				*clr
+				*clr & cla
 				'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss5.jpg"></center>'
 				'Once you reach your feet he gets up as well and turns you to face the couch. He then pushes you forward, bending you over at the waist. You hands have barely touched the couch before you feel his dick slide back in your wet pussy. As soon as he is in he begins relentlessly pounding your cunt as hard as he can, his balls slamming against you. Dimka slaps your ass hard as he fucks you, the force of his hips slapping against your butt forces you forward slowly until you find yourself kneeling on the couch.'
 				gs 'arousal', 'vaginal', 5, 'rough'
 				gs 'stat'
 				act 'Hey you missed':
-					cla
-					*clr
+					*clr & cla
 					gs 'boyStat', 'A1'
 					'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss6.jpg"></center>'
 					'He continues railing you, showing no care for your pleasure, only his. After a while he has your head pushed down onto the arm of the couch with your shoulder pinned against the arm and the back of the couch. You feel somewhat trapped with no room left to scoot forward.'
 					*nl
 					'Without warning he pulls his cock out of your dripping hole for a moment and repositions himself. He gets up on the couch, standing on it to get a higher position. You then feel the head of his cock pressed against your asshole! Before you can even protest he shoves it in your ass, plunging as deep as he can go in a single thrust. You cry in pain and pleasure, tears welling up in your eyes. You scream out "That''s my ass!"'
-					'Dimka doesn''t seem to care as he drives his <<dick>>cm <<$dick_girth>> dick deeper into your ass. You beg him to pull it out but he coldy replies. "Shut the fuck up, slut!" as he continues pounding your aching butthole.'
+					'Dimka doesn''t seem to care as he drives his <<dick>>cm <<$dick_girth>> dick deeper into your ass. You beg him to pull it out but he coldly replies. "Shut the fuck up, slut!" as he continues pounding your aching butthole.'
 					gs 'arousal', 'anal', 5, 'rough', 'sub'
 					gs 'stat'
 					act 'Not as bad':
-						cla
-						*clr
+						*clr & cla
 						'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss7.jpg"></center>'
 						'After several agonizing minutes he pulls out for a moment before rolling you over onto your side laying across the arm of the couch. You want to ask him to stop but as soon as he has you repositioned he slips his rod back in your ass. You grit your teeth at the pain and pray that it will be over soon. “At least now it is a bit loosened up. And in this position he can''t go as deep which makes it feel a little better.” You think, trying to reason with yourself in this powerless situation.'
@@ -1175,16 +1253,14 @@ if $ARGS[0] = 'dimka_knees':
 						gs 'stat'
 						gs 'arousal', 'end'
 						act 'Thar he blows':
-							cla
-							*clr
+							*clr & cla
 							gs 'cum_call', 'butt', 'A1'
 							'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/kiss7.jpg"></center>'
 							'After a few more minutes Dimka begins to grunt and spasm. He suddenly pulls his dick out of your abused hole and you feel his hot cum spray against your inner thighs and ass. After his orgasm subsides he climbs down off the couch and starts to get dressed again, while you clamor for some tissues to wipe his cum off you.'
 							gs 'stat'
 							act 'Get dressed':
-								cla
-								*clr
+								*clr & cla
 								minut += 5
 								cumspclnt = 15
 								gs 'cum_cleanup'
@@ -1201,8 +1277,7 @@ if $ARGS[0] = 'dimka_knees':
 								'Your blood runs cold as the threat sinks in. You know what this would mean to your reputation, at school and at home with you mother.'
 								act 'Run out of his house': gt 'pavResidential'
 								act 'Plead':
-									cla
-									*clr
+									*clr & cla
 									minut += 5
 									'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 									'<center><img src="images/pc/tears1.jpg"></center>'

+ 90 - 114
locations/dimaRevenge.qsrc

@@ -1,7 +1,7 @@
 # dimaRevenge
 
 menu_off = 1
-
+!!needs fighting added to certain areas 
 !! dimaRevChoice = stores the option selected from bathroom scene.
 !! ARGS[0] - day
 !! $ARGS[1] - time of day i.e. morning
@@ -42,7 +42,7 @@ if ARGS[0] = 3:
 	!dimarevenge = 4!
 	'<center><img src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 	'After grabbing lunch, you see some boys looking at you and talking quietly to themselves. You decide to ignore them and sit at a table to eat.
-	As you are enjoying your meal, you feel a hand cup your breast and quicky turn around angry, spilling your lunch in the process. The other kids laugh at the spectacle.
+	As you are enjoying your meal, you feel a hand cup your breast and quickly turn around angry, spilling your lunch in the process. The other kids laugh at the spectacle.
 	Embarrassed, you head to the girl''s restroom to clean up.'
 	act 'Go clean up':
 		*clr & cla
@@ -56,7 +56,6 @@ if ARGS[0] = 3:
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 			if grupTipe[0] = 1:
-				!!if popular!!
 				'"<<$pcs_firstname>> thinks she''s so great. What I wouldn''t give to watch her fall."'
 				'"You won''t need to give anything. Word is she cheated on Dimka and now he''s out to destroy her. You have to be a real idiot to cross him."'
 				'"I didn''t even know they were dating. Where did you hear this?"'
@@ -92,7 +91,6 @@ if ARGS[0] = 3:
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 2:
-				!!If jock!!
 				'"I heard <<$pcs_firstname>> is on steroids."'
 				'"I heard she sucked off the coach for a spot on the team."'
 				'At this point you can''t help yourself and barge out of the stall to the surprise of the two girls.'
@@ -134,7 +132,6 @@ if ARGS[0] = 3:
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 3:
-				!!if nerd!!
 				'"So, did you hear about that nerd girl, <<$pcs_firstname>>? They say she is secretly a slut who gives it up to all the nerds."'
 				'"I heard she''s actually an idiot and the nerds do her homework for her in exchange for blowjobs whenever they want."'
 				'You cover your ears and try to ignore their comments. After they leave you go to the sink and splash water on your face and try to steel yourself.
@@ -142,17 +139,13 @@ if ARGS[0] = 3:
 				You need stop him somehow. But what can you do?'
 				if grupvalue[3] > 50:
 					dimaRevChoice = 3
-					!!if Nerd social group 50 or higher this is an option
 					act 'Review the situation':
 						*clr & cla
 						'<center><b><font color="maroon">Classroom</font></b></center>'
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/gilthinking.jpg"></center>'
-						'You go to class but can''t really focus on today''s lessons. Instead you think about your problem. Dimka has been running around the school spreading rumors about you.
-						You could calmly disprove each rumor, but you''ve come to accept that the vast majority of kids your age don''t respond well to logic and reason. You need to get Dimka to stop bad mouthing you and admit to everyone that he was lying.
-						In order to do that you decide that blackmail is the only course of action. You already know Dimka''s computer is easily hacked, so all you need to do is find someone who can hack it.
-						You think to yourself, Julia is too nice to ever want to violate someones privacy. Natasha doesn''t even own a PC. You don''t want to get Artem involved again, and you forgot Petka existed until just now.
-						Feofan can tell you everything about superheroes including their shoe size, but somehow you don''t think that''s going to help. Admittedly, you don''t know much about Zinaida since you can''t get more than a few words out of her before she goes back to her phone.
-						Evgeny lives and breathes chess and probably won''t be of much use. That leaves Gerasim.'
+						'You go to class but can''t really focus on today''s lessons. Instead you think about your problem. Dimka has been running around the school spreading rumors about you. You could calmly disprove each rumor, but you''ve come to accept that the vast majority of kids your age don''t respond well to logic and reason. You need to get Dimka to stop bad mouthing you and admit to everyone that he was lying. In order to do that you decide that blackmail is the only course of action. You already know Dimka''s computer is easily hacked, so all you need to do is find someone who can hack it.'
+						*nl
+						'You think to yourself, Julia is too nice to ever want to violate someones privacy. Natasha doesn''t even own a PC. You don''t want to get Artem involved again, and you forgot Petka existed until just now. Feofan can tell you everything about superheroes including their shoe size, but somehow you don''t think that''s going to help. Admittedly, you don''t know much about Zinaida since you can''t get more than a few words out of her before she goes back to her phone. Evgeny lives and breathes chess and probably won''t be of much use. That leaves Gerasim.'
 						act 'Talk to Gerasim':
 							*clr & cla
 							'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -241,7 +234,6 @@ if ARGS[0] = 3:
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			elseif grupTipe[0] = 4:
-				!!if gopnik!!
 				'"You know that <<$pcs_firstname>> girl who is always hanging out with the gopniks. Well, I heard she has to suck them off everyday to be allowed to hang out with them."'
 				'"I believe it. She acts all tough, but if it weren''t for her friends she would just be a scared little girl."'
 				'No fucking way are you standing for this! You quickly exit the stall head towards them. The first girl sees you and bolts out of the restroom.
@@ -268,10 +260,8 @@ if ARGS[0] = 3:
 					'"Actually that sounds like fun," says Lena. "We''ll join you." And with that all three of you head into the hall.'
 					act 'Continue':
 						*clr & cla
-						'The three of you roam the hall looking for Dimka. Most of the girls and some of the boys quickly head into different classrooms just to avoid you.
-						You catch one girl who was too slow and, while you press her against a wall, you make her tell you where Dimka is. "I, I saw him hanging out by the lockers, I swear! Please don''t hurt me."'
-						'You slap her in the face lightly, eliciting a whimper from her, then leave her there and head to the lockers. You see Dimka flirting with a girl while she checks her locker.
-						You approach him quickly, your hands already curled into fists.'
+						'The three of you roam the hall looking for Dimka. Most of the girls and some of the boys quickly head into different classrooms just to avoid you. You catch one girl who was too slow and, while you press her against a wall, you make her tell you where Dimka is. "I, I saw him hanging out by the lockers, I swear! Please don''t hurt me."'
+						'You slap her in the face lightly, eliciting a whimper from her, then leave her there and head to the lockers. You see Dimka flirting with a girl while she checks her locker. You approach him quickly, your hands already curled into fists.'
 						act 'Punch him in the face':
 							*clr & cla
 							npc_rel['A1'] -= 20
@@ -290,7 +280,7 @@ if ARGS[0] = 3:
 								'He hears you walking up and turns to meet you. Before he can say anything you punch him as hard as you can in the face.'
 								'"Ow! My fucking nose!" He says while holding his nose, then he looks at you with anger in his eyes. "I''m going to beat your ass bitch."'
 								act 'Fight':
-									!!stats
+									!!stats{
 									gs 'boyStat', 'A1'
 									strenV = 100
 									speedV = 50
@@ -313,7 +303,25 @@ if ARGS[0] = 3:
 									program = 0
 									DimaFight = 1
 									if spellavtoklon = 1:klon = 3
-									if spellbefshild = 1:defence = 500
+									if spellbefshild = 1:defence = 500}
+									gs 'fight','initFight'
+
+									$opp_name[0] = 'Dimka'
+									$opp_image[0] = 'images/characters/pavlovsk/school/head/1.jpg'
+									opp_def[0] = 50
+									opp_run[0] = 50
+									opp_wrstlng[0] = 10
+									opp_kick[0] = 0
+									opp_punch[0] = 50
+									opp_jab[0] = 50
+									opp_stren[0] = 100
+									opp_agil[0] = 40
+									opp_vital[0] = 50
+									opp_react[0] = 40
+									opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+									opp_willpwr[0] = 100
+									opp_shoot[0] = 100
+
 									gt 'fight', 'start'
 								end
 							end
@@ -330,7 +338,6 @@ if ARGS[0] = 3:
 				end
 			else
 				dimaTrain = 0
-				!!if outcast!!
 				'"I heard that weird girl, <<$pcs_firstname>>, lets boys do what ever they want to her no matter how degrading. She has no self respect."'
 				'"I heard she gets an abortion every other month because she doesn''t know how to close her legs."'
 				'You start to cry and desperately cover your ears, wishing for them to stop. After what seems like an hour, you take your hands off your ears.
@@ -510,7 +517,6 @@ end
 
 if dimaRevChoice = 1:
 	menu_off = 1
-	!!if popular!!
 	if ARGS[0] = 4:
 		!!after school!!
 		dimaRevenge += 1
@@ -602,7 +608,6 @@ end
 
 if dimaRevChoice = 2:
 	menu_off = 1
-	!!if jock!!
 	if ARGS[0] = 4:
 		if $ARGS[1] = 'day4jockbefore':
 			!!fourth day before class!!
@@ -640,30 +645,22 @@ if dimaRevChoice = 2:
 						!!combat!!
 						!!if you win!!
 						'Lera is unconscious on the ground as you hold Lena by the hair. "I didn''t say shit about you," you tell her.'
-						'You let go of her and turn to head home, but then you see Vitek walking towards you. He looks pissed. He must have just seen you beat up his sister.
-						You make to run but are tripped by Lena. You close your eyes, afraid of what he''ll do to you, but nothing happens. You open your eyes to see Ivan Fedor holding Vitek back.
-						Vitek is swearing at the top of his lungs. As you get up and dust yourself off, Dan, Vasily, Paulina and Ekaterina come to investigate and see Vitek getting ganged up on. Things get crazy after that.'
+						'You let go of her and turn to head home, but then you see Vitek walking towards you. He looks pissed. He must have just seen you beat up his sister. You make to run but are tripped by Lena. You close your eyes, afraid of what he''ll do to you, but nothing happens. You open your eyes to see Ivan Fedor holding Vitek back. Vitek is swearing at the top of his lungs. As you get up and dust yourself off, Dan, Vasily, Paulina and Ekaterina come to investigate and see Vitek getting ganged up on. Things get crazy after that.'
 					elseif win = 1:
 						!!if you lose!!
-						'The two of them are too strong for you and you get knocked to the ground. They start kicking you. You do your best to block their kicks while trying to get up, but they keep knocking you down.
-						You are about to give up when Ivan and Fedor show up. Fedor tosses Lera aside and Ivan grabs Lena by the shoulders and tries to calm her down. Suddenly you hear an angry yell, and you see Vitek charging towards Ivan.
+						'The two of them are too strong for you and you get knocked to the ground. They start kicking you. You do your best to block their kicks while trying to get up, but they keep knocking you down. You are about to give up when Ivan and Fedor show up. Fedor tosses Lera aside and Ivan grabs Lena by the shoulders and tries to calm her down. Suddenly you hear an angry yell, and you see Vitek charging towards Ivan.
 						You get up in time to see Dan, Vasily Paulina, and Ekaterina arrive, followed by Erast and Lazar. Things get crazy after that, with Roman showing up last.'
 						act 'School brawl':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/bigbrawl.jpg"></center>'
-							'Ivan and Vitek trade blows that would knock anyone else out. Roman, crazy little shit that he is, takes on Erast. Dan and Vasily double up on Fedor, Ekaterina decides she wants to fight Lazar who refuses to hit a girl. Ekaterina scoffs at him and proceeds to kick his ass anyway.
-							You lose track of Lena and Lera. As you look around you see a security camera looking straight at you. Before you can tell anyone about it, a brick hits you in the back causing a great deal of pain. You turn around and see Pauline. "Fucking bitch," you shout as you run at her.
-							"I''ll fucking kill you!"'
+							'Ivan and Vitek trade blows that would knock anyone else out. Roman, crazy little shit that he is, takes on Erast. Dan and Vasily double up on Fedor, Ekaterina decides she wants to fight Lazar who refuses to hit a girl. Ekaterina scoffs at him and proceeds to kick his ass anyway. You lose track of Lena and Lera. As you look around you see a security camera looking straight at you. Before you can tell anyone about it, a brick hits you in the back causing a great deal of pain. You turn around and see Pauline. "Fucking bitch," you shout as you run at her. "I''ll fucking kill you!"'
 							act 'Fight':
 								*clr & cla
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
-								'You and Pauline go at for quite a while. Eventually you are both tired and catch your breath before having another go. As you try to catch your breath, exhausted, you see how the others are doing.
-								You see Ivan and Vitek still at it, neither one of them running out of energy, though it looks like Ivan''s superior skill is starting to become the deciding factor.
-								It seems Dan agree''s, after he and Vasily have Fedor down, he jumps in to help Vitek against Ivan, leaving Vasily to kick Fedor while he is down.'
+								'You and Pauline go at for quite a while. Eventually you are both tired and catch your breath before having another go. As you try to catch your breath, exhausted, you see how the others are doing. You see Ivan and Vitek still at it, neither one of them running out of energy, though it looks like Ivan''s superior skill is starting to become the deciding factor. It seems Dan agree''s, after he and Vasily have Fedor down, he jumps in to help Vitek against Ivan, leaving Vasily to kick Fedor while he is down.'
 								*nl
 								'You see battered and bloody Roman pull out a knife and charge at Erast, who seems to have taken his fair share of blow from Roman. As Roman charges him though, Erast side steps just in time and delivers and powerful blow, that sends Roman sprawling unconscious.
-								Erast looks around and then heads over to help Fedor. Lazar is trying to block Ekaterina''s attacks but his refusal to hit her back means she is beating him down. He goes down and once he does, it is all over.
-								Just then you catch sight of Lena and Lera walking towards you. Apparently they were waiting for you to tire yourself out. Lera grabs you and hold you for Lena, but before she can do anything, you hear the sounds of sirens. Several officers show up and arrest everyone.'
+								Erast looks around and then heads over to help Fedor. Lazar is trying to block Ekaterina''s attacks but his refusal to hit her back means she is beating him down. He goes down and once he does, it is all over. Just then you catch sight of Lena and Lera walking towards you. Apparently they were waiting for you to tire yourself out. Lera grabs you and hold you for Lena, but before she can do anything, you hear the sounds of sirens. Several officers show up and arrest everyone.'
 								act 'In custody':
 									*clr & cla
 									'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/jailcell.jpg"></center>'
@@ -709,7 +706,6 @@ end
 
 if dimaRevChoice = 3:
 	menu_off = 1
-!!if nerd!!
 	if ARGS[0] = 4:
 		dimaRevenge += 1
 		!dimarevenge = 5!
@@ -736,8 +732,7 @@ if dimaRevChoice = 3:
 		!dimarevenge = 6!
 		'<center><b><font color="maroon">School Hallway</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/linesofcoke.jpg"></center>'
-		'You wait for Feofan by his locker. You hear kids snicker about you as they walk by. Soon Feofan arrives with a wide grin on his face. "I hacked his webcam," he says and holds his phone in front of you with a video playing.
-		In the video Dimka is snorting line after line of coke. More than he did when you were with him. Watching him, it is obvious how much of an addict he really is. Then someone knocks on his door and a male voice says, "Dimka I need to talk with you," which causes Dimka to panic and rush to hide his stash.'
+		'You wait for Feofan by his locker. You hear kids snicker about you as they walk by. Soon Feofan arrives with a wide grin on his face. "I hacked his webcam," he says and holds his phone in front of you with a video playing. In the video Dimka is snorting line after line of coke. More than he did when you were with him. Watching him, it is obvious how much of an addict he really is. Then someone knocks on his door and a male voice says, "Dimka I need to talk with you," which causes Dimka to panic and rush to hide his stash.'
 		'"The male voice has to be his dad," reasons Feofan, "and he doesn''t know about his sons habit."'
 		'"I can use that to my advantage," you tell him, "He''ll do whatever I say so his father doesn''t see this. Thanks Feofan. Send the video to my phone and keep a copy for yourself just in case. I''m off to see Dimka."'
 		act 'Confront Dimka':
@@ -751,20 +746,16 @@ if dimaRevChoice = 3:
 			*nl
 			'"How did you get this?" he asks, part mad, part afraid.'
 			'"You don''t need to know that," you say, trying your best to sound strong. "All you need to know is that I''m not the only one who has it. Now if you don''t want this video to get out, you''ll get everyone to stop talking about me."'
-			'"Why should I do that? My dad owns the cops. They won''t do shit. If you give them that video, it will just disappear, and you and your family will pay for it."
-			He thinks he''s being so clever right now. Like you didn''t think about that.'
+			'"Why should I do that? My dad owns the cops. They won''t do shit. If you give them that video, it will just disappear, and you and your family will pay for it." He thinks he''s being so clever right now. Like you didn''t think about that.'
 			*nl
-			'"I wasn''t planning to take it to the police," you tell him. "I was going to send it to everyone: all the students, their parents, teachers, any and everyone. Before long the whole town will know your dad has a junkie for a son.
-			It wouldn''t ruin his career, sure, but it would embarrass him a great deal to have a junkie for a son and be something his enemies could use against him. Once that happens just how do you think he is going to feel about his darling little boy?
-			Just what do you think he will do to you when he learns you are not only a junkie but stupid enough to get caught? I bet he will be none to pleased with you. I imagine he would make a big deal out of getting you help and getting you off the drugs, whether you like it or not."
+			'"I wasn''t planning to take it to the police," you tell him. "I was going to send it to everyone: all the students, their parents, teachers, any and everyone. Before long the whole town will know your dad has a junkie for a son. It wouldn''t ruin his career, sure, but it would embarrass him a great deal to have a junkie for a son and be something his enemies could use against him. Once that happens just how do you think he is going to feel about his darling little boy? Just what do you think he will do to you when he learns you are not only a junkie but stupid enough to get caught? I bet he will be none to pleased with you. I imagine he would make a big deal out of getting you help and getting you off the drugs, whether you like it or not."
 			He''s visibly distraught now and you go in for the kill.'
 			'You whisper in his ear, "How long do you think you can last without your precious coke? One day? Two? I bet you won''t last a week before you''re begging for a hit. Maybe you''ll go even further and suck a guy off for it."'
 			*nl
 			'"Shut your god damn mouth, you bitch!" You must have really touched a nerve there.'
 			'"So that''s how it is then. Okay I''m off to show the video around. Bye."'
 			'"No wait! I''m sorry. I''ll stop everyone from talking. I swear. just don''t show that to anyone."'
-			'"That''s more like it. You have until the end of the day to get results, or else you know what will happen. don''t you? I don''t want to see you in class until you get it done." He nods and heads into the hall. You breathe a sigh of relief.
-			You were seriously scared there, but it was also exciting seeing him so scared himself. You think about following him around to make sure he keeps his word, but that would mean skipping class. You know he won''t cross you as long as you have dirt on him. You head to class.'
+			'"That''s more like it. You have until the end of the day to get results, or else you know what will happen. don''t you? I don''t want to see you in class until you get it done." He nods and heads into the hall. You breathe a sigh of relief. You were seriously scared there, but it was also exciting seeing him so scared himself. You think about following him around to make sure he keeps his word, but that would mean skipping class. You know he won''t cross you as long as you have dirt on him. You head to class.'
 			act 'Go to class':
 				*clr & cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
@@ -774,8 +765,7 @@ if dimaRevChoice = 3:
 					*clr & cla
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
-					'The student chatter continues until a girl you don''t know walks through the hallway. All the girls go quiet and turn away from her while the boys make dirty comments behind her back while laughing among themselves. Instantly, it occurs to you: this is Dimka''s doing.
-					You feel a combination of guilt and anger. So this is how he makes it right. By ruining some other poor girl''s life. You are angry at Dimka and want to punish him, but he did keep his promise, even if someone else was made to suffer. You force your feelings down and head to class, hoping the girl will be alright.'
+					'The student chatter continues until a girl you don''t know walks through the hallway. All the girls go quiet and turn away from her while the boys make dirty comments behind her back while laughing among themselves. Instantly, it occurs to you: this is Dimka''s doing. You feel a combination of guilt and anger. So this is how he makes it right. By ruining some other poor girl''s life. You are angry at Dimka and want to punish him, but he did keep his promise, even if someone else was made to suffer. You force your feelings down and head to class, hoping the girl will be alright.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -785,7 +775,6 @@ end
 
 if dimaRevChoice = 4:
 	menu_off = 1
-	!if gopnik!!
 	if ARGS[0] = 4:
 
 		dimaRevenge += 1
@@ -821,10 +810,9 @@ if dimaRevChoice = 4:
 				'"No he isn''t, but he was here recently," he says as he points to some white powder on a desk. He must come to this room to get his fix. You look around the room and find a locked box under the desk.'
 				'"Can you get this open," you ask Lavrenti.'
 				'"Maybe, give to me." You hand him the box and he pulls out a lockpick. After a few minutes, the lock pops open and he opens the box to reveal a few baggies of cocaine.'
-				'"Oh is he going to lose it when he sees his stash is gone," laughs Lavrenti. "I have an idea." He finds a piece of paper and a pen in the desk and writes a note.'
 				*nl
+				'"Oh is he going to lose it when he sees his stash is gone," laughs Lavrenti. "I have an idea." He finds a piece of paper and a pen in the desk and writes a note.'
 				'If you want your coke back. Meet me in the boy''s locker during lunch. Come alone'
-				*nl
 				'"That should do it," he says as he tapes the note under the desk. "Lets go and wait for him." The two of you head for the locker rooms.'
 				act 'Wait for Dimka to arrive':
 					*clr & cla
@@ -849,8 +837,7 @@ if dimaRevChoice = 4:
 							'"I want you to see something, Dimka," you say as you pull out his stash of coke you took.'
 							'"Give that back," he says.'
 							'"No way am I doing that. Now watch."'
-							'You take out a baggie of coke and cut it open, then dump it on the floor. You do the same with the other baggies. Dimka''s face has an expression of pure terror. You aim the shower at the pile of coke on the ground and let it wash down the drain as Dimka screams insults at you and Lavrenti.
-							He screams insult after insult at the two of you as you laugh your asses off. After a while in sounds less like swearing and more like rabid howling. Finally you get sick of his screaming and grab him by the hair, then slam his face into the ground. As he lays there unconscious, you check his pocket. 10000 roubles.'
+							'You take out a baggie of coke and cut it open, then dump it on the floor. You do the same with the other baggies. Dimka''s face has an expression of pure terror. You aim the shower at the pile of coke on the ground and let it wash down the drain as Dimka screams insults at you and Lavrenti. He screams insult after insult at the two of you as you laugh your asses off. After a while in sounds less like swearing and more like rabid howling. Finally you get sick of his screaming and grab him by the hair, then slam his face into the ground. As he lays there unconscious, you check his pocket. 10000 roubles.'
 							'"Fucking rich kid," you say then you look at Lavrenti, "No offense."'
 							'"None taken," he replies. "We should get out of here, though."'
 							act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -870,12 +857,12 @@ if dimaRevChoice = 4:
 			'"I heard <<$pcs_firstname>> gave Lavrenti a blowjob in the boy''s locker room."'
 			'"I heard she was doing it for a fix. Some one saw them leaving the locker room together and when they went inside, they saw white powder disolving in the drain.
 			She''s a crack head. Maybe if you offer her some, she''ll suck your dick t-"'
+			*nl
 			'He didn''t see your fist coming. He falls to the ground as the other boy runs away. Straight into Lavrenti who knocks him down and gets him into an arm hold.
 			"Where did you hear that," Lavrenti asks as he bends the boy''s arm.'
 			'"Lizaveta," he screams. "But she heard it from Dimka! Please let me go."'
 			'Lavrenti lets him go. He looks at you and says, "No matter how many times you beat Dimka up, it won''t be enough. You need to humiliate him for everyone to see."'
-			'Then he heads home. You think about what he says, and a plan forms in your head. You just need a girl to use as bait and someone to watch your back. You also need a place with lots of people.
-			The disco is the perfect place for that. You resolve to head there tonight.'
+			'Then he heads home. You think about what he says, and a plan forms in your head. You just need a girl to use as bait and someone to watch your back. You also need a place with lots of people. The disco is the perfect place for that. You resolve to head there tonight.'
 			act 'Continue': gt 'gschool_grounds', 'main'
 		end
 
@@ -897,16 +884,14 @@ if dimaRevChoice = 4:
 					*clr & cla
 					npc_rel['A143'] += 5
 					npc_rel['A144'] += 5
-					'You and Alyona watch as Anushka puts the moves on Dimka. After a bit of flirting, she whispers something in his ear, then grabs him by the hand and heads to the restroom.
-					No one can resist her charms, when she wants to use them. You head to the restroom as Alyona hides in the crowd. When you get to the restroom, you hide in a stall. You hear the door open.'
+					'You and Alyona watch as Anushka puts the moves on Dimka. After a bit of flirting, she whispers something in his ear, then grabs him by the hand and heads to the restroom. No one can resist her charms, when she wants to use them. You head to the restroom as Alyona hides in the crowd. When you get to the restroom, you hide in a stall. You hear the door open.'
 					'"Just a little further. In this stall." They stop in front the stall you''re waiting in and open the door.'
 					act 'Spring the trap':
 						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
 						'"What''s up asshole," you say as you punch Dimka in the face. He runs for the exit right away. Straight into Alyona''s fist which knocks him to the ground.'
 						'"Fucking slut set me up," he yells just before Anushka kicks him repeatedly in the side.'
-						'"Who the fuck are you calling a slut?!" Anuska says as she bends over and punches Dimka in the face a few times, followed by several more kicks to his ribs.
-						Dimka curls up on the floor in pain as the three of you continue to rain blows down on him until he stops moving.
+						'"Who the fuck are you calling a slut?!" Anuska says as she bends over and punches Dimka in the face a few times, followed by several more kicks to his ribs. Dimka curls up on the floor in pain as the three of you continue to rain blows down on him until he stops moving.
 						Alyona checks to make sure he''s breathing and, more importantly, to see what''s in his pockets. 10000 roubles again! Does he go home and beg his parents for more money every time he gets robbed?'
 						'"Fucking rich kid," you hear Alyona say under her breath. "How many bottles of Zhiguljovskoje can we buy with this do you think?"'
 						'"Lets find out," you say. "But first I have an idea. Help me lift him."'
@@ -914,10 +899,7 @@ if dimaRevChoice = 4:
 						act 'Back to the dance':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
-							'You, Anushka, and Alyona head back to the dance and have a few beers, tossing his clothes in the trash. After a few minutes, you hear a scream coming from the restroom.
-							One of the girls must have found Dimka. She runs out screaming pervert. A few minutes later you hear sirens as the cops arrive. Everyone heads towards them to see who they are arresting.
-							The cops drag a naked Dimka out of the restroom as several kids take pictures with their phones. Then they put him in the back of a police car and drive off. People will be talking about this for a while.
-							For the first time, you can''t wait for school tomorrow.'
+							'You, Anushka, and Alyona head back to the dance and have a few beers, tossing his clothes in the trash. After a few minutes, you hear a scream coming from the restroom. One of the girls must have found Dimka. She runs out screaming pervert. A few minutes later you hear sirens as the cops arrive. Everyone heads towards them to see who they are arresting. The cops drag a naked Dimka out of the restroom as several kids take pictures with their phones. Then they put him in the back of a police car and drive off. People will be talking about this for a while. For the first time, you can''t wait for school tomorrow.'
 							act 'Continue': gt 'gdkin'
 						end
 					end
@@ -942,35 +924,39 @@ if dimaRevChoice = 4:
 				*clr & cla
 				grupvalue[4] += 2
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/cheers.jpg"></center>'
-				'You head to the old school building, with Anushka. Inside is the old music room, built to be soundproof. It is the perfect place to avoid being heard, even if most of the windows are now just borded up.
-				You knock on the door, so the people inside can quiet down, before heading in. Lavrenti hands you a beer as you enter. The party is in full swing and everyone is drinking and swearing.
-				Anushka goes to join Radomir and his band. As soon as she joins them, they start one of their songs. Vitek, Dan and Vasily are in a corner laughing. Paulina is drinking a bottle of vodka while talking to Lena and Lera.
-				Alyona is sitting by twenty bottles of Zhiguljovskoje, guarding them from anyone who tries to take one. You can''t believe she bought all that just for herself, the other half of them seem to have been handed out.
-				As you think that, Alyona sees you staring at her and offers you a bottle which you gladly accept.'
+				'You head to the old school building, with Anushka. Inside is the old music room, built to be soundproof. It is the perfect place to avoid being heard, even if most of the windows are now just borded up. You knock on the door, so the people inside can quiet down, before heading in. Lavrenti hands you a beer as you enter. The party is in full swing and everyone is drinking and swearing. Anushka goes to join Radomir and his band. As soon as she joins them, they start one of their songs. Vitek, Dan and Vasily are in a corner laughing. Paulina is drinking a bottle of vodka while talking to Lena and Lera.'
 				*nl
-				'"Aww, Alyona has a girlfriend," Vasily snickers. He is already drunk. You know that when Vasily is wasted he usually ends up unconscious either from passing out or fom his mouth getting him into trouble.
-				Radomir''s band finishes their song and grab some beers. Anushka comes over to you and Alyona. Alyona offers her a bottle as well. Anushka accepts it from her with one hand and grabs Alyona''s head with the other and brings her into a deep kiss, causing the boys in the room to cheer.
-				Alyona is unable to resist her and melts into her arms. Anushka eyes you while she kisses Alyona as if inviting you to join.'
-				act 'Join in':
-					*clr & cla
-					npc_rel['A143'] += 5
-					npc_rel['A144'] += 5
-					'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/threegirlskiss.jpg"></center>'
-					'You can''t resist her either, and the three of you make out enthusiastically. Anushka breaks the kiss and pulls you and Alyona towards the door and out into the hallway and into an empty room.
-					She undresses right away. You strip next and the two of you help Alyona with her clothes. The three of you makeout some more and grope each other''s bodies, moaning with passion on the old mattress covered in a blanket.
-					Alyona cums first and rolls over to catch her breath. You and Anushka continue to pleasure each other. Soon Alyona joins in again, switching between Anushka''s and your pussies, giving them the full attention of her tongue.'
-					*nl
-					'The kinkiness of the situation and Anushka finger banging you as Alyona eats her out, carries you to an orgasm as waves of pleasure wash over you. Alyona is still between Anushka''s legs, trying to bring her to orgasm.
-					Emboldened by the atmosphere of sex in the room, you grab Alyona''s face and give her the best kiss you can muster. You lock lips for a minute before pulling away and showing her how to perform real cunnilingus.
-					You work your tongue along Anushka''s pussy lips and clit, bringing her close to orgasm, but you hold back each time, just before she cums. You repeat this until she begs you to make her cum. You comply and Anushka screams as she orgasms.
-					The three of you lie on the ground together and cuddle before passing out.'
-					act 'Wake up':
+				'Alyona is sitting by twenty bottles of Zhiguljovskoje, guarding them from anyone who tries to take one. You can''t believe she bought all that just for herself, the other half of them seem to have been handed out. As you think that, Alyona sees you staring at her and offers you a bottle which you gladly accept.'
+				*nl
+				'"Aww, Alyona has a girlfriend," Vasily snickers. He is already drunk. You know that when Vasily is wasted he usually ends up unconscious either from passing out or fom his mouth getting him into trouble. Radomir''s band finishes their song and grab some beers. Anushka comes over to you and Alyona. Alyona offers her a bottle as well. Anushka accepts it from her with one hand and grabs Alyona''s head with the other and brings her into a deep kiss, causing the boys in the room to cheer. Alyona is unable to resist her and melts into her arms. Anushka eyes you while she kisses Alyona as if inviting you to join.'
+				if hotcat >= 6:
+					act 'Join in':
+						*clr & cla
+						npc_rel['A143'] += 5
+						npc_rel['A144'] += 5
+						'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/threegirlskiss.jpg"></center>'
+						'You can''t resist her either, and the three of you make out enthusiastically. Anushka breaks the kiss and pulls you and Alyona towards the door and out into the hallway and into an empty room.
+						She undresses right away. You strip next and the two of you help Alyona with her clothes. The three of you makeout some more and grope each other''s bodies, moaning with passion on the old mattress covered in a blanket.
+						Alyona cums first and rolls over to catch her breath. You and Anushka continue to pleasure each other. Soon Alyona joins in again, switching between Anushka''s and your pussies, giving them the full attention of her tongue.'
+						*nl
+						'The kinkiness of the situation and Anushka finger banging you as Alyona eats her out, carries you to an orgasm as waves of pleasure wash over you. Alyona is still between Anushka''s legs, trying to bring her to orgasm.
+						Emboldened by the atmosphere of sex in the room, you grab Alyona''s face and give her the best kiss you can muster. You lock lips for a minute before pulling away and showing her how to perform real cunnilingus.
+						You work your tongue along Anushka''s pussy lips and clit, bringing her close to orgasm, but you hold back each time, just before she cums. You repeat this until she begs you to make her cum. You comply and Anushka screams as she orgasms.
+						The three of you lie on the ground together and cuddle before passing out.'
+						act 'Wake up':
+							*clr & cla
+							'<center><img src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_6_7.jpg"></center>'
+							'As you wake up, you see a partially dressed Anushka sitting on the window sill smoking a cigarette. Alyona is still sleeping like a baby. "She looks so content," Anushaka says in a somewhat sad tone, which makes you wonder just how rough Alyona''s life is, "and so adorable when she''s like this. Are you going home?"'
+							'"Yeah," you say as you get dressed. "I''ll see you later."'
+							'You give her a kiss, then finish getting dressed and head home. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
+							act 'Continue': gt 'pavResidential'
+						end
+					end
+				else
+					act 'Just watch':
 						*clr & cla
-						'<center><img src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_6_7.jpg"></center>'
-						'As you wake up, you see a partially dressed Anushka sitting on the window sill smoking a cigarette. Alyona is still sleeping like a baby. "She looks so content," Anushaka says in a somewhat sad tone, which makes you wonder just how rough Alyona''s life is, "and so adorable when she''s like this. Are you going home?"'
-						'"Yeah," you say as you get dressed. "I''ll see you later."'
-						'You give her a kiss, then finish getting dressed and head home. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back.
-						It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
+						'<center><img src="images/locations/pavlosvk/school/oldshcool/gopnahngout/party/party.jpg"></center>'
+						'You watch the two of them make out and then they drift into another room to be alone. You rejoin the party, talking with others and drinking. You spend the whole day there, even passing out for awhile, only to wake up to several others also passed out. Seems like the party finally ran out of steam. You get up and look around a bit, stretching before heading out. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
 						act 'Continue': gt 'pavResidential'
 					end
 				end
@@ -988,7 +974,6 @@ if dimaRevChoice = 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/schoolwinter.jpg"></center>'
 			end
 			'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
-
 			'It seems Dimka didn''t finished to spread dirt about you, maybe you have to talk to your group again, hopefully it''s not too late...'
 			act 'Continue': gt $loc,$metka
 		end
@@ -1182,15 +1167,13 @@ if dimaRevChoice = 6:
 		pav_sex -=100
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-		'As you exit the cafeteria, you start to hear nasty comments from the students in the hall. They get louder and louder until one boy loudly calls you a slut to your face. Then they start chanting "Slut! Slut! Slut!" as other kids join in.
-		Soon the whole hallway is yelling "Slut!" until you run to the girl''s bathroom with your eyes full of tears.'
+		'As you exit the cafeteria, you start to hear nasty comments from the students in the hall. They get louder and louder until one boy loudly calls you a slut to your face. Then they start chanting "Slut! Slut! Slut!" as other kids join in. Soon the whole hallway is yelling "Slut!" until you run to the girl''s bathroom with your eyes full of tears.'
 		act 'In the girls room':
 			*clr & cla
 			minut += 5
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
-			'As you hide in the stall, crying hysterically, all you can think about is how your life is over. All the girls are going to give you the cold shoulder. The boys are going to treat you like a whore and make you give them blowjobs alongside Sonia.
-			Your mother will disown you. Your despair is interrupted by a banging on the restroom door.'
+			'As you hide in the stall, crying hysterically, all you can think about is how your life is over. All the girls are going to give you the cold shoulder. The boys are going to treat you like a whore and make you give them blowjobs alongside Sonia. Your mother will disown you. Your despair is interrupted by a banging on the restroom door.'
 			'"Come out, <<$pcs_nickname>>. you can''t stay in their forever." It''s Dimka, that fucking asshole.'
 			'"Your public is waiting for you, slut. Come out and show us what a good cocksuc- Ow! Fuck! Get the hell off me Artem!"'
 			act 'peek your head out':
@@ -1198,8 +1181,7 @@ if dimaRevChoice = 6:
 				minut += 15
 				'<center><b><font color="maroon">School Hallway</font></b></center>'
 				'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/fightinginhall.jpg"></center>'
-				'You peek your head out and see Artem on top of Dimka, punching him in the face over and over with no sign of stopping. Igor is behind Artem, about to pull him off, but is knocked aside by Ivan.
-				This rather one sided fight goes on until a teacher hears the commotion and comes to investigate. Ivan pulls Artem off of Dimka before the teacher can see what''s happening.'
+				'You peek your head out and see Artem on top of Dimka, punching him in the face over and over with no sign of stopping. Igor is behind Artem, about to pull him off, but is knocked aside by Ivan. This rather one sided fight goes on until a teacher hears the commotion and comes to investigate. Ivan pulls Artem off of Dimka before the teacher can see what''s happening.'
 				act 'Act innocent':
 					*clr & cla
 					minut += 10
@@ -1217,8 +1199,7 @@ if dimaRevChoice = 6:
 						minut += 60
 						'<center><b><font color="maroon">Classroom</font></b></center>'
 						'<center><img src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
-						'You sit in the classroom going over what just happened. You smile as you think about the beating Dimka just received. You also think how fortunate you are that it was Mr. Ivanov who came to investigate.
-						The way Artem could lie to his face like that makes you wonder. It seems like everyone has stopped talking about you. Well, at least about your slutiness. Tired of being in your own head, you listen to the conversations in the classroom.'
+						'You sit in the classroom going over what just happened. You smile as you think about the beating Dimka just received. You also think how fortunate you are that it was Mr. Ivanov who came to investigate. The way Artem could lie to his face like that makes you wonder. It seems like everyone has stopped talking about you. Well, at least about your slutiness. Tired of being in your own head, you listen to the conversations in the classroom.'
 						*nl
 						'"Did you see the fight between Dimka and Artem?"'
 						'"Yeah, if you can call it that. Dimka got his ass kicked. What a weakling. And he''s a snitch."'
@@ -1232,32 +1213,28 @@ if dimaRevChoice = 6:
 							npc_rel['A25'] += 5
 							'<center><b><font color="maroon">Classroom</font></b></center>'
 							'<center><img src="images/locations/pavlovsk/school/classroom/talkboy.jpg"></center>'
-							'It doesn''t look like the teacher is coming back. Most of the students decide to leave early except the nerds, outcasts and a few of the jocks who have to stay for team practice. Soon the seat next to Artem opens up and you decide to take it.
-							Artem gives you a shy smile as you take a seat. You decide that now would be a good time to thank him and ask how he sold that story.'
+							'It doesn''t look like the teacher is coming back. Most of the students decide to leave early except the nerds, outcasts and a few of the jocks who have to stay for team practice. Soon the seat next to Artem opens up and you decide to take it. Artem gives you a shy smile as you take a seat. You decide that now would be a good time to thank him and ask how he sold that story.'
 							*nl
-							'"It was easy, really. I tutor a few of the jocks and they agreed to spread the word that you dumped Dimka for me. It was the only solution I could think of."
-							Artem scratches the back of his head and continues, "I guess word didn''t spread fast enough though, and when I heard everyone in the hall badmouthing you I guess I lost control. I''ve never been in a fight before."'
+							'"It was easy, really. I tutor a few of the jocks and they agreed to spread the word that you dumped Dimka for me. It was the only solution I could think of."'
+							'Artem scratches the back of his head and continues, "I guess word didn''t spread fast enough though, and when I heard everyone in the hall badmouthing you I guess I lost control. I''ve never been in a fight before."'
 							*nl
-							'You can''t help but think there''s more to it to that. You decide that he''s entitled to a litle deviousness and decide not to go into it.
-							"I really appreciate you standing up for me," you tell him as you give him a kiss on the cheek. Soon after the bell rings. As the students leave the classroom you suggest that Artem should walk you home.'
+							'You can''t help but think there''s more to it to that. You decide that he''s entitled to a litle deviousness and decide not to go into it.'
+							'"I really appreciate you standing up for me," you tell him as you give him a kiss on the cheek. Soon after the bell rings. As the students leave the classroom you suggest that Artem should walk you home.'
 							act 'Walk home with Artem':
 								*clr & cla
 								minut += 10
 								npc_rel['A25'] += 10
 								'<center><b><font color="maroon">After School</font></b></center>'
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/walkinghometogether.jpg"></center>'
-								'As you leave the school with Artem, you hear the other students talking about the two of you. Mostly talking about what a lucky bastard Artem is and how cute the two of you look together.
-								When you reach your apartment you check to see if your parents are home and when you see that they aren''t, you invite Artem into your room. You tell him to undress and relax and let you take care of him. Artem undresses and sits on your bed and eagerly waits for what you have planned.
-								You find your sexiest outfit and put it on in the bathroom then return to him.'
+								'As you leave the school with Artem, you hear the other students talking about the two of you. Mostly talking about what a lucky bastard Artem is and how cute the two of you look together. When you reach your apartment you check to see if your parents are home and when you see that they aren''t, you invite Artem into your room. You tell him to undress and relax and let you take care of him. Artem undresses and sits on your bed and eagerly waits for what you have planned. You find your sexiest outfit and put it on in the bathroom then return to him.'
 								act 'Do a strip tease':
 									*clr & cla
 									minut += 15
-								!!if high erotic dancing skill!!
+!!if high erotic dancing skill!! this was never coded 
 									'<center><b><font color="maroon">Home</font></b></center>'
 									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/striptease1.mp4"></video></center>'
-									'You decide to give him a show as you sway your hips back and forth making sure to give him a good view of yor backside like you know he likes. His member stands at attention in no time at all. He can''t resist your ass.
-									As you get into it you shed your outer clothes and continue to gyrate your hips to his enjoyment. You remove your bra in a quick graceful move and take off your panties and flick them at his face. When he picks them off his face you are already on the bed in front of him giving him the best view yet.'
-									!!if low erotic dancing skill!!
+									'You decide to give him a show as you sway your hips back and forth making sure to give him a good view of yor backside like you know he likes. His member stands at attention in no time at all. He can''t resist your ass. As you get into it you shed your outer clothes and continue to gyrate your hips to his enjoyment. You remove your bra in a quick graceful move and take off your panties and flick them at his face. When he picks them off his face you are already on the bed in front of him giving him the best view yet.'
+!!if low erotic dancing skill!! ths was never coded
 									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/stripfail.mp4"></video></center>'
 									'You decide to give him a show. You really should have practiced first. You fell down a couple time and had to get his help to unclasp your bra, and when you tried a complicated move you tripped on your sisters bed. Laughing, you get up and get on the bed in front of him.'
 									act 'Foot worship':
@@ -1273,10 +1250,9 @@ if dimaRevChoice = 6:
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/revenge/reversecowgirl.mp4"></video></center>'
 											'It''s time for the main event. You pull your foot away from him and start to lower youself over his cock. You get lower and lower until your vulva is kissing the tip of his dick. "You wan''t me, don''t you?" you ask him in your sexiest voice.'
 											*nl
-											'"Yes, please, <<$pcs_nickname>>. I can''t take it anymore. I need you." You can''t take it anymore either and you let your pussy engulf his penis and start riding him with reckless abandon. Apparently you were closer than him, because it isn''t long before you orgasm, screaming at the top of your lungs.
-											As you come down from your orgasmic high, you lean forward and give Artem a long, passionate kiss on the lips. You pull yourself off him, turn around and plunge back down to ride him in reverse cowgirl. You roll your hips and milk his cock urging him to let his cum out. You ride him like this for a few minute until you have another orgasm.
-											Your eyes roll back as you ride out the sensation, unaware of the rest of the world. You''re in heaven. When you come back to earth you see that Artem came on your ass.'
+											'"Yes, please, <<$pcs_nickname>>. I can''t take it anymore. I need you." You can''t take it anymore either and you let your pussy engulf his penis and start riding him with reckless abandon. Apparently you were closer than him, because it isn''t long before you orgasm, screaming at the top of your lungs. As you come down from your orgasmic high, you lean forward and give Artem a long, passionate kiss on the lips. You pull yourself off him, turn around and plunge back down to ride him in reverse cowgirl. You roll your hips and milk his cock urging him to let his cum out. You ride him like this for a few minute until you have another orgasm.'
 											*nl
+											'Your eyes roll back as you ride out the sensation, unaware of the rest of the world. You''re in heaven. When you come back to earth you see that Artem came on your ass.'
 											'"That was amazing!" You blush at that statement. Then, seeing the clock, you rush him out of your apartment before your parents get home. Before he leaves, you pull him into another long kiss and watch as he makes his way to the stairs. As you reenter your apartment, you think to yourself wistfully, "That was amazing."'
 											act 'Continue': gt 'korrPar'
 										end

+ 6 - 6
locations/dinnpc.qsrc

@@ -15,7 +15,7 @@ $din_predlog_dima_bj = {
 			bja += 1
 			dick = 16
 
-			if npcSex[numnpc] = 0:npcSex[numnpc] = 1 & guy += 1
+			if npc_Sex['A1'] = 0: npc_Sex['A1'] = 1 & guy += 1
 
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/cocksucker2.jpg"></center>'
@@ -75,10 +75,10 @@ $din_dima_predlog = {
 	act 'Who does he think you are?! - Slap him':
 		*clr & cla
 		pcs_dom += 1
-		npc_rel['A<<numnpc>>'] = 0
+		npc_rel['A1'] = 0
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 		'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.' 
 		'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:' 
 		'"You''ll pay for this, sooner or later. Don''t ever come near me again, bitch! Get the hell away from me!"'
@@ -131,7 +131,7 @@ $din_igor_disco_bj = {
 	act 'Get down on your knees':
 		*clr & cla
 
-		if npcSex[numnpc] = 0:npcSex[numnpc] = 1 & guy += 1
+		if npc_Sex['A4'] = 0: npc_Sex['A4'] = 1 & guy += 1
 
 		dick = 6
 		gs 'stat'
@@ -157,7 +157,7 @@ $din_igor_dima_disco_bj = {
 	act 'Get down on your knees':
 		*clr & cla
 
-		if npcSex[numnpc] = 0:npcSex[numnpc] = 1 & guy += 1
+		if npc_Sex['A4'] = 0: npc_Sex['A4'] = 1 & guy += 1
 
 		dick = 6
 		spafinloc = 12

+ 1 - 1
locations/etoexhib.qsrc

@@ -1257,7 +1257,7 @@ if $ARGS[0] = 'pos34':
 		act 'Next':gt 'etoexhib', 'pos33'
 	end
 
-	if shampoo > 0
+	if shampoo > 0:
 		act 'Take a shower':gt 'ptu_dush', 'pos1'
 	else
 		*nl

+ 484 - 405
locations/fight.qsrc

@@ -12,491 +12,569 @@ opp_punch[0] = Power punch
 opp_jab[0] = Ligth punch
 opp_stren[0] = Strengh
 opp_agil[0] = Agility
-opp_vital[0] = Opponent health
-opp_react = Reactions
+opp_vital[0] = vitality
+opp_react[0] = Reactions
+opp_health[0] = Health
+opp_willpwr[0] = willpower
 opp_shoot[0] = opponent marksmanship (only required if they are armed)
 opp_magik[0] = only if they have magic
 opp_mana[0] = only if they have magic
+opp_fog[0] = (tuman): Obscures vision, makes hitting harder.
+opp_clone[0] = (klon): Copies of the char that absorb 1 hit and disappear.  A char may have some number of them.
+opp_shield[0] = (defence): Shielding that absorbs damage before hitpoints.
+opp_dambonus[0] = (magweapbonus): damage added to melee attacks
+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'
+	killvar '$opp_image'
+	killvar 'opp_def'
+	killvar 'opp_run'
+	killvar 'opp_wrstlng'
+	killvar 'opp_kick'
+	killvar 'opp_punch'
+	killvar 'opp_jab'
+	killvar 'opp_stren'
+	killvar 'opp_agil'
+	killvar 'opp_vital'
+	killvar 'opp_react'
+	killvar 'opp_health'
+	killvar 'opp_willpwr'
+	killvar 'opp_shoot'
+	killvar 'opp_magik'
+	killvar 'opp_mana'
+	killvar 'opp_fog'
+	killvar 'opp_clone'
+	killvar 'opp_shield'
+	killvar 'opp_dambonus'
+	killvar 'opp_init'
+	killvar 'opp_stun'
+
+	!! Clear any allies from previous battle
+	i = arrsize('pcs_health')
+	:ClearAllyLoop
+	if i > 1:
+		gs 'fight', 'clearPCSArray', i-1
+		i -= 1
+		jump 'ClearAllyLoop'
+	end
+	killvar 'i'
+
+	!! Initialize $pcs_name for Sveta
+	$pcs_name[0] = 'You'
+	$pcs_image[0] = FUNC('$face_image')
+end
+
+if $ARGS[0] = 'clearPCSArray':
+!{ Delete an Ally from the pcs data arrays
+	ARGS[1] = Which ally slot tot delete
+}
+	i = ARGS[1]
+
+	killvar '$pcs_name', i
+	killvar '$pcs_image', i
+	killvar 'pcs_def', i
+	killvar 'pcs_run', i
+	killvar 'pcs_wrstlng', i
+	killvar 'pcs_kick', i
+	killvar 'pcs_punch', i
+	killvar 'pcs_jab', i
+	killvar 'pcs_stren', i
+	killvar 'pcs_agil', i
+	killvar 'pcs_vital', i
+	killvar 'pcs_react', i
+	killvar 'pcs_health', i
+	killvar 'pcs_willpwr', i
+	killvar 'pcs_shoot', i
+	killvar 'pcs_magik', i
+	killvar 'pcs_mana', i
+	killvar 'pcs_fog', i
+	killvar 'pcs_clone', i
+	killvar 'pcs_shield', i
+	killvar 'pcs_dambonus', i
+	killvar 'pcs_init', i
+	killvar 'pcs_stun', i
+
+	killvar 'i'
+end
+
+if $ARGS[0] = 'randomOpp':
+!{ Generate a random Opponent
+	ARGS[1] = Optional, raise difficulty of the attacker, 0 - 50
+}
+	OppDiffBonus = ARGS[1]
+	i = arrsize('opp_health')
+	$opp_name[i] = 'Opponent 1'
+	$opp_image[i] = 'images/locations/shared/street/mugger.jpg'
+	opp_def[i] = rand(1,50) + OppDiffBonus
+	opp_run[i] = rand(1,50) + OppDiffBonus
+	opp_wrstlng[i] = rand(1,50) + OppDiffBonus
+	opp_kick[i] = rand(1,50) + OppDiffBonus
+	opp_punch[i] = rand(1,50) + OppDiffBonus
+	opp_jab[i] = rand(1,50) + OppDiffBonus
+	opp_stren[i] = rand(1,50) + OppDiffBonus
+	opp_agil[i] = rand(1,50) + OppDiffBonus
+	opp_vital[i] = rand(1,50) + OppDiffBonus
+	opp_health[i] = (opp_vital * 10 + opp_stren * 5)
+	opp_react[i] = rand(1,50) + OppDiffBonus
+	opp_willpwr[i] = rand(1,50) + OppDiffBonus
+	opp_shoot[i] = rand(1,50) + OppDiffBonus
+	killvar 'OppDiffBonus'
+	killvar 'i'
+end
+
+if $ARGS[0] = 'applyDamage':
+!{ Apply Damage to a participant taking into account clones and shields
+	$ARGS[1] = Target Type ('opp','pcs')
+	 ARGS[2] = Target number
+	 ARGS[3] = damage to be applied
+}
+	$fightAppDam['TargetType'] = $ARGS[1]
+	fightAppDam['TargetNumber'] = ARGS[2]
+	fightAppDam['Damage'] = ARGS[3]
+	dynamic "
+	!!If the target has clones, destroy one
+	if <<$fightAppDam['TargetType']>>_clone[<<fightAppDam['TargetNumber']>>] > 0:
+		<<$fightAppDam['TargetType']>>_clone[<<fightAppDam['TargetNumber']>>] -= 1
+		'Clone Destroyed!'
+	!!if the target has enough shields to mitigate, remove some shields
+	elseif <<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] >= fightAppDam['Damage']:
+		<<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] -= fightAppDam['Damage']
+	!!otherwise remove shields to 0 and the remainder comes from health
+	else
+		<<$fightAppDam['TargetType']>>_health -= (fightAppDam['Damage'] - <<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>])
+		<<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] = 0
+	end"
+	killvar '$fightAppDam'
+	killvar 'fightAppDam'
+end
+
 if $ARGS[0] = 'start':
 	menu_off = 1
 	inFight = 1
 	gs 'themes', 'indoors'
 	cla
-	
-	'<center><b><font color="maroon">Fight!</font></b></center>'
-	*nl
-	'<left><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></left><right><<$opp_image[0]>></right>'
-	*nl
-	'<left><<$pcs_firstname>></left><center>vs.</center><right><<$opp_name[0]>></right>'
-	
-	pcs_timer = 100 - pcs_react
-	opp_timer = 100 - opp_react[0]
-	
+
+	if arrsize('pcs_health') > arrsize('opp_health'):
+		tableSize = arrsize('pcs_health')
+	else
+		tableSize = arrsize('opp_health')
+	end
+
+	$HTMLText = '<table>
+		<tr>
+			<th align="right">Allies</td>
+			<th align="center" valign="center" rowspan=<<tableSize*2+1>> >vs.</td>
+			<th align="left">Opponents</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="<<$opp_image[i]>>"></td>
+		</tr>
+		<tr>
+			<td align="right"><<$pcs_name[i]>></td>
+
+			<td align="left"><<$opp_name[i]>></td>
+		</tr>'
+		i += 1
+		jump 'FightPoster'
+	end
+	$HTMLText += '</table>'
+
+	*pl func('cleanHTML',$HTMLText)
+
+	pcs_timer[0] = 100 - pcs_react
+	if pcs_health[1] > 0:
+		pcs_timer[1] = 100 - pcs_react[1]
+	else
+		pcs_timer[1] = 100
+	end
+	if pcs_health[2] > 0:
+		pcs_timer[2] = 100 - pcs_react[2]
+	else
+		pcs_timer[2] = 100
+	end
+	opp_timer[0] = 100 - opp_react[0]
+	if opp_health[1] > 0:
+		opp_timer[1] = 100 - opp_react[1]
+	else
+		opp_timer[1] = 100
+	end
+	if opp_health[2] > 0:
+		opp_timer[2] = 100 - opp_react[2]
+	else
+		opp_timer[2] = 100
+	end
+
 	act 'Engage': gt 'fight', 'main'
+
+	killvar '$HTMLText'
+	killvar 'tableSize'
+	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'
+	if pcs_timer[0] < opp_timer[0] and pcs_timer[0] < opp_timer[1] and pcs_timer[0] < opp_timer[2] and pcs_timer[0] < pcs_timer[1] and pcs_timer[0] < pcs_timer[2]:
+		if opp_health[0] > 0: opp_timer[0] -= pcs_timer[0]
+		if opp_health[1] > 0: opp_timer[1] -= pcs_timer[0]
+		if opp_health[2] > 0: opp_timer[2] -= pcs_timer[0]
+		if pcs_health[1] > 0: pcs_timer[1] -= pcs_timer[0]
+		if pcs_health[2] > 0: pcs_timer[2] -= pcs_timer[0]
+		pcs_timer[0] = 0
+		gt 'fight', 'player', 0
+	elseif pcs_timer[1] < opp_timer[0] and pcs_timer[1] < opp_timer[1] and pcs_timer[1] < opp_timer[2] and pcs_timer[1] < pcs_timer[0] and pcs_timer[1] < pcs_timer[2]:
+		if opp_health[0] > 0: opp_timer[0] -= pcs_timer[1]
+		if opp_health[1] > 0: opp_timer[1] -= pcs_timer[1]
+		if opp_health[2] > 0: opp_timer[2] -= pcs_timer[1]
+		if pcs_health[0] > 0: pcs_timer[0] -= pcs_timer[1]
+		if pcs_health[2] > 0: pcs_timer[2] -= pcs_timer[1]
+		pcs_timer[1] = 0
+		gt 'fight', 'player', 1
+	elseif pcs_timer[2] < opp_timer[0] and pcs_timer[2] < opp_timer[1] and pcs_timer[2] < opp_timer[2] and pcs_timer[2] < pcs_timer[1] and pcs_timer[2] < pcs_timer[0]:
+		if opp_health[0] > 0: opp_timer[0] -= pcs_timer[2]
+		if opp_health[1] > 0: opp_timer[1] -= pcs_timer[2]
+		if opp_health[2] > 0: opp_timer[2] -= pcs_timer[2]
+		if pcs_health[0] > 0: pcs_timer[0] -= pcs_timer[2]
+		if pcs_health[1] > 0: pcs_timer[1] -= pcs_timer[2]
+		pcs_timer[2] = 0
+		gt 'fight', 'player', 2
+	elseif opp_timer[0] < opp_timer[1] and opp_timer[0] < opp_timer[2] and opp_timer[0] < pcs_timer[0] and opp_timer[0] < pcs_timer[1] and opp_timer[0] < pcs_timer[2]:
+		if opp_health[1] > 0: opp_timer[1] -= opp_timer[0]
+		if opp_health[2] > 0: opp_timer[2] -= opp_timer[0]
+		if pcs_health[0] > 0: pcs_timer[0] -= opp_timer[0]
+		if pcs_health[1] > 0: pcs_timer[1] -= opp_timer[0]
+		if pcs_health[2] > 0: pcs_timer[2] -= opp_timer[0]
+		opp_timer[0] = 0
+		gt 'fight', 'opponent', 0
+	elseif opp_timer[1] < opp_timer[0] and opp_timer[1] < opp_timer[2] and opp_timer[1] < pcs_timer[0] and opp_timer[1] < pcs_timer[1] and opp_timer[1] < pcs_timer[2]:
+		if opp_health[0] > 0: opp_timer[0] -= opp_timer[1]
+		if opp_health[2] > 0: opp_timer[2] -= opp_timer[1]
+		if pcs_health[0] > 0: pcs_timer[0] -= opp_timer[1]
+		if pcs_health[1] > 0: pcs_timer[1] -= opp_timer[1]
+		if pcs_health[2] > 0: pcs_timer[2] -= opp_timer[1]
+		opp_timer[1] = 0
+		gt 'fight', 'opponent', 1
+	elseif opp_timer[2] < opp_timer[0] and opp_timer[2] < opp_timer[1] and opp_timer[2] < pcs_timer[0] and opp_timer[2] < pcs_timer[1] and opp_timer[2] < pcs_timer[2]:
+		if opp_health[0] > 0: opp_timer[0] -= opp_timer[2]
+		if opp_health[1] > 0: opp_timer[1] -= opp_timer[2]
+		if pcs_health[0] > 0: pcs_timer[0] -= opp_timer[2]
+		if pcs_health[1] > 0: pcs_timer[1] -= opp_timer[2]
+		if pcs_health[2] > 0: pcs_timer[2] -= opp_timer[2]
+		opp_timer[2] = 0
+		gt 'fight', 'opponent', 2
+	end
+end
+
+if $ARGS[0] = 'printStats':
+!{ Print the stats for a character
+	$ARGS[1] = The Type of char ('opp','pcs')
+	 ARGS[2] = The member of the party
+}
+	$fightPStats['CharType'] = $ARGS[1]
+	i = ARGS[2]
+
+	if $fightPStats['CharType'] = 'opp':
+		$fightPStats['Name'] = $opp_name[i]
+		fightPStats['Health'] = opp_health[i]
+		fightPStats['Mana'] = opp_mana[i]
+		fightPStats['Willpower'] = opp_willpwr[i]
+		fightPStats['Shield'] = opp_shield[i]
+		fightPStats['Fog'] = opp_fog[i]
+		fightPStats['Clone'] = opp_clone[i]
 	else
-		opp_react[0] = opp_react[0] - pcs_timer
-		pcs_timer = 0
-		gt 'fight', 'player'
+		$fightPStats['Name'] = $pcs_name[i]
+		fightPStats['Health'] = pcs_health[i]
+		fightPStats['Mana'] = pcs_mana[i]
+		fightPStats['Willpower'] = pcs_willpwr[i]
+		fightPStats['Shield'] = pcs_shield[i]
+		fightPStats['Fog'] = pcs_fog[i]
+		fightPStats['Clone'] = pcs_clone[i]
+	end
+
+	'<b><<$fightPStats["Name"]>></b> life <b><font color = red><<fightPStats["Health"]>></font></b>, mana <b><font color = blue><<fightPStats["Mana"]>></font></b>, willpower <b><font color = green><<fightPStats["Willpower"]>></font></b>'
+	if fightPStats['Shield'] > 0:'<b><font color = red>Protection <<fightPStats["Shield"]>> units</font></b>'
+	if fightPStats['Clone'] > 0:'<b><font color = red>Clones active <<fightPStats["Clone"]>> </font></b>'
+	if fightPStats['Fog'] > 0:'<b><font color = red>Obscuring Fog <<fightPStats["Fog"]>> units</font></b>'
+	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
+
+	killvar 'i'
+	killvar 'fightPStats'
+	killvar '$fightPStats'
+end
+
+if $ARGS[0] = 'statDisplay':
+	'<b>= = = = = = = = = = = O p p o n e n t s = = = = = = = = = = =</b>'
+	i = 0
+	:OppLoopRC1
+	if i < arrsize('opp_health'):
+		gs 'fight', 'printStats', 'opp', i
+		i += 1
+		jump 'OppLoopRC1'
+	end
+	*nl
+	'<b>= = = = = = = = = = = = A l l i e s = = = = = = = = = = = = =</b>'
+	i = 0
+	:PCSLoopRC1
+	if i < arrsize('pcs_health'):
+		gs 'fight', 'printStats', 'pcs', i
+		i += 1
+		jump 'PCSLoopRC1'
 	end
 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
-	
-!!	gs'defence'
-!!	gs'statBat'
+
 
 !!win/lose conditions
 	if pcs_health <= 0:
 		'<b><font color = red> You lost!</font></b>'
 
-		xgt'ender','loss'
+		!xgt'ender','loss'
+		gt $loc, $metka
 		exit
-	elseif opp_vital[0] <= 0:
+	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
-	gt 'fight', 'main'
+	!gt 'fight', 'main'
+	killvar 'i'
 end
 
-if $ARGS[0] = 'opponent':
-	if opp_magik > 0: gs 'fight', 'opp_spellcast'
-	if rand(0,opp_kick[0]) > 40:
-		'Your opponent attempts a kick!'
-		*nl
-		if opp_kick[0] + rand(0,30) > pcs_react / 4 + 3 * pcs_agil / 4:
-			opp_strike = opp_stren[0] * rand(3,4) / 15
-			pcs_health -= opp_strike
-			if opp_strike > 10:
-				'They hit you and you reel in pain.'
-			else
-				'Its a glancing blow, but still hurts.'
-			end
-		else
-			'You avoid the blow.'
-		end
-		opp_timer += 40
-		act 'Next': gt 'fight', 'main'
-	elseif rand(0,opp_punch[0]) > 40:
-		'Your opponent attempts a strong punch!'
-		*nl
-		if opp_punch[0] + rand(0,30) > pcs_react / 4 + 3 * pcs_agil / 4:
-			opp_strike = opp_stren[0] * rand(2,3) / 15
-			pcs_health -= opp_strike
-			if opp_strike > 6:
-				'They punch you with real power.'
-			else
-				'Its a glancing blow, but still hurts.'
-			end
-		else
-			'You avoid the blow.'
-		end
-		opp_timer += 30
-		act 'Next': gt 'fight', 'main'
+!! Kick
+$AttackType[0] = 'Kick'
+$AttackSkill[0] = 'kick'
+AttackMin[0] = 3
+AttackMax[0] = 4
+AttackTime[0] = 40
+!! Hard Punch
+$AttackType[1] = 'Hard Punch'
+$AttackSkill[1] = 'punch'
+AttackMin[1] = 2
+AttackMax[1] = 3
+AttackTime[1] = 30
+!! Jab
+$AttackType[2] = 'Jab'
+$AttackSkill[2] = 'jab'
+AttackMin[2] = 1
+AttackMax[2] = 2
+AttackTime[2] = 15
+
+!!{Attack a target
+	$ARGS[0] = Attack Type
+	$ARGS[1] = Target Type
+	 ARGS[2] = Which target
+	 ARGS[3] = Which Attacker
+}
+
+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['AttackerName'] = 'You'
+	elseif $fightAtk_TargetType = 'opp':
+		$fightAtk['AttackerType'] = 'pcs'
+		$fightAtk['AttackerName'] = $pcs_name['<<ARGS[3]>>']
+		$fightAtk['DefenderName'] = $opp_name['<<ARGS[2]>>']
+		$fightAtk['TargetPronoun'] = 'They'
 	else
-		'Your opponent attempts a light!'
-		*nl
-		if opp_jab[0] + rand(0,30) > pcs_react / 4 + 3 * pcs_agil / 4:
-			opp_strike = opp_stren[0] * rand(1,2) / 15
-			pcs_health -= opp_strike
-			if opp_strike > 4:
-				'The jab hits home and stings.'
-			else
-				'They barely hit you.'
-			end
-		else
-			'You avoid the blow.'
-		end
-		opp_timer += 15
-		act 'Next': gt 'fight', 'main'
+		$fightAtk['AttackerType'] = 'opp'
+		$fightAtk['AttackerName'] = $opp_name['<<ARGS[3]>>']
+		$fightAtk['DefenderName'] = $pcs_name['<<ARGS[2]>>']
+		$fightAtk['TargetPronoun'] = 'You'
 	end
-end	
 
-if $ARGS[0] = 'player':
-	if pcs_magik > 0: gs 'fight', 'spellcast'
-
-	act 'Kick them':
-		'You attempts a kick!'
-		*nl
-		if pcs_kick + rand(0,30) > opp_react[0] / 4 + 3 * opp_agil[0] / 4:
-			pcs_strike = pcs_stren * rand(3,4) / 15
-			opp_health -= pcs_strike
-			if pcs_strike > 10:
-				'You hit them and they reel in pain.'
+	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]
+
+	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"
+		!!Apply Damage
+		gs 'fight', 'applyDamage', $fightAtk_TargetType, fightAtk_TargetNumber, fightAtk['Damage']
+		if fightAtk['Damage'] > 10:
+			if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+				'The hit is hard and you reel in pain.'
 			else
-				'Its a glancing blow, but still hurts them.'
+				'The hit is hard and <<$fightAtk["AttackerName"]>> reels in pain.'
 			end
 		else
-			'They avoid the blow.'
+			'Its a glancing blow, but still hurts.'
 		end
-		pcs_timer += 40
-		act 'Next': gt 'fight', 'main'
-	end
-
-	act 'Hard punch':
-		'Your opponent attempts a strong punch!'
-		*nl
-		if pcs_punch + rand(0,30) > opp_react[0] / 4 + 3 * opp_agil[0] / 4:
-			pcs_strike = pcs_stren * rand(2,3) / 15
-			opp_health -= pcs_strike
-			if pcs_strike > 6:
-				'You punch them with real power.'
-			else
-				'Its a glancing blow, but still hurts them.'
-			end
+	else
+		if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+			'You avoid the blow.'
 		else
-			'They avoid the blow.'
+			'<<$fightAtk["AttackerName"]>> avoids the blow.'
 		end
-		pcs_timer += 30
-		act 'Next': gt 'fight', 'main'
 	end
+	dynamic "<<$fightAtk['AttackerType']>>_timer += AttackTime[fightAtk_Type]"
+	cla
+	act 'Next': gt 'fight', 'main'
+
+	killvar 'fightAtk'
+	killvar '$fightAtk'
+	killvar '$fightAtk_Type'
+	killvar '$fightAtk_TargetType'
+	killvar 'fightAtk_TargetNumber'
+	killvar 'fightAtk_AttackerNumber'
+end
 
-	act 'Jab them':
-		'Your opponent attempts a light!'
-		*nl
-		if pcs_jab + rand(0,30) > opp_react[0] / 4 + 3 * opp_agil[0] / 4:
-			pcs_strike = pcs_stren * rand(1,2)/15
-			opp_health -= pcs_strike
-			if pcs_strike > 4:
-				'Your jab hits home and stings them.'
-			else
-				'You barely hit them.'
-			end
+if $ARGS[0] = 'opponent':
+	gs 'fight', 'statDisplay'
+	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
-			'They avoid the blow.'
+			TargetNumber = 2
 		end
-		pcs_timer += 15
-		act 'Next': gt 'fight', 'main'
+	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:
+		gs 'fight', 'Attack', 'Kick', 'pcs', TargetNumber, ARGS[2]
+	elseif rand(0,opp_punch[0]) > 40:
+		gs 'fight', 'Attack', 'Hard Punch', 'pcs', TargetNumber, ARGS[2]
+	else
+		gs 'fight', 'Attack', 'Jab', 'pcs', TargetNumber, ARGS[2]
 	end
-end	
-
-
-if $ARGS[0] = 'opp_spellcast':
-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>'
+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, ARGS[2]
+		end
 
-	if stunV > 0 and SasoriBody = 1:
-		stunV = 0
+		act 'Punch <<$opp_name[0]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, ARGS[2]
+		end
 
-		'<b><font color = red>Sasori moves again.</font></b>'
+		act 'Jab <<$opp_name[0]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 0, ARGS[2]
+		end
 	end
+	if opp_health[1] > 0:
+		act 'Kick <<$opp_name[1]>>':
+			gs 'fight', 'Attack', 'Kick', 'opp', 1, ARGS[2]
+		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'
+		act 'Punch <<$opp_name[1]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 1, ARGS[2]
+		end
 
-		'<b><font color = green><<$boydesc>>Attack</font></b>'
+		act 'Jab <<$opp_name[1]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 1, ARGS[2]
+		end
 	end
+	if opp_health[2] > 0:
+		act 'Kick <<$opp_name[2]>>':
+			gs 'fight', 'Attack', 'Kick', 'opp', 2, ARGS[2]
+		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>'
+		act 'Punch <<$opp_name[2]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 2, ARGS[2]
+		end
 
-		xgt'ender','loss'
-		exit
-	elseif willpowerV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> won!</font></b>'
+		act 'Jab <<$opp_name[2]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 2, ARGS[2]
+		end
+	end	
+end
 
-		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
+if $ARGS[0] = 'opp_spellcast':
+end
 
-		'<b><font color = red><<$boydesc>> disappeared.</font></b>'
+if $ARGS[0] = 'pcs_spellcast':
+end
 
-		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
+!!--------------------------------------------------old shit--------------------------------------------------
 
-	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
@@ -576,5 +654,6 @@ if $ARGS[0] = 'Wrestlergen':
 		!!fat[1] = 100
 	end
 end
+
 --- fight ---------------------------------
 

+ 2 - 1
locations/gaptek.qsrc

@@ -29,7 +29,8 @@ if $ARGS[0] = 'start' or $message ! '':
 	if gaptek_aunt_hours = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,4)+'.jpg"></center>'
+		if pav_pharma_day ! daystart: pav_pharma_day = daystart & pav_pharma_picrand = rand(1,4)
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+pav_pharma_picrand+'.jpg"></center>'
 	end
 	*nl
 	

+ 1 - 1
locations/gdksport.qsrc

@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'ShowerWithIvan':
 		act 'Give blowjob':
 			*clr & cla
 
-			if npcSex[3] = 0:npcSex[3] = 1 & guy += 1
+			if npc_Sex['A3'] = 0: npc_Sex['A3'] = 1 & guy += 1
 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/sex/community/shover.jpg"></center>'
 			'You slowly sink to your knees in front of Ivan and his <<dick>>cm <<$dick_girth>> cock in front of your face. Ivan leaned forward probing impatiently with the head of his cock against your lips. Your mouth opens almost against your will and you let his cock slide in your mouth.'

+ 8 - 8
locations/gopskver.qsrc

@@ -159,9 +159,9 @@ else
 				*clr & cla
 
 				if sgopgang = 0:sgopgang = 1
-				if npcSex[9] = 0:npcSex[9] = 1 & guy += 1
-				if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
-				if npcSex[11] = 0:npcSex[11] = 1 & guy += 1
+				if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
+				if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
+				if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
 
 				stat['vaginal'] += 3
 				gang += 1
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'dan_blowjob':
 		pcs_horny += 10
 		stat['bj'] += 1
 
-		if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+		if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 
 		swallow += 1
 		spafinloc = 12
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'dan_blowjob':
 		*clr & cla
 		minut += 20
 		pcs_horny += 20
-		if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+		if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 		gs 'boyStat', 'A10'
 		pose = 1
 		'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex10.mp4"></video></center>'
@@ -1059,7 +1059,7 @@ if $ARGS[0] = 'triple_blow':
 		*clr & cla
 		pav_sex += 15
 		stat['bj'] += 1
-		if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+		if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 		dick = 17
 		spafinloc = 12
 		gs 'cum_manage'
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'triple_blow':
 			*clr & cla
 			stat['bj'] += 1
 
-			if npcSex[11] = 0:npcSex[11] = 1 & guy += 1
+			if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
 
 			spafinloc = 11
 			gs 'cum_manage'
@@ -1092,7 +1092,7 @@ if $ARGS[0] = 'triple_blow':
 				*clr & cla
 				stat['bj'] += 1
 
-				if npcSex[9] = 0:npcSex[9] = 1 & guy += 1
+				if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
 
 				dick = 18
 				sub += 1

+ 1 - 1
locations/gschool_chats2.qsrc

@@ -189,7 +189,7 @@ if $ARGS[0] = 'natasha':
 				*clr & cla
 				minut += 15
 				NatDolg -= 500
-				if npcSex[16] = 0: npcSex[16] = 1 & girl += 1
+				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & guy += 1
 				lesbian += 1
 				pcs_horny = 0
 				orgasm += 1

+ 129 - 81
locations/gschool_grounds.qsrc

@@ -507,48 +507,72 @@ if $ARGS[0] = 'SchoolRun':
 		wait 725
 
 		begminus = 0
-		if salo > 40: begminus = ((salo - 35)/5)
-		begresult = pcs_run - begminus
-
-		if begresult <= 18:
-			'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by quite a large margin.'
-		elseif begresult < 19:
-			'You struggle to keep up with the other girls, and finish in last place.'
-		elseif begresult < 20:
-			'You run as fast as you can, but only manage to finish second to last.'
-		elseif begresult < 21:
-			'You run as fast as you can, but only manage to take 6th place.'
-		elseif begresult < 22:
-			'You run as fast as you can, but only manage to take 5th place.'
-		elseif begresult < 23:
-			'You run as fast as you can, but only manage to take 4th place.'
-		elseif begresult < 24:
-			'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
-		elseif begresult < 25:
-			'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
-		else
-			swinbeg += 1
-			pcs_dom += 1
-			'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition, as you walk around with your arms raised in triumph.'
+		if bmi_calc > 25: 
+			begminus = ((bmi_calc - 25)*4)
+		elseif bmi_calc < 18:
+			begminus = ((25 - bmi_calc)*6)
 		end
-
-		run_exp += 1
-		fat -= 10
-
-		if swinbeg = 3 and LocalRun = 0:
-			LocalRun = 1
-			if razradbeg < 1:
-				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
-				razradbeg = 1
-			else
-				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
+        begresult = pcs_run - begminus
+		
+		act 'Run': gs 'gschool_grounds', 'SchoolRun_result'
+		gs 'willpower', 'skill', 'run_lvl', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Give it your best (<<will_cost>> Willpower)':
+				begresult += 10
+				gs 'willpower', 'pay', 'self'
+				gs 'gschool_grounds', 'SchoolRun_result'
 			end
+		else
+			act 'Give it your best (<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 'stat'
+if $ARGS[0] = 'SchoolRun_result':
+	if begresult <= 15:
+		grupvalue[2] -= 2
+		'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by uite a large margin.'
+	elseif begresult < 20:
+		grupvalue[2] -= 1
+		'You struggle to keep up with the other girls, and finish in last place.'
+	elseif begresult < 25:
+		'You run as fast as you can, but only manage to finish second to last.'
+	elseif begresult < 30:
+		'You run as fast as you can, but only manage to take 6th place.'
+	elseif begresult < 35:
+		grupvalue[2] += 1
+		'You run as fast as you can, but only manage to take 5th place.'
+	elseif begresult < 40:
+		grupvalue[2] += 1
+		'You run as fast as you can, but only manage to take 4th place.'
+	elseif begresult < 50:
+		grupvalue[2] += 2
+		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
+	elseif begresult < 60:
+		grupvalue[2] += 3
+		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'			
+	else
+		swinbeg += 1
+		grupvalue[2] += 5
+		'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition, as you walk around with your arms raised in triumph.'
+	end
+
+	run_exp += 1
+	fat -= 10
 
-		act 'Return to town':gt 'gschool_grounds', 'main'
+	if swinbeg = 3 and LocalRun = 0:
+		LocalRun = 1
+		if razradbeg < 1:
+			'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
+			razradbeg = 1
+		else
+			'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
+		end
 	end
+
+	gs 'stat'
+	
+	act 'Return to town':gt 'gschool_grounds', 'main'
 end
 
 if $ARGS[0] = 'SchoolRun2':
@@ -584,57 +608,81 @@ if $ARGS[0] = 'SchoolRun2':
 		wait 725
 
 		begminus = 0
-		if salo > 40: begminus = ((salo - 35)/5)
-		begresult = pcs_run - begminus
-
-		if begresult <= 18:
-			'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by quite a large margin.'
-		elseif begresult < 26:
-			'You struggle to keep up with the other girls, and finish in last place.'
-		elseif begresult < 27:
-			'You run as fast as you can, but only manage to finish second to last.'
-		elseif begresult < 28:
-			'You run as fast as you can, but only manage to take 6th place.'
-		elseif begresult < 29:
-			'You run as fast as you can, but only manage to take 5th place.'
-		elseif begresult < 30:
-			'You run as fast as you can, but only manage to take 4th place.'
-		elseif begresult < 31:
-			'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
-		elseif begresult < 32:
-			'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
-		else
-			swinbeggor += 1
-			pcs_dom += 1
-			'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
+		if bmi_calc > 25: 
+			begminus = ((bmi_calc - 25)*4)
+		elseif bmi_calc < 18:
+			begminus = ((25 - bmi_calc)*6)
 		end
+        begresult = pcs_run - begminus
+				
+		act 'Run': gs 'gschool_grounds', 'SchoolRun2_result'
+		gs 'willpower', 'skill', 'run_lvl', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Give it your best (<<will_cost>> Willpower)':
+				begresult += 10
+				gs 'willpower', 'pay', 'self'
+				gs 'gschool_grounds', 'SchoolRun2_result'
+			end
+		else
+			act 'Give it your best (<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] = 'SchoolRun2_result':
+	if begresult <= 15:
+		grupvalue[2] -= 2
+		'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by quite a large margin.'
+	elseif begresult < 20:
+		grupvalue[2] -= 1
+		'You struggle to keep up with the other girls, and finish in last place.'
+	elseif begresult < 25:
+		'You run as fast as you can, but only manage to finish second to last.'
+	elseif begresult < 30:
+		'You run as fast as you can, but only manage to take 6th place.'
+	elseif begresult < 35:
+		grupvalue[2] += 1
+		'You run as fast as you can, but only manage to take 5th place.'
+	elseif begresult < 40:
+		grupvalue[2] += 1
+		'You run as fast as you can, but only manage to take 4th place.'
+	elseif begresult < 50:
+		grupvalue[2] += 2
+		'You run as fast as you can, and manage to take 3rd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you.'
+	elseif begresult < 60:
+		grupvalue[2] += 3
+		'You run as fast as you can, and manage to take 2nd place. Mr. Pavlovich, the P.E. teacher at your school, congratulates you on your achievement.'
+	else
+		swinbeggor += 1
+		grupvalue[2] += 5
+		'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
+	end
 
-		run_exp += 1
-		fat -= 10
+	run_exp += 1
+	fat -= 10
 
-		if swinbeggor = 3 and LocalRun = 1:
-			LocalRun = 2
-			npc_rel['A18'] = 0
-			zverevaQW = 1
-			if razradbeg < 2:
-				'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
-				razradbeg = 2
-			else
-				'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
-			end
-			'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
-		elseif swinbeggor = 2 and begresult >= 130:
-			npc_rel['A18'] = 0
-			'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
-		elseif swinbeggor = 1 and begresult >= 130:
-			npc_rel['A18'] = 0
-			'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a teethy grin and continue your victory lap. Through clenched teeth Christina growls at you, "You bitch!"'
+	if swinbeggor = 3 and LocalRun = 1:
+		LocalRun = 2
+		npc_rel['A18'] = 0
+		zverevaQW = 1
+		if razradbeg < 2:
+			'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
+			razradbeg = 2
+		else
+			'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
 		end
+		'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
+	elseif swinbeggor = 2 and begresult >= 130:
+		npc_rel['A18'] = 0
+		'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
+	elseif swinbeggor = 1 and begresult >= 130:
+		npc_rel['A18'] = 0
+		'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a teethy grin and continue your victory lap. Through clenched teeth Christina growls at you, "You bitch!"'
+	end
 
-		gs 'stat'
+	gs 'stat'
 
-		act 'Leave':gt 'gschool_grounds', 'main'
-	end
+	act 'Leave':gt 'gschool_grounds', 'main'
 end
 
 if $ARGS[0] = 'change_room':

+ 13 - 36
locations/gschool_lessons1.qsrc

@@ -14,11 +14,11 @@ if $ARGS[0] = 'math':
 		'You sit down in your seat just as Mr. Anatoly stands up to begin his lesson. Mr. Anatoly casually leans against the desk then crosses his arms, as he begins the lesson. "Today we will be learning about problem solving. The most important thing about solving a problem is to know what answer you are looking for, especially with word problems. You will need to know the question that you need to answer for. Here is an example: If Anna had four bottle caps and Dina had two pebbles then how many bottle caps do they have in total? Anyone?"'
 		*nl
 		if VKrand = 1:
-			'A few students raise their hands and Anatoly points to <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big156.jpg''">Arkadi Fyodorov</a>, who answers, "They have six of course because four plus two equals six." Anatoly chuckles as he replies, "But of course. Four plus two is six, but are those the number of BOTTLE CAPS they have? The correct answer is no. Anna has four bottle caps and Dina has two PEBBLES, not bottle caps. You need to pay better attention to the actual question." Some of the other boys begin laughing at Arkadi while some of the girls giggle.'
+			'A few students raise their hands and Anatoly points to Arkadi Fyodorov, who answers, "They have six of course because four plus two equals six." Anatoly chuckles as he replies, "But of course. Four plus two is six, but are those the number of BOTTLE CAPS they have? The correct answer is no. Anna has four bottle caps and Dina has two PEBBLES, not bottle caps. You need to pay better attention to the actual question." Some of the other boys begin laughing at Arkadi while some of the girls giggle.'
 			*nl
 			'Anatoly continues, "Do not let the numbers fool you. Understanding the question is the most important part of answering it. Now I''m going to hand out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one." Anatoly reaches for some papers then begins handing them out while the boy crosses his arms trying to ignore some of the others laughing at him.'
 		else
-			'A few students raise their hands and Anatoly points to <a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/girl/julia/love/sad1.jpg''">Julia Milov</a>, who answers, "The answer is four because Anna is the only one with bottle caps. Dina only has pebbles which might as well not be mentioned, as it does not pertain to the answer needed." Anatoly tilts his head in surprise at Julia''s answer while Christina whispers to one of the other girls, "Wow she is really smart. Is she studying to be a teacher or something?"'
+			'A few students raise their hands and Anatoly points to Julia Milov, who answers, "The answer is four because Anna is the only one with bottle caps. Dina only has pebbles which might as well not be mentioned, as it does not pertain to the answer needed." Anatoly tilts his head in surprise at Julia''s answer while Christina whispers to one of the other girls, "Wow she is really smart. Is she studying to be a teacher or something?"'
 			*nl
 			'Anatoly nods his head then says, responding, "Precisely. The involvement of Dina was only to deceive the one answering the question, which is why it is referred to, as a trick question. Now I would like to see who was paying attention and who was dozing off. I will be handing out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one." Anatoly reaches for some papers on his desk then begins handing them out.'
 		end
@@ -33,7 +33,7 @@ if $ARGS[0] = 'math':
 			else
 				$mathNikoimg = 'images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg'
 			end
-			'Anatoly pauses then turns to the door, where <a href="exec:gs ''shortgs'',''img msg'',''<<$mathNikoimg>>''">Niko</a> is casually entering. Anatoly crosses his arms then says, "Late again I see. What is the reason for it this time?" Niko takes a second to collect his thoughts then says,'
+			'Anatoly pauses then turns to the door, where Niko is casually entering. Anatoly crosses his arms then says, "Late again I see. What is the reason for it this time?" Niko takes a second to collect his thoughts then says,'
 			killvar '$mathNikoimg'
 			*nl
 			if VK = 1:
@@ -67,11 +67,11 @@ if $ARGS[0] = 'math':
 		'You walk into the classroom then sit down at your seat just as Mr. Tsarev gets up from his seat to begin today''s lesson. "Alright I would like to know how much you all know of numbers. Can anyone tell me what is the smallest number in existence?"'
 		*nl
 		if VKrand = 1:
-			'Christina raises her hand and Mr. Tsarev points to her then says, "Miss Zvereva." <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big18.jpg''">Christina</a> answers, "Isn''t the smallest number, the size of Igor''s penis?" Igor recoils in shock as Mr. Tsarev; with a stern look on his face, responds, "No that is not the answer and I would appreciate if you would take this question seriously.'
+			'Christina raises her hand and Mr. Tsarev points to her then says, "Miss Zvereva." Christina answers, "Isn''t the smallest number, the size of Igor''s penis?" Igor recoils in shock as Mr. Tsarev; with a stern look on his face, responds, "No that is not the answer and I would appreciate if you would take this question seriously.'
 		elseif VKrand = 2:
-			'<a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big16.jpg''">Natasha Belova</a> raises her hand then says, "Isn''t that a trick question? Numbers have no ending point, so finding the lowest number, shouldn''t be possible." Mr. Tsarev nods his head approvingly before responding, "That is correct. Numbers are without end so finding a lowest point is impossible, so to answer the question at hand,'
+			'Natasha Belova raises her hand then says, "Isn''t that a trick question? Numbers have no ending point, so finding the lowest number, shouldn''t be possible." Mr. Tsarev nods his head approvingly before responding, "That is correct. Numbers are without end so finding a lowest point is impossible, so to answer the question at hand,'
 		else
-			'No one raises their hand, so Mr. Tsarev points out <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big4.jpg''">Igor</a>, who looks around the room in confusion before saying, "Uhh, it''s negative infinity right?" Mr. Tsarev shakes his head before responding, "Is infinity a number?" Igor says, "Um I guess so...Right?" Mr. Tsarev replies, "No it is not. Infinity is a never ending stream sequence of numbers. Not a singular number, so to answer the question,'
+			'No one raises their hand, so Mr. Tsarev points out Igor, who looks around the room in confusion before saying, "Uhh, it''s negative infinity right?" Mr. Tsarev shakes his head before responding, "Is infinity a number?" Igor says, "Um I guess so...Right?" Mr. Tsarev replies, "No it is not. Infinity is a never ending stream sequence of numbers. Not a singular number, so to answer the question,'
 		end
 		*nl
 		'The smallest number in existence is...Nothing. There is no smallest number. Numbers can go beyond negative in an infinite cycle and infinity has no bottom point, so finding the smallest number is an impossibility during an infinite cycle. I will be handing out some worksheet with negative and positive number problems. Try to answer as many as possible in the next 15 minutes." Mr. Tsarev begins handing out worksheets to the class.'
@@ -128,25 +128,18 @@ if $ARGS[0] = 'math':
 				*nl
 				if VKrand = 1 and npc_rel['A2'] >= 80 or VKrand = 1 and grupTipe = 3:
 					'You nervously look around the room, not knowing what the question was when you faintly hear, "Psst!" You look toward Artem to see him holding up a paper scrap behind his seat which has the answer written out. You confidently look toward Mr. Anatoly before telling him the correct answer, resulting in a surprised look on his face before he says, "Hmm, very good, but do try to keep your head up during class, okay?" You give him a nod before he continues his lesson.'
-					'<center><b><font color=#0080FF><<"Artyom [Artem] Chebotarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				elseif VKrand = 2 and npc_rel['A12'] >= 80 or VKrand = 2 and grupTipe = 3:
 					'You nervously look around the room, not knowing what the question was when you hear Julia ask Mr. Tsarev, "Why was the problem structured like that? I thought that finding X came after finding Y" Mr. Tsarev turns to Julia then says, "There is no order in which one we find first. I just used the one earlier in the equation. You can always choose the one that you solve as long as you end up solving both before reaching the second half of the problem."'
 					*nl
 					'Julia nods with a smile, as Anatoly turns around and continues his lesson, completely forgetting about you. Julia turns to you with a warm smile then turns back toward Mr. Tsarev for the rest of the period.'
-					'<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>'
 				elseif VKrand = 3 and NikoLuv >= 2 and grupTipe[61] = 4:
 					'You nervously look around the room, not knowing what the question was when you suddenly hear Evgeny let out a yelp as his chair is pulled out from under him, causing him to fall to the ground. Mr. Tsarev recoils in shock before suddenly shouting, "NIKOLAI! WHAT HAS GOTTEN INTO YOU!?" Niko and most of the class are laughing loudly, as Anatoly shouts out, "NIKOLAI GO TO THE PRINCIPAL''S OFFICE NOW!" Niko packs his stuff in his bag then heads toward the door, giving you a wink as he passes by.'
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
 				elseif pcs_grades >= 80:
 					'You nervously look around the room, not knowing what the question was. You pretend to clear your throat while you quickly study the equation on the board then quickly solve the problem in your head before answering the question correctly. Mr. Tsarev gives you a satisfied nod before responding, "Very good, but try and keep your head up during class, if you don''t mind."'
-					'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 				else
 					*clr & cla
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 					'You are feeling far too tired to pay attention in class today. Not even know what the lesson is about, as you continuously doze off. After what feels like a few minutes, you suddenly hear Mr. Tsarev call your name. Everyone''s eyes are on you, and you realize that you were just asked a question about the topic.'
 					*nl
 					'You take your best guess at what Mr. Tsarev asking. Some of your classmates snicker at your obviously wrong answer. Anatoly says, "Sleeping in class huh? You are never going to get anywhere in life that way, unless you end up working as a politician."'
@@ -167,11 +160,9 @@ if $ARGS[0] = 'math':
 					grupvalue[4] -=1
 					grupvalue[3] +=1
 					gs'stat'
-					'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
-					*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-					'You straighten up in your chair then say, "I wasn''t paying attention, I''m sorry." Anatoly shrugs as he says, "Could you at least try to pay attention. Many things that we need in life require some effort from us all. It''s not always fun but some of the things we learn making life easier in the future, leading to even more pleasant times." You nod as Anatoly turns around to continue his lesson. You sit through the rest of the lesson in silence, trying your best to take in as much as you can.'
 					'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
+					'You straighten up in your chair then say, "I wasn''t paying attention, I''m sorry." Anatoly shrugs as he says, "Could you at least try to pay attention. Many things that we need in life require some effort from us all. It''s not always fun but some of the things we learn making life easier in the future, leading to even more pleasant times." You nod as Anatoly turns around to continue his lesson. You sit through the rest of the lesson in silence, trying your best to take in as much as you can.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
 				end
 				act 'Reluctantly pay attention':
@@ -194,8 +185,8 @@ if $ARGS[0] = 'math':
 						grupvalue[4] +=2
 						grupvalue[3] -=1
 						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>'
+						'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 						'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" You answer boldly. The whole class bursts into laughter, and Anatoly has a rough time getting everyone to quiet down. "Miss <<$pcs_lastname>>, do you find this kind of behavior amusing? or are you just seeking attention? Try to answer this question for yourself while to head off to the principal''s office." Anatoly then points to the door.'
 
 						gs 'willpower', 'misc', 'resist', 'medium'
@@ -209,13 +200,11 @@ if $ARGS[0] = 'math':
 								grupvalue[4] +=1
 								grupvalue[3] -=2
 								gs'stat'
-								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
 								'"What good would that do? Would you rather I begin smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems." You answer brashly, not having any intentions of getting up. Anatoly sighs then shakes his head, "If you are having some personal issues then I won''t punish you for that, but do try to pay attention if you can. I am only trying to prepare you all for the future."'
 								*nl
 								'You remain silent as Anatoly turns around and continues his lesson. You obviously have no interest in learning anything today. You can hear one of the boys behind you mutter, "It must be that time of the month." Then giggle to each other as you turn around to flip him off.'
 								*nl
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
@@ -238,8 +227,6 @@ if $ARGS[0] = 'math':
 			if VK = 1 and npc_rel['A18'] <= 60 and zverSlutQW < 2 and salocatnow >= 5 or VK = 1 and zverRageQW > 0 and zverSlutQW < 2 and salocatnow >= 5:
 				if npc_rel['A18'] > 30:npc_rel['A18'] = 30
 				'As you are browsing the web, you receive a text message from Christina Zvereva, reading; "Hey there piggy, are you looking up discounts on Peremech, so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum? because they may feel it necessary to teach the students, how to talk to a cow like you." You can feel your face growing flushed in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone then try not to make eye contact with Christina for the rest of the lesson.'
-				'<center><b><font color=#0090FF><<"Christina Zvereva">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 1 and npc_rel['A18'] >= 80 and zverRageQW = 0 or VK = 1 and grupTipe = 2 and zverRageQW = 0:
 				VKrand = rand(1,3)
@@ -260,25 +247,17 @@ if $ARGS[0] = 'math':
 					*nl
 					'You giggle as you reply, "Sure sounds like fun." While sticking your tongue out at her, causing you both to giggle before turning back to your phones.'
 				end
-				'<center><b><font color=#0090FF><<"Christina Zvereva">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 2 and JuliaMiLoveQW >= 10:
 				'You continue browsing the web, when you suddenly receive a text message from Julia Milov; depicting your name, and her''s, inside of a heart together. You turn to Julia to see a big smile on her face as she gazes into your eyes. You return the smile before replying with, "You are so precious to me, Julia." Julia quickly replies, "I am so happy that I have you in my life." You reply to Julia, "Ohhh you are just so cute. Muah." Julia giggles before turning back to Mr. Tsarev while occasionally turning back toward you and smiling.'
-				'<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 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 3 and NikoVolkovQW >= 5 and grupTipe[61] = 4:
 				'While you are browsing the internet, you receive a text message from Niko, reading; "Who is this beautiful creature, I see? This precious gem, sitting in front of me? I gaze at her with eyes so amazed, will she not turn around, and return my gaze?" You giggle before turning around to face Niko to see him with a loving smile. You then type back, "You are so sweet Niko." Niko gives you a wink before laying back in his seat.'
-				'<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 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 4 and npc_rel['A25'] >= 80:
 				'As you continue browsing the web, you suddenly receive a text message with an image attachment from Sonia Ivanko, reading; "Sooo pretty. What do you think?" The image is of a high quality pair of high heels. They look very expensive. You type back, "Those heels look very...You. ;)" Sonia replies, "I was thinking of wearing those with my blue skirt, do you think that they will look good together?" You reply, "They would look great together. The colors would compliment each other very well." Sonia giggles as she messages you back.'
 				*nl
 				'"Thanks <<$pcs_nickname>>, I was worried that they were a bit too much on the eyes." You give Sonia a smile as she returns it. Sonia then turns back toward the teacher while continuing to cruise the internet.'
-				'<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 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				*clr & cla
@@ -338,8 +317,6 @@ if $ARGS[0] = 'math':
 								'You then hand Anatoly your phone with the picture you took still on the screen of the phone. Mr. Tsarev looks at what''s on the screen and he stares at it for a few seconds before turning the screen off and returning to the front of the class. After Mr. Tsarev reaches the front of the classroom, he turns to you then says, "Well...Uhhh, I''ll be holding onto your phone for now, You can have it back after today''s lesson."'
 								*nl
 								'Mr. Tsarev puts your phone in his pocket before returning to teaching his lesson. You occasionally see Anatoly turn the phone on and peek at the screen when he believes that no one is watching.'
-								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
@@ -357,8 +334,6 @@ if $ARGS[0] = 'math':
 								'You deftly shove the phone in your bra then smile fiendishly, as you see the indecisiveness on Anatoly''s face. Pretending that it''s a perfectly normal place to store your phone, you say in a innocent tone, "Is there a problem, Mr. Tsarev? Do you want my phone? You can take it, if you want." You slowly thrust your chest forward, raising your breast toward him, giving him a nice view of your ample cleavage; the outline of your phone very visible through the fabric.'
 								*nl
 								'Mr. Tsarev seems flabbergasted by your actions, he remains silent for a few seconds before shaking his head then turning around and walking back to the front of the class. It seems that Anatoly realized that it''s not worth the effort to take your phone away from you, without causing all sorts of awkward situations, You pull your phone back out of your bra then continue browsing the web, as the lesson goes on.'
-								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
@@ -398,6 +373,7 @@ if $ARGS[0] = 'russian':
 	end
 	act 'Don''t pay attention in class':
 		*clr & cla
+		pcs_grades -= rand(0,1)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 		'Mr. Yenotin''s lecture has brought the whole class to a snorefest, most of your classmates are paying more attention to the clock than listening to the lesson.'
 		'All of a sudden you hear a loud bang, making the whole class jump up from their chairs.'
@@ -408,6 +384,7 @@ if $ARGS[0] = 'russian':
 !!The actions from before lead to the teacher telling your mother about you mouthing off at the parents conference
 	act'Daydream':
 		*clr & cla
+		pcs_grades -= rand(0,1)
 		if rand(1,4) = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'Today''s lessons is dragging on forever, and you find yourself drifting off constantly. All of a sudden you hear Mr. Yenotin clapping and without any hesitation you also begin clapping. It doesn''t take a long time before you realize that you''re the only one clapping. You feel you cheeks getting warm as you''re blushing.'
@@ -617,7 +594,7 @@ if $ARGS[0] = 'literature':
 			pcs_grades -= rand(0,1)
 			$boy = 'A'+str( val($mid(' 004 140 156 157 144 006 152 159 145',4*rand(0,8)+2,3)))
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work.jpg"></center>'
-			'You keep your head down and pretend to be deep in thought as Ms. Braakman scans the rooms for a moment. Luckily, she stops and points to someone else in the class. "<<$npc_lastname[$boy]>>, please read the next passage."'
+			'You keep your head down and pretend to be deep in thought as Ms. Braakman scans the rooms for a moment. Luckily, she stops and points to someone else in the class. "Please read the next passage."'
 			*nl
 			if $boy = 'A4':
 				'You watch Igor sink lower into his seat; apparently he was also trying to hide. Reluctantly, he quietly starts to read the passage, but Ms. Braakman interrupts to remind him to speak clearly. Some kids start to snicker and whisper to each other, causing Igor to awkwardly clear his throat before continuing. By the time he''s finished reading, his cheeks are colored a rosy red and he refuses to look up from his desk for the rest of the class.'

+ 21 - 19
locations/gschool_lessons2.qsrc

@@ -1035,28 +1035,30 @@ if $ARGS[0] = 'shop':
 					else
 						act 'Take photos under your skirt (<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', 'misc', 'self', 'medium'
-					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
-						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'misc', 'self', 'medium'
-							gs 'willpower', 'pay', 'self'
-							demerit += 5
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
-							'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
-							'You pretend it''s a perfectly normal place to store your phone, and use your cute voice as you tell him, "Is there a problem, Mr. Kuznetsov? Go ahead, take my phone if you don''t think I should have it." You thrust your chest forward as you encourage him, giving him a nice view of your ample cleavage - the outline of your phone very visible through the fabric.'
-							'He narrows his eyes. "Very well come see me after class, or we can just call your mother to come to school and pick you up for being expelled." He notes the change in your expression and smirks a bit, knowing you will see him after class now.'
-							act 'Wait for the end of class':
+					if $braworntype ! 'none':
+						gs 'willpower', 'misc', 'self', 'medium'
+						if will_cost <= pcs_willpwr:
+							act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 								*clr & cla
-								Kuznecov_shop_punishment = 1
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/ruslan/sex/pshop1.jpg"></center>'
-								'You wait until the end of class. Then you walk up to Mr. Kuznetsov''s desk. "You wanted to see me?"'
-								'He looks up at you for a moment before saying. "Come to my office after school so we can talk about this. If not I will be calling your mother to school tomorrow." With that he dismisses you to go to you next class.'
-								act 'Go to next class': gt 'gschool_lessons', 'short_break'
+								gs 'willpower', 'misc', 'self', 'medium'
+								gs 'willpower', 'pay', 'self'
+								demerit += 5
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/nophone.jpg"></center>'
+								'You deftly shove the phone in your bra, and smile fiendishly as you see the indecisiveness on your teacher''s face.'
+								'You pretend it''s a perfectly normal place to store your phone, and use your cute voice as you tell him, "Is there a problem, Mr. Kuznetsov? Go ahead, take my phone if you don''t think I should have it." You thrust your chest forward as you encourage him, giving him a nice view of your ample cleavage - the outline of your phone very visible through the fabric.'
+								'He narrows his eyes. "Very well come see me after class, or we can just call your mother to come to school and pick you up for being expelled." He notes the change in your expression and smirks a bit, knowing you will see him after class now.'
+								act 'Wait for the end of class':
+									*clr & cla
+									Kuznecov_shop_punishment = 1
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/ruslan/sex/pshop1.jpg"></center>'
+									'You wait until the end of class. Then you walk up to Mr. Kuznetsov''s desk. "You wanted to see me?"'
+									'He looks up at you for a moment before saying. "Come to my office after school so we can talk about this. If not I will be calling your mother to school tomorrow." With that he dismisses you to go to you next class.'
+									act 'Go to next class': gt 'gschool_lessons', 'short_break'
+								end
 							end
+						else
+							act 'Hide the phone in your bra (<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 'Hide the phone in your bra (<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

+ 5 - 5
locations/gschool_lessonsev1.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand4.jpg"></center>'
 		'After finishing the P.E. lesson a bit early, you and some of the other girls start to fool around a bit with volleyballs during the ''free play'' section of the class. The four of you show off your ''giant breasts'' to the guys, running around to make them bounce as much as you can. As the lesson ends, you all share a laugh as you put the volleyballs back where they belong.'
-	elseif fizperand = 5 and npcSex[3] = 1:
+	elseif fizperand = 5 and npc_sex['A3'] = 1:
 		pcs_horny += 10
 		gs'stat'
 		*clr & cla
@@ -625,8 +625,8 @@ if $ARGS[0] = 'computer':
 			if $pantyworntype = 'none' and analplugin = 0:	
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 2
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			elseif $pantyworntype = 'none' and analplugin = 1:	
 				gs 'exhibitionism', 3
 				gs 'fame', 'pav', 'sex', 3			
@@ -638,8 +638,8 @@ if $ARGS[0] = 'computer':
 			else				
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:

+ 3 - 3
locations/gschool_sex.qsrc

@@ -27,9 +27,9 @@ if $ARGS[0] = 'suck':
 				*clr & cla
 				minut += 15
 				stat['bj'] += 3
-				if npcSex[9] = 0:npcSex[9] = 1 & guy += 1
-				if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
-				if npcSex[11] = 0:npcSex[11] = 1 & guy += 1
+				if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
+				if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
+				if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
 				sub += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/group/toiletbjtreesome.jpg"></center>'

+ 87 - 243
locations/hunter_favors.qsrc

@@ -58,21 +58,28 @@ if $ARGS[0] = 'housekeeping_request':
 			end
 		end
 
-		act '"I''ll help later, busy right now"':
-			*clr & cla
-			minut += 5
-			hunter_collective_opinion -= 3
+		gs 'willpower', 'misc', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act '"I''ll help later, busy right now" (<<will_cost>> Willpower)':
+				*clr & cla
+				minut += 5
+				hunter_collective_opinion -= 3
+
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
 
-			!TODO: Find new image
-			gt 'swamp_yard'
+				!TODO: Find new image
+				gt 'swamp_yard'
+			end
+		else
+			act '"I''ll help later, busy right now" (<font color="red"><<will_cost>> Willpower)':'<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		!TODO: Make this act mood dependent
 		act '"What?! Do I look like a servant to you?':
 			'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 			'You walk away from <<$boydesc>>'
 			hunter_collective_opinion -= 10
-			gt 'swamp_yard'
+			act 'Continue': gt 'swamp_yard'
 		end
 	end
 end
@@ -130,9 +137,9 @@ if $ARGS[0] = 'meat_stew':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
 	*nl
 
-	'You cooked a stew with the meat hunters brough and brought it inside the hut. There''s enough for <<mushroom_soup>> servings'
+	'You cooked a stew with the meat hunters brought. There''s enough for <<mushroom_soup>> servings'
 
-	act 'Continue': gt 'swamphouse', 'start'
+	act 'Continue': gt 'swamp_yard', 'fireside'
 end
 
 if $ARGS[0] = 'mushroom_soup':
@@ -149,213 +156,10 @@ if $ARGS[0] = 'mushroom_soup':
 
 	'You made a simple mushroom soup by the camppfire and carried it inside the hut. There''s enough for <<mushroom_soup>> servings'
 
-	act 'Continue': gt 'swamphouse', 'start'
+	act 'Continue': gt 'swamp_yard', 'start'
 end
 
 !Sexual favors
-if $ARGS[0] = 'hunterstableBJ':
-	cla
-	*clr
-	minut += 1
-	hunterstableBJ = 1
-	pcs_dom -= 1
-	menu_off = 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable2.jpg"></center>'
-	*nl
-	'You see one of the hunters sitting at the table. Thinking you both could have some fun, you look at him smiling slyly. Not before long you''re crawling under the table...'
-
-	if hunterstableBJA = 0:
-		act 'Give Andrei a blowjob':
-			*clr & cla
-			gs 'boyStat', 'A172'
-			hunterstableBJA = 1
-			if hunterandreisex = 0:hunterandreisex = 1 & guy += 1
-			temp_sh = rand(1,2)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock....'
-			'Andrei''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
-
-			gs 'arousal', 'bj', 5, 'sub'
-			gs 'stat'
-
-			if temp_sh = 1:
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'face', $boy, 1
-					if $clothingworntype = 'nude': gs 'cum_call', 'stomach', $boy, 1
-					if $clothingworntype ! 'nude': gs 'cum_call', 'clothesgroin', $boy, 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'Andrei didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
-
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			else
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'mouth', $boy, 1
-					swallow += 1
-					hunterstableBJA = 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'You could feel Andrei''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			end
-		end
-	end
-	if hunterstableBJS = 0:
-		act 'Give Sergei a blowjob':
-			*clr & cla
-			gs 'boyStat', 'A174'
-			hunterstableBJS = 1
-			if huntersergeisex = 0:huntersergeisex = 1 & guy += 1
-			temp_sh = rand(1,2)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock....'
-			'Sergei''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
-
-			gs 'arousal', 'bj', 5, 'sub'
-			gs 'stat'
-
-			if temp_sh = 1:
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'face', $boy, 1
-					if $clothingworntype = 'nude': gs 'cum_call', 'stomach', $boy, 1
-					if $clothingworntype ! 'nude': gs 'cum_call', 'clothesgroin', $boy, 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'Sergei didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			else
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'mouth', $boy, 1
-					swallow += 1
-					hunterstableBJS = 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'You could feel Sergei''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			end
-		end
-	end
-	if hunterstableBJI = 0:
-		act 'Give Igor a blowjob':
-			*clr & cla
-			gs 'boyStat', 'A173'
-			hunterstableBJI = 1
-			if hunterigorsex = 0:hunterigorsex = 1 & guy += 1
-			temp_sh = rand(1,5)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-			*nl
-			'You got comfortable under the table and brought your head between his thighs and started sucking on his cock....'
-			'Igor''s cock got rock hard fast and soon enough you could feel a taste of pre-cum in your mouth...'
-
-			gs 'arousal', 'bj', 5, 'sub'
-			gs 'stat'
-
-			if temp_sh = 1:
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'face', $boy, 1
-					if $clothingworntype = 'nude': gs 'cum_call', 'stomach', $boy, 1
-					if $clothingworntype ! 'nude': gs 'cum_call', 'clothesgroin', $boy, 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablecum1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'Igor didn''t last more for a minute or two, his thighs tensed up and his load started shooting out and hitting your face several times.'
-					'When he was all done you cleaned Andrei the best you could, and then you put his cock back in his pants and zipped him up.'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			else
-				act 'Keep sucking':
-					*clr & cla
-					minut += 1
-					gs 'cum_call', 'mouth', $boy, 1
-					swallow += 1
-					hunterstableBJI = 1
-					gs 'stat'
-
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hanterstablebj1.'+rand(1,5)+'.jpg"></center>'
-					*nl
-					'You could feel Igor''s cock tensing up, ready to explode. You hear a grunt and before you can react Andrei unloads his warm spunk in your mouth...'
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Continue': gs 'swamphouse', 'hunterstableBJ'
-				end
-			end
-		end
-	end
-	if hunterstableBJA = 1 and hunterstableBJS = 1 and hunterstableBJI = 1:act 'Get out from under the table':mushroom_soup = 1 & gs 'swamphouse', 'hunterstable'
-end
-
-if $ARGS[0] = 'table_blow_request':
-	*clr & cla
-	minut += 1
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
-	*nl
-	'You sit down at the table, wanting to eat with the guys, before you can begin you hear...'
-	'"Not so fast <<$pcs_nickname>>, Andrei said with a smile on his face. "You understand that the only free cheese is the one found in the mousetrap."'
-	'"Want to eat with us, you need to do some work," he mockingly grinned and pointed under the table.'
-
-	act 'Crawl under the table':
-		pcs_dom -= 1
-		gs 'hunter_favors', 'hunterstableBJ'
-	end
-
-	act 'Refuse':
-		hunter_collective_opinion -= 3
-		hunter_sexual_comfort -= 3
-		gt 'swamphouse', 'start'
-	end
-end
-
 if $ARGS[0] = 'creekside_gangbang_request':
 	*clr & cla
 	minut += 5
@@ -364,6 +168,7 @@ if $ARGS[0] = 'creekside_gangbang_request':
 	'You''re sitting down in the meadow near the road, relaxing, enjoying the nice weather, when all of a sudden Andrei, Sergei and Igor approach you. They quickly surround you not letting move away.'
 	'"Hey, <<$pcs_nickname>>, we''ve been talking with each other, and we feel that you need to repay us somehow for the lessons. So what do you say?"'
 
+	!TODO: WP check to agree?
 	act 'Agree':
 		*clr & cla
 
@@ -395,7 +200,25 @@ if $ARGS[0] = 'creekside_gangbang_request':
 			act 'Further': gt 'hunter_interactions', 'creekside_gangbang'
 		end
 	end
-	act 'Refuse':
+
+	gs 'willpower', 'gangbang', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		!TODO: Add scene for succeeding willpower check
+		act 'Refuse (<<will_cost>> Willpower)':
+			*clr & cla
+			minut += 5
+
+			gs 'willpower', 'pay', 'resist'
+			gs 'stat'
+
+			hunter_collective_opinion += 5
+			hunter_sexual_comfort -= 10
+
+			gs 'stat'
+			gt 'backwater'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)':
 		*clr & cla
 		minut += 5
 
@@ -409,9 +232,11 @@ if $ARGS[0] = 'creekside_gangbang_request':
 		'"<<$pcs_nickname>>, don''t fuck around with us. Deep inside you know you need to repay us." said Andrei, grabbing you by the hair.'
 
 		gs 'hunter_interactions', 'creekside_rape'
-	end
+		end
+	end	
 end
 
+!TODO: WP needed for bondage?
 if $ARGS[0] = 'yard_bondage':
 	if $ARGS[1] = '':
 		yard_bound_temprand = rand(1,9)
@@ -554,7 +379,7 @@ if $ARGS[0] = 'yard_bondage':
 		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boydesc>>''s cock fills your pussy'
 		'After letting you settle in to the sensation for a second he slowly starts pumping your pussy. In a minute you are screaming and moaning as he picks his pace up.'
 
-		gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound'
+		gs 'dinsex', 'vaginal_sex', 10, 'bound'
 
 		act 'Start pumping your hips to match him':
 			cla & *clr
@@ -615,7 +440,7 @@ if $ARGS[0] = 'yard_bondage':
 		gs 'pain', 6, 'pinch', 'nipples'
 		gs 'pain', 3, 'pinch', 'breasts'
 
-		gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+		gs 'arousal', 'breasts', 5, 'rough', 'masochism'
 		gs 'arousal', 'end'
 		gs 'stat'
 
@@ -628,7 +453,7 @@ if $ARGS[0] = 'yard_bondage':
 		act 'Further':
 			cla & *clr
 			gs 'pain', 3, 'spank', 'nipples'
-			gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+			gs 'arousal', 'breasts', 5, 'rough', 'masochism'
 			gs 'arousal', 'end'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps2.jpg"></center>'
@@ -638,7 +463,7 @@ if $ARGS[0] = 'yard_bondage':
 			act 'Further':
 				cla & *clr
 				gs 'pain', 10, 'pinch', 'nipples'
-				gs 'arousal', 'breasts', 10, 'rough', 'masochism', 'sub'
+				gs 'arousal', 'breasts', 10, 'rough', 'masochism'
 				minut -= 5
 				gs 'arousal', 'end'
 
@@ -650,15 +475,24 @@ if $ARGS[0] = 'yard_bondage':
 				'"Please, I can''t take it anymore!" you plead.'
 				'"''Please'' what, little princess?" Andrei asks'
 
-				act 'Seriousy, please let me go!':
-					cla & *clr
-					hunter_collective_opinion += 10
-					hunter_sexual_comfort -= 15
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr: 
+					act 'Seriousy, please let me go! (<<will_cost>> Willpower</font>)':
+						cla & *clr
+						
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						
+						hunter_collective_opinion += 10
+						hunter_sexual_comfort -= 15
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
-					'"Well, alright, you are no fun" says Andrei before releasing you from your bonds.'
-					'You rub your sore breasts for a few seconds before shooing away Andrei staring at you giving him a last show.'
-					act 'Further': gt 'swamp_yard'
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
+						'"Well, alright, you are no fun" says Andrei before releasing you from your bonds.'
+						'You rub your sore breasts for a few seconds before shooing away Andrei staring at you giving him a last show.'
+						act 'Further': gt 'swamp_yard'
+					end
+				else
+					act 'Seriousy, please let me 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 'Please fuck me!':
 					cla & *clr
@@ -688,6 +522,7 @@ if $ARGS[0] = 'yard_bondage':
 		end
 	end
 
+
 	if $ARGS[1] = 'unbound_fuck':
 		cla & *clr
 		hunter_sexual_comfort += 15
@@ -695,8 +530,8 @@ if $ARGS[0] = 'yard_bondage':
 
 		gs 'boyStat', 'A173'
 
-		gs 'arousal', 'foreplay', 5, 'sub', 'exhibitionism'
-		gs 'arousal', 'kiss', 5, 'sub', 'exhibitionism'
+		gs 'arousal', 'foreplay', 5, 'exhibitionism'
+		gs 'arousal', 'kiss', 5, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 
@@ -707,12 +542,12 @@ if $ARGS[0] = 'yard_bondage':
 
 		act 'Further':
 			cla & *clr
-			gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism'
+			gs 'arousal', 'vaginal', 5, 'exhibitionism'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
 			'Igor settles on the ground and you settle on his crotch, mounting him.'
 			'You start bouncing up and down, gasping from the feeling of his cock pumping inside you'
-			gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism'
+			gs 'dinsex', 'vaginal_sex', 10, 'exhibitonism'
 
 			act 'Further':
 				cla & *clr
@@ -720,7 +555,7 @@ if $ARGS[0] = 'yard_bondage':
 				'After some minutes, Igor pushes you on your hands and starts fucking you from behind.'
 				'He really picks up the pace as you start moaning and screaming like a wanton whore, getting fucked like that right out in the open.'
 
-				gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism', 'rough', 'humiliation'
+				gs 'dinsex', 'vaginal_sex', 10, 'exhibitonism', 'rough', 'humiliation'
 				spafinloc = 4
 				gs 'cum_manage'
 				spafinloc = 8
@@ -739,17 +574,26 @@ if $ARGS[0] = 'yard_bondage':
 					'"You mean, never wear clothes around and stay naked the whole time?" you ask, surprised'
 					'"Yes, at least while it is only us around." he says. "So what do you say?"'
 
-					act 'Agree':
-						cla
-						*nl
-						hunter_collective_opinion += 20
-						hunter_sexual_comfort += 10
-						forced_naked_day = 999999999999999
-						gs 'stat'
+					gs 'willpower', 'exhib', 'self', 'hard'
+					if will_cost <= pcs_willpwr:
+						act 'Agree (<<will_cost>> Willpower)':
+							cla
+							*nl
+							hunter_collective_opinion += 20
+							hunter_sexual_comfort += 30
 
-						'"Well," you respond. "At this point we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
-						'"Thanks <<$pcs_nickname>>" he says, before walking away'
-						act 'Further': gt 'swamp_yard'
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+
+							forced_naked_day = 999999999999999
+							gs 'stat'
+
+							'"Well," you respond. "At this point we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
+							'"Thanks <<$pcs_nickname>>" he says, before walking away'
+							act 'Further': gt 'swamp_yard'
+						end
+					else
+						act 'Agree (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Refuse':
 						cla

+ 2 - 3
locations/katjaEv.qsrc

@@ -588,9 +588,8 @@ if $ARGS[0] = 'moron':
 		'A bit shocked but also pleased Ivan would defend you like that. "Thank you Ivan, seriously that was sweet." you said, but Katja only nodded dumbfounded.'
 		'Ivan shrugged, looking a little embarrassed. But it was obvious, he was pleased.'
 		act 'Thank Ivan':
-			*clr
-			cla
-			if npcSex[3] = 1 and $loc ! 'gdkin':
+			*clr & cla
+			if npc_sex['A3'] = 1 and $loc ! 'gdkin':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/whisper.jpg"></center>'
 				'Approaching Ivan, you raised up on tiptoe, and, clasping her arms round his neck, and kissed, and then whispered. "Like kissing girls?" Ivan only replied with a dumbfounded nodded, "Well, then we can show you our appreciation, right Katja?"'
 				'Katja, nods only half paying attention. Then it hit her what you said, she looked at Ivan, at you and her eyes lit up with lustful fire, "Right."'

+ 19 - 2
locations/kisameQW.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisamev.jpg"></center>'
 			pcs_horny += 60
 			gs 'boyStat', 'A40'
-			!!stats
+			!!stats{
 			strenV = 300
 			speedV = 100
 			agilV = 100
@@ -78,7 +78,24 @@ if $ARGS[0] = 'start':
 			klonV = 5
 			!!defenceV = 10000
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+			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'
 			'You kick Kisame in the face. He shows his teeth, and his appearance begins to change. Instantaneously he has blue gills on his face and shark teeth. He whispers with a smile, "You wanna play baby? Let''s play!"'

+ 39 - 2
locations/lab.qsrc

@@ -47,6 +47,7 @@ if $ARGS[0] = 'start':
 			cla
 			judosparday = daystart
 			gs 'boyStat', 'A175'
+			!{
 			!!stats
 			strenV = 600
 			speedV = 60
@@ -68,6 +69,25 @@ if $ARGS[0] = 'start':
 			!!Programme of Action
 			program = 0
 			jugoFight = 2
+			}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Gustav'
+			$opp_image[0] = 'images/characters/city/jugo/jugopre.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 75
+			opp_wrstlng[0] = 75
+			opp_kick[0] = 75
+			opp_punch[0] = 85
+			opp_jab[0] = 75
+			opp_stren[0] = 250
+			opp_agil[0] = 60
+			opp_vital[0] = 200
+			opp_react[0] = 50
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 50
+			opp_shoot[0] = 100
+
 			gt 'fight', 'start'
 		end
 	end
@@ -77,7 +97,7 @@ if $ARGS[0] = 'start':
 			cla
 			tatianasparday = daystart
 			gs 'boyStat', 'A176'
-			!!stats
+			!!stats{
 			strenV = 60
 			speedV = 100
 			agilV = 100
@@ -97,7 +117,24 @@ if $ARGS[0] = 'start':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 4
-			tatianaFight = 1
+			tatianaFight = 1}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Tatiana'
+			$opp_image[0] = 'images/characters/city/tatiana/magiclook.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 75
+			opp_wrstlng[0] = 50
+			opp_kick[0] = 75
+			opp_punch[0] = 100
+			opp_jab[0] = 100
+			opp_stren[0] = 60
+			opp_agil[0] = 100
+			opp_vital[0] = 100
+			opp_react[0] = 60
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 			gt 'fight', 'start'
 		end
 	end

+ 105 - 73
locations/natbelEv.qsrc

@@ -104,33 +104,47 @@ if $ARGS[0] = 'carrybooks':
 	'As you open the door you see Natasha sitting on her small sofa, pulling up her stockings'
 	'"Ready to go?" You ask her, as you put your bag next to her.'
 	if NatashaQW >= 7:
-		act 'Lift her skirt':
-			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
-			'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
-			'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She says, blushing at you prettily.'
-			'"We have some time before school." You tell her while you start pulling off her skirt and panties.'
-			'"Today you''ll be wearing them a little differently." You say, pushing her back on the couch. "Open your legs."'
-			'Natasha obediently opens her legs for you. showing off her pretty pussy. Not wasting any time you start playing with her, first rubbing her lips, then focussing more on her clit as you watch closely while Natasha''s pussy gets wetter and wetter.'
-			act 'Stuff her panties':
+		gs 'willpower', 'exhib', 'force', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Lift her skirt (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'force', 'easy'
+				gs 'willpower', 'pay', 'force'
 				*clr & cla
-				'<center><video <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/stuffpanties.mp4"></center>'
-				'You stop playing with her pussy and grab her panties, handing them over to her. "Put them inside your pussy."'
-				'Natasha looks at you in confusion for a second but then starts to slowly push them into her pussy.'
-				'When there''s only enough left to easily grab on in case you''d want to pull them out she stops and looks at you expectantly. "Like this <<$pcs_nickname>>?"'
-				'You reach down and push the last bit inside as well, holding them in with your finger for a bit before pulling your finger out again.'
-				'"This is how you''ll wear your panties for me at school today Natasha." You tell her. "Now put your skirt back on or we''ll be late.'
-				act 'Go to school': gt 'natbelEv', 'schoolwalk'
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
+				'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
+				'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She says, blushing at you prettily.'
+				'"We have some time before school." You tell her while you start pulling off her skirt and panties.'
+				'"Today you''ll be wearing them a little differently." You say, pushing her back on the couch. "Open your legs."'
+				'Natasha obediently opens her legs for you. showing off her pretty pussy. Not wasting any time you start playing with her, first rubbing her lips, then focussing more on her clit as you watch closely while Natasha''s pussy gets wetter and wetter.'
+				act 'Stuff her panties':
+					*clr & cla
+					'<center><video <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/stuffpanties.mp4"></center>'
+					'You stop playing with her pussy and grab her panties, handing them over to her. "Put them inside your pussy."'
+					'Natasha looks at you in confusion for a second but then starts to slowly push them into her pussy.'
+					'When there''s only enough left to easily grab on in case you''d want to pull them out she stops and looks at you expectantly. "Like this <<$pcs_nickname>>?"'
+					'You reach down and push the last bit inside as well, holding them in with your finger for a bit before pulling your finger out again.'
+					'"This is how you''ll wear your panties for me at school today Natasha." You tell her. "Now put your skirt back on or we''ll be late.'
+					act 'Go to school': gt 'natbelEv', 'schoolwalk'
+				end
 			end
+		else
+			act 'Lift her skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif NatashaQW > 5:
-		act 'Lift her skirt':
-			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
-			'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
-			'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She lets out in a whisper.'
-			'Not wanting to lose your mule to school you let her skirt fall down again and head to school.'
-			act 'Go to school': gt 'gschool_grounds', 'main'
+		gs 'willpower', 'exhib', 'force', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Lift her skirt (<<will_cost>> Willpower)':
+				gs 'willpower', 'exhib', 'force', 'easy'
+				gs 'willpower', 'pay', 'force'
+				*clr & cla
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
+				'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
+				'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She lets out in a whisper.'
+				'Not wanting to lose your mule to school you let her skirt fall down again and head to school.'
+				act 'Go to school': gt 'gschool_grounds', 'main'
+			end
+		else
+			act 'Lift her skirt (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	else
 		'Natasha grabs both of your bags and you head to school.'
@@ -155,48 +169,59 @@ end
 
 !! This is the cucumber event in Natasha''s questline
 if $ARGS[0] = 'laundry':
-	$menu_loc = 'natbelapt'
+	$menu_loc = 'natbelEv'
 	$menu_arg = 'laundry'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
-	$locclass = 'livingr'
+	$locclass = ''
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Laundry room</font></b></center>'
-! Needs image + description
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natlaundry.jpg"></center>'
+	'You walk in and see Natasha just turning on the machine. She turns around and sees you in the doorway.'
 	
 	if NatashaLoc = 7 and HaveCucumber = 1 and NatashaQW >= 10:
-		if NatashaQW = 10: NatashaQW = 11
-		HaveCucumber = 0
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber01.jpg"></center>'
-		'As you enter the building''s laundry room you see Natasha loading the washer. As she closes the lid and turns it on you move in and make her sit on top of it.'
-		'"I thought we could have some fun in here. The noise from the washer should prevent anyone from hearing." You tell her as you hand her the cucumber.'
-		'"What''s this for?" She asks you. "I Want to see you slide it in your pussy Natasha." You tell her with an excited grin on your face.'
-		'"It''s enormous, it won''t fit." She hesitantly tries to back out. "I''ve seen you take bigger. Now open those legs and get yourself ready or I''ll put it in myself right now." You hiss at her.'
-		act 'Further':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber02.jpg"></center>'
-			'Natasha has a shocked look on her face as she scoots back a bit and obediently starts to play with her pussy. You can see she''s already wet. "Being dominated really turns her on." You think to yourself.'
-			'"T-The vibrations from the washer are ..." She starts moaning softly.'
-			'"You better start opening that pussy up or it''s going to sting bitch." You continue in the same threatening tone you used before. Natasha moans as she slips two fingers inside. "That went easy enough, now add a third." You order her, and to your delight she immediately forces a third finger inside her vagina.'
-			'"Good, now spread your pussy, I want to have a last look before the cucumber goes in." You hiss again, wanting to make sure she keeps takign your orders immediately.'
-			'You smile as you she opens her pussy for you with her hands, showing you just how dripping wet she is.'
-			act 'Now put it in':
+		gs 'willpower', 'mast', 'force', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Make her play with a cucumber (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'force'
+				
+				if NatashaQW = 10: NatashaQW = 11
+				HaveCucumber = 0
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber03.jpg"></center>'
-				'Natasha lets out a loud moan as she forces the cucumber inside her pussy even though she was biting her lip to try and stay quiet. It slides about half way in on the first stroke. "You see, it wasn''t too big at all." You praise her. "Now I want to see you fuck yourself hard. Keep going."'
-				'She''s all too eager to obey. With a furious effort she rapidly strokes the big vegetable in and out of herself. Her moans growing louder and louder. Within a few minutes you are rewarded with the sight of her delicious orgasm. Her legs shake as she keeps fucking herself for a bit longer before she finally slides it all the way out and leans back. Her face sporting a deep red flush.'
-				'You lean in and kiss her passionately before telling her: "Let''s go to your room."'
-				act 'Go to her room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber01.jpg"></center>'
+				'You move over and make her sit on top of it.'
+				'"I thought we could have some fun in here. The noise from the washer should prevent anyone from hearing." You tell her as you hand her the cucumber.'
+				'"What''s this for?" She asks you. "I Want to see you slide it in your pussy Natasha." You tell her with an excited grin on your face.'
+				'"It''s enormous, it won''t fit." She hesitantly tries to back out. "I''ve seen you take bigger. Now open those legs and get yourself ready or I''ll put it in myself right now." You hiss at her.'
+				act 'Further':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber02.jpg"></center>'
+					'Natasha has a shocked look on her face as she scoots back a bit and obediently starts to play with her pussy. You can see she''s already wet. "Being dominated really turns her on." You think to yourself.'
+					'"T-The vibrations from the washer are ..." She starts moaning softly.'
+					'"You better start opening that pussy up or it''s going to sting bitch." You continue in the same threatening tone you used before. Natasha moans as she slips two fingers inside. "That went easy enough, now add a third." You order her, and to your delight she immediately forces a third finger inside her vagina.'
+					'"Good, now spread your pussy, I want to have a last look before the cucumber goes in." You hiss again, wanting to make sure she keeps takign your orders immediately.'
+					'You smile as you she opens her pussy for you with her hands, showing you just how dripping wet she is.'
+					act 'Now put it in':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber03.jpg"></center>'
+						'Natasha lets out a loud moan as she forces the cucumber inside her pussy even though she was biting her lip to try and stay quiet. It slides about half way in on the first stroke. "You see, it wasn''t too big at all." You praise her. "Now I want to see you fuck yourself hard. Keep going."'
+						'She''s all too eager to obey. With a furious effort she rapidly strokes the big vegetable in and out of herself. Her moans growing louder and louder. Within a few minutes you are rewarded with the sight of her delicious orgasm. Her legs shake as she keeps fucking herself for a bit longer before she finally slides it all the way out and leans back. Her face sporting a deep red flush.'
+						'You lean in and kiss her passionately before telling her: "Let''s go to your room."'
+						act 'Go to her room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
+					end
+				end
 			end
+		else
+			act 'Make her play with a cucumber (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Go to her room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 		end
 	elseif NatashaLoc = 7:
-		'You walk in and see Natasha just turning on the machine. She turns around and sees you in the doorway.'
 		'"Oh hey <<$pcs_nickname>>, let''s go to my room"'
 		act 'Go to her room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 	else
+		*clr & cla
 		'There is nobody here. This room isn''t exactly big enough to hang out in so you head back out.'
 		act 'Go to the hallway': gt 'natbelapt', 'hallway'
 	end
@@ -219,35 +244,42 @@ if $ARGS[0] = 'showerspy':
 	'You open the bathroom door as quietly as you can and peer through the crack to see Natasha sitting down in the shower while she''s shaving her pussy, completely absorbed in the her grooming.'
 	gs 'arousal', 'voyeur', 5
  	if NatashaQW >= 5:
-		act 'Get a closer look':
-			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerspy02.jpg"></center>'
-			'Wanting to get a better look you step into the bathroom and close the door behind you.'
-			'"Making yourself presentable I see." You say with a grin, which breaks Natasha out of her concentration, making her look up at you with an embarassed look on her face.'
-			'She then shrugs and gets back to her shaving. "I-It just feels nice... You know..." She lets out.'
-			'"Yeah, I understand. Freshly shaven skin is really nice to touch." You let her know as you keep watching while she finishes shaving.'
-			gs 'arousal', 'voyeur', 5
-			if NatashaQW >= 9:
-				act 'Keep chatting while she rinses off':
-					*clr & cla
-					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerspy02.jpg"></center>'
-					'When Natasha is done she quickly rinses off the remaining shaving cream and then looks up at you with a mischievous grin on her face.'
-					'"This feels even nicer." She says as she spreads her pussylips with one hand and inserts the handle of her razor in her pussy, gently pushing it in and then slowly pulling it out a few times.'
-					'"Someone''s in a great mood today." You praise her as you feel your own pussy getting wet at the sight of Natasha playing with herself in the shower. "I think we should continue this in your room."'
-					'Natasha quickly gets up and rinses off her entire body and you hand her a towel as she steps out of the shower.'
-					'"Don''t take too long. I''ll be in your room." You tell her and leave the bathroom.'
-					gs 'arousal', 'voyeur', 5
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Get a closer look (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
+				*clr & cla
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerspy02.jpg"></center>'
+				'Wanting to get a better look you step into the bathroom and close the door behind you.'
+				'"Making yourself presentable I see." You say with a grin, which breaks Natasha out of her concentration, making her look up at you with an embarassed look on her face.'
+				'She then shrugs and gets back to her shaving. "I-It just feels nice... You know..." She lets out.'
+				'"Yeah, I understand. Freshly shaven skin is really nice to touch." You let her know as you keep watching while she finishes shaving.'
+				gs 'arousal', 'voyeur', 5
+				if NatashaQW >= 9:
+					act 'Keep chatting while she rinses off':
+						*clr & cla
+						'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerspy02.jpg"></center>'
+						'When Natasha is done she quickly rinses off the remaining shaving cream and then looks up at you with a mischievous grin on her face.'
+						'"This feels even nicer." She says as she spreads her pussylips with one hand and inserts the handle of her razor in her pussy, gently pushing it in and then slowly pulling it out a few times.'
+						'"Someone''s in a great mood today." You praise her as you feel your own pussy getting wet at the sight of Natasha playing with herself in the shower. "I think we should continue this in your room."'
+						'Natasha quickly gets up and rinses off her entire body and you hand her a towel as she steps out of the shower.'
+						'"Don''t take too long. I''ll be in your room." You tell her and leave the bathroom.'
+						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Leave': gt 'natbelapt','natroom'
+					end
+				else
 					gs 'arousal', 'end'
 					gs 'stat'
+					'When Natasha is done she quickly rinses off the remaining shaving cream and you hand her a towel as she steps out of the shower.'
+					'"I''ll let you finish up in here. I''ll be in your room." You tell her and leave the bathroom.'
 					act 'Leave': gt 'natbelapt','natroom'
 				end
-			else
-				gs 'arousal', 'end'
-				gs 'stat'
-				'When Natasha is done she quickly rinses off the remaining shaving cream and you hand her a towel as she steps out of the shower.'
-				'"I''ll let you finish up in here. I''ll be in your room." You tell her and leave the bathroom.'
-				act 'Leave': gt 'natbelapt','natroom'
 			end
+		else
+			act 'Get a closer look (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Leave': gt 'natbelapt','hallway'
 		end
 	else
 		'Not wanting to intrude any further you decide to leave her be and close the door again.'

+ 25 - 16
locations/natbelapt.qsrc

@@ -474,10 +474,10 @@ if $ARGS[0] = 'natroom':
 			if NatashaQW > 1 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
 			if NatashaQW >= 5:
-				gs 'willpower', 'exhib', 'force'
+				gs 'willpower', 'exhib', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your feet (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib', 'force'
+						gs 'willpower', 'exhib', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_feet'
 					end
@@ -486,10 +486,10 @@ if $ARGS[0] = 'natroom':
 				end
 			end
 			if NatashaQW >= 6:
-				gs 'willpower', 'exhib', 'force'
+				gs 'willpower', 'exhib', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Spit in face (<<will_cost>> Willpower)':
-						gs 'willpower', 'exhib', 'force'
+						gs 'willpower', 'exhib', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'spit_face'
 					end
@@ -498,10 +498,10 @@ if $ARGS[0] = 'natroom':
 				end
 			end
 			if NatashaQW >= 7:
-				gs 'willpower', 'sex', 'force'
+				gs 'willpower', 'cuni', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your pussy (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex', 'force'
+						gs 'willpower', 'sex', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natbelapt', 'lick_pussy'
 					end
@@ -510,10 +510,10 @@ if $ARGS[0] = 'natroom':
 				end
 			end
 			if NatashaQW >= 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
-				gs 'willpower', 'sex', 'force'
+				gs 'willpower', 'sex', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her fuck Kolka (<<will_cost>> Willpower)':
-						gs 'willpower', 'sex', 'force'
+						gs 'willpower', 'sex', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natkolev', 'kolkabj'
 					end
@@ -526,10 +526,10 @@ if $ARGS[0] = 'natroom':
 			!	act 'Fuck her with Julia': gs 'natbelapt', 'Nat_Julia_3some'
 			!end
 			if NatashaQW >= 9 and olufirst = 3 and oluuosegunday ! daystart:
-				gs 'willpower', 'anal', 'force'
+				gs 'willpower', 'anal', 'force', 'easy'
                 if will_cost <= pcs_willpwr:
                     act 'Take her to see Olu (<<will_cost>> Willpower)':
-						gs 'willpower', 'anal', 'force'
+						gs 'willpower', 'anal', 'force', 'easy'
 						gs 'willpower', 'pay', 'force'
 						gt 'natpimp', 'go_see_olu'
 					end
@@ -538,6 +538,15 @@ if $ARGS[0] = 'natroom':
                 end
 			end
 		end
+		if NatashaQW = 1:
+			*nl
+			nattimeleft = NatDolgDay - daystart
+			if nattimeleft > 0:
+				'Natasha has promised to pay you back in <<nattimeleft>> day(s).'
+			else
+				'Natasha promised to pay you back by now, maybe you should talk to her about it.'
+			end
+		end
 	elseif NatashaShower = 1 and NatashaLoc ! 2:
 		*clr & cla
 		menu_off = 1
@@ -738,7 +747,7 @@ if $ARGS[0] = 'hwundress':
 	menu_off = 1
 	'<center><img src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
 	'When you see that Natasha is working hard on your homework, you get up from your seat and lie down on her bed to relax.'
-	gs 'willpower', 'exhib', 'force'
+	gs 'willpower', 'exhib', 'force', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Tell her to strip (<<will_cost>> Willpower)':
 			cla
@@ -848,7 +857,7 @@ if $ARGS[0] = 'afterhomework':
 		gt 'natbelapt', 'natroom'
 	end
 
-	gs 'willpower', 'cuni', 'force'
+	gs 'willpower', 'cuni', 'force', 'easy'
 	if NatashaQW >= 7 and will_cost <= pcs_willpwr:
 		act 'Take off your own clothes (<<will_cost>> Willpower)':
 			cla
@@ -861,7 +870,7 @@ if $ARGS[0] = 'afterhomework':
 		act 'Take off your own clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if natseethrough = 1:
-		gs 'willpower', 'exhib', 'force'
+		gs 'willpower', 'exhib', 'force', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Make her wear the lingerie (<<will_cost>> Willpower)':
 				*clr & cla
@@ -1008,7 +1017,7 @@ if $ARGS[0] = 'lick_pussy':
 	natsub += 1
 	pcs_dom += 1
 	NatDolg -= 500
-	if npcSex[16] = 0:npcSex[16] = 1 & girl += 1
+	if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & guy += 1
 	lesbian += 1
 	natlesb += 1
 	gs 'stat'
@@ -1651,7 +1660,7 @@ if $ARGS[0] = 'kitchen':
 		act 'Leave': gt 'natbelapt','hallway'
 		act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 		if NatashaQW > 6:
-			gs 'willpower', 'exhib', 'force'
+			gs 'willpower', 'exhib', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Show me some skin (<<will_cost>> Willpower)':
 					*clr & cla
@@ -1828,7 +1837,7 @@ if $ARGS[0] = 'natmother':
 		'"Wow, putting on a show for me Natasha?" You ask her as you walk into the room.'
 		'At the sound of your voice, Natasha immediately turns to you and tries to hide just how short the skirt is with her hands.'
 		if NatashaQW > 6:
-			gs 'willpower', 'exhib', 'force'
+			gs 'willpower', 'exhib', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Show me more (<<will_cost>> Willpower)':
 					*clr & cla

+ 38 - 31
locations/natkolEv.qsrc

@@ -826,41 +826,48 @@ if $ARGS[0] = 'showerspy':
 	'You open the bathroom door as quietly as you can and peer through the crack to see Natasha on her knees sucking Kolka off while in the shower.'
 	gs 'arousal', 'voyeur', 5
  	if NatashaQW >= 5:
-		act 'Get a closer look':
-			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natkolkashowerbj2.jpg"></center>'
-			'Wanting to get a better look you step into the bathroom and close the door behind you.'
-			'They''re so absorbed in eachother that they don''t even notice your entry.'
-			'"Taking private lessons Kolka?" You say with a grin on your face.'
-			'At the sound of your voice, they both startle visibly. Natasha''s face instantly turns crimson.'
-			'"Don''t stop on my account. I love watching you guys get each other off."'
-			gs 'arousal', 'voyeur', 5
-			act 'Make Kolka fuck her':
+		gs 'willpower', 'voyeur', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Get a closer look (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerfuck.jpg"></center>'
-				'"It looks like Natasha needs a dick in her pussy. Give her what she wants Kolka."'
-				'Obedience seems to be well trained into Natasha by now as she immediately gets up and offers her pussy to Kolka.'
-				'Kolka doesn''t waste any time and immediately plunges his full length inside her, making her moan loudly. He starts to move gently at first, but Natasha almost immediately starts begging him: "Please fuck me hard and fast Kolka. Yes... Like that... Keep going."'
-				'The bathroom is suddenly filled with the sounds of Natasha''s moaning and flesh smacking against flesh.'
-				'It doesn''t take long before Natasha''s moaning turns into pleading again, "Please... Yes... Almost..." before her legs start trembling in Kolka''s arms.'
-				'You squirm a bit yourself as you watch Natasha having what looks to be one hell of an orgasm.'
-				'It seems to take her forever to stop cumming, but eventually, she just can''t stay on her feet any longer and sinks down to the floor. Kolka looks like he''s on the edge himself.'
-				gs 'arousal', 'voyeur', 20
-				minut -= 15
-				gs 'stat'
-				act 'Let him cum on her face':
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natkolkashowerbj2.jpg"></center>'
+				'Wanting to get a better look you step into the bathroom and close the door behind you.'
+				'They''re so absorbed in eachother that they don''t even notice your entry.'
+				'"Taking private lessons Kolka?" You say with a grin on your face.'
+				'At the sound of your voice, they both startle visibly. Natasha''s face instantly turns crimson.'
+				'"Don''t stop on my account. I love watching you guys get each other off."'
+				gs 'arousal', 'voyeur', 5
+				act 'Make Kolka fuck her':
 					*clr & cla
-					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowercum.jpg"></center>'
-					'"Looks like you did her in Kolka." You say. "Come lie down here Natasha and let him cum on your face."'
-					'She looks dazed as she crawls out of the shower and lies down on her back. Kolka follows her out and straddles her chest. He immediately starts jerking off furiously over her face.'
-					'"Open your mouth. Here it comes." He tells her and seconds after that he starts shooting a huge load of his cum into her mouth and over her face.'
-					'By the time he''s done cumming Natasha''s mouth is overflowing, and half of her face is covered in cum.'
-					'"A true cum shower. Fitting." You say, unable to hold in your laughter. "Well, Kolka looks like it''s time for you to get going. I''ll help her get to her feet."'
-					'Kolka quickly gets dressed before he slips out of the bathroom. After he''s gone you pull Natasha to her feet and help her over to the sink to clean up.'
-					gs 'arousal', 'voyeur', 5
-					act 'Go to Natasha''s room': gt 'natbelapt','natroom'
+					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowerfuck.jpg"></center>'
+					'"It looks like Natasha needs a dick in her pussy. Give her what she wants Kolka."'
+					'Obedience seems to be well trained into Natasha by now as she immediately gets up and offers her pussy to Kolka.'
+					'Kolka doesn''t waste any time and immediately plunges his full length inside her, making her moan loudly. He starts to move gently at first, but Natasha almost immediately starts begging him: "Please fuck me hard and fast Kolka. Yes... Like that... Keep going."'
+					'The bathroom is suddenly filled with the sounds of Natasha''s moaning and flesh smacking against flesh.'
+					'It doesn''t take long before Natasha''s moaning turns into pleading again, "Please... Yes... Almost..." before her legs start trembling in Kolka''s arms.'
+					'You squirm a bit yourself as you watch Natasha having what looks to be one hell of an orgasm.'
+					'It seems to take her forever to stop cumming, but eventually, she just can''t stay on her feet any longer and sinks down to the floor. Kolka looks like he''s on the edge himself.'
+					gs 'arousal', 'voyeur', 20
+					minut -= 15
+					gs 'stat'
+					act 'Let him cum on her face':
+						*clr & cla
+						'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natshowercum.jpg"></center>'
+						'"Looks like you did her in Kolka." You say. "Come lie down here Natasha and let him cum on your face."'
+						'She looks dazed as she crawls out of the shower and lies down on her back. Kolka follows her out and straddles her chest. He immediately starts jerking off furiously over her face.'
+						'"Open your mouth. Here it comes." He tells her and seconds after that he starts shooting a huge load of his cum into her mouth and over her face.'
+						'By the time he''s done cumming Natasha''s mouth is overflowing, and half of her face is covered in cum.'
+						'"A true cum shower. Fitting." You say, unable to hold in your laughter. "Well, Kolka looks like it''s time for you to get going. I''ll help her get to her feet."'
+						'Kolka quickly gets dressed before he slips out of the bathroom. After he''s gone you pull Natasha to her feet and help her over to the sink to clean up.'
+						gs 'arousal', 'voyeur', 5
+						act 'Go to Natasha''s room': gt 'natbelapt','natroom'
+					end
 				end
 			end
+		else
+			act 'Get a closer look (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Leave': gt 'natbelapt','hallway'
 		end
 	else
 		'Not wanting to intrude any further you decide to leave them be and close the door again.'

+ 106 - 69
locations/nyp_school.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 			'You began to help clear the table with the other girls. The boys don''t help with the cleanup and just keep talking with each other. Once everything is cleaned up the teachers let you know. "You can stay here for a while and have fun guys, Rolan will come through in a few hours to lock the place up. Until then feel free to stay and dance, and we''ll see everyone after winter break." With that the teachers pack up and leave, acting like they can''t wait to get out of here, leaving only Mr. Yenotin to watch over everyone.'
 			*nl
 			'With most of the teachers gone, some of the boys begin to whisper among themselves and all of a sudden some of them pull out some fruit juice, while a couple of the girls cut up fresh fruit slices to add to it. Lena and Lera add the final ingredient which is pouring a whole bottle of vodka into the mix, much to the joy of most of the students and to the dismay of the nerds.'
-			if pav_slut > 75 and grupTipe ! 4:
+			if pav_slut > 100 and grupTipe ! 4:
 				!!If Sveta is a slut and not a Gopnik this happens instead of the options below.
 				!!slut and not a gopnik
 				*clr & cla
@@ -66,6 +66,7 @@ if $ARGS[0] = 'start':
 
 				act 'Ignore him':
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 					'You silently turn away from Vasily ignoring his comment. He grabs you by the arm: "What do you think you''re doing, bitch? Answer me when I talk to you!"'
 					if AlbinaBlockHumiliation = 1:
 						if pav_prostitute > 10: pav_prostitute -= 10
@@ -90,7 +91,6 @@ if $ARGS[0] = 'start':
 					end
 				end
 			elseif pav_slut > 125 and grupTipe = 4:
-				!!if pav_slut > 125 and is a gopnik
 				'Suddenly one of the boys call out to you "<<$pcs_nickname>>, come over here. I got something for you."'
 				act 'Approach':
 					*clr & cla
@@ -109,17 +109,24 @@ if $ARGS[0] = 'start':
 
 						act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
 					end
-					act 'Refuse the drink':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/forceddrink.jpg"></center>'
-						'You shake your head no. "No thinks guys."'
-						'One of them snorts, while Dan says. "I don''t think you understand <<$pcs_nickname>> we wasn''t asking." You feel someone grab your hair and pull your head back. While Dan grabs your chin and forces your mouth open, while someone pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. Then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After several times of this, you are so drunk you can barely stand.'
-						minut += 10
-						gs 'drugs', 'alcohol', 'vodka', 1
-						gs 'stat'
+					gs 'willpower', 'drink', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Refuse the drink (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/forceddrink.jpg"></center>'
+							'You shake your head no. "No thinks guys."'
+							'One of them snorts, while Dan says. "I don''t think you understand <<$pcs_nickname>> we wasn''t asking." You feel someone grab your hair and pull your head back. While Dan grabs your chin and forces your mouth open, while someone pours vodka into your mouth. You try to spit some out, but once your mouth is full, Dan forces your mouth closed. Then covers your mouth with his hand and pinches your nose closed, forcing you to swallow or drown. After several times of this, you are so drunk you can barely stand.'
+							minut += 10
+							gs 'drugs', 'alcohol', 'vodka', 1
+							gs 'stat'
 
-						act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
-					end
+							act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
+						end
+					else
+						act 'Refuse the drink (<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
 				act 'Drink some juice':
@@ -366,7 +373,7 @@ if $ARGS[0] = 'nerds':
 		act 'Approach':
 			*clr & cla
 			'As you come nearer the discussion subsides as the guys stop talking as you approach the table.'
-			'Natasha turns around and greets you, "Hi <<$pcs_nickname>>, sorry about the commotion. But I was discussing about how annoying it was that the only thing that everyone talk about is this stupid game."'
+			'Natasha turns around and greets you, "Hi <<$pcs_nickname>>, sorry about the commotion. But I was discussing about how annoying it was that the only thing that everyone talks about is this stupid game."'
 			'"And I take it that you''re not a fan of it?" you reply.'
 			*nl
 			'Natasha smiles nervously back, "That''s right. I mean I don''t mind them talking about it but it''s just that they talk about it all the time. It''s like there''s nothing else happening around here."'
@@ -645,17 +652,25 @@ if $ARGS[0] = 'gopniks':
 				end
 			end
 		end
-		act 'Say no':
-			cla & *clr
-			'You ponder about it for a bit and answer that you don''t want to be a part of such childish things, "There are other ways to leave a memento behind. So no I won''t be joining you."'
-			'The group looks disappointingly at you, "We thought you were cool <<$pcs_nickname>>." Ekaterina says. The others nodded assenting, agreeing with what Ekaterina was saying.'
-			'You shrug your shoulders at their reaction, it doesn''t really bother you that they find you boring for not going along with it.'
-			'They shake their heads as they walk past you, some of them whisper, "Can you believe she turned us down? Who the fuck does she think she is?"'
-			minut += 5
-			gs 'stat'
+		gs 'willpower', 'crime', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Say no (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
+				'You ponder about it for a bit and answer that you don''t want to be a part of such childish things, "There are other ways to leave a memento behind. So no I won''t be joining you."'
+				'The group looks disappointingly at you, "We thought you were cool <<$pcs_nickname>>." Ekaterina says. The others nodded assenting, agreeing with what Ekaterina was saying.'
+				'You shrug your shoulders at their reaction, it doesn''t really bother you that they find you boring for not going along with it.'
+				'They shake their heads as they walk past you, some of them whisper, "Can you believe she turned us down? Who the fuck does she think she is?"'
+				minut += 5
+				gs 'stat'
 
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
-		end
+				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			end
+		else
+			act 'Say no (<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 'Go get high':
 		cla & *clr
@@ -716,36 +731,48 @@ if $ARGS[0] = 'gopniks':
 						act 'Hangout until the party ends':gt 'nyp_school', 'end'
 					end
 				end
+				gs 'willpower', 'drugs', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Have second thoughs (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
+						'As Alyona is passes the joint to you, you begin to internally freak out. You shake your head and show with a hand gesture that you pass.'
+						'"What now?" Arkadi asks, "I thought you wanted to smoke?" he irritably says.'
+						'"I''ve had a change of mind." you meekly answer.'
+						'He scoffs, "I knew this was a bad idea. We shouldn''t have made you tag along."'
+						'Anushka, once again comes to the rescue, "Leave her alone, Arkadi. If she doesn''t want to smoke, don''t force her then. She can still stay until we head back."'
+						'You cheer up a bit and you start talking to Anushka and Alyona while you can hear Arkadi mutter something to the other boys.'
+						minut += 15
+						npc_rel['A156'] -= 1
+						npc_rel['A144'] += 1
+						gs 'stat'
 
-				act 'Have second thoughs':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
-					'As Alyona is passes the joint to you, you begin to internally freak out. You shake your head and show with a hand gesture that you pass.'
-					'"What now?" Arkadi asks, "I thought you wanted to smoke?" he irritably says.'
-					'"I''ve had a change of mind." you meekly answer.'
-					'He scoffs, "I knew this was a bad idea. We shouldn''t have made you tag along."'
-					'Anushka, once again comes to the rescue, "Leave her alone, Arkadi. If she doesn''t want to smoke, don''t force her then. She can still stay until we head back."'
-					'You cheer up a bit and you start talking to Anushka and Alyona while you can hear Arkadi mutter something to the other boys.'
-					minut += 15
-					npc_rel['A156'] -= 1
-					npc_rel['A144'] += 1
-					gs 'stat'
-
-					act 'Hangout until the party ends':gt 'nyp_school', 'end'
-				end
+						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+					end
+				else
+					act 'Have second thoughs (<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
-		act 'Shake head':
-			cla & *clr
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/gopniks.jpg"></center>'
-			'"I''m not interested in smoking weed. But don''t worry your secret is safe with me, I won''t tell anyone." you reply.'
-			'"Yeah, you better keep that mouth shut." Arkadi aggressively tells you off.'
-			'"There There Arkadi, take it easy <<$pcs_nickname>> said she wouldn''t say anything. And even if she did it''s not like this is a big secret after all." Anushka tries to calm Arkadi down.'
-			'"As I said she better keep that mouth shut." he yells out as he moves away from you all. The rest of the group quickly chase after him as you''re left alone standing all by yourself.'
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
-		end
+		gs 'willpower', 'drugs', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Shake head (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/gopniks.jpg"></center>'
+				'"I''m not interested in smoking weed. But don''t worry your secret is safe with me, I won''t tell anyone." you reply.'
+				'"Yeah, you better keep that mouth shut." Arkadi aggressively tells you off.'
+				'"There There Arkadi, take it easy <<$pcs_nickname>> said she wouldn''t say anything. And even if she did it''s not like this is a big secret after all." Anushka tries to calm Arkadi down.'
+				'"As I said she better keep that mouth shut." he yells out as he moves away from you all. The rest of the group quickly chase after him as you''re left alone standing all by yourself.'
+				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			end
+		else
+			act 'Shake head (<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 'Go pick on someone':
 		cla & *clr
@@ -759,7 +786,7 @@ if $ARGS[0] = 'gopniks':
 			cla & *clr
 			minut += 5
 			gs 'stat'
-			!!image needed
+			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 			'"Heya Petia!" you cheerfully greet him.'
 			'Petia, a bit hesitant greets you back, and then arrogantly asks you, "What do you want? I have no time to deal with your shit today."'
 			'"Is that a way to greet a classmate?" you reply, "Here I was meaning to be kind and nice this time but you''re making it really hard to do that."'
@@ -768,7 +795,7 @@ if $ARGS[0] = 'gopniks':
 				cla & *clr
 				minut += 5
 				gs 'stat'
-				!!image needed
+				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 				'"Well here''s the thing. This friend of mine is quite interested in you. But she''s a bit too shy to talk to you herself so she me over to talk with you." you try to keep your voice down.'
 				'Petia, feeling distrustful in your actions, answers, "Yeah, right. You should''ve tried with something less obvious."'
 				'You look pleadingly at him, "No I''m not kidding around, here let me call her over." Before he manages to answer you wave over Lena to come over.'
@@ -776,7 +803,7 @@ if $ARGS[0] = 'gopniks':
 					cla & *clr
 					minut += 5
 					gs 'stat'
-					!!image needed
+					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 					'Lena sees the signal and leaps towards the two of you. She cheerfully stops in front of the two of you as you begin to explain that you''ve told Petia the big secret.'
 					'Lena being the good actrees she is blushes, pushes you gently, "What did you tell him that? I told you that in confidence and now you told him. I''m so ashamed right now."'
 					'Petia now looking nervously around tries to manage the situation, "Wait wait. No need to fight with each other. Let''s talk about it."'
@@ -863,7 +890,7 @@ if $ARGS[0] = 'outcast':
 				'You yell out hoping that someone will come to your aid but to no avail there''s no one daring to help you out.'
 				'While he''s holding you down Vitek turns his attention towards Sonia, "Do you want to help out your little friend here?" he asks her.'
 				'Sonia teary eyed nods, "I''ll do whatever just let her be!"'
-				'"See, even the whores take care of eachother." he grins to his friends, "This gives me an idea, the two of you can give us a little warm-up show and after that we''ll decide among ourselves who gets who."'
+				'"See, even the whores take care of each other." he grins to his friends, "This gives me an idea, the two of you can give us a little warm-up show and after that we''ll decide among ourselves who gets who."'
 				act 'Accept your punishment':
 					cla & *clr
 					minut += 2
@@ -877,26 +904,34 @@ if $ARGS[0] = 'outcast':
 					'You can see his face turn red as he yells to the rest of his gang to get ready for a fight. As he begins walking away he yells out, "I''ll take a rain check <<$pcs_nickname>>!"'
 					act 'Leave the party':
 						cla
+						'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 						'Once the gopniks hurry off you glance at Sonia and say. "We should get out of here, before they come back. See you later." With that you sadly leave the party before things get worse.'
 						act 'Leave':gt 'gschool_grounds', 'main'
 					end
 				end
-				act 'Refuse':
-					cla & *clr
-					minut += 2
-					gs 'pain', 5, 'neck', 'pinch'
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-					'In a mere moment of bravery you yell back, "Sonia and I are not your playthings, go fuck yourself!"'
-					'Vitek starts laughing as he tightens his grip around your neck and you let out a squeak as the pain becomes unbearable, "What did you say whore? Forget the foreplay boys, <<$pcs_nickname>> will do fine by herself..."'
-					'The guys all unisonly laugh and just as they''re about to lead you through the main door Lena runs up to Vitek and whispers something...'
-					'You can see his face turn red as he yells to the rest of his gang to get ready for a fight, "You''re lucky this time whore... Next time I won''t be this nice!" he tells you as he releases you from his grip.'
-					act 'Leave the party':
-						cla
-						'Once the gopniks hurry off you glance at Sonia and say. "We should get out of here, before they come back. See you later." With that you sadly leave the party before things get worse.'
-						act 'Leave':gt 'gschool_grounds', 'main'
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						minut += 2
+						gs 'pain', 5, 'neck', 'pinch'
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+						'In a mere moment of bravery you yell back, "Sonia and I are not your playthings, go fuck yourself!"'
+						'Vitek starts laughing as he tightens his grip around your neck and you let out a squeak as the pain becomes unbearable, "What did you say whore? Forget the foreplay boys, <<$pcs_nickname>> will do fine by herself..."'
+						'The guys all unisonly laugh and just as they''re about to lead you through the main door Lena runs up to Vitek and whispers something...'
+						'You can see his face turn red as he yells to the rest of his gang to get ready for a fight, "You''re lucky this time whore... Next time I won''t be this nice!" he tells you as he releases you from his grip.'
+						act 'Leave the party':
+							cla
+							'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+							'Once the gopniks hurry off you glance at Sonia and say. "We should get out of here, before they come back. See you later." With that you sadly leave the party before things get worse.'
+							act 'Leave':gt 'gschool_grounds', 'main'
+						end
 					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	
 			end
 		end
 	else
@@ -937,6 +972,7 @@ if $ARGS[0] = 'outcast':
 					'"That''s it the show is over!" Vitek yells, "Until next time, <<$pcs_nickname>>." he winks.'
 					act 'Leave the party':
 						cla
+						'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 						'Once the gopniks hurry off you glance around, you notice the exchange got a lot of attention and attention for an outcast is bad. With final look at the decorations you sadly leave the party before things get worse.'
 						act 'Leave':gt 'gschool_grounds', 'main'
 					end
@@ -963,6 +999,7 @@ end
 if $ARGS[0] = 'slut':
 	*clr & cla
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 	'Once in the bathroom Vasily immediately pulls down his pants and says, "Suck my cock bitch. I know that you''ve been anticipating this the whole party."'
 	act 'Suck him off':
 		*clr & cla

+ 3 - 4
locations/orgazm.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	vidageday -= 1
 	frost = 0
 
-	if tabletki <= 0 and prezik > 0 and prosta = 0:
+!{	if tabletki <= 0 and prezik > 0 and prosta = 0:
 		dynamic $prezik
 		protect = 1
 		if preziktype = 2:
@@ -27,7 +27,7 @@ if $ARGS[0] = 'start':
 			sexcontra = 3
 			'You gave the guy a condom and he put it on in silence.'
 		end
-	elseif tabletki <= 0 and prezik > 0:
+	elseif tabletki <= 0 and prezik > 0:}
 		dynamic $prezik
 		protect = 1
 		if preziktype = 2:
@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 			sexcontra = 3
 			'You gave the guy a condom and he put it on in silence.'
 		end
-	end
+	!end
 
 	if protect ! 1:
 		!!unprotected sex
@@ -49,7 +49,6 @@ if $ARGS[0] = 'start':
 			'<<$boydesc>> groans and you feel each jet of sperm paint the walls of your womb with seed.'
 
 			pcs_mood -= 15
-			pcs_willpwr -= 15
 			gs 'cuminsidereact'
 		
 		elseif finrand = 1:

+ 13 - 2
locations/pain.qsrc

@@ -4,10 +4,11 @@
 !$ARGS[1] should equal the body part being hurt from any of the following:
 !BobyPart 'head', 'hair', 'ears', 'eyebrows', 'eyes', 'cheeks', 'nose', 'mouth', 'lips', 'tongue', 'throat', 'neck', 'back',
 !'asscheeks', 'asshole', 'hips', 'thighs', 'legL', 'legR', 'feet', 'toes', 'shoulders', 'armL', 'armR', 'handL', 'handR',
-!'fingers', 'chest', 'breasts', 'nipples', 'ribs', 'tummy', 'pubic', 'vaginal', 'labia', 'clitoris', 'urethra', 'cervix'
+!'fingers', 'chest', 'breasts', 'nipples', 'ribs', 'tummy', 'pubic', 'vaginal', 'labia', 'clitoris', 'urethra', 'cervix',
+!'wrists', 'ankles'
 !$ARGS[2] The action the participant has performed on Sveta (some of these can cause arousal if Sveta is into pain)
 !Acts: 'pierce', 'slap', 'spank', 'pinch', 'bite', 'burn', 'freeze', 'hit', 'kick', 'Slam', 'shock', 'bind', 'stretch'
-!'tear', 'break', 'twist', 'ache', 'cramp', 'labor'
+!'tear', 'break', 'twist', 'ache', 'cramp', 'labor', 'choke', 'fall', 'pull'
 !Format to use: gs 'pain', n, 'BobyPart', 'Act'
 !For pain to multiple body parts, use multiple calls
 
@@ -21,10 +22,16 @@ elseif $ARGS[2] = 'bind':
 elseif $ARGS[2] = 'spank':
 	pain[2] = 3
 	spank += 1
+elseif $ARGS[2] = 'choke':
+	pain[2] = 3
 elseif $ARGS[2] = 'shock':
 	pain[2] = 4
 elseif $ARGS[2] = 'twist':
 	pain[2] = 4
+elseif $ARGS[2] = 'pull':
+	pain[2] = 4	
+elseif $ARGS[2] = 'fall':
+	pain[2] = 4
 elseif $ARGS[2] = 'labor':
 	pain[2] = 4
 elseif $ARGS[2] = 'pinch':
@@ -63,6 +70,10 @@ elseif $ARGS[1] = 'feet':
 	pain[3] = 2
 elseif $ARGS[1] = 'shoulders':
 	pain[3] = 2
+elseif $ARGS[1] = 'wrists':
+	pain[3] = 2
+elseif $ARGS[1] = 'ankles':
+	pain[3] = 2
 elseif $ARGS[1] = 'armL':
 	pain[3] = 2
 elseif $ARGS[1] = 'armR':

+ 78 - 8
locations/park.qsrc

@@ -142,7 +142,7 @@ if $ARGS[0] = 'start':
 					gs 'boyStat', $npclastgenerated
 					act 'Fight':
 						cla
-						!!stats
+						!!stats{
 						strenV = 100
 						speedV = 50
 						agilV = 40
@@ -165,7 +165,24 @@ if $ARGS[0] = 'start':
 						RapistFight = 1
 
 						if spellavtoklon = 1:klon = 3
-						if spellbefshild = 1:defence = 500
+						if spellbefshild = 1:defence = 500}
+						gs 'fight','initFight'
+
+						$opp_name[0] = 'Rapist'
+						$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+						opp_def[0] = 50
+						opp_run[0] = 50
+						opp_wrstlng[0] = 10
+						opp_kick[0] = 0
+						opp_punch[0] = 50
+						opp_jab[0] = 50
+						opp_stren[0] = 100
+						opp_agil[0] = 40
+						opp_vital[0] = 50
+						opp_react[0] = 40
+						opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+						opp_willpwr[0] = 100
+						opp_shoot[0] = 100
 
 						gt 'fight', 'start'
 					end
@@ -549,7 +566,7 @@ if $ARGS[0] = 'prost':
 		act 'Fuck you!':
 			cla
 			minut += 15
-			!!stats
+			!!stats {
 			strenV = 20
 			speedV = 30
 			agilV = 30
@@ -572,7 +589,25 @@ if $ARGS[0] = 'prost':
 			prostitutFight = 1
 
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Prostitute'
+			$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+			opp_def[0] = 30
+			opp_run[0] = 30
+			opp_wrstlng[0] = 20
+			opp_kick[0] = 0
+			opp_punch[0] = 10
+			opp_jab[0] = 10
+			opp_stren[0] = 20
+			opp_agil[0] = 30
+			opp_vital[0] = 50
+			opp_react[0] = 30
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 50
+			opp_shoot[0] = 10
 
 			gt 'fight', 'start'
 		end
@@ -601,7 +636,7 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Bandit', rand(18,40)
 					gs 'boyStat', $npclastgenerated
-					!!stats
+					!!stats{
 					strenV = 200
 					speedV = 30
 					agilV = 20
@@ -624,7 +659,25 @@ if $ARGS[0] = 'prost':
 					prostitutFight = 2
 
 					if spellavtoklon = 1:klon = 3
-					if spellbefshild = 1:defence = 500
+					if spellbefshild = 1:defence = 500}
+
+					gs 'fight','initFight'
+
+					$opp_name[0] = 'Bandit'
+					$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+					opp_def[0] = 10
+					opp_run[0] = 30
+					opp_wrstlng[0] = 10
+					opp_kick[0] = 0
+					opp_punch[0] = 10
+					opp_jab[0] = 10
+					opp_stren[0] = 200
+					opp_agil[0] = 20
+					opp_vital[0] = 150
+					opp_react[0] = 20
+					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+					opp_willpwr[0] = 100
+					opp_shoot[0] = 10
 
 					gt 'fight', 'start'
 				end
@@ -678,7 +731,7 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Prostitute', rand(15,30)
 					gs 'boyStat', $npclastgenerated
-					!!stats
+					!!stats{
 					strenV = 50
 					speedV = 50
 					agilV = 40
@@ -701,7 +754,24 @@ if $ARGS[0] = 'prost':
 					prostitutFight = 3
 
 					if spellavtoklon = 1:klon = 3
-					if spellbefshild = 1:defence = 500
+					if spellbefshild = 1:defence = 500}
+					gs 'fight','initFight'
+
+					$opp_name[0] = 'Prostitute'
+					$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+					opp_def[0] = 10
+					opp_run[0] = 50
+					opp_wrstlng[0] = 10
+					opp_kick[0] = 0
+					opp_punch[0] = 10
+					opp_jab[0] = 10
+					opp_stren[0] = 50
+					opp_agil[0] = 40
+					opp_vital[0] = 60
+					opp_react[0] = 30
+					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+					opp_willpwr[0] = 50
+					opp_shoot[0] = 10
 
 					gt 'fight', 'start'
 				end

+ 20 - 2
locations/parkivent.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '1':
 		gs 'boyStat', $npclastgenerated
 		act 'Fight him':
 			*clr & cla
-			!!stats
+			!!stats{
 			strenV = 100
 			speedV = 50
 			agilV = 40
@@ -70,7 +70,25 @@ if $ARGS[0] = '1':
 			RapistFight = 1
 
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Rapist'
+			$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+			opp_def[0] = 50
+			opp_run[0] = 50
+			opp_wrstlng[0] = 10
+			opp_kick[0] = 0
+			opp_punch[0] = 50
+			opp_jab[0] = 50
+			opp_stren[0] = 100
+			opp_agil[0] = 40
+			opp_vital[0] = 50
+			opp_react[0] = 40
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 
 			gt 'fight', 'start'
 		end

+ 18 - 11
locations/pavComplex.qsrc

@@ -389,17 +389,24 @@ if $ARGS[0] = 'garages':
 							'You shake your head. "No sorry, but maybe I can take your mind off it."'
 							'His face softens a bit and he seems curious. "How exactly?" It doesn''t take a mind reader to know like most teenage boys, all he is thinking about now is fucking you.'
 							gs 'stat'
-							act 'Talk to Valentin':
-								cla & *clr
-								minut += 5
-								npc_rel['A158'] += 1
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/ed6.jpg"></center>'
-								'You bite your lip, you know what he wants but you don''t want to. "We could you know just talk and hang out if you want."'
-								'He sighs obviously a little disappointed. "I guess a little break wouldn''t hurt, so what''s up with you?"'
-								'The two of you start talking and before long he is fairly relaxed, after about half a hour. During a lull in the conversation he says. "I should really get back to this, thanks for hanging out, see ya later." With that he goes back to working on his bike and you take the hint.'
-								gs 'stat'
-								act 'Go to the courtyard':minut += 1 & gt 'pavComplex', 'start'
-							end
+							gs 'willpower', 'sex', 'resist'
+							if will_cost <= pcs_willpwr:
+								act 'Talk to Valentin (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'resist'
+									minut += 5
+									npc_rel['A158'] += 1
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/ed6.jpg"></center>'
+									'You bite your lip, you know what he wants but you don''t want to. "We could you know just talk and hang out if you want."'
+									'He sighs obviously a little disappointed. "I guess a little break wouldn''t hurt, so what''s up with you?"'
+									'The two of you start talking and before long he is fairly relaxed, after about half a hour. During a lull in the conversation he says. "I should really get back to this, thanks for hanging out, see ya later." With that he goes back to working on his bike and you take the hint.'
+									gs 'stat'
+									act 'Go to the courtyard':minut += 1 & gt 'pavComplex', 'start'
+								end
+							else
+								act 'Talk to Valentin (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end	
 							act 'Strip down to your panties':
 								cla & *clr
 								minut += 3

+ 68 - 13
locations/pavaptcourtev.qsrc

@@ -440,6 +440,25 @@ if $ARGS[0] = 'events2':
 			elseif grupTipe = 4:
 				'Vasily smiles to you and scoots over giving you a spot to sit between him and Dan. As you sit down he offers you a beer.'
 				act 'Drink beer': gt 'pavaptcourtev', 'male_gopnik_beer'
+				gs 'willpower', 'drink', 'resist', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse beer (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'resist'
+						grupvalue[4] -= 2
+						minut += 5
+						gs 'stat'
+						if month >= 11 or month <= 3:
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stoogesw.jpg"></center>'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stooges.jpg"></center>'
+						end
+						'You refuse the beer, they shrug but share a look. Then you tell Vasily about what has been going on lately in your life and make small talk with the guys for awhile, but they seem to quickly get tired of listening and tell you they got things to do. Then they grab the few beers left and walk off with out inviting you to join them.'
+						act 'Move away':gt 'pavComplex', 'start'
+					end
+				else
+					act 'Refuse beer (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 			else
 				'Vasily smiles to you and scoots over giving you a spot to sit between him and Dan. As you sit down he asks "What''cha up to?".'
 				act 'Make small talk':
@@ -483,6 +502,22 @@ if $ARGS[0] = 'events2':
 			elseif grupTipe = 4:
 				'They make some room on the bench. "Sure join us <<$pcs_nickname>>" Anushka says.'
 				act 'Drink beer': gt 'pavaptcourtev', 'female_gopnik_beer_1'
+				gs 'willpower', 'drink', 'resist', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse beer (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'type'
+						grupvalue[4] -= 2
+						gs 'stat'
+						minut += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
+						'You refuse the beer, they give each other a look but don''t say anything and then you tell them about what has been going on lately in your life and make small talk with the girls for awhile, but they seem to quickly get tired of listening and tell you they got things to do. Then they grab the few beers left and walk off with out inviting you to join them.'
+						act 'Move away':gt 'pavComplex', 'start'
+					end
+				else
+					act 'refuse beer (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 			else
 				'They exchange looks a moment, then Lena shrugs. "Whatever."'
 				act 'Make small talk':
@@ -519,6 +554,22 @@ if $ARGS[0] = 'events2':
 			elseif grupTipe = 4:
 				'They make some room on the bench. "Sure join us <<$pcs_nickname>>" Paulina says.'
 				act 'Drink beer': gt 'pavaptcourtev', 'female_gopnik_beer_2'
+				gs 'willpower', 'drink', 'resist', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse beer (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'type'
+						grupvalue[4] -= 2
+						gs 'stat'
+						minut += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
+						'You refuse the beer, they give each other a look but don''t say anything and then you tell them about what has been going on lately in your life and make small talk with the girls for awhile, but they seem to quickly get tired of listening and tell you they got things to do. Then they grab the few beers left and walk off with out inviting you to join them.'
+						act 'Move away':gt 'pavComplex', 'start'
+					end
+				else
+					act 'refuse beer (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end	
 			else
 				'They exchange looks a moment, then Lena shurgs. "What ever."'
 				act 'Make small talk':
@@ -910,8 +961,6 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 				else
 					act 'Refuse bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-
-				
 				act 'Make bet':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
@@ -1134,15 +1183,21 @@ if $ARGS[0] = 'follownush':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/kiss.jpg"></center>'
 			'You sit down next to her, the two of you start chatting about what has been going on lately in your lives. Just as you were telling her about something your sister did, she leans over and kisses you. You are briefly taken aback but not that much, it is just what she does.'
-			act 'Stop the kiss':
-				*clr & cla
-				minut += 1
-				npc_rel['A144'] -= 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
-				'You pull back from the kiss breaking it. "Uh sorry, I don''t want to make out or anything."'
-				'She shrugs slightly and the two of you start talking again but things seem a bit off. A bit awkward now, before long you both stop really saying much and then she says she needs to get going and head out. Leaving you to go back out to the courtyard.'
-				act 'Leave':gt 'pavComplex', 'start'
+			gs 'willpower', 'sex', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Stop the kiss (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					minut += 1
+					npc_rel['A144'] -= 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
+					'You pull back from the kiss breaking it. "Uh sorry, I don''t want to make out or anything."'
+					'She shrugs slightly and the two of you start talking again but things seem a bit off. A bit awkward now, before long you both stop really saying much and then she says she needs to get going and head out. Leaving you to go back out to the courtyard.'
+					act 'Leave':gt 'pavComplex', 'start'
+				end
+			else
+				act 'Stop the kiss (<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 lost in the moment':
 				*clr & cla
@@ -1417,7 +1472,7 @@ if $ARGS[0] = 'homenaked':
 					'You glance in the living room and see your brother sound asleep on the couch. You quickly walk past it and past the empty kitchen to the bathroom. Once inside you wrap a towel around your body and then head for your bedroom, just as if you had just taken a shower. Laying on your bed is your clothes, apparently the girls dropped them off... how nice of them...'	
 				end
 				*nl
-				'Anya glances up at you. "Hey one of your friends drop off some clothes, she said you let her borrow them. Anyways they are on your bed."'
+				'Anya glances up at you. "Hey one of your friends dropped off some clothes, she said you let her borrow them. Anyways they are on your bed."'
 				act 'Continue': gt 'bedrPar'
 			end
 		end
@@ -1434,7 +1489,7 @@ if $ARGS[0] = 'naked_aptcomplex':
 	'There are several older women sitting out front of your building. So you make your way around to the back of the complex near the garages, you stop a moment to peek around one of the buildings. Not seeing anyone, you dart from one building to the next, leaving just the small courtyard behind your building to cross. You peek around a building and see a few people there, you keep yourself hidden as you wait, finally they move off and you rush across the courtyard and into the back door of the apartment building.'
 	act 'Sneak upstairs':
 		*clr & cla
-		nakedrand = rand(1,10)
+		nakedrand = rand(1,5)
 		if nakedrand = 1: 
 			gt 'pavaptcourtev', 'two_boys'
 		elseif nakedrand = 2: 

+ 1 - 1
locations/pharmacy.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	menu_off = 0
 	gs 'stat'
 	*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-	if pharma_day ! daystart: pharma_day = daystart & pharma_picrand = rand(1,3)
+	if pharma_day ! daystart: pharma_day = daystart & pharma_picrand = rand(1,4)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg"></center>'
 	*nl
 	if $message ! '':

+ 296 - 184
locations/postdeliveries.qsrc

@@ -76,23 +76,28 @@ if $ARGS[0] = 'start':
 			end
 			act 'During your round...':gt 'postdeliveries', 'event'
 		end
-		act 'Use the more dangerous shortcuts to save time':
-			cla
-			*clr
-			poststreets = 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
-			'You decide to use the streets the postmaster told you to avoid, in order to be done faster. What''s the worst that could happen?'
-			if postamountrand = 0:
-				'Your bag is emptying rapidly, and you don''t think you''ll need much more than a half hour to finish your round if you can keep this up!'
-			elseif postamountrand = 1:
-				'At this pace you''ll be able to finish your round with about a half hour left to spare. Assuming nothing happens...'
-			else
-				'After another half hour you take another look in your bag. Damn, there''s still so much left to deliver! You should be able to just about get it done on time, but you''re going to have to keep the pace up...'
+		gs 'willpower', 'misc', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Use the more dangerous shortcuts to save time (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				poststreets = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
+				'You decide to use the streets the postmaster told you to avoid, in order to be done faster. What''s the worst that could happen?'
+				if postamountrand = 0:
+					'Your bag is emptying rapidly, and you don''t think you''ll need much more than a half hour to finish your round if you can keep this up!'
+				elseif postamountrand = 1:
+					'At this pace you''ll be able to finish your round with about a half hour left to spare. Assuming nothing happens...'
+				else
+					'After another half hour you take another look in your bag. Damn, there''s still so much left to deliver! You should be able to just about get it done on time, but you''re going to have to keep the pace up...'
+				end
+				
+				act 'During your round...':gt 'postdeliveries', 'event'
 			end
-			
-			act 'During your round...':gt 'postdeliveries', 'event'
-		end
+		else
+			act 'Use the more dangerous shortcuts to save time (<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
 
@@ -175,12 +180,18 @@ if $ARGS[0] = '1':
 	'When you don''t tell him off immediately, he continues: "You see... it''s for my wife. Our love life has been rather stale, and I''m hoping to breathe some new life into our relationship with this. It''s an anniversary gift."'
 	'He pats his hand on the parcel. "I''m not 100% sure if I ordered the right size, though! You look like you''re roughly her size. Would yo- would you mind putting it on real quick?" he stutters nervously. "She''d kill me if I got it wrong!"'
 	''
-	act 'Refuse and continue your round':
-		cla
-		'"Yea, no. How would your wife feel, if she knew another girl put those clothes on before her?" you ask him, and continue your round without saying another word.'
-		'The man doesn''t bother to object, and closes the door dejectedly. He knows you''re right.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'	
-	end
+	gs 'willpower', 'exhib', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse and continue your round (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			cla
+			'"Yea, no. How would your wife feel, if she knew another girl put those clothes on before her?" you ask him, and continue your round without saying another word.'
+			'The man doesn''t bother to object, and closes the door dejectedly. He knows you''re right.'
+			act 'Continue your round':gt 'postdeliveries', 'resume'	
+		end
+	else
+		act 'Refuse and continue your round (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
 	act 'Ask him what''s in the parcel':
 		cla
 		posteventQW1 = 1
@@ -190,12 +201,18 @@ if $ARGS[0] = '1':
 		''
 		'After a few seconds of palpable silence, he pleads: "Please? I just need to see how it fits. I really need this to go well... my marriage might depend on it! I''m begging you!"'
 		''
-		act 'Refuse':
-			cla
-			'"Sorry, but no. I really shouldn''t. I have to go!" you tell him.'
-			'The man''s shoulders sag a little, but he was expecting this response. What girl would agree to model lingerie for some random guy she just met?'			
-			act 'Continue your round':gt 'postdeliveries', 'resume'
-		end
+		gs 'willpower', 'exhib', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
+				cla
+				'"Sorry, but no. I really shouldn''t. I have to go!" you tell him.'
+				'The man''s shoulders sag a little, but he was expecting this response. What girl would agree to model lingerie for some random guy she just met?'			
+				act 'Continue your round':gt 'postdeliveries', 'resume'
+			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 'Say you would, but you have a job to do':
 			cla
 			posteventQW1 = 2
@@ -227,17 +244,23 @@ if $ARGS[0] = '2':
 		'"Well well, who is this hottie? Is she joining us?" Arsen asks his girlfriend. He seems quite into the idea.'
 		'"Maybe! What do you think? Want to have some fun with us?" the girl grins at you, while she puts her arm around Arsen''s waist. "Don''t worry about Maksim, he''s only here to take photos."'
 		''
-		act 'Refuse and ask him to sign':
-			cla
-			'"Uhh, no. I just need you to sign here please?" you ask him, handing him the clipboard.'
-			'Arsen signs where you want him to, looking at you with some regret. He says: "Are you sure? I bet Jenya could show you a trick or two! You two really seem to hit it off..."'
-			'His girlfriend nods eagerly and gives you a warm smile.'
-			'"I''m sure she could!" you laugh. "But I have a job to do."'
-			'Jenya kisses her boyfriend passionately, as you turn your back to them and head for the door. "Don''t worry, babe. I''ll take care of you!" she tells him. "Maksim, you ready?"'
-			'The last thing you see before you close the door is Jenya dropping to her knees before Arsen.'
+		gs 'willpower', 'sex', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse and ask him to sign (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
+				cla
+				'"Uhh, no. I just need you to sign here please?" you ask him, handing him the clipboard.'
+				'Arsen signs where you want him to, looking at you with some regret. He says: "Are you sure? I bet Jenya could show you a trick or two! You two really seem to hit it off..."'
+				'His girlfriend nods eagerly and gives you a warm smile.'
+				'"I''m sure she could!" you laugh. "But I have a job to do."'
+				'Jenya kisses her boyfriend passionately, as you turn your back to them and head for the door. "Don''t worry, babe. I''ll take care of you!" she tells him. "Maksim, you ready?"'
+				'The last thing you see before you close the door is Jenya dropping to her knees before Arsen.'
 
-			act 'Continue your round':gt 'postdeliveries', 'resume'
-		end
+				act 'Continue your round':gt 'postdeliveries', 'resume'
+			end
+		else
+			act 'Refuse and ask him to sign (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 		act 'Ask if they can wait until you finish your round':
 			cla
 			posteventQW2 = 2
@@ -287,29 +310,47 @@ if $ARGS[0] = '3':
 				'"Heh... I can''t wait. I have a feeling we''re going to be good friends," he grins, as he signs for his parcel. "See you then."'
 				act 'Continue your round':gt 'postdeliveries', 'resume'
 			end
-			act 'Say you probably won''t be coming':
+			gs 'willpower', 'prostitution', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Say you probably won''t be coming (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'resist'
+					cla
+					'"I don''t know... I don''t think I''ll be coming, sir. I just need you to sign here so I can be on my way," you tell him.'
+					'The man smirks at you, but signs where you ask him to and pulls the box out of your hands: "We''ll see. That''s what you girls all say, until you get sick of the crappily paid jobs you''re doing now and realize how much more comfortable your lives can be. Come find me, if you change your mind. And if you''re brave enough."'
+					'He winks at you, and then slams the door shut before you can say anything more.'
+					act 'Continue your round':gt 'postdeliveries', 'resume'
+				end
+			else
+				act 'Say you probably won''t be coming (<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', 'prostitution', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Tell him you''re not interested (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
 				cla
-				'"I don''t know... I don''t think I''ll be coming, sir. I just need you to sign here so I can be on my way," you tell him.'
-				'The man smirks at you, but signs where you ask him to and pulls the box out of your hands: "We''ll see. That''s what you girls all say, until you get sick of the crappily paid jobs you''re doing now and realize how much more comfortable your lives can be. Come find me, if you change your mind. And if you''re brave enough."'
-				'He winks at you, and then slams the door shut before you can say anything more.'
+				'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
+				'The man smirks, but signs where you ask him to: "Suit yourself."'
+				'He slams the door shut before you can even say anything more.'
 				act 'Continue your round':gt 'postdeliveries', 'resume'
 			end
-		end
-		act 'Tell him you''re not interested':
+		else
+			act 'Tell him you''re not interested (<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', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Just get his signature and leave (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
 			cla
-			'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
-			'The man smirks, but signs where you ask him to: "Suit yourself."'
+			'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
+			'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
 			'He slams the door shut before you can even say anything more.'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
-	end
-	act 'Just get his signature and leave':
-		cla
-		'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
-		'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
-		'He slams the door shut before you can even say anything more.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
-	end
+	else
+		act 'Just get his signature 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	
 end
 
 if $ARGS[0] = '4':
@@ -321,23 +362,34 @@ if $ARGS[0] = '4':
 	'Before you can say anything, he opens his robe and shows you his semi-erect cock: "If you know what''s good for you, I want to feel those hands of yours on my cock within the next ten seconds... just like your colleagues have before you. Unless you want the postmaster to receive complaints about you opening and damaging mail during your round?"'
 	'"But your mail is fine! That''s not fair!" you exclaim, to which the man replies: "Oh, really? Does this look fine to you!?"'
 	'He makes a big tear in the envelope, and balls his fist to crumple it. "Because it sure as hell doesn''t look fine to me!"'
-	if pcs_dom > 15:
-		act 'Say you don''t care if he reports you':
+	gs 'willpower', 'misc', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Say you don''t care if he reports you (<<will_cost>> Willpower)':
 			cla
+			gs 'willpower', 'misc', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
 			''
 			'"It was fine when I got here! Look... sign, don''t sign, I don''t care. The postmaster will believe my word over yours, when he hears about this!" you tell him, and you see the man''s confidence waver a little. You add: "If <b>you</b> know what''s good for you, you sign before this gets out of hand."'
 			'The man regains his posture quickly and scoffs: "We''ll see who he believes! I''m not signing shit, unless you do what I want. And I happen to know the postmaster. If there''s one thing he hates, it''s complaints... trust me. What''s it gonna be, girl?"'
 			'You take another good look at him, but you can''t tell whether the man is bluffing or not. From your dealings with the postmaster so far, you''re not quite sure who he''d believe either. Still, he always seemed like a reasonable man. Surely he''d believe you?'
 			''
 			act 'Back down and agree to jerk him off': gt 'postevents', '4'
-			act 'Stick to your guns and leave':
-				cla
-				posteventQW4 = 1
-				'Not saying another word, you turn around and leave his apartment. Hopefully you''re right about the postmaster believing you...'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
-			end
+			gs 'willpower', 'hj', 'resist', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Stick to your guns and leave (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'resist'
+					posteventQW4 = 1
+					'Not saying another word, you turn around and leave his apartment. Hopefully you''re right about the postmaster believing you...'
+					act 'Continue your round':gt 'postdeliveries', 'resume'
+				end
+			else
+				act 'Stick to your guns 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	
 		end
-	end
+	else
+		act 'Say you don''t care if he reports 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 'Beg him to not go through with it':
 		cla
 		*clr
@@ -346,22 +398,35 @@ if $ARGS[0] = '4':
 		'His cock is fully erect now, and some precum is leaking from the tip. The man must be getting off on bullying you!'
 		'"Don''t be afraid, girl! Go ahead and touch it, just like your colleagues have before you," he grins. "It would only take a minute, and then you can be on your way with your perfect record intact. Otherwise, I''ll just have to get you fired and hope the next girl does want to do what it takes to keep her job..."'
 		act 'Do as he says and jerk him off': gt 'postevents', '4'
-		act 'Refuse and run away':
+		gs 'willpower', 'hj', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Refuse and run away (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'pay', 'resist'
+				posteventQW4 = 1
+				'When he slowly comes closer to you, you decide to quickly leave his apartment and run away while you still can. Who knows what else he''d make you do!?'
+				'Once you''re a few houses away and look back, you realize there''s no way he can follow you the way he was dressed. You take a deep breath, and look at your clipboard to see where you have to go next. One signature will be missing from your list today, but surely the postmaster will understand?'
+				act 'Continue your round':gt 'postdeliveries', 'resume'
+			end
+		else
+			act 'Refuse and run away (<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', 'hj', 'resist', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Run away from him (<<will_cost>> Willpower)':
 			cla
+			gs 'willpower', 'hj', 'resist', 'easy'
+			gs 'willpower', 'pay', 'resist'
 			posteventQW4 = 1
-			'When he slowly comes closer to you, you decide to quickly leave his apartment and run away while you still can. Who knows what else he''d make you do!?'
-			'Once you''re a few houses away and look back, you realize there''s no way he can follow you the way he was dressed. You take a deep breath, and look at your clipboard to see where you have to go next. One signature will be missing from your list today, but surely the postmaster will understand?'
+			'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
+			'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
+			'You take a deep breath, and look at your clipboard to see where you have to go next while you try to put the last guy out of your head. One signature will be missing from your list today, but surely the postmaster will understand when you explain what happened?'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
-		end	
+		end
+	else
+		act 'Run away from 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 'Run away from him':
-		cla
-		posteventQW4 = 1
-		'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
-		'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
-		'You take a deep breath, and look at your clipboard to see where you have to go next while you try to put the last guy out of your head. One signature will be missing from your list today, but surely the postmaster will understand when you explain what happened?'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
-	end	
 end
 
 if $ARGS[0] = '5':
@@ -397,11 +462,21 @@ if $ARGS[0] = '5':
 			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
 	end
-	act 'Say you have no time':
-		cla
-		'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
-		'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+	if postamountrand = 0:
+		gs 'willpower', 'misc', 'resist'
+	else
+		gs 'willpower', 'misc', 'resist', 'easy'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Say you have no time (<<will_cost>> Willpower)':
+			cla
+			gs 'willpower', 'pay', 'resist'
+			'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
+			'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
+			act 'Continue your round':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'Say you have no time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -448,14 +523,24 @@ if $ARGS[0] = '6':
 		end
 		act 'Resume your round':gt 'postdeliveries', 'resume'
 	end
-	act 'No time for breaks, keep working!':
-		cla
-		gs 'pain', 3, 'feet', 'ache'
-		pcs_mood -= 5
-		gs 'stat'
-		'Even though you would like to sit down for a while, you decide it''s better to just deliver your mail first. You can relax when you''re done, right?'
-		'You ignore your aching feet and keep walking to your next address, and the one after that. You try to not let your feet slow you down, but the pain in your feet gets worse the longer you ignore it. You get used to it over time, but the constant nagging pain slowly wears down your mood a little while you continue your run.'
-		act 'Continue':gt 'postdeliveries', 'resume'
+	if postamountrand = 0:
+		gs 'willpower', 'misc', 'resist'
+	else
+		gs 'willpower', 'misc', 'resist', 'easy'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'No time for breaks, keep working! (<<will_cost>> Willpower)':
+			cla
+			gs 'willpower', 'pay', 'resist'
+			gs 'pain', 3, 'feet', 'ache'
+			pcs_mood -= 5
+			gs 'stat'
+			'Even though you would like to sit down for a while, you decide it''s better to just deliver your mail first. You can relax when you''re done, right?'
+			'You ignore your aching feet and keep walking to your next address, and the one after that. You try to not let your feet slow you down, but the pain in your feet gets worse the longer you ignore it. You get used to it over time, but the constant nagging pain slowly wears down your mood a little while you continue your run.'
+			act 'Continue':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'No time for breaks, keep working! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -867,11 +952,21 @@ if $ARGS[0] = '26':
 		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 <b>₽</b> and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
 		act 'Continue your round':gt 'postdeliveries', 'resume'
 	end
-	act 'Decline and say you''re in a hurry':
-		cla
-		'"Sorry kid, I have no time to deliver your note, very busy day today!" you shrug at him, and keep walking.'
-		'The boy''s shoulders sag, and he sadly looks at the note he has in his hand. How is he going to get it delivered to her, if even the postal service won''t help him?'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+	if postamountrand = 0:
+		gs 'willpower', 'misc', 'resist', 'hard'
+	else
+		gs 'willpower', 'misc', 'resist'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Decline and say you''re in a hurry (<<will_cost>> Willpower)':
+			cla
+			gs 'willpower', 'pay', 'resist'
+			'"Sorry kid, I have no time to deliver your note, very busy day today!" you shrug at him, and keep walking.'
+			'The boy''s shoulders sag, and he sadly looks at the note he has in his hand. How is he going to get it delivered to her, if even the postal service won''t help him?'
+			act 'Continue your round':gt 'postdeliveries', 'resume'
+		end
+	else
+		act 'Decline and say you''re in a hurry (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -965,43 +1060,49 @@ if $ARGS[0] = 'bandits':
 		'You can clearly feel his growing erection poking against the small of your back as he pulls your body tightly against his, not leaving any doubt as to what they want from you.'
 		'They begin to drag you towards a fenced building. Once they get you in there, you figure it''s going to be difficult to back out of what they have in mind...'
 		''
-		act 'Wrest yourself free and try to run away':
-			cla
-			'You replay in your head what the man said earlier: they only get to play with you if they catch you! So... it''s okay to run, right? All part of the game!'
-			'You quickly snag your bag away from them and try to run away from them.'
-			''
-!!running check
-			begminus = 0
-			if salo > 40: begminus = ((salo - 35)/5)
-			begresult = pcs_run - begminus
-			randrun = rand(1, 6)
-			if begresult >= 23 and randrun >= 3:
-				'"Hey, come back here!" the guy yells, but you running away clearly caught them by surprise.'
-				'You''re a good enough runner to outrun them, despite the bag you''re carrying.'
-				'Once you''re sure you''ve lost them, you stop to catch your breath. They probably gave up on chasing you.'
-				'You smile to yourself: "Nice try, idiots..."'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
-			elseif begresult >= 23 and randrun = 1:
-				'You manage to break free from them and start running, but the strap of your bag gets caught on a fence when you try to run away.'
-				'The guys are upon you moments later, grabbing onto you tightly to make sure you can''t try to run again.'
-				'"Nice try, bitch! You almost got away... almost, but not quite!" one of them pants, gasping for breath.'
-				'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
-				act 'Continue':gt 'postdeliveries', 'bandsex'
-			elseif begresult >= 23 and randrun = 2:
-				'You manage to break free from them and start running, but you almost immediately trip over a loose rock you failed to notice.'
-				'The guys are upon you moments later, and one of them places his knee between your shoulder blades as you scramble to try and get back on your feet.'
-				'"Nice try, bitch! Looks like you''re ours, though!" one of them grins, somewhat amused at how clumsily you tripped over that rock.'
-				'They hoist you up and drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
-				''
-				act 'Continue':gt 'postdeliveries', 'bandsex'
-			else
-				'"Where the fuck do you think you''re going!?" his friend yells when he notices you''re trying to yank the bag out of his hands. The guy who initially talked to you firmly grabs you by the arms, with a wide grin on his face. Uh oh!'
-				'"Hah! Nice try, but it''s too late to run now!" he laughs, somehow entertained by your failed attempt to get away.'
-				'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
+		gs 'willpower', 'skill', 'resist', 'run_lvl'
+		if will_cost <= pcs_willpwr:
+			act 'Wrest yourself free and try to run away (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'pay', 'resist'
+				'You replay in your head what the man said earlier: they only get to play with you if they catch you! So... it''s okay to run, right? All part of the game!'
+				'You quickly snag your bag away from them and try to run away from them.'
 				''
-				act 'Continue':gt 'postdeliveries', 'bandsex'
+	!!running check
+				begminus = 0
+				if salo > 40: begminus = ((salo - 35)/5)
+				begresult = pcs_run - begminus
+				randrun = rand(1, 6)
+				if begresult >= 23 and randrun >= 3:
+					'"Hey, come back here!" the guy yells, but you running away clearly caught them by surprise.'
+					'You''re a good enough runner to outrun them, despite the bag you''re carrying.'
+					'Once you''re sure you''ve lost them, you stop to catch your breath. They probably gave up on chasing you.'
+					'You smile to yourself: "Nice try, idiots..."'
+					act 'Continue your round':gt 'postdeliveries', 'resume'
+				elseif begresult >= 23 and randrun = 1:
+					'You manage to break free from them and start running, but the strap of your bag gets caught on a fence when you try to run away.'
+					'The guys are upon you moments later, grabbing onto you tightly to make sure you can''t try to run again.'
+					'"Nice try, bitch! You almost got away... almost, but not quite!" one of them pants, gasping for breath.'
+					'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
+					act 'Continue':gt 'postdeliveries', 'bandsex'
+				elseif begresult >= 23 and randrun = 2:
+					'You manage to break free from them and start running, but you almost immediately trip over a loose rock you failed to notice.'
+					'The guys are upon you moments later, and one of them places his knee between your shoulder blades as you scramble to try and get back on your feet.'
+					'"Nice try, bitch! Looks like you''re ours, though!" one of them grins, somewhat amused at how clumsily you tripped over that rock.'
+					'They hoist you up and drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
+					''
+					act 'Continue':gt 'postdeliveries', 'bandsex'
+				else
+					'"Where the fuck do you think you''re going!?" his friend yells when he notices you''re trying to yank the bag out of his hands. The guy who initially talked to you firmly grabs you by the arms, with a wide grin on his face. Uh oh!'
+					'"Hah! Nice try, but it''s too late to run now!" he laughs, somehow entertained by your failed attempt to get away.'
+					'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
+					''
+					act 'Continue':gt 'postdeliveries', 'bandsex'
+				end
 			end
-		end
+		else
+			act 'Wrest yourself free and try to run away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 		act 'Don''t bother trying to run':
 			cla
 			'They look like they''re pretty fast, and way too strong to fight off. You quietly resign to the fact that there''s no way you''re getting out of this, and meekly let them guide you to behind the building.'
@@ -1031,24 +1132,30 @@ if $ARGS[0] = 'bandsex':
 			'"I knew you would!" he grins, putting out his lighter but keeping it in his hand. He adds: "Go on, then... we don''t have all day!"'
 			'You quickly look around you to make sure no one else can see you, and pull your clothes aside. When you proceed to correct your clothes, the first guy slaps your hands away and says: "Not so fast! You''re done when we say you are."'
 			'After another ten seconds of awkward silence, the quiet one nods approvingly and says: "Very nice."'
-			gs 'arousal',5 ,'flash'
+			gs 'arousal', 5,'flash'
 			gs 'stat'
 			'While you quickly cover up, his friend smiles benevolently and offers you your bag: "See, what wasn''t so bad!"'
 			'You quickly take it out of his hands and leave, assuming they''re done with you. From the greedy looks in their eyes, you figure they will probably expect more from you if they catch you again.'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
-		act 'Say nothing':
-			cls
-			postburn = 1
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postburn.jpg"></center>'
-			'When you don''t speak up, he theatrically moves the envelopes into the flame. Within seconds, the contents of your bag are consumed by the flames.'
-			'"You could''ve easily prevented this! If only you weren''t such a prude..." he grins cruelly.'
-			'His friend mockingly pretends to be warming his hands over the smouldering remains of the letters and laughs: "Good luck finding a new job. Now get lost!"'
-			'When you pick up the empty bag and return to the street dejectedly, you realize he''s right. You''re going to get fired, for sure!'
-			act 'Return to the post office':gt 'postdeliveries', 'finishround'
-		end
+		gs 'willpower', 'exhib', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Say nothing (<<will_cost>> Willpower)':
+				cls
+				gs 'willpower', 'pay', 'resist'
+				postburn = 1
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postburn.jpg"></center>'
+				'When you don''t speak up, he theatrically moves the envelopes into the flame. Within seconds, the contents of your bag are consumed by the flames.'
+				'"You could''ve easily prevented this! If only you weren''t such a prude..." he grins cruelly.'
+				'His friend mockingly pretends to be warming his hands over the smouldering remains of the letters and laughs: "Good luck finding a new job. Now get lost!"'
+				'When you pick up the empty bag and return to the street dejectedly, you realize he''s right. You''re going to get fired, for sure!'
+				act 'Return to the post office':gt 'postdeliveries', 'finishround'
+			end
+		else
+			act 'Say nothing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 	elseif postbandQW = 2:
 		'You follow the two men to behind the building again, while one of them digs through your bag.'
 		'The first one claps his hands and grins: "Alright, girl. You know what we want."'
@@ -1150,55 +1257,60 @@ if $ARGS[0] = 'bandsex':
 				end
 			end
 		end
-		act 'Beg him to not make you do it':
-			cla
-			*clr
-			postbandQW = 5
-			posthj += 1
-			gs 'boyStat', 'A104'
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/posthj1.jpg"></center>'
-			'"Please, sir! You can''t make me do this! Please..." you beg him, interrupting his counting. "Anything but this..."'
-			'The man sighs deeply, and then says: "Well, you''re getting me off one way or the other!" After a few seconds of silence, he adds: "Fine. I guess you can use your hands, this time. You better make it good, though!"'
-			'Realizing that''s the best offer you''re going to get, you kneel down before him and begin to jerk him off.'
-			'"Spit on it, girl. Make it nice and slippery, and show some more enthusiasm!" he orders you, and you comply quickly. "Yeah, that''s it..."'
-			'After a few minutes he groans: "I''m gonna cum! Jerk me off over your tits!"'
-			'Seconds later, warm jets of his sperm splatter all over your tits. You feel a twinge of pride when you see how thoroughly satisfied the guy is. That wasn''t so bad!'
-			gs 'arousal', 'hj', 10, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
-			''
-			act 'Find some tissues to clean yourself up with':
-				cla
-				*clr
-				postbandQW = 6
-				postbj += 1
-				gs 'boyStat', 'A105'
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj2.jpg"></center>'
-				'"Why are you still here, girl?" the other guy laughs when he sees you loitering about the apartment naked, looking for tissues. "Are you looking for more cocks to suck?"'
-				'Before you can tell him no, he grabs you by the arm and forcefully drags you to another room of the apartment. He doesn''t bother undressing, but simply takes his cock out of his pants expecting you to do the rest.'
-				'"But I only gave your fri-" you try to tell him, but he''ll have none of your story and slaps you on the cheek. Not hard, but hard enough to derail your train of thought and demand your attention.'
-				'"Open your mouth, girl. I''m not asking again!" he threatens you in a menacing voice.'
-				'You realize he''s not going to let you walk away and sigh, before closing your lips around his shaft obediently. Maybe he''ll go easy on you?'
-				'Unfortunately, he does not. He makes you take the full length of his cock down your throat several times, testing your limits thoroughly. His cock is even bigger than his friend''s, and you have to open your mouth as far as you can to allow him access.'
-				'After a few minutes of uncomfortable throat fucking he finally shoots his load down your throat, and grins at you: "You''re even better than the last Postslut! I''m already looking forward to next week..."'
-				gs 'arousal', 'bj', 10, 'sub'
+		gs 'willpower', 'bj', 'resist', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Beg him to not make you do it (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				postbandQW = 5
+				posthj += 1
+				gs 'boyStat', 'A104'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/posthj1.jpg"></center>'
+				'"Please, sir! You can''t make me do this! Please..." you beg him, interrupting his counting. "Anything but this..."'
+				'The man sighs deeply, and then says: "Well, you''re getting me off one way or the other!" After a few seconds of silence, he adds: "Fine. I guess you can use your hands, this time. You better make it good, though!"'
+				'Realizing that''s the best offer you''re going to get, you kneel down before him and begin to jerk him off.'
+				'"Spit on it, girl. Make it nice and slippery, and show some more enthusiasm!" he orders you, and you comply quickly. "Yeah, that''s it..."'
+				'After a few minutes he groans: "I''m gonna cum! Jerk me off over your tits!"'
+				'Seconds later, warm jets of his sperm splatter all over your tits. You feel a twinge of pride when you see how thoroughly satisfied the guy is. That wasn''t so bad!'
+				gs 'arousal', 'hj', 10, 'sub'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
 				gs 'stat'
-				'While you get dressed again, you overhear the two guys talking. One voice says: "Wha- she did what!? She refused to blow me, and only gave me a handjob! That bitch... is she still here?"'
-				act 'Leave quickly':
+				''
+				act 'Find some tissues to clean yourself up with':
 					cla
-					'You quickly find your bag and leave the apartment, before they come find you again. There''s no way either of them will settle for a handjob now, if they catch you again...'
+					*clr
+					postbandQW = 6
+					postbj += 1
+					gs 'boyStat', 'A105'
+					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postbj2.jpg"></center>'
+					'"Why are you still here, girl?" the other guy laughs when he sees you loitering about the apartment naked, looking for tissues. "Are you looking for more cocks to suck?"'
+					'Before you can tell him no, he grabs you by the arm and forcefully drags you to another room of the apartment. He doesn''t bother undressing, but simply takes his cock out of his pants expecting you to do the rest.'
+					'"But I only gave your fri-" you try to tell him, but he''ll have none of your story and slaps you on the cheek. Not hard, but hard enough to derail your train of thought and demand your attention.'
+					'"Open your mouth, girl. I''m not asking again!" he threatens you in a menacing voice.'
+					'You realize he''s not going to let you walk away and sigh, before closing your lips around his shaft obediently. Maybe he''ll go easy on you?'
+					'Unfortunately, he does not. He makes you take the full length of his cock down your throat several times, testing your limits thoroughly. His cock is even bigger than his friend''s, and you have to open your mouth as far as you can to allow him access.'
+					'After a few minutes of uncomfortable throat fucking he finally shoots his load down your throat, and grins at you: "You''re even better than the last Postslut! I''m already looking forward to next week..."'
+					gs 'arousal', 'bj', 10, 'sub'
+					gs 'arousal', 'end'
+					gs 'cum_call', 'mouth', $boy
+					gs 'stat'
+					'While you get dressed again, you overhear the two guys talking. One voice says: "Wha- she did what!? She refused to blow me, and only gave me a handjob! That bitch... is she still here?"'
+					act 'Leave quickly':
+						cla
+						'You quickly find your bag and leave the apartment, before they come find you again. There''s no way either of them will settle for a handjob now, if they catch you again...'
+						act 'Continue your round':gt 'postdeliveries', 'resume'
+					end
+				end
+				act 'Put your clothes back on and leave':
+					cla
+					'You quickly put your clothes back on, ignoring the man''s cum on your body. The other guy might come looking for you too!'
+					'You quickly pull your bag out of his hand when you leave the apartment, and walk away to finish your round.'
 					act 'Continue your round':gt 'postdeliveries', 'resume'
 				end
 			end
-			act 'Put your clothes back on and leave':
-				cla
-				'You quickly put your clothes back on, ignoring the man''s cum on your body. The other guy might come looking for you too!'
-				'You quickly pull your bag out of his hand when you leave the apartment, and walk away to finish your round.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
-			end
-		end
+		else
+			act 'Beg him to not make you do it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 	elseif postbandQW = 5:
 		cla
 		*clr

+ 208 - 165
locations/postevents.qsrc

@@ -20,57 +20,75 @@ if $ARGS[0] = '1':
 		'The man''s eyes light up the moment you enter the room.'
 		'"That''s great! Fantastic! She''s going to look so hot..." the man murmurs.'
 		''
-		act 'Flirt with him':
-			cla
-			'"What about me?" you ask him sweetly. When he looks at you askingly, you ask again: "What about me? Do you think I look hot in it?"'
-			'"I uhh..." the man mumbles.'
-			'"It''s okay! Your wife isn''t here, right? It''s just you and me! You can say whatever you want!" you wink at him.'
-			'The man is still speechless, but the bulge in his pants tell you everything you need to know. Nevertheless, you want to hear him say it.'
-			'"Well?" you ask him sharply.'
-			'"You look... very sexy," the man confesses. He''s actually fairly attractive, despite his age.'
-			''
-			act 'Press on and seduce him':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postevent1-3.jpg"></center>'
-				'"It''d be so easy for you to just throw me down on that bed and fuck me..." you say huskily, whisking the gown to the side to show him your snatch. "See? Easy access, I wouldn''t even have to take it off!"'
-				'The man knows he shouldn''t be looking at you, but at the same time can''t look away. Still, he makes no move and mutters: "Please, I''m a married man!"'
-				'"And? Married men still have needs! Don''t you want to fuck me?" you whisper into his ear, while you rub your hand over his groin. "Maybe I''ll do the things your wife won''t, if you ask me nicely..."'
-				'You seem to have struck a nerve there! He looks you in the eye to be sure you''re not joking, and then sighs: "Needs? Things my wife won''t do? "That would be just about everything. She''s never ever given me a blowjob, she thinks it''s degrading and disgusting!"'
-				'You slip out of the gown and stand naked before him, and smile sweetly: "Well, I don''t. Forget about your wife for a while, and focus on me. Your wife is not here, I am. If there was one thing you could ask of me... anything at all! What would it be?"'
-				'The man ponders for a second, and then looks at you as if he''s too embarrassed to say it. Then he says: "The blowjob. Definitely the blowjob. I haven''t had one in forever!"'
+		gs 'willpower', 'exhib', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Flirt with him (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'pay', 'self'
+				'"What about me?" you ask him sweetly. When he looks at you askingly, you ask again: "What about me? Do you think I look hot in it?"'
+				'"I uhh..." the man mumbles.'
+				'"It''s okay! Your wife isn''t here, right? It''s just you and me! You can say whatever you want!" you wink at him.'
+				'The man is still speechless, but the bulge in his pants tell you everything you need to know. Nevertheless, you want to hear him say it.'
+				'"Well?" you ask him sharply.'
+				'"You look... very sexy," the man confesses. He''s actually fairly attractive, despite his age.'
 				''
-				act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
-				act 'Don''t do it, but tell him he deserves better':
+				gs 'willpower', 'misc', 'force', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Press on and seduce him (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'force'
+						minut += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postevent1-3.jpg"></center>'
+						'"It''d be so easy for you to just throw me down on that bed and fuck me..." you say huskily, whisking the gown to the side to show him your snatch. "See? Easy access, I wouldn''t even have to take it off!"'
+						'The man knows he shouldn''t be looking at you, but at the same time can''t look away. Still, he makes no move and mutters: "Please, I''m a married man!"'
+						'"And? Married men still have needs! Don''t you want to fuck me?" you whisper into his ear, while you rub your hand over his groin. "Maybe I''ll do the things your wife won''t, if you ask me nicely..."'
+						'You seem to have struck a nerve there! He looks you in the eye to be sure you''re not joking, and then sighs: "Needs? Things my wife won''t do? "That would be just about everything. She''s never ever given me a blowjob, she thinks it''s degrading and disgusting!"'
+						'You slip out of the gown and stand naked before him, and smile sweetly: "Well, I don''t. Forget about your wife for a while, and focus on me. Your wife is not here, I am. If there was one thing you could ask of me... anything at all! What would it be?"'
+						'The man ponders for a second, and then looks at you as if he''s too embarrassed to say it. Then he says: "The blowjob. Definitely the blowjob. I haven''t had one in forever!"'
+						''
+						act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
+						gs 'willpower', 'bj', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'Don''t do it, but tell him he deserves better (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								minut += 5
+								gs 'stat'
+								postmarriedQW = 1
+								'"You know what... no. Ask your wife one last time," you tell him. "Just be straight with her and tell her what you want, like you told me. If she cares for you, she''ll do it."'
+								'The man looks at you a bit confused for a second, but nods. In a way he actually looks relieved... he was about to cheat on his wife with you, but you stopped him!'
+								'"And if she keeps saying no, it''s her own fault if you find someone else who''s more willing. Someone like me. Right?" you smile at him. You''re still completely naked, and the man''s eyes explore your body once more.'
+								'"Right..." the man says doubtfully. You can tell that he''s very conflicted. He wants you, but he wants to remain faithful to his wife as well.'
+								'"You deserve someone who takes care of you! I mean it! You''re a great guy!" you tell him, to give him some confidence. "Let''s make a deal. Ask your wife tonight. If she says no, I will do it next time I deliver mail here. Okay?"'
+								'"I guess that sounds fair?" he says, still a bit confused.'
+								'You give him a soft kiss on the cheek and say: "Good luck tonight!"'
+								'Before he can reply, you go to the bathroom and change back into your regular clothes.'
+								act 'Leave his apartment': gt 'pavResidential'
+							end
+						else
+							act 'Don''t do it, but tell him he deserves better (<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
+					act 'Press on and seduce 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 'Ease up and ask if that was all':
 					*clr & cla
 					minut += 5
+					money += 300
 					gs 'stat'
-					postmarriedQW = 1
-					'"You know what... no. Ask your wife one last time," you tell him. "Just be straight with her and tell her what you want, like you told me. If she cares for you, she''ll do it."'
-					'The man looks at you a bit confused for a second, but nods. In a way he actually looks relieved... he was about to cheat on his wife with you, but you stopped him!'
-					'"And if she keeps saying no, it''s her own fault if you find someone else who''s more willing. Someone like me. Right?" you smile at him. You''re still completely naked, and the man''s eyes explore your body once more.'
-					'"Right..." the man says doubtfully. You can tell that he''s very conflicted. He wants you, but he wants to remain faithful to his wife as well.'
-					'"You deserve someone who takes care of you! I mean it! You''re a great guy!" you tell him, to give him some confidence. "Let''s make a deal. Ask your wife tonight. If she says no, I will do it next time I deliver mail here. Okay?"'
-					'"I guess that sounds fair?" he says, still a bit confused.'
-					'You give him a soft kiss on the cheek and say: "Good luck tonight!"'
-					'Before he can reply, you go to the bathroom and change back into your regular clothes.'
-					act 'Leave his apartment': gt 'pavResidential'
+					'"Anyway... that''s all you needed from me, right?" you ask him with a wink, after he''s been staring at your outfit for a while.'
+					'The man snaps out of his daydream and instantly feels guilty for lusting over you. He mutters: "Erm, yes! Thank you! That was exactly what I needed to see, it looks great..."'
+					'"Great on me, you mean?" you laugh at him, nodding at the tenting erection in his pants. The man nods embarrassedly and leaves so you can change.'
+					'You put your regular clothes back on and go find him outside, who clearly looks relieved.'
+					'He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask, but you really helped me out today. Please take this for your time."'
+					act 'Take the money and leave': gt 'pavResidential'		
 				end
 			end
-			act 'Ease up and ask if that was all':
-				*clr & cla
-				minut += 5
-				money += 300
-				gs 'stat'
-				'"Anyway... that''s all you needed from me, right?" you ask him with a wink, after he''s been staring at your outfit for a while.'
-				'The man snaps out of his daydream and instantly feels guilty for lusting over you. He mutters: "Erm, yes! Thank you! That was exactly what I needed to see, it looks great..."'
-				'"Great on me, you mean?" you laugh at him, nodding at the tenting erection in his pants. The man nods embarrassedly and leaves so you can change.'
-				'You put your regular clothes back on and go find him outside, who clearly looks relieved.'
-				'He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask, but you really helped me out today. Please take this for your time."'
-				act 'Take the money and leave': gt 'pavResidential'		
-			end
-		end
+		else
+			act 'Flirt 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 'Ask if that was all':
 			*clr & cla
 			minut += 5
@@ -188,16 +206,22 @@ if $ARGS[0] = '2':
 
 				act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
 			end
-			act 'Say you don''t want to do this and leave':
-				cla
-				'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
-				'Jenya looks disappointed, but doesn''t try to stop you. She smiles: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cock for me!"'
-				'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are semi-erect and bob up and down with every step.'
-				'"You''re leaving?" he asks you in disbelief. "We waited over an hour for this!?"'
-				'Maksim also seems upset: "I already promised the subscribers a threesome!"'
-				'"Relax, baby! It''s okay. Come here, I''ll take care of the both of you! That''s still a threesome, right?" she says, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. You hear loud slurping sounds coming from the bedroom while you get dressed again in the living room. Jenya truly seems to enjoy what she does...'
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'resist'
+					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
+					'Jenya looks disappointed, but doesn''t try to stop you. She smiles: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cock for me!"'
+					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are semi-erect and bob up and down with every step.'
+					'"You''re leaving?" he asks you in disbelief. "We waited over an hour for this!?"'
+					'Maksim also seems upset: "I already promised the subscribers a threesome!"'
+					'"Relax, baby! It''s okay. Come here, I''ll take care of the both of you! That''s still a threesome, right?" she says, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. You hear loud slurping sounds coming from the bedroom while you get dressed again in the living room. Jenya truly seems to enjoy what she does...'
 
-				act 'Leave the apartment': gt 'pavResidential'
+					act 'Leave the apartment': gt 'pavResidential'
+				end
+			else
+				act 'Say you don''t want to do this 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
 		end
 		act 'Tell her you only want to be with her':
@@ -228,17 +252,23 @@ if $ARGS[0] = '2':
 				'"That''s it. Get that cock nice and hard," Arsen orders you.'
 
 				act 'Continue': gt 'postevents', '2-2'
-			end				
-			act 'Say you don''t want to do this and leave':
-				cla
-				'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
-				'The girl looks disappointed, but doesn''t try to stop you. She says: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cocks for me!"'
-				'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are fully erect and bob up and down with every step they take.'
-				'"You''re leaving?" he mutters in disbelief. "We waited over an hour for this!?"'
-				'Maksim also seems upset: "I already promised the subscribers a threesome! This sucks..."'
-				'"Relax, baby! I''m sorry, she changed her mind. Come here, I''ll take care of the both of you! That''s still a threesome, right Maksim?" she smiles, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. The guys completely forget about you, and you walk out of the room quietly.'
+			end
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Say you don''t want to do this and leave (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'resist'
+					'"I''m sorry, but I really can''t do this," you tell her, and push her off you.'
+					'The girl looks disappointed, but doesn''t try to stop you. She says: "That''s a shame. Arsen would''ve loved to have a cutie like you. Oh well, more cocks for me!"'
+					'You''re gathering your clothes when Arsen and Maksim enter the room. Both their cocks are fully erect and bob up and down with every step they take.'
+					'"You''re leaving?" he mutters in disbelief. "We waited over an hour for this!?"'
+					'Maksim also seems upset: "I already promised the subscribers a threesome! This sucks..."'
+					'"Relax, baby! I''m sorry, she changed her mind. Come here, I''ll take care of the both of you! That''s still a threesome, right Maksim?" she smiles, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. The guys completely forget about you, and you walk out of the room quietly.'
 
-				act 'Get dressed and leave': gt 'pavResidential'
+					act 'Get dressed and leave': gt 'pavResidential'
+				end
+			else
+				act 'Say you don''t want to do this 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
 		end
 	end
@@ -280,8 +310,7 @@ if $ARGS[0] = '2-1':
 				'The next thing you remember is being on your knees next to the bed, getting fucked from behind by Arsen. Jenya eagerly grinds her crotch against your face, guiding your mouth to where she wants it.'
 				'Maksim taking photos of you getting fucked didn''t even cross your mind any more, and you moan eagerly while Arsen drills his cock inside you over and over.'
 				gs 'arousal', 'vaginal', 10, 'sub'
-				gs 'arousal', 'cuni_give', 10, 'sub'
-				minut -= 10
+				gs 'arousal', 'cuni_give', -10, 'sub'
 				gs 'stat'
 				'"Remember, don''t cum inside her!" Jenya reminds Arsen. "If you''re cumming inside anyone, it should be me..."'
 				act 'Continue':
@@ -338,7 +367,7 @@ if $ARGS[0] = '2-2':
 	'Remembering your deal with her, you part your lips obediently and close them again around his shaft, licking his precum off the head. It tastes a bit salty, but not necessarily unpleasant.'
 	'Arsen repositions a little so he can get more of his length into your mouth, while Jenya gets between your legs and begins to lick your pussy lips. Wow, she''s good at this...'
 	gs 'arousal', 'bj', 5
-	gs 'arousal', 'cuni', 5
+	gs 'arousal', 'cuni', -5
 	gs 'stat'
 	act 'Continue':
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-13.jpg"></center>'
@@ -349,84 +378,86 @@ if $ARGS[0] = '2-2':
 		'After a few minutes, Arsen slows down a little and collapses down on the bed, gasping for breath. His erection, glistening with Jenya''s juices, is pointing straight up in the air.'
 		'Jenya takes a moment to catch her breath as well, and wipes the sweat from her forehead. "What do you think, sweetie? Do you want to take it for a ride?" she asks between breaths. She looks fairly tired from the fucking Arsen just gave her.'
 		gs 'arousal', 'mast', 5
-		gs 'arousal', 'kiss', 5
-		minut -= 5
+		gs 'arousal', 'kiss', -5
 		gs 'stat'
-		act 'Decline and let her do it':
-			cla
-			*clr
-			minut += 5
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-14.jpg"></center>'
-			'You discretely shake your head at her, remembering her about your deal.'
-			'Jenya bites her lower lip in disappointment, but then smiles at Arsen as she straddles him. "You''re not done yet, babe!" she tells him in a sing-song voice while she slowly lets his cock sink into her again.'
-			'She silently mouths the words "You owe me!" to you while she begins to ride Arsen. From the ecstatic look on her face a few seconds later, she really doesn''t seem to mind all that much!'
-			'Jenya''s high-pitched squeals fill the room while she rides Arsen enthusiastically, despite her fatigue. Realizing you have to do at least something, you gently fondle Arsen''s balls.'
-			'Suddenly he realizes you''re still here, and his hand finds its way between your legs. He slips several fingers inside your sopping pussy and begins to finger you.'
-			'Arsen is very interested in you and keeps trying to get close to you, but Jenya is always one step ahead of him and offers herself so you don''t have to.'
-			'Eventually his breathing grows short and more ragged, and you realize he must be close to orgasming. Jenya smiles tiredly at you and says: "Go ahead, cutie. Finish him off with your mouth!"'
-			gs 'arousal', 'vaginal_finger', 5
-			gs 'arousal', 'foreplay_give', 5
-			minut -= 5
-			gs 'stat'
-			act 'Give Arsen a blowjob':
-				cla
-				*clr
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-15.jpg"></center>'
-				'Jenya has done so much already, you can''t say no to this too. You nod and get on your knees before Arsen, gently running your tongue across his shaft. You can taste Jenya''s juices on it very clearly. The taste is intoxicating! Hopefully she''s not too tired for some alone time with you later...'
-				'Meanwhile Jenya beckons the photographer to come closer and grins: "I know I shouldn''t, but you look like you could use some relief too, Maksim!"'
-				'The photographer''s cock had been hard throughout the shoot, and Jenya takes most of his length in her mouth immediately before he can even say no. You focus on giving Arsen a good blowjob, while you hear Maksim groan behind you. Jenya already got him off!'
-				gs 'arousal', 'bj', 5
-				gs 'arousal', 'end'
-				gs 'stat'				
-				act 'Let Arsen cum in your mouth':
-					*clr & cla
+		gs 'willpower', 'sex', 'resist', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Decline and let her do it (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-14.jpg"></center>'
+				'You discretely shake your head at her, remembering her about your deal.'
+				'Jenya bites her lower lip in disappointment, but then smiles at Arsen as she straddles him. "You''re not done yet, babe!" she tells him in a sing-song voice while she slowly lets his cock sink into her again.'
+				'She silently mouths the words "You owe me!" to you while she begins to ride Arsen. From the ecstatic look on her face a few seconds later, she really doesn''t seem to mind all that much!'
+				'Jenya''s high-pitched squeals fill the room while she rides Arsen enthusiastically, despite her fatigue. Realizing you have to do at least something, you gently fondle Arsen''s balls.'
+				'Suddenly he realizes you''re still here, and his hand finds its way between your legs. He slips several fingers inside your sopping pussy and begins to finger you.'
+				'Arsen is very interested in you and keeps trying to get close to you, but Jenya is always one step ahead of him and offers herself so you don''t have to.'
+				'Eventually his breathing grows short and more ragged, and you realize he must be close to orgasming. Jenya smiles tiredly at you and says: "Go ahead, cutie. Finish him off with your mouth!"'
+				gs 'arousal', 'vaginal_finger', 5
+				gs 'arousal', 'foreplay_give', 5
+				gs 'stat'
+				act 'Give Arsen a blowjob':
+					cla
+					*clr
 					minut += 5
-					gs 'cum_call', 'mouth', $boy
-					gs 'boyStat', 'A164'
-					gs 'cum_call', 'mouth', $boy
-!!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
-					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
-					'"I''m going to cum!" Arsen groans, and you feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
-					'When Arsen pulls back, she grins proudly at you and locks her lips onto yours. Suddenly your mouth is even more filled with sperm! Jenya kept Maksim''s load in her mouth when he came, and just fed it to you...'
-					'After a passionate kiss, she orders you: "Show their cum to the camera and swallow it, cutie! Enjoy your tasty treat..."'
-					'You obediently open your mouth, and Maksim takes several more photos of you. "Oh man! This next update is going to be spectacular... I don''t know where you found her, but wow!" he grins at Arsen.'
-					'Then you swallow the sperm, and Maksim takes several more photos of your empty mouth. When he has the shots he wants, him and Arsen leave for the living room. You relax on the bed for a moment with Jenya.'
-					'"I''m exhausted!" Jenya says tiredly. "I''m going to take a nap. You can stay if you want? We can nap together?"'
-					act 'Stay and nap with Jenya':
+					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-15.jpg"></center>'
+					'Jenya has done so much already, you can''t say no to this too. You nod and get on your knees before Arsen, gently running your tongue across his shaft. You can taste Jenya''s juices on it very clearly. The taste is intoxicating! Hopefully she''s not too tired for some alone time with you later...'
+					'Meanwhile Jenya beckons the photographer to come closer and grins: "I know I shouldn''t, but you look like you could use some relief too, Maksim!"'
+					'The photographer''s cock had been hard throughout the shoot, and Jenya takes most of his length in her mouth immediately before he can even say no. You focus on giving Arsen a good blowjob, while you hear Maksim groan behind you. Jenya already got him off!'
+					gs 'arousal', 'bj', 5
+					gs 'arousal', 'end'
+					gs 'stat'				
+					act 'Let Arsen cum in your mouth':
 						*clr & cla
-						minut += 65
-						pcs_sleep += 15
-						pcs_health += 60
-						gs 'stat'
-!!!!energy gain, equivalent of an hour of napping
-						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-17.jpg"></center>'
-						'A nap doesn''t sound so bad! "Now that you mention it, I could use a nap..." you tell her, and get comfortable in the bed.'
-						'Jenya embraces you and you both fall asleep. An hour later she wakes up again and begins to rub her body against yours. Her soft kisses on your neck give you goosebumps all over your body.'
-						'"Sorry cutie, but we have plans for tonight!" she whispers with some regret in her voice. "Maybe we''ll see you again?"'
-						'"Maybe. I deliver mail every week!" you smile while you get out of bed and put your clothes back on. Jenya doesn''t bother to put any on, herself.'
-						'When the two of you walk to the living room, Arsen and Maksim are taking turns smoking the water pipe.'
-						'"All done, boys?" she grins. "Look, Maksim is done with the upload. Let''s see how we did!"'
-						'You see a foreign porn website on the computer screen. A picture of your sperm-filled mouth is very prominent on it. The image set has already been downloaded several hundred times!'
-						'"You''re going to be a big hit in Germany!" Maksim winks. "Nah, just kidding. It''s a German amateur website, don''t worry. No one in Russia will find it, your secret is safe!"'
-						'Before you can say anything more, Jenya grabs you by the arm and pulls you to the door. "So... maybe we''ll see you soon, ''porn star''!" she grins, pushing you out of the apartment before giving you one last kiss before closing the door behind you.'
-						'Well, that just happened...'
-						act 'Return to the streets': gt 'pavResidential'
-					end
-					act 'Tell her you can''t stay':
-						cla
 						minut += 5
-						''
-						'"Sorry, I can''t stay," you tell her, shaking your head.'
-						'Jenya pouts a bit but nods understandingly. She gets up to give you one last kiss and says: "You were so much fun! I loved having you around... Maybe I''ll see you again?"'
-						'"Maybe. I deliver mail every week!" you smile while you put your clothes back on.'
-						'When you walk through the living room on your way out, you see Maksim and Arsen sitting at a desk in front of a computer screen again. They browse back and forth between images of your sperm-filled mouth, trying to decide on which is the best one. You probably don''t want to know what they''re going to do with those...'
-						'You decide not to disturb them, and leave the apartment.'
-						act 'Return to the streets': gt 'pavResidential'
+						gs 'cum_call', 'mouth', $boy
+						gs 'boyStat', 'A164'
+						gs 'cum_call', 'mouth', $boy
+	!!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
+						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
+						'"I''m going to cum!" Arsen groans, and you feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
+						'When Arsen pulls back, she grins proudly at you and locks her lips onto yours. Suddenly your mouth is even more filled with sperm! Jenya kept Maksim''s load in her mouth when he came, and just fed it to you...'
+						'After a passionate kiss, she orders you: "Show their cum to the camera and swallow it, cutie! Enjoy your tasty treat..."'
+						'You obediently open your mouth, and Maksim takes several more photos of you. "Oh man! This next update is going to be spectacular... I don''t know where you found her, but wow!" he grins at Arsen.'
+						'Then you swallow the sperm, and Maksim takes several more photos of your empty mouth. When he has the shots he wants, him and Arsen leave for the living room. You relax on the bed for a moment with Jenya.'
+						'"I''m exhausted!" Jenya says tiredly. "I''m going to take a nap. You can stay if you want? We can nap together?"'
+						act 'Stay and nap with Jenya':
+							*clr & cla
+							minut += 65
+							pcs_sleep += 15
+							pcs_health += 60
+							gs 'stat'
+	!!!!energy gain, equivalent of an hour of napping
+							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-17.jpg"></center>'
+							'A nap doesn''t sound so bad! "Now that you mention it, I could use a nap..." you tell her, and get comfortable in the bed.'
+							'Jenya embraces you and you both fall asleep. An hour later she wakes up again and begins to rub her body against yours. Her soft kisses on your neck give you goosebumps all over your body.'
+							'"Sorry cutie, but we have plans for tonight!" she whispers with some regret in her voice. "Maybe we''ll see you again?"'
+							'"Maybe. I deliver mail every week!" you smile while you get out of bed and put your clothes back on. Jenya doesn''t bother to put any on, herself.'
+							'When the two of you walk to the living room, Arsen and Maksim are taking turns smoking the water pipe.'
+							'"All done, boys?" she grins. "Look, Maksim is done with the upload. Let''s see how we did!"'
+							'You see a foreign porn website on the computer screen. A picture of your sperm-filled mouth is very prominent on it. The image set has already been downloaded several hundred times!'
+							'"You''re going to be a big hit in Germany!" Maksim winks. "Nah, just kidding. It''s a German amateur website, don''t worry. No one in Russia will find it, your secret is safe!"'
+							'Before you can say anything more, Jenya grabs you by the arm and pulls you to the door. "So... maybe we''ll see you soon, ''porn star''!" she grins, pushing you out of the apartment before giving you one last kiss before closing the door behind you.'
+							'Well, that just happened...'
+							act 'Return to the streets': gt 'pavResidential'
+						end
+						act 'Tell her you can''t stay':
+							cla
+							minut += 5
+							''
+							'"Sorry, I can''t stay," you tell her, shaking your head.'
+							'Jenya pouts a bit but nods understandingly. She gets up to give you one last kiss and says: "You were so much fun! I loved having you around... Maybe I''ll see you again?"'
+							'"Maybe. I deliver mail every week!" you smile while you put your clothes back on.'
+							'When you walk through the living room on your way out, you see Maksim and Arsen sitting at a desk in front of a computer screen again. They browse back and forth between images of your sperm-filled mouth, trying to decide on which is the best one. You probably don''t want to know what they''re going to do with those...'
+							'You decide not to disturb them, and leave the apartment.'
+							act 'Return to the streets': gt 'pavResidential'
+						end
 					end
 				end
 			end
-		end
+		else
+			act 'Decline and let her do it (<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 to ride Arsen':
 			*clr & cla
 			minut += 5
@@ -449,8 +480,7 @@ if $ARGS[0] = '2-2':
 				'"Remember, don''t cum inside her!" Jenya reminds him. "If you''re cumming inside anyone, it should be me..."'
 				'Eventually his breathing grows short and more ragged, and you realize he must be close to orgasming. Jenya smiles at you and says: "Go ahead, cutie. Finish him off with your mouth!"'
 				gs 'arousal', 'vaginal', 15, 'sub'
-				gs 'arousal', 'cuni_give', 15, 'sub'
-				minut -= 15
+				gs 'arousal', 'cuni_give', -15, 'sub'
 				gs 'stat'
 				act 'Let Arsen cum in your mouth':
 					*clr & cla
@@ -514,7 +544,7 @@ if $ARGS[0] = '3':
 	'He takes you by the arm and guides you to his bedroom, where he strips and lies down on the bed. "Strip and join me," he orders you. "Play with my cock while we talk."'
 	'You nod and take your clothes off, before you sit down on the bed and wrap your fingers around his shaft.'
 	'"So, girl... tell me. Who are you, and why are you here holding the cock of a man you''ve just met?" the man asks sharply, letting out a satisfied groan when you begin to move your hand slowly. His cock is definitely not small, that''s for sure!'
-	gs 'arousal', 'hj', 5
+	gs 'arousal', 'hj', 5, 'prostitution'
 	gs 'stat'
 	'"Uhhh, I''m <<$pcs_firstname>>," you say. "And I''m here because..."'
 	
@@ -534,7 +564,7 @@ if $ARGS[0] = '3':
 		
 		act 'Please him with your mouth': gt 'postevents', '3-1'
 	end	
-	if sub > 20:
+	!if sub > 20:
 		act '"I like being told what to do."':
 			cla
 			postcuffs = 1
@@ -544,7 +574,7 @@ if $ARGS[0] = '3':
 
 			act 'Please him with your mouth': gt 'postevents', '3-1'
 		end
-	end	
+	!end	
 end
 
 if $ARGS[0] = '3-1':
@@ -559,7 +589,7 @@ if $ARGS[0] = '3-1':
 !!!!you swallow his load
 		'You''ve sucked cock many times before, and pull out every trick you know to best please him. He seems thoroughly impressed with your performance. Despite the thick head you manage to take his cock all the way down your throat too, which impresses him even more!'
 		'Finally, he grabs a firm hold of your head to keep it in place. Several splurts of his sperm land on your tongue, after which he finally lets you go.'
-		gs 'arousal', 'bj', 15, 'deepthroat'
+		gs 'arousal', 'bj', 15, 'deepthroat', 'prostitution'
 		gs 'cum_call', 'mouth', $boy
 		gs 'stat'
 		'"That was amazing!" he grins. "Even better than the last girl I had, and that was after months of training! You''re definitely paying me a visit more often..."'
@@ -570,7 +600,7 @@ if $ARGS[0] = '3-1':
 		'You have some experience giving blowjobs, but it''s difficult to do without being able to use your hands!'
 		'You do the best you can, but struggle when he tries to push more of his length down your throat. The thick head makes it very difficult.'
 		'"Time''s up!" he grunts, and he grabs a firm hold of your head. He begins to fuck your mouth, roaring as he shoots his cum directly down your throat.'
-		gs 'arousal', 'bj', 15, 'sub'
+		gs 'arousal', 'bj', 15, 'sub', 'prostitution'
 		gs 'cum_call', 'mouth', $boy
 		gs 'stat'
 		'"That... was decent," he says. "I''ve had better, but we can make a good cocksucker out of you yet."'
@@ -591,27 +621,33 @@ if $ARGS[0] = '3-1':
 			'You let the man put the ring into your mouth, and wait obediently while he fastens it behind your head.'
 			'When he guides his erection back towards your wide open mouth, you realize how little control you have now. You cough and splutter several times when he shoves his cock inside your mouth further than you can handle. He usually backs off just enough to give you a moment to recover, and then continues to fuck your unexperienced throat.'
 			'You''ve come so far, though... you''re not stopping now! You make the most of it and feel relieved when you feel the man''s cum splurting down your throat a few minutes later.'
-			gs 'arousal', 'bj', 15, 'sub', 'bound'
+			gs 'arousal', 'bj', 15, 'sub', 'bound', 'prostitution'
 			gs 'cum_call', 'mouth', $boy
 			gs 'stat'
 			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
 
 			act 'Continue': gt 'postevents', '3-2'
 		end
-		act 'Beg him to let you try again':
-			*clr & cla
+		gs 'willpower', 'humiliation', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Beg him to let you try again (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
 !!!!you swallow his load
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-6.jpg"></center>'
-			'You shake your head no and beg him: "No, I can do it! Please let me try again! No need for that thing."'
-			'He looks at you intently for a second, but puts the gag away. "Alright then," he sighs. "I''ll give you one more chance. Get down on your knees in front of me."'
-			'You do as he says and take the head of his cock back into your mouth, making sure to be careful with your teeth.'
-			'Luckily the man lets you control the pace. Occasionally you try to take a bit more of his shaft in your mouth, but you decide to play it safe and mostly just focus on the head, gently sucking on it and teasing it with your tongue.'
-			gs 'arousal', 'bj', 15
-			gs 'cum_call', 'mouth', $boy
-			gs 'stat'
-			'"Look at me!" he groans, and a warm load of his tangy sperm fills your mouth seconds later. "That was better I guess, but rather half-hearted. Swallow," he orders you, while he strokes your hair with his hand. With him so obviously waiting for you to swallow his sperm, you decide to just do it without hesitation. He seemed unhappy enough with your performance already!'
-			'"You have a lot to learn, but... it''ll be worth it!" he sighs contently. "You could become a good little slut for me, with some training."'
-			act 'Continue': gt 'postevents', '3-2'
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent3-6.jpg"></center>'
+				'You shake your head no and beg him: "No, I can do it! Please let me try again! No need for that thing."'
+				'He looks at you intently for a second, but puts the gag away. "Alright then," he sighs. "I''ll give you one more chance. Get down on your knees in front of me."'
+				'You do as he says and take the head of his cock back into your mouth, making sure to be careful with your teeth.'
+				'Luckily the man lets you control the pace. Occasionally you try to take a bit more of his shaft in your mouth, but you decide to play it safe and mostly just focus on the head, gently sucking on it and teasing it with your tongue.'
+				gs 'arousal', 'bj', 15, 'prostitution'
+				gs 'cum_call', 'mouth', $boy
+				gs 'stat'
+				'"Look at me!" he groans, and a warm load of his tangy sperm fills your mouth seconds later. "That was better I guess, but rather half-hearted. Swallow," he orders you, while he strokes your hair with his hand. With him so obviously waiting for you to swallow his sperm, you decide to just do it without hesitation. He seemed unhappy enough with your performance already!'
+				'"You have a lot to learn, but... it''ll be worth it!" he sighs contently. "You could become a good little slut for me, with some training."'
+				act 'Continue': gt 'postevents', '3-2'
+			end
+		else
+			act 'Beg him to let you try again (<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
@@ -662,7 +698,8 @@ if $ARGS[0] = '4':
 	
 	act 'Show some skin to get him off faster':
 		*clr & cla
-		if pcs_dom > 25:
+		!if pcs_dom > 25: Not sure what to do here, so Ill do rand for now
+		if rand(0,1) = 0:
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-4.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-5.jpg"></center>'
@@ -670,7 +707,8 @@ if $ARGS[0] = '4':
 		'Surely getting to look at your body while you jerk him off will get him off faster?'
 		'You wordlessly slip out of your clothes, and the man grins triumphantly at you: "That''s it, girl... way to go the extra mile!"'
 		'You ignore his comments, while his eyes rove your exposed body.'
-		if pcs_dom > 25:
+		!if pcs_dom > 25: Not sure what to do here, so Ill do rand for now
+		if rand(0,1) = 0:
 			'When he reaches out to touch you, you slap away his hand and sternly say: "No touching, that was not part of the deal. Try that again and I''m out of here."'
 			'He raises his hands apologetically and puts them behind his head, while you resume jerking him off. A few minutes later, his breathing becomes more shallow and you can tell he''s close to orgasming.'
 			'You place your fingers around the base of his shaft, and only very lightly brush one over his cock with a cruel grin until you see his cock spasm and shoot his cum straight up into the air, splattering onto his stomach.'
@@ -740,7 +778,7 @@ if $ARGS[0] = '4':
 			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
 		end			
 	end
-	if pcs_intel > 70 and pcs_dom > 30:
+	if pcs_intel > 70:
 		act 'Look around and try to figure out why it''s not working':
 			cla
 			minut += 5
@@ -752,8 +790,11 @@ if $ARGS[0] = '4':
 			'"Numbing cream!?" you shout, making the guy flinch. Your hand is still firmly wrapped around his cock, and he groans when you clench your fist in anger. He might''ve numbed the head of his cock with it, but the way you''re squeezing his cock and balls instantly puts the fear of God into him.'
 			'"I-I''m sorry!" he shouts. "I thought it wo- ow! Oww! Please let go! I''ll sign! I''ll sign your thing! I won''t bother you ever again!"'
 			''
-			if pcs_dom > 50:
-				act 'Tell him that''s not good enough':
+			gs 'willpower', 'misc', 'force', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Tell him that''s not good enough (<<will_cost>> Willpower)':
+					cla
+					gs 'willpower', 'pay', 'force'
 					cla
 					'"Not good enough!" you yell at him, as you tighten your grip on his junk even more. "You take advantage of me, while I''m just trying to do my job!? How many girls have you degraded like this, before me? I really should make you suffer..."'
 					'"N-no! Please! I can pay! I''ll give you 1000 <b>₽</b>, just please let go! I won''t bother anyone ever again! I promise!" he cries out. You''d swear he''s nearly in tears now.'
@@ -780,7 +821,9 @@ if $ARGS[0] = '4':
 						act 'Continue your round':gt 'postdeliveries', 'resume'
 					end
 				end
-			end
+			else
+				act 'Tell him that''s not good enough (<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 go':
 				cla
 				'You give his balls one more angry squeeze, and then let go. You grin at him and say: "You''re damn right you won''t bother me again. Now sign, unless you want me to tell the postmaster exactly why your signature is missing!"'

+ 69 - 63
locations/postmaster.qsrc

@@ -112,81 +112,87 @@ if $ARGS[0] = 'start':
 
 						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 					end
-				end		
-				act 'Use the more dangerous shortcuts to be done faster':
-					*clr & cla
-					minut += 70
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
-					'You walk by yet another empty street, looking at your map again. You think to yourself: "This is stupid, these supposedly dangerous streets are empty! What''s the worst that could happen?"'
-					'You sometimes feel a bit uncomfortable when small groups of rowdy looking guys are checking you out, but fortunately they leave you alone and your bag is empty in no time at all.'
-					'You''re done almost an hour faster than planned, and it''s only 14:10 when you return to the postmaster.'
-					'He gives you a suspecting look and shakes his head, saying: "There''s no way you''d be back already if you listened to what I said. You ignored my warning, didn''t you?"'
-					act 'Be honest and admit that you did':
+				end
+				gs 'willpower', 'misc', 'self'
+				if will_cost <= pcs_willpwr:
+					act 'Use the more dangerous shortcuts to be done faster (<<will_cost>> Willpower)':
 						*clr & cla
-						money += 500
+						gs 'willpower', 'pay', 'self'
+						minut += 70
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
-						'"I looked carefully, those streets seemed mostly deserted... but yes," you admit. You quickly add: "I can take care of myself, though!"'
-						'He lets out an exasperated sigh but nods: "I drew out that map for your safety, girl... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
-						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
-						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
-						*nl
-						act 'You''re not sure':
-							cla
-							postjobQW = 3
-							minut += 2
+						'You walk by yet another empty street, looking at your map again. You think to yourself: "This is stupid, these supposedly dangerous streets are empty! What''s the worst that could happen?"'
+						'You sometimes feel a bit uncomfortable when small groups of rowdy looking guys are checking you out, but fortunately they leave you alone and your bag is empty in no time at all.'
+						'You''re done almost an hour faster than planned, and it''s only 14:10 when you return to the postmaster.'
+						'He gives you a suspecting look and shakes his head, saying: "There''s no way you''d be back already if you listened to what I said. You ignored my warning, didn''t you?"'
+						act 'Be honest and admit that you did':
+							*clr & cla
+							money += 500
 							gs'stat'
-							'"I don''t know how next week will look yet, can I think about it?" you ask the postmaster.'
-							'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday 18:00, I will assume you''re not coming."'
-							'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
+							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
+							'"I looked carefully, those streets seemed mostly deserted... but yes," you admit. You quickly add: "I can take care of myself, though!"'
+							'He lets out an exasperated sigh but nods: "I drew out that map for your safety, girl... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
+							'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+							'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
+							*nl
+							act 'You''re not sure':
+								cla
+								postjobQW = 3
+								minut += 2
+								gs'stat'
+								'"I don''t know how next week will look yet, can I think about it?" you ask the postmaster.'
+								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday 18:00, I will assume you''re not coming."'
+								'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
-							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
-						end
-						act 'Accept the job':
-							cla
-							postjobQW = 4
-							minut += 2
-							gs'stat'
-							'You tell him you want to work again next Saturday.'
-							'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
+								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+							end
+							act 'Accept the job':
+								cla
+								postjobQW = 4
+								minut += 2
+								gs'stat'
+								'You tell him you want to work again next Saturday.'
+								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
 
-							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
-						end
+								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+							end
 
-					end
-					act 'Lie, saying you''re just a fast worker':
-						*clr & cla
-						money += 500
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
-						'The postmaster sees right through your lie, but can''t help but laugh: "You kids and your youthful hubris! I drew out that map for your safety... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
-						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
-						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
-						*nl
-						act 'You''re not sure':
-							cla
-							postjobQW = 3
-							minut += 2
-							gs'stat'
-							'"I don''t know how next week will look yet, can I think about it?" you ask the postmaster.'
-							'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re passing up on the offer."'
-							'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
-
-							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 						end
-						act 'Accept the job':
-							cla
-							postjobQW = 4
-							minut += 2
+						act 'Lie, saying you''re just a fast worker':
+							*clr & cla
+							money += 500
 							gs'stat'
-							'You tell him you want to work again next Saturday.'
-							'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
+							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
+							'The postmaster sees right through your lie, but can''t help but laugh: "You kids and your youthful hubris! I drew out that map for your safety... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
+							'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+							'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
+							*nl
+							act 'You''re not sure':
+								cla
+								postjobQW = 3
+								minut += 2
+								gs'stat'
+								'"I don''t know how next week will look yet, can I think about it?" you ask the postmaster.'
+								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re passing up on the offer."'
+								'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
+
+								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+							end
+							act 'Accept the job':
+								cla
+								postjobQW = 4
+								minut += 2
+								gs'stat'
+								'You tell him you want to work again next Saturday.'
+								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
 
-							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+							end
 						end
 					end
-				end
+				else
+					act 'Use the more dangerous shortcuts to be done faster (<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 you''re at the post office when it''s not working time
 		else

+ 104 - 77
locations/postoffice.qsrc

@@ -24,100 +24,127 @@ if $ARGS[0] = 'start':
 		end
 	
 		if exhibitionist_lvl > 2:
-			act 'Flash both your tits and your pussy to skip the line':
-				*clr & cla
-				menu_off = 1
-				gs 'flash', 'full', 'inside', 5
-				gs 'stat'
+			gs 'willpower', 'exhib', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Flash both your tits and your pussy to skip the line (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'exhib', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					gs 'flash', 'full', 'inside', 1
+					gs 'stat'
 
-				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
-			end
+					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+				end
+			else
+				act 'Flash both your tits and your pussy to skip the line (<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 exhibitionist_lvl > 1:
-			act 'Flash your pussy to skip the line':
-				*clr & cla
-				menu_off = 1
-				gs 'flash', 'pussy', 'inside', 5
-				gs 'stat'
+			gs 'willpower', 'exhib', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Flash your pussy to skip the line (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'exhib', 'self'
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					gs 'flash', 'pussy', 'inside', 1
+					gs 'stat'
 
-				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
-			end
+					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+				end
+			else
+				act 'Flash your pussy to skip the line (<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 exhibitionist_lvl > 0 or pcs_inhib >= 45:
-			act 'Flash your tits to skip the line':
-				*clr & cla
-				menu_off = 1
-				gs 'flash', 'tits', 'inside', 5
-				gs 'stat'
+			gs 'willpower', 'exhib', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Flash your tits to skip the line (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'exhib', 'self', 'easy'
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					gs 'flash', 'tits', 'inside', 1
+					gs 'stat'
 
-				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
-			end
+					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+				end
+			else
+				act 'Flash your tits to skip the line (<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 exhibitionist_lvl > 0:
-			act 'Suggest a blowjob in exchange for jumping the queue':
-				*clr & cla
-				menu_off = 1
-				if cumloc[11] = 0:
-					pcs_throat += 1
-					gs 'npcgeneratec', 0, 'stranger', rand(18,45)
-					gs 'boyStat', $npclastgenerated
-
-					inhib_exp += rand(2,5)
-					gs 'arousal', 'bj', 10, 'sub'
-					gs 'stat'
-				
-					act 'Cum on your face':
-						*clr & cla
-						if pcs_haircol = 0:
-							$cum_face_image = 'black/' + rand(1,23)
-						elseif pcs_haircol = 1:
-							$cum_face_image = 'brown/' + rand(1,31)
-						elseif pcs_haircol = 2:
-							$cum_face_image = 'red/' + rand(1,19)
-						elseif pcs_haircol = 3:
-							$cum_face_image = 'blonde/' + rand(1,25)
-						else
-							$cum_face_image = 'custom/' + rand(1,20)
-						end
-						'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/<<$cum_face_image>>.jpg"></center>'
-						'The man cums on your face.'
-						spafinloc = 11
-						gs 'cum_manage'
-						gs 'arousal', 'end'
+			gs 'willpower', 'bj', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Suggest a blowjob in exchange for jumping the queue (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'bj', 'self'
+					gs 'willpower', 'pay', 'self'
+					menu_off = 1
+					if cumloc[11] = 0:
+						gs 'npcgeneratec', 0, 'stranger', rand(18,45)
+						gs 'boyStat', $npclastgenerated
+
+						inhib_exp += rand(2,5)
+						gs 'arousal', 'bj', 10, 'sub'
 						gs 'stat'
+					
+						act 'Cum on your face':
+							*clr & cla
+							if pcs_haircol = 0:
+								$cum_face_image = 'black/' + rand(1,23)
+							elseif pcs_haircol = 1:
+								$cum_face_image = 'brown/' + rand(1,31)
+							elseif pcs_haircol = 2:
+								$cum_face_image = 'red/' + rand(1,19)
+							elseif pcs_haircol = 3:
+								$cum_face_image = 'blonde/' + rand(1,25)
+							else
+								$cum_face_image = 'custom/' + rand(1,20)
+							end
+							'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/<<$cum_face_image>>.jpg"></center>'
+							'The man cums on your face.'
+							spafinloc = 11
+							gs 'cum_manage'
+							gs 'arousal', 'end'
+							gs 'stat'
+
+							act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+						end
 
-						act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
-					end
-
-					act 'Cum in your mouth':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/cumlip.jpg"></center>'
-						'The man cums inside your mouth.'
-						spafinloc = 12
-						gs 'cum_manage'
-						gs 'arousal', 'end'
-						gs 'stat'
+						act 'Cum in your mouth':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/cumlip.jpg"></center>'
+							'The man cums inside your mouth.'
+							spafinloc = 12
+							gs 'cum_manage'
+							gs 'arousal', 'end'
+							gs 'stat'
 
-						act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
-					end
-				
-				else
-					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'						
-					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the postoffice and spend 2 hours curled up like a ball.'
-					minut += 120
-					gs 'pain', 4, 'tummy', 'hit'
-
-					act 'Recover':
-						if bankloc = 1:
-							gt 'down'
-						else
-							gt 'pavCommercial'
+							act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+						end
+					
+					else
+						'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'						
+						'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the postoffice and spend 2 hours curled up like a ball.'
+						minut += 120
+						gs 'pain', 4, 'tummy', 'hit'
+
+						act 'Recover':
+							if bankloc = 1:
+								gt 'down'
+							else
+								gt 'pavCommercial'
+							end
 						end
 					end
-				end
+				else
+					act 'Suggest a blowjob in exchange for jumping the queue (<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
 	else

+ 129 - 117
locations/preNT.qsrc

@@ -146,161 +146,173 @@ if $ARGS[0] =  'Ride':
 			*nl
 			'You watch him at the corner of your vision while he continues to stare at your legs while you pretend not to notice. After a minute you notice him begin firmly rubbing on his crotch. You start feeling a little hot, not entirely sure why. <font color=#FF00CC>Why is it so hot all of a sudden? Maybe it is the way he is looking at me. He must really want me. He keeps rubbing that...Bulge. Maybe I should touch it for him. I bet his dick is big if his bulge is that big, but what if he doesn''t want it? That would be so embarrassing, but if he does want it then this is my chance to finally be with a real man, but am I ready?</font>'
 
-			act 'Reach out for his crotch':
-				*clr & cla
-				minut -= 2
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/pre/city/hj1.jpg"></center>'
-				'You can feel your heart pounding as you slowly reach out then begin lightly rubbing Albert''s crotch through his pants. To your surprise, he doesn''t seem to react, so you continue stroking it until you find the zipper of his pants then reach inside, feeling his really warm penis tensing up like a tree stump. You pull it out of his pants then begin firmly stroking it as Albert starts lightly moaning. You can feel your body heating up and your cheeks growing red as you think of how far you have gone. You continue stroking his dick until you feel his hand on the back of your head.'
-				*nl
-				'You look up at Albert to see a lustful look on his face. He moves his lips close to yours before sharing a passionate kiss for a few seconds until he pauses then turns around to see if any other cars are around before you feel his hand lightly pulling you down to his rock hard penis.'
-				'<center><video autoplay loop src="images/pre/city/kiss.mp4"></video></center>'
-				gs 'arousal', 'hj', 5, 'dom'
-				gs 'stat'
-
-				act 'Suck his dick':
+			gs 'willpower', 'hj', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Reach out for his crotch (<<will_cost>> Willpower)':
 					*clr & cla
-					sub += 5
+					gs 'willpower', 'pay', 'self'
 					minut -= 2
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/pre/city/bj1.jpg"></center>'
-					'Realizing what he wants, you lower your head to his penis then light kiss the tip before looking up at him, as he gives you an approving nod, signalling you to continue. You wrap your lips around the tip then give it a light suck before rubbing it with your tongue. You enjoy the warmth of it in your mouth while you slide it in deeper. You begin thoroughly sucking his cock while he takes a quick look around to see if anyone is watching before he continues driving with his dick in your mouth. You can feel your underwear growing wet, causing you to think to yourself,'
+					'<center><img <<$set_imgh>> src="images/pre/city/hj1.jpg"></center>'
+					'You can feel your heart pounding as you slowly reach out then begin lightly rubbing Albert''s crotch through his pants. To your surprise, he doesn''t seem to react, so you continue stroking it until you find the zipper of his pants then reach inside, feeling his really warm penis tensing up like a tree stump. You pull it out of his pants then begin firmly stroking it as Albert starts lightly moaning. You can feel your body heating up and your cheeks growing red as you think of how far you have gone. You continue stroking his dick until you feel his hand on the back of your head.'
 					*nl
-					'<font color=#FF00CC>Why am I so wet? Did I pee myself? Am I really doing this? Is this really happening? I''m sucking this man''s dick and I don''t even know him, but I feel so hot. I want more. I want him to put his dick inside of me. I want him so bad. What is wrong with me? i just met him...</font>'
-					'<center><video autoplay loop src="images/pre/city/bj2.mp4"></video></center>'
-					gs 'arousal', 'bj', 5, 'sub'
+					'You look up at Albert to see a lustful look on his face. He moves his lips close to yours before sharing a passionate kiss for a few seconds until he pauses then turns around to see if any other cars are around before you feel his hand lightly pulling you down to his rock hard penis.'
+					'<center><video autoplay loop src="images/pre/city/kiss.mp4"></video></center>'
+					gs 'arousal', 'hj', 5, 'dom'
 					gs 'stat'
 
-					act 'Continue':
+					act 'Suck his dick':
 						*clr & cla
-						sub += 5
-						guy += 1
+						!sub += 5
 						minut -= 2
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
-						'You suddenly feel his penis throbbing in your mouth, filling it with a warm liquid. <font color=#FF00CC>What is going on? what is this liquid? Did he pee or something? Should I spit it out? No I will get it all over his floor. I should just swallow it quickly.</font> You swallow the liquid and suddenly feel the sting as it goes down your throat. You try not to gag as you look up at Albert and see a very satisfied smile on his face as he lightly strokes your cheek. You slowly sit back in your seat embarrassed at what you just did and not knowing what to say to him.'
-						'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
-						'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
-						gs 'cum_call', 'mouth', 'Albert'
+						'<center><img <<$set_imgh>> src="images/pre/city/bj1.jpg"></center>'
+						'Realizing what he wants, you lower your head to his penis then light kiss the tip before looking up at him, as he gives you an approving nod, signalling you to continue. You wrap your lips around the tip then give it a light suck before rubbing it with your tongue. You enjoy the warmth of it in your mouth while you slide it in deeper. You begin thoroughly sucking his cock while he takes a quick look around to see if anyone is watching before he continues driving with his dick in your mouth. You can feel your underwear growing wet, causing you to think to yourself,'
+						*nl
+						'<font color=#FF00CC>Why am I so wet? Did I pee myself? Am I really doing this? Is this really happening? I''m sucking this man''s dick and I don''t even know him, but I feel so hot. I want more. I want him to put his dick inside of me. I want him so bad. What is wrong with me? i just met him...</font>'
+						'<center><video autoplay loop src="images/pre/city/bj2.mp4"></video></center>'
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'stat'
-						gs 'arousal', 'end'
 
-						act 'Continue riding in silence':
+						act 'Continue':
 							*clr & cla
-							minut += 4
+							!sub += 5
+							guy += 1
+							minut -= 2
 							gs'stat'
-							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
-							'You lay back trying to relax while still feeling the sting of his cum in your mouth. After a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
-							*nl
-							'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home."'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
+							'You suddenly feel his penis throbbing in your mouth, filling it with a warm liquid. <font color=#FF00CC>What is going on? what is this liquid? Did he pee or something? Should I spit it out? No I will get it all over his floor. I should just swallow it quickly.</font> You swallow the liquid and suddenly feel the sting as it goes down your throat. You try not to gag as you look up at Albert and see a very satisfied smile on his face as he lightly strokes your cheek. You slowly sit back in your seat embarrassed at what you just did and not knowing what to say to him.'
 							'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
 							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+							gs 'cum_call', 'mouth', 'Albert'
+							gs 'arousal', 'bj', 5, 'sub'
+							gs 'stat'
+							gs 'arousal', 'end'
 
-							act 'Walk toward your new home':
+							act 'Continue riding in silence':
 								*clr & cla
-								sub += 5
 								minut += 4
-								if sound = 0:
-									if month >=11 and month <= 12 or month >=1 and month <=3:
-										if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-										if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
-									else
-										if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-										if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
-									end
-								end
 								gs'stat'
-								if month >= 11 or month <= 3:
-									if hour >= 8 and hour <= 21:
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
-									else
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
+								'You lay back trying to relax while still feeling the sting of his cum in your mouth. After a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
+								*nl
+								'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home."'
+								'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
+								'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+
+								act 'Walk toward your new home':
+									*clr & cla
+									!sub += 5
+									minut += 4
+									if sound = 0:
+										if month >=11 and month <= 12 or month >=1 and month <=3:
+											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+											if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+										else
+											if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+											if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+										end
 									end
-								else
-									if hour >= 8 and hour <= 21:
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
+									gs'stat'
+									if month >= 11 or month <= 3:
+										if hour >= 8 and hour <= 21:
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
+										else
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
+										end
 									else
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
+										if hour >= 8 and hour <= 21:
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
+										else
+											'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
+										end
 									end
-								end
-								'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
+									'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
 
-								act 'Look at the job listings':gt 'preNT', 'Listings'
+									act 'Look at the job listings':gt 'preNT', 'Listings'
+								end
 							end
 						end
 					end
-				end
-
-				act 'Continue jerking him':
-					*clr & cla
-					pcs_dom += 5
-					guy += 1
-					minut += 4
-					gs'stat'
-					'<center><video autoplay loop src="images/pre/city/hj2.mp4"></video></center>'
-					'Despite Albert''s intentions, you continue stroking his penis, feeling it occasionally throb in your hand. Albert lowers his hand from your head realizing that you aren''t going to suck his dick. Something about the way he just gave up to you makes you feel a sort of exhilarated rush while you think to yourself, <font color=#FF00CC>He just let go of me. He let me decide what to do. Mother always told me that men are all controlling pigs, but I feel in control here. His dick is mine to use as I see fit. His moans are mine to control. Ohh mother, how wrong you were about everything. This is my new life now. My time to choose who I can be with and what i can do. This man is at my mercy. I control his pleasure and I can choo...</font>'
-					gs 'arousal', 'hj', 5, 'dom'
-					gs 'stat'
 
-					act 'Continue':
-						*clr & cla
-						pcs_dom += 5
-						minut += 4
-						gs'stat'
-						'<center><video autoplay loop src="images/pre/city/hj3.mp4"></video></center>'
-						'You suddenly see Alberts head jerk back as his cock begins throbbing in your hands. You feel a little nervous while you think to yourself, <font color=#FF00CC>What is going on? Is he in pain? Did i do something wrong? What is this warm liquid leaking out of his penis?</font> You slowly bring your hand to your face then smell the liquid and almost gag at the smell, as you quickly grab a nearby tissue and wipe some of the cum off of your hand, leaving your hand feeling sticky. You turn to Albert and see a satisfied smile on his face as he strokes your cheek then continues driving.'
-						gs 'cum_call', 'hands', 'Albert'
-						gs 'arousal', 'hj', 5, 'dom'
-						gs 'stat'
-						gs 'arousal', 'end'
-
-						act 'Lay back and relax':
-							cla
-							*clr
-							minut += 2
+					gs 'willpower', 'bj', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Continue jerking him (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							!pcs_dom += 5
+							guy += 1
+							minut += 4
 							gs'stat'
-							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
-							'You lay back feeling very confident with yourself and after a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
-							*nl
-							'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home.'
-							'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
-							'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+							'<center><video autoplay loop src="images/pre/city/hj2.mp4"></video></center>'
+							'Despite Albert''s intentions, you continue stroking his penis, feeling it occasionally throb in your hand. Albert lowers his hand from your head realizing that you aren''t going to suck his dick. Something about the way he just gave up to you makes you feel a sort of exhilarated rush while you think to yourself, <font color=#FF00CC>He just let go of me. He let me decide what to do. Mother always told me that men are all controlling pigs, but I feel in control here. His dick is mine to use as I see fit. His moans are mine to control. Ohh mother, how wrong you were about everything. This is my new life now. My time to choose who I can be with and what i can do. This man is at my mercy. I control his pleasure and I can choo...</font>'
+							gs 'arousal', 'hj', 5, 'dom'
+							gs 'stat'
 
-							act 'Walk toward your new home':
+							act 'Continue':
 								*clr & cla
+								!pcs_dom += 5
 								minut += 4
-								if sound = 0:
-									if month >=11 and month <= 12 or month >=1 and month <=3:
-										if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-										if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
-									else
-										if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-										if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
-									end
-								end
 								gs'stat'
-								if month >= 11 or month <= 3:
-									if hour >= 8 and hour <= 21:
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
-									else
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
-									end
-								else
-									if hour >= 8 and hour <= 21:
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
-									else
-										'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
+								'<center><video autoplay loop src="images/pre/city/hj3.mp4"></video></center>'
+								'You suddenly see Alberts head jerk back as his cock begins throbbing in your hands. You feel a little nervous while you think to yourself, <font color=#FF00CC>What is going on? Is he in pain? Did i do something wrong? What is this warm liquid leaking out of his penis?</font> You slowly bring your hand to your face then smell the liquid and almost gag at the smell, as you quickly grab a nearby tissue and wipe some of the cum off of your hand, leaving your hand feeling sticky. You turn to Albert and see a satisfied smile on his face as he strokes your cheek then continues driving.'
+								gs 'cum_call', 'hands', 'Albert'
+								gs 'arousal', 'hj', 5, 'dom'
+								gs 'stat'
+								gs 'arousal', 'end'
+
+								act 'Lay back and relax':
+									cla
+									*clr
+									minut += 2
+									gs'stat'
+									'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/car.jpg"></center>'
+									'You lay back feeling very confident with yourself and after a few minutes of silence, the car stops and you realize that you have arrived at your building. Albert turns to your with a smile and says, "Here we are. I hope that you enjoyed the ride as much as I did." You can''t help but giggle a bit before replying, "I had a wonderful time. Thank you Albert." Albert chuckles before saying, "Anytime <<$pcs_firstname>>."'
+									*nl
+									'He then steps out of the car then heads to the trunk while you get out and begin stretching your legs. Albert brings out your bags then places them next to you before placing his hand on your hip then giving you a kiss on the cheek, followed by a wink. Albert returns to his car as you wave goodbye then turn to your new home.'
+									'<center><b><font color=#0060FF><<"Albert Sokolov">></font></b></center>'
+									'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/nightout/date/albert3.jpg"></center>'
+
+									act 'Walk toward your new home':
+										*clr & cla
+										minut += 4
+										if sound = 0:
+											if month >=11 and month <= 12 or month >=1 and month <=3:
+												if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+												if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+											else
+												if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+												if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+											end
+										end
+										gs'stat'
+										if month >= 11 or month <= 3:
+											if hour >= 8 and hour <= 21:
+												'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
+											else
+												'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
+											end
+										else
+											if hour >= 8 and hour <= 21:
+												'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
+											else
+												'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'
+											end
+										end
+										'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
+
+										act 'Look at the job listings':gt 'preNT', 'Listings'
 									end
 								end
-								'You begin heading in the direction of your new home when you notice some gopniks harassing a woman. One of the gopniks is whistling at her while the other is lifting up her skirt. You try your best to ignore them as you continue toward you apartment when you suddenly trip over something. You reach down and pick it up realizing that it is a news paper. You take a quick moment to open it up then look through the job listings.'
-
-								act 'Look at the job listings':gt 'preNT', 'Listings'
 							end
 						end
-					end
+					else
+						act 'Continue jerking 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
-			end
+			else
+				act 'Reach out for his crotch (<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 it':
 				*clr & cla

+ 20 - 2
locations/preTG.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'otelPRE':
 											'<center><img <<$set_imgh>> src="images/characters/city/jugo/jugopre.jpg"></center>'
 											'The man has a large tattoo across the left side of his face. He too has red hair'
 											$boy = 'Gustav'
-											!!stats
+											!!stats{
 											strenV = 600
 											speedV = 60
 											agilV = 60
@@ -300,7 +300,25 @@ if $ARGS[0] = 'otelPRE':
 											BonusDefV = 0
 											!!Programme of Action
 											program = 0
-											jugoFight = 1
+											jugoFight = 1}
+											gs 'fight','initFight'
+
+											$opp_name[0] = 'Gustav'
+											$opp_image[0] = 'images/characters/city/jugo/jugopre.jpg'
+											opp_def[0] = 100
+											opp_run[0] = 75
+											opp_wrstlng[0] = 75
+											opp_kick[0] = 75
+											opp_punch[0] = 85
+											opp_jab[0] = 75
+											opp_stren[0] = 250
+											opp_agil[0] = 60
+											opp_vital[0] = 200
+											opp_react[0] = 50
+											opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+											opp_willpwr[0] = 50
+											opp_shoot[0] = 100
+
 											act 'Fight': gt 'fight', 'start'
 										end
 									end

+ 12 - 21
locations/ptu_dush.qsrc

@@ -19,7 +19,7 @@ end
 
 if $ARGS[0] = 'pos2':
 	cls
-	minut += 5
+	minut += 2
 	teachlevel -= 1
 	pcs_horny += 3
 	menu_off = 1
@@ -34,8 +34,6 @@ if $ARGS[0] = 'pos2':
 			minut += 5
 			pcs_horny += 3
 			dynamic $showerdin
-			pcs_hairbsh = 0
-			pcs_makeup = 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_2.jpg"></center>'
 			'As every last piece of your clothes are put away in the locker, you walk over to the showers. Just as you turn on the shower, and feel the first cold water drops, but it doesn''t take long before the water becomes warm and you begin to enjoy the shower.'
@@ -43,20 +41,20 @@ if $ARGS[0] = 'pos2':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			act 'Tease them':
 				cls
-				gs 'arousal', 'masturbate', 5
+				gs 'arousal', 'masturbate', 2
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_3.jpg"></center>'
 				'Feeling aroused that someone walked in on you try to keep quiet while your hand begins sliding down towards your clit. The nearer your hand approaches the more a warm feeling inside you rises.'
 				'You should stop but you''re not able to do that as your hand reach down, and you begin touching yourself. It doesn''t take long before you''re dripping wet. Knowing that you must keep quiet, you try your best to keep as silent as possible. You feel your body fill with warmth, you close your eyes in anticipation to...'	
 				act 'Continue':
 					cls
-					gs 'arousal', 'masturbate', 5
+					gs 'arousal', 'masturbate', 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_4.jpg"></center>'
 					'Not being able to keep yourself silent, you let out a small moan. Right away you regret not being able to keep quiet and as you open your eyes there are two guys standing infront of you, watching as your hand is still touching your clit.'				
 					act 'View them':
 						cls
-						gs 'arousal', 'foreplay', 5
+						gs 'arousal', 'foreplay', 3
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_5.jpg"></center>'
 						'Frightened you jump back and try to cover up but its too late they''ve already blocked your exit and looking down at their pants you clearly see their cocks pressing against the fabric.' 
@@ -64,17 +62,16 @@ if $ARGS[0] = 'pos2':
 						'The guy grabbing you turns to his friend, "Look at this one, she doesn''t seem to mind..."'
 						act 'Give them a handjob':
 							cls
-							gs 'arousal', 'hj', 5, 'group'
+							gs 'arousal', 'hj', 3, 'group', 'unknown'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_6.jpg"></center>'
 							'The other guy smirks as he approaches you and lowers you slowly down. Having their cocks in head height, you grab them with your hands, and begin stroking them off. Your hands are moving the full length, pleasuring them both at the same time.' 
 							'As their cocks continue to grow and having the cocks near your face. You''re not sure if you can resist the temptation to suck them off.'
-							act 'Sosast':
+							act 'Suck their cocks':
 								cls
 								gang += 1
-								gs 'arousal', 'bj', 5, 'group', 'deepthroat'
-								gs 'arousal', 'hj', 5, 'group'
-								minut -= 5
+								gs 'arousal', 'bj', 5, 'group', 'deepthroat', 'unknown'
+								gs 'arousal', 'hj', -5, 'group', 'unknown'
 								gs 'stat'
 								if ptu_trenerssex = 0:ptu_trenerssex = 1 & guy += 2
 								gs'stat'
@@ -84,10 +81,8 @@ if $ARGS[0] = 'pos2':
 								'All of sudden you hear the guy you''re giving a blowjob to, "I want to fuck this little minx by myself."'
 								act 'Have him fuck you':
 									cls
-									pcs_vag += 1
-									gs 'arousal', 'vaginal_finger', 5
-									gs 'arousal', 'vaginal', 5
-									minut -= 5
+									gs 'arousal', 'vaginal_finger', -5, 'unknown'
+									gs 'arousal', 'vaginal', 5, 'unknown'
 									$orgasm_or = 'yes'
 									gs 'cum_call', 'mouth'
 									gs 'stat'
@@ -97,9 +92,8 @@ if $ARGS[0] = 'pos2':
 									'As you manage to return to your senses, you can feel his cock twitching inside of you and he barely manages to pull out and cum in your mouth.'
 									act 'The other guy joins in':
 										cls
-										pcs_ass += 1
 										gs 'pain', 3, 'asshole', 'pierce'
-										gs 'arousal', 'anal', 5, 'rough'
+										gs 'arousal', 'anal', 5, 'rough', 'unknown'
 										gs 'cum_call', 'face'
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_10.jpg"></center>'
@@ -111,14 +105,13 @@ if $ARGS[0] = 'pos2':
 										act 'What now?':
 											cls
 											$orgasm_or = 'yes'
-											gs 'arousal', 'vaginal', 5, 'rough'
+											gs 'arousal', 'vaginal', 5, 'rough', 'unknown'
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_11.jpg"></center>'
 											'He smirks as he grabs hold of you and whispers, "We''re not done yet..." Feeling inferior to his friend, that he hasn''t made you orgasm, he shoves his cock inside you and begins furiously thrusting.' 
 											'You begin to moan loudly, as he penetrates you deeper and deeper. He franticly paces as your orgasm is building up quickly and before you know it even he''s manages to bring you to orgasm. This time you let out a tear as your body shakes from the orgasm.'
 											act 'Finish':
 												cls
-												minut += 5
 												gs 'arousal', 'end'
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/ptu_shower_12.jpg"></center>'
@@ -146,8 +139,6 @@ if $ARGS[0] = 'pos2':
 		cls
 		minut += 10
 		pcs_horny += 3
-		pcs_hairbsh = 0
-		pcs_makeup = 1
 		dynamic $showerdin
 		gs'stat'
 		'<center><b><font color=maroon>Shower</font></b></center>'

+ 10 - 0
locations/saveupdater.qsrc

@@ -570,7 +570,17 @@ if NatBelLernQW > 0 and NatashaQW = 0: NatashaQW = NatBelLernQW & NatBelLernQW =
 
 if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
 
+if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
+if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
+if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
+if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
+if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
+if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
+if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
+if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
 if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
+if npcSex[16] > 0: npcSex[16] = 0 and npc_sex['A16'] = 1
+if npcSex[23] > 0: npcSex[23] = 0 and npc_sex['A23'] = 1
 
 if npc_dob['A34'] ! 20001219: npc_dob['A34'] = 20001219
 

+ 19 - 2
locations/sexm.qsrc

@@ -826,7 +826,7 @@ if $ARGS[0] = 'gangrape':
 
 	act 'Start a fight':
 		cla
-		!!stats
+		!!stats{
 		strenV = 100
 		speedV = 20
 		agilV = 10
@@ -849,7 +849,24 @@ if $ARGS[0] = 'gangrape':
 		gangrapeFight = 1
 
 		if spellavtoklon = 1:klon = 3
-		if spellbefshild = 1:defence = 500
+		if spellbefshild = 1:defence = 500}
+		gs 'fight','initFight'
+
+		$opp_name[0] = 'Stranger'
+		$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+		opp_def[0] = 10
+		opp_run[0] = 20
+		opp_wrstlng[0] = 10
+		opp_kick[0] = 0
+		opp_punch[0] = 10
+		opp_jab[0] = 10
+		opp_stren[0] = 100
+		opp_agil[0] = 10
+		opp_vital[0] = 50
+		opp_react[0] = 10
+		opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+		opp_willpwr[0] = 100
+		opp_shoot[0] = 100
 
 		gt 'fight', 'start'
 	end

+ 2 - 2
locations/sny.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'kiss':
 		act 'wait':
 			*clr & cla
 
-			if npcSex[1] = 0:npcSex[1] = 1 & guy += 1
+			if npc_Sex['A1'] = 0: npc_Sex['A1'] = 1 & guy += 1
 
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/fuck.jpg"></center>'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'kiss':
 			act 'Suck him':
 				*clr & cla
 
-				if npcSex[4] = 0:npcSex[4] = 1 & guy += 1
+				if npc_Sex['A4'] = 0: npc_Sex['A4'] = 1 & guy += 1
 
 				if protect = 1:condomDima = 1
 

+ 20 - 2
locations/stallion.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'fight':
 	act 'Fight':
 		cla
 		$nameV = 'Naked Man'
-		!!stats
+		!!stats{
 		strenV = 100
 		speedV = 300
 		agilV = 300
@@ -59,7 +59,25 @@ if $ARGS[0] = 'fight':
 		program = 0
 		if spellavtoklon = 1:klon = 3
 		if spellbefshild = 1:defence = 500
-		stallionfight = 1
+		stallionfight = 1}
+		gs 'fight','initFight'
+
+		$opp_name[0] = 'Naked Man'
+		$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+		opp_def[0] = 100
+		opp_run[0] = 100
+		opp_wrstlng[0] = 100
+		opp_kick[0] = 100
+		opp_punch[0] = 100
+		opp_jab[0] = 100
+		opp_stren[0] = 100
+		opp_agil[0] = 300
+		opp_vital[0] = 200
+		opp_react[0] = 100
+		opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+		opp_willpwr[0] = 100
+		opp_shoot[0] = 10
+
 		gt 'fight', 'start'
 	end
 end

+ 80 - 8
locations/street_event.qsrc

@@ -464,7 +464,7 @@ if $ARGS[1] = 'main':
 
 		act 'Fight':
 			cla
-			!!stats
+			!!stats{
 			strenV = 100
 			speedV = 50
 			agilV = 40
@@ -486,7 +486,25 @@ if $ARGS[1] = 'main':
 			program = 0
 			RapistFight = 1
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Rapist'
+			$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+			opp_def[0] = 50
+			opp_run[0] = 50
+			opp_wrstlng[0] = 10
+			opp_kick[0] = 0
+			opp_punch[0] = 50
+			opp_jab[0] = 50
+			opp_stren[0] = 100
+			opp_agil[0] = 40
+			opp_vital[0] = 50
+			opp_react[0] = 40
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
+
 			gt 'fight', 'start'
 		end
 
@@ -561,7 +579,7 @@ if $ARGS[1] = 'main':
 				cla
 				gs 'npcgeneratec', 0, 'Robber', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 100
 				speedV = 50
 				agilV = 40
@@ -588,7 +606,25 @@ if $ARGS[1] = 'main':
 				end
 
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Robber'
+				$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+				opp_def[0] = 50
+				opp_run[0] = 50
+				opp_wrstlng[0] = 10
+				opp_kick[0] = 0
+				opp_punch[0] = 50
+				opp_jab[0] = 50
+				opp_stren[0] = 100
+				opp_agil[0] = 40
+				opp_vital[0] = 50
+				opp_react[0] = 40
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 100
+				opp_shoot[0] = 100
+
 				gt 'fight', 'start'
 			end
 		end
@@ -620,7 +656,7 @@ if $ARGS[1] = 'main':
 			else
 				gs 'npcgeneratec', 0, 'Purse Snatcher', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 100
 				speedV = 50
 				agilV = 40
@@ -642,10 +678,28 @@ if $ARGS[1] = 'main':
 				program = 0
 				ThiefFight = 1
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
 				'<<$streetev_title>>'
 				'<center><img src="images/locations/shared/street/pursechase.jpg"></center>'
 				'You chase after him, screaming at him to stop or anyone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down an alley when you are nearly on top of him. He leaps over an overturned trash can, obviously still hoping to get away from you. You easily leap over it as well and a few steps later you tackle him, sending both of you rolling on the ground. You both get back to your feet at the same time, realising he can''t escape he lunges at you.'
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Purse Snatcher'
+				$opp_image[0] = 'images/locations/shared/street/pursesnatch.jpg'
+				opp_def[0] = 50
+				opp_run[0] = 50
+				opp_wrstlng[0] = 10
+				opp_kick[0] = 0
+				opp_punch[0] = 50
+				opp_jab[0] = 50
+				opp_stren[0] = 100
+				opp_agil[0] = 40
+				opp_vital[0] = 50
+				opp_react[0] = 40
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 100
+				opp_shoot[0] = 100
+
 				act 'Fight':gt 'fight', 'start'
 			end
 		end
@@ -1249,7 +1303,7 @@ if $ARGS[1] = 'main':
 							$boydesc = 'The group of girls'
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 							'You give her a small shove, to force her to step back. "Bring it on then, bitch." The words barely leave your mouth before she jumps you, soon all of her friends join in, leaving you to fight them all.'
-							!!stats
+							!!stats{
 							strenV = 100
 							speedV = 50
 							agilV = 60
@@ -1272,7 +1326,25 @@ if $ARGS[1] = 'main':
 							BitchFight = 1
 
 							if spellavtoklon = 1:klon = 3
-							if spellbefshild = 1:defence = 500
+							if spellbefshild = 1:defence = 500}
+							gs 'fight','initFight'
+
+							$opp_name[0] = 'The group of girls'
+							$opp_image[0] = 'images/locations/shared/street/girlgang.jpg'
+							opp_def[0] = 50
+							opp_run[0] = 50
+							opp_wrstlng[0] = 10
+							opp_kick[0] = 0
+							opp_punch[0] = 50
+							opp_jab[0] = 50
+							opp_stren[0] = 100
+							opp_agil[0] = 60
+							opp_vital[0] = 60
+							opp_react[0] = 60
+							opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+							opp_willpwr[0] = 100
+							opp_shoot[0] = 100
+
 							gt 'fight', 'start'
 						end
 					end

+ 0 - 1
locations/swamp_yard.qsrc

@@ -76,7 +76,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if hour >= 20 and hour < 24: gs 'swamp_yard', 'nighttime_flavor_events'
 end	
 
-!Code blocks for leaf events (events not calling other  events)
 if $ARGS[0] = 'swamp_escape':
 	!add chance to swamped by illume
 	if hunters = 1:

+ 11 - 6
locations/webcam_site.qsrc

@@ -9,9 +9,14 @@ if $args[0] = 'start':
 	'<center>Video chat with the best girls online!</center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/webcam/webcam.jpg"></center>'
 	act 'Logout': gt 'Komp', 'start'
-	if $webcam_name = 0:
-		'<center>If you are beautiful and you want to earn a little revealing itself, you need to have a webcam and go through a simple registration.</center>'
-		act 'Register': dynamic $webcam_rega
+	gs 'willpower', 'exhib', 'self', 'hard'
+	if $webcam_name = 0 and will_cost <= pcs_willpwr:
+		'<center>If you are beautiful and you want to earn a little, revealing yourself, you need to have a webcam and go through a simple registration.</center>'
+		act 'Register (<<will_cost>> Willpower)': dynamic $webcam_rega
+		gs 'willpower', 'pay', 'self'
+		gs 'stat'
+	elseif will_cost > pcs_willpwr:
+		act 'Register (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to register online.</font>.'
 	else
 		if $webcam_name > 0: '<center>Your username: <<$webcam_name>></center>' 
 		if $webcam_name > 0: '<center><a href="exec: dynamic $webcam_stat">View your statistics</a></center>'
@@ -134,7 +139,7 @@ $webcam_show = {
 	if show_counter = 4:
 		*clr
 		'<center><video autoplay loop src="images/shared/accessories/computer/webcam/end'+rand(1,2)+'.mp4"></video></center>'
-		'You have already greatly so tired. And the viewers need to take a breath after your super-duper show. It''s time to call it a day.'
+		'You are already super tired and the viewers need to take a breather, after your super-duper show. It''s time to call it a day.'
 
 		
 		'You collected <<my_show_tip_all>> <b>₽</b> during today''s show.'
@@ -159,7 +164,7 @@ $webcam_show = {
 		gs'stat'
 		*clr
 		'<center><video autoplay loop src="images/shared/accessories/computer/webcam/show'+rand(5,7)+'.mp4" ></video></center>'
-		'Show must go on!'
+		'The show must go on!'
 		
 		'You have already collected <<my_show_tip_all>> <b>₽</b> for the show.'
 		
@@ -519,7 +524,7 @@ $webcam_show = {
 !---------Sex - Vasya---------!
 !------------------------------!
 		if $loc='shulga_room' and npc_rel['A11'] >= 100 and week >= 6 and hour >= 15 and vgape < 3 and agape < 3 and pcs_vag >= 1 and my_show_sex = 0:
-			act 'Call Vasya and arrange sex show':
+			act 'Call Vasya and arrange a sex show':
 				gs'stat'
 				*clr
 				'<center><video autoplay loop src="images/shared/accessories/computer/webcam/sex'+rand(1,5)+'.mp4" ></video></center>'

+ 59 - 20
locations/willpower.qsrc

@@ -2,8 +2,14 @@
 
 !!To use it call it with gs 'willpower', 'action', 'type'
 !!Action: Determines what action sveta is resisting, forcing somebody to do or forcing herself to do
-!!List of actions: 'hj', 'bj', 'cuni', 'sex', 'anal', 'group', 'gangbang', 'prostitution', 'swallow', 'cum_inside', 'cum_inside_anal', 'rape', 'drink', 'drugs', 'crime', 'exhib', 'sleep' and two special cases 'misc' and 'skill' 
-!!Type: Determines what kind of willpower check sveta needs to do ('resist', 'force', 'self'). 'resist' is used if sveta is resisting to do the 'action' somebody else wants her to do. 'force' is used if sveta forces somebody else to do the 'action' and 'self' should be used if sveta forces herself to do the 'action' (this should be used only in rare occasions)
+!!List of actions: 
+!!		'voyeur', 'mast', 'hj', 'bj', 'cuni', 'sex', 'anal', 'group', 'gangbang', 'prostitution', 'swallow', 'cum_inside', 'cum_inside_anal', 'rape',
+!!		'drink', 'drugs', 'crime', 'exhib', 'sleep'
+!!		and two special cases 'misc' and 'skill' 
+!!Type: Determines what kind of willpower check sveta needs to do ('resist', 'force', 'self'). 
+!!		-'resist' is used if sveta is resisting to do the 'action' somebody else wants her to do. 
+!!		-'force' is used if sveta forces somebody else to do the 'action'. 
+!!		-'self' should be used if sveta forces herself to do the 'action' (this should be used only in rare occasions)
 
 !!Example 1: Sveta is forcing somebody to perform a blowjob: gs 'willpower', 'bj', 'force'
 !!Example 2: Sveta is resisting doing drugs: gs 'willpower', 'drugs', 'resist'
@@ -131,9 +137,56 @@ if $ARGS[0] = 'calc':
 	will_calc += pain['total']
 end
 
+if $ARGS[0] = 'voyeur':
+	gs 'willpower', 'calc'
+	
+	if $ARGS[1] = 'self':
+		if stat['voyeur'] <= 90:
+			will_cost = (100 - stat['voyeur'] + will_calc)/10
+		else
+			will_cost = (10 + will_calc)/10
+		end
+	elseif $ARGS[1] = 'force':		
+		if stat['voyeur'] <= 40:
+			will_cost = (110 - will_enforced - stat['voyeur'] + will_calc)/10
+		else
+			will_cost = (70 - will_enforced + will_calc)/10
+		end	
+	else
+		if stat['voyeur'] <= 90:
+			will_cost = (10 + stat['voyeur'] + will_calc)/10
+		else
+			will_cost = (100 + will_calc)/10
+		end
+	end	
+end
+
+if $ARGS[0] = 'mast':
+	gs 'willpower', 'calc'
+	
+	if $ARGS[1] = 'self':
+		if stat['mast'] <= 90:
+			will_cost = (100 - stat['mast'] + will_calc)/10
+		else
+			will_cost = (10 + will_calc)/10
+		end
+	elseif $ARGS[1] = 'force':		
+		if stat['mast'] <= 40:
+			will_cost = (110 - will_enforced - stat['mast'] + will_calc)/10
+		else
+			will_cost = (70 - will_enforced + will_calc)/10
+		end	
+	else
+		if stat['mast'] <= 90:
+			will_cost = (10 + stat['mast'] + will_calc)/10
+		else
+			will_cost = (100 + will_calc)/10
+		end
+	end	
+end
+
 if $ARGS[0] = 'hj':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -160,7 +213,6 @@ end
 
 if $ARGS[0] = 'bj':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -187,7 +239,6 @@ end
 
 if $ARGS[0] = 'cuni':
 	gs 'willpower', 'calc'
-	will_cost = 0
 
 	cuni_check = (stat['cuni'] + stat['cuni_give']) / 2
 		
@@ -216,7 +267,6 @@ end
 	
 if $ARGS[0] = 'sex' or $ARGS[0] = 'vaginal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -243,7 +293,6 @@ end
 	
 if $ARGS[0] = 'anal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -270,7 +319,6 @@ end
 	
 if $ARGS[0] = 'gangbang' or $ARGS[0] = 'group':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -297,7 +345,6 @@ end
 	
 if $ARGS[0] = 'prostitution':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -326,7 +373,6 @@ end
 
 if $ARGS[0] = 'humiliation':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -349,7 +395,6 @@ end
 	
 if $ARGS[0] = 'swallow':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -372,7 +417,6 @@ end
 
 if $ARGS[0] = 'cum_inside':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	creampie_count = pcs_cp_safe_unknown + pcs_cp_notsafe_unknown + pcs_cp_risky_unknown
 		
@@ -397,7 +441,6 @@ end
 
 if $ARGS[0] = 'cum_inside_anal':
 	gs 'willpower', 'calc'
-	will_cost = 0
 		
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -421,7 +464,7 @@ end
 !! requires the skill to be named with the _lvl postfix
 if $ARGS[0] = 'skill':
 	gs 'willpower', 'calc'
-	will_cost = 0
+
 	if $ARGS[1] = 'resist' or $ARGS[1] = 'force' or $ARGS[1] = 'self':
 		if $ARGS[2] = 'inhib_lvl':
 			will_cost = (pcs_inhib + will_calc)/10
@@ -439,7 +482,6 @@ end
 		
 if $ARGS[0] = 'rape':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
@@ -458,7 +500,6 @@ end
 
 if $ARGS[0] = 'drink':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		will_cost = (60 - alcohol_exp * 40 + will_calc)/10
@@ -480,7 +521,6 @@ end
 !!Drug needs already included in the will_calc so just a small base cost here
 if $ARGS[0] = 'drugs':
 	gs 'willpower', 'calc'
-	will_cost = 0
 	
 	if $ARGS[1] = 'self':
 		will_cost = (100 - addictive_trait_lvl * 30 + will_calc)/10
@@ -497,7 +537,7 @@ end
 
 if $ARGS[0] = 'crime':
 	gs 'willpower', 'calc'
-	will_cost = 0
+
 	if $ARGS[0] = 'force':
 		will_cost = (80 - will_enforced + will_calc)/10
 	else
@@ -507,7 +547,7 @@ end
 
 if $ARGS[0] = 'exhib':
 	gs 'willpower', 'calc'
-	will_cost = 0		
+		
 	if $ARGS[1] = 'self':
 		will_cost = (100 - Exhibitionist_lvl * 20 - pcs_inhib/5 + will_calc)/10
 	elseif $ARGS[1] = 'force':
@@ -527,7 +567,6 @@ end
 !!Choose this if nothing else fits
 if $ARGS[0] = 'misc':
 	gs 'willpower', 'calc'
-	will_cost = 0
 
 	if $ARGS[1] = 'force':
 		if $ARGS[2] = 'easy':

+ 42 - 11
locations/zsoft_gopskverGorSlut.qsrc

@@ -110,7 +110,15 @@ if $ARGS[0] = '1':
 	'You just want a nice, cold beer and decide to take the initiative. You ask them: "Come on boys, why so rude? Surely you''ll give a nice lady a beer?" in a playful tone, taking a seductive pose and giving them your most <<$text_sveta_obol>> smile. The guys look and whisper some things, but <<$shultextrand33>> quickly grins and beckons you to come closer.' 
 	'You shake your hips and teasingly lick your parched <<$liptalk3>>, and for a second you wonder if you''re laying it on too thick as you approach the three guys. You can feel your mouth water when you see the cold beer they''re reaching out to you though.'
 	'<<$shultextrand33>> says <<$shultextrand6>>: "<<$shul_text_byh>>"'
-	act 'Leave':gt 'gskver', 'start'
+	gs 'willpower', 'misc', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Leave (<<will_cost>> Willpower)':
+		*clr & cla
+		gs 'willpower', 'pay', 'resist'
+		gs 'stat'
+	gt 'gskver', 'start'
+	else
+		act 'Leave (<font color="red"><<will_cost>> Willpower </font>)': '<br><font color="red"> You don''t have enough willpower to leave the boys.</font>'
 	act 'Have a beer with the guys':gt'zsoft_gopskverGorSlut','2'
 end
 
@@ -172,9 +180,14 @@ if $ARGS[0] = '2':
 	r_event_p=rand(1,100)
 	if r_event_p <= 15 and alko < 6:'The guys suggest: "Hey <<$pcs_nickname>>, show us your tits!" (<a href="exec:gt ''zsoft_gopskverGorSlut'',''siski''">Show them.</a>)'
 
-	if alko<6:act 'Leave':gt 'gskver', 'start'
-
-	if alko<6:act 'Drink some more with the guys':gt'zsoft_gopskverGorSlut','2'
+	gs 'willpower', 'drink', 'resist', 'hard'
+	!!Removed alko<6 from the 'leave' action below. 	
+	if will_cost <= pcs_willpwr:
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'gskver', 'start'
+	elseif will_cost > pcs_willpwr:
+		act 'Leave (<font color="red"><<will_cost>> Willpower</font>': '<br><font color="red">You don''t have enough willpower to leave.</font>'
+	if alko<6: act 'Drink some more with the guys': gt'zsoft_gopskverGorSlut','2'
+		
 	act 'Strike a sexy pose':
 		cls
 		minut += 2
@@ -251,7 +264,7 @@ if $ARGS[0] = '2':
 			gs 'boyStat', 'A10'
 			sexpartkno = 1
 			stat['bj'] += 1
-			if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+			if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 			dick = 17
 			minut += 5
 			pcs_horny += 2
@@ -273,7 +286,7 @@ if $ARGS[0] = '2':
 			gs 'boyStat', 'A11'
 			sexpartkno = 1
 			stat['bj'] += 1
-			if npcSex[11] = 0:npcSex[11] = 1 & guy += 1
+			if npc_Sex['A11'] = 0: npc_Sex['A11'] = 1 & guy += 1
 			dick = 15
 			minut += 5
 			pcs_horny += 1
@@ -296,7 +309,7 @@ if $ARGS[0] = '2':
 			gs 'boyStat', 'A9'
 			sexpartkno = 1
 			stat['bj'] += 1
-			if npcSex[9] = 0:npcSex[9] = 1 & guy += 1
+			if npc_Sex['A9'] = 0: npc_Sex['A9'] = 1 & guy += 1
 			dick = 18
 			minut += 5
 			pcs_horny += 1
@@ -379,11 +392,21 @@ if $ARGS[0] = '2':
 			You just want the torture to stop, and nod meekly. The guys pull you towards the bench, and pull you over it so your knees rest on the seat. Vasily takes place behind the bench and pulls the gag from your mouth, replacing it with his cock.
 			With your spirit broken from the rough treatment, you don''t know any better but to just open your mouth and let him in. Vasily gladly accepts your unspoken invitation, and immediately shoves his cock deeper down your throat and begins to fuck your mouth. It''s a little hard to breathe at first, but after a while you get into the rhythm and just let him fuck your throat while your saliva runs down your chin. Then he pulls his cock from your mouth and sits down on the bench, next to his friends and tells you: "Alright... that was fun, but there''s no reason why we should do all the work. Your turn now, <<$pcs_nickname>>. Make it good."'
 
+			gs 'willpower', 'misc', 'resist', 'hard'
 			rndpsos=rand(1,100)
 			if rndpsos>15:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/group/oral/o'+rand(1,33)+'.jpg"></center>
 			<<$gop_grup_oral_text>>'
 			if rndpsos<=15:'<<$gop_grup_event>>'
-			if rndpsos<=15: act 'Run away from them':gt 'gskver', 'start'	
+			if rndpsos<=15 and will_cost <= pcs_willpwr: 
+				act 'Run away from them (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+			gt 'gskver', 'start'
+			
+			else
+				act 'Run away from them (<font color="red"><will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to run away from them.</font>'
+				
 			if rndpsos>15:	
 				act 'Let them do what they want':
 					cls
@@ -392,7 +415,7 @@ if $ARGS[0] = '2':
 					stat['vaginal'] += 1
 					stat['anal'] +=1
 					gang +=1
-					if npcSex[10] = 0:npcSex[10] = 1 & guy += 1
+					if npc_Sex['A10'] = 0: npc_Sex['A10'] = 1 & guy += 1
 					pcs_horny += 5
 					minut += 5
 					gop_grup_eba = RAND(0,1)
@@ -444,14 +467,19 @@ if $ARGS[0] = 'piss':
 		act 'Go to the police station':schtraf = 500 & minut += 5 & katalkinNoexit = 1 & gt'katalkin'
 		act 'Say you can''t afford the fine':
 			*clr & cla
-			gs'stat'
+			gs 'willpower', 'bj', 'self'
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/pol2.jpg"></center>'
 			'You look at the policeman sadly and say: "I''m sorry sir, I can''t afford to pay that fine..."'
 			'One of the policemen says: "That is very unfortunate, but then we''ll have to stick to the protocol. We''ll take you to the police station, where we''ll fill out the documents and lock you up until someone in your family is willing to come pay the fine for you."'
 			'You don''t want that! Everyone in your family would know what you did if they called home! There''s probably something you could do, to get them to forget about your infraction...'
+			
 			act 'Go to the police station':schtraf = 500 & minut += 5 & katalkinNoexit = 1 & gt'katalkin'
-			act 'Give the policemen a blowjob':
+			
+			if will_cost <= pcs_willpwr:
+			act 'Persuade the policemen with a blowjob (<<will_cost>> Willpower)':
 				*clr & cla
+				gs 'willpower', 'pay', 'self'
 				gs 'npcgeneratec', 0, 'Policeman', rand(18,38)
 				gs 'boyStat', $npclastgenerated
 				pcs_horny += 5
@@ -478,6 +506,9 @@ if $ARGS[0] = 'piss':
 				'You hear them laugh as they walk away, while you wipe the cum from your eyes. They might have humiliated you a little, but at least no one else will know!'
 				act 'Leave':gt 'gskver', 'start'
 				act 'Return to the guys':gt'zsoft_gopskverGorSlut','2'
+			elseif will_cost > pcs_willpwr:
+				act 'Persuade the policemen with a blowjob (<font color="red"><<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to persuade the policeman.</font>'
+						
 			end
 		end
 	}

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