Browse Source

replace `$pc.pcs_willpwr` with `$pc.willpower`

Stephan Fuchs 2 months ago
parent
commit
ded9f62aae
100 changed files with 376 additions and 352 deletions
  1. 1 1
      qrsc_to_tw.py
  2. 40 16
      sugarcube/src/actions/act.ts
  3. 4 4
      sugarcube/src/activities/actress/audition_sex1.tw
  4. 2 2
      sugarcube/src/activities/actress/auditions.tw
  5. 3 3
      sugarcube/src/activities/actress/auditions_minor1.tw
  6. 2 2
      sugarcube/src/activities/bootycall/booty_call_start.tw
  7. 1 1
      sugarcube/src/activities/bootycall/booty_call_virgin.tw
  8. 2 2
      sugarcube/src/activities/phone/phone.tw
  9. 1 1
      sugarcube/src/activities/school/chats/gschool_gopnik_chats.tw
  10. 9 9
      sugarcube/src/activities/school/deprecated/gschool_lessons2.tw
  11. 4 4
      sugarcube/src/activities/school/deprecated/gschool_lessons3.tw
  12. 3 3
      sugarcube/src/activities/school/deprecated/gschool_lessons4.tw
  13. 2 2
      sugarcube/src/activities/school/gschool_cheerleading.tw
  14. 7 7
      sugarcube/src/activities/school/gschool_detention.tw
  15. 26 26
      sugarcube/src/activities/school/gschool_events.tw
  16. 7 7
      sugarcube/src/activities/school/gschool_events1.tw
  17. 1 1
      sugarcube/src/activities/school/gschool_lessonsev1.tw
  18. 4 4
      sugarcube/src/activities/school/gschool_lunch.tw
  19. 2 2
      sugarcube/src/activities/school/gschool_sex.tw
  20. 9 9
      sugarcube/src/activities/school/schoolday/breaks/bathroom.tw
  21. 6 6
      sugarcube/src/activities/school/schoolday/lessons/art.tw
  22. 2 2
      sugarcube/src/activities/school/schoolday/lessons/english.tw
  23. 2 2
      sugarcube/src/activities/school/schoolday/lessons/history.tw
  24. 1 1
      sugarcube/src/activities/school/schoolday/skips/boys_bathroom.tw
  25. 1 1
      sugarcube/src/activities/sleep/sleep_prepare.tw
  26. 7 7
      sugarcube/src/autogenerated/Bel gang/belpicknick.tw
  27. 2 2
      sugarcube/src/autogenerated/Block/gopsex.tw
  28. 4 4
      sugarcube/src/autogenerated/Block/pav_aptcourtev.tw
  29. 2 2
      sugarcube/src/autogenerated/Block/pod_whore.tw
  30. 6 6
      sugarcube/src/autogenerated/Boys/BDsex.tw
  31. 1 1
      sugarcube/src/autogenerated/Cars/zaprFWash.tw
  32. 2 2
      sugarcube/src/autogenerated/City Center/burger.tw
  33. 1 1
      sugarcube/src/autogenerated/City Center/talent_agency.tw
  34. 4 4
      sugarcube/src/autogenerated/City Center/tatiana_missions.tw
  35. 2 2
      sugarcube/src/autogenerated/City Industrial/lakecafe.tw
  36. 1 1
      sugarcube/src/autogenerated/City Industrial/qwBarBilliard.tw
  37. 2 2
      sugarcube/src/autogenerated/City Industrial/qwBarEncounters.tw
  38. 3 3
      sugarcube/src/autogenerated/City Red Light/bordel.tw
  39. 1 1
      sugarcube/src/autogenerated/City Red Light/sexshop.tw
  40. 2 2
      sugarcube/src/autogenerated/City Residential/park_walkevents.tw
  41. 5 5
      sugarcube/src/autogenerated/Combat/ender.tw
  42. 4 4
      sugarcube/src/autogenerated/Combat/fight.tw
  43. 5 5
      sugarcube/src/autogenerated/Community center/Voltrener.tw
  44. 6 6
      sugarcube/src/autogenerated/Community center/VoltrenerSexShower.tw
  45. 3 3
      sugarcube/src/autogenerated/Community center/Voltrenersex.tw
  46. 1 1
      sugarcube/src/autogenerated/Community center/gdksport.tw
  47. 1 1
      sugarcube/src/autogenerated/Community center/gdktoilet.tw
  48. 1 1
      sugarcube/src/autogenerated/Community center/gdktoilet_mens.tw
  49. 2 2
      sugarcube/src/autogenerated/Community center/kotovtalker.tw
  50. 1 1
      sugarcube/src/autogenerated/Crime and Punishment/shoplifting.tw
  51. 5 5
      sugarcube/src/autogenerated/Dima Nosov/dimaHome.tw
  52. 2 2
      sugarcube/src/autogenerated/Dima Nosov/dimalina.tw
  53. 2 2
      sugarcube/src/autogenerated/Dima Nosov/dinnpc.tw
  54. 1 1
      sugarcube/src/autogenerated/EfimovRA/Kwlake2.tw
  55. 1 1
      sugarcube/src/autogenerated/EfimovRA/Palatka.tw
  56. 1 1
      sugarcube/src/autogenerated/EfimovRA/billiard.tw
  57. 2 2
      sugarcube/src/autogenerated/EfimovRA/billsvid.tw
  58. 4 4
      sugarcube/src/autogenerated/EfimovRA/kafesvid.tw
  59. 1 1
      sugarcube/src/autogenerated/EfimovRA/kazinosvid.tw
  60. 1 1
      sugarcube/src/autogenerated/EfimovRA/police.tw
  61. 4 4
      sugarcube/src/autogenerated/EfimovRA/svidboy.tw
  62. 4 4
      sugarcube/src/autogenerated/Encounter Generator/sexm.tw
  63. 1 1
      sugarcube/src/autogenerated/Family/seeporn.tw
  64. 1 1
      sugarcube/src/autogenerated/Fedor/FedorEv2.tw
  65. 1 1
      sugarcube/src/autogenerated/Functions/drugs.tw
  66. 1 1
      sugarcube/src/autogenerated/Functions/exercise.tw
  67. 3 3
      sugarcube/src/autogenerated/Functions/fertility.tw
  68. 4 4
      sugarcube/src/autogenerated/Functions/willpower.tw
  69. 2 2
      sugarcube/src/autogenerated/Furniture/vann.tw
  70. 3 3
      sugarcube/src/autogenerated/Gadyukino Characters/hunter_favors.tw
  71. 10 10
      sugarcube/src/autogenerated/Gadyukino Characters/hunter_interactions.tw
  72. 6 6
      sugarcube/src/autogenerated/Gadyukino Characters/mitka.tw
  73. 1 1
      sugarcube/src/autogenerated/Gadyukino/backwater.tw
  74. 1 1
      sugarcube/src/autogenerated/Gadyukino/meadow.tw
  75. 5 5
      sugarcube/src/autogenerated/Generator/zsoft_gopskverGorSlut.tw
  76. 1 1
      sugarcube/src/autogenerated/Generic boyfriend/Gnpc.tw
  77. 2 2
      sugarcube/src/autogenerated/Generic boyfriend/Gnpc2.tw
  78. 3 3
      sugarcube/src/autogenerated/Generic boyfriend/hookup_virgin.tw
  79. 4 4
      sugarcube/src/autogenerated/Home-Shared locations/gloryhole.tw
  80. 12 12
      sugarcube/src/autogenerated/Home-Shared locations/metro_events.tw
  81. 2 2
      sugarcube/src/autogenerated/Home-Shared locations/taxi.tw
  82. 1 1
      sugarcube/src/autogenerated/Igor Kruglov/igorev.tw
  83. 1 1
      sugarcube/src/autogenerated/Igor Kruglov/igorhome.tw
  84. 4 4
      sugarcube/src/autogenerated/Katja Meynold/katja_city_sex.tw
  85. 14 14
      sugarcube/src/autogenerated/Katja Meynold/katja_nightclub.tw
  86. 6 6
      sugarcube/src/autogenerated/Katja Meynold/katja_party.tw
  87. 2 2
      sugarcube/src/autogenerated/Magic Quests/serpent.tw
  88. 8 8
      sugarcube/src/autogenerated/Magic Quests/succubus.tw
  89. 1 1
      sugarcube/src/autogenerated/Magic/castSpell.tw
  90. 2 2
      sugarcube/src/autogenerated/Natasha Belova/natbelEv.tw
  91. 3 3
      sugarcube/src/autogenerated/Natasha Belova/natbel_cp_1.tw
  92. 1 1
      sugarcube/src/autogenerated/New Year 2010/nyp_school.tw
  93. 7 7
      sugarcube/src/autogenerated/New Year 2010/sny.tw
  94. 3 3
      sugarcube/src/autogenerated/Niko Volkov/NikoDates.tw
  95. 5 5
      sugarcube/src/autogenerated/Niko Volkov/NikoEv2.tw
  96. 2 2
      sugarcube/src/autogenerated/North Road/road_prostitution.tw
  97. 5 5
      sugarcube/src/autogenerated/Pav Lake/LakeBoyZ.tw
  98. 2 2
      sugarcube/src/autogenerated/Pavlovsk/garfather.tw
  99. 3 3
      sugarcube/src/autogenerated/Pavlovsk/gopskver.tw
  100. 4 4
      sugarcube/src/autogenerated/Pavlovsk/kotovEv.tw

+ 1 - 1
qrsc_to_tw.py

@@ -828,7 +828,7 @@ def convert_file(filename,skipIfNotExplicit=0,defaultsubfolder=False):
 		data = file.read()
 
 	with open(tw_filepath, 'w') as file:
-		regex1 = r"""<<gs 'willpower' ([\s'\w]*)>>\s*<<if \$will_cost <= \$pc\.pcs_willpwr>>\s*<<act '([\w\s]*?)\s*\(will_cost Willpower\)'>>"""
+		regex1 = r"""<<gs 'willpower' ([\s'\w]*)>>\s*<<if \$will_cost <= \$pc\.willpower>>\s*<<act '([\w\s]*?)\s*\(will_cost Willpower\)'>>"""
 
 		while match := re.search(regex1,data,re.I):
 			blockStart = match.end()

+ 40 - 16
sugarcube/src/actions/act.ts

@@ -97,24 +97,48 @@ var actAdd = function(macroContext:TwineSugarCube.MacroContext,label:string,cont
 		}
 	}
 
