Browse Source

Getting rid of getvar where it isn't needed

Stephan Fuchs 10 months ago
parent
commit
2cac2f4b57
100 changed files with 1064 additions and 1064 deletions
  1. 19 19
      sugarcube/src/activities/abduction.tw
  2. 3 3
      sugarcube/src/activities/abductionCustomer.tw
  3. 1 1
      sugarcube/src/activities/actress/act_main1.tw
  4. 3 3
      sugarcube/src/activities/actress/act_minor1.tw
  5. 1 1
      sugarcube/src/activities/actress/audition_sex1.tw
  6. 5 5
      sugarcube/src/activities/actress/auditions.tw
  7. 10 10
      sugarcube/src/activities/actress/auditions_minor1.tw
  8. 3 3
      sugarcube/src/activities/actress/casting.tw
  9. 1 1
      sugarcube/src/activities/bootycall/booty_call.tw
  10. 16 16
      sugarcube/src/activities/bootycall/booty_call_after.tw
  11. 3 3
      sugarcube/src/activities/bootycall/booty_call_condoms.tw
  12. 24 24
      sugarcube/src/activities/bootycall/booty_call_cowgirl.tw
  13. 5 5
      sugarcube/src/activities/bootycall/booty_call_cum.tw
  14. 32 32
      sugarcube/src/activities/bootycall/booty_call_doggy.tw
  15. 1 1
      sugarcube/src/activities/bootycall/booty_call_favorite_part.tw
  16. 20 20
      sugarcube/src/activities/bootycall/booty_call_leave.tw
  17. 49 49
      sugarcube/src/activities/bootycall/booty_call_miss.tw
  18. 6 6
      sugarcube/src/activities/bootycall/booty_call_morning.tw
  19. 11 11
      sugarcube/src/activities/bootycall/booty_call_pillow_talk.tw
  20. 20 20
      sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw
  21. 3 3
      sugarcube/src/activities/bootycall/booty_call_reactions.tw
  22. 8 8
      sugarcube/src/activities/bootycall/booty_call_sex.tw
  23. 19 19
      sugarcube/src/activities/bootycall/booty_call_start.tw
  24. 1 1
      sugarcube/src/activities/bootycall/booty_call_stats.tw
  25. 1 1
      sugarcube/src/activities/bootycall/booty_call_talk.tw
  26. 10 10
      sugarcube/src/activities/dating/lover_meet.tw
  27. 17 17
      sugarcube/src/activities/phone/phone.tw
  28. 1 1
      sugarcube/src/activities/school/chats/gschool_nerd_chats.tw
  29. 7 7
      sugarcube/src/activities/school/deprecated/gschool_lessons4.tw
  30. 31 31
      sugarcube/src/activities/school/gschool.tw
  31. 1 1
      sugarcube/src/activities/school/gschool_boys_bathroom.tw
  32. 5 5
      sugarcube/src/activities/school/gschool_break.tw
  33. 11 11
      sugarcube/src/activities/school/gschool_chats.tw
  34. 8 8
      sugarcube/src/activities/school/gschool_cheerleading.tw
  35. 14 14
      sugarcube/src/activities/school/gschool_coolkid_chats.tw
  36. 6 6
      sugarcube/src/activities/school/gschool_detention.tw
  37. 20 20
      sugarcube/src/activities/school/gschool_events.tw
  38. 1 1
      sugarcube/src/activities/school/gschool_events1.tw
  39. 3 3
      sugarcube/src/activities/school/gschool_girls_bathroom.tw
  40. 2 2
      sugarcube/src/activities/school/gschool_gopnik_chats.tw
  41. 4 4
      sugarcube/src/activities/school/gschool_gossip.tw
  42. 6 6
      sugarcube/src/activities/school/gschool_jock_chats.tw
  43. 42 42
      sugarcube/src/activities/school/gschool_lessons.tw
  44. 2 2
      sugarcube/src/activities/school/gschool_lessonsev1.tw
  45. 2 2
      sugarcube/src/activities/school/gschool_lessonsev2.tw
  46. 2 2
      sugarcube/src/activities/school/gschool_lessonsev3.tw
  47. 2 2
      sugarcube/src/activities/school/gschool_lunch.tw
  48. 1 1
      sugarcube/src/activities/school/gschool_office.tw
  49. 6 6
      sugarcube/src/activities/school/gschool_outcast_chats.tw
  50. 84 84
      sugarcube/src/activities/school/gschool_post_shower.tw
  51. 1 1
      sugarcube/src/activities/school/gschool_socialchg1.tw
  52. 67 67
      sugarcube/src/activities/school/locations/grounds.tw
  53. 11 11
      sugarcube/src/activities/school/quest_school.tw
  54. 4 4
      sugarcube/src/activities/school/schoolday/lessons/pe.tw
  55. 2 2
      sugarcube/src/activities/school/schoolday/school_start.tw
  56. 117 117
      sugarcube/src/activities/selfplay.tw
  57. 11 11
      sugarcube/src/activities/sleep/sleep.tw
  58. 5 5
      sugarcube/src/activities/sleep/sleep_prepare.tw
  59. 7 7
      sugarcube/src/activities/sleep/wake.tw
  60. 5 5
      sugarcube/src/autogenerated/unsorted/BDSM_Club.tw
  61. 6 6
      sugarcube/src/autogenerated/unsorted/BDsex.tw
  62. 3 3
      sugarcube/src/autogenerated/unsorted/BelSex.tw
  63. 5 5
      sugarcube/src/autogenerated/unsorted/BurgerTip.tw
  64. 1 1
      sugarcube/src/autogenerated/unsorted/Club2.tw
  65. 10 10
      sugarcube/src/autogenerated/unsorted/Cum_Manage.tw
  66. 2 2
      sugarcube/src/autogenerated/unsorted/FedorEv.tw
  67. 2 2
      sugarcube/src/autogenerated/unsorted/FedorEv2.tw
  68. 4 4
      sugarcube/src/autogenerated/unsorted/FedorEv3.tw
  69. 38 38
      sugarcube/src/autogenerated/unsorted/FedorEv4.tw
  70. 1 1
      sugarcube/src/autogenerated/unsorted/FedorEv4_sex.tw
  71. 2 2
      sugarcube/src/autogenerated/unsorted/FedorMisc.tw
  72. 10 10
      sugarcube/src/autogenerated/unsorted/Gnpc.tw
  73. 3 3
      sugarcube/src/autogenerated/unsorted/Gnpc2.tw
  74. 3 3
      sugarcube/src/autogenerated/unsorted/HotelRoom.tw
  75. 9 9
      sugarcube/src/autogenerated/unsorted/JuliaMilHome.tw
  76. 1 1
      sugarcube/src/autogenerated/unsorted/Katlake.tw
  77. 39 39
      sugarcube/src/autogenerated/unsorted/Komp.tw
  78. 2 2
      sugarcube/src/autogenerated/unsorted/LBZhouse.tw
  79. 7 7
      sugarcube/src/autogenerated/unsorted/LCwork.tw
  80. 4 4
      sugarcube/src/autogenerated/unsorted/LakeBoyDy.tw
  81. 1 1
      sugarcube/src/autogenerated/unsorted/LariskaGo.tw
  82. 8 8
      sugarcube/src/autogenerated/unsorted/LariskaHome.tw
  83. 12 12
      sugarcube/src/autogenerated/unsorted/LariskaSex.tw
  84. 1 1
      sugarcube/src/autogenerated/unsorted/MHall.tw
  85. 1 1
      sugarcube/src/autogenerated/unsorted/MLibrary.tw
  86. 18 18
      sugarcube/src/autogenerated/unsorted/MagEncounterFairy.tw
  87. 1 1
      sugarcube/src/autogenerated/unsorted/Military.tw
  88. 4 4
      sugarcube/src/autogenerated/unsorted/NikoDates.tw
  89. 2 2
      sugarcube/src/autogenerated/unsorted/NikoEv2.tw
  90. 5 5
      sugarcube/src/autogenerated/unsorted/NikoPayback.tw
  91. 7 7
      sugarcube/src/autogenerated/unsorted/NikoSlut.tw
  92. 2 2
      sugarcube/src/autogenerated/unsorted/NikoWhore.tw
  93. 12 12
      sugarcube/src/autogenerated/unsorted/Nudelake.tw
  94. 1 1
      sugarcube/src/autogenerated/unsorted/ParkKafe.tw
  95. 2 2
      sugarcube/src/autogenerated/unsorted/Peterroom.tw
  96. 34 34
      sugarcube/src/autogenerated/unsorted/Prostitute.tw
  97. 3 3
      sugarcube/src/autogenerated/unsorted/RimmaSexQW.tw
  98. 3 3
      sugarcube/src/autogenerated/unsorted/Serge_Shulgin.tw
  99. 11 11
      sugarcube/src/autogenerated/unsorted/Serge_kuh.tw
  100. 1 1
      sugarcube/src/autogenerated/unsorted/StasQW.tw

+ 19 - 19
sugarcube/src/activities/abduction.tw

@@ -88,7 +88,7 @@
 		<<gt 'abduction' 'abdFood'>>
 	<</actCLA>>
 	<<set $eventChance = rand(1,100)>>
-	<<if getvar("$pc.pcs_sleep") > 30 and getvar("$eventChance") <= 60>>
+	<<if $pc.pcs_sleep > 30 and getvar("$eventChance") <= 60>>
 		<<actCLA 'Take a nap (4:00)'>>
 			<<gt 'abduction' 'abdSomeoneComing'>>
 		<</actCLA>>
@@ -103,7 +103,7 @@
 	<<set $time.minutes += 1>>
 	<<image "locations/shared/abduction/downstairs2.jpg">>
 	You hear the sounds of footsteps that gradually get louder before they reach the top of the stairs.
-	<<if getvar("$pc.legHair") > 3 or getvar("$pc.pcs_pubes") > 3>>
+	<<if $pc.legHair > 3 or $pc.pcs_pubes > 3>>
 		<<set $time.minutes += 20>>
 		<<image "locations/shared/abduction/sex/shave1.jpg">>
 		You are forced to shave yourself.
@@ -234,7 +234,7 @@
 	<p>He shines a light in your mouth. "Her throat is $throattipe."</p>
 	<p>Next, he prods a finger around in your ass. "And her ass is $anustipe."</p>
 	He pulls his finger out of your ass and finally reaches for your pussy.
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		"Oh, you'll like this. Her pussy is fresh. We have a virgin here."
 		"Looks like we hit the jackpot once again dear Doctor," the man replies with a happy smile.
 	<<else>>
@@ -310,7 +310,7 @@
 			<<actCLA 'Please fuck my mouth Master'>>
 				<<gt 'abduction' 'abdBreak2FuckB1'>>
 			<</actCLA>>
-			<<if getvar("$pc.pcs_vag") > 0>>
+			<<if $pc.pcs_vag > 0>>
 				<<actCLA 'Please fuck my pussy Master'>>
 	<<gt 'abduction' 'abdBreak2FuckA1'>>
 <</actCLA>>
@@ -320,7 +320,7 @@
 			<<actCLA 'You... you are my master. Please accept my mouth for your use...'>>
 				<<gt 'abduction' 'abdBreak2FuckB1'>>
 			<</actCLA>>
-			<<if getvar("$pc.pcs_vag") > 0>>
+			<<if $pc.pcs_vag > 0>>
 				<<actCLA 'You... you are my master. Please accept my pussy for your use...'>>
 	<<gt 'abduction' 'abdBreak2FuckA1'>>
 <</actCLA>>
@@ -381,7 +381,7 @@
 	<<actCLA 'Please fuck my mouth Master'>>
 		<<gt 'abduction' 'abdBreak2FuckB1'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_vag") > 0>>
+	<<if $pc.pcs_vag > 0>>
 		<<actCLA 'Please fuck my pussy Master'>>
 	<<gt 'abduction' 'abdBreak2FuckA1'>>
 <</actCLA>>
@@ -548,7 +548,7 @@
 	You can't see anything to your right, but something is pulling you that way...
 	You decide to...
 	<<set $time.minutes += 180>>
-	<<if getvar("$pc.pcs_hydra") >= 100>>
+	<<if $pc.pcs_hydra >= 100>>
 		<<set $pc.pcs_hydra -= 25>>
 	<<else>>
 		<<set $pc.pcs_hydra -= 50>>
@@ -587,7 +587,7 @@
 	There are some water bottles and dried food beneath your bed.
 	A half broken, dirty mirror provides some means to inspect your appearance.
 	In the corner is something remotely similar to a shower. It only has cold water though.
-	<<if getvar("$pc.pcs_energy") >= 10>>
+	<<if $pc.pcs_energy >= 10>>
 		There''s enough space to do some basic <<link "exercise">><<gt 'abduction' 'abdexercise'>><</link>>.
 	<<else>>
 		There''s enough space to do some basic exercise but you are too hungry to do them.
@@ -604,7 +604,7 @@
 		<<set $pc.pcs_health += 10>>
 		<<set $pc.mood += 10>>
 		<<set $pc.pcs_energy += 25>>
-		<<if getvar("$pc.pcs_hydra") >= 100>>
+		<<if $pc.pcs_hydra >= 100>>
 			<<set $pc.pcs_hydra -= 10>>
 		<<else>>
 			<<set $pc.pcs_hydra -= 20>>
@@ -625,7 +625,7 @@
 		<<set $pc.frost = 1>>
 		<<set $pc.pcs_health += 10>>
 		<<set $pc.mood += 10>>
-		<<if getvar("$pc.pcs_hydra") >= 100>>
+		<<if $pc.pcs_hydra >= 100>>
 			<<set $pc.pcs_hydra += 50>>
 		<<else>>
 			<<set $pc.pcs_hydra += 100>>
@@ -661,7 +661,7 @@
 			<<actCLA 'Take a painkiller'>>
 				<<run $pc.painInc('killer',1)>>
 				<<run $inventory.dec('painkiller',1)>>
-				<<if getvar("$pc.pcs_hydra") >= 100>>
+				<<if $pc.pcs_hydra >= 100>>
 					<<set $pc.pcs_hydra += 25>>
 				<<else>>
 					<<set $pc.pcs_hydra += 50>>
@@ -676,7 +676,7 @@
 	<<actCLA 'Look in the mirror'>>
 		<<gt 'mirror' 'start'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		<<actCLA 'Brush your hair'>>
 	<<gt 'mirror' 'brush'>>
 <</actCLA>>
@@ -690,7 +690,7 @@
 		<<showerdin>>
 		<<image "locations/shared/abduction/shower1.jpg">>
 		The shower is cold and you don't have any shampoo, but at least you get clean again...
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>>
 
 		<</if>>
@@ -708,7 +708,7 @@
 	<<video "pc/activities/exercises/push_nude.mp4">>
 	<p>You do push-ups for $timestring minutes, improving your strength.</p>
 	<<set $randpushfact = rand(-5,5)>>
-	<<if getvar("$pc.pcs_energy") < 40>>
+	<<if $pc.pcs_energy < 40>>
 		<<set $randpushfact -= rand(1,10)>>
 
 	<</if>>
@@ -758,7 +758,7 @@
 		<<actCLA 'Continue'>>
 			<<gt 'abduction' 'abdRoom'>>
 		<</actCLA>>
-	<<elseif getvar("$rapeType") == 2 and getvar("$pc.pcs_vag") > 0>>
+	<<elseif getvar("$rapeType") == 2 and $pc.pcs_vag > 0>>
 		<<run $pc.painInc('vaginal',10)>>
 		<<set $cumnostd = 1>>
 		<<gs 'cum_call' '' 'Master' 0>>
@@ -799,7 +799,7 @@
 		<<actCLA 'Continue'>>
 			<<gt 'abduction' 'abdRoom'>>
 		<</actCLA>>
-	<<elseif getvar("$rapeType") == 5 and getvar("$pc.pcs_vag") > 0>>
+	<<elseif getvar("$rapeType") == 5 and $pc.pcs_vag > 0>>
 		<<run $pc.painInc('vaginal',5)>>
 		<<run $pc.painInc('cervix',10)>>
 		<<set $pc.pcs_vag += 1>>
@@ -839,11 +839,11 @@
 	<<set $tortureCount += 1>>
 	<<if getvar("$tortureType") == 1>>
 		<<gt 'abduction' 'abdTortureA1'>>
-	<<elseif getvar("$tortureType") == 2 and getvar("$pc.pcs_vag") > 0>>
+	<<elseif getvar("$tortureType") == 2 and $pc.pcs_vag > 0>>
 		<<gt 'abduction' 'abdTortureB1'>>
 	<<elseif getvar("$tortureType") == 3>>
 		<<gt 'abduction' 'abdTortureC1'>>
-	<<elseif getvar("$tortureType") == 4 and getvar("$pc.pcs_vag") > 0>>
+	<<elseif getvar("$tortureType") == 4 and $pc.pcs_vag > 0>>
 		<<gt 'abduction' 'abdTortureD1'>>
 	<<else>>
 		<<gt 'abduction' 'abdTortureC1'>>
@@ -1337,7 +1337,7 @@
 	<<actCLA 'Train your mouth'>>
 		<<gt 'abduction' 'abdTrainDildosMouthGate'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_vag") > 0>>
+	<<if $pc.pcs_vag > 0>>
 		<<actCLA 'Train your pussy'>>
 			<<gt 'abduction' 'abdTrainDildosVaginaGate'>>
 		<</actCLA>>

+ 3 - 3
sugarcube/src/activities/abductionCustomer.tw

@@ -27,7 +27,7 @@
 	Your master removes your regular chain and attaches a leash to your collar.
 	You are led up the stairs into the house above your cellar.
 	<p>When you enter the hall, your master orders you on your knees. "Crawl on your hands and legs like the bitch you are!"</p>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		You are led to the room where your customer awaits. Your leash is handed to him.
 	<<else>>
 		You are led to the room where your customer awaits. Your leash is handed to him, and your master leaves. The room''s only door closes behind him, leaving you alone with your customer.
@@ -70,7 +70,7 @@
 		<<set $pc.bodyTypeRand += rand(-6,2)>>
 		<<set $heightTypeRand += rand(-4,1)>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		<<set $dick = 28>>
 	<<elseif getvar("$buyout") == 1>>
 		<<set $dick = 24>>
@@ -175,7 +175,7 @@
 		<p>Kneeling in front of him, you look up and see the $charType look in his eyes.</p>
 		<p>You then look down and see his crotch directly in front of you. It's obvious that he has something $dick_girth in his pants.</p>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		Your master speaks to the customer. "So this is her. You can be sure she's a virgin as her hymen is intact."
 		<p>"I believe you. She's not the first virgin slut that you've delivered to me, is she?"</p>
 		<p>"No, she definitely is not! How many has it been so far? Four, five?"</p>

+ 1 - 1
sugarcube/src/activities/actress/act_main1.tw

@@ -338,7 +338,7 @@
 		<<actCLA 'Continue'>>
 			<<video "locations/city/industrial/studio/acting/main/dramedy/unashamed/nudesex/5_3.mp4">>
 			Vitaly lines up and thrusts his hips into your ass, the hard smack pushing you forward even as you feel his dick bumping into your thigh.
-			<<if getvar("$pc.pcs_vag") > 0>>
+			<<if $pc.pcs_vag > 0>>
 				You groan hard, using memories of sudden insertions to fuel the reaction you're trying to emote.
 			<<else>>
 				You groan hard, trying to imagine what it might feel like for a big cock to suddenly thrust itself inside you and use that image to fuel the reaction you're trying to emote.

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

@@ -73,7 +73,7 @@
 					"Take a good look, cause it's the <b><i>closest you're ever gonna get.</b></i>"
 					<<actCLA 'Flash your tits'>>
 						<<video "locations/city/industrial/studio/acting/minor/club_flash/5.mp4">>
-						<<if getvar("$pc.pcs_inhib") >= 35>>
+						<<if $pc.pcs_inhib >= 35>>
 							Saying your last lines as viciously as you can, you pull up your top and flash your breasts to the camera before pulling it back down and turning to go back to fake dancing.
 						<<else>>
 							Saying your last lines as viciously as you can, you feel your face flush with heat as you pull up your top and flash your breasts to the camera before pulling it back down and turning to go back to fake dancing.
@@ -88,7 +88,7 @@
 								<<video "locations/city/industrial/studio/acting/minor/club_flash/5.mp4">>
 								<<if getvar("$scene_prep") < 8 and getvar("$pcs_perform") < 30>>
 									<p>You have to do an embarrassing amount of re-takes because you keep forgetting your lines. Over and over you say the wrong word or phrase and the director has to stop and read the line back to you before starting over again. Honestly shameful really. You did barely any preparation for the scene and seriously it shows, especially since you aren't particularly talented in acting right now.</p>
-								<<elseif getvar("$pc.pcs_inhib") >= 35>>
+								<<elseif $pc.pcs_inhib >= 35>>
 									<p>They ask for what seems like an unusually high amount of re-takes on the part where you flash the camera but after about 20 minutes of filming the scene is over and you're dismissed. This was the only time your character shows up in the movie after all.</p>
 								<<else>>
 									<<set $time.minutes += 10>>
@@ -155,7 +155,7 @@
 		<<set $robe = 0>>
 		<<set $time.minutes += 5>>
 		<<image "locations/city/industrial/studio/backgrounds/bedroom1.jpg">>
-		<<if getvar("$pc.pcs_inhib") < 50>>
+		<<if $pc.pcs_inhib < 50>>
 			<p>You do as they say, blushing as you strip out of your robe and mount your co-star. He's wearing a dancer's pad so thankfully you aren't rubbing genitalia, but based on where they want you, your pussy is right against the fabric. Your face is hot, being naked on top of a guy like this, surrounded by all these people. You half hope no one ends up watching this show.</p>
 		<<else>>
 			<p>You do as they say, stripping out of your robe and mounting your co-star. He's wearing a dancer's pad so thankfully you aren't rubbing genitalia, but based on where they want you, your pussy is right against the fabric.</p>

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

@@ -139,7 +139,7 @@
 							<p>You don't know what to do! This is all wrong! You wanted to be an actress so you just came here for an audition and the next thing you know you're giving a stranger a blowjob and now his hands are all over you and now he-</p>
 							<<if $wardrobe.pantyworntype == 'none'>>
 								<p>"No panties," $boydesc snickers. "I bet you came here wanting this you little slut."</p>
-							<<elseif getvar("$pc.pcs_pubes") > 3>>
+							<<elseif $pc.pcs_pubes > 3>>
 								<p>"You should really shave," $boydesc says. "Girls with clean pussies make it further in this industry."</p>
 							<<else>>
 								<p>"Cute pussy," $boydesc says. "I see you keep it clean down there."</p>

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

@@ -116,7 +116,7 @@
 <<if $location_var[$here][0] == 'extra_audition'>>
 <</if>>
 <<if $location_var[$here][0] == 'tit_audition'>>
-	<<if getvar("$pc.pcs_inhib") > 45>>
+	<<if $pc.pcs_inhib > 45>>
 		<<gs 'willpower' 'skill' 'pcs_inhib' 'force' 'easy'>>
 	<<else>>
 		<<gs 'willpower' 'skill' 'pcs_inhib' 'force' 'hard'>>
@@ -126,13 +126,13 @@
 	You enter the room and see a woman sitting at a desk with papers in front of her.
 	<p>"Hi, I'm $pc.name_first, I'm here to audition for the part of $audition['role'] in $movie?"</p>
 	"Ahh, yes. Thank you for coming. Just stand there for now please." She looks at you with a critical eye, making notes on a paper in front of her.
-	<<if getvar("$pc.pcs_skin") < 40>>
+	<<if $pc.pcs_skin < 40>>
 		<p>"Your skin is awful, you have acne everywhere. You need a better facial care routine. Actually, I'm sorry I have to stop right here. You simply don't have the face for this role. Next please!" She calls out to the hall while unsympathetically shooing you out with her hand.</p>
 		<<actCLA 'Leave'>>
 			<<gt 'auditions' 'reflection'>>
 		<</actCLA>>
 	<<else>>
-		<<if getvar("$pc.pcs_skin") >= 40 and getvar("$pc.pcs_skin") < 60>>
+		<<if $pc.pcs_skin >= 40 and $pc.pcs_skin < 60>>
 			"Your skin could be a little better but nothing the makeup department can't cover up. Now show me your breasts please."
 		<<else>>
 			"You have wonderful skin, very smooth and soft looking, even from here. That will be great for the camera. Now show me your breasts please."
@@ -149,7 +149,7 @@
 					<<gt 'auditions' 'reflection'>>
 				<</actCLA>>
 			<</actCLA>>
-			<<if getvar("$pc.pcs_inhib") < 50>>
+			<<if $pc.pcs_inhib < 50>>
 				<<if $will_cost <= $pc.pcs_willpwr>>
 					<<actCLA 'Show her your tits (will_cost Willpower)'>>
 						<<image "locations/city/citycenter/aurora/auditions/showtits.jpg">>
@@ -185,7 +185,7 @@
 				<</actCLA>>
 			<</if>>
 		<</actCLA>>
-		<<if getvar("$pc.pcs_inhib") < 50>>
+		<<if $pc.pcs_inhib < 50>>
 			<<if $will_cost <= $pc.pcs_willpwr>>
 				<<actCLA 'Show her your tits (will_cost Willpower)'>>
 					<<image "locations/city/citycenter/aurora/auditions/showtits.jpg">>

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

@@ -13,14 +13,14 @@
 	You enter the room and see a man sitting at a desk with papers in front of him.
 	<p>"Hi, I'm $pc.name_first $pc.name_last, I'm here to audition for the part of $audition['role']?"</p>
 	<p>"Ahh, yes. Thank you for coming. I'm $boydesc[0], I will be conducting your audition today." Still sitting behind the desk, he looks at you for a moment.</p>
-	<<if getvar("$pc.pcs_skin") < 40>>
+	<<if $pc.pcs_skin < 40>>
 		<p>"Your skin is awful," he says shaking his head. "Don't you have any kind of skin care routine at all? I'm sorry, but I just can't cast you for this role like that. Please work on that before you audition for another role like this."</p>
 		You're shamefully shooed out of the room as the next girl is called in.
 		<<actCLA 'Leave'>>
 			<<gt 'auditions' 'reflection'>>
 		<</actCLA>>
 	<<else>>
-		<<if getvar("$pc.pcs_skin") >= 40 and getvar("$pc.pcs_skin") < 60>>
+		<<if $pc.pcs_skin >= 40 and $pc.pcs_skin < 60>>
 			"Hmm, your skin is a little rough but it's nothing the makeup department can't fix. Very well, please start your audition."
 		<<else>>
 			<p>"Good skin," he mutters to himself while marking on a paper. "Will be good for the camera, but how will her acting be? Okay, please read the lines you were given."</p>
@@ -509,8 +509,8 @@
 		<<actCLA 'Finish the audition without flashing'>>
 			<<gt 'auditions_minor1' 'minor1_skip_flash'>>
 		<</actCLA>>
-		<<if getvar("$pc.pcs_inhib") < 50>>
-			<<if getvar("$pc.pcs_inhib") > 40>>
+		<<if $pc.pcs_inhib < 50>>
+			<<if $pc.pcs_inhib > 40>>
 				<<gs 'willpower' 'skill' 'pcs_inhib' 'force' 'easy'>>
 			<<else>>
 				<<gs 'willpower' 'skill' 'pcs_inhib' 'force' 'hard'>>
@@ -542,11 +542,11 @@
 	<<setinit $audition['bonus'] += 15>>
 	<<video "locations/city/citycenter/aurora/auditions/showtits.mp4">>
 	<p>"Take a good look, cause it's the closest you're ever gonna get!"</p>
-	<<if getvar("$pcs_perform") > 30 and getvar("$pc.pcs_inhib") < 50>>
+	<<if getvar("$pcs_perform") > 30 and $pc.pcs_inhib < 50>>
 		You put on a sassy face like your character would be wearing and pop your top, flashing the casting director. Though you can't help it when your natural shyness comes through and causes your cheeks to turn pink.
 	<<elseif getvar("$pcs_perform") > 30>>
 		You put on a sassy face like your character would be wearing make eye contact with the casting director, popping your top and flashing him a great look at your breasts. You hold it for a second before releasing your pose, pulling your clothes back into place.
-	<<elseif getvar("$pc.pcs_inhib") > 50>>
+	<<elseif $pc.pcs_inhib > 50>>
 		You pop your top and flash the casting director without any reservation, holding the pose for a couple seconds before putting your top back down again. It's not like you mind showing off your body off. Whether or not the role demands it, you just don't have a problem with it.
 	<</if>>
 	<<actCLA 'Finish the audition'>>
@@ -577,14 +577,14 @@
 			<<video "locations/city/citycenter/aurora/auditions/showtits.mp4">>
 			Well that answers that question. You take a breath and get back into your character before repeating the final line.
 			<p>"Take a good look, cause it's the closest you're ever gonna get!"</p>
-			<<if getvar("$pcs_perform") > 30 and getvar("$pc.pcs_inhib") < 50>>
+			<<if getvar("$pcs_perform") > 30 and $pc.pcs_inhib < 50>>
 				You put on a sassy face like your character would be wearing and barely hold back the blush you can feel heating your face.
 				<i>Ohmygodthisissoembarrassing!</i>
 				But it looks like the casting director really wants you to do this and if you want this role you're <i>really</i> going to have to commit.
 			<<elseif getvar("$pcs_perform") > 30>>
 				You put on a sassy face like your character would be wearing make eye contact with the casting director before putting your top back down again.
 				If this is what he wants, you guess you'll give it to him.
-			<<elseif getvar("$pc.pcs_inhib") > 50>>
+			<<elseif $pc.pcs_inhib > 50>>
 				You do so without any reservation, holding the pose for a couple seconds before putting your top back down again. It's not like you mind showing off your body off. If he wanted to see your tits he just should have asked to begin with.
 			<</if>>
 			<p>"How was that?"</p>
@@ -608,14 +608,14 @@
 		<<video "locations/city/citycenter/aurora/auditions/showtits.mp4">>
 		Well that answers that question. You take a breath and get back into your character before repeating the final line.
 		<p>"Take a good look, cause it's the closest you're ever gonna get!"</p>
-		<<if getvar("$pcs_perform") > 30 and getvar("$pc.pcs_inhib") < 50>>
+		<<if getvar("$pcs_perform") > 30 and $pc.pcs_inhib < 50>>
 			You put on a sassy face like your character would be wearing and barely hold back the blush you can feel heating your face.
 			<i>Ohmygodthisissoembarrassing!</i>
 			But it looks like the casting director really wants you to do this and if you want this role you're <i>really</i> going to have to commit.
 		<<elseif getvar("$pcs_perform") > 30>>
 			You put on a sassy face like your character would be wearing make eye contact with the casting director before putting your top back down again.
 			If this is what he wants, you guess you'll give it to him.
-		<<elseif getvar("$pc.pcs_inhib") > 50>>
+		<<elseif $pc.pcs_inhib > 50>>
 			You do so without any reservation, holding the pose for a couple seconds before putting your top back down again. It's not like you mind showing off your body off. If he wanted to see your tits he just should have asked to begin with.
 		<</if>>
 		<p>"How was that?"</p>

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

@@ -100,13 +100,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'audition_schedule'>>
 	<<setinit $audition['week'] = rand(1,7)>>
-	<<if getvar("$time.month") == 2 and ($audition['week'] + $time.day) > 28>>
+	<<if $time.month == 2 and ($audition['week'] + $time.day) > 28>>
 		<<setinit $audition['month'] = $next_month_name>>
 		<<setinit $audition['calendar_day'] = $time.day - 28 + $audition['week']>>
-	<<elseif (getvar("$time.month") == 4 or getvar("$time.month") == 6 or getvar("$time.month") == 9 or getvar("$time.month") == 11) and ($audition['week'] + $time.day) > 30>>
+	<<elseif ($time.month == 4 or $time.month == 6 or $time.month == 9 or $time.month == 11) and ($audition['week'] + $time.day) > 30>>
 		<<setinit $audition['month'] = $next_month_name>>
 		<<setinit $audition['calendar_day'] = $time.day - 30 + $audition['week']>>
-	<<elseif (getvar("$time.month") == 1 or getvar("$time.month") == 3 or getvar("$time.month") == 5 or getvar("$time.month") == 7 or getvar("$time.month") == 8 or getvar("$time.month") == 10 or getvar("$time.month") == 12) and ($audition['week'] + $time.day) > 31>>
+	<<elseif ($time.month == 1 or $time.month == 3 or $time.month == 5 or $time.month == 7 or $time.month == 8 or $time.month == 10 or $time.month == 12) and ($audition['week'] + $time.day) > 31>>
 		<<setinit $audition['month'] = $next_month_name>>
 		<<setinit $audition['calendar_day'] = $time.day - 31 + $audition['week']>>
 	<<else>>

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

@@ -286,7 +286,7 @@
 		<<actCLA 'Put away your phone'>>
 			<<gt $location>>
 		<</actCLA>>
-	<<elseif rand(1,2) == 2 and getvar("$time.hour") < 18>>
+	<<elseif rand(1,2) == 2 and $time.hour < 18>>
 			<b><font color="blue">im at work</font></b>
 		<<actCLA 'Sorry, never mind'>>
 			<b><font color="pink">oh</font></b>

+ 16 - 16
sugarcube/src/activities/bootycall/booty_call_after.tw

@@ -114,12 +114,12 @@
 		<<gs 'booty_call_after' 'after_sex1'>>
 		<<gs 'booty_call_after' 'well_continue'>>
 	<</actCLA>>
-	<<if mid($start_type,1,2) == 'sg' and (getvar("$time.hour") >= 22 or getvar("$time.hour") < 3)>>
+	<<if mid($start_type,1,2) == 'sg' and ($time.hour >= 22 or $time.hour < 3)>>
 		<<actCLA 'Mom will kill me'>>
 			<<setinit $booty_call['mom_kill'] += 1>>
 			<<setinit $booty_call['blue_ball'] = 1>>
 			<<if getvar("$booty_call['keep_going_continue']") >= 1>>
-				<<if getvar("$time.hour") < 3>>
+				<<if $time.hour < 3>>
 					<p>"Seriously <<=$npcs.get($boy,'firstname')>>," you say. "I can't. My mom is already going to kill me for staying out past curfew."</p>
 				<<else>>
 					<p>"Seriously <<=$npcs.get($boy,'firstname')>>," you say. "I can't. I need to get home soon or my mom will kill me."</p>
@@ -637,7 +637,7 @@
 		<<image "shared/sex/cum/facial/sleep4.jpg">>
 		<p>You collapse to the bed, <<=$npcs.get($boy,'firstname')>>'s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...</p>
 	<<elseif $booty_call['last_cum'] == 'tits'>>
-		<<if getvar("$pc.pcs_pubes") < 3>>
+		<<if $pc.pcs_pubes < 3>>
 			<<image "shared/sex/after/sleep1.jpg">>
 		<<else>>
 			<<image "shared/sex/after/sleep2.jpg">>
@@ -1019,7 +1019,7 @@
 		<<set $locM_arg = 'boy_bathroom'>>
 		<<gt 'mirror' 'start'>>
 	<</actCLA>>
-	<<if (getvar("$pc.pcs_breath") != 1 or $pc.cumAtLocation(12) == 1) and (getvar("$travel_brush") == 1 or getvar("$overnight_bag["+$boy+"]") == 1)>>
+	<<if ($pc.pcs_breath != 1 or $pc.cumAtLocation(12) == 1) and (getvar("$travel_brush") == 1 or getvar("$overnight_bag["+$boy+"]") == 1)>>
 		<<set $menu_off = 1>>
 		<<set $time.minutes += 3>>
 		<<set $cumspclnt = 2>>
@@ -1050,7 +1050,7 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-	<<if $inventory.get("sanpad") > 0 and (getvar("$mesec") > 0 or (getvar("$placebopart") > 2 and getvar("$pillcon") < 40000)) and getvar("$isprokp") == 0 and getvar("$isprok") == 0 and $wardrobe.pantyworntype != 'none' and getvar("$pc.knowpreg") == 0>>
+	<<if $inventory.get("sanpad") > 0 and (getvar("$mesec") > 0 or (getvar("$placebopart") > 2 and getvar("$pillcon") < 40000)) and getvar("$isprokp") == 0 and getvar("$isprok") == 0 and $wardrobe.pantyworntype != 'none' and $pc.knowpreg == 0>>
 		<<actCLA 'Use a sanitary pad (0:02)'>>
 			<<set $menu_off = 1>>
 			<<run $inventory.dec('sanpad',1)>>
@@ -1064,7 +1064,7 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</if>>
-	<<if $inventory.get("tampon") > 0 and (getvar("$mesec") > 0 or (getvar("$placebopart") > 2 and getvar("$pillcon") < 40000)) and getvar("$isprok") == 0 and getvar("$isprokp") == 0 and getvar("$pc.knowpreg") == 0>>
+	<<if $inventory.get("tampon") > 0 and (getvar("$mesec") > 0 or (getvar("$placebopart") > 2 and getvar("$pillcon") < 40000)) and getvar("$isprok") == 0 and getvar("$isprokp") == 0 and $pc.knowpreg == 0>>
 		<<actCLA 'Use a tampon (0:02)'>>
 			<<set $menu_off = 1>>
 			<<run $inventory.dec('tampon',1)>>
@@ -1121,7 +1121,7 @@
 	<</if>>
 	<<if getvar("$booty_call['sleep_fuck']") > 0>>
 		<!-- !!		gs'booty_call_pillow_talk', 'sleep_fucking_talk'-->
-	<<elseif getvar("$pc.pcs_sleep") < 30 and getvar("$booty_call['get_up']") == 0 and getvar("$booty_call['angry_after']") == 0>>
+	<<elseif $pc.pcs_sleep < 30 and getvar("$booty_call['get_up']") == 0 and getvar("$booty_call['angry_after']") == 0>>
 		<<actCLA 'Rest your eyes'>>
 			<<gt 'booty_call_after' 'bed'>>
 		<</actCLA>>
@@ -1441,7 +1441,7 @@
 	<<gs 'booty_call_after' 'relax_together'>>
 <</if>>
 <<if $location_var[$here][0] == 'spend_night_ask'>>
-	<<if (getvar("$time.hour") >= 20 or $time.dayStage['desc'] == 'mid_night') and getvar("$booty_call['spend_night']") == 0 and getvar("$booty_call['angry_after']") == 0 and getvar("$booty_call['sleepover']") == 0>>
+	<<if ($time.hour >= 20 or $time.dayStage['desc'] == 'mid_night') and getvar("$booty_call['spend_night']") == 0 and getvar("$booty_call['angry_after']") == 0 and getvar("$booty_call['sleepover']") == 0>>
 		<<actCLA 'Ask to spend the night'>>
 			<<setinit $booty_call['spend_night'] = 1>>
 			<<=$npcs.get($boy,'apt_bedroom')>>
@@ -1458,7 +1458,7 @@
 					<<gs 'booty_call_after' 'spend_night'>>
 				<</actCLA>>
 			<</if>>
-			<<if getvar("$time.hour") < 5>>
+			<<if $time.hour < 5>>
 				<<if mid($start_type,1,2) == 'sg'>>
 					<<actCLA 'Avoid my mom'>>
 						<<=$npcs.get($boy,'apt_bedroom')>>
@@ -1467,7 +1467,7 @@
 					<</actCLA>>
 				<</if>>
 			<</if>>
-			<<if getvar("$time.hour") >= 22 or getvar("$time.hour") < 5>>
+			<<if $time.hour >= 22 or $time.hour < 5>>
 				<<actCLA 'It`s late'>>
 					<<=$npcs.get($boy,'apt_bedroom')>>
 					<p>"Mind if I spend the night?" you ask. "It's late and I don't want to go."</p>
@@ -1489,7 +1489,7 @@
 <<if $location_var[$here][0] == 'spend_night'>>
 	<<if $npcs.get($boy,'cheating_know') == 1>>
 		<!-- !! this means he's cheating on someone with you and you know it-->
-		<<if rand(1,10) > 7 and getvar("$time.hour") < 22>>
+		<<if rand(1,10) > 7 and $time.hour < 22>>
 			<<setinit $booty_call['cant_stay'] = 1>>
 			"Sorry, can't. My girlfriend wanted to come over tonight. In fact, you should leave soon before she catches you."
 			<p>"Ugh. <i>Bitch!</i>"</p>
@@ -1506,13 +1506,13 @@
 		<</if>>
 	<<else>>
 		<!-- !! this means he's cheating on someone with you-->
-		<<if rand(1,10) > 7 and getvar("$time.hour") < 22>>
+		<<if rand(1,10) > 7 and $time.hour < 22>>
 			<<setinit $booty_call['cant_stay'] = 1>>
 			"Sorry, can't. I have something to do in the morning."
 			<p>"Ugh, really?"</p>
 			"Yeah, I know. Sucks."
 			<<gs 'booty_call_after' 'after_sex2'>>
-		<<elseif $npcs.get($boy,'girlfriend') == 1 and getvar("$time.hour") < 22>>
+		<<elseif $npcs.get($boy,'girlfriend') == 1 and $time.hour < 22>>
 			<<setinit $booty_call['cant_stay'] = 1>>
 			<<run $npcs.set($boy,'cheating_know',1)>>
 			"Sorry, my girlfriend is coming over soon. Can't let her catch you here."
@@ -1533,7 +1533,7 @@
 <<if $location_var[$here][0] == 'bed'>>
 	<<set $time.minutes += rand(1,2)>>
 	<h2><<<<=$npcs.get($boy,'firstname')>>>>''s Bedroom</h2>
-	<<if getvar("$pc.pcs_pubes") < 4>>
+	<<if $pc.pcs_pubes < 4>>
 		<<image "shared/sex/after/sleep1.jpg">>
 	<<else>>
 		<<image "shared/sex/after/sleep2.jpg">>
@@ -1597,7 +1597,7 @@
 			<<gt 'booty_call_sex' 'sleep_sex'>>
 		<<else>>
 			<<setinit $booty_call['sleepover'] = 1>>
-			<<if getvar("$pc.alko") > 6>>
+			<<if $pc.alko > 6>>
 				<<gs 'sleep' 'simple'>>
 				<<gs 'pain' 3 'head' 'ache'>>
 			<<else>>
@@ -1609,7 +1609,7 @@
 	<<else>>
 		<<setinit $booty_call['extra_cum'] += $npcs.get($boy,'sexdrive')>>
 		<<setinit $booty_call['sleepover'] = 1>>
-		<<if getvar("$pc.alko") > 6>>
+		<<if $pc.alko > 6>>
 			<<setinit $booty_call['hangover'] = 1>>
 			<<gs 'sleep' 'simple'>>
 			<<gs 'pain' 3 'head' 'ache'>>

+ 3 - 3
sugarcube/src/activities/bootycall/booty_call_condoms.tw

@@ -148,7 +148,7 @@
 							<<gs 'booty_call_condoms' 'npc_condom_use'>>
 						<</actCLA>>
 					<</actCLA>>
-					<<if $finances.bank + getvar("$finances.cash") < 2000>>
+					<<if $finances.bank + $finances.cash < 2000>>
 						<<actCLA 'Good, money`s tight'>>
 							"Then I'll stop buying right away," you grin. "I don't have a lot of spare cash on hand, so saving on condoms would be great.
 							<<actCLA 'Continue'>>
@@ -706,7 +706,7 @@
 		<p>$booty_call['disable_condoms_desc'] Bareback is so much better. I want the full feeling of your cock inside me."</p>
 		<<gs 'booty_call_condoms' 'npc_no_condom_react'>>
 	<</actCLA>>
-	<<if getvar("$pc.knowpreg") == 1>>
+	<<if $pc.knowpreg == 1>>
 		<<actCLA 'I`m pregnant'>>
 			<<run $npcs.set($boy,'knowpreg',1)>>
 			<<=$npcs.get($boy,'apt_bedroom')>>
@@ -1769,7 +1769,7 @@
 			<<setinit $booty_call['plan_b'] = 1>>
 			"Besides," you look pointedly at your bag. "I have a morning after pill."
 			<p><<=$npcs.get($boy,'firstname')>> raises an eyebrow back at you.</p>
-			<<if getvar("$time.hour") >= 18>>
+			<<if $time.hour >= 18>>
 				<p>"Were you expecting to lose your virginity tonight?"</p>
 			<<else>>
 				<p>"Were you expecting to lose your virginity today?"</p>

+ 24 - 24
sugarcube/src/activities/bootycall/booty_call_cowgirl.tw

@@ -416,7 +416,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		You gently roll your hips over his, grinding his dick against the inside your pussy. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			You gently roll your hips over his, grinding his cock against the inside your pussy. You breathe slowly, thankful for the blood from your period providing some lubrication for his thick shaft stretching your tight snatch.
 		<<else>>
 			You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it stretches you out. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.
@@ -428,21 +428,21 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
 		<p>You gently roll your hips over his, <i>stretched</i> by the enormous npc_dick[$boy]cm cock inside your pussy. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it painfully bumps up against your cervix. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it presses hard against your cervix. Looking down, you can see his cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it fills you all the way to your cervix, bumping up hard against it. Looking down, you can see his gigantic cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely able to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it fills you all the way to your cervix, pressing hard against it. Looking down, you can see his gigantic cock is stained red from your period, blood mixing with your juices, both of them providing a lot of natural lubrication.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. Too long and too wide for your tight pussy, it feels like being impaled in every sense of the word. Looking down, you can see the red liquid mixing with your juices, both of them providing a lot of natural lubrication.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. You're no virgin, but even for your experienced pussy it feels like fucking a telephone pole. Looking down, you can see the red liquid mixing with your juices, both of them providing a lot of natural lubrication.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. It fills you completely, and even for your experienced pussy it feels on the verge of tearing. Looking down, you can see the red liquid mixing with your juices, both of them providing a lot of natural lubrication.</p>
@@ -460,7 +460,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		You gently roll your hips over his, grinding his dick against the inside your pussy.
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			You gently roll your hips over his, grinding his cock against the inside your pussy. You breathe slowly trying to adjust as his thick shaft stretches your tight snatch.
 		<<else>>
 			You gently roll your hips over his, grinding his thick cock against the inside your pussy, breathing slowly as it stretches you out.
@@ -472,21 +472,21 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
 		<p>You gently roll your hips over his, <i>stretched</i> by the enormous npc_dick[$boy]cm cock inside your pussy.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it painfully bumps up against your cervix.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it presses hard against your cervix.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it fills you all the way to your cervix, bumping up hard against it.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely able to fit the full length of <<=$npcs.get($boy,'firstname')>>'s npc_dick[$boy]cm cock inside your pussy as it fills you all the way to your cervix, pressing hard against it.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You gently roll your hips over his, unable to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. Too long and too wide for your tight pussy, it feels like being impaled in every sense of the word.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. You're no virgin, but even for your experienced pussy it feels like fucking a telephone pole.</p>
 		<<else>>
 			<p>You gently roll your hips over his, barely to fit the full length of <<=$npcs.get($boy,'firstname')>>'s monstrous npc_dick[$boy]cm cock inside your bleeding snatch. It fills you completely, and even for your experienced pussy, you feel barely able to contain it.</p>
@@ -514,13 +514,13 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
 		<p>You moan as <<=$npcs.get($boy,'firstname')>> takes you from behind, his cock thrusting inside you. There's something about doggy style, a <i>depth</i> that you don't get in any other position. And with a dick as long as <<=$npcs.get($boy,'firstname')>>'s, it reaches the deepest part of you, .</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim and then some, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock is way too big for you in both girth and length, pummelling your insides and stretching your pussy to the point of pain, and you are <i><b>loving every second of it.</b></i></p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock is destroying your pussy with size alone, smashing into your cunt with the gentle weight of a sledgehammer in the world. But it doesn't feel bad. Far from it. The pain is euphoric and you can't get enough of his cock.</p>
@@ -538,7 +538,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>You slow down to a to a crawl, gently rolling your hips over <<=$npcs.get($boy,'firstname')>>'s, focusing on feeling the full shape of his dick inside you.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You slow down to a to a crawl, gently rolling your hips over <<=$npcs.get($boy,'firstname')>>'s, feeling every contour and vein of his thick cock inside your tight pussy.</p>
 		<<else>>
 			<p>You slow down to a to a crawl, gently rolling your hips over <<=$npcs.get($boy,'firstname')>>'s, focusing on feeling every contour and vein of his thick cock inside your pussy.</p>
@@ -576,7 +576,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 			<p>You mew softly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it's plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-			<<if getvar("$pc.pcs_vag") <= 15>>
+			<<if $pc.pcs_vag <= 15>>
 				<p>Tiny mews escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>You mew softly as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
@@ -599,7 +599,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His cock driving deep inside you, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>Loud groans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>stretching</i> your tight pussy with its exceptional girth, making you wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>Loud moans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>filling</i> you with its exceptional girth, making you wetter and wetter with every thrust.</p>
@@ -609,7 +609,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 			<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it's plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-			<<if getvar("$pc.pcs_vag") <= 15>>
+			<<if $pc.pcs_vag <= 15>>
 				<p>Loud groans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
@@ -634,7 +634,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "You're amazing! I'm <i>so</i> wet..."</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "Ungh~! You're stretching me out! It's so good! I'm <i>so</i> wet..."</p>
 		<<else>>
 			<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "Ungh~! It feels so good~! Fuck me with your big cock~!"</p>
@@ -850,7 +850,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>"Ah! <i>Fuck!</i> Yes! Yes! Fuck my pussy just like that!" you moan loudly. "Don't stop! You're so <i>fucking</i> good!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck, you're so big! You're stretching me out! Don't stop! Fuck my pussy with your big cock! It's so good!"</p>
 		<<else>>
 			<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Don't stop! Fuck my pussy with your big cock! Fuck, you're so big! You're so <i>fucking</i> good!"</p>
@@ -981,10 +981,10 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
 		<p>Your eyes roll back into your head as <<=$npcs.get($boy,'firstname')>> pummels you from behind. Loud slapping echoes off the walls as <<=$npcs.get($boy,'firstname')>> claps your ass over and over again, splitting your pussy in half and smashing into your cervix with his monster cock on every thrust.</p>
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 		Your mind goes blank with pleasure and within minutes, your makeup is as fucked as you are.
-	<<elseif getvar("$pc.pcs_makeup") == 0>>
+	<<elseif $pc.pcs_makeup == 0>>
 		Tears of pleasure blur your sight and sweat gathers on your skin and your already ruined makeup gets even worse with every passing moment.
 	<<else>>
 		<p>Your mind goes blank with pleasure and you groan loudly, letting <<=$npcs.get($boy,'firstname')>> fuck you into blissful oblivion.</p>
@@ -1017,10 +1017,10 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
 		<p>You scream as he pulls harder on your hair and you try to pull away, but you're unable to escape. <<=$npcs.get($boy,'firstname')>>'s monster cock keeps smashing into your cervix, your pussy unable to accomodate its unnatural length, aching from being stretched to fit its girth. Not to mention your ass is already sore from being repeatedly clapped with sledgehammer force. You're sure your uterus is going to be bruised tomorrow and you groan again, wondering if it's possible to be fucked to death.</p>
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 		<p>Black tears run down your face and sweat covers your body, destroying your makeup as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
-	<<elseif getvar("$pc.pcs_makeup") == 0>>
+	<<elseif $pc.pcs_makeup == 0>>
 		<p>Your already ruined makeup gets worse with every passing moment, getting smeared across the sheets as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
 	<<else>>
 		<p>Tears run down your face and sweat covers your body as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
@@ -1159,7 +1159,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>"Yes! Fuck! Yes! Just like that!" you scream so hard it hurts. "Clap my fucking ass! Fuck me with your cock!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're gonna tear me in half! Don't stop! Don't stop!"</p>
 		<<else>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> Yes! Just like that! Your cock is so big! Don't stop! Don't stop! Pound my ass!"</p>
@@ -1169,7 +1169,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 		<p>"OH FUCK!" you scream so hard it hurts. "You're so big! You're <i>so</i> big! Don't stop! Pound my pussy with your big fucking cock!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're <i>so</i> big! You're gonna tear me in half! Don't stop! Don't stop!"</p>
 		<<else>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're so big! You're <i>so</i> big! Oh fuck! Don't stop! Don't stop! Don't fucking stop!"</p>

+ 5 - 5
sugarcube/src/activities/bootycall/booty_call_cum.tw

@@ -715,7 +715,7 @@
 	<!-- !!{	if booty_call['position'] = 'miss' and npc_cum_cannon[[$boy] = 1:
 	else} -->
 	<<gs 'cum_call' 'face' $boy 1>>
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 
 	<</if>>
@@ -1272,7 +1272,7 @@
 	<<gs 'booty_call_sex' 'sex_end'>>
 <</if>>
 <<if $location_var[$here][0] == 'cum_tits4'>>
-	<<if getvar("$pc.tits") > 1>>
+	<<if $pc.tits > 1>>
 		<<actCLA 'Finish him with your tits'>>
 			<<setinit $booty_call['cock_inserted'] = 0>>
 			<<setinit $booty_call['cum_tits'] = 1>>
@@ -1866,7 +1866,7 @@
 	<</if>>
 	<!-- !!	gs'booty_call_reactions', 'creampie_react'-->
 	<<gs 'booty_call_reactions' 'react_menu'>>
-	<<if (getvar("$booty_call['orgasm_count']") >= 5 or getvar("$pc.pcs_sleep") < 20) and (getvar("$time.hour") >= 20 or getvar("$time.hour") <= 4)>>
+	<<if (getvar("$booty_call['orgasm_count']") >= 5 or $pc.pcs_sleep < 20) and ($time.hour >= 20 or $time.hour <= 4)>>
 		<<actCLA 'Collapse'>>
 			<<gt 'booty_call_after' 'black_out'>>
 		<</actCLA>>
@@ -1905,7 +1905,7 @@
 	<<if getvar("$booty_call['condom']") == 1 and getvar("$booty_call['no_condoms']") != 1>>
 		<<actCLA 'Keep going (no condoms)'>>
 			<<video "shared/sex/misc/wait.mp4">>
-			<<if getvar("$time.dayStage") >= 3>>
+			<<if $time.dayStage >= 3>>
 				"I guess there''s no point in using any more condoms tonight," you grin wickedly.
 			<<else>>
 				"I guess there''s no point in using any more condoms today," you grin wickedly.
@@ -1930,7 +1930,7 @@
 	<<elseif getvar("$booty_call['creampie_count']") > 0>>
 		<<actCLA 'Keep going (free creampies)'>>
 			<<video "shared/sex/misc/wait.mp4">>
-			<<if getvar("$time.dayStage") >= 3>>
+			<<if $time.dayStage >= 3>>
 				"Well I'm already full of cum so I guess there''s no point in telling you not to come inside me tonight," you grin wickedly. "Blow your load in me whenever you want"
 			<<else>>
 				"Well I'm already full of cum so I guess there''s no point in telling you not to come inside me today," you grin wickedly. "Blow your load in me whenever you want"

+ 32 - 32
sugarcube/src/activities/bootycall/booty_call_doggy.tw

@@ -146,7 +146,7 @@
 	<<setinit $booty_call['position'] = 'doggy'>>
 	<<setinit $booty_call['pos_speed'] = 'doggy1'>>
 	<!-- !! booty_call['doggy_fuck'] tracks if you fuck in this position-->
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'doggy_virg_norm1'>>
 
 	<</if>>
@@ -270,7 +270,7 @@
 	<<setinit $booty_call['position'] = 'doggy'>>
 	<<setinit $booty_call['pos_speed'] = 'doggy2'>>
 	<!-- !! booty_call['doggy_fuck'] tracks if you fuck in this position-->
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'doggy_virg_norm1'>>
 
 	<</if>>
@@ -400,7 +400,7 @@
 	<<setinit $booty_call['pos_speed'] = 'doggy3'>>
 	<!-- !! booty_call['doggy_fuck'] tracks if you fuck in this position-->
 	<<setinit $booty_call['doggy_fuck'] = 1>>
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'doggy_virg_hard1'>>
 
 	<</if>>
@@ -646,7 +646,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, red liquid streaming out of your pussy with every thrust. But it doesn't stop him from continuing to drive balls deep with his dick every time.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it easier for his thick cock to slide into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it easier for his thick cock to slide into your waiting snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
@@ -654,33 +654,33 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
 		<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it easier for his long cock to reach all the way inside you to kiss your cervix with its tip. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it easier for his huge cock to ease into your tight snatch and reach all the way inside you to kiss your cervix with its tip. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, paving the way for him to fill you with his huge cock, penetrating deep inside you to kiss your cervix with its tip. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His thick shaft is wet with your period, making it possible for his enormous cock to fit its girth into your tight snatch and reach all the way inside you to kiss your cervix with its tip. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, straining against your walls, with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His thick shaft is wet with your period, allowing him to slide his huge cock into you with ease and kiss your cervix with its tip. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it possible for him to somehow fit his entire npc_dick[$boy]cm cock into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix, with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, allowing him to slide his entire npc_dick[$boy]cm cock into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix, with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, making it possible for him to somehow fit his gigantic npc_dick[$boy]cm cock into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix, with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His shaft is wet with your period, allowing him to slide his gigantic npc_dick[$boy]cm cock into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix, with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His thick shaft is wet with your period, making it possible for him to somehow fit his monstrous npc_dick[$boy]cm cock into your tight snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix and threatening to rip you in half, with every thrust.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His thick shaft is wet with your period, making it possible for him to somehow fit his monstrous npc_dick[$boy]cm cock into your snatch. You're no virgin, but calling this a tight squeeze would be a severe under-exaggeration at best. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix and threatening to rip you in half with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily. His thick shaft is wet with your period, making it possible for him to easily slide his monstrous npc_dick[$boy]cm cock into your snatch. The red liquid streams from your pussy and <<=$npcs.get($boy,'firstname')>> drives balls deep, pressing hard against your cervix and threatening to rip you in half with every thrust.</p>
@@ -698,7 +698,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before driving his dick balls deep inside you.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before stretching you out with his thick cock until he drives it balls deep inside you again.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out just long enough to feel the empty absence of his thick cock until he drives it balls deep inside you again.</p>
@@ -708,7 +708,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 		<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out just long enough for your pussy to feel the absence of his huge cock before driving back in to fill you up, barely able to fit its entirety inside you.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before splitting your tight pussy again, barely able to fit the entirety of his enormous cock inside you.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before stretching your welcoming pussy again, barely able to fit the entirety of his enormous cock inside you.</p>
@@ -716,15 +716,15 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
 		<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before plunging back in, forcing as much of his npc_dick[$boy]cm cock as he can fit inside you, and still leaving shaft to spare.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 20>>
+		<<if $pc.pcs_vag <= 20>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before plunging back in, stretching your tight pussy to the limits as he's unable to fit the entire length of his gigantic cock inside you.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before plunging as much of his gigantic cock back in, just <i>barely</i> able to fit it inside you.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before forcing the monstrous size of his npc_dick[$boy]cm into your tight pussy, threatening to split you in half each time he fails to fit its length inside you.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before forcing the monstrous size of his npc_dick[$boy]cm into your pussy. You're obviusly no virgin, but this is ridiculous, and <<=$npcs.get($boy,'firstname')>>'s cock threatens to split you in half each time he fails to fit its length inside you.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly but steadily, each time methodically drawing himself all the way out before forcing the monstrous size of his npc_dick[$boy]cm into your pussy. <<=$npcs.get($boy,'firstname')>>'s cock is so thick that you your pussy strains to accomodate its girth even as he fails to fit its length inside you.</p>
@@ -742,7 +742,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>You moan as <<=$npcs.get($boy,'firstname')>> takes you from behind, his dick thrusting inside you. There's something about doggy style, a <i>depth</i> that you don't get in any other position. He's so deep inside you and you love feeling him draw all the way out before filling you all the way up again with every motion.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You moan as <<=$npcs.get($boy,'firstname')>> takes you from behind, his cock thrusting inside you. There's something about doggy style, a <i>depth</i> that you don't get in any other position. And his cock is so thick, you feel ready to split apart when his length is inside you but feel empty and vacant whenever he draws it back out.</p>
 		<<else>>
 			<p>You moan as <<=$npcs.get($boy,'firstname')>> takes you from behind, his cock thrusting inside you. There's something about doggy style, a <i>depth</i> that you don't get in any other position. And his cock is so thick, it <i>fills</i> you completely each time he pushes into you down to the base.</p>
@@ -756,13 +756,13 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
 		<p>You moan as <<=$npcs.get($boy,'firstname')>> takes you from behind, his cock thrusting inside you. There's something about doggy style, a <i>depth</i> that you don't get in any other position. And with a dick as long as <<=$npcs.get($boy,'firstname')>>'s, it reaches the deepest part of you, .</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim and then some, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock is way too big for you in both girth and length, pummelling your insides and stretching your pussy to the point of pain, and you are <i><b>loving every second of it.</b></i></p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock is destroying your pussy with size alone, smashing into your cunt with the gentle weight of a sledgehammer in the world. But it doesn't feel bad. Far from it. The pain is euphoric and you can't get enough of his cock.</p>
@@ -780,7 +780,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, pressing his hips against your ass.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your tight pussy, his thick girth forcing gasps from your mouth.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your pussy, his thick girth <i>filling</i> you from wall to wall.</p>
@@ -790,7 +790,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 		<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, eliciting mews of pleasure as his huge shaft <i>fills</i> you from end to end.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting groans of pleasure as the length and girth of his enormous shaft <i>fills</i> you up, stretching your tight pussy in every conceivable manner.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting moans of pleasure as the length and girth of his enormous shaft <i>fills</i> you.</p>
@@ -816,7 +816,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>You mew softly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His cock driving deep inside you, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>Tiny mews escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>stretching</i> your tight pussy with its exceptional girth, making you wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>Soft moans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>filling</i> you with its exceptional girth, making you wetter and wetter with every thrust.</p>
@@ -826,7 +826,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 			<p>You mew softly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it's plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-			<<if getvar("$pc.pcs_vag") <= 15>>
+			<<if $pc.pcs_vag <= 15>>
 				<p>Tiny mews escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>You mew softly as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
@@ -849,7 +849,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His cock driving deep inside you, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>Loud groans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>stretching</i> your tight pussy with its exceptional girth, making you wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>Loud moans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>filling</i> you with its exceptional girth, making you wetter and wetter with every thrust.</p>
@@ -859,7 +859,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 			<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it's plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-			<<if getvar("$pc.pcs_vag") <= 15>>
+			<<if $pc.pcs_vag <= 15>>
 				<p>Loud groans escape your lips as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
 			<<else>>
 				<p>You moan loudly as <<=$npcs.get($boy,'firstname')>> continues to fuck you with his enormous cock. Slowly. Gently. He drives it deep inside you until it's plunged to the hilt, making its presence felt in the deepest parts of your tight pussy even as it <i>stretches</i> you to accomodate its exceptional girth. But you love it, becoming wetter and wetter with every thrust.</p>
@@ -885,7 +885,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "You're amazing! I'm <i>so</i> wet..."</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "Ungh~! You're stretching me out! It's so good! I'm <i>so</i> wet..."</p>
 			<<else>>
 				<p>"Ah~! Yes~! Just like that~!" you moan, your voice a hoarse with arousal. "Ungh~! It feels so good~! Fuck me with your big cock~!"</p>
@@ -1124,7 +1124,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>"Ah! <i>Fuck!</i> Yes! Yes! Fuck my pussy just like that!" you moan loudly. "Don't stop! You're so <i>fucking</i> good!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck, you're so big! You're stretching me out! Don't stop! Fuck my pussy with your big cock! It's so good!"</p>
 		<<else>>
 			<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Don't stop! Fuck my pussy with your big cock! Fuck, you're so big! You're so <i>fucking</i> good!"</p>
@@ -1255,10 +1255,10 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
 		<p>Your eyes roll back into your head as <<=$npcs.get($boy,'firstname')>> pummels you from behind. Loud slapping echoes off the walls as <<=$npcs.get($boy,'firstname')>> claps your ass over and over again, splitting your pussy in half and smashing into your cervix with his monster cock on every thrust.</p>
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 		Your mind goes blank with pleasure and within minutes, your makeup is as fucked as you are.
-	<<elseif getvar("$pc.pcs_makeup") == 0>>
+	<<elseif $pc.pcs_makeup == 0>>
 		Tears of pleasure blur your sight and sweat gathers on your skin and your already ruined makeup gets even worse with every passing moment.
 	<<else>>
 		<p>Your mind goes blank with pleasure and you groan loudly, letting <<=$npcs.get($boy,'firstname')>> fuck you into blissful oblivion.</p>
@@ -1291,10 +1291,10 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
 		<p>You scream as he pulls harder on your hair and you try to pull away, but you're unable to escape. <<=$npcs.get($boy,'firstname')>>'s monster cock keeps smashing into your cervix, your pussy unable to accomodate its unnatural length, aching from being stretched to fit its girth. Not to mention your ass is already sore from being repeatedly clapped with sledgehammer force. You're sure your uterus is going to be bruised tomorrow and you groan again, wondering if it's possible to be fucked to death.</p>
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 		<p>Black tears run down your face and sweat covers your body, destroying your makeup as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
-	<<elseif getvar("$pc.pcs_makeup") == 0>>
+	<<elseif $pc.pcs_makeup == 0>>
 		<p>Your already ruined makeup gets worse with every passing moment, getting smeared across the sheets as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
 	<<else>>
 		<p>Tears run down your face and sweat covers your body as <<=$npcs.get($boy,'firstname')>> pummels you into the bed.</p>
@@ -1433,7 +1433,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>"Yes! Fuck! Yes! Just like that!" you scream so hard it hurts. "Clap my fucking ass! Fuck me with your cock!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're gonna tear me in half! Don't stop! Don't stop!"</p>
 		<<else>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> Yes! Just like that! Your cock is so big! Don't stop! Don't stop! Pound my ass!"</p>
@@ -1443,7 +1443,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 		<p>"OH FUCK!" you scream so hard it hurts. "You're so big! You're <i>so</i> big! Don't stop! Pound my pussy with your big fucking cock!"</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're <i>so</i> big! You're gonna tear me in half! Don't stop! Don't stop!"</p>
 		<<else>>
 			<p>"OH FUCK!" you scream so hard it hurts. "<i>Fuck!</i> You're so big! You're <i>so</i> big! Oh fuck! Don't stop! Don't stop! Don't fucking stop!"</p>

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

@@ -669,7 +669,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pc_favorite_part'>>
 	<<actCLA 'Your cock'>>
-		<<if getvar("$pc.pcs_pubes") < 12>>
+		<<if $pc.pcs_pubes < 12>>
 			<<image "shared/sex/after/dick_play1.jpg">>
 		<<else>>
 			<<image "shared/sex/after/dick_play2.jpg">>

+ 20 - 20
sugarcube/src/activities/bootycall/booty_call_leave.tw

@@ -370,7 +370,7 @@
 		You punctuate the note with a tiny little heart, feeling warmth in your chest as you do.
 		<<gs 'booty_call_leave' 'sneak_out_note_end'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_makeup") > 2>>
+	<<if $pc.pcs_makeup > 2>>
 		<<actCLA 'A kiss'>>
 			<<=$npcs.get($boy,'apt_hall')>>
 			<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>>
@@ -536,7 +536,7 @@
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe'].</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'dressing2'>>
@@ -546,7 +546,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'going_disco'>>
-	<<if getvar("$time.hour") >= 18 and (getvar("$time.weekday") == 5 or getvar("$time.weekday") == 6)>>
+	<<if $time.hour >= 18 and ($time.weekday == 5 or $time.weekday == 6)>>
 		<<if $region == 'pav'>>
 			<<actCLA 'Going to the disco'>>
 				<<gs 'booty_call_leave' 'dress_loop'>>
@@ -579,13 +579,13 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'mom_late'>>
-	<<if mid($start_type,1,2) == 'sg' and getvar("$time.hour") >= 20>>
+	<<if mid($start_type,1,2) == 'sg' and $time.hour >= 20>>
 		<<actCLA 'Mom will kill me'>>
 			<<setinit $booty_call['mom_kill'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
 			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
-			<<if getvar("$time.hour") < 3>>
+			<<if $time.hour < 3>>
 				<p>"Yeah," you say, $booty_call['dress_describe']. "I'm already going to be in trouble as it is, but if I don't come home at all tonight, my mom will kill me."</p>
 			<<else>>
 				<p>"Yeah," you say, $booty_call['dress_describe']. "My mom will kill me if I don't come home before curfew."</p>
@@ -632,7 +632,7 @@
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Have a few things I need to get done. Thanks for letting me spend the night."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -653,7 +653,7 @@
 			<<gs 'booty_call_leave' 'panty_gift'>>
 		<<else>>
 			<p>"Yeah," you say, $booty_call['dress_describe']. "Need to see a friend later. Thanks for letting me spend the night."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -677,21 +677,21 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'going_school'>>
-	<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+	<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 		<<actCLA 'School'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
 			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
-			<<if getvar("$booty_call['late_for_school']") == 1 and getvar("$time.hour") >= 8>>
+			<<if getvar("$booty_call['late_for_school']") == 1 and $time.hour >= 8>>
 				<p>"I already told you, I'm late for school," you say, $booty_call['dress_describe']. "But thanks for letting me spend the night. And the second fuck," you add with a wink.</p>
 			<<elseif getvar("$booty_call['late_for_school']") == 1>>
 				<p>"I already told you, I'm gonna be late for school," you say, $booty_call['dress_describe']. "But thanks for letting me spend the night. And the second fuck," you add with a wink.</p>
-			<<elseif getvar("$time.hour") == 7>>
+			<<elseif $time.hour == 7>>
 				<p>"Gotta get to school," you say, $booty_call['dress_describe']. "Thanks for letting me spend the night."</p>
 			<<else>>
 				<p>"Gotta get ready for school," you say, $booty_call['dress_describe']. "Thanks for letting me spend the night."</p>
 			<</if>>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				"No problem."
@@ -702,14 +702,14 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'school_night'>>
-	<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and (getvar("$time.weekday") < 5 or getvar("$time.weekday") == 7)>>
+	<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and ($time.weekday < 5 or $time.weekday == 7)>>
 		<<actCLA 'It`s a school night'>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<<gs 'booty_call_leave' 'dress_start_desc'>>
 			<p>"You heading out?" <<=$npcs.get($boy,'firstname')>> asks.</p>
 			<!-- !! if schoolprogul = 1:-->
 			<p>"It's a school night," you say, $booty_call['dress_describe']. "Gotta get home so I can set my alarm and get up for class tomorrow."</p>
-			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1))>>
+			<<if rand(1,3) == 3 and (npc_day_off[$boy] == $time.weekday or $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1))>>
 				<<gs 'booty_call_morning' 'booty_call_invite_later'>>
 			<<else>>
 				<<gs 'booty_call_leave' 'dressing2'>>
@@ -758,7 +758,7 @@
 	<</actCLA>>
 	<<actCLA 'Something to remember the occasion'>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
-		<<if getvar("$time.dayStage") > 3>>
+		<<if $time.dayStage > 3>>
 			<p>"Something to remember the night," you smile, $booty_call['dress_describe']. "Keep the good times in mind."</p>
 		<<else>>
 			<p>"Something to remember the day," you smile, $booty_call['dress_describe']. "Keep the good times in mind."</p>
@@ -984,7 +984,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'dress_talk_pc'>>
-	<<if getvar("$booty_call['plans_later_talk']") == 0 and (getvar("$time.hour") < 21 or getvar("$booty_call['sleepover']") == 1)>>
+	<<if getvar("$booty_call['plans_later_talk']") == 0 and ($time.hour < 21 or getvar("$booty_call['sleepover']") == 1)>>
 		<<actCLA 'Ask him what he`s doing later'>>
 			<<setinit $booty_call['plans_later_talk'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
@@ -1101,7 +1101,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'pc_booty_call_invite'>>
-	<<if getvar("$booty_call['sleepover']") == 1 or getvar("$time.hour") < 5>>
+	<<if getvar("$booty_call['sleepover']") == 1 or $time.hour < 5>>
 		<<actCLA 'Ask to come over later'>>
 			<<setinit $booty_call['invite_today'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
@@ -1128,12 +1128,12 @@
 				<</if>>
 			<</if>>
 		<</actCLA>>
-	<<elseif getvar("$time.hour") >= 5>>
+	<<elseif $time.hour >= 5>>
 		<<actCLA 'Ask to come over tomorrow'>>
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
 			<<gs 'booty_call_leave' 'dress_loop'>>
 			<p>"Want to do this again tomorrow?" you ask, flashing a smile while you're $booty_call['dress_describe'].</p>
-			<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or ($npcs.get($boy,'day_off') == 1 and getvar("$time.weekday") == 7)>>
+			<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or ($npcs.get($boy,'day_off') == 1 and $time.weekday == 7)>>
 				<<if rand(1,10) / 2 <= $npcs.get($boy,'sexdrive')>>
 					<p>"Hmm... It'll be my day off... What time were you thinking?"</p>
 					<<gs 'booty_call_leave' 'pc_booty_call_timeset'>>
@@ -1205,7 +1205,7 @@
 	<<if getvar("$booty_call['plans_later_talk']") == 0>>
 		<<gs 'booty_call_leave' 'dress_loop'>>
 		<<setinit $booty_call['plans_later_talk'] = 1>>
-		<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1)>>
+		<<if $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1)>>
 			<<setinit $booty_call['invite_tomorrow'] = 1>>
 			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
@@ -1213,7 +1213,7 @@
 			<<else>>
 				<p>"You busy tomorrow?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "It'll be my day off. Want to come by and do this again?"</p>
 			<</if>>
-		<<elseif $npcs.get($boy,'day_off') == $time.weekday and (getvar("$booty_call['sleepover']") == 1 or getvar("$time.hour") < 5)>>
+		<<elseif $npcs.get($boy,'day_off') == $time.weekday and (getvar("$booty_call['sleepover']") == 1 or $time.hour < 5)>>
 			<<setinit $booty_call['invite_today'] = 1>>
 			<<if $npcs.get($boy,'girlfriend') == 1 and $npcs.get($boy,'fidelity') == 6>>
 				<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>

+ 49 - 49
sugarcube/src/activities/bootycall/booty_call_miss.tw

@@ -107,7 +107,7 @@
 	<!-- !! booty_call['missionary_fuck'] tracks if you fuck in this position-->
 	<<setinit $booty_call['missionary_fuck'] = 1>>
 	<<setinit $booty_call['kiss'] = 0>>
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'miss_virg_norm1'>>
 
 	<</if>>
@@ -264,7 +264,7 @@
 	<<setinit $booty_call['pos_speed'] = 'miss2'>>
 	<!-- !! booty_call['missionary_fuck'] tracks if you fuck in this position-->
 	<<setinit $booty_call['missionary_fuck'] = 1>>
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'miss_virg_norm1'>>
 
 	<</if>>
@@ -412,7 +412,7 @@
 	<!-- !! booty_call['missionary_fuck'] tracks if you fuck in this position-->
 	<<setinit $booty_call['missionary_fuck'] = 1>>
 	<<setinit $booty_call['kiss'] = 0>>
-	<<if getvar("$pc.pcs_vag") == 0 and getvar("$booty_call['fuck_count']") == 0>>
+	<<if $pc.pcs_vag == 0 and getvar("$booty_call['fuck_count']") == 0>>
 		<<gt 'booty_call_virgin' 'miss_virg_hard1'>>
 
 	<</if>>
@@ -690,45 +690,45 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his cock slips in and out of you with ease.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But with your pussy squeezing tight around his thick cock, the added lubrication is more than welcome and his manhood slips in and out of you with ease.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his thick cock slips in and out of you with ease.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his dick is so long that it barely fits inside you, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his lengthy cock slips in and out of you with ease.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you completely with every thrust, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his enormous cock filling you up and straining tight inside your pussy with every thrust, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 20>>
+		<<if $pc.pcs_vag <= 20>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his cock is so long that he can't even get the full length in while still bumping against your cervix with every thrust, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his cock is so long that he bumps against your cervix with every thrust, so the added lubrication is more than welcome.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his gigantic cock is so big that he struggles to fit his full girth inside you with every thrust, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his gigantic cock is so big that he fills you to the brim with every thrust, so the added lubrication is more than welcome.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his monstrous cock is so big that he nearly splits you in half with every thrust, so the added lubrication is more than welcome.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his monstrous cock is so big that it stretches you all the way from your labia to your cervix, so the added lubrication is more than welcome.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his monstrous cock is so big that even your experienced pussy is stretched with every thrust, so the added lubrication is more than welcome.</p>
@@ -745,47 +745,47 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> pumps his cock in and out of you slowly, focusing more on technique than speed, driving as deep inside you as he can with every thrust.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his thick cock in and out of you slowly, focusing more on technique than speed. He drives as deep inside you, straining tight against the walls of your snug pussy with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his cock in and out of you slowly, focusing more on technique than speed. He drives as deep inside you as he can, pleasantly filling you with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his long cock in and out of you slowly, focusing more on technique than speed. He drives deep inside you, barely managing to fit his entire length inside you with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his long cock in and out of you slowly, focusing more on technique than speed. He drives deep inside you and his lengthy manhood comfortably fills you with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his huge cock in and out of you slowly, focusing more on technique than speed. It fills you completely and then some, straining tight against the walls of your snug pussy with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his cock in and out of you slowly, focusing more on technique than speed. He drives as deep inside you as he can, filling you completely with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his cock in and out of you slowly, focusing more on technique than speed. It fills you completely and then some, causing you to gasp with every thrust as its enormous length and girth stretch your snug pussy to the limits.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his cock in and out of you slowly, focusing more on technique than speed. It fills you completely and then some, causing you to gasp with every thrust as its enormous length and girth strain against the walls of your pussy.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 20>>
+		<<if $pc.pcs_vag <= 20>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his lengthy cock in and out of you slowly, focusing more on technique than speed. He drives deep inside you, so far that it bumps against your cervix with every thrust and still has shaft to spare that he can't fit inside you.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his lengthy cock in and out of you slowly, focusing more on technique than speed. He drives deep inside you, so far that it bumps against your cervix with every thrust and still has shaft to spare that he can't fit inside you.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly with his gigantic cock. Calling it a tight fit would be putting it lightly as he struggles to fit himself inside you and his manhood both bumps against your cervix and strains against your walls with every thrust.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly with his gigantic cock. You're obviously no virgin, but he still struggles to fit himself inside you and his manhood both bumps against your cervix and strains against your walls with every thrust.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> pumps his lengthy cock in and out of you slowly, focusing more on technique than speed. He drives deep inside you, so far that it bumps against your cervix with every thrust and still has shaft to spare that he can't fit inside you.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly with his monstrous cock. The size difference is almost comical as his manhood strains against both your pussy's depths and flexibility, nearly splitting you in half with every thrust.</p>
-		<<elseif getvar("$pc.pcs_vag") <= 25>>
+		<<elseif $pc.pcs_vag <= 25>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly with his gigantic cock. You're obviously no virgin, but his manhood barely fits inside you, it's like fucking a baseball bat.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> fucks you slowly, focusing more on technique than speed. He drives deep inside you, and his monstrous cock is so big that even your experienced pussy is stretched with every thrust.</p>
@@ -802,43 +802,43 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love the way he moves his cock, how it makes you feel <i>full</i> when he's inside you, and your hips buck every time he draws his away.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love the way his cock stretches you out, how tightly your pussy grips it, and your hips buck every time he draws his away.</p>
 		<<else>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love the way he moves, the thickness of his cock, how <i>full</i> it makes you feel, and your hips buck every time he draws his away.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love his cock slipping in and out of you, the ease at which he can slide his extensive length nearly to its base, and your hips buck every time he draws his away.</p>
 		<<else>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love his cock slipping in and out of you, the ease at which he can slide his extensive length all the way to its base, and your hips buck every time he draws his away.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love the way his cock stretches you out, how deep it goes inside you, how tightly your pussy grips it, and your hips buck every time he draws his away.</p>
 		<<else>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love the way he moves, the great length and thickness of his cock <i>filling</i> you, and your hips buck every time he draws his away.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, gasping with every thrust. His enormous cock is driving you insane, filling you until it hurts, trapping you in the place between pain and pleasure, before leaving you feeling empty and vacant as it withdraws. Your hips buck every time he pulls away, begging to be impaled by it once again.</p>
 		<<else>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. His enormous cock <i>fills</i> you to bursting and your hips buck every time he draws his away.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_vag") <= 20>>
+		<<if $pc.pcs_vag <= 20>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, gasping with every thrust as the tip of his lengthy cock touches your most secret place. You love his cock slipping in and out of you, the way he pushes for greater depths that your pussy just can't give and you grind your hips against him, trying to push it even deeper.</p>
 		<<else>>
 			<p>You moan beneath <<=$npcs.get($boy,'firstname')>>, your breath hitching with every thrust. You love his cock slipping in and out of you, the deep impact inside you bringing out a pain that feels more like ecstasy.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim and then some, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His gigantic cock fills you to the brim, pummelling your insides with his sheer size in the most pleasurably painful way possible.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-		<<if getvar("$pc.pcs_vag") <= 25>>
+		<<if $pc.pcs_vag <= 25>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock fills is way too big for you in both girth and length, pummelling your insides and stretching your pussy to the point of pain, and you are <i><b>loving every second of it.</b></i></p>
 		<<else>>
 			<p>You groan beneath <<=$npcs.get($boy,'firstname')>>, getting wetter with every thrust. His monster cock is destroying your pussy with size alone, smashing into your cunt like the most gentle jackhammer in the world. But it doesn't feel bad. Far from it. The pain is euphoric and you can't get enough of his cock.</p>
@@ -855,7 +855,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently with his dick. At the reduced pace, you can feel every contour of him inside you, and you moan with every thrust.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. It immediately feels much better and allows your snug pussy to enjoy the thick girth of his cock instead of being hurt by it.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently with his dick. At the reduced pace, you better savour the nice thickness of his cock, breathing in deep pleasure with every thrust.</p>
@@ -863,13 +863,13 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
 		<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. It immediately feels better and you enjoy his sizeable length now that it's less "punchy".</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. Relief and pleasure wash through you, his dick no longer feeling quite so "punchy" inside you, and your snug pussy grips his huge cock with wet desire.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. Relief and pleasure wash through you, his dick no longer feeling quite so "punchy" inside you, and your pussy swallows up his huge cock with wet desire.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. Relief and pleasure wash through you, his dick no longer feeling quite so "punchy" inside you, and your snug pussy grips the enormous length and girth of his cock with wet desire.</p>
 		<<else>>
 			<p><<=$npcs.get($boy,'firstname')>> slows down, fucking you more gently. Relief and pleasure wash through you, his dick no longer feeling quite so "punchy" inside you, and your pussy swallows up the enormous length and girth of his cock with wet desire.</p>
@@ -892,7 +892,7 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 		<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his cock between your legs. Slowly. Gently. His manhood fits you perfectly, filling you up just right. Your breath hitches with every thrust and it feels wonderful.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_vag") <= 10>>
+		<<if $pc.pcs_vag <= 10>>
 			<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his thick cock between your legs. Slowly. Gently. Stretching your tight pussy in all the best ways. Your breath hitches with every thrust and it feels wonderful.</p>
 		<<else>>
 			<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his thick cock between your legs. Slowly. Gently. Filling you up with his girth. Your breath hitches with every thrust and it feels wonderful.</p>
@@ -900,13 +900,13 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
 		<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his cock between your legs. Slowly. Gently. It reaches deep inside you, hitting pleasure points you didn't even know could be hit with a dick. Your breath hitches with every thrust and it feels wonderful.</p>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his huge cock between your legs. Slowly. Gently. Stretching your snug pussy in all the best ways and <i>filling</i> you with it. It's so tight inside you that you literally <i>squeeze</i> pleasure from it and your breath hitches with every thrust.</p>
 		<<else>>
 			<p>You moan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his huge cock between your legs. Slowly. Gently. It <i>fills</i> you time and time again and you can't get enough, your breath hitching with every thrust.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<p>You groan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his enormous cock between your legs. Slowly. Gently. Its magnificent girth threatens to split you in half with every thrust and if it did, you'd die happy.</p>
 		<<else>>
 			<p>You groan softly as <<=$npcs.get($boy,'firstname')>> continues to pump his enormous cock between your legs. Slowly. Gently. It pummels you with its magnificent girth, filling up every single corner of your pussy with every single thrust.</p>
@@ -931,7 +931,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>"Ah~! Your cock feels so good!" you moan. "You fit just right inside me! Fuck me with your perfect dick!"</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>"Ah~! You're so big!" you moan. "Ungh~! You're stretching me out! It's so good!"</p>
 			<<else>>
 				<p>"Ah~! You're so big!" you moan. "Ungh~! It feels so good~! Fuck me with your big cock~!"</p>
@@ -1182,7 +1182,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck me just like that! Right there! Right there! You're so <i>fucking</i> good!"</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck my pussy with your big cock! You're stretching me out! It's so good!"</p>
 			<<else>>
 				<p>"Ah! <i>Fuck!</i> Just like that!" you moan loudly. "Fuck my pussy with your big cock! Right there! Right there! You're so <i>fucking</i> good!"</p>
@@ -1318,55 +1318,55 @@
 	<<elseif $npcs.get($boy,'dick_desc') == 'skinny'>>
 		You groan in pleasure, loving how roughly he's fucking you, hammering your pussy in all the right places with his skinny dick.
 	<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			You groan wordlessly, loving how roughly he's fucking you, hammering your pussy in all the right ways. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			You groan wordlessly, loving how roughly he's fucking you, hammering your pussy in all the right ways. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.
 		<<else>>
 			Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love how rough he's treating you. His cock hammers your pussy in all the right ways and you groan in pleasure. 
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			You groan wordlessly, loving the rough fucking of your pussy by his thick cock, smashing it into your pussy again and again, stretching you to your limits. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			You groan wordlessly, loving the rough fucking of your pussy by his thick cock, smashing it into your pussy again and again, stretching you to your limits. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.
 		<<else>>
 			Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love how rough he's treating you and the way he smashes his thick cock into you over and over again, and stretching you to your limits.
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'long'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his long cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.</p>
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his long cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.</p>
 		<<else>>
 			<p>Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love the rough fucking of your pussy by his long cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his huge cock, the way <<=$npcs.get($boy,'firstname')>> fills you with every thrust, bashing it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.</p>
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his huge cock, the way <<=$npcs.get($boy,'firstname')>> fills you with every thrust, bashing it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.</p>
 		<<else>>
 			<p>Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love the rough fucking of your pussy by his huge cock, the way <<=$npcs.get($boy,'firstname')>> fills you with every thrust, bashing it against your cervix again and again, causing tears of pleasure and pain blur your sight and beads of sweat gather on your skin.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his enormous cock, the way <<=$npcs.get($boy,'firstname')>> stretches you to your limits with every thrust and bashes it against your cervix unceasingly. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.</p>
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his enormous cock, the way <<=$npcs.get($boy,'firstname')>> stretches you to your limits with every thrust and bashes it against your cervix unceasingly. Tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.</p>
 		<<else>>
 			<p>Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love how rough he's treating you and the way <<=$npcs.get($boy,'firstname')>>'s enormous cock stretches you to your limits with every thrust and bashes it against your cervix unceasingly.</p>
 		<</if>>
 	<<elseif $npcs.get($boy,'dick_desc') == 'lengthy'>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his exceptionally lengthy cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, so hard you wonder if you'll be bruised in the morning as tears of pleasure and pain blur your sight and beads of sweat gather on your skin. Within minutes, your makeup is as fucked as you are.</p>
-		<<elseif getvar("$pc.pcs_makeup") == 0>>
+		<<elseif $pc.pcs_makeup == 0>>
 			<p>You groan wordlessly, loving the rough fucking of your pussy by his exceptionally lengthy cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, so hard you wonder if you'll be bruised in the morning as tears of pleasure and pain blur your sight and beads of sweat gather on your skin and your already ruined makeup gets even worse with every passing moment.</p>
 		<<else>>
 			<p>Tears of pleasure and pain blur your sight and beads of sweat gather on your skin. You love the rough fucking of your pussy by his exceptionally lengthy cock, the way <<=$npcs.get($boy,'firstname')>> bashes it against your cervix again and again, so hard you wonder if you'll be bruised in the morning.</p>
@@ -1501,7 +1501,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'normal'>>
 			<p>"Yes! Yes! Just like that!" you scream at the top of your lungs. "Fuck me with your cock! Pound my pussy!"</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'thick'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>"OH FUCK!" you scream at the top of your lungs. "<i>Fuck!</i> You're gonna tear me in half! Don't stop! Don't stop!"</p>
 			<<else>>
 				<p>"OH FUCK!" you scream at the top of your lungs. "<i>Fuck!</i> Your cock is so big! Don't stop! Don't stop! Pound my pussy!"</p>
@@ -1511,7 +1511,7 @@
 		<<elseif $npcs.get($boy,'dick_desc') == 'huge'>>
 			<p>"OH FUCK!" you scream at the top of your lungs. "You're so big! You're <i>so</i> big! Don't stop! Pound my pussy with your huge cock!"</p>
 		<<elseif $npcs.get($boy,'dick_desc') == 'enormous'>>
-			<<if getvar("$pc.pcs_vag") <= 10>>
+			<<if $pc.pcs_vag <= 10>>
 				<p>"OH FUCK!" you scream at the top of your lungs. "<i>Fuck!</i> You're <i>so</i> big! You're gonna tear me in half! Don't stop! Don't stop!"</p>
 			<<else>>
 				<p>"OH FUCK!" you scream at the top of your lungs. "<i>Fuck!</i> You're so big! You're <i>so</i> big! Oh fuck! Don't stop! Don't stop! Don't fucking stop!"</p>

+ 6 - 6
sugarcube/src/activities/bootycall/booty_call_morning.tw

@@ -7,7 +7,7 @@
 		<<gt 'booty_call_morning' 'sleep_fuck_wake'>>
 
 	<</if>>
-	<<if ($npcs.get($boy,'earlyriser') == 1 or getvar("$time.hour") >= 7) and rand(1,10) < $npcs.get($boy,'sexdrive')>>
+	<<if ($npcs.get($boy,'earlyriser') == 1 or $time.hour >= 7) and rand(1,10) < $npcs.get($boy,'sexdrive')>>
 		<!-- !!		if (<<=$npcs.get($boy,'cum_pref')>> = 'facial' or npc_humor[$boy] = 2) and rand(1,2) = 2:-->
 		<<gt 'booty_call_morning' 'cumshot_wakeup1'>>
 		<!-- !!		else-->
@@ -29,7 +29,7 @@
 			<</actCLA>>
 		<</if>>
 		<!-- !!	end-->
-		<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+		<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 			<<actCLA 'School!'>>
 				<<video "shared/romance/misc/wakeup2.mp4">>
 				Your eyes snap open. You frantically grab for your phone and turn on the screen.
@@ -69,7 +69,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'sleep_fuck_wake'>>
-	<<if getvar("$time.dayStage") == 2>>
+	<<if $time.dayStage == 2>>
 		<<video "shared/romance/misc/wakeup1.mp4">>
 	<<else>>
 		<<image "shared/sex/after/sleep4.jpg">>
@@ -752,7 +752,7 @@ end} -->
 		<<else>>
 			<p>"You busy later?" <<=$npcs.get($boy,'firstname')>> asks as you're $booty_call['dress_describe']. "It's my day off. Want to come by and do this again?"</p>
 		<</if>>
-	<<elseif $npcs.get($boy,'day_off') == $time.weekday + 1 or (getvar("$time.weekday") == 7 and $npcs.get($boy,'day_off') == 1)>>
+	<<elseif $npcs.get($boy,'day_off') == $time.weekday + 1 or ($time.weekday == 7 and $npcs.get($boy,'day_off') == 1)>>
 		<<setinit $booty_call['invite_tomorrow'] = 1>>
 		<<if $npcs.get($boy,'girlfriend') == 1>>
 			<<setinit $pc_know_npc_has_girlfriend[$boy] = 1>>
@@ -1790,7 +1790,7 @@ end} -->
 	<<if getvar("$booty_call['give_lift']") == 2>>
 		<!-- !!take to school-->
 		<h2>Outside School</h2>
-		<<if getvar("$time.month") >= 11 or getvar("$time.month") <= 3>>
+		<<if $time.month >= 11 or $time.month <= 3>>
 			<<setinit $booty_call['drop_off_image'] = '<center><img $set_imgh src="images/locations/pavlovsk/school/building/schoolwinter.jpg"></center>'>>
 		<<else>>
 			<<setinit $booty_call['drop_off_image'] = '<center><img $set_imgh src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'>>
@@ -1864,7 +1864,7 @@ end} -->
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'classmates_see'>>
-	<<if getvar("$time.hour") > 6 and rand(1,20) > rand(3,6)>>
+	<<if $time.hour > 6 and rand(1,20) > rand(3,6)>>
 		<p>You step out of the car, looking around and don't see anybody who would recognize you. <<=$npcs.get($boy,'firstname')>> gives you a wave and you wave back as he drives off.</p>
 	<<else>>
 		As you exit the vehicle, some of your classmates are walking by and they glance at you stepping out of a stranger''s car. Some of them immediately look away. Others wear a look of disgust. Judging by the reactions, they must have clocked you.

+ 11 - 11
sugarcube/src/activities/bootycall/booty_call_pillow_talk.tw

@@ -361,7 +361,7 @@
 			<p><<=$npcs.get($boy,'firstname')>> nods, accepting your apology.</p>
 			<<gs 'booty_call_pillow_talk' 'sex_talk'>>
 		<</actCLA>>
-		<<if $finances.bank + getvar("$finances.cash") <= 2000>>
+		<<if $finances.bank + $finances.cash <= 2000>>
 			<<actCLA 'I don`t have a lot of money'>>
 				<<setinit $pc_buy_condoms[$boy] = 1>>
 				<p>"It's just..." You sigh. "Money's really tight for me right now. As dumb as it sounds, I can't afford to buy condoms. So that's why I have to rely on you. Does that make sense?"</p>
@@ -734,7 +734,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'ruined_makeup'>>
-	<<if getvar("$pc.pcs_makeup") == 0 and getvar("$booty_call['starting_makeup']") > 1 and getvar("$booty_call['ruin_makeup']") == 0>>
+	<<if $pc.pcs_makeup == 0 and getvar("$booty_call['starting_makeup']") > 1 and getvar("$booty_call['ruin_makeup']") == 0>>
 		<<actCLA 'You ruined my makeup'>>
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<setinit $booty_call['ruin_makeup'] = 1>>
@@ -1223,8 +1223,8 @@
 	<</if>>
 	<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 	<<image "shared/sex/after/pillow_talk1.jpg">>
-	<<if getvar("$pc.pcs_pubes") < 3>>
-	<<elseif getvar("$pc.pcs_pubes") >= 30>>
+	<<if $pc.pcs_pubes < 3>>
+	<<elseif $pc.pcs_pubes >= 30>>
 		<!-- !! full bush talk-->
 		<!-- !! find real number later-->
 		<<if $npcs.get($boy,'like_pubestyle') == $pc.pubestyle>>
@@ -1240,7 +1240,7 @@
 			<</actCLA>>
 			<<actCLA 'Lazy'>>
 				<<setinit $booty_call['lazy_bush'] = 1>>
-				<<if getvar("$pc.pubestyle") == 10>>
+				<<if $pc.pubestyle == 10>>
 					<p>"I'm just lazy," you shrug. "I'll trim it if it starts getting out of hand, but's too much hassle to maintain any other kind of style. Easier just to trim. Why do you ask?"</p>
 				<<else>>
 					<p>"I'm just lazy," you shrug. "It's too much trouble to maintain. Easier just to let it grow. Why do you ask?"</p>
@@ -1250,7 +1250,7 @@
 			<<gs 'booty_call_pillow_talk' 'pubes_young'>>
 			<<gs 'booty_call_pillow_talk' 'pubes_problem'>>
 			<<gs 'booty_call_pillow_talk' 'pubes_other_lovers'>>
-			<<if getvar("$pc.pubestyle") == 10>>
+			<<if $pc.pubestyle == 10>>
 				<<actCLA 'Just trim'>>
 					<p>"I just trim," you sigh. "Don't really like going 'full jungle' down there, but don't really like shaving either. Why do you ask?"</p>
 					<<gs 'booty_call_pillow_talk' 'boy_pubes_response'>>
@@ -1260,7 +1260,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'boy_pubes_response'>>
-	<<if getvar("$pc.pcs_pubes") >= 30>>
+	<<if $pc.pcs_pubes >= 30>>
 		<<if $npcs.get($boy,'bush_pref') == 0>>
 			<p>"I was just curious," he shrugs. "Some girls shave, some don't. Me? Pussy is pussy, I don't care if it's more like a kiwi or an apple," he laughs aloud.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1274,7 +1274,7 @@
 			"I think it's sexy too," he grins. "Too many girls feel peer pressured into shaving it off, but I love a nice full bush."
 			<<gs 'booty_call_pillow_talk' 'boy_likes_pubes'>>
 		<</if>>
-	<<elseif getvar("$pc.pcs_pubes") < 4>>
+	<<elseif $pc.pcs_pubes < 4>>
 		<<if $npcs.get($boy,'bush_pref') == 0>>
 			<p>"I was just curious," he shrugs. "Some girls shave, some don't. Me? Pussy is pussy, I don't care if it's more like a kiwi or an apple," he laughs aloud.</p>
 			<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1358,7 +1358,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'boy_likes_pubes'>>
-	<<if getvar("$pc.pcs_pubes") >= 30>>
+	<<if $pc.pcs_pubes >= 30>>
 		<<run $npcs.set($boy,'like_pubestyle',$pc.pubestyle)>>
 		<<actCLA 'Good to know'>>
 			<<video "shared/sex/after/pillow_talk3.mp4">>
@@ -1456,7 +1456,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pubes_young'>>
 	<<actCLA 'Makes me feel too young'>>
-		<<if getvar("$pc.pcs_pubes") >= 30>>
+		<<if $pc.pcs_pubes >= 30>>
 			<p>"I tried it once but I didn't like it," you grimace. "Made me feel like a little girl. It was weird. I prefer to have a full bush compared to that. Why do you ask?"</p>
 		<<else>>
 			<p>"I tried it once but I didn't like it," you grimace. "Made me feel like a little girl. It was weird. So now I always make sure I have some hair down there. Why do you ask?"</p>
@@ -1466,7 +1466,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'pubes_problem'>>
 	<<actCLA 'Got a problem with that?'>>
-		<<if getvar("$pc.pcs_pubes") >= 30>>
+		<<if $pc.pcs_pubes >= 30>>
 			<p>"Got a problem with my bush?" you ask, giving him a hard stare.</p>
 			<<if $npcs.get($boy,'bush_pref') == 0>>
 				<p>"Some girls shave, some don't. Me? Pussy is pussy, I don't care if it's more like a kiwi or an apple," he laughs aloud before shrugging. "I was just curious."</p>

+ 20 - 20
sugarcube/src/activities/bootycall/booty_call_pillow_talk2.tw

@@ -77,7 +77,7 @@
 				<!-- !!			end-->
 				<<actCLA 'Really?'>>
 					<<image "shared/sex/after/pillow_talk2.jpg">>
-					<<if getvar("$pc.pcs_cupsize") <= 15>>
+					<<if $pc.pcs_cupsize <= 15>>
 						<p>"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You don't think they're too small?"</p>
 						<<if $npcs.get($boy,'tit_pref') == 1>>
 							"I love all tits," he says, bowing his head to kiss along the side of your breast. "But I love small tits like yours most of all."
@@ -90,7 +90,7 @@
 						<<else>>
 							"Boobs are boobs," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."
 						<</if>>
-					<<elseif getvar("$pc.pcs_cupsize") > 25>>
+					<<elseif $pc.pcs_cupsize > 25>>
 						<p>"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You don't think they're too too big?"</p>
 						<<if $npcs.get($boy,'tit_pref') == 1>>
 							"I prefer smaller boobs to bigger ones," he admits but smiles at you. "But tits are tits. I love them all."
@@ -298,7 +298,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'plans_later'>>
 	<<if getvar("$booty_call['plans_later_talk']") == 0 and getvar("$booty_call['what_do_today']") == 0>>
-		<<if getvar("$time.hour") < 14 and getvar("$time.hour") >= 5>>
+		<<if $time.hour < 14 and $time.hour >= 5>>
 			<<actCLA 'What`re you up to later?'>>
 				<<setinit $booty_call['plans_later_talk'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
@@ -307,7 +307,7 @@
 					<p>"Not really," he shrugs. "It's my day off so I'm just chilling. What about you?"</p>
 					<<gs 'booty_call_pillow_talk2' 'pc_plans_later'>>
 				<<else>>
-					<<if $npcs.get($boy,'end_free_time') >= $time.hour and getvar("$time.hour") > 0>>
+					<<if $npcs.get($boy,'end_free_time') >= $time.hour and $time.hour > 0>>
 						"I have to go to work after this," he says, checking the time. "Shit, I'm gonna be late. I gotta get going now."
 						<p><<=$npcs.get($boy,'firstname')>> hauls himself out of bed and you guess you should do the same.</p>
 						<<setinit $booty_call['npc_late'] = 1>>
@@ -318,7 +318,7 @@
 					<</if>>
 				<</if>>
 			<</actCLA>>
-		<<elseif getvar("$time.hour") >= 20>>
+		<<elseif $time.hour >= 20>>
 			<<actCLA 'What`d you do today?'>>
 				<<setinit $booty_call['what_do_today'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
@@ -357,14 +357,14 @@
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
-	<<if (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") == 0 and $npcs.get('A23','pregtalk') == 0 and getvar("$starlets_on") == 1 and getvar("$time.hour") < 15) or getvar("$gsAboDance") > 0 or (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") != 0)>>
+	<<if (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") == 0 and $npcs.get('A23','pregtalk') == 0 and getvar("$starlets_on") == 1 and $time.hour < 15) or getvar("$gsAboDance") > 0 or (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") != 0)>>
 		<<actCLA 'Dance practice'>>
 			"I have dance practice later," you reply.
 			<<gs 'booty_call_pillow_talk2' 'dance_talk'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$time.hour") > 16>>
-		<<if $region == 'pav' and (getvar("$time.weekday") == 5 or getvar("$time.weekday") == 6)>>
+	<<if $time.hour > 16>>
+		<<if $region == 'pav' and ($time.weekday == 5 or $time.weekday == 6)>>
 			<<actCLA 'Disco'>>
 				<<setinit $booty_call['disco_after'] = 1>>
 				"Thinking about going to the disco later," you reply.
@@ -475,20 +475,20 @@
 		"I didn''t do much. Just you," you smirk back.
 		<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 	<</actCLA>>
-	<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+	<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 		<<actCLA 'School'>>
 			"I spent most of the day in class," you shrug. "It's school. It's whatever."
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
-	<<if $pc.isSchoolStudent and getvar("$q.school.homeworkLeft") == 0 and getvar("$time.isSchoolHoliday") == 0>>
+	<<if $pc.isSchoolStudent and getvar("$q.school.homeworkLeft") == 0 and $time.isSchoolHoliday == 0>>
 		<<actCLA 'Homework'>>
 			"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."
 			<p>You give <<=$npcs.get($boy,'firstname')>> an affectionate smile.</p>
 			<<gs 'booty_call_pillow_talk2' 'small_talk'>>
 		<</actCLA>>
 	<</if>>
-	<<if (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") == 0 and $npcs.get('A23','pregtalk') == 0 and getvar("$starlets_on") == 1 and getvar("$time.hour") < 15) or (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") != 0)>>
+	<<if (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") == 0 and $npcs.get('A23','pregtalk') == 0 and getvar("$starlets_on") == 1 and $time.hour < 15) or (getvar("$AlbinaQW['StarletsJoined']") > 0 and getvar("$AlbinaQW['StarletsShutDown']") != 0)>>
 		<<actCLA 'Dance practice'>>
 			"I had dance practice today," you reply.
 			<<gs 'booty_call_pillow_talk2' 'dance_talk'>>
@@ -752,7 +752,7 @@
 <</if>>
 <!-- !! -------------------------- DICK TALK ------------------------------>
 <<if $location_var[$here][0] == 'dick_grab_image'>>
-	<<if getvar("$pc.pcs_pubes") < 12>>
+	<<if $pc.pcs_pubes < 12>>
 		<<image "shared/sex/after/dick_play1.jpg">>
 	<<else>>
 		<<image "shared/sex/after/dick_play2.jpg">>
@@ -790,7 +790,7 @@
 <</if>>
 <!-- !! -------------------------- DICK TALK ------------------------------>
 <<if $location_var[$here][0] == 'dick_grab_image'>>
-	<<if getvar("$pc.pcs_pubes") < 12>>
+	<<if $pc.pcs_pubes < 12>>
 		<<image "shared/sex/after/dick_play1.jpg">>
 	<<else>>
 		<<image "shared/sex/after/dick_play2.jpg">>
@@ -987,7 +987,7 @@
 				<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 				<<setinit $booty_call['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+				<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 					"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school today. My classmates are going to know you fucked me silly just by the way I walk," you giggle.
 				<<else>>
 					"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I'm going to walk funny for the rest of the day because of you," you giggle.
@@ -998,7 +998,7 @@
 				<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 				<<setinit $booty_call['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+				<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 					"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school. I'm going to have a hard time sitting through class the rest of the day."
 				<<else>>
 					"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I'm going to have a hard time sitting down today."
@@ -1017,7 +1017,7 @@
 				<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 				<<setinit $booty_call['morning_sore_pussy'] = 1>>
 				<<image "shared/sex/after/pillow_talk1.jpg">>
-				<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6>>
+				<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6>>
 					<p>"How am I going to get through my classes today?" you say, giving <<=$npcs.get($boy,'firstname')>> a loopy smile. "If I fall asleep in school today, it's your fault."</p>
 					<p>"I'll take credit for that," <<=$npcs.get($boy,'firstname')>> grins.</p>
 				<<else>>
@@ -1034,21 +1034,21 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'wakeup_sex_late_for_school'>>
-	<<if getvar("$booty_call['late_for_school']") == 0 and getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6 and (getvar("$time.hour") == 7 or getvar("$time.hour") == 8)>>
+	<<if getvar("$booty_call['late_for_school']") == 0 and $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6 and ($time.hour == 7 or $time.hour == 8)>>
 		<<actCLA 'Late for school'>>
 			<<setinit $booty_call['late_for_school'] = 1>>
 			<<gs 'booty_call_pillow_talk' 'talk_time_add'>>
 			<<video "shared/sex/after/check_phone1.mp4">>
 			You reach over to the bedside table, checking the time on your phone.
 			<<gs 'shortgs' 'calendar_display'>>
-			<<if getvar("$time.hour") < 8>>
+			<<if $time.hour < 8>>
 				"Damn," you mutter. "I might be late for school cause of that."
 				<<if $npcs.get($boy,'caretaker') == 1>>
 					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, looking genuinely apologetic.</p>
 				<<else>>
 					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, the grin on his face making him look like he doesn't mean it at all.</p>
 				<</if>>
-				<<if getvar("$time.minutes") <= 30 and $region == 'pav' and getvar("$time.hour") == 7>>
+				<<if $time.minutes <= 30 and $region == 'pav' and $time.hour == 7>>
 					<<actCLA 'I might still make it'>>
 						"I might still make it yet," you smile. "I just need to hurry."
 						<<gs 'booty_call_pillow_talk' 'topics'>>
@@ -1073,7 +1073,7 @@
 						<<gs 'booty_call_pillow_talk' 'topics'>>
 					<</actCLA>>
 				<</if>>
-			<<elseif getvar("$time.hour") == 8>>
+			<<elseif $time.hour == 8>>
 				"Shit," you curse. "I'm late for school."
 				<<if $npcs.get($boy,'caretaker') == 1>>
 					<p>"Sorry," <<=$npcs.get($boy,'firstname')>> says, looking genuinely apologetic.</p>

+ 3 - 3
sugarcube/src/activities/bootycall/booty_call_reactions.tw

@@ -8,7 +8,7 @@
 			<<gs 'booty_call_reactions' 'react_menu'>>
 		<</actCLA>>
 	<</if>>
-	<<if (getvar("$booty_call['orgasm_count']") >= 5 or getvar("$pc.pcs_sleep") < 20) and (getvar("$time.hour") >= 20 or getvar("$time.hour") < 5)>>
+	<<if (getvar("$booty_call['orgasm_count']") >= 5 or $pc.pcs_sleep < 20) and ($time.hour >= 20 or $time.hour < 5)>>
 		<<actCLA 'Collapse'>>
 			<<gt 'booty_call_after' 'black_out'>>
 		<</actCLA>>
@@ -1552,7 +1552,7 @@
 				"Too much mess"
 				<<gs 'booty_call_sex' 'sex_end'>>
 			<</actCLA>>
-			<<if getvar("$pc.pcs_makeup") > 1>>
+			<<if $pc.pcs_makeup > 1>>
 				<<actCLA 'It`ll ruin my makeup'>>
 					<!-- !! IMAGE HERE-->
 					<<setinit $booty_call['makeup_ruin'] = 1>>
@@ -2115,7 +2115,7 @@
 			<p>"I need to get a morning after pill!"</p>
 			<p>"Right now?!"</p>
 			<p>"Right now!!! I can't wait even one minute! I can't get knocked up!"</p>
-			<<if getvar("$time.hour") >= 21>>
+			<<if $time.hour >= 21>>
 				<p>"No pharmacy is open this time of night! Stop freaking out! Y-"</p>
 				<p>"Can'ttalkgottago!"</p>
 				You don't wait to hear what he was trying to say and dash out the door.

+ 8 - 8
sugarcube/src/activities/bootycall/booty_call_sex.tw

@@ -1009,20 +1009,20 @@
 <<if $location_var[$here][0] == 'pain'>>
 	<<if getvar("$booty_call['speed']") != 3>>
 		<<if $npcs.get($boy,'dick_desc') == 'lengthy'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<<else>>
 				<<gs 'pain' 1 'cervix' 'hit'>>
 			<</if>>
 		<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 				<<gs 'pain' 1 'vaginal' 'stretch'>>
 			<<else>>
 				<<gs 'pain' 1 'cervix' 'hit'>>
 			<</if>>
 		<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
 			<<else>>
@@ -1032,20 +1032,20 @@
 		<</if>>
 	<<else>>
 		<<if $npcs.get($boy,'dick_desc') == 'lengthy'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 			<<else>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<</if>>
 		<<elseif $npcs.get($boy,'dick_desc') == 'gigantic'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
 			<<else>>
 				<<gs 'pain' 2 'cervix' 'hit'>>
 			<</if>>
 		<<elseif $npcs.get($boy,'dick_desc') == 'monster'>>
-			<<if getvar("$pc.pcs_vag") <= 20>>
+			<<if $pc.pcs_vag <= 20>>
 				<<gs 'pain' 3 'cervix' 'hit'>>
 				<<gs 'pain' 2 'vaginal' 'stretch'>>
 			<<else>>
@@ -1342,7 +1342,7 @@
 		<<setinit $booty_call['sleep_video1'] = '<<video "shared/sex/sleep/fastrand(1,2).mp4">>'>>
 		<<setinit $booty_call['sleep_video2'] = '<<video "shared/sex/sleep/fast2.mp4">>'>>
 	<</if>>
-	<<if getvar("$time.dayStage") == 2>>
+	<<if $time.dayStage == 2>>
 		<<image "shared/sex/vag/miss/2.jpg">>
 		<i>Mmmmmmm...</i>
 		Your consciousness stirs. A bright light shines on your eyelids. Must be the sun coming through the window. But also, what''s that between your...
@@ -1415,7 +1415,7 @@
 	<<setinit $booty_call['start_time'] = $totminut>>
 	<<setinit $booty_call['wakeup_fuck'] = 1>>
 	<<setinit $booty_call['position'] = 'miss'>>
-	<<if getvar("$time.dayStage") == 2>>
+	<<if $time.dayStage == 2>>
 		<<video "shared/sex/vag/miss/med1.mp4">>
 	<<else>>
 		<<video "shared/sex/sleep/wake2.mp4">>

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

@@ -15,42 +15,42 @@
 <</if>>
 <<if $location_var[$here][0] == 'neighborhood_image'>>
 	<<if $loc == 'pav_residential'>>
-		<<if getvar("$time.month") >= 11 or getvar("$time.month") <= 3>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+		<<if $time.month >= 11 or $time.month <= 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/pavlovsk/pavreswinter.jpg">>
 			<<else>>
 				<<image "locations/pavlovsk/pavreswintern.jpg">>
 			<</if>>
 		<<else>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/pavlovsk/pavres.jpg">>
 			<<else>>
 				<<image "locations/pavlovsk/pavresn_#.jpg" 1 2>>
 			<</if>>
 		<</if>>
 	<<elseif $loc == 'city_residential'>>
-		<<if getvar("$time.month") >= 11 or getvar("$time.month") <= 3>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+		<<if $time.month >= 11 or $time.month <= 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/city/residential/streetw.jpg">>
 			<<else>>
 				<<image "locations/city/residential/streetwn.jpg">>
 			<</if>>
 		<<else>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/city/residential/street.jpg">>
 			<<else>>
 				<<image "locations/city/residential/street_night.jpg">>
 			<</if>>
 		<</if>>
 	<<elseif $loc == 'city_center'>>
-		<<if getvar("$time.month") >= 11 or getvar("$time.month") <= 3>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+		<<if $time.month >= 11 or $time.month <= 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/city/citycenter/downw.jpg">>
 			<<else>>
 				<<image "locations/city/citycenter/downwn.jpg">>
 			<</if>>
 		<<else>>
-			<<if getvar("$time.dayStage") == 2 or getvar("$time.dayStage") == 3>>
+			<<if $time.dayStage == 2 or $time.dayStage == 3>>
 				<<image "locations/city/citycenter/down.jpg">>
 			<<else>>
 				<<image "locations/city/citycenter/down_night.jpg">>
@@ -75,7 +75,7 @@
 <<if $location_var[$here][0] == 'begin'>>
 	<<set $location_type = 'event'>>
 	<<gs 'themes' 'indoors'>>
-	<<if getvar("$time.minutes") > 45>>
+	<<if $time.minutes > 45>>
 		<<setinit $booty_call['start_hour'] = $time.hour + 1>>
 	<<else>>
 		<<setinit $booty_call['start_hour'] = $time.hour>>
@@ -187,7 +187,7 @@
 	<<gs 'booty_call_start' 'begin'>>
 	<<=$npcs.get($boy,'apt_hall')>>
 	<p>You knock on the door and <<=$npcs.get($boy,'firstname')>> opens up.</p>
-	<<if getvar("$pc.pcs_sweat") > 29>>
+	<<if $pc.pcs_sweat > 29>>
 		<!-- !!		if AlbinaQW['startletsday'] = daystart:-->
 		<<actCLA 'Didn`t have time'>>
 			"I didn''t have time," you smile. "I came as soon as I saw your message."
@@ -232,9 +232,9 @@
 		<</actCLA>>
 		<<gs 'booty_call_start' 'couldnt_wait'>>
 		<!-- !!		end-->
-		<<if getvar("$pc.pcs_sweat") > 39>>
+		<<if $pc.pcs_sweat > 39>>
 			<p>"What the fuck?" he says, wrinkling his nose. "You stink."</p>
-		<<elseif getvar("$pc.pcs_sweat") > 29>>
+		<<elseif $pc.pcs_sweat > 29>>
 			"Hey," he says, looking up and down at you in amusement. "You're soaking wet."
 			<<if $pc.horny >= 70>>
 				<<actCLA 'Yeah'>>
@@ -274,7 +274,7 @@
 				<<gt 'booty_call_start' 'undress'>>
 			<</actCLA>>
 		<</actCLA>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<actCLA 'Don`t mess up my makeup'>>
 				<<setinit $booty_call['dont_ruin_makeup'] = 1>>
 				<<=$npcs.get($boy,'apt_hall')>>
@@ -313,7 +313,7 @@
 						<</actCLA>>
 					<</actCLA>>
 				<</if>>
-				<<if getvar("$time.hour") >= 18 and $region == 'pav' and (getvar("$time.weekday") == 5 or getvar("$time.weekday") == 6)>>
+				<<if $time.hour >= 18 and $region == 'pav' and ($time.weekday == 5 or $time.weekday == 6)>>
 					<<actCLA 'I`m going to the disco'>>
 						<<=$npcs.get($boy,'apt_hall')>>
 						<<setinit $booty_call['disco_after'] = 1>>
@@ -943,7 +943,7 @@
 		<<video "shared/sex/cum/mouth/swallow5.mp4">>
 		<<setinit $booty_call['last_cum'] = 'mouth'>>
 		<<setinit $booty_call['cum_mouth_surprise'] = 1>>
-		<<if getvar("$pc.pcs_throat") <= 10>>
+		<<if $pc.pcs_throat <= 10>>
 			<p>Without any warning <<=$npcs.get($boy,'firstname')>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you're about to protest, something spurts out into your throat.</p>
 		<<else>>
 			<p>Without any warning <<=$npcs.get($boy,'firstname')>> grabs your head and shoves it down to the base of his cock. You've sucked enough dick that it doesn't cause any real problems for you, though a little warning would have been nice. And then something spurts directly into the back of your throat.</p>
@@ -1335,7 +1335,7 @@
 		<<gs 'booty_call_sex' 'sex_end'>>
 		<!-- !!		gs 'booty_call_after', 'wipe_tits'-->
 	<</actCLA>>
-	<<if getvar("$pc.tits") > 1>>
+	<<if $pc.tits > 1>>
 		<<actCLA 'Finish him with your tits'>>
 			<<setinit $booty_call['cum_tits'] = 1>>
 			<<setinit $booty_call['cum_count'] += 1>>
@@ -1378,7 +1378,7 @@
 	<<video "shared/sex/cum/mouth/swallow5.mp4">>
 	<p>"No than-" You start trying to tell him you won't do it when he violently grabs your head and forces you back onto his cock.</p>
 	"I wasn''t asking."
-	<<if getvar("$pc.pcs_makeup") > 1>>
+	<<if $pc.pcs_makeup > 1>>
 		<<set $pc.pcs_makeup = 0>>
 		Semen spills into your mouth and you struggle against him, trying to pull away but he holds you firmly onto his manhood. Tears stream from your eyes, running down your face and ruining your makeup in black rivers. All you can do is briefly cough as cum continues to fill your mouth.
 	<<else>>
@@ -1476,7 +1476,7 @@
 		<<=$npcs.get($boy,'apt_bedroom')>>
 		<p>"Hmph!" you tug your chin out of his grasp, internally grumbling to yourself, but you don't press the issue any further.</p>
 		<<gs 'booty_call_sex' 'sex_end'>>
-		<<if getvar("$pc.pcs_vag") != 0 or (getvar("$booty_call['virgin']") < 1 and getvar("$know_virgin["+$boy+"]") < 1) and getvar("$booty_call['no_sex']") != 1>>
+		<<if $pc.pcs_vag != 0 or (getvar("$booty_call['virgin']") < 1 and getvar("$know_virgin["+$boy+"]") < 1) and getvar("$booty_call['no_sex']") != 1>>
 			<<actCLA 'Can we have sex now?'>>
 				<<video "shared/sex/misc/wait.mp4">>
 				<p>"Can we have sex now?" you ask, maybe letting a little more exhasperation into your voice than you meant to.</p>

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

@@ -90,7 +90,7 @@
 		<<setn $npc_sleep_fuck += 1>>
 
 	<</if>>
-	<<if getvar("$time.hour") >= 8 and getvar("$time.hour") < 14 and getvar("$time.weekday") < 6 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and getvar("$time.isSchoolHoliday") == 0 and $schoolProgulDay != $time.daystart>>
+	<<if $time.hour >= 8 and $time.hour < 14 and $time.weekday < 6 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and $time.isSchoolHoliday == 0 and $schoolProgulDay != $time.daystart>>
 		<!-- !!absence from school-->
 		<<run $npcs.set($boy,'school_absences',$schoolprogul)>>
 	<</if>>

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

@@ -193,7 +193,7 @@
 		<</if>>
 		<<gs 'booty_call_pillow_talk' 'topics'>>
 	<</actCLA>>
-	<<if getvar("$finances.cash") >= 740>>
+	<<if $finances.cash >= 740>>
 		<<actCLA 'I have enough money'>>
 			<<setinit $take_morning_after[$boy] = $time.daystart>>
 			"No," you shake your head. "You don't have to do that. I have enough money to buy a pill myself."

+ 10 - 10
sugarcube/src/activities/dating/lover_meet.tw

@@ -277,35 +277,35 @@
 	<!-- !! QUEST VARIABLES!!! WOOOT ALMOST TIME!-->
 	<<set $didPushAway = 0>>
 	<!-- !!How beautiful you are-->
-	<<if getvar("$pc.pcs_skin") < 20>>
+	<<if $pc.pcs_skin < 20>>
 		<<setinit $loverrelation[$lover_number] -= 2>> <<set $meetskin = 'looking at $tXyr feet'>>
-	<<elseif getvar("$pc.pcs_skin") < 40>>
+	<<elseif $pc.pcs_skin < 40>>
 		<<setinit $loverrelation[$lover_number] -= 1>> <<set $meetskin = 'giving you a quick glance'>>
-	<<elseif getvar("$pc.pcs_skin") < 60>>
+	<<elseif $pc.pcs_skin < 60>>
 		<<set $meetskin = 'looking at you'>>
-	<<elseif getvar("$pc.pcs_skin") < 80>>
+	<<elseif $pc.pcs_skin < 80>>
 		<<setinit $loverrelation[$lover_number] += 1>> <<set $meetskin = 'smiling at you'>>
 	<<else>>
 		<<setinit $loverrelation[$lover_number] += 2>> <<set $meetskin = 'smiling at you'>>
 	<</if>>
 	<!-- !! Your lip size-->
-	<<if getvar("$pc.lip_size") == 0>>
+	<<if $pc.lip_size == 0>>
 		<<set $meetlip = 'thin lips'>>
 
 	<</if>>
-	<<if getvar("$pc.lip_size") == 1>>
+	<<if $pc.lip_size == 1>>
 		<<set $meetlip = 'soft lips'>>
 
 	<</if>>
-	<<if getvar("$pc.lip_size") == 2>>
+	<<if $pc.lip_size == 2>>
 		<<set $meetlip = 'plump lips'>>
 
 	<</if>>
-	<<if getvar("$pc.lip_size") == 3>>
+	<<if $pc.lip_size == 3>>
 		<<set $meetlip = 'large, plump lips'>>
 
 	<</if>>
-	<<if getvar("$pc.lip_size") == 4>>
+	<<if $pc.lip_size == 4>>
 		<<set $meetlip = 'thick and huge lips'>>
 
 	<</if>>
@@ -1121,7 +1121,7 @@
 			<</actCLA>>
 		<<elseif getvar("$loverGender["+$lover_number+"]") == 1>>
 			<<set $telsob = '$loverdesc[$lover_number]'>>
-			<<if getvar("$time.month") > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
+			<<if $time.month > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
 				<<actCLA 'Invite to the park'>>
 					<<gt 'parksvid'>>
 				<</actCLA>>

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

@@ -389,7 +389,7 @@
 	<!-- !! Add Lovers-->
 	<<set $i = 0>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :telefonIncLoop2'>>
-	<<if getvar("$i") < 3 and getvar("$time.hour") > 5 and getvar("$time.hour") < 20>>
+	<<if getvar("$i") < 3 and $time.hour > 5 and $time.hour < 20>>
 		<<if getvar("$pcs_lovers["+$i+"]") == 1 and getvar("$svidanie["+$i+"]") == 0 and $loverday[$i] != $time.daystart and rand(1,100) > 95>>
 			<<set $j = arrsize('$telefIncCall')>>
 			<!-- FAILED TO CONVERT
@@ -523,7 +523,7 @@
 			<<gt 'telefon' 'NPCCallsForDate' $Call4Date["ContactIndex"]>>
 		<</actCLA>>
 	<</actCLA>>
-	<<if getvar("$time.month") > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
+	<<if $time.month > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
 		<<actCLA 'Invite to the park'>>
 			"Let''s go for a walk in the park."
 			<<if $Call4Date["willAgree"]>>
@@ -633,7 +633,7 @@
 	<<actCLA 'Answer'>>
 		<p>"Pretty good, you?"</p>
 		<p>$Call4Date["CallerName"], "Great, but I kind of miss you, can we meet today?"</p>
-		<<if getvar("$time.weekday") > 1 and getvar("$time.weekday") < 5 and getvar("$workKafe['job']") == 1>>
+		<<if $time.weekday > 1 and $time.weekday < 5 and getvar("$workKafe['job']") == 1>>
 			<<actCLA 'Sorry, I`m working today'>>
 				"Sorry, I'm working today."
 				<p>$Call4Date["CallerName"], "Okay, I'll call tomorrow."</p>
@@ -709,13 +709,13 @@
 <</if>>
 <<if $location_var[$here][0] == 'start'>>
 	<<gs 'telefon' 'phone_call_receive'>>
-	<<if $npcs.get('A192','QW') == 1 and getvar("$time.weekday") == 6 and getvar("$pc.pcs_apprnc") > 80>>
+	<<if $npcs.get('A192','QW') == 1 and $time.weekday == 6 and $pc.pcs_apprnc > 80>>
 		<<gt 'nastja' 'pos4'>>
-	<<elseif $npcs.get('A192','QW') == 2 and getvar("$time.weekday") != 6 and getvar("$zenit") != 0 and $nastjaday != $time.daystart>>
+	<<elseif $npcs.get('A192','QW') == 2 and $time.weekday != 6 and getvar("$zenit") != 0 and $nastjaday != $time.daystart>>
 		<<gt 'nastja' 'pos13'>>
-	<<elseif getvar("$time.hour") >= 8 and getvar("$time.hour") <= 20 and $npcs.get('A192','QW') == 2 and getvar("$time.weekday") == 6 and getvar("$pc.pcs_apprnc") > 80 and $nastjaday != $time.daystart>>
+	<<elseif $time.hour >= 8 and $time.hour <= 20 and $npcs.get('A192','QW') == 2 and $time.weekday == 6 and $pc.pcs_apprnc > 80 and $nastjaday != $time.daystart>>
 		<<gt 'nastja' 'pos12'>>
-	<<elseif $npcs.get('A192','QW') == 5 and getvar("$time.weekday") == 6 and $nastjaday != $time.daystart>>
+	<<elseif $npcs.get('A192','QW') == 5 and $time.weekday == 6 and $nastjaday != $time.daystart>>
 		<<gt 'nastja' 'pos22'>>
 	<<elseif $npcs.get('A192','QW') == 6 and $nastjaday != $time.daystart>>
 		<<gt 'nastja' 'pos31'>>
@@ -728,9 +728,9 @@
 	<<gs 'telefon' 'phone_ring'>>
 	<<if getvar("$vladimirQW") == 20>>
 		<<gt 'qwloc' '2'>>
-	<<elseif getvar("$vladimirQW") == 25 and getvar("$time.weekday") == 6>>
+	<<elseif getvar("$vladimirQW") == 25 and $time.weekday == 6>>
 		<<gt 'qwloc' '3'>>
-	<<elseif getvar("$vladimirQW") == 35 and getvar("$time.weekday") == 6>>
+	<<elseif getvar("$vladimirQW") == 35 and $time.weekday == 6>>
 		<<gt 'qwloc' '4'>>
 	<</if>>
 <</if>>
@@ -879,7 +879,7 @@
 	<<gs 'telefon' 'phone_call_receive'>>
 	<<set $willAgree = (rand(0, 10) > 3)>>
 	"Yes, I'm listening," says a voice from the speaker.
-	<<if getvar("$time.month") > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
+	<<if $time.month > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
 		<<actCLA 'Invite to the park'>>
 			"Let''s go for a walk in the park."
 			<<if $willAgree>>
@@ -953,7 +953,7 @@
 	<<gs 'telefon' 'phone_call_receive'>>
 	<<set $willAgree = (rand(0, 10) > 3)>>
 	"Yes, I'm listening," says a voice from the speaker.
-	<<if getvar("$time.month") > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
+	<<if $time.month > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
 		<<actCLA 'Invite to the park'>>
 			"Let''s go for a walk in the park."
 			<<if $willAgree>>
@@ -1032,7 +1032,7 @@
 	<<gs 'telefon' 'phone_call_receive'>>
 	<<set $willAgree = (rand(0, 10) > 3)>>
 	"Yes, I'm listening," says a voice from the speaker.
-	<<if getvar("$time.month") > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
+	<<if $time.month > 5 and getvar("$temper") > 20 and getvar("$sunWeather") == 1>>
 		<<actCLA 'Invite to the park'>>
 			"Let''s go for a walk in the park."
 			<<if $willAgree>>
@@ -1126,7 +1126,7 @@
 	<<actCLA 'Reply'>>
 		<p>"Pretty good, you?"</p>
 		<p>$loverdesc[$lover_number], "Great, but I kind of miss you, can we meet today?"</p>
-		<<if ($pc.pregchem / 24) <= $lover_days and getvar("$pc.knowpreg") == 1 and getvar("$pc.pregtalk") == 0>>
+		<<if ($pc.pregchem / 24) <= $lover_days and $pc.knowpreg == 1 and getvar("$pc.pregtalk") == 0>>
 			<<actCLA 'Tell him he`s going to be a dad'>>
 				<<set $pc.pregtalk = 1>>
 				"Honey, I'm pregnant with your child."
@@ -1180,7 +1180,7 @@
 					<</actCLA>>
 				<</if>>
 			<</actCLA>>
-		<<elseif ($pc.pregchem / 24) > $lover_days and getvar("$pc.knowpreg") == 1 and getvar("$pc.pregtalk") == 0>>
+		<<elseif ($pc.pregchem / 24) > $lover_days and $pc.knowpreg == 1 and getvar("$pc.pregtalk") == 0>>
 			<<actCLA 'Honey, you will soon become a dad'>>
 				<<setinit $loverrelation[$lover_number] = 0>>
 				"Honey, I'm pregnant with your child."
@@ -1189,7 +1189,7 @@
 					<<gt 'telefon' 'fin'>>
 				<</actCLA>>
 			<</actCLA>>
-		<<elseif getvar("$time.weekday") > 1 and getvar("$time.weekday") < 5 and getvar("$workKafe['job']") == 1>>
+		<<elseif $time.weekday > 1 and $time.weekday < 5 and getvar("$workKafe['job']") == 1>>
 			<<actCLA 'Sorry, I`m working today'>>
 				"Sorry, I'm working today."
 				<p>$loverdesc[$lover_number], "Okay, I'll call tomorrow."</p>
@@ -1725,7 +1725,7 @@ $ARGS[2] is for flashing when clothed if left blank then it is not flashing
 } -->
 <<if $location_var[$here][0] == 'Phone_selfie_image'>>
 	<<if $location_var[$here][2] == ''>>
-		<<if getvar("$wardrobe.PCloswimwear") == 1>>
+		<<if $wardrobe.PCloswimwear == 1>>
 			<!-- !!changing to and unmixed variable so the rng will work-->
 			<<if getvar("$Enable_Android") == 1>>
 				<<set temp_swim = $selfieSwimtot[arrpos(''$selfieLoc'', $ARGS[1],1)]>>
@@ -1986,7 +1986,7 @@ $ARGS[2] is for flashing when clothed if left blank then it is not flashing
 		<<else>>
 			<<set $locIndex = arrpos(1, '$selfieLoc', $phone_loc)>>
 		<</if>>
-		<<if (getvar("$pc.pcs_inhib") >= 35 or getvar("$exhibitionist_lvl") > 0 or $phone_loc == 'bedroom') and dyneval("result = <<selfieTitflash[$locIndex]>>") > 0>>
+		<<if ($pc.pcs_inhib >= 35 or getvar("$exhibitionist_lvl") > 0 or $phone_loc == 'bedroom') and dyneval("result = <<selfieTitflash[$locIndex]>>") > 0>>
 			<<setinit $telefon['body'] += '<a href="exec:gs 'exp_gain' , 'photoskl' , 1>> <<gs 'telefon' 'Phone_camera_selfie' '$phone_loc' 'tits' "><b>Flash your tits for a selfie</b></a><br>'>>
 		<</if>>
 		<<if (getvar("$exhibitionist_lvl") > 0 or $phone_loc == 'bedroom') and dyneval("result = <<selfieAssflash[$locIndex]>>") > 0>>

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

@@ -291,7 +291,7 @@
 					<<gs 'gschool_nerd_chats' 'julia_tampon'>>
 				<</actCLA>>
 			<</if>>
-		<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+		<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 			<<actCLA 'Ask for a tampon'>>
 				<<setinit $temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 				<<gs 'gschool_nerd_chats' 'julia_tampon'>>

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

@@ -10,7 +10,7 @@
 			<<set $VK = rand(1,5)>>
 			<<image "locations/pavlovsk/school/classroom/phone.jpg">>
 			The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the class to finally be over. You decide to play on your phone to pass the time.
-			<<if getvar("$VK") == 1 and ($q.christina?.get('fight') == -1 or $q.christina?.get('subpath') >= 2) and getvar("$pc.salocatnow") >= 5>>
+			<<if getvar("$VK") == 1 and ($q.christina?.get('fight') == -1 or $q.christina?.get('subpath') >= 2) and $pc.salocatnow >= 5>>
 				<<gs 'npc_relationship' 'modify' 'A18' 'loathe'>>
 				<p>As you're browsing the web, you receive a text message from <<npc 'A18'>><</npc>> reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don't you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face flushing in embarrassment while reading <<npc 'A18'>><</npc>>'s hurtful comments. You quickly turn off your phone and try not to make eye contact with <<npc 'A18'>><</npc>> for the rest of the lesson.</p>
 				<<actCLA 'Wait for the end of the lesson'>>
@@ -138,7 +138,7 @@
 		Some of the boys stop what they're doing when it's your turn, coming over to shout some words of support.
 
 	<</if>>
-	<<if getvar("$pc.pcs_cupsize") <= 20>>
+	<<if $pc.pcs_cupsize <= 20>>
 		<<if getvar("$pc.vitality") <= 30>>
 			<<run $q.school.func('groupRelInc','jocks',-1)>>
 			You're barely able to do more than a few before you are just too tired. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you're made to give it a few more tries.
@@ -156,7 +156,7 @@
 		<<actCLA 'End of lesson'>>
 			<<gt 'gschool_lessons4' 'postphys'>>
 		<</actCLA>>
-	<<elseif getvar("$pc.pcs_cupsize") <= 60>>
+	<<elseif $pc.pcs_cupsize <= 60>>
 		<<video "locations/pavlovsk/school/gym/jumprb.mp4">>
 		<<if getvar("$pc.vitality") <= 30>>
 			<<run $q.school.func('groupRelInc','jocks',-1)>>
@@ -390,7 +390,7 @@
 			<</actCLA>>
 		<</if>>
 	<<elseif getvar("$gymshower") >= 5 and getvar("$gymshower") <= 7>>
-		<<if getvar("$pc.pcs_pubes") >= 40>>
+		<<if $pc.pcs_pubes >= 40>>
 			<<gt 'gschool_lessons4' 'pube_bully'>>
 			<!-- !!		elseif grupTipe = 4 or grupTipe = 2:-->
 			<!-- !!-->
@@ -403,7 +403,7 @@
 		You pick one of the empty shower heads at random and turn the water on, letting it pour over you, and rinse the sweat from your body. After a tiring gym class, the hot water feels great, soothing your aching muscles and relaxing your mind. After a few minutes of enjoyment, you grab some soap and start lathering yourself up. You quickly become lost in the task, the sound of your scrubbing mixing with the squeak of faucets, the slap of your classmates feet across the tile floor, and the endless white noise of cascading water.
 		<<gs 'gschool_lessons4' 'shower_options'>>
 	<</if>>
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>>
 
 	<</if>>
@@ -1067,13 +1067,13 @@
 	<<actCLA 'Use the mirror'>>
 		<<gt 'mirror' 'start'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		<<actCLA 'Brush your hair'>>
 	<<gt 'mirror' 'brush'>>
 <</actCLA>>
 
 	<</if>>
-	<<if $inventory.get("deo") > 0 and getvar("$pc.deodorant_on") == 0>>
+	<<if $inventory.get("deo") > 0 and $pc.deodorant_on == 0>>
 		Your deodorant will last you for <b>$inventory.get("deo")</b> more <<plural $inventory.get("deo") "application." "applications.">>
 		<<actCLA 'Apply deodorant (0:01)'>>
 			<<set $menu_off = 1>>

+ 31 - 31
sugarcube/src/activities/school/gschool.tw

@@ -3,45 +3,45 @@
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'schedule'>>
 	<<if $q.school.period == 0>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: Math
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: English
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: Math
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: English
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: Math
 
 		<</if>>
 		<!-- !'8.00 - 8.45'-->
 	<<elseif $q.school.period == 1>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: Russian
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: Geography
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: Russian
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: Geography
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: Russian
 
 		<</if>>
@@ -50,45 +50,45 @@
 		<b>Next</b>: Morning break
 		<!-- !'9.35 - 9.55'-->
 	<<elseif $q.school.period == 3>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: Literature
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: Science
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: Biology
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: Science
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: Literature
 
 		<</if>>
 		<!-- !'9.55 - 10.40'-->
 	<<elseif $q.school.period == 4>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: Art
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: Shop
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: History
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: Shop
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: Art
 
 		<</if>>
@@ -97,45 +97,45 @@
 		<b>Next</b>: Lunch break
 		<!-- !'11.30 - 12.25'-->
 	<<elseif $q.school.period == 6>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: Biology
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: Computer
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: Computer
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: Computer
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: History
 
 		<</if>>
 		<!-- !'12.25 - 13.10'-->
 	<<elseif $q.school.period == 7>>
-		<<if getvar("$time.weekday") == 1>>
+		<<if $time.weekday == 1>>
 			<b>Next period</b>: P.E.
 
 		<</if>>
-		<<if getvar("$time.weekday") == 2>>
+		<<if $time.weekday == 2>>
 			<b>Next period</b>: Music
 
 		<</if>>
-		<<if getvar("$time.weekday") == 3>>
+		<<if $time.weekday == 3>>
 			<b>Next period</b>: P.E.
 
 		<</if>>
-		<<if getvar("$time.weekday") == 4>>
+		<<if $time.weekday == 4>>
 			<b>Next period</b>: Music
 
 		<</if>>
-		<<if getvar("$time.weekday") == 5>>
+		<<if $time.weekday == 5>>
 			<b>Next period</b>: P.E.
 
 		<</if>>
@@ -143,7 +143,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'weekly grade update'>>
-	<<if getvar("$time.isSchoolHoliday") == 0 and getvar("$time.weekday") == 1 and getvar("$SchoolAtestat") == 0>>
+	<<if $time.isSchoolHoliday == 0 and $time.weekday == 1 and getvar("$SchoolAtestat") == 0>>
 		<<if getvar("$q.school.homeworkLeft") > 0 and getvar("$petka['homework']") == 1>>
 			<<run $q.school.func('homework','yes' $q.school.homeworkLeft 2 'A6')>>
 

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

@@ -1169,7 +1169,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'masturbateb4'>>
-	<<if getvar("$pc.pcs_inhib") < 40>>
+	<<if $pc.pcs_inhib < 40>>
 		<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 	<</if>>

+ 5 - 5
sugarcube/src/activities/school/gschool_break.tw

@@ -1128,7 +1128,7 @@
 				<<image "locations/pavlovsk/school/principal/officenaked.jpg">>
 				You take a deep breath and decide the girls need to be punished. "Some of the girls stripped me and stole my clothes."
 				<p>Ms. Volkov frowns at first, but her expression softens ever so slightly. "Which ones?"</p>
-				<<if getvar("$finances.cash") >= 2000 or ($gm_school[25] == 1 and getvar("$finances.cash") >= 200)>>
+				<<if $finances.cash >= 2000 or ($gm_school[25] == 1 and $finances.cash >= 200)>>
 					She sighs and gives you a minute to tell the truth. When you finish, she gets up and opens up a closet, looks around in it for a minute before she pulls out a cheap, conservative looking school uniform and hands it over to you. "Here is a replacement, your parents will be sent a bill for it. Now get dressed and be on your way."
 					<<if $gm_school[25] == 0>>
 						<<set $finances.cash -= 2000>>
@@ -1147,7 +1147,7 @@
 				<</if>>
 				<<run $wardrobe.wear_clothes_legacy('clothes','gm_school',25)>>
 				<<actCLA 'Leave her office'>>
-					<<if getvar("$time.hour") >= 14>>
+					<<if $time.hour >= 14>>
 						<<gt 'school_grounds'>>
 					<<else>>
 						<<gt 'gschool_lessons' 'short_break'>>
@@ -1162,7 +1162,7 @@
 					You take a deep breath and decide it would only make things worse for you if you snitch. "It was stupid. I accidentally spilled a bottle of water all over my clothes, so I went to the bathroom to dry them with the hand dryer. While I waited, I went to use the toilet and when I came back, they were gone. I don't know what happened to them."
 					Ms. Volkov frowns and her expression hardens ever so slightly. "If you don't tell me who is bullying you, I can't help. Don't think they will stop just because you didn''t tell me who it was."
 					You shake your head. "No one did this to me, at least no one I seen. I don't know what happened to my clothes. They just disappeared." you tell her, sticking to your story.
-					<<if getvar("$finances.cash") >= 2000 or ($gm_school[25] == 1 and getvar("$finances.cash") >= 200)>>
+					<<if $finances.cash >= 2000 or ($gm_school[25] == 1 and $finances.cash >= 200)>>
 						She sighs and gets up. She walks over to and opens up a closet, looks around in it for a minute and pulls out a cheap, conservative looking school uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."
 						<<if $gm_school[25] == 0>>
 							<<set $finances.cash -= 2000>>
@@ -1183,7 +1183,7 @@
 					<</if>>
 					<<run $wardrobe.wear_clothes_legacy('clothes','gm_school',25)>>
 					<<actCLA 'Leave her office'>>
-						<<if getvar("$time.hour") >= 14>>
+						<<if $time.hour >= 14>>
 							<<gt 'school_grounds'>>
 						<<else>>
 							<<gt 'gschool_lessons' 'short_break'>>
@@ -1200,7 +1200,7 @@
 		<p>You decide that it would be better to go home than to show up naked in front of the headmistress. You peek out one last time before stepping out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it outside. You could try and sneak home - it will take longer, but hopefully no one will see you. Or you can just run home while trying to hide your face and hope that no one recognizes you.</p>
 		<<actCLA 'Run home'>>
 			<<run $pc.fameInc('pav','sex',5)>>
-			<<if getvar("$time.month") > 3 and getvar("$time.month") < 11>>
+			<<if $time.month > 3 and $time.month < 11>>
 				<<image "locations/pavlovsk/naked/runhomenaked.jpg">>
 			<<else>>
 				<<image "locations/pavlovsk/naked/runhomenakedw.jpg">>

+ 11 - 11
sugarcube/src/activities/school/gschool_chats.tw

@@ -29,7 +29,7 @@
 	<<else>>
 		<<image "locations/pavlovsk/school/chat/nerd#.jpg" 1 3>>
 		<<if $q.school.func('isWearingSchoolUniform')>>
-			<<if getvar("$wardrobe.PCloInhibit") <= 10>>
+			<<if $wardrobe.PCloInhibit <= 10>>
 				<<run $q.school.func('groupRelInc','nerds',1)>>
 				<<if $pc.fame('pav_sex') > 0>>
 					<<run $pc.fameInc('pav','sex',-1)>>
@@ -44,7 +44,7 @@
 				<</if>>
 				Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they've moved together.
 				<<gs 'gschool_groups' 'nerds'>>
-			<<elseif getvar("$wardrobe.PCloSkirt") < 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
+			<<elseif $wardrobe.PCloSkirt < 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
 				<<gs 'npc_relationship' 'modify' 'A12' 'like'>>
 				<<gs 'npc_relationship' 'modify' 'A16' 'like'>>
 				<<if getvar("$grupTipe") == 3>>
@@ -54,7 +54,7 @@
 				<</if>>
 				Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they've moved together.
 				<<gs 'gschool_groups' 'nerds'>>
-			<<elseif getvar("$wardrobe.PCloSkirt") == 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
+			<<elseif $wardrobe.PCloSkirt == 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
 				<<run $q.school.func('groupRelInc','nerds',-1)>>
 				<<run $q.school.func('groupMembersRelInc','nerds',-1)>>
 				<<if $npcs.get('A25','slutStatus',0) > 0>>
@@ -133,7 +133,7 @@
 	<<else>>
 		<<image "locations/pavlovsk/school/chat/gopnik.jpg">>
 		<<if $q.school.func('isWearingSchoolUniform')>>
-			<<if getvar("$wardrobe.PCloInhibit") <= 10>>
+			<<if $wardrobe.PCloInhibit <= 10>>
 				<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>
 				<<if getvar("$grupTipe") == 4>>
 					<<run $q.school.func('groupRelInc','gopniks',-10)>>
@@ -152,7 +152,7 @@
 				<<actCLA 'Leave'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-			<<elseif getvar("$wardrobe.PCloSkirt") < 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
+			<<elseif $wardrobe.PCloSkirt < 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
 				<<if getvar("$grupTipe") == 4>>
 					You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.
 				<<else>>
@@ -167,7 +167,7 @@
 				<<actCLA 'Leave'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-			<<elseif getvar("$wardrobe.PCloSkirt") == 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
+			<<elseif $wardrobe.PCloSkirt == 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
 				<<run $q.school.func('groupRelInc','gopniks',5)>>
 				<<run $q.school.func('groupMembersRelInc','gopniks',1)>>
 				<<gs 'npc_relationship' 'modify' 'A143' 'like'>>
@@ -274,7 +274,7 @@
 		<<image "locations/pavlovsk/school/chat/cooljocks.jpg">>
 		When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know while the guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.
 		<<if $q.school.func('isWearingSchoolUniform')>>
-			<<if getvar("$wardrobe.PCloInhibit") <= 10>>
+			<<if $wardrobe.PCloInhibit <= 10>>
 				<<if $pc.fame('pav_sex') > 0>>
 					<<run $pc.fameInc('pav','sex',-1)>>
 
@@ -313,8 +313,8 @@
 				<<actCLA 'Leave'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-			<<elseif getvar("$wardrobe.PCloSkirt") < 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
-				<<if getvar("$wardrobe.PCloQuality") >= 4>>
+			<<elseif $wardrobe.PCloSkirt < 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
+				<<if $wardrobe.PCloQuality >= 4>>
 					<<run $q.school.func('groupRelInc','cool',1)>>
 					<<run $q.school.func('groupRelInc','jocks',1)>>
 					<<gs 'npc_relationship' 'modify' 'A1' 1>>
@@ -345,8 +345,8 @@
 						<<gt 'gschool_lessons' 'short_break'>>
 					<</actCLA>>
 				<</if>>
-			<<elseif getvar("$wardrobe.PCloSkirt") == 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
-				<<if getvar("$wardrobe.PCloQuality") >= 4>>
+			<<elseif $wardrobe.PCloSkirt == 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
+				<<if $wardrobe.PCloQuality >= 4>>
 					<<run $q.school.func('groupMembersRelInc','cool',1)>>
 					<<run $q.school.func('groupRelInc','cool',2)>>
 					<<run $q.school.func('groupMembersRelInc','jocks',1)>>

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

@@ -335,14 +335,14 @@
 					You head into the hall and into your corner. You watch the girls closely and copy their moves. You feel like you're getting better with each training session and Albina seems to think so too, even giving you a smile a few times as she observes you.
 					<!-- ! Sveta has to have attended practice for at least 2 weeks, it has to be Thursday and there''s a 33% chance it happens-->
 					<<if rand(0,9) == 0>>
-						<<if getvar("$cheerleadingQW['practice_count']") > 4 and getvar("$time.weekday") == 4 and ($time.daystart - ($time.daystart % 7)) % 2 == 1>>
+						<<if getvar("$cheerleadingQW['practice_count']") > 4 and $time.weekday == 4 and ($time.daystart - ($time.daystart % 7)) % 2 == 1>>
 							<<setinit $cheerleadingQW['backup_game'] = 1>>
 							<p>You finish practicing the last of your moves as Albina heads your way. "$pc.name_first, one of the girls has just gone and busted her ankle. I need you to stand in for her at the game tomorrow. Don't get ahead of yourself, you're only serving your purpose. So be here tomorrow after school."</p>
 							<p>Albina walks away, but your excited eagerness is suddenly shattered when she turns and glares directly at you. "Don't make me regret choosing you!"</p>
 							You are left with a slight feeling of dread within you.
 						<</if>>
 					<<elseif rand(0,8) == 0>>
-						<<if getvar("$cheerleadingQW['practice_count']") > 4 and getvar("$time.weekday") == 4 and ($time.daystart - ($time.daystart % 7)) % 2 == 1>>
+						<<if getvar("$cheerleadingQW['practice_count']") > 4 and $time.weekday == 4 and ($time.daystart - ($time.daystart % 7)) % 2 == 1>>
 							<<setinit $cheerleadingQW['backup_game'] = 1>>
 							'As you finish practicing on your own , Vicky cheerfully bounces up and greets you. "Hey $pc.name_nick , today is your lucky day! You get to replace me tomorrow!"
 							You stare at her and she quickly reassures you. "Don't worry , this isn''t a prank. I have... other things that need my attention tomorrow and Albina is fine with you covering for me. It's your job after all!" she giggles.
@@ -435,21 +435,21 @@
 			<<video "locations/pavlovsk/school/afterschool/cheerleading/opening.mp4">>
 			<!-- !! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else-->
 			<!-- !! the events could differ according to the season-->
-			<<if getvar("$time.month") >= 10>>
+			<<if $time.month >= 10>>
 				<<if getvar("$first_time_outside_in_cold_weather") == 0>>
 					There is a chill in the air and you shudder as you step outside in your thin outfit that does little to protect you from the elements. Despite the girls'' pleas, the football teams prefer the outdoor field to playing indoors and you are forced to perform outside, even during cold weather. Thankfully, performing your routine and then cheering from the sidelines helps keep you somewhat warm as you persevere with the vicious cold.
 					<<set $first_time_outside_in_cold_weather = 1>>
 				<<else>>
 					The cold chill in the air stings with a bitter fury as you step outside. For whatever reason, a few of your fellow cheerleaders have chosen not to wear a bra and their solid nipples are poking through the thin fabric of their outfits. You soldier through the biting cold and perform your routine before cheering from the sidelines for the rest of the game, which helps keep you somewhat warm.
 				<</if>>
-			<<elseif getvar("$time.month") <= 3>>
+			<<elseif $time.month <= 3>>
 				<<if getvar("$first_time_doing_basketball") == 0>>
 					Thankfully, the football team is on its winter break and you are now safely in the warm indoors performing for the basketball team. While performing your opening routine, you notice some of the players and spectators checking you and the other girls out. Some of them are just appreciating the show while others are hungrily undressing you with their eyes. They continue eying you up for the rest of the game as you cheer from the sidelines. You ignore them as best as you can, thankful that you are indoors and warm at least.
 					<<set $first_time_doing_basketball = 1>>
 				<<else>>
 					You head out into the hall and perform your opening routine for the crowd before the game starts and you cheer from the sidelines. You notice a few guys checking you and the other girls out, some of them undressing you with their eyes. You try your best to ignore them as the game continues.
 				<</if>>
-			<<elseif getvar("$time.month") == 4>>
+			<<elseif $time.month == 4>>
 				<<if getvar("$first_time_spring_football_match") == 0>>
 					Football has started back up and you're thankful that the weather has improved somewhat. You are no longer chilled to the bone, but the temperature picking up means you sweat a little more doing your routines. You're grateful for the bottles of refreshing cold water being passed out and relish as you quench your thirst.
 					<<set $first_time_spring_football_match = 1>>
@@ -459,9 +459,9 @@
 			Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.
 			<<actCLA 'Wait until the end of the game'>>
 				<<video "locations/pavlovsk/school/afterschool/cheerleading/closing.mp4">>
-				<<if getvar("$time.month") <= 3>>
+				<<if $time.month <= 3>>
 					The game comes to an end and you perform your closing routine to the crowd as the players make their way off the court. You join them after you finish and head into the locker room.
-				<<elseif getvar("$time.month") >= 10>>
+				<<elseif $time.month >= 10>>
 					You let out a sigh of relief when the game ends and after performing your closing routine, you all huddle together and make a dash for the warmth of the locker room.
 				<<else>>
 					The game ends and you perform your closing routine to the crowd as the players leave the field. You soon join them in returning to the locker room.
@@ -486,7 +486,7 @@
 <<if $location_var[$here][0] == 'shower'>>
 	<<set $time.minutes += 10>>
 	<<showerdin>>
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>>
 
 	<</if>>

+ 14 - 14
sugarcube/src/activities/school/gschool_coolkid_chats.tw

@@ -145,29 +145,29 @@
 	You don't want to, but you feel miserable and everything hurts. You crave the rush that you've come to enjoy so much.
 	<p>"Please Dimka, can I have some pale lady?"</p>
 	<p>He smiles at you with a smug grin. "Sure. Do you have any money?"</p>
-	<<if getvar("$finances.cash") >= 420>>
+	<<if $finances.cash >= 420>>
 		<<actCLA 'Change your mind'>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</actCLA>>
-		<<if getvar("$finances.cash") >= 420>>
+		<<if $finances.cash >= 420>>
 			<<actCLA 'Buy enough for 1 line (420 <b>₽</b>)'>>
 	<<set $palelady = 1>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
 <</actCLA>>
 
 		<</if>>
-		<<if getvar("$finances.cash") >= 840>>
+		<<if $finances.cash >= 840>>
 			<<actCLA 'Buy enough for 2 lines (840 <b>₽</b>)'>>
 	<<set $palelady = 2>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
 <</actCLA>>
 
 		<</if>>
-		<<if getvar("$finances.cash") >= 1680>>
+		<<if $finances.cash >= 1680>>
 			<<actCLA 'Buy enough for 5 lines (1680 <b>₽</b>)'>>
 	<<set $palelady = 5>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
 <</actCLA>>
 
 		<</if>>
-		<<if getvar("$finances.cash") >= 3720>>
+		<<if $finances.cash >= 3720>>
 			<<actCLA 'Buy enough for 10 lines (3320 <b>₽</b>)'>>
 	<<set $palelady = 10>> <<gt 'gschool_coolkid_chats' 'dimka_pay'>>
 <</actCLA>>
@@ -618,7 +618,7 @@
 		<<gs 'katjaEvDin' 'kiss_events'>>
 	<<else>>
 		<<image "characters/shared/headshots_main/big14.jpg">>
-		<<if $npcs.get('A14','sex') > 0 and $wardrobe.pantyworntype == 'none' and getvar("$wardrobe.PCloSkirt") > 1 and $katjaQW['no_panties_day'] != $time.daystart>>
+		<<if $npcs.get('A14','sex') > 0 and $wardrobe.pantyworntype == 'none' and $wardrobe.PCloSkirt > 1 and $katjaQW['no_panties_day'] != $time.daystart>>
 			<<actCLA 'Show her you`re not wearing panties'>>
 				<<gt 'Katja_tanga' 'school'>>
 			<</actCLA>>
@@ -666,7 +666,7 @@
 				<</if>>
 			<</actCLA>>
 		<</if>>
-		<<if getvar("$katjaQW['QWstage']") > 1 and getvar("$pc.pcs_makeup") <= 1>>
+		<<if getvar("$katjaQW['QWstage']") > 1 and $pc.pcs_makeup <= 1>>
 			<p>Katja looks at you with a smile. "$pc.name_nick, I bet you would look great with a little make-up on you! What do you say?"</p>
 			<<actCLA 'Let her put makeup on you'>>
 				<<set $pc.pcs_hairbsh = 1>>
@@ -787,7 +787,7 @@
 					<<gs 'gschool_coolkid_chats' 'katja_tampon'>>
 				<</actCLA>>
 			<</if>>
-		<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+		<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 			<<actCLA 'Ask for a tampon'>>
 				<<setinit $temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 				<<gs 'gschool_coolkid_chats' 'katja_tampon'>>
@@ -1025,7 +1025,7 @@
 				<<gs 'gschool_coolkid_chats' 'bella_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'bella_tampon'>>
@@ -1251,7 +1251,7 @@
 				<<gs 'gschool_coolkid_chats' 'lizaveta_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'lizaveta_tampon'>>
@@ -1657,7 +1657,7 @@
 				<<gs 'gschool_coolkid_chats' 'vicky_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'vicky_tampon'>>
@@ -1764,7 +1764,7 @@
 				<<gs 'gschool_coolkid_chats' 'stasya_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'stasya_tampon'>>
@@ -1917,7 +1917,7 @@
 				<<gs 'gschool_coolkid_chats' 'irina_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'irina_tampon'>>
@@ -2080,7 +2080,7 @@
 				<<gs 'gschool_coolkid_chats' 'sonia_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_coolkid_chats' 'sonia_tampon'>>

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

@@ -679,9 +679,9 @@
 			He grins, both at your reaction and the fact he got your phone number. "Okay, well, I will call you then. Talk to you later." He waits until you go inside before he leaves.
 			<<msg '!!Marcus BF content is WIP. More will added in in future!!'>>
 			<<actCLA 'Home'>>
-				<<if getvar("$time.hour") == 8>>
+				<<if $time.hour == 8>>
 					<<set $time.minutes += 180 - $time.minutes>>
-				<<elseif getvar("$time.hour") == 9>>
+				<<elseif $time.hour == 9>>
 					<<set $time.minutes += 120 - $time.minutes>>
 				<</if>>
 				<<gt 'pod_ezd' 'etaj_1'>>
@@ -782,9 +782,9 @@
 							He grins, both at your reaction and the fact he got your phone number. "Okay, well, I will call you then. Talk to you later." He waits until you go inside before he leaves.
 							<<msg '!!Marcus BF content is WIP. More will be added in future!!'>>
 							<<actCLA 'Home'>>
-								<<if getvar("$time.hour") == 8>>
+								<<if $time.hour == 8>>
 									<<set $time.minutes += 180 - $time.minutes>>
-								<<elseif getvar("$time.hour") == 9>>
+								<<elseif $time.hour == 9>>
 									<<set $time.minutes += 120 - $time.minutes>>
 								<</if>>
 								<<gt 'pod_ezd' 'etaj_1'>>
@@ -1150,9 +1150,9 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'end'>>
-	<<if getvar("$time.hour") == 8>>
+	<<if $time.hour == 8>>
 		<<set $time.minutes += 180 - $time.minutes>>
-	<<elseif getvar("$time.hour") == 9>>
+	<<elseif $time.hour == 9>>
 		<<set $time.minutes += 120 - $time.minutes>>
 	<</if>>
 	<<gt 'school_grounds'>>

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

@@ -139,7 +139,7 @@
 						<<gt 'school_start_skipEvents'>>
 					<</actCLA>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") > 25>>
+				<<if $pc.pcs_inhib > 25>>
 					<<actCLA 'Drop some textbooks'>>
 						<<if $wardrobe.pantyworntype != 'none'>>
 							<<gs 'flash' 'panties' 'indoors' 1 1>>
@@ -165,7 +165,7 @@
 								<<gt 'school_start_skipEvents'>>
 							<</actCLA>>
 						<</actCLA>>
-						<<if getvar("$pc.pcs_inhib") > 35>>
+						<<if $pc.pcs_inhib > 35>>
 							<<if $wardrobe.pantyworntype == 'none'>>
 								<<actCLA 'Show more'>>
 									<<gs 'flash' 'butt' 'indoors' 1 1>>
@@ -225,7 +225,7 @@
 			<</if>>
 		<</if>>
 		<<either ($pc.hotcat > 5) ? 1 : 0>>
-			<<if $wardrobe.pantyworntype != 'none' and getvar("$pc.pcs_inhib") < 60>>
+			<<if $wardrobe.pantyworntype != 'none' and $pc.pcs_inhib < 60>>
 				<<run $pc.skillExperienceGain('inhibition',2)>>
 
 			<</if>>
@@ -244,7 +244,7 @@
 				After a brief shock and a slight jump on the moment of impact, you decide that such an act does not even dignify a response from you and continue walking as if nothing happened, although the cheeks on your face are visibly flushed.
 				<<gs 'gschool_events' 'leave_break_events'>>
 			<</actCLA>>
-			<<if getvar("$wardrobe.PCloSkirt") > 0>>
+			<<if $wardrobe.PCloSkirt > 0>>
 				<<actCLA 'Lift your skirt' undefined `{willpower:['exhib','self']}`>>
 					<<gs 'willpower' 'exhib' 'self'>>
 					<<gs 'willpower' 'pay' 'self'>>
@@ -291,7 +291,7 @@
 							<<gt 'gschool_lessons' 'morning'>>
 						<</actCLA>>
 					<</actCLA>>
-					<<if getvar("$pc.pcs_inhib") > 35>>
+					<<if $pc.pcs_inhib > 35>>
 						<<if $wardrobe.pantyworntype == 'none'>>
 							<<actCLA 'Show more'>>
 								<<gs 'flash' 'butt' 'indoors' 1 1>>
@@ -365,7 +365,7 @@
 	<<gs 'gschool_events' 'leave_break_events'>>
 	<<set $break_rand = rand(1,72)>>
 	<<if getvar("$break_rand") == 1 and getvar("$pc.hotcat") > 5>>
-		<<if $wardrobe.pantyworntype != 'none' and getvar("$pc.pcs_inhib") < 60>>
+		<<if $wardrobe.pantyworntype != 'none' and $pc.pcs_inhib < 60>>
 			<<setn $inhib_exp += 2>>
 
 		<</if>>
@@ -381,7 +381,7 @@
 			<<gs 'gschool_events' 'leave_break_events'>>
 		<</actCLA>>
 		<<gs 'willpower' 'exhib' 'self'>>
-		<<if getvar("$wardrobe.PCloSkirt") > 0 and $will_cost <= $pc.pcs_willpwr>>
+		<<if $wardrobe.PCloSkirt > 0 and $will_cost <= $pc.pcs_willpwr>>
 			<<actCLA 'Lift your skirt (will_cost Willpower)'>>
 				<<gs 'willpower' 'exhib' 'self'>>
 				<<gs 'willpower' 'pay' 'self'>>
@@ -399,7 +399,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 getvar("$wardrobe.PCloSkirt") > 0 and $will_cost > $pc.pcs_willpwr>>
+		<<elseif $wardrobe.PCloSkirt > 0 and $will_cost > $pc.pcs_willpwr>>
 			<<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>>
@@ -656,9 +656,9 @@
 				<</actCLA>>
 			<</actCLA>>
 		
-	<<elseif getvar("$break_rand") == 12 and getvar("$pc.hotcat") > 5 and getvar("$wardrobe.PCloSkirt") > 0>>
+	<<elseif getvar("$break_rand") == 12 and getvar("$pc.hotcat") > 5 and $wardrobe.PCloSkirt > 0>>
 		<<image "locations/pavlovsk/school/events/skirtpulledup.jpg">>
-		<<if getvar("$pc.pcs_butt") > 8>>
+		<<if $pc.pcs_butt > 8>>
 			As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel a hand firmly squeezing your ass. As you move to turn around, the hand quickly pulls away. You can tell from his admiring expression that Lazar was the one groping your ass. All the workouts you've been doing have made your ass big and firm enough to impress him.
 		<<else>>
 			<p>As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from his disappointed expression that Lazar was the one groping your ass. Perhaps he was expecting something firmer after hanging out with the athletic girls so much? Maybe you should work out more...</p>
@@ -748,7 +748,7 @@
 				<</actCLA>>
 			<</actCLA>>
 		
-	<<elseif getvar("$break_rand") == 13 and getvar("$pc.hotcat") > 5 and getvar("$wardrobe.PCloSkirt") > 0>>
+	<<elseif getvar("$break_rand") == 13 and getvar("$pc.hotcat") > 5 and $wardrobe.PCloSkirt > 0>>
 		<<image "locations/pavlovsk/school/events/skirtpulledup.jpg">>
 		As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. The brazen look on his face betrays Roman. It must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.
 		<<actCLA 'Ignore him'>>
@@ -1128,7 +1128,7 @@
 
 		<<or ($pc.hotcat > 5 && $wardrobe.PCloSkirt > 0) ? 1 : 0>>
 			<<image "locations/pavlovsk/school/events/skirtpulledup.jpg">>
-			<<if getvar("$pc.pcs_butt") > 8>>
+			<<if $pc.pcs_butt > 8>>
 				As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel a hand firmly squeezing your ass. As you move to turn around, the hand quickly pulls away. You can tell from his admiring expression that Lazar was the one groping your ass. All the workouts you've been doing have made your ass big and firm enough to impress him.
 			<<else>>
 				<p>As you walk down the hallway, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. You can tell from his disappointed expression that Lazar was the one groping your ass. Perhaps he was expecting something firmer after hanging out with the athletic girls so much? Maybe you should work out more...</p>
@@ -1608,7 +1608,7 @@
 		<<arousalEnd>>
 	<<elseif getvar("$break_rand") == 22>>
 		<<image "locations/pavlovsk/school/events/handstand.jpg">>
-		<<if getvar("$christinaQW['fight']") == 1 or getvar("$christinaQW['blackmail']") == 2>>
+		<<if $q.christina?.get('fight') == 1 or $q.christina?.get('blackmail') == 2>>
 			As you stop by your locker, you see some girls from your brother''s class doing handstands against the wall. Everytime their skirts flip down, the boys watching cheer. Giggling, they keep doing it until a teacher is spotted, and everybody scatters.
 		<<else>>
 			As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterday''s practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.
@@ -1629,9 +1629,9 @@
 	<<elseif getvar("$break_rand") == 25>>
 		<<image "locations/pavlovsk/school/events/makeupgirl.jpg">>
 		As you walk down the hallway, you see Bella sitting on one of the window ledges, ignoring her classmates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.
-	<<elseif getvar("$break_rand") == 26 and getvar("$christinaQW['fight']") < 1 and getvar("$christinaQW['blackmail']") < 2>>
+	<<elseif getvar("$break_rand") == 26 and $q.christina?.get('fight') < 1 and $q.christina?.get('blackmail') < 2>>
 		<<image "locations/pavlovsk/school/events/nastymessage.jpg">>
-		<<if getvar("$christinaQW['subpath']") > 1>>
+		<<if $q.christina?.get('subpath') > 1>>
 			As you walk down the hallway, you see Christina writing stuff on your locker. You know your place now, so you walk up to her, keeping your eyes on the floor.
 			"Hi Pet. Somebody took the artwork off your locker, so I added it back for you. Now thank me, and then tell me why the last one was removed."
 			<<actCLA 'Thank her'>>
@@ -1649,7 +1649,7 @@
 			<</actCLA>>
 			<<actCLA 'Avoid eye contact'>>
 				<<set $menu_off = 1>>
-				<<setinit $christinaQW['bully'] += 2>>
+				<<run $q.christina.inc('bully',2)>>
 				<<image "locations/pavlovsk/school/events/nastymessage2.jpg">>
 				Keeping your eyes on the floor, you try to walk by but she notices you.
 				<p>"Hey $pc.name_nick. Somebody took the artwork off your locker, so I added it back for you. No need to thank me."</p>
@@ -1658,7 +1658,7 @@
 			<</actCLA>>
 			<<actCLA 'Yell at Christina'>>
 				<<set $menu_off = 1>>
-				<<setinit $christinaQW['bully'] -= 2>>
+				<<run $q.christina.dec('bully',2)>>
 				<<image "characters/shared/headshots_main/big18.jpg">>
 				<p>You head straight at her and yell "What the fuck, Christina!" Other kids in the hallway start drifting in your direction, sensing a fight is about to happen.</p>
 				<p>"Oh, hey $pc.name_nick. Somebody took the artwork off your locker, so I added it back for you. No need to thank me." She gives you a dangerous look despite the calm tone in her voice.</p>
@@ -1691,7 +1691,7 @@
 		<</if>>
 	<<elseif getvar("$break_rand") == 30>>
 		<<image "locations/pavlovsk/school/events/skirtupback.jpg">>
-		<<if getvar("$christinaQW['blackmail']") >= 1>>
+		<<if $q.christina?.get('blackmail') >= 1>>
 			You see Christina walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. You roll your eyes and wonder how you were the first person that figured out she was fucking him. Or maybe you aren''t, who knows.
 			<<arouse 'erotic' 1 >>
 			<<arousalEnd>>
@@ -1713,7 +1713,7 @@
 	<<elseif getvar("$break_rand") == 33>>
 		<<image "locations/pavlovsk/school/events/walkaround.jpg">>
 		As you walk down the hallway, you see Pauline, Lena and Lera practically laying in the middle of the hallway. This forces the other students to carefully walk around them and they berate those who step too close to them. You are sure they are enjoying making the other students lives harder by just being in their way.
-	<<elseif getvar("$break_rand") <= 35 and getvar("$time.month") != 9 and getvar("$cheerleadingQW['quest_stage']") == 0 and getvar("$cheerleadingQW['gossip']") == 4 and $cheerleadingQW['gossip_day'] < $time.daystart>>
+	<<elseif getvar("$break_rand") <= 35 and $time.month != 9 and getvar("$cheerleadingQW['quest_stage']") == 0 and getvar("$cheerleadingQW['gossip']") == 4 and $cheerleadingQW['gossip_day'] < $time.daystart>>
 		<!-- !! month ! 9 so it doesnt happen in september, but does any time after that-->
 		<<gt 'gschool_cheerleading' 'poster'>>
 	<<elseif getvar("$break_rand") <= 35 and getvar("$cheerleadingQW['quest_stage']") == -1 and $cheerleadingQW['reject'] + 30 >= $time.daystart>>
@@ -2242,7 +2242,7 @@
 				<p>You are in the mood anyways, so why not? Hopefully it isn't too quick. They lead you to the men's room, where they all crowd around you in a circle and unzip their pants.</p>
 				The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.
 				<!-- FAILED TO CONVERT
-					if fame['pav_slut'] > 250: 'On one wall you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+					if fame['pav_slut'] > 250: 'On one wall you see written, in particularly large letters, "<b><<$pc.name_nick>> <<$pc.name_last>> = <<$gnikname>>"</b>.'
 				-----
 					<<if getvar("$fame['pav_slut']") > 250>>
 					<!-- FAILED TO CONVERT

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

@@ -1116,7 +1116,7 @@
 		<<arousalEnd>>
 		<<actCLA 'Continue'>>
 			<!-- !! if after school should sent Sveta outside-->
-			<<if getvar("$time.hour") >= 14>>
+			<<if $time.hour >= 14>>
 				<<gt 'school_grounds'>>
 			<<else>>
 				<<gt 'gschool_events' 'leave_break_events2'>>

+ 3 - 3
sugarcube/src/activities/school/gschool_girls_bathroom.tw

@@ -493,7 +493,7 @@
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Masturbate'>>
-		<<if getvar("$pc.pcs_inhib") < 40>>
+		<<if $pc.pcs_inhib < 40>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>
@@ -539,7 +539,7 @@
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Masturbate'>>
-		<<if getvar("$pc.pcs_inhib") < 40>>
+		<<if $pc.pcs_inhib < 40>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>
@@ -675,7 +675,7 @@
 		<</if>>
 	<</actCLA>>
 	<<actCLA 'Masturbate'>>
-		<<if getvar("$pc.pcs_inhib") < 40>>
+		<<if $pc.pcs_inhib < 40>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>

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

@@ -998,7 +998,7 @@
 				<<gs 'gschool_gopnik_chats' 'alyona_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_gopnik_chats' 'alyona_tampon'>>
@@ -1373,7 +1373,7 @@
 				<<gs 'gschool_gopnik_chats' 'anushka_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_gopnik_chats' 'anushka_tampon'>>

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

@@ -88,7 +88,7 @@
 		Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.
 		Several of the cool girls are talking to Zinaida. At first you think they might be bullying her, but it instead sounds like they're asking her a bunch of questions. Whatever they're talking about, they seem to come to an agreement.
 		<!-- !! Cheerleading foreshadowing gossip-->
-	<<elseif getvar("$cheerleadingQW['gossip']") == 0 and ((getvar("$time.month") == 9 and getvar("$time.day") >= 19) or getvar("$time.month") != 9)>>
+	<<elseif getvar("$cheerleadingQW['gossip']") == 0 and (($time.month == 9 and $time.day >= 19) or $time.month != 9)>>
 		<<setinit $cheerleadingQW['gossip'] = 1>>
 		<<setinit $cheerleadingQW['gossip_day'] = $time.daystart>>
 		"<<npc "A23">><</npc>> said that she knows Karine is skipping out on the squad to spend time with that dick she calls her boyfriend."
@@ -496,7 +496,7 @@
 	<<else>>
 		<<gs 'gschool_gossip' 'mixed' $location_var[$here][1]>>
 	<</if>>
-	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and getvar("$time.hour") >= 13 and $loc_arg == 'watercooler'>>
+	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and $time.hour >= 13 and $loc_arg == 'watercooler'>>
 		<!-- !!in hallway!!-->
 		You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile thinking about what that means.
 	<</if>>
@@ -751,7 +751,7 @@
 	<<else>>
 		<<gs 'gschool_gossip' 'boys' $location_var[$here][1]>>
 	<</if>>
-	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and getvar("$time.hour") >= 13>>
+	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and $time.hour >= 13>>
 		<!-- !!in hallway!!-->
 		You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.
 	<</if>>
@@ -967,7 +967,7 @@
 	<<else>>
 		<<gs 'gschool_gossip' 'girls' $location_var[$here][1]>>
 	<</if>>
-	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and getvar("$time.hour") >= 13>>
+	<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and $time.hour >= 13>>
 		<!-- !!in hallway!!-->
 		You find Natasha in the hallway and have a little chat. Dimka is nowhere to be seen. A few other seats are empty as well. You smile, thinking about what that means.
 	<</if>>

+ 6 - 6
sugarcube/src/activities/school/gschool_jock_chats.tw

@@ -375,7 +375,7 @@
 	<<set $menu_off = 1>>
 	<<gs 'Zvereva_events' 'cikl'>>
 	<<image "characters/shared/headshots_main/big18.jpg">>
-	<<if getvar("$NatbelQW['chrispaid']") == 2 and getvar("$finances.cash") >= 500>>
+	<<if getvar("$NatbelQW['chrispaid']") == 2 and $finances.cash >= 500>>
 		<<actCLA 'Pay off Natasha`s debt (500 <b>₽</b>)'>>
 			<<set $finances.cash -= 500>>
 			<<setinit $NatbelQW['chrispaid'] = 3>>
@@ -512,7 +512,7 @@
 				<<gs 'gschool_jock_chats' 'christina_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_jock_chats' 'christina_tampon'>>
@@ -683,7 +683,7 @@
 				<<gs 'gschool_jock_chats' 'albina_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_jock_chats' 'albina_tampon'>>
@@ -870,7 +870,7 @@
 				<<gs 'gschool_jock_chats' 'veronika_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_jock_chats' 'veronika_tampon'>>
@@ -1063,7 +1063,7 @@
 				<<gs 'gschool_jock_chats' 'lina_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_jock_chats' 'lina_tampon'>>
@@ -1307,7 +1307,7 @@
 				<<gs 'gschool_jock_chats' 'lariska_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_jock_chats' 'lariska_tampon'>>

+ 42 - 42
sugarcube/src/activities/school/gschool_lessons.tw

@@ -26,7 +26,7 @@
 		<<gs 'gschool_socialchg' 'test'>>
 	<</if>>
 	<<if $breaktype != 'first'>>
-		<<if getvar("$detention_set") == 1 and getvar("$time.weekday") == 1>>
+		<<if getvar("$detention_set") == 1 and $time.weekday == 1>>
 			<<set $detention_set = 2>>
 			<<image "characters/shared/headshots_main/big134.jpg">>
 			The principal is waiting for you in the hall, and with a simple curl of a finger, she summons you to follow her to her office.
@@ -39,7 +39,7 @@
 			<<actCLA 'Continue down the hall'>>
 				<<gt 'school_start_events'>>
 			<</actCLA>>
-		<<elseif getvar("$time.weekday") < 4 and getvar("$class['first_grade_check']") == 0>>
+		<<elseif $time.weekday < 4 and getvar("$class['first_grade_check']") == 0>>
 			<<gt 'gschool_lessons' 'grade_check'>>
 		<<elseif getvar("$grupTipe") == 3 and $nerd_game['invite_day'] < $time.daystart - $time.weekday>>
 			<<gt 'nerd_game_night' 'invite' 'morning'>>
@@ -62,7 +62,7 @@
 			<<actCLA 'Go to the boys restroom' -1>>
 				<<set $breaktype = 'first'>> <<gt 'gschool_break' 'boys_restroom'>>
 			<</actCLA>>
-			<<if getvar("$time.weekday") == 1 and $class['grade_check_day'] != $time.daystart>>
+			<<if $time.weekday == 1 and $class['grade_check_day'] != $time.daystart>>
 				<<actCLA 'Check your grades' -1>>
 					<<gt 'gschool_lessons' 'grade_check'>>
 				<</actCLA>>
@@ -81,14 +81,14 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'uniform_check'>>
-	<<if getvar("$wardrobe.PCloInhibit") <= 10>>
+	<<if $wardrobe.PCloInhibit <= 10>>
 		<<run $q.school.func('groupRelInc','nerds',1)>>
 		<<run $q.school.func('groupRelInc','outcasts',1)>>
 		<<run $q.school.func('groupRelInc','cool',-1)>>
 		<<run $q.school.func('groupRelInc','jocks',-1)>>
 		<font color="blue">This uniform is very conservative.</font>
-	<<elseif getvar("$wardrobe.PCloSkirt") < 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
-		<<if getvar("$wardrobe.PCloInhibit") >= 30 or getvar("$wardrobe.PCloTopCut") == 4>>
+	<<elseif $wardrobe.PCloSkirt < 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
+		<<if $wardrobe.PCloInhibit >= 30 or $wardrobe.PCloTopCut == 4>>
 			<<run $q.school.func('groupRelInc','cool',-1)>>
 			<<run $q.school.func('groupRelInc','jocks',-1)>>
 			<<run $q.school.func('groupRelInc','nerds',-1)>>
@@ -98,15 +98,15 @@
 		<<elseif getvar("$CloStyle") == 2>>
 			<<run $q.school.func('groupRelInc','gopniks',1)>>
 			<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>
-		<<elseif getvar("$wardrobe.PCloQuality") >= 4>>
+		<<elseif $wardrobe.PCloQuality >= 4>>
 			<<run $q.school.func('groupRelInc','cool',1)>>
 			<<run $q.school.func('groupRelInc','jocks',1)>>
 			<font color="blue">This uniform complies with the regulations and is of good quality.</font>
 		<<else>>
 			<font color="blue">This uniform complies with the school regulations on skirt length.</font>
 		<</if>>
-	<<elseif getvar("$wardrobe.PCloSkirt") == 5 and getvar("$wardrobe.PCloThinness") < 5 and getvar("$wardrobe.PCloBra") == 0>>
-		<<if getvar("$wardrobe.PCloInhibit") >= 35>>
+	<<elseif $wardrobe.PCloSkirt == 5 and $wardrobe.PCloThinness < 5 and $wardrobe.PCloBra == 0>>
+		<<if $wardrobe.PCloInhibit >= 35>>
 			<<run $q.school.func('groupRelInc','cool',-1)>>
 			<<run $q.school.func('groupRelInc','jocks',-1)>>
 			<<run $q.school.func('groupRelInc','nerds',-1)>>
@@ -116,7 +116,7 @@
 		<<elseif getvar("$CloStyle") == 2>>
 			<<run $q.school.func('groupRelInc','gopniks',1)>>
 			<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>
-		<<elseif getvar("$wardrobe.PCloQuality") >= 4>>
+		<<elseif $wardrobe.PCloQuality >= 4>>
 			<<run $q.school.func('groupRelInc','cool',1)>>
 			<<run $q.school.func('groupRelInc','jocks',1)>>
 			<<run $q.school.func('groupRelInc','gopniks',1)>>
@@ -142,24 +142,24 @@
 	<<set $locclass to null>>
 	<<set $menu_off = 1>>
 	<<if $q.school.period == 1>>
-		<<if getvar("$time.hour") == 6>>
+		<<if $time.hour == 6>>
 			<<set $time.minutes += 165 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 7>>
+		<<elseif $time.hour == 7>>
 			<<set $time.minutes += 105 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 8 and getvar("$time.minutes") < 45>>
+		<<elseif $time.hour == 8 and $time.minutes < 45>>
 			<<set $time.minutes += 45 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 8 and getvar("$time.minutes") < 50>>
+		<<elseif $time.hour == 8 and $time.minutes < 50>>
 			Time to go to your next class.
 		<<else>>
 			<<set $q.school.period = 2>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</if>>
 	<<elseif $q.school.period == 2>>
-		<<if getvar("$time.hour") == 8>>
+		<<if $time.hour == 8>>
 			<<set $time.minutes += 95 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 9 and getvar("$time.minutes") < 35>>
+		<<elseif $time.hour == 9 and $time.minutes < 35>>
 			<<set $time.minutes += 35 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 9 and getvar("$time.minutes") < 55>>
+		<<elseif $time.hour == 9 and $time.minutes < 55>>
 			Time to go to your next class.
 		<<else>>
 			<<set $q.school.period = 4>>
@@ -167,7 +167,7 @@
 		<</if>>
 	<<elseif $q.school.period == 3>>
 		<<if $location_var[$here][1] == ''>>
-			<<if getvar("$time.hour") == 9 and getvar("$time.minutes") < 55>>
+			<<if $time.hour == 9 and $time.minutes < 55>>
 				<<set $time.minutes += 55 - $time.minutes>>
 				Time to go to your next class.
 			<<else>>
@@ -175,30 +175,30 @@
 				<<gt 'gschool_lessons' 'short_break'>>
 			<</if>>
 		<<else>>
-			<<if getvar("$time.hour") == 9 and getvar("$time.minutes") < 46>>
+			<<if $time.hour == 9 and $time.minutes < 46>>
 				<<set $time.minutes += 46 - $time.minutes>>
 			<</if>>
 		<</if>>
 	<<elseif $q.school.period == 4>>
-		<<if getvar("$time.hour") == 9>>
+		<<if $time.hour == 9>>
 			<<set $time.minutes += 100 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 10 and getvar("$time.minutes") < 40>>
+		<<elseif $time.hour == 10 and $time.minutes < 40>>
 			<<set $time.minutes += 40 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 10 and getvar("$time.minutes") < 45>>
+		<<elseif $time.hour == 10 and $time.minutes < 45>>
 			Time to go to your next class.
 		<<else>>
 			<<set $q.school.period = 5>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</if>>
 	<<elseif $q.school.period == 5>>
-		<<if getvar("$time.hour") == 10>>
+		<<if $time.hour == 10>>
 			<<set $time.minutes += 90 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 11 and getvar("$time.minutes") < 30>>
+		<<elseif $time.hour == 11 and $time.minutes < 30>>
 			<<set $time.minutes += 30 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 12 and getvar("$time.minutes") < 25 and getvar("$time.minutes") > 20>>
+		<<elseif $time.hour == 12 and $time.minutes < 25 and $time.minutes > 20>>
 			<<set $q.school.period = 6>>
 			<<gt 'gschool_lessons' 'short_break'>>
-		<<elseif (getvar("$time.hour") == 12 and getvar("$time.minutes") > 25) or getvar("$time.hour") > 12>>
+		<<elseif ($time.hour == 12 and $time.minutes > 25) or $time.hour > 12>>
 			<<set $q.school.period = 6>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</if>>
@@ -208,11 +208,11 @@
 		<</if>>
 	<<elseif $q.school.period == 6>>
 		<<if $location_var[$here][1] == ''>>
-			<<if getvar("$time.hour") == 10>>
+			<<if $time.hour == 10>>
 				<<set $time.minutes += 145 - $time.minutes>>
-			<<elseif getvar("$time.hour") == 11>>
+			<<elseif $time.hour == 11>>
 				<<set $time.minutes += 85 - $time.minutes>>
-			<<elseif getvar("$time.hour") == 12 and getvar("$time.minutes") < 25>>
+			<<elseif $time.hour == 12 and $time.minutes < 25>>
 				<<set $time.minutes += 25 - $time.minutes>>
 			<<else>>
 				<<set $q.school.period = 7>>
@@ -220,20 +220,20 @@
 			<</if>>
 		<</if>>
 	<<elseif $q.school.period == 7>>
-		<<if getvar("$time.hour") == 11>>
+		<<if $time.hour == 11>>
 			<<set $time.minutes += 130 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 12>>
+		<<elseif $time.hour == 12>>
 			<<set $time.minutes += 70 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 13 and getvar("$time.minutes") < 10>>
+		<<elseif $time.hour == 13 and $time.minutes < 10>>
 			<<set $time.minutes += 10 - $time.minutes>>
-		<<elseif getvar("$time.hour") == 13 and getvar("$time.minutes") < 15>>
+		<<elseif $time.hour == 13 and $time.minutes < 15>>
 			Time to go to your next class.
 		<<else>>
 			<<set $q.school.period = 8>>
 			<<gt 'gschool_lessons' 'short_break'>>
 		<</if>>
 	<<elseif $q.school.period == 8>>
-		<<if getvar("$time.hour") == 13>>
+		<<if $time.hour == 13>>
 			<<set $time.minutes += 60 - $time.minutes>>
 
 		<</if>>
@@ -318,7 +318,7 @@
 	<<set $breaktype to null>>
 	<<if $q.school.period == 0>>
 		<<set $q.school.period = 1>>
-		<<if getvar("$time.hour") >= 8>>
+		<<if $time.hour >= 8>>
 			<<switch $time.weekday>>
 				<<case 1 3 5>>
 					<<gs 'gschool_lessons4' 'math_late'>>
@@ -326,10 +326,10 @@
 					<<gs 'gschool_lessons3' 'literature_late'>>
 			<</switch>>
 		<<else>>
-			<<if getvar("$time.hour") == 7>>
+			<<if $time.hour == 7>>
 				<<set $time.minutes += 60 - $time.minutes>>
 			<</if>>
-			<<if getvar("$time.hour") == 6>>
+			<<if $time.hour == 6>>
 				<<set $time.minutes += 120 - $time.minutes>>
 			<</if>>
 			<<switch $time.weekday>>
@@ -341,7 +341,7 @@
 		<</if>>
 	<<elseif $q.school.period == 1>>
 		<<set $q.school.period = 2>>
-		<<if getvar("$time.hour") == 8 and getvar("$time.minutes") < 50>>
+		<<if $time.hour == 8 and $time.minutes < 50>>
 			<<set $time.minutes += 50 - $time.minutes>>
 
 		<</if>>
@@ -356,7 +356,7 @@
 		<<gs 'gschool_lunch' 'break'>>
 	<<elseif $q.school.period == 3>>
 		<<set $q.school.period = 4>>
-		<<if getvar("$time.hour") == 9 and getvar("$time.minutes") < 55>>
+		<<if $time.hour == 9 and $time.minutes < 55>>
 			<<set $time.minutes += 55 - $time.minutes>>
 		<</if>>
 		<<switch $time.weekday>>
@@ -369,7 +369,7 @@
 		<</switch>>
 	<<elseif $q.school.period == 4>>
 		<<set $q.school.period = 5>>
-		<<if getvar("$time.hour") == 10 and getvar("$time.minutes") < 45>>
+		<<if $time.hour == 10 and $time.minutes < 45>>
 			<<set $time.minutes += 45 - $time.minutes>>
 		<</if>>
 		<<switch $time.weekday>>
@@ -385,7 +385,7 @@
 		<<gs 'gschool_lunch' 'lunch'>>
 	<<elseif $q.school.period == 6>>
 		<<set $q.school.period = 7>>
-		<<if getvar("$time.hour") == 12 and getvar("$time.minutes") < 25>>
+		<<if $time.hour == 12 and $time.minutes < 25>>
 			<<set $time.minutes += 25 - $time.minutes>>
 		<</if>>
 		<<switch $time.weekday>>
@@ -398,7 +398,7 @@
 		<</switch>>
 	<<elseif $q.school.period == 7>>
 		<<set $q.school.period = 8>>
-		<<if getvar("$time.hour") == 13 and getvar("$time.minutes") < 15>>
+		<<if $time.hour == 13 and $time.minutes < 15>>
 			<<set $time.minutes += 15 - $time.minutes>>
 
 		<</if>>

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

@@ -232,7 +232,7 @@
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") >= 40>>
+				<<if $pc.pcs_inhib >= 40>>
 					<<actCLA 'Come get some more'>>
 						<<video "locations/pavlovsk/school/classroom/boobgr.mp4">>
 						<p>You pinch your lips together, trying to silence another moan as you feel your molester's fingers give your still sensitive nipple another quick pinch before retreating again. After the hand is gone, you move your hand to one side of your face, as if to scratch an itch and simultaneously glance over your shoulder until you're looking sidelong at Dan, who has been groping you. You lift the corner of your mouth in a small smile, making a "Come here!" motion with your index finger, winking at him before you scoot your chair back. His eyes fill with surprise and excitement and a few seconds after you've turned back towards the teacher, you feel his hand massaging your breast again.</p>
@@ -900,7 +900,7 @@
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") >= 40>>
+				<<if $pc.pcs_inhib >= 40>>
 					<<actCLA 'Come get some more'>>
 						<<video "locations/pavlovsk/school/classroom/boobgr.mp4">>
 						<p>You pinch your lips together, trying to silence another moan as you feel your molester's fingers give your still sensitive nipple another quick pinch before retreating again. After the hand is gone, you move your hand to one side of your face, as if to scratch an itch and simultaneously glance over your shoulder until you're looking sidelong at Vasily, who has been groping you. You lift the corner of your mouth in a small smile, making a "Come here!" motion with your index finger, winking at him before you scoot your chair back. His eyes fill with surprise and excitement and a few seconds after you've turned back towards Mr. Ivanov, you feel his hand massaging your breast again.</p>

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

@@ -778,7 +778,7 @@
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") >= 40>>
+				<<if $pc.pcs_inhib >= 40>>
 					<<actCLA 'Come get some more'>>
 						<<run $npcs.inc('A10','rel',2)>>
 						<<video "locations/pavlovsk/school/classroom/boobgr.mp4">>
@@ -1223,7 +1223,7 @@
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") >= 40>>
+				<<if $pc.pcs_inhib >= 40>>
 					<<actCLA 'Come get some more'>>
 						<<run $npcs.inc('A10','rel',2)>>
 						<<video "locations/pavlovsk/school/classroom/boobgr.mp4">>

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

@@ -485,7 +485,7 @@
 				<</actCLA>>
 
 		<<elseif getvar("$scooltiperand") == 4>>
-			<<if getvar("$pc.pcs_makeup") > 1>>
+			<<if $pc.pcs_makeup > 1>>
 				<<image "characters/shared/headshots_main/big15.jpg">>
 				<<set $pc.mood += 5>>
 				From over your shoulder, a folded piece of paper is thrown onto your desk. You glance behind you and see Vicky smiling back at you. Opening the note, it reads:
@@ -897,7 +897,7 @@
 				<<actCLA 'Wait for the end of the lesson'>>
 					<<gt 'gschool_lessons' 'short_break'>>
 				<</actCLA>>
-				<<if getvar("$pc.pcs_inhib") >= 40>>
+				<<if $pc.pcs_inhib >= 40>>
 					<<actCLA 'Come get some more'>>
 						<<run $npcs.inc('A154','rel',1)>>
 						<p>You bite your lip to silence the moan that wants to escape as you feel your molester's fingers give your nipple a quick pinch before retreating. After the hand is gone, you move your hand to the opposite side of your face, as if to scratch an itch and simultaneously glance over your shoulder until your eye is on Radomir, who groped you. You give him a smile out of the corner of your mouth and use your index finger make a "Come here!" motion at him as you wink and scoot your chair back. His eyes fill with surprise and excitement and a few seconds after you turn back to face Mr. Vasilyev, you feel his hand massaging your breast again.</p>

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

@@ -91,7 +91,7 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$finances.cash") >= 50>>
+	<<if $finances.cash >= 50>>
 		<<actCLA 'Buy food (50 <b>₽</b>)'>>
 			<<set $menu_off = 1>>
 			<<set $finances.cash -= 50>>
@@ -131,7 +131,7 @@
 
 	<</if>>
 	<<if $breaktype != 'long'>>
-		<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and getvar("$time.hour") < 10>>
+		<<if getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2 and $time.hour < 10>>
 			<p><br>"Hi Nat, did you happen to see Dimka?" "Hey $pc.name_nick, he was here earlier, speaking with Lena and Lera.</p>
 
 		<</if>>

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

@@ -462,7 +462,7 @@
 				<<image "characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore5.jpg">>
 				<p>You barely even have time to open your mouth at all before she shoves the dickcm $dick_girth strap-on inside and down your throat, causing you to start gagging. Unconcerned by this, she shoves the dildo as far down your throat as it will physically go and starts roughly fucking your throat with it, barely giving you any time to catch your breath. After several minutes, your throat feels like it's on fire and she finally stops, finally giving you time to gulp down the air you so desperately need. As you do, she lifts you up and bends you over her desk once more. She briefly slips one finger into your pussy, likely checking if you're a virgin.</p>
 				<<arouse 'bj' 5 `['lesbian','humiliation','sub','deepthroat']`>>
-				<<if getvar("$pc.pcs_vag") == 0>>
+				<<if $pc.pcs_vag == 0>>
 					"I must admit, I'm very surprised that anyone acting like such a whore would still be a virgin. I suppose that means you're one of those girls that just let the boys use their other holes instead..."
 					<<actCLA 'Get your ass fucked'>>
 						<<gt 'gschool_office' 'whore2'>>

+ 6 - 6
sugarcube/src/activities/school/gschool_outcast_chats.tw

@@ -85,7 +85,7 @@
 		<<if $npcs.get('A159','rel') >= 50>>
 			<p>Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey $pc.name_nick, you're smoking hot, you know that? I might just let you date me if you ask nicely." He gives you a creepy smile that shows his filthy teeth, which look like they haven't seen a toothbrush in years, if ever.</p>
 			<p>You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn't date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff than have sex with you!"</p>
-			<<if getvar("$pc.tits") >= 5>>
+			<<if $pc.tits >= 5>>
 				<p>You notice he isn't paying attention and follow his gaze down to see that he's staring at your breasts instead. "My eyes are up here, perv! Are you drooling? Eeeww! Go and cream your pants at your own tits, you fat loser!" you exclaim while covering your breasts with your arm. He quickly darts his eyes back up.</p>
 
 			<</if>>
@@ -103,7 +103,7 @@
 		<<if $npcs.get('A159','rel') >= 50>>
 			<p>Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey $pc.name_nick, did I mention that you have an amazing looking body and look so hot when you work out in gym class? You're too good looking for those jacked up monkeys and should hook up with me instead." He gives you a creepy smile that shows his filthy teeth, which look like they haven't seen a toothbrush in years, if ever.</p>
 			<p>You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn't date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff than have sex with you!"</p>
-			<<if getvar("$pc.tits") >= 5>>
+			<<if $pc.tits >= 5>>
 				<p>You notice he isn't paying attention and follow his gaze down to see that he's staring at your breasts instead. "Those 'jacked up monkeys' would beat your ass if they saw you drooling at my tits. Put your tongue back in your mouth, perv!" you sternly tell him while covering your breasts with your arm. He quickly darts his eyes back up.</p>
 
 			<</if>>
@@ -120,7 +120,7 @@
 		<<run $q.school.func('groupRelInc','gopniks',-1)>>
 		<<if getvar("$pc.hotcat") >= 6>>
 			<p>Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey $pc.name_nick, you're pretty sexy for a nerd. How about we study together sometime?" He gives you a creepy smile that shows his filthy teeth, which look like they haven't seen a toothbrush in years, if ever.</p>
-			<<if getvar("$pc.tits") >= 5>>
+			<<if $pc.tits >= 5>>
 				You notice him practically drooling while staring at your breasts and quickly cover them with your arm, causing him to quickly dart his eyes back up.
 
 			<</if>>
@@ -182,7 +182,7 @@
 		<<if $npcs.get('A159','rel') >= 50>>
 			<p>Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey $pc.name_nick, did I tell you that I like bad girls? I think we should date." He gives you a creepy smile that shows his filthy teeth, which look like they haven't seen a toothbrush in years, if ever.</p>
 			<p>You shove him away from you. "What the fuck? Why would I date a fat, smelly loser like you? Get the fuck away from me before I knock those rotten teeth of yours out!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.</p>
-			<<if getvar("$pc.tits") >= 5>>
+			<<if $pc.tits >= 5>>
 				<p>"And I seen you staring at my tits as well, perv! Do it again and I'll kick your balls back up inside you!" you add.</p>
 
 			<</if>>
@@ -190,7 +190,7 @@
 			<p>Petia looks a little fearful, yet somehow confident at the time. "What do you want, loser?" you snarl while trying not to inhale his foul aroma.</p>
 			<p>He gives you a creepy smile that shows his filthy teeth, which look like they haven't seen a toothbrush in years, if ever. "I think you're just acting tough because you're scared of the truth. You want to date me. Why else would you be talking to me?"</p>
 			<p>"Date <i>you</i>?!" you exclaim while balling your fist up. "I would punch your rotten teeth out right now if I wasn't worried about catching some filthy disease off of you. It's called 'soap', you smelly cunt!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.</p>
-			<<if getvar("$pc.tits") >= 5>>
+			<<if $pc.tits >= 5>>
 				<p>"And I seen you staring at my tits as well, perv! Do it again and I'll kick your balls back up inside you!" you add.</p>
 
 			<</if>>
@@ -351,7 +351,7 @@
 				<<gs 'gschool_outcast_chats' 'sonia_tampon'>>
 			<</actCLA>>
 		<</if>>
-	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and getvar("$pc.knowpreg") == 0>>
+	<<elseif getvar("$placebopart") > 0 and getvar("$LutH") > 0 and $pc.knowpreg == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don`t have a tampon. Can I borrow one?"'>>
 			<<gs 'gschool_outcast_chats' 'sonia_tampon'>>

+ 84 - 84
sugarcube/src/activities/school/gschool_post_shower.tw

@@ -23,9 +23,9 @@
 			<<set $checkoutalbina = 1>>
 			<<image "locations/pavlovsk/school/gym/locker/albpeek.jpg">>
 			<p>You glance at Albina while she pulls her clothes out of her locker. She is petite and slender, but has well toned muscles, a very shapely set of thighs and a firm bubble butt that's the envy of many girls in school. Her long dark brown hair reaches half way down her back and her pussy is clean shaven - in fact, you can't see a single hair on her smooth skin. She has a great body and you can see why so many boys consider her one of the most attractive girls in your class.</p>
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts have a nice firm shape to them and are bigger than your own, but are average sized compared to the rest of the class.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. They are average sized compared to the other girls.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them, but are smaller than your own and most of your classmates.
@@ -60,9 +60,9 @@
 		<<actCLA 'Check out Alyona'>>
 			<<image "locations/pavlovsk/school/gym/locker/alypeek.jpg">>
 			You take a peek at Aylona while she finishes drying herself off. Her body is incredibly thin, almost anorexic and is covered in tattoos. However, she has a flat stomach and small but perky breasts. Between her legs is a neatly trimmed landing strip that matches the black hair that hangs just past her shoulders. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 1>>
+			<<if $pc.tits < 1>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 1>>
+			<<elseif $pc.tits == 1>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.
@@ -95,9 +95,9 @@
 		<<actCLA 'Check out Anushka'>>
 			<<image "locations/pavlovsk/school/gym/locker/nushpeek.jpg">>
 			You peek at Anushka, who is walking in from the shower and still drying herself off. She has a petite build and has a variety of tattoos large and small covering her body. She is rather slender, with small perky breasts and a firm butt. Her pussy is completely smooth and her black hair reaches just past her chin, leaving her with the shortest hair of any girl in school. She is one of the most beautiful girls in school, with a model''s face and body.
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little bit small.
@@ -132,9 +132,9 @@
 		<<actCLA 'Check out Bella'>>
 			<<image "locations/pavlovsk/school/gym/locker/belpeek.jpg">>
 			<p>You peek at Bella, who is standing by her locker still drying herself off. She has a slim build and her pussy is shaved smooth while her long brown hair reaches half way down her back. Bella isn't just beautiful, she rivals the looks of models and actresses - she is the prettiest girl you have ever seen.</p>
-			<<if getvar("$pc.tits") < 4>>
+			<<if $pc.tits < 4>>
 				Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-			<<elseif getvar("$pc.tits") == 4>>
+			<<elseif $pc.tits == 4>>
 				Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.
 			<<else>>
 				Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.
@@ -170,9 +170,9 @@
 		<<actCLA `'Check out '+$npcs.get('A18','usedname')`>>
 			<<image "locations/pavlovsk/school/gym/locker/chrispeek.jpg">>
 			You glance at <<npc 'A18'>><</npc>> walking across the room after tossing her towel in a bin. Her build is very athletic with a toned body. Every single part of her has great muscle definition, especially her legs. In combination with her firm breasts and neat landing strip between her legs, her figure is surprisingly pleasing, with a very pretty face boarding on beautiful, she is very attractive even if not in the conventional way. You could easily imagine her on the cover of a sports magazine.
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them and are bigger than your own.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Upon inspection, you notice her breasts are a little small when compared to you and your classmates, but have a nice firm shape to them.
@@ -214,9 +214,9 @@
 		<<actCLA 'Check out Irina'>>
 			<<image "locations/pavlovsk/school/gym/locker/iripeek.jpg">>
 			You peek at Irina, who is standing by her locker as she starts to get dressed. She has a petite build that makes her large breasts seem even larger on her frame. Her pussy has a neatly trimmed landing strip above it, while her long blond hair reaches just past her shoulders. Irina is one of the prettiest girls in school and would likely be considered the prettiest if not for her friend Bella.
-			<<if getvar("$pc.tits") < 4>>
+			<<if $pc.tits < 4>>
 				Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-			<<elseif getvar("$pc.tits") == 4>>
+			<<elseif $pc.tits == 4>>
 				Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.
 			<<else>>
 				Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.
@@ -252,9 +252,9 @@
 		<<actCLA 'Check out Julia'>>
 			<<image "locations/pavlovsk/school/gym/locker/julpeek.jpg">>
 			You peek at Julia, who is standing by her locker, still drying herself off. She has a curvy build, with fairly large and perky breasts and a jiggly bubble butt. Her pussy has a neatly trimmed landing strip above it, while her long brown hair reaches just past her shoulders. She is the prettiest of the nerds, being comparable to most of the jocks and cool girls.
-			<<if getvar("$pc.tits") < 4>>
+			<<if $pc.tits < 4>>
 				Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-			<<elseif getvar("$pc.tits") == 4>>
+			<<elseif $pc.tits == 4>>
 				Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average compared to other girls.
 			<<else>>
 				Upon inspection, you notice her breasts are firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.
@@ -288,9 +288,9 @@
 		<<actCLA 'Check out Katja'>>
 			<<image "locations/pavlovsk/school/gym/locker/katpeek.jpg">>
 			Your attention is drawn towards Katja carefully gathering her clothes from her locker and neatly placing them down. She is petite and very slender with a clean shaven pussy and very long red hair reaching half way down her back. You can see why many boys and even some girls consider her to be very cute and attractive.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Her teardrop shaped breasts are average sized, but bigger than your own.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Her teardrop shaped breasts are average sized and around the same size as your own.
 			<<else>>
 				Her teardrop shaped breasts are average sized, but smaller than your own.
@@ -322,7 +322,7 @@
 		<<actCLA 'Check out Katyusha'>>
 			<<image "locations/pavlovsk/school/gym/locker/katypeek.jpg">>
 			You take a peek at Katyusha while she finishes drying herself off. She has a few small tattoos and is incredibly toned and muscled for a girl, giving her body an almost manish quality to it. Between her legs is an unsightly bush that matches the brown hair that hangs just past her shoulders. She is not a very attractive looking girl.
-			<<if getvar("$pc.tits") == 0>>
+			<<if $pc.tits == 0>>
 				Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. The two of you have the smallest breasts in the entire class.
 			<<else>>
 				Upon inspection, you notice her breasts are very small, barely more than puffy nipples. She has the smallest breasts in the entire class.
@@ -355,9 +355,9 @@
 		<<actCLA 'Check out Lariska'>>
 			<<image "locations/pavlovsk/school/gym/locker/larpeek.jpg">>
 			<p>You glance at Lariska as she finishes drying herself off, wrapping her hair in a towel before bundling it around her head. She is tall and lanky with narrow hips and small perky breasts. You also can't help but notice that she keeps her bush trimmed and tidy; she has that cute girl next door level of looks.</p>
-			<<if getvar("$pc.tits") < 1>>
+			<<if $pc.tits < 1>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. Her bust is bigger than yours, but smaller than almost all of your classmates.
-			<<elseif getvar("$pc.tits") == 1>>
+			<<elseif $pc.tits == 1>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.
@@ -400,9 +400,9 @@
 		<<actCLA 'Check out Lena'>>
 			<<image "locations/pavlovsk/school/gym/locker/lenpeek.jpg">>
 			You take a peek at Lena while she finishes drying herself off. Her body is curvy with large breasts and a fairly large butt, with a few small tattoos dotted around. Between her legs is a neatly trimmed landing strip of brown hair while her red dyed hair hangs just past her shoulders. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 4>>
+			<<if $pc.tits < 4>>
 				Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-			<<elseif getvar("$pc.tits") == 4>>
+			<<elseif $pc.tits == 4>>
 				Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. They are above average sized compared to other girls.
 			<<else>>
 				Upon inspection, you notice her breasts are firm, but still not as large as yours. However, her breasts are above average compared to the rest of the class.
@@ -438,9 +438,9 @@
 		<<actCLA 'Check out Lera'>>
 			<<image "locations/pavlovsk/school/gym/locker/lerpeek.jpg">>
 			You take a peek at Lera while she finishes drying herself off. Her body is fairly normal looking with a few small tattoos dotted around. Between her legs is a neatly trimmed V of brown hair, while her long brown highlighted hair hangs part way down her back. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, her breasts are about average sized compared to the other girls.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, they're smaller than your own and some of your classmates.
@@ -476,9 +476,9 @@
 		<<actCLA 'Check out Lina'>>
 			<<image "locations/pavlovsk/school/gym/locker/linpeek.jpg">>
 			You take a peek at Lina as she starts to pull her thigh highs on. She is slightly more athletic looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact, most of the boys think she's rather pretty and you're inclined to agree.
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -524,9 +524,9 @@
 		<<actCLA 'Check out Lizaveta'>>
 			<<image "locations/pavlovsk/school/gym/locker/lizpeek.jpg">>
 			<p>You take a peek at Lizaveta as she starts to get dressed. She has reddish-brown hair that goes just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair.</p>
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Looking further, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Looking further, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Looking further, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -579,9 +579,9 @@
 		<<actCLA 'Check out Natalia'>>
 			<<image "locations/pavlovsk/school/gym/locker/natapeek.jpg">>
 			You take a peek at Natalia as she starts to get dressed. Her body is slim, while her brown hair hangs part way down her back. Allowing your eyes to wander, you see she her pubic hair is neatly trimmed. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.
@@ -620,9 +620,9 @@
 		<<actCLA 'Check out Natasha'>>
 			<<image "locations/pavlovsk/school/gym/locker/natpeek.jpg">>
 			You take a peek at Natasha as she starts to get dressed. She has very long light brown hair reaching half way down her back. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 5>>
+			<<if $pc.tits < 5>>
 				Looking closer, you notice her breasts are large, but have a nice firm shape to them. She has the biggest breasts in the entire class, although the popular girls would never admit their jealousy.
-			<<elseif getvar("$pc.tits") == 5>>
+			<<elseif $pc.tits == 5>>
 				Looking closer, you notice her breasts are the same size as your own and are large and firm. They are the largest among your classmates, although the popular girls would never admit their jealousy.
 			<<else>>
 				Looking closer, you notice her breasts are firm but not as large as yours. However, her breasts are larger than any of the other girls, although the popular girls would never admit their jealousy.
@@ -663,9 +663,9 @@
 		<<actCLA 'Check out Pauline'>>
 			<<image "locations/pavlovsk/school/gym/locker/palpeek.jpg">>
 			You take a peek at Pauline as she starts to get dressed. She is slightly more muscular looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs, that matches her long black hair that hangs just past her shoulders. She doesn''t stand out in any particular way, but you''d never call her ugly.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.
@@ -698,9 +698,9 @@
 		<<actCLA 'Check out Sonia'>>
 			<<image "locations/pavlovsk/school/gym/locker/sonpeek.jpg">>
 			Your attention homes in on Sonia as she pulls her clothes out of her locker. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -745,9 +745,9 @@
 		<<actCLA 'Check out Stasya'>>
 			<<image "locations/pavlovsk/school/gym/locker/stapeek.jpg">>
 			Your attention homes in on Stasya as she starts to get dressed. She has long black hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a completely smooth pussy. She has that cute girl next door level of looks.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but is average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.
@@ -790,9 +790,9 @@
 		<<actCLA 'Check out Veronika'>>
 			<<image "locations/pavlovsk/school/gym/locker/verpeek.jpg">>
 			Your attention is drawn to Veronika getting dressed. She is slightly taller than most girls and is slim and slightly muscular with a neatly trimmed triangle of pubic hair atop her pussy. That matches the long blond hair that reaches half way down her back.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are about average sized.
@@ -824,9 +824,9 @@
 		<<actCLA 'Check out Vicky'>>
 			<<image "locations/pavlovsk/school/gym/locker/vicpeek.jpg">>
 			You see Vicky standing in front of her locker, with her long red hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. You can see why many boys and even some girls consider her to be very cute and attractive.
-			<<if getvar("$pc.tits") < 3>>
+			<<if $pc.tits < 3>>
 				Looking closer, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-			<<elseif getvar("$pc.tits") == 3>>
+			<<elseif $pc.tits == 3>>
 				Looking closer, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.
 			<<else>>
 				Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average sized with a nice firm shape to them.
@@ -860,9 +860,9 @@
 		<<actCLA 'Check out Zinaida'>>
 			<<image "locations/pavlovsk/school/gym/locker/zinpeek.jpg">>
 			Your attention homes in on Zinaida as she pulls her clothes out of her locker. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a bush of pubic hair. She doesn''t stand out in any particular way, but you''d never call her ugly.
-			<<if getvar("$pc.tits") < 2>>
+			<<if $pc.tits < 2>>
 				Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-			<<elseif getvar("$pc.tits") == 2>>
+			<<elseif $pc.tits == 2>>
 				Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 			<<else>>
 				Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -907,9 +907,9 @@
 	<<actCLA 'Check out Albina'>>
 		<<set $checkoutalbina = 1>>
 		<<image "locations/pavlovsk/school/gym/shower/watchalb.jpg">>
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from head to toe and she has a firm bubble butt that's the envy of many girls in school. It's clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they have a nice firm shape to them and are bigger than your own.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from head to toe and she has a firm bubble butt that's the envy of many girls in school. It's clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they are the same size as your own, with a nice firm shape to them.
 		<<else>>
 			Your attention homes in on Albina, her eyes closed as water rains over her head and pours down her face. Her body is well toned and shapely, her skin is silky smooth from head to toe and she has a firm bubble butt that's the envy of many girls in school. It's clear to you why so many boys consider her to be one of the most attractive girls in your class. She starts soaping up her breasts and upon inspection, you notice that they have a nice firm shape to them, but are smaller than your own.
@@ -944,9 +944,9 @@
 	<<actCLA 'Check out Alyona'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchaly.jpg">>
 		Your attention homes in on Aylona as she soaps herself up. Her body is incredibly thin, almost anorexic and is covered in tattoos. Your attention is drawn to her small but perky breasts as she soaps them up. By the way they jiggle under her hands, they must be very soft. Between her legs is a neatly trimmed landing strip of carpet that matches the black hair that hangs just past her shoulders. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 1>>
+		<<if $pc.tits < 1>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 1>>
+		<<elseif $pc.tits == 1>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.
@@ -979,9 +979,9 @@
 	<<actCLA 'Check out Anushka'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchnush1.jpg">>
 		You glance at Anushka, who is standing directly under the shower letting it run down her body, plastering her short black chin length hair to her head and face. She has a petite build and has a variety of tattoos large and small covering her body. She is rather slender, her breasts are small and perky, her ass is firm and her pussy is completely smooth. She is one of the most beautiful girls in school, with a model''s face and a body.
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -1016,9 +1016,9 @@
 	<<actCLA 'Check out Bella'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchbel.jpg">>
 		<p>You peek at Bella, who is standing under the shower soaping herself up. She has a slim build and her pussy is shaved smooth while her long brown hair reaches half way down her back. Bella isn't just beautiful, she rivals the looks of models and actresses - she is the prettiest girl you have ever seen.</p>
-		<<if getvar("$pc.tits") < 4>>
+		<<if $pc.tits < 4>>
 			Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-		<<elseif getvar("$pc.tits") == 4>>
+		<<elseif $pc.tits == 4>>
 			Upon inspection, you notice her breasts are the same size as yours and are fairly large and firm. Her breasts are above average when compared to other girls.
 		<<else>>
 			Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, her breasts are above average when compared to the rest of the class.
@@ -1096,9 +1096,9 @@
 	<<actCLA 'Check out Irina'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchira.jpg">>
 		You peek at Irina letting the water run over her body. She has a petite build that makes her large breasts seem even larger on her frame, her pussy has a neatly trimmed landing strip above it and her long blond hair reaches just past her shoulders. Irina is very pretty and would likely be considered the prettiest if not for her friend Bella.
-		<<if getvar("$pc.tits") < 4>>
+		<<if $pc.tits < 4>>
 			Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-		<<elseif getvar("$pc.tits") == 4>>
+		<<elseif $pc.tits == 4>>
 			Upon inspection, you notice her breasts are fairly large and firm, the same size as yours. However, compared to the other girls, her breasts are above average.
 		<<else>>
 			Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. However, compared to you and your classmates, her breasts are above average.
@@ -1137,9 +1137,9 @@
 	<<actCLA 'Check out Julia'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchjul.jpg">>
 		You peek at Julia soaping herself up. She has a curvy build, with large and perky breasts and a jiggly bubble butt, her pussy has a neatly trimmed landing strip above it and her long brown hair reaches just past her shoulders. She is the pretties of the nerds, being comparable to most of the jocks and cool girls.
-		<<if getvar("$pc.tits") < 4>>
+		<<if $pc.tits < 4>>
 			Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-		<<elseif getvar("$pc.tits") == 4>>
+		<<elseif $pc.tits == 4>>
 			Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. Compared to the other girls, her breasts are above average.
 		<<else>>
 			Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. Compared to your classmates, her breasts are above average.
@@ -1173,9 +1173,9 @@
 	<<actCLA 'Check out Katja'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchkat.jpg">>
 		Your attention is drawn towards Katja thoroughly washing her very long red hair that reaches half way down her back. She is petite and very slender with a clean shaven pussy. You can see why many boys and even some girls consider her to be very cute and attractive.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Her teardrop shaped breasts are average sized, but bigger than your own.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Her teardrop shaped breasts are average sized and around the same size as your own.
 		<<else>>
 			Her teardrop shaped breasts are average sized, but smaller than your own.
@@ -1207,7 +1207,7 @@
 	<<actCLA 'Check out Katyusha'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchkaty.jpg">>
 		You take a peek at Katyusha while she stands silently under the shower. She has a few small tattoos and is incredibly toned and muscled for a girl, giving her body an almost manish quality to it. Between her legs is an unsightly bush that matches the brown hair that hangs just past her shoulders. She is not a very attractive looking girl.
-		<<if getvar("$pc.tits") == 0>>
+		<<if $pc.tits == 0>>
 			Upon inspection, you notice her breasts are the same size as your own, barely more than puffy nipples. The two of you have the smallest breasts in the entire class.
 		<<else>>
 			Upon inspection, you notice her breasts are very small, barely more than puffy nipples. She has the smallest breasts in the entire class.
@@ -1240,9 +1240,9 @@
 	<<actCLA 'Check out Lariska'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchlar.jpg">>
 		Your attention homes in on Lariska, who is letting the water from the shower pour over her head, rinsing the suds from her body. She is tall and lanky with narrow hips and small perky breasts. The stream of water running down her stomach draws your eyes between her legs, soap collecting and washing through the natural filter of her neatly trimmed bush. She has that cute girl next door look to her.
-		<<if getvar("$pc.tits") < 1>>
+		<<if $pc.tits < 1>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than almost all of your classmates.
-		<<elseif getvar("$pc.tits") == 1>>
+		<<elseif $pc.tits == 1>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, she has one of the smaller busts in the class.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, she has one of the smaller busts in the class.
@@ -1285,9 +1285,9 @@
 	<<actCLA 'Check out Lena'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchlen.jpg">>
 		Your attention homes in on Lena, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is curvy with large breasts and a fairly large butt, with a few small tattoos dotted around. Between her legs is a neatly trimmed landing strip of brown hair while her red dyed hair hangs just past her shoulders. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 4>>
+		<<if $pc.tits < 4>>
 			Upon inspection, you notice her breasts are fairly large, but have a nice firm shape to them. Her bust is bigger than yours and most of your classmates.
-		<<elseif getvar("$pc.tits") == 4>>
+		<<elseif $pc.tits == 4>>
 			Upon inspection, you notice her breasts are the same size as your own and are fairly large and firm. Compared to the other girls, her breasts are above average.
 		<<else>>
 			Upon inspection, you notice her breasts are fairly large and firm, but still not as large as yours. Compared to your classmates, her breasts are above average.
@@ -1323,9 +1323,9 @@
 	<<actCLA 'Check out Lera'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchler.jpg">>
 		Your attention homes in on Lera, who is letting the water from the shower pour over her head, rinsing the suds from her body. Her body is fairly normal looking with a few small tattoos dotted around. Between her legs is a neatly trimmed V of brown hair, while her long brown highlighted hair hangs part way down her back. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but are average sized compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are about average sized.
@@ -1361,9 +1361,9 @@
 	<<actCLA 'Check out Lina'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchlin.jpg">>
 		Your attention homes in on Lina as she soaps herself up. She is slightly more athletic looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs, highlighted by the soap suds collecting in it. She doesn''t stand out in any particular way, but you''d never call her ugly. In fact most of the boys think she's rather pretty and you're inclined to agree.
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.
@@ -1409,9 +1409,9 @@
 	<<actCLA 'Check out Lizaveta'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchliz.jpg">>
 		<p>Your attention homes in on Lizaveta as she soaps herself up. She has reddish-brown hair that goes just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.</p>
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Looking further, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Looking further, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are a little small.
 		<<else>>
 			Looking further, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are a little small.
@@ -1461,9 +1461,9 @@
 	<<actCLA 'Check out Natalia'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchnata.jpg">>
 		Your attention focuses in on Natalia, who lets the water from the shower run over her head while appearing to cradle her body as she rinsing herself. Her body is slim. Her brown hair hangs part way down her back, allowing your eyes to wander, you see she her pubic hair is neatly trimmed. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average sized compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average sized.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average sized.
@@ -1501,9 +1501,9 @@
 	<<actCLA 'Check out Natasha'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchnat.jpg">>
 		Your attention homes in on Natasha as she soaps herself up. She has very long light brown hair reaching half way down her back and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 5>>
+		<<if $pc.tits < 5>>
 			Looking closer, you notice her breasts are large, but have a nice firm shape to them. She has the biggest breasts in the entire class, although the popular girls would never admit their jealousy.
-		<<elseif getvar("$pc.tits") == 5>>
+		<<elseif $pc.tits == 5>>
 			Looking closer, you notice her breasts are the same size as your own and are large and firm. They are the largest among your classmates, although the popular girls would never admit their jealousy.
 		<<else>>
 			Looking closer, you notice her breasts are large and firm, but still not as large as yours. However, her breasts are larger than any of the other girls, although the popular girls would never admit their jealousy.
@@ -1544,9 +1544,9 @@
 	<<actCLA 'Check out Pauline'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchpau.jpg">>
 		Your attention homes in on Pauline as she soaps herself up. She is slightly more muscular looking than most girls, with average sized breasts and a neatly trimmed triangle between her legs that matches her long black hair that hangs just past her shoulders. She doesn''t stand out in any particular way, but you''d never call her ugly.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but are average sized compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. Compared to you and your classmates, her breasts are about average sized.
@@ -1579,9 +1579,9 @@
 	<<actCLA 'Check out Sonia'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchson1.jpg">>
 		Your attention homes in on Sonia as she soaps herself up. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are a little small.
@@ -1633,9 +1633,9 @@
 	<<actCLA 'Check out Stasya'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchsta.jpg">>
 		Your attention homes in on Stasya as she soaps herself up. She has long black hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a completely smooth pussy. She has that cute girl next door level of looks.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Upon inspection, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but about average compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are about average.
@@ -1676,9 +1676,9 @@
 	<<actCLA 'Check out Veronika'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchver.jpg">>
 		Your attention is drawn to Veronika silently and stiffly standing under the shower as the water rains down over her head. She is slightly taller than most girls and is slim and slightly muscular with a neatly trimmed triangle of pubic hair atop her pussy that matches the long blond hair that reaches half way down her back.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. They are bigger than yours, but about average compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are about average.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, they are about average sized.
@@ -1710,9 +1710,9 @@
 	<<actCLA 'Check out Vicky'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchvic.jpg">>
 		You see Vicky taking her shower, with her long red hair reaching just past her shoulders. Allowing your eyes to wander, you see she has a neatly trimmed triangle of pubic hair. You can see why many boys and even some girls consider her to be very cute and attractive.
-		<<if getvar("$pc.tits") < 3>>
+		<<if $pc.tits < 3>>
 			Looking closer, you notice her breasts are about average, but have a nice firm shape to them. Her bust is bigger than yours, but is about average sized compared to the rest of your classmates.
-		<<elseif getvar("$pc.tits") == 3>>
+		<<elseif $pc.tits == 3>>
 			Looking closer, you notice her breasts are the same size as your own, with a nice firm shape to them. Compared to the other girls, her breasts are about average sized.
 		<<else>>
 			Looking closer, you notice your bust is bigger than hers, but compared to your classmates, her breasts are about average sized with a nice firm shape to them.
@@ -1746,9 +1746,9 @@
 	<<actCLA 'Check out Zinaida'>>
 		<<image "locations/pavlovsk/school/gym/shower/watchzin.jpg">>
 		Your attention homes in on Zinaida as she soaps herself up in the shower. She has long brown hair reaching just past her shoulders and, allowing your eyes to wander, you see she has a bush of pubic hair. She doesn''t stand out in any particular way, but you''d never call her ugly.
-		<<if getvar("$pc.tits") < 2>>
+		<<if $pc.tits < 2>>
 			Upon inspection, you notice her breasts are a little small, but have a nice firm shape to them. Her bust is bigger than yours, but smaller than most of your classmates.
-		<<elseif getvar("$pc.tits") == 2>>
+		<<elseif $pc.tits == 2>>
 			Upon inspection, you notice her breasts are the same size as your own, with a nice firm shape to them. However, compared to the other girls, her breasts are a little small.
 		<<else>>
 			Upon inspection, you notice her breasts have a nice firm shape to them. However, compared to you and your classmates, her breasts are a little small.

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

@@ -43,7 +43,7 @@
 			<<actCLA 'Sure'>>
 				<<run $npcs.inc('A149','rel',1)>>
 				<<set $time.minutes += 10>>
-				<<if getvar("$time.month") > 2 and getvar("$time.month") < 9>>
+				<<if $time.month > 2 and $time.month < 9>>
 					<<image "locations/pavlovsk/school/grounds/football1.jpg">>
 				<<else>>
 					<<image "locations/pavlovsk/school/grounds/football4.jpg">>

+ 67 - 67
sugarcube/src/activities/school/locations/grounds.tw

@@ -1,13 +1,13 @@
 :: school_grounds_events[events]
-	<<if $time.day == $nyp_day and getvar("$time.month") == 12 and $pc.isSchoolStudent>>
-		<<if getvar("$time.hour") >= 14 and getvar("$time.hour") < 17>>
+	<<if $time.day == $nyp_day and $time.month == 12 and $pc.isSchoolStudent>>
+		<<if $time.hour >= 14 and $time.hour < 17>>
 			<p>
 				All of the boys and girls are standing near the school.
 				Everyone did their best to look good today, wearing their nicest clothes.
 				Someone calls out to you. "Hey $pc.name_nick, are you coming to the New Year's Eve party or not?
 				You haven't paid the 1000 <b>₽</b> entry fee yet!"
 			</p>
-			<<if getvar("$finances.cash") >= 1000>>
+			<<if $finances.cash >= 1000>>
 				<<actCLA 'Go to the party (1,000 <b>₽</b>)'>>
 					<<setn $finances.cash -= 1000>> <<gt 'nyp_school' 'start'>>
 				<</actCLA>>
@@ -47,18 +47,18 @@
 		but budget cuts meant the project was cancelled and now the old building stands empty and abandoned.
 		It's a popular spot for students to skip class or hang out outside of school.
 	</p>
-	<<if ((getvar("$time.hour") == 6 and getvar("$time.minutes") >= 30) or (getvar("$time.hour") >= 7 and getvar("$time.hour") < 18))  and !$time.isSchoolHoliday and $pc.isSchoolStudent>>
+	<<if (($time.hour == 6 and $time.minutes >= 30) or ($time.hour >= 7 and $time.hour < 18))  and !$time.isSchoolHoliday and $pc.isSchoolStudent>>
 		<<act 'changing rooms'>><<setn $time.minutes += 1>><<gt  'school_grounds'  'change_room'>><</act>>
 		With the school open you can go to the changing rooms by the gym and change your outfit.
 	<</if>>
 
 
-	<<if getvar("$time.weekday") < 6 and getvar("$time.hour") >= 6 and !$time.isSchoolHoliday and $pc.isSchoolStudent and $q.school.lastAttendedDay < $time.daystart>>
+	<<if $time.weekday < 6 and $time.hour >= 6 and !$time.isSchoolHoliday and $pc.isSchoolStudent and $q.school.lastAttendedDay < $time.daystart>>
 		<<if !$q.school.func('isWearingSchoolUniform')>>
 			You're not allowed to attend any classes at school if you're not wearing your school uniform.
 		<<else>>
-			<<if getvar("$time.hour") == 6>>
-				<<if getvar("$time.minutes") < 30>>
+			<<if $time.hour == 6>>
+				<<if $time.minutes < 30>>
 					It's too early for school now.
 				<<else>>
 					<!--<<if getvar("$NikoEv") == 10>>
@@ -69,11 +69,11 @@
 						<<gt 'school_hallway'>>
 					<</actCLA>>
 				<</if>>
-			<<elseif getvar("$time.hour") == 7>>
+			<<elseif $time.hour == 7>>
 				<!--<<if getvar("$NikoEv") == 10>>
 					<<gt 'NikoWhore' 'Walk Of Shame'>>
 				<<else-->
-				<<if getvar("$time.minutes") <= 45>>
+				<<if $time.minutes <= 45>>
 					<<actCLA '<b>Go to class</b>'>>
 						<<gt 'school_hallway'>>
 					<</actCLA>>
@@ -94,7 +94,7 @@
 						<</actCLA>>
 					<</actCLA>>
 				<</if>>
-			<<elseif getvar("$time.hour") == 8>>
+			<<elseif $time.hour == 8>>
 				<!--<<if getvar("$NikoEv") == 10>>
 					<<gt 'NikoWhore' 'Walk Of Shame'>>
 
@@ -103,7 +103,7 @@
 				<<actCLA '<b>Rush to class</b>'>>
 					<<set $demerit += 10>> <<gt 'school_hallway'>>
 				<</actCLA>>
-			<<elseif getvar("$time.hour") < 14>>
+			<<elseif $time.hour < 14>>
 				It's too late for you to attend school now. You have been marked as absent today.
 			<</if>>
 		<</if>>
@@ -114,15 +114,15 @@
 :: school_grounds_deactivated
 	<!-- All the stuff that's related to various quests and events -->
 
-	<<if getvar("$InvitationToDimkaNYparty") == 1 and getvar("$time.day") == 31 and $time.day == $nyp_day>>
+	<<if getvar("$InvitationToDimkaNYparty") == 1 and $time.day == 31 and $time.day == $nyp_day>>
 		<<actCLA 'Follow Dimka to the party at his house'>>
 			<<setn $time.minutes += 30>> <<gt 'sny' '3'>>
 		<</actCLA>>
 
 	<</if>>
-	<<if getvar("$time.hour") == 14 and getvar("$time.weekday") < 6 and getvar("$time.isSchoolHoliday") == 0>>
+	<<if $time.hour == 14 and $time.weekday < 6 and $time.isSchoolHoliday == 0>>
 		<<if $NikoDate_Day != $time.daystart>>
-			<<if getvar("$time.weekday") == 1 and getvar("$NikoIntro") == 0>>
+			<<if $time.weekday == 1 and getvar("$NikoIntro") == 0>>
 				<<gt 'NikoEv' 'Intro'>>
 			<<elseif getvar("$NikoVolkovQW") == 5 and getvar("$NikoEv") == 6 and getvar("$NikoDate") == 0>>
 				<<gt 'NikoDates' 'After School'>>
@@ -133,7 +133,7 @@
 			<</if>>
 		<</if>>
 	<</if>>
-	<<if getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$time.isSchoolHoliday") == 0 and $afterschool_day != $time.daystart and getvar("$suspended['on']") != 1>>
+	<<if $time.weekday < 6 and $time.hour == 14 and $time.isSchoolHoliday == 0 and $afterschool_day != $time.daystart and getvar("$suspended['on']") != 1>>
 		<<set $afterschool_day = $time.daystart>>
 		<<if rand(0,3) == 0>>
 			<<set $eventtype = 'after_school'>>
@@ -143,25 +143,25 @@
 		<</if>>
 	<</if>>
 	<!-- !! Cheerleading tryouts if Sveta decided to attend-->
-	<<if getvar("$time.hour") == 14 and getvar("$cheerleadingQW['quest_stage']") == 1>>
+	<<if $time.hour == 14 and getvar("$cheerleadingQW['quest_stage']") == 1>>
 		<<if getvar("$pc.pregtime") < 90>>
 			<<gt 'gschool_cheerleading' 'tryouts'>>
 
 		<</if>>
 		<!-- !! Sveta attends training after school every Tuesday and Thursday.-->
-	<<elseif getvar("$time.hour") == 14 and $cheerleadingQW['day'] != $time.daystart and (getvar("$time.weekday") == 2 or getvar("$time.weekday") == 4) and getvar("$time.isSchoolHoliday") == 0 and getvar("$cheerleadingQW['quest_stage']") > 1 and getvar("$suspended['on']") != 1>>
+	<<elseif $time.hour == 14 and $cheerleadingQW['day'] != $time.daystart and ($time.weekday == 2 or $time.weekday == 4) and $time.isSchoolHoliday == 0 and getvar("$cheerleadingQW['quest_stage']") > 1 and getvar("$suspended['on']") != 1>>
 		<<if $npcs.get('A23','pregtalk') == 0>>
 			<<gt 'gschool_cheerleading' 'afterschool_practice'>>
 
 		<</if>>
 		<!-- !! A football game is played once every 2nd Friday and the cheerleaders perform out on the field.-->
-	<<elseif getvar("$time.hour") == 14 and $cheerleadingQW['day'] != $time.daystart and getvar("$time.weekday") == 5 and ($time.daystart - ($time.daystart % 7)) % 2 == 1 and getvar("$time.isSchoolHoliday") == 0 and (getvar("$cheerleadingQW['quest_stage']") >= 3 or getvar("$cheerleadingQW['backup_game']") == 1) and getvar("$suspended['on']") != 1>>
+	<<elseif $time.hour == 14 and $cheerleadingQW['day'] != $time.daystart and $time.weekday == 5 and ($time.daystart - ($time.daystart % 7)) % 2 == 1 and $time.isSchoolHoliday == 0 and (getvar("$cheerleadingQW['quest_stage']") >= 3 or getvar("$cheerleadingQW['backup_game']") == 1) and getvar("$suspended['on']") != 1>>
 		<<if $npcs.get('A23','pregtalk') == 0>>
 			<<gt 'gschool_cheerleading' 'afterschool_game'>>
 
 		<</if>>
 	<</if>>
-	<<if getvar("$time.hour") <= 8 and getvar("$kanikuli") == 6>>
+	<<if $time.hour <= 8 and getvar("$kanikuli") == 6>>
 		<p>Today is graduation day! The school prom is tonight as well.</p>
 		<<actCLA 'Go to your graduation'>>
 			<<set $menu_off = 1>>
@@ -201,7 +201,7 @@
 			<</actCLA>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$SchoolAtestat") == -1 and getvar("$time.weekday") < 6 and getvar("$time.hour") >= 6 and getvar("$time.hour") < 14>>
+	<<if getvar("$SchoolAtestat") == -1 and $time.weekday < 6 and $time.hour >= 6 and $time.hour < 14>>
 		<<actCLA 'Get your diploma'>>
 			<<set $menu_off = 1>>
 			<<set $time.minutes += 20>>
@@ -227,59 +227,59 @@
 		<</actCLA>>
 
 	<</if>>
-	<<if getvar("$time.weekday") == 6 and getvar("$time.hour") == 8 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and getvar("$detention_set") == 1 and getvar("$SchoolBlock") == 0>>
+	<<if $time.weekday == 6 and $time.hour == 8 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and getvar("$detention_set") == 1 and getvar("$SchoolBlock") == 0>>
 		<<actCLA 'Go to detention'>>
 			<<gt 'gschool_detention' 'start'>>
 		<</actCLA>>
 
 	<</if>>
-	<<if $q.christina?.get('pre_fight') == 1 and getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$time.isSchoolHoliday") == 0>>
+	<<if $q.christina?.get('pre_fight') == 1 and $time.weekday < 6 and $time.hour == 14 and $time.isSchoolHoliday == 0>>
 		<<actCLA `'Attack '+$npcs.get('A18','usedname')`>>
 			<<gt 'Zvereva_events' 'KristinaFight'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$suspended['on']") != 1 and getvar("$time.isSchoolHoliday") == 0>>
-		<<if getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 0>>
+	<<if getvar("$suspended['on']") != 1 and $time.isSchoolHoliday == 0>>
+		<<if $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 0>>
 			<<gt 'dimaRevenge' $dimaRevenge>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 1>>
+		<<elseif $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 1>>
 			<<gt 'dimaRevenge' $dimaRevenge>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 1>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 1>>
 			<<gt 'dimaRevenge' 5 'before'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 1>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 1>>
 			<<gt 'dimaRevenge' 6 'before'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 7 and getvar("$dimaRevChoice") == 1>>
+		<<elseif $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 7 and getvar("$dimaRevChoice") == 1>>
 			<<gt 'dimaRevenge' $dimaRevenge>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 2>>
 			<<gt 'dimaRevenge' $dimaRevenge 'day4jockbefore'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 2>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 2>>
 			<<gt 'dimaRevenge' $dimaRevenge 'day5jockbefore'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 2>>
+		<<elseif $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 2>>
 			<<gt 'dimaRevenge' 5 'day5jockafter'>>
 			<!-- !elseif week < 6 and hour = 11 and dimaRevenge = 4 and	dimaRevChoice = 3:-->
 			<!-- !	 gt 'gschool_lessons', 'short_break'-->
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 3>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 3>>
 			<<gt 'dimaRevenge' $dimaRevenge>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 4>>
+		<<elseif $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 4>>
 			<<gt 'dimaRevenge' $dimaRevenge 'after'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 4>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 4>>
 			<<gt 'dimaRevenge' $dimaRevenge 'before'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 14 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 4>>
+		<<elseif $time.weekday < 6 and $time.hour == 14 and getvar("$dimaRevenge") == 6 and getvar("$dimaRevChoice") == 4>>
 			<<gt 'dimaRevenge' 5 'after'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 7 and getvar("$dimaRevChoice") == 4 and $dimaRevengedaystart >= $time.daystart>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 7 and getvar("$dimaRevChoice") == 4 and $dimaRevengedaystart >= $time.daystart>>
 			<<gt 'dimaRevenge' 6>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 5>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 5 and getvar("$dimaRevChoice") == 5>>
 			<<gt 'dimaRevenge' $dimaRevenge 'before'>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 5>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 5>>
 			<<gt 'dimaRevenge' 5>>
-		<<elseif getvar("$time.weekday") < 6 and getvar("$time.hour") == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 6>>
+		<<elseif $time.weekday < 6 and $time.hour == 7 and getvar("$dimaRevenge") == 4 and getvar("$dimaRevChoice") == 6>>
 			<<gt 'dimaRevenge' $dimaRevenge>>
 		<</if>>
 	<</if>>
-	<<if getvar("$time.hour") >= 14 and $pc.fame('pav_slut') >= 250 and getvar("$SchoolGossip") > 0 and $afterschoolday != $time.daystart>>
+	<<if $time.hour >= 14 and $pc.fame('pav_slut') >= 250 and getvar("$SchoolGossip") > 0 and $afterschoolday != $time.daystart>>
 		<<gt 'gschool_sex' 'suck'>>
 
 	<</if>>
-	<<if getvar("$time.hour") == 14 and getvar("$time.weekday") < 6 and getvar("$time.isSchoolHoliday") == 0 and getvar("$SchoolAtestat") == 0>>
+	<<if $time.hour == 14 and $time.weekday < 6 and $time.isSchoolHoliday == 0 and getvar("$SchoolAtestat") == 0>>
 		<<if getvar("$ivan_afterschool") == 1>>
 			<<actCLA 'Meet Ivan after school'>>
 				<<gt 'gschool_sex' 'afterschool'>>
@@ -431,11 +431,11 @@
 			'<<link 'Albina'>><<setn $time.minutes += 15>><<gt  'albina_starlets_aftermath'>><</link>> is waiting behind the wheel of an SUV parked near the school.'
 		<</if>>
 		<!-- ! meynold`s events-->
-		<<if getvar("$time.hour") == 14 and $vicky_afterschool != $time.daystart>>
+		<<if $time.hour == 14 and $vicky_afterschool != $time.daystart>>
 			<<gs 'mey_vika_events' 'near_school'>>
 
 		<</if>>
-		<<if getvar("$mey_vika['mey_vika_qw']") == 35 or getvar("$mey_vika['mey_vika_qw']") == 36 and getvar("$time.minutes") < 45>>
+		<<if getvar("$mey_vika['mey_vika_qw']") == 35 or getvar("$mey_vika['mey_vika_qw']") == 36 and $time.minutes < 45>>
 			<<actCLA 'Study with Tamara'>>
 				<<if getvar("$mey_vika['mey_vika_qw']") == 36>>
 					<<gt 'mey_tamara_events' 'rebuke'>>
@@ -445,7 +445,7 @@
 			<</actCLA>>
 		<</if>>
 	<</if>>
-	<<if $strelaDay != $time.daystart and getvar("$strelaQW") == 1 and getvar("$time.hour") == 14>>
+	<<if $strelaDay != $time.daystart and getvar("$strelaQW") == 1 and $time.hour == 14>>
 		<p>A Mitsubishi Pajero and a BMW drive up to the school gates and strong, muscular guys in leather jackets and tracksuits get out of the cars. They have come to meet Vitek, Dan and Vasily. You watch them talk about something, although you're not close enough to hear what it's about. Then you notice Fedor leaving the school, his face swollen and bruised, and he waves at you. "$pc.name_nick! Come here, you're my witness!"</p>
 		<<actCLA 'Go and see what he needs'>>
 			<<gt 'strela'>>
@@ -457,17 +457,17 @@
 :: gschool_sportsfield[outdoors public hasEvents]
 <!-- !Outside school sports field-->
 	<<gs 'Zvereva_schedule'>>
-	<<if getvar("$time.month") > 3 and getvar("$time.month") < 11>>
+	<<if $time.month > 3 and $time.month < 11>>
 		<<image "locations/pavlovsk/school/grounds/field.jpg">>
 	<<else>>
 		<<image "locations/pavlovsk/school/grounds/fieldwinter.jpg">>
 	<</if>>
 	There is a football field near the school with a large track circling around it. Students often use the field and track before and after school.
-	<<if getvar("$time.weekday") == 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 18>>
+	<<if $time.weekday == 5 and $time.hour >= 16 and $time.hour <= 18>>
 		'As you pass by the sports field, you hear lots of cheering and yelling coming from the younger kids on the field. As you approach, you see '+iif(socialchg['tLazar_day'] ! daystart, '<<link 'Lazar'>><<gt  'gschool_socialchg1'  'tLazar'>><</link>>', 'Lazar')+' on the football field showing off his skills.'
 
 	<</if>>
-	<<if (getvar("$time.weekday") == 1 or getvar("$time.weekday") == 3) and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 18>>
+	<<if ($time.weekday == 1 or $time.weekday == 3) and $time.hour >= 16 and $time.hour <= 18>>
 		'Looking toward what you can barely describe as a running track, you notice '+iif(socialchg['tSvyatoslav_day'] ! daystart, '<<link 'Svyatoslav'>><<gt  'gschool_socialchg1'  'tSvyatoslav'>><</link>>', 'Svyatoslav')+' doing sprints by the football field.'
 
 	<</if>>
@@ -475,11 +475,11 @@
 		<<gt 'school_grounds'>>
 	<</ConnectedLocationCode>>
 	<<if $wardrobe.clothingworntype == 'danilovich_outfits' and $wardrobe.shoeworntype == 'danilovich'>>
-		<<if getvar("$pc.pcs_energy") >= 5 and $pc.pcs_stam >= $pc.stammax / 5>>
+		<<if $pc.pcs_energy >= 5 and $pc.pcs_stam >= $pc.stammax / 5>>
 			<<actCLA 'Go for a run (1 hour)'>>
 				<<set $menu_off = 1>>
 				<<gs 'exercise' 'tier1' 60 'run'>>
-				<<if getvar("$time.month") > 2 and getvar("$time.month") <= 9>>
+				<<if $time.month > 2 and $time.month <= 9>>
 					<<image "locations/pavlovsk/school/grounds/runsummer.jpg">>
 				<<else>>
 					<<image "locations/pavlovsk/school/grounds/runwinter.jpg">>
@@ -513,11 +513,11 @@
 	<<elseif ($wardrobe.clothingworntype != 'danilovich_outfits' or $wardrobe.shoeworntype != 'danilovich')>>
 		You could go for a run here if you were wearing sports clothes and shoes.
 	<</if>>
-	<<if getvar("$time.hour") >= 9 and getvar("$time.hour") < 18 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and getvar("$time.isSchoolHoliday") == 0>>
+	<<if $time.hour >= 9 and $time.hour < 18 and mid($start_type,1,2) == 'sg' and getvar("$SchoolAtestat") == 0 and $time.isSchoolHoliday == 0>>
 		'With the school open, you can go to the <<link 'changing rooms'>><<setn $time.minutes += 1>><<gt  'school_grounds'  'change_room'>><</link>> by the gym and change your outfit.'
 
 	<</if>>
-	<<if getvar("$time.weekday") == 6 and getvar("$SchoolSorev") == 2 and getvar("$time.hour") == 10 and getvar("$SchoolBlock") == 0>>
+	<<if $time.weekday == 6 and getvar("$SchoolSorev") == 2 and $time.hour == 10 and getvar("$SchoolBlock") == 0>>
 		Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.
 		<<if $wardrobe.clothingworntype == 'danilovich_outfits' and $wardrobe.shoeworntype == 'danilovich'>>
 			<<actCLA 'Participate in the 400m sprint event'>>
@@ -527,7 +527,7 @@
 			You need to wear exercise clothes to participate.
 		<</if>>
 	<</if>>
-	<<if getvar("$time.weekday") == 6 and getvar("$SchoolSorev") == 1 and getvar("$time.hour") == 10 and getvar("$SchoolBlock") == 0>>
+	<<if $time.weekday == 6 and getvar("$SchoolSorev") == 1 and $time.hour == 10 and getvar("$SchoolBlock") == 0>>
 		Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.
 		<<if $wardrobe.clothingworntype == 'danilovich_outfits' and $wardrobe.shoeworntype == 'danilovich'>>
 			<<actCLA 'Participate in the 400m sprint race'>>
@@ -538,9 +538,9 @@
 		<</if>>
 	<</if>>
 	<!-- ! Giving football preference, since there''s no indoor option for it.-->
-	<<if getvar("$temper") >= 15 and getvar("$sunWeather") == 1 and getvar("$time.hour") > 8 and getvar("$time.hour") < 12 and getvar("$time.weekday") == 6 and $fbpickupDay + 14 <= $time.daystart and $bbpickupDay != $time.daystart>>
+	<<if getvar("$temper") >= 15 and getvar("$sunWeather") == 1 and $time.hour > 8 and $time.hour < 12 and $time.weekday == 6 and $fbpickupDay + 14 <= $time.daystart and $bbpickupDay != $time.daystart>>
 		As you pass by the sports field, you notice that most of the jocks have gathered around the <<link "football field">><<gt 'fbgameout' 'start'>><</link>>.
-	<<elseif getvar("$temper") >= 15 and getvar("$sunWeather") == 1 and getvar("$time.hour") > 8 and getvar("$time.hour") < 12 and getvar("$time.weekday") == 6 and $bbpickupDay + 14 <= $time.daystart and $fbpickupDay != $time.daystart>>
+	<<elseif getvar("$temper") >= 15 and getvar("$sunWeather") == 1 and $time.hour > 8 and $time.hour < 12 and $time.weekday == 6 and $bbpickupDay + 14 <= $time.daystart and $fbpickupDay != $time.daystart>>
 		As you pass by the sports field, you notice that most of the jocks have gathered around the <<link "basketball court">><<gt 'bbgameout' 'start'>><</link>>.
 	<</if>>
 	<<gs 'brother' 'bro_school_field'>>
@@ -567,9 +567,9 @@
 		<p>Go!</p>
 		<!--<<wait 725>>-->
 		<<set $begminus = 0>>
-		<<if getvar("$pc.pcs_bmi") > 25>>
+		<<if $pc.pcs_bmi > 25>>
 			<<set $begminus = (($pc.pcs_bmi - 25) * 4)>>
-		<<elseif getvar("$pc.pcs_bmi") < 20>>
+		<<elseif $pc.pcs_bmi < 20>>
 			<<set $begminus = ((20 - $pc.pcs_bmi) * (20 - $pc.pcs_bmi))>>
 		<</if>>
 		<<set $begresult = $pc.skillLevel("run") - $begminus>>
@@ -669,9 +669,9 @@
 		<p>Go!</p>
 		<!--<<wait 725>>-->
 		<<set $begminus = 0>>
-		<<if getvar("$pc.pcs_bmi") > 25>>
+		<<if $pc.pcs_bmi > 25>>
 			<<set $begminus = (($pc.pcs_bmi - 25) * 4)>>
-		<<elseif getvar("$pc.pcs_bmi") < 18>>
+		<<elseif $pc.pcs_bmi < 18>>
 			<<set $begminus = ((25 - $pc.pcs_bmi) * 6)>>
 		<</if>>
 		<<set $begresult = $pc.skillLevel("run") - $begminus>>
@@ -787,7 +787,7 @@
 		<</if>>
 	<</actCLA>>
 	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <<link 'manage your piercings'>><<gt  'wardrobe'  'start'">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0  '  and <a href="exec:dynamic $pirManage>><</link>>', '.')+''
-	<<if (getvar("$time.hour") == 18 and getvar("$time.minutes") >= 30) or getvar("$time.hour") > 18>>
+	<<if ($time.hour == 18 and $time.minutes >= 30) or $time.hour > 18>>
 		The school is closing for the night and you have to leave before you get locked in.
 		$exit
 	<</if>>
@@ -799,7 +799,7 @@
 	<<actCLA 'Look in the mirror'>>
 		<<gt 'mirror' 'start'>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		<<actCLA 'Brush your hair'>>
 	<<gt 'mirror' 'brush'>>
 <</actCLA>>
@@ -847,7 +847,7 @@
 				<<set $time.minutes += 4>>
 				<<actCLA 'Go for a shower'>>
 					<<showerdin>>
-					<<if getvar("$pc.deodorant_on") == 1>>
+					<<if $pc.deodorant_on == 1>>
 						<<gs 'sweat' 'remove_deo'>>
 
 					<</if>>
@@ -862,7 +862,7 @@
 						<<set $pc.mood += 5>>
 						<<set $pc.fat += 8>>
 						<<set $pc.pcs_energy += 60>>
-						<<if getvar("$pc.pcs_hydra") >= 100>>
+						<<if $pc.pcs_hydra >= 100>>
 							<<set $pc.pcs_hydra += 10>>
 						<<else>>
 							<<set $pc.pcs_hydra += 20>>
@@ -889,7 +889,7 @@
 				<<set $time.minutes += 4>>
 				<<actCLA 'Go for a shower'>>
 					<<showerdin>>
-					<<if getvar("$pc.deodorant_on") == 1>>
+					<<if $pc.deodorant_on == 1>>
 						<<gs 'sweat' 'remove_deo'>>
 
 					<</if>>
@@ -901,7 +901,7 @@
 					"That's fine, so long as you don't mind the station cafe. I want to see if we can't patch things up between us."
 					<<set $time.minutes += 10>>
 					<<actCLA 'Go to the cafe'>>
-						<<if getvar("$pc.alko") > 0>>
+						<<if $pc.alko > 0>>
 							<<setn $pc.alko -= 1>>
 
 						<</if>>
@@ -910,7 +910,7 @@
 						<<set $pc.mood += 15>>
 						<<set $pc.fat += 11>>
 						<<set $pc.pcs_energy += 70>>
-						<<if getvar("$pc.pcs_hydra") >= 100>>
+						<<if $pc.pcs_hydra >= 100>>
 							<<set $pc.pcs_hydra += 40>>
 						<<else>>
 							<<set $pc.pcs_hydra += 80>>
@@ -965,7 +965,7 @@
 			<<actCLA 'Go for a shower'>>
 				<<set $menu_off = 1>>
 				<<showerdin>>
-				<<if getvar("$pc.deodorant_on") == 1>>
+				<<if $pc.deodorant_on == 1>>
 					<<gs 'sweat' 'remove_deo'>>
 
 				<</if>>
@@ -1000,7 +1000,7 @@
 				<<set $time.minutes += 4>>
 				<<actCLA 'Go take your shower'>>
 					<<showerdin>>
-					<<if getvar("$pc.deodorant_on") == 1>>
+					<<if $pc.deodorant_on == 1>>
 						<<gs 'sweat' 'remove_deo'>>
 
 					<</if>>

+ 11 - 11
sugarcube/src/activities/school/quest_school.tw

@@ -201,7 +201,7 @@
 					<<setinit $q.school.classes[$location_var[$here][2]].weekly_grade_gain += 10>>
 				<<case 'class_activity'>>
 					<!-- !!This adds the point for doing an in class activity that is not modified.-->
-					<<if getvar("$pc.pcs_stam") <= 0>>
+					<<if $pc.pcs_stam <= 0>>
 						<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 							<<setinit $q.school.classes[$location_var[$here][2]].weekly_grade_gain += 1>>
 						<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -241,7 +241,7 @@
 				<<case 'class_activity_skill'>>
 					<!-- !!This adds the point for doing an in class activity modified by a skill.-->
 					<<set _skillLevel = parseInt($location_var[$here][3])>>
-					<<if getvar("$pc.pcs_stam") <= 0>>
+					<<if $pc.pcs_stam <= 0>>
 						<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 							<<setinit $q.school.classes[$location_var[$here][2]].weekly_grade_gain += (2*(85+_skillLevel))/200>>
 						<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -281,7 +281,7 @@
 				<<case 'class_activity_attributes'>>
 					<!-- !!This adds the point for doing an in class activity modified by an attributes.-->
 					<<set _skillLevel = parseInt($location_var[$here][3])>>
-					<<if getvar("$pc.pcs_stam") <= 0>>
+					<<if $pc.pcs_stam <= 0>>
 						<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 							<<setinit $q.school.classes[$location_var[$here][2]].weekly_grade_gain += (2*(50+_skillLevel))/200>>
 						<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -321,7 +321,7 @@
 				<<case 'optional_activity'>>
 					<!-- !!This adds the point for doing an optional out of class activity that is not modified.-->
 					<<if !$q.school.classes[$location_var[$here][2]].use_computer or $location_var[$here][3].toBoolean()>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += 1>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -359,7 +359,7 @@
 							<</if>>
 						<</if>>
 					<<elseif $q.school.classes[$location_var[$here][2]].use_computer>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += 1>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -405,7 +405,7 @@
 					<!-- !!This adds the point for doing an optional out of class activity modified by a skill.-->
 					<<set _skillLevel = parseInt($location_var[$here][4])>>
 					<<if !$q.school.classes[$location_var[$here][2]].use_computer or $location_var[$here][3].toBoolean()>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += (2*(85+_skillLevel))/200>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -443,7 +443,7 @@
 							<</if>>
 						<</if>>
 					<<elseif $q.school.classes[$location_var[$here][2]].use_computer>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += (1*(85+_skillLevel))/200>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -489,7 +489,7 @@
 					<!-- !!This adds the point for doing an optional out of class activity modified by an attributes.-->
 					<<set _skillLevel = parseInt($location_var[$here][4])>>
 					<<if !$q.school.classes[$location_var[$here][2]].use_computer or $location_var[$here][3].toBoolean()>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += (2*(50+_skillLevel))/200>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -527,7 +527,7 @@
 							<</if>>
 						<</if>>
 					<<elseif $q.school.classes[$location_var[$here][2]].use_computer>>
-						<<if getvar("$pc.pcs_stam") <= 0>>
+						<<if $pc.pcs_stam <= 0>>
 							<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 								<<setinit $q.school.classes[$location_var[$here][2]].optional_weekly_grade_gain += (1*(50+_skillLevel))/200>>
 							<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -602,7 +602,7 @@
 						<<if _classData.homework>>
 							<<if !$location_var[$here][2].toBoolean()>><!--No computer is used -->
 								<<if !_classData.usecomputer>>
-									<<if getvar("$pc.pcs_stam") <= 0>>
+									<<if $pc.pcs_stam <= 0>>
 										<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 											<<setinit $q.school.classes[_classId].weekly_grade_gain += _numberOfHomeworks*((2*1*(50+_homework_modifier))/200)>>
 										<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>
@@ -641,7 +641,7 @@
 									<</if>>
 								<</if>>
 							<<else>>
-								<<if getvar("$pc.pcs_stam") <= 0>>
+								<<if $pc.pcs_stam <= 0>>
 									<<if getvar("$pcs_condition['lack_of_sleep']") >= 20>>
 										<<setinit $q.school.classes[_classId].weekly_grade_gain += _numberOfHomeworks*((2*(50+_homework_modifier))/200)>>
 									<<elseif getvar("$pcs_condition['lack_of_sleep']") >= 10>>

+ 4 - 4
sugarcube/src/activities/school/schoolday/lessons/pe.tw

@@ -21,13 +21,13 @@
 	<<run $q.school.func('attend_class','pe')>>
 	<<image "locations/pavlovsk/school/gym/fizra.jpg">>
 	You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is present.
-	<<if getvar("$time.weekday") == 5 and getvar("$LocalRun") == 0>>
+	<<if $time.weekday == 5 and getvar("$LocalRun") == 0>>
 		<<if getvar("$SchoolSorev") == 0>>
 			<<set $SchoolSorev = 1>>
 
 		<</if>>
 		<p>Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.</p>
-	<<elseif getvar("$time.weekday") == 5 and getvar("$LocalRun") == 1>>
+	<<elseif $time.weekday == 5 and getvar("$LocalRun") == 1>>
 		<<if getvar("$SchoolSorev") == 0>>
 			<<set $SchoolSorev = 2>>
 
@@ -219,7 +219,7 @@
 			<<run $q.school.func('class_activity_attributes','pe' $pc.vitality)>>
 			<<gs 'exercise' 'tier2' 1 'vital'>>
 			Coach Nikolaevich breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.
-			<<if getvar("$pc.pcs_cupsize") <= 20>>
+			<<if $pc.pcs_cupsize <= 20>>
 				<<if getvar("$pc.vitality") <= 30>>
 					<<run $q.school.func('groupRelInc','jocks',-1)>>
 					You're barely able to do more than a few before you get tripped up on the rope. You did the fewest in your class and most of the jocks snicker or make snide remarks. The teacher wants to make sure you get enough exercise though, so you're made to give it a few more tries.
@@ -233,7 +233,7 @@
 					<<run $q.school.func('groupRelInc','jocks',2)>>
 					The other girls are surprised at just how long you can jump rope without messing up. You manage to go the longest in a a few of the rounds.
 				<</if>>
-			<<elseif getvar("$pc.pcs_cupsize") <= 60>>
+			<<elseif $pc.pcs_cupsize <= 60>>
 				<<video "locations/pavlovsk/school/gym/jumprb.mp4">>
 				<<if getvar("$pc.vitality") <= 30>>
 					<<run $q.school.func('groupRelInc','jocks',-1)>>

+ 2 - 2
sugarcube/src/activities/school/schoolday/school_start.tw

@@ -1,5 +1,5 @@
 :: school_start
-<<if getvar("$time.hour") == 8>>
+<<if $time.hour == 8>>
     <<set $late = 1>>
 <</if>>
 <<run $q.school.inc('attendedDays',1)>>
@@ -78,7 +78,7 @@
         <p>Albina glares directly into your eyes. "ARE YOU DOING THIS TO MOCK ME YOU FUCKING BITCH?! I GAVE YOU ONE. LAST. FUCKING. CHANCE AND YOU THROW IT BACK IN MY FUCKING FACE?!" She tightens her grips as she gets up in your face. "You're done with the Starlets. If I <i>ever</i> see you anywhere near us, you better hope that I'm in a good fucking mood, bitch!"</p>
         She releases you and angrily storms off, shoving other students out of her way. You compose yourself and continue on your way, trying to ignore the stares.
     <</if>>
-<<elseif (getvar("$time.weekday") == 1 or getvar("$time.weekday") == 3 or getvar("$time.weekday") == 5) and ($q.christina?.get('fight') == -1 or $q.christina?.get('submit') == 1) and $q.christina?.get('subpath') < 3>>
+<<elseif ($time.weekday == 1 or $time.weekday == 3 or $time.weekday == 5) and ($q.christina?.get('fight') == -1 or $q.christina?.get('submit') == 1) and $q.christina?.get('subpath') < 3>>
     <<set $menu_off = 1>>
     <<if $q.christina?.get('fight') == -1>>
         <p><<npc 'A18'>><</npc>> approaches you. "Have you recovered from your ass-kicking yet? At least you understand your place now. I'm looking forward to after P.E. class today!"</p>

+ 117 - 117
sugarcube/src/activities/selfplay.tw

@@ -123,7 +123,7 @@
 	<<if getvar("$mastrOnce") == 0>>
 		<<set $mastrOnce = 1>>
 		<<set $org_temp = $orgasm>>
-		<<if getvar("$pc.pcs_inhib") < 30>>
+		<<if $pc.pcs_inhib < 30>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>
@@ -146,7 +146,7 @@
 	<!-- !	dildonumber = 0-->
 	<!-- !end-->
 
-	<<if $pc.horny > 0 and getvar("$pc.agape") < 3>>
+	<<if $pc.horny > 0 and $pc.agape < 3>>
 		<<gs 'selfplay' 'anal_fingering'>>
 
 	<</if>>
@@ -154,10 +154,10 @@
 		<<if getvar("$dildo") >= 1 or getvar("$middildo") == 1 or getvar("$largedildo") == 1 or getvar("$bigdildo") == 1 or getvar("$extradildo") == 1 or getvar("$superdildo") == 1 or getvar("$maddildo") == 1>>
 			<<if getvar("$dildonumber") > 0>>
 				<!-- Boy Ddildonumber -->
-				<<if getvar("$pc.vgape") <= 0>>
+				<<if $pc.vgape <= 0>>
 
 				<</if>>
-				<<if getvar("$pc.agape") <= 0>>
+				<<if $pc.agape <= 0>>
 					<<actCLA 'Use the dildo on your ass'>>
 						<<set $selfplaytime += 15>>
 						<<gs 'selfplay' 'sis_prov'>>
@@ -290,7 +290,7 @@
 		<<set $dildo_start_minute = $time.minutes>>
 		<<set $dildo_start_hour = $time.hour>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		You wince in pain as you sit down on your dildo and it tears through your hymen. After giving yourself a minute to adjust, you tentatively bounce up and down on it, until you start to enjoy yourself.
 	<<elseif $dildo_start_minute == $time.minutes and $dildo_start_hour == $time.hour>>
 		You spend 5 minutes bouncing up and down on the dildo mounted on your bathtub wall and having a good time.
@@ -329,7 +329,7 @@
 		<<set $dildo_start_minute = $time.minutes>>
 		<<set $dildo_start_hour = $time.hour>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		Leaving the shower running, you move the curtain aside and ease down onto your bathtub mounted rubber cock.
 		<p>You wince in pain as it tears through your hymen and slip on the wet tub floor, gasping aloud when you suddenly find yourself ass-to-tub and the entire thing shoved up your pussy.</p>
 		<i>Ow! Ow! Ow! Ow! I did not mean to take the full length of that thing right away!</i>
@@ -392,7 +392,7 @@
 		<<set $dildo_start_minute = $time.minutes>>
 		<<set $dildo_start_hour = $time.hour>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		Pulling yourself up out of the bath, you point your ass towards your suction mounted dildo and ease your pussy onto it.
 		<p>You wince in pain as it tears through your hymen and you slip, the bathwater sloshing around from your sudden movement. Next thing you know, you're gasping aloud when you suddenly find yourself ass-to-tub and the entire dildo shoved up your pussy to the hilt.</p>
 		<i>Ow! Ow! Ow! Ow! I did not mean to take the full length of that thing right away!</i>
@@ -465,7 +465,7 @@
 		<<set $dildo_start_minute = $time.minutes>>
 		<<set $dildo_start_hour = $time.hour>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		Leaving the shower running, you bend over, pointing your bottom towards your wall mounted dildo. You figure it's time that you test this thing out.
 		Lining it up with your pussy, you slowly push yourself back onto it, feeling it stretch you and penetrate you until you feel it bumping against your hymen. After taking a deep breath, you force your ass backward, immediately letting out a whimper of pain when you feel it tear through your maidenhood.
 		Biting hard on your lip, you give yourself a minute to adjust and let your walls stretch out. Eventually you feel a little braver and you tentatively slide off of it and then push back on again. With big long strokes, you pull all the way off and then push slowly back on until your filled and you feel your ass touching the wall. Soon it starts to feel good, and you pick up the pace. And then you grab the shower head and start spraying your clit with it while you slam yourself back on forth on your rubber cock.
@@ -540,7 +540,7 @@
 		<<set $dildo_start_minute = $time.minutes>>
 		<<set $dildo_start_hour = $time.hour>>
 	<</if>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		Moving your bottom over towards your wall mounted dildo, you figure it's time that you test this thing out.
 		Lining it up with your pussy, you slowly push yourself back onto it, feeling it stretch you and penetrate you until you feel it bumping against your hymen. After taking a deep breath, you force your ass backward, immediately letting out a whimper of pain when you feel it tear through your maidenhood.
 		Biting hard on your lip, you give yourself a minute to adjust and let your walls stretch out. Eventually you feel a little braver and you tentatively slide off of it and then push back on again. With big long strokes, you pull all the way off and then push slowly back on until your filled and you feel your ass touching the wall. Soon it starts to feel good, and you pick up the pace. And then you grab the shower head and start spraying your clit with it while you slam yourself back on forth on your rubber cock.
@@ -620,16 +620,16 @@
 		<<set $selfplaytime += 2>>
 		<<gs 'selfplay' 'sis_prov'>>
 		<<image "shared/sex/mast/finger.jpg">>
-		<<if getvar("$pc.pcs_vag") == 0 and getvar("$mesec") <= 0>>
+		<<if $pc.pcs_vag == 0 and getvar("$mesec") <= 0>>
 			You let your fingers dart over your soft and wet pussy lips, before gradually attempting to slide your finger into your pussy. You feel your hymen stretch a little as you slide first one and then a second finger inside.
 			<<arouse 'vaginal_finger' 2 `['masturbate']`>>
 			<<gs 'selfplay' 'fingering2'>>
-		<<elseif getvar("$pc.pcs_vag") > 0>>
+		<<elseif $pc.pcs_vag > 0>>
 			You slide one finger into your vagina, and then another.
-			<<if getvar("$pc.pcs_vag") < 5>>
+			<<if $pc.pcs_vag < 5>>
 				<<set $pc.horny += rand(2, 5)>>
 				You feel your pussy clasping around your fingers very tightly.
-			<<elseif getvar("$pc.pcs_vag") < 10>>
+			<<elseif $pc.pcs_vag < 10>>
 				<<set $pc.horny += rand(5, 10)>>
 				You feel your slippery pussy walls around your fingers. It feels nice and tight.
 			<<else>>
@@ -661,11 +661,11 @@
 		<<else>>
 			You start moving your fingers in and out, softly pinching your nipples as you play with yourself.
 		<</if>>
-		<<if getvar("$pc.pcs_vag") <= 12>>
+		<<if $pc.pcs_vag <= 12>>
 			Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.
 
 		<</if>>
-		<<if getvar("$pc.pcs_vag") > 12>>
+		<<if $pc.pcs_vag > 12>>
 			Your pussy is quite loose, and you have to work hard to get much enjoyment out of it.
 
 		<</if>>
@@ -673,7 +673,7 @@
 		<<arouse 'vaginal_finger' 10 `['masturbate']`>>
 		<<if $org_temp == $orgasm>>
 			<<gs 'selfplay' 'fingering2' 1>>
-			<<if getvar("$pc.pcs_vag") > 0>>
+			<<if $pc.pcs_vag > 0>>
 				<<gs 'selfplay' 'fingering3'>>
 
 			<</if>>
@@ -689,33 +689,33 @@
 		<<gs 'selfplay' 'sis_prov'>>
 		<<image "shared/sex/mast/hand.jpg">>
 		You shove all your fingers inside your pussy.
-		<<if getvar("$pc.pcs_vag") < 10>>
-			<<if getvar("$pc.vgape") == 2>>
+		<<if $pc.pcs_vag < 10>>
+			<<if $pc.vgape == 2>>
 				<<set $pc.vgape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 1>>
+			<<if $pc.vgape == 1>>
 				<<set $pc.vgape = 2>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 0>>
+			<<if $pc.vgape == 0>>
 				<<set $pc.vgape = 1>>
 
 			<</if>>
 			<<set $pc.horny -= 10>>
 			<<set $pc.mood -= 10>>
 			You shove all your fingers inside your tight pussy, and feel it stretch out way more than it should. It's rather painful.
-		<<elseif getvar("$pc.pcs_vag") < 15>>
+		<<elseif $pc.pcs_vag < 15>>
 			<<set $pc.horny += rand(1, 3)>>
 			You shove all your fingers inside your tight pussy, feeling your pussy grip them tightly. It doesn''t hurt, but doesn''t feel very good either.
-		<<elseif getvar("$pc.pcs_vag") < 20>>
+		<<elseif $pc.pcs_vag < 20>>
 			<<set $pc.horny += rand(3, 6)>>
 			You shove all your fingers inside your tight pussy, feeling your pussy grip them tightly.
 		<<else>>
 			<<set $pc.horny += rand(6, 12)>>
 			You stick all of your fingers in your pussy, and feel how your vagina envelops them nicely. You get a pleasant feeling of fullness.
 		<</if>>
-		<<if getvar("$pc.pcs_vag") < 15>>
+		<<if $pc.pcs_vag < 15>>
 			<<setn $vaginaTemp += 1>>
 
 		<</if>>
@@ -734,16 +734,16 @@
 	<<actCLA 'Fuck yourself with your fingers'>>
 		<<set $selfplaytime += 10>>
 		<<gs 'selfplay' 'sis_prov'>>
-		<<if getvar("$pc.pcs_vag") < 10>>
-			<<if getvar("$pc.vgape") == 2>>
+		<<if $pc.pcs_vag < 10>>
+			<<if $pc.vgape == 2>>
 				<<set $pc.vgape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 1>>
+			<<if $pc.vgape == 1>>
 				<<set $pc.vgape = 2>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 0>>
+			<<if $pc.vgape == 0>>
 				<<set $pc.vgape = 1>>
 
 			<</if>>
@@ -756,13 +756,13 @@
 		<<else>>
 			You start to slowly move your hand, thrusting your fingers into your pussy again and again.
 		<</if>>
-		<<if getvar("$pc.pcs_vag") <= 15>>
+		<<if $pc.pcs_vag <= 15>>
 			<<setn $pc.horny -= 10>> <<setn $pc.mood -= 10>>
 		<</if>>
-		<<if getvar("$pc.pcs_vag") > 10>>
+		<<if $pc.pcs_vag > 10>>
 			<<set $pc.horny += rand(10, 20)>>
 		<</if>>
-		<<if getvar("$pc.pcs_vag") < 20>>
+		<<if $pc.pcs_vag < 20>>
 			<<setn $vaginaTemp += 1>>
 
 		<</if>>
@@ -770,7 +770,7 @@
 		<<arouse 'vaginal_finger' 10 `['masturbate']`>>
 		<<if $org_temp == $orgasm>>
 			<<gs 'selfplay' 'fingering4' 1>>
-			<<if getvar("$pc.pcs_vag") > 10>>
+			<<if $pc.pcs_vag > 10>>
 				<<gs 'selfplay' 'self_fisting_1'>>
 
 			<</if>>
@@ -785,33 +785,33 @@
 		<<set $selfplaytime += 2>>
 		<<gs 'selfplay' 'sis_prov'>>
 		<<image "shared/sex/mast/self_fisting.jpg">>
-		<<if getvar("$pc.pcs_vag") < 15>>
-			<<if getvar("$pc.vgape") == 2>>
+		<<if $pc.pcs_vag < 15>>
+			<<if $pc.vgape == 2>>
 				<<set $pc.vgape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 1>>
+			<<if $pc.vgape == 1>>
 				<<set $pc.vgape = 2>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 0>>
+			<<if $pc.vgape == 0>>
 				<<set $pc.vgape = 1>>
 
 			<</if>>
 			<<set $pc.horny -= 10>>
 			<<set $pc.mood -= 10>>
 			You shove your whole hand inside your tight pussy, and feel it stretch out way more than it should. It's rather painful.
-		<<elseif getvar("$pc.pcs_vag") < 20>>
+		<<elseif $pc.pcs_vag < 20>>
 			<<set $pc.horny += rand(1, 3)>>
 			You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly. It doesn''t hurt, but doesn''t feel very good either.
-		<<elseif getvar("$pc.pcs_vag") < 25>>
+		<<elseif $pc.pcs_vag < 25>>
 			<<set $pc.horny += rand(3, 6)>>
 			You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly.
 		<<else>>
 			<<set $pc.horny += rand(6, 12)>>
 			You stick your whole hand in your pussy, and feel how your vagina envelops it nicely. You get a pleasant feeling of fullness.
 		<</if>>
-		<<if getvar("$pc.pcs_vag") < 20>>
+		<<if $pc.pcs_vag < 20>>
 			<<setn $vaginaTemp += 1>>
 
 		<</if>>
@@ -830,16 +830,16 @@
 	<<actCLA 'Fuck your fist'>>
 		<<set $selfplaytime += 10>>
 		<<gs 'selfplay' 'sis_prov'>>
-		<<if getvar("$pc.pcs_vag") < 15>>
-			<<if getvar("$pc.vgape") == 2>>
+		<<if $pc.pcs_vag < 15>>
+			<<if $pc.vgape == 2>>
 				<<set $pc.vgape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 1>>
+			<<if $pc.vgape == 1>>
 				<<set $pc.vgape = 2>>
 
 			<</if>>
-			<<if getvar("$pc.vgape") == 0>>
+			<<if $pc.vgape == 0>>
 				<<set $pc.vgape = 1>>
 
 			<</if>>
@@ -852,13 +852,13 @@
 		<<else>>
 			You start to slowly move your arm, thrusting your hand into your pussy again and again.
 		<</if>>
-		<<if getvar("$pc.pcs_vag") <= 20>>
+		<<if $pc.pcs_vag <= 20>>
 			<<setn $pc.horny -= 10>> <<setn $pc.mood -= 10>>
 		<</if>>
-		<<if getvar("$pc.pcs_vag") > 15>>
+		<<if $pc.pcs_vag > 15>>
 			<<set $pc.horny += rand(10, 20)>>
 		<</if>>
-		<<if getvar("$pc.pcs_vag") < 25>>
+		<<if $pc.pcs_vag < 25>>
 			<<setn $vaginaTemp += 1>>
 
 		<</if>>
@@ -881,7 +881,7 @@
 		<!-- !!if $loc = 'vanrPar':'<<image `'shared/sex/mast/klitvann.jpg'`>>'-->
 		<<image "shared/sex/mast/1.jpg">>
 		<<arouse 'anal_finger' 5 `['masturbate']`>>
-		<<if getvar("$pc.pcs_ass") >= 5>>
+		<<if $pc.pcs_ass >= 5>>
 			You press a finger against your asshole and push it in. It slides in quite easily.
 		<<else>>
 			<<set $pc.pcs_ass += 1>>
@@ -906,33 +906,33 @@
 	<<set $selfplaytime += 5>>
 	<<gs 'selfplay' 'sis_prov'>>
 	<<image "shared/sex/mast/2.jpg">>
-	<<if getvar("$pc.pcs_ass") >= 10>>
+	<<if $pc.pcs_ass >= 10>>
 		You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
 			<<set $pc.horny -= 50>>
-			<<if getvar("$pc.pcs_ass") > 1>>
+			<<if $pc.pcs_ass > 1>>
 				<<setn $pc.pcs_ass -= 1>>
 
 			<</if>>
 			Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.
 		<</if>>
-	<<elseif getvar("$pc.pcs_ass") >= 5 and getvar("$pc.pcs_ass") < 10>>
+	<<elseif $pc.pcs_ass >= 5 and $pc.pcs_ass < 10>>
 		<<set $analplay += 1>>
 		You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -942,15 +942,15 @@
 		<</if>>
 	<<else>>
 		<<set $pc.pcs_ass += 1>>
-		<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 0>>
+		<<if $pc.agape == 0>>
 			<<set $pc.agape = 1>>
 
 		<</if>>
@@ -966,8 +966,8 @@
 		<<gs 'selfplay' 'van_vtor'>>
 
 	<</if>>
-	<<if $org_temp == $orgasm and getvar("$pc.agape") < 3>>
-		<<if getvar("$pc.pcs_ass") < 25>>
+	<<if $org_temp == $orgasm and $pc.agape < 3>>
+		<<if $pc.pcs_ass < 25>>
 			<<actCLA 'Keep fucking your ass with two fingers'>>
 				<<gt 'selfplay' 'anal_fingering2a'>>
 			<</actCLA>>
@@ -981,33 +981,33 @@
 	<<set $selfplaytime += 5>>
 	<<gs 'selfplay' 'sis_prov'>>
 	<<image "shared/sex/mast/2.jpg">>
-	<<if getvar("$pc.pcs_ass") >= 10>>
+	<<if $pc.pcs_ass >= 10>>
 		You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
 			<<set $pc.horny -= 50>>
-			<<if getvar("$pc.pcs_ass") > 1>>
+			<<if $pc.pcs_ass > 1>>
 				<<setn $pc.pcs_ass -= 1>>
 
 			<</if>>
 			Fucking your already sore asshole with two fingers was a bad idea. It hurts a lot and you feel like you damaged it further.
 		<</if>>
-	<<elseif getvar("$pc.pcs_ass") >= 5 and getvar("$pc.pcs_ass") < 10>>
+	<<elseif $pc.pcs_ass >= 5 and $pc.pcs_ass < 10>>
 		<<set $analplay += 1>>
 		You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -1017,15 +1017,15 @@
 		<</if>>
 	<<else>>
 		<<set $pc.pcs_ass += 1>>
-		<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 0>>
+		<<if $pc.agape == 0>>
 			<<set $pc.agape = 1>>
 
 		<</if>>
@@ -1041,8 +1041,8 @@
 		<<gs 'selfplay' 'van_vtor'>>
 
 	<</if>>
-	<<if $org_temp == $orgasm and getvar("$pc.agape") < 3>>
-		<<if getvar("$pc.pcs_ass") < 25>>
+	<<if $org_temp == $orgasm and $pc.agape < 3>>
+		<<if $pc.pcs_ass < 25>>
 			<<actCLA 'Keep fucking your ass with two fingers'>>
 				<<gt 'selfplay' 'anal_fingering2a'>>
 			<</actCLA>>
@@ -1056,33 +1056,33 @@
 	<<set $selfplaytime += 5>>
 	<<gs 'selfplay' 'sis_prov'>>
 	<<image "shared/sex/mast/3.jpg">>
-	<<if getvar("$pc.pcs_ass") >= 15>>
+	<<if $pc.pcs_ass >= 15>>
 		Your asshole is fairly loose, and you manage to slide three fingers in without much effort.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
 			<<set $pc.horny -= 50>>
-			<<if getvar("$pc.pcs_ass") > 1>>
+			<<if $pc.pcs_ass > 1>>
 				<<setn $pc.pcs_ass += 1>>
 
 			<</if>>
 			Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.
 		<</if>>
-	<<elseif getvar("$pc.pcs_ass") >= 10 and getvar("$pc.pcs_ass") < 15>>
+	<<elseif $pc.pcs_ass >= 10 and $pc.pcs_ass < 15>>
 		<<set $analplay += 1>>
 		You slide three fingers into your asshole. You can feel your anus squeezing your fingers tightly.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -1092,15 +1092,15 @@
 		<</if>>
 	<<else>>
 		<<set $pc.pcs_ass += 1>>
-		<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 0>>
+		<<if $pc.agape == 0>>
 			<<set $pc.agape = 1>>
 
 		<</if>>
@@ -1116,7 +1116,7 @@
 	<<actCLA 'Stop touching yourself'>>
 		<<gt 'selfplay' 'stop'>>
 	<</actCLA>>
-	<<if $org_temp == $orgasm and getvar("$pc.agape") < 3>>
+	<<if $org_temp == $orgasm and $pc.agape < 3>>
 		<<actCLA 'Push four fingers into your asshole'>>
 			<<gt 'selfplay' 'anal_fingering4'>>
 		<</actCLA>>
@@ -1126,33 +1126,33 @@
 	<<set $selfplaytime += 5>>
 	<<gs 'selfplay' 'sis_prov'>>
 	<<image "shared/sex/mast/4.jpg">>
-	<<if getvar("$pc.pcs_ass") >= 20>>
+	<<if $pc.pcs_ass >= 20>>
 		Your asshole is very loose, and you manage to push four fingers into it.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
 			<<set $pc.horny -= 50>>
-			<<if getvar("$pc.pcs_ass") > 1>>
+			<<if $pc.pcs_ass > 1>>
 				<<setn $pc.pcs_ass -= 1>>
 
 			<</if>>
 			Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.
 		<</if>>
-	<<elseif getvar("$pc.pcs_ass") >= 15 and getvar("$pc.pcs_ass") < 20>>
+	<<elseif $pc.pcs_ass >= 15 and $pc.pcs_ass < 20>>
 		<<set $analplay += 1>>
 		You manage to push four fingers into your asshole. You can feel your anus squeezing your fingers tightly.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -1162,15 +1162,15 @@
 		<</if>>
 	<<else>>
 		<<set $pc.pcs_ass += 1>>
-		<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 0>>
+		<<if $pc.agape == 0>>
 			<<set $pc.agape = 1>>
 
 		<</if>>
@@ -1186,7 +1186,7 @@
 	<<actCLA 'Stop touching yourself'>>
 		<<gt 'selfplay' 'stop'>>
 	<</actCLA>>
-	<<if $org_temp == $orgasm and getvar("$pc.agape") < 3>>
+	<<if $org_temp == $orgasm and $pc.agape < 3>>
 		<<actCLA 'Put your whole hand in'>>
 			<<gt 'selfplay' 'anal_fisting'>>
 		<</actCLA>>
@@ -1197,33 +1197,33 @@
 	<<set $selfplaytime += 5>>
 	<<gs 'selfplay' 'sis_prov'>>
 	<<image "shared/sex/mast/5.jpg">>
-	<<if getvar("$pc.pcs_ass") >= 25>>
+	<<if $pc.pcs_ass >= 25>>
 		Slowly but surely, you manage to get your entire hand into your ass.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
 			<<set $pc.horny -= 50>>
-			<<if getvar("$pc.pcs_ass") > 1>>
+			<<if $pc.pcs_ass > 1>>
 				<<setn $pc.pcs_ass -= 1>>
 
 			<</if>>
 			Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.
 		<</if>>
-	<<elseif getvar("$pc.pcs_ass") >= 20 and getvar("$pc.pcs_ass") < 25>>
+	<<elseif $pc.pcs_ass >= 20 and $pc.pcs_ass < 25>>
 		<<set $analplay += 1>>
 		It takes a lot of effort, but over the course of several minutes you manage to work your whole hand into your ass. You feel your anus squeeze your wrist tightly.
-		<<if getvar("$pc.agape") > 0>>
-			<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape > 0>>
+			<<if $pc.agape == 2>>
 				<<set $pc.agape = 3>>
 
 			<</if>>
-			<<if getvar("$pc.agape") == 1>>
+			<<if $pc.agape == 1>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -1233,15 +1233,15 @@
 		<</if>>
 	<<else>>
 		<<set $pc.pcs_ass += 1>>
-		<<if getvar("$pc.agape") == 2>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 0>>
+		<<if $pc.agape == 0>>
 			<<set $pc.agape = 1>>
 
 		<</if>>
@@ -1257,7 +1257,7 @@
 	<<actCLA 'Stop touching yourself'>>
 		<<gt 'selfplay' 'stop'>>
 	<</actCLA>>
-	<<if $org_temp == $orgasm and getvar("$pc.agape") < 3>>
+	<<if $org_temp == $orgasm and $pc.agape < 3>>
 		<<actCLA 'Keep fisting yourself'>>
 			<<gt 'selfplay' 'anal_fisting2'>>
 		<</actCLA>>
@@ -1271,16 +1271,16 @@
 	<<arouse 'anal_fist' 5 `['masturbate']`>>
 	<<arouse 'anal_fist' -15 `['masturbate']`>>
 	There is still a lot of resistance but you are able to move your fist backwards and forwards with it still in your butt. the feeling of being stretched so much and the rubbing inside your ass is blissful.
-	<<if getvar("$pc.agape") > 0>>
-		<<if getvar("$pc.agape") == 2>>
+	<<if $pc.agape > 0>>
+		<<if $pc.agape == 2>>
 			<<set $pc.agape = 3>>
 
 		<</if>>
-		<<if getvar("$pc.agape") == 1>>
+		<<if $pc.agape == 1>>
 			<<set $pc.agape = 2>>
 
 		<</if>>
-		<<if getvar("$pc.pcs_ass") > 1>>
+		<<if $pc.pcs_ass > 1>>
 			<<setn $pc.pcs_ass -= 1>>
 
 		<</if>>

+ 11 - 11
sugarcube/src/activities/sleep/sleep.tw

@@ -39,14 +39,14 @@
 	<</if>>
 	<<setinit $varsleep['minutes to wakeup'] -= 1>>
 	<<setinit $varsleep['minutes to wakeup end'] -= 1>>
-	<<if getvar("$alarm_holiday") == 1 and getvar("$time.isSchoolHoliday") == 1>>
+	<<if getvar("$alarm_holiday") == 1 and $time.isSchoolHoliday == 1>>
 		<!-- !! use weekend time alarm-->
 		<<setinit $varsleep['alarm_time'] = $time.daystart * 1440 + $timerEnd * 60 + $timerEndM>>
 		<<if $varsleep['minutes to wakeup end'] > 0>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump loopson_sleep'>>
 
 		<</if>>
-	<<elseif getvar("$time.weekday") > 5>>
+	<<elseif $time.weekday > 5>>
 		<!-- !! use weeken time alarm-->
 		<<setinit $varsleep['alarm_time'] = $time.daystart * 1440 + $timerEnd * 60 + $timerEndM>>
 		<<if $varsleep['minutes to wakeup end'] > 0>>
@@ -109,7 +109,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'nap_bed'>>
 	<<actCLA 'Take a nap (1:00)'>>
-		<<if getvar("$pc.pcs_sleep") >= 10 and getvar("$pc.pcs_sleep") <= 90>>
+		<<if $pc.pcs_sleep >= 10 and $pc.pcs_sleep <= 90>>
 			<<set $InSleep = 1>>
 			<<set $pc.pcs_sleep += 10>>
 			<<set $pc.pcs_health += 5>>
@@ -118,7 +118,7 @@
 			<<actCLA 'Get up'>>
 				<<set $InSleep = 0>> <<gt $location>>
 			<</actCLA>>
-		<<elseif getvar("$pc.pcs_sleep") < 10>>
+		<<elseif $pc.pcs_sleep < 10>>
 			<<gt 'sleep' 'sleep'>>
 		<<else>>
 			<<set $time.minutes += 5>>
@@ -195,7 +195,7 @@
 			<</if>>
 		<</if>>
 		<!--
-			<<if getvar("$pc.vibratorin") == 1>>
+			<<if $pc.vibratorin == 1>>
 				<<set $vtime += 1>>
 				<<if getvar("$vtime") >= 5>>
 					<<set $pc.horny += 1>>
@@ -218,7 +218,7 @@
 					<</actCLA>>
 					$exit
 				<</if>>
-			<<elseif $pc.horny > 80 and getvar("$pc.pcs_sleep") >= 30 and rand(1,300) == 300 and getvar("$succubusQW") != 1 and getvar("$succubusQW") != 2>>
+			<<elseif $pc.horny > 80 and $pc.pcs_sleep >= 30 and rand(1,300) == 300 and getvar("$succubusQW") != 1 and getvar("$succubusQW") != 2>>
 
 				<<set $waketext = 'You glance at your alarm clock. It reads <b>$mid(100+hour,2,2):$mid(100+minut,2,2)</b>.'>>
 				<<gt 'sleep' 'wake_horny'>>
@@ -239,9 +239,9 @@
 
 	<<if getvar("$slept_in") == 1>>
 		You wake up at <b><<time_current>></b>, after sleeping-in a little longer than planned, but at least you've had plenty of sleep.
-	<<elseif getvar("$pc.pcs_sleep") >= 100 and getvar("$budilnikOn") == 1 and _time_now >= _alarm_time>>
+	<<elseif $pc.pcs_sleep >= 100 and getvar("$budilnikOn") == 1 and _time_now >= _alarm_time>>
 		You wake up at <b><<time_current>></b>, just before your alarm goes off. You've had plenty of sleep.
-	<<elseif getvar("$pc.pcs_sleep") >= 100>>
+	<<elseif $pc.pcs_sleep >= 100>>
 		You wake up at <b><<time_current>></b>, no longer tired and ready to start the day with plenty of sleep.
 	<<elseif getvar("$budilnikOn") == 1 and _time_now == _alarm_time>>
 		<<set $pc.mood -= 10>>
@@ -294,7 +294,7 @@
 		<</if>>
 		Maybe you should just get up.
 	<</if>>
-	<<if $loc == 'bedrPar' and getvar("$sisterLesb") == 6 and getvar("$time.hour") < 6>>
+	<<if $loc == 'bedrPar' and getvar("$sisterLesb") == 6 and $time.hour < 6>>
 		Or... you could wake up Anya and see if your dearest sister would be willing to help you with that.
 	<<elseif $loc == 'FedorEv4'>>
 		Or... you could wake up Fedor and see if your boyfriend can't help you with that.
@@ -325,7 +325,7 @@
 			<<gs 'sleep' 'end'>>
 		<</actCLA>>
 	<</if>>
-	<<if $loc == 'bedrPar' and getvar("$sisterLesb") == 6 and getvar("$time.hour") < 6>>
+	<<if $loc == 'bedrPar' and getvar("$sisterLesb") == 6 and $time.hour < 6>>
 		<<actCLA 'Wake Anya and see if she`s in the mood'>>
 			<<set $strip_here = 0>> <<set $pc.isSleeping= 0>> <<gt 'sistersleep' 'sister_sleep'>>
 		<</actCLA>>
@@ -470,7 +470,7 @@
 	<<set $strip_here = 0>>
 	<<image "pc/body/succubusself.jpg">>
 	<font color="red">You feel the power flowing around your body for several minutes, leaking through your skin and making changes all throughout you, before fading to a presence deep in your core leaving you looking the same as before... but feeling so different! </font>
-	<<if getvar("$pc.preg") == 1>>
+	<<if $pc.preg == 1>>
 		<<gs 'medical_din' 'remove_preg'>>
 		<<set $RecovH = 0>>
 	<</if>>

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

@@ -40,7 +40,7 @@
 
 	<</if>>-->
 	<!--
-	<<if getvar("$pc.analplugin") == 1 and getvar("$pc.vibratorin") == 1>>
+	<<if getvar("$pc.analplugin") == 1 and $pc.vibratorin == 1>>
 		<<if getvar("$bedAnal") == 1 and getvar("$bedVibrator") == 1>>
 			<<set $pc.analplugin = 0>>
 			<<set $pc.vibratorin = 0>>
@@ -57,7 +57,7 @@
 
 			You decide to remove your butt plug, but leave your vibrator in.
 		<</if>>
-	<<elseif getvar("$pc.analplugin") == 1 and getvar("$pc.vibratorin") == 0>>
+	<<elseif getvar("$pc.analplugin") == 1 and $pc.vibratorin == 0>>
 		<<if getvar("$bedAnal") == 1>>
 			<<set $pc.analplugin = 0>>
 
@@ -65,7 +65,7 @@
 		<<elseif getvar("$bedAnal") == 0>>
 			You decide to leave your butt plug in.
 		<</if>>
-	<<elseif getvar("$pc.analplugin") == 0 and getvar("$pc.vibratorin") == 1>>
+	<<elseif getvar("$pc.analplugin") == 0 and $pc.vibratorin == 1>>
 		<<if getvar("$bedVibrator") == 1>>
 			<<set $pc.vibratorin = 0>>
 			You remove your vibrator.
@@ -107,13 +107,13 @@
 	<<else>>
 		Your hair is loose and free.
 	<</if>> -->
-	<<if getvar("$pc.pcs_makeup") > 1 and getvar("$pc.cosmetic_tattoo") == 0>>
+	<<if $pc.pcs_makeup > 1 and $pc.cosmetic_tattoo == 0>>
 		<<set $pc.pcs_makeup = 0>>
 		<<set $pc.vidageday -= 1>>
 		<<gs 'body' 'SkinLoss' 'MakeUpSleep'>>
 		<p>You went to bed wearing your makeup, which will smear your face as you sleep; your skin will age faster from this!</p>
 	<</if>>
-	<!--<<if getvar("$pc.fat") > 5 and getvar("$stringimplant") == 1>>
+	<!--<<if $pc.fat > 5 and getvar("$stringimplant") == 1>>
 		<<setn $silicone += 1>> <<setn $pc.fat -= 5>>
 
 	<</if>>-->

+ 7 - 7
sugarcube/src/activities/sleep/wake.tw

@@ -32,15 +32,15 @@
 		<<gs 'marisha_ev' 'morning'>>
 
 	<</if>>
-	<<if getvar("$time.daystart") < 10 and $start_subtype == 'tg'>>
+	<<if $time.daystart < 10 and $start_subtype == 'tg'>>
 		<p>The first thing you think as you wake up is, "Damn! It's is not a dream, I really am a woman now."</p>
 
 	<</if>>
-	<<if getvar("$time.daystart") >= 10 and getvar("$time.daystart") < 30 and $start_subtype == 'tg'>>
+	<<if $time.daystart >= 10 and $time.daystart < 30 and $start_subtype == 'tg'>>
 		Looking at your female body, you are still a little surprised it's actually you.
 
 	<</if>>
-	<<if getvar("$slept_in") == 1 and getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6 and getvar("$time.hour") >= 9 and getvar("$time.hour") < 14 and getvar("$suspended['on']") != 1>>
+	<<if getvar("$slept_in") == 1 and $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6 and $time.hour >= 9 and $time.hour < 14 and getvar("$suspended['on']") != 1>>
 		<<if getvar("$schoolprogul") > 2 and getvar("$schoolPredupr") == 2>>
 			<<set $pc.mood -= 35>>
 			<<msg '<center>Damn it""s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It""s too late to go to school now!<br><<$npcs.get(""A29"",'nickname')>> will be furious. I don""t know what she might do...</center>'>>
@@ -56,8 +56,8 @@
 		<</if>>
 	<</if>>-->
 
-	<!--<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6 and getvar("$time.hour") >= 4 and getvar("$time.hour") < 9>>
-		<<if getvar("$slept_in") == 1 and (getvar("$time.hour") == 7 or getvar("$time.hour") == 8) and getvar("$suspended['on']") != 1>>
+	<!--<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6 and $time.hour >= 4 and $time.hour < 9>>
+		<<if getvar("$slept_in") == 1 and ($time.hour == 7 or $time.hour == 8) and getvar("$suspended['on']") != 1>>
 			<<set $pc.mood -= 10>>
 			<<msg '<center>Damn it""s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, you""ve slept too long! You need to hurry or you""re going to be late for school!</center>'>>
 		<</if>>
@@ -77,14 +77,14 @@
 			<<gs 'sleep' 'end'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$enfullmorrout") == 1 and getvar("$time.hour") >= 4 and getvar("$time.hour") < 12>>
+	<<if getvar("$enfullmorrout") == 1 and $time.hour >= 4 and $time.hour < 12>>
 		<<actCLA 'Full morning routine (01:00)'>>
 			<<set $time.minutes += 15>>
 			<<set $fullmorrout = 1>>
 			<<run $wardrobe.wearLastWorn('bed')>>
 			<<gs 'sleep' 'end'>>
 		<</actCLA>>
-		<<if getvar("$time.isSchoolHoliday") == 0 and $pc.isSchoolStudent and getvar("$time.weekday") < 6 and getvar("$time.hour") >= 4 and getvar("$time.hour") < 9 and getvar("$suspended['on']") != 1>>
+		<<if $time.isSchoolHoliday == 0 and $pc.isSchoolStudent and $time.weekday < 6 and $time.hour >= 4 and $time.hour < 9 and getvar("$suspended['on']") != 1>>
 			<<actCLA 'Full morning routine for School (01:00)'>>
 				<<set $fullmorrout = 1>>
 				<<set $time.minutes += 15>>

+ 5 - 5
sugarcube/src/autogenerated/unsorted/BDSM_Club.tw

@@ -42,9 +42,9 @@
 			<</actCLA>>
 		<</if>>
 	<<elseif getvar("$BDSMmeet") == 1 and $BDSMday != $time.daystart>>
-		<<if getvar("$finances.cash") < 10000>>
+		<<if $finances.cash < 10000>>
 			You go to the Club entrance but don't have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.
-		<<elseif $wardrobe.clothingworntype != 'gm_maid' or getvar("$wardrobe.PCloStyle2") != 1>>
+		<<elseif $wardrobe.clothingworntype != 'gm_maid' or $wardrobe.PCloStyle2 != 1>>
 			You are not wearing a maid uniform and security refuse you entry.
 		<<else>>
 			<<if $BDSMrole == 's'>>
@@ -54,7 +54,7 @@
 			<</if>>
 		<</if>>
 	<<elseif getvar("$BDSMmeet") > 1 and getvar("$BDSMmeet") < 4 and $BDSMday != $time.daystart>>
-		<<if $BDSMpayDay >= $time.daystart - 30 or getvar("$finances.cash") >= 10000>>
+		<<if $BDSMpayDay >= $time.daystart - 30 or $finances.cash >= 10000>>
 			<<gt 'BDSM_training' 'start'>>
 		<<else>>
 			You are in a Club but don't have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.
@@ -145,7 +145,7 @@
 	<<set $menu_off = 0>>
 	<<image "locations/city/suburb/bdsm_club/1_1.jpg">>
 	You enter the club and Mistress Elektra is sitting at her desk overseeing admissions.
-	<<if getvar("$finances.cash") > 10000>>
+	<<if $finances.cash > 10000>>
 		<<set $BDSMpayDay = $time.daystart>>
 		<<set $BDSMday = $time.daystart>>
 		<<set $finances.cash -= 10000>>
@@ -166,7 +166,7 @@
 	<<set $menu_off = 0>>
 	<<image "locations/city/suburb/bdsm_club/1_1.jpg">>
 	Elektra is sitting at the admissions desk and greets you informally.
-	<<if getvar("$finances.cash") > 10000>>
+	<<if $finances.cash > 10000>>
 		<<set $BDSMpayDay = $time.daystart>>
 		<<set $BDSMday = $time.daystart>>
 		<<set $finances.cash -= 10000>>

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

@@ -511,7 +511,7 @@
 		<<set $cumspclnt = 4>>
 		<<gs 'cum_cleanup'>>
 		Yuri lets you have a quick shower and dress before giving you a quick kiss on the cheek.
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
@@ -539,7 +539,7 @@
 		<<set $cumspclnt = 4>>
 		<<gs 'cum_cleanup'>>
 		<p>You wash quickly in shower and $boydesc begins to hurry you out.</p>
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
@@ -555,7 +555,7 @@
 		<<showerdin>>
 		<<video "shared/home/bathroom/dush.mp4">>
 		You go into the bathroom and turn on the shower, lathering body and washing as well as you can.
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
@@ -925,7 +925,7 @@
 		<p>$boydesc stares expectingly at you until your lips glide over his hard dick.</p>
 		<<arouse 'bj' 5 `['sub']`>>
 	<<elseif getvar("$harakBoy") == 2>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 
 		<</if>>
@@ -956,7 +956,7 @@
 	<<gs 'dinsex' 'boy_wants_anal'>>
 	<p>$boydesc lays you on your stomach on the bed, spreading your ass apart as he begins to massage and open your anus with his fingers, first one, then two.</p>
 	<<arouse 'anal_finger' 5 `['sub']`>>
-	<<if getvar("$pc.pcs_ass") < 10>>
+	<<if $pc.pcs_ass < 10>>
 		You groan in pain as his third finger invades your ass.
 	<<else>>
 		You feel your asshole stretch to accommodate his third finger.
@@ -973,7 +973,7 @@
 	<p>$boydesc stops his assault for a moment, giving your ass time to adapt to the cock invading it before he starts you again, this time even more insistent.</p>
 	<<arouse 'anal' 10 `['sub']`>>
 	<<if $pc.pcs_ass + $lubonus + 2 < $dick>>
-		<<if getvar("$pc.pcs_makeup") > 1>>
+		<<if $pc.pcs_makeup > 1>>
 			<<set $pc.pcs_makeup = 0>>
 
 		<</if>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/BelSex.tw

@@ -394,13 +394,13 @@
 		<<set $pc.horny = $pc.horny + 1>>
 		<<set $pc.pcs_hairbsh = 1>>
 		<<set $pc.pcs_makeup = 1>>
-		<<if getvar("$pc.frost") > 0>>
+		<<if $pc.frost > 0>>
 			<<set $pc.frost = 0>>
 
 		<</if>>
 		<<video "shared/home/bathroom/dush.mp4">>
 		You get into the nice, hot water stream of the shower and lather your body up with a soapy sponge. You carefully make sure to wash all of his cum that's dripping out your holes, you then shampoo your hair and rinse that out as well. You're squeaky clean now.
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
@@ -422,7 +422,7 @@
 					<p>You have reduced your next weeks payment by: -1*belgangPayWeek <b>₽</b></p>
 				<</if>>
 			<</if>>
-			<<if getvar("$wardrobe.PCloswimwear") == 1>>
+			<<if $wardrobe.PCloswimwear == 1>>
 				<<run $wardrobe.wear_clothes_legacy('clothes',$lastwornclothingtype['swim'],$lastwornclothingnumber['swim'])>>
 				<<run $wardrobe.wear(['panties',$lastwornpantytype['swim'],$lastwornpantynumber['swim']])>>
 				<<run $wardrobe.wear(['bra',$lastwornbratype['swim'],$lastwornbranumber['swim']])>>

+ 5 - 5
sugarcube/src/autogenerated/unsorted/BurgerTip.tw

@@ -173,7 +173,7 @@
 					<<actCLA 'Suck his dick'>>
 						<<gt 'BurgerTip' 'bj'>>
 					<</actCLA>>
-					<<if !$pc.thinksIsVirgin or getvar("$pc.pcs_ass") > 0>>
+					<<if !$pc.thinksIsVirgin or $pc.pcs_ass > 0>>
 						<<actCLA 'Have sex'>>
 							<!-- FAILED TO CONVERT
 								*clr&cla
@@ -485,7 +485,7 @@
 									<<image "characters/city/anatoly/sex/bossbjs.jpg">>
 									You kneel before your Anatoly, and shower his groin with gentle kisses and little licks. He is rock hard and ready in no time. You tease him a little by sucking on just the tip of his cock, for awhile. When it looks like he can't take it anymore, you slide his entire cock into your mouth. You bob your head up and down vigorously, savoring the taste of the boss''s cock. Before you can finish him, he pulls himself from your mouth, and motions for you to follow him to the bench.
 									<<arouse 'bj' 5 `['sub']`>>
-									<<if getvar("$pc.pcs_vag") == 0>>
+									<<if $pc.pcs_vag == 0>>
 										<p>Wait! You've never had sex before!</p>
 										Anatoly grins and says, "It's not that big of a deal just lay down on this bench and relax. All secretaries do it for their bosses from time to time."
 										He continues, "Now just spread your legs a little. I promise you'll enjoy this, just maybe not as much as me."
@@ -531,7 +531,7 @@
 										<<set $sexcontra = 0>>
 										<<showerdin>>
 										<p>You head to the shower to wash up. When you return, you see that he is already dressed."$pc.name_nick, I've got to run, but you were great baby," he says, giving you a kiss before he leaves.</p>
-										<<if getvar("$pc.deodorant_on") == 1>>
+										<<if $pc.deodorant_on == 1>>
 											<<gs 'sweat' 'remove_deo'>> 
 
 										<</if>>
@@ -740,7 +740,7 @@
 	<<arouse 'bj' 5 `['sub']`>>
 	<<if getvar("$wantrand") == 3>>
 		<p>After a short time, Anatoly takes his cock from your mouth and says, "$pc.name_nick, I want all of you."</p>
-		<<if !$pc.thinksIsVirgin or getvar("$pc.pcs_ass") > 0>>
+		<<if !$pc.thinksIsVirgin or $pc.pcs_ass > 0>>
 			<<actCLA 'Bend over the desk'>>
 				<<gt 'BurgerTip' 'bend'>>
 			<</actCLA>>
@@ -754,7 +754,7 @@
 		<</if>>
 	<<elseif getvar("$wantrand") == 2>>
 		<p>After a short time, Anatoly groans, "$pc.name_nick if you keep sucking, I'm going to finish"</p>
-		<<if !$pc.thinksIsVirgin or getvar("$pc.pcs_ass") > 0>>
+		<<if !$pc.thinksIsVirgin or $pc.pcs_ass > 0>>
 			<<actCLA 'Bend over the desk'>>
 	<<gt 'BurgerTip' 'bend'>>
 <</actCLA>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/Club2.tw

@@ -61,7 +61,7 @@
 	<</actCLA>>
 	<<actCLA 'Caress yourself'>>
 		<<set $TQuest = 1>>
-		<<if getvar("$pc.pcs_inhib") < 40>>
+		<<if $pc.pcs_inhib < 40>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>

+ 10 - 10
sugarcube/src/autogenerated/unsorted/Cum_Manage.tw

@@ -121,7 +121,7 @@
 		<<set $sexspecpot = 0>>
 
 	<</if>>
-	<<if getvar("$pc.vibratorin") == 1 and getvar("$spafinloc") == 0 and getvar("$replace_vib") == 0>>
+	<<if $pc.vibratorin == 1 and getvar("$spafinloc") == 0 and getvar("$replace_vib") == 0>>
 		<<set $pc.vibratorin = 0>>
 
 	<</if>>
@@ -391,7 +391,7 @@
 				<</if>>
 			<</if>>
 			<<setinit $sparrloc[$sparrtemp] = $spafinloc>>
-			<<if getvar("$spafinloc") == 12 and getvar("$pc.pcs_breath") == 1>>
+			<<if getvar("$spafinloc") == 12 and $pc.pcs_breath == 1>>
 				<<set $pc.pcs_breath = 0>>
 
 			<</if>>
@@ -740,19 +740,19 @@
 	<<set $txtloc = 'your arms'>>
 	<<set $icon_txtloc = $txtloc>>
 <<elseif getvar("$i") == 11>>
-	<<if getvar("$pc.hairColor") == 0>>
+	<<if $pc.hairColor == 0>>
 		<<set $cum_face_image = 'brown/'>>
 		<<set $cum_face_image += rand(1, 31)>>
-	<<elseif getvar("$pc.hairColor") == 1>>
+	<<elseif $pc.hairColor == 1>>
 		<<set $cum_face_image = 'black/'>>
 		<<set $cum_face_image += rand(1, 23)>>
-	<<elseif getvar("$pc.hairColor") == 2>>
+	<<elseif $pc.hairColor == 2>>
 		<<set $cum_face_image = 'red/'>>
 		<<set $cum_face_image += rand(1, 19)>>
-	<<elseif getvar("$pc.hairColor") == 3>>
+	<<elseif $pc.hairColor == 3>>
 		<<set $cum_face_image = 'blonde/'>>
 		<<set $cum_face_image += rand(1, 25)>>
-	<<elseif getvar("$pc.hairColor") > 3>>
+	<<elseif $pc.hairColor > 3>>
 		<<set $cum_face_image = 'custom/'>>
 		<<set $cum_face_image += rand(1, 20)>>
 	<</if>>
@@ -836,12 +836,12 @@
 <</END>>
 <!-- !! if sperm age stage is 4, it means inside the body-->
 <<if getvar("$j") == 4>>
-	<<if (getvar("$pc.vibratorin") == 1 and getvar("$i") == 0) or (getvar("$analplugin") == 1 and getvar("$i") == 3)>>
+	<<if ($pc.vibratorin == 1 and getvar("$i") == 0) or (getvar("$analplugin") == 1 and getvar("$i") == 3)>>
 		<<set $txtproxy = 'being plugged in '>>
 	<<elseif getvar("$i") == 0 and $cumvolume[$i+'>>
 	<</if>>
 		<<set $txtproxy = 'staying inside of '>>
-	<<elseif getvar("$i") == 3 and getvar("$pc.pcs_ass") <= 25>>
+	<<elseif getvar("$i") == 3 and $pc.pcs_ass <= 25>>
 		<<set $txtproxy = 'staying inside of '>>
 	<<else>>
 		<!-- FAILED TO CONVERT
@@ -1184,7 +1184,7 @@
 <!-- FAILED TO CONVERT
 	if i = 0 and j = 4 and vibratorin = 0 and pcs_vag*10 < cumvolume['<<i>>:<<j>>'] and cumvolume['<<i>>:<<j>>'] >= 20:
 -----
-	<<if getvar("$i") == 0 and getvar("$j") == 4 and getvar("$pc.vibratorin") == 0 and $pc.pcs_vag * 10 < ERROR: FAILED TO CONVERT LITERAL: """cumvolume[$i""" + >>
+	<<if getvar("$i") == 0 and getvar("$j") == 4 and $pc.vibratorin == 0 and $pc.pcs_vag * 10 < ERROR: FAILED TO CONVERT LITERAL: """cumvolume[$i""" + >>
 	<!-- FAILED TO CONVERT
 	<<j>>'] and cumvolume[$i+':<<j>>'] >= 20:
 -----

+ 2 - 2
sugarcube/src/autogenerated/unsorted/FedorEv.tw

@@ -9,7 +9,7 @@
 	<<set $menu_off = 1>>
 	<center><b><font color="blue"><<<<=$npcs.get(''A5'','firstname')>>>> <<<<=$npcs.get(''A5'','lastname')>>>></font></b></center>
 	<<image "characters/shared/headshots_main/big5.jpg">>
-	<<if getvar("$kotovLoveQW") > 0 and getvar("$time.weekday") < 5 and getvar("$kotovVSkozlov") == 0 and getvar("$fedorKozlovQW") >= 10>>
+	<<if getvar("$kotovLoveQW") > 0 and $time.weekday < 5 and getvar("$kotovVSkozlov") == 0 and getvar("$fedorKozlovQW") >= 10>>
 		<<gt 'FedorEv' 'Vitek Vs Fedor'>>
 	<<elseif getvar("$kotovVSkozlov") == 1>>
 		<<gt 'FedorEv' 'Strela Chat'>>
@@ -255,7 +255,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'Skate'>>
 	<<set $menu_off = 1>>
-	<<if getvar("$time.month") == 12 or getvar("$time.month") < 3>>
+	<<if $time.month == 12 or $time.month < 3>>
 		<<gt 'FedorEv' 'Skate Date'>>
 	<<else>>
 		<<gt 'FedorEv' 'Park 3'>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/FedorEv2.tw

@@ -429,7 +429,7 @@
 <<if $location_var[$here][0] == 'Wash Up'>>
 	<<set $menu_off = 1>>
 	<<set $pc.mood += 25>>
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<<set $pc.pcs_health = 100>>
 
 	<</if>>
@@ -443,7 +443,7 @@
 	<!-- Boy A5 -->
 	<<image "characters/pavlovsk/school/boy/fedor/fedorev/home/cleanup.jpg">>
 	Fedor then picks you up and carries you to the shower where you both carefully wash each other while feeling the warm water washing over you and Fedor''s strong hands lathering your body. You turn around and start washing Fedor and after you both rinse off Fedor wraps his arms around your waist and kisses you very passionately before turning off the water and drying you off. Fedor then grabs his comb and carefully combs your hair then helps you into your clothes as you help him into his.
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>>
 
 	<</if>>

+ 4 - 4
sugarcube/src/autogenerated/unsorted/FedorEv3.tw

@@ -969,7 +969,7 @@
 		<<actCLA 'Calm Fedor'>>
 			<<set $cumspclnt = 1>>
 			<<gs 'cum_cleanup'>>
-			<<if getvar("$pc.pcs_sweat") < 30>>
+			<<if $pc.pcs_sweat < 30>>
 				<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 			<<else>>
 				<<set $pc.pcs_sweat -= 10 + rand(0,4)>>
@@ -1002,7 +1002,7 @@
 	<<set $FedorRestTimes += 1>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>
@@ -1033,7 +1033,7 @@
 	<<set $FedorRestTimes += 1>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>
@@ -1063,7 +1063,7 @@
 	<<set $time.minutes += 10>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>

+ 38 - 38
sugarcube/src/autogenerated/unsorted/FedorEv4.tw

@@ -265,12 +265,12 @@
 	<<set $menu_arg = 'Bathroom'>>
 	<<set $menu_off = 0>>
 	<<set $time.minutes += 5>>
-	<<if getvar("$time.hour") >= 8 and getvar("$time.hour") < 9 and getvar("$WithFedor") == 0>>
+	<<if $time.hour >= 8 and $time.hour < 9 and getvar("$WithFedor") == 0>>
 		Fedor is currently in the shower and has locked the door.
 		<<actCLA 'Step away'>>
 			<<gt 'FedorEv4' 'Hallway'>>
 		<</actCLA>>
-	<<elseif getvar("$time.hour") >= 9 and getvar("$time.hour") < 10 and getvar("$WithFedor") == 0>>
+	<<elseif $time.hour >= 9 and $time.hour < 10 and getvar("$WithFedor") == 0>>
 		It seems that Regina is in the shower and has locked the door.
 		<<actCLA 'Step away'>>
 			<<gt 'FedorEv4' 'Hallway'>>
@@ -301,7 +301,7 @@
 	<<set $time.minutes += 10>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>
@@ -320,7 +320,7 @@
 	<<set $time.minutes += 10>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>
@@ -341,7 +341,7 @@
 	<center><h4><font color="blue">Bathroom</font></h4></center>
 	<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Shower/wash.jpg">>
 	You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible before turning off the water. You grab a spare towel and begin drying yourself off before getting dressed.
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>> 
 
 	<</if>>
@@ -402,7 +402,7 @@
 	<<set $menu_loc = 'FedorEv4'>>
 	<<set $menu_arg = 'Kitchen'>>
 	<<set $menu_off = 0>>
-	<<if getvar("$time.hour") >= 20 and getvar("$time.hour") <= 22 and getvar("$ReginaIntro") == 0>>
+	<<if $time.hour >= 20 and $time.hour <= 22 and getvar("$ReginaIntro") == 0>>
 		<<gt 'FedorEv4' 'Regina Intro'>>
 
 	<</if>>
@@ -411,13 +411,13 @@
 	<<image "locations/pavlovsk/resident/fedorhome/kitchen.jpg">>
 	This kitchen is very clean. Fedor''s parents must be very neat people.
 	There is a sink, a microwave, a stove and a <<link "refrigerator">><<gt 'FedorEv4' 'Fridge'>><</link>> stocked with food.
-	<<if getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 19 and getvar("$time.hour") < 20 or getvar("$time.weekday") > 5 and getvar("$time.hour") >= 12 and getvar("$time.hour") < 14>>
+	<<if $time.weekday <= 5 and $time.hour >= 19 and $time.hour < 20 or $time.weekday > 5 and $time.hour >= 12 and $time.hour < 14>>
 		<<link "Fedor">><<gt 'FedorEv4' 'Fedor Kitchen'>><</link>> is sitting down, eating dinner.
-	<<elseif getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 20 and getvar("$time.hour") <= 22 or getvar("$time.weekday") > 5 and getvar("$time.hour") >= 14 and getvar("$time.hour") < 16>>
+	<<elseif $time.weekday <= 5 and $time.hour >= 20 and $time.hour <= 22 or $time.weekday > 5 and $time.hour >= 14 and $time.hour < 16>>
 		<<link "Regina">><<gt 'FedorEv4' 'Regina Chat'>><</link>> is sitting at the table, eating dinner.
-	<<elseif getvar("$time.weekday") > 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 20>>
+	<<elseif $time.weekday > 5 and $time.hour >= 16 and $time.hour <= 20>>
 		<<link "Regina">><<gt 'FedorEv4' 'Regina Chat'>><</link>> is cleaning the kitchen.
-	<<elseif getvar("$time.weekday") <= 5 and getvar("$time.hour") == 11>>
+	<<elseif $time.weekday <= 5 and $time.hour == 11>>
 		<<link "Regina">><<gt 'FedorEv4' 'Regina Chat'>><</link>> is getting ready to leave for work.
 	<</if>>
 	<<actCLA 'Return to the hallway'>>
@@ -438,12 +438,12 @@
 	<<set $locclass = 'livingr'>>
 	<<image "locations/pavlovsk/resident/fedorhome/livingroom.jpg">>
 	'The living room looks very neat and has a couch, a blu-ray player and a <<link 'TV'>><<gt  'FedorEv4'  'TV'>><</link>>.'
-	<<if getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 20 and getvar("$time.hour") < 22 or getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 18 and getvar("$time.hour") < 19 or getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 15 and getvar("$time.hour") < 16 or getvar("$time.weekday") > 5 and getvar("$time.hour") >= 14 and getvar("$time.hour") < 18>>
+	<<if $time.weekday <= 5 and $time.hour >= 20 and $time.hour < 22 or $time.weekday <= 5 and $time.hour >= 18 and $time.hour < 19 or $time.weekday <= 5 and $time.hour >= 15 and $time.hour < 16 or $time.weekday > 5 and $time.hour >= 14 and $time.hour < 18>>
 		<<link "Fedor">><<gt 'FedorEv4' 'Fedor Livingroom'>><</link>> is sitting on the couch, watching TV.
 	<</if>>
-	<<if getvar("$time.weekday") > 5 and getvar("$time.hour") >= 10 and getvar("$time.hour") < 12>>
+	<<if $time.weekday > 5 and $time.hour >= 10 and $time.hour < 12>>
 		<<link "Regina">><<gt 'FedorEv4' 'Regina Chat'>><</link>> is vacuuming the floor.
-	<<elseif getvar("$time.weekday") <= 5 and getvar("$time.hour") > 22 and getvar("$time.hour") <= 24 or getvar("$time.weekday") > 5 and getvar("$time.hour") >= 12 and getvar("$time.hour") < 14>>
+	<<elseif $time.weekday <= 5 and $time.hour > 22 and $time.hour <= 24 or $time.weekday > 5 and $time.hour >= 12 and $time.hour < 14>>
 		<<link "Regina">><<gt 'FedorEv4' 'Regina Chat'>><</link>> is sitting down on the couch, watching TV.
 	<</if>>
 	<<actCLA 'Return to the hallway'>>
@@ -457,7 +457,7 @@
 	<<set $menu_loc = 'FedorEv4'>>
 	<<set $menu_arg = 'Hallway'>>
 	<<set $menu_off = 0>>
-	<<if getvar("$time.hour") == 20 and getvar("$ReginaIntro") == 0>>
+	<<if $time.hour == 20 and getvar("$ReginaIntro") == 0>>
 		<<gt 'FedorEv4' 'Regina Intro'>>
 
 	<</if>>
@@ -473,7 +473,7 @@
 	<<actCLA '<b>Leave the house</b>'>>
 		<<if $wardrobe.clothingworntype == 'nude'>>
 			<<gt 'FedorEv4' 'Nude'>>
-		<<elseif getvar("$FedorHomeDate") == 1 and getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 14 and getvar("$time.hour") <= 24>>
+		<<elseif getvar("$FedorHomeDate") == 1 and $time.weekday <= 5 and $time.hour >= 14 and $time.hour <= 24>>
 			<<gt 'FedorEv4' 'End Date'>>
 		<<else>>
 			<<set $FedorHomeDate = 0>>
@@ -481,7 +481,7 @@
 			<<gt 'pav_residential'>>
 		<</if>>
 	<</actCLA>>
-	<<if getvar("$fedorKozlovQW") > 1 and getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 17>>
+	<<if getvar("$fedorKozlovQW") > 1 and $time.weekday <= 5 and $time.hour >= 16 and $time.hour <= 17>>
 		<<actCLA 'Go to Fedor`s bedroom'>>
 			<<gt 'FedorMisc' 'Workout Time'>>
 		<</actCLA>>
@@ -490,7 +490,7 @@
 			<<gt 'FedorEv4' 'Bedroom'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$fedorKozlovQW") > 1 and getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 17>>
+	<<if getvar("$fedorKozlovQW") > 1 and $time.weekday <= 5 and $time.hour >= 16 and $time.hour <= 17>>
 		<<actCLA 'Go to the bathroom'>>
 			<<gt 'FedorMisc' 'Workout Time'>>
 		<</actCLA>>
@@ -499,7 +499,7 @@
 			<<gt 'FedorEv4' 'Bathroom'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$fedorKozlovQW") > 1 and getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 17>>
+	<<if getvar("$fedorKozlovQW") > 1 and $time.weekday <= 5 and $time.hour >= 16 and $time.hour <= 17>>
 		<<actCLA 'Go to the kitchen'>>
 			<<gt 'FedorMisc' 'Workout Time'>>
 		<</actCLA>>
@@ -508,7 +508,7 @@
 			<<gt 'FedorEv4' 'Kitchen'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$fedorKozlovQW") > 1 and getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 16 and getvar("$time.hour") <= 17>>
+	<<if getvar("$fedorKozlovQW") > 1 and $time.weekday <= 5 and $time.hour >= 16 and $time.hour <= 17>>
 		<<actCLA 'Go to the living room'>>
 			<<gt 'FedorMisc' 'Workout Time'>>
 		<</actCLA>>
@@ -532,11 +532,11 @@
 	<<if getvar("$FedorLove") == 1>>
 		Fedor has a <<link "framed picture">><<gt 'FedorEv4' 'Picture'>><</link>> by his bed.
 	<</if>>
-	<<if getvar("$time.hour") < 8>>
+	<<if $time.hour < 8>>
 		<<link "Fedor">><<gt 'FedorEv4' 'Fedor Sleeping'>><</link>> is sleeping in his bed.
-	<<elseif getvar("$time.hour") >= 22>>
+	<<elseif $time.hour >= 22>>
 		<<link "Fedor">><<gt 'FedorEv4' 'Fedor Bedroom'>><</link>> is laying on his bed.
-	<<elseif getvar("$time.weekday") > 5 and getvar("$time.hour") > 9 and getvar("$time.hour") < 14 or getvar("$time.weekday") > 5 and getvar("$time.hour") >= 18 and getvar("$time.hour") < 22>>
+	<<elseif $time.weekday > 5 and $time.hour > 9 and $time.hour < 14 or $time.weekday > 5 and $time.hour >= 18 and $time.hour < 22>>
 		<<link "Fedor">><<gt 'FedorEv4' 'Fedor Bedroom 2'>><</link>> is on his computer.
 	<</if>>
 	<<actCLA 'Leave bedroom'>>
@@ -630,7 +630,7 @@
 	<center><b><h4><font color="blue"><<"Fyodor [$Fedor] Kozlov">></font></h4></b></center>
 	<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg">>
 	<p>Hey $pc.name_first, I'm a bit too tired to walk you home right now but you can climb into bed and spend the night if you like. Just don't let my mother see you leave.</p>
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<p>Fedor then looks back at you and frowns. "$pc.name_first you're hurt. My mother works as a nurse. You should have her take a look at you."</p>
 
 	<</if>>
@@ -684,7 +684,7 @@
 	<</actCLA>>
 	<<if getvar("$VKwip") == 100>>
 		<<actCLA 'Masturbate'>>
-			<<if getvar("$time.weekday") <= 5 and getvar("$time.hour") <= 24 and getvar("$time.hour") > 20 or getvar("$time.weekday") <= 5 and getvar("$time.hour") <= 10 and getvar("$time.hour") > 9 or getvar("$time.weekday") > 5 and getvar("$time.hour") <= 18 and getvar("$time.hour") > 9>>
+			<<if $time.weekday <= 5 and $time.hour <= 24 and $time.hour > 20 or $time.weekday <= 5 and $time.hour <= 10 and $time.hour > 9 or $time.weekday > 5 and $time.hour <= 18 and $time.hour > 9>>
 				<<gt 'FedorEv4' 'Solo Caught'>>
 			<<else>>
 				<<gt 'FedorEv4' 'Solo'>>
@@ -703,9 +703,9 @@
 	<<actCLA 'Watch family channel (1:30)'>>
 		<<gt 'FedorEv4' 'TV Family'>>
 	<</actCLA>>
-	<<if getvar("$time.weekday") <= 5 and getvar("$time.hour") < 20 or getvar("$time.weekday") > 5 and getvar("$time.hour") > 22 or getvar("$time.weekday") > 5 and getvar("$time.hour") < 10 or getvar("$time.weekday") > 5 and getvar("$time.hour") > 18>>
+	<<if $time.weekday <= 5 and $time.hour < 20 or $time.weekday > 5 and $time.hour > 22 or $time.weekday > 5 and $time.hour < 10 or $time.weekday > 5 and $time.hour > 18>>
 		<<actCLA 'Watch porn (0:30)'>>
-			<<if getvar("$time.weekday") <= 5 and getvar("$time.hour") <= 24 and getvar("$time.hour") > 20 and getvar("$VKwip") == 100 or getvar("$time.weekday") <= 5 and getvar("$time.hour") <= 10 and getvar("$time.hour") > 9 and getvar("$VKwip") == 100 or getvar("$time.weekday") > 5 and getvar("$time.hour") <= 18 and getvar("$time.hour") > 9 and getvar("$VKwip") == 100>>
+			<<if $time.weekday <= 5 and $time.hour <= 24 and $time.hour > 20 and getvar("$VKwip") == 100 or $time.weekday <= 5 and $time.hour <= 10 and $time.hour > 9 and getvar("$VKwip") == 100 or $time.weekday > 5 and $time.hour <= 18 and $time.hour > 9 and getvar("$VKwip") == 100>>
 				<<gt 'FedorEv4' 'Porn Caught'>>
 			<<else>>
 				<<gt 'FedorEv4' 'TV Porn'>>
@@ -831,7 +831,7 @@
 	<<actCLA 'Walk away'>>
 		<<gt 'FedorEv4' 'Kitchen'>>
 	<</actCLA>>
-	<<if $pc.pcs_health < $pc.healthmax and getvar("$finances.cash") >= 20>>
+	<<if $pc.pcs_health < $pc.healthmax and $finances.cash >= 20>>
 		<<actCLA 'Let Regina help you'>>
 	<<gt 'FedorEv4' 'Check up'>>
 <</actCLA>>
@@ -939,7 +939,7 @@
 	<center><b><h4><font color="blue"><<"Fyodor [$Fedor] Kozlov">></font></h4></b></center>
 	<<image "characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg">>
 	Fedor is sitting on the sofa watching tv and when he notices you, he pats the seat next to him, offering you a seat.
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<p>Fedor looks at you and frowns. "$pc.name_first you're hurt. My mother works as a nurse, if she is home then you should have her take a look at you."</p>
 
 	<</if>>
@@ -947,7 +947,7 @@
 		<p>Fedor reaches over, then begins rubbing your ass, "You have a body to die for $pc.name_nick."</p>
 
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		Fedor notices your messy hair and pulls out his <<link "comb">><<gt 'FedorMisc' 'Comb'>><</link>>.
 
 	<</if>>
@@ -988,11 +988,11 @@
 		<p>"$pc.name_first would you like something to eat?"</p>
 
 	<</if>>
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<p>Fedor looks at you and frowns. "$pc.name_first you're hurt. My mother works as a nurse, if she is home then you should have her take a look at you."</p>
 
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		Fedor notices your messy hair and pulls out his <<link "comb">><<gt 'FedorMisc' 'Comb'>><</link>>.
 
 	<</if>>
@@ -1054,10 +1054,10 @@
 	<<if getvar("$FedorLove") == 0>>
 		He seems lost in thought but as soon as you approach, he opens his mouth to speak but no words escape his mouth. He then closes his mouth and stares at the ceiling. It seems as though he has something he wants to talk to you about.
 	<</if>>
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<p>Fedor looks at you then frowns. "$pc.name_first you're hurt. My mother works as a nurse. You should have her take a look at you."</p>
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		Fedor notices your messy hair and pulls out his <<link "comb">><<gt 'FedorMisc' 'Comb'>><</link>>.
 	<</if>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
@@ -1115,7 +1115,7 @@
 			<<gt 'FedorEv4' 'Future'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$time.hour") >= 21>>
+	<<if $time.hour >= 21>>
 		<<actCLA 'Spend the night'>>
 			<<gt 'bed2'>>
 		<</actCLA>>
@@ -1137,11 +1137,11 @@
 		<<image "characters/shared/headshots_main/big5.jpg">>
 	<</if>>
 	<p>Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey $pc.name_nick, wanna check out some videos?"</p>
-	<<if getvar("$pc.pcs_health") < 100>>
+	<<if $pc.pcs_health < 100>>
 		<p>Fedor looks at you and frowns. "$pc.name_first you're hurt. My mother works as a nurse, if she is home then you should have her take a look at you."</p>
 
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		Fedor notices your messy hair and pulls out his <<link "comb">><<gt 'FedorMisc' 'Comb'>><</link>>.
 
 	<</if>>
@@ -1401,9 +1401,9 @@
 		<<actCLA 'Enter house'>>
 			<<gt 'FedorEv4' 'Hallway'>>
 		<</actCLA>>
-	<<elseif getvar("$time.weekday") <= 5 and getvar("$time.hour") >= 19>>
+	<<elseif $time.weekday <= 5 and $time.hour >= 19>>
 		<<gt 'FedorEv4' 'Home Entrance 3'>>
-	<<elseif getvar("$time.weekday") > 5 and getvar("$time.hour") > 10>>
+	<<elseif $time.weekday > 5 and $time.hour > 10>>
 		<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>
 		<<image "locations/pavlovsk/resident/fedorhome/regina.jpg">>
 		You knock on the door until Regina opens it and invites you inside.

+ 1 - 1
sugarcube/src/autogenerated/unsorted/FedorEv4_sex.tw

@@ -1386,7 +1386,7 @@
 	You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible until you can hear Fedor enter the room and you peek out of the curtain to see him taking a piss and as soon as he notices you, he gives you a wink with a mischievous grin on his face.
 	<<set $noShampoo = 1>>
 	<<showerdin>>
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>>
 
 	<</if>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/FedorMisc.tw

@@ -41,7 +41,7 @@
 	<<else>>
 		Fedor is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have.
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		'Fedor notices your messy hair and pulls out his <<link 'comb'>><<gt  'FedorMisc'  'Comb'  <<ARGS[1]>>>><</link>>.'
 	<</if>>
 	<<if $npcs.get('A5','grupTipe') == 5>>
@@ -450,7 +450,7 @@
 	<<set $time.minutes += 10>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>

+ 10 - 10
sugarcube/src/autogenerated/unsorted/Gnpc.tw

@@ -128,36 +128,36 @@
 	<<setinit $otnBoyFrend[$numnpc] -= 5>> <<gt $location>>
 <</actCLA>>
 <<actCLA 'Take a walk through the park'>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		<<setinit $otnBoyFrend[$numnpc] -= 5>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") == 1>>
+	<<if $pc.pcs_hairbsh == 1>>
 		<<setinit $otnBoyFrend[$numnpc] += 1>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 2>>
+	<<if $pc.pcs_makeup == 2>>
 		<<setinit $otnBoyFrend[$numnpc] += 1>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 3>>
+	<<if $pc.pcs_makeup == 3>>
 		<<setinit $otnBoyFrend[$numnpc] += 2>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 4>>
+	<<if $pc.pcs_makeup == 4>>
 		<<setinit $otnBoyFrend[$numnpc] -= 5>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_sweat") > 19>>
+	<<if $pc.pcs_sweat > 19>>
 		<<setinit $otnBoyFrend[$numnpc] -= 5>>
-	<<elseif getvar("$pc.pcs_sweat") < 10>>
+	<<elseif $pc.pcs_sweat < 10>>
 		<<setinit $otnBoyFrend[$numnpc] += 1>>
 	<</if>>
-	<<if getvar("$wardrobe.PCloSkirt") > 2>>
+	<<if $wardrobe.PCloSkirt > 2>>
 		<<setinit $otnBoyFrend[$numnpc] += 3>>
 
 	<</if>>
-	<<if getvar("$wardrobe.PCloPants") > 3>>
+	<<if $wardrobe.PCloPants > 3>>
 		<<setinit $otnBoyFrend[$numnpc] += 2>>
 
 	<</if>>
@@ -221,7 +221,7 @@
 		<</actCLA>>
 	<</if>>
 <</actCLA>>
-<<if getvar("$pc.preg") == 1 and getvar("$pc.pregchem") <= 1920 and $npcs.get($numnpc,'pregtalk') == 0 and getvar("$gnpcSex["+$numnpc+"]") > 0 and getvar("$pc.knowpreg") == 1>>
+<<if $pc.preg == 1 and getvar("$pc.pregchem") <= 1920 and $npcs.get($numnpc,'pregtalk') == 0 and getvar("$gnpcSex["+$numnpc+"]") > 0 and $pc.knowpreg == 1>>
 	<<if $npcs.get($ChildFath[arrsize('$ChildFath') - 1,'usedname')] != $nameBoyfrend[$numnpc]>>
 		<<set $pc.pregLie = '(Lie) '>>
 	<<else>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/Gnpc2.tw

@@ -8,7 +8,7 @@
 <h2><<$boydesc>></h2>
 <<image `'characters/shared/headshots_main/big<<numnpc>>.jpg'`>>
 <p>You're on a date with $boydesc. $bfRelationship[$numnpc]</p>
-<<if getvar("$time.hour") < 20>>
+<<if $time.hour < 20>>
 	<<if getvar("$otnBoyFrend["+$numnpc+"]") < 80>>
 		<p>$boydesc offered to take you home.</p>
 		<<actCLA 'Go home'>>
@@ -37,7 +37,7 @@
 			<</actCLA>>
 		
 	<</if>>
-<<elseif getvar("$time.hour") >= 20 and getvar("$time.hour") < 23>>
+<<elseif $time.hour >= 20 and $time.hour < 23>>
 	<<if getvar("$otnBoyFrend["+$numnpc+"]") < 80>>
 		<p>$boydesc offered to take you home.</p>
 		<<actCLA 'Go home'>>
@@ -76,7 +76,7 @@
 			
 		<</if>>
 	<</if>>
-<<elseif getvar("$time.hour") >= 23>>
+<<elseif $time.hour >= 23>>
 	<p>$boydesc offered to take you home.</p>
 	<<actCLA 'go home'>>
 		<<gt 'pav_residential'>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/HotelRoom.tw

@@ -35,7 +35,7 @@
 		<</if>>
 	<</actCLA>>
 	<<if getvar("$hotelRoom["+$hotel+"]") != 0>>
-		<<if getvar("$finances.cash") >= 100>>
+		<<if $finances.cash >= 100>>
 			<<actCLA 'Order room service (0:30) (100 <b>₽</b>)'>>
 	<<gt 'beverage' 'h_food'>>
 <</actCLA>>
@@ -87,7 +87,7 @@
 		<</if>>
 	<</actCLA>>
 	<<if getvar("$hotelRoom["+$hotel+"]") != 0>>
-		<<if getvar("$finances.cash") >= 100>>
+		<<if $finances.cash >= 100>>
 			<<actCLA 'Order room service (0:30) (100 <b>₽</b>)'>>
 	<<gt 'beverage' 'h_food'>>
 <</actCLA>>
@@ -142,7 +142,7 @@
 		<</if>>
 	<</actCLA>>
 	<<if getvar("$hotelRoom["+$hotel+"]") != 0>>
-		<<if getvar("$finances.cash") >= 100>>
+		<<if $finances.cash >= 100>>
 			<<actCLA 'Order room service (0:30) (100 <b>₽</b>)'>>
 	<<gt 'beverage' 'h_food'>>
 <</actCLA>>

+ 9 - 9
sugarcube/src/autogenerated/unsorted/JuliaMilHome.tw

@@ -33,11 +33,11 @@
 	<<actCLA 'Leave'>>
 		<<gt 'pod_ezd' 'etaj_3'>>
 	<</actCLA>>
-	<<if getvar("$time.isSchoolHoliday") == 0 and getvar("$time.hour") > 6 and getvar("$time.hour") < 15 and getvar("$time.weekday") < 6>>
+	<<if $time.isSchoolHoliday == 0 and $time.hour > 6 and $time.hour < 15 and $time.weekday < 6>>
 		You knock on the door, but no one comes to answer. Julia must not be home.
-	<<elseif getvar("$time.hour") > 20>>
+	<<elseif $time.hour > 20>>
 		It's too late in the day to visit Julia.
-	<<elseif getvar("$time.hour") < 8>>
+	<<elseif $time.hour < 8>>
 		It's too early in the day to visit Julia.
 	<<else>>
 		<p>You knock on the door. You hear footsteps in the apartment and sure enough, a few seconds later Julia opens the door. "Oh, hi $pc.name_nick! Come on in!"</p>
@@ -163,7 +163,7 @@
 			<<set $pc.mood += 20>>
 			<<set $pc.fat += 2>>
 			<<set $pc.pcs_energy += 50>>
-			<<if getvar("$pc.pcs_hydra") >= 100>>
+			<<if $pc.pcs_hydra >= 100>>
 				<<set $pc.pcs_hydra += 20>>
 			<<else>>
 				<<set $pc.pcs_hydra += 40>>
@@ -186,7 +186,7 @@
 			<<set $pc.mood += 20>>
 			<<set $pc.fat += 2>>
 			<<set $pc.pcs_energy += 50>>
-			<<if getvar("$pc.pcs_hydra") >= 100>>
+			<<if $pc.pcs_hydra >= 100>>
 				<<set $pc.pcs_hydra += 20>>
 			<<else>>
 				<<set $pc.pcs_hydra += 40>>
@@ -209,7 +209,7 @@
 			<<set $pc.mood += 20>>
 			<<set $pc.fat += 2>>
 			<<set $pc.pcs_energy += 50>>
-			<<if getvar("$pc.pcs_hydra") >= 100>>
+			<<if $pc.pcs_hydra >= 100>>
 				<<set $pc.pcs_hydra += 20>>
 			<<else>>
 				<<set $pc.pcs_hydra += 40>>
@@ -232,7 +232,7 @@
 			<<set $pc.mood += 20>>
 			<<set $pc.fat += 2>>
 			<<set $pc.pcs_energy += 50>>
-			<<if getvar("$pc.pcs_hydra") >= 100>>
+			<<if $pc.pcs_hydra >= 100>>
 				<<set $pc.pcs_hydra += 20>>
 			<<else>>
 				<<set $pc.pcs_hydra += 40>>
@@ -255,7 +255,7 @@
 			<<set $pc.mood += 20>>
 			<<set $pc.fat += 2>>
 			<<set $pc.pcs_energy += 50>>
-			<<if getvar("$pc.pcs_hydra") >= 100>>
+			<<if $pc.pcs_hydra >= 100>>
 				<<set $pc.pcs_hydra += 20>>
 			<<else>>
 				<<set $pc.pcs_hydra += 40>>
@@ -302,7 +302,7 @@
 		<h2>Bathroom</h2>
 		<<video "shared/home/bathroom/dush.mp4">>
 		You take a quick shower.
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/Katlake.tw

@@ -17,7 +17,7 @@ After a few minutes, a beautiful girl lies down near you. She's truly gorgeous,
 	<</actCLA>>
 
 <<if $location_var[$here][0] == 'znakomstvo'>>
-	<<if getvar("$pc.pcs_apprnc") < 56>>
+	<<if $pc.pcs_apprnc < 56>>
 		<<set $katday = $time.daystart>>
 		<p>"Erm... hello!" you say, a bit shyly.</p>
 		The girl wrinkles her nose when she sees you, but says nothing. She keeps giving you a cold stare that indicates that she wants nothing to do with you.

+ 39 - 39
sugarcube/src/autogenerated/unsorted/Komp.tw

@@ -112,7 +112,7 @@
 		<<actCLA 'Browse a dating website (1:00)'>>
 			<<gt 'komp' 'znak'>>
 		<</actCLA>>
-		<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+		<<if $time.hour < 20 and $time.hour > 7>>
 			<<if $wardrobe.clothingworntype == 'nude'>>
 				You need to be dressed before searching jobs.
 			<<else>>
@@ -264,7 +264,7 @@
 		<<gs 'sweat' 'add' 10>>
 		<<if getvar("$divanmastr") == 0>>
 			<<set $divanmastr = 1>>
-			<<if getvar("$pc.pcs_inhib") < 30>>
+			<<if $pc.pcs_inhib < 30>>
 				<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 			<</if>>
@@ -482,14 +482,14 @@
 		<<if getvar("$komprabota") == 0 and getvar("$gorodokkomp") == 0>>
 			<p>You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."</p>
 			The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.
-			<<if getvar("$pc.pcs_apprnc") < 120>>
+			<<if $pc.pcs_apprnc < 120>>
 				You consider it for a moment, but decide against it. You're probably not pretty enough to be an underwear model.
-			<<elseif getvar("$pc.pcs_apprnc") >= 120>>
+			<<elseif $pc.pcs_apprnc >= 120>>
 				<<actCLA 'Accept the job and go there'>>
 					<<gt 'qjob' 'var1'>>
 				<</actCLA>>
 			<</if>>
-			<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+			<<if $time.hour < 20 and $time.hour > 7>>
 				<<actCLA 'Search for more jobs'>>
 	<<gt 'komp' 'rabota'>>
 <</actCLA>>
@@ -501,14 +501,14 @@
 		<<elseif getvar("$komprabota") == 1 and getvar("$gorodokkomp") == 0>>
 			<p>You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."</p>
 			The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.
-			<<if getvar("$pc.pcs_apprnc") < 120>>
+			<<if $pc.pcs_apprnc < 120>>
 				You consider it for a moment, but decide against it. You're probably not pretty enough to be an underwear model.
-			<<elseif getvar("$pc.pcs_apprnc") >= 120>>
+			<<elseif $pc.pcs_apprnc >= 120>>
 				<<actCLA 'Accept the job and go there'>>
 					<<gt 'qjob' 'var2'>>
 				<</actCLA>>
 			<</if>>
-			<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+			<<if $time.hour < 20 and $time.hour > 7>>
 				<<actCLA 'Search for more jobs'>>
 	<<gt 'komp' 'rabota'>>
 <</actCLA>>
@@ -520,14 +520,14 @@
 		<<elseif getvar("$komprabota") > 1 and getvar("$komprabota") < 5 and getvar("$gorodokkomp") == 0>>
 			<p>You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Good looking female model, posing for artwork. Must be able to stand still in one pose for a long time. Pay: 1000 <b>₽</b> cash."</p>
 			The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.
-			<<if getvar("$pc.pcs_apprnc") < 60>>
+			<<if $pc.pcs_apprnc < 60>>
 				You consider it for a moment, but decide against it. You're probably not pretty enough to be a model.
-			<<elseif getvar("$pc.pcs_apprnc") >= 60>>
+			<<elseif $pc.pcs_apprnc >= 60>>
 				<<actCLA 'Accept the job and go there'>>
 					<<gt 'qjob' 'var3'>>
 				<</actCLA>>
 			<</if>>
-			<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+			<<if $time.hour < 20 and $time.hour > 7>>
 				<<actCLA 'Search for more jobs'>>
 	<<gt 'komp' 'rabota'>>
 <</actCLA>>
@@ -549,10 +549,10 @@
 				After a quick verification, you usually get paid immediately after a session ends. The tokens you earn will be converted to rubles, and paid to your bank account right away.
 				The website hides your stream for viewers from your region, so the chance of being recognized by someone you know in real life is very low.
 				If you're interested in becoming a webcam girl, please fill in this questionnaire below.</i>
-				<<if getvar("$finances.hasBankAccount") == 0>>
+				<<if $finances.hasBankAccount == 0>>
 					You need a valid bank account to be able to register for this job.
 				<<else>>
-					<<if getvar("$pc.pcs_inhib") >= 40 or getvar("$exhibitionist_lvl") > 1 or (getvar("$pc.pcs_inhib") >= 35 and getvar("$exhibitionist_lvl") > 0)>>
+					<<if $pc.pcs_inhib >= 40 or getvar("$exhibitionist_lvl") > 1 or ($pc.pcs_inhib >= 35 and getvar("$exhibitionist_lvl") > 0)>>
 						<<actCLA 'Fill in the questionnaire'>>
 							<<set $camwhore = 1>>
 							<<set $mfcclients = 0>>
@@ -581,7 +581,7 @@
 						You don't feel comfortable showing off your body in this way.
 					<</if>>
 				<</if>>
-				<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+				<<if $time.hour < 20 and $time.hour > 7>>
 					<<actCLA 'Search for more jobs'>>
 	<<gt 'komp' 'rabota'>>
 <</actCLA>>
@@ -593,7 +593,7 @@
 			<</actCLA>>
 		<<else>>
 			Unfortunately, you do not find any jobs you would consider doing.
-			<<if getvar("$time.hour") < 20 and getvar("$time.hour") > 7>>
+			<<if $time.hour < 20 and $time.hour > 7>>
 				<<actCLA 'Search for more jobs'>>
 	<<gt 'komp' 'rabota'>>
 <</actCLA>>
@@ -723,7 +723,7 @@
 	<</if>>
 <</if>>
 <<if $location_var[$here][0] == 'startpagemfc'>>
-	<<if getvar("$pc.vgape") > 10 or getvar("$pc.agape") > 10>>
+	<<if $pc.vgape > 10 or $pc.agape > 10>>
 		<p>While you sit in your chair, you can't help but wince every time you move. You want to put up a show, but it hurts too much. And besides... you doubt your viewers would want to see you in your current state! You should heal up a bit before trying again.</p>
 		<<actCLA 'Collect your earnings and leave'>>
 			<<set $finances.bank += $tokens * 2>>
@@ -757,7 +757,7 @@
 	<<set $menu_arg = 'waitclients'>>
 	<<set $menu_off = 0>>
 	<<if getvar("$topmfc") == 1 and getvar("$backmfc") == 1>>
-		<<if getvar("$pc.pcs_apprnc") < 100>>
+		<<if $pc.pcs_apprnc < 100>>
 			<<if getvar("$webpopular") < 15>>
 				<<if getvar("$mfcclients") > 5>>
 					<<set $camclients -= rand(1,3)>>
@@ -829,7 +829,7 @@
 			<</if>>
 		<</if>>
 	<<elseif getvar("$topmfc") == 0 and getvar("$backmfc") == 1>>
-		<<if getvar("$pc.pcs_apprnc") < 100>>
+		<<if $pc.pcs_apprnc < 100>>
 			<<if getvar("$webpopular") < 15>>
 				<<if getvar("$mfcclients") > 3>>
 					<<set $camclients -= rand(1,3)>>
@@ -901,7 +901,7 @@
 			<</if>>
 		<</if>>
 	<<elseif getvar("$topmfc") == 1 and getvar("$backmfc") == 0>>
-		<<if getvar("$pc.pcs_apprnc") < 100>>
+		<<if $pc.pcs_apprnc < 100>>
 			<<if getvar("$webpopular") < 15>>
 				<<if getvar("$mfcclients") > 3>>
 					<<set $camclients -= rand(1,3)>>
@@ -973,7 +973,7 @@
 			<</if>>
 		<</if>>
 	<<else>>
-		<<if getvar("$pc.pcs_apprnc") < 100>>
+		<<if $pc.pcs_apprnc < 100>>
 			<<if getvar("$webpopular") < 15>>
 				<<if getvar("$mfcclients") > 3>>
 					<<set $camclients -= rand(1,4)>>
@@ -1319,15 +1319,15 @@
 			
 			<<if getvar("$pc.analplugin") == 1>>
 				<<image "pc/items/accessories/computer/camwhore19.jpg">>
-			<<elseif getvar("$pc.pcs_vag") == 0>>
+			<<elseif $pc.pcs_vag == 0>>
 				<<image "pc/items/accessories/computer/camwhore18.jpg">>
-			<<elseif getvar("$pc.pcs_vag") <= 10>>
+			<<elseif $pc.pcs_vag <= 10>>
 				<<image "pc/items/accessories/computer/camwhore13.jpg">>
-			<<elseif getvar("$pc.pcs_vag") <= 15>>
+			<<elseif $pc.pcs_vag <= 15>>
 				<<image "pc/items/accessories/computer/camwhore14.jpg">>
-			<<elseif getvar("$pc.pcs_vag") <= 25>>
+			<<elseif $pc.pcs_vag <= 25>>
 				<<image "pc/items/accessories/computer/camwhore15.jpg">>
-			<<elseif getvar("$pc.pcs_vag") <= 35>>
+			<<elseif $pc.pcs_vag <= 35>>
 				<<image "pc/items/accessories/computer/camwhore16.jpg">>
 			<<else>>
 				<<image "pc/items/accessories/computer/camwhore17.jpg">>
@@ -1346,7 +1346,7 @@
 			<</actCLA>>
 		
 	<</if>>
-	<<if getvar("$backmfc") == 0 and getvar("$pc.pcs_ass") >= 30 and getvar("$webpopular") >= 50 and getvar("$clientask") == 80>>
+	<<if getvar("$backmfc") == 0 and $pc.pcs_ass >= 30 and getvar("$webpopular") >= 50 and getvar("$clientask") == 80>>
 		<<set $menu_off = 1>>
 		One of the visitors makes several comments on how badly he wants to fuck your ass, and then offers you tokens to show your anus to him...
 		<<actCLA 'Show them your battered sphincter'>>
@@ -1355,7 +1355,7 @@
 			<<set $backmfc = 0>>
 			<<set $time.minutes += 2>>
 			<<gs 'internet_mobile' 'use_internet' $subs 2>>
-			<<if getvar("$pc.pcs_apprnc") > 100>>
+			<<if $pc.pcs_apprnc > 100>>
 				<<set $tokens += rand(50,100)>>
 			<<else>>
 				<<set $tokens += rand(40,75)>>
@@ -1408,7 +1408,7 @@
 			<</actCLA>>
 		
 	<</if>>
-	<<if getvar("$webpopular") >= 15 and getvar("$pc.pcs_ass") >= 15 and getvar("$clientask") == 89>>
+	<<if getvar("$webpopular") >= 15 and $pc.pcs_ass >= 15 and getvar("$clientask") == 89>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 89>>
 	<</if>>
@@ -1416,31 +1416,31 @@
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 88>>
 	<</if>>
-	<<if getvar("$webpopular") >= 50 and getvar("$pc.pcs_vag") >= 35 and getvar("$clientask") == 87>>
+	<<if getvar("$webpopular") >= 50 and $pc.pcs_vag >= 35 and getvar("$clientask") == 87>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 87>>
 	<</if>>
-	<<if getvar("$webpopular") >= 35 and getvar("$pc.pcs_vag") >= 25 and getvar("$pc.alko") >= 4 and getvar("$clientask") == 86>>
+	<<if getvar("$webpopular") >= 35 and $pc.pcs_vag >= 25 and $pc.alko >= 4 and getvar("$clientask") == 86>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 86>>
 	<</if>>
-	<<if getvar("$webpopular") >= 50 and $pc.pcs_vag + getvar("$pc.pcs_ass") > 0 and getvar("$pc.alko") >= 4 and getvar("$clientask") == 85>>
+	<<if getvar("$webpopular") >= 50 and $pc.pcs_vag + $pc.pcs_ass > 0 and $pc.alko >= 4 and getvar("$clientask") == 85>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 85>>
 	<</if>>
-	<<if getvar("$backmfc") == 0 and getvar("$webpopular") >= 25 and $pc.pcs_vag + getvar("$pc.pcs_ass") >= 30 and getvar("$pc.alko") >= 4 and getvar("$clientask") == 84>>
+	<<if getvar("$backmfc") == 0 and getvar("$webpopular") >= 25 and $pc.pcs_vag + $pc.pcs_ass >= 30 and $pc.alko >= 4 and getvar("$clientask") == 84>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 84>>
 	<</if>>
-	<<if getvar("$backmfc") == 0 and getvar("$pc.pcs_vag") > 20 and getvar("$clientask") == 83>>
+	<<if getvar("$backmfc") == 0 and $pc.pcs_vag > 20 and getvar("$clientask") == 83>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 83>>
 	<</if>>
-	<<if getvar("$webpopular") > 25 and getvar("$backmfc") == 0 and getvar("$sub") > 25 and getvar("$pc.pcs_vag") > 10 and $inventory.get("condom") > 0 and getvar("$clientask") == 82>>
+	<<if getvar("$webpopular") > 25 and getvar("$backmfc") == 0 and getvar("$sub") > 25 and $pc.pcs_vag > 10 and $inventory.get("condom") > 0 and getvar("$clientask") == 82>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 82>>
 	<</if>>
-	<<if getvar("$backmfc") == 0 and getvar("$webpopular") >= 50 and getvar("$pc.pcs_ass") > 25 and getvar("$clientask") == 81>>
+	<<if getvar("$backmfc") == 0 and getvar("$webpopular") >= 50 and $pc.pcs_ass > 25 and getvar("$clientask") == 81>>
 		<<set $menu_off = 1>>
 		<<gt 'kompMFCtwo' 81>>
 	<</if>>
@@ -1582,14 +1582,14 @@
 			<<elseif getvar("$webpopular") >= 75>>
 				<<set $camclients += rand(15,35)>>
 			<</if>>
-			<<if getvar("$pc.alko") >= 4>>
+			<<if $pc.alko >= 4>>
 				<<gs 'pain' 2 'slap' 'breasts'>>
 			<</if>>
 			<<set $chancetips = rand(0,100)>>
 			<<if getvar("$chancetips") >= 85>>
 				<<set $tokens += rand(2,10)>>
 			<</if>>
-			<<if getvar("$pc.alko") >= 4>>
+			<<if $pc.alko >= 4>>
 				<<image "pc/items/accessories/computer/camwhore80.jpg">>
 			<<else>>
 				<<image "pc/items/accessories/computer/camwhore9.jpg">>
@@ -1681,7 +1681,7 @@
 			<<elseif getvar("$webpopular") >= 75>>
 				<<set $camclients += rand(15,40)>>
 			<</if>>
-			<<if getvar("$pc.pcs_ass") < 10>>
+			<<if $pc.pcs_ass < 10>>
 				<<setn $analplay += 1>>
 
 			<</if>>
@@ -1765,7 +1765,7 @@
 		 * $pl
 		<p>You can buy prepaid internet access online through your bank account. 1 hour of internet only costs 10 <b>₽</b>! *</p>
 		 * $pl
-		<<if getvar("$finances.bank") >= 0>>
+		<<if $finances.bank >= 0>>
 			<p>You have karta <b>₽</b> in your account.</p>
 			<!-- FAILED TO CONVERT
 				'You have an overdraft limit of <font color="blue"><<bankDebtLimit>></font>!'

+ 2 - 2
sugarcube/src/autogenerated/unsorted/LBZhouse.tw

@@ -112,7 +112,7 @@
 <<if $location_var[$here][0] == 'Shower'>>
 	<<video "shared/home/bathroom/dush.mp4">>
 	You grab your stuff and walk over to the bathroom to have a shower. You carefully run the faucet, checking the water temperature before washing yourself off, enjoying the warm water hitting your body.
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>> 
 
 	<</if>>
@@ -121,7 +121,7 @@
 	<<set $time.minutes += 15>>
 	<<set $pc.pcs_hairbsh = 1>>
 	<<set $pc.pcs_makeup = 1>>
-	<<if getvar("$pc.frost") > 0>>
+	<<if $pc.frost > 0>>
 		<<set $pc.frost = 0>>
 
 	<</if>>

+ 7 - 7
sugarcube/src/autogenerated/unsorted/LCwork.tw

@@ -7,7 +7,7 @@
 	<<gs 'dinSex' 'std_trigger'>>
 	<<set $randLCpay = 1000>>
 	<<set $guy += $randguycafe>>
-	<<if getvar("$pc.pcs_vag") < 20>>
+	<<if $pc.pcs_vag < 20>>
 		<<set $pc.pcs_vag += $randguycafe>>
 
 	<</if>>
@@ -41,7 +41,7 @@
 			<<image "locations/city/industrial/bbq/sex/1b.jpg">>
 			By the end, the guys tell you to kneel down in the center of the room and to bring them all to orgasm. You kneel down in the middle of them, sucking one off while your jerk off two more, it takes you a bit to work your way around and get them all off, by the time the last one cums on you, your entire body is covered in cum.
 			<p>Fortunately, they allow you to take a shower and one of them even drives you home. He pays you randLCpay <b>₽</b>, and says he hopes you'll be their waitress again some day.</p>
-			<<if getvar("$pc.deodorant_on") == 1>>
+			<<if $pc.deodorant_on == 1>>
 				<<gs 'sweat' 'remove_deo'>> 
 
 			<</if>>
@@ -60,7 +60,7 @@
 	<<set $spafinloc = 11>>
 	<<gs 'cum_manage'>>
 	<<set $randLCpay = 500>>
-	<<if getvar("$pc.pcs_vag") < 18>>
+	<<if $pc.pcs_vag < 18>>
 		<<setn $pc.pcs_vag += 1>>
 
 	<</if>>
@@ -101,7 +101,7 @@
 	<<gs 'cum_manage'>>
 	<<set $randLCpay = 500>>
 	<<set $guy += 2>>
-	<<if getvar("$pc.pcs_vag") < 18>>
+	<<if $pc.pcs_vag < 18>>
 		<<setn $pc.pcs_vag += 2>>
 
 	<</if>>
@@ -142,7 +142,7 @@
 	<<set $randLCpay = 500>>
 	<<set $girl += 1>>
 	<<set $guy += 1>>
-	<<if getvar("$pc.pcs_ass") < 18>>
+	<<if $pc.pcs_ass < 18>>
 		<<setn $pc.pcs_ass += 1>>
 
 	<</if>>
@@ -255,7 +255,7 @@
 	 	<<set $horand = rand(1, 100)>>
 	<<set $randLCpay = 500>>
 	<<set $guy += 1>>
-	<<if getvar("$pc.pcs_vag") < 18>>
+	<<if $pc.pcs_vag < 18>>
 		<<setn $pc.pcs_vag += 1>>
 
 	<</if>>
@@ -282,7 +282,7 @@
 		Finally, the man''s cock erupts in your mouth, and he doesn''t explain when you take his cock out of your mouth after a few spurts and release the rest onto your boobies.
 		<p>He gives you a satisfied grin and lets you use his shower to clean yourself up before you go. He peeks into the shower once or twice while you're washing yourself, but you don't care, it's not like he hasn't seen you naked before!</p>
 		<p>He gives you randLCpay <b>₽</b>, and walks you to the door when you're all freshened up.</p>
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>

+ 4 - 4
sugarcube/src/autogenerated/unsorted/LakeBoyDy.tw

@@ -102,15 +102,15 @@
 					<<set $time.minutes += 1>>
 					<<run $npcs.set('A113','QW',1)>>
 					<<set $time.daybelisex = $time.daystart>>
-					<<if getvar("$finances.cash") < 10000>>
+					<<if $finances.cash < 10000>>
 						<<set $belgangPay = 50000>>
 					<</if>>
-					<<if getvar("$finances.cash") >= 10000>>
+					<<if $finances.cash >= 10000>>
 						<<set $belgangPay = $finances.cash * 5>>
 					<</if>>
-					<<if getvar("$time.weekday") == 7>>
+					<<if $time.weekday == 7>>
 						<<set $belfirstweek = 0>>
-					<<elseif getvar("$time.weekday") >= 1 and getvar("$time.weekday") <= 2>>
+					<<elseif $time.weekday >= 1 and $time.weekday <= 2>>
 						<<set $belfirstweek = 0>>
 					<<else>>
 						<<set $belfirstweek = 1>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/LariskaGo.tw

@@ -22,7 +22,7 @@ You join Lariska and start walking with her to her home.
 		<<else>>
 			You go into the japanese styled apartment, then follow Lariska to her room.
 		<</if>>
-		<<if getvar("$pc.frost") > 0>>
+		<<if $pc.frost > 0>>
 			<<set $pc.frost = 0>>
 
 		<</if>>

+ 8 - 8
sugarcube/src/autogenerated/unsorted/LariskaHome.tw

@@ -12,12 +12,12 @@
 	<<set $time.minutes += 1>>
 	<<gs 'themes' 'indoors'>>
 	<<gs 'lariska_schedule'>>
-	<<if getvar("$pc.frost") > 0>>
+	<<if $pc.frost > 0>>
 		<<set $pc.frost = 0>>
 
 	<</if>>
 	<<if getvar("$locat['Lari_athome']") == 1>>
-		<<if getvar("$time.weekday") <= 5>>
+		<<if $time.weekday <= 5>>
 			<<image "characters/shared/headshots_main/big13.jpg">>
 			You knock on Lariska''s apartment door.
 			<p>Lariska answers the door. "Come in, $pc.name_nick."</p>
@@ -74,7 +74,7 @@
 		<<else>>
 			<<set $text_home = 'I am not sure where Lariska is right now.'>>
 		<</if>>
-		<<if getvar("$time.weekday") >= 6>>
+		<<if $time.weekday >= 6>>
 			<<image "characters/pavlovsk/school/girl/lariska/lariskamother.jpg">>
 			<<if getvar("$LariskaQW['metAnna']") == 0>>
 				You knock on Lariska''s apartment door and a smart looking brunette opens the door. You look helplessly into her impressive cleavage and let out an involuntary sigh.
@@ -233,7 +233,7 @@
 
 	<</if>>
 	<<if getvar("$locat['Lariska']") == 11>>
-		<<if getvar("$LariskaQW['story']") == 11 and getvar("$time.weekday") < 6 and $LariskaBoyDay <= $time.daystart>>
+		<<if getvar("$LariskaQW['story']") == 11 and $time.weekday < 6 and $LariskaBoyDay <= $time.daystart>>
 			<<link "Lariska">><<gt 'lariska_storyline' 'Boyfriend_2'>><</link>> is cooking dinner.
 		<<else>>
 			<<link "Lariska">><<gt 'LariskaHome' 'kitchen_cooking_1'>><</link>> is cooking dinner.
@@ -282,7 +282,7 @@
 	<<set $pc.pcs_health += 10>>
 	<<set $pc.fat += 8>>
 	<<set $pc.pcs_energy += 60>>
-	<<if getvar("$pc.pcs_hydra") >= 100>>
+	<<if $pc.pcs_hydra >= 100>>
 		<<set $pc.pcs_hydra += 30>>
 	<<else>>
 		<<set $pc.pcs_hydra += 60>>
@@ -394,7 +394,7 @@
 		<<set $pc.horny += 10>>
 		<<set $pc.pcs_hairbsh = 1>>
 		<<set $pc.pcs_makeup = 1>>
-		<<if getvar("$pc.deodorant_on") == 1>>
+		<<if $pc.deodorant_on == 1>>
 			<<gs 'sweat' 'remove_deo'>> 
 
 		<</if>>
@@ -434,7 +434,7 @@
 			<<set $pc.horny += 10>>
 			<<set $pc.pcs_hairbsh = 1>>
 			<<set $pc.pcs_makeup = 1>>
-			<<if getvar("$pc.deodorant_on") == 1>>
+			<<if $pc.deodorant_on == 1>>
 				<<gs 'sweat' 'remove_deo'>> 
 
 			<</if>>
@@ -546,7 +546,7 @@
 			<<gt 'LariskaHome' 'homework'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$lariskaTrain") > 5 and getvar("$LariskaQW['volleyball']") == 0 and (getvar("$locat['Lariska']") == 8 or (getvar("$locat['Lariska']") == 22 and getvar("$time.hour") < 16 and getvar("$time.weekday") <= 5))>>
+	<<if getvar("$lariskaTrain") > 5 and getvar("$LariskaQW['volleyball']") == 0 and (getvar("$locat['Lariska']") == 8 or (getvar("$locat['Lariska']") == 22 and $time.hour < 16 and $time.weekday <= 5))>>
 		<<actCLA 'Talk to Lariska about becoming a pro volleyball player'>>
 			<<set $time.minutes += 5>>
 			<<image "characters/shared/headshots_main/big13.jpg">>

+ 12 - 12
sugarcube/src/autogenerated/unsorted/LariskaSex.tw

@@ -90,7 +90,7 @@
 	You reach up and grab her ass, massaging it, as you bury your face in her snatch, rubbing with your nose and licking at the same time. You hear a few moans before she starts licking you back, dragging her tongue slowly across your outer lips before beginning to fuck your hole with that beautiful tongue.
 	You start squirming around, trying and failing to stay focused on pleasing her, but she stops for a moment. The next thing you see is a fairly large suction dildo being presented to you. Taking it, you suck on it for a moment to lube it up, before gently rubbing it around her folds, drawing a long moan out of her.
 	As you start slowly working the tip in, you hear a vibrator start buzzing. Swinging your head around her leg and looking down, you see Lariska lubing up a smaller, vibrating dildo, as she prepares it for you. She mimics your movements, first rubbing it all around the outside of your pussy, before peeling the folds back so she can start easing it in.
-	<<if getvar("$pc.vibratorin") == 1>>
+	<<if $pc.vibratorin == 1>>
 		<<set $pc.vibratorin = 0>>
 		<<set $vibratorOUT = 1>>
 		You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.
@@ -421,7 +421,7 @@
 <<if $location_var[$here][0] == 'miss_1'>>
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_1.jpg">>
-	<<if getvar("$pc.vibratorin") == 1>>
+	<<if $pc.vibratorin == 1>>
 		<<set $pc.vibratorin = 0>>
 		<<set $vibratorOUT = 1>>
 		You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.
@@ -432,7 +432,7 @@
 	<</if>>
 	Pushing you onto your back, she lifts your legs up and starts teasing your pussy lips with the tip. You look her in the eyes, silently begging her to start fucking you. Getting the unspoken message, she eases her way in a few centimeters, before pulling back out and teasing you some more.
 	<p>"Beg," she says in a somewhat commanding voice. "Please, Lariska, fuck me!" Smiling she puts it back in, pushing it in a little more, before pulling back out again. "I can't hear you, $pc.name_nick!" You scream out, "Please, Lariska, I'm begging you!"</p>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		<p>She pushes the strap-on back inside, and you feel something inside of you rip. You know it was your hymen, you are no longer a virgin.</p>
 	<</if>>
 	She starts fucking you, hanging onto your ankles for leverage. In between grunts and moans, you keep begging her to screw your brains out. Tingles spread throughout your body with each thrust, so you grab your tits and start massaging them, magnifying those feelings. 
@@ -487,7 +487,7 @@
 <<if $location_var[$here][0] == 'cow_1'>>
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_2.jpg">>
-	<<if getvar("$pc.vibratorin") == 1>>
+	<<if $pc.vibratorin == 1>>
 		<<set $pc.vibratorin = 0>>
 		<<set $vibratorOUT = 1>>
 		You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.
@@ -497,7 +497,7 @@
 
 	<</if>>
 	Lariska lays on her back and you climb on. Pulling the shaft against your folds, you start grinding against it, your outer lips partially wrapped around it. You line yourself up with her rubber dick and begin sliding down as she plays with your nipples.
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		<p>She pushes the strap-on back inside, and you feel something inside of you rip. You know it was your hymen, you are no longer a virgin.</p>
 	<</if>>
 	Grinding your hips back and forth, you work the shaft deeper until it's fully hilted. She wraps her hands around your ass and starts pulling you forward and pushing you back, letting you grind your butt down with each push.
@@ -553,7 +553,7 @@
 <<if $location_var[$here][0] == 'dog_1'>>
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_3.jpg">>
-	<<if getvar("$pc.vibratorin") == 1>>
+	<<if $pc.vibratorin == 1>>
 		<<set $pc.vibratorin = 0>>
 		<<set $vibratorOUT = 1>>
 		You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.
@@ -563,7 +563,7 @@
 
 	<</if>>
 	Going down onto your hands and knees, you look over your shoulder at Lariska and wag your ass seductively. Smiling at you, Lariska starts by rubbing the tip along your slit, making you moan in anticipation. Done teasing, she lines herself up and starts pushing it in.
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		<p>She pushes the strap-on back inside, and you feel something inside of you rip. You know it was your hymen, you are no longer a virgin.</p>
 	<</if>>
 	She starts pulling out and pushing back in, each pull leaving you feeling empty, and each thrust sparking small bolts of pleasure throughout your body. Grabbing your hips for leverage, she finds a steady pace that fills you with bliss.
@@ -620,7 +620,7 @@
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_4.jpg">>
 	<<if getvar("$analplugin") == 1>>
-		<<if getvar("$pc.pcs_ass") < 16>>
+		<<if $pc.pcs_ass < 16>>
 			Lariska pulls the plug out of your narrow and tight ass.
 			<<set $analplugout = 1>>
 			<<set $analplugin = 0>>
@@ -689,7 +689,7 @@
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_5.jpg">>
 	<<if getvar("$analplugin") == 1>>
-		<<if getvar("$pc.pcs_ass") < 16>>
+		<<if $pc.pcs_ass < 16>>
 			Lariska pulls the plug out of your narrow and tight ass.
 			<<set $analplugout = 1>>
 			<<set $analplugin = 0>>
@@ -757,7 +757,7 @@
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/school/girl/lariska/sex/home/strap_6.jpg">>
 	<<if getvar("$analplugin") == 1>>
-		<<if getvar("$pc.pcs_ass") < 16>>
+		<<if $pc.pcs_ass < 16>>
 			Lariska pulls the plug out of your narrow and tight ass.
 			<<set $analplugout = 1>>
 			<<set $analplugin = 0>>
@@ -845,7 +845,7 @@
 				<<image "characters/pavlovsk/school/girl/lariska/boyfriend/bf_4.jpg">>
 				<<if $pc.thinksIsVirgin>>
 					<<if getvar("$analplugin") == 1>>
-						<<if getvar("$pc.pcs_ass") < 16>>
+						<<if $pc.pcs_ass < 16>>
 							Lariska slides the butt plug out of your narrow and tight ass, opening the way for Lev.
 							<<set $analplugout = 1>>
 							<<set $analplugin = 0>>
@@ -865,7 +865,7 @@
 					The sensations of the pounding he is giving you and making out with Lariska is overwhelming your senses. She moves her hands between your legs, and returns the favor from earlier by rubbing your clit.
 					<<arouse 'anal' 5 `['lesbian','group']`>>
 				<<else>>
-					<<if getvar("$pc.vibratorin") == 1>>
+					<<if $pc.vibratorin == 1>>
 						<<set $pc.vibratorin = 0>>
 						<<set $vibratorOUT = 1>>
 						Lariska slides the vibrator out of your pussy, Giving Lev access to your pussy. You feel somewhat empty now, though that's about to change.

+ 1 - 1
sugarcube/src/autogenerated/unsorted/MHall.tw

@@ -23,7 +23,7 @@
 		<<actCLA 'Go to Dressing room'>>
 			<<gt 'MDressing'>>
 		<</actCLA>>
-		<<if ($wardrobe.clothingworntype != 'gm_maid' or getvar("$wardrobe.PCloStyle2") != 1) and $wardrobe.clothingworntype != 'nude'>>
+		<<if ($wardrobe.clothingworntype != 'gm_maid' or $wardrobe.PCloStyle2 != 1) and $wardrobe.clothingworntype != 'nude'>>
 			$exit
 
 		<</if>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/MLibrary.tw

@@ -9,7 +9,7 @@
 <<set $menu_off = 0>>
 <<image "locations/city/suburb/bdsm_club/library.jpg">>
 Library, full of books.
-<<if getvar("$time.hour") == 18>>
+<<if $time.hour == 18>>
 	<<set $menu_off = 1>>
 	<<set $pc.horny += 10>>
 	<<video "locations/city/suburb/bdsm_club/librand.mp4">>

+ 18 - 18
sugarcube/src/autogenerated/unsorted/MagEncounterFairy.tw

@@ -113,7 +113,7 @@
 		<<gs 'MagEncounterFairy' 'fairychattopic'>>
 		<<if getvar("$fairyday['skin_increase']") <= 10 and $fairyday != $time.daystart and getvar("$fairyshoo") == 0>>
 			<<set $pc.pcs_skin += 10>>
-			<<if getvar("$pc.pcs_skin") > 1000>>
+			<<if $pc.pcs_skin > 1000>>
 				<<set $pc.pcs_skin = 1000>>
 
 			<</if>>
@@ -134,7 +134,7 @@
 			Just as she flies off, she returns fluttering in front of your face.
 			"You know, you're almost a magical creature now.", she says. "Don't move."
 			Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.
-		<<elseif $fairyday != $time.daystart and (getvar("$pc.nipples") < 80 or getvar("$pc.clit_size") < 80)>>
+		<<elseif $fairyday != $time.daystart and ($pc.nipples < 80 or $pc.clit_size < 80)>>
 			<<set $fairyday = $time.daystart>>
 			The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you've been a little nice to me, maybe I could be a little nice to you."
 			<<actCLA 'Huh?'>>
@@ -149,13 +149,13 @@
 				<<if getvar("$fairy_surprise") <= 2>>
 					<<set $pc.nipples += 5>>
 					<<set $pc.horny += 10>>
-					<<if getvar("$pc.nipples") < 20>>
+					<<if $pc.nipples < 20>>
 						<<image "pc/body/nipples/nipples1.jpg">>
-					<<elseif getvar("$pc.nipples") < 40>>
+					<<elseif $pc.nipples < 40>>
 						<<image "pc/body/nipples/nipples2.jpg">>
-					<<elseif getvar("$pc.nipples") < 60>>
+					<<elseif $pc.nipples < 60>>
 						<<image "pc/body/nipples/nipples3.jpg">>
-					<<elseif getvar("$pc.nipples") < 80>>
+					<<elseif $pc.nipples < 80>>
 						<<image "pc/body/nipples/nipples4.jpg">>
 					<<else>>
 						<<image "pc/body/nipples/nipples5.jpg">>
@@ -164,13 +164,13 @@
 					You can't help but rub both breasts, feeling the warm tingling in them, and in your pussy.
 				<<elseif getvar("$fairy_surprise") == 3>>
 					<<set $pc.nipples -= 5>>
-					<<if getvar("$pc.nipples") < 20>>
+					<<if $pc.nipples < 20>>
 						<<image "pc/body/nipples/nipples1.jpg">>
-					<<elseif getvar("$pc.nipples") < 40>>
+					<<elseif $pc.nipples < 40>>
 						<<image "pc/body/nipples/nipples2.jpg">>
-					<<elseif getvar("$pc.nipples") < 60>>
+					<<elseif $pc.nipples < 60>>
 						<<image "pc/body/nipples/nipples3.jpg">>
-					<<elseif getvar("$pc.nipples") < 80>>
+					<<elseif $pc.nipples < 80>>
 						<<image "pc/body/nipples/nipples4.jpg">>
 					<<else>>
 						<<image "pc/body/nipples/nipples5.jpg">>
@@ -180,13 +180,13 @@
 				<<elseif getvar("$fairy_surprise") <= 4>>
 					<<set $pc.clit_size += 5>>
 					<<set $pc.horny += 10>>
-					<<if getvar("$pc.clit_size") < 20>>
+					<<if $pc.clit_size < 20>>
 						<<image "pc/body/clit/clit1.jpg">>
-					<<elseif getvar("$pc.clit_size") < 40>>
+					<<elseif $pc.clit_size < 40>>
 						<<image "pc/body/clit/clit2.jpg">>
-					<<elseif getvar("$pc.clit_size") < 60>>
+					<<elseif $pc.clit_size < 60>>
 						<<image "pc/body/clit/clit3.jpg">>
-					<<elseif getvar("$pc.clit_size") < 80>>
+					<<elseif $pc.clit_size < 80>>
 						<<image "pc/body/clit/clit4.jpg">>
 					<<else>>
 						<<image "pc/body/clit/clit5.jpg">>
@@ -197,13 +197,13 @@
 					You two say your goodbyes and the fairy flies off.
 				<<elseif getvar("$fairy_surprise") == 5>>
 					<<set $pc.clit_size -= 5>>
-					<<if getvar("$pc.clit_size") < 20>>
+					<<if $pc.clit_size < 20>>
 						<<image "pc/body/clit/clit1.jpg">>
-					<<elseif getvar("$pc.clit_size") < 40>>
+					<<elseif $pc.clit_size < 40>>
 						<<image "pc/body/clit/clit2.jpg">>
-					<<elseif getvar("$pc.clit_size") < 60>>
+					<<elseif $pc.clit_size < 60>>
 						<<image "pc/body/clit/clit3.jpg">>
-					<<elseif getvar("$pc.clit_size") < 80>>
+					<<elseif $pc.clit_size < 80>>
 						<<image "pc/body/clit/clit4.jpg">>
 					<<else>>
 						<<image "pc/body/clit/clit5.jpg">>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/Military.tw

@@ -54,7 +54,7 @@
 	<<actCLA 'Get some food and drink from the mess hall'>>
 		<<gt 'beverage' 'm_meal'>>
 	<</actCLA>>
-	<<if getvar("$time.weekday") < 6 or getvar("$time.weekday") == 7 and getvar("$time.hour") >= 18>>
+	<<if $time.weekday < 6 or $time.weekday == 7 and $time.hour >= 18>>
 		<<set $time.minutes += 60>>
 		<<set $finances.cash += 5000>>
 		<<actCLA 'Go back to town'>>

+ 4 - 4
sugarcube/src/autogenerated/unsorted/NikoDates.tw

@@ -296,7 +296,7 @@
 
 							-->
 							<<warn "CONVERSION ERROR 4d9bbe10ab7f16133a4864e3ab242faf">>
-							<<if getvar("$pc.deodorant_on") == 1>>
+							<<if $pc.deodorant_on == 1>>
 								<<gs 'sweat' 'remove_deo'>> 
 
 							<</if>>
@@ -385,7 +385,7 @@
 		<<gs 'clothing' 'strip'>>
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/2/Home/1.jpg">>
 		You can feel the room spinning as Niko carries you to his bedroom and drops you on the bed. You look around the room while you lose feeling in your legs. You can faintly feel your clothes being removed. After most of your clothes are removed you slowly look down to see Niko spreading your vaginal lips as he looks inside of your pussy.
-		<<if getvar("$pc.pcs_vag") == 0>>
+		<<if $pc.pcs_vag == 0>>
 			Niko smiles widely as he says to himself, "Ahh a virgin, I always wanted to fuck a virgin. Lucky me." Niko then walks toward his desk and pulls out a camera and then places it by the bedside facing you.
 		<<else>>
 			Niko shrugs as he says to himself, "Of course she isn''t a virgin, that would have been too good." Niko then walks toward his desk and pulls out a camera and then places it by the bedside facing you.
@@ -411,7 +411,7 @@
 							<<set $NikoEv = 4>>
 
 						<</if>>
-						<<if getvar("$time.hour") > 6>>
+						<<if $time.hour > 6>>
 							<<gs 'cikl'>>
 
 						<</if>>
@@ -678,7 +678,7 @@
 	<<set $pc.pcs_makeup = 1>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/NikoEv2.tw

@@ -481,7 +481,7 @@
 									<<image "pc/body/cum/cumface/blonde/15.jpg">>
 									<p>Biker1: Wow she walks around like that?</p>
 									Biker2: Well she is obviously a slut looking for customers.
-									<<if getvar("$pc.salocatnow") >= 5>>
+									<<if $pc.salocatnow >= 5>>
 										<p>Trucker1: A slut huh? Well she looks more like a cow to me.</p>
 										<p>Biker3: Yeah she looks like my old lady, but a pussy is a pussy, I guess'?</p>
 									<<else>>
@@ -613,7 +613,7 @@
 	<<set $pc.pcs_makeup = 1>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>

+ 5 - 5
sugarcube/src/autogenerated/unsorted/NikoPayback.tw

@@ -30,7 +30,7 @@
 				<center><b><h4><font color="red"><<"Nikolai [$Niko] Volkov">></font></h4></b></center>
 				<<image "characters/pavlovsk/school/boy/niko/nikoev/smile#.jpg" 2 3>>
 				<p>You silently nod and Niko smiles. "Good, that's what I like to hear. So what's it gonna be today? Money or that pretty mouth of yours?"</p>
-				<<if getvar("$finances.cash") >= 200>>
+				<<if $finances.cash >= 200>>
 					<<actCLA 'Money (200 <b>₽</b>)'>>
 						<<set $finances.cash -= 200>>
 						<<set $time.minutes += 5>>
@@ -74,7 +74,7 @@
 		<center><b><h4><font color="red"><<"Nikolai [$Niko] Volkov">></font></h4></b></center>
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/smile#.jpg" 2 3>>
 		<p>You approach Niko and a confident grin creeps onto his face. "You showed up? Good. How will you be paying today?"</p>
-		<<if getvar("$finances.cash") >= 200>>
+		<<if $finances.cash >= 200>>
 			<<actCLA 'Money (200 <b>₽</b>)'>>
 				<<set $NikoPayed = $time.daystart>>
 				<<set $finances.cash -= 200>>
@@ -147,7 +147,7 @@
 			<</if>>
 		<</actCLA>>
 	<</actCLA>>
-	<<if getvar("$pc.pcs_vag") == 0>>
+	<<if $pc.pcs_vag == 0>>
 		<!-- FAILED TO CONVERT
 			act 'Vaginal [<font color=#FF00FF>Lose Virginity</font>]':
 		-----
@@ -307,7 +307,7 @@
 			<p>You slowly approach the sink and spread your legs as Niko approaches you from behind. You feel tears streaming down your face as he drops his pants and rubs his dick against your pussy before forcing it inside you, causing a powerful jolt of pain to shoot through you. He wastes no time and begins thrusting his dick inside you very roughly as he whispers in your ear. "Oops. There goes your virginity. How does it feel to be a real woman?" You lower your head in shamed silence while trying to focus on anything but the pain.</p>
 			<<arouse 'vaginal' 5 `['rough','sub']`>>
 			<<actCLA 'Continue'>>
-				<<if getvar("$pc.pcs_vag") == 0>>
+				<<if $pc.pcs_vag == 0>>
 					<<setn $pc.pcs_vag += 1>>
 
 				<</if>>
@@ -343,7 +343,7 @@
 			<p>You squirm as Niko turns you around and lifts you up by the legs. Tears well up in your eyes as you feel his dick pushing its way inside your virgin pussy, causing you to cry out as a wave of pain shoots through you. He wastes no time and begins thrusting his dick inside you very roughly as he whispers in your ear. "Oops. There goes your virginity. How does it feel to be a real woman?" You lower your head in shamed silence while trying to focus on anything but the pain.</p>
 			<<arouse 'vaginal' 5 `['rough','sub']`>>
 			<<actCLA 'Continue'>>
-				<<if getvar("$pc.pcs_vag") == 0>>
+				<<if $pc.pcs_vag == 0>>
 					<<setn $pc.pcs_vag += 1>>
 
 				<</if>>

+ 7 - 7
sugarcube/src/autogenerated/unsorted/NikoSlut.tw

@@ -1051,7 +1051,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'Diner Exterior'>>
 	<<set $time.minutes += 5>>
-	<<if getvar("$time.hour") >= 7 and getvar("$time.hour") <= 19>>
+	<<if $time.hour >= 7 and $time.hour <= 19>>
 		<<image "locations/highway/borisdiner/exterior1.jpg">>
 		This small diner has a large parking lot and you can often find over the road trucks parked there. It sits at one end of a larger brick building which is a local biker bar. The diner has chrome skirts and a chrome door that leads inside. Truckers can be found here throughout the day. While commuters and some locals can be found here in the day and evenings. Bikers tend to stop by in the evening or late at night and stay into the early morning hours after the biker bar next door, closes.
 	<<else>>
@@ -1075,16 +1075,16 @@
 
 	<</if>>
 	<<image "locations/highway/borisdiner/interior1.jpg">>
-	<<if getvar("$time.hour") >= 7 and getvar("$time.hour") <= 17 and $time.hour != $BorisDiner['Trucker']>>
+	<<if $time.hour >= 7 and $time.hour <= 17 and $time.hour != $BorisDiner['Trucker']>>
 		You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a <<link "trucker">><<gt 'NikoSlut' 'Truckers'>><</link>> sitting on a stool, enjoying his meal.
-	<<elseif getvar("$time.hour") >= 7 and getvar("$time.hour") <= 17 and $time.hour == $BorisDiner['Trucker']>>
+	<<elseif $time.hour >= 7 and $time.hour <= 17 and $time.hour == $BorisDiner['Trucker']>>
 		You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a trucker sitting on a stool, enjoying his meal...
 	<<elseif $time.hour != $BorisDiner['Biker']>>
 		You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some <<link "bikers">><<gt 'NikoSlut' 'Bikers'>><</link>> sitting at the tables, chatting and drinking beer.
 	<<else>>
 		You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some bikers sitting at the tables, chatting and drinking beer.
 	<</if>>
-	<<if getvar("$time.hour") == 18>>
+	<<if $time.hour == 18>>
 		<<if $YurikEv['Name'] == 'Yurik'>>
 			You can see <<link "Yurik">><<gt 'NikoSlut' 'Yurik In'>><</link>> sitting in the corner of the bar. Eating some dinner.
 		<<else>>
@@ -1097,7 +1097,7 @@
 	<<actCLA 'Go to the mens restroom'>>
 		<<gt 'NikoSlut' 'Mens Restroom'>>
 	<</actCLA>>
-	<<if getvar("$finances.cash") >= 200>>
+	<<if $finances.cash >= 200>>
 		<<actCLA 'Order some eggs (200<b>₽</b>)'>>
 			<<gt 'NikoSlut' 'Meal 1'>>
 		<</actCLA>>
@@ -1105,7 +1105,7 @@
 			<<gt 'NikoSlut' 'Salad'>>
 		<</actCLA>>
 	<</if>>
-	<<if getvar("$finances.cash") >= 300>>
+	<<if $finances.cash >= 300>>
 		<<actCLA 'Order a burger(300<b>₽</b>)'>>
 			<<gt 'NikoSlut' 'Meal 2'>>
 		<</actCLA>>
@@ -1223,7 +1223,7 @@
 	<<set $pc.pcs_makeup = 1>>
 	<<set $cumspclnt = 1>>
 	<<gs 'cum_cleanup'>>
-	<<if getvar("$pc.pcs_sweat") < 30>>
+	<<if $pc.pcs_sweat < 30>>
 		<<set $pc.pcs_sweat = 15 + rand(0,4)>>
 	<<else>>
 		<<set $pc.pcs_sweat -= 10 + rand(0,4)>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/NikoWhore.tw

@@ -104,7 +104,7 @@
 															<p>"I told you she was a freak! She loves getting fucked. She was basically begging me to fuck her ass!" Dan laughs.</p>
 															<p>"Come on guys, we already have Sonia. We don't need $pc.name_nick too." Vasily responds.</p>
 															<p>"She might be Sonia 2.0! It would be wrong for us <i>not</i> to show her off. Now is the perfect time too. The boys are still on the stairwell." Dan adds.</p>
-															<<if getvar("$pc.hotcat") >= 7 and getvar("$pc.salocatnow") < 5>>
+															<<if getvar("$pc.hotcat") >= 7 and $pc.salocatnow < 5>>
 																<p>"That sounds like a great idea. $pc.name_nick is much hotter than Sonia anyway. Let's do it." Vitek responds before pulling you to your feet. "You're coming with us."</p>
 															<<else>>
 																"That sounds like a great idea. She looks like an overgrown pig, but we can always fuck her from behind. Alright let''s do it." Vitek responds before pulling you to your feet. "You're coming with us."
@@ -257,7 +257,7 @@
 	<p>"What the fuck was she thinking? Why would she do this to herself? Is she that desperate for dick?" Lariska asks.</p>
 	"I always thought she was a nice girl, but I guess she was just a whore all along. She hid it well." Lina responds.
 	<p><<npc 'A18'>><</npc>> laughs. "You're both so stupid! I knew she was a fucking whore all along, you just have to look at how she acts. So weak and pathetic and eager to please any boy that paid any attention to her." You hear several of the other girls agree with her.</p>
-	<<if getvar("$pc.hotcat") >= 6 and getvar("$pc.salocatnow") < 5>>
+	<<if getvar("$pc.hotcat") >= 6 and $pc.salocatnow < 5>>
 		<p>"Fuck yeah! I've been wanting to fuck $pc.name_nick since I first saw her drop that chalk in math class." Roman laughs.</p>
 	<<else>>
 		<p>"I always thought about what it would be like to fuck $pc.name_first since I first saw her drop that chalk in math class. If only she wasn't so ugly..." Roman laughs.</p>

+ 12 - 12
sugarcube/src/autogenerated/unsorted/Nudelake.tw

@@ -12,7 +12,7 @@
 <center><b>nudist beach</b></center>
 <<image "locations/city/residential/lake/nudelake.jpg">>
 The nudist beach, where clothing is optional.
-<<if getvar("$wardrobe.PCloswimwear") == 1 or $wardrobe.clothingworntype == 'nude'>>
+<<if $wardrobe.PCloswimwear == 1 or $wardrobe.clothingworntype == 'nude'>>
 	<<actCLA 'Get dressed'>>
 		 		<<set $time.minutes += 5>>
 		<<run $wardrobe.wear_clothes_legacy('clothes',$lastwornclothingtype['swim'],$lastwornclothingnumber['swim'])>>
@@ -25,8 +25,8 @@ The nudist beach, where clothing is optional.
 		<</actCLA>>
 	<</actCLA>>
 <</if>>
-<<if getvar("$temper") >= 15 and getvar("$time.month") >= 5 and getvar("$time.month") <= 9>>
-	<<if func('changingroom','count_swim_item') > 0 and getvar("$wardrobe.PCloswimwear") == 0>>
+<<if getvar("$temper") >= 15 and $time.month >= 5 and $time.month <= 9>>
+	<<if func('changingroom','count_swim_item') > 0 and $wardrobe.PCloswimwear == 0>>
 		<<actCLA 'Change into your swimwear'>>
 			<<set $menu_off = 1>>
 			 			<<set $time.minutes += 5>>
@@ -47,11 +47,11 @@ The nudist beach, where clothing is optional.
 		<</actCLA>>
 	<</if>>
 <</if>>
-<<if getvar("$temper") >= 15 and getvar("$time.month") >= 5 and getvar("$time.month") <= 9>>
+<<if getvar("$temper") >= 15 and $time.month >= 5 and $time.month <= 9>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
 		<<actCLA 'Take off your clothes'>>
 			<<set $menu_off = 1>>
-			<<if getvar("$pc.pcs_inhib") > 30>>
+			<<if $pc.pcs_inhib > 30>>
 				 				<<set $time.minutes += 5>>
 				<<setinit $lastwornclothingtype['swim'] = $wardrobe.clothingworntype>>
 				<<setinit $lastwornclothingnumber['swim'] = $wardrobe.clothingwornnumber>>
@@ -63,10 +63,10 @@ The nudist beach, where clothing is optional.
 				<<if $pc.horny >= 80 and getvar("$exhibitionist_lvl") > 1>>
 					<<image "locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg">>
 					<p>You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don't care about what they might say or think of you.</p>
-				<<elseif getvar("$pc.pcs_inhib") >= 60>>
+				<<elseif $pc.pcs_inhib >= 60>>
 					<<image "locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg">>
 					Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.
-				<<elseif getvar("$pc.pcs_inhib") < 60>>
+				<<elseif $pc.pcs_inhib < 60>>
 					<<image "locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg">>
 					You quickly check to see if anyone is watching, and when you're satisfied no one is paying you undue attention, you take off your clothes. You're naked now.
 				<</if>>
@@ -80,7 +80,7 @@ The nudist beach, where clothing is optional.
 		<</actCLA>>
 	<</if>>
 <</if>>
-<<if getvar("$time.hour") >= 6 and getvar("$time.hour") <= 20 and getvar("$temper") >= 15>>
+<<if $time.hour >= 6 and $time.hour <= 20 and getvar("$temper") >= 15>>
 	<<if $wardrobe.clothingworntype == 'nude'>>
 		Here you can <<link "sunbathe">><<gt 'Nudelake' 'zagarat'>><</link>> and <<link "swim">><<gt 'Nudelake' 'swim'>><</link>>
 		<<actCLA 'Go swimming'>>
@@ -91,7 +91,7 @@ The nudist beach, where clothing is optional.
 		<</actCLA>>
 		You can play <<link "beach volleyball">><<gt 'Nudelake' 'voleybol'>><</link>>.
 	<</if>>
-<<elseif getvar("$time.hour") >= 6 and getvar("$time.hour") <= 20>>
+<<elseif $time.hour >= 6 and $time.hour <= 20>>
 	It's too cold for any nudist activities.
 <<else>>
 	The nudist beach is closed.
@@ -144,7 +144,7 @@ The nudist beach, where clothing is optional.
 <<if $location_var[$here][0] == 'zagarat'>>
 	<<set $location_type = 'event_outdoors'>>
 	<<set $time.minutes += 30>>
-	<<if getvar("$pc.pcs_sweat") < 35>>
+	<<if $pc.pcs_sweat < 35>>
 		<<gs 'sweat' 'add' 5>>
 
 	<</if>>
@@ -193,7 +193,7 @@ The nudist beach, where clothing is optional.
 		<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 	<<else>>
 		<<gs 'exercise' 'tier1' 1 'stren'>>
-		<<if getvar("$pc.pcs_inhib") < 50>>
+		<<if $pc.pcs_inhib < 50>>
 			<<run $pc.skillExperienceGain('inhibition',rand(1,3))>>
 
 		<</if>>
@@ -201,7 +201,7 @@ The nudist beach, where clothing is optional.
 	<<set $pc.pcs_sweat = 10 + rand(0,4)>>
 	<<image `'pc/activities/swim/lake/swim_nude_'+rand(0,10)+'.jpg'`>>
 	You go for a swim.
-	<<if getvar("$pc.deodorant_on") == 1>>
+	<<if $pc.deodorant_on == 1>>
 		<<gs 'sweat' 'remove_deo'>> 
 
 	<</if>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/ParkKafe.tw

@@ -20,7 +20,7 @@
 	<<actCLA 'Have a seat'>>
 		<<gt 'parkKafe' 'table'>>
 	<</actCLA>>
-	<<if getvar("$finances.cash") >= 350>>
+	<<if $finances.cash >= 350>>
 		<<actCLA 'Order take-out (0:20) (350 <b>₽</b>)'>>
 			<<set $finances.cash -= 350>> <<gt 'food' 'f_food'>>
 		<</actCLA>>

+ 2 - 2
sugarcube/src/autogenerated/unsorted/Peterroom.tw

@@ -124,7 +124,7 @@
 			<<image "characters/city/peter/sex/8.jpg">>
 			He continues to fuck you hard and fast, then slows the rhythm, finishing with several sharp uneven thrusts that fill your insides with a hot stream of cum.
 			<<arouse 'anal' 10 `['sub']`>>
-			<<if getvar("$pc.pcs_ass") < 25>>
+			<<if $pc.pcs_ass < 25>>
 				<<setn $pc.pcs_ass += 1>>
 
 			<</if>>
@@ -169,7 +169,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'd1'>>
-	 	<<if getvar("$pc.pcs_ass") < 25>>
+	 	<<if $pc.pcs_ass < 25>>
 		<<setn $pc.pcs_ass += 1>>
 
 	<</if>>

+ 34 - 34
sugarcube/src/autogenerated/unsorted/Prostitute.tw

@@ -11,7 +11,7 @@
 	<<set $time.minutes += 5>>
 	<h2>Road near the park, among prostitutes</h2>
 	<<image "locations/city/centralpark/park2.jpg">>
-	<<if getvar("$time.hour") >= 16 and getvar("$time.hour") <= 23>>
+	<<if $time.hour >= 16 and $time.hour <= 23>>
 		<<if getvar("$whoreQW") == 1>>
 			Several prostitutes are looking at you a bit awkwardly, remembering the beating you gave their friend all too well. They still don't want you here, but they're too scared to confront you directly.
 			<<actCLA 'Ask how things work around here'>>
@@ -51,7 +51,7 @@
 			<</actCLA>>
 		<<elseif getvar("$whoreQW") == 2>>
 			The prostitutes look at you curiously for a moment, but quickly turn their attention back to trying to attract customers.
-			<<if getvar("$wardrobe.PCloStyle") == 4 and getvar("$pc.pcs_sleep") > 0>>
+			<<if $wardrobe.PCloStyle == 4 and $pc.pcs_sleep > 0>>
 				<<actCLA 'Stand and wait for customers (0:16)'>>
 					<<set $time.minutes += 10>>
 					<<if rand(0, ($pc.pcs_apprnc / 4 + $time.hour) * 2) < 20>>
@@ -64,7 +64,7 @@
 						<<if getvar("$proseventrand") == 1>>
 							A black jeep with tinted windows pulls up next to you, and a window rolls down. You're looking into the face of a fairly mean looking guy, who you're fairly sure is a criminal.
 							He looks at you with disdain. "Time for you to pay your tribute, slut."
-							<<if getvar("$finances.cash") >= 1000>>
+							<<if $finances.cash >= 1000>>
 								<<actCLA 'Give him 1000 <b>₽</b>'>>
 									<<set $finances.cash -= 1000>>
 									<p>You give the man 1,000 <b>₽</b>, which he pockets right away. Then he drives off, without saying another word.</p>
@@ -72,7 +72,7 @@
 										<<gt 'prostitute' 'start'>>
 									<</actCLA>>
 								<</actCLA>>
-							<<elseif getvar("$finances.cash") < 1000>>
+							<<elseif $finances.cash < 1000>>
 								<<actCLA 'Say you haven`t earned much'>>
 									<<set $finances.cash = 0>>
 									You try to explain to the man that you haven''t earned much yet. He thinks it over for a moment.
@@ -96,7 +96,7 @@
 							<</actCLA>>
 						<<elseif getvar("$proseventrand") == 2>>
 							<p>A rather scrawny looking prostitute approaches you and says: "Listen up, skank. It's time you pay Stella!"</p>
-							<<if getvar("$finances.cash") >= 500>>
+							<<if $finances.cash >= 500>>
 								<<actCLA 'Give her 500 <b>₽</b>'>>
 									<<set $finances.cash -= 500>>
 									As you give her the money, you''d swear you see a twinge of relief in her eyes. The girl was clearly worried you were going to give her a hard time.
@@ -105,7 +105,7 @@
 										<<gt 'prostitute' 'start'>>
 									<</actCLA>>
 								<</actCLA>>
-							<<elseif getvar("$finances.cash") < 500>>
+							<<elseif $finances.cash < 500>>
 								<<actCLA 'Say you haven`t earned much'>>
 									<<set $finances.cash = 0>>
 									You begin to explain that you haven''t earned much money yet, but she's not interested in your story.
@@ -183,43 +183,43 @@
 	<<image "locations/city/centralpark/park2.jpg">>
 	<p>You pretend to think it over for a moment, then look at the man again and smile: "For you, babe? Only ProsMoney * 100 <b>₽</b>."</p>
 	<<set $vnpr = 0>>
-	<<if getvar("$pc.visualAge") >= 40>>
+	<<if $pc.visualAge >= 40>>
 		<<setn $vnpr -= 20>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") >= 35 and getvar("$pc.visualAge") < 40>>
+	<<if $pc.visualAge >= 35 and $pc.visualAge < 40>>
 		<<setn $vnpr -= 10>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") >= 30 and getvar("$pc.visualAge") < 35>>
+	<<if $pc.visualAge >= 30 and $pc.visualAge < 35>>
 		<<setn $vnpr -= 5>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") >= 25 and getvar("$pc.visualAge") < 30>>
+	<<if $pc.visualAge >= 25 and $pc.visualAge < 30>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") >= 20 and getvar("$pc.visualAge") < 25>>
+	<<if $pc.visualAge >= 20 and $pc.visualAge < 25>>
 		<<setn $vnpr += 5>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") >= 18 and getvar("$pc.visualAge") < 20>>
+	<<if $pc.visualAge >= 18 and $pc.visualAge < 20>>
 		<<setn $vnpr += 10>>
 
 	<</if>>
-	<<if getvar("$pc.visualAge") < 18>>
+	<<if $pc.visualAge < 18>>
 		<<setn $vnpr += 15>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_apprnc") == -10>>
+	<<if $pc.pcs_apprnc == -10>>
 		<<set $vnpr -= 100>>
-	<<elseif getvar("$pc.pcs_apprnc") < 5>>
+	<<elseif $pc.pcs_apprnc < 5>>
 		<<set $vnpr -= 10>>
-	<<elseif getvar("$pc.pcs_apprnc") < 15>>
+	<<elseif $pc.pcs_apprnc < 15>>
 		<<set $vnpr -= 5>>
-	<<elseif getvar("$pc.pcs_apprnc") < 30>>
+	<<elseif $pc.pcs_apprnc < 30>>
 		<<set $vnpr += 1>>
-	<<elseif getvar("$pc.pcs_apprnc") < 50>>
+	<<elseif $pc.pcs_apprnc < 50>>
 		<<set $vnpr += 5>>
 	<<else>>
 		<<set $vnpr += 10>>
@@ -228,43 +228,43 @@
 		<<setn $vnpr -= 10>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 0>>
+	<<if $pc.pcs_makeup == 0>>
 		<<setn $vnpr -= 10>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 1>>
+	<<if $pc.pcs_makeup == 1>>
 		<<setn $vnpr -= 1>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 2>>
+	<<if $pc.pcs_makeup == 2>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") == 3>>
+	<<if $pc.pcs_makeup == 3>>
 		<<setn $vnpr += 5>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_makeup") >= 4>>
+	<<if $pc.pcs_makeup >= 4>>
 		<<setn $vnpr += 10>>
 
 	<</if>>
-	<<if getvar("$pc.legHair") <= 0>>
+	<<if $pc.legHair <= 0>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
-	<<if getvar("$pc.legHair") > 0>>
+	<<if $pc.legHair > 0>>
 		<<setn $vnpr -= 5>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_pubes") > 3>>
+	<<if $pc.pcs_pubes > 3>>
 		<<setn $vnpr -= 5>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_pubes") <= 3>>
+	<<if $pc.pcs_pubes <= 3>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
-	<<if getvar("$pc.tan") > 0>>
+	<<if $pc.tan > 0>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
@@ -272,16 +272,16 @@
 		<<setn $vnpr += 1>>
 
 	<</if>>
-	<<if getvar("$pc.pcs_sweat") > 24>>
+	<<if $pc.pcs_sweat > 24>>
 		<<set $vnpr -= 10>>
-	<<elseif getvar("$pc.pcs_sweat") < 15>>
+	<<elseif $pc.pcs_sweat < 15>>
 		<<set $vnpr += 1>>
 	<</if>>
-	<<if getvar("$pc.pcs_hairbsh") < 1>>
+	<<if $pc.pcs_hairbsh < 1>>
 		<<setn $vnpr -= 1>>
 
 	<</if>>
-	<<if getvar("$pc.lip_size") == 4>>
+	<<if $pc.lip_size == 4>>
 		<<setn $vnpr += 1>>
 
 	<</if>>
@@ -467,7 +467,7 @@
 								<<image "shared/sex/cum/facial/facial17.jpg">>
 								You don't have much experience giving blowjobs, and even though you do your best, the man can tell you're not very good at it.
 								When the man is about to cum, he suddenly pulls his cock out of your mouth and shoots his load all over your face. Not expecting this, you didn''t have time to close your eyes and some of it ends up in your eyes.
-								<<if getvar("$pc.pcs_makeup") > 1>>
+								<<if $pc.pcs_makeup > 1>>
 									<<set $pc.pcs_makeup = 0>> 
 
 								<</if>>
@@ -480,7 +480,7 @@
 								<<image "shared/sex/cum/facial/facial18.jpg">>
 								Your trained tongue slides up and down his shaft expertly, and you pull out all of your tricks to make him feel good. You even use some techniques you learned to stall his orgasm for a moment, making it all the more intense for him when he orgasms.
 								You quickly release his cock from your mouth and tilt your head backwards with your eyes closed, making him squirt his load onto your chin with a fake smile on your face.
-								<<if getvar("$pc.pcs_makeup") > 1>>
+								<<if $pc.pcs_makeup > 1>>
 									<p>Even though the man thinks you're delighted with him cumming all over you, in truth you're mostly focusing on not smearing your make-up!</p>
 
 								<</if>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/RimmaSexQW.tw

@@ -9,7 +9,7 @@ You go over to Rima who smiles affably as she greets you.
 <<actCLA '"Sorry, I can`t right now"'>>
 	<<gt 'moncheri' 'start'>>
 <</actCLA>>
-<<if getvar("$finances.cash") >= 250>>
+<<if $finances.cash >= 250>>
 	<<actCLA '"Sure. How about we go to my place?"'>>
 		<<set $finances.cash -= 250>>
 		Rima enthusiastically agrees. While she finishes work for the day, you call a taxi.
@@ -77,7 +77,7 @@ You go over to Rima who smiles affably as she greets you.
 		When she's done, Rima orders you to lick her clean and you comply without question.
 	<<elseif getvar("$RimmaRandEvent") == 20>>
 		<center><<image `'mod/bestmod/images/beast/zoo/rimma14.jpg'`>></center>
-		<<if getvar("$pc.pcs_throat") < 25>>
+		<<if $pc.pcs_throat < 25>>
 		<<setn $pc.pcs_throat += 3>>
 
 	<</if>>
@@ -85,7 +85,7 @@ You go over to Rima who smiles affably as she greets you.
 		You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.
 		<<arouse 'bj' 10 `['sub','lesbian']`>>
 		<<actCLA 'Further'>>
-			<<if getvar("$pc.pcs_ass") < 25>>
+			<<if $pc.pcs_ass < 25>>
 			<<setn $pc.pcs_ass += 1>>
 
 		<</if>>

+ 3 - 3
sugarcube/src/autogenerated/unsorted/Serge_Shulgin.tw

@@ -134,7 +134,7 @@
 				You get comfortable in Sergey''s bed, and sleep for a few hours.
 				<<run $npcs.inc('A112','rel',1)>>
 				<<set $time.minutes += 240>>
-				<<if getvar("$pc.pcs_sleep") >= 60>>
+				<<if $pc.pcs_sleep >= 60>>
 					<<set $pc.pcs_sleep = 100>>
 				<<else>>
 					<<set $pc.pcs_sleep += 40>>
@@ -155,7 +155,7 @@
 <<if $location_var[$here][0] == 'hide'>>
 	<<set $menu_off = 1>>
 	<<if $location_var[$here][1] == 'serge_tv'>>
-		<<if getvar("$time.hour") < 7 or getvar("$time.hour") >= 23>>
+		<<if $time.hour < 7 or $time.hour >= 23>>
 			<p>It's too late, you would awaken Sergey if you turn the TV on!</p>
 			<<actCLA 'Get out of bed'>>
 				<<gt 'vasilyhome' 'sergey_room'>>
@@ -507,7 +507,7 @@
 		<!-- Boy A112 -->
 		<<arouse 'bj' 5 `['sub','rough','deepthroat']`>>
 		<<actCLA 'Continue'>>
-			<<if getvar("$pc.pcs_makeup") >= 2>>
+			<<if $pc.pcs_makeup >= 2>>
 				<<set $pc.pcs_makeup = 0>>
 
 			<</if>>

+ 11 - 11
sugarcube/src/autogenerated/unsorted/Serge_kuh.tw

@@ -360,9 +360,9 @@
 	<!-- !if nude, skirt/dress and panties, skirt/dress but no panties, pants and panties, pants but no panties-->
 	<<if $wardrobe.clothingworntype == 'nude'>>
 		<<gt 'Serge_kuh' 'izn1'>>
-	<<elseif getvar("$wardrobe.PCloSkirt") > 0 and $wardrobe.pantyworntype != 'none'>>
+	<<elseif $wardrobe.PCloSkirt > 0 and $wardrobe.pantyworntype != 'none'>>
 		<<set $rand_kuh_izdev = rand(1,3)>>
-	<<elseif getvar("$wardrobe.PCloSkirt") > 0>>
+	<<elseif $wardrobe.PCloSkirt > 0>>
 		<<set $rand_kuh_izdev = rand(4,7)>>
 	<<elseif $wardrobe.pantyworntype != 'none'>>
 		<<set $rand_kuh_izdev = rand(8,12)>>
@@ -518,14 +518,14 @@
 							With his cock still inside your pussy, he begins to finger your tight little asshole.
 							<<if getvar("$lubri") > 0>>
 								<<set $lubri -= 1>>
-								<<if getvar("$pc.agape") < 1>>
+								<<if $pc.agape < 1>>
 									<<set $pc.agape = 1>>
 
 								<</if>>
 								<p>"Uncle Sergey, wait!" you gasp. "I have lube, you should use some if you want to go there!"</p>
 								Sergey wordlessly takes the lube out of your pocket and smears some on his fingers before he penetrates you again. They go in a lot easier now.
 							<<elseif getvar("$lubri") == 0>>
-								<<if getvar("$pc.agape") < 2>>
+								<<if $pc.agape < 2>>
 									<<set $pc.agape = 2>>
 
 								<</if>>
@@ -799,7 +799,7 @@
 						<<arouse 'vaginal' 5 `['sub','rough']`>>
 						<<set $time.minutes -= 5>>
 						<<actCLA 'Continue'>>
-							<<if getvar("$pc.spanked") == 0>>
+							<<if $pc.spanked == 0>>
 								<<set $pc.spanked = 1>>
 
 							<</if>>
@@ -882,7 +882,7 @@
 							He guides his hard cock to your anus and rubs it over your tight sphincter a few times.
 							<<if getvar("$lubri") > 0>>
 								<<set $lubri -= 1>>
-								<<if getvar("$pc.agape") < 1>>
+								<<if $pc.agape < 1>>
 									<<set $pc.agape = 1>>
 
 								<</if>>
@@ -890,7 +890,7 @@
 								<p>"Really? Go get it for me", Sergey smiles benevolently, and squirts a generous amount onto his fingers when you offer him the tube. He spends a few minutes preparing your anus for his cock, making you feel surprisingly good in response. Anal really does feel nice, if your partner takes the time to prepare you first.</p>
 								Then he spreads some lube on his dick and guides it to your anus once more, pushing it past your sphincter relatively easily.
 							<<elseif getvar("$lubri") == 0>>
-								<<if getvar("$pc.agape") < 2>>
+								<<if $pc.agape < 2>>
 									<<set $pc.agape = 2>>
 
 								<</if>>
@@ -1333,7 +1333,7 @@
 		<p>You're no longer in control of your body, completely surrendering yourself to Sergey as long as he keeps this up. Sergey frowns a bit, you're not experiencing this as punishment at all!</p>
 		<<arouse 'vaginal' 10 `['sub','rough']`>>
 		<<actCLA 'Continue'>>
-			<<if getvar("$pc.agape") < 2>>
+			<<if $pc.agape < 2>>
 				<<set $pc.agape = 2>>
 
 			<</if>>
@@ -1421,7 +1421,7 @@
 		<<arouse 'vaginal' 10 `['sub','rough']`>>
 		<<set $time.minutes -= 10>>
 		<<actCLA 'Continue'>>
-			<<if getvar("$pc.agape") < 1>>
+			<<if $pc.agape < 1>>
 				<<set $pc.agape = 1>>
 
 			<</if>>
@@ -1452,7 +1452,7 @@
 				<<set $time.minutes -= 10>>
 				<<actCLA 'Continue'>>
 					<<set $time.minutes += 5>>
-					<<if getvar("$pc.pcs_hydra") >= 100>>
+					<<if $pc.pcs_hydra >= 100>>
 						<<set $pc.pcs_hydra -= 5>>
 					<<else>>
 						<<set $pc.pcs_hydra -= 10>>
@@ -1610,7 +1610,7 @@
 				He continues to fuck your throat for another minute or two, as if you're nothing more than a sex doll. By the time he's satisfied, thick strands of your saliva run down his shaft and down your chin, dripping onto the floor as you gasp for breath
 				<<arouse 'bj' 10 `['sub','rough','deepthroat']`>>
 				<<actCLA 'Continue'>>
-					<<if getvar("$pc.agape") < 1>>
+					<<if $pc.agape < 1>>
 						<<set $pc.agape = 1>>
 
 					<</if>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/StasQW.tw

@@ -19,7 +19,7 @@
 <<elseif getvar("$StasKafe") == 1>>
 	<<image "locations/city/citycenter/diner/kafe.jpg">>
 	<p>After the dance, you sit down again at the table. The waitress brings the bill over. You take a look at the bill and are slightly stunned by the total. Five thousand! Stas takes the bill out of your hands and says, "Do not worry, I'll pay."</p>
-	<<if getvar("$finances.cash") >= 5000>>
+	<<if $finances.cash >= 5000>>
 		<<actCLA 'No thank you, I`ll pay'>>
 			<<set $finances.cash -= 5000>>
 			<<image "locations/city/citycenter/diner/kafe.jpg">>

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