Ver Fonte

[fixed] Small bug I should have catched earlier.

bgkjdgbizgblzdgbr há 7 meses atrás
pai
commit
65e00bcbee
2 ficheiros alterados com 148 adições e 149 exclusões
  1. 2 2
      locations/katja_city_sex.qsrc
  2. 146 147
      locations/katja_nightclub.qsrc

+ 2 - 2
locations/katja_city_sex.qsrc

@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'two_guys_cumming':
 						'"They were pretty good, '+iif(npc_ass['A14'] + 4*katjaQW['lube'] <dick1, ' even if <<$npc_nickname[$boy1]>>''s dick was so large it hurt.', ' no pain at all.')+' So I will say they are approved." Katja says as her face is getting completely red, she then she starts to laugh about how casually she talks of things like this now.' 
 					else
 						if npc_ass['A14'] + 4*katjaQW['lube'] <dick1:
-							katjaQW['slut'] -= ran(1,2)
+							katjaQW['slut'] -= rand(1,2)
 							'"No they were not. It hurt a lot. Next time, I need a guy with a smaller dick." Katja answers not looking satisfied at all.' 
 						else
 							'"Not really. They did okay in not making it hurt, but they did not know how to please a lady, only thinking about how to bring themselves off." Katja complains.' 
@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'two_guys_cumming':
 					'"They were pretty good, '+iif(npc_vag['A14']<dick1, ' even if <<$npc_nickname[$boy1]>>''s dick was so large it hurt.', '  <<$npc_nickname[$boy1]>>''s dick fit nice in my pussy.')+' So I will say that he is approved, I never fucked  <<$npc_nickname[$boy2]>> only sucked his cock so abut him I can''t say." Katja says as her face is getting completely red, she then  she starts to laugh about how casually she rates guys sex skill now.' 
 				else
 					if npc_vag['A14']  <dick1:
-						katjaQW['slut'] -= ran(1,2)
+						katjaQW['slut'] -= rand(1,2)
 						'"No they were not. It hurt a lot.  <<$npc_nickname[$boy1]>>''s cock was too big for my pussy. Next time, I need a guy with a smaller dick." Katja answers, not looking satisfied at all.' 
 					else
 						'"Not really. They did okay, but they did not know how to please a lady, only thinking about how to bring themself off." Katja complains.' 

+ 146 - 147
locations/katja_nightclub.qsrc

@@ -361,7 +361,7 @@ if $ARGS[0] = 'dance':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing_wild.jpg"></center>'
 		'A very popular beat comes on, and the crowd goes wild. The dance floor becomes a mass of people moving fast to the rhythm. Dance skill does not matter at the moment, just enthusiasm and stamina.'
-		if  and katjaQW['drinks'] > 8:
+		if katjaQW['drinks'] > 8:
 			'Katja is very drunk and is generally just having trouble staying on her feet with all the people bombing into her.'+iif( alko < 8, ' You do your best to not make her fall.', ' You are in the same state and it is a miracle that non of you fall.')
 		elseif katjaQW['drinks'] > 4:
 			iif(alko > 4, 'You and Katja are', 'Katja is')+' having some issues with not bumping into other dancers, not that they seem to be paying any notion to it.'
@@ -1417,77 +1417,118 @@ if $ARGS[0] = 'dance_two_guys3':
 			end
 		else
 			'After some time, he gets you and Katja so close you both can hear him and he suggests that the four of you continue the party at his place which is close by, making it very clear that him and his friend is expecting the bedroom to be the main location of the party.'
