Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -139,12 +139,7 @@
 				"</optional>" +
 				"<optional>" +
 					"<element name='Splash'>" +
-						"<interleave>" +
-							"<element name='Shape' a:help='Shape of the splash damage, can be circular or linear'><text/></element>" +
-							"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
-							"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
-							Attacking.BuildAttackEffectsSchema() +
-						"</interleave>" +
+						Attacking.BuildAreaDamageSchema() +
 					"</element>" +
 				"</optional>" +
 				"<optional>" +
Index: binaries/data/mods/public/simulation/components/DeathDamage.js
===================================================================
--- binaries/data/mods/public/simulation/components/DeathDamage.js
+++ binaries/data/mods/public/simulation/components/DeathDamage.js
@@ -12,10 +12,7 @@
 			"<Crush>50.0</Crush>" +
 		"</Damage>" +
 	"</a:example>" +
-	"<element name='Shape' a:help='Shape of the splash damage, can be circular.'><text/></element>" +
-	"<element name='Range' a:help='Size of the area affected by the splash.'><ref name='nonNegativeDecimal'/></element>" +
-	"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units.'><data type='boolean'/></element>" +
-	Attacking.BuildAttackEffectsSchema();
+	Attacking.BuildAreaDamageSchema();
 
 DeathDamage.prototype.Init = function()
 {
Index: binaries/data/mods/public/simulation/helpers/Attacking.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Attacking.js
+++ binaries/data/mods/public/simulation/helpers/Attacking.js
@@ -86,6 +86,29 @@
 };
 
 /**
+ * Builds a RelaxRNG schema of possible attack effects.
+ * See globalscripts/AttackEffects.js for possible elements.
+ * Attacks may also have a "Bonuses" element.
+ *
+ * @return {string} - RelaxNG schema string.
+ */
+Attacking.prototype.BuildAreaDamageSchema = function()
+{
+	return "" +
+	"<interleave>" +
+		"<element name='Shape' a:help='Shape of the area damage.'>" +
+			"<choice>" +
+				"<value>Circular</value>" +
+				"<value>Linear</value>" +
+			"</choice>" +
+		"</element>" +
+		"<element name='Range' a:help='Size of the area affected by the area damage.'><ref name='nonNegativeDecimal'/></element>" +
+		"<element name='FriendlyFire' a:help='Whether the area damage can hurt non enemy units.'><data type='boolean'/></element>" +
+		this.BuildAttackEffectsSchema() +
+	"</interleave>";
+};
+
+/**
  * Returns a template-like object of attack effects.
  */
 Attacking.prototype.GetAttackEffectsData = function(valueModifRoot, template, entity)