summaryrefslogtreecommitdiff
path: root/npc/quests/counteragent_mixture.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/quests/counteragent_mixture.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/battle.c
Diffstat (limited to 'npc/quests/counteragent_mixture.txt')
-rw-r--r--npc/quests/counteragent_mixture.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index ed8152a06..20e1e8bed 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -86,7 +86,7 @@ alberta_in,133,55,3 script Louitz#cm 4_M_02,{
mes "like any liquids we're used to.";
close;
case 2:
- set molgenstain,1;
+ molgenstain = 1;
mes "[Merchant Louitz]";
mes "Hey, this is one of";
mes "those solutions that";
@@ -156,7 +156,7 @@ alberta_in,133,55,3 script Louitz#cm 4_M_02,{
mes "like any liquids we're used to.";
close;
case 2:
- set molgenstain,1;
+ molgenstain = 1;
mes "[Merchant Louitz]";
mes "Oh hey, this is that";
mes "Karvodailnirol that the";
@@ -226,7 +226,7 @@ alberta_in,133,55,3 script Louitz#cm 4_M_02,{
mes "like any liquids we're used to.";
close;
case 2:
- set molgenstain,1;
+ molgenstain = 1;
mes "[Merchant Louitz]";
mes "Oh hey, this is that";
mes "Detrimindexta that the";
@@ -348,7 +348,7 @@ geffen,181,114,3 script Aure Dupon#cm 4_KID01,{
mes "carried by the tides of destiny.";
close;
case 2:
- set molgenstain,2;
+ molgenstain = 2;
mes "[Aure Dupon]";
mes "Molgenstein...?";
mes "The man is obsessed";
@@ -536,8 +536,8 @@ geffen_in,141,140,3 script Molgenstein#cm 2_M_MOLGENSTEIN,{
}
}
if (molgenstain == 2) {
- set MISC_QUEST,MISC_QUEST | 4;
- set molgenstain,0;
+ MISC_QUEST |= 4;
+ molgenstain = 0;
mes "[Chemist Molgenstein]";
mes "Heeheeheehee.... welcome. Hehehehe.... heeheeheeheehee....";
next;