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

* Applied BrianL's castle switch fix (bugreport:2969)

Browse Source 
* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13683 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Playtester 2009-04-20 19:11:16 +00:00
parent dea692f95a
commit f8ef62df87
23 changed files with 44 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/Changelog.txt
View File

@ -37,6 +37,8 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
2009/04/20
* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997) [Playtester]
2009/04/17
* Fixed a few items [Playtester]
- Windhawk can be equipped by thief class

2
db/item_db.txt
View File

@ -1042,7 +1042,7 @@
2118,Arm_Guard_,Arm Guard,5,10000,,150,,5,,1,0x02000000,7,2,32,,20,1,,{},{},{}
2119,Improved_Arm_Guard,Improved Arm Guard,5,40000,,150,,4,,0,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{}
2120,Improved_Arm_Guard_,Improved Arm Guard,5,40000,,150,,4,,1,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{}
2121,Memory_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; },{},{}
2121,Memorize_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; if (isequipped(2717) && isequipped(2212)) { bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }; },{},{}
2122,Platinum_Shield,Platinum Shield,5,20,,1200,,5,,0,0xFFFFFFFE,2,2,32,,68,1,1,{ bonus bMdef,5; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",2,150,BF_MAGIC,0; },{},{}
2123,Orleans_Server,Orleans' Plate,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; bonus bMagicDamageReturn,5; if (isequipped(2701)) bonus bCastrate,-10; },{},{}
2124,Thorny_Buckler,Thorny Shield,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } },{},{}

1
npc/Changelog.txt
View File

@ -1,6 +1,7 @@
Date Added
======
2009/04/20
* Applied BrianL's castle switch fix (bugreport:2969) [Playtester]
* Various script updates [Playtester]
- Removed the Acorn repeatable quest (got removed on iRO)
- Re-enabled Umbala bungee jumping (bugreport:2978)

9
npc/guild/aldeg_cas01.txt
View File

@ -124,13 +124,8 @@ aldeg_cas01,123,223,0 script #switch_A01 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "aldeg_cas01",218,176;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "aldeg_cas01",218,176;
end;
}

9
npc/guild/aldeg_cas02.txt
View File

@ -123,13 +123,8 @@ aldeg_cas02,139,235,0 script #switch_A02 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "aldeg_cas02",78,75;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "aldeg_cas02",78,75;
end;
}

9
npc/guild/aldeg_cas03.txt
View File

@ -124,13 +124,8 @@ aldeg_cas03,229,267,0 script #switch_A03 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "aldeg_cas03",110,119;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "aldeg_cas03",110,119;
end;
}

9
npc/guild/aldeg_cas04.txt
View File

@ -124,13 +124,8 @@ aldeg_cas04,83,17,0 script #switch_A04 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "aldeg_cas04",67,117;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "aldeg_cas04",67,117;
end;
}

9
npc/guild/aldeg_cas05.txt
View File

@ -123,13 +123,8 @@ aldeg_cas05,64,8,0 script #switch_A05 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "aldeg_cas05",51,179;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "aldeg_cas05",51,179;
end;
}

9
npc/guild/gefg_cas01.txt
View File

@ -115,13 +115,8 @@ gefg_cas01,152,117,0 script #switch_G01 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "gefg_cas01",40,49;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "gefg_cas01",40,49;
end;
}

9
npc/guild/gefg_cas02.txt
View File

@ -116,13 +116,8 @@ gefg_cas02,145,115,0 script #switch_G02 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "gefg_cas02",12,67;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "gefg_cas02",12,67;
end;
}

9
npc/guild/gefg_cas03.txt
View File

@ -119,13 +119,8 @@ gefg_cas03,275,289,0 script #switch_G03 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "gefg_cas03",106,24;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "gefg_cas03",106,24;
end;
}

9
npc/guild/gefg_cas04.txt
View File

@ -116,13 +116,8 @@ gefg_cas04,117,123,0 script #switch_G04 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "gefg_cas04",73,47;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "gefg_cas04",73,47;
end;
}

9
npc/guild/gefg_cas05.txt
View File

@ -116,13 +116,8 @@ gefg_cas05,149,107,0 script #switch_G05 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "gefg_cas05",70,53;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "gefg_cas05",70,53;
end;
}

9
npc/guild/payg_cas01.txt
View File

@ -119,13 +119,8 @@ payg_cas01,295,8,0 script #switch_Py01 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "payg_cas01",120,59;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "payg_cas01",120,59;
end;
}

9
npc/guild/payg_cas02.txt
View File

@ -118,13 +118,8 @@ payg_cas02,149,148,0 script #switch_Py02 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "payg_cas02",22,261;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "payg_cas02",22,261;
end;
}

9
npc/guild/payg_cas03.txt
View File

@ -117,13 +117,8 @@ payg_cas03,163,167,0 script #switch_Py03 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "payg_cas03",50,261;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "payg_cas03",50,261;
end;
}

9
npc/guild/payg_cas04.txt
View File

@ -116,13 +116,8 @@ payg_cas04,151,47,0 script #switch_Py04 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "payg_cas04",38,285;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "payg_cas04",38,285;
end;
}

9
npc/guild/payg_cas05.txt
View File

@ -117,13 +117,8 @@ payg_cas05,161,136,0 script #switch_Py05 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "payg_cas05",277,250;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "payg_cas05",277,250;
end;
}

9
npc/guild/prtg_cas01.txt
View File

@ -120,13 +120,8 @@ prtg_cas01,15,209,0 script #switch_Pt01 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "prtg_cas01",112,183;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "prtg_cas01",112,183;
end;
}

9
npc/guild/prtg_cas02.txt
View File

@ -121,13 +121,8 @@ prtg_cas02,207,228,0 script #switch_Pt02 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "prtg_cas02",94,62;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "prtg_cas02",94,62;
end;
}

9
npc/guild/prtg_cas03.txt
View File

@ -121,13 +121,8 @@ prtg_cas03,193,130,0 script #switch_Pt03 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "prtg_cas03",51,101;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "prtg_cas03",51,101;
end;
}

9
npc/guild/prtg_cas04.txt
View File

@ -119,13 +119,8 @@ prtg_cas04,275,160,0 script #switch_Pt04 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "prtg_cas04",259,265;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "prtg_cas04",259,265;
end;
}

9
npc/guild/prtg_cas05.txt
View File

@ -118,13 +118,8 @@ prtg_cas05,281,176,0 script #switch_Pt05 111,{
mes " ";
mes "There's a small lever. Will you pull it? ";
next;
switch(select("Pull.:Do not.")) {
case 1:
warp "prtg_cas05",36,38;
break;
case 2:
break;
}
if(select("Pull.:Do not.") == 2) close;
warp "prtg_cas05",36,38;
end;
}