Browse Source

[edit] Got rid of some of the old variables for Natasha Belova. It should all be based off of NatashaQW where needed. Some of the variables didn't do anything in the first place.

CroWke 4 years ago
parent
commit
d612edc38b

+ 2 - 5
locations/Snpc.qsrc

@@ -543,12 +543,10 @@ if numnpc = 16:
 			end
 		end
 	end
-	if natotrab > 0 and NatDolg > 0:
+	if NatashaQW >= 8 and NatDolg > 0:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5
-			natotrab += 1
-			natsub += 1
 			gs 'stat'
 			'<center><b><font color="maroon">Girls Bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
@@ -559,11 +557,10 @@ if numnpc = 16:
 				*clr & cla
 				minut += 15
 				NatDolg -= 500
-				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & guy += 1
+				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & girl += 1
 				lesbian += 1
 				pcs_horny = 0
 				orgasm += 1
-				natlesb += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/school/natschoolowe.jpg"></center>'
 				'Her tongue starts to lick your clit, you bite your lip to try and keep from moaning to loudly. You lean back and relax, as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if your not mistaken she is starting to like it a lot.'

+ 1 - 3
locations/gschool_chats2.qsrc

@@ -171,12 +171,11 @@ if $ARGS[0] = 'natasha':
 			'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
-	elseif NatashaQW > 6 and natotrab > 0 and NatDolg > 0:
+	elseif NatashaQW >= 8 and NatDolg > 0:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5
 			natotrab += 1
-			natsub += 1
 			gs 'stat'
 			'<center><b><font color="maroon">Girls Bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
@@ -188,7 +187,6 @@ if $ARGS[0] = 'natasha':
 				*clr & cla
 				NatDolg -= 500
 				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & girl += 1
-				natlesb += 1
 				$orgasm_or = 'yes'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/school/natschoolowe.jpg"></center>'
 				'Her tongue starts to lick your clit, you bite your lip to try and keep from moaning too loudly. You lean back and relax, as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if your not mistaken she is starting to like it a lot.'

+ 39 - 47
locations/natbelapt.qsrc

@@ -509,7 +509,7 @@ if $ARGS[0] = 'natroom':
 					act 'Make her lick your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			if NatashaQW >= 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
+			if NatashaQW >= 8 and hour >= 18 and hour < 21 and natfuckday < daystart and kolkawantsnat = 1:
 				gs 'willpower', 'sex', 'force', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Make her fuck Kolka (<<will_cost>> Willpower)':
@@ -522,7 +522,7 @@ if $ARGS[0] = 'natroom':
 				end
 			end
 !! nutluck pulled this for now
-			!if NatashaQW > 9 and hour >= 17 and hour < 21 and natsub >= 6 and natfuckday < daystart and natsub >= 10 and pcs_dom >=20 and strapon = 1 and JuliaNatSexProposed = 1:
+			!if NatashaQW > 9 and hour >= 17 and hour < 21 and natfuckday < daystart and pcs_dom >=20 and strapon = 1 and JuliaNatSexProposed = 1:
 			!	act 'Fuck her with Julia': gs 'natbelapt', 'Nat_Julia_3some'
 			!end
 			if NatashaQW >= 9 and olufirst = 3 and oluuosegunday ! daystart:
@@ -721,8 +721,6 @@ if $ARGS[0] = 'make_her_do_homework':
 	minut += 60
 	menu_off = 1
 	lernHome = 0
-	natsub += 1
-	natotrab += 1
 	NatashaHW += 1
 	if NatashaHW = 3: NatashaQW = 4
 	if NatashaQW = 2: NatashaQW = 3
@@ -943,8 +941,6 @@ end
 if $ARGS[0] = 'lick_feet':
 	*clr & cla
 	minut += 5
-	natotrab += 1
-	natsub += 1
 	if NatashaQW = 5: NatashaQW = 6
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/lickfeet1.jpg"></center>'
@@ -953,7 +949,6 @@ if $ARGS[0] = 'lick_feet':
 	act 'Let her suffer for a bit':
 		*clr & cla
 		minut += 5
-		natsub += 1
 		NatDolg -= 500
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/lickfeet1.jpg"></center>'
@@ -968,7 +963,6 @@ if $ARGS[0] = 'lick_feet':
 	act 'Lie back and enjoy':
 		*clr & cla
 		minut += 5
