Browse Source

[fixed] Remaining 'pcs_willpwr +=' removal. Left a select few, but added comments for easier locating.

Sicaa 4 năm trước cách đây
mục cha
commit
301c95c39e
57 tập tin đã thay đổi với 302 bổ sung358 xóa
  1. 0 1
      locations/FedorEv2.qsrc
  2. 4 6
      locations/Gadgarden.qsrc
  3. 1 2
      locations/HotelRoom.qsrc
  4. 0 2
      locations/IrinaRoom.qsrc
  5. 149 152
      locations/Komp.qsrc
  6. 6 7
      locations/Miroslava.qsrc
  7. 5 7
      locations/Serge_Shulgin.qsrc
  8. 1 10
      locations/Serge_kuh.qsrc
  9. 0 4
      locations/TV.qsrc
  10. 0 2
      locations/albinahome.qsrc
  11. 2 1
      locations/backwater.qsrc
  12. 0 1
      locations/balkon2.qsrc
  13. 0 1
      locations/bed.qsrc
  14. 0 1
      locations/brother_voyeur.qsrc
  15. 0 1
      locations/cfnm.qsrc
  16. 0 1
      locations/club.qsrc
  17. 0 2
      locations/din_van.qsrc
  18. 3 4
      locations/downlibrary.qsrc
  19. 2 4
      locations/etoexhib.qsrc
  20. 19 19
      locations/father.qsrc
  21. 0 5
      locations/foto.qsrc
  22. 1 0
      locations/gLakeNude.qsrc
  23. 1 0
      locations/gadfield.qsrc
  24. 2 1
      locations/gadforestrelax.qsrc
  25. 31 29
      locations/gadriver.qsrc
  26. 2 1
      locations/gadukino.qsrc
  27. 3 7
      locations/gdkbibl.qsrc
  28. 0 1
      locations/gschool_boys_bathroom.qsrc
  29. 0 1
      locations/gschool_girls_bathroom.qsrc
  30. 0 2
      locations/hunters.qsrc
  31. 0 2
      locations/kafe2.qsrc
  32. 0 1
      locations/kinoM.qsrc
  33. 0 2
      locations/kisameQW.qsrc
  34. 1 5
      locations/kotovSex.qsrc
  35. 1 2
      locations/krutishi.qsrc
  36. 0 1
      locations/kuhr.qsrc
  37. 1 2
      locations/kuhr2x.qsrc
  38. 26 25
      locations/lesbimistress.qsrc
  39. 1 2
      locations/liam.qsrc
  40. 3 3
      locations/mitkasex.qsrc
  41. 0 1
      locations/nastja.qsrc
  42. 0 1
      locations/obj_din.qsrc
  43. 0 1
      locations/park.qsrc
  44. 0 2
      locations/parkivent.qsrc
  45. 0 1
      locations/parks.qsrc
  46. 0 1
      locations/pavtrain_market.qsrc
  47. 3 4
      locations/placer_sex.qsrc
  48. 0 1
      locations/podezdM.qsrc
  49. 0 1
      locations/qwmeet.qsrc
  50. 10 7
      locations/rolanbath.qsrc
  51. 3 2
      locations/sauna.qsrc
  52. 0 1
      locations/sitr.qsrc
  53. 2 3
      locations/sitr2x.qsrc
  54. 11 5
      locations/succubus.qsrc
  55. 4 3
      locations/swamp_yard.qsrc
  56. 2 3
      locations/swamphouse.qsrc
  57. 2 1
      locations/ybass.qsrc

+ 0 - 1
locations/FedorEv2.qsrc

@@ -169,7 +169,6 @@ if $ARGS[0] = 'Cinema':
 			*clr & cla
 			pcs_health += 10
 			pcs_mood += 20
-			!pcs_willpwr += 20
 			pcs_energy += 20
 			pcs_hydra += 50
 			cumspclnt = 2

+ 4 - 6
locations/Gadgarden.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'garden':
             work_garden = 0
 		    grandmahelp += 3
 		    stren_exp += 1
-		    fat -= RAND(1,5)
+		    fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
 		    gs 'stat'
 			
@@ -60,7 +60,7 @@ if $ARGS[0] = 'garden':
 		    water_garden = 0
 		    grandmahelp += 1
 		    vital_exp += 1
-		    fat -= RAND(1,2)
+		    fat -= rand(1,2)
 		    hndiwrk_exp += rand(0,3)
 		    gs 'stat'
 			
@@ -80,7 +80,7 @@ if $ARGS[0] = 'garden':
 		    harvest_garden = 0
 		    grandmahelp += 3
 		    stren_exp += 1
-		    fat -= RAND(1,3)
+		    fat -= rand(1,3)
 		    hndiwrk_exp += rand(3,9)
 		    gs 'stat'
 			
@@ -129,7 +129,6 @@ if $ARGS[0] = 'strawberry':
 			pcs_mood += 10
 			pcs_hydra += 40
 			pcs_energy += 15
-			pcs_willpwr += willpowermax/10
 			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
 			gs 'stat'
 			
@@ -196,7 +195,6 @@ if $ARGS[0] = 'fruit_garden':
 			pcs_mood += 10
 			pcs_hydra += 20
 			pcs_energy += 30
-			pcs_willpwr += willpowermax/10
 			cumspclnt = 2 & gs 'cum_cleanup' & pcs_breath = 0
 			gs 'stat'
 			
@@ -217,7 +215,7 @@ if $ARGS[0] = 'fruit_garden':
 			fruit_collect = 0
 			grandmahelp += 5
 		    agil_exp += 1
-            fat -= RAND(1,3)
+            fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 			

+ 1 - 2
locations/HotelRoom.qsrc

@@ -158,8 +158,7 @@ if hotelroom=3:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/
 $din_wath_tv_h2 = {
 	cls
 	minut += 60
-	pcs_willpwr += RAND(5,10)
-	pcs_mood += RAND(10,20)
+	pcs_mood += rand(10,20)
 	gs'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv0,'+rand(0,4)+'.jpg"></center>'

+ 0 - 2
locations/IrinaRoom.qsrc

@@ -102,7 +102,6 @@ if $ARGS[0] = 'sex':
 	*clr
 	pcs_mood += 50
 	pcs_mood = 100
-	pcs_willpwr += 100
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/sex/irinasex.jpg"></center>'
 
@@ -254,7 +253,6 @@ if $ARGS[0] = 'first9':
 	clr
 	*clr
 	pcs_mood = 100
-	pcs_willpwr += 100
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/sex/irinaqw7.jpg"></center>'
 	'Iras lips and tongue quickly have an effect and you finish with passionate moans.'

+ 149 - 152
locations/Komp.qsrc

@@ -147,7 +147,6 @@ if $ARGS[0] = 'porno':
 		act 'Watch porn':
 			cls
 			elektro += 3
-			pcs_willpwr += rand(5, 10)
 			pcs_mood += rand(10, 20)
 			internet -= 1
 			gs 'stat'
@@ -205,7 +204,6 @@ if $ARGS[0] = 'pasians':
 	*clr
 	minut += 20
 	elektro += 3
-	pcs_willpwr += rand(5, 10)
 	pcs_mood += rand(10, 20)
 
 	gs 'stat'
@@ -240,7 +238,6 @@ if $ARGS[0] = 'znak':
 			act 'Leave this website':gt 'Komp', 'brows'
 		end
 	elseif home_cur ! 1 and home_cur ! 3 and home_cur ! 4 and home_cur ! 5:
-		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(5, 10)
 		'You spend time looking at the various profiles, but it won''t let you register unless you have your own home and it is set as your current home.'
 		'Still, some of the pictures were quite raunchy and the more desperate profiles were really funny.'
@@ -524,7 +521,7 @@ if $ARGS[0] = 'kursak':
 	internet -= 1
 	pcs_mood -= 10
 	compskl_exp += 1
-	kursovik = kursovik + RAND(pcs_intel/20,pcs_intel/10)
+	kursovik = kursovik + rand(pcs_intel/20,pcs_intel/10)
 	if kursovik > 100:kursovik = 100
 	'<center><b>Coursework</b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/computer/kursak.jpg"></center>'
@@ -672,7 +669,7 @@ end
 if $ARGS[0] = 'waitclients':
 	gs'family'
 	cls
-	minut += RAND(1,4)
+	minut += rand(1,4)
 	if mfccum > 0: mfcdaycum = daystart
 
 	mfcclients += 1
@@ -681,71 +678,71 @@ if $ARGS[0] = 'waitclients':
 		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(1,3)
+					camclients -= rand(1,3)
 				else
-					camclients += RAND(1,3)
+					camclients += rand(1,3)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(3,5)
+					camclients -= rand(3,5)
 				else
-					camclients += RAND(3,5)
+					camclients += rand(3,5)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(4,8)
+					camclients -= rand(4,8)
 				else
-					camclients += RAND(4,8)
+					camclients += rand(4,8)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,15)
+					camclients -= rand(5,15)
 				else
-					camclients += RAND(5,15)
+					camclients += rand(5,15)
 				end
 			end
-			chancetips = RAND(0,100)
-			clientask = RAND(0,100)
+			chancetips = rand(0,100)
+			clientask = rand(0,100)
 			if chancetips >= 95 and camclients >= 250:
 				if webpopular >= 50:
-					tokens += RAND(10,30)
+					tokens += rand(10,30)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		else
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(3,5)
+					camclients -= rand(3,5)
 				else
-					camclients += RAND(3,5)
+					camclients += rand(3,5)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(5,8)
+					camclients -= rand(5,8)
 				else
-					camclients += RAND(5,8)
+					camclients += rand(5,8)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,12)
+					camclients -= rand(5,12)
 				else
-					camclients += RAND(5,12)
+					camclients += rand(5,12)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(8,15)
+					camclients -= rand(8,15)
 				else
-					camclients += RAND(8,15)
+					camclients += rand(8,15)
 				end
 			end
-			chancetips = RAND(5,100)
-			clientask = RAND(5,100)
+			chancetips = rand(5,100)
+			clientask = rand(5,100)
 			if chancetips >= 95 and camclients >= 200:
 				if webpopular >= 50:
-					tokens += RAND(10,40)
+					tokens += rand(10,40)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		end
@@ -753,71 +750,71 @@ if $ARGS[0] = 'waitclients':
 		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(1,3)
+					camclients -= rand(1,3)
 				else
-					camclients += RAND(1,3)
+					camclients += rand(1,3)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(1,5)
+					camclients -= rand(1,5)
 				else
-					camclients += RAND(1,5)
+					camclients += rand(1,5)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,10)
+					camclients -= rand(5,10)
 				else
-					camclients += RAND(5,10)
+					camclients += rand(5,10)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(6,15)
+					camclients -= rand(6,15)
 				else
-					camclients += RAND(6,15)
+					camclients += rand(6,15)
 				end
 			end
-			chancetips = RAND(5,90)
-			clientask = RAND(5,100)
+			chancetips = rand(5,90)
+			clientask = rand(5,100)
 			if chancetips >= 85 and camclients >= 230:
 				if webpopular >= 50:
-					tokens += RAND(10,35)
+					tokens += rand(10,35)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		else
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(3,6)
+					camclients -= rand(3,6)
 				else
-					camclients += RAND(3,6)
+					camclients += rand(3,6)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(5,10)
+					camclients -= rand(5,10)
 				else
-					camclients += RAND(5,10)
+					camclients += rand(5,10)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(7,12)
+					camclients -= rand(7,12)
 				else
-					camclients += RAND(7,12)
+					camclients += rand(7,12)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,15)
+					camclients -= rand(10,15)
 				else
-					camclients += RAND(10,15)
+					camclients += rand(10,15)
 				end
 			end
