diff options
author | Wushin <pasekei@gmail.com> | 2015-02-01 13:20:36 -0600 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-02-01 13:20:36 -0600 |
commit | 7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7 (patch) | |
tree | d8bc376f768085d422dc523fabe7823b878ee3d3 /world/map/npc/015-3 | |
parent | 44d34c2835e8f6601bbb0e320c82240c19cdbea3 (diff) | |
parent | 06d909765be760521b8379cda26167e2e7804cff (diff) | |
download | serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.gz serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.bz2 serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.xz serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.zip |
Merge pull request #267 from mekolat/gat
remove .gat
Diffstat (limited to 'world/map/npc/015-3')
-rw-r--r-- | world/map/npc/015-3/_import.txt | 4 | ||||
-rw-r--r-- | world/map/npc/015-3/_mobs.txt | 12 | ||||
-rw-r--r-- | world/map/npc/015-3/_warps.txt | 4 | ||||
-rw-r--r-- | world/map/npc/015-3/barrier.txt | 4 | ||||
-rw-r--r-- | world/map/npc/015-3/katze.txt | 4 | ||||
-rw-r--r-- | world/map/npc/015-3/mapflags.txt | 4 | ||||
-rw-r--r-- | world/map/npc/015-3/pot.txt | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/world/map/npc/015-3/_import.txt b/world/map/npc/015-3/_import.txt index 5eed93fd..c0f4fc4f 100644 --- a/world/map/npc/015-3/_import.txt +++ b/world/map/npc/015-3/_import.txt @@ -1,6 +1,6 @@ // Map 015-3: Cat's Cave -// This file is generated automatically. All manually changes will be removed when running the Converter. -map: 015-3.gat +// This file is generated automatically. All manually added changes will be removed when running the Converter. +map: 015-3 npc: npc/015-3/_mobs.txt npc: npc/015-3/_warps.txt npc: npc/015-3/barrier.txt diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt index 9c1e23ba..03f2627c 100644 --- a/world/map/npc/015-3/_mobs.txt +++ b/world/map/npc/015-3/_mobs.txt @@ -1,13 +1,13 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. +// This file is generated automatically. All manually added changes will be removed when running the Converter. // Cat's Cave mobs -015-3.gat,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms,Mob015-3::On1017 -015-3.gat,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms,Mob015-3::On1002 -015-3.gat,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms,Mob015-3::On1002 -015-3.gat,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012 +015-3,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms,Mob015-3::On1017 +015-3,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms,Mob015-3::On1002 +015-3,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms,Mob015-3::On1002 +015-3,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012 -015-3.gat,0,0,0|script|Mob015-3|-1 +015-3,0,0,0|script|Mob015-3|-1 { end; diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt index ec6b4d3e..fea56f7e 100644 --- a/world/map/npc/015-3/_warps.txt +++ b/world/map/npc/015-3/_warps.txt @@ -1,4 +1,4 @@ -// This file is generated automatically. All manually changes will be removed when running the Converter. +// This file is generated automatically. All manually added changes will be removed when running the Converter. // Cat's Cave warps -015-3.gat,31,43|warp|To Woodland|-1,-1,015-1.gat,59,32 +015-3,31,43|warp|To Woodland|-1,-1,015-1,59,32 diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt index 7e34aeee..f65b6c85 100644 --- a/world/map/npc/015-3/barrier.txt +++ b/world/map/npc/015-3/barrier.txt @@ -1,7 +1,7 @@ // You can only enter the cat cave naked, otherwise the cat's reaction scares // you away. You can also get in while wearing the cat ears. -015-3.gat,31,42,0|script|#CatCaveBarrier|45,1,1 +015-3,31,42,0|script|#CatCaveBarrier|45,1,1 { set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if (getequipid(equip_head) != 1217 @@ -24,7 +24,7 @@ goto L_Close; L_Not_Naked: - warp "015-1.gat", 60, 32; + warp "015-1", 60, 32; set @Hiss, 1; callsub S_Update_Hiss; mes "\"GRAAUWL! Hissss...\""; diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt index cbf48d22..8e94ce06 100644 --- a/world/map/npc/015-3/katze.txt +++ b/world/map/npc/015-3/katze.txt @@ -16,7 +16,7 @@ // * 2 Hard spikes // * 2 Tiny potions -015-3.gat,32,25,0|script|Katze|172 +015-3,32,25,0|script|Katze|172 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); @@ -44,7 +44,7 @@ L_ThrowStone: set @cat, 0; callsub S_Update_Katze; percentheal -30, 0; - warp "015-1.gat", 60, 32; + warp "015-1", 60, 32; mes "\"GRAAUWL! Hissss...\""; mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea..."; goto L_Close; diff --git a/world/map/npc/015-3/mapflags.txt b/world/map/npc/015-3/mapflags.txt index 0123e3b9..04397e31 100644 --- a/world/map/npc/015-3/mapflags.txt +++ b/world/map/npc/015-3/mapflags.txt @@ -1,2 +1,2 @@ -015-3.gat|mapflag|nosave|015-1,59,32 -015-3.gat|mapflag|resave|010-1,27,97 +015-3|mapflag|nosave|015-1,59,32 +015-3|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt index 9c6ccc8f..523be319 100644 --- a/world/map/npc/015-3/pot.txt +++ b/world/map/npc/015-3/pot.txt @@ -1,6 +1,6 @@ // The pot where the player can deposit stuff for the cat. -015-3.gat,37,29,0|script|Pot|400 +015-3,37,29,0|script|Pot|400 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); |