Browse Source

Follow up dae8122 , b695ab3 , 8120164
Added missing line, removed item bonus from item_id:1602

Lilith 11 years ago
parent
commit
3f4c389cef
2 changed files with 3 additions and 2 deletions
  1. 1 1
      db/re/item_db.txt
  2. 2 1
      src/map/battle.c

+ 1 - 1
db/re/item_db.txt

@@ -900,7 +900,7 @@
 1599,Angra_Manyu,Angra Manyu,5,1,,10,10000:10000,,2,0,0xFFFFFFFF,63,2,2,1,1,1,8,{ bonus bAllStats,50; bonus bBaseAtk,3300; bonus bMatkRate,200; bonus2 bHPDrainRate,1000,100; bonus2 bSPDrainRate,1000,20; bonus bHealPower,200; bonus2 bAddClass,Class_All,100; skill "WZ_STORMGUST",10; Skill "WZ_METEOR",10; Skill "WZ_VERMILION",10; skill "GM_SANDMAN",1; bonus bVariableCastrate,-100; bonus bFixedCastrate,-100; },{},{}
 // Staffs
 1601,Rod,Rod,5,50,,400,15:30,,1,3,0x00818315,63,2,2,1,1,1,10,{},{},{}
-1602,Rod_,Rod,5,50,,400,15:30,,1,4,0x00818315,63,2,2,1,1,1,10,{ bonus2 bAddRace,RC_Plant,100; },{},{}
+1602,Rod_,Rod,5,50,,400,15:30,,1,4,0x00818315,63,2,2,1,1,1,10,{},{},{}
 1603,Rod__,Rod,5,50,,400,15:30,,1,0,0x00818315,63,2,2,1,1,1,10,{},{},{}
 1604,Wand,Wand,5,2500,,400,25:45,,1,2,0x00818315,63,2,2,2,12,1,10,{},{},{}
 1605,Wand_,Wand,5,2500,,400,25:45,,1,3,0x00818315,63,2,2,2,12,1,10,{},{},{}

+ 2 - 1
src/map/battle.c

@@ -586,7 +586,8 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
 					}
 					else
 					{
-						int ele_fix = sd->right_weapon.addele[tstatus->def_ele] + sd->left_weapon.addele[tstatus->def_ele];
+						int ele_fix = sd->right_weapon.addele[tstatus->def_ele] + sd->left_weapon.addele[tstatus->def_ele]
+									+ sd->right_weapon.addele[ELE_ALL] + sd->left_weapon.addele[ELE_ALL];
 						for (i = 0; ARRAYLENGTH(sd->right_weapon.addele2) > i && sd->right_weapon.addele2[i].rate != 0; i++) {
 							if (sd->right_weapon.addele2[i].ele != tstatus->def_ele) continue;
 							if(!( ((sd->right_weapon.addele2[i].flag)&flag)&BF_WEAPONMASK &&