-			chancetips = RAND(10,90)
-			clientask = RAND(10,100)
+			chancetips = rand(10,90)
+			clientask = rand(10,100)
 			if chancetips >= 85 and camclients >= 200:
 				if webpopular >= 50:
-					tokens += RAND(15,35)
+					tokens += rand(15,35)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		end
@@ -825,71 +822,71 @@ if $ARGS[0] = 'waitclients':
 		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(1,3)
+					camclients -= rand(1,3)
 				else
-					camclients += RAND(1,3)
+					camclients += rand(1,3)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(2,5)
+					camclients -= rand(2,5)
 				else
-					camclients += RAND(2,5)
+					camclients += rand(2,5)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,15)
+					camclients -= rand(5,15)
 				else
-					camclients += RAND(5,15)
+					camclients += rand(5,15)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(5,20)
+					camclients -= rand(5,20)
 				else
-					camclients += RAND(5,20)
+					camclients += rand(5,20)
 				end
 			end
-			chancetips = RAND(10,80)
-			clientask = RAND(10,100)
+			chancetips = rand(10,80)
+			clientask = rand(10,100)
 			if chancetips >= 75 and camclients >= 200:
 				if webpopular >= 50:
-					tokens += RAND(10,40)
+					tokens += rand(10,40)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		else
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(4,7)
+					camclients -= rand(4,7)
 				else
-					camclients += RAND(4,7)
+					camclients += rand(4,7)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(5,12)
+					camclients -= rand(5,12)
 				else
-					camclients += RAND(5,12)
+					camclients += rand(5,12)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(9,15)
+					camclients -= rand(9,15)
 				else
-					camclients += RAND(9,15)
+					camclients += rand(9,15)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(15,20)
+					camclients -= rand(15,20)
 				else
-					camclients += RAND(15,20)
+					camclients += rand(15,20)
 				end
 			end
-			chancetips = RAND(15,80)
-			clientask = RAND(15,100)
+			chancetips = rand(15,80)
+			clientask = rand(15,100)
 			if chancetips >= 75 and camclients >= 170:
 				if webpopular >= 50:
-					tokens += RAND(15,45)
+					tokens += rand(15,45)
 				else
-					tokens += RAND(1,20)
+					tokens += rand(1,20)
 				end
 			end
 		end
@@ -897,71 +894,71 @@ if $ARGS[0] = 'waitclients':
 		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(1,4)
+					camclients -= rand(1,4)
 				else
-					camclients += RAND(1,4)
+					camclients += rand(1,4)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(3,10)
+					camclients -= rand(3,10)
 				else
-					camclients += RAND(3,10)
+					camclients += rand(3,10)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,20)
+					camclients -= rand(10,20)
 				else
-					camclients += RAND(10,20)
+					camclients += rand(10,20)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,30)
+					camclients -= rand(10,30)
 				else
-					camclients += RAND(10,30)
+					camclients += rand(10,30)
 				end
 			end
-			chancetips = RAND(15,50)
-			clientask = RAND(15,100)
+			chancetips = rand(15,50)
+			clientask = rand(15,100)
 			if chancetips >= 45 and camclients >= 150:
 				if webpopular >= 50:
-					tokens += RAND(20,50)
+					tokens += rand(20,50)
 				else
-					tokens += RAND(5,25)
+					tokens += rand(5,25)
 				end
 			end
 		else
 			if webpopular < 15:
 				if mfcclients > 3:
-					camclients -= RAND(3,8)
+					camclients -= rand(3,8)
 				else
-					camclients += RAND(3,8)
+					camclients += rand(3,8)
 				end
 			elseif webpopular >= 15 and webpopular < 35:
 				if mfcclients > 3:
-					camclients -= RAND(3,15)
+					camclients -= rand(3,15)
 				else
-					camclients += RAND(3,15)
+					camclients += rand(3,15)
 				end
 			elseif webpopular >= 35 and webpopular < 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,20)
+					camclients -= rand(10,20)
 				else
-					camclients += RAND(10,20)
+					camclients += rand(10,20)
 				end
 			elseif webpopular >= 75:
 				if mfcclients > 3:
-					camclients -= RAND(10,30)
+					camclients -= rand(10,30)
 				else
-					camclients += RAND(10,30)
+					camclients += rand(10,30)
 				end
 			end
-			chancetips = RAND(20,50)
-			clientask = RAND(20,100)
+			chancetips = rand(20,50)
+			clientask = rand(20,100)
 			if chancetips >= 45 and camclients >= 100:
 				if webpopular >= 50:
-					tokens += RAND(30,50)
+					tokens += rand(30,50)
 				else
-					tokens += RAND(10,30)
+					tokens += rand(10,30)
 				end
 			end
 	 	end
@@ -994,13 +991,13 @@ if $ARGS[0] = 'waitclients':
 			webpopular += 1
 			topmfc = 0
 			if webpopular < 15:
-				tokens += RAND(10,25)
+				tokens += rand(10,25)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(15,25)
+				tokens += rand(15,25)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 75:
-				tokens += RAND(50,150)
+				tokens += rand(50,150)
 			end
 			gs 'stat'
 
@@ -1035,13 +1032,13 @@ if $ARGS[0] = 'waitclients':
 			webpopular += 1
 			backmfc = 0
 			if webpopular < 15:
-				tokens += RAND(10,25)
+				tokens += rand(10,25)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(15,25)
+				tokens += rand(15,25)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 75:
-				tokens += RAND(50,150)
+				tokens += rand(50,150)
 			end
 			gs 'stat'
 
@@ -1077,13 +1074,13 @@ if $ARGS[0] = 'waitclients':
 			webpopular += 1
 			backmfc = 0
 			if webpopular < 15:
-				tokens += RAND(15,25)
+				tokens += rand(15,25)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(20,30)
+				tokens += rand(20,30)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 75:
-				tokens += RAND(50,150)
+				tokens += rand(50,150)
 			end
 			gs 'stat'
 
@@ -1117,13 +1114,13 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 			webpopular += 1
 			if webpopular < 15:
-				tokens += RAND(20,25)
+				tokens += rand(20,25)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 75:
-				tokens += RAND(100,150)
+				tokens += rand(100,150)
 			end
 			gs 'stat'
 
@@ -1164,13 +1161,13 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 			webpopular += 1
 			if webpopular < 15:
-				tokens += RAND(10,25)
+				tokens += rand(10,25)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(15,25)
+				tokens += rand(15,25)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 75:
-				tokens += RAND(50,150)
+				tokens += rand(50,150)
 			end
 			gs 'stat'
 			if analplugIN = 1:
@@ -1223,18 +1220,18 @@ if $ARGS[0] = 'waitclients':
 			webpopular += 2
 			backmfc = 0
 			if pcs_apprnc > 100:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			else
-				tokens += RAND(40,75)
+				tokens += rand(40,75)
 			end
 			if webpopular < 15:
-				tokens += RAND(25,50)
+				tokens += rand(25,50)
 			elseif webpopular >= 15 and webpopular < 35:
-				tokens += RAND(50,100)
+				tokens += rand(50,100)
 			elseif webpopular >= 35 and webpopular < 75:
-				tokens += RAND(100,150)
+				tokens += rand(100,150)
 			elseif webpopular >= 75:
-				tokens += RAND(100,200)
+				tokens += rand(100,200)
 			end
 			gs 'stat'
 			if analplugIN = 0:
@@ -1368,20 +1365,20 @@ if $ARGS[0] = 'waitclients':
 		act 'Idly play with your boobs':
 			cls
 			if webpopular < 15:
-				camclients += RAND(3,6)
+				camclients += rand(3,6)
 			elseif webpopular >= 15 and webpopular < 35:
-				camclients += RAND(5,10)
+				camclients += rand(5,10)
 			elseif webpopular >= 35 and webpopular < 75:
-				camclients += RAND(10,20)
+				camclients += rand(10,20)
 			elseif webpopular >= 75:
-				camclients += RAND(15,35)
+				camclients += rand(15,35)
 			end
 			if alko >= 4:
 				gs 'pain', 2, 'slap', 'breasts'
 			end
-			chancetips = RAND(0,100)
+			chancetips = rand(0,100)
 			if chancetips >= 85:
-				tokens += RAND(2,10)
+				tokens += rand(2,10)
 			end
 			gs 'stat'
 			if alko >= 4:
@@ -1422,17 +1419,17 @@ if $ARGS[0] = 'waitclients':
 		act 'Play with your pussy':
 			cls
 			if webpopular < 15:
-				camclients += RAND(5,10)
+				camclients += rand(5,10)
 			elseif webpopular >= 15 and webpopular < 35:
-				camclients += RAND(10,15)
+				camclients += rand(10,15)
 			elseif webpopular >= 35 and webpopular < 75:
-				camclients += RAND(10,30)
+				camclients += rand(10,30)
 			elseif webpopular >= 75:
-				camclients += RAND(15,40)
+				camclients += rand(15,40)
 			end
-			chancetips = RAND(0,100)
+			chancetips = rand(0,100)
 			if chancetips >= 75:
-				tokens += RAND(10,15)
+				tokens += rand(10,15)
 			end
 			gs 'stat'
 
@@ -1464,21 +1461,21 @@ if $ARGS[0] = 'waitclients':
 		act'Play with your ass':
 			cls
 			if webpopular < 15:
-				camclients += RAND(5,10)
+				camclients += rand(5,10)
 			elseif webpopular >= 15 and webpopular < 35:
-				camclients += RAND(10,15)
+				camclients += rand(10,15)
 			elseif webpopular >= 35 and webpopular < 75:
-				camclients += RAND(10,30)
+				camclients += rand(10,30)
 			elseif webpopular >= 75:
-				camclients += RAND(15,40)
+				camclients += rand(15,40)
 			end
 			if pcs_ass < 10:analplay += 1
 			mfcclients = 0
 			minut += 2
-			pcs_horny += RAND(5,10)
-			chancetips = RAND(0,100)
+			pcs_horny += rand(5,10)
+			chancetips = rand(0,100)
 			if chancetips >= 60:
-				tokens += RAND(10,20)
+				tokens += rand(10,20)
 			end
 			gs 'stat'
 
@@ -1506,19 +1503,19 @@ if $ARGS[0] = 'waitclients':
 		act'Pinch your nipples hard':
 			cls
 			if webpopular < 15:
-				camclients += RAND(5,10)
+				camclients += rand(5,10)
 			elseif webpopular >= 15 and webpopular < 35:
-				camclients += RAND(10,15)
+				camclients += rand(10,15)
 			elseif webpopular >= 35 and webpopular < 75:
-				camclients += RAND(10,30)
+				camclients += rand(10,30)
 			elseif webpopular >= 75:
-				camclients += RAND(15,40)
+				camclients += rand(15,40)
 			end
 			mfcclients = 0
 			gs 'pain', 2, 'pinch', 'nipples'
-			chancetips = RAND(0,100)
+			chancetips = rand(0,100)
 			if chancetips >= 75:
-				tokens += RAND(20,40)
+				tokens += rand(20,40)
 			end
 			gs 'stat'
 

+ 6 - 7
locations/Miroslava.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 
 	gs 'boyStat', 'A60'
 	girlage = age
-	temp = RAND(0,20)
+	temp = rand(0,20)
 	mira_temp = rand(0,20)
 
 	!MiraLoc tells us where Mira is Located
@@ -79,7 +79,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				menu_off = 1
 				*clr & cla
 				minut += 60
-				if salo > 3 and cheatNoFat = 0:salo -= RAND(1,3)
+				if salo > 3 and cheatNoFat = 0:salo -= rand(1,3)
 				fat -= 5
 				run_exp += 1
 				gs 'sweat', 'add', 10
