diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 03:22:57 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 03:22:57 +0000 |
| commit | 49ebf878dfb1301fe86d490bab59811c0632e716 (patch) | |
| tree | ade0a6658743332fec87c124f7af2a242d42f148 | |
| parent | 3145ee52536bf79a9c2e540fe7cf668204588348 (diff) | |
| download | hercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.gz hercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.bz2 hercules-49ebf878dfb1301fe86d490bab59811c0632e716.tar.xz hercules-49ebf878dfb1301fe86d490bab59811c0632e716.zip | |
Fixed bugreport:5411 Shield Bommerang (Rapid Smitting), in renewal now takes weapon in account plus it weapon element (no longer forced-neutral).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15768 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/re/skill_db.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 0c65e594b..a2c5c2fb5 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,0,0,0,5,1,no,0,0,0,weapon,0, CR_SHIELDBOOMERANG,Shield Boomerang +251,3:5:7:9:11,6,1,-1,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 diff --git a/src/map/battle.c b/src/map/battle.c index 576c88f78..95756c2f7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1241,8 +1241,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo //Since these do not consume ammo, they need to be explicitly set as arrow attacks. flag.arrow = 1; break; - +#if isOFF(REMODE) case CR_SHIELDBOOMERANG: +#endif case PA_SHIELDCHAIN: case LG_SHIELDPRESS: case LG_EARTHDRIVE: |