diff options
-rw-r--r-- | npc/010-2_Dimond's_Cove/_import.txt | 7 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/_import.txt | 7 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/_mobs.txt (renamed from npc/010-2_Dimond's_Cove/_mobs.txt) | 0 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/_warps.txt (renamed from npc/010-2_Dimond's_Cove/_warps.txt) | 0 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/dimonds.txt (renamed from npc/010-2_Dimond's_Cove/dimonds.txt) | 0 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/doug.txt (renamed from npc/010-2_Dimond's_Cove/doug.txt) | 0 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/loratay.txt (renamed from npc/010-2_Dimond's_Cove/loratay.txt) | 0 | ||||
-rw-r--r-- | npc/010-2_Dimonds_Cove/workers.txt (renamed from npc/010-2_Dimond's_Cove/workers.txt) | 0 | ||||
-rw-r--r-- | npc/011-3_Hermit's_cave/_import.txt | 5 | ||||
-rw-r--r-- | npc/011-3_Hermits_cave/_import.txt | 5 | ||||
-rw-r--r-- | npc/011-3_Hermits_cave/_mobs.txt (renamed from npc/011-3_Hermit's_cave/_mobs.txt) | 0 | ||||
-rw-r--r-- | npc/011-3_Hermits_cave/_warps.txt (renamed from npc/011-3_Hermit's_cave/_warps.txt) | 0 | ||||
-rw-r--r-- | npc/011-3_Hermits_cave/hermit.txt (renamed from npc/011-3_Hermit's_cave/hermit.txt) | 0 | ||||
-rw-r--r-- | npc/011-3_Hermits_cave/monsters.txt (renamed from npc/011-3_Hermit's_cave/monsters.txt) | 0 | ||||
-rw-r--r-- | npc/018-2_Woodland_minning_camp/receptionist.txt | 2 | ||||
-rw-r--r-- | npc/_import.txt | 4 | ||||
-rw-r--r-- | tools/tmwcon/src/converter/Process.java | 2 |
17 files changed, 16 insertions, 16 deletions
diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt deleted file mode 100644 index dc812c2d..00000000 --- a/npc/010-2_Dimond's_Cove/_import.txt +++ /dev/null @@ -1,7 +0,0 @@ -map: 010-2.gat -npc: npc/010-2_Dimond's_Cove/_mobs.txt -npc: npc/010-2_Dimond's_Cove/_warps.txt -npc: npc/010-2_Dimond's_Cove/dimonds.txt -npc: npc/010-2_Dimond's_Cove/doug.txt -npc: npc/010-2_Dimond's_Cove/loratay.txt -npc: npc/010-2_Dimond's_Cove/workers.txt diff --git a/npc/010-2_Dimonds_Cove/_import.txt b/npc/010-2_Dimonds_Cove/_import.txt new file mode 100644 index 00000000..1a75f84a --- /dev/null +++ b/npc/010-2_Dimonds_Cove/_import.txt @@ -0,0 +1,7 @@ +map: 010-2.gat +npc: npc/010-2_Dimonds_Cove/_mobs.txt +npc: npc/010-2_Dimonds_Cove/_warps.txt +npc: npc/010-2_Dimonds_Cove/dimonds.txt +npc: npc/010-2_Dimonds_Cove/doug.txt +npc: npc/010-2_Dimonds_Cove/loratay.txt +npc: npc/010-2_Dimonds_Cove/workers.txt diff --git a/npc/010-2_Dimond's_Cove/_mobs.txt b/npc/010-2_Dimonds_Cove/_mobs.txt index 7ccbfc8c..7ccbfc8c 100644 --- a/npc/010-2_Dimond's_Cove/_mobs.txt +++ b/npc/010-2_Dimonds_Cove/_mobs.txt diff --git a/npc/010-2_Dimond's_Cove/_warps.txt b/npc/010-2_Dimonds_Cove/_warps.txt index 8760c121..8760c121 100644 --- a/npc/010-2_Dimond's_Cove/_warps.txt +++ b/npc/010-2_Dimonds_Cove/_warps.txt diff --git a/npc/010-2_Dimond's_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt index 713b0d69..713b0d69 100644 --- a/npc/010-2_Dimond's_Cove/dimonds.txt +++ b/npc/010-2_Dimonds_Cove/dimonds.txt diff --git a/npc/010-2_Dimond's_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt index 49bb349c..49bb349c 100644 --- a/npc/010-2_Dimond's_Cove/doug.txt +++ b/npc/010-2_Dimonds_Cove/doug.txt diff --git a/npc/010-2_Dimond's_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt index 559ba578..559ba578 100644 --- a/npc/010-2_Dimond's_Cove/loratay.txt +++ b/npc/010-2_Dimonds_Cove/loratay.txt diff --git a/npc/010-2_Dimond's_Cove/workers.txt b/npc/010-2_Dimonds_Cove/workers.txt index 13704115..13704115 100644 --- a/npc/010-2_Dimond's_Cove/workers.txt +++ b/npc/010-2_Dimonds_Cove/workers.txt diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt deleted file mode 100644 index 5cf9225b..00000000 --- a/npc/011-3_Hermit's_cave/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -map: 011-3.gat -npc: npc/011-3_Hermit's_cave/_mobs.txt -npc: npc/011-3_Hermit's_cave/_warps.txt -npc: npc/011-3_Hermit's_cave/hermit.txt -npc: npc/011-3_Hermit's_cave/monsters.txt diff --git a/npc/011-3_Hermits_cave/_import.txt b/npc/011-3_Hermits_cave/_import.txt new file mode 100644 index 00000000..bb001714 --- /dev/null +++ b/npc/011-3_Hermits_cave/_import.txt @@ -0,0 +1,5 @@ +map: 011-3.gat +npc: npc/011-3_Hermits_cave/_mobs.txt +npc: npc/011-3_Hermits_cave/_warps.txt +npc: npc/011-3_Hermits_cave/hermit.txt +npc: npc/011-3_Hermits_cave/monsters.txt diff --git a/npc/011-3_Hermit's_cave/_mobs.txt b/npc/011-3_Hermits_cave/_mobs.txt index 39ac018b..39ac018b 100644 --- a/npc/011-3_Hermit's_cave/_mobs.txt +++ b/npc/011-3_Hermits_cave/_mobs.txt diff --git a/npc/011-3_Hermit's_cave/_warps.txt b/npc/011-3_Hermits_cave/_warps.txt index be9b6a83..be9b6a83 100644 --- a/npc/011-3_Hermit's_cave/_warps.txt +++ b/npc/011-3_Hermits_cave/_warps.txt diff --git a/npc/011-3_Hermit's_cave/hermit.txt b/npc/011-3_Hermits_cave/hermit.txt index 0c6f7550..0c6f7550 100644 --- a/npc/011-3_Hermit's_cave/hermit.txt +++ b/npc/011-3_Hermits_cave/hermit.txt diff --git a/npc/011-3_Hermit's_cave/monsters.txt b/npc/011-3_Hermits_cave/monsters.txt index 37da9f40..37da9f40 100644 --- a/npc/011-3_Hermit's_cave/monsters.txt +++ b/npc/011-3_Hermits_cave/monsters.txt diff --git a/npc/018-2_Woodland_minning_camp/receptionist.txt b/npc/018-2_Woodland_minning_camp/receptionist.txt index 58c9ed7a..ee735d14 100644 --- a/npc/018-2_Woodland_minning_camp/receptionist.txt +++ b/npc/018-2_Woodland_minning_camp/receptionist.txt @@ -30,7 +30,7 @@ L_Mine: L_Enter: mes "[Receptionist]"; - mes "\"I'm sorry, but the mine is very active. Entrance is restricted to miners only.\""; + mes "\"If you think you can handle all the monsters that have appeared there.\""; next; goto L_Question_End; diff --git a/npc/_import.txt b/npc/_import.txt index 51db0dff..df218035 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -16,9 +16,9 @@ import: npc/009-1_Hurnscald/_import.txt import: npc/009-2_Hurnscald/_import.txt import: npc/009-3_Cave_beneath_Hurnscald/_import.txt import: npc/010-1_Woodland/_import.txt -import: npc/010-2_Dimond's_Cove/_import.txt +import: npc/010-2_Dimonds_Cove/_import.txt import: npc/011-1_Woodland/_import.txt -import: npc/011-3_Hermit's_cave/_import.txt +import: npc/011-3_Hermits_cave/_import.txt import: npc/011-4_Lake_cave/_import.txt import: npc/012-1_Woodland_Hills/_import.txt import: npc/012-3_Cave/_import.txt diff --git a/tools/tmwcon/src/converter/Process.java b/tools/tmwcon/src/converter/Process.java index 8f077d5c..5b42df09 100644 --- a/tools/tmwcon/src/converter/Process.java +++ b/tools/tmwcon/src/converter/Process.java @@ -142,7 +142,7 @@ public class Process { } String folderName = scriptDirectory + name; if (title.length() > 0) { - folderName += "_" + title.replaceAll("\\s", "_"); + folderName += "_" + title.replaceAll("\\s", "_").replaceAll("[^A-Za-z0-9\\-_]", ""); title = name + " " + title; } else { title = name; |