From a37c2240c30fd39af2371a5e7fda00743d60a718 Mon Sep 17 00:00:00 2001 From: mimo Date: Thu, 19 Apr 2018 14:20:53 +0000 Subject: [PATCH] Attacks resulting from a gathering order on an animal should be considered forced or not consistently with the original gather order. Reviewed By: temple Fixes #4863 Differential Revision: https://code.wildfiregames.com/D1457 This was SVN commit r21744. --- binaries/data/mods/public/simulation/components/UnitAI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js index fda4dfe7ae..9f0d587529 100644 --- a/binaries/data/mods/public/simulation/components/UnitAI.js +++ b/binaries/data/mods/public/simulation/components/UnitAI.js @@ -587,7 +587,7 @@ UnitAI.prototype.UnitFsmSpec = { return; } - this.PushOrderFront("Attack", { "target": this.order.data.target, "force": false, "hunting": true, "allowCapture": false }); + this.PushOrderFront("Attack", { "target": this.order.data.target, "force": !!this.order.data.force, "hunting": true, "allowCapture": false }); return; } @@ -899,7 +899,7 @@ UnitAI.prototype.UnitFsmSpec = { return; } - this.PushOrderFront("Attack", { "target": msg.data.target, "hunting": true, "allowCapture": false }); + this.PushOrderFront("Attack", { "target": msg.data.target, "force": !!msg.data.force, "hunting": true, "allowCapture": false }); return; }