summaryrefslogtreecommitdiff
path: root/world/map/npc/011-6
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
committerWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
commit63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch)
treefd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 /world/map/npc/011-6
parent95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff)
parent4cc9ace3c293a6592bcca06db2a558e01308372a (diff)
downloadserverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip
Merge pull request #206 from wushin/AST-FIX
AST script fix
Diffstat (limited to 'world/map/npc/011-6')
-rw-r--r--world/map/npc/011-6/_mobs.txt96
-rw-r--r--world/map/npc/011-6/barrier.txt2
-rw-r--r--world/map/npc/011-6/bryant.txt2
-rw-r--r--world/map/npc/011-6/crastur.txt2
4 files changed, 51 insertions, 51 deletions
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 9bf56f93..c627e4aa 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,56 +1,56 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Bandit Cave mobs
-011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000,100000,Mob011-6::On1035
-011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000,60000,Mob011-6::On1064
-011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,223,250,123,65|monster|Bat|1017,5,30000,100000,Mob011-6::On1017
-011-6.gat,224,175,118,25|monster|Bat|1017,3,30000,100000,Mob011-6::On1017
-011-6.gat,257,77,4,126|monster|Bat|1017,6,30000,100000,Mob011-6::On1017
-011-6.gat,192,77,4,126|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,167,110,87,13|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,75,70,104,96|monster|Bat|1017,23,30000,100000,Mob011-6::On1017
-011-6.gat,78,195,129,97|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000,100000,Mob011-6::On1013
-011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000,100000,Mob011-6::On1007
-011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000,100000,Mob011-6::On1007
-011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000,100000,Mob011-6::On1056
-011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000,100000,Mob011-6::On1056
+011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035
+011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064
+011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6.gat,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013
+011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007
+011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056
+011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
-011-6.gat,0,0,0|script|Mob011-6|-1,
+011-6.gat,0,0,0|script|Mob011-6|-1
{
end;
diff --git a/world/map/npc/011-6/barrier.txt b/world/map/npc/011-6/barrier.txt
index cf5908e4..7b4f2b25 100644
--- a/world/map/npc/011-6/barrier.txt
+++ b/world/map/npc/011-6/barrier.txt
@@ -1,4 +1,4 @@
-011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0,
+011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0
{
set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 42b8c747..2aaa15fe 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -1,7 +1,7 @@
//NPC to set the state for killing the bandit lord.
// Variables used: nibble 0 of QUEST_Hurnscald
-011-6.gat,27,200,0|script|Bryant|126,
+011-6.gat,27,200,0|script|Bryant|126
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index f9acb0bf..2818998b 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -1,4 +1,4 @@
-011-6.gat,172,250,0|script|Crastur the Ugly|418,
+011-6.gat,172,250,0|script|Crastur the Ugly|418
{
set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);