diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-07 08:42:44 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-07 08:42:44 -0600 |
| commit | 63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch) | |
| tree | fd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 /world/map/npc/016-1 | |
| parent | 95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff) | |
| parent | 4cc9ace3c293a6592bcca06db2a558e01308372a (diff) | |
| download | serverdata-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/016-1')
| -rw-r--r-- | world/map/npc/016-1/_mobs.txt | 26 | ||||
| -rw-r--r-- | world/map/npc/016-1/gwendolyn.txt | 6 |
2 files changed, 15 insertions, 17 deletions
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt index 9fd9e68c..781e2392 100644 --- a/world/map/npc/016-1/_mobs.txt +++ b/world/map/npc/016-1/_mobs.txt @@ -1,19 +1,19 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Woodland mobs -016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000,30000,Mob016-1::On1037 -016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055 -016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038 -016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028 -016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0,0,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0,0,Mob016-1::On1030 -016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000,180000,Mob016-1::On1029 -016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000,7000,Mob016-1::On1035 - - -016-1.gat,0,0,0|script|Mob016-1|-1, +016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037 +016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055 +016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038 +016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028 +016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030 +016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029 +016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035 + + +016-1.gat,0,0,0|script|Mob016-1|-1 { end; diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt index 828acff3..e27b61db 100644 --- a/world/map/npc/016-1/gwendolyn.txt +++ b/world/map/npc/016-1/gwendolyn.txt @@ -21,7 +21,7 @@ // 5, state5: you are ready to do the targeting minigame // 6, state6: you did the minigame -016-1.gat,33,45,0|script|Gwendolyn|182, +016-1.gat,33,45,0|script|Gwendolyn|182 { // schoolfee in gp set @SCHOOLFEE, 25000; @@ -548,9 +548,7 @@ L_Close: close; S_Update_Var: - set QUEST_Forestbow_state, - (QUEST_Forestbow_state & ~(@Q_hawkseye_MASK) - | (@Q_hawkseye << @Q_hawkseye_SHIFT)); + set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_hawkseye_MASK) | (@Q_hawkseye << @Q_hawkseye_SHIFT)); return; S_getDirection: |