1
0
Ver Fonte

[fixed] Undone all the pav_slut code that was reverted in error by HG

Kevin_Smarts há 2 anos atrás
pai
commit
e7bc5db30a
1 ficheiros alterados com 24 adições e 24 exclusões
  1. 24 24
      locations/gdksex.qsrc

+ 24 - 24
locations/gdksex.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'outside':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	'You leave the disco with <<$npc_firstname[$npclastsaved]>> and walk for a few minutes, until he leads you into a quiet garden area.'
 
-	if (gdk_nice_guy = 1 and pav_slut < 70) or (gdk_nice_guy = 0 and pav_slut < 30):
+	if (gdk_nice_guy = 1 and fame['pav_slut'] < 70) or (gdk_nice_guy = 0 and fame['pav_slut'] < 30):
 		'He pulls out a six pack and crisps, offering you a beer, while you both sit down on a fallen tree.'
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -84,7 +84,7 @@ if $ARGS[0] = 'outside':
 				'<<$npc_firstname[$npclastsaved]>> scoots over until he''s right next to you on the fallen tree, and closes his arms around you. He pulls you in and kisses your lips passionately, making your heart flutter. Wow, he''s a good kisser!'
 				'Then you feel his hands on your chest.'
 
-				if pav_slut < 50:
+				if fame['pav_slut'] < 50:
 					gs 'willpower', 'sex', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Softly whisper, asking him to stop (<<will_cost>> Willpower)':
@@ -133,7 +133,7 @@ if $ARGS[0] = 'outside':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/tits.jpg"></center>'
 								'<<$npc_firstname[$npclastsaved]>>''s head slumps for just a moment and his movements slow down, but he''s not quite willing to let go of your boobs just yet.'
 
-								if pav_slut < 150:
+								if fame['pav_slut'] < 150:
 									gs 'willpower', 'bj', 'resist'
 									if will_cost <= pcs_willpwr:
 										act 'Go back to the disco':
@@ -170,9 +170,9 @@ if $ARGS[0] = 'outside':
 					gs 'boyStat', $bmNane[Tboynum]
 
 					if gdk_nice_guy = 1:
-						pav_sex += rand(0,2)
+						gs 'fame', 'pav', 'sex', rand(0,2)
 					elseif gdk_nice_guy = 0:
-						pav_sex += rand(2,4)
+						gs 'fame', 'pav', 'sex', rand(2,4)
 					end
 					bmGossip[Tboynum] = 1
 
@@ -210,7 +210,7 @@ if $ARGS[0] = 'outside':
 					elseif deystrand = 1 or pcs_apprnc < randvnesh:
 						'<<$npc_firstname[$npclastsaved]>> scoots over until he''s right next to you, and kisses you on the lips.'
 
-						if pav_slut < 50:
+						if fame['pav_slut'] < 50:
 							gs 'willpower', 'mast', 'resist'
 							if will_cost <= pcs_willpwr:
 								act 'Go back to the disco (<<will_cost>> Willpower)':
@@ -231,7 +231,7 @@ if $ARGS[0] = 'outside':
 					gs 'stat'
 					'<<$npc_firstname[$npclastsaved]>> scoots over until he''s right next to you, and kisses you on the lips.'
 
-					if pav_slut < 50:
+					if fame['pav_slut'] < 50:
 						gs 'willpower', 'mast', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Go back to the disco (<<will_cost>> Willpower)':
@@ -249,7 +249,7 @@ if $ARGS[0] = 'outside':
 				end
 			end
 		end
-	elseif (gdk_nice_guy = 1 and pav_slut >= 70 and pav_slut < 130) or (gdk_nice_guy = 0 and pav_slut >= 30 and pav_slut < 70):
+	elseif (gdk_nice_guy = 1 and fame['pav_slut'] >= 70 and fame['pav_slut'] < 130) or (gdk_nice_guy = 0 and fame['pav_slut'] >= 30 and fame['pav_slut'] < 70):
 		gs 'drugs', 'alcohol', 'beer'
 		minut += 15
 		gs 'stat'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'outside':
 
 		gs 'gdksex', 'decline', 70
 		gs 'gdksex', 'kissing'
