Browse Source

[fixed]Katja's Location not found issue after makeup

maankamara 1 year ago
parent
commit
ab99480993
2 changed files with 9 additions and 4 deletions
  1. 3 0
      locations/katja_chat.qsrc
  2. 6 4
      locations/katja_procedural.qsrc

+ 3 - 0
locations/katja_chat.qsrc

@@ -138,6 +138,7 @@ if $ARGS[0] = 'uni_cafe':
 end
 end
 
 
 if $ARGS[0] = 'chat':
 if $ARGS[0] = 'chat':
+	killvar '$carry_arg'
 	gs 'katja_meynold_schedule' 
 	gs 'katja_meynold_schedule' 
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -192,6 +193,7 @@ if $ARGS[0] = 'chat':
 end
 end
 
 
 if $ARGS[0] = 'chat1':
 if $ARGS[0] = 'chat1':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
 	if sofiaQW['know'] = 1 and sofiaQW['QWstage'] = 0: gt 'katja_chat', 'sofia1'
 	if sofiaQW['know'] = 1 and sofiaQW['QWstage'] = 0: gt 'katja_chat', 'sofia1'
@@ -297,6 +299,7 @@ if $ARGS[0] = 'coffee_hole':
 end
 end
 
 
 if $ARGS[0] = 'brunch':
 if $ARGS[0] = 'brunch':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
 	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
 	minut += 10
 	minut += 10

+ 6 - 4
locations/katja_procedural.qsrc

@@ -166,6 +166,8 @@ if $ARGS[0] = 'face_color':
 end
 end
 
 
 if $ARGS[0] = 'makeup':
 if $ARGS[0] = 'makeup':
+	$carry_arg[1] = $ARGS[1]
+	$carry_arg[2] = $ARGS[2]
 	'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 	'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 	act 'Let her put makeup on you':
 	act 'Let her put makeup on you':
 		*clr & cla
 		*clr & cla
@@ -182,7 +184,7 @@ if $ARGS[0] = 'makeup':
 			'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 		end
 
 
 		act 'Normal make-up':
 		act 'Normal make-up':
@@ -191,7 +193,7 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 		end
 
 
 		act 'Heavy make-up':
 		act 'Heavy make-up':
@@ -200,9 +202,9 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
 			'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 		end
-		act 'You really don''t need it': gt $ARGS[1], $ARGS[2]
+		act 'You really don''t need it': gt $carry_arg[1], $carry_arg[2]
 	end
 	end
 end
 end