summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-03 00:18:49 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-03 00:18:49 +0000
commit2596009d03fe616ef9fd8b94367bd197a4a34249 (patch)
tree86ca2d9de6c8a7a1e0af924cb24df898f22460c7
parentd2f27c0797129497441a47fbb04e0f033fdd341d (diff)
downloadhercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.gz
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.bz2
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.tar.xz
hercules-2596009d03fe616ef9fd8b94367bd197a4a34249.zip
Fixed bugreport:5500 / Follow up r15768
Shield Chain now takes account of weapon attack and weapon refinement into damage, along with elemental weapons. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15826 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/re/skill_db.txt4
-rw-r--r--src/map/battle.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index a2c5c2fb5..bdb6b2faa 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -294,7 +294,7 @@
248,0,0,0,0,0,0,10,0,no,0,0,0,none,0, CR_TRUST,Faith
249,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, CR_AUTOGUARD,Guard
250,3,6,1,0,0,0,5,1,no,0,0,0,weapon,5:6:7:8:9, CR_SHIELDCHARGE,Smite
-251,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, CR_SHIELDBOOMERANG,Shield Boomerang
+251,3:5:7:9:11,6,1,0,0,0,5,1,no,0,0,0,weapon,0, CR_SHIELDBOOMERANG,Shield Boomerang
252,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, CR_REFLECTSHIELD,Shield Reflect
253,-2,8,1,6,0,0,10,-2,no,0,0,0,weapon,0, CR_HOLYCROSS,Holy Cross
254,5,6,4,6,0x48,0,10,1,no,33,0x100,0,magic,0, CR_GRANDCROSS,Grand Cross
@@ -523,7 +523,7 @@
477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, WS_WEAPONREFINE,Upgrade Weapon
478,3,6,2,0,0x3,3,10,1,no,0,0,0,none,0, CR_SLIMPITCHER,Aid Condensed Potion
479,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0, CR_FULLPROTECTION,Full Protection
-480,5,8,1,0,0,0,5,5,no,0,0,0,weapon,0, PA_SHIELDCHAIN,Shield Chain
+480,5,8,1,-1,0,0,5,5,no,0,0,0,weapon,0, PA_SHIELDCHAIN,Shield Chain
481,0,0,0,0,0,0,5,0,no,0,0,0,none,0, HP_MANARECHARGE,Mana Recharge
482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, PF_DOUBLECASTING,Double Casting
483,16,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0, HW_GANBANTEIN,Ganbantein
diff --git a/src/map/battle.c b/src/map/battle.c
index 8f793c4e4..ef64469b7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1242,9 +1242,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
flag.arrow = 1;
break;
#if isOFF(REMODE)
+ case PA_SHIELDCHAIN:
case CR_SHIELDBOOMERANG:
#endif
- case PA_SHIELDCHAIN:
case LG_SHIELDPRESS:
case LG_EARTHDRIVE:
flag.weapon = 0;