-	//<!-- Willpower -->
-	if('willpower' in flags){
-		let _willpower_cost = 0;
-		if(typeof flags.willpower == "number"){
-			_willpower_cost = flags.willpower
-		}else{
-			_willpower_cost = setup.func('willpower','cost',flags.willpower)
+	//#region Personality
+		if(flags.personality){
+
+			if(flags.willpower){
+				console.error('personality and willpower must not be declare at the same time in actAdd: (label, flags)',label,flags);
+			}
+
+			let personality_willpower = 0;
+
+			for(const [personalityId, personalityRequirement] of Object.entries(flags.personality)){
+				const expectedPersonalityEffect = pc.personalityScale(personalityId).effectOfAction(personalityRequirement);
+				if(expectedPersonalityEffect.willpower > 0)
+					personality_willpower += expectedPersonalityEffect.willpower;
+			}
+
+			if(personality_willpower){
+
+			}
 		}
-		label += " ("+_willpower_cost+")"
-		if(_willpower_cost > pc.pcs_willpwr){
-			_styleClass += ' willpower willpower_disabled disabled'
-			_act_contents = ''
-			_tooltip = "You don\'t have enough willpower to perform this action."
-		}else{
-			_styleClass += ' willpower'
-			_act_contents = "<<gs 'willpower' 'pay' "+_willpower_cost+" `"+ JSON.stringify(flags.willpower)+"`" + _act_contents;
+	//#endregion
+
+	//#region Willpower
+		if(flags.willpower){
+			let _willpower_cost = 0;
+			if(typeof flags.willpower == "number"){
+				_willpower_cost = flags.willpower
+			}else{
+				_willpower_cost = setup.func('willpower','cost',flags.willpower)
+			}
+			label += " ("+_willpower_cost+")"
+			if(_willpower_cost > pc.willpower){
+				_styleClass += ' willpower willpower_disabled disabled'
+				_act_contents = ''
+				_tooltip = "You don\'t have enough willpower to perform this action."
+			}else{
+				_styleClass += ' willpower'
+				_act_contents = "<<gs 'willpower' 'pay' "+_willpower_cost+" `"+ JSON.stringify(flags.willpower)+"`" + _act_contents;
+			}
 		}
-	}
+
+		
+	//#endregion
 
 	//<!-- Money Cost -->
 	if('cost' in flags){

+ 4 - 4
sugarcube/src/activities/actress/audition_sex1.tw

@@ -60,7 +60,7 @@
 	<<gs 'willpower' 'bj' 'resist'>>
 	<<setinit $audition['bonus'] += 5>>
 	<<setinit $actress['cast_couch_bj'] += 1>>
-	<<if $will_cost > $pc.pcs_willpwr>>
+	<<if $will_cost > $pc.willpower>>
 		<<actCLA `'Chicken out ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<<else>>
 		<<act 'Chicken out (will_cost Willpower)'>>
@@ -83,7 +83,7 @@
 				<<video "shared/actress/sex/reluctant/bj3.mp4">>
 				<p>Suddenly you're snapped out of your thoughts as $boydesc pulls you off his cock.</p>
 				"Ugh, you're terrible at this. Take off your clothes and face the desk," he says, looking down at you expectantly.
-				<<if $will_cost > $pc.pcs_willpwr>>
+				<<if $will_cost > $pc.willpower>>
 					<<actCLA `'Run away ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 				<<else>>
 					<<act 'Run away (will_cost Willpower)'>>
@@ -98,7 +98,7 @@
 						<<gt 'audition_sex1' 'reluctant_bj2'>>
 					<</act>>
 				<</actCLA>>
-				<<if $pc.sexStat('vaginal') == 0 and $will_cost <= $pc.pcs_willpwr>>
+				<<if $pc.sexStat('vaginal') == 0 and $will_cost <= $pc.willpower>>
 					<<actCLA '"No! I`m a virgin!" (will_cost Willpower)'>>
 						<<setinit $audition['virgin_know'] = 1>>
 						<<image "locations/city/citycenter/aurora/auditions/room.jpg">>
@@ -1131,7 +1131,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'cum_inside' 'resist'>>
-		<<if $will_cost >= $pc.pcs_willpwr>>
+		<<if $will_cost >= $pc.willpower>>
 			<<actCLA 'Not inside me! (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<if rand(0,1) == 1>>

+ 2 - 2
sugarcube/src/activities/actress/auditions.tw

@@ -150,7 +150,7 @@
 				<</act>>
 			<</actCLA>>
 			<<if $pc.pcs_inhib < 50>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Show her your tits (will_cost Willpower)'>>
 						<<image "locations/city/citycenter/aurora/auditions/showtits.jpg">>
 						Your face heats with embarassment, both at her beratement and because of how uncomfotable you are with doing this but you pull your clothes aside to reveal your breasts to the woman. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.
@@ -186,7 +186,7 @@
 			<</if>>
 		<</actCLA>>
 		<<if $pc.pcs_inhib < 50>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Show her your tits (will_cost Willpower)'>>
 					<<image "locations/city/citycenter/aurora/auditions/showtits.jpg">>
 					You blush with embarassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.

+ 3 - 3
sugarcube/src/activities/actress/auditions_minor1.tw

@@ -107,7 +107,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'casting_couch'>>
 	<<gs 'willpower' 'misc' 'self' 'easy'>>
-	<<if $will_cost > $pc.pcs_willpwr>>
+	<<if $will_cost > $pc.willpower>>
 		<<actCLA `'Beg to change his mind ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<<else>>
 		<<actCLA 'Beg to change his mind (will_cost Willpower)'>>
@@ -418,7 +418,7 @@
 		<</actCLA>>
 	<</if>>
 	<<gs 'willpower' 'prostitution' 'self'>>
-	<<if $will_cost > $pc.pcs_willpwr>>
+	<<if $will_cost > $pc.willpower>>
 		<<actCLA `'Slut up and offer sexual favors for the role ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<<else>>
 		<<actCLA 'Slut up and offer sexual favors for the role (will_cost Willpower)'>>
@@ -515,7 +515,7 @@
 			<<else>>
 				<<gs 'willpower' 'skill' 'pcs_inhib' 'force' 'hard'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<act 'Flash your tits (will_cost Willpower)'>>
 					<<gt 'auditions_minor1' 'minor1_flash'>>
 				<</act>>

+ 2 - 2
sugarcube/src/activities/bootycall/booty_call_start.tw

@@ -443,7 +443,7 @@
 				<<gt 'booty_call_start' 'bj_sub1'>>
 			<</act>>
 			<<gs 'willpower' 'bj' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'How about a handy instead? (will_cost Willpower)'>>
 					<<gs 'willpower' 'bj' 'resist'>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -457,7 +457,7 @@
 				<<actCLA `'How about a handy instead? ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 			<</if>>
 			<<gs 'willpower' 'bj' 'resist' 'easy'>>
-			<!-- !!{		if will_cost <= pcs_willpwr:
+			<!-- !!{		if will_cost <= willpower:
 			act'Can we 69?  (<<will_cost>> Willpower)':
 			cla & *nl
 			gs 'willpower', 'pay', 'self'

+ 1 - 1
sugarcube/src/activities/bootycall/booty_call_virgin.tw

@@ -274,7 +274,7 @@
 			<</act>>
 		<</actCLA>>
 		<!-- !!{		gs 'willpower', 'bj', 'resist', 'easy'
-		if will_cost <= pcs_willpwr:
+		if will_cost <= willpower:
 		act'Can we 69?  (<<will_cost>> Willpower)':
 		cla & *nl
 		gs 'willpower', 'pay', 'self'

+ 2 - 2
sugarcube/src/activities/phone/phone.tw

@@ -588,7 +588,7 @@
 		<<setinit $Call4Date["loverResist"] = 'hard'>>
 	<</if>>
 	<<gs 'willpower' 'misc' 'self' $Call4Date["loverResist"]>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I think we should break up... (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<p>$Call4Date["NPC-He"] sounds hurt, but you insist it is for the best. You both say goodbye and part ways.</p>
@@ -692,7 +692,7 @@
 			<<setinit $Call4Date["loverResist"] = 'hard'>>
 		<</if>>
 		<<gs 'willpower' 'misc' 'self' $Call4Date["loverResist"]>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'I think we should break up... (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<p>$Call4Date["NPC-He"] sounds hurt, but you insist it is for the best. You both say goodbye and part ways.</p>

+ 1 - 1
sugarcube/src/activities/school/chats/gschool_gopnik_chats.tw

@@ -19,7 +19,7 @@
 			<<actCLA 'Continue'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 		<<gs 'willpower' 'misc' 'force' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Argue that it`s not true (will_cost Willpower)'>>
 				<<image "characters/shared/headshots_main/big9.jpg">>
 				<<gs 'willpower' 'pay' 'force'>>

+ 9 - 9
sugarcube/src/activities/school/deprecated/gschool_lessons2.tw

@@ -275,7 +275,7 @@
 					<p>Some of your classmates burst into loud laughter while others are stunned into silence. Mr. Ivanov turns and gives the rest of class a hard look. "SILENCE!" he loudly booms before turning back to you.</p>
 					<p>"You think you're being funny Miss $pc.name_last? Well you're taking your smart mouth to the principal right now."</p>
 					<<gs 'willpower' 'misc' 'resist' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Don`t leave the classroom (will_cost Willpower)'>>
 
 							<<set $demerit += 1>>
@@ -396,7 +396,7 @@
 						<</actCLA>>
 
 
-					<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+					<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 						<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 
 
@@ -407,7 +407,7 @@
 							<p>Realizing he can't retrieve your phone without causing any awkward situations, he returns to the front of the class in defeat. "I expected nothing less from you Miss $pc.name_last. You never fail to fall down to your lowest potential." You pull your phone back out as he resumes his lesson, looking somewhat annoyed.</p>
 							<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 						<</actCLA>>
-					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 						<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<</actCLA>>
@@ -645,7 +645,7 @@
 		<</actCLA>>
 		<<if $wardrobe.isWearingPanties>>
 			<<gs 'willpower' 'exhib' 'self' 'medium'>>
-			<<if $will_cost <= $pc.pcs_willpwr and $wardrobe.isWearingPanties>>
+			<<if $will_cost <= $pc.willpower and $wardrobe.isWearingPanties>>
 				<<actCLA 'Remove panties (will_cost Willpower)'>>
 					<<strip 'panties'>>
 					<<gs 'willpower' 'exhib' 'self' 'medium'>>
@@ -786,7 +786,7 @@
 						<br>You don't have enough willpower to take an upskirt photo of yourself.
 					<</if>>
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+					<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 						<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
 							<<gs 'willpower' 'pay' 'self'>>
@@ -797,7 +797,7 @@
 							<p>Mr. Vasilyev is stunned by your move. "You know that this isn't appropriate Miss $pc.name_last. Please hand it over." You have no intention of doing so and wiggle your chest a bit. He soon admits defeat and returns to his lesson as you pull your phone back out and return to your game.</p>
 							<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 						<</actCLA>>
-					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 						<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<</actCLA>>
@@ -970,7 +970,7 @@
 						<<set $demerit += 10 + $school_bunk * 5>> <<gt 'gschool_office' 'principal'>>
 					<</actCLA>>
 					<<gs 'willpower' 'misc' 'resist' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Don`t leave the classroom (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'resist'>>
 							<<set $demerit += 5>>
@@ -1070,7 +1070,7 @@
 						<</actCLA>>
 
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+					<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 						<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
 							<<gs 'willpower' 'pay' 'self'>>
@@ -1083,7 +1083,7 @@
 								<<set $demerit += 10 + $school_bunk * 5>> <<gt 'gschool_lessons' 'short_break'>>
 							<</actCLA>>
 						<</actCLA>>
-					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 						<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<</actCLA>>

+ 4 - 4
sugarcube/src/activities/school/deprecated/gschool_lessons3.tw

@@ -262,7 +262,7 @@
 							<<image "locations/pavlovsk/school/classroom/teasep1.jpg">>
 							You turn towards Dan so you're sitting sideways while facing him. You pull your skirt up a little showing off a glimpse of your panties, which makes him grin wide. He motions for you to pull your skirt up higher to give him a better view.
 							<<gs 'willpower' 'exhib' 'resist' 'medium'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Refuse (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'resist'>>
 									<<image "locations/pavlovsk/school/classroom/teaseb3.jpg">>
@@ -283,7 +283,7 @@
 									<<image "locations/pavlovsk/school/classroom/teasep3.jpg">>
 									<p>Just then, he reaches over, grabs the front of your panties and tries to pull them down to get a look at your pussy. You grab his hand just in time to stop him from doing it. "Come on $pc.name_nick, show me your pussy," he whispers as he keeps trying to tug your panties down.</p>
 									<<gs 'willpower' 'exhib' 'resist' 'medium'>>
-									<<if $will_cost <= $pc.pcs_willpwr>>
+									<<if $will_cost <= $pc.willpower>>
 										<<actCLA 'Refuse (will_cost Willpower)'>>
 											<<gs 'willpower' 'pay' 'resist'>>
 											<<image "locations/pavlovsk/school/classroom/teasep5.jpg">>
@@ -317,7 +317,7 @@
 			<</actCLA>>
 			<<if $wardrobe.isWearingPanties>>
 				<<gs 'willpower' 'exhib' 'self' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Remove panties (will_cost Willpower)'>>
 						<<set $wardrobe.pantyworntype = 'none'>>
 						<<gs 'willpower' 'exhib' 'self' 'medium'>>
@@ -422,7 +422,7 @@
 
 					<<if $wardrobe.isWearingBra>>
 						<<gs 'willpower' 'misc' 'self' 'medium'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 								<<gs 'willpower' 'misc' 'self' 'medium'>>
 								<<gs 'willpower' 'pay' 'self'>>

+ 3 - 3
sugarcube/src/activities/school/deprecated/gschool_lessons4.tw

@@ -72,7 +72,7 @@
 							<</actCLA>>
 
 
-						<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+						<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 							<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 
 
@@ -82,7 +82,7 @@
 								<<npc 'A26'>><</npc>> seems flabbergasted by your actions. He remains silent for a few seconds before shaking his head, turning around and walking back to the front of the class. It seems that he realized that it's not worth the effort to take your phone away from you without causing all sorts of awkward situations. You pull your phone back out of your bra and continue browsing the web as the lesson goes on.
 								<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 							<</actCLA>>
-						<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+						<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 							<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 						<</if>>
 					<</actCLA>>
@@ -500,7 +500,7 @@
 				<<else>>
 					<<gs 'willpower' 'sex' 'resist' 'medium'>>
 				<</if>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Tell them to get out (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						

+ 2 - 2
sugarcube/src/activities/school/gschool_cheerleading.tw

@@ -222,7 +222,7 @@
 		<<gt 'gschool_cheerleading' 'practice'>>
 	<</act>>
 	<<gs 'willpower' 'misc' 'self' iif(cheerleadingQW['skipped'] > 0, 'hard', '')>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Skip practice (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<run $q.cheerleading.inc('skipped',1)>>
@@ -252,7 +252,7 @@
 		<<gt 'gschool_cheerleading' 'game'>>
 	<</act>>
 	<<gs 'willpower' 'misc' 'self' iif(cheerleadingQW['skipped'] > 0, 'hard', '')>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Skip the game (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<run $q.cheerleading.inc('skipped',1)>>

+ 7 - 7
sugarcube/src/activities/school/gschool_detention.tw

@@ -91,7 +91,7 @@
 	<<gs 'gschool_detention' 'back_down'>>
 	<<gs 'gschool_detention' 'return_favor' 'random'>>
 	<<gs 'willpower' 'misc' 'self' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Smack her (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<run $quest('school').func('groupRelInc','gopniks',1)>>
@@ -243,7 +243,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Do it (will_cost willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<fame 'pav' 'sex' 1>>
@@ -438,7 +438,7 @@
 	<p>You share a table with $rand_girl and $rand_boy. Before long, he is flirting for all he is worth with her and going by her giggles, he's striking the right tone. The teacher shushes them a few times but doesn't really make much of an effort to silence them. $rand_boy leans in and whisper something to her that earns him a half hearted smack on the shoulder and you overhear her calling him "bad" - her smile and the way she plays with her hair suggests that she likes "bad."</p>
 	<p>They have a whispered argument or discussion - you are not sure which - but when they are done, they both look around and you can tell they are up to something. $rand_girl leans over to you and whispers: "Can you distract Mr $rand_teacher for us, so we can slip away?" Both of them give you pleading looks.</p>
 	<<gs 'willpower' 'misc' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<h2>Detention</h2>
@@ -527,7 +527,7 @@
 				<<set $orgasm_or = 'no'>>
 				<<arouse 'cuni' 10 `['dom']`>>
 				<<gs 'willpower' 'cuni' 'force'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Glaze his face (will_cost willpower)'>>
 						<<gs 'willpower' 'pay' 'force'>>
 						<<run $npcs.dec('A152','rel',5)>>
@@ -698,7 +698,7 @@
 	<p>You grin - it is funny watching him getting a little embarrassed about it. "What about it? I had fun. Didn't you?" you ask, feigning indignance to tease him.</p>
 	<p>He looks slightly panicked as he reassures you. "No, no, no. It's not that, I had fun, it was great! I, um... well, I was just wondering if you wanted to meet me after detention?"</p>
 	<<gs 'willpower' 'sex' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse (will_cost willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<h2>Detention</h2>
@@ -803,7 +803,7 @@
 	<p>"Miss $pc.name_last, it's time that you repay me for keeping your cutting class secret." Turning in your chair, you see his dick sticking out of his pants; the bastard already had sex with you for his silence and now he expects you to keep getting him off!</p>
 	<p>The wheels are turning in your head: On one hand, it's not like you haven't already let him have his way with you, so your reluctance at the thought probably isn't as strong as it should be. But that doesn't change the fact that he is blackmailing you, and who's to say where that leads you or when he'll be satisfied? Should you submit or make a stand?</p>
 	<<gs 'willpower' 'sex' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Tell him to fuck off (will_cost willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<h2>Detention</h2>
@@ -811,7 +811,7 @@
 			<p>You flip him off and stand up. "Fuck you, I already gave you what you wanted to be silent." You take a few steps toward the door but then stop dead in your tracks when you hear your own voice, offering yourself to Mr. Ivanov so he doesn't tell on you. The bastard recorded you in the bathroom?! You turn around to see him holding his phone, a hard, triumphant look meeting yours as he answers the silent question: "That's right, I recorded our little chat. I knew you were going to offer sex - right from the first time you entered my class, I knew you were a little whore, and I was right, wasn't I? So now you are going to be my little whore anytime I want, or else I will get you expelled for trying to have sex with one of your teachers... and I'll make sure your parents will hear about it, too. Just imagine how disappointed they'll be how their daughter turned out."</p>
 			<p>You are completely stunned, shock and fear burning in your chest like fire. Telling your parents? Getting you expelled from school? You knew he was a twisted motherfucker, but this? You had no idea he was the kind of scum who would threaten to destroy your life so he could own you. A part of you tries to stay rational and thinks that he would get in as much trouble as you, if not more, if the school found out. Problem is, you can't <b>prove</b> that you had sex, that he took you up on your offer, that he fucked a student. The only recording of the event is his and he's probably smart enough to cut it so it only has you soliciting him. Would they really expel you? You don't know.</p>
 			<<gs 'willpower' 'sex' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA '"Fuck you, asshole!" (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<h2>Detention</h2>

+ 26 - 26
sugarcube/src/activities/school/gschool_events.tw

@@ -167,7 +167,7 @@
 			<<gs 'gschool_events' 'leave_break_events'>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $wardrobe.PCloSkirt > 0 and $will_cost <= $pc.pcs_willpwr>>
+		<<if $wardrobe.PCloSkirt > 0 and $will_cost <= $pc.willpower>>
 			<<actCLA 'Lift your skirt (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -185,7 +185,7 @@
 				'Not even breaking stride you call over your shoulder "Sweetie, you'll have to spank me harder than that if you want to get up to my standards!" Your hands go down to your waist and give a flip of your skirt to give him a fleeting view of '+iif($wardrobe.pantyworntype ! 'none', 'your panties.', 'your naked ass.')
 				<<gs 'gschool_events' 'leave_break_events'>>
 			<</actCLA>>
-		<<elseif $wardrobe.PCloSkirt > 0 and $will_cost > $pc.pcs_willpwr>>
+		<<elseif $wardrobe.PCloSkirt > 0 and $will_cost > $pc.willpower>>
 			<<actCLA `'Lift your skirt ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 		<</if>>
 		<<if rand (0,2) == 0>>
@@ -292,7 +292,7 @@
 		<<else>>
 			<<gs 'willpower' 'bj' 'resist'>>
 		<</if>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Tell him to get lost (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<video "locations/pavlovsk/school/lunch/flipoff.mp4">>
@@ -627,7 +627,7 @@
 			<<gs 'gschool_events' 'leave_break_events'>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Tease them (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -645,7 +645,7 @@
 			<</actCLA>>
 		
 		<<gs 'willpower' 'exhib' 'self' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Taunt them (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'self' 'hard'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -691,7 +691,7 @@
 			You think he is kinda cute, so you decide to flirt back with him. You place your hand on his chest and tell him he isn''t so bad himself. Soon, you are flirting back just as much as he is flirting with you.
 			<p>After a while, he seems emboldened by you flirting back at him and if you are not mistaken, he is sporting a raging hard-on as well. "Hey $pc.name_nick, want to go somewhere private and have some fun?"</p>
 			<<gs 'willpower' 'sex' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Not today (will_cost Willpower)'>>
 					<<gs 'fame' 'pav' 'sex' 1>>
 					<<gs 'willpower' 'sex' 'resist'>>
@@ -749,7 +749,7 @@
 			<<else>>
 				<<gs 'willpower' 'bj' 'resist'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tell him to get lost (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<video "locations/pavlovsk/school/lunch/flipoff.mp4">>
@@ -796,7 +796,7 @@
 			<<else>>
 				<<gs 'willpower' 'sex' 'resist'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tell him to get lost (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<video "locations/pavlovsk/school/lunch/flipoff.mp4">>
@@ -1097,7 +1097,7 @@
 				<<gs 'gschool_events' 'leave_break_events'>>
 			<</actCLA>>
 			<<gs 'willpower' 'exhib' 'self'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tease them (will_cost Willpower)'>>
 					<<gs 'willpower' 'exhib' 'self'>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -1115,7 +1115,7 @@
 				<</actCLA>>
 			<</if>>
 			<<gs 'willpower' 'exhib' 'self' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Taunt them (will_cost Willpower)'>>
 					<<gs 'willpower' 'exhib' 'self' 'hard'>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -1161,7 +1161,7 @@
 				You think he is kinda cute, so you decide to flirt back with him. You place your hand on his chest and tell him he isn''t so bad himself. Soon, you are flirting back just as much as he is flirting with you.
 				<p>After a while, he seems emboldened by you flirting back at him and if you are not mistaken, he is sporting a raging hard-on as well. "Hey $pc.name_nick, want to go somewhere private and have some fun?"</p>
 				<<gs 'willpower' 'sex' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Not today (will_cost Willpower)'>>
 						<<fame 'pav' 'sex' 1>>
 						<<gs 'willpower' 'sex' 'resist'>>
@@ -1182,7 +1182,7 @@
 					<<warn "CONVERSION ERROR f09d8bf923d3271f5d05a620e5cae255">>
 				<</if>>
 				<<gs 'willpower' 'sex' 'resist' 'hard'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Hell no (will_cost Willpower)'>>
 						<<fame 'pav' 'sex' -1>>
 						<<gs 'willpower' 'sex' 'resist' 'hard'>>
@@ -1574,7 +1574,7 @@
 						You reply. "No reason. I just wanted to say hi."
 						<p>She shrugs as she takes a long pull of the bottle before offering it to you. "Want a drink?"</p>
 						<<gs 'willpower' 'drink' 'resist'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Refuse the drink (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<run $quest('school').func('groupRelInc','gopniks',-1)>>
@@ -1597,7 +1597,7 @@
 							<p>You take the offered bottle and take a swig of it yourself. It burns as it goes down. This is some of the cheapest vodka you have ever tasted. Coughing a bit, you hand it back to her and she smiles. "Fuck that's strong!"</p>
 							She takes another long swig from the bottle. "Well I don't drink this shit for the taste, but for the effect." She offers you the bottle again.
 							<<gs 'willpower' 'drink' 'resist'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Refuse another drink (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'resist'>>
 									<<image "locations/pavlovsk/school/events/afterschool/alyona3.jpg">>
@@ -1780,7 +1780,7 @@
 				<<gt 'gschool_grounds' 'main'>>
 			<</act>>
 			<<gs 'willpower' 'misc' 'self' 'medium'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Intervene (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<set $npc('A13').rel += 5>>
@@ -1827,7 +1827,7 @@
 					<<gt 'school_grounds'>>
 				<</act>>
 				<<gs 'willpower' 'misc' 'self' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Intervene (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'self'>>
 						<<set $npc('A13').rel += 5>>
@@ -1857,7 +1857,7 @@
 						<<gt 'school_grounds'>>
 					<</act>>
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Intervene (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'self'>>
 							<<set $npc('A13').rel += 5>>
@@ -1881,7 +1881,7 @@
 							 <<gt 'school_grounds'>>
 						<</act>>
 						<<gs 'willpower' 'misc' 'self' 'medium'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Intervene (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'self'>>
 								<<set $npc('A13').rel += 5>>
@@ -1906,7 +1906,7 @@
 								 <<gt 'school_grounds'>>
 							<</act>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Intervene (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'self'>>
 									<<set $npc('A13').rel += 5>>
@@ -1959,7 +1959,7 @@
 				She looks up a bit startled. She apparently didn''t hear you walk up. She quickly rubs her eyes, making it very obvious she was crying. "I'm fine."
 				Her tone suggests she is anything but fine, but before you can say more she starts to get up, clearly wanting to get away.
 				<<gs 'willpower' 'misc' 'self' iif(grupTipe ! 4,'easy','')>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Try to talk her through her troubles (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'self'>>
 						<<set $time.minutes += 10>>
@@ -2000,7 +2000,7 @@
 			<p>As you are heading out of school, you see a group of gopniks ahead of you. Just before you walk past them, Vitek steps in front of you and blocks your path. You step away from him, pulling out of his reach as you turn around. You point your finger at him. "Don't make me hurt you! You know I will."</p>
 			<p>He laughs a bit and steps up closer again, crowding you a bit, but keeps his hands to himself. "Come on $pc.name_nick. You know you want to have some fun. Stop acting like you are not all hot and bothered by this. We can help you with that itch."</p>
 			<<gs 'willpower' 'bj' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Back off (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<setinit $grupvalue[4] += 2>>
@@ -2070,13 +2070,13 @@
 				<</act>>
 			<<else>>
 				<<gs 'willpower' 'bj' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Resist (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<image "locations/pavlovsk/school/events/resistgop.jpg">>
 						You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and turn your head away from him. The boy leans in close to you. "Just do as you're told or this will be a lot worse for you."
 						<<gs 'willpower' 'bj' 'resist'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Threaten to scream (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<image "locations/pavlovsk/school/events/resistgop.jpg">>
@@ -2108,7 +2108,7 @@
 					She looks up a bit startled. She apparently didn''t hear you walk up. She quickly rubs her eyes, making it very obvious she was crying. "I'm fine."
 					Her tone suggests she is anything but fine, but before you can say more she starts to get up, clearly wanting to get away.
 					<<gs 'willpower' 'misc' 'self' iif(grupTipe ! 4,'easy','')>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Try to talk her through her troubles (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'self'>>
 							<<set $time.minutes += 10>>
@@ -2207,13 +2207,13 @@
 					<</act>>
 				<<else>>
 					<<gs 'willpower' 'bj' 'resist'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Resist (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'resist'>>
 							<<image "locations/pavlovsk/school/events/resistgop.jpg">>
 							You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and turn your head away from him. The boy leans in close to you. "Just do as you're told or this will be a lot worse for you."
 							<<gs 'willpower' 'bj' 'resist'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Threaten to scream (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'resist'>>
 									<<image "locations/pavlovsk/school/events/resistgop.jpg">>

+ 7 - 7
sugarcube/src/activities/school/gschool_events1.tw

@@ -49,7 +49,7 @@
 				<</act>>
 			<</actCLA>>
 			<<gs 'willpower' 'exhib' 'self'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tease him (will_cost Willpower)'>>
 					<<run $pc.skillExperienceGain('inhibition',2)>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -137,7 +137,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Tease him (will_cost Willpower)'>>
 				<<run $pc.skillExperienceGain('inhibition',2)>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -294,7 +294,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Tease him (will_cost Willpower)'>>
 				<<run $pc.skillExperienceGain('inhibition',2)>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -522,13 +522,13 @@
 				<</act>>
 			<<else>>
 				<<gs 'willpower' 'bj' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Resist (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<image "locations/pavlovsk/school/events/resistgop.jpg">>
 						You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and turn your head away from him. The boy leans in close to you. "Just do as you're told or this will be a lot worse for you."
 						<<gs 'willpower' 'bj' 'resist'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Threaten to scream (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<image "locations/pavlovsk/school/events/resistgop.jpg">>
@@ -855,13 +855,13 @@
 				<</act>>
 			<<else>>
 				<<gs 'willpower' 'bj' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Resist (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<image "locations/pavlovsk/school/events/resistgop.jpg">>
 						You manage to pull away from him, but the others are blocking you. You back up, but eventually find your back against one of the walls and you turn your head away from him. The boy leans in close to you. "Just do as you're told or this will be a lot worse for you."
 						<<gs 'willpower' 'bj' 'resist'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Threaten to scream (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<image "locations/pavlovsk/school/events/resistgop.jpg">>

+ 1 - 1
sugarcube/src/activities/school/gschool_lessonsev1.tw

@@ -1205,7 +1205,7 @@
 			Marcus clears his throat and begins reading. He's painfully slow at times and his American accent doesn''t help but he does his best. As he comes to a difficult part, he starts stammering and gets stuck trying to pronounce a word correctly.
 			<p>While Marcus is trying to tackle the word, you hear someone snickering behind him. It's Alyona. "M.-M.-Maybe you should t-t-try once again. Are you slow or something?" The rest of the class starts laughing while Marcus shamefully stares down on his desk...</p>
 			<<gs 'willpower' 'misc' 'self' 'medium'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tell her off (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<run $npcs.dec('A143','rel',11)>>

+ 4 - 4
sugarcube/src/activities/school/gschool_lunch.tw

@@ -243,7 +243,7 @@
 	<p>You can't help but smile and shake your head a little. You can tell by the way his eyes roam all over your body that despite his compliments, there's only one thing on his mind right now. If the way he's flirting wasn't obvious enough, the bulge straining against his pants is a dead giveaway. "Well you're not looking too bad yourself Marcus. And by the look of things, you sure are VERY happy to see me!" you say with a giggle while deliberately staring at his crotch.</p>
 	<p>He blushes and pulls out his shirt so it hangs over his crotch, trying to hide his erection. "Oh fuck, sorry about that. I just had two girls in my last class who took turns flashing me. I swear those girls get a huge kick out of teasing me." He looks around before leaning in close to you. "Hey, think you might be able to you know... help me out with this?" he asks softly while indicating the evident bulge in his pants.</p>
 	<<gs 'willpower' 'bj' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Make an excuse and go (will_cost Willpower)'>>
 			<<gs 'willpower' 'bj' 'resist'>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -267,7 +267,7 @@
 		<<warn "CONVERSION ERROR ba1e8ff7985e0dd6f5db6a42a6dd4855">>
 	<</if>>
 	<<gs 'willpower' 'bj' 'resist' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Not today (will_cost Willpower)'>>
 			<<gs 'willpower' 'bj' 'resist' 'hard'>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -386,7 +386,7 @@
 		<<image "characters/pavlovsk/school/girl/anushka/sex/school/want.jpg">>
 		As you're leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately while one of her hands slides up your skirt and starts rubbing your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don't really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you. Come with me..." she whispers as her fingers slide up into your pussy.
 		<<gs 'willpower' 'sex' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Not today (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<image "characters/pavlovsk/school/girl/anushka/nomake.jpg">>
@@ -420,7 +420,7 @@
 		<<image "locations/pavlovsk/school/lunch/hall.jpg">>
 		<p>As you stop by your locker after lunch, Anushka comes over, rests against the locker next to yours and leans in close to you. "Hey $pc.name_nick, you wanna come have some fun? The boys brought something special and they're waiting for us in one of the unused classrooms." By the look in her eyes and the way she's acting, you know exactly what she means by "having fun" with the boys.</p>
 		<<gs 'willpower' 'sex' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Not today (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<run $quest('school').func('groupRelInc','gopniks',-1)>>

+ 2 - 2
sugarcube/src/activities/school/gschool_sex.tw

@@ -243,7 +243,7 @@
 	She grins at you and gives your ass a squeeze. "That''s my girl." She motions for you to follow as she starts off to the lesser used wing of the school. You fall in behind her and the two of you weave through the maze of other students heading for lunch.
 	<p>She leads you into a classroom and closes the door. Arkadi and Valentin are already waiting, passing a bottle of vodka back and forth. They grin as the two of you enter and wave you over. You notice the boys have apparently found two of those large exercise balls and filled them up, leaving them nearby. As you get closer, Valentin speaks up. "Glad you could make it $pc.name_nick. Here, have a drink." He passes you the bottle of vodka.</p>
 	<<gs 'willpower' 'drink' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Don`t drink (will_cost willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<relationship 'A156' 'dislike'>>
@@ -280,7 +280,7 @@
 		<p>Valentin holds up the bottle. "I'll drink to that, especially when we get to hang out with some fine ass bitches like the two of you." He then takes an even bigger swig than Anushka, so much so that Arkadi elbows him in the side. "Stop hogging it all and pass it over!"</p>
 		<p>Valentin coughs and passes the bottle to Arkadi, who promptly takes a big swig while Valentin berates him. "Fucking asshole! You almost made me choke on that." After his drink, Arkadi passes the bottle back to you.</p>
 		<<gs 'willpower' 'drink' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Don`t drink again (will_cost willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<arouse 'foreplay' 2 `['lesbian']`>>

+ 9 - 9
sugarcube/src/activities/school/schoolday/breaks/bathroom.tw

@@ -199,7 +199,7 @@
 			<p>As you walk in, you see a group of gopnik girls standing around chatting. It's obvious they are up to something as they turn as one to glare at you. A chill run down your spine - you picked the wrong time to come to the bathroom. You know who Lena, Lera, Pauline and Ekaterina are, but the other ones are from your brother's class. Pauline takes a step towards you and in a menacing tone says "Leave. Now!" You know you should leave since you are no match for these girls. If they decide to kick your ass, or worse, you won't be able to prevent it or escape, but you are also tired of the gopniks acting like they run the school and the rules don't apply to them.</p>
 			<<actCLA 'Leave the restroom'>><<gs 'school_schedule'>><</actCLA>>
 			<<gs 'willpower' 'misc' 'resist' 'medium'>>
-			<<if $will_cost < $pc.pcs_willpwr>>
+			<<if $will_cost < $pc.willpower>>
 				<<actCLA 'Refuse (will_cost willpower)'>>
 					<<set $uniform_steal_day = $time.daystart>>
 					<<gs 'willpower' 'pay' 'resist'>>
@@ -516,7 +516,7 @@
 							<</act>>
 						<</actCLA>>
 						<<gs 'willpower' 'sex' 'force'>>
-						<<if $will_cost < $pc.pcs_willpwr>>
+						<<if $will_cost < $pc.willpower>>
 							<<actCLA 'I want to be on top (will_cost willpower)'>>
 								<<gs 'willpower' 'pay' 'force'>>
 								<!-- Boy A147 -->
@@ -566,7 +566,7 @@
 				<p>You cock your head to one side. "So you just want me to just turn around and let you shove your dick up my ass?" you ask with one brow slightly arched.</p>
 				"Well no, you can suck it a bit first to get it nice and wet so it slides in easier." he says with a confident grin.
 				<<gs 'willpower' 'anal' 'resist'>>
-				<<if $will_cost < $pc.pcs_willpwr>>
+				<<if $will_cost < $pc.willpower>>
 					<<actCLA 'Decline his offer (will_cost willpower)'>>
 						<<set $menu_off = 0>>
 						<<gs 'willpower' 'pay' 'resist'>>
@@ -640,7 +640,7 @@
 					 <<gt 'gschool_lessons' 'short_break'>>
 				<</act>>
 				<<gs 'willpower' 'misc' 'resist' 'medium'>>
-				<<if $will_cost < $pc.pcs_willpwr>>
+				<<if $will_cost < $pc.willpower>>
 					<<actCLA 'Push the stall door open (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<image "locations/pavlovsk/school/bathroom/sex/boys/alylav1.jpg">>
@@ -691,7 +691,7 @@
 									<<gt 'gschool_break' 'join_alylav'>>
 								<</act>>
 								<<gs 'willpower' 'sex' 'resist'>>
-								<<if $will_cost < $pc.pcs_willpwr>>
+								<<if $will_cost < $pc.willpower>>
 									<<actCLA 'I just want to suck your dick (will_cost willpower)'>>
 										<<gs 'willpower' 'pay' 'resist'>>
 										<<image "locations/pavlovsk/school/bathroom/sex/boys/alylav1.jpg">>
@@ -712,7 +712,7 @@
 								Lavrenti looks at Alyona. "Don't be like that, you can have your turn next.". She moves past you and shoves you hard against the back of the stall. "Fuck both of you." She storms out of the stall, leaving you to sit down on the toilet seat. As you do, you find Lavrenti''s cock in your face. Using one hand, you stroke the shaft of his dick while you suck on the head, bobbing your head up and down in motion with your hand. He pulls open your shirt to fondle your tits. A few minutes pass before he says: "Get up, I want to get that pussy of yours all wet so I can fuck it."
 								<<arouse 'bj' 3 `['dom']`>>
 								<<gs 'willpower' 'sex' 'resist'>>
-								<<if $will_cost < $pc.pcs_willpwr>>
+								<<if $will_cost < $pc.willpower>>
 									<<actCLA 'Just give him a blowjob (will_cost willpower)'>>
 										<<gs 'willpower' 'pay' 'resist'>>
 										<<image "locations/pavlovsk/school/bathroom/sex/boys/alylav5.jpg">>
@@ -878,7 +878,7 @@
 										<<gs 'pain' 1 'asscheeks' 'spank'>>
 										<<arouse 'foreplay' 2 `['sub']`>>
 										<<gs 'willpower' 'misc' 'resist' 'medium'>>
-										<<if $will_cost < $pc.pcs_willpwr>>
+										<<if $will_cost < $pc.willpower>>
 											<<actCLA 'No (will_cost Willpower)'>>
 												<<gs 'willpower' 'pay' 'resist'>>
 												<<image "locations/pavlovsk/school/bathroom/sex/girls/causmo10.jpg">>
@@ -899,7 +899,7 @@
 														<<else>>
 															<p>She pulls her feet away from you, while still holding you by the hair. "So have you had enough?"</p>
 															<<gs 'willpower' 'misc' 'resist' 'medium'>>
-															<<if $will_cost < $pc.pcs_willpwr>>
+															<<if $will_cost < $pc.willpower>>
 																<<actCLA 'Screw you bitch (will_cost Willpower)'>>
 																	<<gs 'willpower' 'pay' 'resist'>>
 																	<<image "locations/pavlovsk/school/bathroom/sex/girls/causmo13.jpg">>
@@ -1103,7 +1103,7 @@
 				<</actCLA>>
 			<</actCLA>>
 			<<gs 'willpower' 'misc' 'self' 'medium'>>
-			<<if $will_cost < $pc.pcs_willpwr>>
+			<<if $will_cost < $pc.willpower>>
 				<<actCLA 'Tell her a lie (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<image "locations/pavlovsk/school/principal/officenaked.jpg">>

+ 6 - 6
sugarcube/src/activities/school/schoolday/lessons/art.tw

@@ -245,7 +245,7 @@
 							<<image "locations/pavlovsk/school/classroom/teasep1.jpg">>
 							You turn towards Svyatoslav so you're sitting sideways while facing him. You pull your skirt up a little, showing off a glimpse of your panties, which makes him grin wide. He motions for you to pull your skirt up higher to give him a better view.
 							<<gs 'willpower' 'exhib' 'resist' 'medium'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Refuse (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'resist'>>
 									<<image "locations/pavlovsk/school/classroom/teaseb3.jpg">>
@@ -267,7 +267,7 @@
 									<<image "locations/pavlovsk/school/classroom/teasep3.jpg">>
 									<p>Just then, he reaches over, grabs the front of your panties and tries to pull them down to get a look at your pussy. You grab his hand just in time to stop him from doing it. "Come on $pc.name_nick, show me your pussy." he whispers as he keeps trying to tug your panties down.</p>
 									<<gs 'willpower' 'exhib' 'resist' 'medium'>>
-									<<if $will_cost <= $pc.pcs_willpwr>>
+									<<if $will_cost <= $pc.willpower>>
 										<<actCLA 'Refuse (will_cost Willpower)'>>
 											<<gs 'willpower' 'pay' 'resist'>>
 											<<image "locations/pavlovsk/school/classroom/teasep5.jpg">>
@@ -301,7 +301,7 @@
 			<</actCLA>>
 			<<if $wardrobe.isWearingPanties>>
 				<<gs 'willpower' 'exhib' 'self' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr and $wardrobe.isWearingPanties>>
+				<<if $will_cost <= $pc.willpower and $wardrobe.isWearingPanties>>
 					<<actCLA 'Remove panties (will_cost Willpower)'>>
 						<<set $wardrobe.pantyworntype = 'none'>>
 						<<gs 'willpower' 'exhib' 'self' 'medium'>>
@@ -349,7 +349,7 @@
 						<<set $demerit += 10 + $school_bunk * 5>> <<gt 'gschool_office' 'principal'>>
 					<</actCLA>>
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Don`t leave the classroom (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'resist'>>
 							<<set $demerit += 1>>
@@ -442,7 +442,7 @@
 						<</actCLA>>
 
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+					<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 						<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
 							<<gs 'willpower' 'pay' 'self'>>
@@ -453,7 +453,7 @@
 							<p>Mr. Vasilyev is stunned by your move. "You know that this isn't appropriate Miss $pc.name_last. Please hand it over." You have no intention of doing so and wiggle your chest a bit. He soon admits defeat and returns to his lesson as you pull your phone back out and return to your game.</p>
 							<<actCLA 'Wait for the end of the lesson'>><<gs 'school_schedule'>><</actCLA>>
 						<</actCLA>>
-					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 						<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<</actCLA>>

+ 2 - 2
sugarcube/src/activities/school/schoolday/lessons/english.tw

@@ -244,7 +244,7 @@
 							<</actCLA>>
 
 						<<gs 'willpower' 'misc' 'self' 'medium'>>
-						<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+						<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 							<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 								<<gs 'willpower' 'misc' 'self' 'medium'>>
 								<<gs 'willpower' 'pay' 'self'>>
@@ -260,7 +260,7 @@
 									<<gt 'gschool_lessonsev3' 'getphone'>>
 								<</act>>
 							<</actCLA>>
-						<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+						<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 							<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 						<</if>>
 					<</actCLA>>

+ 2 - 2
sugarcube/src/activities/school/schoolday/lessons/history.tw

@@ -375,7 +375,7 @@
 						<</actCLA>>
 
 					<<gs 'willpower' 'misc' 'self' 'medium'>>
-					<<if $wardrobe.isWearingBra and $will_cost <= $pc.pcs_willpwr>>
+					<<if $wardrobe.isWearingBra and $will_cost <= $pc.willpower>>
 						<<actCLA 'Hide the phone in your bra (will_cost Willpower)'>>
 							<<gs 'willpower' 'misc' 'self' 'medium'>>
 							<<gs 'willpower' 'pay' 'self'>>
@@ -388,7 +388,7 @@
 								<<gs 'gschool_lessonsev2' 'history'>>
 							<</actCLA>>
 						<</actCLA>>
-					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.pcs_willpwr>>
+					<<elseif $wardrobe.isWearingBra and $will_cost > $pc.willpower>>
 						<<actCLA `'Hide the phone in your bra ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<</actCLA>>

+ 1 - 1
sugarcube/src/activities/school/schoolday/skips/boys_bathroom.tw

@@ -463,7 +463,7 @@
 					<p>All you can feel is intense, mind-dissolving pleasure that shoots up your spine like lightning and grows stronger with every inch of depth he gains. You didn't think he could fit his entire cock inside you and yet, eventually, you feel his balls brushing against your pussy and feel so wonderfully, desperately full. That's when you hear him whisper "I want to fuck your ass, $pc.name_nick."</p>
 					<<arouse 'vaginal' 5 >>
 					<<gs 'willpower' 'anal' 'resist'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA '"Just keep fucking my pussy" (will_cost Willpower)'>>
 							<<set $Marcus_sextype = 1>>
 							<<gs 'willpower' 'pay' 'resist'>>

+ 1 - 1
sugarcube/src/activities/sleep/sleep_prepare.tw

@@ -27,7 +27,7 @@
 	<<else>>
 		<<set $notathomesleep = 0>>
 	<</if>>-->
-	<!--<<if getvar("$succubusflag") == 1 and $sucwalkday <= $time.daystart and $succhungry < (0 - 1 - succublvl or $pc.pcs_willpwr < ((succublvl * willpowermax) / 13) or getvar("$sucpowzeroed") >= 3)>>
+	<!--<<if getvar("$succubusflag") == 1 and $sucwalkday <= $time.daystart and $succhungry < (0 - 1 - succublvl or $pc.willpower < ((succublvl * willpowermax) / 13) or getvar("$sucpowzeroed") >= 3)>>
 		<<gs 'succubus' 'sucwalkinginit'>>
 
 	<</if>>-->

+ 7 - 7
sugarcube/src/autogenerated/Bel gang/belpicknick.tw

@@ -61,7 +61,7 @@
 	<<else>>
 		<<gs 'willpower' 'voyeur' 'resist' 'hard'>>
 	<</if>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Run away from them (will_cost Willpower)'>>
 			<<if $pc.skillLevel("dance") < 40>>
 				<<gs 'willpower' 'mast' 'resist' 'hard'>>
@@ -142,7 +142,7 @@
 			<<gt 'belpicknick' 'ab_hard'>>
 		<</act>>
 		
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run away from them (will_cost Willpower)'>>
 				
 				
@@ -179,7 +179,7 @@
 			<<gt 'belpicknick' 'ab_hard'>>
 		<</act>>
 		
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run away from them (will_cost Willpower)'>>
 				
 				
@@ -203,7 +203,7 @@
 		<<gt 'belpicknick' 'gang'>>
 	<</act>>
 	<<gs 'willpower' 'gangbang' 'resist' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Run away from them (will_cost Willpower)'>>
 			<<gs 'willpower' 'gangbang' 'resist' 'hard'>>
 			
@@ -254,7 +254,7 @@
 			<</act>>
 		<</if>>
 		<<gs 'willpower' 'sex' 'resist' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run away from them (will_cost Willpower)'>>
 				<<gs 'willpower' 'sex' 'resist' 'hard'>>
 				
@@ -318,7 +318,7 @@
 				<</act>>
 			<</if>>
 			<<gs 'willpower' 'sex' 'resist' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Run away from them (will_cost Willpower)'>>
 					<<gs 'willpower' 'sex' 'resist' 'hard'>>
 					
@@ -391,7 +391,7 @@
 				<</act>>
 			<</if>>
 			<<gs 'willpower' 'sex' 'resist' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Run away from them (will_cost Willpower)'>>
 					<<gs 'willpower' 'sex' 'resist' 'hard'>>
 					<<gs 'willpower' 'pay' 'resist'>>

+ 2 - 2
sugarcube/src/autogenerated/Block/gopsex.tw

@@ -319,7 +319,7 @@
 		<</act>>
 	<</if>>
 	<<gs 'willpower' 'sex' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Leave(will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<gt 'vasilyhome' 'livingroom'>>
@@ -613,7 +613,7 @@
 		<</actCLA>>
 	<</if>>
 	<<gs 'willpower' 'sex' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Leave(will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<gt 'vasilyhome' 'livingroom'>>

+ 4 - 4
sugarcube/src/autogenerated/Block/pav_aptcourtev.tw

@@ -888,7 +888,7 @@
 								<<gt 'pav_aptcourtev' 'suck3stooges'>>
 							<</act>>
 							<<gs 'willpower' 'drink' 'force' 'hard'>>
-							<<if $quest('school').func('isGroupMember','gopniks') and $will_cost <= $pc.pcs_willpwr>>
+							<<if $quest('school').func('isGroupMember','gopniks') and $will_cost <= $pc.willpower>>
 								<<actCLA 'Threaten Dan (will_cost Willpower)'>>
 									<<run $npcs.dec('A10','rel',2)>>
 									<<run $quest('school').func('groupRelInc','gopniks',1)>>
@@ -903,7 +903,7 @@
 										<<gt 'pav_complex' 'start'>>
 									<</act>>
 								<</actCLA>>
-							<<elseif $quest('school').func('isGroupMember','gopniks') and $will_cost > $pc.pcs_willpwr>>
+							<<elseif $quest('school').func('isGroupMember','gopniks') and $will_cost > $pc.willpower>>
 								<<actCLA `'Threaten Dan ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 							<</if>>
 						<</actCLA>>
@@ -1016,7 +1016,7 @@
 							<<gt 'pav_aptcourtev' 'eatlera'>>
 						<</act>>
 						<<gs 'willpower' 'drink' 'force' 'hard'>>
-						<<if $quest('school').func('isGroupMember','gopniks') and $will_cost <= $pc.pcs_willpwr>>
+						<<if $quest('school').func('isGroupMember','gopniks') and $will_cost <= $pc.willpower>>
 							<<actCLA 'Threaten Lera (will_cost Willpower)'>>
 								<<run $npcs.dec('A21','rel',2)>>
 								<<run $quest('school').func('groupRelInc','gopniks',1)>>
@@ -1032,7 +1032,7 @@
 									<<gt 'pav_complex' 'start'>>
 								<</act>>
 							<</actCLA>>
-						<<elseif $quest('school').func('isGroupMember','gopniks') and $will_cost > $pc.pcs_willpwr>>
+						<<elseif $quest('school').func('isGroupMember','gopniks') and $will_cost > $pc.willpower>>
 							<<actCLA `'Threaten Lera ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 						<</if>>
 					<</actCLA>>

+ 2 - 2
sugarcube/src/autogenerated/Block/pod_whore.tw

@@ -31,7 +31,7 @@
 					<<gt 'pod_whore' 'hide' 'pod_whore_price'>>
 				<</act>>
 				<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Decline, you don`t want to fuck him (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<gt 'pod_whore' 'hide' 'pod_whore_no'>>
@@ -46,7 +46,7 @@
 			<</if>>
 		<</actCLA>>
 		<<gs 'willpower' 'misc' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA '"Nope, never heard of her!" (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<gt 'pod_whore' 'hide' 'pod_client_talk_no'>>

+ 6 - 6
sugarcube/src/autogenerated/Boys/BDsex.tw

@@ -89,7 +89,7 @@
 				<<gt 'BDsex' 'minet'>>
 			<</act>>
 			<<gs 'willpower' 'bj' 'resist' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Lie on your back and spread your legs (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>> <<gt 'BDsex' 'sex'>>
 				<</actCLA>>
@@ -107,7 +107,7 @@
 				<<gt 'BDsex' 'anal2'>>
 			<</act>>
 			<<gs 'willpower' 'anal' 'resist' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA '"I do not want to!" Lie on your back and spread your legs (will_cost Willpower)'>>
 					<<gs 'willpower' 'anal' 'resist' 'easy'>> <<gs 'willpower' 'pay' 'resist'>> <<gt 'BDsex' 'sex'>>
 				<</actCLA>>
@@ -119,7 +119,7 @@
 				<<actCLA `'"I""ll do it doggy style, but not in the ass!" ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 			<</if>>
 			<<gs 'willpower' 'bj' 'force'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Take him into your mouth (will_cost Willpower)'>>
 					<<gs 'willpower' 'bj' 'force'>> <<gs 'willpower' 'pay' 'force'>> <<gt 'BDsex' 'minet'>>
 				<</actCLA>>
@@ -332,7 +332,7 @@
 					<<gt 'BDsex' 'anal2'>>
 				<</act>>
 				<<gs 'willpower' 'anal' 'resist' 'easy'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA '"I do not want to!" Lie on your back and spread your legs (will_cost Willpower)'>>
 						<<gs 'willpower' 'anal' 'resist' 'easy'>> <<gs 'willpower' 'pay' 'resist'>> <<gt 'BDsex' 'sex'>>
 					<</actCLA>>
@@ -344,7 +344,7 @@
 					<<actCLA `'"I""ll do it doggy style, but not in the ass!" ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 				<</if>>
 				<<gs 'willpower' 'bj' 'force'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Take him into your mouth (will_cost Willpower)'>>
 						<<gs 'willpower' 'bj' 'force'>> <<gs 'willpower' 'pay' 'force'>> <<gt 'BDsex' 'minet'>>
 					<</actCLA>>
@@ -424,7 +424,7 @@
 					<<gt 'BDsex' 'anal2'>>
 				<</act>>
 				<<gs 'willpower' 'anal' 'resist' 'easy'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA '"I do not want to!" Lie on your back and spread your legs (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>> <<gt 'BDsex' 'sex'>>
 					<</actCLA>>

+ 1 - 1
sugarcube/src/autogenerated/Cars/zaprFWash.tw

@@ -903,7 +903,7 @@
 		<!-- ! these values are based off of the cheat menu values for players who turn off these stats as they can never go below 35-->
 		<<gs 'willpower' 'skill' 'resist' 'stren_lvl'>>
 		<<set $will_cost = ($will_cost * 3) / 2>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Push him off of you and escape (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>> <<gt 'zaprFWashEvent' 'fight'>>
 			<</actCLA>>

+ 2 - 2
sugarcube/src/autogenerated/City Center/burger.tw

@@ -261,7 +261,7 @@
 						<</actCLA>>
 					<</actCLA>>
 					<<gs 'willpower' 'bj' 'resist' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Thank you very much. (Deny) (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'resist'>>
 							You grin and say, "Thank you very much." Anatoly flushes and says emphatically, "You know what I mean." He unbuttons his pants and pulls out his hard member.
@@ -371,7 +371,7 @@
 					<<image "locations/city/citycenter/diner/sex/bj1.jpg">>
 					<p>You escape from Ilyushkin's hands who was not expecting such a reaction. He glares at you, "You suck off Borisovich but get squeamish with his deputy?" You are taken aback by these words. How does he know about what happened in the fitting room. Apparently your thoughts are reflected on your face and Ilyushkin chuckles. "Yes Borisovich himself bragged about it. If you thought, Borisovich wouldn't tell anyone you're an idiot. But I won't tell anyone. And I'm offering you a decent reward. So, be a good girl and show me what you can do with this mouth of yours. "</p>
 					<<gs 'willpower' 'bj' 'resist' 'medium'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<act 'That`s bullshit! (will_cost Willpower)'>>
 
 							<<gt 'burger' 'start'>>

+ 1 - 1
sugarcube/src/autogenerated/City Center/talent_agency.tw

@@ -182,7 +182,7 @@
 		You nod understandingly.
 		"Alright, time for you to undress."
 		<<gs 'willpower' 'misc' 'resist' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA '"Wait, what?" (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<image "locations/city/citycenter/aurora/auditions/room.jpg">>

+ 4 - 4
sugarcube/src/autogenerated/City Center/tatiana_missions.tw

@@ -326,7 +326,7 @@
 			<p>"Me?"</p>
 			<p>Obviously, this isn't your finest moment, and... err... 'Vintage Tatiana?' looks both cross-eyed and very confused at your pointing hand.</p>
 			<<gs 'willpower' 'misc' 'self' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Kick Vintage Tatiana`s ass! (will_cost Willpower)'>>
 					<h2>Sword Wielding Tatiana?</h2>
 					<<image "characters/city/btatiana/ST1.jpg">>
@@ -608,7 +608,7 @@
 	<p>"Hey! Look, $pc.name_nick! The guys are gone! Tell me... Doesn't this give you ideas?"</p>
 	Tatiana turns your face up and sits on your lap, her robe nowhere to be seen as a mischievous smile crosses her face. She bends over, and her cold lips close over your left nipple.
 	<<gs 'willpower' 'misc' 'resist' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Try to remember! (will_cost Willpower)'>>
 			<<image "characters/city/btatiana/Sex/MT3.jpg">>
 			<p>"Tee hee, $pc.name_nick. Do you like this? Am I making your panties wet? Don't worry, no girl has left feeling unsatisfied after playing with me!"</p>
@@ -626,7 +626,7 @@
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 1>>
 			<<gs 'willpower' 'kiss' 'force' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Counterattack! (will_cost Willpower)'>>
 					<<image "characters/city/btatiana/Sex/MT4.jpg">>
 					You push away a surprised Tatiana... and then cuddle by her side, kissing your way from collarbone to lips, startling the wannabe vamp, who is shocked to see her hold over your mind broken.
@@ -640,7 +640,7 @@
 					<<gs 'willpower' 'pay' 'force'>>
 					<<set $time.minutes += 1>>
 					<<gs 'willpower' 'sex' 'force' 'easy'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'No mercy! (will_cost Willpower)'>>
 							<<image "characters/city/btatiana/Sex/MT5.jpg">>
 							You delicately caress her face, reassuring the scared woman. Without further preamble, your lips follow her body''s curves, your small kisses drinking in her coldness as your tongue licks her nipples, slowly approaching the prize.

+ 2 - 2
sugarcube/src/autogenerated/City Industrial/lakecafe.tw

@@ -319,7 +319,7 @@
 								<p>You refuse to relent and Eugene sighs. "All our regulars know that we 'arrange meetings' every Monday between 22:00 and 23:00. If you're here at that time and want to earn some money, introduce yourself to the person or group you want to service and say 'I'll be your waitress tonight.' They'll know what it means, but I beg you, please don't do it $pc.name_nick!"</p>
 								You see tears forming in her eyes.
 								<<gs 'willpower' 'misc' 'self' 'easy'>>
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Say you won`t do it (will_cost Willpower)'>>
 										<<gs 'willpower' 'pay' 'self'>>
 										Eugene seems relieved as she looks back at you.
@@ -351,7 +351,7 @@
 							<p>"All our regulars know that we 'arrange meetings' every Monday between 22:00 and 23:00. If you're here at that time and want to earn some money, introduce yourself to the person or group you want to service and say 'I'll be your waitress tonight.' They'll know what it means. From what the girls told me, they get paid between 500 and 1,000 <b>₽</b>."</p>
 							Before you leave, she adds "Please don't do it though. I'm starting to care for you and..." She looks away from you before finishing her sentence.
 							<<gs 'willpower' 'misc' 'self' 'easy'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Say you won`t do it (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'self'>>
 									Eugene seems relieved as she looks back at you.

+ 1 - 1
sugarcube/src/autogenerated/City Industrial/qwBarBilliard.tw

@@ -219,7 +219,7 @@
 							<<set $martinpos = 'I`ll do it if you want me to'>>
 							<<gs 'willpower' 'bj' 'self'>>
 							<!-- !!if (pcs_horny >= 80 and exhibitionist_lvl > 0) or (pcs_dom >= 30 and exhibitionist_lvl > 1):-->
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA '$martinpos (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'self'>>
 									<<image "locations/city/industrial/bar/sex/pool/poolm1.jpg">>

+ 2 - 2
sugarcube/src/autogenerated/City Industrial/qwBarEncounters.tw

@@ -224,7 +224,7 @@
 		<!-- !! Note this action was influenced by exhibition level too.-->
 		<!-- !! May be some way to add that in later using willpower?-->
 		<<gs 'willpower' 'sex' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Grind back against him'>>
 				 				<<gs 'willpower' 'pay' 'resist'>>
 				<<video "locations/city/industrial/bar/sex/bar/bargrind2.mp4">>
@@ -255,7 +255,7 @@
 					<</actCLA>>
 				<</actCLA>>
 				<<gs 'willpower' 'cuni' 'force'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Take charge'>>
 						 						<<gs 'willpower' 'pay' 'force'>>
 						<<image "locations/city/industrial/bar/sex/bar/bargrindd1.jpg">>

+ 3 - 3
sugarcube/src/autogenerated/City Red Light/bordel.tw

@@ -140,7 +140,7 @@
 		<<set $bordelpay += 100>>
 		<p>A customer orders you and another girl (bordelpay <b>₽</b>).</p>
 		<<gs 'willpower' 'sex' 'resist' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Refuse (will_cost Willpower)'>>
 				<<gs 'willpower' 'sex' 'resist' 'hard'>>
 				<<gs 'willpower' 'pay' 'resist'>>
@@ -164,7 +164,7 @@
 		<<set $bordelpay += 150>>
 		<p>Two clients book you (bordelpay <b>₽</b>).</p>
 		<<gs 'willpower' 'sex' 'resist' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Refuse (will_cost Willpower)'>>
 				<<gs 'willpower' 'sex' 'resist' 'hard'>>
 				<<gs 'willpower' 'pay' 'resist'>>
@@ -214,7 +214,7 @@
 		<<set $bordelpay += 200>>
 		<p>A group of customers order you (bordelpay <b>₽</b>).</p>
 		<<gs 'willpower' 'sex' 'resist' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Refuse (will_cost Willpower)'>>
 				<<gs 'willpower' 'sex' 'resist' 'hard'>>
 				<<gs 'willpower' 'pay' 'resist'>>

+ 1 - 1
sugarcube/src/autogenerated/City Red Light/sexshop.tw

@@ -547,7 +547,7 @@
 						<</act>>
 					<</actCLA>>
 
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Resist (will_cost Willpower)'>>
 
 							<<image "locations/city/redlight/erotomaniac/sex/shkend14.jpg">>

+ 2 - 2
sugarcube/src/autogenerated/City Residential/park_walkevents.tw

@@ -135,7 +135,7 @@
 		<<actCLA '"I don`t mind it all"'>>
 			<p>The guy laughs "Unfortunately, I doubt it'll be as much fun as the first time, but why don't you bend over this bench right here?"</p>
 			<<gs 'willpower' 'sex' 'resist' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA '"Not this time, I`m afraid" (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<gt 'city_park' 'start'>>
@@ -164,7 +164,7 @@
 		<<actCLA 'Ask him how to do it'>>
 			<p>"What do I have to do?", you ask. He smiles, "Let us go over there." and points over to the bench in a somewhat secluded part of the park.</p>
 			<<gs 'willpower' 'sex' 'resist' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Fuck off, asshole (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<gt 'city_park' 'start'>>

+ 5 - 5
sugarcube/src/autogenerated/Combat/ender.tw

@@ -360,7 +360,7 @@
 			<<gt 'alexandriaEv' 'jail'>>
 		<</act>>
 		<<gs 'willpower' 'crime' 'self' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run!(will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<set $AlexandriaMissionQW += 1>>
@@ -391,7 +391,7 @@
 		<</act>>
 		<<if getvar("$spellKnown['heal']") == 1 and getvar("$pcs_mana") >= 400>>
 			<<gs 'willpower' 'misc' 'self' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Will you to cast Heal.(will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<gt 'alexandriaEv' 'heal2'>>
@@ -420,7 +420,7 @@
 		<</actCLA>>
 		<<if getvar("$spellKnown['heal']") == 1 and getvar("$pcs_mana") >= 400>>
 			<<gs 'willpower' 'misc' 'self' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Will you to cast Heal.(will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<gt 'alexandriaEv' 'heal4'>>
@@ -703,7 +703,7 @@
 			<<gt 'alexandriaEv' 'jail'>>
 		<</act>>
 		<<gs 'willpower' 'crime' 'self' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run!(will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<set $AlexandriaMissionQW += 1>>
@@ -1159,7 +1159,7 @@
 			<<gt 'alexandriaEv' 'jail'>>
 		<</act>>
 		<<gs 'willpower' 'crime' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Run!(will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<set $AlexandriaMissionQW += 1>>

+ 4 - 4
sugarcube/src/autogenerated/Combat/fight.tw

@@ -107,7 +107,7 @@ opp_spells[0] = comma delimited list of spell names
 	<<set $pc.vitality[$i] to null>>
 	<<set $pc.skillLevel("reaction")[$i] to null>>
 	<<set $pc.pcs_health[$i] to null>>
-	<<set $pc.pcs_willpwr[$i] to null>>
+	<<set $pc.willpower[$i] to null>>
 	<<set $pc.skillLevel("shoot")[$i] to null>>
 	<<set $pcs_magik[$i] to null>>
 	<<set $pcs_mana[$i] to null>>
@@ -403,7 +403,7 @@ opp_spells[0] = comma delimited list of spell names
 		<<setinit $fightPStats['Name'] = $pcs_name[$i]>>
 		<<setinit $fightPStats['Health'] = $pc.pcs_health[$i]>>
 		<<setinit $fightPStats['Mana'] = $pcs_mana[$i]>>
-		<<setinit $fightPStats['Willpower'] = $pc.pcs_willpwr[$i]>>
+		<<setinit $fightPStats['Willpower'] = $pc.willpower[$i]>>
 		<<setinit $fightPStats['Shield'] = $pcs_shield[$i]>>
 		<<setinit $fightPStats['Fog'] = $pcs_fog[$i]>>
 		<<setinit $fightPStats['Clone'] = $pcs_clone[$i]>>
@@ -510,7 +510,7 @@ opp_spells[0] = comma delimited list of spell names
 		<<xgt 'ender' 'win'>>
 		<<gt $location>>
 		$exit
-	<<elseif $pc.pcs_willpwr <= 0>>
+	<<elseif $pc.willpower <= 0>>
 		<b><font color = red> You cannot summon the will to fight!</font></b>
 		<<xgt 'ender' 'loss'>>
 		<<gt $location>>
@@ -955,7 +955,7 @@ ARGS[3] = Which Attacker
 		<b><font color = red>Will protection <<defenceWV>> units</font></b>
 
 	<</if>>
-	Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>
+	Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<willpower>></font></b>
 	<<if getvar("$defence") > 0>>
 		<b><font color = green>Protection <<defence>> units</font></b>
 

+ 5 - 5
sugarcube/src/autogenerated/Community center/Voltrener.tw

@@ -57,7 +57,7 @@
 		You and Lariska tried to persuade Mikhail to take Lariska, but he refuses to consider your arguments.
 	<<elseif getvar("$lariskaTrenerTalk") == 2>>
 		<<gs 'willpower' 'misc' 'force'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Convince Mikhail to let Lariska play (will_cost Willpower)'>>
 				<<setinit $LariskaQW['volleyball'] = 1>>
 				<<set $lariskalove += 1>>
@@ -84,7 +84,7 @@
 		<</if>>
 	<<elseif getvar("$lariskaTrenerTalk") == 3>>
 		<<gs 'willpower' 'misc' 'force' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Convince Mikhail to let both of you join the team (will_cost Willpower)'>>
 				<<set $volleysostav = 1>>
 				<<setinit $LariskaQW['volleyball'] = 1>>
@@ -116,7 +116,7 @@
 		<</if>>
 	<<elseif getvar("$lariskaTrenerTalk") == 4>>
 		<<gs 'willpower' 'misc' 'force'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Convince Mikhail to let Lariska play (will_cost Willpower)'>>
 				<<setinit $LariskaQW['volleyball'] = 1>>
 				<<set $lariskalove += 1>>
@@ -220,7 +220,7 @@
 								<<gt 'gdksport' 'start'>>
 							<</act>>
 							<<gs 'willpower' 'misc' 'self' 'hard'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Persuade him to let you join the team (will_cost Willpower)'>>
 									<<gs 'willpower' 'pay' 'self'>>
 									<!-- !!if volleysostav > 0:npc_rel['A69'] -= 1-->
@@ -254,7 +254,7 @@
 					<<else>>
 						You ask the coach about joining the team. After thinking for a minute, he says "I have a spot for a substitute, but I don't know if you have what it takes."
 						<<gs 'willpower' 'misc' 'self'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Persuade him (will_cost Willpower)'>>
 								<<set $time.minutes += rand(20,30)>>
 								<<gs 'willpower' 'pay' 'self'>>

+ 6 - 6
sugarcube/src/autogenerated/Community center/VoltrenerSexShower.tw

@@ -35,7 +35,7 @@ Changed dynamic calls to argument location calls
 		<</act>>
 	<</actCLA>>
 	<<gs 'willpower' 'exhib' 'self' 'easy'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Carry on (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<set $npc('A69').rel += 2>>
@@ -52,7 +52,7 @@ Changed dynamic calls to argument location calls
 				<</act>>
 			<</actCLA>>
 		<</actCLA>>
-	<<elseif $will_cost > $pc.pcs_willpwr>>
+	<<elseif $will_cost > $pc.willpower>>
 		<<actCLA `'Carry on ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<</if>>
 <</if>>
@@ -70,7 +70,7 @@ Changed dynamic calls to argument location calls
 		<</act>>
 	<</actCLA>>
 	<<gs 'willpower' 'exhib' 'self'>>
-	<<if ($pc.horny >= 70 or $pc.fame('pav_slut') > 50) and $will_cost <= $pc.pcs_willpwr>>
+	<<if ($pc.horny >= 70 or $pc.fame('pav_slut') > 50) and $will_cost <= $pc.willpower>>
 		<<actCLA 'Masturbate (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<set $npc('A69').rel += 1>>
@@ -90,7 +90,7 @@ Changed dynamic calls to argument location calls
 				<</act>>
 			<</actCLA>>
 		<</actCLA>>
-	<<elseif ($pc.horny >= 70 or $pc.fame('pav_slut') > 50) and $will_cost > $pc.pcs_willpwr>>
+	<<elseif ($pc.horny >= 70 or $pc.fame('pav_slut') > 50) and $will_cost > $pc.willpower>>
 		<<actCLA `'Masturbate ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<</if>>
 <</if>>
@@ -111,7 +111,7 @@ Changed dynamic calls to argument location calls
 			<<video "locations/pavlovsk/community/gym/volley/sex/voltrenersexshower20.mp4">>
 			Opening your eyes, you see coach standing above you. He quite unceremoniously says: "Spread your bread."
 			<<gs 'willpower' 'cum_outside' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Cover up (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<image "locations/pavlovsk/community/gym/volley/sex/voltrenersexshower12.jpg">>
@@ -241,7 +241,7 @@ Changed dynamic calls to argument location calls
 								<<video "locations/pavlovsk/community/gym/volley/sex/voltrenersexshower25.mp4">>
 								<p>Thrusting one finger in your ass and one in your pussy, the coach begins to move them at the same time in both holes. The feeling of them rubbing against each other through the thin walls between them is driving you wild and forcing you to moan and squirm. A moan almost becomes a scream: "Fuck me, fuck, fuck...", - you cry completely deprived of reason from the overflowing desire.</p>
 								<<gs 'willpower' 'sex' 'self'>>
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Jump on his member (will_cost Willpower)'>>
 										<<gs 'willpower' 'pay' 'self'>>
 										<<image "locations/pavlovsk/community/gym/volley/sex/voltrenersexshower27.jpg">>

+ 3 - 3
sugarcube/src/autogenerated/Community center/Voltrenersex.tw

@@ -17,7 +17,7 @@
 		<<gt 'gdksport' 'start'>>
 	<</act>>
 	<<if getvar("$trenerSex") > 0 or getvar("$trenerlust") > 80>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Don`t resist (will_cost Willpower)'>>
 				<<gs 'willpower' 'misc' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -36,7 +36,7 @@
 		<</if>>
 		<<gs 'willpower' 'misc' 'self'>>
 	<<elseif getvar("$trenerSex") == 0>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Look at the coach (will_cost Willpower)'>>
 				<<gs 'willpower' 'misc' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -126,7 +126,7 @@
 			<<video "locations/pavlovsk/community/gym/volley/sex/voitrensex6.mp4">>
 			Kissing the head of his cock, you open your mouth and began to caress his dick with your tongue, lightly sucking it. Then, you start to suck his cock in earnest, running your lips up and down his shaft as you bob your head, you hands caressing his balls as you do.
 			<<if getvar("$trenerSex") >= 3 and $pc.thinksIsVirgin and $pc.sexStat('vaginal') == 0 and getvar("$mesec") <= 0>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act 'Lose your virginity (will_cost Willpower)'>>
 						 <<gt 'Voltrenersex' 'Defl'>>
 					<</act>>

+ 1 - 1
sugarcube/src/autogenerated/Community center/gdksport.tw

@@ -902,7 +902,7 @@
 				<</if>>
 			<</actCLA>>
 			<<gs 'willpower' 'anal' 'resist' 'hard'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'That`s enough for now (will_cost Willpower)'>>
 					<<gs 'willpower' 'anal' 'resist' 'hard'>>
 					<<gs 'willpower' 'pay' 'resist'>>

+ 1 - 1
sugarcube/src/autogenerated/Community center/gdktoilet.tw

@@ -20,7 +20,7 @@
 	<</act>>
 	<<if $time.hour >= 8 and $time.hour <= 23>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Enter the men`s restroom (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>

+ 1 - 1
sugarcube/src/autogenerated/Community center/gdktoilet_mens.tw

@@ -53,7 +53,7 @@
 					
 				<<elseif $pc.horny >= 40>>
 					<<gs 'willpower' 'mast' 'self'>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Masturbate'>>
 							<<gs 'willpower' 'mast' 'self'>>
 							<<gs 'willpower' 'pay' 'self'>>

+ 2 - 2
sugarcube/src/autogenerated/Community center/kotovtalker.tw

@@ -113,7 +113,7 @@
 		<</if>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'force' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Argue that it`s not true (will_cost Willpower)'>>
 			
 			<<if $pc.fame('pav_sex') > 75>>
@@ -143,7 +143,7 @@
 	<<if $pc.fame('pav_slut') < 280>>
 		<p><<=$npc($static_num).firstname>>: "$pc.name_nick Hey, let's get drunk and then do something dumb."</p>
 		<<gs 'willpower' 'drink' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Refuse (will_cost Willpower)'>>
 				
 				<<run $npcs.dec('A9','rel',5)>>

+ 1 - 1
sugarcube/src/autogenerated/Crime and Punishment/shoplifting.tw

@@ -119,7 +119,7 @@
 		<</act>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'self' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Deny'>>
 			<<set $time.minutes += 5>>
 			<<gs 'willpower' 'pay' 'self'>>

+ 5 - 5
sugarcube/src/autogenerated/Dima Nosov/dimaHome.tw

@@ -852,7 +852,7 @@
 							<<image "locations/pavlovsk/resident/dimkahome/drink.jpg">>
 							He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.
 							
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Change your mind (will_cost Willpower)'>>
 									
 									<<run $npcs.dec('A1','rel',5)>>
@@ -923,7 +923,7 @@
 								<<image "locations/pavlovsk/resident/dimkahome/drink.jpg">>
 								He nods and turns to dig around in the mini fridge. Dimka pours two glasses half full with juice and then adds some vodka to them. His body is obscuring your view of the glasses as he prepares the drinks.
 								
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Change your mind (will_cost Willpower)'>>
 										
 										<<run $npcs.dec('A1','rel',5)>>
@@ -978,7 +978,7 @@
 					<p>He busts out laughing. "$loverdesc[0]? Oh god I thought you had more sense than that. You know you could do much better than him, right?" He says as he strokes your hair.</p>
 				<</if>>
 				<<gs 'willpower' 'misc' 'self' 'easy'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'No I don`t think I can (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'self'>>
 						<<run $npcs.dec('A1','rel',5)>>
@@ -1057,7 +1057,7 @@
 						<<gt 'dimaHome' 'dimka_makeout'>>
 					<</act>>
 					
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Stop kissing (will_cost Willpower)'>>
 							
 							<<run $npcs.dec('A1','rel',5)>>
@@ -1166,7 +1166,7 @@
 				<<gt 'dimaHome' 'dimka_knees'>>
 			<</act>>
 			<<gs 'willpower' 'bj' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'I said no (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<run $npcs.dec('A1','rel',5)>>

+ 2 - 2
sugarcube/src/autogenerated/Dima Nosov/dimalina.tw

@@ -570,7 +570,7 @@
 			"I... I mean... I don't really know..."
 			<p>"I will admit," he starts as he leans back in his seat. "She's an amazing cocksucker, but she has no real personality, which means she's perfect to be molded into whatever I'd like." Dimka smiles wickedly and chuckles. "At first all I wanted was for her to be my girlfriend, but after seeing how you've turned out, I know I can train her into something even better than you. What do you think?"</p>
 			<<gs 'willpower' 'misc' 'self' 'medium'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA '"Leave her alone!"(will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<image "characters/shared/headshots_main/big1.jpg">>
@@ -746,7 +746,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'sex' 'force' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA '"Neither" (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'force'>>
 				<<gt 'dimalina' 'helplina'>>

+ 2 - 2
sugarcube/src/autogenerated/Dima Nosov/dinnpc.tw

@@ -62,7 +62,7 @@
 <<widget 'din_dima_predlog'>>
 	<<set $menu_off = 1>>
 	<<gs 'willpower' 'bj' 'self' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Who does he think you are?! - Slap him (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<set $npc('A1').rel = -20>>
@@ -84,7 +84,7 @@
 		<p>Your eyes widen and you flush at his proposal - surely, he didn't actually mean that you had to give him a blowjob right here, just so you could go out with him... right?</p>
 		<p>As if to answer your question, Dimka unbuttons his pants. "Come on, are you gonna keep me waiting all night long? Which is it? Are you brave and fun? Or just another prude?"</p>
 		<<gs 'willpower' 'bj' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'That does it! - Slap him (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<set $npc('A1').rel = -20>>

+ 1 - 1
sugarcube/src/autogenerated/EfimovRA/Kwlake2.tw

@@ -17,7 +17,7 @@ While you're walking along the beach, Kat notices a man sitting by himself.
 	<<arouse 'kiss' -5 `['lesbian']`>>
 	<<arouse 'vaginal_finger' 5 `['lesbian']`>>
 	<<gs 'willpower' 'foreplay' 'resist' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'That`s enough! Leave before this gets out of hand (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<gt 'Nudelake'>>

+ 1 - 1
sugarcube/src/autogenerated/EfimovRA/Palatka.tw

@@ -56,7 +56,7 @@
 	<<image "locations/city/shared/military/pal1.jpg">>
 	<p>Entering the tent, you stumble, you reflexively close your eyes, as you prepare to hit the floor face first. Much to your surprise you do not land on the floor. Instead you feel powerful, strong hands catching you. Opening your eyes in surprise, you look up and see that a well-built black soldier has caught you in his arms.</p>
 	<<gs 'willpower' 'sex' 'resist' 'easy'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<act 'Say thank you '>>
 			
 			<<gt 'palatka' 'start'>>

+ 1 - 1
sugarcube/src/autogenerated/EfimovRA/billiard.tw

@@ -61,7 +61,7 @@ Quite a large billiard room, there are plenty of tables in the main hall, but th
 
 				<</if>>
 				<<gs 'willpower' 'anal' 'resist' 'hard'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Stick to practice games (will_cost Willpower)'>>
 						<<gs 'willpower' 'anal' 'resist' 'hard'>>
 						<<gs 'willpower' 'pay' 'resist'>>

+ 2 - 2
sugarcube/src/autogenerated/EfimovRA/billsvid.tw

@@ -98,7 +98,7 @@
 	<p>When you once again leaned over the table to play a shot, $telsob leans over and slips her hands on your hips, then upwards to cup your breasts.</p>
 	<<arouse 'foreplay' 5 `['lesbian']`>>
 	<<gs 'willpower' 'cuni' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Not now $telsob (will_cost Willpower)'>>
 			<<gs 'willpower' 'cuni' 'resist'>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -207,7 +207,7 @@
 	<p>During the game $telsob is constantly trying to put her arms around you, she wraps her hand around your hips, then casually touches your chest.</p>
 	<<arouse 'foreplay' 5 `['lesbian']`>>
 	<<gs 'willpower' 'cuni' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Continue to play $telsob (will_cost Willpower)'>>
 			<<gs 'willpower' 'cuni' 'resist'>>
 			<<gs 'willpower' 'pay' 'resist'>>

+ 4 - 4
sugarcube/src/autogenerated/EfimovRA/kafesvid.tw

@@ -89,7 +89,7 @@
 		Smiling, you reach up and take a firm hold between her thighs. "I don't like it. I love it," you say, with a wicked grin of your own. Her body writhes in pleasure, as you put you hand to work against her now soaked panties. A few seconds later, she starts to take your top off.
 		<<arouse 'foreplay' 5 `['lesbian']`>>
 		<<gs 'willpower' 'cuni' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<act 'We can`t do it here (will_cost Willpower)'>>
 				
 				<<gt 'kafesvid' '3'>>
@@ -206,7 +206,7 @@
 	<p>$telsob, without weakening her grip, turns to the waiter and says, "Want to touch my girls tits?"</p>
 	The waiter looks at you, hesitantly.
 	<<gs 'willpower' 'foreplay' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<act '"I`ll crush your balls if you do" (will_cost Willpower)'>>
 			
 			<<gt 'kafesvid' '3'>>
@@ -286,7 +286,7 @@
 						<<set $orgasm_or = 'yes'>>
 						<<arouse 'anal' 5 `['sub']`>>
 						<<gs 'willpower' 'misc' 'resist' 'easy'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'No, that`s enough (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<gt 'kafesvid' '3'>>
@@ -349,7 +349,7 @@
 				<<set $orgasm_or = 'custom'>>
 				<<arouse 'anal' 5 `['sub']`>>
 				<<gs 'willpower' 'misc' 'resist' 'easy'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'No, that`s enough (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<gt 'kafesvid' '3'>>

+ 1 - 1
sugarcube/src/autogenerated/EfimovRA/kazinosvid.tw

@@ -162,7 +162,7 @@
 		<p>$telsob giggled, "You may end up naked and ashamed, $pc.name_nick and I haven't lost a hand yet."</p>
 		"I have nothing to be ashamed of," the man grins.
 		<<gs 'willpower' 'misc' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Take $telsob and leave (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<gt 'kazinosvid' '3'>>

+ 1 - 1
sugarcube/src/autogenerated/EfimovRA/police.tw

@@ -22,7 +22,7 @@
 	<p>With your hands still cuffed in front of you, you can't resist whatever she has in mind. You frantically think about your options: you could confess, but your taped confession could very well get you in trouble if they found out you snitched! On the other hand... what the hell is this woman going to do to you!? No one knows you're here... they could lock you up, and no one would miss you!</p>
 	<p>When you still say nothing, she presses some buttons on the interrogation camera and grabs you by the hair. "Let me give you an impression of what happens if you don't confess, you whore! Get down on your knees right now!"</p>
 	<<gs 'willpower' 'crime' 'self' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Keep your mouth shut'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<image "locations/city/industrial/police/sex/a2.jpg">>

+ 4 - 4
sugarcube/src/autogenerated/EfimovRA/svidboy.tw

@@ -20,7 +20,7 @@
 		<<image "characters/city/boyfriend/sex/event/kino1.jpg">>
 		<p>During the screening, $loverdesc[$lover_number] looks around and, making sure that you are alone in the theater, turns and starts to kiss you. His hand slips under your clothes, and you start to caress his chest.</p>
 		<<gs 'willpower' 'bj' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA '"Not here" (will_cost Willpower)'>>
 				<<gs 'willpower' 'bj' 'resist'>>
 				<<gs 'willpower' 'pay' 'resist'>>
@@ -176,7 +176,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Discard the idea and move on. (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'resist'>>
 				<<gs 'willpower' 'pay' 'resist'>>
@@ -304,7 +304,7 @@
 			<<image 'characters/city/boyfriend/sex/event/bil2<<picrand>>.jpg'>>
 			You lay down the cue on the table and relax, allowing him to continue to caress your body, kissing it down lower and lower.
 			<<gs 'willpower' 'cuni' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Stop (will_cost Willpower)'>>
 					<<gs 'willpower' 'cuni' 'resist'>>
 					<<gs 'willpower' 'pay' 'resist'>>
@@ -357,7 +357,7 @@
 			<<image "characters/city/boyfriend/sex/event/kafe2.jpg">>
 			<p>Soon, you are almost without clothes, and $loverdesc[$lover_number] is kissing your underbelly, dropping to the pubis.</p>
 			<<gs 'willpower' 'cuni' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Stop (will_cost Willpower)'>>
 					<<gs 'willpower' 'cuni' 'resist'>>
 					<<gs 'willpower' 'pay' 'resist'>>

+ 4 - 4
sugarcube/src/autogenerated/Encounter Generator/sexm.tw

@@ -321,12 +321,12 @@
 		<</act>>
 	<</if>>
 	<<gs 'willpower' 'action' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr and getvar("$boyonce["+$lover_number+"]") == 1 and getvar("$haraklover["+$lover_number+"]") == 0 and getvar("$loverizvrat["+$lover_number+"]") == 1 and getvar("$strapon") > 0>>
+	<<if $will_cost <= $pc.willpower and getvar("$boyonce["+$lover_number+"]") == 1 and getvar("$haraklover["+$lover_number+"]") == 0 and getvar("$loverizvrat["+$lover_number+"]") == 1 and getvar("$strapon") > 0>>
 		<<actCLA 'Fuck him with your strapon (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'force'>>
 			<<gt 'sexm' 'strapon'>>
 		<</actCLA>>
-	<<elseif $will_cost > $pc.pcs_willpwr and getvar("$boyonce["+$lover_number+"]") == 1 and getvar("$haraklover["+$lover_number+"]") == 0 and getvar("$loverizvrat["+$lover_number+"]") == 1 and getvar("$strapon") > 0>>
+	<<elseif $will_cost > $pc.willpower and getvar("$boyonce["+$lover_number+"]") == 1 and getvar("$haraklover["+$lover_number+"]") == 0 and getvar("$loverizvrat["+$lover_number+"]") == 1 and getvar("$strapon") > 0>>
 		<<actCLA `'Fuck him with your strapon ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<</if>>
 <</if>>
@@ -581,7 +581,7 @@
 	<<if getvar("$podrand") == 0>>
 		<p>$loverdesc[$lover_number] whispers to you, "Take it in your mouth."</p>
 		<<gs 'willpower' 'bj' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Fuck off! (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<gs 'lover' 'remove' $lover_number>>
@@ -596,7 +596,7 @@
 	<<elseif getvar("$podrand") == 1>>
 		<p>$loverdesc[$lover_number] begins to strip off your clothes.</p>
 		<<gs 'willpower' 'sex' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Fuck off! (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<gs 'lover' 'remove' $lover_number>>

+ 1 - 1
sugarcube/src/autogenerated/Family/seeporn.tw

@@ -328,7 +328,7 @@ You and the boys sit down around the TV. Kolka puts on a DVD, and immediately, t
 			<</actCLA>>
 		<</actCLA>>
 		<<gs 'willpower' 'bj' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'I don`t think so! (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<set $BrotherNo = 1>>

+ 1 - 1
sugarcube/src/autogenerated/Fedor/FedorEv2.tw

@@ -701,7 +701,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<gs 'willpower' 'bj' 'self' 'hard'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Unzip his pants (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<!-- Boy A5 -->

+ 1 - 1
sugarcube/src/autogenerated/Functions/drugs.tw

@@ -101,7 +101,7 @@
 	<<set $dur -= 1>>
 	<<set $pc.pcs_health = $pc.vitality * 10 + $pc.skillLevel("strength") * 5>>
 	<<if $willday_cocaine != $time.daystart>>
-		<<set $willday_cocaine = $time.daystart>> <<setn $pc.pcs_willpwr += 10>>
+		<<set $willday_cocaine = $time.daystart>> <<setn $pc.willpower += 10>>
 
 	<</if>>
 	<<set $pc.mood = 100>>

+ 1 - 1
sugarcube/src/autogenerated/Functions/exercise.tw

@@ -546,7 +546,7 @@ Other stats can be added if desired - for a dance-a-thon you might use gs 'exerc
 		<<set $willday_yoga = $time.daystart>>
 		<<set $yoga_counter = 0>>
 		<<warn 'JUMP MARKER ENCOUNTERED: :timeloopyoga'>>
-		<<set $pc.pcs_willpwr += rand(1,2)>>
+		<<set $pc.willpower += rand(1,2)>>
 		<<if $yoga_counter < Math.min(timemult - 1,4)>>
 			<<setn $yoga_counter += 1>>
 

+ 3 - 3
sugarcube/src/autogenerated/Functions/fertility.tw

@@ -140,11 +140,11 @@
 	<</if>>
 	<<if getvar("$tabletkicheck") == 1 and $tabletkichday < $time.daystart>>
 		<<set $tabletkichday = $time.daystart>>
-		<<set $tabletkimm = (100 * ($pc.pcs_willpwr / $pc.willpowermax)) + $pc.mood>>
+		<<set $tabletkimm = (100 * ($pc.willpower / $pc.willpowermax)) + $pc.mood>>
 		<<if $pc.pcs_sleep < 10>>
 			<<set $tabletkimm -= (100 - ($pc.pcs_sleep * 10))>>
 		<</if>>
-		<<if $pc.pcs_willpwr < $pc.willpowermax / 4>>
+		<<if $pc.willpower < $pc.willpowermax / 4>>
 			<<set $tabletkimm = $tabletkimm / 4>>
 		<<elseif $pc.mood < 10>>
 			<<set $tabletkimm = $tabletkimm / 2>>
@@ -156,7 +156,7 @@
 		<<set $tabletkiap += $temprand>>
 		<<if getvar("$tabletkiap") < 300>>
 			<<if getvar("$tabletkipd") > -10>>
-				<<if $pc.pcs_willpwr < $pc.willpowermax / 4>>
+				<<if $pc.willpower < $pc.willpowermax / 4>>
 					You stare at your package of birth control pills, you know you should take one but you can't quite work up enough effort to care.
 				<<elseif $pc.mood < 10>>
 					You stare at your package of birth control pills, but you don't open it.

+ 4 - 4
sugarcube/src/autogenerated/Functions/willpower.tw

@@ -31,7 +31,7 @@
 <!-- !!WARNING: If you have two or more actions that need willpower at the same time, you have to recalculate the willpower cost before the costs are payed (see Code Example 2)-->
 <!-- !{ Code Example 1 (one action needs willpower)
 gs 'willpower', 'misc', 'self', 'hard'
-if will_cost <= pcs_willpwr:
+if will_cost <= willpower:
 act 'Kick him in the balls (<<will_cost>> Willpower)':
 gs 'willpower', 'pay', 'self'
 'Event text'
@@ -43,7 +43,7 @@ end
 } -->
 <!-- !{ Code Example 2 (several actions need willpower)
 gs 'willpower', 'misc', 'self', 'hard'
-if will_cost <= pcs_willpwr:
+if will_cost <= willpower:
 act 'Kick him in the balls (<<will_cost>> Willpower)':
 gs 'willpower', 'misc', 'self', 'hard' <- recalculate the willpower cost here
 gs 'willpower', 'pay', 'self'
@@ -54,7 +54,7 @@ else
 act 'Kick him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don't have enough willpower to use this action.</font>'
 end
 gs 'willpower', 'misc', 'self', 'medium'
-if will_cost <= pcs_willpwr:
+if will_cost <= willpower:
 act 'Slap him across the face (<<will_cost>> Willpower)':
 gs 'willpower', 'misc', 'self', 'medium' <- recalculate the willpower cost here
 gs 'willpower', 'pay', 'self'
@@ -923,7 +923,7 @@ end
 			<<set $will_cost = 1>>
 
 		<</if>>
-		<<set $pc.pcs_willpwr -= _will_cost>>
+		<<set $pc.willpower -= _will_cost>>
 		<<if $location_var[$here][1] == 'force'>>
 			<<if $pc.willpowermax < 150>>
 				<<set $pc.will_counter+= 10>>

+ 2 - 2
sugarcube/src/autogenerated/Furniture/vann.tw

@@ -215,7 +215,7 @@
 	You spray water from the faucet directly onto your pussy and let the jet of warm water caress you. Getting further into it, you push your fingers inside your pussy while the water takes care of your clit. You're completely absorbed in your masturbation until you hear someone turn on the faucet in the sink. Opening your eyes, you see a guy standing at the sink, looking at you and grinning.
 	<p>"Sorry, don't let me interrupt. I'm just enjoying the show!" he says without looking away from your pussy, your fingers still tightly jammed inside it.</p>
 	<<gs 'willpower' 'misc' 'self'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Scream (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<set $pc.horny = 0>>
@@ -231,7 +231,7 @@
 		<<image "locations/city/island/university/dorm/sex/bathroom/v10.jpg">>
 		<p>You instinctively cover your naked pussy and unsuccessfully try to cover your breasts with your other hand. The guy just keeps watching you, and his smile grows wider. You realize that your hand is still stroking your pussy, and his gaze only excites you further. You remove your hand from your crotch, and he walks up and sits on the edge of the tub. He lifts a loofah out of the water and hands it to you. "Can I help you...? I mean with washing your back?" he asks. You sit and stare blankly at him, not knowing what to say.</p>
 		<<gs 'willpower' 'foreplay' 'resist' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Refuse (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<image "locations/city/island/university/dorm/sex/bathroom/v10.jpg">>

+ 3 - 3
sugarcube/src/autogenerated/Gadyukino Characters/hunter_favors.tw

@@ -99,7 +99,7 @@
 			<</if>>
 		<</actCLA>>
 		<<gs 'willpower' 'misc' 'resist' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA '"I`ll help later, busy right now" (will_cost Willpower)'>>
 				<<set $time.minutes += 5>>
 				<<set $hunter_collective_opinion -= 3>>
@@ -240,7 +240,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'gangbang' 'resist' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<!-- !TODO: Add scene for succeeding willpower check-->
 		<<actCLA 'Refuse (will_cost Willpower)'>>
 			<<set $time.minutes += 5>>
@@ -450,7 +450,7 @@
 				<p>"Please, I can't take it anymore!" you plead.</p>
 				<p>"Please" what, little princess?" Andrei asks.</p>
 				<<gs 'willpower' 'sex' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Seriousy, please let me go! (will_cost Willpower</font>)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<set $hunter_collective_opinion += 10>>

+ 10 - 10
sugarcube/src/autogenerated/Gadyukino Characters/hunter_interactions.tw

@@ -217,7 +217,7 @@
 			<<elseif getvar("$hunter_sexual_comfort") > 50 and $wardrobe.clothingworntype != 'nude'>>
 				"Bet he is not as fun as us" says Andrei. "Also bet he is not as fun to suck off as us" he says, his eyes stripping you already.
 				<<gs 'willpower' 'resist' 'bj' iif(hunter_collective_opinion > 40, 'easy', 'hard')>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Maybe another time boys (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<gt 'swamp_yard' 'campfire'>>
@@ -421,7 +421,7 @@
 			<<act 'Walk away'>>
 				<<gt 'swamp_yard' 'start'>>
 			<</act>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<act 'Ask again and flash your tits (will_cost Willpower)'>>
 					<<gt 'hunter_interactions' 'booze_dare' 'flash_tits'>>
 				<</act>>
@@ -462,7 +462,7 @@
 			<<if $wardrobe.clothingworntype != 'nude'>>
 				"How about you show us your panties" says Andrei. "Wondering what color your underwear is, just scientific curiosity that's all"
 				<<if $wardrobe.isWearingPanties>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<act 'Show him your panties (will_cost Willpower)'>>
 							<<gt 'hunter_interactions' 'booze_dare' 'flash_thong'>>
 						<</act>>
@@ -470,7 +470,7 @@
 						<<actCLA `'Show him your panties ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 					<</if>>
 				<<else>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<set $hunter_sexual_comfort += 1>>
 						You tell Andrei that you are not wearing any panties with a blush. "I do not believe you" he says with a smirk. "We need empirical proof. Solid evidence or nothing."
 						<<act 'Show them your unclad ass (will_cost Willpower)'>>
@@ -498,7 +498,7 @@
 			<<gs 'willpower' 'voyeur' 'exhib'>>
 			<<if $wardrobe.clothingworntype != 'nude'>>
 				"I can barely understand you over all those clothes" says Andrei. Noticing your confused stare, Sergei says "He means we want you to take your clothes off"
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act 'Strip off your clothes (will_cost Willpower)'>>
 						<<gt 'hunter_interactions' 'booze_dare' 'strip_outfit'>>
 					<</act>>
@@ -506,7 +506,7 @@
 					<<actCLA `'Strip off your clothes ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 				<</if>>
 			<<elseif $wardrobe.isWearingPanties>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<set $hunter_sexual_comfort += 1>>
 					"Your dare is to get rid of those panties" says Sergei plainly.
 					<<act 'Take off your panties (will_cost Willpower)'>>
@@ -533,7 +533,7 @@
 				<<set $hunter_sexual_comfort += 2>>
 				<<if $pc.alko < 4>>
 					"I want to see you play with your titties" says Sergei
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<act 'Oblige him (will_cost Willpower)'>>
 							<<gt 'hunter_interactions' 'booze_dare' 'present_tits'>>
 						<</act>>
@@ -542,7 +542,7 @@
 					<</if>>
 				<<else>>
 					<p>"So, $pc.name_nick, I am scientifically curious again. Can you show us how you jill off? Just a little demonstration, and you get your booze."</p>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<act 'Give them a teaser (will_cost Willpower)'>>
 							<<gt 'hunter_interactions' 'booze_dare' 'masturbate_1'>>
 						<</act>>
@@ -557,7 +557,7 @@
 			<<if $wardrobe.clothingworntype != 'nude'>>
 				<<gs 'willpower' 'bj' 'exhib'>>
 				<p>"I want you to suck my dick if you want some booze" says Sergei. "You get two free drinks eh?" quips Andrei behind him</p>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act 'Kneel down in front of Sergei (will_cost Willpower)'>>
 						<<gt 'hunter_interactions' 'booze_dare' 'blow_clothed'>>
 					<</act>>
@@ -572,7 +572,7 @@
 				<<elseif getvar("$hunter_collective_opinion") > 40>>
 					<<set $hunter_sexual_comfort += 3>>
 					<p>"I want to fuck you" says Igor heatedly. "I want to taste you, I want to be inside you. You are driving me crazy, $pc.name_nick"</p>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<act 'Lay down on the blanket (will_cost Willpower)'>>
 							<<gt 'hunter_interactions' 'booze_dare' 'blanket_fuck'>>
 						<</act>>

+ 6 - 6
sugarcube/src/autogenerated/Gadyukino Characters/mitka.tw

@@ -93,7 +93,7 @@
 		<p>Mitka scratches his balls and adds with a grin: "Hey $pc.name_nick, do you want to have some fun?"</p>
 		<<if $pc.thinksIsVirgin>>
 			<<gs 'willpower' 'bj' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'I don`t know. My mother is obsessed with me staying a virgin. (will_cost Willpower)'>>
 					<<run $npcs.dec('A63','rel',1)>>
 					<<gs 'willpower' 'bj' 'resist'>>
@@ -161,7 +161,7 @@
 			<p>"How about you let me fuck you today?" Mitka asks.</p>
 			<<if $pc.thinksIsVirgin>>
 				<<gs 'willpower' 'sex' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'No, I`m still a virgin. (will_cost Willpower)'>>
 						<<run $npcs.dec('A63','rel',2)>>
 						<<gs 'willpower' 'sex' 'resist'>>
@@ -176,7 +176,7 @@
 				<</if>>
 			<</if>>
 			<<gs 'willpower' 'sex' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'No thanks, not today. (will_cost Willpower)'>>
 					<<run $npcs.dec('A63','rel',2)>>
 					<<gs 'willpower' 'sex' 'resist'>>
@@ -220,7 +220,7 @@
 		<<elseif getvar("$mitkarand") < 9>>
 			<p>Can you give me a blowjob today?" Mitka asks.</p>
 			<<gs 'willpower' 'bj' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'No thanks, not today. (will_cost Willpower)'>>
 					<<run $npcs.dec('A63','rel',2)>>
 					<<gs 'willpower' 'bj' 'resist'>>
@@ -277,7 +277,7 @@
 			<p>"I want to do anal today. What do you think?" Mitka asks.</p>
 			<<if $pc.pcs_ass == 0>>
 				<<gs 'willpower' 'anal' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'No, I`ve never done anal before (will_cost Willpower)'>>
 						<<run $npcs.dec('A63','rel',2)>>
 						<<gs 'willpower' 'anal' 'resist'>>
@@ -292,7 +292,7 @@
 				<</if>>
 			<</if>>
 			<<gs 'willpower' 'anal' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'No thanks, not today. (will_cost Willpower)'>>
 					<<run $npcs.dec('A63','rel',2)>>
 					<<gs 'willpower' 'anal' 'resist'>>

+ 1 - 1
sugarcube/src/autogenerated/Gadyukino/backwater.tw

@@ -55,7 +55,7 @@
 			<<set $time.minutes += 30>>
 			<<set $pc.mood += 10>>
 			<<if $willday_bath != $time.daystart>>
-				<<set $willday_bath = $time.daystart>> <<setn $pc.pcs_willpwr += 1>>
+				<<set $willday_bath = $time.daystart>> <<setn $pc.willpower += 1>>
 
 			<</if>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>

+ 1 - 1
sugarcube/src/autogenerated/Gadyukino/meadow.tw

@@ -104,7 +104,7 @@
 						<<else>>
 							Your meadow is a perfect place to exercise. No one is around, so you could probably exercise nude if you wanted.
 						<</if>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<act 'Exercise nude'>>
 								<<gt 'meadow' 'workout' 'nude'>>
 							<</act>>

+ 5 - 5
sugarcube/src/autogenerated/Generator/zsoft_gopskverGorSlut.tw

@@ -353,7 +353,7 @@
 	<p>You shake your hips and teasingly lick your parched $pc_desc['lips'] lips, and for a second you wonder if you're laying it on too thick as you approach the three guys. You can feel your mouth water when you see the cold beer they're reaching out to you though.</p>
 	<p>$shultextrand33 says $shultextrand6: "$shul_text_byh"</p>
 	<<gs 'willpower' 'misc' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Leave (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<gt 'pav_park' 'start'>>
@@ -534,7 +534,7 @@
 	<<warn "CONVERSION ERROR ee687cb1047e233eaf8db6905e0c2d2a">>
 	<<gs 'willpower' 'drink' 'resist' 'hard'>>
 	<!-- !!Removed alko<6 from the 'leave' action below.-->
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Leave (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>> <<gt 'pav_park' 'start'>>
 		<</actCLA>>
@@ -996,7 +996,7 @@
 					<p>The boys are whispering amongst themselves: "She's got a good mouth on her, sure. But what about her other holes? Next time, we have to give that a try..."</p>
 				<</if>>
 				<<gs 'willpower' 'misc' 'resist' 'hard'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Run away from them (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<gt 'pav_park' 'start'>>
@@ -1714,7 +1714,7 @@
 		<<actCLA 'Go to the police station'>>
 		<<set $schtraf = 500>> <<set $time.minutes += 5>> <<set $katalkinNoexit = 1>> <<gt 'katalkin'>>
 	<</actCLA>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Persuade the policemen with a blowjob (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<gs 'npcgeneratec' 0 'Policeman' `rand(18,38)`>>
@@ -1743,7 +1743,7 @@
 				<<gt 'zsoft_gopskverGorSlut' '2'>>
 			<</act>>
 			<</actCLA>>
-		<<elseif $will_cost > $pc.pcs_willpwr>>
+		<<elseif $will_cost > $pc.willpower>>
 			<!-- FAILED TO CONVERT
 			act 'Persuade the policemen with a blowjob (<font color="red"><<will_cost>> Willpower)': '<br><font color="red">You don''t have enough willpower to persuade the policeman.</font>'
 		-----

+ 1 - 1
sugarcube/src/autogenerated/Generic boyfriend/Gnpc.tw

@@ -304,7 +304,7 @@
 		<<else>>
 			<<gs 'willpower' 'misc' 'self'>>
 		<</if>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Break up with him (will_cost Willpower)'>>
 				<<if getvar("$otnBoyFrend["+$numnpc+"]") < 40>>
 					<<gs 'willpower' 'misc' 'self' 'easy'>>

+ 2 - 2
sugarcube/src/autogenerated/Generic boyfriend/Gnpc2.tw

@@ -586,7 +586,7 @@
 											<<image "locations/pavlovsk/community/disco/sex/petting.jpg">>
 											You remove your hand from his pants and then your guy sticks his hand into your pants, and you feel his fingers caress your wet pussy.
 											
-											<<if $will_cost <= $pc.pcs_willpwr>>
+											<<if $will_cost <= $pc.willpower>>
 												<<actCLA 'Remove his hand (will_cost Willpower)'>>
 													
 													<<set $time.minutes += 5>>
@@ -790,7 +790,7 @@
 				<<image "locations/pavlovsk/community/disco/sex/petting.jpg">>
 				You remove your hand from his pants and he immediately reaches his hand into your pants, as you feel his fingers caress your wet pussy.
 				
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Remove his hand (will_cost Willpower)'>>
 						
 						<<set $time.minutes += 5>>

+ 3 - 3
sugarcube/src/autogenerated/Generic boyfriend/hookup_virgin.tw

@@ -58,7 +58,7 @@
 		<p>"What happened to saving yourself for marriage?"</p>
 		<i>"I can't wait that long."</i>
 		<<gs 'willpower' 'misc' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Ask him to use a condom (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<gt 'hookup_virgin' 'virgin_condom1'>>
@@ -119,7 +119,7 @@
 		<p>"What happened to saving yourself for marriage?"</p>
 		<i>"I can't wait that long."</i>
 		<<gs 'willpower' 'misc' 'self'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Ask him to use a condom (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<gt 'hookup_virgin' 'virgin_condom1'>>
@@ -526,7 +526,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'virgin_condom4'>>
-	<<if $will_cost <= $pc.pcs_willpwr and $prezikcount + $inventory.get("condom") > 0>>
+	<<if $will_cost <= $pc.willpower and $prezikcount + $inventory.get("condom") > 0>>
 		<<actCLA 'Put a condom on him (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<if rand(1,10) >= 7>>

+ 4 - 4
sugarcube/src/autogenerated/Home-Shared locations/gloryhole.tw

@@ -135,13 +135,13 @@
 				<</actCLA>>
 			
 			<<gs 'willpower' 'hj' 'self' 'easy'>>
-			<<if $pc.pcs_throat == 0 and $will_cost <= $pc.pcs_willpwr>>
+			<<if $pc.pcs_throat == 0 and $will_cost <= $pc.willpower>>
 				<<actCLA 'Touch the shaft (will_cost Willpower)'>>
 					<<gs 'willpower' 'hj' 'self'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<gt 'gloryhole' 'virgin'>>
 				<</actCLA>>
-			<<elseif $pc.pcs_throat == 0 and $will_cost > $pc.pcs_willpwr>>
+			<<elseif $pc.pcs_throat == 0 and $will_cost > $pc.willpower>>
 				<<actCLA `'Touch the shaft ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 			<</if>>
 		<</actCLA>>
@@ -454,7 +454,7 @@
 		<</if>>
 		<<arouse 'anal' 5 `['unknown','sub']`>>
 		<<if $pc.pcs_ass < 10>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Stop (will_cost Willpower)'>>
 					<<gs 'willpower' 'anal' 'resist'>>
 					
@@ -491,7 +491,7 @@
 			<</act>>
 		<</actCLA>>
 		<<gs 'willpower' 'swallow' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Turn around, kneel and let him cum in your mouth (will_cost Willpower)'>>
 				<<gs 'willpower' 'swallow' 'resist'>>
 				<<gs 'willpower' 'pay' 'resist'>>

+ 12 - 12
sugarcube/src/autogenerated/Home-Shared locations/metro_events.tw

@@ -75,7 +75,7 @@
 		The man cautiously lifts your skirt and starts caressing your buttocks.
 		<<arouse 'foreplay' 2 `['sub','unknown']`>>
 		
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<act 'Move away (will_cost Willpower)'>>
 				
 				
@@ -87,7 +87,7 @@
 			The man pulls your panties down to your knees, then lets your skirt fall back into place. He slides his hand between your thighs, caressing your clit. After spending a few minutes pleasuring you, he pulls your hand back and places it on his cock.
 			<<arouse 'foreplay' 2 `['sub','unknown']`>>
 			
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<act 'Move away (will_cost Willpower)'>>
 					
 					
@@ -184,7 +184,7 @@
 			After a few minutes, he pulls his hand out and grabs your other breast. He's now fondling both of your breasts as his cock pushes against your ass.
 			<<arouse 'foreplay' 2 `['sub','unknown']`>>
 			
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<act 'Move away (will_cost Willpower)'>>
 					
 					
@@ -196,7 +196,7 @@
 				Once he hears you moan, he pulls his hands away from your breasts and slides them down the front of your body to the waist of your pants. He unbuttons your pants and pulls them, along with your panties, down to your knees, leaving you exposed from the waist down in a crowded subway car. He takes your hand and places it on his rock hard cock.
 				<<arouse 'foreplay' 2 `['sub','unknown','exhibitionism']`>>
 				
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act 'Move away (will_cost Willpower)'>>
 						
 						
@@ -236,7 +236,7 @@
 						You give into his demands and squat down in front of him. He grabs your head and turns your face to his crotch, his rock hard cock waiting for you. He starts rubbing his cock against your face and lips, teasing his cock.
 						<<arouse 'foreplay' 2 `['sub','unknown']`>>
 						<<gs 'willpower' 'bj' 'resist' 'medium'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<act 'Move away (will_cost Willpower)'>>
 								
 								
@@ -348,7 +348,7 @@
 			<<gt $location>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Return the favor (will_cost Willpower)'>>
 				<<if !$wardrobe.isWearingPanties>>
 					<<if $wardrobe.PCloPants > 0>>
@@ -413,7 +413,7 @@
 			<<gt $location>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Return the favor (will_cost Willpower)'>>
 				<<if !$wardrobe.isWearingPanties>>
 					<<if $wardrobe.PCloPants > 0>>
@@ -745,7 +745,7 @@
 			<<gt 'metro' 'start'>>
 		<</act>>
 		<<gs 'willpower' 'exhib' 'self' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Return the favor (will_cost Willpower)'>>
 				<<if !$wardrobe.isWearingPanties>>
 					<<if $wardrobe.PCloPants > 0>>
@@ -964,7 +964,7 @@
 	<<image "locations/city/shared/metro/metrorestroom.jpg">>
 	<p>You walk over to them. "Come, let's go have some fun, yes?" the one who pulled his pants down says to you in badly accented Russian; it sounds like he might be from Africa. He points and you turn to that he's pointing at the restrooms. It's clear what they want.</p>
 	<<gs 'willpower' 'sex' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Tell them no (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<image "pc/reactions/no.jpg">>
@@ -982,7 +982,7 @@
 		After a few minutes of kissing, he pushes you down by your shoulders.
 		<<arouse 'foreplay' 3 `['exhibitionism']`>>
 		<<gs 'willpower' 'sex' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Change your mind (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<image "locations/city/shared/metro/sex/station/2bbcno.jpg">>
@@ -1016,7 +1016,7 @@
 						<<arouse 'bj' 5 `['exhibitionism','group']`>>
 						<<arouse 'hj' -5 `['exhibitionism','group']`>>
 						<<gs 'willpower' 'sex' 'resist' 'medium'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Just suck them off (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>>
 								<<gt 'metro_events' 'twobbcfinish'>>
@@ -1035,7 +1035,7 @@
 								<<arouse 'bj' 5 `['exhibitionism','group','sub','rough']`>>
 								<<arouse 'vaginal' -5 `['exhibitionism','group','sub','rough']`>>
 								<<gs 'willpower' 'sex' 'resist' 'medium'>>
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Finish them off with blowjobs (will_cost Willpower)'>>
 										<<gs 'willpower' 'pay' 'resist'>>
 										<<gt 'metro_events' 'twobbcfinish'>>

+ 2 - 2
sugarcube/src/autogenerated/Home-Shared locations/taxi.tw

@@ -17,7 +17,7 @@
 			<<gs 'taxi' 'locations'>>
 		<<else>>
 			<<gs 'willpower' 'misc' 'self' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Don't tell him you can't pay (will_cost Willpower)'>>
 					<<gs 'willpower' 'misc' 'self' 'easy'>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -261,7 +261,7 @@
 		<</if>>
 		<<if $pc.sexStat('vaginal') == 0>>
 			<<gs 'willpower' 'sex' 'resist' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tell him you`re a virgin (will_cost Willpower)'>>
 					<<gs 'willpower' 'sex' 'resist' 'easy'>>
 					<<gs 'willpower' 'pay' 'resist'>>

+ 1 - 1
sugarcube/src/autogenerated/Igor Kruglov/igorev.tw

@@ -158,7 +158,7 @@ qwday	igor_qwday
 		<</actCLA>>
 		<<gs 'willpower' 'misc' 'force' 'easy'>>
 		<<if getvar("$igor_krossdresssex") >= 1 and $igor_kdsexday != $time.daystart>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Crossdress sex (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'force'>>
 					As you're not that keen getting penetrated you suggest that you want to introduce Igor to some special kind of kinky sex that turns you on.

+ 1 - 1
sugarcube/src/autogenerated/Igor Kruglov/igorhome.tw

@@ -973,7 +973,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'self' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'You`ve had enough'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<p>Tired of her yapping you angirly answer, "A grown woman shouldn't act this way. What does it matter how I dress? Are you really that judgmental of someone you've just met?"</p>

+ 4 - 4
sugarcube/src/autogenerated/Katja Meynold/katja_city_sex.tw

@@ -76,7 +76,7 @@
 							<<else>>
 								<<gs 'willpower' 'drugs' 'force'>>
 							<</if>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Convince Katja to try cocaine (will_cost Willpower)'>>
 									<<set $time.minutes += 8>>
 									<<gs 'willpower' 'pay' 'force'>>
@@ -138,7 +138,7 @@
 						<<else>>
 							<<gs 'willpower' 'drugs' 'force'>>
 						<</if>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Convince Katja to do some lines with you (will_cost Willpower)'>>
 								<<set $time.minutes += 8>>
 								<<if getvar("$katjaQW['coke_stage']") == 2>>
@@ -180,7 +180,7 @@
 								<<if getvar("$katjaQW['coke_stage']") == 4>>
 									<<gs 'willpower' 'drugs' 'force' 'easy'>>
 								<</if>>
-								<<if $will_cost <= $pc.pcs_willpwr or getvar("$katjaQW['coke_stage']") == 3>>
+								<<if $will_cost <= $pc.willpower or getvar("$katjaQW['coke_stage']") == 3>>
 									<<actCLA 'Convince Katja not to do cocaine (will_cost Willpower)'>>
 										<<if getvar("$katjaQW['coke_stage']") == 4>>
 											<<gs 'willpower' 'pay' 'force'>>
@@ -250,7 +250,7 @@
 									It's clear that if you want Katja to stop, it would require you to forcefully drag her away, though you're not exactly sure how this will go down when you are in a stranger''s apartment.
 								<</if>>
 								<<if getvar("$katjaQW['coke_stage']") < 8>>
-									<<if $will_cost <= $pc.pcs_willpwr>>
+									<<if $will_cost <= $pc.willpower>>
 										<<actCLA 'Convince Katja not to take cocaine (will_cost Willpower)'>>
 											<<gs 'willpower' 'pay' 'force'>>
 											<<if getvar("$katjaQW['coke_stage']") == 5>>

+ 14 - 14
sugarcube/src/autogenerated/Katja Meynold/katja_nightclub.tw

@@ -400,7 +400,7 @@
 					<<else>>
 						<<gs 'willpower' '' 'force'>>
 					<</if>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Convince Katja to dance some more (will_cost Willpower)'>>
 							<<relationship 'A14' 'dislike'>>
 							<<gs 'willpower' 'pay' 'force'>>
@@ -451,7 +451,7 @@
 					<<else>>
 						<<gs 'willpower' '' 'force'>>
 					<</if>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Convince Katja to go to the bar (will_cost Willpower)'>>
 							<<relationship 'A14' 'dislike'>>
 							<<gs 'willpower' 'pay' 'force'>>
@@ -708,7 +708,7 @@
 										<<else>>
 											<<gs 'willpower' '' 'force'>>
 										<</if>>
-										<<if $will_cost <= $pc.pcs_willpwr>>
+										<<if $will_cost <= $pc.willpower>>
 											<<actCLA 'Convince Katja to stay at the bar (will_cost Willpower)'>>
 												<<relationship 'A14' 'dislike'>>
 												<<gs 'willpower' 'pay' 'force'>>
@@ -846,7 +846,7 @@
 										<<else>>
 											<<gs 'willpower' '' 'force'>>
 										<</if>>
-										<<if $will_cost <= $pc.pcs_willpwr>>
+										<<if $will_cost <= $pc.willpower>>
 											<<actCLA 'Convince Katja to stay at the bar (will_cost Willpower)'>>
 												<<relationship 'A14' 'dislike'>>
 												<<gs 'willpower' 'pay' 'force'>>
@@ -957,7 +957,7 @@
 					<<else>>
 						<<gs 'willpower' '' 'force'>>
 					<</if>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Convince Katja to have another drink (will_cost Willpower)'>>
 							<<relationship 'A14' 'dislike'>>
 							<<gs 'willpower' 'pay' 'force'>>
@@ -1107,7 +1107,7 @@
 								<<else>>
 									<<gs 'willpower' '' 'force'>>
 								<</if>>
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Convince Katja to stay on the dance floor (will_cost Willpower)'>>
 										<<relationship 'A14' 'dislike'>>
 										<<gs 'willpower' 'pay' 'force'>>
@@ -1166,7 +1166,7 @@
 							<<else>>
 								<<gs 'willpower' '' 'force'>>
 							<</if>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Push her a little more (will_cost Willpower)'>>
 									<<relationship 'A14' 'dislike'>>
 									<<gs 'willpower' 'pay' 'force'>>
@@ -1242,7 +1242,7 @@
 							<<else>>
 								<<gs 'willpower' '' 'force'>>
 							<</if>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Convince Katja not to go home with him (will_cost Willpower)'>>
 									<<relationship 'A14' 'dislike'>>
 									<<gs 'willpower' 'pay' 'force'>>
@@ -1374,7 +1374,7 @@
 						<<else>>
 							<<gs 'willpower' 'drugs' 'force'>>
 						<</if>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Convince Katja to try the cocaine (will_cost Willpower)'>>
 								<<set $time.minutes += 8>>
 								<<gs 'willpower' 'pay' 'force'>>
@@ -1437,7 +1437,7 @@
 					<<else>>
 						<<gs 'willpower' 'drugs' 'force'>>
 					<</if>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Convince Katja to do some lines with you (will_cost Willpower)'>>
 							<<set $time.minutes += 8>>
 							<<if getvar("$katjaQW['coke_stage']") == 2>>
@@ -1480,7 +1480,7 @@
 							<<if getvar("$katjaQW['coke_stage']") == 4>>
 								<<gs 'willpower' 'drugs' 'force' 'easy'>>
 							<</if>>
-							<<if $will_cost <= $pc.pcs_willpwr or getvar("$katjaQW['coke_stage']") == 3>>
+							<<if $will_cost <= $pc.willpower or getvar("$katjaQW['coke_stage']") == 3>>
 								<<actCLA 'Convince Katja not to do cocaine (will_cost Willpower)'>>
 									<<if getvar("$katjaQW['coke_stage']") == 4>>
 										<<gs 'willpower' 'pay' 'force'>>
@@ -1551,7 +1551,7 @@
 								It's clear that if you want Katja to stop, it would require you to forcefully drag her away. But that would probably get the guy and the security guard to stop you, as well as get you thrown out of the club, maybe worse.
 							<</if>>
 							<<if getvar("$katjaQW['coke_stage']") < 8>>
-								<<if $will_cost <= $pc.pcs_willpwr>>
+								<<if $will_cost <= $pc.willpower>>
 									<<actCLA 'Convince Katja not to take cocaine (will_cost Willpower)'>>
 										<<gs 'willpower' 'pay' 'force'>>
 										<<if getvar("$katjaQW['coke_stage']") == 5>>
@@ -1647,7 +1647,7 @@
 				<<else>>
 					<<gs 'willpower' 'sex' 'force'>>
 				<</if>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Convince Katja to have sex with $npc('+$npclastgenerated).nickname+' (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'force'>>
 						<<arouse 'foreplay_give' 3 >>
@@ -1687,7 +1687,7 @@
 			<<else>>
 				<<gs 'willpower' 'sex' 'force' 'easy'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Convince Katja to stop (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'force'>>
 					"Come on, Katja. Stop teasing the poor guy. You're making him think that he's anywhere close to our standard," you say out loud to make sure that he heard you.

+ 6 - 6
sugarcube/src/autogenerated/Katja Meynold/katja_party.tw

@@ -61,7 +61,7 @@
 			<<else>>
 				<<gs 'willpower' 'misc' 'force'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Convince Katja to stay and watch a movie (will_cost Willpower)'>>
 					<<set $menu_off = 1>>
 					<<gs 'willpower' 'pay' 'force'>>
@@ -181,7 +181,7 @@
 			<<else>>
 				<<gs 'willpower' 'misc' 'force'>>
 			<</if>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Convince Katja to stay and watch a movie (will_cost Willpower)'>>
 					<<set $menu_off = 1>>
 					<<gs 'willpower' 'pay' 'force'>>
@@ -457,7 +457,7 @@
 		<<set '"You know, $pc.name_nick. We sometimes take some cocaine when we are partying. If you have any, then maybe we could take some now?" Katja asks, looking at you ' + iif(katjaQW['coke_stage'] = 4, 'nervously.', 'with pleading eyes.')>>
 		<<if getvar("$dur") >= 2>>
 			<<gs 'willpower' 'drugs' 'resist'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'Tell Katja that you don`t want to take drugs right now (will_cost Willpower)'>>
 					<<set $time.minutes += 2>>
 					<<gs 'willpower' 'pay' 'resist'>>
@@ -504,7 +504,7 @@
 						<<else>>
 							<<gs 'willpower' 'drugs' 'force'>>
 						<</if>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Convince Katja to try cocaine (will_cost Willpower)'>>
 								<<set $time.minutes += 4>>
 								<<gs 'willpower' 'pay' 'force'>>
@@ -574,7 +574,7 @@
 							<<else>>
 								<<gs 'willpower' 'drugs' 'force'>>
 							<</if>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Convince Katja to try cocaine (will_cost Willpower)'>>
 									<<set $time.minutes += 8>>
 									<<gs 'willpower' 'pay' 'force'>>
@@ -630,7 +630,7 @@
 					<<else>>
 						<<gs 'willpower' 'drugs' 'force'>>
 					<</if>>
-					<<if $will_cost <= $pc.pcs_willpwr>>
+					<<if $will_cost <= $pc.willpower>>
 						<<actCLA 'Convince Katja to do some lines with you (will_cost Willpower)'>>
 							<<set $time.minutes += 8>>
 							<<if getvar("$katjaQW['coke_stage']") == 2>>

+ 2 - 2
sugarcube/src/autogenerated/Magic Quests/serpent.tw

@@ -17,7 +17,7 @@
 	<<image "locations/gadukino/serpent/serpent1_0.jpg">>
 	<p>"Now, do we have a deal?" the sibilant voice continues.</p>
 	<<gs 'willpower' 'misc' 'self'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'No, leave me alone you freaky snake (will_cost Willpower)'>>
 			<<gs 'willpower' 'misc' 'self' 'hard'>> <<gs 'willpower' 'pay' 'self'>> <<set $serpent_path = 0>> <<gt 'gaddvor'>>
 		<</actCLA>>
@@ -25,7 +25,7 @@
 		<<actCLA `'No, leave me alone you freaky snake ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<</if>>
 	<<gs 'willpower' 'skill' 'self' 'magik_lvl'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Maybe, but first tell me more about what you can teach me (will_cost Willpower)'>>
 			<<gs 'willpower' 'skill' 'self' 'magik_lvl'>> <<gs 'willpower' 'pay' 'self'>> <<set $serpent_path = 1>> <<gt 'serpent'>>
 		<</actCLA>>

+ 8 - 8
sugarcube/src/autogenerated/Magic Quests/succubus.tw

@@ -22,7 +22,7 @@
 			<p>You try to contain $sucself1...</p>
 			<<gs 'willpower' 'misc' 'resist' 'easy'>>
 			<<set $will_cost = $will_cost * $succublvl>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<p>And you're successful, $sucself1 returns to your core.</p>
 				<<actCLA 'Continue'>>
@@ -73,7 +73,7 @@
 			<p>You try to contain $sucself1...</p>
 			<<gs 'willpower' 'misc' 'resist' 'easy'>>
 			<<set $will_cost = $will_cost * $succublvl>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<p>And you're successful, $sucself1 returns to your core.</p>
 				<<actCLA 'Continue'>>
@@ -335,7 +335,7 @@
 				<<set $pc.horny = 0>>
 				<<set $orgasm += 1 + $scfeed>>
 				<!-- ! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting-->
-				<<set $pc.pcs_willpwr += $scfeed>>
+				<<set $pc.willpower += $scfeed>>
 				<<set $succubxp += 6>>
 				<<set $sexnutrition += 30 * $scfeed>>
 				<<set $sucabscum = 1>>
@@ -384,7 +384,7 @@
 			<<set $pc.horny = 0>>
 			<<set $orgasm += 1 + $scfeed>>
 			<!-- ! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting-->
-			<<set $pc.pcs_willpwr += $scfeed>>
+			<<set $pc.willpower += $scfeed>>
 			<<set $succubxp += 6>>
 			<<set $sexnutrition += 30 * $scfeed>>
 			<<set $sucabscum = 1>>
@@ -551,7 +551,7 @@
 					<<set $pc.horny = 0>>
 					<<set $orgasm += $scfeed>>
 					<!-- ! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting-->
-					<<set $pc.pcs_willpwr += $scfeed>>
+					<<set $pc.willpower += $scfeed>>
 					<<set $sexnutrition += 25 * $scfeed>>
 					<<set $suclezsex = $lesbian>>
 					<<set $succubxp += 6>>
@@ -603,7 +603,7 @@
 
 		<</if>>
 		<!-- ! Seems appropriate. Potentially worth revisiting-->
-		<<set $pc.pcs_willpwr = $pc.willpowermax>>
+		<<set $pc.willpower = $pc.willpowermax>>
 		<<set $sucexcess -= 100>>
 		<<set $succhungry += 1>>
 		<<set $succubxp += 10>>
@@ -1160,7 +1160,7 @@
 	<<set $pc.horny = 0>>
 	<<set $orgasm += $scfeed>>
 	<!-- ! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting-->
-	<<set $pc.pcs_willpwr += $scfeed>>
+	<<set $pc.willpower += $scfeed>>
 	<<set $succubxp += 3 * $sucencntrand>>
 	<<set $sexnutrition += 25 * $scfeed>>
 	<<set $scwalkmon = rand (50,(100 * $sucencntrand))>>
@@ -1366,7 +1366,7 @@
 		<<set $pc.pcs_health += $pc.healthmax / 5>>
 		<<set $pc.pcs_stam = $pc.stammax>>
 		<!-- ! Commenting it out for now, but potentially worth revisiting-->
-		<!-- !pcs_willpwr = $pc.intelligence*5 + will*5+1000-->
+		<!-- !willpower = $pc.intelligence*5 + will*5+1000-->
 		<<set $pcs_mana = ($pc.skillLevel("intelligence") * $pcs_magik) + $pcs_magik * 100 + $pc.vitality * 10 + $rikudo>>
 		<<set $time.minutes += 15>>
 		<<set $scwrdtmp = '.'>>

+ 1 - 1
sugarcube/src/autogenerated/Magic/castSpell.tw

@@ -57,7 +57,7 @@
 	<</if>>
 	<<if $pcs_mana >= $manaCost>>
 		<<set $pcs_mana -= $manaCost>>
-		<!-- !pcs_willpwr -= spellWill[$SpellID]-->
+		<!-- !willpower -= spellWill[$SpellID]-->
 		<<set $arouseVal = $manaCost / 50>>
 		<<arouse 'voyeur' $arouseVal >>
 		<<set $time.minutes -= $arouseVal>>

+ 2 - 2
sugarcube/src/autogenerated/Natasha Belova/natbelEv.tw

@@ -390,7 +390,7 @@
 	You walk in and see Natasha just turning on the machine. She turns around and sees you in the doorway.
 	<<if getvar("$NatashaLoc") == 7 and getvar("$NatbelQW['cucumber']") == 1 and getvar("$NatbelQW['QWstage']") >= 10>>
 		<<gs 'willpower' 'mast' 'force' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Make her play with a cucumber (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'force'>>
 				<<if getvar("$NatbelQW['QWstage']") == 10>>
@@ -452,7 +452,7 @@
 	<<arouse 'voyeur' 5 >>
 	<<if getvar("$NatbelQW['QWstage']") >= 5>>
 		<<gs 'willpower' 'voyeur' 'self' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Get a closer look (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'self'>>
 				<<image "characters/pavlovsk/school/girl/natasha/sex/natshowerspy02.jpg">>

+ 3 - 3
sugarcube/src/autogenerated/Natasha Belova/natbel_cp_1.tw

@@ -261,7 +261,7 @@ NatbelQW['panty_stuff_day'] is set to daystart each morning you stuff Natasha''s
 		<<gt 'natbelapt' 'natroom'>>
 	<</actCLA>>
 	<<gs 'willpower' 'cuni' 'force' 'easy'>>
-	<<if getvar("$NatbelQW['QWstage']") >= 8 and $will_cost <= $pc.pcs_willpwr>>
+	<<if getvar("$NatbelQW['QWstage']") >= 8 and $will_cost <= $pc.willpower>>
 		<<actCLA 'Take off your own clothes (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			You smile at Natasha and start taking off your own clothes slowly, she tries not to pay attention to you. Yet you can see her sneaking peeks.
@@ -272,7 +272,7 @@ NatbelQW['panty_stuff_day'] is set to daystart each morning you stuff Natasha''s
 				<<gt 'natbel_cp_1' 'straddleface'>>
 			<</act>>
 		<</actCLA>>
-	<<elseif getvar("$NatbelQW['QWstage']") >= 8 and $will_cost > $pc.pcs_willpwr>>
+	<<elseif getvar("$NatbelQW['QWstage']") >= 8 and $will_cost > $pc.willpower>>
 		<<actCLA `'Take off your own clothes ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
 	<</if>>
 	<<if getvar("$NatbelQW['seethrough']") == 1>>
@@ -645,7 +645,7 @@ NatbelQW['panty_stuff_day'] is set to daystart each morning you stuff Natasha''s
 	You walk in and see Natasha just turning on the machine. She turns around and sees you in the doorway.
 	<<if getvar("$NatashaLoc") == 7 and getvar("$NatbelQW['cucumber']") == 1 and getvar("$NatbelQW['QWstage']") >= 10>>
 		<<gs 'willpower' 'mast' 'force' 'easy'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Make her play with a cucumber (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'force'>>
 				<<if getvar("$NatbelQW['QWstage']") == 10>>

+ 1 - 1
sugarcube/src/autogenerated/New Year 2010/nyp_school.tw

@@ -778,7 +778,7 @@
 					<</actCLA>>
 				<</actCLA>>
 				<<gs 'willpower' 'sex' 'resist'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Refuse (will_cost Willpower)'>>
 						
 						<<set $time.minutes += 2>>

+ 7 - 7
sugarcube/src/autogenerated/New Year 2010/sny.tw

@@ -15,7 +15,7 @@
 	<<image "locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg">>
 	The whole class went to Dimka''s home. He has house music playing and lots of alcohol to drink. You go up to a table with a couple of the other girls and get a glass of vodka. Soon, everyone is drinking and celebrating the new year.
 	<<gs 'willpower' 'drink' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse to drink (will_cost Willpower)'>>
 			<<set $time.minutes += 15>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -50,7 +50,7 @@
 	<<image "locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg">>
 	Boys and girls start to relax and break up into groups to talk. Someone pours more vodka into a glass and hands it to you.
 	<<gs 'willpower' 'drink' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse to drink (will_cost Willpower)'>>
 			<<set $time.minutes += 15>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -85,7 +85,7 @@
 	<<image "locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg">>
 	Albina goes into the center of the room and begins to dance. She is a very talented dancer and knows how to move her body. She is quickly joined by Katja and her sister Vicky. While you are watching the girls, someone hands you another glass of vodka.
 	<<gs 'willpower' 'drink' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse to drink (will_cost Willpower)'>>
 			<<set $time.minutes += 15>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -120,7 +120,7 @@
 	<<image "locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg">>
 	Albina and Katja are dancing face to face in the middle of the room. Suddenly, Albina kisses Katja on the lips. The room erupts into howling kids encouraging them to continuing. Someone hands you another glass of vodka.
 	<<gs 'willpower' 'drink' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Refuse to drink (will_cost Willpower)'>>
 			<<set $time.minutes += 15>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -210,7 +210,7 @@
 		<<image "locations/pavlovsk/resident/dimkahome/newyear/idi.jpg">>
 		<p>You are a bit tipsy and feel fairly relaxed at the party. There's some vodka shots lined up, so you could have another drink, or maybe it's time to head home?</p>
 		<<gs 'willpower' 'drink' 'resist'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Leave (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<gt 'pav_residential'>>
@@ -265,7 +265,7 @@
 	<<image "locations/pavlovsk/resident/dimkahome/newyear/tusa9.jpg">>
 	<p>Virtually everyone is passed out on the floor, some in various states of undress. Dimka comes over to you. "And you're still on your feet? Good for you, the others have already left or passed out, let's go, I need you to help me with something."</p>
 	<<gs 'willpower' 'misc' 'resist'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I have to go now (will_cost Willpower)'>>
 			<<set $time.minutes += 15>>
 			<<gs 'willpower' 'pay' 'resist'>>
@@ -386,7 +386,7 @@
 	<<set $time.minutes += 5>>
 	<<if $pc.alko < 6>>
 		<<gs 'willpower' 'kiss' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'Push him away (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<p>You push yourself from Dimka. "Hey! Beat it! Are you crazy or something?"</p>

+ 3 - 3
sugarcube/src/autogenerated/Niko Volkov/NikoDates.tw

@@ -211,7 +211,7 @@
 				<</actCLA>>
 			<</actCLA>>
 			<<gs 'willpower' 'exhib' 'resist' 'medium'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<actCLA 'I can`t (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>>
 					<<set $time.minutes += 5>>
@@ -974,7 +974,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>
@@ -1151,7 +1151,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>

+ 5 - 5
sugarcube/src/autogenerated/Niko Volkov/NikoEv2.tw

@@ -300,7 +300,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>
@@ -442,7 +442,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>
@@ -656,7 +656,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>
@@ -865,7 +865,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>
@@ -949,7 +949,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'prostitution' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'I can`t right now (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<set $time.minutes += 5>>

+ 2 - 2
sugarcube/src/autogenerated/North Road/road_prostitution.tw

@@ -59,12 +59,12 @@
 		<<gt 'road'>>
 	<</act>>
 	<<gs 'willpower' 'prostitution' 'self' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'Look for a client (0:30 and will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<gt 'prostitution_car_negotiation' 'look_client'>>
 		<</actCLA>>
-	<<elseif $will_cost > $pc.pcs_willpwr>>
+	<<elseif $will_cost > $pc.willpower>>
 		<!-- FAILED TO CONVERT
 			act 'Look for a client (0:30 and <font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		-----

+ 5 - 5
sugarcube/src/autogenerated/Pav Lake/LakeBoyZ.tw

@@ -36,7 +36,7 @@
 		<<else>>
 			<p>$boydesc sits closer to you and offers you a cold beer.</p>
 			<<gs 'willpower' 'drink' 'resist' 'easy'>>
-			<<if $will_cost <= $pc.pcs_willpwr>>
+			<<if $will_cost <= $pc.willpower>>
 				<<act 'Smile and leave (will_cost Willpower)'>>
 					
 					<<gt 'pav_lake'>>
@@ -50,7 +50,7 @@
 				Suddenly, he puts his hand on your thigh.
 				<p>"Another beer, $pc.name_nick?"</p>
 				<<gs 'willpower' 'drink' 'resist' 'easy'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'Thank him for the beer and leave (will_cost Willpower)'>>
 					<<gs 'willpower' 'pay' 'resist'>> <<gt 'pav_lake'>>
 				<</actCLA>>
@@ -65,7 +65,7 @@
 					<<if rand(1,100) <= 20>>
 						Leaned in he whispers to you, "I need to taste those lips."
 						<<gs 'willpower' 'kiss' 'resist' 'easy'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Push him away and leave (will_cost Willpower)'>>
 							<<gs 'willpower' 'pay' 'resist'>> <<gt 'pav_lake'>>
 						<</actCLA>>
@@ -83,7 +83,7 @@
 							<p>You passionately kiss $boydesc, as he continues to caress your body, paying particular interest to your breasts.</p>
 							<p>$boydesc invites you to his house.</p>
 							<<gs 'willpower' 'sex' 'resist' 'easy'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Call it a day and leave (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>> <<gt 'pav_lake'>>
 							<</actCLA>>
@@ -118,7 +118,7 @@
 							<p>You quickly get changed into your regular clothes and go for a walk with $boydesc.</p>
 							<p>$boydesc invites you over to his house.</p>
 							<<gs 'willpower' 'sex' 'resist' 'easy'>>
-							<<if $will_cost <= $pc.pcs_willpwr>>
+							<<if $will_cost <= $pc.willpower>>
 								<<actCLA 'Call it a day and leave (will_cost Willpower)'>>
 								<<gs 'willpower' 'pay' 'resist'>> <<gt 'pav_lake'>>
 							<</actCLA>>

+ 2 - 2
sugarcube/src/autogenerated/Pavlovsk/garfather.tw

@@ -218,7 +218,7 @@ Your stepfather is a greying, slightly flabby man working as a truck driver. He
 					<</if>>
 					<<if $pc.horny >= 50 or getvar("$TouchedByFather") == 1>>
 						<<gs 'willpower' 'exhib' 'self' 'easy'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA ''Accidentally' drop the wrench (will_cost Willpower)'>>
 								<<gs 'willpower' 'exhib' 'self' 'easy'>>
 								<<gs 'willpower' 'pay' 'self'>>
@@ -587,7 +587,7 @@ Your stepfather is a greying, slightly flabby man working as a truck driver. He
 					<</if>>
 					<<if $pc.horny >= 75 or getvar("$TouchedByFather") == 1>>
 						<<gs 'willpower' 'exhib' 'self' 'easy'>>
-						<<if $will_cost <= $pc.pcs_willpwr>>
+						<<if $will_cost <= $pc.willpower>>
 							<<actCLA 'Spread your legs (will_cost Willpower)'>>
 								<<gs 'willpower' 'exhib' 'self' 'easy'>>
 								<<gs 'willpower' 'pay' 'self'>>

+ 3 - 3
sugarcube/src/autogenerated/Pavlovsk/gopskver.tw

@@ -118,7 +118,7 @@
 			<<elseif $pc.alko >= 6 and $pc.alko < 9 and getvar("$DansOralSlut") == 1>>
 				You're quite drunk, and before heading out Dan offers to walk you home.
 				<<gs 'willpower' 'misc' 'resist' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act '"No need, I can find my own way home"(will_cost Willpower)'>>
 
 						<<gt 'pav_complex' 'start'>>
@@ -147,7 +147,7 @@
 			<<elseif $pc.alko >= 6 and $pc.alko < 9 and getvar("$DansOralSlut") == 0>>
 				You're quite drunk, and before heading out Dan offers to walk you home.
 				<<gs 'willpower' 'misc' 'resist' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<act '"No need, I can find my own way home"(will_cost Willpower)'>>
 
 						<<gt 'pav_complex' 'start'>>
@@ -454,7 +454,7 @@
 	<<set $pc.spankedtime = $totminut>>
 	<<gs 'underwear' 'remove'>>
 	<<set $pc.mood = $pc.mood - 10>>
-	<<set $pc.pcs_willpwr = $pc.pcs_willpwr - 10>>
+	<<set $pc.willpower = $pc.willpower - 10>>
 	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 

+ 4 - 4
sugarcube/src/autogenerated/Pavlovsk/kotovEv.tw

@@ -19,7 +19,7 @@
 		<</actCLA>>
 	<</actCLA>>
 	<<gs 'willpower' 'misc' 'self' 'hard'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'It`s all lies, babe! (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'self'>>
 			<<if $pc.fame('pav_sex') > 75>>
@@ -75,7 +75,7 @@
 <<elseif $loc == 'pav_park'>>
 	<p>Vitek sees you walk by, and waves his hand: "Hey $pc.name_nick! Come on, join me!"</p>
 	<<gs 'willpower' 'misc' 'resist' 'medium'>>
-	<<if $will_cost <= $pc.pcs_willpwr>>
+	<<if $will_cost <= $pc.willpower>>
 		<<actCLA 'No time right now, sorry! (will_cost Willpower)'>>
 			<<gs 'willpower' 'pay' 'resist'>>
 			<<gt $location>>
@@ -96,7 +96,7 @@
 				<<image "characters/shared/headshots_main/big9.jpg">>
 				<p>You enjoyed your time with Vitek, but you have to get on with your day. Vitek is a bit disappointed to see you leave and hugs you tightly, while kissing you on your lips. You kiss him back, and can't help but feel a bit more aroused when he lets you go. He smiles at you and says: "$pc.name_nick, babe... want to go to my place for a while?"</p>
 				<<gs 'willpower' 'misc' 'resist' 'medium'>>
-				<<if $will_cost <= $pc.pcs_willpwr>>
+				<<if $will_cost <= $pc.willpower>>
 					<<actCLA 'No time right now, sorry! (will_cost Willpower)'>>
 						<<gs 'willpower' 'pay' 'resist'>>
 						<<gt $location>>
@@ -115,7 +115,7 @@
 			<</actCLA>>
 		<</actCLA>>
 		<<gs 'willpower' 'misc' 'resist' 'medium'>>
-		<<if $will_cost <= $pc.pcs_willpwr>>
+		<<if $will_cost <= $pc.willpower>>
 			<<actCLA 'No time right now, sorry! (will_cost Willpower)'>>
 				<<gs 'willpower' 'pay' 'resist'>>
 				<<gt $location>>

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