diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/006-2-1/_import.txt | 5 | ||||
| -rw-r--r-- | npc/006-2-5/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/006-2/_mobs.txt | 3 | ||||
| -rw-r--r-- | npc/018-7-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/018-7-1/demure.txt | 4 |
5 files changed, 10 insertions, 5 deletions
diff --git a/npc/006-2-1/_import.txt b/npc/006-2-1/_import.txt index 2b4c270cb..87ae69a2f 100644 --- a/npc/006-2-1/_import.txt +++ b/npc/006-2-1/_import.txt @@ -2,3 +2,8 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-2-1/_mobs.txt", "npc/006-2-1/_warps.txt", +"npc/006-2-1/camilot.txt", +"npc/006-2-1/chirp.txt", +"npc/006-2-1/jenny.txt", +"npc/006-2-1/lune.txt", +"npc/006-2-1/plum.txt", diff --git a/npc/006-2-5/_warps.txt b/npc/006-2-5/_warps.txt index 6f2842d15..aca02344a 100644 --- a/npc/006-2-5/_warps.txt +++ b/npc/006-2-5/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-2-5: Throne Room warps 006-2-5,38,35,0 warp #006-2-5_38_35 0,0,006-2,68,75 -006-2-5,34,21,0 warp #006-2-5_34_21 0,0,006-2-4,33,23 +006-2-5,34,21,0 warp #006-2-5_34_21 0,0,006-2-6,33,23 006-2-5,43,23,0 warp #006-2-5_43_23 0,0,006-2-4,39,23 diff --git a/npc/006-2/_mobs.txt b/npc/006-2/_mobs.txt index a6054ddfe..ea4136dd7 100644 --- a/npc/006-2/_mobs.txt +++ b/npc/006-2/_mobs.txt @@ -2,7 +2,8 @@ // Map 006-2: The Piou Islands mobs 006-2,68,72,9,6 monster Forest Piou 1202,5,30000,30000 006-2,92,100,9,6 monster Piousse 1003,12,30000,30000 -006-2,68,102,9,6 monster Mana Piou 1155,8,30000,30000 +006-2,68,101,9,6 monster Mana Piou 1155,8,30000,30000 006-2,44,100,9,6 monster Piou 1002,18,30000,30000 006-2,68,117,2,3 monster Forest Piou 1202,1,20000,15000 006-2,68,117,2,3 monster Mana Piou 1155,1,20000,15000 +006-2,68,72,6,5 monster Shrewboo 1435,4,30000,30000 diff --git a/npc/018-7-1/_import.txt b/npc/018-7-1/_import.txt index c18bacb5e..cefe635ad 100644 --- a/npc/018-7-1/_import.txt +++ b/npc/018-7-1/_import.txt @@ -1,5 +1,6 @@ // Map 018-7-1: Developers' Lair (Lilit Palace) // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-7-1/018-7-1_demure_blackbox.txt", "npc/018-7-1/_mobs.txt", "npc/018-7-1/_warps.txt", "npc/018-7-1/demure.txt", diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt index e9d0c323a..b6d666dc2 100644 --- a/npc/018-7-1/demure.txt +++ b/npc/018-7-1/demure.txt @@ -136,14 +136,12 @@ OnDem2: .@left+=mobcount(.@m$, strnpcinfo(NPC_NAME_UNIQUE)+"::OnDem2"); // You win! if (!.@left) { - // TODO: Call BLACKBOX - // BLACKBOX: Solo both of them within five(?) minutes, normal+, all map - // aka. @d_mode{1: 1, 2: 3, 3: 2+}, @elapsed < 300 mapannounce(getmap(), "CONGRATULATIONS - YOU WIN", bc_map | bc_pc); Zeny += rand2(500, 1500)*max(1, @d_mode2); // FIXME: Add a proper reward sleep2(100); instance_warpall("018-7-2", 23, 22); + 01871_Demure_BlackBox(); } end; |