@@ -118,7 +118,6 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				cumspclnt = 4 & gs 'cum_cleanup'
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
-				pcs_willpwr += 5
 				if pcs_stren < 30:stren_exp += 1
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 				gs 'stat'
@@ -570,7 +569,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					menu_off = 1
 					*clr & cla
 					minut += 60
-					if npc_rel['A60'] < 20: npc_rel['A60'] += RAND(1,2)
+					if npc_rel['A60'] < 20: npc_rel['A60'] += rand(1,2)
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You ask your grandparents if Mira can sleep over. They tell you it''s fine with them, so you invite Mira to sleep over.'
@@ -840,7 +839,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						act 'Confirm your wish':
 							*clr & cla
 							minut += 5
-							pcs_horny += RAND(5,10)
+							pcs_horny += rand(5,10)
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_nude1.jpg"></center>'
 							'"No, you freely made the promise of three wishes. Anything I want. I want you to strip naked and head through the village to the fields. I will meet you there with your cloths. Now, do as you promised," you stated in an adamant voice.'
@@ -850,7 +849,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 							act 'Watch':
 								*clr & cla
 								minut += 5
-								pcs_horny += RAND(5,10)
+								pcs_horny += rand(5,10)
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_nude2.jpg"></center>'
 								'Mira hesitantly begins to move through the village street. You look at her and the reaction of passers-by.'
@@ -858,7 +857,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 								act 'Look further':
 									*clr & cla
 									minut += 15
-									pcs_horny += RAND(5,10)
+									pcs_horny += rand(5,10)
 									Mira_no += rand(10,30)
 									miraday = daystart
 									npc_QW['A60'] = 21

+ 5 - 7
locations/Serge_Shulgin.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'hide':
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/vert/pr1.mp4"></video></center>'
 		'"I bet I could make you feel good, uncle Sergey... would you like that?" you whisper in his ear, with a devious smile on your face.'
 		'He doesn''t reply, but the burning desire in his eyes betrays him: he wants you badly. To drive your point home you press your tongue against your cheek hinting what you could do for him, if only he would let you...'
-		act 'Continue': gt 'Serge_Shulgin','hide','sleep_sex_oral_event<<RAND(1,3)>>'
+		act 'Continue': gt 'Serge_Shulgin','hide','sleep_sex_oral_event<<rand(1,3)>>'
 	end &!--- sleep_nameksex_oral ---
 
 	if $ARGS[1] = 'sleep_nameksex_rought':
@@ -218,7 +218,7 @@ if $ARGS[0] = 'hide':
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/vert/pr1.mp4"></video></center>'
 		'"I bet I could make you feel good, uncle Sergey... would you like that?" you whisper in his ear, with a devious smile on your face.'
 		'He doesn''t reply, but the burning desire in his eyes betrays him: he wants you badly. To drive your point home you press your tongue against your cheek hinting what you could do for him, if only he would let you...'
-		act 'Continue': gt 'Serge_Shulgin','hide','sleep_sex_rought_event<<RAND(1,2)>>'
+		act 'Continue': gt 'Serge_Shulgin','hide','sleep_sex_rought_event<<rand(1,2)>>'
 	end &!--- sleep_nameksex_rought ---
 	!--------------------!
 	!Leads to cunnilingus event!
@@ -368,7 +368,6 @@ if $ARGS[0] = 'hide':
 				act 'Continue':
 					*clr & cla
 					pcs_mood = 100
-					pcs_willpwr +=20
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cow'+rand(4,6)+'.mp4"></video></center>'
 					'After fucking you caringly for a few minutes, he rolls off you and lies on his back next to you. He gives you a peck on your cheek and whispers: "If you want to fuck me on your terms, now is your chance... it''s all yours."'
 					'You eagerly nod and mount him, quickly guiding his cock back to the entrance of your pussy. It feels quite slick from your juices already. Slowly grinding your hips against his pelvis, you begin to ride Sergey. Slowly and gently... you''re going to savour this moment, you tell yourself.'
@@ -421,7 +420,6 @@ if $ARGS[0] = 'hide':
 			act 'Continue':
 				*clr & cla
 				pcs_mood = 100
-				pcs_willpwr +=20
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/dog'+rand(1,11)+'.mp4"></video></center>'
 				'You don''t want him to finish already! You quickly get onto the bed on your hands and knees and wiggle your ass at him seductively.'
 				'Sergey positions the head of his dick against your wet folds and immediately drives his whole length inside you.'
@@ -564,7 +562,7 @@ if $ARGS[0] = 'hide':
 	end &!--- sleep_sex_rought_event2 ---
 
 	if $ARGS[1] = 'serge_textb':
-		serge_textb = RAND(0,6)
+		serge_textb = rand(0,6)
 		if serge_textb = 0:$serge_textb = 'When you ask about Vasily''s mother, Sergey shrugs: "It''s a short story, really. I met Vasily''s mother at my graduation party. We all got drunk and she and I had some fun. When she turned out to be pregnant, we got married. We didn''t have much of a say in the matter, that''s just how it worked back then. Shulga was born a few months after that. We tried to make it work, but she got bored and left me a year later when she got offered a job abroad, leaving Shulga with me. I haven''t heard from her since. It''s fine, though... me and him managed just fine, without her."'
 		if serge_textb = 1:$serge_textb = 'You spend fifteen minutes talking to Sergey about everyday things.'
 		if serge_textb = 2:$serge_textb = 'When you ask Sergey what he does for a living, he smiles and says: "I work in a factory where we produce bricks. I work the day shift, from 09:00 to 15:00, five days a week. I''m a foreman there, managing the laborers and keeping an eye on the machinery. Of course I pitch in as well, when the men need help. It''s dusty, hard work, and it doesn''t pay well, but it''s work worth doing!"'
@@ -577,7 +575,7 @@ if $ARGS[0] = 'hide':
 	end &!--- serge_textb ---
 
 	if $ARGS[1] = 'serge_textb2':
-		serge_textb2 = RAND(0,5)
+		serge_textb2 = rand(0,5)
 		if serge_textb2 = 0:$serge_textb2 = 'Sergey tells you a dirty joke.'
 		if serge_textb2 = 1:$serge_textb2 = 'Sergey tells you a dirty story.'
 		if serge_textb2 = 2:$serge_textb2 = 'Sergey tells you a funny story. It''s loaded with sexual innuendos and double entendres.'
@@ -590,7 +588,7 @@ The secretary blushes as she begins to unbutton her shirt, and replies: "For 100
 	end &!--- serge_textb2 ---
 
 	if $ARGS[1] = 'serge_tv_rand':
-		serge_tv_rand = RAND(0,11)
+		serge_tv_rand = rand(0,11)
 		if serge_tv_rand = 0:$serge_tv_rand = '<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvdance.mp4" width="748" height="540"></video></center>The TV currently shows a new music video, where mostly undressed girls shake their butts lewdly.'
 		if serge_tv_rand = 1:$serge_tv_rand = '<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvgeo1.mp4" width="750" height="540"></video></center>The TV currently shows a documentary about animals.'
 		if serge_tv_rand = 2:$serge_tv_rand = '<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvgeo2.mp4" width="746" height="540"></video></center>The TV currently shows a documentary about the world.'

+ 1 - 10
locations/Serge_kuh.qsrc

@@ -176,7 +176,6 @@ if $ARGS[0] = 'vodka':
 							act 'Continue':
 								*clr & cla
 								pcs_mood += 50
-								pcs_willpwr +=20
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/alko6.jpg"></center>'
 								'Sergey doesn''t say anything, but suddenly leans forward and gently runs his tongue over the insides of your pussy lips, touching your clitoris too on his way up.'
 								'You shudder when you feel his touch, and can''t help but thrust your hips forward. Sergey eagerly accepts your invitation and plunges his tongue inside you as far as he can, resting his nose against your crotch as he begins to fuck your pussy with his tongue.'
@@ -308,7 +307,7 @@ if $ARGS[0] = 'help_ev1':
 
 	$rand_kuh_izdev = 'izdev<<rand_kuh_izdev>>'
 
-	rand_kuh_sex = RAND(1,3)
+	rand_kuh_sex = rand(1,3)
 	$rand_kuh_sex = 'sex<<rand_kuh_sex>>'
 	
 	gs 'stat'
@@ -523,7 +522,6 @@ if $ARGS[0] = 'izdev2':
 									act 'Continue':
 										*clr & cla
 										pcs_mood += 15
-										pcs_willpwr +=20
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex6-10.jpg"></center>'
 										'Sergey pushes you with your back onto the table and pulls your legs up, immediately leading his cock back into your ass. He thrusts wildly against you and slaps your ass cheeks and thighs hard whenever he gets the chance, making you moan and cry out loudly.'
 										$orgasm_or = 'custom'
@@ -952,7 +950,6 @@ if $ARGS[0] = 'izdev9':
 							act 'Continue':
 								*clr & cla
 								gs 'cum_call','stomach',$boy,1
-								pcs_willpwr +=20
 								pcs_hairbsh = 0
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex5-8.jpg"></center>'
 								'A few minutes later, Sergey grabs your <<$pcs_haircol>> <<$curly>> in his fist and guides you to the ground, his cock never leaving your ass. You meekly let him guide you, this feels way too good to object! You plunged several fingers in your vagina by now, and are fingerbanging yourself to an orgasm while Sergey has his fun with your backside.'
@@ -1188,7 +1185,6 @@ if $ARGS[0] = 'izdev13':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								pcs_willpwr +=20
 								pcs_mood += 25
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/sex1-8.jpg"></center>'
@@ -1540,7 +1536,6 @@ if $ARGS[0] = 'izn2':
 	act 'Continue':
 		*clr & cla
 		pcs_mood += 50
-		pcs_willpwr +=10
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra'+rand(1,5)+'.mp4"></video></center>'
 		'"But I''m being selfish, I guess you want to orgasm too?" he grins. Without waiting for an answer he moves his hand between your legs, trying to find your clitoris. You''re still a bit ashamed of this situation, and squeeze your thighs together, making it more difficult for him.'
 		'A few minutes later he finds it anyway, and you immediately feel a surge through your body once his fingers finds your swollen clit. He twirls his finger across the surface, making you moan with pleasure - if he keeps that up, you''ll orgasm in no time!'
@@ -1581,7 +1576,6 @@ if $ARGS[0] = 'izn2':
 			act 'Continue':
 				*clr & cla
 				pcs_mood = 100
-				pcs_willpwr +=20
 				gs 'cum_call','anus',$boy,1
 				pcs_hairbsh = 0
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra'+rand(6,8)+'.mp4"></video></center>'
@@ -1651,7 +1645,6 @@ if $ARGS[0] = 'sex1':
 				*clr & cla
 				gs 'cum_call','face',$boy,1
 				pcs_mood = 100
-				pcs_willpwr +=20
 				pcs_hairbsh = 0
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex1-4.jpg"></center>'
 				'You''re very close to your orgasm when Sergey suddenly interrupts you. He wraps his arms around you and lifts you up, putting you down before him. "Uncle Sergey, I was just about to-" you complain, but he puts his finger over your lips and whispers: "Shh... I know. You''ll get there."'
@@ -1707,7 +1700,6 @@ if $ARGS[0] = 'sex2':
 					*clr & cla
 					minut +=10
 					pcs_mood = 100
-					pcs_willpwr +=20
 					gs 'cum_manage'
 					gs 'cum_call','',$boy,1
 					pcs_hairbsh = 0
@@ -1799,7 +1791,6 @@ if $ARGS[0] = 'sex3':
 						act 'Continue':
 							*clr & cla
 							pcs_mood = 100
-							pcs_willpwr +=20
 							gs 'cum_call','',$boy,1
 							pcs_hairbsh = 0
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex3-7.jpg"></center>'

+ 0 - 4
locations/TV.qsrc