-				if katjaQW['QWstage'] < 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (50,100):
-					'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
-					if katjaQW['QWstage'] > 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
-						+iif(katjaQW['simultanous_boys'] <2, 'She then leans into you and whisper "I''ve never been with two guys at once."', '')
-						act 'Try to convince Katja to go with him':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-							'"Come on, Katja. It''s going to be fun. They look hot and '+iif(katjaQW['simultanous_boys'] <2, ' if you never been with two guys, then you should defiantly try it.', 'I know you like to have several cocks to play with.')+' I grabbed the guy i was dancing withs cock while we danced and I think it''ll do nicely," you whisper in her ear.'
-							'Katja''s face is getting red, "I don''t know. I''m not sure '+iif(katjaQW['simultanous_boys'] <2, it is the right time to try a foursome', 'they are right for us')+'."'
-							if katjaQW['dom'] > 30:
-								gs 'willpower', '', 'force', 'hard'
-							elseif katjaQW['dom'] < 0:
-								gs 'willpower', '', 'force', 'easy'
-							else
-								gs 'willpower', '', 'force'
-							end
-							if will_cost <= pcs_willpwr:
-								act 'Push her a little more (<<will_cost>> Willpower)':
-									cla
-									gs 'npc_relationship', 'modify', 'A14', 'dislike'
-									gs 'willpower', 'pay', 'force'
-									katjaQW['dom'] -= rand(1,2)
-									katjaQw['horny'] += 10
-									gs 'stat'
-									if hour > 10:
-										locat['katja_rand2'] = daystart
-									else
-										locat['katja_rand3'] = daystart -1
-									end
-									locat['katja_save2'] = 54
-									locat['katja'] = locat['katja_save2']
-									minut += 10
-									'"I know you want those cocks. Just imagine one of them sliding in and out of your tight, wet pussy, while you look at me bouncing up and down the other cock" you whisper in her ear and you can her start squirming.'
-									'"OK. Let''s go," she finally says out loud and the men''s faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-									act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 	
-								end
-							else
-								act 'Push her a little more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-							act 'Let it go':
+			if katjaQW['QWstage'] < 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] < rand (50,100):
+				'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
+				if katjaQW['QWstage'] > 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
+					+iif(katjaQW['simultanous_boys'] <2, 'She then leans into you and whisper "I''ve never been with two guys at once."', '')
+					act 'Try to convince Katja to go with him':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+						'"Come on, Katja. It''s going to be fun. They look hot and '+iif(katjaQW['simultanous_boys'] <2, ' if you never been with two guys, then you should defiantly try it.', 'I know you like to have several cocks to play with.')+' I grabbed the guy i was dancing withs cock while we danced and I think it''ll do nicely," you whisper in her ear.'
+						'Katja''s face is getting red, "I don''t know. I''m not sure '+iif(katjaQW['simultanous_boys'] <2, 'it is the right time to try a foursome', 'they are right for us')+'."'
+						if katjaQW['dom'] > 30:
+							gs 'willpower', '', 'force', 'hard'
+						elseif katjaQW['dom'] < 0:
+							gs 'willpower', '', 'force', 'easy'
+						else
+							gs 'willpower', '', 'force'
+						end
+						if will_cost <= pcs_willpwr:
+							act 'Push her a little more (<<will_cost>> Willpower)':
 								cla
-								katjaQW['dom'] += rand(2,3)
-								gs 'arousal', 'end'
+								gs 'npc_relationship', 'modify', 'A14', 'dislike'
+								gs 'willpower', 'pay', 'force'
+								katjaQW['dom'] -= rand(1,2)
+								katjaQw['horny'] += 10
 								gs 'stat'
-								'You resign yourself and accept Katja''s decision. "I''m very sorry, but my friend doesn''t feel like it. So we''re staying here to dance," you tell them, and they says goodbye and walks away, looking quite sad.' 
-								gs 'katja_nightclub', 'dance_end'
+								if hour > 10:
+									locat['katja_rand2'] = daystart
+								else
+									locat['katja_rand3'] = daystart -1
+								end
+								locat['katja_save2'] = 54
+								locat['katja'] = locat['katja_save2']
+								minut += 10
+								'"I know you want those cocks. Just imagine one of them sliding in and out of your tight, wet pussy, while you look at me bouncing up and down the other cock" you whisper in her ear and you can her start squirming.'
+								'"OK. Let''s go," she finally says out loud and the men''s faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+								act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 	
 							end
