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
@@ -40,6 +40,16 @@
 		"</element>" +
 	"</optional>";
 
+Attack.prototype.continuousDamageSchema =
+	"<optional>" +
+		"<element name='ContinuousDamage' a:help='Damage caused to the target after hit for a given number of intervals.'>" +
+			"<interleave>" +
+				"<element name='Interval' a:help='Time between the damage is caused (in milliseconds).'><ref name='nonNegativeDecimal'/></element>" +
+				"<element name='NumberOfIntervals' a:help='Number of times the damage is caused.'><ref name='nonNegativeDecimal'/></element>" +
+			"</interleave>" +
+		"</element>" +
+	"</optional>";
+
 Attack.prototype.Schema =
 	"<a:help>Controls the attack abilities and strengths of the unit.</a:help>" +
 	"<a:example>" +
@@ -73,6 +83,10 @@
 			"<PrepareTime>800</PrepareTime>" +
 			"<RepeatTime>1600</RepeatTime>" +
 			"<Delay>1000</Delay>" +
+			"<ContinuousDamage>" +
+				"<Interval>1000</Interval>" +
+				"<NumberOfIntervals>5</NumberOfIntervals>" +
+			"</ContinuousDamage>" +
 			"<Bonuses>" +
 				"<Bonus1>" +
 					"<Classes>Cavalry</Classes>" +
@@ -114,6 +128,7 @@
 				"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" + // TODO: it shouldn't be stretched
 					"<data type='positiveInteger'/>" +
 				"</element>" +
+				Attack.prototype.continuousDamageSchema +
 				Attack.prototype.bonusesSchema +
 				Attack.prototype.preferredClassesSchema +
 				Attack.prototype.restrictedClassesSchema +
@@ -145,6 +160,10 @@
 					"<data type='positiveInteger'/>" +
 				"</element>" +
 				"<element name='Delay' a:help='Delay of the damage in milliseconds'><ref name='nonNegativeDecimal'/></element>" +
+				Attack.prototype.continuousDamageSchema +
+				Attack.prototype.bonusesSchema +
+				Attack.prototype.preferredClassesSchema +
+				Attack.prototype.restrictedClassesSchema +
 				"<optional>" +
 					"<element name='Splash'>" +
 						"<interleave>" +
@@ -477,6 +496,18 @@
 	return template.Bonuses || null;
 };
 
+Attack.prototype.GetContinuousDamage = function(type)
+{
+	let interval = this.template[type].Continuous ? +this.template[type].Continuous.Interval : 0;
+	let numberOfIntervals = this.template[type].Continuous ? +this.template[type].Continuous.NumberOfIntervals : 0;
+	interval = ApplyValueModificationsToEntity(
+		"ContinuousDamage/" + type + "/Interval", interval, this.entity);
+	numberOfIntervals = ApplyValueModificationsToEntity(
+		"ContinuousDamage/" + type + "/NumberOfIntervals", numberOfIntervals, this.entity);
+
+	return { "interval": interval, "numberOfIntervals": numberOfIntervals};
+};
+
 /**
  * Attack the target entity. This should only be called after a successful range check,
  * and should only be called after GetTimers().repeat msec has passed since the last
@@ -485,7 +516,8 @@
 Attack.prototype.PerformAttack = function(type, target)
 {
 	let attackerOwner = Engine.QueryInterface(this.entity, IID_Ownership).GetOwner();
- 	let cmpDamage = Engine.QueryInterface(SYSTEM_ENTITY, IID_Damage);
+	let cmpDamage = Engine.QueryInterface(SYSTEM_ENTITY, IID_Damage);
+	let continuousDamage = this.GetContinuousDamage(type);
 
 	// If this is a ranged attack, then launch a projectile
 	if (type == "Ranged")
@@ -577,7 +609,9 @@
 			"bonus": this.GetBonusTemplate(type),
 			"isSplash": false,
 			"attackerOwner": attackerOwner,
-			"attackImpactSound": attackImpactSound
+			"attackImpactSound": attackImpactSound,
+			"interval": continuousDamage.interval,
+			"numberOfIntervals": continuousDamage.numberOfIntervals
 		};
 		if (this.template[type].Splash)
 		{
@@ -624,7 +658,9 @@
 			"attacker": this.entity,
 			"multiplier": GetDamageBonus(target, this.GetBonusTemplate(type)),
 			"type": type,
-			"attackerOwner": attackerOwner
+			"attackerOwner": attackerOwner,
+			"interval": continuousDamage.interval,
+			"numberOfIntervals": continuousDamage.numberOfIntervals
 		});
 	}
 };
Index: binaries/data/mods/public/simulation/components/Damage.js
===================================================================
--- binaries/data/mods/public/simulation/components/Damage.js
+++ binaries/data/mods/public/simulation/components/Damage.js
@@ -122,7 +122,9 @@
 			"direction": data.direction,
 			"playersToDamage": this.GetPlayersToDamage(data.attackerOwner, data.friendlyFire),
 			"type": data.type,
-			"attackerOwner": data.attackerOwner
+			"attackerOwner": data.attackerOwner,
+			"interval": data.interval,
+			"numberOfIntervals": data.numberOfIntervals
 		});
 	}
 
@@ -157,7 +159,9 @@
 			"attacker": data.attacker,
 			"multiplier": GetDamageBonus(ent, data.bonus),
 			"type": data.type,
-			"attackerOwner": data.attackerOwner
+			"attackerOwner": data.attackerOwner,
+			"interval": data.interval,
+			"numberOfIntervals": data.numberOfIntervals
 		});
 		cmpProjectileManager.RemoveProjectile(data.projectileId);
 		break;
@@ -226,7 +230,9 @@
 			"attacker": data.attacker,
 			"multiplier": damageMultiplier,
 			"type": data.type + ".Splash",
-			"attackerOwner": data.attackerOwner
+			"attackerOwner": data.attackerOwner,
+			"interval": data.interval,
+			"numberOfIntervals": data.numberOfIntervals
 		});
 	}
 };
@@ -240,6 +246,8 @@
  * @param {number} data.multiplier - the damage multiplier.
  * @param {string} data.type - the type of damage.
  * @param {number} data.attackerOwner - the player id of the attacker.
+ * @param {number} data.interval - time between damages caused during continuous damage.
+ * @param {number} data.numberOfIntervals - remaining intervals during continuous damage.
  */
 Damage.prototype.CauseDamage = function(data)
 {
@@ -255,6 +263,12 @@
 	if (cmpPromotion && cmpLoot && cmpLoot.GetXp() > 0)
 		cmpPromotion.IncreaseXp(cmpLoot.GetXp() * -targetState.change / cmpHealth.GetMaxHitpoints());
 
+	if (data.numberOfIntervals && --data.numberOfIntervals > 0)
+	{
+		let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+		cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_Damage, "CauseDamage", +data.interval, data);
+	}
+
 	if (targetState.killed)
 		this.TargetKilled(data.attacker, data.target, data.attackerOwner);
 
