From 93e19df0fabe442abcc45b88f36b3210dcf121b5 Mon Sep 17 00:00:00 2001 From: Micksha Date: Mon, 3 Feb 2020 21:12:10 +0000 Subject: add signs to 008-1, 008-1-1 and 008-1-2 --- conf/map/maps.conf | 1 + db/map_index.txt | 79 ++++++++++++++++++++++--------------------- maps/re/008-1-1.mcache | Bin 2015 -> 2022 bytes maps/re/008-1-2.mcache | Bin 0 -> 5336 bytes maps/re/008-1.mcache | Bin 6901 -> 6901 bytes npc/001-2-32/_import.txt | 2 +- npc/001-2-32/_warps.txt | 2 +- npc/001-2-34/_import.txt | 2 +- npc/001-2-34/_warps.txt | 2 +- npc/001-2-35/_import.txt | 2 +- npc/001-2-35/_warps.txt | 2 +- npc/001-2-36/_import.txt | 2 +- npc/001-2-36/_warps.txt | 2 +- npc/001-2-37/_import.txt | 2 +- npc/001-2-37/_savepoints.txt | 2 +- npc/001-2-37/_warps.txt | 2 +- npc/001-2-38/_import.txt | 2 +- npc/001-2-38/_savepoints.txt | 2 +- npc/001-2-38/_warps.txt | 2 +- npc/001-2-39/_import.txt | 2 +- npc/001-2-39/_warps.txt | 2 +- npc/008-1-1/_import.txt | 1 + npc/008-1-1/_mobs.txt | 10 ++++-- npc/008-1-1/_warps.txt | 1 + npc/008-1-1/sign.txt | 24 +++++++++++++ npc/008-1-2/_import.txt | 4 +++ npc/008-1-2/_warps.txt | 4 +++ npc/008-1-2/sign.txt | 34 +++++++++++++++++++ npc/008-1/_import.txt | 1 + npc/008-1/_warps.txt | 1 + npc/008-1/sign.txt | 50 +++++++++++++++++++++++++++ npc/_anchors.txt | 1 + npc/_import.txt | 1 + 33 files changed, 187 insertions(+), 57 deletions(-) create mode 100644 maps/re/008-1-2.mcache create mode 100644 npc/008-1-1/sign.txt create mode 100644 npc/008-1-2/_import.txt create mode 100644 npc/008-1-2/_warps.txt create mode 100644 npc/008-1-2/sign.txt create mode 100644 npc/008-1/sign.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index a8e041a0..feae4da0 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -58,6 +58,7 @@ map_list: ( "001-3-1", "001-3-2", "008-1-1", + "008-1-2", "008-1", "008-2-0", "008-2-1", diff --git a/db/map_index.txt b/db/map_index.txt index 7243548d..3bac58a3 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -55,42 +55,43 @@ 001-3-1 55 001-3-2 56 008-1-1 57 -008-1 58 -008-2-0 59 -008-2-1 60 -008-2-10 61 -008-2-11 62 -008-2-12 63 -008-2-13 64 -008-2-14 65 -008-2-15 66 -008-2-16 67 -008-2-17 68 -008-2-18 69 -008-2-19 70 -008-2-2 71 -008-2-20 72 -008-2-21 73 -008-2-22 74 -008-2-23 75 -008-2-24 76 -008-2-25 77 -008-2-26 78 -008-2-27 79 -008-2-28 80 -008-2-29 81 -008-2-3 82 -008-2-30 83 -008-2-31 84 -008-2-32 85 -008-2-4 86 -008-2-5 87 -008-2-6 88 -008-2-7 89 -008-2-8 90 -008-2-9 91 -008-3-0 92 -008-3-1 93 -008-4-1 94 -test 95 -testbg 96 +008-1-2 58 +008-1 59 +008-2-0 60 +008-2-1 61 +008-2-10 62 +008-2-11 63 +008-2-12 64 +008-2-13 65 +008-2-14 66 +008-2-15 67 +008-2-16 68 +008-2-17 69 +008-2-18 70 +008-2-19 71 +008-2-2 72 +008-2-20 73 +008-2-21 74 +008-2-22 75 +008-2-23 76 +008-2-24 77 +008-2-25 78 +008-2-26 79 +008-2-27 80 +008-2-28 81 +008-2-29 82 +008-2-3 83 +008-2-30 84 +008-2-31 85 +008-2-32 86 +008-2-4 87 +008-2-5 88 +008-2-6 89 +008-2-7 90 +008-2-8 91 +008-2-9 92 +008-3-0 93 +008-3-1 94 +008-4-1 95 +test 96 +testbg 97 diff --git a/maps/re/008-1-1.mcache b/maps/re/008-1-1.mcache index 5a8705a2..704869a3 100644 Binary files a/maps/re/008-1-1.mcache and b/maps/re/008-1-1.mcache differ diff --git a/maps/re/008-1-2.mcache b/maps/re/008-1-2.mcache new file mode 100644 index 00000000..7c9d08f7 Binary files /dev/null and b/maps/re/008-1-2.mcache differ diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache index a819d56d..38c10582 100644 Binary files a/maps/re/008-1.mcache and b/maps/re/008-1.mcache differ diff --git a/npc/001-2-32/_import.txt b/npc/001-2-32/_import.txt index 9043352d..b59046e0 100644 --- a/npc/001-2-32/_import.txt +++ b/npc/001-2-32/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-32: unnamed +// Map 001-2-32: Training Arena Lobby // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-32/_warps.txt", "npc/001-2-32/doors.txt", diff --git a/npc/001-2-32/_warps.txt b/npc/001-2-32/_warps.txt index 306493cb..4db4b354 100644 --- a/npc/001-2-32/_warps.txt +++ b/npc/001-2-32/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-32: unnamed warps +// Map 001-2-32: Training Arena Lobby warps 001-2-32,27,33,0 warp #001-2-32_27_33 0,0,001-2-33,39,33 diff --git a/npc/001-2-34/_import.txt b/npc/001-2-34/_import.txt index 326973e6..9ec74d40 100644 --- a/npc/001-2-34/_import.txt +++ b/npc/001-2-34/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-34: unnamed +// Map 001-2-34: Training Room Lobby // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-34/_warps.txt", "npc/001-2-34/doors.txt", diff --git a/npc/001-2-34/_warps.txt b/npc/001-2-34/_warps.txt index 1311f071..06f74a95 100644 --- a/npc/001-2-34/_warps.txt +++ b/npc/001-2-34/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-34: unnamed warps +// Map 001-2-34: Training Room Lobby warps 001-2-34,29,33,0 warp #001-2-34_29_33 0,0,001-2-33,29,33 diff --git a/npc/001-2-35/_import.txt b/npc/001-2-35/_import.txt index 969d9e1c..a4496ab4 100644 --- a/npc/001-2-35/_import.txt +++ b/npc/001-2-35/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-35: unnamed +// Map 001-2-35: Training Arena // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-35/_warps.txt", "npc/001-2-35/mapflags.txt", diff --git a/npc/001-2-35/_warps.txt b/npc/001-2-35/_warps.txt index d5939222..9ee7b9ba 100644 --- a/npc/001-2-35/_warps.txt +++ b/npc/001-2-35/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-35: unnamed warps +// Map 001-2-35: Training Arena warps 001-2-35,23,29,0 warp #001-2-35_23_29 0,0,001-2-32,32,29 diff --git a/npc/001-2-36/_import.txt b/npc/001-2-36/_import.txt index 57397efd..403b0b12 100644 --- a/npc/001-2-36/_import.txt +++ b/npc/001-2-36/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-36: unnamed +// Map 001-2-36: Training Room // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-36/_warps.txt", "npc/001-2-36/hector.txt", diff --git a/npc/001-2-36/_warps.txt b/npc/001-2-36/_warps.txt index 530050a7..bcb74de9 100644 --- a/npc/001-2-36/_warps.txt +++ b/npc/001-2-36/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-36: unnamed warps +// Map 001-2-36: Training Room warps 001-2-36,37,30,0 warp #001-2-36_37_30 0,0,001-2-34,24,29 diff --git a/npc/001-2-37/_import.txt b/npc/001-2-37/_import.txt index 05315d64..03162e19 100644 --- a/npc/001-2-37/_import.txt +++ b/npc/001-2-37/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-37: unnamed +// Map 001-2-37: Legion West Wing // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-37/_savepoints.txt", "npc/001-2-37/_warps.txt", diff --git a/npc/001-2-37/_savepoints.txt b/npc/001-2-37/_savepoints.txt index cd68fab2..30d7a797 100644 --- a/npc/001-2-37/_savepoints.txt +++ b/npc/001-2-37/_savepoints.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-37: unnamed saves +// Map 001-2-37: Legion West Wing saves 001-2-37,25,41,0 script #save_001-2-37_25_41 NPC_SAVE_POINT,0,0,{ savepointparticle .map$, .x, .y, NO_INN; close; diff --git a/npc/001-2-37/_warps.txt b/npc/001-2-37/_warps.txt index f6997b5f..dabc5285 100644 --- a/npc/001-2-37/_warps.txt +++ b/npc/001-2-37/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-37: unnamed warps +// Map 001-2-37: Legion West Wing warps 001-2-37,37,28,0 warp #001-2-37_37_28 0,0,001-2-33,24,30 001-2-37,37,33,0 warp #001-2-37_37_33 0,0,001-2-39,24,33 diff --git a/npc/001-2-38/_import.txt b/npc/001-2-38/_import.txt index e60aa3f9..63d2a402 100644 --- a/npc/001-2-38/_import.txt +++ b/npc/001-2-38/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-38: unnamed +// Map 001-2-38: Legion East Wing // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-38/_savepoints.txt", "npc/001-2-38/_warps.txt", diff --git a/npc/001-2-38/_savepoints.txt b/npc/001-2-38/_savepoints.txt index d4e4db2c..59be0f59 100644 --- a/npc/001-2-38/_savepoints.txt +++ b/npc/001-2-38/_savepoints.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-38: unnamed saves +// Map 001-2-38: Legion East Wing saves 001-2-38,25,41,0 script #save_001-2-38_25_41 NPC_SAVE_POINT,0,0,{ savepointparticle .map$, .x, .y, NO_INN; close; diff --git a/npc/001-2-38/_warps.txt b/npc/001-2-38/_warps.txt index 9139345a..53e119b5 100644 --- a/npc/001-2-38/_warps.txt +++ b/npc/001-2-38/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-38: unnamed warps +// Map 001-2-38: Legion East Wing warps 001-2-38,23,28,0 warp #001-2-38_23_28 0,0,001-2-33,44,30 001-2-38,23,33,0 warp #001-2-38_23_33 0,0,001-2-39,44,33 diff --git a/npc/001-2-39/_import.txt b/npc/001-2-39/_import.txt index 8ceee767..f3a2043a 100644 --- a/npc/001-2-39/_import.txt +++ b/npc/001-2-39/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-39: unnamed +// Map 001-2-39: Legion Command Room // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-39/_warps.txt", "npc/001-2-39/mapflags.txt", diff --git a/npc/001-2-39/_warps.txt b/npc/001-2-39/_warps.txt index 527acae5..1a25cfd3 100644 --- a/npc/001-2-39/_warps.txt +++ b/npc/001-2-39/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-39: unnamed warps +// Map 001-2-39: Legion Command Room warps 001-2-39,45,33,0 warp #001-2-39_45_33 0,0,001-2-38,24,33 001-2-39,23,33,0 warp #001-2-39_23_33 0,0,001-2-37,36,33 diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt index 119610cc..4788f56c 100644 --- a/npc/008-1-1/_import.txt +++ b/npc/008-1-1/_import.txt @@ -5,3 +5,4 @@ "npc/008-1-1/galimatia.txt", "npc/008-1-1/koga.txt", "npc/008-1-1/morcant.txt", +"npc/008-1-1/sign.txt", diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt index 35a0bc0f..e836fe97 100644 --- a/npc/008-1-1/_mobs.txt +++ b/npc/008-1-1/_mobs.txt @@ -2,7 +2,7 @@ // Map 008-1-1: Woodland mobs 008-1-1,173,86,25,5 monster Forest Maggot 1028,12,500,2500 008-1-1,132,56,7,5 monster Forest Maggot 1028,5,500,2500 -008-1-1,144,91,11,16 monster Butterfly 1032,8,10000,10000 +008-1-1,74,59,9,16 monster Butterfly 1032,4,20000,10000 008-1-1,63,73,11,5 monster Maggot 1026,7,500,10000 008-1-1,206,87,6,4 monster Mouboo 1023,3,30000,60000 008-1-1,131,45,0,0 monster Beehive 1056,1,30000,100000 @@ -17,9 +17,15 @@ 008-1-1,112,75,2,2 monster Pink Flower 1034,1,100,10000 008-1-1,110,46,3,2 monster Mauve Plant 1036,3,1000,2000 008-1-1,159,93,9,7 monster Silkworm 1040,4,3000,6000 -008-1-1,68,29,7,7 monster Mouboo 1023,3,30000,60000 +008-1-1,62,36,7,7 monster Mouboo 1023,3,30000,60000 008-1-1,126,45,0,0 monster Beehive 1056,1,30000,100000 008-1-1,121,45,0,0 monster Beehive 1056,1,30000,100000 008-1-1,163,178,2,1 monster Red Rose 1062,1,50000,10000 008-1-1,158,191,3,1 monster Yellow Rose 1060,1,20000,5000 008-1-1,166,184,1,1 monster Blue Rose 1061,1,100000,20000 +008-1-1,137,88,11,16 monster Butterfly 1032,8,10000,10000 +008-1-1,75,41,14,4 monster Silkworm 1040,3,9000,6000 +008-1-1,122,75,8,4 monster Forest Maggot 1028,3,50000,2500 +008-1-1,96,45,1,0 monster Red Rose 1062,1,50000,10000 +008-1-1,97,47,2,0 monster Yellow Rose 1060,1,20000,5000 +008-1-1,99,45,0,0 monster Blue Rose 1061,1,100000,20000 diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt index 11a32b86..db9189dc 100644 --- a/npc/008-1-1/_warps.txt +++ b/npc/008-1-1/_warps.txt @@ -3,3 +3,4 @@ 008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85 008-1-1,202,47,0 warp #008-1-1_202_47 0,0,008-3-0,129,112 008-1-1,51,57,0 warp #008-1-1_51_57 0,0,008-2-32,40,37 +008-1-1,181,198,0 warp #008-1-1_181_198 1,0,008-1-2,180,32 diff --git a/npc/008-1-1/sign.txt b/npc/008-1-1/sign.txt new file mode 100644 index 00000000..df554c2d --- /dev/null +++ b/npc/008-1-1/sign.txt @@ -0,0 +1,24 @@ +// Evol scripts. +// Authors: +// Micksha +// Description: +// Sign pillars in West Woodland. + +008-1-1,53,58,0 script Sign#008-1-1-merchant NPC_NO_SPRITE,{ + npctalkonce l("Merchant House"); + close; + +OnInit: + .distance = 1; + .sex = G_OTHER; + end; +} +008-1-1,157,87,0 script Sign#008-1-1-central NPC_NO_SPRITE,{ + npctalkonce l("Right: Hurnscald | Down: Swamp"); + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/008-1-2/_import.txt b/npc/008-1-2/_import.txt new file mode 100644 index 00000000..f49fc06e --- /dev/null +++ b/npc/008-1-2/_import.txt @@ -0,0 +1,4 @@ +// Map 008-1-2: Swamp +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/008-1-2/_warps.txt", +"npc/008-1-2/sign.txt", diff --git a/npc/008-1-2/_warps.txt b/npc/008-1-2/_warps.txt new file mode 100644 index 00000000..c7ee0e45 --- /dev/null +++ b/npc/008-1-2/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 008-1-2: Swamp warps +008-1-2,181,31,0 warp #008-1-2_181_31 1,0,008-1-1,180,197 +008-1-2,249,48,0 warp #008-1-2_249_48 0,0,008-1,23,216 diff --git a/npc/008-1-2/sign.txt b/npc/008-1-2/sign.txt new file mode 100644 index 00000000..73b011e3 --- /dev/null +++ b/npc/008-1-2/sign.txt @@ -0,0 +1,34 @@ +// Evol scripts. +// Authors: +// Micksha +// Description: +// Sign pillars in West Woodland. + +008-1-2,218,80,0 script Sign#008-1-2-northeast NPC_NO_SPRITE,{ + npctalkonce l("Up: West Woodland | Right: Dimond's Cove | Left: Sorentown"); + close; +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1-2,145,80,0 script Sign#008-1-2-sorentown NPC_NO_SPRITE,{ + npctalkonce l("Left: Asphodel Moor | Right: All directions"); + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1-2,39,192,0 script Sign#008-1-2-asphodel NPC_NO_SPRITE,{ + npctalkonce l("Down: Graveyard (under construction) | Up: All directions"); + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt index 018577b5..812a33fa 100644 --- a/npc/008-1/_import.txt +++ b/npc/008-1/_import.txt @@ -17,6 +17,7 @@ "npc/008-1/oscar.txt", "npc/008-1/sabine.txt", "npc/008-1/shop.txt", +"npc/008-1/sign.txt", "npc/008-1/snarfles.txt", "npc/008-1/soul-menhir.txt", "npc/008-1/voltain.txt", diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt index d0d93314..3464da48 100644 --- a/npc/008-1/_warps.txt +++ b/npc/008-1/_warps.txt @@ -27,3 +27,4 @@ 008-1,20,85,0 warp #008-1_20_85 0,1,008-1-1,246,85 008-1,165,171,0 warp #008-1_165_171 0,0,008-4-1,175,19 008-1,289,125,0 warp #008-1_289_125 0,0,008-2-31,29,25 +008-1,22,216,0 warp #008-1_22_216 0,0,008-1-2,248,48 diff --git a/npc/008-1/sign.txt b/npc/008-1/sign.txt new file mode 100644 index 00000000..17099ba4 --- /dev/null +++ b/npc/008-1/sign.txt @@ -0,0 +1,50 @@ +// Evol scripts. +// Authors: +// Micksha +// Description: +// Sign pillars in Hurnscald. + +008-1,142,105,0 script Sign#008-1-central NPC_NO_SPRITE,{ + npctalkonce l("Right: Hurnscald | Down: Dimond's Cove | Left: West Woodland | Up: Nivalis (under construction)"); + close; +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1,126,160,0 script Sign#008-1-south NPC_NO_SPRITE,{ + npctalkonce l("Down: Dimond's Cove | Left: Swamp"); + close; +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1,246,177,0 script Sign#008-1-southeast NPC_NO_SPRITE,{ + npctalkonce l("Left: Dimond's Cove | Up: Hurnscald | Right: Forsaken Inn"); + close; +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1,251,104,0 script Sign#008-1-hurns NPC_NO_SPRITE,{ + npctalkonce l("Left: West Woodland | Up: North Mine | Right: Harbor | Down: other directions"); + close; +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} + +008-1,247,105,0 script Sign#008-1-4144 NPC_NO_SPRITE,{ + npctalkonce l("This place is dedicated to 4144, the alltime Hero."); + close; +OnInit: + .distance = 1; + .sex = G_OTHER; + end; +} diff --git a/npc/_anchors.txt b/npc/_anchors.txt index 1ca080cb..d46e49f2 100644 --- a/npc/_anchors.txt +++ b/npc/_anchors.txt @@ -38,4 +38,5 @@ OnInit: htput(.ht, "^START|^BEGIN", "000-0 22 24"); htput(.ht, "^VEIN", "008-3-0 85 172"); htput(.ht, "^WARE", "001-2-18 37 31"); + htput(.ht, "^WEST|PORT", "008-1-1 52 60"); } diff --git a/npc/_import.txt b/npc/_import.txt index 4427e76b..e523471a 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -57,6 +57,7 @@ @include "npc/001-3-1/_import.txt" @include "npc/001-3-2/_import.txt" @include "npc/008-1-1/_import.txt" +@include "npc/008-1-2/_import.txt" @include "npc/008-1/_import.txt" @include "npc/008-2-0/_import.txt" @include "npc/008-2-1/_import.txt" -- cgit v1.2.3-60-g2f50