Jelajahi Sumber

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://svn.code.sf.net/p/rathena/svn/trunk@15768 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 tahun lalu
induk
melakukan
f65f94c406
2 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 1 1
      db/re/skill_db.txt
  2. 2 1
      src/map/battle.c

+ 1 - 1
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

+ 2 - 1
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: