Ticket #3889: xpPerHit.diff

binaries/data/mods/public/simulation/components/Looter.js

@@ -14 +14 @@
     if (!cmpLoot)
         return;
 
-    // Loot experience points as defined in the template
-    var xp = cmpLoot.GetXp();
-    if (xp > 0)
-    {
-        let cmpPromotion = Engine.QueryInterface(this.entity, IID_Promotion);
-        if (cmpPromotion)
-            cmpPromotion.IncreaseXp(xp);
-    }
-
     // Loot resources as defined in the templates
     var resources = cmpLoot.GetResources();
     for (let type in resources)

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

@@ -74 +74 @@
     // 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 the target was killed run some cleanup
     if (targetState.killed)
         Damage.TargetKilled(data.attacker, data.target);