-							!!if katjaQW['faithful'] = 0:
-							!!	act 'Go home with him alone':
-							!!		cla
-							!!		gs 'npc_relationship', 'modify', 'A14', 'hate'
-							!!		gs 'npcgeneratec', 0, '', rand(18,55), rand(3,4)
-							!!		'"Well, I''m going home with him. So if you don''t want to have fun, you can stay here alone," you tell her.'
-							!!		'Katja almost looks angry. "If you are going to get hurt, I won''t be able to help you. But whatever," she says before turning around and walking away.'
-							!!		'The guy looks a little surprised by that exchange, but takes you under his arm and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-							!!		act 'Go with him': gt 'sex_ev_start', 'hookup_npc_home_start'
-							!!	end
-							!!end
+						else
+							act 'Push her a little more (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Let it go':
+							cla
+							katjaQW['dom'] += rand(2,3)
+							gs 'arousal', 'end'
+							gs 'stat'
+							'You resign yourself and accept Katja''s decision. "I''m very sorry, but my friend doesn''t feel like it. So we''re staying here to dance," you tell them, and they says goodbye and walks away, looking quite sad.' 
+							gs 'katja_nightclub', 'dance_end'
 						end
+						!!if katjaQW['faithful'] = 0:
+						!!	act 'Go home with him alone':
+						!!		cla
+						!!		gs 'npc_relationship', 'modify', 'A14', 'hate'
+						!!		gs 'npcgeneratec', 0, '', rand(18,55), rand(3,4)
+						!!		'"Well, I''m going home with him. So if you don''t want to have fun, you can stay here alone," you tell her.'
+						!!		'Katja almost looks angry. "If you are going to get hurt, I won''t be able to help you. But whatever," she says before turning around and walking away.'
+						!!		'The guy looks a little surprised by that exchange, but takes you under his arm and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						!!		act 'Go with him': gt 'sex_ev_start', 'hookup_npc_home_start'
+						!!	end
+						!!end
 					end
-					act 'Agree and say goodbye to them':
+				end
+				act 'Agree and say goodbye to them':
+					cla
+					gs 'arousal', 'end'
+					gs 'stat'
+					'You agree with Katja and say goodbye to the men.'
+					gs 'katja_nightclub', 'dance_end'
+				end
+			else
+				if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katjaQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
+					'"That sounds like a good idea. I''m sure that you two have lots of ways to entertain us," Katja says in a seductive voice, before you even have time to reply.'
+					act 'Go home with them':
 						cla
-						gs 'arousal', 'end'
-						gs 'stat'
-						'You agree with Katja and say goodbye to the men.'
-						gs 'katja_nightclub', 'dance_end'
+						minut += 10
+						if hour > 10:
+							locat['katja_rand2'] = daystart
+						else
+							locat['katja_rand3'] = daystart -1
+						end
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']
+						'"I just hope you are men enough to really entertain a couple of hot girls like us. Let''s go," you say, trying to sound as seductive as Katja. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys'
 					end
