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/merchants/hd_refiner.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/merchants/hd_refiner.txt')
| -rw-r--r-- | npc/re/merchants/hd_refiner.txt | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index fed923af9..c55917f4f 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -140,17 +140,17 @@ mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm."; close; } -prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 826 -morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 826 -payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 826 -alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 826 -yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 826 -ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 826 -lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 +prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 4_M_DWARF +morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 4_M_DWARF +payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 4_M_DWARF +alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 4_M_DWARF +yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 4_M_DWARF +ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 4_M_DWARF +lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF // iRO NPC locations: -// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826 -// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 826 +// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF +// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF // Basta (+10 and up) //============================================================ @@ -297,10 +297,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 mes "I'll do better next time! Don't worry!"; close; } -prt_in,57,54,3 duplicate(Basta) Basta#prt 826 -morocc_in,68,30,3 duplicate(Basta) Basta#morocc 826 -payon,148,174,3 duplicate(Basta) Basta#payon 826 -alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826 -yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826 -ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826 -lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826 +prt_in,57,54,3 duplicate(Basta) Basta#prt 4_M_DWARF +morocc_in,68,30,3 duplicate(Basta) Basta#morocc 4_M_DWARF +payon,148,174,3 duplicate(Basta) Basta#payon 4_M_DWARF +alberta_in,18,56,3 duplicate(Basta) Basta#alberta 4_M_DWARF +yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 4_M_DWARF +ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 4_M_DWARF +lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 4_M_DWARF |