Index: map/battleutils.cpp =================================================================== --- map/battleutils.cpp (revision 3763) +++ map/battleutils.cpp (working copy) @@ -425,52 +425,142 @@ //relic weapons have 16% (ffxiclopedia) chance to do x times damage, cannot proc with weapon skills // Relic: 2.5 times damage - case 18264: // Spharai, h2h - case 18276: // Excalibur, sword - case 18282: // Ragnarok, great sword - case 18288: // Guttler, axe - case 18300: // Gungnir, polearm - case 18318: // Amanomurakumo, great katana - case 18330: // Claustrum, staff - if (rand()%100 > 16) return originalDamage; - return (damage = (damage * (float)2.5)); + case 18264: // Spharai 75 + case 18265: // Spharai 80 + case 18637: // Spharai 85 + case 18651: // Spharai 90 + case 18665: // Spharai 95 + case 19746: // Spharai 99 + case 19839: // Spharai 99-2 + + case 18276: // Excalibur 75 + case 18277: // Excalibur 80 + case 18639: // Excalibur 85 + case 18653: // Excalibur 90 + case 18667: // Excalibur 95 + case 19748: // Excalibur 99 + case 19841: // Excalibur 99-2 + + case 18282: // Ragnarok 75 + case 18283: // Ragnarok 80 + case 18640: // Ragnarok 85 + case 18654: // Ragnarok 90 + case 18668: // Ragnarok 95 + case 19749: // Ragnarok 99 + case 19842: // Ragnarok 99-2 + + case 18288: // Guttler 75 + case 18289: // Guttler 80 + case 18641: // Guttler 85 + case 18655: // Guttler 90 + case 18669: // Guttler 95 + case 19750: // Guttler 99 + case 19843: // Guttler 99-2 + + case 18300: // Gungnir 75 + case 18301: // Gungnir 80 + case 18643: // Gungnir 85 + case 18657: // Gungnir 90 + case 18671: // Gungnir 95 + case 19752: // Gungnir 99 + case 19845: // Gungnir 99-2 + + case 18318: // Amanomurakumo 75 + case 18319: // Amanomurakumo 80 + case 18646: // Amanomurakumo 85 + case 18660: // Amanomurakumo 90 + case 18674: // Amanomurakumo 95 + case 19755: // Amanomurakumo 99 + case 19848: // Amanomurakumo 99-2 + + case 18330: // Claustrum 75 + case 18331: // Claustrum 80 + case 18648: // Claustrum 85 + case 18662: // Claustrum 90 + case 18676: // Claustrum 95 + case 19757: // Claustrum 99 + case 19850: // Claustrum 99-2 + if (rand()%100 <= 16) + { + originalDamage = (damage * (float)2.5); + } break; // Relic: 3 times damage - case 18270: // Mandau, dagger - case 18312: // Kikoku, katana - case 18324: // Mjollnir, club - case 18336: // Annihilator, marksmanship - case 18348: // Yoichinoyumi, archery - if (rand()%100 >= 16) return originalDamage; - return (damage = (damage * 3)); + case 18270: // Mandau 75 + case 18271: // Mandau 80 + case 18638: // Mandau 85 + case 18652: // Mandau 90 + case 18666: // Mandau 95 + case 19747: // Mandau 99 + case 19840: // Mandau 99-2 + + case 18312: // Kikoku 75 + case 18313: // Kikoku 80 + case 18645: // Kikoku 85 + case 18659: // Kikoku 90 + case 18673: // Kikoku 95 + case 19754: // Kikoku 99 + case 19847: // Kikoku 99-2 + + case 18324: // Mjollnir 75 + case 18325: // Mjollnir 80 + case 18647: // Mjollnir 85 + case 18661: // Mjollnir 90 + case 18675: // Mjollnir 95 + case 19756: // Mjollnir 99 + case 19849: // Mjollnir 99-2 + + case 18336: // Annihilator 75 + case 18337: // Annihilator 80 + case 18649: // Annihilator 85 + case 18663: // Annihilator 90 + case 18677: // Annihilator 95 + case 19758: // Annihilator 99 + case 19851: // Annihilator 99-2 + + case 18348: // Yoichinoyumi 75 + case 18349: // Yoichinoyumi 80 + case 18650: // Yoichinoyumi 85 + case 18664: // Yoichinoyumi 90 + case 18678: // Yoichinoyumi 95 + case 19759: // Yoichinoyumi 99 + case 19852: // Yoichinoyumi 99-2 + if (rand()%100 <= 16) + { + originalDamage = (damage * 3); + } break; // Relic: 2 times damage - case 18294: // Bravura, great axe - case 18306: // Apocalypse, scythe - if (rand()%100 >= 16) return originalDamage; - return (damage = (damage * 2)); + case 18294: // Bravura 75 + case 18295: // Bravura 80 + case 18642: // Bravura 85 + case 18656: // Bravura 90 + case 18670: // Bravura 95 + case 19751: // Bravura 99 + case 19844: // Bravura 99-2 + + case 18306: // Apocalypse 75 + case 18307: // Apocalypse 80 + case 18644: // Apocalypse 85 + case 18658: // Apocalypse 90 + case 18672: // Apocalypse 95 + case 19753: // Apocalypse 99 + case 19846: // Apocalypse 99-2 + + if (rand()%100 <= 16) + { + originalDamage = (damage * 2); + } break; - - //mythic weapons, same distribution as multi attacking weapons - - // Mythic: 2 time damage - case 19001: // Gastraphetes(lvl75), marksmanship - case 19007: // Death Penalty(lvl75), marksmanship - if (rand()%100 < 55) return originalDamage; - return (damage = (damage * 2)); - break; - - default: - return originalDamage; // just to be sure break; } + + return originalDamage; - - }