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/yuno.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/yuno.txt')
| -rw-r--r-- | npc/re/cities/yuno.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt index 630969db6..ac2fb25fb 100644 --- a/npc/re/cities/yuno.txt +++ b/npc/re/cities/yuno.txt @@ -11,10 +11,10 @@ //= 1.0 First version. //============================================================ -yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 852 -yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 852 -yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 852 -yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 852 -yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 852 -yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 852 -yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 852 +yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 4_M_EIN_SOLDIER +yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 4_M_EIN_SOLDIER +yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 4_M_EIN_SOLDIER +yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 4_M_EIN_SOLDIER +yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 4_M_EIN_SOLDIER +yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 4_M_EIN_SOLDIER +yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 4_M_EIN_SOLDIER |