summaryrefslogtreecommitdiff
path: root/world/map/npc/020-2
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-06-28 11:41:36 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-06-28 12:29:02 -0700
commitbc66a98377575c7c8e9592e50cbdcf083d6ecaff (patch)
treed1ecc1c6a99191cce3108199d96fcbe891772f65 /world/map/npc/020-2
parent9018aee73b120bd9c5c414abcb5af6da4c7b1bea (diff)
downloadserverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.gz
serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.bz2
serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.xz
serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.zip
Refactor all calls within an if, which is illegal
Diffstat (limited to 'world/map/npc/020-2')
-rw-r--r--world/map/npc/020-2/baktar.txt96
1 files changed, 48 insertions, 48 deletions
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index c6603d43..8e88e30d 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -98,7 +98,7 @@ L_KnowAlready:
mes @npcname$;
mes "\"I love Tulimshar's stuff. I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there. If you give me an interesting item from the area, I'll give you a nice reward. So, you have a new item?\"";
goto L_startitem;
-close;
+ close;
L_exotic:
mes @npcname$;
@@ -183,76 +183,76 @@ L_NeverMind:
L_DesertHat_Item:
if(@Q_status & (1<<@BIT_DESERTHAT)) goto L_havealready;
if (countitem("DesertHat") < 1) goto L_Noitem;
- delitem "DesertHat", 1;
- set Zeny, Zeny + @MONEY_DESERTHAT;
- getexp @XP_DESERTHAT,0;
- set @Q_status, @Q_status | (1<<@BIT_DESERTHAT);
- callsub S_Update_Var;
+ delitem "DesertHat", 1;
+ set Zeny, Zeny + @MONEY_DESERTHAT;
+ getexp @XP_DESERTHAT,0;
+ set @Q_status, @Q_status | (1<<@BIT_DESERTHAT);
+ callsub S_Update_Var;
close;
L_DesertShirt_Item:
if(@Q_status & (1<<@BIT_DESERTSHIRT)) goto L_havealready;
if (countitem("DesertShirt") < 1) goto L_Noitem;
- delitem "DesertShirt", 1;
- set Zeny, Zeny + @MONEY_DESERTSHIRT;
- getexp @XP_DESERTSHIRT,0;
- set @Q_status, @Q_status | (1<<@BIT_DESERTSHIRT);
- callsub S_Update_Var;
+ delitem "DesertShirt", 1;
+ set Zeny, Zeny + @MONEY_DESERTSHIRT;
+ getexp @XP_DESERTSHIRT,0;
+ set @Q_status, @Q_status | (1<<@BIT_DESERTSHIRT);
+ callsub S_Update_Var;
close;
L_SerfHat_Item:
if(@Q_status & (1<<@BIT_SERFHAT)) goto L_havealready;
if (countitem("SerfHat") < 1) goto L_Noitem;
- delitem "SerfHat", 1;
- set Zeny, Zeny + @MONEY_SERFHAT;
- getexp @XP_SERFHAT,0;
- set @Q_status, @Q_status | (1<<@BIT_SERFHAT);
- callsub S_Update_Var;
+ delitem "SerfHat", 1;
+ set Zeny, Zeny + @MONEY_SERFHAT;
+ getexp @XP_SERFHAT,0;
+ set @Q_status, @Q_status | (1<<@BIT_SERFHAT);
+ callsub S_Update_Var;
close;
L_tongue_Item:
if(@Q_status & (1<<@BIT_MS_TONGUE)) goto L_havealready;
if (countitem("MountainSnakeTongue") < 1) goto L_Noitem;
- delitem "MountainSnakeTongue", 1;
- set Zeny, Zeny + @MONEY_MS_TONGUE;
- getexp @XP_MS_TONGUE,0;
- set @Q_status, @Q_status | (1<<@BIT_MS_TONGUE);
- callsub S_Update_Var;
-close;
+ delitem "MountainSnakeTongue", 1;
+ set Zeny, Zeny + @MONEY_MS_TONGUE;
+ getexp @XP_MS_TONGUE,0;
+ set @Q_status, @Q_status | (1<<@BIT_MS_TONGUE);
+ callsub S_Update_Var;
+ close;
L_egg_Item:
if(@Q_status & (1<<@BIT_MS_EGG)) goto L_havealready;
if (countitem("MountainSnakeEgg") < 1) goto L_Noitem;
- delitem "MountainSnakeEgg", 1;
- set Zeny, Zeny + @MONEY_MS_EGG;
- getexp @XP_MS_EGG,0;
- set @Q_status, @Q_status | (1<<@BIT_MS_EGG);
- callsub S_Update_Var;
-close;
+ delitem "MountainSnakeEgg", 1;
+ set Zeny, Zeny + @MONEY_MS_EGG;
+ getexp @XP_MS_EGG,0;
+ set @Q_status, @Q_status | (1<<@BIT_MS_EGG);
+ callsub S_Update_Var;
+ close;
L_skin_Item:
if(@Q_status & (1<<@BIT_SNAKESKIN)) goto L_havealready;
if (countitem("SnakeSkin") < 1) goto L_Noitem;
- delitem "SnakeSkin", 1;
- set Zeny, Zeny + @MONEY_SNAKESKIN;
- getexp @XP_SNAKESKIN,0;
- set @Q_status, @Q_status | (1<<@BIT_SNAKESKIN);
- callsub S_Update_Var;
-close;
+ delitem "SnakeSkin", 1;
+ set Zeny, Zeny + @MONEY_SNAKESKIN;
+ getexp @XP_SNAKESKIN,0;
+ set @Q_status, @Q_status | (1<<@BIT_SNAKESKIN);
+ callsub S_Update_Var;
+ close;
L_BugLegItem:
if(@Q_status & (1<<@BIT_BUGLEG)) goto L_havealready;
if (countitem("BugLeg") < 1) goto L_Noitem;
- delitem "BugLeg", 1;
- set Zeny, Zeny + @MONEY_BUGLEG;
- getexp @XP_BUGLEG,0;
- set @Q_status, @Q_status | (1<<@BIT_BUGLEG);
- callsub S_Update_Var;
-close;
+ delitem "BugLeg", 1;
+ set Zeny, Zeny + @MONEY_BUGLEG;
+ getexp @XP_BUGLEG,0;
+ set @Q_status, @Q_status | (1<<@BIT_BUGLEG);
+ callsub S_Update_Var;
+ close;
L_Noitem:
mes @npcname$;
mes "\"Well, if you happen to get items from Tulimshar, see me first before you sell anything.\"";
-close;
+ close;
L_havealready:
mes @npcname$;
mes "\"I already collected what you can offer me.\"";
-close;
+ close;
S_Update_Var:
set QUEST_Nivalis_state,
@@ -293,7 +293,7 @@ L_2_init:
next;
set @Q_status2, 1;
callsub S_Update_Var2;
-close;
+ close;
L_2_talk1:
mes @npcname$;
@@ -313,7 +313,7 @@ L_2_talk1:
mes "\"Ok.\"";
set @Q_status2, 2;
callsub S_Update_Var2;
-close;
+ close;
L_2_talk2:
mes @npcname$;
@@ -336,7 +336,7 @@ L_2_talk2:
mes "\"I WANT YOU TO KILL THAT BASTARD!!\"";
set @Q_status2, 3;
callsub S_Update_Var2;
-close;
+ close;
L_2_talk3:
menu "Ok, I am a professional in doing such things", L_2_professional,
@@ -346,7 +346,7 @@ L_2_talk3:
"Nevermind", -;
mes @npcname$;
mes "\"Get out of my way, prank!\"";
-close;
+ close;
L_2_professional:
mes @npcname$;
@@ -374,7 +374,7 @@ L_2_name:
"They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", -;
mes @npcname$;
mes "\"Alright, I see. Ok maybe I really need to calm down. Please leave me alone... I will try to calm down, ok?\"";
-close;
+ close;
S_Update_Var2:
set QUEST_Nivalis_state,
@@ -383,6 +383,6 @@ S_Update_Var2:
set QUEST_Nivalis_state,
(QUEST_Nivalis_state & ~(@Q_MASK2_BITS)
| (@Q_status2_bits << @Q_SHIFT2_BITS));
-return;
+ return;
}