Pārlūkot izejas kodu

[fixed] christina variables didn't get updated in some spots

Anya 2 gadi atpakaļ
vecāks
revīzija
d738727cb5
2 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 4 2
      locations/gschool_jock_chats.qsrc
  2. 1 1
      locations/journal_quests.qsrc

+ 4 - 2
locations/gschool_jock_chats.qsrc

@@ -429,12 +429,14 @@ if $ARGS[0] = 'christina':
 			'"Oh, you won''t. So long as you keep your word..." you say with a fake smile that doesn''t quite reach your eyes. Turning on your heels, you head off to your next class, smiling.'
 		end
 	elseif christinaQW['blackmail'] = 2:
+		if LariskaQW['story'] = 3: LariskaQW['story'] = 4
 		'Christina takes one look at you coming over to talk with her. "What now?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Well don''t. We''re not friends. You got what you wanted, now leave me alone unless it''s important."'
 		'Giving her your best obvious fake smile you say "Now don''t be like that. I thought we were great friends!"'
 		'"Whatever." Giving you a dirty look, she heads off to her next class, and you do the same, chuckling to yourself.'
 	elseif christinaQW['fight'] = 1:
+		if LariskaQW['story'] = 3: LariskaQW['story'] = 4
 		'Seeing you walking towards her, she tenses up and whispers "What do you need?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Uh, hi. Well, I gotta go, class is starting." Grabbing her stuff, she flees from your sight. Chuckling to yourself, you do the same.'
@@ -456,7 +458,7 @@ if $ARGS[0] = 'christina':
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	if christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0:
+	if christinaQW['blackmail'] = 0 and christinaQW['pre_bm'] = 0 and christinaQW['pre_fight'] = 0 and christinaQW['fight'] = 0 and christinaQW['subpath'] = 0:
 		act 'Think about Christina': gt 'Zvereva_events', 'christina_decide'
 	end
 end
@@ -859,7 +861,7 @@ if $ARGS[0] = 'lariska':
 				'"Relax," you say laughing. "I beat the shit out of her, so she knows better then to deny me something I want. Just ask her about it the next time you get a chance, ok?"'
 				'She looks at you, a bit dazed, but manages to nod.'
 				'Giving her a soft smile, you head off to your next class.'
-			elseif christinaQW['blackmail'] = 2 or christinaQW['subpath'] >= 2:
+			elseif christinaQW['blackmail'] >= 2 or christinaQW['subpath'] >= 2:
 				gs 'npc_relationship', 'modify', 'A13', 'like'
 				LariskaQW['story'] = 4
 				'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'

+ 1 - 1
locations/journal_quests.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'start':
 		elseif LariskaQW['story'] = 4:
 			'I should talk to Lariska at school again.'
 		elseif LariskaQW['story'] = 3:
-			if christinaQW['dompath'] >= 3 or christinaQW['subpath'] >= 2:
+			if christinaQW['blackmail'] >= 2 or christinaQW['fight'] = 1 or christinaQW['subpath'] >= 2:
 				'I should talk to Lariska at school.'
 			else
 				'I have to find a way to deal with Christina before Lariska is willing to be more involved with me.'