diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/cities/alberta.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/re/cities/alberta.txt')
| -rw-r--r-- | npc/re/cities/alberta.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt index d25b59b4a..4fb8bab6d 100644 --- a/npc/re/cities/alberta.txt +++ b/npc/re/cities/alberta.txt @@ -13,29 +13,29 @@ // cities/amatsu.txt //============================================================ -alberta,246,74,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709 +alberta,246,74,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 4_M_SEAMAN // cities/ayothaya.txt //============================================================ -alberta,246,29,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843 +alberta,246,29,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 4_M_THAIONGBAK // cities/gonryun.txt //============================================================ -alberta,246,62,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776 +alberta,246,62,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 4_M_TWMIDMAN // cities/louyang.txt //============================================================ -alberta,246,40,3 duplicate(Girl_louyang) Girl#0lou 815 +alberta,246,40,3 duplicate(Girl_louyang) Girl#0lou 4_F_CHNDRESS1 // cities/moscovia.txt //============================================================ -alberta,246,51,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960 +alberta,246,51,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 4_F_RUSWOMAN2 // quests/quests_alberta.txt //============================================================ -alberta,244,118,4 duplicate(Sailor_alberta) Sailor#tur 709 -alberta,246,114,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121 +alberta,244,118,4 duplicate(Sailor_alberta) Sailor#tur 4_M_SEAMAN +alberta,246,114,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 2_M_MOLGENSTEIN // quests/skills/merchant_skills.txt //============================================================ -alberta,232,103,6 duplicate(Gershaun_alberta) Gershaun 57 +alberta,232,103,6 duplicate(Gershaun_alberta) Gershaun 1_M_LIBRARYMASTER |