-		natsub += 1
 		NatDolg -= 500
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/lickfeet2.jpg"></center>'
 		'You lie back and gently caress your pussy while you relish the feeling of her tongue on your feet. She alternates between licking your feet in long strokes of her tongue and gently sucking on your toes.'
@@ -986,8 +980,6 @@ end
 if $ARGS[0] = 'spit_face':
 	*clr & cla
 	minut += 5
-	natotrab += 1
-	natsub += 1
 	if NatashaQW = 6: NatashaQW = 7
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natknee.jpg"></center>'
@@ -995,7 +987,6 @@ if $ARGS[0] = 'spit_face':
 	act 'Spit in her face':
 		*clr & cla
 		minut += 5
-		natsub += 1
 		NatDolg -= 500
 		!!natknee
 		gs 'stat'
@@ -1011,7 +1002,6 @@ end
 if $ARGS[0] = 'lick_pussy':
 	*clr & cla
 	minut += 5
-	natsub += 1
 	NatDolg -= 500
 	if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & girl += 1
 	lesbian += 1
@@ -1019,7 +1009,19 @@ if $ARGS[0] = 'lick_pussy':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natlick.jpg"></center>'
 	'You force Natasha to undress you and then watch as she undresses herself before she returns to kneeling at your feet. You pull her face into your pussy and snarl at her, "Now lick!". Natasha fearfully starts to work.'
-	if natsub < 10:
+	
+	!! You need to train her a bit before she does a good job
+	if nattraining > 3 or NatashaQW = 8:
+		killvar 'nattraining'
+		if NatashaQW = 7: NatashaQW = 8
+		act 'Lie down and open your legs':
+			gt 'natbelapt', 'openlegs'
+		end
+		act 'Straddle her face':
+			gt 'natbelapt', 'straddleface'
+		end
+	else
+		nattraining += 1
 		'This useless cunt can''t even find your clitoris and only sluggishly works her mouth on your pussy without any enthusiasm.'
 		if NatDolg >= 500:
 			gs 'willpower', 'pee', 'force'
@@ -1029,7 +1031,6 @@ if $ARGS[0] = 'lick_pussy':
 					gs 'willpower', 'pay', 'force'
 					gs 'arousal', 'pee_give', 5, 'dom', 'lesbian'
 					gs 'arousal', 'end'
-					natsub += 1
 					NatDolg -= 500
 					natpee += 1
 					!!natknee
@@ -1047,7 +1048,6 @@ if $ARGS[0] = 'lick_pussy':
 			minut += 5
 			pcs_horny -= 10
 			money -= 50
-			natsub += 1
 			gs 'stat'
 !!ImageNeededPlaceholder
 			'<center><img <<$set_imgh>> src="images/shared/food/icecreem.jpg"></center>'
@@ -1055,14 +1055,6 @@ if $ARGS[0] = 'lick_pussy':
 			'"You are hopeless. Here, go buy an ice cream cone and practice licking. You''d better improve by next time, bitch." You throw a 50 ruble note at her as she stops licking you.'
 			act 'Continue': gt 'natbelapt', 'natroom'
 		end
-	else
-		if NatashaQW = 7: NatashaQW = 8
-		act 'Lie down and open your legs':
-			gt 'natbelapt', 'openlegs'
-		end
-		act 'Straddle her face':
-			gt 'natbelapt', 'straddleface'
-		end
 	end
 end
 
@@ -1132,7 +1124,7 @@ if $ARGS[0] = 'chat':
 				*nl
 				act 'Continue':gt 'natbelapt', 'natknows'
 			end
-		elseif pregchem > 0 and knowpreg = 1 and natsub = 0:
+		elseif NatashaQW <= 5 and pregchem > 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
@@ -1140,7 +1132,7 @@ if $ARGS[0] = 'chat':
 				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregchem > 0 and knowpreg = 1 and natsub > 0:
+		elseif pregchem > 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
@@ -1175,7 +1167,7 @@ if $ARGS[0] = 'chat':
 				*nl
 				act 'Next':gt 'natbelapt', 'natknows1'
 			end
-		elseif pregchem > 0 and natsub = 0 and knowpreg = 1:
+		elseif NatashaQW <= 5 and pregchem > 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				*nl
@@ -1183,7 +1175,7 @@ if $ARGS[0] = 'chat':
 				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregchem > 0 and natsub > 0 and knowpreg = 1:
