Browse Source

Merge remote-tracking branch 'upstream/master'

oldentree 5 years ago
parent
commit
265adf79d0
100 changed files with 4839 additions and 4387 deletions
  1. 1 0
      locations/AlbStarsWhore.qsrc
  2. 22 37
      locations/AnalPR.qsrc
  3. 38 46
      locations/BDsex.qsrc
  4. 35 34
      locations/BelSex.qsrc
  5. 2 2
      locations/Cheatmenu_din.qsrc
  6. 2 2
      locations/EndFight.qsrc
  7. 2 1
      locations/FedorEv.qsrc
  8. 119 101
      locations/FedorEv2.qsrc
  9. 270 235
      locations/FedorEv3.qsrc
  10. 302 227
      locations/FedorEv4.qsrc
  11. 12 2
      locations/FedorMisc.qsrc
  12. 8 8
      locations/FightCrouch.qsrc
  13. 6 6
      locations/FightE.qsrc
  14. 3 3
      locations/FightE1.qsrc
  15. 3 3
      locations/FightE2.qsrc
  16. 4 4
      locations/FightE3.qsrc
  17. 23 16
      locations/Gadbana.qsrc
  18. 2 2
      locations/Gadhouse.qsrc
  19. 3 2
      locations/IgorEv.qsrc
  20. 441 441
      locations/IgorHunter.qsrc
  21. 12 12
      locations/IrinaRoom.qsrc
  22. 1 0
      locations/JuliaMilGo.qsrc
  23. 9 14
      locations/JuliaMilVhod.qsrc
  24. 3 0
      locations/KatjaHomeTalk.qsrc
  25. 13 12
      locations/LBZhouse.qsrc
  26. 1 1
      locations/LCporn.qsrc
  27. 38 40
      locations/LariskaHome.qsrc
  28. 4 4
      locations/LariskaStart.qsrc
  29. 6 6
      locations/MartinSex.qsrc
  30. 1 1
      locations/MartinTalk.qsrc
  31. 0 607
      locations/NatBelHome.qsrc
  32. 0 25
      locations/NatBelVhod.qsrc
  33. 3 3
      locations/NikoDates.qsrc
  34. 4 4
      locations/NikoDreams.qsrc
  35. 6 20
      locations/NormPR.qsrc
  36. 32 27
      locations/ParChurch2.qsrc
  37. 64 14
      locations/Prostitute.qsrc
  38. 1 1
      locations/RoundEnd.qsrc
  39. 1 1
      locations/Snpc.qsrc
  40. 1 1
      locations/SubLoss.qsrc
  41. 1 1
      locations/SubWin.qsrc
  42. 10 2
      locations/Vnlake1.qsrc
  43. 9 1
      locations/Vnlake2.qsrc
  44. 10 2
      locations/VoltrenerSexShower.qsrc
  45. 100 63
      locations/WorkHosp.qsrc
  46. 19 8
      locations/abduction.qsrc
  47. 504 394
      locations/albinahome.qsrc
  48. 1 0
      locations/anushapt.qsrc
  49. 2 3
      locations/artemEv.qsrc
  50. 6 6
      locations/artgar.qsrc
  51. 14 13
      locations/backwater.qsrc
  52. 20 2
      locations/bass.qsrc
  53. 72 0
      locations/beg1.qsrc
  54. 5 5
      locations/bicycle.qsrc
  55. 6 10
      locations/blowPR.qsrc
  56. 17 13
      locations/brothel.qsrc
  57. 12 11
      locations/brother_voyeur.qsrc
  58. 42 39
      locations/buklinik_event.qsrc
  59. 1 1
      locations/burger.qsrc
  60. 74 32
      locations/cikl.qsrc
  61. 102 76
      locations/dateM.qsrc
  62. 1 1
      locations/dimaEv.qsrc
  63. 423 338
      locations/dimaHome.qsrc
  64. 91 115
      locations/dimaRevenge.qsrc
  65. 7 7
      locations/din_pav.qsrc
  66. 41 28
      locations/din_van.qsrc
  67. 6 6
      locations/dinnpc.qsrc
  68. 1 1
      locations/dvor.qsrc
  69. 11 5
      locations/etoexhib.qsrc
  70. 530 263
      locations/fight.qsrc
  71. 3 3
      locations/fight1.qsrc
  72. 3 3
      locations/fight2.qsrc
  73. 5 5
      locations/fight3.qsrc
  74. 6 6
      locations/fightFW.qsrc
  75. 31 27
      locations/fit.qsrc
  76. 144 133
      locations/foto.qsrc
  77. 19 19
      locations/foto_models.qsrc
  78. 1 0
      locations/gadmarket.qsrc
  79. 2 1
      locations/gaptek.qsrc
  80. 22 17
      locations/gdksport.qsrc
  81. 3 3
      locations/gevent.qsrc
  82. 8 8
      locations/gopskver.qsrc
  83. 10 5
      locations/gpoli.qsrc
  84. 9 9
      locations/grigory.qsrc
  85. 153 178
      locations/gschool_boys_bathroom.qsrc
  86. 1 4
      locations/gschool_break.qsrc
  87. 37 37
      locations/gschool_chats1.qsrc
  88. 36 35
      locations/gschool_chats2.qsrc
  89. 12 11
      locations/gschool_chats3.qsrc
  90. 5 25
      locations/gschool_detention.qsrc
  91. 61 38
      locations/gschool_events.qsrc
  92. 16 49
      locations/gschool_girls_bathroom.qsrc
  93. 141 87
      locations/gschool_grounds.qsrc
  94. 42 67
      locations/gschool_lessons1.qsrc
  95. 28 20
      locations/gschool_lessons2.qsrc
  96. 5 5
      locations/gschool_lessonsev1.qsrc
  97. 201 30
      locations/gschool_randperson.qsrc
  98. 3 3
      locations/gschool_sex.qsrc
  99. 195 147
      locations/gschool_socialchg.qsrc
  100. 1 1
      locations/hairsalon.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'

+ 38 - 46
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'
@@ -277,7 +278,7 @@ if $ARGS[0] = 'hj':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					gs 'cum_manage'
 					protect = 0
 					if sexcontra = 4:
@@ -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)
 
@@ -380,7 +381,7 @@ if $ARGS[0] = 'minet':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					'<<$boydesc>> finishes, filling the condom with his cum.'
 					protect = 0
 					sexcontra = 0
@@ -390,9 +391,9 @@ if $ARGS[0] = 'minet':
 					'<<$boydesc>> finished all over your hands covering them in hot and sticky cum.'
 					spafinloc = 13
 					sexpartkno = 1
-					gs 'cum_manage'	
+					gs 'cum_manage'
 					gs 'arousal', 'end'
-					gs 'stat'				
+					gs 'stat'
 				end
 				act 'Leave':gt 'BDsex', 'end'
 			end
@@ -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)
 
@@ -446,7 +447,7 @@ if $ARGS[0] = 'minet':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					'<<$boydesc>> finishes, filling the condom with his cum.'
 					protect = 0
 					sexcontra = 0
@@ -471,7 +472,7 @@ if $ARGS[0] = 'facial':
 	minut += 3
 	picrand = rand(11, 15)
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
-	if protect = 1: 
+	if protect = 1:
 		'<<$boydesc>> finishes, filling the condom with his cum.'
 		protect = 0
 		sexcontra = 0
@@ -481,7 +482,7 @@ if $ARGS[0] = 'facial':
 		sexpartkno = 1
 		gs 'cum_manage'
 	end
-	gs 'stat'			
+	gs 'stat'
 	act 'Brush up':gt 'BDsex', 'end'
 end
 
@@ -489,7 +490,7 @@ if $ARGS[0] = 'swallow':
 	minut += 3
 	picrand = rand(20, 29)
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<picrand>>.jpg"></center>'
-	if protect = 1: 
+	if protect = 1:
 		'<<$boydesc>> finishes, and you feel the condom balloon up in your mouth.'
 		protect = 0
 		sexcontra = 0
@@ -500,7 +501,7 @@ if $ARGS[0] = 'swallow':
 		gs 'cum_manage'
 		swallow += 1
 	end
-	gs 'stat'			
+	gs 'stat'
 	act 'Brush up':gt 'BDsex', 'end'
 end
 
@@ -542,6 +543,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
+		noShampoo = 1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You go into the bathroom and turn on the shower, lathering body and washing as well as you can.'
@@ -590,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'
@@ -670,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
 
@@ -740,7 +734,6 @@ if $ARGS[0] = 'cum':
 			gs 'arousal', 'end'
 			gs 'stat'
 			pcs_mood -= 15
-			pcs_willpwr -= 15
 			gs 'cuminsidereact'
 		elseif finrand = 1:
 			!!out
@@ -806,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
@@ -837,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
@@ -874,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

+ 35 - 34
locations/BelSex.qsrc

@@ -13,12 +13,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'sex':
 
 	belact = rand(1,3)
 	'You suck <<$boydesc>>''s tongue as he kisses you, doing your best to please him in any way you can... because who knows what he''ll do if you don''t. He crudely kneads your butt and upper thighs, grabbing your ass cheeks and slapping them, making your ass cheeks jiggle.'
-	
+
 	gs 'arousal', 'kiss', 5, 'sub', 'prostitution'
 	gs 'arousal', 'foreplay', 5, 'sub', 'prostitution'
 	minut -= 5
 	gs 'stat'
-	
+
 	belybj = rand(0,2)
 	if belybj = 0:
 		'<<$boydesc>> puts his large hands on your shoulders and forces you downwards. Even though you''re trying to cooperate and drop to your knees as soon as you realize what he wants, he''s still kind of rough with you. "Start sucking, <<$pcs_nickname>>."'
@@ -42,7 +42,7 @@ if $ARGS[0] = 'bj1':
 
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution', 'deepthroat'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'<<$boydesc>> groans, clearly enjoying himself. He stands up, grabs you by the hair, and begins fucking your mouth. "Wider, you little slut, I don''t want to feel any teeth."'
 		'Not daring making him more upset you make sure your teeth don''t get in the way and open your mouth as wider.'
@@ -89,7 +89,7 @@ if $ARGS[0] = 'bj2':
 
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'Your tongue is giving every bit of his cock it can reach its attention as you bob your head back and forth.'
 		'Your lust takes over and you take him as deep into your mouth as you can, keeping him there until you start to gag and have to come up for air. Taking few breaths to recover, you take him inside again, rapidly moving your head, sucking and deepthroating him for all you''re worth.'
@@ -122,7 +122,7 @@ if $ARGS[0] = 'bj2':
 		else
 			'<<$boydesc>> lies down on his back and begins playing with his cock waiting for you to straddle him.'
 			act 'Ride him':gt 'BelSex', 'cowgirl'
-		end 
+		end
 	end
 end
 
@@ -133,10 +133,10 @@ if $ARGS[0] = 'bj3':
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<picrand>>.mp4"></video></center>'
 	'"Get down on your knees!" he commands. Unfazed by his boldness, you kneel down in front of him and lick up and down his length a few times before you take his <<dick>> cm cock into your mouth. As his cock enters, a rank odor enters your nostrils. You disregard the nasty aroma and begin moving your tongue around the head and you suck his dick as you start bobbing your head up and down while your hands take turns playing with his hairy balls. It''s hard for you to decide whether you want to move slowly and tease him, or speed up to avoid getting caught, but what you are doing seems to be to his liking.'
 	'"Good girl", he whispers, "I knew you could suck cock as soon as I saw you." His praise causes you to smile a little around his dick and you take him a little deeper in response.'
-	
+
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution', 'deepthroat'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'<<$boydesc>> is grimacing, enjoying himself. He is sitting down, letting you do all the work. Encouraged, you take his cock deeper, trying to hold it down as long as possible.'
 		'"Good girl, keep on sucking my cock." All of a sudden his cock gets stiffer and he pulls out of your mouth. "I''m ready to cum..." You move your head towards his cock but he stops you...'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'bj3':
 			belsexpayment = 300
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum<<picrand>>.mp4"></video></center>'
 			'Instead, <<$boydesc>> starts jerking off, telling you "I''ll be done soon, <<$pcs_nickname>>. I want you to swallow every little drop." He doesn''t last much longer and cums all over your face.'
-			'He squeezes the last few drops of sperm into your mouth and then sticks his dick in your mouth. You swallow his cum obediently and then suck his dick clean, licking every tasty inch of it you can reach. Once he goes soft in your mouth, he pulls out his cock.' 
+			'He squeezes the last few drops of sperm into your mouth and then sticks his dick in your mouth. You swallow his cum obediently and then suck his dick clean, licking every tasty inch of it you can reach. Once he goes soft in your mouth, he pulls out his cock.'
 			swallow += 1
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -181,10 +181,10 @@ if $ARGS[0] = 'vaginal1':
 	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. You land on your back, as he quickly moves in, you spread your legs. He starts touching your pussy lips with his fat fingers, you let out a moan as he penetrates you with his finger.'
 	'"That''s enough, you''re all wet and ready now." he says. He grabs hold of his penis slowly slides his member into your wet cunt, softly parting your nether lips. As your pussy walls envelops his cock you let out a soft moan.'
 	'Hanging over you, looking into your eyes he starts build up quite a bit of speed. "You''re a pretty good fuck <<$pcs_nickname>>, but I''ve had better." he says as his sweat drips all over you.'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'vaginal1':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan; "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -213,13 +213,13 @@ if $ARGS[0] = 'vaginal2':
 	sex_temp += 1
 	picrand = rand(0,7)
 	'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<picrand>>.mp4"></video></center>'
-	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. His cock, well greased from the blowjob, easily slides into your pussy.' 
+	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. His cock, well greased from the blowjob, easily slides into your pussy.'
 	'You feel his glans stretching the inner walls of your pussy and you let out a loud moan with each penetration. As he keeps fucking you it doesn''t take long before you get accustomed to his movements.'
 	'"Let''s see how deep I can go," he says as he rams his cock so deep that your pubes touch. You scream out loud, breathing fast and heavily and he continues pounding you.'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'vaginal2':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -251,10 +251,10 @@ if $ARGS[0] = 'doggy':
 	'With his cock rock hard and nicely wet he lifts your body, turns you around, and tells you to get on all fours on the floor. He gets down on his knees. Streching your butt cheeks slowly, he runs his shaft along your wet pussy, teasing you, all of a sudden he shoves his cock into your pussy and starts pounding away, not caring about your enjoyment. He just wants to fuck.'
 	'Holding you by the hips, he pounds on without slowing the pace, only occasionally stopping to catch a breath. "Isn''t he going to slow down soon?" you think to yourself. But you''ve underestimated him, instead he grabs your hair and pushes himself even deeper inside.'
 	'You moan loudly as he rams his cock deeper and deeper. You hear him panting and grunting he must''ve reached his limit...'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'doggy':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -286,11 +286,11 @@ if $ARGS[0] = 'cowgirl':
 	'<<$boydesc>> lies on the bed. He smirks as he tells you that you''ll be doing all the work today. You look at him, still a bit confused after the blowjob you''ve given him. Wasn''t that enough? "Don''t waste my time <<$pcs_nickname>>. Come here!" Not daring to do upset him even more, you crawl on top of <<$boydesc>> and guide his cock inside your vagina.'
 	'He grabs your hips, controlling the rhythm as you to ride him. He wants it fast. Fast, deep and hard, without any regard to you, or that he actually bumps into your cervix in this position. You keep riding him at the same rhythm as he moves his hands grabbing you breasts instead.'
 	'Unable to think of anything but the pleasure, you moan so loudly that you are almost screaming. Wanting to ride out this intense feeling, you completely forget that you''re supposed to please <<$boydesc>> as you orgasm while riding him.'
-	
-	$orgasm_or = 'yes' 
+
+	$orgasm_or = 'yes'
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'cowgirl':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -320,10 +320,10 @@ if $ARGS[0] = 'anal1':
 	'<center><video autoplay loop src="images/shared/sex/anal/piledriver/kotovsexanal36.mp4"></video></center>'
 	'<<$boydesc>> begins rubbing the tip of his dick against you anus. Before you can even protest, his <<dick>> cm cock has already painfully penetrated your ass. You instinctively want to flinch away, but he grabs your hips with surprising strength and forces his dick as far into your ass as he can... before he starts hammering away.'
 	'"All the other girls I''ve fucked over the years loved getting their ass destroyed," he informs you between slaps of flesh against flesh. "I hope you don''t mind." The only response you manage to let out is a little squeak as if you''re giving him permission to continue on, not that he needs it.'
-	
+
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution', 'rough'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'anal1':
 		picrand = rand(1,2)
 		'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal<<picrand>>.mp4"></video></center>'
 		'You can tell <<$boydesc>> is close to his orgasm. He huffs and puffs quite heavily now. Seconds later he firmly grabs your hips, his movements more erratic, and you feel his cock spasming inside you as he shoots his cum deep inside your asshole. The cum feels kind of warm inside you, and it slowly dribbles from you asshole once he pulls out his cock.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -343,17 +343,17 @@ if $ARGS[0] = 'anal2':
 	'<center><video autoplay loop src="images/shared/sex/anal/cowgirl/kotovsexanal<<picrand>>.mp4"></video></center>'
 	'<<$boydesc>> lies on the bed, as you climb on top of him. <<$boydesc>> grabs hold of his cock, guiding his cock inside your tight anus.'
 	'You gasp as you start moving back and forth, controlling the rhythm as you ride him. First, slowly, as you adjust yourself. Soon enough you''re speeding up: fast, deep, and hard. You feel a sharp pain that quickly turns into a pleasant ache. You keep riding him at the same pace as he begins panting more and more.'
-	
+
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
 		belsexpayment = 600
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/analcum.jpg"></center>'
 		'You can tell <<$boydesc>> is close to his orgasm. His cock is stiff and has gotten larger inside your anus. Seconds later he firmly grabs your hips and you feel his cock spasming inside you as he shoots his cum deep inside your asshole. The cum feels kind of warm inside you, and it slowly dribbles out as you get up off of him.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -368,14 +368,14 @@ if $ARGS[0] = 'analdoggy':
 
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
 		belsexpayment = 600
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/kafeanpie.jpg"></center>'
 		'You''re at your limit and just as you want to beg him to take it easier, you feel him twitching behind you. All of a sudden you feel his warm cum shooting inside you. It slowly dribbles down your thighs as he pulls out of you.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -384,6 +384,7 @@ if $ARGS[0] = 'shower':
 	'<<$boydesc>> is finally done with you. He looks at you all pleased as you get up and head off to the bathroom to take a quick shower and freshen up.'
 	act 'Take a 15 minute shower':
 		cls
+		noShampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pav_prostitute += 1
@@ -400,7 +401,7 @@ if $ARGS[0] = 'shower':
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-	
+
 			if belgangPay <= 0:
 				money += belsexpayment
 				'Vadim looks at you and says: "That was a good fuck, <<$pcs_nickname>>. Here, this is for you," and with those words he hands you <<belsexpayment>> <b>₽</b>.'
@@ -417,12 +418,12 @@ if $ARGS[0] = 'shower':
 					'You have reduced your next weeks payment by: <<-1*belgangPayWeek>> <b>₽</b>'
 				end
 			end
-						
+
 			if $clothingworntype = 'swimwear': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-								
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': gt $loc
 		end
 	end

+ 2 - 2
locations/Cheatmenu_din.qsrc

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

+ 2 - 2
locations/EndFight.qsrc

@@ -33,7 +33,7 @@
 	!!you lost surrender
 !!end
 
-!!act '...':gt $loc
+!!act 'Finish':gt $loc
 
 !!if Ku > Kb:
 !!	if Ku > Kz:Uteh[1] += 10
@@ -145,7 +145,7 @@ elseif resultFight = 4:
 	SubLoss[a] += 1
 end
 
-act '...':gt $loc
+act 'Finish':gt $loc
 
 --- EndFight ---------------------------------
 

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

+ 119 - 101
locations/FedorEv2.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'Park Walk':
 	act 'I would love too.':
 		*clr & cla
 		pcs_mood += 5
-		pcs_willpwr += 5
+		!pcs_willpwr += 5
 		minut += 5
 		FedorLuv += 1						
 		gs'stat'
@@ -39,25 +39,31 @@ if $ARGS[0] = 'Park Walk':
 		'"That sounds like fun" Fedor then leads you to the swing and after you sit down Fedor grabs your waist firmly and gives you a light push and as you continue to swing he slowly increases the pace. After you have a good pace going then Fedor stands in front of you watching you swing while encouraging you to swing higher.'	
 		
 		if $pantyworntype = 'none':
-			act 'Flash Fedor':
-				*clr & cla
-				pcs_mood += 5
-				pcs_willpwr += 5
-				FedorLuv += 2
-				gs'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/swingflash.mp4"></video></center>'
-				'While swinging, you give Fedor a seductive grin, as you spread your legs after each swing, giving Fedor a close up of your vagina which gives you a rush of excitement. You can see a shocked look on Fedor''s face which soon turns to a very pleased grin, "<<$pcs_nickname>> you little minx." You then slide off the swing, landing on your feet and walk past Fedor, giving him a seductive wink while taking his hand and continuing your walk together.'
-				gs 'arousal', 'flash', 5
-				gs 'arousal', 'end'	
-				gs'stat'
-							
-				act 'Finish your walk':gt 'FedorEv2', 'Train Tracks'
-			end	
+			gs 'willpower', 'exhib', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Flash Fedor (<<will_cost>> Willpower)': 
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					pcs_mood += 5
+					!pcs_willpwr += 5
+					FedorLuv += 2
+					gs'stat'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/swingflash.mp4"></video></center>'
+					'While swinging, you give Fedor a seductive grin, as you spread your legs after each swing, giving Fedor a close up of your vagina which gives you a rush of excitement. You can see a shocked look on Fedor''s face which soon turns to a very pleased grin, "<<$pcs_nickname>> you little minx." You then slide off the swing, landing on your feet and walk past Fedor, giving him a seductive wink while taking his hand and continuing your walk together.'
+					gs 'arousal', 'flash', 5
+					gs 'arousal', 'end'	
+					gs'stat'
+								
+					act 'Finish your walk':gt 'FedorEv2', 'Train Tracks'
+				end	
+			else
+				act 'Flash Fedor (<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 'Ask Fedor to swing with you':
 			*clr & cla
 			pcs_mood += 5
-			pcs_willpwr += 5
+			!pcs_willpwr += 5
 			FedorLuv += 1
 			minut += 10
 			gs'stat'
@@ -83,7 +89,7 @@ if $ARGS[0] = 'Train Tracks':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 5
-	pcs_willpwr += 5
+	!pcs_willpwr += 5
 	minut += 20
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/tracks.jpg"></center>'
@@ -94,7 +100,7 @@ if $ARGS[0] = 'Train Tracks':
 	act 'Kiss Fedor':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		FedorLuv += 2			
 		gs 'boyStat', 'A5'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/kiss.jpg"></center>'
@@ -108,7 +114,7 @@ if $ARGS[0] = 'Train Tracks':
 	act 'Offer him your hand':
 		*clr & cla
 		pcs_mood += 10
-		pcs_willpwr += 10
+		!pcs_willpwr += 10
 		minut += 10
 		FedorLuv -= 2			
 		gs'stat'
@@ -131,7 +137,7 @@ if $ARGS[0] = 'Movies':
 	act 'Hold hands':
 		*clr & cla
 		pcs_mood += 5
-		pcs_willpwr += 5
+		!pcs_willpwr += 5
 		FedorLuv += 1				
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/handkiss.jpg"></center>'
@@ -170,7 +176,7 @@ if $ARGS[0] = 'Cinema':
 			*clr & cla
 			pcs_health += 10
 			pcs_mood += 20
-			pcs_willpwr += 20
+			!pcs_willpwr += 20
 			pcs_energy += 20
 			pcs_hydra += 50
 			cumspclnt = 2
@@ -194,7 +200,7 @@ if $ARGS[0] = 'Cinema':
 			*clr & cla
 			pcs_health += 10
 			pcs_mood += 20
-			pcs_willpwr += 20
+			!pcs_willpwr += 20
 			fat += 1
 			pcs_energy += 30
 			pcs_hydra += 80
@@ -214,7 +220,7 @@ if $ARGS[0] = 'Movies 2':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 20
-	pcs_willpwr += 20
+	!pcs_willpwr += 20
 	minut += 60
 	gs'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/scare.mp4"></video></center>'
@@ -224,7 +230,7 @@ if $ARGS[0] = 'Movies 2':
 	act 'Kiss him':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		FedorLuv += 2				
 		gs 'boyStat', 'A5'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/scarekiss.mp4"></video></center>'
@@ -232,29 +238,35 @@ if $ARGS[0] = 'Movies 2':
 		gs 'arousal', 'kiss', 5	
 		gs'stat'
 
-		act 'Unzip his pants':
-			*clr & cla				
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinosex3.jpg"></center>'
-			'You slowly turn back to Fedor and notice that he forgot to zip his pants and you can see his underwear poking out, so you slowly reach out to zip it for him when you feel sudden excitement as your hand is over his crootch and with out thinking you reach into his pants and start rubbing on his penis. You can feel how rock hard his cock is and unable to stop yourself you start jerking him off hearing him softly moan. You then look up to him to see him biting his lip trying not to make to much noise.'
-			
-			act 'Continue jerking him':
-				*clr & cla
-				pcs_mood += 20
-				pcs_willpwr += 20
-				FedorLuv += 3
-				pcs_dom += 3						
+		gs 'willpower', 'hj', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Unzip his pants (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
+				*clr & cla				
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/hj.jpg"></center>'
-				'Feeling his warm penis in your hand and seeing his expression just fills you with excitement and a sense of power as you are in full control his pleasure. You continue to jerk him off as you admire the look of pleasure in his face and the slow throbbing of his cock. Soon Fedor''s head slams back in his chair and he lets out a muffled groan as his cock starts rapidly throbbing and erupting squirt after squire of semen on your pants and hands. Fedor lays back motionlessly for a few seconds then turns to you with a very satisfied look on his face, he leans toward you and kiss you on the cheek as he whispers "Wow <<$pcs_nickname>>, You are the best." then leans back in his chair, zipping his pants.'
-				gs 'arousal', 'hj', 5, 'dom'
-				gs 'cum_call', 'clothesgroin', $boy, 1 
-				gs 'cum_call', 'hands', $boy, 1						
-				gs 'arousal', 'end'
-				gs 'stat'						
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinosex3.jpg"></center>'
+				'You slowly turn back to Fedor and notice that he forgot to zip his pants and you can see his underwear poking out, so you slowly reach out to zip it for him when you feel sudden excitement as your hand is over his crootch and with out thinking you reach into his pants and start rubbing on his penis. You can feel how rock hard his cock is and unable to stop yourself you start jerking him off hearing him softly moan. You then look up to him to see him biting his lip trying not to make to much noise.'
 				
-				act 'Finish watching movie':gt 'FedorEv2', 'Movie 3'
-			end	
+				act 'Continue jerking him':
+					*clr & cla
+					pcs_mood += 20
+					!pcs_willpwr += 20
+					FedorLuv += 3
+					!pcs_dom += 3						
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/hj.jpg"></center>'
+					'Feeling his warm penis in your hand and seeing his expression just fills you with excitement and a sense of power as you are in full control his pleasure. You continue to jerk him off as you admire the look of pleasure in his face and the slow throbbing of his cock. Soon Fedor''s head slams back in his chair and he lets out a muffled groan as his cock starts rapidly throbbing and erupting squirt after squire of semen on your pants and hands. Fedor lays back motionlessly for a few seconds then turns to you with a very satisfied look on his face, he leans toward you and kiss you on the cheek as he whispers "Wow <<$pcs_nickname>>, You are the best." then leans back in his chair, zipping his pants.'
+					gs 'arousal', 'hj', 5, 'dom'
+					gs 'cum_call', 'clothesgroin', $boy, 1 
+					gs 'cum_call', 'hands', $boy, 1						
+					gs 'arousal', 'end'
+					gs 'stat'						
+					
+					act 'Finish watching movie':gt 'FedorEv2', 'Movie 3'
+				end	
+			end
+		else
+			act 'Unzip his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Finish watching movie':gt 'FedorEv2', 'Movie 3'
 	end
@@ -273,7 +285,7 @@ if $ARGS[0] = 'Movie 3':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 20
-	pcs_willpwr += 20
+	!pcs_willpwr += 20
 	minut += 30
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/seat2.jpg"></center>'
@@ -294,7 +306,7 @@ if $ARGS[0] = 'Movie 4':
 	act 'Kiss Fedor':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		FedorLuv += 3				
 		gs 'boyStat', 'A5'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endkiss.mp4"></video></center>'
@@ -338,7 +350,7 @@ if $ARGS[0] = 'Home':
 			minut += 90
 			pcs_health += 15	
 			pcs_mood += 40
-			pcs_willpwr += 40
+			!pcs_willpwr += 40
 			fat += 2
 			pcs_energy += 90
 			pcs_hydra += 60
@@ -507,7 +519,7 @@ if $ARGS[0] = 'Virgin Sex':
 						gs 'cum_call', 'stomach', $boy, 1
 						gs'stat'			
 						
-						act 'Shower':gt 'FedorEv2', 'Wash Up'
+						act 'Take a shower':gt 'FedorEv2', 'Wash Up'
 					end					
 				end				
 			end			
@@ -564,7 +576,7 @@ if $ARGS[0] = 'Wash Up':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 25
-	pcs_willpwr += 25
+	!pcs_willpwr += 25
 	if pcs_health < 100:pcs_health = 100
 	sweat = 7 + rand(0,4)
 	hapri = 1
@@ -654,7 +666,7 @@ if $ARGS[0] = 'Trip':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 10
-	pcs_willpwr += 10
+	!pcs_willpwr += 10
 	minut += 50
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/skate/skate1.jpg"></center>'
@@ -671,7 +683,7 @@ if $ARGS[0] = 'No Trip':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 15
-	pcs_willpwr += 15
+	!pcs_willpwr += 15
 	minut += 50
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/skate/skate3.jpg"></center>'
@@ -688,7 +700,7 @@ if $ARGS[0] = 'Skate Kiss':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 20
-	pcs_willpwr += 20
+	!pcs_willpwr += 20
 	gs 'boyStat', 'A5'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/skate/kiss.jpg"></center>'
 	'You slow down the speed of your skating then turn to face Fedor and look into his eyes. You slowly lean your head forward toward his as he does the same. After a second you feel his lips pressed against yours. You and Fedor enjoy a long kiss. After a minute you both pull away from each other then Fedor says, "I had a great time with you <<$pcs_firstname>>. would you like me to walk you home or will you be fine on your own?"'
@@ -705,7 +717,7 @@ if $ARGS[0] = 'Skate End':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 10
-	pcs_willpwr += 10
+	!pcs_willpwr += 10
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/skate/skate5.jpg"></center>'
@@ -753,7 +765,7 @@ if $ARGS[0] = 'Park 2':
 			act 'Kiss Fedor':	
 				*clr & cla
 				pcs_mood += 20
-				pcs_willpwr += 20
+				!pcs_willpwr += 20
 				FedorLuv += 2
 				gs 'boyStat', 'A5'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/swing2.jpg"></center>'
@@ -769,7 +781,7 @@ if $ARGS[0] = 'Park 2':
 			act 'Take his hand':	
 				*clr & cla
 				pcs_mood += 15
-				pcs_willpwr += 15
+				!pcs_willpwr += 15
 				minut += 10
 				gs'stat'
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
@@ -795,7 +807,7 @@ if $ARGS[0] = 'Park 2':
 			act 'Kiss Fedor':	
 				*clr & cla
 				pcs_mood += 20
-				pcs_willpwr += 20
+				!pcs_willpwr += 20
 				FedorLuv += 2
 				gs 'boyStat', 'A5'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/swing4.jpg"></center>'
@@ -811,7 +823,7 @@ if $ARGS[0] = 'Park 2':
 			act 'Hug Fedor':	
 				*clr & cla
 				pcs_mood += 15
-				pcs_willpwr += 15
+				!pcs_willpwr += 15
 				FedorLuv += 1
 				minut += 10
 				gs'stat'
@@ -863,7 +875,7 @@ if $ARGS[0] = 'Park 2':
 		act 'Kiss Fedor':	
 			*clr & cla
 			pcs_mood += 20
-			pcs_willpwr += 20
+			!pcs_willpwr += 20
 			gs 'boyStat', 'A5'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/tree2.jpg"></center>'
 			'You and Fedor relax for a few minutes, chatting until you turn around to face Fedor then stare deep into his eyes for a few seconds before leaning forward to kiss him. Your lips press against Fedor''s as his tongue wanders into your mouth. You caress Fedor''s tongue with yours while enjoying his strong arms wraped around your waist. After kissing for a few minutes, Fedor pulls away then whispers "<<$pcs_firstname>> you are the sweetest girl I know and the hotest one as well." you give him a quick kiss before responding "You''re such a charmer." Fedor smiles as he gives you another kiss. "I better take you home before it gets too late or would you rather stay here?"'
@@ -879,7 +891,7 @@ if $ARGS[0] = 'Park 2':
 			*clr & cla
 			minut += 15
 			pcs_mood += 15
-			pcs_willpwr += 15
+			!pcs_willpwr += 15
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/tree1.jpg"></center>'
 			'You lay back, leaning against Fedor, feeling his heart beating as you both discuss current events for a few minutes. After you both feel fully rested, Fedor leans over your shoulder and tells you "It''s really good to just relax sometimes isn''t it?" you respond, "Sure is. I had a great time hanging out with you Fyodor." Redor gives you a smile as he responds, "Yeah we should do this again sometime. Are you ready to head home or would you like to stay here a bit longer?"'
@@ -888,56 +900,62 @@ if $ARGS[0] = 'Park 2':
 			
 			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
 		end
-		act 'Unzip his pants':	
-			*clr & cla
-			gs 'boyStat', 'A5'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/tree2.jpg"></center>'
-			'Fedor lays back against a tree as you sit next to him. You reach down and begin rubbing on his crotch and Fedor immediately looks up at you with a mischievous smile on his face. "In a public park? What a naughty girl you are." he then leans his head forward kissing your lips as you begin unbuttoning his pants.'
-			gs 'arousal', 'foreplay_give', 5, 'dom'
-			gs 'arousal', 'end'	
-			gs'stat'		
-			
-			act 'Continue':	
+		gs 'willpower', 'bj', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Unzip his pants (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'self'
 				*clr & cla
-				gs'stat'
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/sex/bj2.mp4"></video></center>'
-				'You give Fedor a seductive wink as you unbutton his pants then begin jerking his penis while staring him in the eyes before leaning forward and taking his dick into your mouth, caressing it with your tongue, trying your very best to bring him as much pleasure as you can while enjoying the warmth of his penis in your mouth. Fedor tries to stifle his moans as he occasionally looks around to see if anyone has noticed you. After a few more seconds Fedor whispers to you "I can''t last much longer. I''m gonna cum."'
-				gs 'arousal', 'bj', 10, 'dom'
+				gs 'boyStat', 'A5'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/tree2.jpg"></center>'
+				'Fedor lays back against a tree as you sit next to him. You reach down and begin rubbing on his crotch and Fedor immediately looks up at you with a mischievous smile on his face. "In a public park? What a naughty girl you are." he then leans his head forward kissing your lips as you begin unbuttoning his pants.'
+				gs 'arousal', 'foreplay_give', 5, 'dom'
 				gs 'arousal', 'end'	
 				gs'stat'		
 				
-				act 'Make him cum':	
+				act 'Continue':	
 					*clr & cla
-					pcs_mood += 20
-					pcs_willpwr += 20
-					FedorLuv += 4
 					gs'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj3.mp4"></video></center>'
-					'You give Fedor a wink as you continue sucking on his dick at an increased pace. Fedor tilts his head back then bites his lips as you feel a stream of warm cum filling your mouth and shooting down your throut, you begin swallowing every drop of Fedor''s cum as you stare up at him, enjoying the twitching of his body as he cums in your mouth. After a few seconds Fedor''s body eases as he leans his head against the tree behind him. He then looks down to you. "That was incredible <<$pcs_nickname>>. Thank you." you give Fedor a wink as you respond, "I know how to keep my man satisfed and maybe someday you will be <b>MY MAN</b>." Fedor smiles as he responds, "I better try real hard then." and you give Fedor a seductive wink. Fedor zips his pants then sits up and asks "Are you ready to go home or would you like to remain here?"'	
-					gs 'arousal', 'bj', 5, 'dom'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/sex/bj2.mp4"></video></center>'
+					'You give Fedor a seductive wink as you unbutton his pants then begin jerking his penis while staring him in the eyes before leaning forward and taking his dick into your mouth, caressing it with your tongue, trying your very best to bring him as much pleasure as you can while enjoying the warmth of his penis in your mouth. Fedor tries to stifle his moans as he occasionally looks around to see if anyone has noticed you. After a few more seconds Fedor whispers to you "I can''t last much longer. I''m gonna cum."'
+					gs 'arousal', 'bj', 10, 'dom'
 					gs 'arousal', 'end'	
-					gs 'boyStat', 'A5'
-					gs 'cum_call', 'mouth', $boy, 1	
 					gs'stat'		
 					
-					act 'Take me home':gt 'FedorEv2', 'Park End'
-					
-					act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
-				end
-				act 'Stop before he cums':	
-					*clr & cla
-					minut += 5
-					FedorLuv -= 5
-					gs'stat'
-					'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
-					'You pull away from him and say, "I would rather not get any cum on me right now." Fedor looks at you with a surprised look on his face. "C''mon <<$pcs_firstname>>, You can''t stop now." you give him a confident grin. "Maybe I''ll give you one later but for now I need to head home. See you later Fedor." You then get up and leave the park.'	
-					*nl
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
-					
-					act 'Leave':minut += 15 & gt 'pavResidential'
-				end						
-			end	
+					act 'Make him cum':	
+						*clr & cla
+						pcs_mood += 20
+						!pcs_willpwr += 20
+						FedorLuv += 4
+						gs'stat'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj3.mp4"></video></center>'
+						'You give Fedor a wink as you continue sucking on his dick at an increased pace. Fedor tilts his head back then bites his lips as you feel a stream of warm cum filling your mouth and shooting down your throut, you begin swallowing every drop of Fedor''s cum as you stare up at him, enjoying the twitching of his body as he cums in your mouth. After a few seconds Fedor''s body eases as he leans his head against the tree behind him. He then looks down to you. "That was incredible <<$pcs_nickname>>. Thank you." you give Fedor a wink as you respond, "I know how to keep my man satisfed and maybe someday you will be <b>MY MAN</b>." Fedor smiles as he responds, "I better try real hard then." and you give Fedor a seductive wink. Fedor zips his pants then sits up and asks "Are you ready to go home or would you like to remain here?"'	
+						gs 'arousal', 'bj', 5, 'dom'
+						gs 'arousal', 'end'	
+						gs 'boyStat', 'A5'
+						gs 'cum_call', 'mouth', $boy, 1	
+						gs'stat'		
+						
+						act 'Take me home':gt 'FedorEv2', 'Park End'
+						
+						act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+					end
+					act 'Stop before he cums':	
+						*clr & cla
+						minut += 5
+						FedorLuv -= 5
+						gs'stat'
+						'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
+						'You pull away from him and say, "I would rather not get any cum on me right now." Fedor looks at you with a surprised look on his face. "C''mon <<$pcs_firstname>>, You can''t stop now." you give him a confident grin. "Maybe I''ll give you one later but for now I need to head home. See you later Fedor." You then get up and leave the park.'	
+						*nl
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
+						
+						act 'Leave':minut += 15 & gt 'pavResidential'
+					end						
+				end	
+			end
+		else
+			act 'Unzip his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end		
 	end
 	act 'Train Tracks':	

+ 270 - 235
locations/FedorEv3.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'Food':
 	minut += 5		
 	pcs_health += 5	
 	pcs_mood += 15
-	pcs_willpwr += 15
+	!pcs_willpwr += 15
 	pcs_energy += 30
 	pcs_hydra += 50
 	cumspclnt = 2
@@ -62,7 +62,7 @@ if $ARGS[0] = 'Food 2':
 	minut += 5
 	pcs_health += 10	
 	pcs_mood += 20
-	pcs_willpwr += 20
+	!pcs_willpwr += 20
 	fat += 2
 	pcs_energy += 60
 	pcs_hydra += 80
@@ -98,7 +98,7 @@ if $ARGS[0] = 'Front':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		minut += 70
 		gs 'boyStat', 'A5'
 		'You and Fedor take a seat and he hands you your popcorn and snacks then gives you a kiss on the cheek as the lights dim and the movie begins.'
@@ -188,7 +188,7 @@ if $ARGS[0] = 'Middle':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		minut += 70
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/staring.jpg"></center>'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'Back':
 	act 'Take a seat':
 		*clr & cla
 		pcs_mood += 20
-		pcs_willpwr += 20
+		!pcs_willpwr += 20
 		minut += 60
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/staring.jpg"></center>'
@@ -364,22 +364,28 @@ if $ARGS[0] = 'Back Preg':
 		gs 'stat'			
 	
 		act 'Finish watching the movie':gt 'FedorEv3', 'Movies 2'
-	end	
-	act 'Pull out please':
-		VK = rand(1,10)
-		if VK <= 7:
-			gt 'FedorEv3', 'Back Sex'
-		else	
-			gt 'FedorEv3', 'Back Caught'
-		end	
-	end		
+	end
+	gs 'willpower', 'cum_inside', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'Pull out please (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			VK = rand(1,10)
+			if VK <= 7:
+				gt 'FedorEv3', 'Back Sex'
+			else	
+				gt 'FedorEv3', 'Back Caught'
+			end	
+		end
+	else
+		act 'Pull out please (<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] = 'Movies 2':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 20
-	pcs_willpwr += 20
+	!pcs_willpwr += 20
 	EndMovie = 1
 	minut += 5			
 	gs'stat'
@@ -762,43 +768,49 @@ if $ARGS[0] = 'Restroom Lady':
 						act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
 					end								
 				end	
-			end				
-			act 'Pull her head to your crotch':
-				*clr & cla
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady6.jpg"></center>'
-				'You both continue kissing as your hands wander down her body, caressing her curves until you grab her by her hair then pull away from her as you begin laying backward on a nearby wall,' 
-				'lightly pulling her head down to your crotch. She looks up at you then begins eagarly licking your vaginal lips while working her way up to your clitoris.'
-				gs 'arousal', 'cuni', 5, 'lesbian', 'dom'
-				gs 'stat'	
-						
-				act 'Rest your leg on the counter':
+			end
+			gs 'willpower', 'cuni', 'force'
+			if will_cost <= pcs_willpwr:
+				act 'Pull her head to your crotch (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'force'
 					*clr & cla
-					minut -= 5
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady7.jpg"></center>'
-					'As the woman is licking your clitoris, you raise your right leg and place your foot on the counter giving the woamn easier access to your vagina which she takes full advantage of as she shoves her tongue inside your pussy,' 
-					'lapping up your juices. She returns to licking your clitoris doing the best she can to pleasure you which is working as you can feel the pleasure building quickly as she increases her pace.'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady6.jpg"></center>'
+					'You both continue kissing as your hands wander down her body, caressing her curves until you grab her by her hair then pull away from her as you begin laying backward on a nearby wall,' 
+					'lightly pulling her head down to your crotch. She looks up at you then begins eagarly licking your vaginal lips while working her way up to your clitoris.'
 					gs 'arousal', 'cuni', 5, 'lesbian', 'dom'
-					gs 'stat'
-
-					act 'Cum':
+					gs 'stat'	
+							
+					act 'Rest your leg on the counter':
 						*clr & cla
+						minut -= 5
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady7.jpg"></center>'
-						'The pleasure begins building quickly as you close your eyes, surrendering yourself to the pleasure and soon you feel your entire body begin to heat up as you reach your breaking point. You suddenly feel your muscles stiffen as you hit an explosive' 
-						'orgasm causing your body to twitch and spasm as her soft tongue continues massaging your clit. You ride out your orgasm then take a few seconds to catch your breath before opening your eyes to see the woman''s face in front of yours as she says,' 
-						'"It looks like you enjoyed yourself. I guess I still have it. I have to go now but I had a great time and I do hope to see you again." she then gets dressed and leaves the restroom.'
-						*nl	
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/kiss1.jpg"></center>'
-						$orgasm_or = 'yes'
-						gs 'arousal', 'kiss', 5, 'lesbian'
-						gs 'arousal', 'end'
-						gs 'stat'							
+						'As the woman is licking your clitoris, you raise your right leg and place your foot on the counter giving the woamn easier access to your vagina which she takes full advantage of as she shoves her tongue inside your pussy,' 
+						'lapping up your juices. She returns to licking your clitoris doing the best she can to pleasure you which is working as you can feel the pleasure building quickly as she increases her pace.'
+						gs 'arousal', 'cuni', 5, 'lesbian', 'dom'
+						gs 'stat'
 
-						act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
-					end	
+						act 'Cum':
+							*clr & cla
+							gs'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/lady7.jpg"></center>'
+							'The pleasure begins building quickly as you close your eyes, surrendering yourself to the pleasure and soon you feel your entire body begin to heat up as you reach your breaking point. You suddenly feel your muscles stiffen as you hit an explosive' 
+							'orgasm causing your body to twitch and spasm as her soft tongue continues massaging your clit. You ride out your orgasm then take a few seconds to catch your breath before opening your eyes to see the woman''s face in front of yours as she says,' 
+							'"It looks like you enjoyed yourself. I guess I still have it. I have to go now but I had a great time and I do hope to see you again." she then gets dressed and leaves the restroom.'
+							*nl	
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/ladies/kiss1.jpg"></center>'
+							$orgasm_or = 'yes'
+							gs 'arousal', 'kiss', 5, 'lesbian'
+							gs 'arousal', 'end'
+							gs 'stat'							
+
+							act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
+						end	
+					end
 				end
+			else
+				act 'Pull her head to your crotch (<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	
@@ -814,63 +826,69 @@ if $ARGS[0] = 'Restroom Man':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/urinal.jpg"></center>'
 	'You approach the sink and turn on the water as a man enters the restroom and starts to use the urinal. The man clearly doesn''t notice you.'
 	
-	act 'Walk up behind him and grab his penis':
-		*clr & cla
-		minut -= 5
-		gs 'npcgeneratec', 0, 'Guy in restroom', rand(19,45)
-		gs 'boyStat', $npclastgenerated
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scene5.jpg"></center>'
-		'You walk up behind him and wait for him to finish peeing then you reach out and grab his penis. The man jumps up obviously surprised, He quickly turns to face you with a skocked look on his face but after looking you up and down he smiles and lays against the wall and enjoys your touch gently stroking your hair as you continue to slowly stroke his penis.'
-		gs 'arousal', 'hj', 5, 'dom'					
-		gs 'stat'
-		
-		act 'Anal':
-			*clr & cla 				
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scenea1.jpg"></center>'
-			'The man grabs your shoulders and spins you around then begins undressing you as he kisses your ass and legs, he then turns on the tap and wets his fingers then uses them to lube up your anus. The man rubs his dick against your anus and then thrusts his dick in your ass causing you to moan loudly.' 
-			'The pain in your rectum is sharp at first but as he remains still inside you your asshole begins to adjust to his cock.'
-			gs 'arousal', 'anal', 5, 'sub'					
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Walk up behind him and grab his penis (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			*clr & cla
+			minut -= 5
+			gs 'npcgeneratec', 0, 'Guy in restroom', rand(19,45)
+			gs 'boyStat', $npclastgenerated
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scene5.jpg"></center>'
+			'You walk up behind him and wait for him to finish peeing then you reach out and grab his penis. The man jumps up obviously surprised, He quickly turns to face you with a skocked look on his face but after looking you up and down he smiles and lays against the wall and enjoys your touch gently stroking your hair as you continue to slowly stroke his penis.'
+			gs 'arousal', 'hj', 5, 'dom'					
 			gs 'stat'
 			
-			act 'Continue':
-				*clr & cla	
-				minut -= 5
+			act 'Anal':
+				*clr & cla 				
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scenea2.jpg"></center>'
-				'The man begins thrusting his hips rubbing his cock against your anus slow at first then he continues picking up the pace until all you can hear is the smacking of his hips against your ass. You are moaning uncomtrolably as you feel the pain fade and pleasure build. You turn your head to see a reflection of yourself and the reality of the situation dawns on you causing you to think to yourself' 
-				'"I can''t believe that I am being fucked by a stranger in a public bathroom." before you can finish your thought you hear the man say, "OH FUCK I''m gonna cum!"'
-				gs 'arousal', 'anal', 5, 'sub', 'exhibitionism'				
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scenea1.jpg"></center>'
+				'The man grabs your shoulders and spins you around then begins undressing you as he kisses your ass and legs, he then turns on the tap and wets his fingers then uses them to lube up your anus. The man rubs his dick against your anus and then thrusts his dick in your ass causing you to moan loudly.' 
+				'The pain in your rectum is sharp at first but as he remains still inside you your asshole begins to adjust to his cock.'
+				gs 'arousal', 'anal', 5, 'sub'					
 				gs 'stat'
 				
-				act 'Get down on you knees':
-					*clr & cla				
-					gs 'stat'
-					'<center><video autoplay loop src="images/shared/sex/cum/facial/cumface1.mp4"></video></center>'
-					'You quickly pull off him and get on your knees in front of him as he qroans then paints your face with his seed. He continues to spray his load in your face until he has nothing left, he then takes a few seconds to catch his breath while admiring the view. You begin wiping the cum off of your eyelids as the man says,' 
-					'"Woah, I have to be the luckiest guy in the world right now, You were amazing girl. I hope we meet again." he then pulls up his pants then leaves the restroom.'
-					gs 'cum_call', 'face'						
-					gs 'arousal', 'hj', 5, 'sub'					
-					gs 'arousal', 'end'
-					gs 'stat'
-					
-					act 'Wash up':gt 'FedorEv3', 'Restroom Wash 2'
-				end
-				act 'Let him cum inside':
-					*clr & cla				
+				act 'Continue':
+					*clr & cla	
+					minut -= 5
 					gs'stat'
-					'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal1.mp4"></video></center>'
-					'Instead of pulling off him you start pushing against his crotch and he grabs your hips firmly as he groans and fills your ass with his seed. you can feel him pumping his seed into your ass almost filling you up completely, he then suddenly pulls out of you' 
-					'sending a splurt of semen to leak out of your ass and drip on the floor. The man watches you for a few seconds then says, "Damn girl, I don''t know what I did to deserve this but thank you, You are a real angel." He kisses you on the forehead as he pulls up his pants then leaves the restroom.'
-					gs 'cum_call', 'anus'							
-					gs 'arousal', 'anal', 5, 'dom'					
-					gs 'arousal', 'end'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/scenea2.jpg"></center>'
+					'The man begins thrusting his hips rubbing his cock against your anus slow at first then he continues picking up the pace until all you can hear is the smacking of his hips against your ass. You are moaning uncomtrolably as you feel the pain fade and pleasure build. You turn your head to see a reflection of yourself and the reality of the situation dawns on you causing you to think to yourself' 
+					'"I can''t believe that I am being fucked by a stranger in a public bathroom." before you can finish your thought you hear the man say, "OH FUCK I''m gonna cum!"'
+					gs 'arousal', 'anal', 5, 'sub', 'exhibitionism'				
 					gs 'stat'
 					
-					act 'Wash up':gt 'FedorEv3', 'Restroom Wash 2'
-				end	
-			end
-		end	
+					act 'Get down on you knees':
+						*clr & cla				
+						gs 'stat'
+						'<center><video autoplay loop src="images/shared/sex/cum/facial/cumface1.mp4"></video></center>'
+						'You quickly pull off him and get on your knees in front of him as he qroans then paints your face with his seed. He continues to spray his load in your face until he has nothing left, he then takes a few seconds to catch his breath while admiring the view. You begin wiping the cum off of your eyelids as the man says,' 
+						'"Woah, I have to be the luckiest guy in the world right now, You were amazing girl. I hope we meet again." he then pulls up his pants then leaves the restroom.'
+						gs 'cum_call', 'face'						
+						gs 'arousal', 'hj', 5, 'sub'					
+						gs 'arousal', 'end'
+						gs 'stat'
+						
+						act 'Wash up':gt 'FedorEv3', 'Restroom Wash 2'
+					end
+					act 'Let him cum inside':
+						*clr & cla				
+						gs'stat'
+						'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal1.mp4"></video></center>'
+						'Instead of pulling off him you start pushing against his crotch and he grabs your hips firmly as he groans and fills your ass with his seed. you can feel him pumping his seed into your ass almost filling you up completely, he then suddenly pulls out of you' 
+						'sending a splurt of semen to leak out of your ass and drip on the floor. The man watches you for a few seconds then says, "Damn girl, I don''t know what I did to deserve this but thank you, You are a real angel." He kisses you on the forehead as he pulls up his pants then leaves the restroom.'
+						gs 'cum_call', 'anus'							
+						gs 'arousal', 'anal', 5, 'dom'					
+						gs 'arousal', 'end'
+						gs 'stat'
+						
+						act 'Wash up':gt 'FedorEv3', 'Restroom Wash 2'
+					end	
+				end
+			end	
+		end
+	else
+		act 'Walk up behind him and grab his penis (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Ignore him and continue washing up':gt 'FedorEv3', 'Restroom Wash 2'		
 end	
@@ -929,15 +947,20 @@ if $ARGS[0] = 'Restroom Man 2':
 				end	
 			end
 		end	
-	end	
-	act 'Splash water in his face':
-		VK = rand(1,3)
-		if VK = 1 or (succubusflag = 1 and succublvl > 1):
-			gt 'FedorEv3', 'Restroom Escape'
-		else
-			gt 'FedorEv3', 'Restroom Rape'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Splash water in his face (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'resist'
+			VK = rand(1,3)
+			if VK = 1 or (succubusflag = 1 and succublvl > 1):
+				gt 'FedorEv3', 'Restroom Escape'
+			else
+				gt 'FedorEv3', 'Restroom Rape'
+			end	
 		end	
-	end	
+	else
+		act 'Splash water in his face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 end	
 
 if $ARGS[0] = 'Restroom Escape':
@@ -960,7 +983,7 @@ if $ARGS[0] = 'Restroom Rape':
 	menu_off = 1
 	pcs_health -= 10				
 	pcs_mood -= 20
-	pcs_willpwr -= 5	
+	!pcs_willpwr -= 5	
 	pain['tummy'] += 15
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/rape.jpg"></center>'
@@ -971,7 +994,7 @@ if $ARGS[0] = 'Restroom Rape':
 	act 'Plead':
 		*clr & cla
 		minut -= 5
-		sub += 3
+		!sub += 3
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/rape1.mp4"></video></center>'
 		'You plead with the man but his only response is "Shut the fuck up! The only thing a whore like you is good for is a getting fucked, so spread your legs and keep quiet!"' 
@@ -1041,160 +1064,172 @@ if $ARGS[0] = 'Restroom Gang':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/hide.jpg"></center>'
 	'You approach the sink then turn on the water, when you hear some rowdy guys outside, you quickly run into one of the stalls then hear the door slam open and the guys start hollering as they share stories that you can''t quite hear.'
 
-	act 'Eavesdrop':
-		*clr & cla 
-		gs'stat'
-		'You approach the door to listen to what they are talking about. One guy says, "You had to see the tits on that girl. She was basically flying out of her top." and the other guy said "That''s nothing. I had this one girl with tits so big you could fuck them for days." another guy replies, "This one bitch I saw claimed that she was..." One of the guys yells out "Hold on guys! We got a girl is in here." You look up to see a man peeking over the stall and your heart stops as someone starts pushing the stall door open.'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang.jpg"></center>'
-		
-		act 'Hold the door closed':
-			*clr & cla
-			minut += 5
-			gs'stat'	
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang1.jpg"></center>'
-			'You quickly push the door closed and hold it then the guys start slaming the door while the guy peeping yells to the others "Check this out guys. This girl is hot! I bet she came in here looking for a good fucking." the guys start hollering even louder as the guy continues to make vulgar comments about you. After a few seconds you feel them slaming even harder on the door when it finally gives in, swinging open. You see the men all staring into the stall with lustful looks on their faces.'
-		
-			act 'Plead with them':
-				*clr & cla 
-				sub += 3
+	gs 'willpower', 'misc', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Eavesdrop (<<will_cost>> Willpower)':
+			gs 'willpower', 'pay', 'self'
+			*clr & cla 
+			gs'stat'
+			'You approach the door to listen to what they are talking about. One guy says, "You had to see the tits on that girl. She was basically flying out of her top." and the other guy said "That''s nothing. I had this one girl with tits so big you could fuck them for days." another guy replies, "This one bitch I saw claimed that she was..." One of the guys yells out "Hold on guys! We got a girl is in here." You look up to see a man peeking over the stall and your heart stops as someone starts pushing the stall door open.'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang.jpg"></center>'
+			
+			act 'Hold the door closed':
+				*clr & cla
+				minut += 5
 				gs'stat'	
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang2.jpg"></center>'
-				'"I didn''t mean to interrupt. Can I please go." One of the guys grins. "You can go...After we''re done with you." He then lunges into the stall and grabs you by the throat and whispers in your ear "I bet you came in here hoping to get caught, so that you can get a good fucking. Well we''ll give you a fucking you''ll never forget." he then pulls you out of the stall where the other guys are waiting with their cocks in their hand.'
-
-				act 'Submit':
-					*clr & cla
-					minut -= 5
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang3.jpg"></center>'
-					'Knowing that you are not strong enough to overpower them, you submit to them allowing them to remove your top as they bend you over, so that one of the guys cock is pressing against your lips. You wrap your lips around his dick provoking a moan from him as the rest of the guys touch you all over your body. "Look at this slut. She looks a lot better than that girl from the party. I bet she''s a better fuck too." and the other guy responds, "I bet you 200<b>₽</b> that she will be able to take all of our dicks without passing out." and the other guy gives him a high five.'
-					gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-					gs 'boyStat', $npclastgenerated
-					gs 'arousal', 'foreplay', 5, 'sub', 'rough', 'gangbang'	
-					gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-					gs'stat'						
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang1.jpg"></center>'
+				'You quickly push the door closed and hold it then the guys start slaming the door while the guy peeping yells to the others "Check this out guys. This girl is hot! I bet she came in here looking for a good fucking." the guys start hollering even louder as the guy continues to make vulgar comments about you. After a few seconds you feel them slaming even harder on the door when it finally gives in, swinging open. You see the men all staring into the stall with lustful looks on their faces.'
+			
+				act 'Plead with them':
+					*clr & cla 
+					!sub += 3
+					gs'stat'	
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang2.jpg"></center>'
+					'"I didn''t mean to interrupt. Can I please go." One of the guys grins. "You can go...After we''re done with you." He then lunges into the stall and grabs you by the throat and whispers in your ear "I bet you came in here hoping to get caught, so that you can get a good fucking. Well we''ll give you a fucking you''ll never forget." he then pulls you out of the stall where the other guys are waiting with their cocks in their hand.'
 
-					act 'Continue sucking':
-						*clr & cla 
+					act 'Submit':
+						*clr & cla
 						minut -= 5
 						gs'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang4.jpg"></center>'
-						'As you are sucking, The guy behind you shoves his dick into your vagina causing a rush of pain and pleasure. The pain quickly subsides and you start to actually feel less afraid as you enjoy the pleasure build up. You can hear one of the guys say, "Hey look at her. I think she''s starting to like it." and another responds, "I knew she was a dirty whore when I saw her." the words offend you at first but begin to excite you as you continue getting fucked.'
-						gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'gangbang'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang3.jpg"></center>'
+						'Knowing that you are not strong enough to overpower them, you submit to them allowing them to remove your top as they bend you over, so that one of the guys cock is pressing against your lips. You wrap your lips around his dick provoking a moan from him as the rest of the guys touch you all over your body. "Look at this slut. She looks a lot better than that girl from the party. I bet she''s a better fuck too." and the other guy responds, "I bet you 200<b>₽</b> that she will be able to take all of our dicks without passing out." and the other guy gives him a high five.'
+						gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+						gs 'boyStat', $npclastgenerated
+						gs 'arousal', 'foreplay', 5, 'sub', 'rough', 'gangbang'	
 						gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-						gs'stat'							
-											
-						act 'Enjoy':
-							*clr & cla
-							minut -= 10
+						gs'stat'						
+
+						act 'Continue sucking':
+							*clr & cla 
+							minut -= 5
 							gs'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang5.jpg"></center>'
-							'One of the guys grabs you by your legs and lifts you up as another one lays under you then you feel a sharp sting in your ass as you are lowered onto a guy''s dick. You let out a pained grunt as you feel another guy''s dick enter you vagina and one in your mouth so you continue sucking trying your best to make them cum, so that they will no longer need you and hopefully let you go.'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang4.jpg"></center>'
+							'As you are sucking, The guy behind you shoves his dick into your vagina causing a rush of pain and pleasure. The pain quickly subsides and you start to actually feel less afraid as you enjoy the pleasure build up. You can hear one of the guys say, "Hey look at her. I think she''s starting to like it." and another responds, "I knew she was a dirty whore when I saw her." the words offend you at first but begin to excite you as you continue getting fucked.'
 							gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'gangbang'
-							gs 'arousal', 'anal', 5, 'sub', 'rough', 'gangbang'									
 							gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-							gs'stat'						
-								
-							act 'Continue':
-								*clr & cla 
+							gs'stat'							
+												
+							act 'Enjoy':
+								*clr & cla
 								minut -= 10
 								gs'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang6.jpg"></center>'
-								'You continue to let them do as they please and after a few minutes one of the guys grabs your throat. "Are you ready for our cum whore?"'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang5.jpg"></center>'
+								'One of the guys grabs you by your legs and lifts you up as another one lays under you then you feel a sharp sting in your ass as you are lowered onto a guy''s dick. You let out a pained grunt as you feel another guy''s dick enter you vagina and one in your mouth so you continue sucking trying your best to make them cum, so that they will no longer need you and hopefully let you go.'
 								gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'gangbang'
 								gs 'arousal', 'anal', 5, 'sub', 'rough', 'gangbang'									
 								gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-								gs'stat'											
-								
-								act 'Beg them to pull out':
-									*clr & cla
-									minut -= 15
+								gs'stat'						
+									
+								act 'Continue':
+									*clr & cla 
+									minut -= 10
 									gs'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum1.jpg"></center>'
-									'"You plead. "Please pull out, I want your cum all over my body" and one of the guys responds, "You heard her gentlemen, let''s cover this bitch from head to toe." as they begin to pull out of you and one by one they release their load on a different part of your body covering you with their cum.'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'face'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'breasts'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'stomach'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'legs'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'labia'
-									gs 'arousal', 'anal', 10, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/gang6.jpg"></center>'
+									'You continue to let them do as they please and after a few minutes one of the guys grabs your throat. "Are you ready for our cum whore?"'
+									gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'gangbang'
+									gs 'arousal', 'anal', 5, 'sub', 'rough', 'gangbang'									
 									gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'vaginal', 10, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'end'
-									gs 'stat'											
+									gs'stat'											
+									
+									gs 'willpower', 'cum_inside', 'resist', 'hard'
+									if will_cost <= pcs_willpwr:
+										act 'Eavesdrop (<<will_cost>> Willpower)':
+											gs 'willpower', 'pay', 'resist'
+											*clr & cla
+											minut -= 15
+											gs'stat'
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum1.jpg"></center>'
+											'"You plead. "Please pull out, I want your cum all over my body" and one of the guys responds, "You heard her gentlemen, let''s cover this bitch from head to toe." as they begin to pull out of you and one by one they release their load on a different part of your body covering you with their cum.'
+											gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+											gs 'boyStat', $npclastgenerated
+											gs 'cum_call', 'face'
+											gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+											gs 'boyStat', $npclastgenerated
+											gs 'cum_call', 'breasts'
+											gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+											gs 'boyStat', $npclastgenerated
+											gs 'cum_call', 'stomach'
+											gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+											gs 'boyStat', $npclastgenerated
+											gs 'cum_call', 'legs'
+											gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+											gs 'boyStat', $npclastgenerated
+											gs 'cum_call', 'labia'
+											gs 'arousal', 'anal', 10, 'sub', 'rough', 'gangbang'
+											gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
+											gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
+											gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
+											gs 'arousal', 'vaginal', 10, 'sub', 'rough', 'gangbang'
+											gs 'arousal', 'end'
+											gs 'stat'											
 
-									act 'See what they do':
+											act 'See what they do':
+												*clr & cla
+												minut += 5
+												gs'stat'
+												'Without even realizing it you are rubbing their cum all over your body as you stare at them gazing in adoration at you. "Whoa this whore is a real gem. I''ll be having dreams of this one." and another responds, "If you love her so much why don''t you marry her and have fun explaining it to that loud mouth bitch you call a mother!" Causing the first guy to tackle the other and the 2 guys begin fighting as the rest of them start cheering them on. You use this time to quickly grab your clothes then run out of the men''s room and into the ladies room.'
+												*nl	
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/fight.jpg"></center>'
+												
+												act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
+											end	
+										end
+									else
+										act 'Beg them to pull out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+									end
+									act 'Nod':
 										*clr & cla
-										minut += 5
+										minut -= 15
+										!sub += 5
 										gs'stat'
-										'Without even realizing it you are rubbing their cum all over your body as you stare at them gazing in adoration at you. "Whoa this whore is a real gem. I''ll be having dreams of this one." and another responds, "If you love her so much why don''t you marry her and have fun explaining it to that loud mouth bitch you call a mother!" Causing the first guy to tackle the other and the 2 guys begin fighting as the rest of them start cheering them on. You use this time to quickly grab your clothes then run out of the men''s room and into the ladies room.'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum2.jpg"></center>'
+										'You meekly nod yes and one of the guys says, "Alright boys, Lets fill this whore up." and one by one the guys begin to cum inside all of your' 
+										'holes and on your face and stomach. After they finish they pull out of you while slowly guiding you to the floor. You lay back to catch your' 
+										'breath as you feel the warm cum sliding down and dripping out of your vagina, anus and off your body. "This has got to be the filthiest whore' 
+										'I have ever seen." and another responds, "That''s exactly what I said after I fucked your sister." Causing the first guy to tackle the other'
+										*nl	
+										'and the 2 guys begin fighting as the rest of them start cheering them on. You use this time to quickly grab your clothes then run out of the' 
+										'men''s room and into the ladies room'
 										*nl	
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/fight.jpg"></center>'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'anus'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'face'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'breasts'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'stomach'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'legs'
+										gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
+										gs 'boyStat', $npclastgenerated
+										gs 'cum_call', 'labia'
+										gs 'arousal', 'anal', 10, 'sub', 'rough', 'gangbang'
+										gs 'cum_call'
+										gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
+										gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
+										gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
+										gs 'arousal', 'vaginal', 10, 'sub', 'rough', 'gangbang'
+										gs 'arousal', 'end'
+										gs 'stat'
 										
 										act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
 									end	
-								end	
-								act 'Nod':
-									*clr & cla
-									minut -= 15
-									sub += 5
-									gs'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/cum/cum2.jpg"></center>'
-									'You meekly nod yes and one of the guys says, "Alright boys, Lets fill this whore up." and one by one the guys begin to cum inside all of your' 
-									'holes and on your face and stomach. After they finish they pull out of you while slowly guiding you to the floor. You lay back to catch your' 
-									'breath as you feel the warm cum sliding down and dripping out of your vagina, anus and off your body. "This has got to be the filthiest whore' 
-									'I have ever seen." and another responds, "That''s exactly what I said after I fucked your sister." Causing the first guy to tackle the other'
-									*nl	
-									'and the 2 guys begin fighting as the rest of them start cheering them on. You use this time to quickly grab your clothes then run out of the' 
-									'men''s room and into the ladies room'
-									*nl	
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/men/gang/fight.jpg"></center>'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'anus'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'face'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'breasts'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'stomach'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'legs'
-									gs 'npcgeneratec', 0, 'Rowdy guy', rand(18,30)
-									gs 'boyStat', $npclastgenerated
-									gs 'cum_call', 'labia'
-									gs 'arousal', 'anal', 10, 'sub', 'rough', 'gangbang'
-									gs 'cum_call'
-									gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'hj', 5, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'bj', 5, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'vaginal', 10, 'sub', 'rough', 'gangbang'
-									gs 'arousal', 'end'
-									gs 'stat'
-									
-									act 'Wash up':gt 'FedorEv3', 'Restroom Wash'
-								end	
-							end		
-						end			
-					end				
-				end					
-			end
-		end	
+								end		
+							end			
+						end				
+					end					
+				end
+			end	
+		end
+	else
+		act 'Eavesdrop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act	'Hide':	
 		*clr & cla
@@ -1345,7 +1380,7 @@ if $ARGS[0] = 'Movies 3':
 	*clr & cla
 	menu_off = 1
 	pcs_mood += 10
-	pcs_willpwr += 10
+	!pcs_willpwr += 10
 	minut += 5			
 	FedorRest = 0
 	WithFedor = 0

File diff suppressed because it is too large
+ 302 - 227
locations/FedorEv4.qsrc


+ 12 - 2
locations/FedorMisc.qsrc

@@ -120,9 +120,19 @@ if $ARGS[0] = 'Fedor Chat 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/hall/fedor.jpg"></center>'
 	'You approach Fedor and ask "How about we spend some alone time together?" Fedor gives you a playful smile as he wraps his arm around your neck, he then leads you to the hallway near the back of the school. Fedor rests against a nearby window and asks "So, what would you like to do today?"'
 
-	act 'Wanna fool around in the locker room?':gt 'FedorMisc', 'Locker Room'
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Wanna fool around in the locker room? (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Locker Room'
+	else
+		act 'Wanna fool around in the locker room? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
-	act 'Begin caressing Fedor':gt 'FedorMisc', 'Hall'
+	gs 'willpower', 'sex', 'self', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'Begin caressing Fedor (<<will_cost>> Willpower)': gs 'willpower', 'sex', 'self', 'hard' & gs 'willpower', 'pay', 'self' & gt 'FedorMisc', 'Hall'
+	else
+		act 'Begin caressing Fedor (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	act 'I could really use a smoke':gt 'FedorMisc', 'Smoke'
 

+ 8 - 8
locations/FightCrouch.qsrc

@@ -26,14 +26,14 @@ if crouch = 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/cron.jpg"></center>'
 			'Your opponent manages to press themselves to the floor but you''re too fast and manage to grab hold of your opponent.'
 
-			act '...':gt 'fightfw'
+			act 'Continue':gt 'fightfw'
 		elseif enrand = 1:
 			point += 2
 			endurE -= 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/crob.jpg"></center>'
 			'You reverse the opponent''s attempt to roll you over and instead you lock them in.'
 
-			act '...':gt 'fight1'
+			act 'Continue':gt 'fight1'
 		end
 	end
 
@@ -47,14 +47,14 @@ if crouch = 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/crou.jpg"></center>'
 			'Your opponent manages to press themselves to the floor and you''re unable to grab hold of your opponent.'
 
-			act '...':gt 'fight2'
+			act 'Continue':gt 'fight2'
 		elseif enrand = 1:
 			pointE += 1
 			endurE -= 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/cronu.jpg"></center>'
 			'You reverse the opponent''s attempt to roll you over and instead you lock them in.'
 
-			act '...':gt 'fight3'
+			act 'Continue':gt 'fight3'
 		elseif enrand = 2:
 			''
 		end
@@ -77,14 +77,14 @@ else
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/cron.jpg"></center>'
 			'The opponent is unable to perform the move.'
 
-			act '...':gt 'fightE'
+			act 'Continue':gt 'fightE'
 		elseif enrand = 1:
 			pointE += 1
 			endurE -= 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/crou.jpg"></center>'
 			'The opponent successfully performs a move.'
 
-			act '...':gt 'fightE1'
+			act 'Continue':gt 'fightE1'
 		end
 	end
 
@@ -99,14 +99,14 @@ else
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/crob.jpg"></center>'
 			'The opponent easily reverses you attempt and gains an advantage on you.'
 
-			act '...':gt 'fightE2'
+			act 'Continue':gt 'fightE2'
 		elseif enrand = 1:
 			point += 1
 			endurE -= 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/cronu.jpg"></center>'
 			'You successfully manage to perform the move on your opponent and grab hold of their back.'
 
-			act '...':gt 'fightE3'
+			act 'Continue':gt 'fightE3'
 		end
 	end
 end

+ 6 - 6
locations/FightE.qsrc

@@ -8,19 +8,19 @@ $resultUderDinE = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu.jpg"></center>'
 		'<<$nameE>> successfully grabs hold of you.'
 
-		act '...':stoper = 0 & gt 'fightE1'
+		act 'Continue':stoper = 0 & gt 'fightE1'
 	elseif Aktiv < Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu1.jpg"></center>'
 		'<<$nameE>> can''t do anything as you''re able to reverse.'
 
-		act '...':stoper = 0 & gt 'fightE3'
+		act 'Continue':stoper = 0 & gt 'fightE3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 
@@ -34,19 +34,19 @@ $resultBrosDinE = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fb.jpg"></center>'
 		'<<$nameE>> successfully mounted you.'
 
-		act '...':stoper = 0 & gt 'fightE2'
+		act 'Continue':stoper = 0 & gt 'fightE2'
 	elseif Aktiv < Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu1.jpg"></center>'
 		'<<$nameE>> can''t do anything as you''re able to reverse.'
 
-		act '...':stoper = 0 & gt 'fightE3'
+		act 'Continue':stoper = 0 & gt 'fightE3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 3 - 3
locations/FightE1.qsrc

@@ -10,19 +10,19 @@ $resultUderDinE = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f2u.jpg"></center>'
 		'<<$nameE>> successfully grabs hold of you.'
 
-		act '...':gt 'fightE1'
+		act 'Continue':gt 'fightE1'
 	elseif Aktiv < Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f2u2.jpg"></center>'
 		'<<$nameE>> can''t do anything as you''re able to reverse.'
 
-		act '...':stoper = 0 & gt 'fightE3'
+		act 'Continue':stoper = 0 & gt 'fightE3'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 3 - 3
locations/FightE2.qsrc

@@ -8,19 +8,19 @@ $resultUderDinE = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u.jpg"></center>'
 		'<<$nameE>> successfully locks you in a hold.'
 
-		act '...':stoper = 0 & gt 'fightE1'
+		act 'Continue':stoper = 0 & gt 'fightE1'
 	elseif Aktiv < Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u1.jpg"></center>'
 		'<<$nameE>> can''t do anything as you''re able to reverse.'
 
-		act '...':stoper = 0 & gt 'fightE3'
+		act 'Continue':stoper = 0 & gt 'fightE3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u2.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 4 - 4
locations/FightE3.qsrc

@@ -8,14 +8,14 @@ cls
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u.jpg"></center>'
 		'<<$nameE>> manages to get the upper hand against you.'
 
-		act '...':stoper = 0 & gt 'fightE1'
+		act 'Continue':stoper = 0 & gt 'fightE1'
 	elseif Aktiv <= Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u2.jpg"></center>'
 		'<<$nameE>> can''t do anything about your wriggling and you slip out of her hold.'
 
-		act '...':gt 'RoundStop'
+		act 'Continue':gt 'RoundStop'
 end
 }
 
@@ -29,14 +29,14 @@ $resultBrosDinE = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3b.jpg"></center>'
 		'<<$nameE>> successfully manages to throw you on the floor.'
 
-		act '...':stoper = 0 & gt 'fightE2'
+		act 'Continue':stoper = 0 & gt 'fightE2'
 	elseif Aktiv <= Passiv:
 		point += 1
 		Kz += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u2.jpg"></center>'
 		'<<$nameE>> can''t do anything as you''re able to reverse.'
 
-		act '...':gt 'RoundStop'
+		act 'Continue':gt 'RoundStop'
 	end
 }
 

+ 23 - 16
locations/Gadbana.qsrc

@@ -46,7 +46,7 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart: 
+			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
 				grandma_trouble += 1
@@ -63,7 +63,7 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart: 
+			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
 				grandma_trouble += rand(0,1)
@@ -89,6 +89,7 @@ if mira = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
+					noShampoo = 1
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
@@ -117,21 +118,25 @@ if mira = 0:
 	end
 	*nl
 
-	act 'Wash your body (0:25)':
-		cls
-		menu_off = 1
-		minut += 25
-		dynamic $showerdin
-		if frost > 0:frost = 0
-		!!gs 'clothing', 'strip', 'Gadbana'
-		gs 'clothing', 'strip'
-		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
-		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+	if shampoo > 0:
+		act 'Wash your body (0:25)':
+			cls
+			menu_off = 1
+			minut += 25
+			dynamic $showerdin
+			if frost > 0:frost = 0
+			!!gs 'clothing', 'strip', 'Gadbana'
+			gs 'clothing', 'strip'
+			if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
+			'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-		act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $metka
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	dynamic $bteeth
@@ -260,6 +265,7 @@ else
 			gs 'stat'
 			act 'Steam':
 				cls
+				noShampoo = 1
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1
@@ -272,6 +278,7 @@ else
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban2.jpg"></center>'
 				'Mira finally finishes lathering herself, you take the loofah and lather yourself from head to toe. You enjoy yourselves in the warm bath, relaxing in each other''s company, occasionally exchanging meaningless anecdotes...'
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 				gs 'arousal', 'voyeur', 120
 				gs 'arousal', 'end'
 				gs 'stat'

+ 2 - 2
locations/Gadhouse.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'Main':
 	!{
 	!New family system, skip for now.
 	gs 'zz_family', 'father_sheduler'
-	if $father['location'] = $curloc and ParHomeBlock = 0:
+	if $father['location'] = $curloc and home_owned[2] = 1:
 		'Your parents room.'
 		gs 'gadukino_event', 'go_home'
 	end
@@ -184,7 +184,7 @@ if $ARGS[0] = 'Main':
 	if indorf = 1:
 		'Your parents are relaxing inside.'
 
-		if staygad ! daystart and ParHomeBlock = 0: gs 'gadukino_event', 'go_home'
+		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
 	end
 
 	 if $clothingworntype ! 'nude':

+ 3 - 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!"'
@@ -382,6 +382,7 @@ if $ARGS[0] = 'strap on':
 				act 'Nevermind': gt 'igorhome', 'igorroom'
 				act 'It''s time.':
 					*clr & cla
+					igorstrap = 1
 				    '<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/ygov1.mp4"></video></center>'
 					'You put the wine glass down and take his away from him, placing it down as well. You lean in close to him. "Ok I think you''re ready for it. Let me show you an experience you''ll never forget?"'
 					'He nods, clearly nervous, thought he also looks very excited as well, almost eager.'

+ 441 - 441
locations/IgorHunter.qsrc

@@ -23,466 +23,466 @@ gs 'stat'
 
 
 if $ARGS[0] = '':
-    
-    
-    '<center><b><font color = maroon>Igor Anisimov</font></b></center>'
-    '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
-    'Igor is a hunter along with the Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center..'
-    
-    act 'Chat':
-        *clr & cla
-        minut += 60
-        menu_off = 1
-        
-        igor_base_opinion += 2
-        
-        gs 'IgorHunter', 'check_opinion'
-        act 'Continue': gt $loc
-    end
+
+
+	'<center><b><font color = maroon>Igor Anisimov</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
+	'Igor is a hunter along with the Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center..'
+
+	act 'Chat':
+		*clr & cla
+		minut += 60
+		menu_off = 1
+
+		igor_base_opinion += 2
+
+		gs 'IgorHunter', 'check_opinion'
+		act 'Finish': gt $loc
+	end
 end
 
 if $ARGS[0] = 'check_opinion':
-    huntersIgorQw = igor_base_opinion + hunter_collective_opinion / 2 - hunter_sexual_comfort / 4
+	huntersIgorQw = igor_base_opinion + hunter_collective_opinion / 2 - hunter_sexual_comfort / 4
+
+	if huntersIgorQw > hunter_collective_opinion: huntersIgorQw = hunter_collective_opinion - hunter_sexual_comfort / 4
 
-    if huntersIgorQw > hunter_collective_opinion: huntersIgorQw = hunter_collective_opinion - hunter_sexual_comfort / 4
-    
-    !TODO: Add igor_sexual_comfort: 'platonic', 'romantic', 'partial', 'full', 'extreme' or 0 to 4
+	!TODO: Add igor_sexual_comfort: 'platonic', 'romantic', 'partial', 'full', 'extreme' or 0 to 4
 
-    gs 'stat'
+	gs 'stat'
 
 end
 
 if $ARGS[0] = 'schedule':
-    !TODO: Add energy/stamina and horniness stats for Igor
+	!TODO: Add energy/stamina and horniness stats for Igor
 end
 
 !Sex scenes
 if $ARGS[0] = 'creekside':
-    if $ARGS[1] = '':
-        cla
-        act 'You suddenly feel an arm on your shoulder':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/2.jpg"></center>'
-            'You turn back to see Igor standing over you. Watching the scenery you did not even notice him sneaking up to you.'
-            'After saying hi, you suddenly realize you are completely naked in front of him, giving him quite the view with the creek in the background'
-            act 'Cover your chest with your arms':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/1.jpg"></center>'
-                'You quickly cover your chest with your arms, looking away a bit ashamed. The clothing disparity is a bit embarassing, him clothed and you in your birthday suit.'
-                '"What is wrong?" asks Igor, landing a small kiss on your shoulder.'
-                
-                gs 'arousal', 'flashlite', 2
-                gs 'stat'
-
-                act 'You are not feeling it':
-                    cla
-                    '"I...it''s just... I''m sorry, just not in the mood to seen naked" you stammer.'
-                    '"No need to apologize, I''ll leave you alone" says Igor with a smile. "Catch you back at the hut maybe"'
-                    
-                    gs 'arousal', 'flashlite', 2
-                    mood -=5
-                    gs 'stat'
-                    gs 'arousal', 'end'
-
-                    act 'Further': gt 'backwater'
-                end
-                act 'Kiss him back':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/3.jpg"></center>'
-                    'Igor''s tender kiss on your bare skin dissolves whatever bit of embarrassment you had. Being naked in front off him like this is actually turning you on.'
-                    'You respond by giving Igor a passionate kiss, his hand stroking the small of your back.'
-
-                    gs 'arousal', 'kiss', 4
-                    gs 'arousal', 'flashlite', 2
-                    gs 'stat'
-
-                    act 'You do not want to get carried away':
-                        cla & *clr
-                        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/1.jpg"></center>'
-                        'You cover up your chest and tell Igor you want to call it there "I do not want to do anything further. At least, not like this..." you say.'
-                        'It would only take the right touch to change your mind, if Igor had noticed the growing dampness between your legs. Instead he smiles and gives you a kis on the shoulder before walking away.'
-                     
-                        gs 'arousal', 'flashlite', 2
-                        gs 'arousal', 'end'
-                        gs 'stat'
-
-                        act 'Further': gt 'backwater'
-                    end
-                    act 'Take him in your mouth': gt 'IgorHunter', 'creekside', 'bj'
-                end
-            end
-        
-            act 'Greet him with a hug':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/4.jpg"></center>'
-                'With a smile, you stand up on the rock you were sitting and go in for a hug as Igor kneels down, his lips locking on your nipple.'
-                'You hug his neck as he suckles and flicks his tongue around your nipple, eliciting some deep sighs from you.'
-                
-                gs 'arousal', 'foreplay', 4
-                gs 'arousal', 'breasts', 2
-                minut -= 3
-                gs 'stat'
-                
-                act 'Not now':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/11.jpg"></center>'
-                    'You gently push Igor away, not feeling like doing anything further.'
-                    '"Maybe later", you say. Igor gives you another peck on the breasts before walking away.'
-                    
-                    gs 'arousal', 'breasts', 2
-                    gs 'stat'
-                    gs 'arousal', 'end'
-                   
-                    act 'Further': gt 'backwater'
-                end
-                
-                act 'Lay back and spread your legs':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/5.jpg"></center>'
-                    'Having your nipples teased like this is almost unbearable. You feel your pussy lips getting inflamed, the dampness between your legs growing.'
-                    'Laying back, you spread your legs wide and look almost beggingly at Igor, wanting his attention right between them. He does not lose time starting to lick your now burning hot, soaking wet fuckhole'
-
-                    gs 'arousal', 'cuni', 10
-                    minut -= 4
-                    gs 'stat'
-                   
-                    act 'You want him inside you': gt 'IgorHunter', 'creekside', 'piv'
-                end
-            end
-        end
-    end
-
-    if $ARGS[1] = 'bj':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/6.jpg"></center>'
-        gs 'dinSex', 'bj_random'
-        gs 'arousal', 'bj', 9
-        minut -= 3
-        gs 'stat'
-        
-        act 'Keep sucking him':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/7.jpg"></center>'
-            'As you keep sucking and stroking Igor''s <<$penis_desc>>, you start to feel his dick throb stronger and stronger. Igor tells you he is going to cum'
-            gs 'arousal', 'bj', 6
-            minut -= 3
-            gs 'stat'
-            
-            act 'You want to swallow his cum':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/8.jpg"></center>'
-                gs 'dinSex', 'bj_swallow_random'
-                'You lock eyes  with Igor and open your mouth wide, sticking out your tongue to show how thoroughly you have cleaned his dick.'
-                gs 'cum_call', 'mouth', 'A173'
-                gs 'arousal', 'bj', 6
-                minut -= 3
-                gs 'stat'
-                gs 'arousal','end'
-
-                act 'Further': gt 'backwater' 
-            end
-            act 'Make him pull out':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/9.jpg"></center>'
-                'Igor pulls out of your mouth the last moment, jerking off furiously and covering your chest in his warm spunk.'
-                gs 'cum_call', 'breasts', 'A173', 1
-                gs 'arousal', 'bj', 4
-                gs 'arousal', 'breasts', 4
-                minut -= 5
-                gs 'stat'
-
-                act 'Relax and enjoy the view together':
-                    cla & *clr
-                    gs 'arousal', 'breasts', 4
-                    minut += 10
-                    gs 'arousal', 'end'
-                    gs 'stat'
-
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/10.jpg"></center>'
-                    'You go back to relaxing and enjoying the view, Igor''s warm seed still covering your tits.'
-                    'Igor cuddles you from behind as his hand idly plays with your boob, basking in the post-orgasmic bliss.'
-                    act 'Further': gt 'backwater' 
-                end    
-            end
-        end
-    end
- 
-
-    if $ARGS[1] = 'piv':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_2.jpg"></center>'
-        'You lean back further as Igor kisses all over your tit, your hand lightly playing with your other breast'
-
-        gs 'arousal', 'breasts', 5
-        gs 'arousal', 'foreplay', 5
-        minut -= 7
-        gs 'stat'
-
-        act 'Jump on Igor''s lap':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_5.jpg"></center>'
-            'You sit on Igor''s lap, slowly grinding your ass on his crotch as his dick pokes against your folds, the tip almost dipping into the dampness inside'
-            
-            gs 'arousal', 'foreplay', 5
-            minut -= 2
-            gs 'stat'
-
-            act 'Take him inside you':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_6.jpg"></center>'
-                gs 'dinSex', 'vaginal_sex', 12
-                gs 'stat'
-
-                act 'You start feeling his cock start to twitch inside you':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_7.jpg"></center>'
-                    pose = 3
-                    gs 'dinSex', 'sexcum'
-                    gs 'arousal', 'vaginal', 4
-                    gs 'stat'
-                    gs 'arousal', 'end'
-
-                    act 'Further': gt 'backwater'
-                end
-            end
-        end
-    end
+	if $ARGS[1] = '':
+		cla
+		act 'You suddenly feel an arm on your shoulder':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/2.jpg"></center>'
+			'You turn back to see Igor standing over you. Watching the scenery you did not even notice him sneaking up to you.'
+			'After saying hi, you suddenly realize you are completely naked in front of him, giving him quite the view with the creek in the background'
+			act 'Cover your chest with your arms':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/1.jpg"></center>'
+				'You quickly cover your chest with your arms, looking away a bit ashamed. The clothing disparity is a bit embarassing, him clothed and you in your birthday suit.'
+				'"What is wrong?" asks Igor, landing a small kiss on your shoulder.'
+
+				gs 'arousal', 'flashlite', 2
+				gs 'stat'
+
+				act 'You are not feeling it':
+					cla
+					'"I...it''s just... I''m sorry, just not in the mood to seen naked" you stammer.'
+					'"No need to apologize, I''ll leave you alone" says Igor with a smile. "Catch you back at the hut maybe"'
+
+					gs 'arousal', 'flashlite', 2
+					mood -=5
+					gs 'stat'
+					gs 'arousal', 'end'
+
+					act 'Further': gt 'backwater'
+				end
+				act 'Kiss him back':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/3.jpg"></center>'
+					'Igor''s tender kiss on your bare skin dissolves whatever bit of embarrassment you had. Being naked in front off him like this is actually turning you on.'
+					'You respond by giving Igor a passionate kiss, his hand stroking the small of your back.'
+
+					gs 'arousal', 'kiss', 4
+					gs 'arousal', 'flashlite', 2
+					gs 'stat'
+
+					act 'You do not want to get carried away':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/1.jpg"></center>'
+						'You cover up your chest and tell Igor you want to call it there "I do not want to do anything further. At least, not like this..." you say.'
+						'It would only take the right touch to change your mind, if Igor had noticed the growing dampness between your legs. Instead he smiles and gives you a kis on the shoulder before walking away.'
+
+						gs 'arousal', 'flashlite', 2
+						gs 'arousal', 'end'
+						gs 'stat'
+
+						act 'Further': gt 'backwater'
+					end
+					act 'Take him in your mouth': gt 'IgorHunter', 'creekside', 'bj'
+				end
+			end
+
+			act 'Greet him with a hug':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/4.jpg"></center>'
+				'With a smile, you stand up on the rock you were sitting and go in for a hug as Igor kneels down, his lips locking on your nipple.'
+				'You hug his neck as he suckles and flicks his tongue around your nipple, eliciting some deep sighs from you.'
+
+				gs 'arousal', 'foreplay', 4
+				gs 'arousal', 'breasts', 2
+				minut -= 3
+				gs 'stat'
+
+				act 'Not now':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/11.jpg"></center>'
+					'You gently push Igor away, not feeling like doing anything further.'
+					'"Maybe later", you say. Igor gives you another peck on the breasts before walking away.'
+
+					gs 'arousal', 'breasts', 2
+					gs 'stat'
+					gs 'arousal', 'end'
+
+					act 'Further': gt 'backwater'
+				end
+
+				act 'Lay back and spread your legs':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/5.jpg"></center>'
+					'Having your nipples teased like this is almost unbearable. You feel your pussy lips getting inflamed, the dampness between your legs growing.'
+					'Laying back, you spread your legs wide and look almost beggingly at Igor, wanting his attention right between them. He does not lose time starting to lick your now burning hot, soaking wet fuckhole'
+
+					gs 'arousal', 'cuni', 10
+					minut -= 4
+					gs 'stat'
+
+					act 'You want him inside you': gt 'IgorHunter', 'creekside', 'piv'
+				end
+			end
+		end
+	end
+
+	if $ARGS[1] = 'bj':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/6.jpg"></center>'
+		gs 'dinSex', 'bj_random'
+		gs 'arousal', 'bj', 9
+		minut -= 3
+		gs 'stat'
+
+		act 'Keep sucking him':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/7.jpg"></center>'
+			'As you keep sucking and stroking Igor''s <<$penis_desc>>, you start to feel his dick throb stronger and stronger. Igor tells you he is going to cum'
+			gs 'arousal', 'bj', 6
+			minut -= 3
+			gs 'stat'
+
+			act 'You want to swallow his cum':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/8.jpg"></center>'
+				gs 'dinSex', 'bj_swallow_random'
+				'You lock eyes	with Igor and open your mouth wide, sticking out your tongue to show how thoroughly you have cleaned his dick.'
+				gs 'cum_call', 'mouth', 'A173'
+				gs 'arousal', 'bj', 6
+				minut -= 3
+				gs 'stat'
+				gs 'arousal','end'
+
+				act 'Further': gt 'backwater'
+			end
+			act 'Make him pull out':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/9.jpg"></center>'
+				'Igor pulls out of your mouth the last moment, jerking off furiously and covering your chest in his warm spunk.'
+				gs 'cum_call', 'breasts', 'A173', 1
+				gs 'arousal', 'bj', 4
+				gs 'arousal', 'breasts', 4
+				minut -= 5
+				gs 'stat'
+
+				act 'Relax and enjoy the view together':
+					cla & *clr
+					gs 'arousal', 'breasts', 4
+					minut += 10
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/10.jpg"></center>'
+					'You go back to relaxing and enjoying the view, Igor''s warm seed still covering your tits.'
+					'Igor cuddles you from behind as his hand idly plays with your boob, basking in the post-orgasmic bliss.'
+					act 'Further': gt 'backwater'
+				end
+			end
+		end
+	end
+
+
+	if $ARGS[1] = 'piv':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_2.jpg"></center>'
+		'You lean back further as Igor kisses all over your tit, your hand lightly playing with your other breast'
+
+		gs 'arousal', 'breasts', 5
+		gs 'arousal', 'foreplay', 5
+		minut -= 7
+		gs 'stat'
+
+		act 'Jump on Igor''s lap':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_5.jpg"></center>'
+			'You sit on Igor''s lap, slowly grinding your ass on his crotch as his dick pokes against your folds, the tip almost dipping into the dampness inside'
+
+			gs 'arousal', 'foreplay', 5
+			minut -= 2
+			gs 'stat'
+
+			act 'Take him inside you':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_6.jpg"></center>'
+				gs 'dinSex', 'vaginal_sex', 12
+				gs 'stat'
+
+				act 'You start feeling his cock start to twitch inside you':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/creekside/f_7.jpg"></center>'
+					pose = 3
+					gs 'dinSex', 'sexcum'
+					gs 'arousal', 'vaginal', 4
+					gs 'stat'
+					gs 'arousal', 'end'
+
+					act 'Further': gt 'backwater'
+				end
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'cabin':
-    if $ARGS[1] = '' or $ARGS[1] = 'makeout':
-        if $ARGS[2] = '' or $ARGS[2] = 'light':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_makeout.jpg"></center>'
-            'You are making out with Igor on the couch, your hands roaming over his body as he passionately kisses you'
-            'As you both get more and more heated, you notice Igor''s hands gliding further and further up your thighs'
-
-            gs 'arousal', 'kiss', 6
-            gs 'arousal', 'foreplay', 2
-            minut -= 4
-            gs 'stat'
-
-            act 'You do not want to get carried away':
-                cla
-                'You tell Igor you do not want to do anything more. He keeps kissing you for a couple more minutes but the heat quickly dies down before Igor gives you a final kiss on the cheek and walks away.'
-                gs 'arousal', 'kiss', 2
-                gs 'stat'
-                gs 'arousal', 'end'
-
-                act 'Further': gt 'swamphouse'
-            end
-            
-            act 'Keep making out': gt 'igorhunter', 'cabin', 'makeout', 'heavy'
-            act 'Blow him': gt 'igorhunter', 'cabin', 'bj'
-
-        end
-        if $ARGS[2] = 'heavy':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_makeout_2.jpg"></center>'
-            'You relax on the couch, letting Igor''s hands glide further up. He moves towards your midriff, lifting your bottom up and exposing your wet pussy as he strokes deliciously close to your nether lips, making you moan lightly'
-            
-            gs 'arousal', 'foreplay', 4
-            gs 'stat'
-        
-            act 'Suck Igor''s cock': gt 'igorhunter', 'cabin', 'bj'
-            act 'You want him to lick your pussy': gt 'igorhunter', 'cabin', 'cuni'
-            act '"I need you inside me, Igor!" you whisper': gt 'igorhunter', 'cabin', 'vaginal'
-        end    
-    end
-
-    if $ARGS[1] = 'cuni':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_cuni.jpg"></center>'
-        'You smile and moan as Igor laps up your juices, pulling out and playing with your tit as he flick around your clit, getting you very excited.'
-
-        gs 'arousal', 'foreplay', 4
-        gs 'arousal', 'breasts', 3
-        gs 'arousal', 'cuni', 10
-        minut -= 10
-        gs 'stat'
-
-        act 'Return the favor': gt 'igorhunter', 'cabin', 'bj'
-        act 'You need your pussy filled and fucked proper': gt 'igorhunter', 'cabin', 'vaginal'
-    end
-
-    if $ARGS[1] = 'bj':  
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/bj_1.jpg"></center>'
-        'You go on your hands and knees in front of Igor, your exposed ass towards the door for anyone coming in to see your fuckholes.'
-        gs 'dinsex', 'bj_random'
-
-        gs 'arousal', 'bj', 7
-        gs 'arousal', 'flash', 5, 'exhibitionism'
-        minut -= 6
-        gs 'stat'
-
-        act 'Keep sucking him':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/bj_2.jpg"></center>'
-            'You keep sucking Igor on your knees, your hand pulling out and squeezing your tits. Igor lightly grabs your head and begins to lightly skulllfuck you. After a moment you notice his dick spasming right in your mouth, shooting his jizm right down your throat.'
-            gs 'dinsex', 'bj_swallow_random'
-
-            gs 'arousal', 'bj', 7
-            gs 'arousal', 'breasts', 5
-            minut -= 8
-            gs 'stat'
-            gs 'arousal', 'end'
-
-            act 'Further': gt 'swamphouse'
-        end    
-    end
-
-    if $ARGS[1] = 'vaginal':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_1.jpg"></center>'
-        gs 'dinsex', 'vaginal_sex', 15
-
-        act 'Take off your top':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_2.jpg"></center>'
-            'You pretty much rip off your top and start kneading your tits as Igor keeps drilling your cunt, making you moan and scream like a whore.'
-
-            gs 'arousal', 'vaginal', 8
-            gs 'arousal', breasts, 4
-            gs 'stat'
-
-            act 'Igor suddenly pulls out':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_3.jpg"></center>'
-                'Jerking off his <<$penis_desc>>, he covers your stomach and tits with his warm spunk.'
-
-                gs 'cum_call', 'breasts', 'A173', 1
-                gs 'cum_call', 'stomach', 'A173', 1
-                minut += 2
-                gs 'stat'
-                gs 'arousal', 'end'
-
-                act 'Cuddle him':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_4.jpg"></center>'
-                    'You cuddle with Igor still covered in his spunk, enjoying this intimate moment'
-                    'After a few minutes, Igor pulls you closer and gives you a kiss on the cheek before getting dressed and walking out of the hut.'
-
-                    minut += 8
-                    mood += 10
-
-                    act 'Further': gt 'swamphouse'
-                end
-            end
-        end
-    end
+	if $ARGS[1] = '' or $ARGS[1] = 'makeout':
+		if $ARGS[2] = '' or $ARGS[2] = 'light':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_makeout.jpg"></center>'
+			'You are making out with Igor on the couch, your hands roaming over his body as he passionately kisses you'
+			'As you both get more and more heated, you notice Igor''s hands gliding further and further up your thighs'
+
+			gs 'arousal', 'kiss', 6
+			gs 'arousal', 'foreplay', 2
+			minut -= 4
+			gs 'stat'
+
+			act 'You do not want to get carried away':
+				cla
+				'You tell Igor you do not want to do anything more. He keeps kissing you for a couple more minutes but the heat quickly dies down before Igor gives you a final kiss on the cheek and walks away.'
+				gs 'arousal', 'kiss', 2
+				gs 'stat'
+				gs 'arousal', 'end'
+
+				act 'Further': gt 'swamphouse'
+			end
+
+			act 'Keep making out': gt 'igorhunter', 'cabin', 'makeout', 'heavy'
+			act 'Blow him': gt 'igorhunter', 'cabin', 'bj'
+
+		end
+		if $ARGS[2] = 'heavy':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_makeout_2.jpg"></center>'
+			'You relax on the couch, letting Igor''s hands glide further up. He moves towards your midriff, lifting your bottom up and exposing your wet pussy as he strokes deliciously close to your nether lips, making you moan lightly'
+
+			gs 'arousal', 'foreplay', 4
+			gs 'stat'
+
+			act 'Suck Igor''s cock': gt 'igorhunter', 'cabin', 'bj'
+			act 'You want him to lick your pussy': gt 'igorhunter', 'cabin', 'cuni'
+			act '"I need you inside me, Igor!" you whisper': gt 'igorhunter', 'cabin', 'vaginal'
+		end
+	end
+
+	if $ARGS[1] = 'cuni':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/cabin_cuni.jpg"></center>'
+		'You smile and moan as Igor laps up your juices, pulling out and playing with your tit as he flick around your clit, getting you very excited.'
+
+		gs 'arousal', 'foreplay', 4
+		gs 'arousal', 'breasts', 3
+		gs 'arousal', 'cuni', 10
+		minut -= 10
+		gs 'stat'
+
+		act 'Return the favor': gt 'igorhunter', 'cabin', 'bj'
+		act 'You need your pussy filled and fucked proper': gt 'igorhunter', 'cabin', 'vaginal'
+	end
+
+	if $ARGS[1] = 'bj':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/bj_1.jpg"></center>'
+		'You go on your hands and knees in front of Igor, your exposed ass towards the door for anyone coming in to see your fuckholes.'
+		gs 'dinsex', 'bj_random'
+
+		gs 'arousal', 'bj', 7
+		gs 'arousal', 'flash', 5, 'exhibitionism'
+		minut -= 6
+		gs 'stat'
+
+		act 'Keep sucking him':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/bj_2.jpg"></center>'
+			'You keep sucking Igor on your knees, your hand pulling out and squeezing your tits. Igor lightly grabs your head and begins to lightly skulllfuck you. After a moment you notice his dick spasming right in your mouth, shooting his jizm right down your throat.'
+			gs 'dinsex', 'bj_swallow_random'
+
+			gs 'arousal', 'bj', 7
+			gs 'arousal', 'breasts', 5
+			minut -= 8
+			gs 'stat'
+			gs 'arousal', 'end'
+
+			act 'Further': gt 'swamphouse'
+		end
+	end
+
+	if $ARGS[1] = 'vaginal':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_1.jpg"></center>'
+		gs 'dinsex', 'vaginal_sex', 15
+
+		act 'Take off your top':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_2.jpg"></center>'
+			'You pretty much rip off your top and start kneading your tits as Igor keeps drilling your cunt, making you moan and scream like a whore.'
+
+			gs 'arousal', 'vaginal', 8
+			gs 'arousal', breasts, 4
+			gs 'stat'
+
+			act 'Igor suddenly pulls out':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_3.jpg"></center>'
+				'Jerking off his <<$penis_desc>>, he covers your stomach and tits with his warm spunk.'
+
+				gs 'cum_call', 'breasts', 'A173', 1
+				gs 'cum_call', 'stomach', 'A173', 1
+				minut += 2
+				gs 'stat'
+				gs 'arousal', 'end'
+
+				act 'Cuddle him':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/cabin/f_4.jpg"></center>'
+					'You cuddle with Igor still covered in his spunk, enjoying this intimate moment'
+					'After a few minutes, Igor pulls you closer and gives you a kiss on the cheek before getting dressed and walking out of the hut.'
+
+					minut += 8
+					mood += 10
+
+					act 'Further': gt 'swamphouse'
+				end
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'woods':
-    if $ARGS[1] = '':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/2.jpg"></center>'
-        'You passionately kiss Igor, his tongue exploring your throat. As you are making out with Igor, you notice him undoing your buttons'
-        
-        gs 'arousal', 'kiss', 3
-        gs 'stat'
-
-        act 'Pull back': 
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/misc/hangout_woods.jpg"></center>'
-            'You do not really want to do it here. Noticing you not really reciprocating, Igor pulls back and goes back to simply relaxing and chatting with you.'
-
-            gs 'arousal', 'end'
-
-            act 'Further': gt 'swamp_woods'
-        end
-
-        act 'Keep making out with him':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/3.jpg"></center>'
-            'You let him undo your top, continuing to make out with him until he exposes your tits to the warm, breezy air.'
-
-            gs 'arousal', 'foreplay', 2
-            gs 'stat'
-
-            act '...':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/4.jpg"></center>'
-                'He pulls your outfit down and kisses down your chest before his lips find your nipple. You gasp when he starts to suckle and nibble, feeling a bit of wetness between your legs'
-
-                gs 'arousal', 'foreplay', 4
-                gs 'arousal', 'breasts', 4
-                minut -= 5
-                gs 'stat'
-
-                act 'Stand up so that he can strip you off':
-                    cla & *clr
-                    '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/5_2.jpg"></center>'
-                    'As soon as you stand up he starts pulling your outfit down your legs, exposing your already aching pussy.'
-
-                    act 'Blow him': gt 'IgorHunter', 'woods', 'cuni'
-                end
-            end
-        end
-    end
-
-    if $ARGS[1] = 'cuni':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/6.jpg"></center>'
-        'Just as you start kneeling down, Igor picks you up and puts you up on the stump in one swift move'
-        'You let out a shriek part out of surprise and part how being manhandled like this got you aroused, spreading your legs wide for Igor'
-        'He does not lose time before starting to suck on your clit, pumping his finger in and out while you moan deeply.'
-
-        gs 'arousal', 'foreplay', 8, 'sub'
-        gs 'arousal', 'cuni', 12
-        gs 'arousal', 'vaginal_finger', 8
-        minut -= 20
-        gs 'stat'
-
-        act 'Get down and strip Igor': gt 'IgorHunter', 'woods', 'bj'
-    end
-
-    if $ARGS[1] = 'bj':
-        cla & *clr
-        '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/8.jpg"></center>'
-        'Satisfied enough with Igor''s ''surprise'', you get down and undo his pants as he takes off his t-shirt.'
-        'You then pull down his boxers, exposing his diamond hard cock'
-
-        minut += 2
-        gs 'stat'
-
-        act 'Suck his dick':
-            cla & *clr
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/9.jpg"></center>'
-            gs 'dinsex', 'bj_random'
-            'After a few moments, you start feeling his dick rhytmically pulsing inside your mouth'
-
-            gs 'arousal', 'bj', 8
-            gs 'stat'
-
-            act 'Keep sucking and milk his dick':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/swallow.jpg"></center>'
-                'You keep on sucking and stroking Igor''s dick as his dick throbs harder and harder'
-                gs 'dinsex', 'bj_swallow_random'
-
-                gs 'arousal', 'bj', 4
-                gs 'cum_call', 'mouth', 'A173', 1
-                gs 'stat'
-                gs 'arousal', 'end'
-
-                act 'Further': gt 'swamp_woods'
-            end
-
-            act 'You want him to cum on your tits':
-                cla & *clr
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/pnecklace.jpg"></center>'
-                'You take him out and jerk him off. It takes him only a few seconds to climax, covering your chest with his spunk'
-
-                gs 'arousal', 'hj', 4
-                gs 'cum_call', 'breasts', 'A173', 1
-                gs 'stat'
-                gs 'arousal', 'end'
-
-                act 'Further': gt 'swamp_woods'
-            end
-        end
-    end
+	if $ARGS[1] = '':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/2.jpg"></center>'
+		'You passionately kiss Igor, his tongue exploring your throat. As you are making out with Igor, you notice him undoing your buttons'
+
+		gs 'arousal', 'kiss', 3
+		gs 'stat'
+
+		act 'Pull back':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/misc/hangout_woods.jpg"></center>'
+			'You do not really want to do it here. Noticing you not really reciprocating, Igor pulls back and goes back to simply relaxing and chatting with you.'
+
+			gs 'arousal', 'end'
+
+			act 'Further': gt 'swamp_woods'
+		end
+
+		act 'Keep making out with him':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/3.jpg"></center>'
+			'You let him undo your top, continuing to make out with him until he exposes your tits to the warm, breezy air.'
+
+			gs 'arousal', 'foreplay', 2
+			gs 'stat'
+
+			act 'Continue':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/4.jpg"></center>'
+				'He pulls your outfit down and kisses down your chest before his lips find your nipple. You gasp when he starts to suckle and nibble, feeling a bit of wetness between your legs'
+
+				gs 'arousal', 'foreplay', 4
+				gs 'arousal', 'breasts', 4
+				minut -= 5
+				gs 'stat'
+
+				act 'Stand up so that he can strip you off':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/5_2.jpg"></center>'
+					'As soon as you stand up he starts pulling your outfit down your legs, exposing your already aching pussy.'
+
+					act 'Blow him': gt 'IgorHunter', 'woods', 'cuni'
+				end
+			end
+		end
+	end
+
+	if $ARGS[1] = 'cuni':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/6.jpg"></center>'
+		'Just as you start kneeling down, Igor picks you up and puts you up on the stump in one swift move'
+		'You let out a shriek part out of surprise and part how being manhandled like this got you aroused, spreading your legs wide for Igor'
+		'He does not lose time before starting to suck on your clit, pumping his finger in and out while you moan deeply.'
+
+		gs 'arousal', 'foreplay', 8, 'sub'
+		gs 'arousal', 'cuni', 12
+		gs 'arousal', 'vaginal_finger', 8
+		minut -= 20
+		gs 'stat'
+
+		act 'Get down and strip Igor': gt 'IgorHunter', 'woods', 'bj'
+	end
+
+	if $ARGS[1] = 'bj':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/8.jpg"></center>'
+		'Satisfied enough with Igor''s ''surprise'', you get down and undo his pants as he takes off his t-shirt.'
+		'You then pull down his boxers, exposing his diamond hard cock'
+
+		minut += 2
+		gs 'stat'
+
+		act 'Suck his dick':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/9.jpg"></center>'
+			gs 'dinsex', 'bj_random'
+			'After a few moments, you start feeling his dick rhytmically pulsing inside your mouth'
+
+			gs 'arousal', 'bj', 8
+			gs 'stat'
+
+			act 'Keep sucking and milk his dick':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/swallow.jpg"></center>'
+				'You keep on sucking and stroking Igor''s dick as his dick throbs harder and harder'
+				gs 'dinsex', 'bj_swallow_random'
+
+				gs 'arousal', 'bj', 4
+				gs 'cum_call', 'mouth', 'A173', 1
+				gs 'stat'
+				gs 'arousal', 'end'
+
+				act 'Further': gt 'swamp_woods'
+			end
+
+			act 'You want him to cum on your tits':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter_igor/woods/pnecklace.jpg"></center>'
+				'You take him out and jerk him off. It takes him only a few seconds to climax, covering your chest with his spunk'
+
+				gs 'arousal', 'hj', 4
+				gs 'cum_call', 'breasts', 'A173', 1
+				gs 'stat'
+				gs 'arousal', 'end'
+
+				act 'Further': gt 'swamp_woods'
+			end
+		end
+	end
 end
 
 --- Igorhunter ---------------------------------

+ 12 - 12
locations/IrinaRoom.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'kiss':
 
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Sex':gt 'IrinaRoom', 'sex'
 end
 
@@ -108,24 +108,24 @@ if $ARGS[0] = 'sex':
 
 	if pcs_horny < 50:
 		'Once in bed you caress each other with passion and lick each others wet pussies. But the excitement gradually disappears and you feel that you won''t orgasm this time.'
-		
+
 		$orgasm_or = 'no'
 		gs 'arousal', 'cuni', 60, 'lesbian'
 		gs 'arousal', 'cuni_give', 60, 'lesbian'
 		minut -= 60
 		gs 'stat'
-		
+
 	end
 
 	if pcs_horny >= 50:
 		'Once in bed you caress each other with passion and lick each others wet pussies. Finally you are both satisfied.'
-		
+
 		$orgasm_or = 'yes'
 		gs 'arousal', 'cuni', 60, 'lesbian'
 		gs 'arousal', 'cuni_give', 60, 'lesbian'
 		minut -= 60
 		gs 'stat'
-		
+
 	end
 
 	act 'Leave':
@@ -160,7 +160,7 @@ if $ARGS[0] = 'first3':
 
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Ira undress':gt 'IrinaRoom', 'first4'
 	act 'Ira drink more':gt 'IrinaRoom', 'first5'
 end
@@ -191,13 +191,13 @@ if $ARGS[0] = 'first5':
 	'You pumped Ira with wine, she is highly intoxicated and spilled wine on myself. She went into the bathroom to change. You, too, went in and offered to help her.'
 	'She undresses and you have decided to follow suit and after undressing climb into the shower. You start lathering her body and see that she is flushed and her nipples erect.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
+	noShampoo = 1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 
 	gs 'arousal', 'foreplay', 10, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Kiss':gt 'IrinaRoom', 'first6'
 end
 
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first6':
 
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Fondle breasts':gt 'IrinaRoom', 'first7'
 end
 
@@ -225,7 +225,7 @@ if $ARGS[0] = 'first7':
 
 	gs 'arousal', 'breasts', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Lick pussy':gt 'IrinaRoom', 'first8'
 end
 
@@ -245,7 +245,7 @@ if $ARGS[0] = 'first8':
 	gs 'arousal', 'cuni_give', 10, 'lesbian'
 	minut -= 10
 	gs 'stat'
-	
+
 	act 'Enjoy':gt 'IrinaRoom', 'first9'
 end
 
@@ -262,7 +262,7 @@ if $ARGS[0] = 'first9':
 	$orgasm_or = 'yes'
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	gs 'stat'
-		
+
 	act 'Leave':
 		cla
 		minut += 5

+ 1 - 0
locations/JuliaMilGo.qsrc

@@ -9,6 +9,7 @@ gs 'stat'
 act 'Go with Julia':
 	cls
 	minut += 15
+	BeInJulMilHome = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'

+ 9 - 14
locations/JuliaMilVhod.qsrc

@@ -2,27 +2,22 @@
 
 CLOSE ALL
 menu_off = 1
-cla
-*clr
+*clr & cla
 
 if BeInJulMilHome = 0:BeInJulMilHome = 1
 gs'stat'
 
-GoInside = 1
-$byetext=''
-if hour <18 and kanikuli = 0 and week <6: $byetext='You ring the door bell, but no one comes to answer. Julia must not be home.' & GoInside = 0
-
-if hour > 20 : $byetext='It''s too late in the day to visit Julia.' & GoInside = 0
-
-if hour < 8 : $byetext='It''s too early in the day to visit Julia.' & GoInside = 0
-
-if GoInside ! 0:
+act 'Leave':gt'pod_ezd','etaj_3'
+if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
+	'You ring the door bell, but no one comes to answer. Julia must not be home.'
+elseif hour > 20 :
+	'It''s too late in the day to visit Julia.'
+elseif hour < 8:
+	'It''s too early in the day to visit Julia.'
+else
 	'You ring the door bell. You hear footsteps in the apartment and sure enough, a few seconds later Julia opens the door. "Oh, hi <<$pcs_nickname>>! Come on in!"'
 	act 'Enter Julia''s apartment':gt'JuliaMilHome'
-else
-	'<<$byetext>>'
 end
-act 'Move away from the door':gt'pod_ezd','etaj_3'
 
 --- JuliaMilVhod ---------------------------------
 

+ 3 - 0
locations/KatjaHomeTalk.qsrc

@@ -21,6 +21,7 @@ if $ARGS[0] = '':
 
 				act 'Wash alone':
 					cls
+					noShampoo = 1
 					dynamic $showerdin
 					minut += 15
 					pcs_horny += 1
@@ -42,6 +43,7 @@ if $ARGS[0] = '':
 				if mesec <= 0:
 					act 'Bathe together':
 						cls
+						noShampoo = 1
 						dynamic $showerdin
 						minut += 15
 						pcs_horny += 1
@@ -105,6 +107,7 @@ if $ARGS[0] = '':
 					end
 				end
 			elseif KatjaHorny < 50:
+				noShampoo = 1
 				dynamic $showerdin
 				minut += 15
 				pcs_horny += 1

+ 13 - 12
locations/LBZhouse.qsrc

@@ -4,7 +4,7 @@ CLOSE ALL
 $LBZH_sex={
 	act 'Give up your pussy':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,7)
 		!'<<mrapic>>'
 		'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<mrapic>>.mp4"></video></center>'
@@ -19,14 +19,14 @@ $LBZH_sex={
 $LBZH_anal={
 	act 'Give up your ass':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,7)
 		!'<<mrapic>>'
 		'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<mrapic>>.mp4"></video></center>'
 		''
 		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
-		
+
 		spafinloc = 3
 		gs 'cum_manage'
 		'<<$boydesc>> groaned and came filling your ass with his warm sperm.'
@@ -38,7 +38,7 @@ $LBZH_anal={
 $LBZH_bj={
 	act 'Suck':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,12)
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<mrapic>>.mp4"></video></center>'
 		'You take a cock in your mouth and start sucking it. You get busy working up and down his dick with your mouth. Your lips lock tightly around his shaft while your tongue licks and plays with his dick.'
@@ -46,7 +46,7 @@ $LBZH_bj={
 
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
-			
+
 		 act 'Swallow':
 			cls
 			swallow += 1
@@ -61,7 +61,7 @@ $LBZH_bj={
 
 			act 'Finish':dynamic $LBZH_end
 		end
-	 
+
 		dynamic $LBZH_sex
 		dynamic $LBZH_anal
 	end
@@ -75,6 +75,7 @@ $LBZH_end={
 
 	act 'Wash in the shower':
 		cls
+		noShampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pcs_horny = pcs_horny + 1
@@ -90,8 +91,8 @@ $LBZH_end={
 			cls
 			gs'stat'
 			'After you are done washing you get dressed and blow <<$boydesc>> a kiss before you leave.'
-			
-			
+
+
 			act 'Leave':
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -120,20 +121,20 @@ act 'Sex':
 	if tiprand<=70:
 		'<<$boydesc>> gently pushes your shoulders down and you kneel in front of him, waiting for his hard shaft.'
 		dynamic $LBZH_bj
-	     
+
 		act 'Masturbate':
 			cls
 			temp_hj+=1
 			temp_guy+=1
-			gs'stat' 
+			gs'stat'
 			mrapic=0
 			'<center><video autoplay loop src="images/shared/sex/handjob/hj<<mrapic>>.mp4"></video></center>'
 			'You immediately take his cock in your hand and start jerking him off.'
 			'Soon <<$boydesc>> starts to pant heavily and moans out. "<<$pcs_nickname>>, I''m about to cum."'
-			
+
 			gs 'arousal', 'hj', 5, 'sub'
 			gs 'stat'
-			
+
 			dynamic $LBZH_sex
 			dynamic $LBZH_anal
 		end

+ 1 - 1
locations/LCporn.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'firsttime':
 		minut += 7
 		gs 'stat'
 		'No, no! You quickly squirm past Eugene and leave the pantry, and don''t stop walking until you''re well away from the diner.'
-		LCEugenefirst = -1
+		LCEugenefirst = 0
 
 		act 'Continue':gt 'nord'
 	end

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

+ 6 - 6
locations/MartinSex.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = '':
 					'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind, but then you remember that you are on your period, so stripping isn''t really a sexy option right now.'
 				end
 
-				if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
+				if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20 and cycle ! 0:
 					'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be.'
 				elseif exhibitionist_lvl > 0 and pcs_dom > 50 and cycle = 0:
 					'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be, and your period certainly isn''t going to stand in the way of <i>that</i>.'
@@ -128,7 +128,7 @@ if $ARGS[0] = '':
 					act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 				end
 
-				if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
+				if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20:
 					act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 				end
 
@@ -184,7 +184,7 @@ if $ARGS[0] = '':
 			'Maybe he just needs a little push. Maybe, all you have to do is show him that you aren''t too young, show him what he is missing out on.'
 			if cycle = 0: 'But, damn, since you are currently on your period, that isn''t an option today. You will have to think of something else or come back some other time.'
 
-			if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
+			if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20:
 				if cycle = 0:
 					'A good blowjob would probably set him straight right quick, no matter what time of the month it is.'
 				else
@@ -240,7 +240,7 @@ if $ARGS[0] = '':
 			act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 		end
 
-		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20:
 			act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 		end
 
@@ -260,7 +260,7 @@ if $ARGS[0] = '':
 			'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind, but then you remember that you are on your period, so stripping isn''t really a sexy option right now.'
 		end
 
-		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20 and cycle ! 0:
 			'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be.'
 		elseif exhibitionist_lvl > 0 and pcs_dom > 50 and cycle = 0:
 			'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be, and your period certainly isn''t going to stand in the way of <i>that</i>.'
@@ -390,7 +390,7 @@ if $ARGS[0] = '':
 			act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 		end
 
-		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and stat['bj'] > 20:
 			act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 		end
 

+ 1 - 1
locations/MartinTalk.qsrc

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

+ 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 - 25
locations/NatBelVhod.qsrc

@@ -1,25 +0,0 @@
-# NatBelVhod
-CLOSE ALL
-
-menu_off = 1
-if BeInNatBelHome = 0:BeInNatBelHome = 1
-gs'stat'
-
-GoInside = 1
-$byetext=''
-if hour <18 and kanikuli = 0 and week <6: $byetext='You knock on the door, but nobody answers.' & GoInside = 0
-
-if hour > 20 : $byetext='It is to late to go to visit.' & GoInside = 0
-
-if hour < 8 : $byetext='It is to early to go to visit.' & GoInside = 0
-
-act 'Leave':gt'pod_ezd','etaj_4'
-if GoInside ! 0:
-	'You knock on the door. Natasha answers and invites you in.'
-	act 'Go into the apartment':gt'NatBelHome'
-else
-	'<<$byetext>>'
-end
-
---- NatBelVhod ---------------------------------
-

+ 3 - 3
locations/NikoDates.qsrc

@@ -411,7 +411,7 @@ if $ARGS[0] = 'Date 2_2':
 					*nl
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/train.mp4"></video></center>'
 
-					act '...':gt 'NikoDates', 'Date Rape'
+					act 'Continue':gt 'NikoDates', 'Date Rape'
 				end
 			end
 		end
@@ -460,7 +460,7 @@ if $ARGS[0] = 'Date Rape':
 				gs 'arousal', 'end'
 				gs'stat'
 
-				act '...':
+				act 'Continue':
 					cls
 					gs 'clothing', 'wear_last_worn'
 					if NikoEv < 4:NikoEv = 4
@@ -1676,7 +1676,7 @@ if $ARGS[0] = 'Exposed':
 											gs 'arousal', 'end'
 											gs 'stat'
 
-											act '...':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'Family'
+											act 'Continue':gs 'clothing', 'wear_last_worn' & gt 'NikoDreams', 'Family'
 										end
 									end
 								end

+ 4 - 4
locations/NikoDreams.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] =  'Family':
 						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4"></video></center>'
 
-						act '...':gt 'SoniaHome', 'Aftermath'
+						act 'Continue':gt 'SoniaHome', 'Aftermath'
 					end
 				end
 			end
@@ -324,7 +324,7 @@ if $ARGS[0] =  'TeeHee':
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/butterfly6.jpg"></center>'
 
-		act '...':VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
+		act 'Continue':VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'SoniaHome', 'Aftermath 2'
 	end
 
 	act 'Walk away':VKTeeHee = 1 & gt 'NikoDreams', 'Woods Home'
@@ -430,7 +430,7 @@ if $ARGS[0] =  'Friends':
 						*nl
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
 
-						act '...':minut += 120 & gt 'NikoEv2', 'Niko Wake'
+						act 'Continue':minut += 120 & gt 'NikoEv2', 'Niko Wake'
 					end
 				end
 			end
@@ -539,7 +539,7 @@ if $ARGS[0] = 'Puppeteer':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppeteer.jpg"></center>'
 							'You turn around but quickly get grabbed by your cheeks then launched onto the ground by a horrific looking man with an orange suit and long sharp nails. You quickly roll to the side, dodging a swipe of his nails before quickly crawling away just to get grabbed by your ankles and dragged back. You let out a loud scream before you hear the man say, "Ahh another one for my collection. You belong to me now puppet." The man then pulls you toward him. You try to grab onto something to stop yourself from getting dragged away but can find nothing to grab onto. You can do nothing but cry and scream as you get pulled out of the school into a dark mist which envelopes you....'
 
-							act '...':
+							act 'Continue':
 								*clr & cla
 								music_loop = 0
 								close all

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

+ 32 - 27
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>'
@@ -584,7 +588,7 @@ if $ARGS[0] = 'confession':
 			'"Hmm? Of course you may, <<$pcs_firstname>>," he replied with a smile, "It is Kirill. Father Kirill."'
 			'You knelt next to Father Kirill.'
 			'"Father, I''m no longer an virgin." you confess.'
-			if gpoliuborka = 2:
+			if forge_referral = 1:
 				'"I''ve lied to my mother about it and given her a fake note from the gynecologist saying I''m still a virgin." you admitted shamefully.'
 			else
 				'"<<$npc_nickname[''A29'']>> will make me go to the gynecologist soon and he''ll report that I''m no longer a virgin." you say fearfully, "My <<$npc_nickname[''A29'']>> will be so mad. I don''t know what to do."'
@@ -657,7 +661,7 @@ if $ARGS[0] = 'secrets':
 			else
 				'"Really?" Father Kirill answered eagerly, "I imagine that it was an educational experience then. Did you and the boys further your education in any way beyond the movies?"'
 			end
-			if evgenQW < 2:
+			if evgenQW < 3:
 				'You shake your head then realize that Father Kirill can''t see you.'
 				'"No, Father. we only watched the movies." you tell him.'
 				'"Well then, no harm done then." he says, almost sounding disappointed.'
@@ -668,7 +672,7 @@ if $ARGS[0] = 'secrets':
 					act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 				end
 			end
-			if evgenQW >= 2:
+			if evgenQW = 3:
 				act 'Admit to jerking the boys':
 					*clr & cla
 					Kirill_Crpt += 1
@@ -687,7 +691,7 @@ if $ARGS[0] = 'secrets':
 					end
 				end
 			end
-			if evgenQW >= 3:
+			if evgenQW >= 4:
 				act 'Admit to sucking the boys':
 					*clr & cla
 					Kirill_Crpt += 1
@@ -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/RoundEnd.qsrc

@@ -23,7 +23,7 @@ stoper = 0
 			resultFight = 2
 		end
 
-		act '...':gt 'EndFight'
+		act 'Continue':gt 'EndFight'
 	elseif round < Formula + 1:
 		endur += lustw * 25 / 100
 		endurE += lustwe * 25 / 100

+ 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 - 1
locations/SubLoss.qsrc

@@ -6,7 +6,7 @@
 resultFight = 4
 'You signal the referee that you''re no longer able to continue fighting and give up.'
 
-act '...':gt 'EndFight'
+act 'Continue':gt 'EndFight'
 
 --- SubLoss ---------------------------------
 

+ 1 - 1
locations/SubWin.qsrc

@@ -6,7 +6,7 @@
 resultFight = 0
 '<<$nameE>> is done. The referee signals, that she can no longer continue on fighting and she''s given up.'
 
-act '...':gt 'EndFight'
+act 'Continue':gt 'EndFight'
 
 --- SubWin ---------------------------------
 

+ 10 - 2
locations/Vnlake1.qsrc

@@ -1,8 +1,16 @@
 # Vnlake1
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake1.jpg"></center>'
 'While you were sunbathing a tipsy girl holding a bottle of wine walks up to you, she sits down next to you and begins to stroke your back.'
-
-act 'Drive her off':gt 'Nudelake'
+	
+gs 'willpower', 'sex', 'resist'
+if will_cost <= pcs_willpwr:	
+	act 'Drive her off (<<will_cost>> Willpower)':
+		gs 'willpower', 'pay', 'resist'
+		gt 'Nudelake'
+	end
+else
+    act 'Drive her off (<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':
 	cla

+ 9 - 1
locations/Vnlake2.qsrc

@@ -2,7 +2,15 @@
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake1.jpg"></center>'
 'Whilst tanning you doze off, and you dream about your breasts being caressed, as someones tongue pleasures your pussy. You open your eyes and understand that this is not a dream, next to you two men one caressing your breasts, the second has already dug his head between your legs.'
 
-act 'Push them away':gt 'Nudelake'
+gs 'willpower', 'sex', 'resist'
+if will_cost <= pcs_willpwr:		
+	act 'Push them away (<<will_cost>> Willpower)':
+		gs 'willpower', 'pay', 'resist'
+		gt 'Nudelake'
+	end
+else
+    act 'Push them 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 'Touch member':
 	cls

+ 10 - 2
locations/VoltrenerSexShower.qsrc

@@ -123,7 +123,11 @@ if $ARGS[0] = '3':
 				gs 'arousal', 'flash', 10
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Wash your ass':dynamic $showerdin & gt 'gdksport', 'start'
+				act 'Wash your ass':
+					noShampoo = 1
+					dynamic $showerdin
+					gt 'gdksport', 'start'
+				end
 			end
 			act 'Cover up':
 				cls
@@ -132,7 +136,11 @@ if $ARGS[0] = '3':
 				'Mikhail Nikolaevich gives you an evil look, "Prokhorov fucks your ass and you scream with joy, but your coach just wants to alleviate some tension and you curl up all scared?"'
 				'You can see from the look in his eyes that he''s been at the wine and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 				gs 'stat'
-				act 'Wash your ass':dynamic $showerdin & gt 'gdksport', 'start'
+				act 'Wash your ass':
+					noShampoo = 1
+					dynamic $showerdin
+					gt 'gdksport', 'start'
+				end
 			end
 		end
 	end

+ 100 - 63
locations/WorkHosp.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
-	'The hospital staff are hard at work, with many patients waiting in the lobbies.  Doctors and nurses rush from office to office trying to keep the flow of patients going as quickly as possible.'
+	'The hospital staff are hard at work, with many patients waiting in the lobbies. Doctors and nurses rush from office to office trying to keep the flow of patients going as quickly as possible.'
 	jobhosprand = rand(0, 9)
 
 	act 'Work in the Operating Room (1:00)':
@@ -57,7 +57,7 @@ if $ARGS[0] = 'start':
 					picrand = 11
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/mastr11.jpg"></center>'
 					'You begin to secretly masturbate whenever nobody is watching.'
-					$orgasm_or = 'custom'
+					$orgasm_or = 'yes'
 					$orgasm_txt = 'Gradually a pleasant warmth and sensation radiates from your needy sex, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
 					gs 'arousal', 'masturbate', 15
 					gs 'stat'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 		cls
 		'<center><b><font color="maroon">Clinic</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
-		'Your shift ended.'
+		'Your shift has ended.'
 
 		act 'Go home':gt 'street'
 	end
@@ -102,16 +102,14 @@ end
 if $ARGS[0] = 'milit':
 	cla
 	military = 1
-	'"Listen, I am scheduled to work this weekend, but I have plans. Here''s the deal: War games are often held not far from the city and well, according to the rules, they need doctors on site before they can begin. Don''t worry, you will have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, on Saturday you can catch a bus at the clinic between 6 and 9. Oh yeah, I almost forgot! The pay for two days is 5000."'
-
+	'"Listen, I am scheduled to work this weekend, but I have plans. Here''s the deal, War games are often held not far from the city and well, according to the rules, they need doctors on site before they can begin. Don''t worry, you will have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, on Saturday you can catch a bus at the clinic between 6 and 9. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?" asks Kat.'
 
 	act 'Move away':gt 'WorkHosp', 'start'
 end
 
 if $ARGS[0] = '0':
     $location_type = 'event'
-	cla
-	*clr
+	cla & *clr
 	katprorand = rand(0, 2)
 
 	if katprorand = 0:
@@ -120,7 +118,7 @@ if $ARGS[0] = '0':
 		xgt 'lezbsex', 'var'
 	elseif katprorand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex7.jpg"></center>'
-		'You and Kat just began to fondle each other when a patient entered the room. You backed away from her trying to pretend that nothing was happening.  On the contrary, Kat did not hesitate and was lying on the couch with her legs spread wide, proudly showing off her wet pussy.  She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing, while looking hungrily at the guy and inviting him to join in the fun.'
+		'You and Kat just began to fondle each other when a patient entered the room. You backed away from her trying to pretend that nothing was happening. On the contrary, Kat did not hesitate and was lying on the couch with her legs spread wide, proudly showing off her wet pussy. She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing, while looking hungrily at the guy and inviting him to join in the fun.'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		gs 'stat'
 		act 'Leave':gt 'WorkHosp', 'start'
@@ -134,14 +132,14 @@ if $ARGS[0] = '0':
 			gs 'boyStat', $npclastgenerated
 			gt 'podrsex', 'suck'
 			gs 'arousal', 'cuni_give', 10, 'lesbian'
-			gs 'arousal', 'vaginal', 10, 'unkown'
+			gs 'arousal', 'vaginal', 10, 'unknown'
 			minut -= 10
 			gs 'arousal', 'end'
 			gs 'stat'
 		end
 	elseif katprorand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex8.jpg"></center>'
-		'While your tryst with Kate was in full swing, two doctors came in. You were both so engrossed with each other, that you didn''t even notice them until they started to caress you. You both spread your legs wider, inviting them to join the fun.'
+		'While Kat and you are in full swing, two doctors enter the room. You are both engrossed with each other, that you didn''t even notice them until they started to caress you. You both spread your legs wider, inviting them to join the fun.'
 
 		act 'Entertain them':
 			gang += 1
@@ -155,19 +153,18 @@ if $ARGS[0] = '0':
 			gs 'WorkHosp', 'randdoc'
 			if $boydesc = $boydesc[1]:docfuck[randdoc] -= 1 & jump 'docloop'
 			if docfuck[randdoc] = 1:guy += 1
-			xgt 'sexdvanadva', 'var'
 			gs 'arousal', 'bj', 10, 'group'
 			gs 'arousal', 'vaginal', 10, 'group'
 			minut -= 10
 			gs 'arousal', 'end'
 			gs 'stat'
+			xgt 'sexdvanadva', 'var'
 		end
 	end
 end
 
 if $ARGS[0] = '1':
-	cla
-	*clr
+	cla & *clr
 	mastrrand = rand(0, 1)
 
 	if mastrrand = 0:
@@ -175,75 +172,115 @@ if $ARGS[0] = '1':
 		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
-		if pcs_horny < 50:act 'Break and run':gs 'arousal', 'end' & gt 'WorkHosp', 'start'
-
-		act 'Go along with it':
-			guy += 1
-			picrand = 12
-			gs 'WorkHosp', 'randdoc'
-			if docfuck[randdoc] = 1:guy += 1
-			gt 'sex', 'minet'
+		if pcs_horny < 50:
+			
+			act 'Break and run':
+				gs 'arousal', 'end'
+				gt 'WorkHosp', 'start'
+			end
+			
+			gs 'willpower', 'sex', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'Go along with it (<<will_cost>> Willpower)':
+					guy += 1
+					picrand = 12
+					gs 'WorkHosp', 'randdoc'
+					if docfuck[randdoc] = 1:guy += 1
+					gs 'willpower', 'pay', 'self'
+					gt 'sex', 'minet'
+				end
+			else
+				act 'Go along with it (<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
 		picrand = rand(12, 13)
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex10.jpg"></center>'
 		'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.'
-
-		if pcs_horny < 50:
-			act 'Leave':gt 'WorkHosp', 'start'
-		end
-
-		act 'Play with them':
-			sexpartkno = 1
-			gs 'WorkHosp', 'randdoc'
-			$boy[1] = $boy
-			$boydesc[1] = $boydesc
-			if docfuck[randdoc] = 1:guy += 1
-			:docloop2
-			gs 'WorkHosp', 'randdoc'
-			if $boydesc = $boydesc[1]:docfuck[randdoc] -= 1 & jump 'docloop2'
-			if docfuck[randdoc] = 1:guy += 1
-			xgt 'sexdvoe', 'var'
-			gs 'arousal', 'bj', 10, 'group'
-			gs 'arousal', 'vaginal', 10, 'group'
-			minut -= 10
+		gs 'arousal', 'masturbate', 10
+		gs 'stat'
+					
+		act 'Leave':
 			gs 'arousal', 'end'
-			gs 'stat'
+			gt 'WorkHosp', 'start'
+		end
+		
+		gs 'willpower', 'sex', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Play with them (<<will_cost>> Willpower)':
+				sexpartkno = 1
+				gs 'WorkHosp', 'randdoc'
+				$boy[1] = $boy
+				$boydesc[1] = $boydesc
+				if docfuck[randdoc] = 1:guy += 1
+				:docloop2
+				gs 'WorkHosp', 'randdoc'
+				if $boydesc = $boydesc[1]:docfuck[randdoc] -= 1 & jump 'docloop2'
+				if docfuck[randdoc] = 1:guy += 1
+				gs 'arousal', 'bj', 10, 'group'
+				gs 'arousal', 'vaginal', 10, 'group'
+				minut -= 10
+				gs 'willpower', 'pay', 'self'
+				gs 'arousal', 'end'
+				gs 'stat'
+				xgt 'sexdvoe', 'var'
+			end
+		else
+			act 'Play with them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end
 
 if $ARGS[0] = '2':
-	cla
-	*clr
+	*clr & cla
 	picrand = rand(13, 15)
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex11.jpg"></center>'
 	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him, as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan, and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
-	act 'Oust him':medcn_exp += rand (0,1) & gt 'WorkHosp', 'start'
-	act 'Give him what he wants':guy += 1 & gt 'sex', 'minet'
+	
+	act 'Oust him':
+		medcn_exp += rand (0,1) 
+		gt 'WorkHosp', 'start'
+	end
+	
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Give him what he wants (<<will_cost>> Willpower)':
+			guy += 1
+			gs 'willpower', 'pay', 'self'
+			gt 'sex', 'minet'
+		end
+	else
+		act 'Give him what he wants (<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] = '3':
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex12.jpg"></center>'
-	'A pretty patient comes into the room and the doctor tries to examine her.  Then she touches his trousers near his poorly hidden erection.  The doctor glances at you with a question in his eyes.'
+	'A pretty patient comes into the room and the doctor tries to examine her. Then she touches his trousers near his poorly hidden erection. The doctor glances at you with a question in his eyes.'
+	
 	act 'Ask if she actually needs treatment':medcn_exp += rand (0,1) & gt 'WorkHosp', 'start'
-     
-	act 'Play along':
-		guy += 1
-		girl += 1
-		lesbian += 1
-		picrand = 13
-		sexpartkno = 1
-		gs 'WorkHosp', 'randdoc'
-		if docfuck[randdoc] = 1:guy += 1
-		gt 'podrsex', 'suck'
-		gs 'arousal', 'cuni_give', 10, 'group'
-		gs 'arousal', 'vaginal', 10, 'group'
-		minut -= 10
-		gs 'arousal', 'end'
-		gs 'stat'
+    
+	gs 'willpower', 'sex', 'self'
+	if will_cost <= pcs_willpwr: 
+		act 'Play along (<<will_cost>> Willpower)':
+			guy += 1
+			girl += 1
+			lesbian += 1
+			picrand = 13
+			sexpartkno = 1
+			gs 'WorkHosp', 'randdoc'
+			if docfuck[randdoc] = 1:guy += 1
+			gt 'podrsex', 'suck'
+			gs 'arousal', 'cuni_give', 10, 'group'
+			gs 'arousal', 'vaginal', 10, 'group'
+			minut -= 10
+			gs 'willpower', 'pay', 'self'
+			gs 'arousal', 'end'
+			gs 'stat'
+		end
+	else
+		act 'Play along (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 

+ 19 - 8
locations/abduction.qsrc

@@ -49,12 +49,20 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	vitamin_bak = vitamin
 	kosmetica_bak = kosmetica
 	lipbalm_bak = lipbalm
+	tampon_bak = tampon
+	shampoo_bak = shampoo
+	stanok_bak = stanok
+	deodorant_bak = deodorant
 
 	painkiller = 0
 	prezik = 0
 	vitamin = 0
 	kosmetica = 0
 	lipbalm = 0
+	tampon = 0
+	shampoo = 0
+	stanok = 0
+	deodorant = 0
 
 	tabletkishot = rand(84,91)
 	shotdays = 84
@@ -523,6 +531,10 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	vitamin = vitamin_bak
 	kosmetica = kosmetica_bak
 	lipbalm = lipbalm_bak
+	tampon = tampon_bak
+	shampoo = shampoo_bak
+	stanok = stanok_bak
+	deodorant = deodorant_bak
 
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'Nord'
@@ -626,20 +638,15 @@ if $ARGS[0] = 'abdFood':
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	act 'Take a cold shower (0:15)':
-		cumspclnt = 1
-		gs 'cum_cleanup'
-		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-
 		*clr & cla
 		menu_off = 1
-		shampoo -= 1
 		minut += 15
 		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
+		noShampoo = 1
+		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'
-		'The shower is cold but at least you got clean again...'
+		'The shower is cold and you don''t have any shampoo, but at least you got clean again...'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		act 'Get back':gt 'abduction', 'abdFood'
 	end
@@ -1047,6 +1054,10 @@ if $ARGS[0] = 'abdSoldSauna':
 	vitamin = vitamin_bak
 	kosmetica = kosmetica_bak
 	lipbalm = lipbalm_bak
+	tampon = tampon_bak
+	shampoo = shampoo_bak
+	stanok = stanok_bak
+	deodorant = deodorant_bak
 
 	act 'Continue':gt 'sauna', 'saunaroom'
 end

+ 504 - 394
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,246 +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
-							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
 
@@ -403,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 ---------------------------------
 

+ 1 - 0
locations/anushapt.qsrc

@@ -346,6 +346,7 @@ if $ARGS[0] = 'bathroom':
 		*clr & cla
 		menu_off = 1
 		minut += 10
+		noShampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		temp = rand(0,4)

+ 2 - 3
locations/artemEv.qsrc

@@ -163,8 +163,7 @@ if $ARGS[0] = 'learn':
 			cla
 			'After you finish your homework with Artem, he says a little shyly: "You know... I''ve never seen a girl naked before. Only on pictures. Maybe you could..."'
 			if dimaFilm > 0 and arthakQW = 0 and pcs_vag > 0:
-				! using 'misc' since youre stripping either way, this is about forcing yourself to reveal dimka is blackmailing you
-				gs 'willpower', 'misc', 'self'
+				gs 'willpower', 'exhib', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Agree to strip, in exchange for help with Dimka (<<will_cost>> Willpower)':
 						*clr & cla
@@ -1127,7 +1126,7 @@ if $ARGS[0] = 'artemGopSkver':
 					gs 'shortgs','undress'
 					gs 'stat'
 					
-					act 'Dance for them':
+					act 'Get down on your knees':
 						*clr & cla
 						gs 'npcgeneratec', 0, 'Gopnik', rand(16,24)
 						gs 'boyStat', $npclastgenerated,1

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

+ 14 - 13
locations/backwater.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = '':
 	act 'Go back to the hut':minut += 5 & gt'swamp_yard'
 
 	'<center><B>Backwater</B></center>'
-	
+
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater.jpg"></center>'
@@ -30,16 +30,17 @@ if $ARGS[0] = '':
 		end
 	end
 	*nl
-	
+
 	'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
 	*nl
 	if clothesAtLocation = 1:'Your clothes lie on the shore.'
-	
+
 	if $clothingworntype = 'nude':
 		act 'Wash self':
 			cla
 			*clr
 			menu_off = 1
+			noShampoo = 1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0
@@ -48,7 +49,7 @@ if $ARGS[0] = '':
 			pcs_willpwr += 5
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
-	
+
 			if $pantyworntype = 'none':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
 			else
@@ -74,7 +75,7 @@ if $ARGS[0] = '':
 			minut += 10
 			if huntersRape = 1: huntersRape = 2
 			gs 'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
 			*nl
 			'You carefully wash off the sperm in the creek.'
@@ -90,11 +91,11 @@ if $ARGS[0] = '':
 			face_write = 0
 			minut += 10
 			gs'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
 			*nl
 			'You wash off the indecent inscriptions on your body.'
-	
+
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
@@ -108,15 +109,15 @@ if $ARGS[0] = '':
 			minut += 10
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
 			*nl
 			'You clean the cum stains off your clothes.'
-	
+
 			act 'Finish':gt 'backwater'
 		end
 	end
-	
+
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			cla
@@ -138,7 +139,7 @@ if $ARGS[0] = '':
 			act 'Finish':gt 'backwater'
 		end
 	end
-	
+
 	if clothesAtLocation = 0:
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
@@ -149,7 +150,7 @@ if $ARGS[0] = '':
 					minut+=5
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
-	
+
 					if CloSkirtShortness > 0:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
 					else
@@ -191,7 +192,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	
+
 end
 
 if $ARGS[0] = 'creekside_relax':

+ 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

+ 72 - 0
locations/beg1.qsrc

@@ -82,7 +82,15 @@ if $ARGS[0] = 'br':
 	'Your discipline: The Women''s 400 Meter Dash.' 
 	'After changing into your running gear, you spend some time warming up in the empty stadium before the race starts.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 	
 	if begresult <= 18:  
 		'Sadly, you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
@@ -132,7 +140,15 @@ if $ARGS[0] = '3':
 	'Your discipline: The Women''s 400 Meter Dash.' 
 	'After changing into your running gear, you spend some time warming up in the empty stadium before the race starts.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made a bit of a fool of yourself.'
@@ -178,7 +194,15 @@ if $ARGS[0] = '2':
 	'Your discipline: The Women''s 400 Meter Dash.' 
 	'After changing into your running gear, you spend some time warming up in the stadium before the race starts, only a hundred people or so on the ranks watching you but with how big the stadium is, you can barely even see them.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		gs 'fame', 'city', 'running', 1
@@ -226,7 +250,15 @@ if $ARGS[0] = '1':
 	'After changing into your running gear, you spend some time warming up in the stadium before the race starts.' 
 	'Only 1,000 people came to watch the city championship, spread out over the large stadium.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		gs 'fame', 'city', 'running', 1
@@ -274,7 +306,15 @@ if $ARGS[0] = 'kms':
 	'After changing into your running gear, you spend some time warming up in the stadium before the race starts.' 
 	'Maybe 5,000 people came to watch the district championship, the stadium far from full.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		gs 'fame', 'city', 'running', 2
@@ -323,7 +363,15 @@ if $ARGS[0] = 'ross':
 	'At least 30,000 people came to national championship, putting the stadium at a little less than half capacity.'
 !! Took the Krestovsky Stadium for reference.
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		gs 'fame', 'city', 'running', 4
@@ -371,7 +419,15 @@ if $ARGS[0] = 'kval':
 	'Your discipline: The Women''s 400 Meter Dash.' 
 	'After changing into your running gear, you spend some time warming up in the empty stadium before the race starts.' 
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 18:
 		gs 'fame', 'city', 'running', 4
@@ -421,7 +477,15 @@ if $ARGS[0] = 'evro':
 	'The stadium is well-attended - about 50,000 people, you''d wager - here to watch athletics competitions between the best European athletes, you one of them.'
 	!! Took the Krestovsky Stadium for reference.
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 
 	if begresult <= 16:
 		gs 'fame', 'city', 'running', 6
@@ -477,7 +541,15 @@ if $ARGS[0] = 'Int':
 	'The stadium is full, almost bursting with people. There must be 70,000 people here to watch athletics competitions with competitors from all over the world. Only the best of the best even made it here and you are proud to be one of them.'
 	!! Took the Krestovsky Stadium for reference.
 	'When you and the other runners are called, you walk to your starting position, tense but ready.' 
+	wait 725
 	'You get in position. Then, you hear the starting shot: The race begins!'
+	wait 725
+	'On your marks...'
+	wait 725
+	'Get set...'
+	wait 725
+	'Go! - You''re away!'
+	wait 725
 	
 	if begresult < 18:
 		gs 'fame', 'city', 'running', 10

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

+ 17 - 13
locations/brothel.qsrc

@@ -513,7 +513,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $metka">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $metka">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $metka">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
@@ -533,18 +533,22 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	act 'Have a glass of water (0:05)':gs 'beverage', 'bev_wat'
 	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
-	act 'Have a shower':
-		cls
-		dynamic $showerdin
-		gs 'stat'
-		'<h3>Girl room</h3>'
-		'<h5>Shower</h5>'
-		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
-		''
-		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		dynamic $dryOff
-		if stanok > 0: dynamic $brit
+	if shampoo > 0:
+		act 'Have a shower':
+			cls
+			dynamic $showerdin
+			gs 'stat'
+			'<h3>Girl room</h3>'
+			'<h5>Shower</h5>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
+			''
+			'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			dynamic $dryOff
+			if stanok > 0: dynamic $brit
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage

+ 12 - 11
locations/brother_voyeur.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'showertalk1':
 		'"Of course not silly! I''m not even mad! I just wanted to catch up with my favorite little brother and I thought, since you were right there, why not now?"'
 		'"Oh, okay..." he nods, still looking away.'
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,3)
-		
+
 		if pcs_inhib >= 40 or npc_rel['A34'] >= 90:
 			act'"You can look at me you know"':
 				npc_rel['A34'] += 5
@@ -153,7 +153,7 @@ if $ARGS[0] = 'showertalk2':
 			npc_rel['A34'] += 5
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
-			
+
 			'"Kolka..." When you say this he starts to turn towards you a little bit but then stops himself and continues to stare at the wall. You sigh sympathetically. "It''s okay to look at me you know."'
 			'He perks up and turns towards you slowly. "R-really?" His wide eyes rapidly flit between your face, your breasts, your <<$pcdesc_pubes>> pussy, the walls, and the floor, unable to make up his mind of where he should be looking.'
 			'"Yes really!" you laugh. "Yeah, yeah, I know. I''ve got boobs. I''ve got a pussy instead of a penis. I know it''s strange and distracting and all that, but you''re my brother and I love you! I don''t want to have to share my conversations between you and the wall. So, I don''t mind you looking. If it means I can spend this time getting closer to you, you can look all you want. Okay?"'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'showertalk2':
 			if brothershowertalk <= 5:
 				'You casually chat with him about how he''s doing in school while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
 				act'Continue':gt'brother_voyeur','shave'
-				
+
 			elseif brothershowertalk > 5:
 				'He energetically talks to you about school and how it''s going for him, though he still sits on the toilet facing away. He also still takes a few looks at you now and again but they aren''t as sneaky and they mostly seem to be glances to see your face. <i>Not that his eyes don''t wander downward anyways...</i> you notice with a smile.'
 				brothershowerschooltalk = rand(1,3)
@@ -222,7 +222,7 @@ if $ARGS[0] = 'showertalk2':
 					elseif pcs_grades < 50:
 						'"Blegh! Yeah, you''re right. Math sucks!" you grumble in agreement.'
 					end
-					
+
 					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerschooltalk = 2:
@@ -271,7 +271,7 @@ if $ARGS[0] = 'showertalk2':
 					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerfriendtalk = 3:
-					'"... I wish I had more time to play football with Zhendos and Mishan though," he says, snapping you out of your idle thoughts and bringing you back to the room. "I can''t do anything with them when <<$npc_nickname[''A29'']>> is dragging us to Gadukino every other weekend."'
+					'"I wish I had more time to play football with Zhendos and Mishan though," he says, snapping you out of your idle thoughts and bringing you back to the room. "I can''t do anything with them when <<$npc_nickname[''A29'']>> is dragging us to Gadukino every other weekend."'
 					*nl
 					if seepornofut = 0:
 						'"It''s okay Kolka," you console him. "Just enjoy the time you have with them. In a couple years <<$npc_nickname[''A29'']>> might not force you to go anymore but you all might end up too busy to hang out."'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'showertalk2':
 				end
 			end
 		end
-		
+
 		if pcs_horny >= 55:
 			act'Use the showerhead on your pussy':
 				cla & *clr
@@ -330,7 +330,7 @@ if $ARGS[0] = 'showertalk2':
 							'As your orgasm winds down, you breathe deeply and glance upward towards your brother. You quickly stiffen up when you see what looks to be like the finishing movements of his shoulders turning back forward. Were you so caught up in pleasure that you didn''t notice that he was watching you masturbate in front of him?'
 							'You gulp and try to continue the conversation normally. His responses seem more or less the same and the conversation doesn''t seem to be any different other than a burning in your cheeks. Maybe he didn''t see anything after all? But you can''t be sure...'
 						end
-						
+
 						if pcs_pubes >= 4 or pcs_leghair >= 4:
 							act'Continue':gt'brother_voyeur','shave'
 						else
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'brother_shower_end':
 			end
 		end
 	end
-	
+
 	act'Kick him out':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
@@ -2334,7 +2334,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'"But that''s not fair! So what I want doesn''t count for anything?"'
 				'"Nope! But I get to decide if I''m feeling generous."'
 				'With Kolka''s hands balled into fists at his side and your hands on your hips, the two of you glare at each other, scowling. This turned into a much bigger argument than you meant it to.'
-				if succubusflag = 0:	
+				if succubusflag = 0:
 					if knowpreg = 1 or thinkpreg = 1:
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
@@ -2355,7 +2355,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'"I''m sorry Kolka! Your cock just felt so good, I couldn''t stop! You can''t be mad at me for being too addicted to your cock to stop, right?" You kneel down, trying to apologize by cleaning him up with your tongue.'
 				'He grumbles a bit but you can tell that he''s not mad at you. "I guess I can''t be mad about that... But next time I ask, I want to cum on your face!"'
 				'"Okay, it''s a promise!" you say, standing back up and kissing him on the cheek. "So long as I can stop myself that is."'
-				if succubusflag = 0:	
+				if succubusflag = 0:
 					if knowpreg = 1 or thinkpreg = 1:
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
@@ -2370,7 +2370,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
-			
+
 			if succubusflag = 0:
 				act'Too much mess':
 					cla
@@ -2475,6 +2475,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
+	noShampoo = 1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 42 - 39
locations/buklinik_event.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'pos8':
 	*clr
     medcn_exp += rand (0,3)
 	if bumtolik = 8:bumtolik = 9
-     
+
 	buklinikDay = daystart
 	minut += 120
 	pcs_mood += 20
@@ -183,11 +183,11 @@ end
 
 !events from 1.2.4
 ! nanny_act - action''s counter
-! nanny_cleaning 
+! nanny_cleaning
 ! nanny_food
 ! nanny_story
 ! nanny_vika
- 
+
 ! --- LOCATIONS --- !
 if $ARGS[0] = 'hall':
 	cls
@@ -232,7 +232,7 @@ if $ARGS[0] = 'room':
 	end
 	'<a href="exec:gt ''buklinik_event'',''misha''">Michael</a> lying in bed and reading a book.'
 
-	act 'Out': gt 'buklinik_event', 'hall'	
+	act 'Out': gt 'buklinik_event', 'hall'
 end
 
 if $ARGS[0] = 'kitchen':
@@ -253,7 +253,7 @@ if $ARGS[0] = 'kitchen':
 			nanny_food = 1
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/gotovka.jpg"></center>'
 			'You cooked the food and fed Michael.'
-			act '...': gt $loc, $metka
+			act 'Finish': gt $loc, $metka
 		end
 	end
 	act 'Out': gt 'buklinik_event', 'hall'
@@ -298,7 +298,7 @@ if $ARGS[0] = 'vika':
 		'- So Far, Vic.'
 		'Well, I guess I gotta go to Michael, thought you.'
 		act 'For the work': gt 'buklinik_event', 'hall'
-	end	
+	end
 
 	act '<B>Depart</B>': gt 'buklinik_event', 'hall'
 end
@@ -318,7 +318,7 @@ if $ARGS[0] = 'misha':
 		$zz_str[0] = 'You were talking with Michael I learned that he was born in Pavlovo, in the same way as you. His family moved to here when he was seven. The family had four children, he is a senior. He says he often remembers about the life he''d led before he contracted polio.'
 		$zz_str[1] = 'At an early age I died a sister, Anastasia, died of pneumonia, then for several years I suffered from poliomyelitis, and since then I couldn''t shake the feeling of guilt. It seemed to him that the parents, especially the mother, had paid him too much attention and didn''t notice that Karen needs help until it is too late. There was nothing to show that his fears are justified but to get rid of feelings of guilt, Mikhail was not able.'
 		$zz_str[2] = 'He explains that in his childhood loved to play with the neighborhood children... But the disease hit me when I was six years old, and I immediately became the main concern of his family, especially the mother. She''s totally dedicated to me. Throughout the early years of my life she fed me with unfailing kindness and patience.'
-		$zz_str[3] = 'Despite the physical difficulties which had to be overcome, Michael received a diploma in English language at University, and his poems and articles were published. He worked on a word processor with a stick, which was holding my mouth. The master''s degree he was going to get the specialty of the reporter, but soon began to the consequences of poliomyelitis affecting muscles. From study had to be abandoned.'	
+		$zz_str[3] = 'Despite the physical difficulties which had to be overcome, Michael received a diploma in English language at University, and his poems and articles were published. He worked on a word processor with a stick, which was holding my mouth. The master''s degree he was going to get the specialty of the reporter, but soon began to the consequences of poliomyelitis affecting muscles. From study had to be abandoned.'
 		$zz_str[4] = 'You talk with Michael, he told you about "iron lung", this device allows him to breathe, but he can do without it for several hours using a portable respirator and it depends on how he feels.'
 		$zz_str[5] = 'You talk with Michael, he told you that he''s not that lame, just it not work the muscle.'
 		$zz_str[6] = '- Are you a believer? - he asked you. - Yes not particularly, as it. - answered you. - And I still believe, '' he said. - I though of someone to blame it all on what was happening to me. - with a smile he said.'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'event0':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
 
 	'- The fact that we need to send a nurse to one special person, his name is Misha, he is disabled.'
-	'Most of his thirty-six years Michael spent inside of a device called «iron lung», after six years ill with polio.' 
+	'Most of his thirty-six years Michael spent inside of a device called «iron lung», after six years ill with polio.'
 	'He alone can breathe only a short time, he constantly needs breathing apparatus.'
 	'- Wow! - answered you in surprise.'
 	'- In General, go to this address - there to you will explain what you need to do.'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'event1':
 	medcn_exp += rand (0,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/vika/3.jpg"></center>'
-	'You came to the address and knocked on the door. You opened the young girl and asked: 
+	'You came to the address and knocked on the door. You opened the young girl and asked:
 	- You from the clinic of mercy?'
 	'- Yes. - you replied, looking at the girl, she had pokazalas you are quite cute . She was invited to enter.'
 	act 'Enter':
@@ -394,8 +394,8 @@ if $ARGS[0] = 'event1':
 	- Well, okay, then, I went as Michael. - she kissed him on the forehead man. - Before, Dating Svetlana. - she waved her hand to me and closed the door.
 	- Here we are all alone. - a little sadly said Michael.'
 					act 'Don''t worry everything will be fine': gt 'buklinik_event', 'hall'
-				end		
-			end		
+				end
+			end
 		end
 	end
 end
@@ -407,11 +407,11 @@ if $ARGS[0] = 'entrance':
 	buklinikDay = daystart
 	minut += 20
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/city/vika/'+iif(ARGS[1]=0,5,3)+'.jpg"></center>'
 
 	if ARGS[1] = 0:
-		'You''ve come to the address and knocked on the door. You opened Vic. 
+		'You''ve come to the address and knocked on the door. You opened Vic.
 		- Oh, Hey, <<$pcs_nickname>>, you don''t mind that I turn to you?
 		- Yes, no, not against. - answered with a smile you.
 		- And Misha, I told you what pleasant interlocutor, and he with you like!
@@ -425,7 +425,7 @@ if $ARGS[0] = 'entrance':
 		- Well here I am. - Answered you.
 		- Let''s go. Well, I ran.'
 	end
-	
+
 	if ARGS[1] = 2 or ARGS[1] = 4:
 		'You come to Michael, the door you opened Vic.
 		- Hi, <<$pcs_nickname>>.
@@ -456,13 +456,13 @@ if $ARGS[0] = 'entrance':
 		end
 	end
 
-	act '...': gt 'buklinik_event', 'hall'
+	act 'Continue': gt 'buklinik_event', 'hall'
 end
 
 if $ARGS[0] = 'event2':
 	act '<B>Leave</B>': gt 'buklinik_event', 'room'
 	if nanny_cleaning = 0 or nanny_food = 0: exit
-	
+
 	if MishaLove = 1:
 		act 'I am finished':
 			cls
@@ -507,7 +507,7 @@ if $ARGS[0] = 'event2':
 					act 'Listen':
 						cls
 						'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/6.mp4"></video></center>'
-						'And I decided to invite her on a picnic, and she consented.'	
+						'And I decided to invite her on a picnic, and she consented.'
 						act 'Further':
 							cls
 							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/shave.mp4"></video></center>'
@@ -699,13 +699,13 @@ if $ARGS[0] = 'event2':
 						'- As you think, you can already start, you can look at your body?'
 						'Yeah, I''d like to do.'
 						act'Undress him':
-							cls	
+							cls
 							'Now I had to undress, so I had to remove Michael''s clothes and for the first time to see his body. Suddenly I was gripped by fear. He was so fragile. What if I hurt him or do anything with his body?'
 							'- Misha, at any time, if I do something you don''t like it, let me know. Not only for our collaboration, but for you it is important to learn how to talk to your partner about how you feel. If it makes you feel bad, uncomfortable, just tell me to stop, okay?'
 							'"Okay," he replied, and his face ran a shade of anxiety.'
 							'Remember, we do it all for you, so if you want me to do something slower or stopped doing at all, just tell me about it.'
 							'You gently raised the blanket. He was dressed in a red long-sleeved shirt and black training pants. «Slowly and carefully, slowly and gently, said I to myself, as the spell. - Start with shirts». I undid the first button, and then the other until the very end. Then a button on the wrist of the left sleeve. Then, pulled out the sleeve as much as possible. The collar came down on one shoulder. It is very little time spent on the street and was very pale. Against the red fabric of the shirt his skin was as pure white as salt. I vigorously rubbed my hands together to warm them up, and slipped his hand under the shirt. You gently took his thin hand, simultaneously pulling the sleeve and putting his hand on the bed. When the sleeve was almost cleared, Michael shouted - very loudly. Oh my God! Did I hurt it?'
-							act 'Oh my God! what happened?':	
+							act 'Oh my God! what happened?':
 								cls
 								'- What happened? asked you.'
 								'"Nail, nail caught on the shirt." he said.'
@@ -729,7 +729,7 @@ if $ARGS[0] = 'event2':
 										'- I''ve never seen a naked woman, said he, stammering.'
 										'Despite a thin body, Michael had chubby cheeks, which now was covered with a pink blush.'
 										'- That''s why I''m here - you cheered him and laid next to him on the bed. - For sex brought pleasure, it is very important to be able to relax, so now I''ll show you an exercise that will help.'
-										act 'Further': 
+										act 'Further':
 											cls
 											'At this point you have decided to learn to breathe deeply, from your diaphragm, focusing exclusively on the process of breathing: a long, full breath, and immediately slow exhale. Mikhail couldn''t take deep breaths, but I still asked him to focus on the breath, even if it was difficult.'
 											'Close your eyes and try to clear your mind of everything unnecessary, to think only about breathing, you said.'
@@ -793,7 +793,7 @@ if $ARGS[0] = 'event2':
 			nanny_cleaning = 0
 			nanny_food = 0
 			nanny_act = 5
-			
+
 			bumtolik = 14
 			buklinikDay = daystart
 			gs 'stat'
@@ -811,7 +811,7 @@ if $ARGS[0] = 'event2':
 				'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/pants.mp4" ></video></center>'
 		'Haven''t stripped Michael to the end, you notice that he''s already excited. When you removed your pants, you had to pull the rubber band, because she''s touching his hard cock.'
 				act 'Undress herself':
-					cls	
+					cls
 		'You undressed.'
 					act'Lie down on the bed':
 						cls
@@ -833,7 +833,7 @@ if $ARGS[0] = 'event2':
 		- There are worse things I could choke, said Michael.
 		You slowly bent arm, twisting the hip to the left to lower the right nipple to his lips. Michael grabbed his wet mouth and drew in.
 		- It is very nice.
-		After a few seconds, you took the nipple from his lips.'		
+		After a few seconds, you took the nipple from his lips.'
 							act'You need air?':
 								cls
 		'- Do you need air? - crosely you.
@@ -847,17 +847,17 @@ if $ARGS[0] = 'event2':
 									act'Want Cooney':
 										stat['cuni'] += 1
 										cls
-		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/facesitting.mp4"></video></center>'									
+		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/facesitting.mp4"></video></center>'
 		'You told him about it. he immediately agreed. You sat on his face and began to slowly move his hips. Arousal gushed on and you reschili...'
 										act'To accelerate the pace':
 											cls
-		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/tube.mp4"></video></center>'										
+		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/tube.mp4"></video></center>'
 		'With excitement you began, almost jumping on his face he heard:
 		- Ahem... bwhc... I can''t breathe!
 		- God, my! - you screamed.
 		- Respirator... pipes... - after saying the last word you gave him.
 		- I think it''s worth to wait for later. - you said.
-		After inhaling he asked if we could have sex. you asked him to listen to your breath, reached into my purse for a condom and quickly put it on.'								 
+		After inhaling he asked if we could have sex. you asked him to listen to your breath, reached into my purse for a condom and quickly put it on.'
 											act'Take the dick':
 												cls
 												gs 'boyStat', 'A185'
@@ -895,16 +895,17 @@ if $ARGS[0] = 'event2':
 														'So long as men can breathe or eyes can see,'
 														'So long lives this, and this gives life to thee.'
 
-														'Finished Michael.'	
+														'Finished Michael.'
 														act'That''s fine':
 															cls
 															gs'stat'
 															'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/sex/end.jpg" ></center>'
 		'- Misha, it was perfect. I want you to know how glad I am that we met and that we had a chance to help you.
-		You ran a finger along his hip and down the leg. You felt an excitement not yet experienced at all the time that you were together. You took his face in her hands and kissed her forehead'													
+		You ran a finger along his hip and down the leg. You felt an excitement not yet experienced at all the time that you were together. You took his face in her hands and kissed her forehead'
 															act'Well on this we''re finished':
 																cls
 																nanny_vika = 1
+																noShampoo = 1
 																dynamic $showerdin
 																'You take a quick shower and get dressed, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 																if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -964,7 +965,7 @@ if $ARGS[0] = 'event2':
 							gs 'boyStat', 'A185'
 							gs 'Cum_Manage'
 							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/sex.mp4" ></video></center>'
-							'You took his cock in hand and brought the head in her pussy, asking him to rate the level of arousal. First you didn''t move, and then fell down. After about a minute came the orgasm.'						
+							'You took his cock in hand and brought the head in her pussy, asking him to rate the level of arousal. First you didn''t move, and then fell down. After about a minute came the orgasm.'
 							act'Further':
 								cls
 								'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/misha.jpg" ></center>'
@@ -979,6 +980,7 @@ if $ARGS[0] = 'event2':
 									cls
 									nanny_vika = 1
 									gs'stat'
+									noShampoo = 1
 									dynamic $showerdin
 									'You take a quick shower and dress yourself and Michael, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 									if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -989,7 +991,7 @@ if $ARGS[0] = 'event2':
 					end
 				end
 			end
-		end							
+		end
 	elseif nanny_act = 6 and nanny_vika = 0:
 		act'So let''s start':
 			cla
@@ -1001,7 +1003,7 @@ if $ARGS[0] = 'event2':
 			act'Further':
 				cls
 				stat['hj'] += 1
-				'You held his penis in his hands for a few minutes and he asked if he could kiss my vagina.'			
+				'You held his penis in his hands for a few minutes and he asked if he could kiss my vagina.'
 				act'Of course':
 					cls
 					'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/lick.mp4"></video></center>'
@@ -1013,7 +1015,7 @@ if $ARGS[0] = 'event2':
 						act'Suck':
 							cls
 							stat['bj'] += 1
-							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/suck.mp4"></video></center>'						
+							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/suck.mp4"></video></center>'
 							'You suck dick'
 							act'Take the dick':
 								stat['vaginal'] += 1
@@ -1021,7 +1023,7 @@ if $ARGS[0] = 'event2':
 								gs 'boyStat', 'A185'
 								gs 'Cum_Manage'
 								cls
-								'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/anal.mp4"></video></center>'	
+								'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/anal.mp4"></video></center>'
 								'You put on a condom and slide your finger on the back, easy to tighten the member by hand. You slung it over your foot to cock was inside you, and began to move, rocking. You felt the vagina begins to swell. Together with him you reached the highest point of excitation. Did you do the breath, but then stopped to ask Michael how he assessed the level of arousal.'
 								'- About eight, he said.'
 								'You quickened the pace. Michael came. His excitement lasted longer than any of our previous classes. Even after orgasm his cock was still hard, so you can make a few more movements up and down and to cum.'
@@ -1044,26 +1046,27 @@ if $ARGS[0] = 'event2':
 									act'Wait For Vika':
 										cls
 										nanny_vika = 1
+										noShampoo = 1
 										dynamic $showerdin
 										'You take a quick shower and dress yourself and Michael.'
-										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.<br>'
 										'Vick soon came, and quickly proneslas past you, saying: Oh, izvinite, I need the toilet!.'
 										'- Well it''s time to say goodbye, Misha. - sad to say you.'
 										act'Kiss on the cheek':
 											cls
 											nanny_story = 1
 											bumtolik = 16
-											'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/kiss_cheek.jpg" ></center>'	
+											'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/kiss_cheek.jpg" ></center>'
 											'Goodbye, Michael.'
 											act'Go': gt'buklinik','olga2'
-										end	
+										end
 										act'A kiss on the lips':
 											cls
 											nanny_story = 1
 											bumtolik = 16
 											MishaLove = 1
-											'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/kiss_lips.mp4" ></video></center>'	
-											'Good-Bye, Micha.'	
+											'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/kiss_lips.mp4" ></video></center>'
+											'Good-Bye, Micha.'
 											act 'Go': gt'buklinik', 'olga2'
 										end
 									end
@@ -1072,7 +1075,7 @@ if $ARGS[0] = 'event2':
 						end
 					end
 				end
-			end		
+			end
 		end
 	end
 end

+ 1 - 1
locations/burger.qsrc

@@ -624,7 +624,7 @@ if $ARGS[0] = 'dishes':
 			minut -= 3
 			gs 'stat'
 
-			act '...':
+			act 'Continue':
 				*clr & cla
 				gs 'boyStat', 'A75'
 				sexpartkno = 1

+ 74 - 32
locations/cikl.qsrc

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

+ 102 - 76
locations/dateM.qsrc

@@ -471,74 +471,80 @@ if $ARGS[0] = 'datecinema':
 					'As you''re about to grab some popcorn from the tub, <<$boydesc>> unknowingly goes to grab some popcorn too, touching your hand.'
 					'He''s startled as he didn''t expect your hand to be there either. You acknowledge his touch by teasingly whispering, "Are you trying to make a move on me?"'
 					'<<$boydesc>> nervously smiles at you. "Sorry it wasn''t my intentions to make you feel uncomfortable."'
-					act 'Tease him':
-						*clr & cla
-						minut += 5
-						gs 'stat'
-						'<center><img src="images/locations/shared/date/theatertease.jpg"></center>'
-						'Feeling frisky and not wanting to let go of the opportunity you tell him, "Come on, no need to get so defensive. Let me show you a thing."'
-						'You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<$boydesc>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.'
-						'"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."'
-						act 'Get on your knees':
+					gs 'willpower', 'exhib', 'self'
+					if will_cost <= pcs_willpwr:
+						act 'Tease him (<<will_cost>> Willpower)':
+							gs 'willpower', 'pay', 'self'
 							*clr & cla
-							'<center><img src="images/locations/shared/date/theaterbj.jpg"></center>'
-							'You go down on your knees removing your shirt and bra showing your body to <<$boydesc>>. You begin playing with his rock hard penis through the pants.'
-							'<<$boydesc>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.'
-							'You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<$boydesc>> smiling. "Keep quiet now we don''t want to get caught."'
-							'You grab <<$boydesc>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<$boydesc>> is trying his best to keep quiet.'
-							gs 'arousal', 'bj', 5, 'dom', 'exhibitionism'
+							minut += 5
 							gs 'stat'
-							act 'Lay down on the seat':
+							'<center><img src="images/locations/shared/date/theatertease.jpg"></center>'
+							'Feeling frisky and not wanting to let go of the opportunity you tell him, "Come on, no need to get so defensive. Let me show you a thing."'
+							'You look around checking if everyone else is concentrating on the movie and then quickly remove your top. <<$boydesc>> not knowing how to respond looks in awe. Not wanting to wait on him anymore you decide to take action.'
+							'"Let me show you a great time." you slyly tell him. "Just relax and enjoy yourself."'
+							act 'Get on your knees':
 								*clr & cla
-								'<center><img src="images/locations/shared/date/theatercuni.jpg"></center>'
-								'After a few minutes you stop and get up, lean into him telling him that it''s his turn to impress you.'
-								'You lay down on the empty seats next to you and spread your legs. <<$boydesc>> by now very aroused dives in and begins playing with your wet clit.'
-								'His tongue does wonders to your clit and there are a few times you can''t contain yourself just wanting to scream out loud in pleasure.'
-								gs 'arousal', 'cuni', 5, 'dom', 'exhibitionism'
+								'<center><img src="images/locations/shared/date/theaterbj.jpg"></center>'
+								'You go down on your knees removing your shirt and bra showing your body to <<$boydesc>>. You begin playing with his rock hard penis through the pants.'
+								'<<$boydesc>> looks at you with lust. His eyes are quite revealing, he wants you to please him with your mouth and he wants it now.'
+								'You unbutton his pants and pull down his briefs. The rock hard cock pops out while you look at <<$boydesc>> smiling. "Keep quiet now we don''t want to get caught."'
+								'You grab <<$boydesc>> by the shaft and your lips embrace the top of his cock. After a while you pick up the pace moving the head up and down while <<$boydesc>> is trying his best to keep quiet.'
+								gs 'arousal', 'bj', 5, 'dom', 'exhibitionism'
 								gs 'stat'
-								act 'Reverse cowgirl':
+								act 'Lay down on the seat':
 									*clr & cla
-									'<center><img src="images/locations/shared/date/theatercow.jpg"></center>'
-									'He stops to let you rest just as you''re nearing the orgasm, feeling irritated you decide to get even.'
-									'You make <<$boydesc>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don''t want the guy in front of you to find out what the two of you are doing.'
-									'As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<$boydesc>> is clearly having some trouble holding himself as his cock is growing inside you.'
-									gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
+									'<center><img src="images/locations/shared/date/theatercuni.jpg"></center>'
+									'After a few minutes you stop and get up, lean into him telling him that it''s his turn to impress you.'
+									'You lay down on the empty seats next to you and spread your legs. <<$boydesc>> by now very aroused dives in and begins playing with your wet clit.'
+									'His tongue does wonders to your clit and there are a few times you can''t contain yourself just wanting to scream out loud in pleasure.'
+									gs 'arousal', 'cuni', 5, 'dom', 'exhibitionism'
 									gs 'stat'
-									act 'Back to laying down':
+									act 'Reverse cowgirl':
 										*clr & cla
-										gs 'cum_call', 'stomach', $boydesc
-										gs 'cum_call', 'breasts', $boydesc
-										'<center><img src="images/locations/shared/date/theatervag.jpg"></center>'
-										'By now <<$boydesc>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.'
-										'As soon as <<$boydesc>> enters you he''s already heavily panting. You whisper angrily to him "Don''t you dare cum yet. I''m still not pleased." <<$boydesc>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.'
+										'<center><img src="images/locations/shared/date/theatercow.jpg"></center>'
+										'He stops to let you rest just as you''re nearing the orgasm, feeling irritated you decide to get even.'
+										'You make <<$boydesc>> sit down again and plant yourself on top of his cock, letting out a quiet whimper as you don''t want the guy in front of you to find out what the two of you are doing.'
+										'As you control the pace you switch it up multiple times bouncing up and down as you see this as a payback for not letting you orgasm before. <<$boydesc>> is clearly having some trouble holding himself as his cock is growing inside you.'
 										gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
 										gs 'stat'
-										'He starts groaning pulling out his cock out of you and shoots the load all over you. His warm spunk hits your stomach and breast as he jerks out the last drips. You take your finger and swipe a small sample off your stomach putting it in your mouth. It tastes great.'
-										act 'Caught':
+										act 'Back to laying down':
 											*clr & cla
-											minut += 10
+											gs 'cum_call', 'stomach', $boydesc
+											gs 'cum_call', 'breasts', $boydesc
+											'<center><img src="images/locations/shared/date/theatervag.jpg"></center>'
+											'By now <<$boydesc>> is almost drained and the smallest touch would make him cum. You decide to give him a breather as you once again lay down spreading your legs once again while your pussy juice drips all over the seat.'
+											'As soon as <<$boydesc>> enters you he''s already heavily panting. You whisper angrily to him "Don''t you dare cum yet. I''m still not pleased." <<$boydesc>> does his best and keeps thrusting for a minute or two not being able to hold on anymore.'
+											gs 'arousal', 'vaginal', 5, 'dom', 'exhibitionism'
 											gs 'stat'
-											'<center><img src="images/locations/shared/date/theatercaught.jpg"></center>'
-											'While the two of you are returning to your senses all of a sudden someone flashes a light at you. It''s the usher... You''re totally caught as you''re still laying down naked with <<$boydesc>> cum splattered all over you.'
-											'"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<$boydesc>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.'
-											'"Kids these days. It''s the third time I catch couples doing this shit this week. Pick up your stuff and get the hell out of here, you''re lucky I don''t have the time to call the cops."'
-											'You''re blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<$boydesc>> is walking besides you and also has his head down looking at the ground as ashamed as you.'
-											act 'Outside':
+											'He starts groaning pulling out his cock out of you and shoots the load all over you. His warm spunk hits your stomach and breast as he jerks out the last drips. You take your finger and swipe a small sample off your stomach putting it in your mouth. It tastes great.'
+											act 'Caught':
 												*clr & cla
-												minut += 5
+												minut += 10
 												gs 'stat'
-												'<center><img src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
-												'"Wow, that''s never happened to me before." <<$boydesc>> tells you.'
-												'"I only regret us getting caught. If we''ve only been able to keep quiet. Nothing do anything about that now." you say smiling.'
-												'"I guess I should ask for your for your number now that we''ve got to know each other really well?"'
-												act 'Sure': gt 'dateM', 'cinema_sure'
-												act 'Sorry': gt 'dateM', 'cinema_sorry'
+												'<center><img src="images/locations/shared/date/theatercaught.jpg"></center>'
+												'While the two of you are returning to your senses all of a sudden someone flashes a light at you. It''s the usher... You''re totally caught as you''re still laying down naked with <<$boydesc>> cum splattered all over you.'
+												'"What the hell are you two doing!" the usher yells. The guy that sat in front of you stands up noticing you laying naked quickly picks up the phone and tries taking some pictures. <<$boydesc>> pulls up his pants and gets dressed, leaving you all naked to fend for yourself.'
+												'"Kids these days. It''s the third time I catch couples doing this shit this week. Pick up your stuff and get the hell out of here, you''re lucky I don''t have the time to call the cops."'
+												'You''re blemishing red as you quickly get dressed, grabbing your stuff, running out of the theater. You can hear some of the other people commenting on the situation as you walk past them. <<$boydesc>> is walking besides you and also has his head down looking at the ground as ashamed as you.'
+												act 'Outside':
+													*clr & cla
+													minut += 5
+													gs 'stat'
+													'<center><img src="images/locations/pavlovsk/park/theater/kinoteatr.jpg"></center>'
+													'"Wow, that''s never happened to me before." <<$boydesc>> tells you.'
+													'"I only regret us getting caught. If we''ve only been able to keep quiet. Nothing do anything about that now." you say smiling.'
+													'"I guess I should ask for your for your number now that we''ve got to know each other really well?"'
+													act 'Sure': gt 'dateM', 'cinema_sure'
+													act 'Sorry': gt 'dateM', 'cinema_sorry'
+												end
 											end
 										end
 									end
 								end
 							end
 						end
+					else
+						act 'Tease 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 'Keep watching the movie':
 						*clr & cla
@@ -613,17 +619,24 @@ if $ARGS[0] = 'datecafe':
 			'She scribbles down your order, as she re-reads the order, she manages to stammer through your order but when it comes to <<$boydesc>> she messes up.'
 			'"What is wrong with you? Can''t you write down a simple order?" <<$boydesc>> reacts.'
 			'You sit there looking in shock wondering what you should do...'
-			act 'React':
-				*clr & cla
-				minut += 10
-				gs 'stat'
-				'<center><img src="images/locations/shared/date/cafereact.jpg"></center>'
-				'The poor waitress returns after a while with your order. You look at her with an apologetic look.'
-				'"Hope everything is in order." <<$boydesc>> says. Feeling a bit irritated you kick him under the table, while thanking her.'
-				'<<$boydesc>> looks at you in dispair, "What? Did I do anything wrong?"'
-				'"Well, first off, you don''t need to be a jerk to the waitress." you angrily tell him.'
-				'"I''m sorry but I''m just really nervous being on a date with you so I acted out." You can see that he''s remorseful but you still don''t want to carry on a conversation with him.'
-				act 'Continue date':gt 'dateM', 'cafepeople'
+			gs 'willpower', 'misc', 'self'
+			if will_cost <= pcs_willpwr:
+				act 'React (<<will_cost>> Willpower)':
+					gs 'willpower', 'misc', 'self'
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					minut += 10
+					gs 'stat'
+					'<center><img src="images/locations/shared/date/cafereact.jpg"></center>'
+					'The poor waitress returns after a while with your order. You look at her with an apologetic look.'
+					'"Hope everything is in order." <<$boydesc>> says. Feeling a bit irritated you kick him under the table, while thanking her.'
+					'<<$boydesc>> looks at you in dispair, "What? Did I do anything wrong?"'
+					'"Well, first off, you don''t need to be a jerk to the waitress." you angrily tell him.'
+					'"I''m sorry but I''m just really nervous being on a date with you so I acted out." You can see that he''s remorseful but you still don''t want to carry on a conversation with him.'
+					act 'Continue date':gt 'dateM', 'cafepeople'
+				end
+			else
+				act 'React (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Keep quiet':
 				*clr & cla
@@ -648,14 +661,21 @@ if $ARGS[0] = 'datecafe':
 				'"Thanks, one should not be accepting bad service no matter who you are."'
 				act 'Continue date':gt 'dateM', 'cafepeople'
 			end
-			act 'Tell him off':
-				*clr & cla
-				'<center><img src="images/locations/shared/date/cafetelloff.jpg"></center>'
-				'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
-				'"You should really learn some matters. To treat a human being like that is despicable. You should be ashamed of yourself."'
-				'<<$boydesc>> looks at you in fear as he wasn''t expecting you to react like that.'
-				'"Nothing to say? No need to, I''m done. Enjoy the date alone you loser." You quickly get up and walk out of the café.'
-				act 'Rush out':gt $loc, $metka
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Tell him off (<<will_cost>> Willpower)':
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					'<center><img src="images/locations/shared/date/cafetelloff.jpg"></center>'
+					'Not liking the way <<$boydesc>> treated the waitress you go on the attack against <<$boydesc>>. You''re appalled by how he behaves. With such poor first-impression you decide you don''t ever want to see this bottom-feeder again.'
+					'"You should really learn some matters. To treat a human being like that is despicable. You should be ashamed of yourself."'
+					'<<$boydesc>> looks at you in fear as he wasn''t expecting you to react like that.'
+					'"Nothing to say? No need to, I''m done. Enjoy the date alone you loser." You quickly get up and walk out of the café.'
+					act 'Rush out':gt $loc, $metka
+				end
+			else
+				act 'Tell him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	end
@@ -826,14 +846,20 @@ if $ARGS[0] = 'bartalk':
 										end
 									end
 								end
-								act 'Decide to stop':
-									*clr & cla
-									gs 'arousal', 'end'
-									'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
-									'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
-									'<<$boydesc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
-									act 'Finish the date':gt 'dateM', 'barend'
-								end
+								gs 'willpower', 'bj', 'resist'
+								if will_cost <= pcs_willpwr:
+									act 'Decide to stop (<<will_cost>> Willpower)':
+										*clr & cla
+										gs 'willpower', 'pay', 'resist'
+										gs 'arousal', 'end'
+										'<center><img src="images/locations/shared/date/barinside.jpg"></center>'
+										'You can''t get yourself to go through this. Excusing yourself you walk back to the table and sit down.'
+										'<<$boydesc>> arrives shortly after you to the table. The whole situation is too awkward now and you begin to blush as you''re really ashamed of your actions. You''re starting to panic a bit...'
+										act 'Finish the date':gt 'dateM', 'barend'
+									end
+								else
+									act 'Decide to stop (<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

+ 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
 

File diff suppressed because it is too large
+ 423 - 338
locations/dimaHome.qsrc


+ 91 - 115
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.
@@ -400,7 +407,7 @@ if ARGS[0] = 3:
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
-			if otnBoyFrend['A2'] > 50:
+			if npc_rel['A2'] > 50:
 				act 'Talk with Artem':
 					*clr & cla
 					npc_rel['A2'] += 5
@@ -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

+ 7 - 7
locations/din_pav.qsrc

@@ -210,7 +210,7 @@ $pavser4 = {
 			gs 'arousal', 'masturbate', 5
 			gs 'stat'
 			
-            act '...':
+            act 'Continue':
                 *clr & cla
 				pcs_mood = 100
                 '<center><video autoplay loop src="images/locations/oldtown/vacanthouse/11684312.mp4"></video></center>'
@@ -393,7 +393,7 @@ $pavser9 = {
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'stat'
 						
-                        act '...':
+                        act 'Continue':
                             *clr & cla
 			                pcs_mana = manamax
 			                gs 'underwear', 'remove'
@@ -406,7 +406,7 @@ $pavser9 = {
 							gs 'arousal', 'vaginal_finger', 5, 'sub'
 							gs 'stat'
 							
-                            act '...':
+                            act 'Continue':
                                 *clr & cla
                                 gs'stat'
 								gs 'npcgeneratec', 0, 'Stranger', rand(19,45)
@@ -420,7 +420,7 @@ $pavser9 = {
 								gs 'arousal', 'vaginal', 10, 'sub'
 								gs 'stat'
 								
-                                act '...':
+                                act 'Continue':
                                     *clr & cla
 			                        pcs_mana = manamax
                                     gs'stat'
@@ -430,7 +430,7 @@ $pavser9 = {
 									$orgasm_or = 'yes'
 									gs 'stat'
 									
-                                    act '...':
+                                    act 'Continue':
                                         *clr & cla
                                         gs'stat'
                                         '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/09.jpg" ></center>'
@@ -441,7 +441,7 @@ $pavser9 = {
 										gs 'arousal', 'anal', 10, 'sub'
 										gs 'stat'
 										
-                                        act '...':
+                                        act 'Continue':
                                             *clr & cla
                                             orgasm += 1
 				                            pcs_horny = 0
@@ -452,7 +452,7 @@ $pavser9 = {
 											$orgasm_or = 'yes'
 											gs 'stat'
 									
-                                            act '...':
+                                            act 'Continue':
                                                 *clr & cla
                                                 gs'stat'
                                                 '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/11.jpg" ></center>'

+ 41 - 28
locations/din_van.qsrc

@@ -15,8 +15,15 @@ $showerdin = {
 	gs 'cum_cleanup'
 	pcs_hairbsh = 0
 	pcs_makeup = 1
+	if frost > 0:frost = 0
+	if shampoo < 0: shampoo = 0
 	lactation['lactmess'] = 0
 	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
+	if noShampoo = 0:
+		shampoo -= 1
+	else
+		killvar 'noShampoo'
+	end
 	if false_lashes >= 1:
 		if rand(0,4) <= 2:
 			'You''re careful enough that your false lashes make it through relatively unscathed.'
@@ -54,15 +61,11 @@ $shower = {
 	act 'Take a shower (0:15)':
 		menu_off = 1
 		*clr & cla
-		shampoo -= 1
 		minut += 15
-
-		if shampoo < 0: shampoo = 0
-
+		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
-		if frost > 0:frost = 0
-
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
 		'You undress and turn on the water in the shower. When it hits the right temperature you enter the shower and let the warm water rain down on you.'
@@ -74,8 +77,15 @@ $shower = {
 			'You have already gotten used to your feminine body and its softness doesn''t surprise you very much anymore. But you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
 			pcs_horny += rand(0,2)
-			'You carefully soap yourself trying not to miss any spot and then wash off.'
+			''+iif(noShampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'soap yourself trying not to miss any spot and then wash off.'
 		end
+
+		if shampoo = 0 and noShampoo_tmp = 1:
+			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
+		elseif shampoo <= 5:
+			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+		end
+
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
 
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
@@ -157,25 +167,21 @@ $shower = {
 			if indorf = 0: gs 'vanrPar', 'peek'
 		end
 	end
+	killvar 'noShampoo_tmp'
 }
 
 $bath = {
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
 		*clr & cla
-		shampoo -= 1
+
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-
-		if shampoo < 0:
-			shampoo = 0
-		end
-
+		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
-		if frost > 0:frost = 0
-
 		if bath_daystart ! daystart:
 			bath_daystart = daystart
 			pcs_skin += rand(1,2)
@@ -195,9 +201,17 @@ $bath = {
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
 			pcs_horny += rand(0,2)
-			'You lean back and relax for a while. Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
+			'You lean back and relax for a while. '+iif(noShampoo_tmp = 1, 'It’s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
 		end
 
+		if shampoo = 0 and noShampoo_tmp = 1:
+			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
+		elseif shampoo <= 5:
+			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+		end
+
+		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
+
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the bath.'
 
 		if btwarn > 0:
@@ -239,6 +253,7 @@ $bath = {
 
 		dynamic $brit
 	end
+	killvar 'noShampoo_tmp'
 }
 
 $brit = {
@@ -967,22 +982,20 @@ if $ARGS[0] = 'private':
 		'You have <b><<sanpad>></b> pads.'
 	end
 
-	if shampoo > 0 or $loc = 'vanrPar':
-		if $loc = 'vanrPar':
-			if shampoo < 1:shampoo = 1
-			'You are using your parents'' shampoo.'
-		else
-			'You have enough shampoo for <b><<shampoo>></b> uses.'
-		end
+	if $loc = 'vanrPar':
+		'You can use your parent''s shampoo.'
+		dynamic $shower
+		dynamic $bath
+	elseif $loc = 'tanvanr':
+		'You can use Tanya''s shampoo.'
+		dynamic $shower
+		dynamic $bath
+	elseif shampoo > 0:
+		'You have enough shampoo for <b><<shampoo>></b> uses.'
 		dynamic $shower
 		dynamic $bath
-	elseif shampoo = 0 and $loc = 'tanvanr':
-		shampoo = 1
-		'You can use Tanyas shampoo.'
-		gs 'din_van', 'prvt_pee'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-		gs 'din_van', 'prvt_pee'
 	end
 
 	if painkiller > 0:

+ 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/dvor.qsrc

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

+ 11 - 5
locations/etoexhib.qsrc

@@ -607,7 +607,7 @@ if $ARGS[0] = 'pos18':
 	'<center><b><font color="maroon">Disco</font></b></center>'
 
 	act 'Go outside':gt 'etoexhib', 'pos17'
-	
+
 	if hour < 23:
 		menu_off = 1
 		temp = rand(1, 100)
@@ -697,7 +697,7 @@ if $ARGS[0] = 'pos18':
 		end
 	else
 		'The Club closes, the lights go off, the music fades and everyone begins to leave.'
-	end	
+	end
 end
 
 if $ARGS[0] = 'pos19':
@@ -1210,7 +1210,7 @@ if $ARGS[0] = 'pos28':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_dir.jpg"></center>'
 	if izvad = 0:
 		'"Welcome, <<$pcs_nickname>>! Hope you like working with us. If you have any questions for me, I''m listening."'
-	elseif izvad = 1: 
+	elseif izvad = 1:
 		'"Hello again, <<$pcs_nickname>>."'
 	end
 
@@ -1257,7 +1257,13 @@ if $ARGS[0] = 'pos34':
 		act 'Next':gt 'etoexhib', 'pos33'
 	end
 
-	act 'Take a shower':gt 'ptu_dush', 'pos1'
+	if shampoo > 0:
+		act 'Take a shower':gt 'ptu_dush', 'pos1'
+	else
+		*nl
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
 	act 'Go to the hall':gt 'etoexhib', 'pos33'
 end
 
@@ -1699,7 +1705,7 @@ if $ARGS[0] = 'pos54':
 	end
 
 	act 'Leave': gt 'nordtrain', 'outside'
-	
+
 	if age < 18 and fakepassport ! 1 and money > 30000:
 		act 'Buy fake passport (30,000 <b>₽</b>)':
 			*clr & cla

+ 530 - 263
locations/fight.qsrc

@@ -1,314 +1,580 @@
 # fight
+
+!! Variables to be set before fight - in brackets so you can copy/paste
+!!{
+$opp_name[0] = <<name of opponent>>
+$opp_image[0] = opponent image ie. '<img <<$set_imgh>> src="images/characters/city/tobi/tobi.jpg">'
+opp_def[0] = opponent defence
+opp_run[0] = Opponent running skill used for player escape
+opp_wrstlng[0] = Wrestling skill
+opp_kick[0] = Kicking
+opp_punch[0] = Power punch
+opp_jab[0] = Ligth punch
+opp_stren[0] = Strengh
+opp_agil[0] = Agility
+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
-	cla
-	
-	if fight_cheat = 1:
-		xgt 'ender', 'win'
-		exit
-	end
-	
 	inFight = 1
 	gs 'themes', 'indoors'
-	gs'defence'
-	gs'statBat'
-
-	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and manaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
-		SasoriBody = SasoriBody - 1
-		gs'priziv','sasori'
+	cla
 
-		'<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'
+	if arrsize('pcs_health') > arrsize('opp_health'):
+		tableSize = arrsize('pcs_health')
+	else
+		tableSize = arrsize('opp_health')
+	end
 
-		'<b><font color = red>The last doll crumbles into pieces and you''ve finally reached Sasori.</font></b>'
+	$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>'
 
-	if stunV > 0 and SasoriBody > 1:
-		stunV = 0
+	*pl func('cleanHTML',$HTMLText)
 
-		'<b><font color = red>The doll began to move again.</font></b>'
+	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
 
-	if stunV > 0 and SasoriBody = 1:
-		stunV = 0
+	act 'Engage': gt 'fight', 'main'
 
-		'<b><font color = red>Sasori moves again.</font></b>'
+	killvar '$HTMLText'
+	killvar 'tableSize'
+	killvar 'i'
+end
+
+if $ARGS[0] = 'main':
+	gs 'fight', 'result_check'
+	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 GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and manaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
-		GedoMazo = 2
-		barierV = 0
+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
+		$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>'
 
-		'<b><font color = green><<$boydesc>> He fell to the ground and turned to dust.</font></b>'
+	killvar 'i'
+	killvar 'fightPStats'
+	killvar '$fightPStats'
+end
 
-		gs'priziv','tobi'
+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
 
-		'<b><font color = green><<$boydesc>>Attack</font></b>'
+if $ARGS[0] = 'result_check':
+!!cheat to auto-win fights check
+	if fight_cheat = 1:
+		!xgt 'ender', 'win'
+		gt $loc, $metka
+		exit
 	end
 
-	if pcs_health <= 0 and heart = 0 and izanagi = 0:
+
+!!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 healthV <= 0 and heartV = 0 and izanagiV = 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_mana <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red> You won!</font></b>'
+	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
-	elseif manaV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> lost!</font></b>'
+	end
+	!gt 'fight', 'main'
+	killvar 'i'
+end
 
-		xgt'ender','win'
-		exit
-	elseif pcs_willpwr <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red> You lost!</font></b>'
+!! 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
+		$fightAtk['AttackerType'] = 'opp'
+		$fightAtk['AttackerName'] = $opp_name['<<ARGS[3]>>']
+		$fightAtk['DefenderName'] = $pcs_name['<<ARGS[2]>>']
+		$fightAtk['TargetPronoun'] = 'You'
+	end
 
-		xgt'ender','loss'
-		exit
-	elseif willpowerV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>> won!</font></b>'
+	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
+				'The hit is hard and <<$fightAtk["AttackerName"]>> reels in pain.'
+			end
+		else
+			'Its a glancing blow, but still hurts.'
+		end
+	else
+		if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
+			'You avoid the blow.'
+		else
+			'<<$fightAtk["AttackerName"]>> avoids the blow.'
+		end
+	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
 
-		xgt'ender','win'
-		exit
+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
+			TargetNumber = 2
+		end
+	elseif pcs_health[1] > 0 and pcs_health[2] > 0:
+		TargetNumber = rand(1,2)
+	elseif pcs_health[0] > 0:
+		TargetNumber = 0
+	elseif pcs_health[1] > 0:
+		TargetNumber = 1
+	else
+		TargetNumber = 2
+	end		
+!!	if opp_magik[0] > 0: gs 'fight', 'opp_spellcast'
+	if rand(0,opp_kick[0]) > 40:
+		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 izanagiV > 0 and healthV <= 0 or izanagiV > 0 and manaV <= 0 or izanagiV > 0 and willpowerV <= 0:
-		izanagiV = izanagiV - 1
+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
 
-		'<b><font color = red><<$boydesc>> disappeared.</font></b>'
+		act 'Punch <<$opp_name[0]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, ARGS[2]
+		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
+		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
 
-		'<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
+		act 'Punch <<$opp_name[1]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 1, ARGS[2]
+		end
 
-		'<b><font color = red><<$boydesc>> staggered, as his heart burst.</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
 
-		healthV = vitalV*10 + strenV*5
-		manaV = intelV*magikV + magikV*100 + vitalV*10
-		willpowerV = willV*10
-		stunV = 0
+		act 'Punch <<$opp_name[2]>> hard':
+			gs 'fight', 'Attack', 'Hard Punch', 'opp', 2, ARGS[2]
+		end
 
-		'<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
+		act 'Jab <<$opp_name[2]>>':
+			gs 'fight', 'Attack', 'Jab', 'opp', 2, ARGS[2]
+		end
+	end	
+end
 
-		'<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
+if $ARGS[0] = 'opp_spellcast':
+end
+
+if $ARGS[0] = 'pcs_spellcast':
+end
+
 
-		'<b><font color = green>All of a sudden he appears in front of you completely healthy.</font></b>'
-	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_mana <= 0 or heart > 0 and pcs_willpwr <= 0:
-		heart = heart - 1
-		zerkaloV = 0
-		poisonV = 0
-		bloodV = 0
 
-		'<b><font color = green>Your heart took too much of a beating and gave up.</font></b>'
 
-		pcs_health = pcs_vital*10 + pcs_stren*5
-		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
-		stun = 0
 
-		'<b><font color = green>You open your eyes as you''re not dead...</font></b>'
-	end
 
-	gs'before'
-	'<b>= = = = = = = = = = = = = (ROUND <<round>>) = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
-	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
-	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
-	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
-	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
-	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
-	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'
-	if defenceAct > 0:'<b><font color = green><<defenceAct>> Regeneration</font></b>'
-	if defenceActM > 0:'<b><font color = green><<defenceActM>> Mana recovery protection</font></b>'
-	if unmaterial > 0:'<b><font color = green>You''re <<unmaterial>> strokes are not material.</font></b>'
-	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
-	gs'init'
-
-	if hod = 0:
-		!player attacks
-		'<font color = green>Choose your attack</font>'
-
-		if gun > 0:
-			!Boomstick
-			if bulletIn > 0:
-				'You have <<bulletIn>> bullets loaded in the gun.'
-
-				act 'Pistol shot':
-					cla
-					bulletIn -= 1
-					gunpower = 150
-					buu = 1
-					gunpricel = 1
-					Gcrime += 1
-					gt'strelba'
-				end
-			elseif bulletIn <= 0:
-				if bullet = 0:
-					'You''re out of ammunition.'
-				elseif bullet>0:
-					'You have <<bullet>> left.'
-
-					act 'Reload':
-						cla
-						if bullet < 7:
-							bulletIn = bullet
-							bullet = 0
-
-							'You reload the empty gun.'
-						end
-						if bullet >= 7:
-							bullet -= 7
-							bulletIn = 7
-
-							'You reload all the 7 bullets in the gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
 
-		if Mgun > 0:
-			!Boomstick
-			if mbulletIn > 0:
-				'You have <<mbulletIn>> bullets left in the machine gun.'
-
-				act 'Single shot':
-					cla
-					mbulletIn -= 1
-					buu = 1
-					gunpower = 300
-					gunpricel = 2
-					Gcrime += 1
-					gt'strelba'
-				end
-
-				if mbulletIn >= 3:
-					act 'Burst shot':
-						cla
-						mbulletIn -= 3
-						buu = 3
-						gunpower = 300
-						gunpricel = 1
-						Gcrime += buu
-						gt'strelba'
-					end
-					act 'Automatic shot':
-						cla
-						buu = mbulletIn
-						mbulletIn = 0
-						gunpower = 300
-						gunpricel = 0
-						Gcrime += buu
-						gt'strelba'
-					end
-				end
-			elseif mbulletIn <= 0:
-				if mbullet = 0:
-					'You''ve run out of ammunition.'
-				elseif mbullet > 0:
-					'You have <<mbullet>> bullets left in the machine gun.'
-
-					act 'Reload':
-						cla
-						if mbullet < 7:
-							mbulletIn = mbullet
-							mbullet = 0
-
-							'You reload the empty gun.'
-						end
-						if mbullet >= 30:
-							mbullet -= 30
-							mbulletIn = 30
-
-							'You''ve reloaded 30 bullets for the machine gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
 
-		if tragun > 0:
-			!travmatik
-			if tbulletIn > 0:
-				'You have <<mbulletIn>> bullets left in the non-lethal gun.'
-
-				act 'Pistol shot':
-					cla
-					tbulletIn -= 1
-					gunpower = 50
-					buu = 1
-					gunpricel = 0
-					gt'strelba'
-				end
-			elseif tbulletIn <= 0:
-				if tbullet = 0:
-					'You''ve run out of ammunition.'
-				elseif tbullet > 0:
-					'You have <<mbullet>> bullets left in the non-lethal gun.'
-
-					act 'Charge':
-						cla
-						if tbullet >= 1:
-							tbullet -= 1
-							tbulletIn = 1
-
-							'You reload the empty gun.'
-						end
-
-						act 'Further':gt'fight','sta'
-					end
-				end
-			end
-		end
-		if autocombat_cheat = 0 or pcs_magick > 0:
-			act 'Physical Attack':xgt'boxing'
-			if pcs_magik > 0: act 'Magical Attack':gt'magik'
-			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
-		elseif autocombat_cheat = 1 and pcs_magick = 0:
-			xgt'boxing'
-		end		
-	elseif hod = 1:
-		!enemy attacks
-		'<font color = red><<$boydesc>> attacks</font>'
-		if autocombat_cheat = 0: 
-			act 'Continue': xgt'enemy','start'
-			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
-		elseif autocombat_cheat = 1: 
-			xgt'enemy','start'
-		end
-	end
-end
+
+
+
+!!--------------------------------------------------old shit--------------------------------------------------
+
 
 if $ARGS[0] = 'sta':
 	menu_off = 1
@@ -388,5 +654,6 @@ if $ARGS[0] = 'Wrestlergen':
 		!!fat[1] = 100
 	end
 end
+
 --- fight ---------------------------------
 

+ 3 - 3
locations/fight1.qsrc

@@ -9,19 +9,19 @@ $resultUderDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u.jpg"></center>'
 		'You''ve successfully mounted your opponent.'
 
-		act '...':stoper = 0 & gt 'fight2'
+		act 'Continue':stoper = 0 & gt 'fight2'
 	elseif Aktiv < Passiv:
 		pointE += 1
 		KzE += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u1.jpg"></center>'
 		'You''re not able to do anything as your opponent counters.'
 
-		act '...':stoper = 0 & gt 'fight3'
+		act 'Continue':stoper = 0 & gt 'fight3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u2.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 3 - 3
locations/fight2.qsrc

@@ -12,19 +12,19 @@ $resultUderDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f2u.jpg"></center>'
 		'You''re successfully holding your opponent.'
 
-		act '...':gt 'fight2'
+		act 'Continue':gt 'fight2'
 	elseif Aktiv < Passiv:
 		pointE += 1
 		KzE += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f2u2.jpg"></center>'
 		'You''re not able to do anything as your opponent counters.'
 
-		act '...':stoper = 0 & gt 'fight3'
+		act 'Continue':stoper = 0 & gt 'fight3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u2.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 5 - 5
locations/fight3.qsrc

@@ -9,21 +9,21 @@ $resultUderDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u.jpg"></center>'
 		'You''ve successfully locked your opponent.'
 
-		act '...':stoper = 0 & gt 'fight2'
+		act 'Continue':stoper = 0 & gt 'fight2'
 
 	! if Aktiv <= Passiv:
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f1u2.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	else
 		pointE += 1
 		KzE += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u2.jpg"></center>'
 		'You''re not able to do anything as your opponent breaks your lock.'
 
-		act '...':gt 'RoundStop'
+		act 'Continue':gt 'RoundStop'
 	end
 }
 
@@ -35,7 +35,7 @@ $resultBrosDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3b.jpg"></center>'
 		'You''re successfully thrown your opponent.'
 
-		act '...':stoper = 0 & gt 'fight1'
+		act 'Continue':stoper = 0 & gt 'fight1'
 	! if Aktiv <= Passiv:
 	else
 		pointE +=1
@@ -43,7 +43,7 @@ $resultBrosDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f3u2.jpg"></center>'
 		'You''re not able to do anything as your opponent counters.'
 
-		act '...':gt 'RoundStop'
+		act 'Continue':gt 'RoundStop'
 	end
 }
 

+ 6 - 6
locations/fightFW.qsrc

@@ -6,19 +6,19 @@ $resultUderDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu.jpg"></center>'
 		'You''ve successfully mounted your opponent.'
 
-		act '...':stoper = 0 & gt 'fight2'
+		act 'Continue':stoper = 0 & gt 'fight2'
 	elseif Aktiv < Passiv:
 		pointE += 1
 		KzE += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu1.jpg"></center>'
 		'You''re not able to do anything as your opponent counters.'
 
-		act '...':stoper = 0 & gt 'fight3'
+		act 'Continue':stoper = 0 & gt 'fight3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 
@@ -30,19 +30,19 @@ $resultBrosDin = {
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fb.jpg"></center>'
 		'You''ve successfully mounted your opponent.'
 
-		act '...':stoper = 0 & gt 'fight1'
+		act 'Continue':stoper = 0 & gt 'fight1'
 	elseif Aktiv < Passiv:
 		pointE += 1
 		KzE += 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/fu1.jpg"></center>'
 		'You''re not able to counter your opponent.'
 
-		act '...':stoper = 0 & gt 'fight3'
+		act 'Continue':stoper = 0 & gt 'fight3'
 	elseif Aktiv = Passiv:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/f.jpg"></center>'
 		'The two of you try to one up each other without being able to gain the superiority.'
 
-		act '...':gt $curloc
+		act 'Finish':gt $curloc
 	end
 }
 

+ 31 - 27
locations/fit.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'dressing room':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/razd.jpg"></center>'
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
-	
+
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
@@ -113,21 +113,25 @@ if $ARGS[0] = 'dressing room':
 		end
 	end
 
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		menu_off = 1
-		minut += 15
-		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		if pcs_inhib < 15:inhib_exp += rand(1,2)
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-		act 'Get out of the shower':gt 'fit', 'dressing room'
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			menu_off = 1
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			if pcs_inhib < 15:inhib_exp += rand(1,2)
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
+			act 'Get out of the shower':gt 'fit', 'dressing room'
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	act 'Use mirror':
@@ -194,15 +198,17 @@ if $ARGS[0] = 'fitgirl':
 
 	act 'Follow her':
 		*clr & cla
-		!! pcs_hairbsh = 0
-		!! pcs_makeup = 1
-		!! dynamic $showerdin
-		!! dont ruin the pcs makeup and hair because otherwise its pretty hard to get to 80 appearance
+		pcs_hairbsh = 0
+		pcs_makeup = 1
+		noShampoo = 1
+		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower0.jpg"></center>'
 		'There''s no one in the shower, except this girl. The girl looks around and seeing you smiles again then turns away.'
-		
+
+		act 'Leave the shower':gt 'fit', 'dressing room'
+
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Molest her (<<will_cost>> Willpower)':
@@ -241,11 +247,11 @@ if $ARGS[0] = 'fitgirl':
 						*clr & cla
 						gs 'stat'
 
-						if pcs_apprnc < 120:
+						if pcs_apprnc < 100:
 							'The girl smiles at you, but removes your hand and leaves, blowing you a kiss.'
 
-							act '...':gt 'fit', 'dressing room'
-						elseif pcs_apprnc >= 120:
+							act 'Continue':gt 'fit', 'dressing room'
+						elseif pcs_apprnc >= 100:
 							cla
 							*clr
 							gs 'underwear', 'remove'
@@ -267,8 +273,6 @@ if $ARGS[0] = 'fitgirl':
 		else
 			act 'Molest her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-
-		act 'Leave the shower':gt 'fit', 'dressing room'
 	end
 end
 
@@ -276,7 +280,7 @@ if $ARGS[0] = 'tanyaIntroduction':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower1.jpg"></center>'
 	'Just as the both of you are about to get more intimate a group of middleaged women enters the showers. They haven''t noticed you yet. The girl next to you is clearly afraid of being spotted in the shower with you and takes her first opportunity to quietely escape to the dressing room.'
 	'You follow her only a few seconds later. She has already begun to dress herself.'
-	
+
 	if $pantyworntype = 'none': gs 'underwear', 'wear'
 	gs 'panties', 'dispose'
 	gs 'clothing', 'wear_last_worn'

+ 144 - 133
locations/foto.qsrc

@@ -859,68 +859,73 @@ if $ARGS[0] = 'showers':
 	'A little bit aways are bathroom stalls with a line of sinks and mirrors on the wall opposite as well as several tampon dispensers.'
 
 	act 'Go to the studio floor':gt'foto','studio'
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		minut += 15
-		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		inhib_exp += 1
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'You go into a stall and turn on the shower. You lather your body and wash.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		if pcs_horny >= 40:
-			act 'Use the shower head on your pussy':
-				cla
-				*clr
-				gs 'exhibitionism', 1
-				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
-				*nl
-				'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers. '
+	
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			inhib_exp += 1
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into a stall and turn on the shower. You lather your body and wash.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			if pcs_horny >= 40:
+				act 'Use the shower head on your pussy':
+					cla
+					*clr
+					gs 'exhibitionism', 1
+					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
+					*nl
+					'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers. '
 
-				if hypnoAddict > 0:
-					minut += 10
-					'You unconsciously avoid spraying water into your vagina.'
-					act 'Dry off':gt 'foto', 'showers'
-				else
-					if pcs_horny >= 70:
-						if exhibitionist_lvl > 0:
-							gs 'exhibitionism', 1
-							pcs_mood += 15
-							pcs_willpwr += 15
-							$orgasm_or = 'yes'
-							$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
-							gs 'arousal','masturbate', 10
-							gs 'arousal', 'end'
-							act 'Dry off':gt 'foto', 'showers'
+					if hypnoAddict > 0:
+						minut += 10
+						'You unconsciously avoid spraying water into your vagina.'
+						act 'Dry off':gt 'foto', 'showers'
+					else
+						if pcs_horny >= 70:
+							if exhibitionist_lvl > 0:
+								gs 'exhibitionism', 1
+								pcs_mood += 15
+								pcs_willpwr += 15
+								$orgasm_or = 'yes'
+								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
+								gs 'arousal','masturbate', 10
+								gs 'arousal', 'end'
+								act 'Dry off':gt 'foto', 'showers'
+							else
+								gs 'exhibitionism', 2
+								pcs_mood += 15
+								pcs_willpwr += 15
+								$orgasm_or = 'yes'
+								$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+								gs 'arousal','masturbate', 10
+								gs 'arousal', 'end'
+								act 'Dry off':gt 'foto', 'showers'
+							end
 						else
-							gs 'exhibitionism', 2
-							pcs_mood += 15
-							pcs_willpwr += 15
-							$orgasm_or = 'yes'
-							$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+							pcs_horny += 5
+							pcs_mood += 10
+							pcs_willpwr += 10
+							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
 							gs 'arousal','masturbate', 10
 							gs 'arousal', 'end'
 							act 'Dry off':gt 'foto', 'showers'
 						end
-					else
-						pcs_horny += 5
-						pcs_mood += 10
-						pcs_willpwr += 10
-						'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
-						gs 'arousal','masturbate', 10
-						gs 'arousal', 'end'
-						act 'Dry off':gt 'foto', 'showers'
 					end
+					cumspclnt = 8
+					gs 'cum_cleanup'
 				end
-				cumspclnt = 8
-				gs 'cum_cleanup'
 			end
-		end
 
-		act 'Get out of the shower':gt 'foto', 'showers'
+			act 'Get out of the shower':gt 'foto', 'showers'
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	if mesec > 0 and isprok = 0:
@@ -952,94 +957,98 @@ if $ARGS[0] = 'krystalshower':
 	'"Ahh! Yes! Just like that!"'
 	pcs_horny += 10
 	act 'Leave':gt'foto','studio'
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		minut += 15
-		pcs_horny += 15
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		gs 'exhibitionism', 1
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></video></center>'
-		'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		if pcs_horny >= 40:
-			act 'Use the shower head on your pussy':
-				cla
-				*clr
-				gs 'exhibitionism', 2
-				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				*nl
-				'Her boyfriend pushes her against the wall and pulls her leg up to get deep inside her. Krystal''s moans and the sound of cock slamming into her pussy are too much for you and you can''t stop yourself from placing the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
-				'Your voices start to sync together, echoing out of the stalls in perfect time with each other.'
-				gs 'arousal','masturbate', 5
-				act 'Continue':
-					cla & *clr
-					stat['mast'] += 1
-					if exhibitionist_lvl < 2:
-						pcs_mood += 15
-						pcs_willpwr += 15
-						gs 'exhibitionism', 1
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
-						'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-						$orgasm_or = 'yes'
-						$orgasm_txt = 'You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
-						gs 'arousal','masturbate', 5
-						gs 'arousal', 'end'
-						act 'Dry off':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
-							'You shyly towel off and start to go when you hear Krystal whisper, "Was it good for you too <<$pcs_nickname>>?"'
-							*nl
-							'Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
-							act'Leave':gt 'foto', 'studio'
-						end
-					else
-						pcs_mood += 15
-						pcs_willpwr += 15
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
-						'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-						$orgasm_or = 'yes'
-						$orgasm_txt = 'You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
-						gs 'arousal','masturbate', 5
-						gs 'arousal', 'end'
-						act 'Dry off':
-							cla & *clr
-							'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
-							'You start to towel off, widely smiling at Krystal who is washing the cum off her body.'
-							'She smiles back at you. "Maybe you''d like to join us next time?"'
-							'"Maybe, we''ll see!" you say with a smirk.'
-							act'Leave':gt 'foto', 'studio'
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			minut += 15
+			pcs_horny += 15
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			gs 'exhibitionism', 1
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></video></center>'
+			'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			if pcs_horny >= 40:
+				act 'Use the shower head on your pussy':
+					cla
+					*clr
+					gs 'exhibitionism', 2
+					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					*nl
+					'Her boyfriend pushes her against the wall and pulls her leg up to get deep inside her. Krystal''s moans and the sound of cock slamming into her pussy are too much for you and you can''t stop yourself from placing the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
+					'Your voices start to sync together, echoing out of the stalls in perfect time with each other.'
+					gs 'arousal','masturbate', 5
+					act 'Continue':
+						cla & *clr
+						stat['mast'] += 1
+						if exhibitionist_lvl < 2:
+							pcs_mood += 15
+							pcs_willpwr += 15
+							gs 'exhibitionism', 1
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
+							'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
+							gs 'arousal','masturbate', 5
+							gs 'arousal', 'end'
+							act 'Dry off':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
+								'You shyly towel off and start to go when you hear Krystal whisper, "Was it good for you too <<$pcs_nickname>>?"'
+								*nl
+								'Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
+								act'Leave':gt 'foto', 'studio'
+							end
+						else
+							pcs_mood += 15
+							pcs_willpwr += 15
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
+							'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
+							gs 'arousal','masturbate', 5
+							gs 'arousal', 'end'
+							act 'Dry off':
+								cla & *clr
+								'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
+								'You start to towel off, widely smiling at Krystal who is washing the cum off her body.'
+								'She smiles back at you. "Maybe you''d like to join us next time?"'
+								'"Maybe, we''ll see!" you say with a smirk.'
+								act'Leave':gt 'foto', 'studio'
+							end
 						end
+						cumspclnt = 8
+						gs 'cum_cleanup'
 					end
-					cumspclnt = 8
-					gs 'cum_cleanup'
 				end
 			end
-		end
 
-		if exhibitionist_lvl > 1:
-			act 'Dry off':
-				cla & *clr
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				'You start to towel off looking a little enviously at Krystal when her boyfriend pushes her against the wall and starts to take her from the front.'
-				*nl
-				'You take one last look with a bit of regret and go back to the main floor of the studio.'
-				pcs_horny += 20
-				act'Leave':gt 'foto', 'studio'
-			end
-		else
-			act 'Dry off':
-				cla & *clr
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				'You shyly towel off, still doing your best to ignore the wild and unashamed sex of your co-worker and her boyfriend, who have now switched positions so Krystal''s back is to the wall with her leg up and his big fat cock now pummelling her from the front.'
-				*nl
-				'As you finish drying off you realize how wet between the legs you are. Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
-				pcs_horny = 70
-				act'Leave':gt 'foto', 'studio'
+			if exhibitionist_lvl > 1:
+				act 'Dry off':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					'You start to towel off looking a little enviously at Krystal when her boyfriend pushes her against the wall and starts to take her from the front.'
+					*nl
+					'You take one last look with a bit of regret and go back to the main floor of the studio.'
+					pcs_horny += 20
+					act'Leave':gt 'foto', 'studio'
+				end
+			else
+				act 'Dry off':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					'You shyly towel off, still doing your best to ignore the wild and unashamed sex of your co-worker and her boyfriend, who have now switched positions so Krystal''s back is to the wall with her leg up and his big fat cock now pummelling her from the front.'
+					*nl
+					'As you finish drying off you realize how wet between the legs you are. Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
+					pcs_horny = 70
+					act'Leave':gt 'foto', 'studio'
+				end
 			end
 		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	act'Go to your makeup station':gt'foto','makeup'
 end
@@ -2596,6 +2605,7 @@ if $ARGS[0] = 'blackm':
 								act 'No!':
 									cla
 									*clr
+									noShampoo = 1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -2625,6 +2635,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
+										noShampoo = 1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

+ 19 - 19
locations/foto_models.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'mari_1':
 		'"Hi, I hope I''m not bothering you. I''ve just been recruited by the agency and I wanted to introduce myself," you say as you step up to her.'
 		'"I''m <<$pcs_firstname>>."'
 		'Mari looks your way and smiles, "Hello, it''s nice meeting a new employee, I''m Mari." As she runs her hand through her hair absentmindedly, you can''t help but notice her breasts becoming even more visible now that her curly brown hair has been moved out of the way.'
-		act'...':
+		act 'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/3.jpg"></center>'
 			'"I''m gonna to sit down if you don''t mind. Long hours standing up and all, no use standing when you don''t have to!" she says pleasantly as she sits down and puts one of her legs up on the bench.'
@@ -162,17 +162,17 @@ if $ARGS[0] = 'mari_1':
 							*clr
 							'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/5.jpg"></center>'
 							'You stick around for a while watching Mari as the photographer gives her instructions and she poses accordingly.'
-							act '...':
+							act 'Continue':
 								cla
 								*clr
 								'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/6.jpg"></center>'
 								'You watch her drop her skirt on the photographer''s command, revealing her lack of underwear and a neat triangle of pubic hair.'
-								act '...':
+								act 'Continue':
 									cla
 									*clr
 									'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/7.jpg"></center>'
 									'You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.'
-									act'...':
+									act 'Continue':
 										cla
 										*clr
 										'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/8.jpg"></center>'
@@ -207,17 +207,17 @@ if $ARGS[0] = 'mari_1':
 						*clr
 						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/5.jpg"></center>'
 						'You stick around for a while watching Mari as the photographer gives her instructions and she poses accordingly.'
-						act '...':
+						act 'Continue':
 							cla
 							*clr
 							'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/6.jpg"></center>'
 							'You watch her drop her skirt on the photographer''s command, revealing her lack of underwear and a neat triangle of pubic hair.'
-							act '...':
+							act 'Continue':
 								cla
 								*clr
 								'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/7.jpg"></center>'
 								'You watch her pull off her top next with a smile and a laugh and you realize that she''s genuinely happy right now.'
-								act'...':
+								act 'Continue':
 									cla
 									*clr
 									'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/8.jpg"></center>'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'mari_2':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
 		'"Oh hi, <<$pcs_nickname>>," she says as she hears your voice and looks up. "I am! But it''s boring to spend it the break rooms. I spend most of my breaks lounging around on the sets. No one''s using them and it''s just more fun that way. Besides, this chair is really comfy!" she says with a laugh.'
-		act '...':
+		act 'Continue':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
 			'You can''t help but smile and laugh with her.'
@@ -254,7 +254,7 @@ if $ARGS[0] = 'mari_2':
 					*clr & cla
 					'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading5.jpg"></center>'
 					'You shrug and say, "I haven''t the faintest idea what you''re talking about Mari."'
-					act'...':
+					act 'Continue':
 						*clr & cla
 						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading6.jpg"></center>'
 						'She stands up and laughs again. "We''re always naked!" she giggles. Once more, you can''t help but join in with her infectious laughter and remembering that you yourself are currently naked on the way to a shoot.'
@@ -283,21 +283,21 @@ if $ARGS[0] = 'mari_2':
 										cla
 										'All of a sudden you start to feel nervous. It''s such a personal question you don''t know if you should be asking, but you''re committed now. There''s no turning back. "It''s kind of personal, but I was wondering... what do your parents think of all this? I''m mostly asking since we kind of come from similar backgrounds and you know, your parents are from Gadukino and I''m from Pavlovsky and we''re in sort of similar situations and... you know..."'
 										'You trail off at the end of your sentence, unsure of how to end such a personal request.'
-										act '...':
+										act 'Continue':
 											*clr & cla
 											'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading9.jpg"></center>'
 											'Mari looks away for a moment, contemplating your question.'
 											'"Well, to be honest I don''t really know. I mean my parents know I''ve got a job in the city but they don''t know exactly what I do. I know they love me a lot and they''re very happy for me for living my dream and maybe they''d even be proud of me if I told them about it, but I don''t know."'
-											act'...':
+											act 'Continue':
 												*clr & cla
 												'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading10.jpg"></center>'
 												'"I''m not sure how much they <i>need</i> to know about their teenage daughter having pictures taken of her in the nude and put in magazines and on the internet. So my advice is, it all depends on your parents. If they''re cool with it, maybe you should tell them. Otherwise, I guess don''t."'
-												act '...':
+												act 'Continue':
 													*clr & cla
 													'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading11.jpg"></center>'
 													'She looks at you a bit concerned, hoping that she''s been of some help to you.'
 													'Unsure of what to do you hesitate in your response resulting in an awkward pause.'
-													act'...':
+													act 'Continue':
 														*clr & cla
 														'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading12.jpg"></center>'
 														'"Oh, come here silly," she says as she stands up and wraps you in a warm hug. You feel her soft breasts smushing into yours, the smoothness of her body rubbing against you, her nipples two gentle points of pressure on your skin, your own nipples pressing back into her... It''s all strangely calming. Mari''s right. It is relaxing to be naked together.'
@@ -480,7 +480,7 @@ if $ARGS[0] = 'mari_chat':
 					'"Yeah, I''ve got two. My sister who''s about the same age as you are and my silly little brother."'
 					'Mari smiles at you. "That''s sounds nice."'
 					'You think of your siblings and smile. "Yeah. It is."'
-					
+
 				elseif sisterLesb >= 5:
                     '    "Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
                     '    Mari smiles at you. "You sound close."'
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'anastasiasex':
 				end
 			end
 		end
-		
+
 		if guy >= 10:
 			act'I know what you mean':
 				*clr & cla
@@ -1155,7 +1155,7 @@ if $ARGS[0] = 'anastasiasex':
 						act'Oh! We can do that here?':gt'foto_models','anastasiasex3'
 					end
 				end
-				
+
 				if pcs_cupsize >= 25:
 					act'I''ve got big boobs':
 						cla & *nl
@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'anastasiasex2':
 			'With that, she bids you farewell, walking towards another part of the studio.'
 			act 'Leave':gt 'foto','studio'
 		end
-		
+
 		act'Yes':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'anastasiasex3':
 		'"There are three things you need to know in this business. Make sure to enjoy yourself, never forget your birth control, and <i>always</i> charge extra for creampies, swallowing, and anal."'
 		'She stands back, meeting your eyes with a smile. "Words to live by my dear. Words to live by. But I must be off now. Don''t be a stranger!"'
 		'With that, she bids you farewell, walking towards another part of the studio.'
-		
+
 		'<b>dev note: escorting business still WIP</b>'
 		act 'Leave':gt 'foto','studio'
 	end
@@ -1886,7 +1886,7 @@ if $ARGS[0] = 'jeff_chat':
 			end
 		end
 	end
-		
+
 	if jeff_grope > 3:
 		act 'Ask her to stop groping you':
 			*clr & cla

+ 1 - 0
locations/gadmarket.qsrc

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

+ 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
 	

+ 22 - 17
locations/gdksport.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec:gt ''gdksport'',''dance1''">Dance</a> and <a href="exec:gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
 	'In the locker room is a <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-	
+
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
 	elseif npc_rel['A3'] >= 80 and hour = 17 and ivansportday ! daystart:
@@ -31,10 +31,10 @@ if $ARGS[0] = 'start':
 		'You can see <a href="exec:gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
 	end
 
-	*nl	
+	*nl
 	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'
 	if $shoeworntype ! 'trainers': 'You are not wearing training shoes.'
-	
+
 	act 'Go outside':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
@@ -72,8 +72,12 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'sports_outfit'
 
-	act 'Take a shower':gt 'gdksport', 'shower'
-	
+	if shampoo > 0:
+		act 'Take a shower':gt 'gdksport', 'shower'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
 	*nl
 
 	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour < 18:
@@ -123,7 +127,7 @@ if $ARGS[0] = 'racing1':
 	'Race training cost 300 <b>₽</b> for 30 lessons.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboBeg = 0:
 		act 'Buy 30 racing lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -143,7 +147,7 @@ if $ARGS[0] = 'dance1':
 	'Dance lessons cost 300 <b>₽</b> for 30 lessons.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboDance = 0:
 		act 'Buy 30 dance lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -153,7 +157,7 @@ if $ARGS[0] = 'dance1':
 			'You paid for 30 dance lessons.'
 			act 'Leave':gt 'gdksport', 'start'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'vball1':
@@ -163,7 +167,7 @@ if $ARGS[0] = 'vball1':
 	'Volleyball lessons cost 300 <b>₽</b> for 30 visits.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboVolley = 0:
 		act 'Buy 30 volleyball lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -173,7 +177,7 @@ if $ARGS[0] = 'vball1':
 			'You paid for 30 volleyball lessons.'
 			act 'Leave':gt 'gdksport', 'start'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'dance2':
@@ -181,9 +185,9 @@ if $ARGS[0] = 'dance2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
-	
+
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if pcs_danc < 50:
 		gsAboDance -= 1
 		timemult = 8
@@ -413,7 +417,7 @@ if $ARGS[0] = 'starlets':
 	*clr & cla
 
 	startletsday = daystart
-	
+
 	timemult = 8
 	loopcount = 1
 	:starletstimeloop
@@ -474,6 +478,7 @@ if $ARGS[0] = 'starlets':
 				loopcount = 0
 				timemult = 0
 				money += albpayrand * 1000
+				noShampoo = 1
 				dynamic $showerdin
 				profiDanceTime += 1
 				inhib_exp += rand(3,5)
@@ -739,12 +744,12 @@ if $ARGS[0] = 'vball5':
 !	loopcount = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
-	'The tournament starts at 20:00. Your bus departs at 19:00. You gathered your things together with the rest of the team and got on a bus that took you to the out of town match.'
+	'The tournament starts at 19:00. Your bus departs at 18:00. You gathered your things together with the rest of the team and got on a bus that took you to the out of town match.'
 	act 'Leave':gt 'gdksport', 'start'
 	act 'Get on bus and go to play':
 		volltime = 0
 		sorevday = daystart
-		if hour < 19: hour = 19 & minut = 0
+		if hour < 18: hour = 18 & minut = 0
 		timemult = 0
 		pcs_dom += 1
 		npc_rel['A69'] += 2
@@ -1004,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.'
@@ -1112,7 +1117,7 @@ if $ARGS[0] = 'Ivan_bored':
 	'You look at Ivan for a long moment and bite your lower lip and then whisper just loud enough he can barely hear you. "I''m bored." He looks at you a moment then smiles, he looks around, then takes you by the hand and leads you away from the others, into one of the lesser used area''s of the school. He stops at one of the boys restrooms, going inside and leaving you outside. A few moments later two younger boys are ushered out by Ivan and sent packing. He watches them go, once they round the corner he pulls you into the bathroom.'
 
 	act 'Leave': gt 'gschool_lessons', 'short_break'
-	
+
 	act 'Go into the bathroom with Ivan':
 		*clr & cla
 		pcs_horny += 20

+ 3 - 3
locations/gevent.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '1':
 
 				'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to try instead. When he cums he pulls back just a bit, and you can feel it spasm as a warm liquid hits your tongue.'
 			end
-			
+
 			act 'Swallow his cum':
 				*clr & cla
 				swallow += 1
@@ -163,7 +163,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/3.jpg"></center>'
 	'You go with the Armenian to his home nearby. In the apartment there are two more guys, also Armenians. They speak to each other in their own language, while drinking alot of alcohol. You don''t realise just how strong it is until you are completely wasted, then they strip and fuck you, taking turns in all of your holes, finishing inside and all over you, all the while they are filming with there phones. Finally, when they are spent and bored of you, they kicked you out of the apartment.'
 
-	act '...':gt 'pavResidential'
+	act 'Continue':gt 'pavResidential'
 end
 
 if $ARGS[0] = '4':
@@ -251,7 +251,7 @@ if $ARGS[0] = '6':
 	guyondisco -= 1
 	if guyondisco > 0: jump 'geventgondloop'
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/6.1.jpg"></center>'
 	'You barely remember what happened. You were standing against the wall at the disco, quietly enjoying the admittedly rather outdated music when a guy approached you. He started groping you, but you were too drunk to stop him. It also felt kind of nice to be wanted, so you just went along with it.'
 	'The next thing you remember: you were on your knees, sucking him off in the bathroom stalls. After he came in your mouth he took you away from the disco to a different place, where several of his friends had already gathered. "Dude, nice!" they praised his catch, while you unsteadily tried to move to the couch to sit down. You never made it to the couch, the guys immediately surrounded you and started to maul you from all sides.'

+ 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

+ 10 - 5
locations/gpoli.qsrc

@@ -123,6 +123,7 @@ if $ARGS[0] = '':
 							Gspravka = 30
 							GspravkaT = 1
 							Gspassed = 1
+							forge_referral = 1
 							gs 'stat'
 							'You see a pile of unused referral forms and think to yourself: "I may not be a virgin any more, but <<$npc_nickname[''A29'']>> doesn''t need to know that!"'
 							'After you make sure no one is in the corridor, you quickly walk to the desk, take one of the empty referral forms and press his stamp onto it. You can do the rest later. You quickly hide it under your clothes and get back to cleaning, after carefully putting everything back the way you found it.'
@@ -643,7 +644,7 @@ end
 
 if $ARGS[0] = 'referral':
 	menu_off = 1
-	if pcs_vag = 0 and count['hidden_vaginal'] = 0:
+	if pcs_vag = 0 and stat['hidden_vaginal'] = 0:
 		*clr & cla
 		minut = minut + 15
 		gs 'stat'
@@ -661,7 +662,7 @@ if $ARGS[0] = 'referral':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-		if count['hidden_vaginal'] = 1 and pcs_vag = 0:
+		if pcs_vag = 0 and stat['hidden_vaginal'] > 0:
 			'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynaecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
 			act 'Have the check-up': gt 'gpoli', 'referral2'
 		else	
@@ -730,7 +731,7 @@ if $ARGS[0] = 'referral2':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_4.jpg"></center>'
-	if count['hidden_vaginal'] = 0:'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
+	if stat['hidden_vaginal'] = 0:'Once you''re nude, you have a seat in the gynaecologist''s chair and spread your legs in the stirrups.'
 	'For the next few minutes, the doctor gives you a thorough check-up. He spends a bit more time on your asshole than he probably should, but then again - maybe he''s just being thorough.'
 	$gpoli_sick = ''
 	if preg > 0:
@@ -746,7 +747,7 @@ if $ARGS[0] = 'referral2':
 	
 	if $gpoli_sick = '':
 		'"Well, you are completely healthy. However, you are also no longer a virgin." At these words you see the corners of his mouth twitch, and you think his trousers look a little tighter in his crotch area. "Please get dressed again while I write out the referral for your mother."'
-		if count['hidden_vaginal'] = 1 and pcs_vag = 0:
+		if pcs_vag = 0 and stat['hidden_vaginal'] > 0:
 			'Your heart begins to race when you hear that, your mother can''t find out! How could this have happened you''ve never even had sex!'
 		else
 			'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
@@ -757,7 +758,7 @@ if $ARGS[0] = 'referral2':
 		'The doctor frowns when he gives you the results: "I''m afraid I have some bad news, <<$pcs_nickname>>. You <<$gpoli_sick>>.'
 		if venera > 0: gs 'gpoli', 'std_check'
 		'You''re also not a virgin any more, obviously."'
-		if count['hidden_vaginal'] = 1 and pcs_vag = 0:
+		if pcs_vag = 0 and stat['hidden_vaginal'] > 0:
 			'Your heart begins to race when you hear that, your mother can''t find out! How could this have happened you''ve never even had sex!'
 		else
 			'Your heart begins to race when you hear that, your mother can''t find out! She would kill you if she finds out what you have been up to!'
@@ -778,6 +779,7 @@ if $ARGS[0] = 'gynoblow':
 		Gspravka = 30
 		GspravkaT = 1
 		Gspassed = 1
+		forge_referral = 1
 	end
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_7.jpg"></center>'
@@ -862,6 +864,7 @@ if $ARGS[0] = 'spravka_arrange':
 			Gspravka = 30
 			GspravkaT = 1
 			Gspassed = 1
+			forge_referral = 1
 			gs 'stat'
 			'This is your chance! You quickly grab a nearly filled out form from his desk and run out of his examination room. Dr. Petrovich pulls up his pants again but doesn''t even follow you, knowing this would be way too awkward to explain to anyone else in the clinic. Looks like you win this one!'
 			'A while later, you fill out the rest of the form and nod to yourself as you think: "This should get <<$npc_nickname[''A29'']>> off my back for another month..."'
@@ -997,6 +1000,7 @@ if $ARGS[0] = 'spravka_arrange':
 											Gspravka = 30
 											GspravkaT = 1
 											Gspassed = 1
+											forge_referral = 1
 											gs 'arousal', 'end'
 											gs 'stat'
 											if $loc = 'kuhrPar':
@@ -1042,6 +1046,7 @@ if $ARGS[0] = 'spravka_money':
 				Gspravka = 30
 				GspravkaT = 1
 				Gspassed = 1
+				forge_referral = 1
 				'Without giving it much thought, you say: "Deal!"'
 				'It''s not cheap, but this way you get another month to think of a solution before your mother finds out you are not a virgin. Dr. Petrovich takes your money and fills out a form, stating you are a virgin. He stamps it and hands it to you, and you carefully put it in your pocket while thanking him.'
 				act 'Leave':gt 'gpoli'

+ 9 - 9
locations/grigory.qsrc

@@ -469,7 +469,7 @@ if $ARGS[0] = 'flower5':
 	'For several minutes, you watch him work in the field, though he does not appear to see you.'
 	'Sighing, you glance at his truck and notice a bag sitting in the front seat, several little purple flowers falling out of it.'
 	'Your eyes widen at the sight.'
-	
+
 	if grigory_flower = 1:
 		act 'Creepy':
 			grigory_flower = 10
@@ -836,7 +836,7 @@ if $ARGS[0] = 'field_watch':
 
 		act 'Continue':gt'gadfield','field'
 	end
-end	
+end
 
 if $ARGS[0] = 'field3':
 !! Field Scene 3: Friendly
@@ -904,11 +904,11 @@ end
 if $ARGS[0] = 'drunk':
 	!!Evening Drinking 1 (You are drunk)
 
-	'Walking through the little villiage, you experience a moment of vertigo that nearly takes you off your feet.' 
+	'Walking through the little villiage, you experience a moment of vertigo that nearly takes you off your feet.'
 	'Thinking little of it, you keep stumbling down the road.'
 	'Stumbling again, you start to fall, but suddenly the world shifts and you''re flying instead.'
 	'It takes you a few seconds to realize that someone just caught you and is still holding you in their arms, having swept you off of your feet.'
-	'Disoriented, you start to struggle until you hear a familiar voice, though you''re too drunk to place it, "Easy Kiska, its just me."' 
+	'Disoriented, you start to struggle until you hear a familiar voice, though you''re too drunk to place it, "Easy Kiska, its just me."'
 	'You find the rumbling voice comforting, and you stop struggling. Instead, you try to look up at the big man carrying you, "Yyeti?"'
 	'The man chuckles lightly, "It would break your grandparents'' hearts to see you like this," He says to himself. You can feel him stop walking, only becoming aware of the gintle swaying as it comes to an end.'
 	'"Now what?" He asks.'
@@ -916,11 +916,11 @@ if $ARGS[0] = 'drunk':
 	'Another soft laugh, "Wasn''t asking you Kiska," He gives you an affectionate squeeze. You close your eyes and just enjoy the warmth of the big man cradling you so close to his body.'
 	'"Only other place I can think of is mine," A long pause, "Hope you don''t take this the wrong way," He seems to say to himself.'
 	'A second later you begin to feel the swaying of his footsteps again. Within seconds you drift to sleep.'
-		act '...':
+		act 'Continue':
 		'With a groan of discomfort, you feel yourself being sat in a cold leather chair, the chill of the night making you shiver as the big warm thing you had snuggled against is gone.'
 		'"Its ok," You hear someone say softly. The voice is familiar, Grigory? What''s he doing with me?'
 		'The train of thought is interrupted as he wraps his big warm coat around you. With a little sigh, your world fades once more.'
-			act '...':
+			act 'Continue':
 			'You''re woken again when you feel someone picking you up. You struggle ineffectively for a second before you''re able to focus on the big man holding you, "Grigory?" You slur heavily, "What uuh doin?"'
 			'"Its ok Kiska," Grigory says softly, "You''re drunk and I brought you home."'
 			'"Kaaaaay," You manage, closing your eyes and enjoying the feel of his big body pressed against your own.'
@@ -930,7 +930,7 @@ if $ARGS[0] = 'drunk':
 			'"Sweet dreams my little Kiska," He says softly.'
 			'"Youuuu sweet," You mumble, closing your eyes.'
 			'You feel something press softly against your forehead for a second. You wonder if he just kissed your forehead, but can''t quite will yourself to open your eyes.'
-				act '...':
+				act 'Continue':
 				'You wake to the smell of cooking eggs and a pounding headache.'
 				'Opening your eyes, you have a moment of disorientation until half remembered fragments of the previous night start coming back to you.'
 				'Part of you wants to remain in the warm bed forever, but you know you have to get up sometime. Pushing back the covers, you slip from the bed.'
@@ -997,7 +997,7 @@ if $ARGS[0] = 'romantic_event':
 			'"Can''t we stay a little longer?" You ask, stifling a yawn as you say it.'
 			'You more feel then hear his soft chuckle, "Whatever makes you happy Kiska," He sounds happy when he speaks.'
 			'This is nice, you think, closing your eyes for a moment.'
-			act '...':
+			act 'Continue':
 				'The sky is much brighter when you open your eyes again. The second thing you notice is that you''re in bed.'
 				'You roll part way over, the weight arcoss your hip shifting as you do so. You look down to see Grigory''s arm draped across your middle. With a little smile, you turn the rest of the way towars him, finding him in his pajamas, under the covers with you. '
 				'Grigory makes a soft sound, almost a snore, in his sleep. Your little smile blossoms into an amused grin when you see that he''s been drooling in his sleep.'
@@ -1145,7 +1145,7 @@ if $ARGS[0] = 'drunk_late':
 					'With no response, you exit the bedroom and start to look around. The first thing you notice is that all of Grigory''s clothes have been picked up, and that the end table has been moved back to where it belongs. The second is when you look out the living room window and notice that his truck is gone.'
 					'You sigh, then start back toward the bedroom to grab your shoes and tidy up before leaving. You''re almost to the front door when you notice a note stuck to the door. '
 					*nl
-					'<b>Sorry about last night. I had a bit too much to drink. Please forgive me.' 
+					'<b>Sorry about last night. I had a bit too much to drink. Please forgive me.'
 					'I was going to wake you this morning, but you looked like a sleeping angel and I couldn''t bring myself to wake you up. I hope you slept well.'
 					'Help yourself to the fridge for breakfast, maybe I''ll see you a little later.'
 					'Love you Kiska,'

+ 153 - 178
locations/gschool_boys_bathroom.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'bathroom2':
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	if school_bunk = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone2.jpg"></center>'
-		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'		
+		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke2.jpg"></center>'
 		'For the rest of the period, you play on your phone while having another cigarette or two. You find it very relaxing and by the time the next class bell rings, you are in a far better mood.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'boy2':
 	'"Who''s in here?" You hear a gruff voice ask. You don''t answer and hope he, whoever it is, will just let it go. Unfortunately, he doesn''t, "Hey, don''t fuck with me! I know you''re here." Next thing you hear, a stall door at the far end of the bathroom slams, audibly opened with a hard push. The sound repeats, again and again, and is slowly working its way towards you. Having little choice, you sit and wait until it''s your stall''s turn. The boy turns out to be Radomir, looking angry at first but his expression changes into a half-grin when he sees who it is. "Hey <<$pcs_nickname>>, what''s up?"'
 	*nl
 	'You look up at him and smile, "Hey Radomir, just cutting class. Needed a break, you know?"'
-	if hotcat >= 5:
+	if hotcat >= 6:
 		'He nods his head a bit. "Sure, sure, I gotcha. Glad to find you here, I was afraid I might get bored," he says as he moves into the stall with you, grabs your wrist tightly and pulls you up. You haven''t even processed what he''s doing when you feel his lips on yours as he drags you out of the stall with him.'
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -165,14 +165,13 @@ if $ARGS[0] = 'boy2':
 				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'nude', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				
-				gs 'willpower', 'sex', 'resist', 'hard'
+
+				gs 'willpower', 'sex', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Slap him (<<will_cost>> willpower)':
 						*clr & cla
 						npc_rel['A154'] -= 5
-						gs 'willpower', 'sex', 'resist', 'hard'
-						gs 'willpower', 'pay', 'resist'
+						gs 'willpower', 'pay', 'self'
 						gs 'arousal', 'end'
 						gs 'stat'
 						'You push him away again and this time, you gain just enough room to slap him. He stops, a bit surprised at first that you slapped him, but then he slaps you back. "What the fuck?! Don''t you dare slap me, bitch!"'
@@ -186,33 +185,21 @@ if $ARGS[0] = 'boy2':
 				else
 					act 'Slap him (<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', 'sex', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'I said ''no'' (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'sex', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						'You shove him back a step. "I said no, stop please." He backs up a step and puts his hands up. "Fine, what the fuck ever. But then why the fuck are you in the boys bathroom, if not to get fucked like a slut?"'
-						'You really don''t know why you came in here instead of the girls bathroom, but you did. "Because girls can be bitchy and I didn''t feel like dealing with it." He calms down a bit and then shrugs.'
-						'"Yeah okay, I guess. Anyways, I got more important things to do." With that he walks out.'
-						if school_bunk = 0:
-							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
-						else
-							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
-						end
+				act 'I said no':
+					*clr & cla
+					gs 'stat'
+					'You shove him back a step. "I said no, stop please." He backs up a step and puts his hands up. "Fine, what the fuck ever. But then why the fuck are you in the boys bathroom, if not to get fucked like a slut?"'
+					'You really don''t know why you came in here instead of the girls bathroom, but you did. "Because girls can be bitchy and I didn''t feel like dealing with it." He calms down a bit and then shrugs.'
+					'"Yeah okay, I guess. Anyways, I got more important things to do." With that he walks out.'
+					if school_bunk = 0:
+						act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+					else
+						act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 					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
-				
-				gs 'willpower', 'sex', 'resist'
-				if gruptipe = 4 and will_cost <= pcs_willpwr:
-					act 'Back the fuck off (<<will_cost>> Willpower)':
+				if gruptipe = 4:
+					act 'Back the fuck off':
 						*clr & cla
-						gs 'willpower', 'sex', 'resist'
-						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'You turn spinning you both around a bit and then you shove him hard against the counter, "Back the fuck off, Radomir, or I''ll be wearing your balls as earrings." He laughs a bit at that but raises his hands up, as if to surrender.'
 						'"Yeah yeah, I was just playing, girl. No need to get all bitchy. Anyways if you don''t want to play, there are other bitches dying to take a ride. Catch you later, <<$pcs_nickname>>." He pauses to check himself in the mirror and straighten up his hair before walking out like nothing happened.'
@@ -222,10 +209,7 @@ if $ARGS[0] = 'boy2':
 							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 						end
 					end
-				elseif gruptipe = 4 and will_cost > pcs_willpwr:
-					act 'Back the fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
 				act 'Submit to him':gt 'gschool_boys_bathroom', 'boy2_sub'
 			end
 		else
@@ -324,6 +308,7 @@ if $ARGS[0] = 'boy2_sub':
 				'When he''s finished cleaning up and his uniform is back in place, he heads for the door but pauses on his way out. "I look forward to next time, but maybe do some of those exercises to tighten up that pussy of yours, or maybe I will just go straight for you ass next time," he shrugs as if it doesn''t really matter to him and then exits, leaving you standing there, still struggling to wash your ass.'
 				*nl
 				'Luckily for you, no one else enters the bathroom while you clean yourself off and get dressed. You leave the bathroom just before the bell rings, hoping no one spots you. You can''t help but wonder if Radomir was serious about those exercises...'
+				noShampoo = 1
 				dynamic $showerdin
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -344,7 +329,7 @@ if $ARGS[0] = 'boy3':
 	if hotcat >= 6:
 		'Lazar sets the folder aside. "I was studying the playbook for this week''s game, but I''d be up for some fun and stress relief," he says with a lustful grin. You''re wondering what he means by ''stress relief,'' when he suddenly moves towards you. He quickly starts kissing you and grabbing at your breasts and ass.'
 		gs 'willpower', 'sex', 'resist'
-		if will_cost <= pcs_willpwr: 
+		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
@@ -358,22 +343,16 @@ if $ARGS[0] = 'boy3':
 				'You pause for a moment, realizing why he thought you wanted to have sex. "I... Look, girls can really be catty at times, like super-annoying and bitchy, and I just wasn''t in the mood for that. So, I thought, hiding in here would be more relaxing, you know?"'
 				*nl
 				'He grins and steps close again, so close that you can feel his breath on your cheeks. "I know a great way to relax, and it sure beats talking..." There''s something appealing about him, a charm that is hard to resist, and you notice that he''s leaning in for another kiss...'
-				gs 'willpower', 'sex', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'I said, ''no'' (<<will_cost>> willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'resist'
-						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-						'You put your hand up and stop him again, "Look, seriously, I just wanted to talk. But if you''d rather not..." You trail off and make telling motions towards your things in the stall and the bathroom door.'
-						*nl
-						'He sighs loudly; clearly he wanted more but he''s not pushing the issue. "Okay, alright, I get it. Sure, we can talk for a bit." He shrugs a half-assed apology, "I just thought you wanted more is all."'
-						*nl
-						'The two of you spend the next few minutes talking about pretty much anything: school, music, movies, Lazar''s previous games and the upcoming ones. Before you know it, the bell rings. You gather your things and bid Lazar farewell before heading towards your next class.'
-						act 'Go to class':gt 'gschool_lessons', 'short_break'
-					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>'
+				act 'I said, no':
+					*clr & cla
+					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+					'You put your hand up and stop him again, "Look, seriously, I just wanted to talk. But if you''d rather not..." You trail off and make telling motions towards your things in the stall and the bathroom door.'
+					*nl
+					'He sighs loudly; clearly he wanted more but he''s not pushing the issue. "Okay, alright, I get it. Sure, we can talk for a bit." He shrugs a half-assed apology, "I just thought you wanted more is all."'
+					*nl
+					'The two of you spend the next few minutes talking about pretty much anything: school, music, movies, Lazar''s previous games and the upcoming ones. Before you know it, the bell rings. You gather your things and bid Lazar farewell before heading towards your next class.'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 				act 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
 			end
@@ -435,6 +414,7 @@ if $ARGS[0] = 'boy3_kiss':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'masturbate', 5
 				gs 'arousal', 'end'
+				noShampoo = 1
 				dynamic $showerdin
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of hot sperm lands on your inner thigh, another lands on your pubic area, a third hitting your wet cunt and fingers. He shudders a bit and finally stops spurting cum as your own shivers subside. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was good," he comments and you are inclined to agree.'
@@ -508,27 +488,34 @@ if $ARGS[0] = 'boy4':
 			'He just lets you do the work, leaning back against the stall wall and closing his eyes to enjoy you sucking him off. "God damn, you Russian girls know how to suck cock." You take that as a compliment and redouble your efforts, bobbing your head up and down his length. His impressive size doesn''t make his manhood easy to handle but it certainly makes it more exciting to you. For a few minutes, he just lets you do your thing as he observes and savors your blowjob, but eventually he breaks the silence, "Hey, <<$pcs_nickname>>? How about you take off your clothes and let me give you the fuck of your life?"'
 			gs 'arousal', 'bj', 5
 			gs 'stat'
-			act 'Keep sucking':
-				*clr & cla
-				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc2.jpg"></center>'
-				'As much as you''ve enjoyed giving him a blowjob, you don''t want to have sex with him here in the bathroom so you continue to suck on his cock. Marcus takes the hint and doesn''t ask twice - it''s not like he can complain really. He does, however, place his hand on the top of your head and start thrusting his hips, fucking your mouth. Though he''s gotten a bit rough, he''s still considerate enough not to force too much of his dick into your mouth.'
-				gs 'arousal', 'bj', 5
-				gs 'stat'
-				act 'Suck him off':
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Keep sucking (<<will_cost>> Willpower)':
 					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
 					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc4.mp4"></video></center>'
-					'You take him deep, as deep as you can, and hold him there for a moment. Whatever thought he had a moment ago, you are sure it is all but wiped from memory, ejected along with the groan you hear. You come up for air but go right back down again, deepthroating him and holding him there as if your life depended on it, as if pleasuring him was the only thing that mattered - there''s his hand at the back of your head but it''s you who does this, you decide to do this, and both of you know it. He starts moaning loudly now and suddenly that hand at the back of your head comes to life; it tilts your head back as he murmurs: "Open your mouth and stick out your tongue."'
-					*nl
-					'As you do, he starts jerking off, holding the tip directly over your tongue and soon, spurts of cum fly onto your tongue and into your mouth. Jet after jet shoots out, more than you''ve ever seen a guy cum before, and you wonder if he is going to stop at all. He must have had a seriously amount saved up; not only the amount is exceptional but it seems thicker and saltier than any sperm you''re familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it. Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you, sitting there, on your knees, with his cum on your tongue. You are strangely proud of yourself, of the effect you had and still have on him, his cum the tangible and tangy proof of it. You let him take one last look at you before you pull your tongue back into your mouth and swallow, twice, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc2.jpg"></center>'
+					'As much as you''ve enjoyed giving him a blowjob, you don''t want to have sex with him here in the bathroom so you continue to suck on his cock. Marcus takes the hint and doesn''t ask twice - it''s not like he can complain really. He does, however, place his hand on the top of your head and start thrusting his hips, fucking your mouth. Though he''s gotten a bit rough, he''s still considerate enough not to force too much of his dick into your mouth.'
 					gs 'arousal', 'bj', 5
-					gs 'arousal', 'end'
-					gs 'cum_call', 'mouth', $boy
 					gs 'stat'
-					'He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls." He pulls up his pants and bends over to give you a quick kiss on the lips before he finishes getting dressed. You get up and make yourself presentable as well.'
-					act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
+					act 'Suck him off':
+						*clr & cla
+						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc4.mp4"></video></center>'
+						'You take him deep, as deep as you can, and hold him there for a moment. Whatever thought he had a moment ago, you are sure it is all but wiped from memory, ejected along with the groan you hear. You come up for air but go right back down again, deepthroating him and holding him there as if your life depended on it, as if pleasuring him was the only thing that mattered - there''s his hand at the back of your head but it''s you who does this, you decide to do this, and both of you know it. He starts moaning loudly now and suddenly that hand at the back of your head comes to life; it tilts your head back as he murmurs: "Open your mouth and stick out your tongue."'
+						*nl
+						'As you do, he starts jerking off, holding the tip directly over your tongue and soon, spurts of cum fly onto your tongue and into your mouth. Jet after jet shoots out, more than you''ve ever seen a guy cum before, and you wonder if he is going to stop at all. He must have had a seriously amount saved up; not only the amount is exceptional but it seems thicker and saltier than any sperm you''re familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it. Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you, sitting there, on your knees, with his cum on your tongue. You are strangely proud of yourself, of the effect you had and still have on him, his cum the tangible and tangy proof of it. You let him take one last look at you before you pull your tongue back into your mouth and swallow, twice, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.'
+						gs 'arousal', 'bj', 5
+						gs 'arousal', 'end'
+						gs 'cum_call', 'mouth', $boy
+						gs 'stat'
+						'He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls." He pulls up his pants and bends over to give you a quick kiss on the lips before he finishes getting dressed. You get up and make yourself presentable as well.'
+						act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
+					end
 				end
+			else
+				act 'Keep sucking (<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 fuck':
 				Marcus_sextype = 1
@@ -550,40 +537,47 @@ if $ARGS[0] = 'boy4':
 					'The incredible thing is though, that it doesn''t hurt, not at all - he seems to fit you perfectly, even though his size is well above average. All you feel is intense, mind-dissolving pleasure that shoots up your spine like lightning and grows stronger with every inch of depth he gains. You would have bet that he couldn''t fit his entire cock inside you and yet, eventually, you feel his scrotum touch your nether lips and feel so wonderfully, desperately full. That''s when you hear him whisper, "I want to fuck your ass, <<$pcs_nickname>>."'
 					gs 'arousal', 'vaginal', 5
 					gs 'stat'
-					act '"Just keep fucking my pussy"':
-						Marcus_sextype = 1
-						*clr & cla
-						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc6.jpg"></center>'
-						'You shake your head no and say. "Please just keep fucking my pussy." He fucks you in deep strokes for a bit and it is everything you could want or hope for. Once your moans start getting so loud that they could easily be heard in the hall, he picks up the pace and starts hammering into your pussy, his balls slapping against your clit with each powerful stroke. You feel your need for release grow with every thrust and everything he does only seems to make it better. He leans forward, kisses your neck just below your ear, then unexpectedly whispers to you. "I''m about to cum."'
-						gs 'arousal', 'vaginal', 5
-						gs 'stat'
-						act 'Suck him off':
+					gs 'willpower', 'anal', 'resist'
+					if will_cost <= pcs_willpwr:
+						act '"Just keep fucking my pussy" (<<will_cost>> Willpower)':
 							*clr & cla
-							'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc4.mp4"></video></center>'
-							'You pull away slightly and he takes the hint and pulls out of you. You turn around and drop down to your knees. You immediately go down on him, as if your mouth was drawn to his black cock, and you give it a couple of strokes, enjoying the taste of yourself on him. He starts moaning loudly now and suddenly that hand at the back of your head comes to life; it tilts your head back as he murmurs: "Open your mouth and stick out your tongue."'
-							*nl
-							'As you do, he starts jerking off, holding the tip directly over your tongue and soon, spurts of cum fly onto your tongue and into your mouth. Jet after jet shoots out, more than you''ve ever seen a guy cum before, and you wonder if he is going to stop at all. He must have had a seriously amount saved up; not only the amount is exceptional but it seems thicker and saltier than any sperm you''re familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it. Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you, sitting there, on your knees, with his cum on your tongue. You are strangely proud of yourself, of the effect you had and still have on him, his cum the tangible and tangy proof of it. You let him take one last look at you before you pull your tongue back into your mouth and swallow, twice, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.'
-							gs 'arousal', 'bj', 5
-							gs 'arousal', 'end'
-							gs 'cum_call', 'mouth', $boy
-							gs 'stat'
-							'He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls." He pulls up his pants and bends over to give you a quick kiss on the lips before he finishes getting dressed. You get up and make yourself presentable as well.'
-							act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
-						end
-						act 'Let him finish inside of you':
 							Marcus_sextype = 1
-							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
 							'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc7.jpg"></center>'
-							'You glance back at him and grin. He gets the idea and redoubles his efforts to fuck you, his balls slapping against your clit with each powerful stroke. You feel your need for release grow with every thrust and everything he does only seems to make it better. Finally he shudders and you feel his dick pulsing as he fills your pussy with his load. His cum makes your pussy feel like it is over flowing. As he pulls out, you can feel his cum leaking out.'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc6.jpg"></center>'
+							'You shake your head no and say. "Please just keep fucking my pussy." He fucks you in deep strokes for a bit and it is everything you could want or hope for. Once your moans start getting so loud that they could easily be heard in the hall, he picks up the pace and starts hammering into your pussy, his balls slapping against your clit with each powerful stroke. You feel your need for release grow with every thrust and everything he does only seems to make it better. He leans forward, kisses your neck just below your ear, then unexpectedly whispers to you. "I''m about to cum."'
 							gs 'arousal', 'vaginal', 5
-							gs 'arousal', 'end'
-							gs 'cum_call', 'vagina', $boy
 							gs 'stat'
-							act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
+							act 'Suck him off':
+								*clr & cla
+								'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc4.mp4"></video></center>'
+								'You pull away slightly and he takes the hint and pulls out of you. You turn around and drop down to your knees. You immediately go down on him, as if your mouth was drawn to his black cock, and you give it a couple of strokes, enjoying the taste of yourself on him. He starts moaning loudly now and suddenly that hand at the back of your head comes to life; it tilts your head back as he murmurs: "Open your mouth and stick out your tongue."'
+								*nl
+								'As you do, he starts jerking off, holding the tip directly over your tongue and soon, spurts of cum fly onto your tongue and into your mouth. Jet after jet shoots out, more than you''ve ever seen a guy cum before, and you wonder if he is going to stop at all. He must have had a seriously amount saved up; not only the amount is exceptional but it seems thicker and saltier than any sperm you''re familiar with. He completely coats your tongue in white liquid and more of it runs into your mouth, filling it. Letting out one last loud sigh, he steps back and leans against the stall wall, taking a long look at you, sitting there, on your knees, with his cum on your tongue. You are strangely proud of yourself, of the effect you had and still have on him, his cum the tangible and tangy proof of it. You let him take one last look at you before you pull your tongue back into your mouth and swallow, twice, feeling it go down your throat like glue, then open wide again to show him you gulped it all down.'
+								gs 'arousal', 'bj', 5
+								gs 'arousal', 'end'
+								gs 'cum_call', 'mouth', $boy
+								gs 'stat'
+								'He grins as he watches your little display and says, more to himself than you, "Fuck, I love Russian girls." He pulls up his pants and bends over to give you a quick kiss on the lips before he finishes getting dressed. You get up and make yourself presentable as well.'
+								act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
+							end
+							act 'Let him finish inside of you':
+								Marcus_sextype = 1
+								*clr & cla
+								'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/sex/school/marc7.jpg"></center>'
+								'You glance back at him and grin. He gets the idea and redoubles his efforts to fuck you, his balls slapping against your clit with each powerful stroke. You feel your need for release grow with every thrust and everything he does only seems to make it better. Finally he shudders and you feel his dick pulsing as he fills your pussy with his load. His cum makes your pussy feel like it is over flowing. As he pulls out, you can feel his cum leaking out.'
+								gs 'arousal', 'vaginal', 5
+								gs 'arousal', 'end'
+								gs 'cum_call', 'vagina', $boy
+								gs 'stat'
+								act 'Finish':gt 'gschool_boys_bathroom', 'boy4_end'
+							end
 						end
+					else
+						act '"Just keep fucking my pussy" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					act 'Let him fuck your ass':
 						Marcus_sextype = 2
@@ -719,6 +713,7 @@ if $ARGS[0] = 'boy5':
 						gs 'cum_call', 'mouth', $boy
 						gs 'boyStat', 'A3'
 						gs 'cum_call', 'anus', $boy
+						noShampoo = 1
 						dynamic $showerdin
 						gs 'stat'
 						'Shortly after this moment, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a couple more times before pulling out and standing up to watching Ivan, still pounding your ass. Not that he has much time to enjoy it: Maybe a minute later, Ivan groans loudly and buries his dick deep in your ass and you feel a warmth inside you as he starts cumming. He keeps going for a few more strokes but then pulls out of your ass, just as he stops shooting spurts of sperm in your ass. As his dick leaves your ass, which gapes a bit after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles, "Fuck, that was great. You''re the best, <<$pcs_nickname>>."'
@@ -970,6 +965,7 @@ if $ARGS[0] = 'boy6_sub':
 						act 'Clean up':
 							*clr & cla
 							*nl
+							noShampoo = 1
 							dynamic $showerdin
 							gs 'stat'
 							'You stand up, wobbly, your tears doing nothing to wash off the semen. You go to the sink and clean yourself up as best you can, which is a lot more than you expected but not enough to <i>feel</i> clean. When you think you''ve done everything you can do here to remove the sperm and have cried yourself out enough to pull yourself back together, you gather your clothes and get dressed. The bell rings, just as you button up your shirt and remember the ripped-off button. You hurriedly search, find and pocket it, check yourself in the mirror to make sure there''s no obvious bruises or cum stains and that it isn''t too obvious you''ve been crying. Then, with one last, deep breath, you head to class.'
@@ -983,62 +979,23 @@ if $ARGS[0] = 'boy6_sub':
 	end
 end
 
-!!This replaces random girls, with these possible couples for either company1 or company2
-!!replacement for random boy/girl
-!!Viktoriya and Vanya
-!!Ivan and Lariska
-!!Ivan and Lina
-!!Ivan and Bella
-!!Lazar and Irina
-!!Lazar and Lariska
-!!Lazar and Lina
-!!Marcus and Irina (Marcus only if Sveta is not dating him)
-!!Marcus and Bella (Marcus only if Sveta is not dating him)
-!!Paulina and Vitek(Vitek only if Sveta is not dating him)
-!!Paulina and Dan
-!!Alyona and Radomir
-!!Alyona and Lavrenti
-!!Sonia and Lazar
-!!Sonia and Dimka
-!!Sonia and Vitek (Vitek only if Sveta is not dating him)
-!!Sonia and Dan
-!!Sonia and Vasily
-!!Sonia and Svyatoslav
-!!Sonia and Erast
-!!Sonia and Feofan
-!!Sonia and Radomir
-!!Sonia and Roman
-!!Sonia and Lavrenti
-!!Sonia and Valentin
-!!Sonia and Arkadi
-!!Andrey and Stasy
-!!Andrey and Irina
-!!Andrey and Lizaveta
-!!Andrey and Sonia
-!!Lena and Lavrenti
 if $ARGS[0] = 'companyb':
-	menu_off = 1
-	if soniaPS > 0 and rand(0,1) = 0:
-		$rand_girl = 'Sonia'
-	elseif rand(0,1) = 0:
-		$rand_girl = 'a girl you don''t know'
-	else
-		gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
-	end
-	btoilet_rand = rand(1,100)
-	if btoilet_rand <= 30:
-		killvar 'btoilet_rand'
-		gt 'gschool_boys_bathroom', 'companyb1'
-	elseif btoilet_rand <= 60:
-		killvar 'btoilet_rand'
-		gt 'gschool_boys_bathroom', 'companyb2'
-	elseif btoilet_rand <= 80:
-		killvar 'btoilet_rand'
-		gt 'gschool_boys_bathroom', 'companyb3'
-	else
-		killvar 'btoilet_rand'
-		gt 'gschool_boys_bathroom', 'companyb4'
-	end
+    menu_off = 1
+    gs 'gschool_randperson', 'couple_generator'
+    btoilet_rand = rand(1,100)
+    if btoilet_rand <= 30:
+        killvar 'btoilet_rand'
+        gt 'gschool_boys_bathroom', 'companyb1'
+    elseif btoilet_rand <= 60:
+        killvar 'btoilet_rand'
+        gt 'gschool_boys_bathroom', 'companyb2'
+    elseif btoilet_rand <= 80:
+        killvar 'btoilet_rand'
+        gt 'gschool_boys_bathroom', 'companyb3'
+    else
+        killvar 'btoilet_rand'
+        gt 'gschool_boys_bathroom', 'companyb4'
+    end
 end
 
 if $ARGS[0] = 'companyb1':
@@ -1548,7 +1505,7 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-		
+
 		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
@@ -1597,7 +1554,7 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Ivanov over your shoulder, "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
-		
+
 		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
@@ -1679,13 +1636,14 @@ if $ARGS[0] = 'boy7':
 	'He pauses a moment and then asks, "What do you have in mind?"'
 	act 'Just talk':
 		*clr & cla
+		npc_rel['A4'] += 1
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom1.jpg"></center>'
 		'Within moments, the two of you are chatting away about school, movies, sports, music and anything else that strikes your fancy. Before you know it, the class bell rings. You both stop, laugh and gather your things. You then bid each other later and head to your next class.'
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
-	if igor_net > 0:
-		act 'Surprise! I brought my strapon.':
+	if igorstrap = 1 and strapon > 0 and dildonumber > 0:
+		act 'Surprise! I brought my strapon':
 			*clr & cla
 			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom2.jpg"></center>'
@@ -1694,45 +1652,62 @@ if $ARGS[0] = 'boy7':
 			'You attach the dildo to the harness and start to slide the harness up your legs, under your skirt,"Come on, you know you want to and you will love it."'
 			'He watches the strapon slide up your thighs, then glances to the door, "What if someone comes in?"'
 			'You finish pulling the straps tight on the harness, then you grab him by the shirt and pull him into the largest stall, "No one will know what''s happening in here. Now down on your knees and suck my dick."'
-			'He hesitates a moment and then drops down to his knees and starts sucking your dildo.'
-			gs 'arousal', 'foreplay', 5, 'dom'
-			gs 'stat'
-			act 'Turn around':
+			'He looks down at your dildo and you can tell he wants to but then he glances at the door, showing he is afraid of getting caught.'
+			act 'Don''t make him':
 				*clr & cla
+				npc_rel['A4'] += 1
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom3.jpg"></center>'
-				'After he sucks on your dildo for awhile and gets it nice and wet you tell him, "Stand up and turn around, then pull your pants down."'
-				'He does what you ask without hesitation. Once his pants are halfway down his thighs you grab him by the hips and pull him back towards you. Once he is close enough, you reach down and line up the dildo against his asshole. Using one hand you pull his hips back while the other guides your dildo in his ass. He moans in pleasure and pain as your dildo slides in his ass. You slowly begin to fuck his ass.'
-				gs 'arousal', 'anal_strap_give', 10, 'dom'
-				gs 'stat'
-				act 'On your knees':
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom2.jpg"></center>'
+				'You sigh, while it would be fun you don''t want to make him do something he doesn''t want to. "Ok if you really don''t want to, we don''t have to." you tell him.'
+				'He lets out a slight sigh of relief. "Thanks <<$pcs_firstname>>, I just don''t want anyone to know..."'
+				'You nod in understanding as you take your harness back off, maybe next time he will be up for it. After you put it away the two of you spend the rest of the period talking about varies topics until the bell rings and you both leave.'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
+			end
+			gs 'willpower', 'anal', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Make him take it (<<will_cost>> Willpower)':
 					*clr & cla
+					gs 'willpower', 'pay', 'force'
+					gs 'boyStat', 'd<<dildonumber>>'
+					gs 'stat'
 					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom4.jpg"></center>'
-					'Once he is down on his knees you push him forward so he is on all fours, you kneel behind him and slip the dildo back in his ass. It easily slides in and you start fucking him again, he moans in pleasure and starts to buck back against you, encouraging you to fuck him harder and deeper. Meanwhile he starts jerking himself off as you fuck his ass.'
-					gs 'arousal', 'anal_strap_give', 10, 'dom'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom3.jpg"></center>'
+					'He hesitates a moment and then drops down to his knees and starts sucking your dildo. After he sucks on your dildo for awhile and gets it nice and wet you tell him, "Stand up and turn around, then pull your pants down."'
+					if lube > 0: 'You take some lube out of your purse and squirt a bit on the dildo. You rub the lube all over the dildo getting it nice and slick, you wipe the rest of the lube off your fingers on his ass.'
+					'He does what you ask without hesitation. Once his pants are halfway down his thighs you grab him by the hips and pull him back towards you. Once he is close enough, you reach down and line up the dildo against his asshole. Using one hand you pull his hips back while the other guides your <<dick>>cm <<$dick_girth>> dildo in his ass. He moans in pleasure and pain as your dildo slides in his ass. You slowly begin to fuck his ass.'
+					gs 'arousal', 'anal_strap_give', 5, 'dom'
 					gs 'stat'
-					act 'Such a good little bitch':
+					act 'On your knees':
 						*clr & cla
 						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom5.jpg"></center>'
-						'He rises up slightly and you pull him up, until he is just kneeling upright, his moans getting louder and louder as you keep fucking his ass. You wrap one of your arms around him, while the other holds onto his hip, giving you good leverage to fuck him hard and fast. You can feel his body tensing up, you know he is about to cum.'
-						gs 'arousal', 'anal_strap_give', 10, 'dom'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom4.jpg"></center>'
+						'Once he is down on his knees you push him forward so he is on all fours, you kneel behind him and slip the dildo back in his ass. It easily slides in and you start fucking him again, he moans in pleasure and starts to buck back against you, encouraging you to fuck him harder and deeper. Meanwhile he starts jerking himself off as you fuck his ass.'
+						gs 'arousal', 'anal_strap_give', 5, 'dom'
 						gs 'stat'
-						act 'Cum for me little slut':
+						act 'Such a good little bitch':
 							*clr & cla
 							'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom6.jpg"></center>'
-							'Finally he lets out a loud moan and his body shudders, you fuck him through his orgasm. Once he sighs in relief you pull out and stand up. As you do you glance down to see his hand covered in his own cum. "Go on, lick it up," you tell him, as you start to remove the strapon harness.'
-							'He gives you a surprised look but then does as you ask, you are not sure if he likes it or not, either way it is hot to watch. The two of you spend the next couple of minutes getting cleaned and cleaning your dildo in the sink. When he finally speaks up, "I still can''t believe I let you do that. We could have been caught."'
-							'Shaking your head slightly, you know he loved it, the thrill of it as much as you did. "Oh you loved it and you know it. Next time I might even have you eat me, so I can get off." Before he can reply the first bell that lets out class rings and you both hurry out so you are not caught.'
-							gs 'arousal', 'anal_strap_give', 10, 'dom', 'humiliation'
-							gs 'arousal', 'end'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom5.jpg"></center>'
+							'He rises up slightly and you pull him up, until he is just kneeling upright, his moans getting louder and louder as you keep fucking his ass. You wrap one of your arms around him, while the other holds onto his hip, giving you good leverage to fuck him hard and fast. You can feel his body tensing up, you know he is about to cum.'
+							gs 'arousal', 'anal_strap_give', 5, 'dom'
 							gs 'stat'
-							act 'Go to class':gt 'gschool_lessons', 'short_break'
+							act 'Cum for me little slut':
+								*clr & cla
+								'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom6.jpg"></center>'
+								'Finally he lets out a loud moan and his body shudders, you fuck him through his orgasm. Once he sighs in relief you pull out and stand up. As you do you glance down to see his hand covered in his own cum. "Go on, lick it up," you tell him, as you start to remove the strapon harness.'
+								'He gives you a surprised look but then does as you ask, you are not sure if he likes it or not, either way it is hot to watch. The two of you spend the next couple of minutes getting cleaned and cleaning your dildo in the sink. When he finally speaks up, "I still can''t believe I let you do that. We could have been caught."'
+								'Shaking your head slightly, you know he loved it, the thrill of it as much as you did. "Oh you loved it and you know it. Next time I might even have you eat me, so I can get off." Before he can reply the first bell that lets out class rings and you both hurry out so you are not caught.'
+								gs 'arousal', 'anal_strap_give', 5, 'dom', 'humiliation'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Go to class':gt 'gschool_lessons', 'short_break'
+							end
 						end
 					end
 				end
+			else
+				act 'Make him take it (<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

+ 1 - 4
locations/gschool_break.qsrc

@@ -4,7 +4,6 @@ $loc = 'gschool_break'
 $locM = 'gschool_break'
 $menu_loc = 'gschool_break'
 
-
 if $ARGS[0] = 'watercooler':
 	*clr & cla
 	minut += 2
@@ -317,7 +316,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
-					if pav_slut > 75:
+					if pav_slut > 100:
 						'You are tired of it and decide to stand up to them. "No! I have as much right to be in this bathroom as you do, if you don''t like it, you can leave."'
 						'Paulina gives you a dangerous smile. "Well, looks like this bitch needs to be taught a lesson, I say we beat the shit out of her here and now."'
 						'Hearing that, you take a step back, but the other girls quickly surround you giving your nowhere to go. As you start to look for a way to escape, Lena speaks up. "No, we can''t do it now, we will have to wait for her after school. If we give her the beating she deserves, the teachers will see the blood and the marks on her face. It''s better to wait, so no one asks questions."'
@@ -798,8 +797,6 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You peek through the partially open stall door and you see Lavrenti standing to the side of the toilet, while Alyona is sitting on the toilet with her legs apart and back against the other stall wall, sucking Lavrenti''s dick. So far neither of them have noticed you yet.'
 			gs 'arousal', 'voyeur', 1, 'unknown'
 			gs 'stat'
-			
-			
 			act 'Sneak away and leave':	gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
 
 			gs 'willpower', 'misc', 'resist', 'medium'

+ 37 - 37
locations/gschool_chats1.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'dimka':
 		end		
 	elseif DimaRudeQW > 0 and DimaRudeBlock = 0:
 		'Dimka looks into your eyes with a disinterested look and after a while says, "Whatever. After school, we''re going to my place. I''ll wait for you by the entrance."'
-	elseif npc_rel['A1'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A1'] >= 50 and pav_slut < 100:
 		npc_rel['A1'] += 1
 		if grupTipe = 1:
 			'"Just the person I was hoping to see," Dimka smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would have loved it out there. Really made me realize we''re wasting away out here in a place like this." With that you mostly talk about the other places he has been.'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'dimka':
 			'Dimka greets you with a friendly smile, making room for you in the group made up of Albina, Igor and a few other students you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not apart of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." He playfully chides everyone and soon you are engaged in a conversation with Dimka.'
 		end
 		if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
-	elseif npc_rel['A1'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A1'] <= 20 and pav_slut < 100:
 		npc_rel['A1'] += 1
 		if grupTipe = 1:
 			'"You seem to have the wrong idea about me, <<$pcs_nickname>>." Dimka holds out his hand to keep you from getting any closer. "Just because we run in the same social circle doesn''t mean we''re friends."'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'igor':
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		
-		if Igorsex > 0:
+		if igorstrap = 1:
 			act 'Tease him':
 				*clr & cla
 				npc_rel['A4'] += 1
@@ -211,7 +211,7 @@ if $ARGS[0] = 'igor':
 				end
 			end
 		end
-	elseif npc_rel['A4'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A4'] >= 50 and pav_slut < 100:
 		npc_rel['A4'] += 1
 		if grupTipe = 1:
 			'You know he doesn''t have many friends, so he''s more than happy that you want to hang out with him. Unlike most boys, Igor is really attentive and listens to everything you say, even taking an interest in the more "girly" topics.'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'igor':
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
 		end
-	elseif npc_rel['A4'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A4'] <= 20 and pav_slut < 100:
 		npc_rel['A4'] += 1
 		if grupTipe = 1:
 			'The conversation feels forced as Igor does little to keep talking to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
@@ -251,7 +251,7 @@ if $ARGS[0] = 'igor':
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'Igor is hanging with Dimka, Stasya and Albina when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
 		act 'Help with homework':
 			*clr & cla
@@ -473,14 +473,14 @@ if $ARGS[0] = 'albina':
 		npc_rel['A23'] = 0
 		AlbEnemy = 1
 		'Albina angrily glares at you as she talks: "Cut the crap, bitch... I know what you did. You''ll regret this!"'
-	elseif npc_rel['A23'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A23'] >= 50 and pav_slut < 100:
 		npc_rel['A23'] += 1
 		if grupTipe = 1:
 			'For once, Albina isn''t just focusing on herself while you''re hanging out. She takes a genuine interest in what you have to say, even stopping to ask your thoughts on the things you talk about.'
 		else
 			'Albina spends a lot of the conversation talking about herself but does like to hear your thoughts on what she says. "I could never be in a relationship like that, having my boyfriend ignore me. I can''t tell if Stasya is being patient or really, really, <i>really</i> stupid for going along with Anfrey''s bullshit." She huffs with crossed arms.'
 		end
-	elseif npc_rel['A23'] <= 20 and pav_slut < 125:	
+	elseif npc_rel['A23'] <= 20 and pav_slut < 100:	
 		npc_rel['A23'] += 1
 		if grupTipe = 1:
 			'"Hey Albina, how are things going?" You ask her with a smile.'
@@ -489,7 +489,7 @@ if $ARGS[0] = 'albina':
 			'"Is this some kind of joke?" Albina laughs. She shoves you away and into one of the lockers. "Did Mefodiy put you up to this?"'
 			'"No... I just wanted to talk..." You reply but she seems reluctant to believe you. You take your chance and butter her up by complimenting her whenver you can as you keep the conversation focused on her, a topic she always enjoys talking about. She seems to relax a bit as time goes on.' 
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"Look who it is, the gopnik''s favorite cum dumpster," Albina smirks. "There''s some <i>nasty</i>? rumors about you going around school. If everyone is saying you''re a cock hungry whore, I''m inclined to believe them. They all can''t be wrong, right?" she chuckles.'
 	else 
 		npc_rel['A23'] += 1
@@ -498,7 +498,7 @@ if $ARGS[0] = 'albina':
 		'Was this all just an excuse to campaign a bit for her dad?'
 	end
 	
-	if artemIzdev = 1 and pav_slut < 125:
+	if artemIzdev = 1 and pav_slut < 100:
 		act 'Ask about a tiny camera':
 			minut += 5
 			artemIzdev = 2
@@ -514,7 +514,7 @@ if $ARGS[0] = 'lizaveta':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
-	if npc_rel['A140'] >= 50 and pav_slut < 125:
+	if npc_rel['A140'] >= 50 and pav_slut < 100:
 		npc_rel['A140'] += 1
 		if grupTipe = 1:
 			'The perks of being a close friend of Liza goes beyond just running in the same social circle as she tells you some gossip that no one else should know about.'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'lizaveta':
 			'With a dramatic sigh, Liza caves a little bit and shares some harmless, yet juicy gossip you hadn''t heard about until now.'
 		end
 		act 'Latest gossip': gt 'gschool_chats1', 'latest_gossip'
-	elseif npc_rel['A140'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A140'] <= 20 and pav_slut < 100:
 		npc_rel['A140'] += 1
 		if grupTipe = 1:
 			'"You know, you really shouldn''t shit where you sleep," Lizaveta says while shaking her head disapprovingly.'
@@ -534,7 +534,7 @@ if $ARGS[0] = 'lizaveta':
 		else
 			'The conversation is stale and lifeless as Lizaveta taps away at her phone while you talk, only managing a "Yeah..." or "Uh-huh..." occasionally.'
 		end		
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"The current rumor is that you''ve ridden well over 100 dicks!" Lizaveta exclaims with a cruel laugh. "There''s even a bet that you''ll have sucked or fucked a 1,000 dicks by the end of the year. Wanna know if I''m betting against or for you?" she taunts before dismissing it as a joke, but you''re not sure if she''s telling the truth...'
 	else 
 		npc_rel['A140'] += 1
@@ -696,7 +696,7 @@ if $ARGS[0] = 'stasya':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big139.jpg"></center>'
-	if npc_rel['A139'] >= 50 and pav_slut < 125:
+	if npc_rel['A139'] >= 50 and pav_slut < 100:
 		npc_rel['A139'] += 1
 		if grupTipe = 1:
 			'When Stasya sees you, she pulls you into a quick hug. "Glad you showed up, I was starting to get bored and desperate," she tells you with a dramatic sigh.'
@@ -707,14 +707,14 @@ if $ARGS[0] = 'stasya':
 			'You take a moment to admire the new makeup she''s wearing. "I think you look gorgeous. Why?"'
 			'Stasya smiles smugly as she glances back in the mirror. "It''s time Andrey paid attention to what really matters in life... and that''s me."'
 		end
-	elseif npc_rel['A139'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A139'] <= 20 and pav_slut < 100:
 		npc_rel['A139'] += 1
 		if grupTipe = 1:
 			'"Don''t think that just because we''re in the same clique, we''re going to be best buddies," Stasya tells you. Despite that, she doesn''t run you off as you hang around to talk.'
 		else
 			'"Don''t even fucking think about it," Stasya warns when you try to approach. She glares you down until you finally back away.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"You better stay the fuck away from Andrey, or you''ll end up with some extra holes you can stuff full with more cocks."'
 		'You''re slammed into the lockers as she shoves past you.'
 	else 
@@ -729,7 +729,7 @@ if $ARGS[0] = 'irina':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big17.jpg"></center>'
-	if npc_rel['A17'] >= 50 and pav_slut < 125:
+	if npc_rel['A17'] >= 50 and pav_slut < 100:
 		npc_rel['A17'] += 1
 		if grupTipe = 1:
 			'"Liza told me that some girl overheard this group of girls talking at lunch that they heard Stasya talking shit about me!" Irina exclaims and the both of you let out a little gasp, even though it really isn''t much of a surprise.'
@@ -740,7 +740,7 @@ if $ARGS[0] = 'irina':
 			'"I''m sure Artem or Petka would be more than happy to help you out," You gently remind her.'
 			'A sly smile spreads across Irina''s face. "You''re totally right, <<$pcs_nickname>>! You know me so well."'
 		end
-	elseif npc_rel['A17'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A17'] <= 20 and pav_slut < 100:
 		npc_rel['A17'] += 1
 		if grupTipe = 1:
 			'Irina listens to you talk with a tired and bored expression. "Oh god, I think I''d rather talk to Lesco..." she yawns before brushing you off. "I''ve heard enough. Go bother Stasya."'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'irina':
 			'You try to make small talk with Irina and to your surprise she doesn''t instantly turn you away. Seeing as though she hasn''t said anything yet, you keep talking to her, even if she hasn''t said much... of anything yet. Falling quiet, you hear the faint sound of music and realize she''s being wearing earpods this whole time.'
 			'With comical timing, Irina pulls them out when she finally notices you standing next to her. "What do you want?" she sneers.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"I would rather have Petia staring at my tits until he creams himself than to talk to you, skank," Irina hisses with disgust.'
 	else 
 		npc_rel['A17'] += 1
@@ -763,7 +763,7 @@ if $ARGS[0] = 'sonia':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big25.jpg"></center>'
 	if soniaPS = 0:
-		if npc_rel['A25'] >= 50 and pav_slut < 125:
+		if npc_rel['A25'] >= 50 and pav_slut < 100:
 			npc_rel['A25'] += 1
 			'"What are you up to?" You ask Sonia as you watch her organizing a stack of various teen magazines inside her locker.'
 			'"I think it''s time I got rid of some of these..." Sonia sighs as she stares longinly at the stack. "But I can''t bear throwing any of them away!"'
@@ -773,7 +773,7 @@ if $ARGS[0] = 'sonia':
 			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
 			'"Ready to get drunk and party at the community center, hm?" You give her a playful nudge.'
 			'Sonia giggles and bounces around excitedly. "Damn right, and you better be ready, too!"'
-		elseif npc_rel['A25'] <= 20 and pav_slut < 125:
+		elseif npc_rel['A25'] <= 20 and pav_slut < 100:
 			npc_rel['A25'] += 1
 			if grupTipe = 1:
 				'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading which is a bit disappointing, but at least she stuck around.'
@@ -782,7 +782,7 @@ if $ARGS[0] = 'sonia':
 				'"Garment factory?" She asks with a hurt and slightly annoyed look. "What makes you think I shop at that place...?"'
 				'It takes some time, but eventually you manage to save the conversation, or at least you think so since she doesn''t run you off, although she''s more withdrawn after that point.'
 			end
-		elseif pav_slut >= 125:
+		elseif pav_slut >= 100:
 			npc_rel['A25'] += 1
 			'Unlike most people, Sonia isn''t calling you a slut or whore. Instead she asks you about some of the best sex you''ve had lately and some of your favorite positions. The conversation continues like this and you end up enjoying hanging out with her as you talk about all kinds of naughty things.'
 		else 
@@ -869,7 +869,7 @@ if $ARGS[0] = 'svyatoslav':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
-	if npc_rel['A8'] >= 50 and pav_slut < 125:
+	if npc_rel['A8'] >= 50 and pav_slut < 100:
 		npc_rel['A8'] += 1
 		if grupTipe = 2:
 			'"Dammit I almost had him this time..." Svyatoslav lowers his disappointed gaze.'
@@ -880,7 +880,7 @@ if $ARGS[0] = 'svyatoslav':
 			'"I might be interested seeing the epic battle, yes!" you excitingly answer.'
 			'"Good, good! I hope you''ll be cheering for me!" he winks.'
 		end
-	elseif npc_rel['A8'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A8'] <= 20 and pav_slut < 100:
 		npc_rel['A8'] += 1
 		if grupTipe = 2:
 			'"It''s your fault I lost the last race against Ivan!" Svyatoslav starts accusing you.'
@@ -891,7 +891,7 @@ if $ARGS[0] = 'svyatoslav':
 			'"What?! What are you talking about Svyatoslav?" you ask, confused about what the hell he''s talking about.'
 			'"Yeah, yeah, don''t lie to me, <<$pcs_nickname>>! It''s all your fault that I keep losing against Ivan..." he continues on.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"So when am I going to get the complementary blowjob?" Svyatoslav asks.'
 		'"Never..." you sourly reply.'
 		'"Come on, don''t play hard to get, I know you loving sucking cock, you little slut." he starts approaching you.'
@@ -909,7 +909,7 @@ if $ARGS[0] = 'vanya':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
-	if npc_rel['A165'] >= 50 and pav_slut < 125:
+	if npc_rel['A165'] >= 50 and pav_slut < 100:
 		npc_rel['A165'] += 1
 		if grupTipe = 2:
 			'"Say, <<$pcs_nickname>> did you hear about the prank I pulled on the football coach?" Vanya is having a hard time keeping himself from laughter.'
@@ -921,7 +921,7 @@ if $ARGS[0] = 'vanya':
 			'Vanya cracks up seeing you panic, "Just kidding! Just wanted to see your reaction."'
 			'"Always the same thing Vanya, don''t you get tired of playing games all the time?" you reprimand him.'
 		end
-	elseif npc_rel['A165'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A165'] <= 20 and pav_slut < 100:
 		npc_rel['A165'] += 1
 		if grupTipe = 2:
 			'"What the hell, Vanya!" you angrily stomp towards him...'
@@ -940,7 +940,7 @@ if $ARGS[0] = 'vanya':
 		'Vanya''s attention turns totally towards you, "Hell yeah! I love secrets! Especially ones I can use on others as a joke."'
 		'"Well this one is special..." you snicker, "I saw Vicky and you having sex in the park..."'
 		'Vanya stops and thinks for a moment and then starts grinning, "That''s the big secret, well that''s nothing new. Vicky and I love to have sex outdoors." he winks.'
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"Are you up for a threesome with Vicky and me?" Vanya asks.'
 		'"What?" you ask surprised.'
 		'Vanya breaks out in a mischievous smile, "Yeah, you know, we''ve heard that you''ve become such a big slut so we wanted to try a threesome."'
@@ -1017,7 +1017,7 @@ if $ARGS[0] = 'christina':
 	elseif kristinaSex = 0 and swinbeggor > 0:
 		if npc_rel['A18'] > 20: npc_rel['A18'] -= 10
 		'Christina looks at you full of hate: "I can''t believe you were faster than me... bitch!"'
-	elseif npc_rel['A18'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A18'] >= 50 and pav_slut < 100:
 		npc_rel['A18'] += 1
 		if grupTipe = 2:
 			'"Hi, <<$pcs_nickname>>! Do you want to work out together, since you know, you''re the only one that is on the same level as me?" she confidently asks.'
@@ -1030,7 +1030,7 @@ if $ARGS[0] = 'christina':
 			'"You should join one of the sports teams. I''m sure you''d do great there." she tries to entice you.'
 			'"That''s definitely something I will consider. Thanks for the suggestion." you reply.'
 		end
-	elseif npc_rel['A18'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A18'] <= 20 and pav_slut < 100:
 		npc_rel['A18'] += 1
 		if grupTipe = 2:
 			'"Look at the biggest joke among us. You shouldn''t even be allowed to call yourself a jock. What a joke..." Christina shakes her head.'
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'christina':
 			'"Well, excuse me your highness," you sarcastically take a bow in front of her. You hear some snickering behind you.'
 			'Christina turns a bit red as she pushes you away and storms off with Lina trying to keep up behind her.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina says mockingly.'
 		'"Shut up Christina I''m tired of your bullshit." you tiredly reply.'
 		'"Poor little thing, must''ve been what at least a few minutes since you last spread your legs for someone," she begins to laugh as she walks away.'
@@ -1061,7 +1061,7 @@ if $ARGS[0] = 'bella':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
-	if npc_rel['A22'] >= 50 and pav_slut < 125:
+	if npc_rel['A22'] >= 50 and pav_slut < 100:
 		npc_rel['A22'] += 1
 		if grupTipe = 2:
 			'"Now that you''ve proven yourself that you''re amazing at sports, you should come and hang with my friends." Bella says smiling.'
@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'bella':
 			'"You really mean that?" your eyes widen, "I can''t believe you asked me..."'
 			'Bella nods, "Of course, I don''t joke around. I''ll be seeing you around and we can plan something, no?"'
 		end
-	elseif npc_rel['A22'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A22'] <= 20 and pav_slut < 100:
 		npc_rel['A22'] += 1
 		if grupTipe = 2:
 			'"What do you want now <<$pcs_nickname>>? What can you possible want from me?" Bella rolls her eyes.'
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'bella':
 			'"I just wanted to ask you about this store in the city. I heard..."'
 			'Before you''re able to continue she cuts you off, looks at pedicure and with a sigh replies, "Listen, the city is not for children like you. You''re better off buying clothes like the rest of your classmates at the GM store here in Pavlovsk..."'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'"I heard some rumors that you''re interested in older guys? Is it true?" Bella asks.'
 		'You stand in silence as she continues on.'
 		'"Well I''ve told about you to some of my older male friends and they would love to meet you," she winks.'
@@ -1101,7 +1101,7 @@ if $ARGS[0] = 'veronika':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
-	if npc_rel['A141'] >= 50 and pav_slut < 125:
+	if npc_rel['A141'] >= 50 and pav_slut < 75:
 		npc_rel['A141'] += 1
 		if grupTipe = 2:
 			'"So... <<$pcs_nickname>>... I was thinking..." Veronika speaks up.'
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'veronika':
 			'"Yeah, just wanted to tell you that I''ll be cheering you on as you compete." you say.'
 			'"Thank you." Veronika politely replies.'
 		end
-	elseif npc_rel['A141'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A141'] <= 20 and pav_slut < 75:
 		npc_rel['A141'] += 1
 		if grupTipe = 2:
 			'Veronika is looking confoundedly at you.'
@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'veronika':
 			'"Did you say something?" you ask.'
 			'She keeps on looking at you and just shrugs her shoulders before continuing on.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 75:
 		'"What are you up to Veronika?" you ask.'
 		'Veronika stops and starts looking intensely at you.'
 		'"Fine be that way then," you sourly reply.'

+ 36 - 35
locations/gschool_chats2.qsrc

@@ -1,17 +1,18 @@
 # gschool_chats2
 
+
 if $ARGS[0] = 'artem':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 
-	if artQW = 5:
+	if artQW = 5 and arthakQW ! 11:
 		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I can''t wait for our next lesson after school…" He says, his hand running down your thigh and stopping at the hem of your skirt. "I bet you can''t wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
 	elseif artQW = 3 or artQW = 20:
 		npc_rel['A2'] += 1
 		'Artem notices you walking over and quickly grabs an empty chair and makes room for you to sit next to him. "I was worried we wouldn''t see each other today." He jokes, but you can tell there''s a part of him that was being sincere. Artem isn''t one for public affection, but he still can''t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
-	elseif npc_rel['A2'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A2'] >= 50 and pav_slut < 100:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
 			'"There you are, <<$pcs_nickname>>. How''s it going?" Artem greets you as you sit down. "I figure we can get a head-start on Yenotin''s lesson while we talk," he says, moving the textbook towards you so the both of you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
@@ -27,14 +28,14 @@ if $ARGS[0] = 'artem':
 			*nl
 			'Artem chuckles sheepishly, obviously a bit flustered by the question. "The jocks aren''t too bad and the popular kids… well, they need all the help they can get, and… and I''m happy to help if I can," he says before quickly changing the subject. You decide not to insist and keep him company while he works.'
 		end
-	elseif npc_rel['A2'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A2'] <= 20 and pav_slut < 100
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
 			'You try to chat up Artem, but he doesn''t seem all that interested in the conversation. His answers are short and he doesn''t even bother to stop writing in his notebook as you talk.'
 		else
 			'"Sorry, <<$Pcs_nickname>>, but why are you talking to me? We''re not exactly friends, y''know…." Artem asks weakly. He''s careful not to offend you, but it''s clear he''s hesitant to talk to you.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
 	else
 		npc_rel['A2'] += 1
@@ -48,7 +49,7 @@ if $ARGS[0] = 'artem':
 			*clr & cla
 			artemLernQW = 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			if pav_slut >= 125:
+			if pav_slut >= 100:
 				'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem looks around. "I have been hearing some pretty bad rumors about you. But if you don''t tell anyone, you can come by my place after school and we can do our homework together."'
 			else
 				'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? I thought you was doing great in school, but sure if you need my help I would be happy to. Come meet me at my place if you want to do homework together."'
@@ -63,24 +64,24 @@ if $ARGS[0] = 'petka':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big6.jpg"></center>'
-	if artQW = 5:
+	if artQW = 5 and arthakQW ! 11:
 		npc_rel['A6'] += 1
 		'A devious smile spreads across his face as he closes his book and sets it aside. You try your best to keep the conversation lighthearted, but Petka is determined to let you know how much he''s enjoying his after school "lessons" and how he can''t wait for the next one.'
-	elseif npc_rel['A6'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A6'] >= 50 and pav_slut < 100
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
 			'"You really have to read this book, <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you."'
 		else
 			'"Oh, hey, <<$Pcs_nickname>>. Did you say something? I don''t think I heard you." He smiles sheepishly as he puts his book down. "This book is crazy interesting." He tells you, and before you know it he''s going on and on about all the interesting characters, plot holes and themes in the book.'
 		end
-	elseif npc_rel['A6'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A6'] <= 20 and pav_slut < 100
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
 			'"Can we talk later? I really want to finish this chapter before class starts." Petka says, only briefly looking up from his book to address you before burying his nose right back into it.'
 		else
 			'You try talking to Petka, bit it''s a very one-sided with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
 	else
 		npc_rel['A6'] += 1
@@ -94,21 +95,21 @@ if $ARGS[0] = 'julia':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
-	if npc_rel['A12'] >= 50 and pav_slut < 125:
+	if npc_rel['A12'] >= 50 and pav_slut < 100:
 		npc_rel['A12'] += 1
 		if grupTipe = 3:
 			'Usually Julia is quiet and lets others do most of the talking, but with you, she participates more in the conversation.'
 		else
 			'Julia is sitting alone, diligently working on her homework, when you sit down and start talking with her. She''s a quiet, soft spoken girl, so you end up doing most of the talking, but you can tell she''s enjoying herself.'
 		end
-	elseif npc_rel['A12'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A12'] <= 20 and pav_slut < 100:
 		npc_rel['A12'] += 1
 		if grupTipe = 3:
 			'You try to talk to Julia, but the conversation becomes completely one-sided, with you doing all the talking while Julia busies herself with schoolwork.'
 		else
 			'You try talking to Julia, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
 	else
 		npc_rel['A12'] += 1
@@ -122,7 +123,7 @@ if $ARGS[0] = 'julia':
 		JuliaMilLernQW = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
-		if pav_slut >= 125:
+		if pav_slut >= 100:
 			'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 		else
 			'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
@@ -137,21 +138,21 @@ if $ARGS[0] = 'natasha':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
 
-	if npc_rel['A16'] >= 50 and pav_slut < 125:
+	if npc_rel['A16'] >= 50 and pav_slut < 100:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
 			'"Hey, have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this, and it ends up bringing her down, but you quickly change the subject and start complimenting her on her sense of style and grades, reminding her she''s a top student in school which brings a smile to her face.'
 		else
 			'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day so far and what goes on in the apartment complex where you both live.'
 		end
-	elseif npc_rel['A16'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A16'] <= 20 and pav_slut < 100:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
 			'Natasha isn''t really interested in talking to you, but you persit trying to keep up a conversation. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" She says halfheartedly.'
 		else
 			'"Why are you even talking to me? It''s not like we''re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just…" She drags the last part out, expecting you to catch her drift and leave.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
 	else
 		npc_rel['A16'] += 1
@@ -160,7 +161,7 @@ if $ARGS[0] = 'natasha':
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
-	if NatashaQW = 0 and npc_rel['A16'] >= 60 and pav_slut < 125:
+	if NatashaQW = 0 and npc_rel['A16'] >= 60 and pav_slut < 100:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 			minut += 5
@@ -188,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
@@ -208,22 +209,22 @@ if $ARGS[0] = 'evgeny':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big35.jpg"></center>'
-	if npc_rel['A151'] >= 50 and pav_slut < 125:
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big151.jpg"></center>'
+	if npc_rel['A151'] >= 50 and pav_slut < 100:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
 			'"In chess, you should be as cool as a cucumber." Evgeny says without you asking his opinion on the matter. You can''t help but laugh a bit, but go along with it nonetheless as you watch him play chess against himself.'
 		else
 			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn''t even bother to look up from his chessboard, but you don''t take it as an insult. He''s always been socially awkward, some going as far as to say he''s autistic, so you don''t take offense, and instead sit down across from him and make small talk while he plays against himself.'
 		end
-	elseif npc_rel['A151'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A151'] <= 20 and pav_slut < 100:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
 			'You try talking to Evgeny, but it''s a very one-sided with you doing all of the talking until he finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		else
 			'"I really don''t want to talk right now." Evgeny says abruptly. You''re a bit shocked at how straightforward he is, but he refuses to look up from his chessboard, leaving you with no other option but to walk away.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
 	else
 		npc_rel['A151'] += 1
@@ -236,7 +237,7 @@ if $ARGS[0] = 'feofan':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big36.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
 	if npc_rel['A152'] >= 50 and pav_slut < 125:
 		npc_rel['A152'] += 1
 		if grupTipe = 3:
@@ -264,22 +265,22 @@ if $ARGS[0] = 'gerasim':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big37.jpg"></center>'
-	if npc_rel['A153'] >= 50 and pav_slut < 125:
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big153.jpg"></center>'
+	if npc_rel['A153'] >= 50 and pav_slut < 100:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
 			'You greet Gerasim with a smile, and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "I''m fine." He says, his smile growing. "Thanks for worrying about me, <<$pcs_nickname>>."'
 		else
 			'"Oh, hello, <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously, and you realize he''s doing someone else''s homework. "Yeah, I''m a little busy, but I wouldn''t mind the company while I work." He adds with a small laugh.'
 		end
-	elseif npc_rel['A153'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A153'] <= 20 and pav_slut < 100:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
 			'Gerasim isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" He says halfheartedly with an awkward laugh.'
 		else
 			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
 	else
 		npc_rel['A153'] += 1
@@ -292,22 +293,22 @@ if $ARGS[0] = 'zinaida':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big38.jpg"></center>'
-	if npc_rel['A142'] >= 50 and pav_slut < 125:
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big142.jpg"></center>'
+	if npc_rel['A142'] >= 50 and pav_slut < 100:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
 			'"Hey, look at this, I got into the top ten with my last score." With a small smile, Zinaida shows you the screen of her phone, and sure enough she''s number five on the leader board. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it.'
 		else
 			'"Hey, <<$pcs_nickname>>." Zinaida says with a small smile. "Come to watch me beat some noobs?" She says as she lowers her phone so you can watch her as she plays.'
 		end
-	elseif npc_rel['A142'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A142'] <= 20 and pav_slut < 100:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
 			'She is playing some game on her phone. "I''d like to talk… but I''m busy trying to beat this level. It''s… hard." Zinaida says quietly, looking up at you through her messy hair that hang down onto her face.'
 		else
 			'You try talking to Zinaida, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
 	else
 		npc_rel['A142'] += 1
@@ -320,7 +321,7 @@ if $ARGS[0] = 'petia':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big47.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 
 	if hotcat >= 6:
 		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care, and a raunchy smell hits your nostrils. "Hey, <<$pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
@@ -429,7 +430,7 @@ if $ARGS[0] = 'lesco':
 		'You see Lesco talking to Lera and unsurprisingly things look tense. Knowing how volatile the gopnik can be, you approach them carefully. They greet you back and Lesco is the first to speak up, "Lera and I were talking about her needing to take care some of her chores at home, but she doesn''t want to listen..."'
 		'An annoyed Lera is quick to snap back. "Why are you telling your little girlfriend my business? Trying to show off? Try that shit again and I''ll tell her all your dirty little secrets."'
 		'Hearing this you start to wonder what kind of secrets someone like Lesco is hiding but decide to keep quiet as you don''t really want to get involved. They continue on bickering for a while before you decide that it''s time to leave them alone.'
-	elseif npc_rel['A7'] >= 50 and pav_slut < 125:
+	elseif npc_rel['A7'] >= 50 and pav_slut < 100:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
 			'You see Lesco sitting by himself just like usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?"'
@@ -440,7 +441,7 @@ if $ARGS[0] = 'lesco':
 			*nl
 			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
-	elseif npc_rel['A7'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A7'] <= 20 and pav_slut < 100:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
 			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he relaxes slightly and shyly looks up towards you, "What do you want?"'
@@ -451,7 +452,7 @@ if $ARGS[0] = 'lesco':
 			*nl
 			'You shrug your shoulders saying you just wanted to hang out for a bit. He seems unsure a bit but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
-	elseif pav_slut >= 125:
+	elseif pav_slut >= 100:
 		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut, I have enough problems with out being seen with the likes of you." With that he moves away from you.'
 	else
 		npc_rel['A7'] += 1

+ 12 - 11
locations/gschool_chats3.qsrc

@@ -1,5 +1,6 @@
 # gschool_chats3
 
+
 if $ARGS[0] = 'vitek':
 	*clr & cla
 	menu_off = 1
@@ -77,7 +78,7 @@ if $ARGS[0] = 'radomir':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big39.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A154'] += 1
 		'As you walk up, Radomir says, "Well well well, if it isn''t my favorite groupie slut."'
@@ -109,7 +110,7 @@ if $ARGS[0] = 'roman':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big42.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big157.jpg"></center>'
 	if npc_rel['A157'] >= 50 and gopnik_slut = 1:
 		npc_rel['A157'] += 1
 		'As you walk up, Roman says, "Well well well, if it isn''t our little fuck bunny, you looking for a cock to hop on?"'
@@ -196,17 +197,17 @@ if $ARGS[0] = 'valentin':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big43.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big158.jpg"></center>'
 	
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if grupTipe = 4 and gopnik_slut = 1:
-		npc_rel['A58'] += 1
+		npc_rel['A158'] += 1
 		'He smiles as you walk up. "What''s up <<$pcs_nickname>>?"'
 		'You smile back. "Nothing much, just wanted to hang out and talk."'
 		'The two of you talk about a few things, though he gets a little hands on with you at times, but you are used to it. As you start to leave, he adds, "Stop by the garage some time, I can always use a break and a quick fuck."'
 	elseif npc_rel['A158'] >= 50 and pav_slut < 150:
-		npc_rel['A58'] += 1
+		npc_rel['A158'] += 1
 		if grupTipe = 4:
 			'As you walk up, Valentin calls out, "Hey, <<$pcs_nickname>>, good seeing you again."'
 			'You smile as you reply, "You know, I''ve been busy lately so I haven''t really been around here."'
@@ -225,7 +226,7 @@ if $ARGS[0] = 'valentin':
 			'Your cheeks turn red as you hear him comment and soon the two of you are chatting and flirting back and forth.'
 		end
 	elseif npc_rel['A158'] <= 20 and pav_slut < 150:
-		npc_rel['A58'] += 1
+		npc_rel['A158'] += 1
 		if grupTipe = 4:
 			'"Hey, Valentin!" you greet him as you walk up.'
 			'He sighs. "What do you want?"'
@@ -240,7 +241,7 @@ if $ARGS[0] = 'valentin':
 	elseif pav_slut >= 150:
 		'You try and talk to him, but he just completely ignores you, like you aren''t even there. Eventually you give up and walk off.'
 	else 
-		npc_rel['A58'] += 1
+		npc_rel['A158'] += 1
 		'"Hey, Valentin!" you greet him as you walk up.'
 		'He gives you a slight no in greeting.'
 		'"What have you been up to?" you ask him.'
@@ -296,7 +297,7 @@ if $ARGS[0] = 'arkadi':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big41.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big156.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A156'] += 1
 		'As you walk up, he cups his crotch and bounces it a bit. "Yeah you want this, don''t you. Well I don''t got time to give it to you right now."'
@@ -339,7 +340,7 @@ if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big40.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A155'] += 1
 		'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
@@ -403,7 +404,7 @@ if $ARGS[0] = 'ekaterina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big46.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big145.jpg"></center>'
 	
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A145'] += 1
@@ -493,7 +494,7 @@ if $ARGS[0] = 'alyona':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big44.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big143.jpg"></center>'
 	
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A143'] += 1

+ 5 - 25
locations/gschool_detention.qsrc

@@ -408,28 +408,8 @@ end
 
 if $ARGS[0] = 'Help Friends in need':
 	*clr & cla
-	gs 'gschool_events', 'rand_teacher_arg'
-	if $rand_teacher = 'Ivanov': $rand_teacher = 'Tsarev'
-	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
-	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
+	gs 'gschool_randperson', 'couple_generator'
 	gs 'stat'
-!!replacement for random boy/girl
-!!Viktoriya and Vanya
-!!Ivan and Lariska
-!!Ivan and Lina
-!!Ivan and Bella
-!!Lazar and Irina
-!!Lazar and Lariska
-!!Lazar and Lina
-!!Marcus and Irina (Marcus only if Sveta is not dating him)
-!!Marcus and Bella (Marcus only if Sveta is not dating him)
-!!Paulina and Vitek(Vitek only if Sveta is not dating him)
-!!Paulina and Dan
-!!Anuska and Radomir
-!!Anuska and Valentin
-!!Anuska and Arkadi
-!!Alyona and Radomir
-!!Alyona and Lavrenti
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
 	'You share a table with <<$rand_girl>> and <<$rand_boy>>. Before long, he is flirting for all he is worth with her and going by her giggles at several things he says, he''s striking the right tone. The teacher shushes them a few times but doesn''t really make much of an effort to silence them. <<$rand_boy>> leans in and whisper something to her that earns him a half hearted smack on the shoulder and you overhear her calling him "bad" - her smile and the way she plays with her hair suggests that she likes "bad".'
@@ -633,7 +613,7 @@ if $ARGS[0] = 'company':
 	minut += 120
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big27.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 	if Marcus_sextype = 0:
 		'Shortly after the teacher stops paying attention to everyone, Marcus walks over and sits down next to you. "Hey <<$pcs_nickname>>, what''s up?"'
 		'You give him a friendly smile. "Doing time for my crime. At least I won''t have to do it alone now."'
@@ -651,7 +631,7 @@ if $ARGS[0] = 'company':
 	end
 	act 'After detention':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big27.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 		'As you leave the school building, Marcus jogs to catch up to you. "Hey, wait up!" You stop and turn around. He looks down at you for a moment while you both stand there before saying: "I like you, <<$pcs_nickname>> and if it is ok I would like to walk you home?"'
 		act '"No"':
 			*clr & cla
@@ -691,7 +671,7 @@ end
 if $ARGS[0] = 'company2':
 	*clr & cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big27.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 	'Shortly after the teacher stops paying attention to everyone, Marcus walks over and sits down next to you. "Hey <<$pcs_nickname>>, what''s up?"'
 	'You give him a friendly smile. "Doing time for my crime. At least I won''t have to do it alone."'
 	'He laughs a bit, "Yeah, I''ve seen your name on the detention sheet, so I knew you had been a bad girl and would be here." Then his expression gets more serious and he talks softly so no one can overhear him. "I have been wanting to talk to you about the other day, you know, in the bathroom?" He flushes a little bit as he says that.'
@@ -1164,7 +1144,7 @@ if $ARGS[0] = 'anal':
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/sex/anal.mp4"></video></center>'
-	'As you walk around you hear some soft moaning coming from further back, you quietly move forward and peek around one of the book shelves. You see Lina down on all fours, on the floor, with her pants and panties pulled down just enough to expose her ass. Ivan stands behind and above her with his pants pulled down amd his large cock deep in her ass. As you watch he hammers away at her ass balls deep, her moans sound like they are a mixture of pain and pleasure. She reaches up and starts to rub her pussy, as Ivan pounds her ass. You bite your lip as you watch, feeling your own arousal mounting.'
+	'As you walk around you hear some soft moaning coming from further back, you quietly move forward and peek around one of the book shelves. You see Lina down on all fours, on the floor, with her pants and panties pulled down just enough to expose her ass. Ivan stands behind and above her with his pants pulled down and his large cock deep in her ass. As you watch he hammers away at her ass balls deep, her moans sound like they are a mixture of pain and pleasure. She reaches up and starts to rub her pussy, as Ivan pounds her ass. You bite your lip as you watch, feeling your own arousal mounting.'
 	gs 'arousal', 'voyeur', 20
 	gs 'stat'
 	act 'Keep watching':

+ 61 - 38
locations/gschool_events.qsrc

@@ -1488,28 +1488,42 @@ if $ARGS[0] = 'afterschool_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
 		'You''re running a bit late leaving school, the hallways are deserted. Or so you thought at first, as you hear some voices down one of the corridors, you slow down and then peak around the corner. You see several of the jock boys and Lariska, she seems unsure about something and you hear the boys encouraging her to give them a peak and show off her great body. She glances up and down the hallway, obviously afraid of being seen, but also just as obviously about to give into peer pressure.'
 		act 'Ignore whats happening and leave': gt 'gschool_grounds', 'main'
-		act 'Intervene':
-			*clr & cla
-			npc_rel['A13'] += 5
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
-			'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-			'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-			'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-			act 'Leave': gt 'gschool_grounds', 'main'
+		gs 'willpower', 'misc', 'self', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Intervene (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				npc_rel['A13'] += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+				'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+				'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+				'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+				act 'Leave': gt 'gschool_grounds', 'main'
+			end
+		else
+			act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip2.jpg"></center>'
 			'After a few moments they encourage her to take off her jacket, it''s just her jacket nothing to it. She seems unsure but after one more quick glance around she pulls off her jacket, then smiles as the boys whistle and compliment her. She seems to be a little more ok with it, since the boys are complimenting her so much. Then they start encouraging her to show them her underwear.'
 			act 'Ignore whats happening and leave': gt 'gschool_grounds', 'main'
-			act 'Intervene':
-				*clr & cla
-				npc_rel['A13'] += 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip2.jpg"></center>'
-				'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-				'For a moment she seems as confused, but then with a final look at the boys she nods quickly, putting her jacket back on. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-				'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-				act 'Leave': gt 'gschool_grounds', 'main'
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Intervene (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					npc_rel['A13'] += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+					'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+					'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+					'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+					act 'Leave': gt 'gschool_grounds', 'main'
+				end
+			else
+				act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Keep Watching':
 				*clr & cla
@@ -1520,16 +1534,21 @@ if $ARGS[0] = 'afterschool_events':
 				gs 'arousal', 'voyeur', 5, 'unknown'
 				gs 'stat'
 				act 'Ignore whats happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
-				act 'Intervene':
-					*clr & cla
-					gs 'arousal', 'end'
-					gs 'stat'
-					npc_rel['A13'] += 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip3.jpg"></center>'
-					'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-					'For a moment she seems as confused and ashamed, she quickly covers herself up and blushes deeply, but then with a final look at the boys she nods quickly, pulling up her skirt and putting her shirt back on. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-					'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-					act 'Leave': gt 'gschool_grounds', 'main'
+				gs 'willpower', 'misc', 'self', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Intervene (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'self'
+						npc_rel['A13'] += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+						'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+						'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+						'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+						act 'Leave': gt 'gschool_grounds', 'main'
+					end
+				else
+					act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Keep Watching':
 					*clr & cla
@@ -1540,22 +1559,26 @@ if $ARGS[0] = 'afterschool_events':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 					act 'Ignore whats happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
-					act 'Intervene':
-						*clr & cla
-						npc_rel['A13'] += 5
-						gs 'arousal', 'end'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip4.jpg"></center>'
-						'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-						'For a moment she seems as confused and ashamed, she quickly covers herself up and blushes deeply, as she scrambles to quickly get dressed. The boys groan and say things like "Way to go <<$pcs_nickname>>." or "<<$pcs_nickname>> you''re are such a spoil sport." Then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-						'The boys grumble a bit more as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-						act 'Leave': gt 'gschool_grounds', 'main'
+					gs 'willpower', 'misc', 'self', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Intervene (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'self'
+							npc_rel['A13'] += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+							'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+							'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+							'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+							act 'Leave': gt 'gschool_grounds', 'main'
+						end
+					else
+						act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-
 					act 'Keep Watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
-						'Finally she gives in and pulls her panties down and steps out of them, now completely naked in front of the boys. Who seem to be loving the show and she seems torn on enjoying the approval of the boys and the embarrassment of being naked. After giving she a look at her naked body for a couple of more minutes she seems to change her mind and start to quickly get dressed. The boys try to get her to stay naked by she gets dressed. The boys take it in stride and comment about how great she looks and how cool she is, once dressed they all leave together, leaving you to go on your way as well.'
+						'Finally she gives in and pulls her panties down and steps out of them, now completely naked in front of the boys. Who seem to be loving the show and she seems torn on enjoying the approval of the boys and the embarrassment of being naked. She lets the boys look at her naked body for a couple of more minutes, before she seems to change her mind and start to quickly get dressed. The boys try to get her to stay naked by she gets dressed. The boys take it in stride and comment about how great she looks and how cool she is, once dressed they all leave together, leaving you to go on your way as well.'
 						gs 'arousal', 'voyeur', 5
 						gs 'arousal', 'end'
 						gs 'stat'

+ 16 - 49
locations/gschool_girls_bathroom.qsrc

@@ -1,5 +1,6 @@
 # gschool_girls_bathroom
 
+
 !!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
 	$location_type = 'bathroom'
@@ -151,16 +152,21 @@ if $ARGS[0] = 'girl2':
 				*clr & cla
 				'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/soniatrade.jpg"></center>'
-				'It seems to last forever, your insides twitching and squeezing the life out of Sonia''s fingers, your knuckles as white as the porcelain you''re holding onto. It takes you a while to recover from the orgasm, to notice the goofy, smug smile on Sonia''s face, and you can''t help but chuckle at her expression and your own sudden relaxation. With your legs feeling like they''re made out of jelly, you slide yourself off the toilet and trade places with Sonia, down on your knees in front of her. You consider teasing her like she did you, admiring her perfectly smooth sex and her beautiful body and face for a few seconds, but you are both past teasing at this point and you put your head between her legs and start licking her pussy with enthusiasm. She moans and grips your hair, showing you how much she appreciates your effort, but you don''t feel like you are as skilled as she is, and it both peeves you and spurs you on. It takes you longer to get her to start moaning loudly than it did her. In an attempt to copy her technique, you slip one of your slender fingers into her pussy, penetrating her while you work her clit with your tongue.'
-				*nl
-				'Realizing what you are trying to do, she reaches down and spreads the lips of her pussy wide while you lick her, as if to guide you. Following her cue, you alternate between fingering and tongue-fucking her, and if her grabbing you by the hair and pulling your face against her crotch is any indication, you are doing something right. Sonia grinds her pussy against you as she starts twitching and moaning your name, coating your lips and chin in her pussy juices as she cums.'
-				'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
+				'It seems to last forever, your insides twitching and squeezing the life out of Sonia''s fingers, your knuckles as white as the porcelain you''re holding onto. It takes you a while to recover from the orgasm, to notice the goofy, smug smile on Sonia''s face, and you can''t help but chuckle at her expression and your own sudden relaxation. With your legs feeling like they''re made out of jelly, you slide yourself off the toilet and trade places with Sonia, down on your knees in front of her. You consider teasing her like she did you, admiring her perfectly smooth sex and her beautiful body and face for a few seconds, but you are both past teasing at this point and you put your head between her legs and start licking her pussy with enthusiasm. She moans and grips your hair, showing you how much she appreciates your effort, but you don''t feel like you are as skilled as she is, and it both peeves you and spurs you on.'
 				*nl
-				'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
-				gs 'arousal', 'cuni_give', 10, 'lesbian'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Go to Class':gt 'gschool_lessons', 'short_break'
+				'It takes you longer to get her to start moaning loudly than it did her. In an attempt to copy her technique, you slip one of your slender fingers into her pussy, penetrating her while you work her clit with your tongue. Realizing what you are trying to do, she reaches down and spreads the lips of her pussy wide while you lick her, as if to guide you. Following her cue, you alternate between fingering and tongue-fucking her, and if her grabbing you by the hair and pulling your face against her crotch is any indication, you are doing something right. Sonia grinds her pussy against you as she starts twitching and moaning your name, coating your lips and chin in her pussy juices as she cums.'
+				act 'Continue':
+					*clr & cla
+					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/soniatrade.jpg"></center>'
+					'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
+					*nl
+					'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
+					gs 'arousal', 'cuni_give', 10, 'lesbian'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go to Class':gt 'gschool_lessons', 'short_break'
+				end
 			end
 		end
 	end
@@ -404,48 +410,9 @@ if $ARGS[0] = 'toy bunny':
 	end
 end
 
-!!This replaces random girls, with these possible couples for either company1 or company2
-!!replacement for random boy/girl
-!!Viktoriya and Vanya
-!!Ivan and Lariska
-!!Ivan and Lina
-!!Ivan and Bella
-!!Lazar and Irina
-!!Lazar and Lariska
-!!Lazar and Lina
-!!Marcus and Irina (Marcus only if Sveta is not dating him)
-!!Marcus and Bella (Marcus only if Sveta is not dating him)
-!!Paulina and Vitek(Vitek only if Sveta is not dating him)
-!!Paulina and Dan
-!!Alyona and Radomir
-!!Alyona and Lavrenti
-!!Sonia and Lazar
-!!Sonia and Dimka
-!!Sonia and Vitek (Vitek only if Sveta is not dating him)
-!!Sonia and Dan
-!!Sonia and Vasily
-!!Sonia and Svyatoslav
-!!Sonia and Erast
-!!Sonia and Feofan
-!!Sonia and Radomir
-!!Sonia and Roman
-!!Sonia and Lavrenti
-!!Sonia and Valentin
-!!Sonia and Arkadi
-!!Andrey and Stasy 
-!!Andrey and Irina
-!!Andrey and Lizaveta
-!!Andrey and Sonia
-!!Lena and Lavrenti
 if $ARGS[0] = 'company':
 	menu_off = 1
-	if soniaPS > 0 and rand(0,1) = 0:
-		$rand_girl = 'Sonia'
-	elseif rand(0,1) = 0:
-		$rand_girl = 'a girl you don''t know'
-	else
-		gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
-	end
+	gs 'gschool_randperson', 'couple_generator'
 	gtoilet_rand = rand(1,100)
 	if gtoilet_rand <= 30:
 		killvar 'gtoilet_rand'

+ 141 - 87
locations/gschool_grounds.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'main':
 			kanikuli = 7
 			gs 'stat'
 
-			if ParHomeBlock = 1:
+			if home_owned[2] = 0:
 				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
 			else
 				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
@@ -67,7 +67,7 @@ if $ARGS[0] = 'main':
 
 			if pcs_grades >= 90:
 				'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
-				if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
+				if home_owned[2] = 1:'As you return to your place you see your mother smiling brightly.'
 			elseif pcs_grades >= 70:
 				'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
 			else
@@ -380,7 +380,7 @@ if $ARGS[0] = 'bulding':
 	$metka = 'bulding'
 	$location_type = 'public_indoors'
 	$menu_loc = 'gschool_grounds'
-	$menu_arg = 'building'
+	$menu_arg = 'bulding'
 	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Inside School</font></b></center>'
@@ -406,6 +406,7 @@ if $ARGS[0] = 'bulding':
 	act 'Return to town': minut += 2 & gt 'pavResidential'
 
 	if dimaRevenge = 1:
+		menu_off = 1
 		'You''re in a good mood today as you enter the school. That changes when Dimka stops you in the hall on the way to class.
 		"I know what you did, bitch. Did you really thing I wouldn''t figure out it was you that wiped my harddrive."
 		Before you can deny anything he continues: "I don''t even need that video to ruin your life. Just you wait. Soon the whole school will know what a whore you are."
@@ -413,6 +414,7 @@ if $ARGS[0] = 'bulding':
 	end
 
 	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
+		menu_off = 1
 		zverSlutQW = 2
 		if KotovZverHelp ! 1:
 			$npc_notes['A18'] = 'Ever since your fight, Christina has been avoiding you. She''s been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s dick for a place in the running competition, and beat her up when she tried to fight you. Barely a shade of her former self she stands timidly in a corner, her head still wrapped in gauss. Whenever she opens her mouth, people can see the broken teeth she hasn''t had a chance to get fixed yet.'
@@ -426,10 +428,10 @@ if $ARGS[0] = 'bulding':
 		if lariskaHelp > 0:LariskaHomeIn = 1
 		$npc_notes['A13'] = 'Lariska is an athletic girl with a weak personality: she''s very dependent on other people''s opinions of her. Christina used to control her, but ever since you took care of Christina she has been a lot more lively. She has a spark in her eyes, and is almost always in a good mood. Even though Mikhail Nikolayevich sees a lot of potential in her and offered her a spot on the volleyball team, she''s afraid to go pro.'
 	elseif zverSlutQW = 0 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
+		menu_off = 1
 		$npc_notes['A18'] = 'Christina is a tall and strong girl. She''s one of the best athletes your school has to offer. Her leadership skills, combined with her intelligence and tenacity make her a very serious threat to anyone who would challenge her.'
 		npc_rel['A18'] = 0
-
-		''
+		*nl
 		$npc_notes['A13'] = 'Lariska is an athletic girl with a weak personality: she''s very dependent on other people''s opinions of her. Christina controls her every move, and ever since the fight she has been avoiding you. She seems even more down than usual, and often looks sad. Even though Mikhail Nikolayevich sees a lot of potential in her and offered her a spot on the volleyball team, she''s afraid to go pro.'
 		if lariskaHelp > 0:
 			$text_end = ' And don''t you worry, I will take care of your girlfriend Lariska as well. I''ll teach her what happens when she sides against me.'
@@ -505,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':
@@ -582,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
 
-		run_exp += 1
-		fat -= 10
+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
 
-		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!"'
+	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!"'
+	end
 
-		gs 'stat'
+	gs 'stat'
 
-		act 'Leave':gt 'gschool_grounds', 'main'
-	end
+	act 'Leave':gt 'gschool_grounds', 'main'
 end
 
 if $ARGS[0] = 'change_room':
@@ -685,7 +735,11 @@ if $ARGS[0] = 'change_room':
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $shower
+	if shampoo > 0:
+		dynamic $shower
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
 	dynamic $tampon
 	gs 'din_van', 'pblc_pee'
 end

+ 42 - 67
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,18 +67,17 @@ 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.'
 	end
 	if dimaRevenge = 1:
-		wait(5000)
-		gt 'dimaRevenge', 1
+		act 'Continue': gt 'dimaRevenge', 1
 	else
 		act 'Focus on your school work':
 			*clr & cla
@@ -129,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."'
@@ -168,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':
@@ -183,7 +173,7 @@ if $ARGS[0] = 'math':
 					'Mr. Tsarev says, "You don''t know do you? Then 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." Not knowing what to say, you simply nod as Anatoly turns around and continues his lesson. You sit through the rest of the lesson in silence, while your mind drifts elsewhere. You can''t focus on the lesson at all.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
 				end
-				
+
 				gs 'willpower', 'misc', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Give him an attitude (<<will_cost>> Willpower)':
@@ -195,12 +185,12 @@ 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'
-						if will_cost <= pcs_willpwr:	
+						if will_cost <= pcs_willpwr:
 							act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 								*clr & cla
 								gs 'willpower', 'pay', 'resist'
@@ -210,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
@@ -239,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)
@@ -261,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
@@ -332,15 +310,13 @@ if $ARGS[0] = 'math':
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 								else
 									gs 'exhibitionism', 2
-									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 								end
 								'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Tsarev walking towards your desk. When the Anatoly arrives at your desk, he says to you, "What is so important that you need to use your phone during my lesson? If nothing then I will hold onto it until the end of class." He then extends his hand out. You reply in a seductive tone, "Would you like to see?"'
 								*nl
 								'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
@@ -358,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:
@@ -399,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.'
@@ -409,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.'
@@ -514,7 +490,7 @@ if $ARGS[0] = 'russian':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'You notice Mr. Yenotin looking at you calmly; he must have noticed you''re not paying attention to his class.'
-			
+
 			act 'Put your phone away':
 				*clr & cla
 				pcs_grades -= rand(0,1)
@@ -558,7 +534,7 @@ if $ARGS[0] = 'russian':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Yenotin walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "Look, I know sometimes the lessons aren''t the most exciting but you still can''t play around with your phone, <<$pcs_nickname>>? So hand it over and you''ll get it back at the end of the lesson."'
@@ -618,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.'
@@ -759,7 +735,7 @@ if $ARGS[0] = 'literature':
 						grupvalue[3] += 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 						'Realizing that this isn''t worth the fight, you hand over your phone without argument. "You can have this back after class." Ms. Braakman says as she walks back to the blackboard.'
-						act '...': gt 'gschool_lessonsev3', 'getphone'
+						act 'Continue': gt 'gschool_lessonsev3', 'getphone'
 					end
 					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
@@ -812,7 +788,7 @@ if $ARGS[0] = 'literature':
 							*nl
 							'Flustered and aroused, you regain your senses and remember that you''re sitting in class right now. You look around the room, but it seems like her groping went unnoticed and was seen as her fishing out your phone like you challenged her to do.'
 
-							act '...': gt 'gschool_lessonsev3', 'getphone'
+							act 'Continue': gt 'gschool_lessonsev3', 'getphone'
 						end
 					elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
 						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>'
@@ -832,8 +808,7 @@ if $ARGS[0] = 'english':
 	*nl
 	'"Everyone sit down, class is starting." Ms. Braakman says in English, her voice thick with a Russian accent. A few students take their seat, but most of the class continues on socializing with friends as if they didn''t hear her. "Class is starting, now take a seat!" she repeats loudly, this time speaking Russian. Reluctantly, the groups scatter and everyone settles into their seats.'
 	if dimaRevenge = 1:
-		wait(5000)
-		gt 'dimaRevenge', 1
+		act 'Continue': gt 'dimaRevenge', 1
 	else
 		act 'Listen attentively':
 			*clr & cla
@@ -1000,7 +975,7 @@ if $ARGS[0] = 'english':
 					*nl
 					'"A perfect example of how to fail my class." She smirks as kids begin to laugh at you.'
 				end
-				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'english'	
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'english'
 			elseif rand(1,2) = 1:
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
@@ -1017,9 +992,9 @@ if $ARGS[0] = 'english':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'The lesson is so boring that you have to do something to keep yourself entertained, so you take out your phone and begin to play a mobile game, hoping the lesson will be over soon.'
-			
+
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			
+
 			if rand(1,4) = 1:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
@@ -1052,7 +1027,7 @@ if $ARGS[0] = 'english':
 							grupvalue[3] += 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 							'Realizing that this isn''t worth the fight, you hand over your phone without argument. "You can have this back after class." Ms. Braakman says as she walks back to the blackboard.'
-							act '...': gt 'gschool_lessonsev3', 'getphone'
+							act 'Continue': gt 'gschool_lessonsev3', 'getphone'
 						end
 						gs 'willpower', 'exhib', 'self'
 						if will_cost <= pcs_willpwr:
@@ -1106,7 +1081,7 @@ if $ARGS[0] = 'english':
 								'"Don''t make me remind you of your place, little girl." Ms. Braakman''s warning is punctuated painfully as she gives a sharp pinch and tug to one of your nipples, eliciting a soft whimper from you. Having gotten her point across, she removes her hand and with it your phone. "You can get this back after class."'
 								*nl
 								'Flustered and aroused, you regain your senses and remember that you''re sitting in class right now. You look around the room, but it seems like her groping went unnoticed and was seen as her fishing out your phone like you challenged her to do.'
-								act '...': gt 'gschool_lessonsev3', 'getphone'
+								act 'Continue': gt 'gschool_lessonsev3', 'getphone'
 							end
 						elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
 							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>'
@@ -1190,9 +1165,9 @@ if $ARGS[0] = 'geography':
 					'"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 loud laughter, and Mrs. Sokoloff has a rough time getting everyone to quiet down.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'				
+					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc', 'resist', 'medium'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
@@ -1208,7 +1183,7 @@ if $ARGS[0] = 'geography':
 						end
 					else
 						act 'Don''t leave the classroom (<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 'Be a smart ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1299,7 +1274,7 @@ if $ARGS[0] = 'geography':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mrs. Sokoloff walking towards your desk.'
 							'When the teacher arrives at your desk, she tells you, "And what could you be doing on your phone that''s more important than paying attention in class, Miss. <<$pcs_lastname>>? Hand it over."'
@@ -1312,7 +1287,7 @@ if $ARGS[0] = 'geography':
 					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)':
@@ -1411,7 +1386,7 @@ if $ARGS[0] = 'history':
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc', 'resist', 'medium'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
@@ -1519,7 +1494,7 @@ if $ARGS[0] = 'history':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mrs. Sokoloff walking towards your desk.'
 							'When the teacher arrives at your desk, she tells you, "And what could you be doing on your phone that''s more important than paying attention in class, Miss. <<$pcs_lastname>>? Hand it over."'
@@ -1625,7 +1600,7 @@ if $ARGS[0] = 'biology':
 					'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
 					act 'Go to principal''s office': demerit += 10 + school_bunk * 5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc', 'resist', 'medium'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
@@ -1669,7 +1644,7 @@ if $ARGS[0] = 'biology':
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'You fall asleep and start dreaming.'
-			act 'Dream':	
+			act 'Dream':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/ero4.jpg"></center>'
 				'You dream that you are on a bed naked with a girl, you kiss and caress each other passionately,'
@@ -1734,7 +1709,7 @@ if $ARGS[0] = 'biology':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Miss Orlov walking towards your desk.'
@@ -1883,7 +1858,7 @@ if $ARGS[0] = 'literature_late':
 			end
 		elseif lit_late_counter > 10:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
-			
+
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
@@ -1899,7 +1874,7 @@ if $ARGS[0] = 'literature_late':
 			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 'Do as she says':
 				*clr & cla
 				if $pantyworntype ! 'none':
@@ -1940,7 +1915,7 @@ if $ARGS[0] = 'literature_late':
 			end
 		elseif lit_late_counter > 5:
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_lastname>>, I warned you I would not tolerate this. Now come up here right now young lady!" She says as she points in front of her desk.'
-			
+
 			gs 'willpower', 'misc', 'resist', 'pay'
 			if will_cost <= pcs_willpwr:
 				act 'Refuse (<<will_cost>> Willpower)':
@@ -1956,7 +1931,7 @@ if $ARGS[0] = 'literature_late':
 			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 'Do as she says':
 				*clr & cla
 				gs 'pain', 2, 'asscheeks', 'slap'

+ 28 - 20
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
@@ -1382,7 +1384,13 @@ if $ARGS[0] = 'postphys2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
-	act 'Have a shower': gt 'gschool_lessons2', 'shower'
+	
+
+	if shampoo > 0:
+		act 'Have a shower':gt 'gschool_lessons2', 'shower'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
 	act 'Get dressed': gt 'gschool_lessons2', 'dress'
 end
 

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

+ 201 - 30
locations/gschool_randperson.qsrc

@@ -20,39 +20,210 @@
 !! NOTE that in $rand_girl1 zero values for outcasts and teachers are not defined - undefined values will be zero by language
 !! Thanks to that you can include new social group and you don''t need to make changes in all places
 
-rand_person_ind = 0
-rand_filtered_ind = 0
+if $ARGS[0] = 'person_generator':
+	rand_person_ind = 0
+	rand_filtered_ind = 0
 
-:filter_loop
-  rand_person_ind = rand_person_ind + 1
-  if rand_person_ind >= ARRSIZE('grupTipe') : jump 'outside_filter_loop'
-  genderMatches = ARGS[0] = npcPol[rand_person_ind]
-  nameIsNotRepeated = ARGS[1] <> $npc_firstname[$school_static_num[rand_person_ind]]
-  grupTipeIsLegal = grupTipe[rand_person_ind] > 0
-  grupTipeMatches = ARGS[grupTipe[rand_person_ind] + 1] = 1
-  if genderMatches and nameIsNotRepeated and grupTipeIsLegal and grupTipeMatches :
-    rand_filtered[rand_filtered_ind] = rand_person_ind
-    rand_filtered_ind = rand_filtered_ind + 1
-  end
-  jump 'filter_loop'
-:outside_filter_loop
+	:filter_loop
+	  rand_person_ind = rand_person_ind + 1
+	  if rand_person_ind >= ARRSIZE('grupTipe') : jump 'outside_filter_loop'
+	  genderMatches = ARGS[0] = npcPol[rand_person_ind]
+	  nameIsNotRepeated = ARGS[1] <> $npc_firstname[$school_static_num[rand_person_ind]]
+	  grupTipeIsLegal = grupTipe[rand_person_ind] > 0
+	  grupTipeMatches = ARGS[grupTipe[rand_person_ind] + 1] = 1
+	  if genderMatches and nameIsNotRepeated and grupTipeIsLegal and grupTipeMatches :
+		rand_filtered[rand_filtered_ind] = rand_person_ind
+		rand_filtered_ind = rand_filtered_ind + 1
+	  end
+	  jump 'filter_loop'
+	:outside_filter_loop
 
-if ARRSIZE('rand_filtered') > 0 :
-  random_person = rand_filtered[rand(0,ARRSIZE('rand_filtered'))]
-  $RESULT = $npc_firstname[$school_static_num[random_person]]
-else
-  $rand_gender = IIF (ARGS[0] = 0, 'boy', 'girl')
-  $RESULT =  '<<$rand_gender>> you don''t know'
+	if ARRSIZE('rand_filtered') > 0 :
+	  random_person = rand_filtered[rand(0,ARRSIZE('rand_filtered'))]
+	  $RESULT = $npc_firstname[$school_static_num[random_person]]
+	else
+	  $rand_gender = IIF (ARGS[0] = 0, 'boy', 'girl')
+	  $RESULT =  '<<$rand_gender>> you don''t know'
+	end
+
+	KILLVAR 'rand_person_ind'
+	KILLVAR 'rand_filtered_ind'
+	KILLVAR 'rand_filtered'
+	KILLVAR '$rand_gender'
+	KILLVAR 'random_person'
+	KILLVAR 'genderMatches'
+	KILLVAR 'nameIsNotRepeated'
+	KILLVAR 'grupTipeIsLegal'
+	KILLVAR 'grupTipeMatches'
 end
 
-KILLVAR 'rand_person_ind'
-KILLVAR 'rand_filtered_ind'
-KILLVAR 'rand_filtered'
-KILLVAR '$rand_gender'
-KILLVAR 'random_person'
-KILLVAR 'genderMatches'
-KILLVAR 'nameIsNotRepeated'
-KILLVAR 'grupTipeIsLegal'
-KILLVAR 'grupTipeMatches'
+if $ARGS[0] = 'couple_generator':
+	:couple_jump
+	couple_rand = rand(1,53)
+	
+	if couple_rand = 1:
+        $rand_girl = 'Viktoriya'
+        $rand_boy = 'Vanya'
+    elseif couple_rand = 2:
+        $rand_girl = 'Lina'
+        $rand_boy = 'Ivan'
+    elseif couple_rand = 3:
+        $rand_girl = 'Stasya'
+        $rand_boy = 'Andrey'
+	elseif couple_rand = 4:
+        $rand_girl = 'Lariska'
+        $rand_boy = 'Ivan'
+    elseif couple_rand = 5:
+        $rand_girl = 'Lizaveta'
+        $rand_boy = 'Andrey'
+	elseif couple_rand = 6:
+        $rand_girl = 'Lina'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 7:
+        $rand_girl = 'Bella'
+        $rand_boy = 'Lazar'
+	elseif couple_rand = 8:
+        $rand_girl = 'Lariska'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 9:
+        $rand_girl = 'Irina'
+        $rand_boy = 'Lazar'
+	elseif couple_rand = 10:
+        $rand_girl = 'Irina'
+        $rand_boy = 'Dimka'
+    elseif couple_rand = 11:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Marcus'
+	elseif couple_rand = 12 and kotovLoveQW <= 0:
+        $rand_girl = 'Pauline'
+        $rand_boy = 'Vitek'
+    elseif couple_rand = 13:
+        $rand_girl = 'Pauline'
+        $rand_boy = 'Dan'
+	elseif couple_rand = 14:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Radomir'
+    elseif couple_rand = 15:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Valentin'
+	elseif couple_rand = 16:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Arkadi'
+    elseif couple_rand = 17:
+        $rand_girl = 'Alyona'
+        $rand_boy = 'Valentin'
+	elseif couple_rand = 18:
+        $rand_girl = 'Alyona'
+        $rand_boy = 'Arkadi'
+    elseif couple_rand = 19:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Andrey'
+	elseif couple_rand = 20:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Ivan'
+    elseif couple_rand = 21:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Dimka'
+	elseif couple_rand = 22:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 23:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Vasily'
+	elseif couple_rand = 24:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Svyatoslav'
+    elseif couple_rand = 25:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Erast'
+	elseif couple_rand = 26 and fedorlove < 1:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Fedor'
+    elseif couple_rand = 27:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Marcus'
+	elseif couple_rand = 28 and kotovLoveQW <= 0:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Vitek'
+    elseif couple_rand = 29:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Dan'
+	elseif couple_rand = 30:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Radomir'
+    elseif couple_rand = 31:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Valentin'
+	elseif couple_rand = 32:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Arkadi'
+    elseif couple_rand = 33:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Roman'
+	elseif couple_rand = 34:
+        $rand_girl = 'Pauline'
+        $rand_boy = 'Radomir'
+	elseif couple_rand = 35:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 36:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Ivan'
+	elseif couple_rand = 37:
+        $rand_girl = 'Anushka'
+        $rand_boy = 'Lavrenti'
+    elseif couple_rand = 38:
+        $rand_girl = 'Alyona'
+        $rand_boy = 'Lavrenti'
+	elseif couple_rand = 39:
+        $rand_girl = 'Albina'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 40:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Lavrenti'
+	elseif couple_rand = 41:
+        $rand_girl = 'Albina'
+        $rand_boy = 'Radomir'
+    elseif couple_rand = 42:
+        $rand_girl = 'Lizaveta'
+        $rand_boy = 'Lavrenti'
+	elseif couple_rand = 43:
+        $rand_girl = 'Christina'
+        $rand_boy = 'Lazar'
+    elseif couple_rand = 44:
+        $rand_girl = 'Christina'
+        $rand_boy = 'Ivan'
+	elseif couple_rand = 45:
+        $rand_girl = 'Lariska'
+        $rand_boy = 'Ivan'
+    elseif couple_rand = 46:
+        $rand_girl = 'Lariska'
+        $rand_boy = 'Radomir'
+	elseif couple_rand = 47:
+        $rand_girl = 'Lina'
+        $rand_boy = 'Andrey'
+    elseif couple_rand = 48:
+        $rand_girl = 'Lina'
+        $rand_boy = 'Svyatoslav'
+	elseif couple_rand = 49:
+        $rand_girl = 'Lina'
+        $rand_boy = 'Radomir'
+    elseif couple_rand = 50:
+        $rand_girl = 'Pauline'
+        $rand_boy = 'Radomir'
+	elseif couple_rand = 51:
+        $rand_girl = 'Lena'
+        $rand_boy = 'Radomir'
+    elseif couple_rand = 52:
+        $rand_girl = 'Lena'
+        $rand_boy = 'Lavrenti'
+	elseif couple_rand = 53:
+        $rand_girl = 'Sonia'
+        $rand_boy = 'Niko'
+	else
+		jump 'couple_jump'
+	end
+	killvar 'couple_rand'
+end
 
 --- gschool_randperson ---------------------------------

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

+ 195 - 147
locations/gschool_socialchg.qsrc

@@ -15,13 +15,13 @@ if $ARGS[0] = 'test':
 	elseif grupvalue[4] < 20 and grupTipe = 4: 
 		gt 'gschool_socialchg', 'gopnik outcast'		
 	elseif pav_slut < 100:
-		if grupvalue[1] > 50 and grupTipe ! 1: 
+		if grupvalue[1] > 80 and grupTipe ! 1: 
 			gt 'gschool_socialchg', 'coolkid'
-		elseif grupvalue[2] > 50 and grupTipe ! 2: 
+		elseif grupvalue[2] > 80 and grupTipe ! 2: 
 			gt 'gschool_socialchg', 'jock'
-		elseif grupvalue[3] > 50 and grupTipe ! 3: 
+		elseif grupvalue[3] > 80 and grupTipe ! 3: 
 			gt 'gschool_socialchg', 'nerd'
-		elseif grupvalue[4] > 50 and grupTipe ! 4: 
+		elseif grupvalue[4] > 80 and grupTipe ! 4: 
 			gt 'gschool_socialchg', 'gopnik'
 		end
 	elseif pav_slut < 125 and grupvalue[4] > 50 and grupTipe ! 4:
@@ -37,14 +37,9 @@ if $ARGS[0] = 'test':
 		killvar 'gopnik_initiation'
 		killvar 'gopnik_initiation_day'
 		gt 'gschool_socialchg', 'gopnik miss'
-		!! one chance more?
 	end
-
 end
 
-!!if Pav_slut >= 125 and a cool kid, nerd, or jock.
-!!if pav_slut >= 150 and a gopnik
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
 
 if $ARGS[0] = 'Pavlovsk slut':
 	cla & *clr
@@ -52,37 +47,30 @@ if $ARGS[0] = 'Pavlovsk slut':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
 	'As you walk down the school hallway, you notice almost everyone is eyeing you. Some sneer at you, others laugh, a few turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most seem to actively avoid you, you are starting to feel a bit uncomfortable at all the staring eyes. As you approach you locker you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you and you turn around to see who it might be.'
-!!This is add on to the above text based on what social group Sveta use to be.
+
 	grupvalue[1] = 0
 	grupvalue[2] = 0
 	grupvalue[3] = 0
-	gs 'gschool_socialchg', 'group_rel_change','cool kids', -20
-	gs 'gschool_socialchg', 'group_rel_change','jocks', -20
-	gs 'gschool_socialchg', 'group_rel_change','nerds', -20
-	if pav_slut > 149 and grupTipe ! 4:
-		grupvalue[4] = 0
-		gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
-	end
+	grupvalue[4] = 0
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','cool kids', -20
+!!	gs 'gschool_socialchg', 'group_rel_change','jocks', -20
+!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
+!! 	gs 'gschool_socialchg', 'group_rel_change','nerds', -20
 
 	if grupTipe = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/coolslut.jpg"></center>'
 		'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what is going on, Irina cuts you off. "Shut your cum hole slut, I don''t want to smell you cum breath. We''ve all heard about what you have been up too. Your ass is out, you are no longer welcome around us anymore. Go hang out with the other outcasts or find Sonia so that the two of you can blab about the latest cock you sucked, I am sure you two have a lot in common now." With that Irina turns and walks away, Dimka gives you a final look and shakes his head.'
 		'"What a waste, fucking slut." Then he spits at you feet before leaving as well. You hear most of the rest of the students laughing, as you look around. Not being part of the popular clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	elseif grupTipe = 2:
-		!!jock social group
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/jockslut.jpg"></center>'
 		'Christina, Lariska, and Lina walk up to you, Lariska and Lina are looking at you in disgust while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys bathroom sucking a bunch of cocks? We all heard that is all you do, suck cocks and let anyone fuck you, just like a whore. At least the whores know to get payed but you just give it away for free." She says, mockingly laughing, Lariska, Lina and several other students nearby join in, openly mocking you.'
 		'"Stay away from us and go hang out with the other losers, I am sure you and Sonia have a lot in common now slut." Then she leans in close "Or I will show you what happens to sluts that don''t know their place." With that they turn and walk away. Not being part of the jock clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	elseif grupTipe = 3:
-		!!nerd social group
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'A couple of students stand infront of you, wanting to get a better look at the slut based on what''s written on your locker, when you look at them they start laughing and then quickly hurry away from you as if you''ve been struck with the plague. You turn and try to find some of your friends, most seem to be hiding or when they see you coming hurry off. You finally manage to catch up to Gerasim. As you''re about to say something he turns to you. "Please go away, I don''t know what got into you. But the things they say you have done." He looks disgusted. "I''m sorry but I can''t be seen hanging out with you, I''ve got enough problems without you making it worse."'
 		'When he notices the dejected look on your face as he''s told you off, ending with that you are an outcast he sighs a little. "I''m sorry I really am, but this is your own fault, I don''t know what you were thinking doing all those sex things and I don''t care, but please leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you, as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	elseif grupTipe = 4:
-		!!gopnik social group
-		grupvalue[4] = 0
-		gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/gopnikslut.jpg"></center>'
 		'Paulina, Lera, and Lena are standing next to you. Lera is snickering, Paulina looks annoyed, just like she''s preparing to beat you up while Lera looks at you with disgust. Paulina shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. No you had to go around and be the pathetic town slut. Don''t act all surprised, we''ve all heard about how you will let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay the fuck away from us or I will beat the shit out of you." With that Paulina shoves you against you locker and walks away.'
 		'Lena gives you a final look of disgust and shoves you once again while Lera gives you a few parting words before walking away. "If you ever get the idea to approach us, we will feed you to some guys that will pull a train on you so hard, one even a slut like you won''t enjoy." Not being part of the gopnik clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
@@ -93,28 +81,12 @@ if $ARGS[0] = 'Pavlovsk slut':
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
-!!if grupvalue[1] >= 51 or higher and Sveta is not currently a cool kid then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
 if $ARGS[0] = 'coolkid':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Albina, Andrey and Stasya there. They give you friendly smiles. Albina speaks "Hey <<$pcs_nickname>>, we have been talking and you seem like you have the right attitude to be one of us. So what do you say, do you want to join the popular clique?" They seem to be waiting on your response.'
-	act 'Yes':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-		'You nod your head, "Yes I would love it, I love hanging out with you guys."'
-		'Albina gives you a hug, once she lets go Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on you are one of us." Stasya gives you a friendly smile, as the four of you walk to your next class.'
-		grupvalue[2] -= 20
-		grupvalue[3] -= 20
-		grupvalue[4] -= 20
-		grupTipe = 1
-		gs 'gschool_socialchg', 'group_rel_change','cool kids', 5
-		gs 'stat'
-
-		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
-	end
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
@@ -122,94 +94,136 @@ if $ARGS[0] = 'coolkid':
 		'Albina frowns but then nods. "Suit yourself then." With that she turns and leaves, Andrey just shakes his head at you and does the same.'
 		'Stasya gives you a once over. "I told you guys she wasn''t cool enough." Then shakes her head at you. "Loser!" and with that follows the others, leaving you behind to wonder if you made the right choice.'
 
-		grupvalue[1] -= 20
+		grupvalue[1] -= rand(30,50)
 		gs 'gschool_socialchg', 'group_rel_change','cool kids', -5
 		gs 'stat'
 
+		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
+	end
+	act 'Yes':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
+		'You nod your head, "Yes I would love it, I love hanging out with you guys."'
+		'Albina gives you a hug, once she lets go Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on you are one of us." Stasya gives you a friendly smile, as the four of you walk to your next class.'
+		
+		grupvalue[2] -= 20
+		grupvalue[3] -= 40
+		grupvalue[4] -= 50
+		
+		if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
+		if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+		if grupTipe = 4 or grupvalue[4] < 0: grupvalue[4] = 0
+		
+		grupTipe = 1
+		
+!!		gs 'gschool_socialchg', 'group_rel_change','cool kids', 5
+		gs 'stat'
+
 		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 	end
 end
-!!if grupvalue[2] >= 51 or higher and Sveta is not currently a jock then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
+
 if $ARGS[0] = 'jock':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
 	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Lariska and Lina there. They give you friendly smiles. Lariska speaks "Hey <<$pcs_nickname>>, we have been talking and you seem like you have the right attitude to be one of us. So what do you say, do you want to join us, the jock clique?" They seem to be waiting on your response.'
-	act 'Yes':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
-		'You nod your head, "Yes I would love to, I love hanging out with you guys."'
-		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile, with that they walk you to your next class.'
-		grupvalue[1] -= 20
-		grupvalue[3] -= 20
-		grupvalue[4] -= 20
-		gs 'gschool_socialchg', 'group_rel_change','jocks', 5
-		grupTipe = 2
-		gs 'stat'
-
-		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
-	end
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head no. "I like hanging out with you guys, but I don''t think that is a good idea."'
 		'Lariska frowns but then nods. "Suit yourself then." With that she turns and leaves.'
 		'Lina gives you a once over. "Well at least Christina will be happy." and with that she follows after Lariska, leaving you behind to wonder if you made the right choice.'
-		grupvalue[2] -= 20
+		grupvalue[2] -= rand(30,50)
 		gs 'gschool_socialchg', 'group_rel_change','jocks', -5
 		gs 'stat'
 
+		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
+	end
+	act 'Yes':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
+		'You nod your head, "Yes I would love to, I love hanging out with you guys."'
+		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile, with that they walk you to your next class.'
+		
+		grupvalue[1] -= 20
+		grupvalue[3] -= 50
+		grupvalue[4] -= 30
+		
+		if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
+		if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+		if grupTipe = 4 or grupvalue[4] < 0: grupvalue[4] = 0
+		
+		grupTipe = 2
+		
+!!		gs 'gschool_socialchg', 'group_rel_change','jocks', 5
+		gs 'stat'
+
 		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 	end
 end
-!!if grupvalue[3] >= 51 or higher and Sveta is not currently a nerd then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
+
 if $ARGS[0] = 'nerd':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
 	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Artem, Feofan, Petka, Gerasim, Zinaida, and Julia there. They give you friendly smiles. Artem speaks "Hey <<$pcs_nickname>>, we have been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
+	act 'No':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
+		'You shake your head no. "I like hanging out with you guys, but I''m just not interested in doing a game night, sorry."'
+		'Artem frowns but then nods. "Oh, ok. Well maybe some other time." With that he turns and the rest follow, looking a little depressed. Looks like they was really expecting and hoping you to join them. It makes you feel a little bad and leaves you to wonder if you made the right choice.'
+		grupvalue[3] -= rand(30,50)
+!!		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
+		gs 'stat'
+
+		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
+	end	
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
 		'You nod your head, "Yes I would love it, I love hanging out with you guys. A game night sounds like a lot of fun."'
 		'Most of them start talking at once, they seem as excited as you are about you joining them. You understand this means you are part of their group now. Finally Feofan talks loud enough the rest let him talk. "That''s great <<$pcs_nickname>> meet us at the community center library tonight after school. See you then." With that they all start leaving and going to class, most saying they look forward to seeing you tonight.'
-		grupvalue[2] -= 20
-		grupvalue[1] -= 20
-		grupvalue[4] -= 20
-		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
+		
+		grupvalue[1] -= 50
+		grupvalue[2] -= 40
+		grupvalue[4] -= 50
+		
+		if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
+		if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
+		if grupTipe = 4 or grupvalue[4] < 0: grupvalue[4] = 0
+				
 		grupTipe = 3
+		
 		nerd_night_game = 1
 		nerd_night_game_day = daystart
-		gs 'stat'
-
-		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
-	end
-!!need a code so after school a new option pops up go to game night is an option.
-	act 'No':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
-		'You shake your head no. "I like hanging out with you guys, but I''m just not interested in doing a game night, sorry."'
-		'Artem frowns but then nods. "Oh, ok. Well maybe some other time." With that he turns and the rest follow, looking a little depressed. Looks like they was really expecting and hoping you to join them. It makes you feel a little bad and leaves you to wonder if you made the right choice.'
-		grupvalue[3] -= 20
-		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
+		
+!!		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
 		gs 'stat'
 
 		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 	end
 end
 
-!!if grupvalue[4] >= 51 or higher and Sveta is not currently a gopnik then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
 if $ARGS[0] = 'gopnik':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
 	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Viktor and Lena there. Viktor gives you a hungry once over and Lena gives you a smirk. Viktor speaks "Hey <<$pcs_nickname>>, we have been talking and you seem like you have the right attitude to hang with us. So what do you say, want to come to one of our exclusive parties tonight?" They seem to be waiting on your response.'
+	act 'No':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
+		'You shake your head no. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
+		'Viktor''s eyes darken a bit. "What, you too good for us all of a sudden? Well fuck you then!" With that he storms away, Lena looks at you like you are a complete idiot and then follows her brother, leaving you behind to wonder if you made the right choice.'
+		grupvalue[4] -= rand(30,50)
+		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
+		gs 'stat'
+
+		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
+	end
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
@@ -219,25 +233,11 @@ if $ARGS[0] = 'gopnik':
 		gopnik_initiation = 1
 		gopnik_initiation_day = daystart
 		gs 'stat'
-!!need so it triggers an event so their is a new option if Sveta goes to the apartment garages at that time tonight.
-
-		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
-	end
-	act 'No':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
-		'You shake your head no. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
-		'Viktor''s eyes darken a bit. "What, you too good for us all of a sudden? Well fuck you then!" With that he storms away, Lena looks at you like you are a complete idiot and then follows her brother, leaving you behind to wonder if you made the right choice.'
-		grupvalue[4] -= 20
-		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
-		gs 'stat'
 
 		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 	end
 end
 
-!!if grupvalue[1] <= 20 or lower and Sveta is currently a cool kid then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
 if $ARGS[0] = 'coolkid outcast':
 	cla & *clr
 	menu_off = 1
@@ -245,66 +245,91 @@ if $ARGS[0] = 'coolkid outcast':
 	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to ask what is going on, Irina cuts you off. "Save it, we don''t care. I don''t know what happened to you, but you use to be cool. Now? Well you made your choice, you''re out, no longer welcome to hang with us." With that Irina turns and walks away, Dimka gives you a final look and shakes his head.'
 	'"Now you''re back where you always belonged, as an outcast with the other losers." He says before leaving as well. You hear most of the rest of the students laughing, as you look around. Not being part of the popular clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
-	grupTipe = 5
+
 	grupvalue[1] = 0
-	grupvalue[2] = 0
-	grupvalue[3] = 0
-	grupvalue[4] = 0
-	gs 'gschool_socialchg', 'group_rel_change','cool kids', -20
+	grupvalue[2] -= 50
+	grupvalue[3] -= 30
+	grupvalue[4] -= 10
+	
+	if grupvalue[2] < 0: grupvalue[2] = 0
+	if grupvalue[3] < 0: grupvalue[3] = 0
+	if grupvalue[4] < 0: grupvalue[4] = 0
+	
+	grupTipe = 5
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','cool kids', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
-!!if grupvalue[2] <= 20 or lower and Sveta is currently a jock then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
+
 if $ARGS[0] = 'jock outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
 	'Christina, Lariska, and Lina walk up to you, Lariska and Lina are looking at you like you did something wrong, while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys bathroom sucking a bunch of cocks? We all heard that is all you do, suck cocks and let anyone fuck you, just like a whore. At least the whores know to get payed but you just give it away for free." She says, mockingly laughing, Lariska, Lina and several other students nearby join in, openly mocking you. "Stay away from us and go hang out with the other losers, I am sure you and Sonia have a lot in common now slut." Then she leans in close "Or I will show you what happens to sluts that don''t know their place." With that they turn and walk away. Not being part of the jock clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
-	grupTipe = 5
-	grupvalue[1] = 0
+	
+	grupvalue[1] -= 50
 	grupvalue[2] = 0
-	grupvalue[3] = 0
-	grupvalue[4] = 0
-	gs 'gschool_socialchg', 'group_rel_change','jocks', -20
+	grupvalue[3] -= 30
+	grupvalue[4] -= 20
+	
+	if grupvalue[1] < 0: grupvalue[1] = 0
+	if grupvalue[3] < 0: grupvalue[3] = 0
+	if grupvalue[4] < 0: grupvalue[4] = 0
+	
+	grupTipe = 5
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','jocks', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
-!!if grupvalue[3] <= 20 or lower and Sveta is currently a nerd then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
+
 if $ARGS[0] = 'nerd outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
 	'A couple of students stand infront of you, wanting to get a better look at the slut based on what''s written on your locker, when you look at them they start laughing and then quickly hurry away from you as if you''ve been struck with the plague. You turn and try to find some of your friends, most seem to be hiding or when they see you coming hurry off. You finally manage to catch up to Gerasim. As you''re about to say something he turns to you. "Please go away, I don''t know what got into you. But the things they say you have done." He looks disgusted. "I''m sorry but I can''t be seen hanging out with you, I''ve got enough problems without you making it worse." When he notices the dejected look on your face as he''s told you off, ending with that you are an outcast he sighs a little. "I''m sorry I really am, but this is your own fault, I don''t know what you were thinking doing all those sex things and I don''t care, but please leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you, as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
-	grupTipe = 5
-	grupvalue[1] = 0
-	grupvalue[2] = 0
+	
+	grupvalue[1] -= 50
+	grupvalue[2] -= 30
 	grupvalue[3] = 0
-	grupvalue[4] = 0
-	gs 'gschool_socialchg', 'group_rel_change','nerds', -20
+	grupvalue[4] -= 40
+	
+	if grupvalue[1] < 0: grupvalue[1] = 0
+	if grupvalue[2] < 0: grupvalue[2] = 0
+	if grupvalue[4] < 0: grupvalue[4] = 0
+	
+	grupTipe = 5
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','nerds', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
-!!if grupvalue[4] <= 20 or lower and Sveta is currently a gopnik then this happens.
-!!If the above is true then the next day Sveta goes to school when she first goes inside the school this triggers.
+
 if $ARGS[0] = 'gopnik outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
 	'Paulina, Lera, and Lena are standing next to you. Lera is snickering, Paulina looks annoyed, just like she''s preparing to beat you up while Lera looks at you with disgust. Paulina shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. No you had to go around and be the pathetic town slut. Don''t act all surprised, we''ve all heard about how you will let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay the fuck away from us or I will beat the shit out of you." With that Paulina shoves you against you locker and walks away. Lena gives you a final look of disgust and shoves you once again while Lera gives you a few parting words before walking away. "If you ever get the idea to approach us, we will feed you to some guys that will pull a train on you so hard, one even a slut like you won''t enjoy." Not being part of the gopnik clique anymore the other students are ready to prey on your weakness as they either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>*You have lost your social group and become an outcast.*</font>'
-	grupTipe = 5
-	grupvalue[1] = 0
-	grupvalue[2] = 0
-	grupvalue[3] = 0
+	
+	grupvalue[1] -= 40
+	grupvalue[2] -= 30
+	grupvalue[3] -= 50
 	grupvalue[4] = 0
-	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
+	
+	if grupvalue[1] < 0: grupvalue[1] = 0
+	if grupvalue[2] < 0: grupvalue[2] = 0
+	if grupvalue[3] < 0: grupvalue[3] = 0
+	
+	grupTipe = 5
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
@@ -433,6 +458,7 @@ if $ARGS[0] = 'keep_playing_on':
 end
 
 if $ARGS[0] = 'gopnik initiation':
+	*clr & cla
 	menu_off = 1
 	!!this should be a new option that shows up at the apartment complex garages at 20:00 hours if joining the gopniks triggered it. Once it is triggered it doesn''t show up again unless Sveta triggers the gopnik invite again for some reason.
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/lenameet.jpg"></center>'
@@ -521,7 +547,6 @@ if $ARGS[0] = 'walkoff':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 	'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
 
-	!!have this auto dump you after the text back onto the residential street of Pavlovsk
 	act 'Leave the gang': gt 'pavResidential'
 end
 
@@ -622,18 +647,24 @@ if $ARGS[0] = 'noslut':
 	gs 'gschool_socialchg', 'group_rel_change','gopniks', -10
 	gs 'stat'
 
-	!!have this auto dump you after the text back onto the residential street of Pavlovsk
 	act 'Leave the gang': gt 'pavResidential'
 end
 
 if $ARGS[0] = 'gopnik party':
+	*clr & cla
 	menu_off = 1
-	grupvalue[2] -= 20
-	grupvalue[3] -= 20
-	grupvalue[1] -= 20
-	gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
+	grupvalue[1] -= 50
+	grupvalue[2] -= 30
+	grupvalue[3] -= 50
+		
+	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
+	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
+	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+				
 	grupTipe = 4
 
+!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/hall.jpg"></center>'
 	'You follow Lena and Lera who talk the whole way about how awesome that was and about how you did a good job. Upon arriving at old school, Lena and Lara slip through the busted front door, down the main hallway. Straight to see Vitek, who is waiting in the old school offices, with the rest of the gopniks.'
 	minut += 10
@@ -1307,6 +1338,7 @@ if $ARGS[0] = 'tRadomir':
 end
 
 if $ARGS[0] = 'tValentin':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big43.jpg"></center>'
 	'You approach Valentin. He smiles and greets you, "Hi <<$pcs_nickname>>. Are you enjoying yourself?"'
 	'You smile back and greet him back, "Hi Valentin. Yeah, it''s been pretty fun so far."'
@@ -1368,6 +1400,7 @@ if $ARGS[0] = 'tValentin':
 end
 
 if $ARGS[0] = 'tArkadi':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big41.jpg"></center>'
 	'You notice Arkadi doesn''t seem to be all that happy, as he listens to Radomir. You approach him, wanting to cheer him up, "What''s up?" you ask.'
 	'Arkadi looks at you, spits on the side and says, "Nothing much. Just another boring day here in Pavlovsk. Man this place sucks monkey balls."'
@@ -1404,6 +1437,7 @@ if $ARGS[0] = 'tArkadi':
 end
 
 if $ARGS[0] = 'tAnushka':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
 	'You sit down on the sofa next to Anushka. She gives you a big grin, "Hiya <<$pcs_nickname>> what have you been up to?" You notice a blunt that''s been placed on the table.'
 	'You shrug your shoulders, "Nothing much. Been talking to people, having fun."'
@@ -1413,6 +1447,18 @@ if $ARGS[0] = 'tAnushka':
 	minut += 2
 	gs 'stat'
 
+	act 'No thanks':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/smokemakeout.jpg"></center>'
+		'You shake your head, "No, no I''m not in the mood for that. I was just surprised there was anything of it left unsmoked."'
+		'Anushka smiles, and if to prove you right. Lites it up and takes a long drag off it. Then she grabs Alyona and they kiss or share smoke, or a bit of both for a bit."'
+		'Feeling a bit akward watching it you decided to leave. "Well, I should go mingle, you girls have fun." You are not even sure if they heard your or even care.'
+		minut += 2
+		gs 'stat'
+
+		act 'Move away': gt 'gschool_socialchg', 'lounge'
+	end
+	
 	act 'Sure':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/smoking.jpg"></center>'
@@ -1439,20 +1485,10 @@ if $ARGS[0] = 'tAnushka':
 			act 'Move away': gt 'gschool_socialchg', 'lounge'
 		end
 	end
-	act 'No thanks':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/smokemakeout.jpg"></center>'
-		'You shake your head, "No, no I''m not in the mood for that. I was just surprised there was anything of it left unsmoked."'
-		'Anushka smiles, and if to prove you right. Lites it up and takes a long drag off it. Then she grabs Alyona and they kiss or share smoke, or a bit of both for a bit."'
-		'Feeling a bit akward watching it you decided to leave. "Well, I should go mingle, you girls have fun." You are not even sure if they heard your or even care.'
-		minut += 2
-		gs 'stat'
-
-		act 'Move away': gt 'gschool_socialchg', 'lounge'
-	end
 end
 
 if $ARGS[0] = 'tAlyona':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/nushaly.jpg"></center>'
 	'You sit down on the sofa next to Alyona, while Anushka smiles at you and takes another long hit of the joint she is smoking. "So I''ve heard about that little adventure of yours earlier today. Must''ve been excited."'
 	'You nod, "Yeah, it was very fun. It was a pretty wild thing to do."'
@@ -1486,6 +1522,7 @@ end
 
 
 if $ARGS[0] = 'tEkaterina':
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big46.jpg"></center>'
 	'Seeing Ekaterina standing by herself you walk over to her thinking about to check up if everything is alright with her.'
 	'"Is everything okay?" you ask as you come close.'
@@ -1531,15 +1568,25 @@ if $ARGS[0] = 'tEkaterina':
 end
 
 if $ARGS[0] = 'gopnik slut':
-	grupvalue[2] -= 20
-	grupvalue[3] -= 20
-	grupvalue[1] -= 20
-	gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
+	*clr & cla
+	menu_off = 1
+	minut += 10
+	gs 'stat'
+	grupvalue[1] -= 50
+	grupvalue[2] -= 30
+	grupvalue[3] -= 50
+		
+	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
+	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
+	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+				
 	grupTipe = 4
+	
+!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', 5
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/hall.jpg"></center>'
 	'You follow Lena and Lera who don''t really talk to you during the walk to the old school, you get the feeling you might have made a mistake. But you agreed to be the party slut and you are not sure they would even let you backout now. Once at the old school they slip through the busted front door, down the main hallway, that leads to the old offices and teachers lounge.'
-	minut += 10
-	gs 'stat'
+	
 
 	act 'Join the party':
 		cla & *clr
@@ -1723,14 +1770,15 @@ if $ARGS[0] = 'group_rel_change':
 	if $ARGS[1] = 'gopniks': ntemp = 4
 	if $ARGS[1] = 'outcasts': ntemp = 5
 	if $ARGS[1] = 'teachers': ntemp = 6
-	temp = arrsize('grupTipe')
-:gs_socloop
-	temp -= 1
-	if grupTipe[temp] = ntemp:
-		npc_rel[$school_static_num[temp]] += ARGS[2]
-		npc_rel[$school_static_num[temp]] = min(npc_rel[$school_static_num[temp]],100)
-		npc_rel[$school_static_num[temp]] = max(npc_rel[$school_static_num[temp]],0)
+	temp = arrsize('npc_dna')
+	
+	:gs_socloop
+	if npc_grupTipe['A<<temp>>'] = ntemp:
+		npc_rel['A<<temp>>'] += ARGS[2]
+		npc_rel['A<<temp>>'] = min(npc_rel['A<<temp>>'],100)
+		npc_rel['A<<temp>>'] = max(npc_rel['A<<temp>>'],0)
 	end
+	temp -= 1
 	if temp > 1: jump 'gs_socloop'
 end
 

+ 1 - 1
locations/hairsalon.qsrc

@@ -583,7 +583,7 @@ if $ARGS[0] = 'dyehair':
 			cla
 			*clr
 			'"I want to go back to my natural hair colour." you say as you pick at your hair in the mirror, "I don''t think <<$pcs_haircol>> is working for me."' 
-			'"Sure thing!", she says in a chearful way, "Why don''t you take a seat?"'
+			'"Sure thing!", she says in a cheerful way, "Why don''t you take a seat?"'
 			'"We''ll be done in no time!", she says and points your over to sit down on one of the seats.'
 
 			act 'Sit down':

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