Merge remote-tracking branch 'Anya/master'

locations/natbel_cp_1.qsrc

@@ -32,12 +32,14 @@ NatbelQW['panty_stuff_day'] is set to daystart each morning you stuff Natasha''s
 
 
 if $ARGS[0] = 'nat_debt_timer':
-	*nl
-	NatbelQW['DebtTimeLeft'] = NatbelQW['DebtDay'] - daystart
-	if NatbelQW['DebtTimeLeft'] > 0:
-		'Natasha has promised to pay you back in <<NatbelQW[''DebtTimeLeft'']>> day(s).'
-	else
-		'Natasha promised to pay you back by now, maybe you should talk to her about it.'
+	if NatbelQW['QWstage'] >= 2 and NatbelQW['Debt'] > 0:
+		*nl
+		NatbelQW['DebtTimeLeft'] = NatbelQW['DebtDay'] - daystart
+		if NatbelQW['DebtTimeLeft'] > 0:
+			'Natasha has promised to pay you back in <<NatbelQW[''DebtTimeLeft'']>> day(s).'
+		else
+			'Natasha promised to pay you back by now, maybe you should talk to her about it.'
+		end
 	end
 end
 
@@ -117,27 +119,31 @@ end
 
 ! Only if Natasha owes you money
 if $ARGS[0] = 'make_her_do_homework':
-	*clr & cla
-	minut += 60
-	menu_off = 1
-	gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A16'
-	NatbelQW['homework'] += 1
-	if NatbelQW['homework'] >= 3 and NatbelQW['QWstage'] = 3: NatbelQW['QWstage'] = 4
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
-	if NatbelQW['QWstage'] = 3:
-		'"Well Natasha, since I won''t be seeing my money anytime soon I think it''s best for now if you repay me by doing my homework for me." You tell her in a threatening voice.'
-	elseif NatbelQW['QWstage'] = 4:
-		'"Well Natasha, on top of doing my homework for me, you''ll be carrying my books to school in the morning from now on." You tell her in a threatening voice.'
-	end
-	'Natasha sighs with a resigned look as she nods meekly and starts working on your homework as well as hers.'
-	if NatbelQW['QWstage'] > 5:
-		act 'Continue': gt 'natbel_cp_1', 'hwundress'
-	else
-		'You relax on her bed and start daydreaming for a while.'
-		'You are woken out of your daydream by Natasha saying: "It''s done <<$pcs_nickname>>."'
-		'"Good, let me have a look at it."'
-		act 'Take your finished homework': gt 'natbelapt', 'natroom'
+	if NatbelQW['QWstage'] >= 2 and lernHome > 0 and NatbelQW['Debt'] > 0:
+		act 'Make her do your homework':
+			*clr & cla
+			minut += 60
+			menu_off = 1
+			gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A16'
+			NatbelQW['homework'] += 1
+			if NatbelQW['homework'] >= 3 and NatbelQW['QWstage'] = 3: NatbelQW['QWstage'] = 4
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
+			if NatbelQW['QWstage'] = 3:
+				'"Well Natasha, since I won''t be seeing my money anytime soon I think it''s best for now if you repay me by doing my homework for me." You tell her in a threatening voice.'
+			elseif NatbelQW['QWstage'] = 4:
+				'"Well Natasha, on top of doing my homework for me, you''ll be carrying my books to school in the morning from now on." You tell her in a threatening voice.'
+			end
+			'Natasha sighs with a resigned look as she nods meekly and starts working on your homework as well as hers.'
+			if NatbelQW['QWstage'] > 5:
+				act 'Continue': gt 'natbel_cp_1', 'hwundress'
+			else
+				'You relax on her bed and start daydreaming for a while.'
+				'You are woken out of your daydream by Natasha saying: "It''s done <<$pcs_nickname>>."'
+				'"Good, let me have a look at it."'
+				act 'Take your finished homework': gt 'natbelapt', 'natroom'
+			end
+		end
 	end
 end
 
@@ -339,64 +345,66 @@ if $ARGS[0] = 'afterhomework':
 end
 
 if $ARGS[0] = 'corrupt_choices':