+		elseif pregchem > 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				*nl
@@ -1200,7 +1192,26 @@ if $ARGS[0] = 'chat':
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 		'You talk about the price of clothes and cosmetics for a while. Natasha seems to know a lot about the latest fashion, even though she can''t afford it.'
-		if NatDolg <= 0 and money >= 2000 and natsub > 0:
+		if NatashaQW = 1 and NatBelBestFrend >= 3 and NatDolg = 0 and money >= 5000:
+			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
+
+			act 'Don''t give her the money': gt 'natbelapt', 'chat'
+			act 'Lend Natasha the 5000 <b>₽</b>':
+				*clr & cla
+				if NatashaQW = 1: NatashaQW = 2
+				minut += 15
+				NatDolg = 5000
+				money -= 5000
+				NatDolgDay = daystart+30
+				NatBelBestFrend += 1
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+				'You get your purse and give Natasha the money. Natasha is delighted and says that she will pay it back in a month.'
+
+				act 'Keep talking': gt 'natbelapt', 'chat'
+				act 'Stop talking': gt 'natbelapt', 'natroom'
+			end
+		elseif NatashaQW >= 2 and NatDolg = 0 and money >= 2000:
 			'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me some money, please? I swear I''ll pay you back before you even miss it."'
 			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			act 'Give her the money (2000 <b>₽</b>)':
@@ -1237,25 +1248,6 @@ if $ARGS[0] = 'chat':
 					act 'Keep talking': gt 'natbelapt', 'chat'
 				end
 			end
-		elseif NatBelBestFrend >= 3 and NatDolg = 0 and money >= 5000 and natsub = 0:
-			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
-
-			act 'Don''t give her the money': gt 'natbelapt', 'chat'
-			act 'Lend Natasha the 5000 <b>₽</b>':
-				*clr & cla
-				if NatashaQW = 1: NatashaQW = 2
-				minut += 15
-				NatDolg = 5000
-				money -= 5000
-				NatDolgDay = daystart+30
-				NatBelBestFrend += 1
-				gs 'stat'
-				'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-				'You get your purse and give Natasha the money. Natasha is delighted and says that she will pay it back in a month.'
-
-				act 'Keep talking': gt 'natbelapt', 'chat'
-				act 'Stop talking': gt 'natbelapt', 'natroom'
-			end
 		elseif NatDolg > 0 and NatDolgDay > daystart:
 			'Natasha promises you to repay the <<NatDolg>><b>₽</b> in <<NatDolgDay-daystart>> days.'
 			act 'Stop talking': gt 'natbelapt', 'natroom'

+ 0 - 1
locations/natkolEv.qsrc

@@ -63,7 +63,6 @@ if $ARGS[0] = 'kolkabj':
 		end
 		act 'Make her blow Kolka':
 			*clr & cla
-			natsub += 1
 			NatDolg -= 500
 			natbj += 1
 			natbro += 1

+ 0 - 2
locations/natpimp.qsrc

@@ -10,8 +10,6 @@ if $ARGS[0] = 'go_see_olu':
 		*clr & cla
 		NatDolg -= 500
 		minut += 5
-		natsub += 1
-		natfuck += 1
 		if NatashaQW = 9: NatashaQW = 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'

+ 1 - 1
locations/postdeliveries.qsrc

@@ -663,7 +663,7 @@ if $ARGS[0] = '12':
 			'"I hope this doesn''t mean you ignore your debt to me?" you ask her sternly.'
 			'She bites her lip and shakes her head: "I... I won''t, <<$pcs_nickname>>. I''ll find a way to repay you."'
 			'"Good," you give her a satisfied nod, and leave her apartment.'
-			if natsub > 0: 'You smile evilly as you walk down the stairs, replaying her words over and over in your mind. "I''ll find a way to repay you!" she said... you can think of several ways! Whether she''ll like them is a different matter...'
+			if NatashaQW >= 5: 'You smile evilly as you walk down the stairs, replaying her words over and over in your mind. "I''ll find a way to repay you!" she said... you can think of several ways! Whether she''ll like them is a different matter...'
 			act 'Continue your round':gt 'postdeliveries', 'resume'
 		end
 	end

+ 5 - 0
locations/saveupdater.qsrc

@@ -614,6 +614,11 @@ if puspic ! 0: killvar 'puspic'
 
 if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
 
+!! Replacing some of the natasha variables with NatashaQW levels.
+killvar 'natsub'
+killvar 'natotrab'
+killvar 'natlesb'
+killvar 'natfuck'
 
 --- saveupdater ---------------------------------