2 files changed, 26 insertions, 17 deletions

diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 40664647a..4d7cd6003 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -419,6 +419,7 @@ AString DamageTypeToString(eDamageType a_DamageType)
 	switch (a_DamageType)
 	{
 		case dtAttack:          return "dtAttack";
+		case dtRangedAttack:    return "dtRangedAttack";
 		case dtLightning:       return "dtLightning";
 		case dtFalling:         return "dtFalling";
 		case dtDrowning:        return "dtDrowning";
@@ -463,6 +464,7 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString)
 	{
 		// Cannonical names:
 		{ dtAttack,          "dtAttack"},
+		{ dtRangedAttack,    "dtRangedAttack"},
 		{ dtLightning,       "dtLightning"},
 		{ dtFalling,         "dtFalling"},
 		{ dtDrowning,        "dtDrowning"},
@@ -478,23 +480,26 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString)
 		{ dtAdmin,           "dtAdmin"},
 
 		// Common synonyms:
-		{ dtPawnAttack,   "dtAttack"},
-		{ dtEntityAttack, "dtAttack"},
-		{ dtMob,          "dtAttack"},
-		{ dtMobAttack,    "dtAttack"},
-		{ dtFall,         "dtFalling"},
-		{ dtDrown,        "dtDrowning"},
-		{ dtSuffocation,  "dtSuffocating"},
-		{ dtStarvation,   "dtStarving"},
-		{ dtHunger,       "dtStarving"},
-		{ dtCactus,       "dtCactusContact"},
-		{ dtCactuses,     "dtCactusContact"},
-		{ dtCacti,        "dtCactusContact"},
-		{ dtLava,         "dtLavaContact"},
-		{ dtPoison,       "dtPoisoning"},
-		{ dtBurning,      "dtOnFire"},
-		{ dtInFire,       "dtFireContact"},
-		{ dtPlugin,       "dtAdmin"},
+		{ dtAttack,        "dtPawnAttack"},
+		{ dtAttack,        "dtEntityAttack"},
+		{ dtAttack,        "dtMob"},
+		{ dtAttack,        "dtMobAttack"},
+		{ dtRangedAttack,  "dtArrowAttack"},
+		{ dtRangedAttack,  "dtArrow"},
+		{ dtRangedAttack,  "dtProjectile"},
+		{ dtFalling,       "dtFall"},
+		{ dtDrowning,      "dtDrown"},
+		{ dtSuffocating,   "dtSuffocation"},
+		{ dtStarving,      "dtStarvation"},
+		{ dtStarving,      "dtHunger"},
+		{ dtCactusContact, "dtCactus"},
+		{ dtCactusContact, "dtCactuses"},
+		{ dtCactusContact, "dtCacti"},
+		{ dtLavaContact,   "dtLava"},
+		{ dtPoisoning,     "dtPoison"},
+		{ dtOnFire,        "dtBurning"},
+		{ dtFireContact,   "dtInFire"},
+		{ dtAdmin,         "dtPlugin"},
 	} ;
 	for (int i = 0; i < ARRAYCOUNT(DamageTypeMap); i++)
 	{
diff --git a/source/BlockID.h b/source/BlockID.h
index b7e9f3779..00aeff4d6 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -647,6 +647,7 @@ enum eDamageType
 {
 	// Canonical names for the types (as documented in the plugin wiki):
 	dtAttack,           // Being attacked by a mob
+	dtRangedAttack,     // Being attacked by a projectile, possibly from a mob
 	dtLightning,        // Hit by a lightning strike
 	dtFalling,          // Falling down; dealt when hitting the ground
 	dtDrowning,         // Drowning in water / lava
@@ -667,6 +668,9 @@ enum eDamageType
 	dtEntityAttack = dtAttack,
 	dtMob          = dtAttack,
 	dtMobAttack    = dtAttack,
+	dtArrowAttack  = dtRangedAttack,
+	dtArrow        = dtRangedAttack,
+	dtProjectile   = dtRangedAttack,
 	dtFall         = dtFalling,
 	dtDrown        = dtDrowning,
 	dtSuffocation  = dtSuffocating,