-	if NatbelQW['QWstage'] >= 5:
-		gs 'willpower', 'humiliation', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Make her lick your feet (<<will_cost>> Willpower)':
-				gs 'willpower', 'humiliation', 'force', 'easy'
-				gs 'willpower', 'pay', 'force'
-				gt 'natbel_cp_1', 'lick_feet'
+	if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:
+		if NatbelQW['QWstage'] >= 5:
+			gs 'willpower', 'humiliation', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Make her lick your feet (<<will_cost>> Willpower)':
+					gs 'willpower', 'humiliation', 'force', 'easy'
+					gs 'willpower', 'pay', 'force'
+					gt 'natbel_cp_1', 'lick_feet'
+				end
+			else
+				act 'Make her lick your feet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Make her lick your feet (<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 NatbelQW['QWstage'] >= 6:
-		gs 'willpower', 'humiliation', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Spit in face (<<will_cost>> Willpower)':
-				gs 'willpower', 'humiliation', 'force', 'easy'
-				gs 'willpower', 'pay', 'force'
-				gt 'natbel_cp_1', 'spit_face'
+		if NatbelQW['QWstage'] >= 6:
+			gs 'willpower', 'humiliation', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Spit in face (<<will_cost>> Willpower)':
+					gs 'willpower', 'humiliation', 'force', 'easy'
+					gs 'willpower', 'pay', 'force'
+					gt 'natbel_cp_1', 'spit_face'
+				end
+			else
+				act 'Spit in face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Spit in face (<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 NatbelQW['QWstage'] >= 7:
-		gs 'willpower', 'cuni', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Make her lick your pussy (<<will_cost>> Willpower)':
-				gs 'willpower', 'cuni', 'force', 'easy'
-				gs 'willpower', 'pay', 'force'
-				gt 'natbel_cp_1', 'lick_pussy'
+		if NatbelQW['QWstage'] >= 7:
+			gs 'willpower', 'cuni', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Make her lick your pussy (<<will_cost>> Willpower)':
+					gs 'willpower', 'cuni', 'force', 'easy'
+					gs 'willpower', 'pay', 'force'
+					gt 'natbel_cp_1', 'lick_pussy'
+				end
+			else
+				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
-		else
-			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 NatbelQW['QWstage'] >= 8 and hour >= 18 and hour < 21 and NatbelQW['KolkaFuckDay'] < daystart and NatbelQW['KolkaWantsNat'] = 1:
-		gs 'willpower', 'sex', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Make her fuck Kolka (<<will_cost>> Willpower)':
-				gs 'willpower', 'sex', 'force', 'easy'
-				gs 'willpower', 'pay', 'force'
-				gt 'natkolev', 'kolkabj'
+		if NatbelQW['QWstage'] >= 8 and hour >= 18 and hour < 21 and NatbelQW['KolkaFuckDay'] < daystart and NatbelQW['KolkaWantsNat'] = 1:
+			gs 'willpower', 'sex', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Make her fuck Kolka (<<will_cost>> Willpower)':
+					gs 'willpower', 'sex', 'force', 'easy'
+					gs 'willpower', 'pay', 'force'
+					gt 'natkolev', 'kolkabj'
+				end
+			else
+				act 'Make her fuck Kolka (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Make her fuck Kolka (<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 NatbelQW['QWstage'] >= 9 and OluQW['sex'] = 1:
-		gs 'willpower', 'anal', 'force', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Take her to see Olu (<<will_cost>> Willpower)':
-				gs 'willpower', 'anal', 'force', 'easy'
-				gs 'willpower', 'pay', 'force'
-				gt 'natpimp', 'go_see_olu'
+		if NatbelQW['QWstage'] >= 9 and OluQW['sex'] = 1:
+			gs 'willpower', 'anal', 'force', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Take her to see Olu (<<will_cost>> Willpower)':
+					gs 'willpower', 'anal', 'force', 'easy'
+					gs 'willpower', 'pay', 'force'
+					gt 'natpimp', 'go_see_olu'
+				end
+			else
+				act 'Take her to see Olu (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Take her to see Olu (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end

locations/natbelapt.qsrc

@@ -402,7 +402,7 @@ if $ARGS[0] = 'kitchen':
 		'As you walk into the kitchen, you see Natasha pouring herself a glass of milk.'
 		'When she notices you standing there her face starts turning red immediately.'
 		'"I-I needed a drink." She stammers as she puts the milk back into the fridge and heads towards the door.'
-		'"You''re forgetting your milk." You tell her, unable to hold in your laughter as you watch her dart back to the table and grabbing her glass before leaving as quickly as she can. Her face a brilliant shade of crimson by now.'
+		'"You''re forgetting your milk." You tell her, unable to hold in your laughter as you watch her dart back to the table and grabbing her glass before leaving as quickly as she can. Her face is a brilliant shade of crimson now.'
 	elseif NatashaLoc = 3 and NatbelQW['seethroughwearing'] = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natfridge.jpg"></center>'
@@ -656,9 +656,9 @@ if $ARGS[0] = 'natroom':
 
 		if lernHome > 0: act 'Study together': gs 'natbelEv', 'study_together'
 
-		if NatbelQW['QWstage'] >= 2 and lernHome > 0 and NatbelQW['Debt'] > 0: act 'Make her do your homework': gs 'natbel_cp_1', 'make_her_do_homework'
-		if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart: gs 'natbel_cp_1', 'corrupt_choices'
-		if NatbelQW['QWstage'] >= 2 and NatbelQW['Debt'] > 0: gs 'natbel_cp_1', 'nat_debt_timer'
+		gs 'natbel_cp_1', 'make_her_do_homework'
+		gs 'natbel_cp_1', 'corrupt_choices'
+		gs 'natbel_cp_1', 'nat_debt_timer'
 	elseif NatashaShower = 1 and NatashaLoc ! 2:
 		*clr & cla
 		menu_off = 1