Index: map/battleutils.cpp
===================================================================
--- map/battleutils.cpp	(revision 3765)
+++ map/battleutils.cpp	(working copy)
@@ -452,8 +452,118 @@
 			if (rand()%100 >= 16) return originalDamage;
 			return (damage = (damage * 2));
 			break;
+			
+		// Aftermath Empyrean Weapons 2x Dmg
+		case 19460:		// Farsha 85
+		case 19538:		// Farsha 90
+		case 19636:		// Farsha 95
+		case 19809:		// Farsha 99
+		case 19857:		// Farsha 99-2
+		
+		case 19461:		// Ukonvasara 85
+		case 19539:		// Ukonvasara 90
+		case 19637:		// Ukonvasara 95
+		case 19810:		// Ukonvasara 99
+		case 19858:		// Ukonvasara 99-2
+		
+		case 19466:		// Gambanteinn 85
+		case 19544:		// Gambanteinn 90
+		case 19642:		// Gambanteinn 95
+		case 19815:		// Gambanteinn 99
+		case 19863:		// Gambanteinn 99-2
+		
+		case 19457:		// Twashtar 85
+		case 19535:		// Twashtar 90
+		case 19633:		// Twashtar 95
+		case 19806:		// Twashtar 99
+		case 19854:		// Twashtar 99-2
+		
+		case 19456:		// Verethragna 85
+		case 19534:		// Verethragna 90
+		case 19632:		// Verethragna 95
+		case 19805:		// Verethragna 99
+		case 19853:		// Verethragna 99-2
+		
+		case 19464:		// Kannagi 85
+		case 19542:		// Kannagi 90
+		case 19640:		// Kannagi 95
+		case 19813:		// Kannagi 99
+		case 19861:		// Kannagi 99-2
+		
+		case 19465:		// Masamune 85
+		case 19543:		// Masamune 90
+		case 19641:		// Masamune 95
+		case 19814:		// Masamune 99
+		case 19862:		// Masamune 99-2
+		
+		case 19463:		// Rhongomiant 85
+		case 19541:		// Rhongomiant 90
+		case 19639:		// Rhongomiant 95
+		case 19812:		// Rhongomiant 99
+		case 19860:		// Rhongomiant 99-2
+		
+		case 19462:		// Redemption 85
+		case 19540:		// Redemption 90
+		case 19638:		// Redemption 95
+		case 19811:		// Redemption 99
+		case 19859:		// Redemption 99-2
+		
+		case 19467:		// Hvergelmir 85
+		case 19545:		// Hvergelmir 90
+		case 19643:		// Hvergelmir 95
+		case 19816:		// Hvergelmir 99
+		case 19864:		// Hvergelmir 99-2
+		
+		case 19458:		// Almace 85
+		case 19536:		// Almace 90
+		case 19634:		// Almace 95
+		case 19807:		// Almace 99
+		case 19855:		// Almace 99-2
+		
+		case 19459:		// Caladbolg 85
+		case 19537:		// Caladbolg 90
+		case 19635:		// Caladbolg 95
+		case 19808:		// Caladbolg 99
+		case 19856:		// Caladbolg 99-2
+		
+		case 19468:		// Gandiva 85
+		case 19546:		// Gandiva 90
+		case 19644:		// Gandiva 95
+		case 19817:		// Gandiva 99
+		case 19865:		// Gandiva 99-2
+		
+		case 19469:		// Armageddon 85
+		case 19547:		// Armageddon 90
+		case 19645:		// Armageddon 95
+		case 19818:		// Armageddon 99
+		case 19866:		// Armageddon 99-2
+		
+			if(m_PChar->StatusEffectContainer->HasStatusEffect(EFFECT_AFTERMATH_LV1) == true)
+			{
+				if (rand()%100 <= 30)
+				{
+					// ShowDebug(CL_CYAN"Aftermath Lvl 1 Proc \n");
+					originalDamage = (damage * 2);
+				}
+			}
+			else if(m_PChar->StatusEffectContainer->HasStatusEffect(EFFECT_AFTERMATH_LV2) == true)
+			{
+				if (rand()%100 <= 40)
+				{
+					// ShowDebug(CL_CYAN"Aftermath Lvl 2 Proc \n");
+					originalDamage = (damage * 2);
+				}
+			}
+			else if(m_PChar->StatusEffectContainer->HasStatusEffect(EFFECT_AFTERMATH_LV3) == true)
+			{
+				if (rand()%100 <= 50)
+				{
+					// ShowDebug(CL_CYAN"Aftermath Lvl 3 Proc \n");
+					originalDamage = (damage * 2);
+				}
+			}
+			break;
 
-
 		//mythic weapons, same distribution as multi attacking weapons
 
 		// Mythic: 2 time damage
@@ -465,12 +575,11 @@
 
 
 		default:
-			return originalDamage;			// just to be sure
 			break;
 	}
+	
+	return originalDamage;
 
-
-
 }