Index: binaries/data/mods/public/simulation/components/tests/test_Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -76,6 +76,10 @@
 				"Spread": 2,
 				"Gravity": 1
 			},
+			"Continuous": {
+				"Interval": 500,
+				"NumberOfIntervals": 4
+			},
 			"PreferredClasses": {
 				"_string": "Archer"
 			},
@@ -175,6 +179,11 @@
 		"friendlyFire": false,
 		"shape": "Circular"
 	});
+
+	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetContinuousDamage("Ranged"), {
+		"interval": 500,
+		"numberOfIntervals": 4
+	});
 });
 
 for (let className of ["Infantry", "Cavalry"])
Index: binaries/data/mods/public/simulation/components/tests/test_Damage.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Damage.js
+++ binaries/data/mods/public/simulation/components/tests/test_Damage.js
@@ -548,3 +548,47 @@
 }
 
 Test_MissileHit();
+
+function Test_ContinuousDamage()
+{
+	ResetState();
+
+	let cmpDamage = ConstructComponent(SYSTEM_ENTITY, "Damage");
+	let cmpTimer = ConstructComponent(SYSTEM_ENTITY, "Timer");
+	let target = 60;
+	let damageTaken = false;
+	let data = {
+		"attacker": 50,
+		"target": target,
+		"type": "Melee",
+		"strengths": { "hack": 0, "pierce": 0, "crush": 1 },
+		"multiplier": 1.0,
+		"interval": 10000,
+		"numberOfIntervals": 3
+	}
+
+	AddMock(target, IID_DamageReceiver, {
+		"TakeDamage": (strengths, multiplier) => { damageTaken = true; return { "killed": false, "change": -multiplier * strengths.crush }; }
+	});
+
+	// damage scheduled: 0 sec, 10 sec, 20 sec
+	cmpDamage.CauseDamage(data);
+	TS_ASSERT(damageTaken); // 0 sec
+
+	damageTaken = false;
+	cmpTimer.OnUpdate({ turnLength: 9 });
+	TS_ASSERT(!damageTaken); // 9 sec
+	
+	cmpTimer.OnUpdate({ turnLength: 1 });
+	TS_ASSERT(damageTaken); // 10 sec
+
+	damageTaken = false;
+	cmpTimer.OnUpdate({ turnLength: 10 });
+	TS_ASSERT(damageTaken); // 20 sec
+
+	damageTaken = false;
+	cmpTimer.OnUpdate({ turnLength: 10 });
+	TS_ASSERT(!damageTaken); // 30 sec
+}
+
+Test_ContinuousDamage();
Index: binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen_cavalry_javelinist_b">
+  <Attack>
+    <Ranged>
+      <Hack>0</Hack>
+      <Pierce>18.0</Pierce>
+      <Crush>0</Crush>
+      <MaxRange>28.0</MaxRange>
+      <MinRange>0.0</MinRange>
+      <ProjectileSpeed>62.5</ProjectileSpeed>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
+      <Spread>3.0</Spread>
+      <Continuous>
+        <Interval>1000</Interval>
+        <NumberOfIntervals>3</NumberOfIntervals>
+      </Continuous>
+    </Ranged>
+  </Attack>
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>