Browse Source

change the order in if .. elseif construction and place end into proper place

rachels 3 years ago
parent
commit
5b6c1b998d
1 changed files with 61 additions and 62 deletions
  1. 61 62
      locations/katjaEv.qsrc

+ 61 - 62
locations/katjaEv.qsrc

@@ -1663,25 +1663,7 @@ if $ARGS[0] = 'kathan9':
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL9.jpg"></center>'
 
-			if IvanShowerQW = 11 and pav_slut < 250:
-				'"Hey Ivan! Why not sit with Katja and me for a while?"'
-				'For a moment, he looks to the lake and seems at the brink of saying "no", but then shrugs and walks towards you.'
-				'"Yeah, why not? I have swam enough for a while"'
-				'Ivan sits between the two of you and begins to talk, mostly about his dream to be at the boxing nationals. This isn''t a particularly interesting subject for Katja, but even she seems taken by the jock''s driven dedication. That and his defined abs... Cough... who wouldn''t be?'
-				'Katja slowly opens up to the conversation and soon the three of you are talking in a mismatched dialogue mixing sports, cosmetics and strangely, who is the girl with the best ass in school (You of course!). The time passes and the conversation ends with a relaxed silence as you observe the landscape.'
-				'"Ok girls, this has been fun, but I must return to my training."'
-				'Ivan gives you both a little kiss on the cheek and then walks towards the lake, letting the two of you appreciate the jock''s nice butt... Sigh...'
-
-				act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
-
-				act 'Swim':minut += 10 & gt 'katjaEv','kathan5'
-
-				act 'Tan':minut += 10 & gt 'katjaEv','kathan6'
-
-				act 'Walk':minut += 10 & gt 'katjaEv','kathan7'
-
-
-			elseif IvanShowerQW = 11 and pav_slut < 250 and Katjaslut >= 20 and KatjaHorny >= 20 and katjaFirstKiss = 1 and KatjaOTN = 1:
+			if IvanShowerQW = 11 and pav_slut < 250 and Katjaslut >= 20 and KatjaHorny >= 20 and katjaFirstKiss = 1 and KatjaOTN = 1:
 				'"Hey Ivan! Why not sit with Katja and me for a while?"'
 				'For a moment, he looks to the lake and seems at the brink of saying "no", but then shrugs and walks towards you.'
 				'"Yeah, why not? I have swam enough for a while"'
@@ -1937,6 +1919,24 @@ if $ARGS[0] = 'kathan9':
 						end
 					end
 				end
+			elseif IvanShowerQW = 11 and pav_slut < 250:
+				'"Hey Ivan! Why not sit with Katja and me for a while?"'
+				'For a moment, he looks to the lake and seems at the brink of saying "no", but then shrugs and walks towards you.'
+				'"Yeah, why not? I have swam enough for a while"'
+				'Ivan sits between the two of you and begins to talk, mostly about his dream to be at the boxing nationals. This isn''t a particularly interesting subject for Katja, but even she seems taken by the jock''s driven dedication. That and his defined abs... Cough... who wouldn''t be?'
+				'Katja slowly opens up to the conversation and soon the three of you are talking in a mismatched dialogue mixing sports, cosmetics and strangely, who is the girl with the best ass in school (You of course!). The time passes and the conversation ends with a relaxed silence as you observe the landscape.'
+				'"Ok girls, this has been fun, but I must return to my training."'
+				'Ivan gives you both a little kiss on the cheek and then walks towards the lake, letting the two of you appreciate the jock''s nice butt... Sigh...'
+
+				act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
+
+				act 'Swim':minut += 10 & gt 'katjaEv','kathan5'
+
+				act 'Tan':minut += 10 & gt 'katjaEv','kathan6'
+
+				act 'Walk':minut += 10 & gt 'katjaEv','kathan7'
+
+
 			else
 				'Talking with Ivan, King of the Lone Wolves, is an uphill battle. He is evidently not interested in the sort of things Katja likes to talk about and would probably prefer to jump back into his swimming. Alas, Ivan is too polite to just tell you to fuck off, and that is a weakness you and Katja can exploit.'
 				'After some pestering, Ivan finally resigns to sit with you and pass time in "civilized" conversation. The minutes pass, with him primarily listening to your endless rants, but after a while, between Katja''s shyness and Ivan''s apathy, silence falls over the three of you, leaving your little trio observing the lake in tranquillity.'
@@ -1980,30 +1980,7 @@ if $ARGS[0] = 'kathan10':
 	if $clothingworntype = 'nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS8.jpg"></center>'
 
