summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 07:47:02 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 07:47:02 +0000
commitda4595570bb874ce6e448a1e6e63d8719e2b54d5 (patch)
tree173a11b1cce5530b8a844fe4729622ee5bc5a4da /npc
parent9d980263608070842314af7778385d1821ac6b34 (diff)
downloadhercules-da4595570bb874ce6e448a1e6e63d8719e2b54d5.tar.gz
hercules-da4595570bb874ce6e448a1e6e63d8719e2b54d5.tar.bz2
hercules-da4595570bb874ce6e448a1e6e63d8719e2b54d5.tar.xz
hercules-da4595570bb874ce6e448a1e6e63d8719e2b54d5.zip
- Fixed double-quotes not being escaped in the custom xmas_rings_event. (bugreport:2546)
- Renamed an OnClock label so it's consistent with the other castles. (bugreport:2831) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13756 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/custom/events/xmas_rings_event.txt7
-rw-r--r--npc/guild2/schg_cas01.txt2
3 files changed, 8 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bcd940273..627eddf73 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2009/05/11
+ - Fixed double-quotes not being escaped in the custom xmas_rings_event. (bugreport:2546) [brianluau]
+ - Renamed an OnClock label in schg_cas01 so it's consistent with the other castles. (bugreport:2831)
2009/05/07
- Fixed a "player not attached" error in the Moscovia quest. (bugreport:3041) [brianluau]
- Fixed a race condition in the Arunafeltz quest blocking progress. (bugreport:2782)
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 39c178096..bc2fc3fad 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena Version; 4880+ (with 'setItemScript' command)
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 Tested, fully working. 1.0a a few typos fix
//= 1.1 Readded Mdef +1 and Luk +1 to Santa's Hat [Lupus]
+//= 1.2 Fixed double quotes not being escaped [brianluau]
//============================================================
@@ -93,9 +94,9 @@ OnInit:
//Santa's Hat
setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 338;}}";
//Gold Xmas Ring
- setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv("AL_HEAL")){skill "TF_HIDING",4+isequipped(2637);}else{skill "AL_HEAL",1+4*isequipped(2637);} }";
+ setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }";
//Silver Xmas Ring
- setitemscript 2637,"{ bonus bDamageWhenUnequip,40; if(isequipped(2236)==0)end; if(getskilllv("AL_TELEPORT")){skill "MC_IDENTIFY",1;}else{skill "AL_TELEPORT",1+isequipped(2636);} }";
+ setitemscript 2637,"{ bonus bDamageWhenUnequip,40; if(isequipped(2236)==0)end; if(getskilllv(\"AL_TELEPORT\")){skill \"MC_IDENTIFY\",1;}else{skill \"AL_TELEPORT\",1+isequipped(2636);} }";
end;
}
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index dc1ec36be..46dbcda48 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -108,7 +108,7 @@ Onchange:
donpcevent "2nd Guardian Stone#sch01::OnEnable";
end;
-OnClock0000:
+OnClock0001:
if (!GetCastleData("schg_cas01",1)) end;
killmonster "schg_cas01","Manager#sch01_02::OnTreasureDied";