diff options
| author | Reid <reidyaro@gmail.com> | 2016-11-25 03:58:04 +0000 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2016-11-25 03:58:04 +0000 |
| commit | c958963c69246c0e79da6b4b50d93f1a7b2cdb73 (patch) | |
| tree | cf1e12d526e97287435d8450a9d314d5fa099043 | |
| parent | b14cc0162d254793a65c5bff3ee7774c481927f7 (diff) | |
| parent | 6e0b1da9f86989a7c4abaf3915a0ba57f61a77bc (diff) | |
| download | serverdata-c958963c69246c0e79da6b4b50d93f1a7b2cdb73.tar.gz serverdata-c958963c69246c0e79da6b4b50d93f1a7b2cdb73.tar.bz2 serverdata-c958963c69246c0e79da6b4b50d93f1a7b2cdb73.tar.xz serverdata-c958963c69246c0e79da6b4b50d93f1a7b2cdb73.zip | |
Merge branch 'make-makefile' into 'master'
Make makefile
See merge request !45
141 files changed, 1134 insertions, 1180 deletions
@@ -29,11 +29,11 @@ Thumbs.db /core /ipch /login-server -/Makefile /Makefile.cache /map-server /mapcache /configure +/versions # /plugins -- everything /plugins/ diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..d2b0bafa --- /dev/null +++ b/Makefile @@ -0,0 +1,32 @@ +new: build config initdb + +server-update: updateconfig updatedb + +server-updatebuild: build updateconfig updatedb + +maps: + cd ../tools/hercules/ ; ./tmx_converter.py ../../client-data/ ../../server-data ; ./convert_tmx_to_mapcache.py + +build: + cd ../tools/localserver/ ; ./build.sh + +buildasan: + cd ../tools/localserver/ ; ./buildasan.sh + +config: + cd ../tools/localserver/ ; ./installconfigs.sh + +updateconfig: + cd ../tools/localserver/ ; ./updateconfigs.sh + +initdb: + cd ../tools/localserver/ ; ./initdb.sh + +updatedb: + cd ../tools/localserver/ ; ./updatedb.sh + +givegm: + cd ../tools/localserver/ ; ./givegm.sh ${ID} + +updates: + cd ../tools/update/ ; ./createnew.sh ; ./create_music.sh diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat Binary files differindex 03c3311a..6d8f8662 100644 --- a/db/re/map_cache.dat +++ b/db/re/map_cache.dat diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt index 6e826f37..039280fe 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,4 +1,5 @@ -// Map 000-0-0: La Johanne, First Deck, Sailor's Room +// Map 000-0-0: Sailor's Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-0-0/mapflags.txt", "npc/000-0-0/q'onan.txt", "npc/000-0-0/sailors.txt", diff --git a/npc/000-0-1/_import.txt b/npc/000-0-1/_import.txt index e6111ffc..ed783937 100644 --- a/npc/000-0-1/_import.txt +++ b/npc/000-0-1/_import.txt @@ -1,3 +1,4 @@ -// Map 000-0-1: La Johanne, First Deck, Sailor's Room +// Map 000-0-1: Sailor's Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-0-1/mapflags.txt", "npc/000-0-1/narrator.txt", diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index bce8195d..75f2626b 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,3 +1,4 @@ // Map 000-0: Oceania +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-0/mapflags.txt", "npc/000-0/sailors.txt", diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt index 0c43ef44..f103452c 100644 --- a/npc/000-1/_import.txt +++ b/npc/000-1/_import.txt @@ -1,5 +1,5 @@ // Map 000-1: Drasil Island -"npc/000-1/mapflags.txt", +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-1/_mobs.txt", "npc/000-1/_warps.txt", "npc/000-1/ale.txt", @@ -12,6 +12,7 @@ "npc/000-1/gulukan.txt", "npc/000-1/jalad.txt", "npc/000-1/lean.txt", +"npc/000-1/mapflags.txt", "npc/000-1/maxe.txt", "npc/000-1/muller.txt", "npc/000-1/panels.txt", diff --git a/npc/000-1/_mobs.txt b/npc/000-1/_mobs.txt index b0aa9802..894a04eb 100644 --- a/npc/000-1/_mobs.txt +++ b/npc/000-1/_mobs.txt @@ -1,6 +1,5 @@ -// Map 000-1: Drasil Island -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -000-1,0,0,0,0 monster Piou 1002,4,15000,60000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-1: Drasil Island mobs 000-1,28,49,12,19 monster Tortuga 1004,3,16000,120000 000-1,58,118,69,28 monster Tortuga 1004,4,35000,300000 000-1,71,95,9,24 monster Tortuga 1004,1,35000,300000 @@ -8,11 +7,6 @@ 000-1,37,66,22,10 monster Tortuga 1004,2,35000,120000 000-1,42,41,19,33 monster Tortuga 1004,2,35000,120000 000-1,87,37,24,23 monster Tortuga 1004,3,35000,120000 -000-1,32,116,16,19 monster Croc 1006,2,35000,300000 -000-1,63,31,20,6 monster Croc 1006,1,35000,300000 -000-1,76,68,3,2 monster Croc 1006,1,35000,300000 -000-1,52,92,9,34 monster Croc 1006,1,35000,300000 -000-1,71,77,9,9 monster Croc 1006,1,35000,300000 000-1,44,75,5,3 monster Little Blub 1007,2,25000,120000 000-1,61,64,14,21 monster Little Blub 1007,2,25000,120000 000-1,62,25,21,9 monster Little Blub 1007,2,25000,120000 @@ -21,6 +15,18 @@ 000-1,85,58,28,19 monster Little Blub 1007,2,35000,120000 000-1,48,61,18,12 monster Little Blub 1007,1,35000,120000 000-1,28,48,6,11 monster Little Blub 1007,1,35000,120000 +000-1,35,50,1,2 monster Plushroom Field 1011,1,35000,150000 +000-1,54,115,1,2 monster Plushroom Field 1011,1,35000,150000 +000-1,63,80,9,5 monster Plushroom Field 1011,1,35000,150000 +000-1,54,64,1,5 monster Plushroom Field 1011,1,35000,150000 +000-1,78,58,8,10 monster Plushroom Field 1011,2,35000,150000 +000-1,71,62,3,2 monster Plushroom Field 1011,1,35000,150000 +000-1,32,116,16,19 monster Croc 1006,2,35000,300000 +000-1,63,31,20,6 monster Croc 1006,1,35000,300000 +000-1,76,68,3,2 monster Croc 1006,1,35000,300000 +000-1,52,92,9,34 monster Croc 1006,1,35000,300000 +000-1,71,77,9,9 monster Croc 1006,1,35000,300000 +000-1,0,0,0,0 monster Piou 1002,4,60000,15000 000-1,78,115,0,0 monster Crocotree 1010,1,420000,240000 000-1,57,104,0,0 monster Crocotree 1010,1,420000,240000 000-1,39,112,0,0 monster Crocotree 1010,1,420000,240000 @@ -31,9 +37,3 @@ 000-1,44,44,0,0 monster Crocotree 1010,1,420000,240000 000-1,70,33,0,0 monster Crocotree 1010,1,420000,240000 000-1,84,66,0,0 monster Crocotree 1010,1,420000,240000 -000-1,35,50,1,2 monster Plushroom Field 1011,1,35000,150000 -000-1,54,115,1,2 monster Plushroom Field 1011,1,35000,150000 -000-1,63,80,9,5 monster Plushroom Field 1011,1,35000,150000 -000-1,54,64,1,5 monster Plushroom Field 1011,1,35000,150000 -000-1,78,58,8,10 monster Plushroom Field 1011,2,35000,150000 -000-1,71,62,3,2 monster Plushroom Field 1011,1,35000,150000 diff --git a/npc/000-1/_warps.txt b/npc/000-1/_warps.txt index ec347a47..47b4fb42 100644 --- a/npc/000-1/_warps.txt +++ b/npc/000-1/_warps.txt @@ -1,2 +1,3 @@ -// Map 000-1: Drasil Island -000-1,94,100,0 warp ToShip 0,0,000-2-0,21,28 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-1: Drasil Island warps +000-1,94,100,0 warp #000-1_94_100 0,0,000-2-0,21,28 diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt index 98704625..c0b9afb1 100644 --- a/npc/000-2-0/_import.txt +++ b/npc/000-2-0/_import.txt @@ -1,7 +1,8 @@ -// Map 000-2-0: La Johanne, First Deck -"npc/000-2-0/mapflags.txt", +// Map 000-2-0: First Deck +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-2-0/_warps.txt", "npc/000-2-0/billybons.txt", "npc/000-2-0/doors.txt", "npc/000-2-0/julia.txt", +"npc/000-2-0/mapflags.txt", "npc/000-2-0/note.txt", diff --git a/npc/000-2-0/_warps.txt b/npc/000-2-0/_warps.txt index 149b47a0..ca8cba34 100644 --- a/npc/000-2-0/_warps.txt +++ b/npc/000-2-0/_warps.txt @@ -1,2 +1,4 @@ -// Map 000-2-0: La Johanne, First Deck -000-2-0,31,25,0 warp ToLevel1 0,0,000-2-1,72,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-0: First Deck warps +000-2-0,33,28,0 warp #000-2-0_33_28 0,0,000-2-3,20,27 +000-2-0,31,25,0 warp #000-2-0_31_25 0,0,000-2-1,72,29 diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt index 5ef64326..ba87b23e 100644 --- a/npc/000-2-1/_import.txt +++ b/npc/000-2-1/_import.txt @@ -1,6 +1,7 @@ -// Map 000-2-1: La Johanne, Second Deck -"npc/000-2-1/mapflags.txt", +// Map 000-2-1: Second Deck +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-2-1/_mobs.txt", +"npc/000-2-1/_savepoints.txt", "npc/000-2-1/_warps.txt", "npc/000-2-1/alige.txt", "npc/000-2-1/arpan.txt", @@ -10,6 +11,7 @@ "npc/000-2-1/devis.txt", "npc/000-2-1/hammock.txt", "npc/000-2-1/knife.txt", +"npc/000-2-1/mapflags.txt", "npc/000-2-1/peter.txt", "npc/000-2-1/q'onan.txt", -"npc/000-2-1/savepoint.txt", +"npc/000-2-1/story_save.txt", diff --git a/npc/000-2-1/_mobs.txt b/npc/000-2-1/_mobs.txt index 95fb4575..7e30e561 100644 --- a/npc/000-2-1/_mobs.txt +++ b/npc/000-2-1/_mobs.txt @@ -1,3 +1,3 @@ -// Map 000-2-1: La Johanne, Second Deck -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -000-2-1,61,32,41,19 monster Piou 1002,3,30000,20000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-1: Second Deck mobs +000-2-1,52,32,42,19 monster Piou 1002,3,30000,20000 diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt new file mode 100644 index 00000000..14b79c7e --- /dev/null +++ b/npc/000-2-1/_savepoints.txt @@ -0,0 +1,38 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-1: Second Deck saves +000-2-1,40,37,0 script #save_000-2-1_40_37 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} +000-2-1,46,37,0 script #save_000-2-1_46_37 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} +000-2-1,50,38,0 script #save_000-2-1_50_38 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} +000-2-1,55,40,0 script #save_000-2-1_55_40 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt index db00884c..db3a1c8e 100644 --- a/npc/000-2-1/_warps.txt +++ b/npc/000-2-1/_warps.txt @@ -1,2 +1,3 @@ -// Map 000-2-1: La Johanne, Second Deck -000-2-1,72,30,0 warp ToLevel0#000-2-1 0,0,000-2-0,31,26 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-1: Second Deck warps +000-2-1,72,30,0 warp #000-2-1_72_30 0,0,000-2-0,31,26 diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/story_save.txt index d293cfd1..e46841c1 100644 --- a/npc/000-2-1/savepoint.txt +++ b/npc/000-2-1/story_save.txt @@ -2,25 +2,7 @@ // Author: // Reid // Description: -// Saves locations in 000-2-1 map. - -000-2-1,40,37,0 script #name1 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 40, 37; - close; - -OnInit: - .distance = 2; - end; -} - -000-2-1,46,37,0 script #name2 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 46, 37; - close; - -OnInit: - .distance = 2; - end; -} +// Scritpted save locations in 000-2-1 map. 000-2-1,50,38,0 script #name3 NPC_FINAL_POINT,{ .@q_nard = getq(ShipQuests_Nard); @@ -46,12 +28,3 @@ OnInit: .distance = 2; end; } - -000-2-1,55,40,0 script #name4 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 55, 40; - close; - -OnInit: - .distance = 2; - end; -} diff --git a/npc/000-2-2/_import.txt b/npc/000-2-2/_import.txt index c45d2958..81d32fdf 100644 --- a/npc/000-2-2/_import.txt +++ b/npc/000-2-2/_import.txt @@ -1,4 +1,5 @@ -// Map 000-2-2: La Johanne, Hold +// Map 000-2-2: Hold +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-2-2/doors.txt", "npc/000-2-2/mapflags.txt", "npc/000-2-2/ratto.txt", diff --git a/npc/000-2-3/_import.txt b/npc/000-2-3/_import.txt index be1dd722..16842f77 100644 --- a/npc/000-2-3/_import.txt +++ b/npc/000-2-3/_import.txt @@ -1,9 +1,10 @@ -// Map 000-2-3: La Johanne, Nard's Room -"npc/000-2-3/mapflags.txt", +// Map 000-2-3: Nard's Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-2-3/_warps.txt", "npc/000-2-3/box.txt", "npc/000-2-3/elmo.txt", "npc/000-2-3/hammock.txt", +"npc/000-2-3/mapflags.txt", "npc/000-2-3/nard.txt", "npc/000-2-3/piourocket.txt", "npc/000-2-3/sailors.txt", diff --git a/npc/000-2-3/_warps.txt b/npc/000-2-3/_warps.txt index e8557250..f5c0e1e7 100644 --- a/npc/000-2-3/_warps.txt +++ b/npc/000-2-3/_warps.txt @@ -1,2 +1,3 @@ -// Map 000-2-3: La Johanne, Nard's Room -000-2-3,19,27,0 warp ToLevel0#000-2-3 0,0,000-2-0,32,28 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-3: Nard's Room warps +000-2-3,19,27,0 warp #000-2-3_19_27 0,0,000-2-0,32,28 diff --git a/npc/000-2-4/_import.txt b/npc/000-2-4/_import.txt index e3a3cc8c..579e400a 100644 --- a/npc/000-2-4/_import.txt +++ b/npc/000-2-4/_import.txt @@ -1,5 +1,6 @@ -// Map 000-2-4: La Johanne, Hold, Alige's Hiding Place -"npc/000-2-4/mapflags.txt", +// Map 000-2-4: Alige's Hiding Place +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-2-4/_mobs.txt", "npc/000-2-4/_warps.txt", "npc/000-2-4/alige.txt", +"npc/000-2-4/mapflags.txt", diff --git a/npc/000-2-4/_mobs.txt b/npc/000-2-4/_mobs.txt index d37e1efe..6976796d 100644 --- a/npc/000-2-4/_mobs.txt +++ b/npc/000-2-4/_mobs.txt @@ -1,3 +1,3 @@ -// Map 000-2-4: La Johanne, Hold, Alige's Hiding Place -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -000-2-4,30,30,2,2 monster Cuco 1020,1,90000,80000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-4: Alige's Hiding Place mobs +000-2-4,30,30,3,3 monster Cuco 1020,1,80000,90000 diff --git a/npc/000-2-4/_warps.txt b/npc/000-2-4/_warps.txt index 50bdbf76..65fec77c 100644 --- a/npc/000-2-4/_warps.txt +++ b/npc/000-2-4/_warps.txt @@ -1,2 +1,3 @@ -// Map 000-2-4: La Johanne, Hold, Alige's Hiding Place -000-2-4,41,30 warp ToLevel2 0,0,000-2-2,25,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 000-2-4: Alige's Hiding Place warps +000-2-4,41,30,0 warp #000-2-4_41_30 0,0,000-2-1,25,31 diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index 1f21d464..eb522c73 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -1,5 +1,5 @@ // Map 001-1: Artis -"npc/001-1/mapflags.txt", +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-1/_mobs.txt", "npc/001-1/_warps.txt", "npc/001-1/artaxe.txt", @@ -7,32 +7,33 @@ "npc/001-1/calypsan.txt", "npc/001-1/carmie.txt", "npc/001-1/chelios.txt", -//"npc/001-1/cookiemaster.txt", +"npc/001-1/cookiemaster.txt", "npc/001-1/devis.txt", "npc/001-1/doors.txt", "npc/001-1/elmo.txt", "npc/001-1/enora.txt", "npc/001-1/eugene.txt", "npc/001-1/fexil.txt", +"npc/001-1/flyingpiou.txt", "npc/001-1/harbours.txt", "npc/001-1/juscare.txt", "npc/001-1/katja.txt", "npc/001-1/lucas.txt", -"npc/001-1/merlin.txt", "npc/001-1/manhole.txt", +"npc/001-1/mapflags.txt", +"npc/001-1/merlin.txt", "npc/001-1/mouboo.txt", "npc/001-1/nalkri.txt", "npc/001-1/panels.txt", +"npc/001-1/pious.txt", "npc/001-1/qonan.txt", "npc/001-1/qpid.txt", "npc/001-1/rumly.txt", +"npc/001-1/salem.txt", "npc/001-1/shop.txt", "npc/001-1/sign.txt", "npc/001-1/taree.txt", "npc/001-1/treeleaf.txt", -"npc/001-1/xilaxa.txt", "npc/001-1/trees.txt", -"npc/001-1/pious.txt", -"npc/001-1/flyingpiou.txt", "npc/001-1/wateranimation.txt", -"npc/001-1/salem.txt", +"npc/001-1/xilaxa.txt", diff --git a/npc/001-1/_mobs.txt b/npc/001-1/_mobs.txt index 42001525..13ff81f1 100644 --- a/npc/001-1/_mobs.txt +++ b/npc/001-1/_mobs.txt @@ -1,5 +1,5 @@ -// Map 001-1: Artis -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-1: Artis mobs 001-1,0,0,0,0 monster Piou 1002,2,15000,60000 001-1,0,0,0,0 monster Piousse 1003,1,15000,150000 001-1,174,34,23,30 monster Fluffy 1022,6,18000,100000,Mobs#001-1::OnFluffyDeath @@ -14,7 +14,7 @@ 001-1,34,130,0,0 monster Manana Tree 1017,1,420000,240000 001-1,41,129,0,0 monster Manana Tree 1017,1,420000,240000 001-1,36,77,0,0 monster Manana Tree 1017,1,420000,240000 -001-1,35,74,0,0 monster Manana Tree 1017,1,420000,240000 +001-1,37,79,0,0 monster Manana Tree 1017,1,420000,240000 001-1,39,73,0,0 monster Manana Tree 1017,1,420000,240000 001-1,43,70,0,0 monster Manana Tree 1017,1,420000,240000 001-1,48,71,0,0 monster Manana Tree 1017,1,420000,240000 @@ -30,14 +30,3 @@ 001-1,185,65,0,0 monster Manana Tree 1017,1,420000,240000 001-1,191,63,0,0 monster Manana Tree 1017,1,420000,240000 001-1,200,66,0,0 monster Manana Tree 1017,1,420000,240000 - -001-1,0,0,0 script Mobs#001-1 NPC_HIDDEN,{ - end; - -OnFluffyDeath: - if (playerattached()) - { - set ArtisFluffyKilled, ArtisFluffyKilled + 1; - } - end; -} diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt index 84db2ecd..34a715ad 100644 --- a/npc/001-1/_warps.txt +++ b/npc/001-1/_warps.txt @@ -1,5 +1,444 @@ -// Map 001-1: Artis -001-1,194,109,0 warp ToShip#001-1 0,0,001-2-21,20,28 -001-1,100,37,0 warp ToMerchantHall#001-1 0,0,001-2-19,32,39 -001-1,104,43,0 warp ToMerchantBottom#001-1 0,0,001-2-19,41,49 -001-1,134,83,0 warp ToRedPlushINN#001-1 0,0,001-2-28,60,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-1: Artis warps +001-1,51,80,0 script #001-1_51_80_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-4", 48, 40; +close; + +OnUnTouch: + doevent "#001-1_51_80::OnUnTouch"; +} +001-1,51,80,0 script #001-1_51_80 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,70,77,0 script #001-1_70_77_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-2", 38, 38; +close; + +OnUnTouch: + doevent "#001-1_70_77::OnUnTouch"; +} +001-1,70,77,0 script #001-1_70_77 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,51,65,0 script #001-1_51_65_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-0", 30, 34; +close; + +OnUnTouch: + doevent "#001-1_51_65::OnUnTouch"; +} +001-1,51,65,0 script #001-1_51_65 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,55,71,0 script #001-1_55_71_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-0", 37, 45; +close; + +OnUnTouch: + doevent "#001-1_55_71::OnUnTouch"; +} +001-1,55,71,0 script #001-1_55_71 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,168,98,0 script #001-1_168_98_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-16", 32, 35; +close; + +OnUnTouch: + doevent "#001-1_168_98::OnUnTouch"; +} +001-1,168,98,0 script #001-1_168_98 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,194,109,0 warp #001-1_194_109 0,0,001-2-21,20,28 +001-1,100,37,0 warp #001-1_100_37 0,0,001-2-19,32,39 +001-1,104,43,0 warp #001-1_104_43 0,0,001-2-19,41,49 +001-1,134,83,0 warp #001-1_134_83 0,0,001-2-28,60,31 +001-1,118,88,0 script #001-1_118_88_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-28", 29, 39; +close; + +OnUnTouch: + doevent "#001-1_118_88::OnUnTouch"; +} +001-1,118,88,0 script #001-1_118_88 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,182,74,0 script #001-1_182_74_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-18", 39, 35; +close; + +OnUnTouch: + doevent "#001-1_182_74::OnUnTouch"; +} +001-1,182,74,0 script #001-1_182_74 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,163,70,0 script #001-1_163_70_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-26", 28, 42; +close; + +OnUnTouch: + doevent "#001-1_163_70::OnUnTouch"; +} +001-1,163,70,0 script #001-1_163_70 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,132,67,0 script #001-1_132_67_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-15", 34, 45; +close; + +OnUnTouch: + doevent "#001-1_132_67::OnUnTouch"; +} +001-1,132,67,0 script #001-1_132_67 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,101,107,0 script #001-1_101_107_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-27", 35, 34; +close; + +OnUnTouch: + doevent "#001-1_101_107::OnUnTouch"; +} +001-1,101,107,0 script #001-1_101_107 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,89,65,0 script #001-1_89_65_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-7", 36, 45; +close; + +OnUnTouch: + doevent "#001-1_89_65::OnUnTouch"; +} +001-1,89,65,0 script #001-1_89_65 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,57,41,0 warp #001-1_57_41 0,0,001-2-33,34,45 +001-1,142,30,0 script #001-1_142_30_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-12", 34, 35; +close; + +OnUnTouch: + doevent "#001-1_142_30::OnUnTouch"; +} +001-1,142,30,0 script #001-1_142_30 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,128,30,0 script #001-1_128_30_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-1", 37, 40; +close; + +OnUnTouch: + doevent "#001-1_128_30::OnUnTouch"; +} +001-1,128,30,0 script #001-1_128_30 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,104,32,0 script #001-1_104_32_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-19", 41, 30; +close; + +OnUnTouch: + doevent "#001-1_104_32::OnUnTouch"; +} +001-1,104,32,0 script #001-1_104_32 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,107,49,0 script #001-1_107_49_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-20", 33, 34; +close; + +OnUnTouch: + doevent "#001-1_107_49::OnUnTouch"; +} +001-1,107,49,0 script #001-1_107_49 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,148,54,0 script #001-1_148_54_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-11", 46, 45; +close; + +OnUnTouch: + doevent "#001-1_148_54::OnUnTouch"; +} +001-1,148,54,0 script #001-1_148_54 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,135,49,0 script #001-1_135_49_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-10", 51, 44; +close; + +OnUnTouch: + doevent "#001-1_135_49::OnUnTouch"; +} +001-1,135,49,0 script #001-1_135_49 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,118,49,0 script #001-1_118_49_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-10", 27, 44; +close; + +OnUnTouch: + doevent "#001-1_118_49::OnUnTouch"; +} +001-1,118,49,0 script #001-1_118_49 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-1,49,96,0 script #001-1_49_96_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-31", 32, 39; +close; + +OnUnTouch: + doevent "#001-1_49_96::OnUnTouch"; +} +001-1,49,96,0 script #001-1_49_96 NPC_ARTIS_DOOR,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt index 23ad615d..d88413f0 100644 --- a/npc/001-1/doors.txt +++ b/npc/001-1/doors.txt @@ -5,483 +5,6 @@ // Doors warp and animations in map 001-1 // -001-1,55,71,0 script #Warp1 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-0", 37, 45; - close; - -OnUnTouch: - doevent "#Door1::OnUnTouch"; -} - -001-1,55,71,0 script #Door1 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,51,65,0 script #Warp2 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-0", 30, 34; - close; - -OnUnTouch: - doevent "#Door2::OnUnTouch"; -} - -001-1,51,65,0 script #Door2 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,70,77,0 script #Warp3 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-2", 38, 38; - close; - -OnUnTouch: - doevent "#Door3::OnUnTouch"; -} - -001-1,70,77,0 script #Door3 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,51,80,0 script #Warp4 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-4", 48, 40; - close; - -OnUnTouch: - doevent "#Door4::OnUnTouch"; -} - -001-1,51,80,0 script #Door4 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,89,65,0 script #Warp5 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-7", 36, 45; - close; - -OnUnTouch: - doevent "#Door5::OnUnTouch"; -} - -001-1,89,65,0 script #Door5 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,142,30,0 script #Warp6 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-12", 34, 35; - close; - -OnUnTouch: - doevent "#Door6::OnUnTouch"; -} - -001-1,142,30,0 script #Door6 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,132,67,0 script #Warp7 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-15", 34, 45; - close; - -OnUnTouch: - doevent "#Door7::OnUnTouch"; -} - -001-1,132,67,0 script #Door7 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,128,30,0 script #Warp8 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-1", 37, 40; - close; - -OnUnTouch: - doevent "#Door8::OnUnTouch"; -} - -001-1,128,30,0 script #Door8 NPC_ARTIS_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,168,98,0 script #Warp9 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-16", 32, 35; - close; - -OnUnTouch: - doevent "#Door9::OnUnTouch"; -} - -001-1,168,98,0 script #Door9 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,118,49,0 script #Warp10 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-10", 27, 44; - close; - -OnUnTouch: - doevent "#Door10::OnUnTouch"; -} - -001-1,118,49,0 script #Door10 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,135,49,0 script #Warp11 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-10", 51, 44; - close; - -OnUnTouch: - doevent "#Door11::OnUnTouch"; -} - -001-1,135,49,0 script #Door11 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - .sex = G_MALE; - .distance = 5; - end; -} - -001-1,148,54,0 script #Warp12 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-11", 46, 45; - close; - -OnUnTouch: - doevent "#Door12::OnUnTouch"; -} - -001-1,148,54,0 script #Door12 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,163,70,0 script #Warp13 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-26", 28, 42; - close; - -OnUnTouch: - doevent "#Door13::OnUnTouch"; -} - -001-1,163,70,0 script #Door13 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,101,107,0 script #Warp14 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-27", 35, 35; - close; - -OnUnTouch: - doevent "#Door14::OnUnTouch"; -} - -001-1,101,107,0 script #Door14 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,107,49,0 script #Warp15 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-20", 33, 34; - close; - -OnUnTouch: - doevent "#Door15::OnUnTouch"; -} - -001-1,107,49,0 script #Door15 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,104,32,0 script #Warp16 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-19", 41, 30; - close; - -OnUnTouch: - doevent "#Door16::OnUnTouch"; -} - -001-1,104,32,0 script #Door16 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,182,74,0 script #Warp17 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-18", 39, 35; - close; - -OnUnTouch: - doevent "#Door17::OnUnTouch"; -} - -001-1,182,74,0 script #Door17 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,118,88,0 script #Warp18 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-28", 29, 42; - close; - -OnUnTouch: - doevent "#Door18::OnUnTouch"; -} - -001-1,118,88,0 script #Door18 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-1,49,96,0 script #Warp19 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-31", 32, 39; - close; - -OnUnTouch: - doevent "#Door19::OnUnTouch"; -} - -001-1,49,96,0 script #Door19 NPC_ARTIS_DOOR,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - 001-1,57,41,0 script #Warp20 NPC_HIDDEN,0,0,{ OnTouch: .@enora = getq(ArtisQuests_Enora); diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt index 231ad613..339372d0 100644 --- a/npc/001-1/enora.txt +++ b/npc/001-1/enora.txt @@ -439,3 +439,13 @@ OnInit: end; } +001-1,0,0,0 script Mobs#001-1 NPC_HIDDEN,{ + end; + +OnFluffyDeath: + if (playerattached()) + { + set ArtisFluffyKilled, ArtisFluffyKilled + 1; + } + end; +} diff --git a/npc/001-1/juscare.txt b/npc/001-1/juscare.txt index 2dabc630..0456a532 100644 --- a/npc/001-1/juscare.txt +++ b/npc/001-1/juscare.txt @@ -70,13 +70,13 @@ OnInit: // this is not very obvious stuff setmovegraphcmd - "inn_front", "inn_door", 1, 0x1, "flags_0 2; dir 4; call open_door #Door18", + "inn_front", "inn_door", 1, 0x1, "flags_0 2; dir 4; call open_door #001-1_118_88", "inn_front", "inn_tree", 2, "dir 2; wait 1; sit; wait 1; emote 106; wait 20; stand; wait 1", "inn_front", "river_bank",1, "flags_0 8; flags_1 4", "river_bank", "eugene", 1, 0x4, "moveon", "eugene", "fishing_spot", 1, 0x4, "wait 7", "fishing_spot", "chelios", 1, 0x4, "dir 6; wait 1; emote 103; wait 10", - "inn_tree", "inn_door", 1, "flags_1 1; flags_0 2; dir 4; call open_door #Door18", + "inn_tree", "inn_door", 1, "flags_1 1; flags_0 2; dir 4; call open_door #001-1_118_88", "inn_tree", "fountain", 2, "dir 4; wait 1; emote 122; wait 10; dir 0; wait 1", "fountain", "chelios_road", "moveon", "chelios_road", "chelios", "dir 6; wait 1; emote 103; wait 7", @@ -88,12 +88,12 @@ OnInit: "fishing_spot", "eugene", 1, 0x8, "moveon", "eugene", "river_bank",1, 0x8, "moveon", "river_bank", "inn_front", 1, 0x8, "dir 0; wait 5", - "inn_door", "inn_doorstep",1, 0x1, "warp 001-2-28 inter_inn_doorstep; call close_door #Door18", + "inn_door", "inn_doorstep",1, 0x1, "warp 001-2-28 inter_inn_doorstep; call close_door #001-1_118_88", "inter_inn_doorstep", "inter_inn_2tables", 1, 0x1, "moveon", "inter_inn_2tables", "inter_inn_fav_table", 1, 0x1, "flags_1 2; flags_0 1; dir 6; wait 1; sit; wait 15; stand; wait 1", "inter_inn_fav_table", "inter_inn_2tables", 1, 0x2, "moveon", - "inter_inn_2tables", "inter_inn_doorstep", 1, 0x2, "call open_door #Door18; warp 001-1 inn_doorstep", - "inn_doorstep", "inn_door", 1, 0x2, "call close_door #Door18", + "inter_inn_2tables", "inter_inn_doorstep", 1, 0x2, "call open_door #001-1_118_88; warp 001-1 inn_doorstep", + "inn_doorstep", "inn_door", 1, 0x2, "call close_door #001-1_118_88", "inn_door", "inn_front", 1, 0x2, "flags_1 1; flags_0 2; wait 10"; firstmove "wait 4", "inn_front"; diff --git a/npc/001-2-0/_import.txt b/npc/001-2-0/_import.txt index fb1d7098..2fb6a262 100644 --- a/npc/001-2-0/_import.txt +++ b/npc/001-2-0/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-0: Artis, Light Armor Shop -"npc/001-2-0/mapflags.txt", +// Map 001-2-0: Light Armor Shop +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-0/_warps.txt", +"npc/001-2-0/mapflags.txt", "npc/001-2-0/resa.txt", "npc/001-2-0/shop.txt", diff --git a/npc/001-2-0/_warps.txt b/npc/001-2-0/_warps.txt index 2f0004b5..c81b7fa6 100644 --- a/npc/001-2-0/_warps.txt +++ b/npc/001-2-0/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-0: Artis, Light Armor Shop -001-2-0,30,35,0 warp To Artis North#001-2-0 0,0,001-1,51,66 -001-2-0,37,46,0 warp To Artis South#001-2-0 0,0,001-1,55,72 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-0: Light Armor Shop warps +001-2-0,30,35,0 warp #001-2-0_30_35 0,0,001-1,51,66 +001-2-0,37,46,0 warp #001-2-0_37_46 0,0,001-1,55,72 diff --git a/npc/001-2-1/_import.txt b/npc/001-2-1/_import.txt index b130b929..85933242 100644 --- a/npc/001-2-1/_import.txt +++ b/npc/001-2-1/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-1: Artis, Noble House -"npc/001-2-1/mapflags.txt", -"npc/001-2-1/savepoints.txt", +// Map 001-2-1: Noble House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-1/_savepoints.txt", "npc/001-2-1/_warps.txt", +"npc/001-2-1/mapflags.txt", diff --git a/npc/001-2-1/_savepoints.txt b/npc/001-2-1/_savepoints.txt new file mode 100644 index 00000000..4b3f1497 --- /dev/null +++ b/npc/001-2-1/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-1: Noble House saves +001-2-1,27,30,0 script #save_001-2-1_27_30 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-1/_warps.txt b/npc/001-2-1/_warps.txt index 210d4bff..1189adc7 100644 --- a/npc/001-2-1/_warps.txt +++ b/npc/001-2-1/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-1: Artis, Noble House -001-2-1,37,41,0 warp To Artis#001-2-1 0,0,001-1,128,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-1: Noble House warps +001-2-1,37,41,0 warp #001-2-1_37_41 0,0,001-1,128,31 diff --git a/npc/001-2-1/savepoints.txt b/npc/001-2-1/savepoints.txt deleted file mode 100644 index f9df8dd4..00000000 --- a/npc/001-2-1/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-1,27,30,0 script #savepoint0-001-2-1 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-10/_import.txt b/npc/001-2-10/_import.txt index d6cafa3d..7c1b01d6 100644 --- a/npc/001-2-10/_import.txt +++ b/npc/001-2-10/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-10: Artis, Noble House -"npc/001-2-10/mapflags.txt", -"npc/001-2-10/savepoints.txt", +// Map 001-2-10: Noble House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-10/_savepoints.txt", "npc/001-2-10/_warps.txt", +"npc/001-2-10/mapflags.txt", diff --git a/npc/001-2-10/_savepoints.txt b/npc/001-2-10/_savepoints.txt new file mode 100644 index 00000000..c98aa450 --- /dev/null +++ b/npc/001-2-10/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-10: Noble House saves +001-2-10,26,30,0 script #save_001-2-10_26_30 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-10/_warps.txt b/npc/001-2-10/_warps.txt index 3446e14e..e9e39231 100644 --- a/npc/001-2-10/_warps.txt +++ b/npc/001-2-10/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-10: Artis, Noble House -001-2-10,27,45,0 warp To Artis Left#001-2-10 0,0,001-1,118,50 -001-2-10,51,45,0 warp To Artis Right#001-2-10 0,0,001-1,135,50 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-10: Noble House warps +001-2-10,27,45,0 warp #001-2-10_27_45 0,0,001-1,118,50 +001-2-10,51,45,0 warp #001-2-10_51_45 0,0,001-1,135,50 diff --git a/npc/001-2-10/savepoints.txt b/npc/001-2-10/savepoints.txt deleted file mode 100644 index 7e4d9386..00000000 --- a/npc/001-2-10/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-10,26,30,0 script #savepoint0-001-2-10 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-11/_import.txt b/npc/001-2-11/_import.txt index fd42a7a5..7e5ac100 100644 --- a/npc/001-2-11/_import.txt +++ b/npc/001-2-11/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-11: Artis, Noble House +// Map 001-2-11: Noble House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-11/_savepoints.txt", +"npc/001-2-11/_warps.txt", "npc/001-2-11/mapflags.txt", "npc/001-2-11/mona.txt", -"npc/001-2-11/savepoints.txt", -"npc/001-2-11/_warps.txt", diff --git a/npc/001-2-11/_savepoints.txt b/npc/001-2-11/_savepoints.txt new file mode 100644 index 00000000..fc0b47fb --- /dev/null +++ b/npc/001-2-11/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-11: Noble House saves +001-2-11,26,31,0 script #save_001-2-11_26_31 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-11/_warps.txt b/npc/001-2-11/_warps.txt index aa15823d..648faa57 100644 --- a/npc/001-2-11/_warps.txt +++ b/npc/001-2-11/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-11: Artis, Noble House -001-2-11,46,46,0 warp To Artis#001-2-11 0,0,001-1,148,55 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-11: Noble House warps +001-2-11,46,46,0 warp #001-2-11_46_46 0,0,001-1,148,55 diff --git a/npc/001-2-11/savepoints.txt b/npc/001-2-11/savepoints.txt deleted file mode 100644 index 4f360d63..00000000 --- a/npc/001-2-11/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-11,26,31,0 script #savepoint0-001-2-11 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-12/_import.txt b/npc/001-2-12/_import.txt index cb502c8c..fa40eb2b 100644 --- a/npc/001-2-12/_import.txt +++ b/npc/001-2-12/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-12: Artis, Noble House +// Map 001-2-12: Noble House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-12/_warps.txt", "npc/001-2-12/mapflags.txt", "npc/001-2-12/oscar.txt", -"npc/001-2-12/_warps.txt", diff --git a/npc/001-2-12/_warps.txt b/npc/001-2-12/_warps.txt index ffab313a..c03a6b0b 100644 --- a/npc/001-2-12/_warps.txt +++ b/npc/001-2-12/_warps.txt @@ -1,4 +1,5 @@ -// Map 001-2-12: Artis, Noble House -001-2-12,34,36,0 warp To Artis#001-2-12 0,0,001-1,142,31 -001-2-12,26,28,0 warp To Second Floor#001-2-12 1,0,001-2-13,27,29 -001-2-12,29,28,0 warp To Cellar#001-2-12 0,0,001-2-14,25,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-12: Noble House warps +001-2-12,27,27,0 warp #001-2-12_27_27 1,0,001-2-13,27,29 +001-2-12,34,36,0 warp #001-2-12_34_36 0,0,001-1,142,31 +001-2-12,29,28,0 warp #001-2-12_29_28 0,0,001-2-14,25,29 diff --git a/npc/001-2-13/_import.txt b/npc/001-2-13/_import.txt index 669325bc..36eee751 100644 --- a/npc/001-2-13/_import.txt +++ b/npc/001-2-13/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-13: Artis, Noble House, First Floor -"npc/001-2-13/mapflags.txt", -"npc/001-2-13/savepoints.txt", +// Map 001-2-13: First Floor +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-13/_savepoints.txt", "npc/001-2-13/_warps.txt", +"npc/001-2-13/mapflags.txt", diff --git a/npc/001-2-13/_savepoints.txt b/npc/001-2-13/_savepoints.txt new file mode 100644 index 00000000..dd210526 --- /dev/null +++ b/npc/001-2-13/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-13: First Floor saves +001-2-13,41,31,0 script #save_001-2-13_41_31 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-13/_warps.txt b/npc/001-2-13/_warps.txt index e0d59104..9400dd8a 100644 --- a/npc/001-2-13/_warps.txt +++ b/npc/001-2-13/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-13: Artis, Noble House, First Floor -001-2-13,26,30,0 warp To First Floor#001-2-13 1,0,001-2-12,27,30 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-13: First Floor warps +001-2-13,27,30,0 warp #001-2-13_27_30 1,0,001-2-12,27,28 diff --git a/npc/001-2-13/savepoints.txt b/npc/001-2-13/savepoints.txt deleted file mode 100644 index e46700eb..00000000 --- a/npc/001-2-13/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-13,41,31,0 script #savepoint0-001-2-13 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-14/_import.txt b/npc/001-2-14/_import.txt index f2b81f32..0b4d600c 100644 --- a/npc/001-2-14/_import.txt +++ b/npc/001-2-14/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-14: Artis, Noble House, Basement -"npc/001-2-14/mapflags.txt", -"npc/001-2-14/_mobs.txt", +// Map 001-2-14: Basement +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-14/_warps.txt", +"npc/001-2-14/mapflags.txt", diff --git a/npc/001-2-14/_mobs.txt b/npc/001-2-14/_mobs.txt deleted file mode 100644 index 95387e21..00000000 --- a/npc/001-2-14/_mobs.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Map 001-2-14: Artis, Noble House, Basement -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -001-2-14,0,0,0,0 monster Ratto 1005,3,420000,240000 diff --git a/npc/001-2-14/_warps.txt b/npc/001-2-14/_warps.txt index a43836f4..4ae630aa 100644 --- a/npc/001-2-14/_warps.txt +++ b/npc/001-2-14/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-14: Artis, Noble House, Basement -001-2-14,26,28,0 warp To First Floor#001-2-14 1,0,001-2-12,30,28 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-14: Basement warps +001-2-14,26,27,0 warp #001-2-14_26_27 1,0,001-2-12,30,28 diff --git a/npc/001-2-15/_import.txt b/npc/001-2-15/_import.txt index 84d812e1..d4250125 100644 --- a/npc/001-2-15/_import.txt +++ b/npc/001-2-15/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-15: Artis, Noble House -"npc/001-2-15/mapflags.txt", -"npc/001-2-15/savepoints.txt", +// Map 001-2-15: Noble House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-15/_savepoints.txt", "npc/001-2-15/_warps.txt", +"npc/001-2-15/mapflags.txt", diff --git a/npc/001-2-15/_savepoints.txt b/npc/001-2-15/_savepoints.txt new file mode 100644 index 00000000..c8b82561 --- /dev/null +++ b/npc/001-2-15/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-15: Noble House saves +001-2-15,27,41,0 script #save_001-2-15_27_41 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-15/_warps.txt b/npc/001-2-15/_warps.txt index a637573a..5704aecc 100644 --- a/npc/001-2-15/_warps.txt +++ b/npc/001-2-15/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-15: Artis, Noble House -001-2-15,34,46,0 warp To Artis#001-2-15 0,0,001-1,132,68 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-15: Noble House warps +001-2-15,34,46,0 warp #001-2-15_34_46 0,0,001-1,132,68 diff --git a/npc/001-2-15/savepoints.txt b/npc/001-2-15/savepoints.txt deleted file mode 100644 index 157af4d6..00000000 --- a/npc/001-2-15/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-15,27,41,0 script #savepoint0-001-2-15 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-16/_import.txt b/npc/001-2-16/_import.txt index a49ea87d..66b975ca 100644 --- a/npc/001-2-16/_import.txt +++ b/npc/001-2-16/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-16: Artis, Harbourmaster Lodge -"npc/001-2-16/mapflags.txt", +// Map 001-2-16: Harbourmaster Lodge +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-16/_warps.txt", +"npc/001-2-16/mapflags.txt", diff --git a/npc/001-2-16/_warps.txt b/npc/001-2-16/_warps.txt index cb0826a3..ba8035ee 100644 --- a/npc/001-2-16/_warps.txt +++ b/npc/001-2-16/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-16: Artis, Harbourmaster Lodge -001-2-16,24,29,0 warp To Left Chamb#001-2-16 0,0,001-2-17,35,29 -001-2-16,32,36,0 warp To Artis#001-2-16 0,0,001-1,168,99 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-16: Harbourmaster Lodge warps +001-2-16,32,36,0 warp #001-2-16_32_36 0,0,001-1,168,99 +001-2-16,24,29,0 warp #001-2-16_24_29 0,0,001-2-17,35,29 diff --git a/npc/001-2-17/_import.txt b/npc/001-2-17/_import.txt index e00df9a8..ef22e0df 100644 --- a/npc/001-2-17/_import.txt +++ b/npc/001-2-17/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-17: Artis, Harbourmaster Lodge, Backroom -"npc/001-2-17/mapflags.txt", +// Map 001-2-17: Backroom +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-17/_warps.txt", +"npc/001-2-17/mapflags.txt", diff --git a/npc/001-2-17/_warps.txt b/npc/001-2-17/_warps.txt index 82b28851..b2f5355e 100644 --- a/npc/001-2-17/_warps.txt +++ b/npc/001-2-17/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-17: Artis, Harbourmaster Lodge, Backroom -001-2-17,36,29,0 warp To Right Chamb#001-2-17 0,0,001-2-16,25,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-17: Backroom warps +001-2-17,36,29,0 warp #001-2-17_36_29 0,0,001-2-16,25,29 diff --git a/npc/001-2-18/_import.txt b/npc/001-2-18/_import.txt index 1eed4415..a2930084 100644 --- a/npc/001-2-18/_import.txt +++ b/npc/001-2-18/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-18: Artis, Docks Warehouse -"npc/001-2-18/mapflags.txt", +// Map 001-2-18: Docks Warehouse +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-18/_warps.txt", +"npc/001-2-18/mapflags.txt", diff --git a/npc/001-2-18/_warps.txt b/npc/001-2-18/_warps.txt index 7f95d8ff..0852b8f7 100644 --- a/npc/001-2-18/_warps.txt +++ b/npc/001-2-18/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-18: Artis, Docks Warehouse -001-2-18,39,36,0 warp ToArtis#001-2-18 0,0,001-1,182,75 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-18: Docks Warehouse warps +001-2-18,39,36,0 warp #001-2-18_39_36 0,0,001-1,182,75 diff --git a/npc/001-2-19/_import.txt b/npc/001-2-19/_import.txt index 4091d03e..c92d0825 100644 --- a/npc/001-2-19/_import.txt +++ b/npc/001-2-19/_import.txt @@ -1,5 +1,5 @@ -// Map 001-2-19: Artis, Merchant Hall -"npc/001-2-19/mapflags.txt", +// Map 001-2-19: Merchant Hall +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-19/_warps.txt", -"npc/001-2-19/doors.txt", "npc/001-2-19/lloyd.txt", +"npc/001-2-19/mapflags.txt", diff --git a/npc/001-2-19/_warps.txt b/npc/001-2-19/_warps.txt index cab875e3..f69ef28a 100644 --- a/npc/001-2-19/_warps.txt +++ b/npc/001-2-19/_warps.txt @@ -1,4 +1,51 @@ -// Map 001-2-19: Artis, Merchant Hall -001-2-19,41,31,0 warp ToArtisTop#001-2-19 0,0,001-1,104,33 -001-2-19,33,39,0 warp ToArtisMiddle#001-2-19 0,0,001-1,101,37 -001-2-19,41,56,0 warp ToMerchantRoom#001-2-19 0,0,001-2-20,29,27 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-19: Merchant Hall warps +001-2-19,41,31,0 warp #001-2-19_41_31 0,0,001-1,104,33 +001-2-19,41,24,0 script #001-2-19_41_24_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-25", 29, 30; +close; + +OnUnTouch: + doevent "#001-2-19_41_24::OnUnTouch"; +} +001-2-19,41,24,0 script #001-2-19_41_24 NPC_ARTIS_DOOR_WOOD,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-2-19,33,39,0 warp #001-2-19_33_38 0,0,001-1,101,37 +001-2-19,41,56,0 warp #001-2-19_41_55 0,0,001-2-20,29,27 +001-2-19,41,47,0 script #001-2-19_41_47_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-1", 104, 42; +close; + +OnUnTouch: + doevent "#001-2-19_41_47::OnUnTouch"; +} +001-2-19,41,47,0 script #001-2-19_41_47 NPC_ARTIS_DOOR_WOOD,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + diff --git a/npc/001-2-19/doors.txt b/npc/001-2-19/doors.txt deleted file mode 100644 index 63e37a97..00000000 --- a/npc/001-2-19/doors.txt +++ /dev/null @@ -1,56 +0,0 @@ -// Evol scripts. -// Authors: -// 4144, Reid -// Description: -// Doors warp and animations in map 001-1 -// - -001-2-19,41,25,0 script #MerchantHallWarp1 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-25", 29, 30; - close; - -OnUnTouch: - doevent "#MerchantHallDoor1::OnUnTouch"; -} - -001-2-19,41,24,0 script #MerchantHallDoor1 NPC_ARTIS_DOOR_WOOD,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-2-19,41,48,0 script #MerchantHallWarp2 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-1", 104, 42; - close; - -OnUnTouch: - doevent "#MerchantHallDoor2::OnUnTouch"; -} - -001-2-19,41,46,0 script #MerchantHallDoor2 NPC_ARTIS_DOOR_WOOD,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} diff --git a/npc/001-2-2/_import.txt b/npc/001-2-2/_import.txt index 8e57a5b1..7d11248e 100644 --- a/npc/001-2-2/_import.txt +++ b/npc/001-2-2/_import.txt @@ -1,5 +1,5 @@ // Map 001-2-2: Moon's House -"npc/001-2-2/mapflags.txt", +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-2/_warps.txt", +"npc/001-2-2/mapflags.txt", "npc/001-2-2/moon.txt", - diff --git a/npc/001-2-2/_warps.txt b/npc/001-2-2/_warps.txt index fe75ea00..5856fa4d 100644 --- a/npc/001-2-2/_warps.txt +++ b/npc/001-2-2/_warps.txt @@ -1,4 +1,4 @@ -// Map 001-2-2: Moon's House -001-2-2,38,39,0 warp To Artis#001-2-2 0,0,001-1,70,78 -001-2-2,27,29,0 warp To Sec. Level#001-2-2 1,0,001-2-3,27,30 - +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-2: Moon's House warps +001-2-2,38,39,0 warp #001-2-2_38_39 0,0,001-1,70,78 +001-2-2,27,30,0 warp #001-2-2_27_29 2,0,001-2-3,27,30 diff --git a/npc/001-2-20/_import.txt b/npc/001-2-20/_import.txt index f21ef3e0..5929d241 100644 --- a/npc/001-2-20/_import.txt +++ b/npc/001-2-20/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-20: Artis, Merchant Hall, Backroom -"npc/001-2-20/mapflags.txt", +// Map 001-2-20: Backroom +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-20/_warps.txt", -"npc/001-2-20/doors.txt", +"npc/001-2-20/mapflags.txt", diff --git a/npc/001-2-20/_warps.txt b/npc/001-2-20/_warps.txt index 0c856352..a032fa4d 100644 --- a/npc/001-2-20/_warps.txt +++ b/npc/001-2-20/_warps.txt @@ -1,2 +1,26 @@ -// Map 001-2-20: Artis, Merchant Hall, Backroom -001-2-20,33,35,0 warp ToArtis#001-2-20 0,0,001-1,107,50 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-20: Backroom warps +001-2-20,33,35,0 warp #001-2-20_33_35 0,0,001-1,107,50 +001-2-20,29,25,0 script #001-2-20_29_25_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-19", 41, 54; +close; + +OnUnTouch: + doevent "#001-2-20_29_25::OnUnTouch"; +} +001-2-20,29,25,0 script #001-2-20_29_25 NPC_ARTIS_DOOR_WOOD,2,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + diff --git a/npc/001-2-20/doors.txt b/npc/001-2-20/doors.txt deleted file mode 100644 index 2f9a3987..00000000 --- a/npc/001-2-20/doors.txt +++ /dev/null @@ -1,31 +0,0 @@ -// Evol scripts. -// Authors: -// 4144, Reid -// Description: -// Doors warp and animations in map 001-1 -// - -001-2-20,29,26,0 script #MerchantRoomWarp1 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-19", 41, 55; - close; - -OnUnTouch: - doevent "#MerchantRoomDoor1::OnUnTouch"; -} - -001-2-20,29,25,0 script #MerchantRoomDoor1 NPC_ARTIS_DOOR_WOOD,2,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} diff --git a/npc/001-2-21/_import.txt b/npc/001-2-21/_import.txt index 50c3f97a..b0f7a5a1 100644 --- a/npc/001-2-21/_import.txt +++ b/npc/001-2-21/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-21: La Johanne, First Deck -"npc/001-2-21/mapflags.txt", +// Map 001-2-21: First Deck +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-21/_warps.txt", "npc/001-2-21/julia.txt", +"npc/001-2-21/mapflags.txt", "npc/001-2-21/note.txt", diff --git a/npc/001-2-21/_warps.txt b/npc/001-2-21/_warps.txt index aa272e61..01f70e01 100644 --- a/npc/001-2-21/_warps.txt +++ b/npc/001-2-21/_warps.txt @@ -1,4 +1,5 @@ -// Map 001-2-21: La Johanne, First Deck -001-2-21,31,25,0 warp ToLevel1#001-2-21 0,0,001-2-22,72,29 -001-2-21,33,28,0 warp ToNardRoom#001-2-21 0,0,001-2-24,20,27 -001-2-21,19,28,0 warp ToArtis#001-2-21 0,0,001-1,193,109 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-21: First Deck warps +001-2-21,19,28,0 warp #001-2-21_19_28 0,0,001-1,193,109 +001-2-21,33,28,0 warp #001-2-21_33_28 0,0,001-2-24,20,27 +001-2-21,31,25,0 warp #001-2-21_31_25 0,0,001-2-22,72,29 diff --git a/npc/001-2-22/_import.txt b/npc/001-2-22/_import.txt index be88ba5f..96490c74 100644 --- a/npc/001-2-22/_import.txt +++ b/npc/001-2-22/_import.txt @@ -1,11 +1,13 @@ -// Map 001-2-22: La Johanne, Second Deck -"npc/001-2-22/mapflags.txt", +// Map 001-2-22: Second Deck +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-22/_mobs.txt", +"npc/001-2-22/_savepoints.txt", +"npc/001-2-22/_warps.txt", "npc/001-2-22/alige.txt", "npc/001-2-22/chefgado.txt", "npc/001-2-22/chest.txt", "npc/001-2-22/hammock.txt", "npc/001-2-22/knife.txt", -"npc/001-2-22/_mobs.txt", +"npc/001-2-22/mapflags.txt", +"npc/001-2-22/note.txt", "npc/001-2-22/peter.txt", -"npc/001-2-22/savepoints.txt", -"npc/001-2-22/_warps.txt", diff --git a/npc/001-2-22/_mobs.txt b/npc/001-2-22/_mobs.txt index ad26beec..8e97becc 100644 --- a/npc/001-2-22/_mobs.txt +++ b/npc/001-2-22/_mobs.txt @@ -1,3 +1,3 @@ -// Map 001-2-22: La Johanne, Second Deck -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -001-2-22,61,32,41,19 monster Piou 1002,3,30000,20000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-22: Second Deck mobs +001-2-22,52,32,42,19 monster Piou 1002,3,30000,20000 diff --git a/npc/001-2-22/savepoint.txt b/npc/001-2-22/_savepoints.txt index b2f139e2..a0bd9f89 100644 --- a/npc/001-2-22/savepoint.txt +++ b/npc/001-2-22/_savepoints.txt @@ -1,10 +1,6 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-22,40,37,0 script #savepoint0-001-2-22 NPC_SAVE_POINT,{ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-22: Second Deck saves +001-2-22,40,37,0 script #save_001-2-22_40_37 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -13,8 +9,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-22,46,37,0 script #savepoint1-001-2-22 NPC_SAVE_POINT,{ +001-2-22,46,37,0 script #save_001-2-22_46_37 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -23,8 +18,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-22,50,38,0 script #savepoint2-001-2-22 NPC_SAVE_POINT,{ +001-2-22,55,40,0 script #save_001-2-22_55_40 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -33,8 +27,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-22,55,40,0 script #savepoint3-001-2-22 NPC_SAVE_POINT,{ +001-2-22,50,38,0 script #save_001-2-22_50_38 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -43,8 +36,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-22,53,38,0 script #savepoint4-001-2-22 NPC_SAVE_POINT,{ +001-2-22,53,38,0 script #save_001-2-22_53_38 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; diff --git a/npc/001-2-22/_warps.txt b/npc/001-2-22/_warps.txt index 239f5f61..8fcdb2c3 100644 --- a/npc/001-2-22/_warps.txt +++ b/npc/001-2-22/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-22: La Johanne, Second Deck -001-2-22,72,30,0 warp ToLevel0#001-2-22 0,0,001-2-21,31,26 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-22: Second Deck warps +001-2-22,72,30,0 warp #001-2-22_72_30 0,0,001-2-21,31,26 diff --git a/npc/001-2-22/savepoints.txt b/npc/001-2-22/savepoints.txt deleted file mode 100644 index b2f139e2..00000000 --- a/npc/001-2-22/savepoints.txt +++ /dev/null @@ -1,55 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-22,40,37,0 script #savepoint0-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,46,37,0 script #savepoint1-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,50,38,0 script #savepoint2-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,55,40,0 script #savepoint3-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,53,38,0 script #savepoint4-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-23/_import.txt b/npc/001-2-23/_import.txt index f77ed2c4..22778b22 100644 --- a/npc/001-2-23/_import.txt +++ b/npc/001-2-23/_import.txt @@ -1,4 +1,6 @@ -// Map 001-2-23: La Johanne, Hold +// Map 001-2-23: Hold +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-23/_warps.txt", "npc/001-2-23/doors.txt", "npc/001-2-23/mapflags.txt", "npc/001-2-23/ratto.txt", diff --git a/npc/001-2-23/_warps.txt b/npc/001-2-23/_warps.txt new file mode 100644 index 00000000..d9434efb --- /dev/null +++ b/npc/001-2-23/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-23: Hold warps +001-2-23,48,29,0 warp #001-2-23_48_29 0,0,001-2-22,72,35 diff --git a/npc/001-2-24/_import.txt b/npc/001-2-24/_import.txt index 921a374a..34c43a0b 100644 --- a/npc/001-2-24/_import.txt +++ b/npc/001-2-24/_import.txt @@ -1,6 +1,7 @@ -// Map 001-2-24: La Johanne, Nard's Room -"npc/001-2-24/mapflags.txt", +// Map 001-2-24: Nard's Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-24/_warps.txt", "npc/001-2-24/hammock.txt", +"npc/001-2-24/mapflags.txt", "npc/001-2-24/nard.txt", "npc/001-2-24/piourocket.txt", diff --git a/npc/001-2-24/_warps.txt b/npc/001-2-24/_warps.txt index 049ffb52..945c3aca 100644 --- a/npc/001-2-24/_warps.txt +++ b/npc/001-2-24/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-24: La Johanne, Nard's Room -001-2-24,19,27,0 warp ToLevel0#001-2-24 0,0,001-2-21,32,28 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-24: Nard's Room warps +001-2-24,19,27,0 warp #001-2-24_19_27 0,0,001-2-21,32,28 diff --git a/npc/001-2-25/_import.txt b/npc/001-2-25/_import.txt index 5adbd55e..a3e9ee03 100644 --- a/npc/001-2-25/_import.txt +++ b/npc/001-2-25/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-25: Artis, Merchant Hall, Storage Room -"npc/001-2-25/mapflags.txt", +// Map 001-2-25: Storage Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-25/_mobs.txt", "npc/001-2-25/_warps.txt", +"npc/001-2-25/mapflags.txt", diff --git a/npc/001-2-25/_mobs.txt b/npc/001-2-25/_mobs.txt index 5bbfb151..de0c289e 100644 --- a/npc/001-2-25/_mobs.txt +++ b/npc/001-2-25/_mobs.txt @@ -1,3 +1,3 @@ -// Map 001-2-25: Artis, Merchant Hall, Storage Room -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -001-2-25,0,0,0,0 monster Ratto 1005,2,420000,240000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-25: Storage Room mobs +001-2-25,0,0,0,0 monster Ratto 1005,2,240000,420000 diff --git a/npc/001-2-25/_warps.txt b/npc/001-2-25/_warps.txt index 6643eb70..88fd273d 100644 --- a/npc/001-2-25/_warps.txt +++ b/npc/001-2-25/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-25: Artis, Merchant Hall, Storage Room -001-2-25,29,31,0 warp ToMerchantHalls#001-2-25 0,0,001-2-19,41,26 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-25: Storage Room warps +001-2-25,29,31,0 warp #001-2-25_29_31 0,0,001-2-19,41,26 diff --git a/npc/001-2-26/_import.txt b/npc/001-2-26/_import.txt index 090f9be8..ab0c2970 100644 --- a/npc/001-2-26/_import.txt +++ b/npc/001-2-26/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-26: Artis, Alchemy Lab +// Map 001-2-26: Alchemy Lab +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-26/_warps.txt", "npc/001-2-26/flask.txt", "npc/001-2-26/ivan.txt", "npc/001-2-26/mapflags.txt", -"npc/001-2-26/_warps.txt", diff --git a/npc/001-2-26/_warps.txt b/npc/001-2-26/_warps.txt index e02ab41d..2b16f569 100644 --- a/npc/001-2-26/_warps.txt +++ b/npc/001-2-26/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-26: Artis, Alchemy Lab -001-2-26,28,43,0 warp ToArtis#001-2-26 0,0,001-1,163,71 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-26: Alchemy Lab warps +001-2-26,28,43,0 warp #001-2-26_28_43 0,0,001-1,163,71 diff --git a/npc/001-2-27/_import.txt b/npc/001-2-27/_import.txt index 28e0dc1b..977f4132 100644 --- a/npc/001-2-27/_import.txt +++ b/npc/001-2-27/_import.txt @@ -1,7 +1,8 @@ -// Map 001-2-27: Artis, Blacksmith Shop -"npc/001-2-27/mapflags.txt", +// Map 001-2-27: Blacksmith Shop +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-27/_warps.txt", "npc/001-2-27/don.txt", "npc/001-2-27/kaylo.txt", "npc/001-2-27/lydon.txt", +"npc/001-2-27/mapflags.txt", "npc/001-2-27/shop.txt", diff --git a/npc/001-2-27/_warps.txt b/npc/001-2-27/_warps.txt index ef4a051a..3a55a839 100644 --- a/npc/001-2-27/_warps.txt +++ b/npc/001-2-27/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-27: Artis, Blacksmith Shop -001-2-27,35,36,0 warp ToArtis#001-2-27 0,0,001-1,101,108 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-27: Blacksmith Shop warps +001-2-27,35,36,0 warp #001-2-27_35_35 0,0,001-1,101,108 diff --git a/npc/001-2-28/_import.txt b/npc/001-2-28/_import.txt index 5fb63de6..a58d3fee 100644 --- a/npc/001-2-28/_import.txt +++ b/npc/001-2-28/_import.txt @@ -1,7 +1,8 @@ -// Map 001-2-28: Artis, Red Plush Inn +// Map 001-2-28: Red Plush Inn +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-28/_warps.txt", -"npc/001-2-28/mapflags.txt", "npc/001-2-28/jenna.txt", -"npc/001-2-28/plush.txt", +"npc/001-2-28/mapflags.txt", "npc/001-2-28/note.txt", +"npc/001-2-28/plush.txt", "npc/001-2-28/shop.txt", diff --git a/npc/001-2-28/_warps.txt b/npc/001-2-28/_warps.txt index ce36d7d9..03ba7b48 100644 --- a/npc/001-2-28/_warps.txt +++ b/npc/001-2-28/_warps.txt @@ -1,4 +1,5 @@ -// Map 001-2-28: Artis, Red Plush Inn -001-2-28,29,43,0 warp ToArtisMain#001-2-28 0,0,001-1,118,89 -001-2-28,61,31,0 warp ToArtisRight#001-2-28 0,0,001-1,135,83 -001-2-28,33,26,0 warp ToSecondLevel#001-2-28 2,0,001-2-29,38,34 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-28: Red Plush Inn warps +001-2-28,29,43,0 warp #001-2-28_29_42 0,0,001-1,118,89 +001-2-28,61,31,0 warp #001-2-28_61_30 0,0,001-1,135,83 +001-2-28,34,26,0 warp #001-2-28_34_25 3,0,001-2-29,38,34 diff --git a/npc/001-2-29/_import.txt b/npc/001-2-29/_import.txt index 3c5e0548..39bb3601 100644 --- a/npc/001-2-29/_import.txt +++ b/npc/001-2-29/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-29: Artis, Red Plush Inn, First Floor +// Map 001-2-29: First Floor +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-29/_warps.txt", "npc/001-2-29/mapflags.txt", "npc/001-2-29/savepoint.txt", diff --git a/npc/001-2-29/_warps.txt b/npc/001-2-29/_warps.txt index 8dbe4ff2..113e179c 100644 --- a/npc/001-2-29/_warps.txt +++ b/npc/001-2-29/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-29: Artis, Red Plush Inn, First Floor -001-2-29,38,35,0 warp ToFirstLevel#001-2-29 2,0,001-2-28,33,27 -001-2-29,38,27,0 warp ToThirdLevel#001-2-29 0,1,001-2-30,36,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-29: First Floor warps +001-2-29,39,35,0 warp #001-2-29_39_35 3,0,001-2-28,33,27 +001-2-29,38,26,0 warp #001-2-29_38_25 0,1,001-2-30,36,31 diff --git a/npc/001-2-3/_import.txt b/npc/001-2-3/_import.txt index 9ae1cc94..c003e206 100644 --- a/npc/001-2-3/_import.txt +++ b/npc/001-2-3/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-3: Artis, Moon's House, First Floor -"npc/001-2-3/mapflags.txt", -"npc/001-2-3/savepoints.txt", +// Map 001-2-3: First Floor +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-3/_savepoints.txt", "npc/001-2-3/_warps.txt", +"npc/001-2-3/mapflags.txt", diff --git a/npc/001-2-3/_savepoints.txt b/npc/001-2-3/_savepoints.txt new file mode 100644 index 00000000..a3e08055 --- /dev/null +++ b/npc/001-2-3/_savepoints.txt @@ -0,0 +1,11 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-3: First Floor saves +001-2-3,42,32,0 script #save_001-2-3_42_32 NPC_SAVE_POINT,{ + savepointparticle .map$, .x, .y, CURRENT_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; +} diff --git a/npc/001-2-3/_warps.txt b/npc/001-2-3/_warps.txt index 1bcf29e6..ddd0b6e1 100644 --- a/npc/001-2-3/_warps.txt +++ b/npc/001-2-3/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-3: Artis, Moon's House, First Floor -001-2-3,27,31,0 warp To First Level 1,0,001-2-2,27,30 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-3: First Floor warps +001-2-3,27,31,0 warp #001-2-3_27_31 2,0,001-2-2,27,31 diff --git a/npc/001-2-3/savepoints.txt b/npc/001-2-3/savepoints.txt deleted file mode 100644 index 799ac40e..00000000 --- a/npc/001-2-3/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-3,42,32,0 script #savepoint0-001-2-3 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-30/_import.txt b/npc/001-2-30/_import.txt index b6493c68..91918ef5 100644 --- a/npc/001-2-30/_import.txt +++ b/npc/001-2-30/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-30: Artis, Red Plush Inn, Second Floor -"npc/001-2-30/mapflags.txt", +// Map 001-2-30: Second Floor +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-30/_mobs.txt", "npc/001-2-30/_warps.txt", +"npc/001-2-30/mapflags.txt", diff --git a/npc/001-2-30/_mobs.txt b/npc/001-2-30/_mobs.txt index 3fc02565..956ecf5d 100644 --- a/npc/001-2-30/_mobs.txt +++ b/npc/001-2-30/_mobs.txt @@ -1,3 +1,3 @@ -// Map 001-2-30: Artis, Red Plush Inn, Second Floor -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -001-2-30,0,0,0,0 monster Ratto 1005,1,420000,240000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-30: Second Floor mobs +001-2-30,0,0,0,0 monster Ratto 1005,1,240000,420000 diff --git a/npc/001-2-30/_warps.txt b/npc/001-2-30/_warps.txt index 314f5875..60c227f8 100644 --- a/npc/001-2-30/_warps.txt +++ b/npc/001-2-30/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-30: Artis, Red Plush Inn, Second Floor -001-2-30,36,32,0 warp ToSecondLevel#001-2-30 1,0,001-2-29,37,27 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-30: Second Floor warps +001-2-30,37,32,0 warp #001-2-30_37_32 1,0,001-2-29,37,27 diff --git a/npc/001-2-31/_import.txt b/npc/001-2-31/_import.txt index e50911b6..a599f2ae 100644 --- a/npc/001-2-31/_import.txt +++ b/npc/001-2-31/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-31: +// Map 001-2-31: unnamed +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-31/_warps.txt", "npc/001-2-31/mapflags.txt", diff --git a/npc/001-2-31/_warps.txt b/npc/001-2-31/_warps.txt index e085d649..b25ab888 100644 --- a/npc/001-2-31/_warps.txt +++ b/npc/001-2-31/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-31: -001-2-31,32,40,0 warp ToArtis#001-2-31 0,0,001-1,49,97 -001-2-31,36,32,0 warp ToBarber#001-2-31 0,0,001-2-41,25,32 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-31: unnamed warps +001-2-31,32,40,0 warp #001-2-31_32_40 0,0,001-1,49,97 +001-2-31,36,32,0 warp #001-2-31_36_32 0,0,001-2-41,25,32 diff --git a/npc/001-2-32/_import.txt b/npc/001-2-32/_import.txt index d023b591..9043352d 100644 --- a/npc/001-2-32/_import.txt +++ b/npc/001-2-32/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-32: +// Map 001-2-32: unnamed +// 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", "npc/001-2-32/mapflags.txt", diff --git a/npc/001-2-32/_warps.txt b/npc/001-2-32/_warps.txt index eca97455..306493cb 100644 --- a/npc/001-2-32/_warps.txt +++ b/npc/001-2-32/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-32: -001-2-32,27,33,0 warp ToHall#001-2-33 0,0,001-2-33,39,33 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-32: unnamed 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-33/_import.txt b/npc/001-2-33/_import.txt index 095e0187..7dadf6f8 100644 --- a/npc/001-2-33/_import.txt +++ b/npc/001-2-33/_import.txt @@ -1,6 +1,6 @@ -// Map 001-2-33: Artis, Legion of Aemil Headquarters +// Map 001-2-33: Legion of Aemil Headquarters +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-33/_warps.txt", -"npc/001-2-33/doors.txt", "npc/001-2-33/lozerk.txt", "npc/001-2-33/mapflags.txt", "npc/001-2-33/triggers.txt", diff --git a/npc/001-2-33/_warps.txt b/npc/001-2-33/_warps.txt index 0e6f5fda..16311469 100644 --- a/npc/001-2-33/_warps.txt +++ b/npc/001-2-33/_warps.txt @@ -1,6 +1,53 @@ -// Map 001-2-33: Artis, Legion of Aemil Headquarters -001-2-33,34,47,0 warp ToArtis#001-2-33 0,0,001-1,57,42 -001-2-33,23,30,0 warp ToLeftDormroom#001-2-33 0,0,001-2-37,36,28 -001-2-33,45,30,0 warp ToRightDormroom#001-2-33 0,0,001-2-38,24,28 -001-2-33,25,40,0 warp ToLeftPvP#001-2-33 1,0,001-2-40,27,46 -001-2-33,43,40,0 warp ToRightPvP#001-2-33 1,0,001-2-40,45,46 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-33: Legion of Aemil Headquarters warps +001-2-33,29,32,0 script #001-2-33_29_32_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-34", 29, 32; +close; + +OnUnTouch: + doevent "#001-2-33_29_32::OnUnTouch"; +} +001-2-33,29,32,0 script #001-2-33_29_32 NPC_ARTIS_IN_DOOR,1,2,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-2-33,39,32,0 script #001-2-33_39_32_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-32", 27, 32; +close; + +OnUnTouch: + doevent "#001-2-33_39_32::OnUnTouch"; +} +001-2-33,39,32,0 script #001-2-33_39_32 NPC_ARTIS_IN_DOOR,1,2,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + +001-2-33,45,30,0 warp #001-2-33_45_28 0,0,001-2-38,24,28 +001-2-33,23,30,0 warp #001-2-33_23_28 0,0,001-2-37,36,28 +001-2-33,25,40,0 warp #001-2-33_25_40 2,0,001-2-40,27,46 +001-2-33,43,40,0 warp #001-2-33_43_40 2,0,001-2-40,45,46 +001-2-33,34,47,0 warp #001-2-33_34_46 0,0,001-1,57,42 diff --git a/npc/001-2-33/doors.txt b/npc/001-2-33/doors.txt deleted file mode 100644 index 65266cb1..00000000 --- a/npc/001-2-33/doors.txt +++ /dev/null @@ -1,56 +0,0 @@ -// Evol scripts. -// Authors: -// 4144, Reid -// Description: -// Doors warp and animations in map 001-2-33 -// - -001-2-33,29,32,0 script #LeftWarp-001-2-33 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-34", 29, 32; - close; - -OnUnTouch: - doevent "#LeftWarp-001-2-33::OnUnTouch"; -} - -001-2-33,29,31,0 script #LeftDoor-001-2-33 NPC_ARTIS_IN_DOOR,1,2,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} - -001-2-33,39,32,0 script #RightWarp-001-2-33 NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-32", 27, 32; - close; - -OnUnTouch: - doevent "#RightWarp-001-2-33::OnUnTouch"; -} - -001-2-33,39,31,0 script #RightDoor-001-2-33 NPC_ARTIS_IN_DOOR,1,2,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} diff --git a/npc/001-2-34/_import.txt b/npc/001-2-34/_import.txt index 6b70c089..326973e6 100644 --- a/npc/001-2-34/_import.txt +++ b/npc/001-2-34/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-34: +// Map 001-2-34: unnamed +// 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", "npc/001-2-34/mapflags.txt", diff --git a/npc/001-2-34/_warps.txt b/npc/001-2-34/_warps.txt index aebf2b06..1311f071 100644 --- a/npc/001-2-34/_warps.txt +++ b/npc/001-2-34/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-34: -001-2-34,29,33,0 warp ToHall#001-2-34 0,0,001-2-33,29,33 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-34: unnamed 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 1d471d17..969d9e1c 100644 --- a/npc/001-2-35/_import.txt +++ b/npc/001-2-35/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-35: +// Map 001-2-35: unnamed +// 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 aeb322b7..d5939222 100644 --- a/npc/001-2-35/_warps.txt +++ b/npc/001-2-35/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-35: -001-2-35,23,29,0 warp ToWaitingRoom#001-2-35 0,0,001-2-32,32,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-35: unnamed 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 b064d800..222e5a7f 100644 --- a/npc/001-2-36/_import.txt +++ b/npc/001-2-36/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-36: +// Map 001-2-36: unnamed +// 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/mapflags.txt", "npc/001-2-36/training_room_npc.txt", diff --git a/npc/001-2-36/_warps.txt b/npc/001-2-36/_warps.txt index 1b1659f1..9e9c6c70 100644 --- a/npc/001-2-36/_warps.txt +++ b/npc/001-2-36/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-36: -001-2-36,37,30,0 warp ToWaitingRoom#001-2-36 0,0,001-2-34,24,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-36: unnamed warps +001-2-36,37,30,0 warp #001-2-36_37_29 0,0,001-2-34,24,29 diff --git a/npc/001-2-37/_import.txt b/npc/001-2-37/_import.txt index 52916239..05315d64 100644 --- a/npc/001-2-37/_import.txt +++ b/npc/001-2-37/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-37: +// Map 001-2-37: unnamed +// 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", "npc/001-2-37/hammock.txt", "npc/001-2-37/mapflags.txt", -"npc/001-2-37/savepoints.txt", -"npc/001-2-37/_warps.txt", diff --git a/npc/001-2-38/savepoints.txt b/npc/001-2-37/_savepoints.txt index f3b01caa..2568b51b 100644 --- a/npc/001-2-38/savepoints.txt +++ b/npc/001-2-37/_savepoints.txt @@ -1,10 +1,6 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-38,25,41,0 script #savepoint0-001-2-38 NPC_SAVE_POINT,{ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-37: unnamed saves +001-2-37,25,41,0 script #save_001-2-37_25_41 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -13,8 +9,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-38,35,41,0 script #savepoint1-001-2-38 NPC_SAVE_POINT,{ +001-2-37,35,41,0 script #save_001-2-37_35_41 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -23,8 +18,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-38,25,46,0 script #savepoint2-001-2-38 NPC_SAVE_POINT,{ +001-2-37,35,46,0 script #save_001-2-37_35_46 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -33,8 +27,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-38,35,46,0 script #savepoint3-001-2-38 NPC_SAVE_POINT,{ +001-2-37,25,46,0 script #save_001-2-37_25_46 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; diff --git a/npc/001-2-37/_warps.txt b/npc/001-2-37/_warps.txt index f3fce3e8..f6997b5f 100644 --- a/npc/001-2-37/_warps.txt +++ b/npc/001-2-37/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-37: -001-2-37,37,28,0 warp ToHall#001-2-37 0,0,001-2-33,24,30 -001-2-37,37,33,0 warp ToOffice#001-2-37 0,0,001-2-39,24,33 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-37: unnamed 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 b7b44d44..e60aa3f9 100644 --- a/npc/001-2-38/_import.txt +++ b/npc/001-2-38/_import.txt @@ -1,5 +1,6 @@ -// Map 001-2-38: +// Map 001-2-38: unnamed +// 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", "npc/001-2-38/hammock.txt", "npc/001-2-38/mapflags.txt", -"npc/001-2-38/savepoints.txt", -"npc/001-2-38/_warps.txt", diff --git a/npc/001-2-37/savepoints.txt b/npc/001-2-38/_savepoints.txt index 5664a390..8b89b8e5 100644 --- a/npc/001-2-37/savepoints.txt +++ b/npc/001-2-38/_savepoints.txt @@ -1,10 +1,6 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-37,25,41,0 script #savepoint0-001-2-37 NPC_SAVE_POINT,{ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-38: unnamed saves +001-2-38,25,41,0 script #save_001-2-38_25_41 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -13,8 +9,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-37,35,41,0 script #savepoint1-001-2-37 NPC_SAVE_POINT,{ +001-2-38,35,41,0 script #save_001-2-38_35_41 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -23,8 +18,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-37,25,46,0 script #savepoint2-001-2-37 NPC_SAVE_POINT,{ +001-2-38,35,46,0 script #save_001-2-38_35_46 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; @@ -33,8 +27,7 @@ OnInit: .sex = G_OTHER; end; } - -001-2-37,35,46,0 script #savepoint3-001-2-37 NPC_SAVE_POINT,{ +001-2-38,25,46,0 script #save_001-2-38_25_46 NPC_SAVE_POINT,{ savepointparticle .map$, .x, .y, CURRENT_INN; close; diff --git a/npc/001-2-38/_warps.txt b/npc/001-2-38/_warps.txt index 21c1a438..9139345a 100644 --- a/npc/001-2-38/_warps.txt +++ b/npc/001-2-38/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-38: -001-2-38,23,28,0 warp ToHall#001-2-38 0,0,001-2-33,44,30 -001-2-38,23,33,0 warp ToOffice#001-2-38 0,0,001-2-39,44,33 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-38: unnamed 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 30810ee5..8ceee767 100644 --- a/npc/001-2-39/_import.txt +++ b/npc/001-2-39/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-39: +// Map 001-2-39: unnamed +// 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/qanon.txt", "npc/001-2-39/mapflags.txt", +"npc/001-2-39/qanon.txt", diff --git a/npc/001-2-39/_warps.txt b/npc/001-2-39/_warps.txt index 062eeb68..527acae5 100644 --- a/npc/001-2-39/_warps.txt +++ b/npc/001-2-39/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-39: -001-2-39,23,33,0 warp ToLeftChamber#001-2-39 0,0,001-2-37,36,33 -001-2-39,45,33,0 warp ToRightChambr#001-2-39 0,0,001-2-38,24,33 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-39: unnamed 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/001-2-4/_import.txt b/npc/001-2-4/_import.txt index 285809ab..14bf4c53 100644 --- a/npc/001-2-4/_import.txt +++ b/npc/001-2-4/_import.txt @@ -1,6 +1,6 @@ -// Map 001-2-4: Artis, Library -"npc/001-2-4/mapflags.txt", +// Map 001-2-4: Library +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-4/_warps.txt", -"npc/001-2-4/doors.txt", +"npc/001-2-4/mapflags.txt", "npc/001-2-4/robin.txt", "npc/001-2-4/terry.txt", diff --git a/npc/001-2-4/_warps.txt b/npc/001-2-4/_warps.txt index 5f92bf86..0992fe15 100644 --- a/npc/001-2-4/_warps.txt +++ b/npc/001-2-4/_warps.txt @@ -1,3 +1,27 @@ -// Map 001-2-4: Artis, Library -001-2-4,48,41,0 warp To Artis#001-2-4 1,0,001-1,51,81 -001-2-4,57,27,0 warp To Lib. Second#001-2-4 2,0,001-2-6,57,35 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-4: Library warps +001-2-4,48,41,0 warp #001-2-4_48_41 0,0,001-1,51,81 +001-2-4,57,27,0 warp #001-2-4_57_26 3,0,001-2-6,57,34 +001-2-4,52,27,0 script #001-2-4_52_27_h NPC_HIDDEN,0,0,{ +OnTouch: + warp "001-2-5", 28, 37; +close; + +OnUnTouch: + doevent "#001-2-4_52_27::OnUnTouch"; +} +001-2-4,52,27,0 script #001-2-4_52_27 NPC_ARTIS_IN_DOOR,3,3,{ + close; +OnTouch: + doorTouch; + +OnUnTouch: + doorUnTouch; + +OnTimer340: + doorTimer; + +OnInit: + doorInit; +} + diff --git a/npc/001-2-4/doors.txt b/npc/001-2-4/doors.txt deleted file mode 100644 index 5afc9902..00000000 --- a/npc/001-2-4/doors.txt +++ /dev/null @@ -1,31 +0,0 @@ -// Evol scripts. -// Authors: -// 4144, Reid -// Description: -// Doors warp and animations in map 001-2-4 -// - -001-2-4,52,28,0 script #LibraryWarp NPC_HIDDEN,0,0,{ -OnTouch: - warp "001-2-5", 28, 37; - close; - -OnUnTouch: - doevent "#LibraryDoor::OnUnTouch"; -} - -001-2-4,52,27,0 script #LibraryDoor NPC_ARTIS_IN_DOOR,3,3,{ - close; - -OnTouch: - doorTouch; - -OnUnTouch: - doorUnTouch; - -OnTimer340: - doorTimer; - -OnInit: - doorInit; -} diff --git a/npc/001-2-40/_import.txt b/npc/001-2-40/_import.txt index 8a734ea2..a7c7abb8 100644 --- a/npc/001-2-40/_import.txt +++ b/npc/001-2-40/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-40: +// Map 001-2-40: unnamed +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-40/_warps.txt", "npc/001-2-40/mapflags.txt", "npc/001-2-40/trozz.txt", diff --git a/npc/001-2-40/_warps.txt b/npc/001-2-40/_warps.txt index 5c81efdc..8a8792d8 100644 --- a/npc/001-2-40/_warps.txt +++ b/npc/001-2-40/_warps.txt @@ -1,3 +1,4 @@ -// Map 001-2-40: -001-2-40,27,45,0 warp ToLeftHall#001-2-40 1,0,001-2-33,25,39 -001-2-40,45,45,0 warp ToRightHall#001-2-40 1,0,001-2-33,43,39 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-40: unnamed warps +001-2-40,45,45,0 warp #001-2-40_45_44 2,0,001-2-33,43,39 +001-2-40,27,45,0 warp #001-2-40_27_44 2,0,001-2-33,25,39 diff --git a/npc/001-2-41/_import.txt b/npc/001-2-41/_import.txt index 01c76b99..a8eee726 100644 --- a/npc/001-2-41/_import.txt +++ b/npc/001-2-41/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-41: +// Map 001-2-41: unnamed +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-41/_warps.txt", -"npc/001-2-41/mapflags.txt", "npc/001-2-41/edouard.txt", +"npc/001-2-41/mapflags.txt", diff --git a/npc/001-2-41/_warps.txt b/npc/001-2-41/_warps.txt index 48ff7b05..7a10c00d 100644 --- a/npc/001-2-41/_warps.txt +++ b/npc/001-2-41/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-41: -001-2-41,24,32,0 warp ToHall#001-2-41 0,0,001-2-31,35,32 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-41: unnamed warps +001-2-41,24,32,0 warp #001-2-41_24_32 0,0,001-2-31,35,32 diff --git a/npc/001-2-5/_import.txt b/npc/001-2-5/_import.txt index 25d72856..2e399b36 100644 --- a/npc/001-2-5/_import.txt +++ b/npc/001-2-5/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-5: Artis, Library, Warehouse +// Map 001-2-5: Warehouse +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-5/_warps.txt", "npc/001-2-5/books.txt", "npc/001-2-5/mapflags.txt", -"npc/001-2-5/_warps.txt", diff --git a/npc/001-2-5/_warps.txt b/npc/001-2-5/_warps.txt index 23240893..7d543143 100644 --- a/npc/001-2-5/_warps.txt +++ b/npc/001-2-5/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-5: Artis, Library, Warehouse -001-2-5,28,38,0 warp To Library First#001-2-5 0,0,001-2-4,52,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-5: Warehouse warps +001-2-5,28,38,0 warp #001-2-5_28_38 0,0,001-2-4,52,29 diff --git a/npc/001-2-6/_import.txt b/npc/001-2-6/_import.txt index 315a24ce..cc06496d 100644 --- a/npc/001-2-6/_import.txt +++ b/npc/001-2-6/_import.txt @@ -1,7 +1,8 @@ -// Map 001-2-6: Artis, Library, First Floor -"npc/001-2-6/mapflags.txt", +// Map 001-2-6: First Floor +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-6/_warps.txt", "npc/001-2-6/books.txt", "npc/001-2-6/christopher.txt", "npc/001-2-6/dolfina.txt", "npc/001-2-6/leonard.txt", +"npc/001-2-6/mapflags.txt", diff --git a/npc/001-2-6/_warps.txt b/npc/001-2-6/_warps.txt index d106a18e..e778bf33 100644 --- a/npc/001-2-6/_warps.txt +++ b/npc/001-2-6/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-6: Artis, Library, First Floor -001-2-6,57,38,0 warp To Library First#001-2-6 2,0,001-2-4,57,29 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-6: First Floor warps +001-2-6,57,38,0 warp #001-2-6_57_38 3,0,001-2-4,57,28 diff --git a/npc/001-2-7/_import.txt b/npc/001-2-7/_import.txt index 356c0f79..6d588bf8 100644 --- a/npc/001-2-7/_import.txt +++ b/npc/001-2-7/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-7: Artis, City Hall -"npc/001-2-7/mapflags.txt", +// Map 001-2-7: City Hall +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-7/_warps.txt", +"npc/001-2-7/mapflags.txt", diff --git a/npc/001-2-7/_warps.txt b/npc/001-2-7/_warps.txt index a89acf80..d59fa937 100644 --- a/npc/001-2-7/_warps.txt +++ b/npc/001-2-7/_warps.txt @@ -1,4 +1,5 @@ -// Map 001-2-7: Artis, City Hall -001-2-7,26,31,0 warp To Left Room#001-2-7 0,0,001-2-8,45,41 -001-2-7,46,31,0 warp To Right Room#001-2-7 0,0,001-2-9,25,41 -001-2-7,36,46,0 warp To Artis#001-2-7 0,0,001-1,89,66 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-7: City Hall warps +001-2-7,36,46,0 warp #001-2-7_36_46 0,0,001-1,89,66 +001-2-7,46,31,0 warp #001-2-7_46_31 0,0,001-2-9,25,41 +001-2-7,26,31,0 warp #001-2-7_26_31 0,0,001-2-8,45,41 diff --git a/npc/001-2-8/_import.txt b/npc/001-2-8/_import.txt index 8482930a..93b064fe 100644 --- a/npc/001-2-8/_import.txt +++ b/npc/001-2-8/_import.txt @@ -1,3 +1,4 @@ -// Map 001-2-8: Artis, City Hall, Left Wing -"npc/001-2-8/mapflags.txt", +// Map 001-2-8: Left Wing +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-8/_warps.txt", +"npc/001-2-8/mapflags.txt", diff --git a/npc/001-2-8/_warps.txt b/npc/001-2-8/_warps.txt index 181429d2..43412f72 100644 --- a/npc/001-2-8/_warps.txt +++ b/npc/001-2-8/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-8: Artis, City Hall, Left Wing -001-2-8,46,41,0 warp To Main Hall#001-2-8 0,0,001-2-7,27,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-8: Left Wing warps +001-2-8,46,41,0 warp #001-2-8_46_41 0,0,001-2-7,27,31 diff --git a/npc/001-2-9/_import.txt b/npc/001-2-9/_import.txt index a74bc989..ebac336c 100644 --- a/npc/001-2-9/_import.txt +++ b/npc/001-2-9/_import.txt @@ -1,4 +1,5 @@ -// Map 001-2-9: Artis, City Hall, Right Wing +// Map 001-2-9: Right Wing +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-2-9/_warps.txt", "npc/001-2-9/janus.txt", "npc/001-2-9/mapflags.txt", -"npc/001-2-9/_warps.txt", diff --git a/npc/001-2-9/_warps.txt b/npc/001-2-9/_warps.txt index ce9f5d56..b4d3c594 100644 --- a/npc/001-2-9/_warps.txt +++ b/npc/001-2-9/_warps.txt @@ -1,2 +1,3 @@ -// Map 001-2-9: Artis, City Hall, Right Wing -001-2-9,24,41,0 warp To Main Hall#001-2-9 0,0,001-2-7,45,31 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-2-9: Right Wing warps +001-2-9,24,41,0 warp #001-2-9_24_41 0,0,001-2-7,45,31 diff --git a/npc/_import.txt b/npc/_import.txt index a17a5802..8c606e29 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,3 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. + @include "npc/000-0-0/_import.txt" @include "npc/000-0-1/_import.txt" @include "npc/000-0/_import.txt" @@ -10,14 +12,6 @@ @include "npc/001-1/_import.txt" @include "npc/001-2-0/_import.txt" @include "npc/001-2-1/_import.txt" -@include "npc/001-2-2/_import.txt" -@include "npc/001-2-3/_import.txt" -@include "npc/001-2-4/_import.txt" -@include "npc/001-2-5/_import.txt" -@include "npc/001-2-6/_import.txt" -@include "npc/001-2-7/_import.txt" -@include "npc/001-2-8/_import.txt" -@include "npc/001-2-9/_import.txt" @include "npc/001-2-10/_import.txt" @include "npc/001-2-11/_import.txt" @include "npc/001-2-12/_import.txt" @@ -28,6 +22,7 @@ @include "npc/001-2-17/_import.txt" @include "npc/001-2-18/_import.txt" @include "npc/001-2-19/_import.txt" +@include "npc/001-2-2/_import.txt" @include "npc/001-2-20/_import.txt" @include "npc/001-2-21/_import.txt" @include "npc/001-2-22/_import.txt" @@ -38,6 +33,7 @@ @include "npc/001-2-27/_import.txt" @include "npc/001-2-28/_import.txt" @include "npc/001-2-29/_import.txt" +@include "npc/001-2-3/_import.txt" @include "npc/001-2-30/_import.txt" @include "npc/001-2-31/_import.txt" @include "npc/001-2-32/_import.txt" @@ -48,7 +44,13 @@ @include "npc/001-2-37/_import.txt" @include "npc/001-2-38/_import.txt" @include "npc/001-2-39/_import.txt" +@include "npc/001-2-4/_import.txt" @include "npc/001-2-40/_import.txt" @include "npc/001-2-41/_import.txt" +@include "npc/001-2-5/_import.txt" +@include "npc/001-2-6/_import.txt" +@include "npc/001-2-7/_import.txt" +@include "npc/001-2-8/_import.txt" +@include "npc/001-2-9/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" diff --git a/npc/test/_import.txt b/npc/test/_import.txt index 6fc546a7..9cb2ebd9 100644 --- a/npc/test/_import.txt +++ b/npc/test/_import.txt @@ -1,7 +1,7 @@ -// Map test -"npc/test/mapflags.txt", +// Map test: test +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/test/_mobs.txt", -"npc/test/_warps.txt", +"npc/test/mapflags.txt", "npc/test/npc1.txt", "npc/test/npc2.txt", "npc/test/npc3.txt", diff --git a/npc/test/_mobs.txt b/npc/test/_mobs.txt index 72b589e4..c5b78e37 100644 --- a/npc/test/_mobs.txt +++ b/npc/test/_mobs.txt @@ -1,16 +1,5 @@ -// Test Map -// mapID,x,y,sizex,sizey monster Name mobID,number,eAdeath,eAspawn,script -test,38,12,1,1 monster Piou 1002,1,1000,1000 -test,38,12,1,1 monster Tortuga 1004,1,1000,1000 -test,44,12,1,1 monster Piou 1002,3,1000,1000 -test,48,10,1,1 monster Tortuga 1004,3,1000,1000 -test,48,10,0,0 monster Piou 1002,1,1000,1000 -test,48,10,0,0 monster Ratto 1005,1,1000,1000 -test,54,10,1,1 monster Piou 1002,3,1000,1000 -// test,61,10,0,0 monster Piou 1002,3,1000,1000 -test,68,9,0,0 monster Piou 1002,3,1000,1000 -test,68,9,0,0 monster Ratto 1005,1,1000,1000 -test,68,9,1,1 monster Tortuga 1004,3,1000,1000 -test,76,10,1,1 monster Piou 1002,3,1000,1000 -test,76,10,1,1 monster Ratto 1005,1,1000,1000 -test,78,4,1,1 monster Ratto 1005,3,1000,1000 +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map test: test mobs +test,51,37,12,19 monster Tortuga 1004,3,16000,120000 +test,78,30,0,0 monster Piou 1002,4,60000,15000 +test,79,38,0,0 monster Ratto 1005,1,240000,420000 diff --git a/npc/test/_warps.txt b/npc/test/_warps.txt deleted file mode 100644 index e69de29b..00000000 --- a/npc/test/_warps.txt +++ /dev/null diff --git a/npc/testbg/_import.txt b/npc/testbg/_import.txt index 4d88d6b8..c8affdf4 100644 --- a/npc/testbg/_import.txt +++ b/npc/testbg/_import.txt @@ -1,2 +1,3 @@ -// Map testbg +// Map testbg: testbg +// This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/testbg/mapflags.txt", |