diff options
author | Jesusaves <cpntb1@ymail.com> | 2018-05-30 23:58:34 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2018-05-30 23:58:34 -0300 |
commit | 52bb14a05013cfa64d778f652ea1dfc40069c7f7 (patch) | |
tree | 7ee061e08493434c1577383e2256f8fa787594de | |
parent | 2b102393713342bfcd77492e00d3c693b49ca6e0 (diff) | |
download | serverdata-52bb14a05013cfa64d778f652ea1dfc40069c7f7.tar.gz serverdata-52bb14a05013cfa64d778f652ea1dfc40069c7f7.tar.bz2 serverdata-52bb14a05013cfa64d778f652ea1dfc40069c7f7.tar.xz serverdata-52bb14a05013cfa64d778f652ea1dfc40069c7f7.zip |
Move Tamiloc
-rw-r--r-- | npc/003-1/_import.txt | 1 | ||||
-rw-r--r-- | npc/003-6/_import.txt | 1 | ||||
-rw-r--r-- | npc/003-6/tamiloc.txt (renamed from npc/003-1/tamiloc.txt) | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt index 6e62a1685..19146fc93 100644 --- a/npc/003-1/_import.txt +++ b/npc/003-1/_import.txt @@ -34,7 +34,6 @@ "npc/003-1/silvia.txt", "npc/003-1/soul-menhir.txt", "npc/003-1/swezanne.txt", -"npc/003-1/tamiloc.txt", "npc/003-1/tinris.txt", "npc/003-1/wateranimation.txt", "npc/003-1/well.txt", diff --git a/npc/003-6/_import.txt b/npc/003-6/_import.txt index c62b587f2..95f40969d 100644 --- a/npc/003-6/_import.txt +++ b/npc/003-6/_import.txt @@ -2,3 +2,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/003-6/_warps.txt", "npc/003-6/cyndala.txt", +"npc/003-6/tamiloc.txt", diff --git a/npc/003-1/tamiloc.txt b/npc/003-6/tamiloc.txt index f6812288f..4fbea5a0e 100644 --- a/npc/003-1/tamiloc.txt +++ b/npc/003-6/tamiloc.txt @@ -5,9 +5,9 @@ // Reid // Travolta // Description: -// For a while, the Barber will be Tamiloc, until we decide to either move it or keep it. +// Tamiloc is the barber. -003-1,49,43,0 script Tamiloc NPC_ELVEN_FEMALE_ARMOR_SHOP,{ +003-6,46,30,0 script Tamiloc NPC_ELVEN_FEMALE_ARMOR_SHOP,{ function setRace { clear; setnpcdialogtitle l("Debug - Modify Race"); |