summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-07 23:50:38 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-07 23:50:38 +0000
commit135ec52fa3accd8a599c5ac006157f4c85428935 (patch)
tree91d53fecc2ef4439ddb8db824bc80e8abdd6ec51 /npc
parent427c6cd30c0afc6fb965c5a7ffa925508a49d1d1 (diff)
downloadhercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.gz
hercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.bz2
hercules-135ec52fa3accd8a599c5ac006157f4c85428935.tar.xz
hercules-135ec52fa3accd8a599c5ac006157f4c85428935.zip
- Fixed a little leftover in socket_enchant2.txt .
- Added warp to iz_dun05 bugreport:5395 . - Fixed a little typo in clif.c . - Moved "int clif_status_load_single" from clif.c to clif.h . git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/merchants/socket_enchant2.txt2
-rw-r--r--npc/warps/dungeons/iz_dun.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 107d38d5e..aa92f4d22 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -378,7 +378,7 @@
}
}
-payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86,{
+payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86
lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86
prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86
moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86
diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt
index 0ccc42db9..ee31f73dd 100644
--- a/npc/warps/dungeons/iz_dun.txt
+++ b/npc/warps/dungeons/iz_dun.txt
@@ -28,3 +28,5 @@ iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63
iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27
iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328
iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245
+iz_dun04,129,233,0 warp izd07 2,2,iz_dun05,141,187
+iz_dun05,141,190,0 warp izd07-1 2,2,iz_dun04,129,230