@@ -29,7 +29,6 @@ end
 if $ARGS[0] = 'nokable':
 	*clr & cla
 	pcs_mood += 6
-	pcs_willpwr += rand(5, 10)
 	elektro += 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
@@ -44,7 +43,6 @@ end
 if $ARGS[0] = 'kable':
 	*clr & cla
 	pcs_mood += 12
-	pcs_willpwr += rand(10, 20)
 	elektro += 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
@@ -67,7 +65,6 @@ if $ARGS[0] = 'pav':
 		act 'Continue': gt 'TV', 'pav'
 	elseif tvtime = 1:
 		*clr & cla
-		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(5, 10)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
@@ -94,7 +91,6 @@ if $ARGS[0] = 'gad':
 		act 'Continue': gt 'TV', 'gad'
 	elseif tvtime = 1:
 		*clr & cla
-		pcs_willpwr += rand(5, 10)
 		pcs_mood += rand(5, 10)
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv'+rand(1,5)+'.mp4"></video></center>'

+ 0 - 2
locations/albinahome.qsrc

@@ -307,7 +307,6 @@ if $ARGS[0] = 'dressing':
 		*clr & cla
 		minut += 60
 		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.'
@@ -325,7 +324,6 @@ if $ARGS[0] = 'chat':
 		menu_off = 1
 		minut += 20
 		pcs_mood += 5
-		pcs_willpwr += 5
 		gs 'stat'
 		'<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.'

+ 2 - 1
locations/backwater.qsrc

@@ -46,7 +46,8 @@ if $ARGS[0] = '':
 			body_write = 0
 			minut += 30
 			pcs_mood += 10
-			pcs_willpwr += 5
+			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+			pcs_willpwr += 1
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
 

+ 0 - 1
locations/balkon2.qsrc

@@ -135,7 +135,6 @@ if $ARGS[0] = 'masopt':
 	gs 'stat'
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
 	pcs_mood += 15
-	pcs_willpwr += 15
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_dildo.jpg"></center>'
 
 	if dildo = 1:

+ 0 - 1
locations/bed.qsrc

@@ -20,7 +20,6 @@ if $ARGS[0] = 'mast':
 	menu_off = 1
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
 	pcs_mood += 15
-	pcs_willpwr += 15
 	pcs_vag += 1
 
 	if husband > 0 and housrA = 1 and husbandrink ! 10:

+ 0 - 1
locations/brother_voyeur.qsrc

@@ -316,7 +316,6 @@ if $ARGS[0] = 'showertalk2':
 						cla & *clr
 						if pcs_inhib < 40:inhib_exp += rand(1,3)
 						pcs_mood += 15
-						pcs_willpwr += 15
 						bro_mast_look = rand(1,3)
 						$orgasm_or = 'yes'
 						gs 'arousal', 'masturbate', 10

+ 0 - 1
locations/cfnm.qsrc

@@ -189,7 +189,6 @@ if $ARGS[0] = 'sex':
 	if stripguy = 0:stripguy = 1 & guy + 1
 
 	pcs_mood += 15
-	pcs_willpwr += 15
 	pcs_vag += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/sex.jpg"></center>'

+ 0 - 1
locations/club.qsrc

@@ -268,7 +268,6 @@ if $ARGS[0] = 'dance':
 			danc_exp += 1
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			pcs_mood += 10
-			pcs_willpwr += 10
 			clrand = rand(0, 400)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club4.jpg"></center>'
 			'The dance floor is packed and everyone is dancing very closely, you could put your hand on the shoulder of the guy in front of you but you when you turn around your chest is right up against another. You don''t let it bother you as everyone is forced to dance this close.'

+ 0 - 2
locations/din_van.qsrc

