diff options
Diffstat (limited to 'npc/quests/counteragent_mixture.txt')
| -rw-r--r-- | npc/quests/counteragent_mixture.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt index d24bb0f04..1e82c7859 100644 --- a/npc/quests/counteragent_mixture.txt +++ b/npc/quests/counteragent_mixture.txt @@ -4,7 +4,7 @@ //= kobra_k88
//= added some dialogs for Morgenstein by Komurka
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -19,6 +19,7 @@ //= 1.6 Fixed some bugs, also related to Alch Job quest [Lupus]
//= 1,7 Fixed exploit [Lupus]
//= 1.8 Got rid of 'al_morgen' var [Lupus]
+//= 1.9 now uses (MISC_QUEST & 4) bit
//============================================================
@@ -53,7 +54,7 @@ M_Menu2: goto M_Menu;
M_Solut:
- if(MORGEN==0)set MORGEN,1;
+ if((MISC_QUEST & 4)==0 && MORGEN==0)set MORGEN,1;
mes "[Merchant Louitz]";
mes "Apparently that scientist uses those solutions to make other agents and mixtures.";
mes "You should speak with ^0000ddAure Dupon^000000 in Geffen to find out more about it. ";
@@ -77,7 +78,7 @@ geffen.gat,181,114,4 script Aure Dupon 55,{ mes "[Aure Dupon]";
mes "So... why did you stop me??";
emotion e_hmm;
- if(MORGEN >= 1) goto M_Menu2;
+ if((MISC_QUEST & 4) || MORGEN) goto M_Menu2;
M_Menu:
next;
menu "Talk",M_Talk,"Cancel",M_Cancel;
@@ -94,7 +95,7 @@ M_Menu2: next;
mes "[Aure Dupon]";
mes "Would you be able to give up everything else in your life to achieve that goal? Even if it meant risking insanity??";
- if(MORGEN>=1) goto M_Menu2;
+ if((MISC_QUEST & 4) || MORGEN) goto M_Menu2;
goto M_Menu;
M_Morgen:
@@ -115,8 +116,8 @@ M_Menu2: // Chemist Morgenstein -----------------------------------------------------------
geffen_in.gat,141,140,2 script Morgenstein 121,{
- if(MORGEN == 2) goto L_0;
- if(MORGEN == 3) goto L_1;
+ if(MORGEN >= 2) goto L_0;
+ if(MISC_QUEST & 4) goto L_1;
mes "[Chemist Morgenstein]";
mes "Heheheheheh... Sniff Sniff... I can smell something appetizing here.";
@@ -163,7 +164,8 @@ M_Menu: mes "[Chemist Morgenstein]";
mes "I can make one for you right now,if you want?? Ahhh... Talking about my experiments and research makes me.... 'excited'.......";
mes "You too can feel my 'excitement' if you wish..... Ahhhhh.... I can make you feel...";
- set MORGEN,3;
+ set MISC_QUEST,MISC_QUEST | 4;
+ set MORGEN,0;
close;
L_1:
|