summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-04 05:02:24 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-04 05:02:24 +0000
commitf51129bd4b8821d366a97c7df5748a2f0bec1aa9 (patch)
treed4d962a16a0649738c9a45c69b819f62890d38a3
parent235699773f6c0718aa412daacb03c3fbb0cf6870 (diff)
downloadhercules-f51129bd4b8821d366a97c7df5748a2f0bec1aa9.tar.gz
hercules-f51129bd4b8821d366a97c7df5748a2f0bec1aa9.tar.bz2
hercules-f51129bd4b8821d366a97c7df5748a2f0bec1aa9.tar.xz
hercules-f51129bd4b8821d366a97c7df5748a2f0bec1aa9.zip
added missing OnTouch to Guild Wars script. removed extra set @xxxx
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10674 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/guild/gldfunc_treasure.txt3
-rw-r--r--npc/guild/prtg/prtg_treas.txt1
3 files changed, 4 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c9221d2fc..4d999a8ec 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/06/04
+ * Added missing OnTouch to Prontera "Guild Treasure room guard" [Lupus]
2007/06/03
* Rev. 10669 Updated 2006 headgear quests to semi-official dialog. [L0ne_W0lf]
* Various updates to the various guild Castle scripts. [L0ne_W0lf[
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 8841fbb01..1d728b376 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -96,6 +96,5 @@ function script F_GldTreasSw {
// Treasure Room Protrection
//===============================================================
function script F_TreasProtect {
- set @GID, GetCastleData(getarg(0),1);
- if (strcharinfo(0) != getguildmaster(@GID)) warp getarg(1),getarg(2),getarg(3);
+ if (strcharinfo(0) != getguildmaster( GetCastleData(getarg(0),1) )) warp getarg(1),getarg(2),getarg(3);
}
diff --git a/npc/guild/prtg/prtg_treas.txt b/npc/guild/prtg/prtg_treas.txt
index de3f9501e..442636f10 100644
--- a/npc/guild/prtg/prtg_treas.txt
+++ b/npc/guild/prtg/prtg_treas.txt
@@ -105,6 +105,7 @@ prtg_cas03,193,130,0 script Switch#TresPt03 111,{
// Treasure Room Protection ------------------------------------------------
prtg_cas03,189,132,0 script ban_warp#3 -1,6,6,{
+OnTouch:
callfunc "F_TreasProtect", "prtg_cas03", "prontera",109,179;
end;
}