Ticket #1912: ProofOfConcept.patch

data/mods/public/gui/credits/texts/programming.json

@@ -108 +108 @@
             {"nick": "kingadami", "name": "Adam Winsor"},
             {"nick": "kingbasil", "name": "Giannis Fafalios"},
             {"nick": "lafferjm", "name": "Justin Lafferty"},
+            {"nick": "LeanderH", "name": "Leander Hemelhof"},
             {"nick": "leper", "name": "Georg Kilzer"},
             {"nick": "LittleDev"},
             {"nick": "livingaftermidnight", "name": "Will Dull"},

data/mods/public/simulation/components/Attack.js

@@ -88 +88 @@
                 "<Crush>0.0</Crush>" +
             "</Splash>" +
         "</Ranged>" +
+        "<Continuous>" +
+            "<Hack>0.0</Hack>" +
+            "<Pierce>0.0</Pierce>" +
+            "<Crush>10.0</Crush>" +
+            "<Cycles>12</Cycles>" +
+            "<CycleDuration>250</CycleDuration>" +
+        "</Continuous>" +
         "<Charge>" +
             "<Hack>10.0</Hack>" +
             "<Pierce>0.0</Pierce>" +
@@ -159 +166 @@
         "</element>" +
     "</optional>" +
     "<optional>" +
+        "<element name='Continuous'>" +
+            "<interleave>" +
+                "<element name='Hack' a:help='Hack damage strength'><ref name='nonNegativeDecimal'/></element>" +
+                "<element name='Pierce' a:help='Pierce damage strength'><ref name='nonNegativeDecimal'/></element>" +
+                "<element name='Crush' a:help='Crush damage strength'><ref name='nonNegativeDecimal'/></element>" +
+                "<element name='Cycles' a:help='Amount of damage cycles'><data type='positiveInteger'/></element>" +
+                "<element name='CycleDuration' a:help='Time between cycles (in milliseconds)'><data type='nonNegativeInteger'/></element>" +
+                Attack.prototype.bonusesSchema +
+            "</interleave>" +
+        "</element>" +
+    "</optional>" +
+    "<optional>" +
         "<element name='Capture'>" +
             "<interleave>" +
                 "<element name='Value' a:help='Capture points value'><ref name='nonNegativeDecimal'/></element>" +
@@ -588 +607 @@
             "target": target,
             "attacker": this.entity,
             "multiplier": this.GetAttackBonus(type, target),
-            "type":type
+            "type": type
         });
+        if (this.template.Continuous)
+        {
+            let strengths = {
+                "hack": this.template.Continuous.Hack,
+                "pierce": this.template.Continuous.Pierce,
+                "crush": this.template.Continuous.Crush
+            };
+            this.CauseContinuousDamage({
+                "strengths": strengths,
+                "target": ents[i],
+                "attacker": this.entity,
+                "multiplier": multiplier,
+                "type": data.type,
+                "cycles": this.template.Continuous.Cycles,
+                "cycleDuration": this.template.Continuous.CycleDuration,
+            });
+        }
     }
     // TODO: charge attacks (need to design how they work)
 };
@@ -677 +713 @@
         data.strengths = this.GetAttackStrengths(data.type);
         // Hit the primary target
         Damage.CauseDamage(data);
+        if (this.template.Continuous){
+            let strengths = {
+                "hack": this.template.Continuous.Hack,
+                "pierce": this.template.Continuous.Pierce,
+                "crush": this.template.Continuous.Crush
+            };
+            this.CauseContinuousDamage({
+                "strengths": strengths,
+                "target": data.target,
+                "attacker": data.attacker,
+                "multiplier": data.multiplier,
+                "type": data.type,
+                "cycles": this.template.Continuous.Cycles,
+                "cycleDuration": this.template.Continuous.CycleDuration,
+            });
+        }
 
         // Remove the projectile
         let cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager);
@@ -692 +744 @@
         {
             if (this.testCollision(ents[i], data.position, lateness))
             {
+                let multiplier = this.GetAttackBonus(data.type, ents[i]);
                 Damage.CauseDamage({
                         "strengths": this.GetAttackStrengths(data.type),
                         "target": ents[i],
                         "attacker": this.entity,
-                        "multiplier": this.GetAttackBonus(data.type, ents[i]),
+                        "multiplier": multiplier,
                         "type": data.type
                 });
+                if (this.template.Continuous)
+                {
+                    let strengths = {
+                        "hack": this.template.Continuous.Hack,
+                        "pierce": this.template.Continuous.Pierce,
+                        "crush": this.template.Continuous.Crush
+                    };
+                    this.CauseContinuousDamage({
+                        "strengths": strengths,
+                        "target": ents[i],
+                        "attacker": this.entity,
+                        "multiplier": multiplier,
+                        "type": data.type,
+                        "cycles": this.template.Continuous.Cycles,
+                        "cycleDuration": this.template.Continuous.CycleDuration,
+                    });
+                }
                 // Remove the projectile
                 let cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager);
                 cmpProjectileManager.RemoveProjectile(data.projectileId);
@@ -721 +791 @@
         cmpUnitAI.UpdateRangeQueries();
 };
 