-	elseif (gdk_nice_guy = 1 and pav_slut >= 130 and pav_slut < 200) or (gdk_nice_guy = 0 and pav_slut >= 70 and pav_slut < 130):
+	elseif (gdk_nice_guy = 1 and fame['pav_slut'] >= 130 and fame['pav_slut'] < 200) or (gdk_nice_guy = 0 and fame['pav_slut'] >= 70 and fame['pav_slut'] < 130):
 		if rand(0,3) = 0:
 			'<<$npc_firstname[$npclastsaved]>> says: "<<$pcs_nickname>>, I heard you''re pretty good with your mouth. Come on, let''s have some fun!"'
 			'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
@@ -271,14 +271,14 @@ if $ARGS[0] = 'outside':
 		gs 'gdksex', 'decline', 130
 		gs 'gdksex', 'handjob'
 		act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
-	elseif (gdk_nice_guy = 1 and pav_slut >= 200 and pav_slut < 250) or (gdk_nice_guy = 0 and pav_slut >= 130 and pav_slut < 150):
+	elseif (gdk_nice_guy = 1 and fame['pav_slut'] >= 200 and fame['pav_slut'] < 250) or (gdk_nice_guy = 0 and fame['pav_slut'] >= 130 and fame['pav_slut'] < 150):
 		'<<$npc_firstname[$npclastsaved]>> says: "<<$pcs_nickname>>, my buddies told me you''re a <<$gnikname>>. I want to have some fun with you too!"'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 
 		gs 'gdksex', 'decline', 200
 		gs 'gdksex', 'handjob'
 		act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
-	elseif (gdk_nice_guy = 1 and pav_slut >= 250) or (gdk_nice_guy = 0 and pav_slut >= 150):
+	elseif (gdk_nice_guy = 1 and fame['pav_slut'] >= 250) or (gdk_nice_guy = 0 and fame['pav_slut'] >= 150):
 		gs 'boymass', 'B'
 		'<<$npc_firstname[$npclastsaved]>> says: "<<$pcs_nickname>>, let''s cut the crap: the whole town knows you''re a <<$gnikname>>. I want a blowjob, here''s 100 <b>₽</b>."'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
@@ -287,18 +287,18 @@ if $ARGS[0] = 'outside':
 		act 'Squat down before him': gt 'gdksex', 'blowjob', 'paid'
 	end
 
-	if (gdk_nice_guy = 1 and pav_slut >= 130) or (gdk_nice_guy = 0 and pav_slut >= 70):
+	if (gdk_nice_guy = 1 and fame['pav_slut'] >= 130) or (gdk_nice_guy = 0 and fame['pav_slut'] >= 70):
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Swear at him (<<will_cost>> Willpower)':
 				cla
 				minut += 3
 				if gdk_nice_guy = 1:
-					if pav_sex > 10: gs 'fame', 'pav', 'sex', rand(-2,-4)
-					if pav_prostitute > 10: gs 'fame', 'pav', 'prostitute', rand(-2,-4)
+					if fame['pav_sex'] > 10: gs 'fame', 'pav', 'sex', rand(-2,-4)
+					if fame['pav_prostitute'] > 10: gs 'fame', 'pav', 'prostitute', rand(-2,-4)
 				elseif gdk_nice_guy = 0:
-					if pav_sex > 10: gs 'fame', 'pav', 'sex', rand(0,-2)
-					if pav_prostitute > 10: gs 'fame', 'pav', 'prostitute', rand(0,-2)
+					if fame['pav_sex'] > 10: gs 'fame', 'pav', 'sex', rand(0,-2)
+					if fame['pav_prostitute'] > 10: gs 'fame', 'pav', 'prostitute', rand(0,-2)
 				end
 				gs 'willpower', 'sex', 'resist', 'hard'
 				gs 'willpower', 'pay', 'self'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'outside':
 			act 'Sweat at him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		if ((gdk_nice_guy = 1 and pav_slut < 250) or (gdk_nice_guy = 0 and pav_slut < 150)) and (slutty > 0):
+		if ((gdk_nice_guy = 1 and fame['pav_slut'] < 250) or (gdk_nice_guy = 0 and fame['pav_slut'] < 150)) and (slutty > 0):
 			act 'Tell him you''ll do it for money':
 				cla
 				minut += 3
@@ -340,7 +340,7 @@ if $ARGS[0] = 'outside':
 end
 
 if $ARGS[0] = 'decline':
-	if pav_slut < $ARGS[1]:
+	if fame['pav_slut'] < $ARGS[1]:
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Decline and leave (<<will_cost>> Willpower)':
@@ -372,7 +372,7 @@ if $ARGS[0] = 'kissing':
 		'You lean into him and reciprocate the kiss. Slowly at first, but soon the two of you kiss each other more and more passionately. <<$npc_firstname[$npclastsaved]>> sure knows how to make your heart flutter. Wow, he''s a good kisser!'
 		'Then you feel his hands on your chest.'
 
-		if pav_slut < 100:
+		if fame['pav_slut'] < 100:
 			gs 'willpower', 'mast', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Go back to the disco (<<will_cost>> Willpower)':
@@ -414,7 +414,7 @@ if $ARGS[0] = 'kissing':
 					act'Go to his place':gt'hookup', 'start'
 				end
 			else
-				if pav_slut < 150:
+				if fame['pav_slut'] < 150:
 					gs 'willpower', 'mast', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Go back to the disco (<<will_cost>> Willpower)':
@@ -428,7 +428,7 @@ if $ARGS[0] = 'kissing':
 					end
 				end
 
-				if pav_slut < 250:
+				if fame['pav_slut'] < 250:
 					act 'Let him finger you':
 						*clr & cla
 						gs'arousal','vaginal_finger', 3
@@ -436,7 +436,7 @@ if $ARGS[0] = 'kissing':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/petting.jpg"></center>'
 						'As soon as you pull your hand away from his groin, <<$npc_firstname[$npclastsaved]>> slips his hand underneath your clothes and rubs two fingers against your snatch. You were already fairly turned on, and softly moan in embarrassment when he slides his finger back and forth over your wet pussy lips.'
 
-						if pav_slut < 200:
+						if fame['pav_slut'] < 200:
 							gs 'willpower', 'mast', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
 								act 'Remove his hands and walk away (<<will_cost>> Willpower)':
@@ -601,7 +601,7 @@ if $ARGS[0] = 'kissing':
 					'You kiss <<$npc_firstname[$npclastsaved]>> again while you begin to pet his cock through his pants, feeling the outline of it very clearly through the fabric.'
 					'"Mmmm... do you have something for me?" you ask him sweetly, and he lets out a needy groan.'
 
-					if pav_slut < 150:
+					if fame['pav_slut'] < 150:
 						gs 'willpower', 'mast', 'resist'
 						if will_cost <= pcs_willpwr:
 							act 'Go back to the disco (<<will_cost>> Willpower)':
@@ -623,7 +623,7 @@ if $ARGS[0] = 'kissing':
 						'<center><img <<$set_imgh>> src="images/shared/sex/grab/cock2.jpg"></center>'
 						'You slide your hand into his pants and caress his hard cock. After a few moments of teasing, you pull his pants down and let his cock spring free.'
 
-						if pav_slut < 150:
+						if fame['pav_slut'] < 150:
 							gs 'willpower', 'mast', 'resist'
 							if will_cost <= pcs_willpwr:
 								act 'Go back to the disco (<<will_cost>> Willpower)':