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/027-3 | |
| 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/027-3')
| -rw-r--r-- | world/map/npc/027-3/_mobs.txt | 18 | ||||
| -rw-r--r-- | world/map/npc/027-3/monsters.txt | 14 |
2 files changed, 15 insertions, 17 deletions
diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt index 6256db5e..57088677 100644 --- a/world/map/npc/027-3/_mobs.txt +++ b/world/map/npc/027-3/_mobs.txt @@ -1,17 +1,17 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Crypt Basement mobs -027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043 -027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043 -027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044 -027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044 -027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000,8000,Mob027-3::On1043 -027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000,30000,Mob027-3::On1066 -027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000,20000,Mob027-3::On1024 -027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000,20000,Mob027-3::On1023 +027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044 +027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044 +027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000ms,8000ms,Mob027-3::On1043 +027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-3::On1066 +027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000ms,20000ms,Mob027-3::On1024 +027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000ms,20000ms,Mob027-3::On1023 -027-3.gat,0,0,0|script|Mob027-3|-1, +027-3.gat,0,0,0|script|Mob027-3|-1 { end; diff --git a/world/map/npc/027-3/monsters.txt b/world/map/npc/027-3/monsters.txt index 7aaa7fd5..96edc6be 100644 --- a/world/map/npc/027-3/monsters.txt +++ b/world/map/npc/027-3/monsters.txt @@ -1,12 +1,12 @@ // 027-3 Graveyard zombies and fallens // they need to be in an extra file because of the crying child quest -027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000,120000,specialMob027-3::On1036 -027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000,10000,specialMob027-3::On1036 -027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000,30000,specialMob027-3::On1036 -027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000,30000,specialMob027-3::On1045 +027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000ms,120000ms,specialMob027-3::On1036 +027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000ms,10000ms,specialMob027-3::On1036 +027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000ms,30000ms,specialMob027-3::On1036 +027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000ms,30000ms,specialMob027-3::On1045 -027-3.gat,0,0,0|script|specialMob027-3|-1, +027-3.gat,0,0,0|script|specialMob027-3|-1 { end; @@ -64,8 +64,6 @@ L_Return: return; S_Update_Mask: - set QUEST_Graveyard_Inn, - (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) - | (@state << @Graveyard_Inn_SHIFT); + set QUEST_Graveyard_Inn, (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) | (@state << @Graveyard_Inn_SHIFT); return; } |