+/**
+ * Causes damage on a given unit every cycle, for a specific number of cycles.
+ * data.strengths = {'hack':<float>, 'pierce':<float>, 'crush':<float>}
+ * data.target = <entity id>
+ * data.attacker = <entity id>
+ * data.multiplier = <float between 1 and 0>
+ * data.type = <string>
+ * data.cycles = <int>
+ * data.cycleDuration = <int>
+ */
+Attack.prototype.CauseContinuousDamage = function(data)
+{
+    var cyclesLeft = data.cycles;
+    var cmpHealth = Engine.QueryInterface(data.target, IID_Health);
+    if (cyclesLeft <= 0 || (cmpHealth && cmpHealth.GetHitpoints() == 0)) //Check if mistakes have been made or if the target is already dead
+        return;
+    Damage.CauseDamage(data);
+    // Check if all damage cycles have happened, or if the damage already killed the target
+    if (--cyclesLeft > 0 && cmpHealth && cmpHealth.GetHitpoints() != 0)
+    {
+        data.cycles = cyclesLeft;
+        var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+        var tmp = cmpTimer.SetTimeout(this.entity, IID_Attack, "CauseContinuousDamage", +data.cycleDuration, data);
+    }
+}
+
 Engine.RegisterComponentType(IID_Attack, "Attack", Attack);

data/mods/public/simulation/components/AttackDetection.js

@@ -63 +63 @@
     if (cmpTargetOwnership.GetOwner() != cmpPlayer.GetPlayerID())
         return;
     var cmpAttackerOwnership = Engine.QueryInterface(attacker, IID_Ownership);
-    // Don't register attacks dealt by myself
-    if (cmpAttackerOwnership.GetOwner() == cmpPlayer.GetPlayerID())
+    // Don't register attacks dealt by myself and ignore if attacker is already dead
+    if (!cmpAttackerOwnership || cmpAttackerOwnership.GetOwner() == cmpPlayer.GetPlayerID())
         return;
         
     // Since livestock can be attacked/gathered by other players

data/mods/public/simulation/helpers/Damage.js

@@ -52 +52 @@
         }
         // Call CauseDamage which reduces the hitpoints, posts network command, plays sounds....
         Damage.CauseDamage({"strengths":data.strengths, "target":entity, "attacker":data.attacker, "multiplier":damageMultiplier, "type":data.type + ".Splash"});
+        var cmpAttack = Engine.QueryInterface(data.attacker, IID_Attack);
+        if (cmpAttack && cmpAttack.template.Continuous)
+        {
+            var strengths = {
+                "hack": cmpAttack.template.Continuous.Hack,
+                "pierce": cmpAttack.template.Continuous.Pierce,
+                "crush": cmpAttack.template.Continuous.Crush
+            };
+            cmpAttack.CauseContinuousDamage({
+                "strengths": strengths,
+                "target": entity,
+                "attacker": data.attacker,
+                "multiplier": damageMultiplier,
+                "type": data.type,
+                "cycles": cmpAttack.template.Continuous.Cycles,
+                "cycleDuration": cmpAttack.template.Continuous.CycleDuration,
+            });
+        }
     }
 };
 
@@ -74 +92 @@
     // Damage the target
     var targetState = cmpDamageReceiver.TakeDamage(data.strengths.hack * data.multiplier, data.strengths.pierce * data.multiplier, data.strengths.crush * data.multiplier);
 
-    var cmpPromotion = Engine.QueryInterface(data.attacker, IID_Promotion);
-    var cmpLoot = Engine.QueryInterface(data.target, IID_Loot);
-    if (cmpPromotion && cmpLoot && cmpLoot.GetXp() > 0)
-        cmpPromotion.IncreaseXp(cmpLoot.GetXp() * -targetState.change / cmpHealth.GetMaxHitpoints());
+    if (cmpHealth.GetHitpoints() != 0) // No loot needed if attacker is already dead
+    {
+        var cmpPromotion = Engine.QueryInterface(data.attacker, IID_Promotion);
+        var cmpLoot = Engine.QueryInterface(data.target, IID_Loot);
+        if (cmpPromotion && cmpLoot && cmpLoot.GetXp() > 0)
+            cmpPromotion.IncreaseXp(cmpLoot.GetXp() * -targetState.change / cmpHealth.GetMaxHitpoints());
+    }
 
     // If the target was killed run some cleanup
     if (targetState.killed)
@@ -135 +156 @@
         cmpTargetPlayerStatisticsTracker.LostEntity(targetEntity);
 
     // If killer can collect loot, let's try to collect it.
-    var cmpLooter = Engine.QueryInterface(killerEntity, IID_Looter);
-    if (cmpLooter)
-        cmpLooter.Collect(targetEntity);
+    var cmpHealth = Engine.QueryInterface(killerEntity, IID_Health)
+    if (cmpHealth && cmpHealth.GetHitpoints() != 0) // Check if killer is still alive, else no loot is needed.
+    {
+        var cmpLooter = Engine.QueryInterface(killerEntity, IID_Looter);
+        if (cmpLooter)
+            cmpLooter.Collect(targetEntity);
+    }
 };
 
 Engine.RegisterGlobal("Damage", Damage);

data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml

@@ -20 +20 @@
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
+      <Splash>
+        <Shape>Circular</Shape>
+        <Range>20</Range>
+        <FriendlyFire>false</FriendlyFire>
+        <Hack>0.0</Hack>
+        <Pierce>0.1</Pierce>
+        <Crush>0.0</Crush>
+      </Splash>
     </Ranged>
+    <Continuous>
+      <Hack>0.0</Hack>
+      <Pierce>0.0</Pierce>
+      <Crush>10.0</Crush>
+      <Cycles>12</Cycles>
+      <CycleDuration>250</CycleDuration>
+    </Continuous>  
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>