-				else
-					if (func('katja_procedural', 'willing_to_be_naughty') >= 100 and katjaQW['horny'] >= 100 and katjaQW['dom'] >= 0) or (katjaQW['dom'] >= 25 and func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] >= 150):
-						'"That sounds like a good idea. I''m sure that you two have lots of ways to entertain us," Katja says in a seductive voice, before you even have time to reply.'
-						act 'Go home with them':
+					act 'Tell Katja that you don''t want to go home with them':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+						'You lean into Katja and whisper, "Come on. I don''t want to go home with them. Who knows what will happen."'
+						'"They are actually quite hot and I get a good feeling from them. I''m sure nothing we don''t want to happen will happen. I will protect you for sure if they try to do something we don''t want," Katja answers while trying to look tough to you'
+						if katjaQW['dom'] > 30:
+							gs 'willpower', '', 'force', 'hard'
+						elseif katjaQW['dom'] < 0:
+							gs 'willpower', '', 'force', 'easy'
+						else
+							gs 'willpower', '', 'force'
+						end
+						if will_cost <= pcs_willpwr:
+							act 'Convince Katja not to go home with them (<<will_cost>> Willpower)':
+								cla
+								gs 'npc_relationship', 'modify', 'A14', 'dislike'
+								gs 'willpower', 'pay', 'force'
+								katjaQW['dom'] -= rand(1,2)
+								gs 'stat'										
+								'"I really don''t think it''s a good idea to go with them. I got a really bad feeling from the guy I was dancing with, you can play tough but you know damn well that we wont be able to do anything if the get violent?" you whisper.'
+								'Katja looks at the man you were dancing with again and after a moment of thinking, she relents. "OK. I''m not really convinced that they''re bad, but I will stay with you," she answers.'
+								'She then turns to them. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+								'They then leaves, looking very disappointed.'
+								gs 'katja_nightclub', 'dance_end'
+							end
+						else
+							act 'Convince Katja not to go home with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end
+						act 'Relent and go with them':
 							cla
 							minut += 10
 							if hour > 10:
@@ -1497,100 +1538,58 @@ if $ARGS[0] = 'dance_two_guys3':
 							end
 							locat['katja_save2'] = 54
 							locat['katja'] = locat['katja_save2']
-							'"I just hope you are men enough to really entertain a couple of hot girls like us. Let''s go," you say, trying to sound as seductive as Katja. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+							katjaQW['dom'] += rand(1,2)
+							'"Well, if you really want to, Katja," you say.'
+							'Their faces lights up. "Great! Follow me, my ladies," the guy you were dancing with says and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
 							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys'
 						end
-						act 'Tell Katja that you don''t want to go home with them':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-							'You lean into Katja and whisper, "Come on. I don''t want to go home with them. Who knows what will happen."'
-							'"They are actually quite hot and I get a good feeling from them. I''m sure nothing we don''t want to happen will happen. I will protect you for sure if they try to do something we don''t want," Katja answers while trying to look tough to you'
-							if katjaQW['dom'] > 30:
-								gs 'willpower', '', 'force', 'hard'
-							elseif katjaQW['dom'] < 0:
-								gs 'willpower', '', 'force', 'easy'
-							else
-								gs 'willpower', '', 'force'
-							end
-							if will_cost <= pcs_willpwr:
-								act 'Convince Katja not to go home with them (<<will_cost>> Willpower)':
-									cla
-									gs 'npc_relationship', 'modify', 'A14', 'dislike'
-									gs 'willpower', 'pay', 'force'
-									katjaQW['dom'] -= rand(1,2)
-									gs 'stat'										
-									'"I really don''t think it''s a good idea to go with them. I got a really bad feeling from the guy I was dancing with, you can play tough but you know damn well that we wont be able to do anything if the get violent?" you whisper.'
-									'Katja looks at the man you were dancing with again and after a moment of thinking, she relents. "OK. I''m not really convinced that they''re bad, but I will stay with you," she answers.'
-									'She then turns to them. "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
+						if katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0:
+							act 'Let Katja go home with them, but stay at the club':
+								'"Well, you can go with them if you want to, but I''m staying here" you tell Katja.'
+								if katjaQW['simultanous_boys'] <2:
+									'Katja looks at you a little panicked. "But I''ve never been with two guys before. Wont you come with me please!" she pleads.'
+									'But seeing that you don''t relent so turns to the guys and says "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
 									'They then leaves, looking very disappointed.'
 									gs 'katja_nightclub', 'dance_end'
-								end
-							else
-								act 'Convince Katja not to go home with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-							act 'Relent and go with them':
-								cla
-								minut += 10
-								if hour > 10:
-									locat['katja_rand2'] = daystart
 								else