-		if KatjaSlut >= 20:
-			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you or Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
-			'"Oh yes <<$pcs_nickname>> this hits the spot!"'
-			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, making the time pass quickly.'
-			'"Ok <<$pcs_nickname>>. I think that this is enough."'
-			'Blinking surprised, you look the time. Yes, half an hour has passed, more than enough for your skin treatment.'
-
-			if month >= 12 and month < 3:
-				gs 'willpower', 'misc', 'force', 'easy'
-				if will_cost <= pcs_willpwr:
-
-					act 'Ice dipping!':
-						*clr & cla
-						gs 'willpower', 'pay', 'force'					
-						gs 'stat'
-						gt 'katjaEv','kathan11'
-					end
-				else
-					act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-
-				act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
-
-		elseif KatjaSlut >= 20 and KatjaHorny >= 20 and  katjaFirstKiss = 1 and KatjaOTN = 1:
+		if KatjaSlut >= 20 and KatjaHorny >= 20 and  katjaFirstKiss = 1 and KatjaOTN = 1:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you or Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
 			'"Oh yes <<$pcs_nickname>> this hits the spot!"'
 			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, but as the time pass, you observe some details on the redhead. She seems unable to sit still, bites her lips and gives you longing gazes. It''s undeniable that she is horny, so... what to do? Have some semi-public hot and steamy sex or let the ginger cook in her own sauce until you reach a better place?'
@@ -2030,7 +2007,6 @@ if $ARGS[0] = 'kathan10':
 						gs 'willpower', 'pay', 'force', 'easy'
 						gs 'stat'
 						gt 'katjaEv','kathan11'
-						end
 					end
 				else
 					act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2039,7 +2015,30 @@ if $ARGS[0] = 'kathan10':
 
 			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
 
-		elseif KatjaSlut <= 20:
+		elseif KatjaSlut >= 20:
+			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you or Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
+			'"Oh yes <<$pcs_nickname>> this hits the spot!"'
+			'Ahhh yes! Letting your problems melt away, you and Katja relax in the sauna, talking about your problems and do some rumourmongering, making the time pass quickly.'
+			'"Ok <<$pcs_nickname>>. I think that this is enough."'
+			'Blinking surprised, you look the time. Yes, half an hour has passed, more than enough for your skin treatment.'
+
+			if month >= 12 and month < 3:
+				gs 'willpower', 'misc', 'force', 'easy'
+				if will_cost <= pcs_willpwr:
+
+					act 'Ice dipping!':
+						*clr & cla
+						gs 'willpower', 'pay', 'force'					
+						gs 'stat'
+						gt 'katjaEv','kathan11'
+					end
+				else
+					act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
+
+		else
 			'You both change in the lockers, but before Katja can put on her bikini, you grab it.'
 			'"Hey! What are you doing? This isn''t fun"'
 			'Smiling, you look at her, ogling the petite doll-like ginger that is desperately trying to cover her body.'
@@ -2424,23 +2423,7 @@ if $ARGS[0] = 'kathan14':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS5.jpg"></center>'
 
-					if NatbelQW['QWstage'] >= 8:
-						'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
-						'"<<$pcs_nickname>>?"'
-						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
-						'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
-						'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
-						'"I can''t hear you slut."'
-						'"I... Ok <<$pcs_nickname>>."'
-						'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
-
-						if hour >= 20:
-							act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
-						else
-							act 'Continue window shopping':gt 'katjaEv','kathan14'
-							act 'Look for something else to do':gt 'katjaEv','kathan'
-						end
-					elseif NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] >= 500 and Katjaslut >= 20 and Katjahorny >=20 and katjaFirstKiss = 1 and KatjaOTN = 1:
+					if NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] >= 500 and Katjaslut >= 20 and Katjahorny >=20 and katjaFirstKiss = 1 and KatjaOTN = 1:
 						'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
 						'"<<$pcs_nickname>>?"'
 						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
@@ -2468,6 +2451,22 @@ if $ARGS[0] = 'kathan14':
 							act 'Continue window shopping':gt 'katjaEv','kathan14'
 							act 'Look for something else to do':gt 'katjaEv','kathan'
 						end
+					elseif NatbelQW['QWstage'] >= 8:
+						'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
+						'"<<$pcs_nickname>>?"'
+						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
+						'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
+						'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
+						'"I can''t hear you slut."'
+						'"I... Ok <<$pcs_nickname>>."'
+						'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
+
+						if hour >= 20:
+							act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+						else
+							act 'Continue window shopping':gt 'katjaEv','kathan14'
+							act 'Look for something else to do':gt 'katjaEv','kathan'
+						end
 					else
 						'Walking without care to the nerd, Natasha becomes aware of your presence, but before the girl can react, you push Natasha against a stand, cornering the surprised girl.'
 						'"<<$pcs_nickname>>?"'