diff options
Diffstat (limited to 'world/map/npc/011-1')
-rw-r--r-- | world/map/npc/011-1/_import.txt | 4 | ||||
-rw-r--r-- | world/map/npc/011-1/_mobs.txt | 36 | ||||
-rw-r--r-- | world/map/npc/011-1/_warps.txt | 14 | ||||
-rw-r--r-- | world/map/npc/011-1/alchemist.txt | 2 | ||||
-rw-r--r-- | world/map/npc/011-1/auldsbel.txt | 2 | ||||
-rw-r--r-- | world/map/npc/011-1/mapflags.txt | 2 | ||||
-rw-r--r-- | world/map/npc/011-1/oscar.txt | 22 | ||||
-rw-r--r-- | world/map/npc/011-1/shops.txt | 2 |
8 files changed, 42 insertions, 42 deletions
diff --git a/world/map/npc/011-1/_import.txt b/world/map/npc/011-1/_import.txt index 3038a924..13faf23a 100644 --- a/world/map/npc/011-1/_import.txt +++ b/world/map/npc/011-1/_import.txt @@ -1,6 +1,6 @@ // Map 011-1: Woodland -// This file is generated automatically. All manually changes will be removed when running the Converter. -map: 011-1.gat +// This file is generated automatically. All manually added changes will be removed when running the Converter. +map: 011-1 npc: npc/011-1/_mobs.txt npc: npc/011-1/_warps.txt npc: npc/011-1/alchemist.txt diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt index 156afe85..bc35df56 100644 --- a/world/map/npc/011-1/_mobs.txt +++ b/world/map/npc/011-1/_mobs.txt @@ -1,23 +1,23 @@ -// 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. // Woodland mobs -011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0ms,0ms,Mob011-1::On1013 -011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob011-1::On1014 -011-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob011-1::On1019 -011-1.gat,0,0,0,0|monster|Snail|1041,1,0ms,0ms,Mob011-1::On1041 -011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 -011-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob011-1::On1029 -011-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,2700000ms,1800000ms,Mob011-1::On1032 -011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob011-1::On1035 -011-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob011-1::On1037 -011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038 -011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055 -011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 -011-1.gat,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob011-1::On1131 -011-1.gat,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002 - - -011-1.gat,0,0,0|script|Mob011-1|-1 +011-1,0,0,0,0|monster|EvilMushroom|1013,30,0ms,0ms,Mob011-1::On1013 +011-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob011-1::On1014 +011-1,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob011-1::On1019 +011-1,0,0,0,0|monster|Snail|1041,1,0ms,0ms,Mob011-1::On1041 +011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 +011-1,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob011-1::On1029 +011-1,0,0,0,0|monster|AlizarinPlant|1032,1,2700000ms,1800000ms,Mob011-1::On1032 +011-1,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob011-1::On1035 +011-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob011-1::On1037 +011-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038 +011-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055 +011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028 +011-1,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob011-1::On1131 +011-1,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002 + + +011-1,0,0,0|script|Mob011-1|-1 { end; diff --git a/world/map/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt index d608163f..9466fd96 100644 --- a/world/map/npc/011-1/_warps.txt +++ b/world/map/npc/011-1/_warps.txt @@ -1,9 +1,9 @@ -// 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. // Woodland warps -011-1.gat,58,92|warp|To Hermit's Cave|-1,-1,011-3.gat,0,0 -011-1.gat,30,61|warp|To Woodland|-1,1,014-1.gat,108,91 -011-1.gat,49,104|warp|To Woodland|0,-1,010-1.gat,48,25 -011-1.gat,124,62|warp|To Hurnscald Outskirts|-1,2,008-1.gat,25,61 -011-1.gat,73,9|warp|To Woodland Hills|0,-1,012-1.gat,132,175 -011-1.gat,38,36|warp|To Bandit Cave|-1,-1,011-6.gat,49,100 +011-1,58,92|warp|To Hermit's Cave|-1,-1,011-3,0,0 +011-1,30,61|warp|To Woodland|-1,1,014-1,108,91 +011-1,49,104|warp|To Woodland|0,-1,010-1,48,25 +011-1,124,62|warp|To Hurnscald Outskirts|-1,2,008-1,25,61 +011-1,73,9|warp|To Woodland Hills|0,-1,012-1,132,175 +011-1,38,36|warp|To Bandit Cave|-1,-1,011-6,49,100 diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt index 6e78a408..e4eade06 100644 --- a/world/map/npc/011-1/alchemist.txt +++ b/world/map/npc/011-1/alchemist.txt @@ -1,5 +1,5 @@ // This NPC makes potions and dyes -011-1.gat,117,77,0|script|Rauk|103 +011-1,117,77,0|script|Rauk|103 { // Setzer quest/monster oil quest participation set @SETZER_INITIAL, 0; diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt index 9790e8ef..a99eef70 100644 --- a/world/map/npc/011-1/auldsbel.txt +++ b/world/map/npc/011-1/auldsbel.txt @@ -1,7 +1,7 @@ // Auldsbel the Wizard // Transmutation Magic expert -011-1.gat,50,68,0|script|Auldsbel#_M|168 +011-1,50,68,0|script|Auldsbel#_M|168 { set @mexp, MAGIC_EXPERIENCE & 65535; diff --git a/world/map/npc/011-1/mapflags.txt b/world/map/npc/011-1/mapflags.txt index 75d34ade..0932c5c3 100644 --- a/world/map/npc/011-1/mapflags.txt +++ b/world/map/npc/011-1/mapflags.txt @@ -1 +1 @@ -011-1.gat|mapflag|resave|011-1,103,34 +011-1|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index 0db51330..3cc5c1e3 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -37,7 +37,7 @@ function|script|HalloweenQuestWaterPumpkins end; } -011-1.gat,94,38,0|script|Oscar|142 +011-1,94,38,0|script|Oscar|142 { // Check we are at the good time of the year if (!(gettime(6) == 11 && (gettime(5) >= 4 && gettime(5) <= 30))) goto L_NoEvent; @@ -331,8 +331,8 @@ L_TimerFunction: end; callsub S_CheckPlayer; set $@HalloweenQuest_PumpkinsTimer, $@HalloweenQuest_PumpkinsTimer + 1; - if (mobcount("011-1.gat", "Oscar::OnPD") < 0 && - mobcount("011-1.gat", "Oscar::OnPDP") < 0 && + if (mobcount("011-1", "Oscar::OnPD") < 0 && + mobcount("011-1", "Oscar::OnPDP") < 0 && $@HalloweenQuest_PumpkinsCount <= 0) goto L_AllPumpkinsDead; // A quick "cheer up" @@ -348,14 +348,14 @@ L_TimerFunction: L_TrySpawnPumpkin: if ($@HalloweenQuest_PumpkinsCount > 0) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD"; + areamonster "011-1", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD"; setnpctimer 0; end; OnTimer2500: if ($@HalloweenQuest_PumpkinsState != 0) end; - areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD"; + areamonster "011-1", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD"; end; OnTimer6000: @@ -388,13 +388,13 @@ OnPD: getitem "PumpkinHelmet", 1; // huntsman spider x1 if (@halloween_rand < (15*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP"; // Or spider x1 if (@halloween_rand >= (15*BaseLevel)/100 && @halloween_rand < (75*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP"; // Or archant x2 if (@halloween_rand >= (75*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP"; set @halloween_rand, 0; end; @@ -419,7 +419,7 @@ S_CheckPlayer: goto L_PlayerOff; if (isdead()) goto L_PlayerDead; - if (isin("011-1.gat",20,5,130,110) == 0) + if (isin("011-1",20,5,130,110) == 0) goto L_PlayerLeft; detachrid; return; @@ -454,8 +454,8 @@ L_Success: goto L_Clean; L_Clean: - killmonster "011-1.gat", "Oscar::OnPD"; - killmonster "011-1.gat", "Oscar::OnPDP"; + killmonster "011-1", "Oscar::OnPD"; + killmonster "011-1", "Oscar::OnPDP"; set $@HalloweenQuest_PumpkinHunter$, ""; set $@HalloweenQuest_PumpkinsCount, 0; set $@HalloweenQuest_PumpkinsState, 0; diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 48126fe2..1ccedec6 100644 --- a/world/map/npc/011-1/shops.txt +++ b/world/map/npc/011-1/shops.txt @@ -5,4 +5,4 @@ //################################################################################# // Shop -011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 +011-1,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 |