-									locat['katja_rand3'] = daystart -1
-								end
-								locat['katja_save2'] = 54
-								locat['katja'] = locat['katja_save2']
-								katjaQW['dom'] += rand(1,2)
-								'"Well, if you really want to, Katja," you say.'
-								'Their faces lights up. "Great! Follow me, my ladies," the guy you were dancing with says and you walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-								act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys'
-							end
-							if katjaQW['relationship_talk'] = 1 and katjaQW['faithful'] = 0:
-								act 'Let Katja go home with them, but stay at the club':
-									'"Well, you can go with them if you want to, but I''m staying here" you tell Katja.'
-									if katjaQW['simultanous_boys'] <2:
-										'Katja looks at you a little panicked. "But I''ve never been with two guys before. Wont you come with me please!" she pleads.'
-										'But seeing that you don''t relent so turns to the guys and says "I''m sorry, but my friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so I will stay with her. But maybe another time?"'
-										'They then leaves, looking very disappointed.'
-										gs 'katja_nightclub', 'dance_end'
+									katjaQw['alone_with_other_day'] = daystart
+									if hour > 10:
+										locat['katja_rand2'] = daystart
 									else
-										katjaQw['alone_with_other_day'] = daystart
-										if hour > 10:
-											locat['katja_rand2'] = daystart
-										else
-											locat['katja_rand3'] = daystart -1
-										end
-										locat['katja_save2'] = 54
-										locat['katja'] = locat['katja_save2']
-										cla
-										'She looks at you a little skeptical, but then turns to the men. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
-										'They then lights up and takes her hand and walk away, leaving you alone on the dance floor.'
-										act 'continue': gt 'city_nightclub', 'dance'
+										locat['katja_rand3'] = daystart -1
 									end
+									locat['katja_save2'] = 54
+									locat['katja'] = locat['katja_save2']
+									cla
+									'She looks at you a little skeptical, but then turns to the men. "My friend '+iif(func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 175, 'is boring', 'doesn''t feel like it')+', so she isn''t coming. But I would still love another drink with you."'
+									'They then lights up and takes her hand and walk away, leaving you alone on the dance floor.'
+									act 'continue': gt 'city_nightclub', 'dance'
 								end
 							end
 						end
-					else
-						'Katja looks at you, making it clear that it''s up to you to decide and she will do what you choose.'
+					end
+				else
+					'Katja looks at you, making it clear that it''s up to you to decide and she will do what you choose.'
 						act 'Go home with the men':
-							cla
-							minut += 10
-							if hour > 10:
-								locat['katja_rand2'] = daystart
-							else
-								locat['katja_rand3'] = daystart -1
-							end
-							locat['katja_save2'] = 54
-							locat['katja'] = locat['katja_save2']
-							'"That does sound like fun. Let''s go," you say and their faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
-							act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 
-						end
-						act 'Say no thanks':
-							cla
-							gs 'arousal', 'end'
-							gs 'stat'
-							'"Thanks, but no thanks," you say. "We prefer to stay here and dance."'
-							'They clearly looks disappointed and says goodbye before leaving you and Katja alone on the dance floor.'
-							gs 'katja_nightclub', 'dance_end'
+						cla
+						minut += 10
+						if hour > 10:
+							locat['katja_rand2'] = daystart
+						else
+							locat['katja_rand3'] = daystart -1
 						end
+						locat['katja_save2'] = 54
+						locat['katja'] = locat['katja_save2']
+						'"That does sound like fun. Let''s go," you say and their faces lights up like it''s Christmas. You walk '+iif(temper <20, 'to the wardrobe to get your coats and then leave the club.', 'out in the warm night.')
+						act 'Walk to his home': gt 'katja_city_sex', 'walking_home_with_two_guys' 
+					end
+					act 'Say no thanks':
+						cla
+						gs 'arousal', 'end'
+						gs 'stat'
+						'"Thanks, but no thanks," you say. "We prefer to stay here and dance."'
+						'They clearly looks disappointed and says goodbye before leaving you and Katja alone on the dance floor.'
+						gs 'katja_nightclub', 'dance_end'
 					end
 				end
 			end