summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-21 08:26:58 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-21 08:26:58 +0000
commit4f68a6ef917b92df214a12dcef09cffdfa1e80ff (patch)
tree98bf244c38b10dfbd244ad78e2c638270285d1e0 /npc
parent3726e00c073550558fa9b954e1fd2b854bc787e3 (diff)
downloadhercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.gz
hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.bz2
hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.xz
hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.zip
- Fixed emperium coordinates in Payon Holy Shadow (payg_cas03).
- Also enforce sd->emotionlasttime for pet emotions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15901 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/guild/agit_template.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index 8381f9ca3..21563adf9 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -78,7 +78,7 @@ OnStartArena:
else if (strnpcinfo(2) == "gefg_cas05") { setarray .@emproom[0],194,184; }
else if (strnpcinfo(2) == "payg_cas01") { setarray .@emproom[0],139,139; }
else if (strnpcinfo(2) == "payg_cas02") { setarray .@emproom[0],38,25; }
- else if (strnpcinfo(2) == "payg_cas03") { setarray .@emproom[0],268,264; }
+ else if (strnpcinfo(2) == "payg_cas03") { setarray .@emproom[0],269,265; }
else if (strnpcinfo(2) == "payg_cas04") { setarray .@emproom[0],270,28; }
else if (strnpcinfo(2) == "payg_cas05") { setarray .@emproom[0],30,30; }
else if (strnpcinfo(2) == "prtg_cas01") { setarray .@emproom[0],197,197; }
@@ -235,7 +235,7 @@ OnRecvCastle:
// Set Emperium room spawn coordinates and spawn monsters.
if (strnpcinfo(2) == "payg_cas01") { setarray .@emproom[0],139,139; }
else if (strnpcinfo(2) == "payg_cas02") { setarray .@emproom[0],38,25; }
- else if (strnpcinfo(2) == "payg_cas03") { setarray .@emproom[0],268,264; }
+ else if (strnpcinfo(2) == "payg_cas03") { setarray .@emproom[0],269,265; }
else if (strnpcinfo(2) == "payg_cas04") { setarray .@emproom[0],270,28; }
else if (strnpcinfo(2) == "payg_cas05") { setarray .@emproom[0],30,30; }
monster strnpcinfo(2),.@emproom[0],.@emproom[1],"Moonlight Flower",1150,1;