diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
| commit | ea7d999c39ead96efb6d9af7e68794c59290cf60 (patch) | |
| tree | 771e06363fe2e7609847a0a63a2e499632d3d7a2 /world/map/npc/027-6 | |
| parent | 9e7f46ac732851c1359a15837c82ebf67ea2be39 (diff) | |
| parent | 91fe3711fcacdfe83794b4347595e56e90e9d3a7 (diff) | |
| download | serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.gz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.bz2 serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.xz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3 spells
Diffstat (limited to 'world/map/npc/027-6')
| -rw-r--r-- | world/map/npc/027-6/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/027-6/_mobs.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/027-6/_nodes.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/027-6/general_krukan.txt | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/world/map/npc/027-6/_import.txt b/world/map/npc/027-6/_import.txt index 5c19c47b..48dbcf11 100644 --- a/world/map/npc/027-6/_import.txt +++ b/world/map/npc/027-6/_import.txt @@ -2,6 +2,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. map: 027-6 npc: npc/027-6/_mobs.txt +npc: npc/027-6/_nodes.txt npc: npc/027-6/_warps.txt npc: npc/027-6/casket_traps.txt npc: npc/027-6/general_krukan.txt diff --git a/world/map/npc/027-6/_mobs.txt b/world/map/npc/027-6/_mobs.txt index 407a697e..a6d6a471 100644 --- a/world/map/npc/027-6/_mobs.txt +++ b/world/map/npc/027-6/_mobs.txt @@ -1,9 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Crypt Sub-Basement Two mobs - - -027-6,0,0,0|script|Mob027-6|32767 -{ - end; -} diff --git a/world/map/npc/027-6/_nodes.txt b/world/map/npc/027-6/_nodes.txt new file mode 100644 index 00000000..4e14e522 --- /dev/null +++ b/world/map/npc/027-6/_nodes.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Crypt Sub-Basement Two nodes + +// (no nodes) diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index 6b086cee..1c2ff95f 100644 --- a/world/map/npc/027-6/general_krukan.txt +++ b/world/map/npc/027-6/general_krukan.txt @@ -86,7 +86,7 @@ OnTimer5000: L_Return_1: set $@CRYPT_FIGHT1_PLAYER_COUNT, 0; - areatimer "027-6", 0, 0, 79, 84, 10, "General Krukan::OnTick"; + areatimer 0, "027-6", 0, 0, 79, 84, 10, "General Krukan::OnTick"; end; L_CryptLogic: @@ -182,7 +182,7 @@ L_CleanUpLosers: end; L_CleanUp: - areatimer "027-6", 0, 0, 79, 84, 10, "General Krukan::OnReward"; + areatimer 0, "027-6", 0, 0, 79, 84, 10, "General Krukan::OnReward"; set $@CRYPT_FIGHT1, 0; set $@CRYPT_FIGHT1_PLAYER_COUNT, 0; set $@CRYPT_FIGHT1_WAVE, 0; |