@@ -139,7 +139,6 @@ $shower = {
 
 				if pcs_inhib < 30:inhib_exp += rand(1,3)
 				pcs_mood += 15
-				pcs_willpwr += 15
 				$orgasm_or = 'yes'
 				gs 'arousal', 'masturbate', 10
 				gs 'arousal', 'end'
@@ -240,7 +239,6 @@ $bath = {
 
 			if pcs_inhib < 30:inhib_exp += rand(1,3)
 			pcs_mood += 15
-			pcs_willpwr += 15
 			$orgasm_or = 'yes'
 			gs 'arousal', 'masturbate', 10
 			gs 'arousal', 'end'

+ 3 - 4
locations/downlibrary.qsrc

@@ -29,11 +29,11 @@ $downlibrary['BookStudy'] = {
 	if $downlibrary['Skill'] ! '':
 		dynamic "
 			if pcs_<<$downlibrary['Skill']>> >= 50:
-				<<$downlibrary['Skill']>>_exp += RAND(0,1)
+				<<$downlibrary['Skill']>>_exp += rand(0,1)
 			elseif pcs_<<$downlibrary['Skill']>> >= 25:
-				<<$downlibrary['Skill']>>_exp += RAND(1,2)
+				<<$downlibrary['Skill']>>_exp += rand(1,2)
 			else
-				<<$downlibrary['Skill']>>_exp += RAND(1,3)
+				<<$downlibrary['Skill']>>_exp += rand(1,3)
 			end"
 	end
 
@@ -60,7 +60,6 @@ if hour >= 8 and hour <= 18:
 
 	act 'Read an entertaining book (1:00)':
 		pcs_mood = 100
-		pcs_willpwr += 100
 
 		dynamic $downlibrary['BookStudy'], ''
 

+ 2 - 4
locations/etoexhib.qsrc

@@ -625,7 +625,6 @@ if $ARGS[0] = 'pos18':
 				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 				pcs_mood += 10
-				pcs_willpwr += 10
 				frost = 0
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 				'The music is quite old, but catchy. You have fun dancing, paying no attention to anyone.'
@@ -685,7 +684,6 @@ if $ARGS[0] = 'pos18':
 				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 				pcs_mood += 10
-				pcs_willpwr += 10
 				frost = 0
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
 				'The music is quite old, but catchy. You have fun dancing, paying no attention to anyone.'
@@ -1085,7 +1083,7 @@ if $ARGS[0] = 'pos27':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_karandash.jpg"></center>'
 				'Pacing between rows, you go down on your haunches, pretending to pick up a fallen pencil. However, sitting in the back row some of the guys could see under your skirt. Their eyes widened as they could see everything.'
 				if $pantyworntype = 'none':
-					temp = RAND(1,100)
+					temp = rand(1,100)
 					if temp >= 90:
 						pcs_mood -= 5
 						teachlevel -= 2
@@ -1122,7 +1120,7 @@ if $ARGS[0] = 'pos27':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_rak.jpg"></center>'
 				'While explaining stuff you "accidentally" drop the chalk. At first, you try to pick it up by bending down. You can''t grab it, realizing that the chalk is out of reach. You get down on all fours, with your ass up. Those who sat nearby witnessed an unforgettable show.'
 				if $pantyworntype = 'none':
-					temp = RAND(1,100)
+					temp = rand(1,100)
 					if temp >= 90:
 						pcs_mood -= 5
 						teachlevel -= 2

+ 19 - 19
locations/father.qsrc

@@ -230,8 +230,8 @@ if (hour > 10 and week < 6) or week >= 6:
                 'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
             else
                 'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
-                if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60 and fatherPayDay ! daystart:FatherMolest = RAND(1,4)
-                if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80 and fatherPayDay ! daystart:FatherMolest = RAND(1,2)
+                if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60 and fatherPayDay ! daystart:FatherMolest = rand(1,4)
+                if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80 and fatherPayDay ! daystart:FatherMolest = rand(1,2)
                 if npc_rel['A28'] >=80 and fatherPayDay ! daystart:FatherMolest = 1
                 if FatherMolest = 1:
                     'While you''re talking with him, you notice your stepfather is in a good mood today. Perhaps you can persuade him...'
@@ -240,14 +240,14 @@ if (hour > 10 and week < 6) or week >= 6:
 						menu_off = 1
                         minut+=5
                         gs 'stat'
-                        pcs_horny += RAND(1,5)
+                        pcs_horny += rand(1,5)
                         '"Oh come on, please Daddy?" you beg him, batting your eyelids and trying to look as cute as possible.'
                         if pcs_apprnc + (npc_rel['A28']/10) >= 200:
                             fatherLust = 1
                         elseif pcs_apprnc + (npc_rel['A28']/10) >= 120:
-                            fatherLust = Rand (1,2)
+                            fatherLust = rand(1,2)
                         elseif pcs_apprnc + (npc_rel['A28']/10) >= 60:
-                            fatherLust = Rand (1,4)
+                            fatherLust = rand(1,4)
                         else
                             fatherLust = 2
                         end
@@ -371,12 +371,12 @@ if (hour > 10 and week < 6) or week >= 6:
                 'You notice your stepfather keeps glancing at your disheveled hair with a disapproving look on his face. "Silly me, I should really take better care of my hair!" you think to yourself.'
             end
 
-            if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60:FatherMolest = RAND(1,8)
-            if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = RAND(1,4)
-            if npc_rel['A28'] >= 80:FatherMolest = RAND(1,2)
+            if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60:FatherMolest = rand(1,8)
+            if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80:FatherMolest = rand(1,4)
+            if npc_rel['A28'] >= 80:FatherMolest = rand(1,2)
 
             if FatherMolest=1:
-                pcs_horny += RAND(1,5)
+                pcs_horny += rand(1,5)
                 gs 'stat'
                 'He seems happy to oblige, and asks you to twirl your body so he can look at your outfit from all angles. The approving nod and hungry look in his eyes that follow, show that he would like to do more than just watch.'
                 if pcs_horny >= 50 or TouchedByFather = 1:
@@ -388,12 +388,12 @@ if (hour > 10 and week < 6) or week >= 6:
                         'In the heat of the moment you gently start to sway your hips back and forth, without even realizing it. When you realize what you''re doing, you stare your stepfather in the eye for a second with a mischievous smile on your lips. You then turn your back to him and keep swaying your ass seductively.'
 
                         if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
+                        if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+                        if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                         if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
                         if fatherLust>=2:
-                            pcs_horny -= RAND(1,5)
+                            pcs_horny -= rand(1,5)
                             gs 'stat'
                             if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim47.jpg"></center>' & 'Even though your body is definitely having an effect on him your stepfather is clearly embarrassed, and surprised you would do such a thing. He clears his throat loudly and looks at you disapprovingly, and the silence that follows makes you feel a bit uncomfortable.'
                             if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim48.jpg"></center>' & 'You avoid his gaze while you keep swaying your ass back and forth, slowly pulling your clothes away so he can see you''re not wearing any underwear. He sighs wistfully and tries to look away, saying in a stern voice: "<<$pcs_nickname>>, this is not fair, you know I am not made of stone. Don''t show me your bare ass like that." Realizing he wants no more part of your little show, you leave.'
@@ -431,12 +431,12 @@ if (hour > 10 and week < 6) or week >= 6:
                             'You innocently offer him to have a feel at the fabric, pretending you''re really interested to know what he thinks of your the quality of your clothing. Your stepfather looks at you with a slightly puzzled look on his face. "Go on, touch it, it''s so nice and soft!" you encourage him, and you take his hand and pull it towards you.'
 
                             if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
+                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                             if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
                             if fatherLust>=2:
-                                pcs_horny -= RAND(1,5)
+                                pcs_horny -= rand(1,5)
                                 gs 'stat'
                                 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim41.jpg"></center>'
                                 'Your stepfather clearly doesn''t want to, and is slightly embarrassed by the whole situation. He quickly pulls his hand away and tells you to go straighten your clothes.'
@@ -457,12 +457,12 @@ if (hour > 10 and week < 6) or week >= 6:
                             'Encouraged by your stepfather''s reaction, you put your hands on your breasts and pretend you''re straightening your clothes. You run your fingers down to your stomach and groin while plucking at the fabric, giving him one hell of a show. He can''t take his eyes off your body and you can tell your actions make him want you more than ever.'
 
                             if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = Rand (1,4)
-                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = Rand (1,2)
+                            if pcs_apprnc + (npc_rel['A28']/10) >= 60 and pcs_apprnc + (npc_rel['A28']/10) < 120:fatherLust = rand(1,4)
+                            if pcs_apprnc + (npc_rel['A28']/10) >= 120 and pcs_apprnc + (npc_rel['A28']/10) < 200:fatherLust = rand(1,2)
                             if pcs_apprnc + (npc_rel['A28']/10) >= 200 or TouchedByFather=1:fatherLust = 1
 
                             if fatherLust>=2:
-                                pcs_horny -= RAND(1,5)
+                                pcs_horny -= rand(1,5)
                                 gs 'stat'
                                 if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim45.jpg"></center>' & 'Your stepfather realizes you''re going too far, and interrupts you by clearing his throat loudly. He tells you to go away, making you feel rather uncomfortable.'
                                 if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim46.jpg"></center>' & 'Deciding to take your teasing to the next level, you pull your clothes to the side and show him your bare pussy. Your stepfather realizes you''re taking it too far, and sends you off: "<<$pcs_nickname>>, stop that. And go put on some underwear, that''s no way for a lady to behave."'
@@ -488,7 +488,7 @@ if (hour > 10 and week < 6) or week >= 6:
         *clr & cla
 		menu_off = 1
         minut += 60
-        pcs_mood += RAND(10,50)
+        pcs_mood += rand(10,50)
         gs 'stat'
         '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
         '<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'

+ 0 - 5
locations/foto.qsrc

@@ -891,7 +891,6 @@ if $ARGS[0] = 'showers':
 							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
@@ -900,7 +899,6 @@ if $ARGS[0] = '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
@@ -910,7 +908,6 @@ if $ARGS[0] = 'showers':
 						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'
@@ -985,7 +982,6 @@ if $ARGS[0] = 'krystalshower':
 						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.'
@@ -1003,7 +999,6 @@ if $ARGS[0] = 'krystalshower':
 							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'

+ 1 - 0
locations/gLakeNude.qsrc

@@ -168,6 +168,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			gs 'cum_cleanup'
 			minut = minut + 30
 			pcs_mood += 5
+			! Seems appropriate. Potentially worth revisiting
 			pcs_willpwr += 1
 			if $clothingworntype = 'swimwear':
 				if pcs_inhib < 50:inhib_exp += rand(1,2)

+ 1 - 0
locations/gadfield.qsrc

@@ -354,6 +354,7 @@ if $ARGS[0] = 'cow2':
 					cumspclnt = 4 & gs 'cum_cleanup'
 					pcs_sweat = 10 + rand(0,4)
 					pcs_mood += 5
+					! Leaving it in for now as it seems sort of appropriate. Potentially worth revisiting
 					pcs_willpwr += 5
 					if pcs_stren < 30:stren_exp += 1
 					gs 'stat'

+ 2 - 1
locations/gadforestrelax.qsrc

@@ -183,7 +183,8 @@ if bilberry > 0:
 	    pcs_energy += 15
 	    pcs_hydra += 40
 	    bilberry -= 1
-	    pcs_willpwr += 5
+	    ! Commenting it out for now, but potentially worth revisiting
+		!pcs_willpwr += 5
 	    pcs_health += 5
 	    pcs_mood += 10
 	    gs'stat'

+ 31 - 29
locations/gadriver.qsrc

@@ -174,10 +174,10 @@ if $ARGS[0] = 'gadbitch':
 	'A small country beach, where you can sunbathe and swim.'
 
 	mira_temp = rand(1,10)
-	if MiraLoc = 1:temp_gr = RAND(0,20)
+	if MiraLoc = 1:temp_gr = rand(0,20)
 
 	if sunWeather = 1 and MiraLoc = 1:
-		if RAND(0,10) < 5:
+		if rand(0,10) < 5:
 			'<a href="exec:sun = 1 & gt ''gadriver'', ''Mira'' ">Mira</a> is laying on the beach sunbathing.'
 			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 		else
@@ -186,7 +186,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 	end
 
-	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
+	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
 	act 'Go back to the river':
 		cla
@@ -217,7 +217,7 @@ if $ARGS[0] = 'gadbitch':
 	end
 	
 	if temper >= 15 and month >= 5 and month <= 9:
-		temp_gr = RAND(0,9)
+		temp_gr = rand(0,9)
 		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 			act 'Strip naked':
 				cla
@@ -239,7 +239,7 @@ if $ARGS[0] = 'gadbitch':
 				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				pcs_sweat = 10 + rand(0,4)
 				if hour >= 22 or hour <= 6:
-					if RAND(0,10) < 5 and MiraLoc = 1:
+					if rand(0,10) < 5 and MiraLoc = 1:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
 						'You and Mira take a nighttime swim in the river, splashing water at each other and having fun.'
 					else
@@ -247,7 +247,7 @@ if $ARGS[0] = 'gadbitch':
 						'You take a nighttime swim in the river, feeling the refreshing and invigorating water flowing across your body.'
 					end
 				else
-					if RAND(0,10) < 5 and MiraLoc = 1:
+					if rand(0,10) < 5 and MiraLoc = 1:
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
 						'You and Mira take a swim in the river, splashing water at each other and having fun.'
 					else
@@ -279,7 +279,7 @@ if $ARGS[0] = 'gadbitch':
 						minut -= 10
 						gs 'cum_call','face',$boy, 1,'','',20
 						gs 'cum_call','mouth',$boy, 1,'','',20
-						swallow += RAND(0,3)
+						swallow += rand(0,3)
 						gang +=1
 						gs 'stat'
 
@@ -309,7 +309,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Go skinny dipping':
 					cla
 					*clr
-					temp_gr = RAND(0,15)
+					temp_gr = rand(0,15)
 					cumspclnt = 4
 					gs 'cum_cleanup'
 					minut = minut + 20
@@ -322,7 +322,7 @@ if $ARGS[0] = 'gadbitch':
 						'You strip your clothes off and slowly step in to the cold river, knowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
 					else
 						if temp_gr >= 10 and MiraLoc = 1:
-							pcs_horny += RAND(5,15)
+							pcs_horny += rand(5,15)
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
 							'You step in to the river, you and Mira have a good old fashioned water fight, splashing each other until one of you finally surrenders.'
@@ -352,7 +352,7 @@ if $ARGS[0] = 'gadbitch':
 							gs 'boyStat', 'A62'
 							npc_sex[$boy] += 1
 							gs 'cum_call','mouth',$boy
-							swallow += RAND(0,1)
+							swallow += rand(0,1)
 							gs 'stat'
 							gang +=1
 
@@ -512,7 +512,8 @@ if $ARGS[0] = 'gadbitch':
 						minut += 30
 						pcs_sweat = 10 + rand(0,4)
 						pcs_mood += 5
-						pcs_willpwr += 5
+						! Commented out for now, but potentially worth revisiting
+						!pcs_willpwr += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
 						grandmahelp += 1
@@ -543,7 +544,8 @@ if $ARGS[0] = 'gadbitch':
 							npc_rel['A60'] += 1
 							pcs_sweat = 10 + rand(0,4)
 							pcs_mood += 5
-							pcs_willpwr += 5
+							! Commented out for now, but potentially worth revisiting
+							!pcs_willpwr += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
 							grandmahelp += 1
@@ -658,7 +660,7 @@ if $ARGS[0] = 'gadbitch':
 								*nl
 								'You wade into the river, and have fun with Mira spraying each other with water.'
 								if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-								temp_gr = RAND(0,15)
+								temp_gr = rand(0,15)
 								cumspclnt = 4 & gs 'cum_cleanup'
 								minut += 30
 								gs 'exercise', 'tier1', 1, 'stren_exp'
@@ -697,7 +699,7 @@ if $ARGS[0] = 'get_changed':
 				*nl
 				'You wade into the river, and have fun with Mira spraying each other with water.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-				temp_gr = RAND(0,15)
+				temp_gr = rand(0,15)
 				cumspclnt = 4 & gs 'cum_cleanup'
 				minut += 30
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
@@ -802,7 +804,7 @@ if $ARGS[0] = 'mirapunish':
 	*clr & cla
 	menu_off = 1
 	minut += 10
-	pcs_horny += RAND(25,75)
+	pcs_horny += rand(25,75)
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirapunish.jpg"></center>'
@@ -818,7 +820,7 @@ if $ARGS[0] = 'GuysRiver':
 	minut += 5
 	pcs_horny += 10
 	gs 'stat'
-	temp_gr = RAND(0,10)
+	temp_gr = rand(0,10)
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/mitkaguysriver.jpg"></center>'
 	'"Oh, hi <<$pcs_nickname>>, so it''s just you today?" Kolyamba grinned.'
@@ -834,7 +836,7 @@ if $ARGS[0] = 'GuysRiver':
 			*clr & cla
 			gs 'boyStat', 'A61'
 			pose = 0
-			temp_gr = RAND(0,2)
+			temp_gr = rand(0,2)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex.jpg"></center>'
@@ -848,7 +850,7 @@ if $ARGS[0] = 'GuysRiver':
 				gs 'boyStat', 'A62'
 				pose = 0
 				gs 'stat'
-				temp_gr = RAND(0,2)
+				temp_gr = rand(0,2)
 				if temp_gr = 0:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex1.jpg"></center>'
 					'Vasyan, rolls you onto your back, sticking his cock into your wet pussy.'
@@ -898,7 +900,7 @@ if $ARGS[0] = 'GuysRiver':
 				gs 'boyStat', 'A62'
 				pose = 0
 				gs 'stat'
-				temp_gr = RAND(0,2)
+				temp_gr = rand(0,2)
 				if temp_gr = 0:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex5.jpg"></center>'
 					'Vasyan, lays you onto your back, using his fingers stimulating your vaginal lips while sticking his cock into your wet pussy.'
@@ -955,7 +957,7 @@ if $ARGS[0] = 'GuysRiver':
 				gs 'boyStat', 'A62'
 				pose = 1
 				gs 'stat'
-				temp_gr = RAND(0,2)
+				temp_gr = rand(0,2)
 
 				if temp_gr = 0:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex9.jpg"></center>'
@@ -1079,20 +1081,20 @@ if $ARGS[0] = 'fishing':
 	if hour < 22:
 		act 'Throw the bait':
 			*clr & cla
-			minut += RAND(5,10)
+			minut += rand(5,10)
 			if hour < 12:
-				temp_gr = RAND(5,20)
+				temp_gr = rand(5,20)
 			elseif hour >= 12 and hour < 18:
-				temp_gr = RAND(0,20)
+				temp_gr = rand(0,20)
 			else
-				temp_gr = RAND(10,20)
+				temp_gr = rand(10,20)
 			end
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/river/fishingriver.jpg"></center>'
 			'You throw out the lure and carefully watch the bobber for signs of nibble.'
 
-			if temp_gr > RAND(15,19):
+			if temp_gr > rand(15,19):
 				cla
 				*clr
 				minut += 1
@@ -1105,7 +1107,7 @@ if $ARGS[0] = 'fishing':
 					cla
 					*clr
 					minut += 1
-					temp_gr = RAND(0,120)
+					temp_gr = rand(0,120)
 					if temp_gr < 50:react_exp += 1
 					gs 'stat'
 
@@ -1170,7 +1172,7 @@ if $ARGS[0] = 'fishing':
 					*clr
 					minut += 5
 					fish -= 1
-					pcs_mood += RAND(15,40)
+					pcs_mood += rand(15,40)
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
@@ -1196,7 +1198,7 @@ if $ARGS[0] = 'fishing':
 		cla
 		*clr
 		minut += 5
-		pcs_mood -= RAND(5,10)
+		pcs_mood -= rand(5,10)
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/talkfishers.jpg"></center>'
@@ -1232,7 +1234,7 @@ if $ARGS[0] = 'fishing':
 				*clr
 				minut += 5
 				fish -= 1
-				pcs_mood += RAND(15,40)
+				pcs_mood += rand(15,40)
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'

+ 2 - 1
locations/gadukino.qsrc

@@ -207,7 +207,8 @@ if $ARGS[0] = 'succubus_hunt':
 				guy += 1
 				pcs_horny = 0
 				orgasm += 1 + scfeed
-				pcs_willpwr += 15 * (1 + scfeed)
+				! This seems appropriate. Reducing it, but otherwise leaving it in. Potentially worth revisiting
+				pcs_willpwr += scfeed
 				succubxp += 6
 				sexnutrition += 30 * scfeed
 				sucabscum = 1

+ 3 - 7
locations/gdkbibl.qsrc

@@ -42,7 +42,7 @@ if hour >= 8 and hour < 18:
 			pcs_nerd += 1
 		end
 		minut += 60
-		intel_exp += RAND(3,6) + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
 		blizoruk += 1
 		grupvalue[3] +=1
 		gs'stat'
@@ -64,7 +64,6 @@ if hour >= 8 and hour < 18:
 		end
 		minut += 60
 		pcs_mood = 100
-		pcs_willpwr += 100
 		blizoruk += 1
 		grupvalue[3] +=1
 		gs'stat'
@@ -86,7 +85,6 @@ if hour >= 8 and hour < 18:
 		end
 		minut += 60
 		pcs_mood = 100
-		pcs_willpwr += 100
 		blizoruk += 1
 		grupvalue[3] +=1
 		gs'stat'
@@ -108,7 +106,6 @@ if hour >= 8 and hour < 18:
 		end
 		minut += 60
 		pcs_mood = 100
-		pcs_willpwr += 100
 		blizoruk += 1
 		grupvalue[3] +=1
 		gs'stat'
@@ -130,7 +127,6 @@ if hour >= 8 and hour < 18:
 		end
 		minut += 60
 		pcs_mood = 100
-		pcs_willpwr += 100
 		blizoruk += 1
 		pcs_horny += 20
 		gs'stat'
@@ -152,7 +148,7 @@ if hour >= 8 and hour < 18:
 			pcs_nerd += 1
 		end
 		minut += 60
-		lern += RAND(1,3)
+		lern += rand(1,3)
 		blizoruk += 1
 		grupvalue[3] += 2
 		gs'stat'
@@ -173,7 +169,7 @@ if hour >= 8 and hour < 18:
 			pcs_nerd += 1
 		end
 		minut += 60
-		sprt_exp += RAND(3,6)
+		sprt_exp += rand(3,6)
 		blizoruk += 1
 		grupvalue[3] +=2
 		gs'stat'

+ 0 - 1
locations/gschool_boys_bathroom.qsrc

@@ -63,7 +63,6 @@ if $ARGS[0] = 'bathroom2':
 	$menu_arg = 'bathroom2'
 	menu_off = 0
 	*clr & cla
-	pcs_willpwr += rand(5,10)
 	pcs_mood += rand(10,30)
 	gs 'stat'
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'

+ 0 - 1
locations/gschool_girls_bathroom.qsrc

@@ -60,7 +60,6 @@ if $ARGS[0] = 'bathroom2':
 	$menu_loc = 'gschool_girls_bathroom'
 	$menu_arg = 'bathroom2'
 	menu_off = 0
-	pcs_willpwr += rand(5, 10)
 	pcs_mood += rand(10, 30)
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'

+ 0 - 2
locations/hunters.qsrc

@@ -74,7 +74,6 @@ if $ARGS[0] = 'huntersgroupfaint':
 			minut += 10
 			pcs_health += 100
 			pcs_mood = 100
-			pcs_willpwr += 100
 			huntersexnude = 0
 			forest_gopsex = 0
 			slutgosex = 0
@@ -93,7 +92,6 @@ if $ARGS[0] = 'huntersgroupfaint':
 			minut += 10
 			pcs_health += 100
 			pcs_mood = 100
-			pcs_willpwr += 100
 			shootingfaint = 0
 			huntersexnude = 0
 			forest_gopsex = 0

+ 0 - 2
locations/kafe2.qsrc

@@ -345,7 +345,6 @@ if $ARGS[0] = 'ira':
 			minut += 30
 			pcs_mood += 5
 			gs 'stat'
-			pcs_willpwr += rand(0, 1)
 
 			npc_rel['A93'] += rand(0, 5)
 
@@ -483,7 +482,6 @@ if $ARGS[0] = 'tamdin':
 			cla
 			minut += 30
 			pcs_mood += 5
-			pcs_willpwr += rand(0, 2)
 
 			npc_rel['A43'] += rand(0, 5)
 

+ 0 - 1
locations/kinoM.qsrc

@@ -82,7 +82,6 @@ if $ARGS[0] = 'sex':
 	
 	if pcs_horny >= 90:
 		pcs_mood += 15
-		pcs_willpwr += 15
 		$orgasm_or = 'yes'
 		$orgasm_txt = 'As you feel pleasure growing inside of you, you start moaning involuntarily, louder and louder. <<$loverdesc[lover_number]>> puts his hand over your mouth in an effort to muffle the noises. Then a massive orgasm hits you, leaving you shuddering and quivering on his cock.'
 	end

+ 0 - 2
locations/kisameQW.qsrc

@@ -14,7 +14,6 @@ if $ARGS[0] = 'start':
 		pcs_horny += 60
 		pcs_sweat = 10 + rand(0,4)
 		pcs_mood += 5
-		pcs_willpwr += 5
 		clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/kisame/sex/kisame2.jpg"></center>'
@@ -24,7 +23,6 @@ if $ARGS[0] = 'start':
 			cla
 			*clr
 			pcs_mood += 5
-			pcs_willpwr += 5
 			guy += 1
 			pcs_vag += 1
 			spafinloc = 0

+ 1 - 5
locations/kotovSex.qsrc

@@ -853,16 +853,14 @@ if $ARGS[0] = '69':
 	'Vitek licks your pussy skilfully, and you have to take a moment to catch your breath and recover before you continue to suck on his dick. For someone who pretends to not be into this, he''s awfully good at it...'
 	if pcs_horny >= 90:
 		pcs_mood += 15
-		pcs_willpwr += 15
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You bite your lips to keep yourself from screaming while you have an orgasm, barely holding yourself back from grinding your pussy against his face like a wanton whore.'
 	else
 		'Even though it feels nice, you realize you won''t get an orgasm out of this. After a few minutes you pull away from him, and kiss him on the lips before he can object. Mmm... you taste good.'
 		$orgasm_or = 'no'
 	end
-	gs 'arousal', 'bj', 5, 'sub'
 	gs 'arousal', 'cuni', 5, 'sub'
-	minut -= 5
+	gs 'arousal', 'bj', -5, 'sub'
 	gs 'stat'
 	act 'blowjob':gt 'kotovSex', 'bj<<rand(1,13)>>'
 	act 'Use your tits to please him':gt 'kotovSex', 'titjob'
@@ -1294,7 +1292,6 @@ if $ARGS[0] = 'kuni':
 				gs 'arousal', 'cuni', 5, 'dom'
 				if pcs_horny >= 90:
 					pcs_mood += 15
-					pcs_willpwr += 15
 					$orgasm_or = 'custom'
 					$orgasm_txt = 'Wow, he''s good! You bite your lips to keep yourself from screaming while you have an orgasm, barely holding yourself back from grinding your pussy against his face like a wanton whore.'
 				else
@@ -1321,7 +1318,6 @@ if $ARGS[0] = 'kuni':
 		'Vitek smiles and gets between your legs without protest, spreading them slightly further with his hands. He does his best to make you feel good, enthusiastically rubbing his tongue over and between your wet pussy lips.'
 		if pcs_horny >= 90:
 			pcs_mood += 15
-			pcs_willpwr += 15
 			$orgasm_or = 'custom'
 			$orgasm_txt = 'Wow, he''s good! You bite your lips to keep yourself from screaming while you have an orgasm, barely holding yourself back from grinding your pussy against his face like a wanton whore.'
 		else

+ 1 - 2
locations/krutishi.qsrc

@@ -18,8 +18,7 @@ if npc_grupTipe['A<<numnpc>>'] = 1:
 				pcs_stam -= 5
 				gs 'sweat', 'add', 3
 				fat -= 1
-				danc_exp += rand(1, 3)
-				pcs_willpwr += 10
+				danc_exp += rand(1,3)
 
 				if numnpc = 1:pcs_mood = 100
 

+ 0 - 1
locations/kuhr.qsrc

@@ -115,7 +115,6 @@ if dildo > 0 and pcs_horny >= 50:
 		*clr
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 		pcs_mood += 15
-		pcs_willpwr += 15
 		pcs_vag += 1
 
 		if husband > 0 and husbandrink ! 10:

+ 1 - 2
locations/kuhr2x.qsrc

@@ -33,7 +33,7 @@ if kransloman = 1:
 	exit
 end
 
-polomka = RAND(1,100)
+polomka = rand(1,100)
 if polomka = 100 and santehnikDolg = 0:
 	kransloman = 1
 	gt'kuhr2x'
@@ -111,7 +111,6 @@ if dildo > 0 and pcs_horny >= 50:
 		*clr
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 		pcs_mood += 15
-		pcs_willpwr += 15
 		pcs_vag += 1
 
 		if husband > 0 and husbandrink ! 10:

+ 26 - 25
locations/lesbimistress.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 			
 			act 'Wait':
 				*clr & cla
-				pcs_horny += RAND(10,20)
+				pcs_horny += rand(10,20)
 				gs'stat'
 				if daystart > lesbiday + 7:
 					lesbiday = daystart
@@ -211,8 +211,8 @@ if $ARGS[0] = 'severe_1':
 	mistsevere[1] = 1
 	minut += 150
 	pcs_mood = 5
-	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 2 & vgape = 1 & pcs_horny += RAND(20,50)
-	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 3 & vgape = 2 & pcs_horny += RAND(20,40)
+	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 2 & vgape = 1 & pcs_horny += rand(20,50)
+	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 3 & vgape = 2 & pcs_horny += rand(20,40)
 	if pcs_vag < 10:pcs_vag += 1 & vgape = 3 & pcs_horny = 0
 	MistressObedience = 3
 	gs'stat'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'severe_3':
 	'You give it some thought, and reply honestly: "Working it in felt okay, Mistress. The vibrations are not very pleasant, though... it''s too sensitive from the stretching."'
 	'"I see... that is too bad. Well, at least now we know!" she smiles, and slowly takes it out of you.'
 
-	if RAND(0,3) < 2:
+	if rand(0,3) < 2:
 		act 'Continue':
 			cla
 			*clr
@@ -339,8 +339,8 @@ end
 
 if $ARGS[0] = 'severe_4':
 	mistsevere[4] = 1
-	if pcs_ass < 30 and pcs_ass >= 20:pcs_ass += 2 & agape = 1 & pcs_horny += RAND(40,80)
-	if pcs_ass < 20 and pcs_ass >= 10:pcs_ass += 2 & agape = 2 & pcs_horny += RAND(20,40)
+	if pcs_ass < 30 and pcs_ass >= 20:pcs_ass += 2 & agape = 1 & pcs_horny += rand(40,80)
+	if pcs_ass < 20 and pcs_ass >= 10:pcs_ass += 2 & agape = 2 & pcs_horny += rand(20,40)
 	if pcs_ass < 10:pcs_ass += 3 & agape = 3
 	if analplugin = 1:analplugin = 0
 	MistressAdoration -= 1
@@ -408,7 +408,7 @@ if $ARGS[0] = 'punish_1':
 	gs 'arousal', 'foreplay', 20, 'sub', 'lesbian', 'bound'
 	gs 'stat'
 	
-	if RAND(0,1) = 0:
+	if rand(0,1) = 0:
 		act 'Stay where you are':
 			cla
 			*clr
@@ -496,13 +496,13 @@ end
 
 if $ARGS[0] = 'punish_3':
 	mistpunish[3] = 1
-	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 2 & pcs_horny += RAND(60,90)
-	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 2 & vgape = 1 & pcs_horny += RAND(40,60)
-	if pcs_vag < 10:pcs_vag += 3 & vgape = 2 & pcs_horny -= RAND(20,40)
+	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 2 & pcs_horny += rand(60,90)
+	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 2 & vgape = 1 & pcs_horny += rand(40,60)
+	if pcs_vag < 10:pcs_vag += 3 & vgape = 2 & pcs_horny -= rand(20,40)
 	if pcs_horny >= 100:orgasm += 1 & pcs_horny = 0 & pcs_mood = 100
 	gs'stat'
 
-	temp = RAND(0,3)
+	temp = rand(0,3)
 	if temp = 0:
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub58.jpg"></center>'
 		'"I want to play with your pussy, slave", Mistress says. The tone at which she says it makes you swallow nervously - it doesn''t sound like she''s in a gentle, caring mood today.'
@@ -778,7 +778,7 @@ if $ARGS[0] = 'punish_6':
 						cla
 						*clr
 						minut += 15
-						pcs_horny += RAND(15,30)
+						pcs_horny += rand(15,30)
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub218.jpg"></center>'
 						'You let out a frustrated moan, this is going to be more difficult than you thought.'
@@ -859,7 +859,7 @@ end
 if $ARGS[0] = 'neutral_1':
 	mistneutral[1] = 1
 	minut += 150
-	vital_exp += RAND(0,2) + rand(0,steroid_dose) & steroidcheck = 1
+	vital_exp += rand(0,2) + rand(0,steroid_dose) & steroidcheck = 1
 	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub47.jpg"></center>'
@@ -884,13 +884,13 @@ if $ARGS[0] = 'neutral_1':
 		'She runs off again, all giddy with excitement.'
 	end
 
-	temp = RAND(0,100)
+	temp = rand(0,100)
 	if temp > pcs_vital:
 		act 'The pot grows heavy...':
 			cla
 			*clr
 			minut += 15
-			if spank >= 30: pcs_horny += RAND(20,50)
+			if spank >= 30: pcs_horny += rand(20,50)
 			if spank < 30: pcs_horny = 0
 			spank += 1
 			spanked += 2
@@ -1132,8 +1132,8 @@ end
 
 if $ARGS[0] = 'neutral_8':
 	mistneutral[8] = 1
-	mistressrnd = RAND(0,1)
-	vital_exp += RAND(0,1) + rand(0,steroid_dose) & steroidcheck = 1
+	mistressrnd = rand(0,1)
+	vital_exp += rand(0,1) + rand(0,steroid_dose) & steroidcheck = 1
 	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
 	minut += 120
 	MistressAdoration += 2
@@ -1414,7 +1414,7 @@ if $ARGS[0] = 'treat_3':
 	gs 'arousal', 'cuni_give', 20, 'sub', 'lesbian'
 	gs 'stat'
 		
-	if RAND(0,1) = 0:
+	if rand(0,1) = 0:
 		'When you suddenly feel her buttocks tremble against your chin, you know she''s orgasming. You win! Once her orgasm subsides, she pulls away from you and smiles: "Very good, slave. Now, I believe I promised you something..."'
 		act 'Receive your reward':
 			cla
@@ -1487,7 +1487,7 @@ if $ARGS[0] = 'treat_3':
 		act 'Receive your punishment':
 			cla
 			*clr
-			if pcs_ass < 30 and pcs_ass >= 20:pcs_ass += 2 & agape = 2 & pcs_horny += RAND(20,40)
+			if pcs_ass < 30 and pcs_ass >= 20:pcs_ass += 2 & agape = 2 & pcs_horny += rand(20,40)
 			if pcs_ass < 20 and pcs_ass >= 10:pcs_ass += 2 & agape = 3 
 			if pcs_ass < 10:pcs_ass += 3 & agape = 3
 			if analplugin = 1:analplugin = 0
@@ -1541,9 +1541,9 @@ end
 
 if $ARGS[0] = 'treat_4':
 	misttreat[4] = 1
-	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 1 & pcs_horny += RAND(20,50)
-	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 1 & pcs_horny += RAND(60,90)
-	if pcs_vag < 10:pcs_vag += 2 & vgape = 1 & pcs_horny += RAND(20,50)
+	if pcs_vag < 30 and pcs_vag >= 20:pcs_vag += 1 & pcs_horny += rand(20,50)
+	if pcs_vag < 20 and pcs_vag >= 10:pcs_vag += 1 & pcs_horny += rand(60,90)
+	if pcs_vag < 10:pcs_vag += 2 & vgape = 1 & pcs_horny += rand(20,50)
 	if pcs_horny >= 100:orgasm += 1 & pcs_horny = 0 & vaginalOrgasm += 1 & pcs_mood = 100
 	MistressAdoration += 1
 	MistressObedience -= 1
@@ -1585,7 +1585,7 @@ if $ARGS[0] = 'amazing_1':
 	'She nods proudly: "Very good, slave. I should not have doubted you."'
 	'She lets you finish undressing. You''re not sure what you''re going to do with your clothes when you''re done, there''s urine all over them! Still, no time to worry about that now... Mistress is waiting.'
 
-	temp = RAND(0,3)
+	temp = rand(0,3)
 	if temp = 0:
 		act 'Continue':
 			cla
@@ -1788,7 +1788,8 @@ if $ARGS[0] = 'amazing_3':
 				gs 'cum_cleanup'
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
-				pcs_willpwr += 5
+				! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+				pcs_willpwr += 1
 				if pcs_stren < 30:stren_exp += 1 + rand(0,steroid_dose) & steroidcheck = 1
 				if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose: clit_size += rand(0,1) & killvar 'steroidcheck'
 				gs'stat'
@@ -2065,7 +2066,7 @@ if $ARGS[0] = 'mistmeet':
 					cla
 					*clr
 					if mistmeets = 0:guy += 1
-					temp = RAND(0,2)
+					temp = rand(0,2)
 					lesbiday = daystart
 					gs'stat'
 					

+ 1 - 2
locations/liam.qsrc

@@ -49,7 +49,7 @@ if car > 0 and cardrive = 14:
 end
 
 if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
-	if RAND(1,100) >= 90:
+	if rand(1,100) >= 90:
 		cls
 		minut += 5
 		gs'stat'
@@ -75,7 +75,6 @@ act 'Walk 1 h':
 	cla
 	minut += 60
 	pcs_mood += 10
-	pcs_willpwr += 10
 	gs 'stat'
 	'You slowly walk along the narrow streets of the Old Town, It became one of the areas of the big city, admiring the beautiful architecture buildings, built long ago and miraculously survived to our times. Breathe in the fresh air, reflecting on the vicissitudes of fate.'
 	act 'Complete outing':gt'liam','start'

+ 3 - 3
locations/mitkasex.qsrc

@@ -357,7 +357,7 @@ if $ARGS[0] = 'gadDogCum2_2':
 	if pcs_horny < 60:'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkagadsexdogcum2_2.jpg"></center>'
 	if pcs_horny >= 60:'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkagadsexdogcum2_3.jpg"></center>'
 	'You bend over sticking out your ass, and feel <<$boydesc>> starts moving faster...'
-	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_willpwr += 15 & pcs_mood += 15
+	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_mood += 15
 	$orgasm_or = 'yes'
 	*pl
 	'<<$textsexhunter6>>'
@@ -462,7 +462,7 @@ if $ARGS[0] = 'gadCowCum2_2':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkagadsexcowcum2_2.jpg"></center>'
 	'You jump on the guys cock gradually speeding up the pace, knowing that he will soon cum...'
-	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_willpwr += 15 & pcs_mood += 15
+	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_mood += 15
 	$orgasm_or = 'yes'
 	gs 'dinsex','sexcum'
 	*pl
@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'forestDogCum1_1':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaforestsexdogcum1_1.jpg"></center>'
 	'You bend over, sticking out your ass, and feel <<$boydesc>> start moving faster...'
-	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_willpwr += 15 & pcs_mood += 15
+	if pcs_horny >= 100:'<<$textsexhunter11>>' & orgasm += 1 & vaginalOrgasm += 1 & pcs_horny = 0 & pcs_mood += 15
 	$orgasm_or = 'yes'
 	gs 'stat'
 	gs 'dinsex','sexcum'

+ 0 - 1
locations/nastja.qsrc

@@ -530,7 +530,6 @@ if $ARGS[0] = 'pos24':
 	pcs_energy = 10
 	pcs_hydra = 20
 	pcs_mood += 10
-	pcs_willpwr += 10
 	gs 'drugs', 'alcohol', 'wine'
 	pcs_horny += rand(10,30)
 	gs 'stat'

+ 0 - 1
locations/obj_din.qsrc

@@ -2623,7 +2623,6 @@ if $ARGS[0] = 'rest':
 	elseif waiting > 0 and waiting <= 120:
 		minut += waiting
 		pcs_mood += 10
-		pcs_willpwr += 10
 		if pcs_sleep < 90 and waiting >= 60:
 			pcs_sleep += 10
 		end

+ 0 - 1
locations/park.qsrc

@@ -367,7 +367,6 @@ if $ARGS[0] = 'luna':
 
 				sprt_exp += 2
 
-				pcs_willpwr += 10
 				pcs_mood += 10
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/karusel.jpg"></center>'
 				'You paid 50 <b>₽</b> and sat in the carousel.'

+ 0 - 2
locations/parkivent.qsrc

@@ -3,7 +3,6 @@
 if $ARGS[0] = 'empty':
 	menu_off = 1
 	pcs_mood += 10
-	pcs_willpwr += 10
 	gs 'stat'
 	'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 
@@ -950,7 +949,6 @@ if $ARGS[0] = 'find_baby':
 	menu_off = 1
     if hour >= 8 and hour <= 20 and park_baby_found < 1:
         pcs_mood += 10
-        pcs_willpwr += 10
         gs 'stat'
         '<center><img <<$set_imgh>> src="images/locations/city/centralpark/park_baby/park_woods.jpg"></center>'
         'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'

+ 0 - 1
locations/parks.qsrc

@@ -27,7 +27,6 @@ if $ARGS[0] = 'start':
 		cla
 		minut += 60
 		pcs_mood += 10
-		pcs_willpwr += 10
 		gs'stat'
 		'You leisurely stroll through the park of the Old Town. Breathe in the fresh air, reflecting on the vicissitudes of fate.'
 

+ 0 - 1
locations/pavtrain_market.qsrc

@@ -265,7 +265,6 @@ if ARGS[0] = 1:
 	act 'Give some money': 
 		*clr & cla
 		money -= rand(3,20)
-		pcs_willpwr += 5
 		pcs_mood += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'

+ 3 - 4
locations/placer_sex.qsrc

@@ -69,7 +69,7 @@ if $args[0] = 'meet':
 			:markdormrape
 			minut += 15
 
-			tiprand = RAND(0,2)
+			tiprand = rand(0,2)
 			if tiprand < 2:
 				gs 'arousal', 'vaginal', 10, 'gangbang', 'unknown'
 				gs 'stat'
@@ -92,7 +92,7 @@ if $args[0] = 'meet':
 				jump'markdormrape'
 			end
 			gs'stat'
-			endrandom = RAND (0,1)
+			endrandom = rand (0,1)
 			if endrandom = 0:
 				'Finally the last guy spills his seed over your exhausted body, and they all leave the room except for <<$boydesc2>>. He sits down on a different bed, chuckling while he watches you sluggishly brush up. Your legs are shaky from the exhaustion, and the alcohol is also still in your system. Both of those factors make you feel rather disoriented, and you try to ignore <<$boydesc2>>''s smug grin. When you''re ready to leave, he waves you goodbye with a smirk on his face: "You were a nice fuck, <<$pcs_nickname>>. I see why Pavlovsk girls are so popular... we''ll definitely be visiting again."'
 				gs 'arousal', 'end'
@@ -106,7 +106,7 @@ if $args[0] = 'meet':
 					minut += 5
 					body_write = 5
 					face_write = 1
-					podvalwriterand = RAND (1,6)
+					podvalwriterand = rand (1,6)
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/podvalwrite<<podvalwriterand>>.jpg"></center>'
@@ -1841,7 +1841,6 @@ if $ARGS[0] = 'sitting_park_bench':
 		elseif waiting > 0 and waiting <= 120:
 			minut = minut + waiting
 			pcs_mood += 10
-			pcs_willpwr += 10
 			if pcs_sleep < 90 and waiting >= 60:
 				pcs_sleep += 10
 			end

+ 0 - 1
locations/podezdM.qsrc

@@ -46,7 +46,6 @@ if $ARGS[0] = 'kiosk':
 	minut += 30
 	fat += 1
 	pcs_mood += 10
-	pcs_willpwr += 10
 	podrand = rand(5, 100)
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdm.jpg"></center>'
 	'As you leave he opens a bottle of beer and hands it to you.'

+ 0 - 1
locations/qwmeet.qsrc

@@ -370,7 +370,6 @@ if $ARGS[0] = 'qwbereg':
 
 						if pcs_horny >= 90:
 							pcs_mood += 15
-							pcs_willpwr += 15
 							$orgasm_or = 'custom'
 							$orgasm_txt = 'Skillful actions of Vladimir give you an orgasm.'
 						else

+ 10 - 7
locations/rolanbath.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	if RolanLoc[hour] = 7:
 		'Rolan is here.'
-		if RAND(0,100) >= 30:
+		if rand(0,100) >= 30:
 			gt 'rolanbath', 'ev'
 		else
 			gt 'rolanbath', 'sexev'
@@ -82,7 +82,8 @@ if $ARGS[0] = 'start':
 					*nl
 					'The warm water feels amazing against you. You forget for a moment that Rolan could enter the bathroom at any moment. The shower is so relaxing that you begin to sing under the water, imagining that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					pcs_willpwr += 10
+					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+					pcs_willpwr += 1
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
 					else
@@ -277,7 +278,8 @@ if $ARGS[0] = 'start':
 					*nl
 					'The warm water feels amazing against you. You forget for a moment that Rolan could enter the bathroom at any moment. The shower is so relaxing that you begin to sing under the water, imagining that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					pcs_willpwr += 10
+					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+					pcs_willpwr += 1
 					act 'Dry off': gt 'rolanbath','dryOff'
 				end
 			elseif rand(0,3) = 1:
@@ -426,7 +428,7 @@ end
 
 !Bathroom, Rolan caught:
 if $ARGS[0] = 'sexev':
-	if RAND(0,100) < 50:
+	if rand(0,100) < 50:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/caught0.jpg"></center>'
 		'...oops... better leave him be.'
@@ -447,7 +449,7 @@ end
 
 !Bathroom, Rolan busy:
 if $ARGS[0] = 'ev':
-	if RAND(0,100) <= 90:
+	if rand(0,100) <= 90:
 		*clr & cla
 		minut += 2
 		gs 'stat'
@@ -484,7 +486,7 @@ if $ARGS[0] = 'bazar':
 		rolan_bazar_count -= 1
 		sh_rolan_bazar += 1
 		minut += 5
-		rolan_textb_vanna = RAND(1,8)
+		rolan_textb_vanna = rand(1,8)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathroom.jpg"></center>'
 		if rolan_textb_vanna = 1:$rolan_textb_vanna = 'Rolan tells you that he doesn''t mind if you take a shower here.'
 		if rolan_textb_vanna = 2:$rolan_textb_vanna = 'Rolan tells you that he see often sees some of your classmates buying clothes at G&M Stores, though he doesn''t know how it''s possible for young girls to have so much money.'
@@ -594,7 +596,8 @@ if $ARGS[0] = 'pervshower':
 					*nl
 					'The warm water feels amazing against you. As you relax you begin to sing under the water completely forgetting that Rolan is there and can hear you. You imagine that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					pcs_willpwr += 10
+					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+					pcs_willpwr += 1
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
 					else

+ 3 - 2
locations/sauna.qsrc

@@ -68,7 +68,8 @@ if $ARGS[0] = 'sauna2':
 			if pcs_horny < 0: pcs_horny = 0
 			pcs_health += healthmax/5
 			pcs_stam = stammax
-			pcs_willpwr += 20
+			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+			pcs_willpwr += 5
 			pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
@@ -235,7 +236,7 @@ if $ARGS[0] = 'saunafitness':
 	'You do push-ups for 30 minutes, improving your strength.'
 
 	randpushfact = rand(-5,5)
-	if pcs_energy < 40: randpushfact -= RAND(1,10)
+	if pcs_energy < 40: randpushfact -= rand(1,10)
 
 	pushnum = (pcs_stren * pcs_sleep * pcs_health)  / ( 1 * 67 *  healthmax) + randpushfact
 

+ 0 - 1
locations/sitr.qsrc

@@ -100,7 +100,6 @@ if dildo > 0 and pcs_horny >= 50:
 		minut += 30
 		stat['mast'] += 1
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
-		pcs_mood += 15
 		pcs_willpwr += 15
 		pcs_vag += 1
 

+ 2 - 3
locations/sitr2x.qsrc

@@ -41,7 +41,7 @@ if mishka > 0:'On a shelf is <<mishka>> teddy bear'
 gs 'exercise', 'start'
 *nl
 
-!housegostrand = RAND(1,20)
+!housegostrand = rand(1,20)
 !if week = 5 and hour > 17 and hour < 21 and housegostrand > 15 and husband > 0 and husbandrink ! 10:gt'sitr2x','guest'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
@@ -66,7 +66,7 @@ if student > 0 and kursovik < 100:
 		cla
 		*clr
 		minut = minut + 60
-		kursovik = kursovik + RAND(pcs_intel/20,pcs_intel/10)
+		kursovik = kursovik + rand(pcs_intel/20,pcs_intel/10)
 		if kursovik > 100:kursovik = 100
 		pcs_mood -= 10
 
@@ -90,7 +90,6 @@ if dildo > 0 and pcs_horny >= 50:
 		stat['mast'] += 1
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 		pcs_mood += 15
-		pcs_willpwr += 15
 		pcs_vag += 1
 
 		if husband > 0 and husbandrink ! 10:

+ 11 - 5
locations/succubus.qsrc

@@ -144,7 +144,8 @@ if $ARGS[0] = 'RapistFight':
 				guy += 1
 				pcs_horny = 0
 				orgasm += 1 + scfeed
-				pcs_willpwr += 15 * (1 + scfeed)
+				! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+				pcs_willpwr += scfeed
 				succubxp += 6
 				sexnutrition += 30 * scfeed
 				sucabscum = 1
@@ -202,7 +203,8 @@ if $ARGS[0] = 'pavResfeed':
 			guy += 1
 			pcs_horny = 0
 			orgasm += 1 + scfeed
-			pcs_willpwr += 15 * (1 + scfeed)
+			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+			pcs_willpwr += scfeed
 			succubxp += 6
 			sexnutrition += 30 * scfeed
 			sucabscum = 1
@@ -356,7 +358,8 @@ if $ARGS[0] = 'tatianasex':
 					gs 'arousal', 'end'
 					pcs_horny = 0
 					orgasm += scfeed
-					pcs_willpwr += 15 * scfeed
+					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+					pcs_willpwr += scfeed
 					sexnutrition += 25 * scfeed
 					suclezsex = lesbian
 					succubxp += 6
@@ -396,6 +399,7 @@ if $ARGS[0] = 'training3sex':
 		gs 'arousal', 'end'
 		tatisucsex += 1
 		if tatisucsex = 0: tatisucsex = 1
+		! Seems appropriate. Potentially worth revisiting
 		pcs_willpwr = willpowermax
 		sucexcess -= 100
 		succhungry += 1
@@ -701,7 +705,8 @@ if $args[0] = 'sucwalkinggo':
 	Insleep = 0
 	pcs_horny = 0
 	orgasm += scfeed
-	pcs_willpwr += 15 * scfeed
+	! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+	pcs_willpwr += scfeed
 	succubxp += 3 * sucencntrand
 	sexnutrition += 25 * scfeed
 	scwalkmon = rand (50,(100 * sucencntrand))
@@ -804,7 +809,8 @@ if $args[0] = 'sucwalkinggo':
 		pcs_mood = 100
 		pcs_health += healthmax/5
 		pcs_stam = stammax
-		pcs_willpwr = pcs_intel*5 + will*5+1000
+		! Commenting it out for now, but potentially worth revisiting
+		!pcs_willpwr = pcs_intel*5 + will*5+1000
 		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 
 		minut += 15

+ 4 - 3
locations/swamp_yard.qsrc

@@ -13,8 +13,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	!the chance of encountering hunters
 
-	if week = 6 or week = 7:huntersrand = RAND(1,3)
-	if week < 6:huntersrand = RAND(1,5)
+	if week = 6 or week = 7:huntersrand = rand(1,3)
+	if week < 6:huntersrand = rand(1,5)
 
 	if huntersrand = 1:hunters = 1
 	!the chance of hitting GG, if she`s a slut
@@ -454,7 +454,8 @@ if $ARGS[0] = 'fireside':
 				pcs_energy += 10
 				pcs_hydra += 10
 				bilberry -= 1
-				pcs_willpwr += 5
+				! Commenting it out for now, but potentially worth revisiting
+				!pcs_willpwr += 5
 				pcs_health += 5
 				pcs_mood += 10
 				gs 'stat'

+ 2 - 3
locations/swamphouse.qsrc

@@ -455,7 +455,8 @@ if $ARGS[0] = 'tub':
 			body_write = 0
 			lubonus = 0
 			pcs_mood += 5
-			pcs_willpwr += 10
+			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+			pcs_willpwr += 2
 			minut += 30
 			hotwater = 0
 			gs 'stat'
@@ -540,7 +541,6 @@ if $ARGS[0] = 'stackmagazines':
 		sprt_exp += 4
 		blizoruk+=1
 		pcs_mood += 10
-		pcs_willpwr += 100
 		minut += 60
 		gs 'stat'
 
@@ -554,7 +554,6 @@ if $ARGS[0] = 'stackmagazines':
 		*clr
 		blizoruk+=1
 		pcs_mood += 10
-		pcs_willpwr += 100
 		gs 'stat'
 
 		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/readpornomag.jpg"></center>'

+ 2 - 1
locations/ybass.qsrc

@@ -19,7 +19,8 @@ act 'Swim (1:00)':
 	minut += 60
 	pcs_sweat = 10 + rand(0,4)
 	pcs_mood += 5
-	pcs_willpwr += 5
+	! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
+	pcs_willpwr += 1
 	if pcs_stren < 40:stren_exp += 1
 
 	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'