Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed double-quotes not being escaped in the custom xmas_rings_event. (bugreport:2546)

Browse Source 
- Renamed an OnClock label so it's consistent with the other castles. (bugreport:2831)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13756 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2009-05-12 07:47:02 +00:00
parent 161d254bb3
commit 1eaef19afe
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/script_commands.txt
View File

@ -6095,7 +6095,7 @@ Type can optionally be used indicates which script to set (default is 0):
Example: Example:
setitemscript 2637,"{ if(isequipped(2236)==0)end; if(getskilllv(26)){skill 40,1;}else{skill 26,1+isequipped(2636);} }"; setitemscript 2637,"{ if(isequipped(2236)==0)end; if(getskilllv(26)){skill 40,1;}else{skill 26,1+isequipped(2636);} }";
setitemscript 2639,""; setitemscript 2637,"";
--------------------------------------- ---------------------------------------

3
npc/Changelog.txt
View File

@ -1,5 +1,8 @@
Date Added 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 2009/05/07
- Fixed a "player not attached" error in the Moscovia quest. (bugreport:3041) [brianluau] - 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) - Fixed a race condition in the Arunafeltz quest blocking progress. (bugreport:2782)

7
npc/custom/events/xmas_rings_event.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Lupus (1.0) //= Lupus (1.0)
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena Version; 4880+ (with 'setItemScript' command) //= eAthena Version; 4880+ (with 'setItemScript' command)
//===== Description: ========================================= //===== Description: =========================================
@ -11,6 +11,7 @@
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Tested, fully working. 1.0a a few typos fix //= 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.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 //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;}}"; 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 //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 //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; end;
} }

2
npc/guild2/schg_cas01.txt
View File

@ -108,7 +108,7 @@ Onchange:
donpcevent "2nd Guardian Stone#sch01::OnEnable"; donpcevent "2nd Guardian Stone#sch01::OnEnable";
end; end;
OnClock0000: OnClock0001:
if (!GetCastleData("schg_cas01",1)) end; if (!GetCastleData("schg_cas01",1)) end;
killmonster "schg_cas01","Manager#sch01_02::OnTreasureDied"; killmonster "schg_cas01","Manager#sch01_02::OnTreasureDied";