diff options
| -rwxr-xr-x | db/re/map_cache.dat | bin | 11772 -> 11768 bytes | |||
| -rw-r--r-- | npc/000-0-0/_import.txt | 1 | ||||
| -rw-r--r-- | npc/000-0-0/_mobs.txt | 3 | ||||
| -rw-r--r-- | npc/000-0/_import.txt | 2 | ||||
| -rw-r--r-- | npc/002-1/arpan.txt | 2 | ||||
| -rw-r--r-- | npc/005-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/005-7/_import.txt | 1 | ||||
| -rw-r--r-- | npc/005-7/trainer.txt (renamed from npc/005-1/trainer.txt) | 2 |
8 files changed, 4 insertions, 8 deletions
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat Binary files differindex bb8702255..985998e4a 100755 --- 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 095ee28ed..fa572a35a 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,5 +1,4 @@ // 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/_mobs.txt", "npc/000-0-0/mapflags.txt", "npc/000-0-0/sailors.txt", diff --git a/npc/000-0-0/_mobs.txt b/npc/000-0-0/_mobs.txt deleted file mode 100644 index 42d34f378..000000000 --- a/npc/000-0-0/_mobs.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 000-0-0: Sailor's Room mobs -000-0-0,30,33,0,0 monster Scythe 1036,1,30000,20000 diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index 75f2626bf..d2f0652ba 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,4 +1,4 @@ -// Map 000-0: Oceania +// Map 000-0: Ocean // 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/002-1/arpan.txt b/npc/002-1/arpan.txt index 071fea65e..ca388bc6e 100644 --- a/npc/002-1/arpan.txt +++ b/npc/002-1/arpan.txt @@ -165,7 +165,7 @@ L_Menu: L_Where: mes ""; mesn; - mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Tulimshar."); + mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant travelling adventure at the city of Tulimshar."); next; mesq l("We will be yaying there in a few days, so we will drop you off there."); next; diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt index 194ccd561..9aee99666 100644 --- a/npc/005-1/_import.txt +++ b/npc/005-1/_import.txt @@ -9,7 +9,6 @@ "npc/005-1/sailors.txt", "npc/005-1/ship.txt", "npc/005-1/soul-menhir.txt", -"npc/005-1/trainer.txt", "npc/005-1/vincent.txt", "npc/005-1/warpcandorbattle.txt", "npc/005-1/zegas.txt", diff --git a/npc/005-7/_import.txt b/npc/005-7/_import.txt index aa79f2d31..79d8a945d 100644 --- a/npc/005-7/_import.txt +++ b/npc/005-7/_import.txt @@ -1,3 +1,4 @@ // Map 005-7: Training House // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-7/_warps.txt", +"npc/005-7/trainer.txt", diff --git a/npc/005-1/trainer.txt b/npc/005-7/trainer.txt index a2e59f474..f59d5971e 100644 --- a/npc/005-1/trainer.txt +++ b/npc/005-7/trainer.txt @@ -6,7 +6,7 @@ // Objective: Train the player and give some experience. // License: GPL v3 -005-1,21,91,0 script Trainer NPC_PLAYER,{ +005-7,25,29,0 script Trainer NPC_PLAYER,{ mesn; mesq l("Hello my friend! Need my help?"); |