glife.qproj

@@ -55,6 +55,7 @@
 	<Folder name="Functions">
 		<Location name="tabhead"/>
 		<Location name="getrandom"/>
+    <Location name="willpoweract"/>
 		<Location name="indik"/>
 		<Location name="indiktab"/>
 		<Location name="shortgs"/>

locations/exhibitionistshop.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	if hypnoClothes = 1 and exhibitionQW = 4:
 		act 'Look for Ksenya': gt 'exhibitionistshop', 'ksenya_intro'
 	end
-	
+
 	if exhibitionQW = 5 and exhibitionQW['daystart'] ! daystart:
 		act 'Talk to Ksenya': gt 'exhibitionistshop', 'ksenya_chat'
 	end
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			gt 'exhibitionistshop', 'bras'
 		end
-		
+
 		act 'View bodysuits':
 			minut += 5
 			gt 'exhibitionistshop', 'bodysuit'
@@ -65,7 +65,6 @@ end
 if $ARGS[0] = 'ksenya_intro':
 	exhibitionQW = 5
 	exhibitionQW['daystart'] = daystart
-	gs 'willpower', 'misc', 'force', 'hard'
 	minut += 2
 	cla & *clr
 	gs 'stat'
@@ -86,21 +85,17 @@ if $ARGS[0] = 'ksenya_intro':
 		'"No reason, sorry. If you ever want to hang out, just stop by the shop and we can chat." She says as she walks you back to the front of the store.'
 		act 'Continue': gt 'exhibitionistshop', 'start'
 	end
-	if will_cost <= pcs_willpwr:
-		act 'Yes':
-			gs 'willpower', 'pay', 'hard'
-			cla & *clr
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya8.jpg"></center>'
-			'In response, you reply, "Yes?" I no longer like wearing underwear. "Are you referring to that?" you inquire.'
-			'"Is he doing hypnosis with you?" You nod your head. She informs you, "I think you may be in trouble if you continue seeing him."'
-			'"Nothing has happened to me that I am aware of." You assure her'
-			'"I trust you, but please let me know if anything happens. My father is not trustworthy, so please be careful. She walks you out of the shop after giving you a hug. If you ever want to talk to me, please come see me." She says as she walks you back to the front of the store.'
-			act 'Continue': gt 'exhibitionistshop', 'start'
-		end
-	else
-		act 'Yes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
+	gs 'willpower', 'misc', 'force', 'hard'
+	gs 'willpoweract', 'Yes', {
+		cla & *clr
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya8.jpg"></center>'
+		'In response, you reply, "Yes?" I no longer like wearing underwear. "Are you referring to that?" you inquire.'
+		'"Is he doing hypnosis with you?" You nod your head. She informs you, "I think you may be in trouble if you continue seeing him."'
+		'"Nothing has happened to me that I am aware of." You assure her'
+		'"I trust you, but please let me know if anything happens. My father is not trustworthy, so please be careful. She walks you out of the shop after giving you a hug. If you ever want to talk to me, please come see me." She says as she walks you back to the front of the store.'
+		act 'Continue': gt 'exhibitionistshop', 'start'
+	}
 end
 
 if $ARGS[0] = 'ksenya_chat':
@@ -245,7 +240,7 @@ end
 
 if $ARGS[0] = 'panties2':
 	cla
-	
+
 	if salacious_panties[i] ! 0:
 		msg 'You already own these panties.'
 		gt 'exhibitionistshop', 'panties'
@@ -292,7 +287,7 @@ end
 
 if $ARGS[0] = 'bras2':
 	cla
-	
+
 	if salacious_bras[i] ! 0:
 		msg 'You already own these bras.'
 		gt 'exhibitionistshop', 'bras'

locations/pushkin_sq.qsrc

@@ -9,7 +9,7 @@ gs'stat'
 
 '<center><B>Okhlopkov Square</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/liames.jpg" ></center>'
-'Okhlopkov Square serves as the main intersection of several smaller streets.'  
+'Okhlopkov Square serves as the main intersection of several smaller streets.'
 'There are many small cafes and shops also a flourishing nightlife and entertainment activities.'
 
 'Another street runs straight back to the <a href="exec:minut += 5 & gt ''pushkin''">Pushkin Town Center</a>.'
@@ -57,7 +57,7 @@ if func('homes_properties', 'is_property_of_status', 'rented', 'old_town_apartme
 
 act 'Walk to the Town Center (0:05)':minut += 5 & gt 'pushkin'
 
-if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
+if hour >= 8 and hour <= 17 and exhibitionQW >= 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
 act 'wait':gs 'obj_din', 'wait'
 
@@ -131,7 +131,7 @@ elseif hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 		'The girls and boys at the local hangout happily greet you.'
 
 		act'Leave': gt 'pushkin_sq'
-		
+
 		if $pantyworntype = 'none' and sttan = 0:
 			cla
 			'"Hey guys, <<$pcs_nickname>> is going commando," one of the boys says.'

locations/therapist.qsrc

@@ -177,7 +177,7 @@ if $ARGS[0] = 'therapyOptions':
 					minut += 30
 					pcs_childtrauma -= 1
 					gs 'stat'
-						'You talk about your traumatic issues, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you uncomfortable, it somehow makes you feel better about yourself.'
+					'You talk about your traumatic issues, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you uncomfortable, it somehow makes you feel better about yourself.'
 					if pcs_childtrauma = 0:
 						'You are able to give the events a place in your life, and you are finally ready to move on.'
 						npc_rel['A217'] = 20
@@ -298,22 +298,17 @@ $therapyMethod = {
 		will_cost += (hypnoSchedule * 10)
 		will_cost += (hypnoStage * 10)
 		will_cost += hypnoTime * 3
-		if will_cost <= pcs_willpwr:
-			act 'Just talk (<<will_cost>> Willpower)':
-				cls
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
-				minut += 30
-				pcs_mood += rand(30,60)
-				gs 'stat'
-				'<<$therapyTalkMessage>>, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
-				'"Please, visit me again if you have any further problems, I will be glad to help!" he says as he escorts you out the door.'
-				act 'Leave':gt $loc
-			end
-		else
-			act 'Just talk (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
+		gs 'willpoweract', 'Just talk', {
+			cls
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
+			minut += 30
+			pcs_mood += rand(30,60)
+			gs 'stat'
+			'<<$therapyTalkMessage>>, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
+			'"Please, visit me again if you have any further problems, I will be glad to help!" he says as he escorts you out the door.'
+			act 'Leave':gt $loc
+		}
 	end
 	if succubusflag['therapist'] = 0:
 		act 'Hypnotherapy':gt 'therapist', 'hypno'
@@ -483,8 +478,9 @@ if $ARGS[0] = 'hypno':
 end
 
 if $ARGS[0] = 'hypno2':
-	*clr & cla
+	!!*clr & cla
 	$waitImg
+	'<font color="<<$hypnocolour>>">'
 	gs 'therapist', 'hypno3'
 end
 
@@ -553,16 +549,11 @@ if $ARGS[0] = 'firstHypnoStage':
 	'"To have your therapy work effectively, you will need to remove your clothing. All of it. This is a perfectly normal thing to do in a clinic. Your clothes will slow things down.'
 	gs 'willpower', 'misc', 'resist', 'easy'
 	will_cost = will_cost + (hypnoTimesResistedStage * 10)
-	if will_cost <= pcs_willpwr:
-		act 'Resist (<<will_cost>> Willpower)':
-			hypnoStripped = 0
-			gs 'willpower', 'pay', 'resist'
-			gs 'stat'
-			gt 'therapist', 'hypnoResist', 'remove your clothing'
-		end
-	else
-		act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
+	gs 'willpoweract', 'Resist', {
+		hypnoStripped = 0
+		gs 'stat'
+		gt 'therapist', 'hypnoResist', 'remove your clothing'
+	}
 	act 'Strip naked':
 		*clr & cla
 		hypnoStripped = 1
@@ -762,15 +753,10 @@ if $ARGS[0] = 'secondHypnoStage':
 						end
 						gs 'willpower', 'misc', 'resist', 'easy'
 						will_cost = will_cost + (hypnoTimesResistedStage * 10)
-						if will_cost <= pcs_willpwr:
-							act 'Resist (<<will_cost>> Willpower)':
-								gs 'willpower', 'pay', 'resist'
-								gs 'stat'
-								gt 'therapist', 'hypnoResist', 'kiss him'
-							end
-						else
-							act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
+						gs 'willpoweract', 'Resist', {
+							gs 'stat'
+							gt 'therapist', 'hypnoResist', 'kiss him'
+						}
 
 						act 'Kiss him':
 							*clr & cla
@@ -828,15 +814,10 @@ if $ARGS[0] = 'thirdHypnoStage':
 						end
 						gs 'willpower', 'misc', 'resist', 'easy'
 						will_cost = will_cost + (hypnoTimesResistedStage * 10)
-						if will_cost <= pcs_willpwr:
-							act 'Resist (<<will_cost>> Willpower)':
-								gs 'willpower', 'pay', 'resist'
-								gs 'stat'
-								gt 'therapist', 'hypnoResist', 'suck his cock'
-							end
-						else
-							act 'Resist (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
+						gs 'willpoweract', 'Resist', {
+							gs 'stat'
+							gt 'therapist', 'hypnoResist', 'suck his cock'
+						}
 
 						act 'Kneel and suck his cock':
 							hypnoTimesResistedStage = 0
@@ -990,7 +971,7 @@ if $ARGS[0] = 'hypnoResist':
 	hypnoTimesResistedStage += 1
 
 	if hypnoStripped = 1:
-		''
+		'<br/>'
 		'Dress now, <i>Cunt</i>"'
 		act 'Dress':
 			gt 'therapist', 'hypnoDress'
@@ -1655,18 +1636,12 @@ if $ARGS[0] = 'hypnoRandom':
 					end
 
 					gs 'willpower', 'misc', 'resist', 'hard'
-
-					if will_cost <= pcs_willpwr:
-						act 'No, master':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-							gs 'willpower', 'pay', 'hard'
-							'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
-							act 'Continue':	gt 'therapist', 'hypnoEnd'
-						end
-					else
-						act 'No, master (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
+					gs 'willpoweract', 'No, master', {
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+						'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
+						act 'Continue': gt 'therapist', 'hypnoEnd'
+					}
 				end
 			elseif therapist_key = 1:
 				'You finish getting dressed and the doctor asks you something that you think you have heard before, "I want you to show up to this room every Saturday night. There you will find me, waiting for you. Once a week, you will be my wife. You will do whatever I ask of you and you will do it without question. This will all be automatic for you. You will not be under hypnosis for this and you will do it because you WANT to do it" he says. "Soon, you will be my wife for real and when that day comes, you must know what is expected of you, Understand?" he states.'
@@ -1680,18 +1655,12 @@ if $ARGS[0] = 'hypnoRandom':
 				end
 
 				gs 'willpower', 'misc', 'resist', 'hard'
-
-				if will_cost <= pcs_willpwr:
-					act 'No, master':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-						gs 'willpower', 'pay', 'hard'
-						'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
-						act 'Continue': gt 'therapist', 'hypnoEnd'
-					end
-				else
-					act 'No, master (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
+				gs 'willpoweract', 'No, master', {
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+					'"Thats a pitty, Well, I will ask you again in time, lets hope you say yes then" he says and turns to his desk to write something down before standing up to show you to the door, giving you a kiss and groping as you leave.'
+					act 'Continue': gt 'therapist', 'hypnoEnd'
+				}
 			else
 				act 'Continue':	gt 'therapist', 'hypnoEnd'
 			end

locations/willpoweract.qsrc

@@ -2,26 +2,27 @@
 !! $ARGS0 is a textual description of the action
 !! $ARGS1 is executed dynamic code of the action
 
-$autoPayCost = {
-	if $willpowerargs[0] ! 'pay':
-		if will_cost < 1 and cheatWillpower = 0: will_cost = 1
-		pcs_willpwr -= will_cost
-		if $willpowerargs[1] = 'force':
-			if willpowermax < 150:
-				will_counter += 10
-			end
-			if will_enforced < 20: will_enforced += 1
-		elseif $willpowerargs[1] ! 'chore':
-			if willpowermax < 150:
-				will_counter += 1
+$actionCode = $ARGS[1]
+
+if will_cost <= pcs_willpwr:
+	act '<<$ARGS[0]>> (<<will_cost>> Willpower)':
+		if $willpowerargs[0] ! 'pay':
+			if will_cost < 1 and cheatWillpower = 0: will_cost = 1
+			pcs_willpwr -= will_cost
+			if $willpowerargs[1] = 'force':
+				if willpowermax < 150:
+					will_counter += 10
+				end
+				if will_enforced < 20: will_enforced += 1
+			elseif $willpowerargs[1] ! 'chore':
+				if willpowermax < 150:
+					will_counter += 1
+				end
 			end
+			if will_counter >= 20: will_counter = 0 & willpowermax += 1
 		end
-		if will_counter >= 20: will_counter = 0 & willpowermax += 1
+		dynamic $actionCode
 	end
-}
-
-if will_cost <= pcs_willpwr:
-	act '<<$ARGS[0]>> (<<will_cost>> Willpower)': dynamic $autoPayCost & dynamic $ARGS[1]
 else
 	act '<<$ARGS[0]>> (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 end