This patch unifies the different GetRange calls to one function in UnitAI. Split from D1958.
The advantage is that it is easier to do custom stuff in one place instead of many places.
Details
- Reviewers
Silier - Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP23465: Unify GetRange calls in UnitAI.
Verify that ranges are still correct and no place to change is forgotten.
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 10778 Build 18747: Vulcan Build Jenkins Build 18746: Vulcan Build (macOS) Jenkins Build 18745: Vulcan Build (Windows) Jenkins Build 18744: arc lint + arc unit
Event Timeline
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/318/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | 762| 762| this.FinishOrder(); | 763| 763| return; | 764| 764| } | 765| |- else | 766| |- { | | 765|+ | 767| 766| this.SetNextState("GARRISON.APPROACHING"); | 768| 767| return; | 769| |- } | | 768|+ | 770| 769| } | 771| 770| | 772| 771| this.SetNextState("GARRISON.GARRISONING"); | | [NORMAL] ESLintBear (key-spacing): | | Missing space before value for key 'GARRISON'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1030|1030| }, |1031|1031| }, |1032|1032| |1033| |- "GARRISON":{ | |1033|+ "GARRISON": { |1034|1034| "enter": function() { |1035|1035| // If the garrisonholder should pickup, warn it so it can take needed action |1036|1036| var cmpGarrisonHolder = Engine.QueryInterface(this.order.data.target, IID_GarrisonHolder); | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1979|1979| |1980|1980| "Attacked": function(msg) { |1981|1981| // If we are capturing and are attacked by something that we would not capture, attack that entity instead |1982| |- if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) |1983| |- && this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") | |1982|+ if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) && | |1983|+ this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") |1984|1984| this.RespondToTargetedEntities([msg.data.attacker]); |1985|1985| }, |1986|1986| }, | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2707|2707| { |2708|2708| // The building was already finished/fully repaired before we arrived; |2709|2709| // let the ConstructionFinished handler handle this. |2710| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2710|+ this.OnGlobalConstructionFinished({ "entity": this.repairTarget, "newentity": this.repairTarget}); |2711|2711| return true; |2712|2712| } |2713|2713| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2707|2707| { |2708|2708| // The building was already finished/fully repaired before we arrived; |2709|2709| // let the ConstructionFinished handler handle this. |2710| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2710|+ this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget }); |2711|2711| return true; |2712|2712| } |2713|2713| | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 7. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3220|3220| "COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals |3221|3221| |3222|3222| "WALKING": "INDIVIDUAL.WALKING", // reuse the same walking behaviour for animals |3223| |- // only used for domestic animals | |3223|+ // only used for domestic animals |3224|3224| }, |3225|3225| }; |3226|3226| | | [NORMAL] ESLintBear (no-unneeded-ternary): | | Unnecessary use of boolean literals in conditional expression. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3277|3277| |3278|3278| UnitAI.prototype.IsAnimal = function() |3279|3279| { |3280| |- return (this.template.NaturalBehaviour ? true : false); | |3280|+ return (!!this.template.NaturalBehaviour); |3281|3281| }; |3282|3282| |3283|3283| UnitAI.prototype.IsDangerousAnimal = function() | | [NORMAL] ESLintBear (comma-spacing): | | A space is required after ','. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3393|3393| { |3394|3394| let index = this.GetCurrentState().indexOf("."); |3395|3395| if (index != -1) |3396| |- this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index)); | |3396|+ this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0, index)); |3397|3397| this.Stop(false); |3398|3398| } |3399|3399| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3449|3449| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3450|3450| continue; |3451|3451| if (i == 0) |3452| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3452|+ this.UnitFsm.ProcessMessage(this, { "type": "PickupCanceled", "data": msg}); |3453|3453| else |3454|3454| this.orderQueue.splice(i, 1); |3455|3455| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3449|3449| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3450|3450| continue; |3451|3451| if (i == 0) |3452| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3452|+ this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg }); |3453|3453| else |3454|3454| this.orderQueue.splice(i, 1); |3455|3455| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3533|3533| }; |3534|3534| |3535|3535| |3536| |-//// FSM linkage functions //// | |3536|+// // FSM linkage functions //// |3537|3537| |3538|3538| // Setting the next state to the current state will leave/re-enter the top-most substate. |3539|3539| UnitAI.prototype.SetNextState = function(state) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3703|3703| continue; |3704|3704| if (this.orderQueue[i].type == type) |3705|3705| continue; |3706| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3706|+ this.orderQueue.splice(i, 0, { "type": type, "data": data}); |3707|3707| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3708|3708| return; |3709|3709| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3703|3703| continue; |3704|3704| if (this.orderQueue[i].type == type) |3705|3705| continue; |3706| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3706|+ this.orderQueue.splice(i, 0, {"type": type, "data": data }); |3707|3707| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3708|3708| return; |3709|3709| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3874|3874| if (data.timerRepeat === undefined) |3875|3875| this.timer = undefined; |3876|3876| |3877| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |3877|+ this.UnitFsm.ProcessMessage(this, { "type": "Timer", "data": data, "lateness": lateness}); |3878|3878| }; |3879|3879| |3880|3880| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3874|3874| if (data.timerRepeat === undefined) |3875|3875| this.timer = undefined; |3876|3876| |3877| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |3877|+ this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness }); |3878|3878| }; |3879|3879| |3880|3880| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3919|3919| // TODO: This is a bit inefficient since every unit listens to every |3920|3920| // construction message - ideally we could scope it to only the one we're building |3921|3921| |3922| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |3922|+ this.UnitFsm.ProcessMessage(this, { "type": "ConstructionFinished", "data": msg}); |3923|3923| }; |3924|3924| |3925|3925| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3919|3919| // TODO: This is a bit inefficient since every unit listens to every |3920|3920| // construction message - ideally we could scope it to only the one we're building |3921|3921| |3922| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |3922|+ this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg }); |3923|3923| }; |3924|3924| |3925|3925| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3944|3944| |3945|3945| UnitAI.prototype.OnAttacked = function(msg) |3946|3946| { |3947| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |3947|+ this.UnitFsm.ProcessMessage(this, { "type": "Attacked", "data": msg}); |3948|3948| }; |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3944|3944| |3945|3945| UnitAI.prototype.OnAttacked = function(msg) |3946|3946| { |3947| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |3947|+ this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg }); |3948|3948| }; |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) |3951|3951| { |3952| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |3952|+ this.UnitFsm.ProcessMessage(this, { "type": "GuardedAttacked", "data": msg.data}); |3953|3953| }; |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) |3951|3951| { |3952| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |3952|+ this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data }); |3953|3953| }; |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) |3956|3956| { |3957| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |3957|+ this.UnitFsm.ProcessMessage(this, { "type": "HealthChanged", "from": msg.from, "to": msg.to}); |3958|3958| }; |3959|3959| |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) |3956|3956| { |3957| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |3957|+ this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to }); |3958|3958| }; |3959|3959| |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) |3961|3961| { |3962|3962| if (msg.tag == this.losRangeQuery) |3963| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |3963|+ this.UnitFsm.ProcessMessage(this, { "type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965|3965| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) |3961|3961| { |3962|3962| if (msg.tag == this.losRangeQuery) |3963| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |3963|+ this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg }); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965|3965| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3962|3962| if (msg.tag == this.losRangeQuery) |3963|3963| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |3965|+ this.UnitFsm.ProcessMessage(this, { "type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3962|3962| if (msg.tag == this.losRangeQuery) |3963|3963| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |3965|+ this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg }); |3966|3966| }; |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) |3969|3969| { |3970| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |3970|+ this.UnitFsm.ProcessMessage(this, { "type": "PackFinished", "packed": msg.packed}); |3971|3971| }; |3972|3972| |3973|3973| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) |3969|3969| { |3970| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |3970|+ this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed }); |3971|3971| }; |3972|3972| |3973|3973| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3970|3970| this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); |3971|3971| }; |3972|3972| |3973| |-//// Helper functions to be called by the FSM //// | |3973|+// // Helper functions to be called by the FSM //// |3974|3974| |3975|3975| UnitAI.prototype.GetWalkSpeed = function() |3976|3976| { | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'visionRange'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4585|4585| let visionRange = this.GetRange(IID_Vision); |4586|4586| if (!visionRange) |4587|4587| return false; |4588| |- let halfvision = visionRange / 2; | |4588|+ let halfvision = visionRange / 2; |4589|4589| |4590|4590| let pos = cmpPosition.GetPosition(); |4591|4591| let heldPosition = this.heldPosition; | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4637|4637| UnitAI.prototype.AttackEntityInZone = function(ents) |4638|4638| { |4639|4639| var target = ents.find(target => |4640| |- this.CanAttack(target) |4641| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) | |4640|+ this.CanAttack(target) && | |4641|+ this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4642|4642| && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4643|4643| ); |4644|4644| if (!target) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4638|4638| { |4639|4639| var target = ents.find(target => |4640|4640| this.CanAttack(target) |4641| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4642| |- && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) | |4641|+ && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) && | |4642|+ (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4643|4643| ); |4644|4644| if (!target) |4645|4645| return false; | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4702|4702| // If we are guarding/escorting, don't abandon as long as the guarded unit is in target range of the attacker |4703|4703| if (this.isGuardOf) |4704|4704| { |4705| |- var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4705|+ var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4706|4706| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4707|4707| if (cmpUnitAI && cmpAttack && |4708|4708| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4706|4706| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4707|4707| if (cmpUnitAI && cmpAttack && |4708|4708| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) |4709| |- return false; | |4709|+ return false; |4710|4710| } |4711|4711| |4712|4712| // Stop if we're in hold-ground mode and it's too far from the holding point | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4744|4744| // If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker |4745|4745| if (this.isGuardOf) |4746|4746| { |4747| |- let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4747|+ let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4748|4748| let cmpAttack = Engine.QueryInterface(target, IID_Attack); |4749|4749| if (cmpUnitAI && cmpAttack && |4750|4750| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4757|4757| return false; |4758|4758| }; |4759|4759| |4760| |-//// External interface functions //// | |4760|+// // External interface functions //// |4761|4761| |4762|4762| UnitAI.prototype.SetFormationController = function(ent) |4763|4763| { | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4913|4913| { |4914|4914| if (this.isGuardOf == target && this.order && this.order.type == "Guard") |4915|4915| return; |4916| |- else |4917| |- this.RemoveGuard(); | |4916|+ this.RemoveGuard(); |4918|4917| } |4919|4918| |4920|4919| this.AddOrder("Guard", { "target": target, "force": false }, queued); | | [NORMAL] ESLintBear (no-trailing-spaces): | | Trailing spaces not allowed. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5245|5245| this.workOrders.length && this.workOrders[0].type == "Trade") |5246|5246| { |5247|5247| let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader); |5248| |- if (cmpTrader.HasBothMarkets() && | |5248|+ if (cmpTrader.HasBothMarkets() && |5249|5249| (cmpTrader.GetFirstMarket() == target && cmpTrader.GetSecondMarket() == source || |5250|5250| cmpTrader.GetFirstMarket() == source && cmpTrader.GetSecondMarket() == target)) |5251|5251| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5526|5526| { |5527|5527| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5528|5528| var targetClasses = this.order.data.targetClasses; |5529| |- if (targetClasses.attack && cmpIdentity |5530| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5529|+ if (targetClasses.attack && cmpIdentity && | |5530|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5531|5531| continue; |5532|5532| if (targetClasses.avoid && cmpIdentity |5533|5533| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5529|5529| if (targetClasses.attack && cmpIdentity |5530|5530| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5531|5531| continue; |5532| |- if (targetClasses.avoid && cmpIdentity |5533| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5532|+ if (targetClasses.avoid && cmpIdentity && | |5533|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5534|5534| continue; |5535|5535| // Only used by the AIs to prevent some choices of targets |5536|5536| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5552|5552| { |5553|5553| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5554|5554| var targetClasses = this.order.data.targetClasses; |5555| |- if (cmpIdentity && targetClasses.attack |5556| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5555|+ if (cmpIdentity && targetClasses.attack && | |5556|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5557|5557| continue; |5558|5558| if (cmpIdentity && targetClasses.avoid |5559|5559| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5555|5555| if (cmpIdentity && targetClasses.attack |5556|5556| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5557|5557| continue; |5558| |- if (cmpIdentity && targetClasses.avoid |5559| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5558|+ if (cmpIdentity && targetClasses.avoid && | |5559|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5560|5560| continue; |5561|5561| // Only used by the AIs to prevent some choices of targets |5562|5562| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5708|5708| |5709|5709| UnitAI.prototype.SetHeldPosition = function(x, z) |5710|5710| { |5711| |- this.heldPosition = {"x": x, "z": z}; | |5711|+ this.heldPosition = { "x": x, "z": z}; |5712|5712| }; |5713|5713| |5714|5714| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5708|5708| |5709|5709| UnitAI.prototype.SetHeldPosition = function(x, z) |5710|5710| { |5711| |- this.heldPosition = {"x": x, "z": z}; | |5711|+ this.heldPosition = {"x": x, "z": z }; |5712|5712| }; |5713|5713| |5714|5714| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5735|5735| return false; |5736|5736| }; |5737|5737| |5738| |-//// Helper functions //// | |5738|+// // Helper functions //// |5739|5739| |5740|5740| UnitAI.prototype.GetRange = function(iid, type) |5741|5741| { | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5746|5746| if (iid === IID_Attack) |5747|5747| return type ? cmpRanged.GetRange(type) : cmpRanged.GetFullAttackRange(); |5748|5748| return cmpRanged.GetRange(); |5749| |-} | |5749|+}; |5750|5750| |5751|5751| UnitAI.prototype.CanAttack = function(target) |5752|5752| { | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5950|5950| return cmpPack && cmpPack.IsPacking(); |5951|5951| }; |5952|5952| |5953| |-//// Formation specific functions //// | |5953|+// // Formation specific functions //// |5954|5954| |5955|5955| UnitAI.prototype.IsAttackingAsFormation = function() |5956|5956| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5955|5955| UnitAI.prototype.IsAttackingAsFormation = function() |5956|5956| { |5957|5957| var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); |5958| |- return cmpAttack && cmpAttack.CanAttackAsFormation() |5959| |- && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; | |5958|+ return cmpAttack && cmpAttack.CanAttackAsFormation() && | |5959|+ this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |5960|5960| }; |5961|5961| |5962|5962| //// Animal specific functions //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5959|5959| && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |5960|5960| }; |5961|5961| |5962| |-//// Animal specific functions //// | |5962|+// // Animal specific functions //// |5963|5963| |5964|5964| UnitAI.prototype.MoveRandomly = function(distance) |5965|5965| { binaries/data/mods/public/simulation/components/UnitAI.js | 331| » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Order.WalkToTarget' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js | 917| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js | 942| » » » "enter":·function(msg)·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js | 992| » » » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'enter' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1055| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1091| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1123| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1283| » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1340| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1515| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1537| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1569| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1723| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1773| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1851| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2028| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2144| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2419| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2452| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2558| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2624| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2663| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2874| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |3055| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |3779| » var·isWorkType·=·type·=>·type·==·"Gather"·||·type·==·"Trade"·||·type·==·"Repair"·||·type·==·"ReturnResource"; | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4624| » var·target·=·ents.find(target·=>·this.CanAttack(target)); | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4639| » var·target·=·ents.find(target·=> | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4685| » var·ent·=·ents.find(ent·=>·this.CanHeal(ent)); | | [NORMAL] ESLintBear (no-shadow): | | 'ent' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4708| » » ····cmpAttack.GetAttackTypes().some(type·=>·cmpUnitAI.CheckTargetAttackRange(this.isGuardOf,·type))) | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |1983| » » » » » » &&·this.order.data.target·!=·msg.data.attacker·&&·this.GetBestAttackAgainst(msg.data.attacker,·true)·!=·"Capture") | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |3741| » » var·order·=·{·"type":·type,·"data":·data·}; | | [NORMAL] JSHintBear: | | 'order' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |3810| » for·(var·i·=·0;·i·<·this.orderQueue.length;·++i) | | [NORMAL] JSHintBear: | | 'i' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |4641| » » &&·this.CheckTargetDistanceFromHeldPosition(target,·IID_Attack,·this.GetBestAttackAgainst(target,·true)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |4642| » » &&·(this.GetStance().respondChaseBeyondVision·||·this.CheckTargetIsInVisionRange(target)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5530| » » » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5533| » » » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5546| » var·targets·=·this.GetTargetsFromUnit(); | | [NORMAL] JSHintBear: | | 'targets' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5547| » for·(var·targ·of·targets) | | [NORMAL] JSHintBear: | | 'targ' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5553| » » » var·cmpIdentity·=·Engine.QueryInterface(targ,·IID_Identity); | | [NORMAL] JSHintBear: | | 'cmpIdentity' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5554| » » » var·targetClasses·=·this.order.data.targetClasses; | | [NORMAL] JSHintBear: | | 'targetClasses' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5556| » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5559| » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5749| } | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |5959| » » &&·this.GetCurrentState()·==·"FORMATIONCONTROLLER.COMBAT.ATTACKING"; | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/833/display/redirect
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5885 | Maybe return null/undefined instead. It doesn't make sense that you are returning an object all the time, and just in this case a boolean :) Can you add JSDOC ? Thanks. |
Perhaps GetVisionRange() and GetAttackRange(type)?
cmpRanged sounds like we'd had a Range component, so better just use cmp if its agnostic (I think there should be other precedences for that).
The unification has one disadvantage - that the component cannot be reused, but I guess it's not wrong if its never reused currently.
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5797–5798 | One can move the GetVisionRange part outside of the four statements unless I looked too superficially. |
Mostly it seemed odd to introduce a helper function that has 2 function calls that work for all cases and 2 function calls that work for only one case.
The truly common part should be in the common / helper function. The distinct part should be in the part concerned with that related code (unitai/attack).
GetRange(iid), GetAttackRange(type) would address that, in case that common helper function would be used for something more than 1 component.
Notice that the if !x return false; is actually adding duplication.
One could also consider the performance impact.
What if there are 8 * 200 = 1600 player unitAI components running around on the map, then we'd prefer less function calls instead of more I suppose?
(One could measure the bytecode produced by the JIT to see if the function is inlined, but we don't have that area 51 technology available yet!)
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/321/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | 762| 762| this.FinishOrder(); | 763| 763| return; | 764| 764| } | 765| |- else | 766| |- { | | 765|+ | 767| 766| this.SetNextState("GARRISON.APPROACHING"); | 768| 767| return; | 769| |- } | | 768|+ | 770| 769| } | 771| 770| | 772| 771| this.SetNextState("GARRISON.GARRISONING"); | | [NORMAL] ESLintBear (key-spacing): | | Missing space before value for key 'GARRISON'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1030|1030| }, |1031|1031| }, |1032|1032| |1033| |- "GARRISON":{ | |1033|+ "GARRISON": { |1034|1034| "enter": function() { |1035|1035| // If the garrisonholder should pickup, warn it so it can take needed action |1036|1036| var cmpGarrisonHolder = Engine.QueryInterface(this.order.data.target, IID_GarrisonHolder); | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1979|1979| |1980|1980| "Attacked": function(msg) { |1981|1981| // If we are capturing and are attacked by something that we would not capture, attack that entity instead |1982| |- if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) |1983| |- && this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") | |1982|+ if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) && | |1983|+ this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") |1984|1984| this.RespondToTargetedEntities([msg.data.attacker]); |1985|1985| }, |1986|1986| }, | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2707|2707| { |2708|2708| // The building was already finished/fully repaired before we arrived; |2709|2709| // let the ConstructionFinished handler handle this. |2710| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2710|+ this.OnGlobalConstructionFinished({ "entity": this.repairTarget, "newentity": this.repairTarget}); |2711|2711| return true; |2712|2712| } |2713|2713| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2707|2707| { |2708|2708| // The building was already finished/fully repaired before we arrived; |2709|2709| // let the ConstructionFinished handler handle this. |2710| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2710|+ this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget }); |2711|2711| return true; |2712|2712| } |2713|2713| | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 7. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3220|3220| "COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals |3221|3221| |3222|3222| "WALKING": "INDIVIDUAL.WALKING", // reuse the same walking behaviour for animals |3223| |- // only used for domestic animals | |3223|+ // only used for domestic animals |3224|3224| }, |3225|3225| }; |3226|3226| | | [NORMAL] ESLintBear (no-unneeded-ternary): | | Unnecessary use of boolean literals in conditional expression. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3277|3277| |3278|3278| UnitAI.prototype.IsAnimal = function() |3279|3279| { |3280| |- return (this.template.NaturalBehaviour ? true : false); | |3280|+ return (!!this.template.NaturalBehaviour); |3281|3281| }; |3282|3282| |3283|3283| UnitAI.prototype.IsDangerousAnimal = function() | | [NORMAL] ESLintBear (comma-spacing): | | A space is required after ','. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3393|3393| { |3394|3394| let index = this.GetCurrentState().indexOf("."); |3395|3395| if (index != -1) |3396| |- this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index)); | |3396|+ this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0, index)); |3397|3397| this.Stop(false); |3398|3398| } |3399|3399| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3449|3449| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3450|3450| continue; |3451|3451| if (i == 0) |3452| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3452|+ this.UnitFsm.ProcessMessage(this, { "type": "PickupCanceled", "data": msg}); |3453|3453| else |3454|3454| this.orderQueue.splice(i, 1); |3455|3455| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3449|3449| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3450|3450| continue; |3451|3451| if (i == 0) |3452| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3452|+ this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg }); |3453|3453| else |3454|3454| this.orderQueue.splice(i, 1); |3455|3455| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3533|3533| }; |3534|3534| |3535|3535| |3536| |-//// FSM linkage functions //// | |3536|+// // FSM linkage functions //// |3537|3537| |3538|3538| // Setting the next state to the current state will leave/re-enter the top-most substate. |3539|3539| UnitAI.prototype.SetNextState = function(state) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3703|3703| continue; |3704|3704| if (this.orderQueue[i].type == type) |3705|3705| continue; |3706| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3706|+ this.orderQueue.splice(i, 0, { "type": type, "data": data}); |3707|3707| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3708|3708| return; |3709|3709| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3703|3703| continue; |3704|3704| if (this.orderQueue[i].type == type) |3705|3705| continue; |3706| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3706|+ this.orderQueue.splice(i, 0, {"type": type, "data": data }); |3707|3707| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3708|3708| return; |3709|3709| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3874|3874| if (data.timerRepeat === undefined) |3875|3875| this.timer = undefined; |3876|3876| |3877| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |3877|+ this.UnitFsm.ProcessMessage(this, { "type": "Timer", "data": data, "lateness": lateness}); |3878|3878| }; |3879|3879| |3880|3880| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3874|3874| if (data.timerRepeat === undefined) |3875|3875| this.timer = undefined; |3876|3876| |3877| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |3877|+ this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness }); |3878|3878| }; |3879|3879| |3880|3880| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3919|3919| // TODO: This is a bit inefficient since every unit listens to every |3920|3920| // construction message - ideally we could scope it to only the one we're building |3921|3921| |3922| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |3922|+ this.UnitFsm.ProcessMessage(this, { "type": "ConstructionFinished", "data": msg}); |3923|3923| }; |3924|3924| |3925|3925| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3919|3919| // TODO: This is a bit inefficient since every unit listens to every |3920|3920| // construction message - ideally we could scope it to only the one we're building |3921|3921| |3922| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |3922|+ this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg }); |3923|3923| }; |3924|3924| |3925|3925| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3944|3944| |3945|3945| UnitAI.prototype.OnAttacked = function(msg) |3946|3946| { |3947| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |3947|+ this.UnitFsm.ProcessMessage(this, { "type": "Attacked", "data": msg}); |3948|3948| }; |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3944|3944| |3945|3945| UnitAI.prototype.OnAttacked = function(msg) |3946|3946| { |3947| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |3947|+ this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg }); |3948|3948| }; |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) |3951|3951| { |3952| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |3952|+ this.UnitFsm.ProcessMessage(this, { "type": "GuardedAttacked", "data": msg.data}); |3953|3953| }; |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3949|3949| |3950|3950| UnitAI.prototype.OnGuardedAttacked = function(msg) |3951|3951| { |3952| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |3952|+ this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data }); |3953|3953| }; |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) |3956|3956| { |3957| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |3957|+ this.UnitFsm.ProcessMessage(this, { "type": "HealthChanged", "from": msg.from, "to": msg.to}); |3958|3958| }; |3959|3959| |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3954|3954| |3955|3955| UnitAI.prototype.OnHealthChanged = function(msg) |3956|3956| { |3957| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |3957|+ this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to }); |3958|3958| }; |3959|3959| |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) |3961|3961| { |3962|3962| if (msg.tag == this.losRangeQuery) |3963| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |3963|+ this.UnitFsm.ProcessMessage(this, { "type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965|3965| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3960|3960| UnitAI.prototype.OnRangeUpdate = function(msg) |3961|3961| { |3962|3962| if (msg.tag == this.losRangeQuery) |3963| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |3963|+ this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg }); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965|3965| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3962|3962| if (msg.tag == this.losRangeQuery) |3963|3963| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |3965|+ this.UnitFsm.ProcessMessage(this, { "type": "LosHealRangeUpdate", "data": msg}); |3966|3966| }; |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3962|3962| if (msg.tag == this.losRangeQuery) |3963|3963| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |3964|3964| else if (msg.tag == this.losHealRangeQuery) |3965| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |3965|+ this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg }); |3966|3966| }; |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) |3969|3969| { |3970| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |3970|+ this.UnitFsm.ProcessMessage(this, { "type": "PackFinished", "packed": msg.packed}); |3971|3971| }; |3972|3972| |3973|3973| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3967|3967| |3968|3968| UnitAI.prototype.OnPackFinished = function(msg) |3969|3969| { |3970| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |3970|+ this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed }); |3971|3971| }; |3972|3972| |3973|3973| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3970|3970| this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); |3971|3971| }; |3972|3972| |3973| |-//// Helper functions to be called by the FSM //// | |3973|+// // Helper functions to be called by the FSM //// |3974|3974| |3975|3975| UnitAI.prototype.GetWalkSpeed = function() |3976|3976| { | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'visionRange'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4585|4585| let visionRange = this.GetRange(IID_Vision); |4586|4586| if (!visionRange) |4587|4587| return false; |4588| |- let halfvision = visionRange / 2; | |4588|+ let halfvision = visionRange / 2; |4589|4589| |4590|4590| let pos = cmpPosition.GetPosition(); |4591|4591| let heldPosition = this.heldPosition; | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4637|4637| UnitAI.prototype.AttackEntityInZone = function(ents) |4638|4638| { |4639|4639| var target = ents.find(target => |4640| |- this.CanAttack(target) |4641| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) | |4640|+ this.CanAttack(target) && | |4641|+ this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4642|4642| && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4643|4643| ); |4644|4644| if (!target) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4638|4638| { |4639|4639| var target = ents.find(target => |4640|4640| this.CanAttack(target) |4641| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4642| |- && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) | |4641|+ && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) && | |4642|+ (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4643|4643| ); |4644|4644| if (!target) |4645|4645| return false; | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4702|4702| // If we are guarding/escorting, don't abandon as long as the guarded unit is in target range of the attacker |4703|4703| if (this.isGuardOf) |4704|4704| { |4705| |- var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4705|+ var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4706|4706| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4707|4707| if (cmpUnitAI && cmpAttack && |4708|4708| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4706|4706| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4707|4707| if (cmpUnitAI && cmpAttack && |4708|4708| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) |4709| |- return false; | |4709|+ return false; |4710|4710| } |4711|4711| |4712|4712| // Stop if we're in hold-ground mode and it's too far from the holding point | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4744|4744| // If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker |4745|4745| if (this.isGuardOf) |4746|4746| { |4747| |- let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4747|+ let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4748|4748| let cmpAttack = Engine.QueryInterface(target, IID_Attack); |4749|4749| if (cmpUnitAI && cmpAttack && |4750|4750| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4757|4757| return false; |4758|4758| }; |4759|4759| |4760| |-//// External interface functions //// | |4760|+// // External interface functions //// |4761|4761| |4762|4762| UnitAI.prototype.SetFormationController = function(ent) |4763|4763| { | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4913|4913| { |4914|4914| if (this.isGuardOf == target && this.order && this.order.type == "Guard") |4915|4915| return; |4916| |- else |4917| |- this.RemoveGuard(); | |4916|+ this.RemoveGuard(); |4918|4917| } |4919|4918| |4920|4919| this.AddOrder("Guard", { "target": target, "force": false }, queued); | | [NORMAL] ESLintBear (no-trailing-spaces): | | Trailing spaces not allowed. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5245|5245| this.workOrders.length && this.workOrders[0].type == "Trade") |5246|5246| { |5247|5247| let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader); |5248| |- if (cmpTrader.HasBothMarkets() && | |5248|+ if (cmpTrader.HasBothMarkets() && |5249|5249| (cmpTrader.GetFirstMarket() == target && cmpTrader.GetSecondMarket() == source || |5250|5250| cmpTrader.GetFirstMarket() == source && cmpTrader.GetSecondMarket() == target)) |5251|5251| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5526|5526| { |5527|5527| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5528|5528| var targetClasses = this.order.data.targetClasses; |5529| |- if (targetClasses.attack && cmpIdentity |5530| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5529|+ if (targetClasses.attack && cmpIdentity && | |5530|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5531|5531| continue; |5532|5532| if (targetClasses.avoid && cmpIdentity |5533|5533| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5529|5529| if (targetClasses.attack && cmpIdentity |5530|5530| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5531|5531| continue; |5532| |- if (targetClasses.avoid && cmpIdentity |5533| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5532|+ if (targetClasses.avoid && cmpIdentity && | |5533|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5534|5534| continue; |5535|5535| // Only used by the AIs to prevent some choices of targets |5536|5536| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5552|5552| { |5553|5553| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5554|5554| var targetClasses = this.order.data.targetClasses; |5555| |- if (cmpIdentity && targetClasses.attack |5556| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5555|+ if (cmpIdentity && targetClasses.attack && | |5556|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5557|5557| continue; |5558|5558| if (cmpIdentity && targetClasses.avoid |5559|5559| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5555|5555| if (cmpIdentity && targetClasses.attack |5556|5556| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5557|5557| continue; |5558| |- if (cmpIdentity && targetClasses.avoid |5559| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5558|+ if (cmpIdentity && targetClasses.avoid && | |5559|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5560|5560| continue; |5561|5561| // Only used by the AIs to prevent some choices of targets |5562|5562| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5693|5693| |5694|5694| UnitAI.prototype.SetHeldPosition = function(x, z) |5695|5695| { |5696| |- this.heldPosition = {"x": x, "z": z}; | |5696|+ this.heldPosition = { "x": x, "z": z}; |5697|5697| }; |5698|5698| |5699|5699| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5693|5693| |5694|5694| UnitAI.prototype.SetHeldPosition = function(x, z) |5695|5695| { |5696| |- this.heldPosition = {"x": x, "z": z}; | |5696|+ this.heldPosition = {"x": x, "z": z }; |5697|5697| }; |5698|5698| |5699|5699| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5720|5720| return false; |5721|5721| }; |5722|5722| |5723| |-//// Helper functions //// | |5723|+// // Helper functions //// |5724|5724| |5725|5725| /** |5726|5726| * General getter for the getting of ranges. | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5736|5736| return; |5737|5737| |5738|5738| return component.GetRange(type); |5739| |-} | |5739|+}; |5740|5740| |5741|5741| UnitAI.prototype.CanAttack = function(target) |5742|5742| { | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5940|5940| return cmpPack && cmpPack.IsPacking(); |5941|5941| }; |5942|5942| |5943| |-//// Formation specific functions //// | |5943|+// // Formation specific functions //// |5944|5944| |5945|5945| UnitAI.prototype.IsAttackingAsFormation = function() |5946|5946| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5945|5945| UnitAI.prototype.IsAttackingAsFormation = function() |5946|5946| { |5947|5947| var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); |5948| |- return cmpAttack && cmpAttack.CanAttackAsFormation() |5949| |- && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; | |5948|+ return cmpAttack && cmpAttack.CanAttackAsFormation() && | |5949|+ this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |5950|5950| }; |5951|5951| |5952|5952| //// Animal specific functions //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5949|5949| && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |5950|5950| }; |5951|5951| |5952| |-//// Animal specific functions //// | |5952|+// // Animal specific functions //// |5953|5953| |5954|5954| UnitAI.prototype.MoveRandomly = function(distance) |5955|5955| { binaries/data/mods/public/simulation/components/UnitAI.js | 331| » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Order.WalkToTarget' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js | 917| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js | 942| » » » "enter":·function(msg)·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js | 992| » » » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'enter' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1055| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1091| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1123| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1283| » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1340| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1515| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1537| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1569| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1723| » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1773| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |1851| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2028| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2144| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2419| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2452| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2558| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2624| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2663| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |2874| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |3055| » » » » "enter":·function()·{ | | [NORMAL] ESLintBear (consistent-return): | | Expected to return a value at the end of method 'enter'. binaries/data/mods/public/simulation/components/UnitAI.js |3779| » var·isWorkType·=·type·=>·type·==·"Gather"·||·type·==·"Trade"·||·type·==·"Repair"·||·type·==·"ReturnResource"; | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4624| » var·target·=·ents.find(target·=>·this.CanAttack(target)); | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4639| » var·target·=·ents.find(target·=> | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4685| » var·ent·=·ents.find(ent·=>·this.CanHeal(ent)); | | [NORMAL] ESLintBear (no-shadow): | | 'ent' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4708| » » ····cmpAttack.GetAttackTypes().some(type·=>·cmpUnitAI.CheckTargetAttackRange(this.isGuardOf,·type))) | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |5738| » return·component.GetRange(type); | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1983| » » » » » » &&·this.order.data.target·!=·msg.data.attacker·&&·this.GetBestAttackAgainst(msg.data.attacker,·true)·!=·"Capture") | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |3741| » » var·order·=·{·"type":·type,·"data":·data·}; | | [NORMAL] JSHintBear: | | 'order' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |3810| » for·(var·i·=·0;·i·<·this.orderQueue.length;·++i) | | [NORMAL] JSHintBear: | | 'i' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |4641| » » &&·this.CheckTargetDistanceFromHeldPosition(target,·IID_Attack,·this.GetBestAttackAgainst(target,·true)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |4642| » » &&·(this.GetStance().respondChaseBeyondVision·||·this.CheckTargetIsInVisionRange(target)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5530| » » » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5533| » » » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5546| » var·targets·=·this.GetTargetsFromUnit(); | | [NORMAL] JSHintBear: | | 'targets' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5547| » for·(var·targ·of·targets) | | [NORMAL] JSHintBear: | | 'targ' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5553| » » » var·cmpIdentity·=·Engine.QueryInterface(targ,·IID_Identity); | | [NORMAL] JSHintBear: | | 'cmpIdentity' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5554| » » » var·targetClasses·=·this.order.data.targetClasses; | | [NORMAL] JSHintBear: | | 'targetClasses' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5556| » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5559| » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5739| } | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |5949| » » &&·this.GetCurrentState()·==·"FORMATIONCONTROLLER.COMBAT.ATTACKING"; | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/836/display/redirect
I can see why that would be wanted for IID_Attack or IID_Heal but IID_Vision should be excluded from this.
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5886 | this is wrong with elevationbonus and IID_Vision returns only number |
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1029/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1030/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... binaries/data/mods/public/simulation/components/Attack.js | 420| » return·{ | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | 782| 782| this.FinishOrder(); | 783| 783| return; | 784| 784| } | 785| |- else | 786| |- { | | 785|+ | 787| 786| this.SetNextState("GARRISON.APPROACHING"); | 788| 787| return; | 789| |- } | | 788|+ | 790| 789| } | 791| 790| | 792| 791| this.SetNextState("GARRISON.GARRISONING"); | | [NORMAL] ESLintBear (key-spacing): | | Missing space before value for key 'GARRISON'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1054|1054| }, |1055|1055| }, |1056|1056| |1057| |- "GARRISON":{ | |1057|+ "GARRISON": { |1058|1058| "APPROACHING": { |1059|1059| "enter": function() { |1060|1060| if (!this.MoveToGarrisonRange(this.order.data.target)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2032|2032| |2033|2033| "Attacked": function(msg) { |2034|2034| // If we are capturing and are attacked by something that we would not capture, attack that entity instead |2035| |- if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) |2036| |- && this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") | |2035|+ if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) && | |2036|+ this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") |2037|2037| this.RespondToTargetedEntities([msg.data.attacker]); |2038|2038| }, |2039|2039| }, | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2768|2768| { |2769|2769| // The building was already finished/fully repaired before we arrived; |2770|2770| // let the ConstructionFinished handler handle this. |2771| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2771|+ this.OnGlobalConstructionFinished({ "entity": this.repairTarget, "newentity": this.repairTarget}); |2772|2772| return true; |2773|2773| } |2774|2774| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2768|2768| { |2769|2769| // The building was already finished/fully repaired before we arrived; |2770|2770| // let the ConstructionFinished handler handle this. |2771| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2771|+ this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget }); |2772|2772| return true; |2773|2773| } |2774|2774| | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3066|3066| this.StopTimer(); |3067|3067| this.ResetAnimation(); |3068|3068| if (this.formationAnimationVariant) |3069| |- this.SetAnimationVariant(this.formationAnimationVariant) | |3069|+ this.SetAnimationVariant(this.formationAnimationVariant); |3070|3070| else |3071|3071| this.SetDefaultAnimationVariant(); |3072|3072| var cmpResistance = Engine.QueryInterface(this.entity, IID_Resistance); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 7. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3292|3292| "COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals |3293|3293| |3294|3294| "WALKING": "INDIVIDUAL.WALKING", // reuse the same walking behaviour for animals |3295| |- // only used for domestic animals | |3295|+ // only used for domestic animals |3296|3296| }, |3297|3297| }; |3298|3298| | | [NORMAL] ESLintBear (no-unneeded-ternary): | | Unnecessary use of boolean literals in conditional expression. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3351|3351| |3352|3352| UnitAI.prototype.IsAnimal = function() |3353|3353| { |3354| |- return (this.template.NaturalBehaviour ? true : false); | |3354|+ return (!!this.template.NaturalBehaviour); |3355|3355| }; |3356|3356| |3357|3357| UnitAI.prototype.IsDangerousAnimal = function() | | [NORMAL] ESLintBear (comma-spacing): | | A space is required after ','. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3467|3467| { |3468|3468| let index = this.GetCurrentState().indexOf("."); |3469|3469| if (index != -1) |3470| |- this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index)); | |3470|+ this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0, index)); |3471|3471| this.Stop(false); |3472|3472| } |3473|3473| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3523|3523| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3524|3524| continue; |3525|3525| if (i == 0) |3526| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3526|+ this.UnitFsm.ProcessMessage(this, { "type": "PickupCanceled", "data": msg}); |3527|3527| else |3528|3528| this.orderQueue.splice(i, 1); |3529|3529| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3523|3523| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3524|3524| continue; |3525|3525| if (i == 0) |3526| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3526|+ this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg }); |3527|3527| else |3528|3528| this.orderQueue.splice(i, 1); |3529|3529| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3607|3607| }; |3608|3608| |3609|3609| |3610| |-//// FSM linkage functions //// | |3610|+// // FSM linkage functions //// |3611|3611| |3612|3612| // Setting the next state to the current state will leave/re-enter the top-most substate. |3613|3613| UnitAI.prototype.SetNextState = function(state) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3778|3778| continue; |3779|3779| if (this.orderQueue[i].type == type) |3780|3780| continue; |3781| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3781|+ this.orderQueue.splice(i, 0, { "type": type, "data": data}); |3782|3782| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3783|3783| return; |3784|3784| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3778|3778| continue; |3779|3779| if (this.orderQueue[i].type == type) |3780|3780| continue; |3781| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3781|+ this.orderQueue.splice(i, 0, {"type": type, "data": data }); |3782|3782| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3783|3783| return; |3784|3784| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4020|4020| if (data.timerRepeat === undefined) |4021|4021| this.timer = undefined; |4022|4022| |4023| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4023|+ this.UnitFsm.ProcessMessage(this, { "type": "Timer", "data": data, "lateness": lateness}); |4024|4024| }; |4025|4025| |4026|4026| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4020|4020| if (data.timerRepeat === undefined) |4021|4021| this.timer = undefined; |4022|4022| |4023| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4023|+ this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness }); |4024|4024| }; |4025|4025| |4026|4026| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4065|4065| // TODO: This is a bit inefficient since every unit listens to every |4066|4066| // construction message - ideally we could scope it to only the one we're building |4067|4067| |4068| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4068|+ this.UnitFsm.ProcessMessage(this, { "type": "ConstructionFinished", "data": msg}); |4069|4069| }; |4070|4070| |4071|4071| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4065|4065| // TODO: This is a bit inefficient since every unit listens to every |4066|4066| // construction message - ideally we could scope it to only the one we're building |4067|4067| |4068| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4068|+ this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg }); |4069|4069| }; |4070|4070| |4071|4071| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4090|4090| |4091|4091| UnitAI.prototype.OnAttacked = function(msg) |4092|4092| { |4093| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4093|+ this.UnitFsm.ProcessMessage(this, { "type": "Attacked", "data": msg}); |4094|4094| }; |4095|4095| |4096|4096| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4090|4090| |4091|4091| UnitAI.prototype.OnAttacked = function(msg) |4092|4092| { |4093| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4093|+ this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg }); |4094|4094| }; |4095|4095| |4096|4096| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4095|4095| |4096|4096| UnitAI.prototype.OnGuardedAttacked = function(msg) |4097|4097| { |4098| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4098|+ this.UnitFsm.ProcessMessage(this, { "type": "GuardedAttacked", "data": msg.data}); |4099|4099| }; |4100|4100| |4101|4101| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4095|4095| |4096|4096| UnitAI.prototype.OnGuardedAttacked = function(msg) |4097|4097| { |4098| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4098|+ this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data }); |4099|4099| }; |4100|4100| |4101|4101| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4100|4100| |4101|4101| UnitAI.prototype.OnHealthChanged = function(msg) |4102|4102| { |4103| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4103|+ this.UnitFsm.ProcessMessage(this, { "type": "HealthChanged", "from": msg.from, "to": msg.to}); |4104|4104| }; |4105|4105| |4106|4106| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4100|4100| |4101|4101| UnitAI.prototype.OnHealthChanged = function(msg) |4102|4102| { |4103| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4103|+ this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to }); |4104|4104| }; |4105|4105| |4106|4106| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4106|4106| UnitAI.prototype.OnRangeUpdate = function(msg) |4107|4107| { |4108|4108| if (msg.tag == this.losRangeQuery) |4109| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4109|+ this.UnitFsm.ProcessMessage(this, { "type": "LosRangeUpdate", "data": msg}); |4110|4110| else if (msg.tag == this.losHealRangeQuery) |4111|4111| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4112|4112| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4106|4106| UnitAI.prototype.OnRangeUpdate = function(msg) |4107|4107| { |4108|4108| if (msg.tag == this.losRangeQuery) |4109| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4109|+ this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg }); |4110|4110| else if (msg.tag == this.losHealRangeQuery) |4111|4111| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4112|4112| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4108|4108| if (msg.tag == this.losRangeQuery) |4109|4109| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4110|4110| else if (msg.tag == this.losHealRangeQuery) |4111| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4111|+ this.UnitFsm.ProcessMessage(this, { "type": "LosHealRangeUpdate", "data": msg}); |4112|4112| }; |4113|4113| |4114|4114| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4108|4108| if (msg.tag == this.losRangeQuery) |4109|4109| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4110|4110| else if (msg.tag == this.losHealRangeQuery) |4111| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4111|+ this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg }); |4112|4112| }; |4113|4113| |4114|4114| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4113|4113| |4114|4114| UnitAI.prototype.OnPackFinished = function(msg) |4115|4115| { |4116| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4116|+ this.UnitFsm.ProcessMessage(this, { "type": "PackFinished", "packed": msg.packed}); |4117|4117| }; |4118|4118| |4119|4119| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4113|4113| |4114|4114| UnitAI.prototype.OnPackFinished = function(msg) |4115|4115| { |4116| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4116|+ this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed }); |4117|4117| }; |4118|4118| |4119|4119| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4116|4116| this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); |4117|4117| }; |4118|4118| |4119| |-//// Helper functions to be called by the FSM //// | |4119|+// // Helper functions to be called by the FSM //// |4120|4120| |4121|4121| UnitAI.prototype.GetWalkSpeed = function() |4122|4122| { | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'cmpVision'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4727|4727| let cmpVision = Engine.QueryInterface(this.entity, IID_Vision); |4728|4728| if (!cmpVision) |4729|4729| return false; |4730| |- let halfvision = cmpVision.GetRange() / 2; | |4730|+ let halfvision = cmpVision.GetRange() / 2; |4731|4731| |4732|4732| let pos = cmpPosition.GetPosition(); |4733|4733| let heldPosition = this.heldPosition; | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4780|4780| UnitAI.prototype.AttackEntityInZone = function(ents) |4781|4781| { |4782|4782| var target = ents.find(target => |4783| |- this.CanAttack(target) |4784| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) | |4783|+ this.CanAttack(target) && | |4784|+ this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4785|4785| && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4786|4786| ); |4787|4787| if (!target) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4781|4781| { |4782|4782| var target = ents.find(target => |4783|4783| this.CanAttack(target) |4784| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4785| |- && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) | |4784|+ && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) && | |4785|+ (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4786|4786| ); |4787|4787| if (!target) |4788|4788| return false; | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4845|4845| // If we are guarding/escorting, don't abandon as long as the guarded unit is in target range of the attacker |4846|4846| if (this.isGuardOf) |4847|4847| { |4848| |- var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4848|+ var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4849|4849| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4850|4850| if (cmpUnitAI && cmpAttack && |4851|4851| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4849|4849| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4850|4850| if (cmpUnitAI && cmpAttack && |4851|4851| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) |4852| |- return false; | |4852|+ return false; |4853|4853| } |4854|4854| |4855|4855| // Stop if we're in hold-ground mode and it's too far from the holding point | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4887|4887| // If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker |4888|4888| if (this.isGuardOf) |4889|4889| { |4890| |- let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4890|+ let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4891|4891| let cmpAttack = Engine.QueryInterface(target, IID_Attack); |4892|4892| if (cmpUnitAI && cmpAttack && |4893|4893| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4900|4900| return false; |4901|4901| }; |4902|4902| |4903| |-//// External interface functions //// | |4903|+// // External interface functions //// |4904|4904| |4905|4905| UnitAI.prototype.SetFormationController = function(ent) |4906|4906| { | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5056|5056| { |5057|5057| if (this.isGuardOf == target && this.order && this.order.type == "Guard") |5058|5058| return; |5059| |- else |5060| |- this.RemoveGuard(); | |5059|+ this.RemoveGuard(); |5061|5060| } |5062|5061| |5063|5062| this.AddOrder("Guard", { "target": target, "force": false }, queued); | | [NORMAL] ESLintBear (no-trailing-spaces): | | Trailing spaces not allowed. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5398|5398| this.workOrders.length && this.workOrders[0].type == "Trade") |5399|5399| { |5400|5400| let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader); |5401| |- if (cmpTrader.HasBothMarkets() && | |5401|+ if (cmpTrader.HasBothMarkets() && |5402|5402| (cmpTrader.GetFirstMarket() == target && cmpTrader.GetSecondMarket() == source || |5403|5403| cmpTrader.GetFirstMarket() == source && cmpTrader.GetSecondMarket() == target)) |5404|5404| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5679|5679| { |5680|5680| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5681|5681| var targetClasses = this.order.data.targetClasses; |5682| |- if (targetClasses.attack && cmpIdentity |5683| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5682|+ if (targetClasses.attack && cmpIdentity && | |5683|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5684|5684| continue; |5685|5685| if (targetClasses.avoid && cmpIdentity |5686|5686| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5682|5682| if (targetClasses.attack && cmpIdentity |5683|5683| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5684|5684| continue; |5685| |- if (targetClasses.avoid && cmpIdentity |5686| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5685|+ if (targetClasses.avoid && cmpIdentity && | |5686|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5687|5687| continue; |5688|5688| // Only used by the AIs to prevent some choices of targets |5689|5689| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5705|5705| { |5706|5706| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5707|5707| var targetClasses = this.order.data.targetClasses; |5708| |- if (cmpIdentity && targetClasses.attack |5709| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5708|+ if (cmpIdentity && targetClasses.attack && | |5709|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5710|5710| continue; |5711|5711| if (cmpIdentity && targetClasses.avoid |5712|5712| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5708|5708| if (cmpIdentity && targetClasses.attack |5709|5709| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5710|5710| continue; |5711| |- if (cmpIdentity && targetClasses.avoid |5712| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5711|+ if (cmpIdentity && targetClasses.avoid && | |5712|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5713|5713| continue; |5714|5714| // Only used by the AIs to prevent some choices of targets |5715|5715| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5849|5849| |5850|5850| UnitAI.prototype.SetHeldPosition = function(x, z) |5851|5851| { |5852| |- this.heldPosition = {"x": x, "z": z}; | |5852|+ this.heldPosition = { "x": x, "z": z}; |5853|5853| }; |5854|5854| |5855|5855| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5849|5849| |5850|5850| UnitAI.prototype.SetHeldPosition = function(x, z) |5851|5851| { |5852| |- this.heldPosition = {"x": x, "z": z}; | |5852|+ this.heldPosition = {"x": x, "z": z }; |5853|5853| }; |5854|5854| |5855|5855| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5876|5876| return false; |5877|5877| }; |5878|5878| |5879| |-//// Helper functions //// | |5879|+// // Helper functions //// |5880|5880| |5881|5881| /** |5882|5882| * General getter for the getting of ranges. | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5893|5893| return; |5894|5894| |5895|5895| return component.GetRange(type); |5896| |-} | |5896|+}; |5897|5897| |5898|5898| UnitAI.prototype.CanAttack = function(target) |5899|5899| { | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6097|6097| return cmpPack && cmpPack.IsPacking(); |6098|6098| }; |6099|6099| |6100| |-//// Formation specific functions //// | |6100|+// // Formation specific functions //// |6101|6101| |6102|6102| UnitAI.prototype.IsAttackingAsFormation = function() |6103|6103| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6102|6102| UnitAI.prototype.IsAttackingAsFormation = function() |6103|6103| { |6104|6104| var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); |6105| |- return cmpAttack && cmpAttack.CanAttackAsFormation() |6106| |- && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; | |6105|+ return cmpAttack && cmpAttack.CanAttackAsFormation() && | |6106|+ this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6107|6107| }; |6108|6108| |6109|6109| //// Animal specific functions //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6106|6106| && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6107|6107| }; |6108|6108| |6109| |-//// Animal specific functions //// | |6109|+// // Animal specific functions //// |6110|6110| |6111|6111| UnitAI.prototype.MoveRandomly = function(distance) |6112|6112| { binaries/data/mods/public/simulation/components/UnitAI.js | 338| » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Order.WalkToTarget' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1242| » » » » return·false; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Timer' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |3925| » var·isWorkType·=·type·=>·type·==·"Gather"·||·type·==·"Trade"·||·type·==·"Repair"·||·type·==·"ReturnResource"; | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4767| » var·target·=·ents.find(target·=>·this.CanAttack(target)); | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4782| » var·target·=·ents.find(target·=> | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4828| » var·ent·=·ents.find(ent·=>·this.CanHeal(ent)); | | [NORMAL] ESLintBear (no-shadow): | | 'ent' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4851| » » ····cmpAttack.GetAttackTypes().some(type·=>·cmpUnitAI.CheckTargetAttackRange(this.isGuardOf,·type))) | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |5895| » return·component.GetRange(type); | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |2036| » » » » » » &&·this.order.data.target·!=·msg.data.attacker·&&·this.GetBestAttackAgainst(msg.data.attacker,·true)·!=·"Capture") | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |3069| » » » » » this.SetAnimationVariant(this.formationAnimationVariant) | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |3872| » » var·order·=·{·"type":·type,·"data":·data·}; | | [NORMAL] JSHintBear: | | 'order' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |3956| » for·(var·i·=·0;·i·<·this.orderQueue.length;·++i) | | [NORMAL] JSHintBear: | | 'i' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |4784| » » &&·this.CheckTargetDistanceFromHeldPosition(target,·IID_Attack,·this.GetBestAttackAgainst(target,·true)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |4785| » » &&·(this.GetStance().respondChaseBeyondVision·||·this.CheckTargetIsInVisionRange(target)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5683| » » » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5686| » » » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5699| » var·targets·=·this.GetTargetsFromUnit(); | | [NORMAL] JSHintBear: | | 'targets' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5700| » for·(var·targ·of·targets) | | [NORMAL] JSHintBear: | | 'targ' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5706| » » » var·cmpIdentity·=·Engine.QueryInterface(targ,·IID_Identity); | | [NORMAL] JSHintBear: | | 'cmpIdentity' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5707| » » » var·targetClasses·=·this.order.data.targetClasses; | | [NORMAL] JSHintBear: | | 'targetClasses' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5709| » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5712| » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5896| } | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |6106| » » &&·this.GetCurrentState()·==·"FORMATIONCONTROLLER.COMBAT.ATTACKING"; | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1547/display/redirect
Build failure - The Moirai have given mortals hearts that can endure.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1548/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/125/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/126/display/redirect
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5886 | Object | undefined |
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5886 | undefined is not a type :) |
binaries/data/mods/public/simulation/components/UnitAI.js | ||
---|---|---|
5886 | acording to this yes https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures |
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... binaries/data/mods/public/simulation/components/Attack.js | 420| » return·{ | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | 788| 788| this.FinishOrder(); | 789| 789| return; | 790| 790| } | 791| |- else | 792| |- { | | 791|+ | 793| 792| this.SetNextState("GARRISON.APPROACHING"); | 794| 793| return; | 795| |- } | | 794|+ | 796| 795| } | 797| 796| | 798| 797| this.SetNextState("GARRISON.GARRISONING"); | | [NORMAL] ESLintBear (key-spacing): | | Missing space before value for key 'GARRISON'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1060|1060| }, |1061|1061| }, |1062|1062| |1063| |- "GARRISON":{ | |1063|+ "GARRISON": { |1064|1064| "APPROACHING": { |1065|1065| "enter": function() { |1066|1066| if (!this.MoveToGarrisonRange(this.order.data.target)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2038|2038| |2039|2039| "Attacked": function(msg) { |2040|2040| // If we are capturing and are attacked by something that we would not capture, attack that entity instead |2041| |- if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) |2042| |- && this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") | |2041|+ if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) && | |2042|+ this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") |2043|2043| this.RespondToTargetedEntities([msg.data.attacker]); |2044|2044| }, |2045|2045| }, | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2774|2774| { |2775|2775| // The building was already finished/fully repaired before we arrived; |2776|2776| // let the ConstructionFinished handler handle this. |2777| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2777|+ this.OnGlobalConstructionFinished({ "entity": this.repairTarget, "newentity": this.repairTarget}); |2778|2778| return true; |2779|2779| } |2780|2780| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2774|2774| { |2775|2775| // The building was already finished/fully repaired before we arrived; |2776|2776| // let the ConstructionFinished handler handle this. |2777| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2777|+ this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget }); |2778|2778| return true; |2779|2779| } |2780|2780| | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3072|3072| this.StopTimer(); |3073|3073| this.ResetAnimation(); |3074|3074| if (this.formationAnimationVariant) |3075| |- this.SetAnimationVariant(this.formationAnimationVariant) | |3075|+ this.SetAnimationVariant(this.formationAnimationVariant); |3076|3076| else |3077|3077| this.SetDefaultAnimationVariant(); |3078|3078| var cmpResistance = Engine.QueryInterface(this.entity, IID_Resistance); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 7. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3298|3298| "COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals |3299|3299| |3300|3300| "WALKING": "INDIVIDUAL.WALKING", // reuse the same walking behaviour for animals |3301| |- // only used for domestic animals | |3301|+ // only used for domestic animals |3302|3302| |3303|3303| // Reuse the same garrison behaviour for animals. |3304|3304| "GARRISON": "INDIVIDUAL.GARRISON", | | [NORMAL] ESLintBear (no-unneeded-ternary): | | Unnecessary use of boolean literals in conditional expression. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3360|3360| |3361|3361| UnitAI.prototype.IsAnimal = function() |3362|3362| { |3363| |- return (this.template.NaturalBehaviour ? true : false); | |3363|+ return (!!this.template.NaturalBehaviour); |3364|3364| }; |3365|3365| |3366|3366| UnitAI.prototype.IsDangerousAnimal = function() | | [NORMAL] ESLintBear (comma-spacing): | | A space is required after ','. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3476|3476| { |3477|3477| let index = this.GetCurrentState().indexOf("."); |3478|3478| if (index != -1) |3479| |- this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index)); | |3479|+ this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0, index)); |3480|3480| this.Stop(false); |3481|3481| } |3482|3482| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3532|3532| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3533|3533| continue; |3534|3534| if (i == 0) |3535| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3535|+ this.UnitFsm.ProcessMessage(this, { "type": "PickupCanceled", "data": msg}); |3536|3536| else |3537|3537| this.orderQueue.splice(i, 1); |3538|3538| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3532|3532| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3533|3533| continue; |3534|3534| if (i == 0) |3535| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3535|+ this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg }); |3536|3536| else |3537|3537| this.orderQueue.splice(i, 1); |3538|3538| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3616|3616| }; |3617|3617| |3618|3618| |3619| |-//// FSM linkage functions //// | |3619|+// // FSM linkage functions //// |3620|3620| |3621|3621| // Setting the next state to the current state will leave/re-enter the top-most substate. |3622|3622| UnitAI.prototype.SetNextState = function(state) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3787|3787| continue; |3788|3788| if (this.orderQueue[i].type == type) |3789|3789| continue; |3790| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3790|+ this.orderQueue.splice(i, 0, { "type": type, "data": data}); |3791|3791| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3792|3792| return; |3793|3793| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3787|3787| continue; |3788|3788| if (this.orderQueue[i].type == type) |3789|3789| continue; |3790| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3790|+ this.orderQueue.splice(i, 0, {"type": type, "data": data }); |3791|3791| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3792|3792| return; |3793|3793| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4029|4029| if (data.timerRepeat === undefined) |4030|4030| this.timer = undefined; |4031|4031| |4032| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4032|+ this.UnitFsm.ProcessMessage(this, { "type": "Timer", "data": data, "lateness": lateness}); |4033|4033| }; |4034|4034| |4035|4035| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4029|4029| if (data.timerRepeat === undefined) |4030|4030| this.timer = undefined; |4031|4031| |4032| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4032|+ this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness }); |4033|4033| }; |4034|4034| |4035|4035| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4074|4074| // TODO: This is a bit inefficient since every unit listens to every |4075|4075| // construction message - ideally we could scope it to only the one we're building |4076|4076| |4077| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4077|+ this.UnitFsm.ProcessMessage(this, { "type": "ConstructionFinished", "data": msg}); |4078|4078| }; |4079|4079| |4080|4080| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4074|4074| // TODO: This is a bit inefficient since every unit listens to every |4075|4075| // construction message - ideally we could scope it to only the one we're building |4076|4076| |4077| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4077|+ this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg }); |4078|4078| }; |4079|4079| |4080|4080| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4099|4099| |4100|4100| UnitAI.prototype.OnAttacked = function(msg) |4101|4101| { |4102| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4102|+ this.UnitFsm.ProcessMessage(this, { "type": "Attacked", "data": msg}); |4103|4103| }; |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4099|4099| |4100|4100| UnitAI.prototype.OnAttacked = function(msg) |4101|4101| { |4102| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4102|+ this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg }); |4103|4103| }; |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) |4106|4106| { |4107| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4107|+ this.UnitFsm.ProcessMessage(this, { "type": "GuardedAttacked", "data": msg.data}); |4108|4108| }; |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) |4106|4106| { |4107| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4107|+ this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data }); |4108|4108| }; |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) |4111|4111| { |4112| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4112|+ this.UnitFsm.ProcessMessage(this, { "type": "HealthChanged", "from": msg.from, "to": msg.to}); |4113|4113| }; |4114|4114| |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) |4111|4111| { |4112| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4112|+ this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to }); |4113|4113| }; |4114|4114| |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) |4116|4116| { |4117|4117| if (msg.tag == this.losRangeQuery) |4118| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4118|+ this.UnitFsm.ProcessMessage(this, { "type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120|4120| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) |4116|4116| { |4117|4117| if (msg.tag == this.losRangeQuery) |4118| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4118|+ this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg }); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120|4120| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4117|4117| if (msg.tag == this.losRangeQuery) |4118|4118| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4120|+ this.UnitFsm.ProcessMessage(this, { "type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4117|4117| if (msg.tag == this.losRangeQuery) |4118|4118| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4120|+ this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg }); |4121|4121| }; |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) |4124|4124| { |4125| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4125|+ this.UnitFsm.ProcessMessage(this, { "type": "PackFinished", "packed": msg.packed}); |4126|4126| }; |4127|4127| |4128|4128| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) |4124|4124| { |4125| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4125|+ this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed }); |4126|4126| }; |4127|4127| |4128|4128| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4125|4125| this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); |4126|4126| }; |4127|4127| |4128| |-//// Helper functions to be called by the FSM //// | |4128|+// // Helper functions to be called by the FSM //// |4129|4129| |4130|4130| UnitAI.prototype.GetWalkSpeed = function() |4131|4131| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4789|4789| UnitAI.prototype.AttackEntityInZone = function(ents) |4790|4790| { |4791|4791| var target = ents.find(target => |4792| |- this.CanAttack(target) |4793| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) | |4792|+ this.CanAttack(target) && | |4793|+ this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4794|4794| && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4795|4795| ); |4796|4796| if (!target) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4790|4790| { |4791|4791| var target = ents.find(target => |4792|4792| this.CanAttack(target) |4793| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4794| |- && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) | |4793|+ && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) && | |4794|+ (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4795|4795| ); |4796|4796| if (!target) |4797|4797| return false; | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4854|4854| // If we are guarding/escorting, don't abandon as long as the guarded unit is in target range of the attacker |4855|4855| if (this.isGuardOf) |4856|4856| { |4857| |- var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4857|+ var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4858|4858| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4859|4859| if (cmpUnitAI && cmpAttack && |4860|4860| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4858|4858| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4859|4859| if (cmpUnitAI && cmpAttack && |4860|4860| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) |4861| |- return false; | |4861|+ return false; |4862|4862| } |4863|4863| |4864|4864| // Stop if we're in hold-ground mode and it's too far from the holding point | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4896|4896| // If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker |4897|4897| if (this.isGuardOf) |4898|4898| { |4899| |- let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4899|+ let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4900|4900| let cmpAttack = Engine.QueryInterface(target, IID_Attack); |4901|4901| if (cmpUnitAI && cmpAttack && |4902|4902| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4909|4909| return false; |4910|4910| }; |4911|4911| |4912| |-//// External interface functions //// | |4912|+// // External interface functions //// |4913|4913| |4914|4914| UnitAI.prototype.SetFormationController = function(ent) |4915|4915| { | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5065|5065| { |5066|5066| if (this.isGuardOf == target && this.order && this.order.type == "Guard") |5067|5067| return; |5068| |- else |5069| |- this.RemoveGuard(); | |5068|+ this.RemoveGuard(); |5070|5069| } |5071|5070| |5072|5071| this.AddOrder("Guard", { "target": target, "force": false }, queued); | | [NORMAL] ESLintBear (no-trailing-spaces): | | Trailing spaces not allowed. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5407|5407| this.workOrders.length && this.workOrders[0].type == "Trade") |5408|5408| { |5409|5409| let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader); |5410| |- if (cmpTrader.HasBothMarkets() && | |5410|+ if (cmpTrader.HasBothMarkets() && |5411|5411| (cmpTrader.GetFirstMarket() == target && cmpTrader.GetSecondMarket() == source || |5412|5412| cmpTrader.GetFirstMarket() == source && cmpTrader.GetSecondMarket() == target)) |5413|5413| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5688|5688| { |5689|5689| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5690|5690| var targetClasses = this.order.data.targetClasses; |5691| |- if (targetClasses.attack && cmpIdentity |5692| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5691|+ if (targetClasses.attack && cmpIdentity && | |5692|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5693|5693| continue; |5694|5694| if (targetClasses.avoid && cmpIdentity |5695|5695| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5691|5691| if (targetClasses.attack && cmpIdentity |5692|5692| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5693|5693| continue; |5694| |- if (targetClasses.avoid && cmpIdentity |5695| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5694|+ if (targetClasses.avoid && cmpIdentity && | |5695|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5696|5696| continue; |5697|5697| // Only used by the AIs to prevent some choices of targets |5698|5698| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5714|5714| { |5715|5715| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5716|5716| var targetClasses = this.order.data.targetClasses; |5717| |- if (cmpIdentity && targetClasses.attack |5718| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5717|+ if (cmpIdentity && targetClasses.attack && | |5718|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5719|5719| continue; |5720|5720| if (cmpIdentity && targetClasses.avoid |5721|5721| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5717|5717| if (cmpIdentity && targetClasses.attack |5718|5718| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5719|5719| continue; |5720| |- if (cmpIdentity && targetClasses.avoid |5721| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5720|+ if (cmpIdentity && targetClasses.avoid && | |5721|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5722|5722| continue; |5723|5723| // Only used by the AIs to prevent some choices of targets |5724|5724| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5858|5858| |5859|5859| UnitAI.prototype.SetHeldPosition = function(x, z) |5860|5860| { |5861| |- this.heldPosition = {"x": x, "z": z}; | |5861|+ this.heldPosition = { "x": x, "z": z}; |5862|5862| }; |5863|5863| |5864|5864| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5858|5858| |5859|5859| UnitAI.prototype.SetHeldPosition = function(x, z) |5860|5860| { |5861| |- this.heldPosition = {"x": x, "z": z}; | |5861|+ this.heldPosition = {"x": x, "z": z }; |5862|5862| }; |5863|5863| |5864|5864| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5885|5885| return false; |5886|5886| }; |5887|5887| |5888| |-//// Helper functions //// | |5888|+// // Helper functions //// |5889|5889| |5890|5890| /** |5891|5891| * General getter for ranges. | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5904|5904| return; |5905|5905| |5906|5906| return component.GetRange(type); |5907| |-} | |5907|+}; |5908|5908| |5909|5909| UnitAI.prototype.CanAttack = function(target) |5910|5910| { | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6102|6102| return cmpPack && cmpPack.IsPacking(); |6103|6103| }; |6104|6104| |6105| |-//// Formation specific functions //// | |6105|+// // Formation specific functions //// |6106|6106| |6107|6107| UnitAI.prototype.IsAttackingAsFormation = function() |6108|6108| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6107|6107| UnitAI.prototype.IsAttackingAsFormation = function() |6108|6108| { |6109|6109| var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); |6110| |- return cmpAttack && cmpAttack.CanAttackAsFormation() |6111| |- && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; | |6110|+ return cmpAttack && cmpAttack.CanAttackAsFormation() && | |6111|+ this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6112|6112| }; |6113|6113| |6114|6114| //// Animal specific functions //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6111|6111| && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6112|6112| }; |6113|6113| |6114| |-//// Animal specific functions //// | |6114|+// // Animal specific functions //// |6115|6115| |6116|6116| UnitAI.prototype.MoveRandomly = function(distance) |6117|6117| { binaries/data/mods/public/simulation/components/UnitAI.js | 338| » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Order.WalkToTarget' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1248| » » » » return·false; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Timer' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |3934| » var·isWorkType·=·type·=>·type·==·"Gather"·||·type·==·"Trade"·||·type·==·"Repair"·||·type·==·"ReturnResource"; | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4776| » var·target·=·ents.find(target·=>·this.CanAttack(target)); | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4791| » var·target·=·ents.find(target·=> | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4837| » var·ent·=·ents.find(ent·=>·this.CanHeal(ent)); | | [NORMAL] ESLintBear (no-shadow): | | 'ent' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4860| » » ····cmpAttack.GetAttackTypes().some(type·=>·cmpUnitAI.CheckTargetAttackRange(this.isGuardOf,·type))) | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |5906| » return·component.GetRange(type); | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |2042| » » » » » » &&·this.order.data.target·!=·msg.data.attacker·&&·this.GetBestAttackAgainst(msg.data.attacker,·true)·!=·"Capture") | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |3075| » » » » » this.SetAnimationVariant(this.formationAnimationVariant) | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |3881| » » var·order·=·{·"type":·type,·"data":·data·}; | | [NORMAL] JSHintBear: | | 'order' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |3965| » for·(var·i·=·0;·i·<·this.orderQueue.length;·++i) | | [NORMAL] JSHintBear: | | 'i' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |4793| » » &&·this.CheckTargetDistanceFromHeldPosition(target,·IID_Attack,·this.GetBestAttackAgainst(target,·true)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |4794| » » &&·(this.GetStance().respondChaseBeyondVision·||·this.CheckTargetIsInVisionRange(target)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5692| » » » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5695| » » » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5708| » var·targets·=·this.GetTargetsFromUnit(); | | [NORMAL] JSHintBear: | | 'targets' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5709| » for·(var·targ·of·targets) | | [NORMAL] JSHintBear: | | 'targ' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5715| » » » var·cmpIdentity·=·Engine.QueryInterface(targ,·IID_Identity); | | [NORMAL] JSHintBear: | | 'cmpIdentity' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5716| » » » var·targetClasses·=·this.order.data.targetClasses; | | [NORMAL] JSHintBear: | | 'targetClasses' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5718| » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5721| » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5907| } | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |6111| » » &&·this.GetCurrentState()·==·"FORMATIONCONTROLLER.COMBAT.ATTACKING"; | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1625/display/redirect
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... binaries/data/mods/public/simulation/components/Attack.js | 420| » return·{ | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | 788| 788| this.FinishOrder(); | 789| 789| return; | 790| 790| } | 791| |- else | 792| |- { | | 791|+ | 793| 792| this.SetNextState("GARRISON.APPROACHING"); | 794| 793| return; | 795| |- } | | 794|+ | 796| 795| } | 797| 796| | 798| 797| this.SetNextState("GARRISON.GARRISONING"); | | [NORMAL] ESLintBear (key-spacing): | | Missing space before value for key 'GARRISON'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |1060|1060| }, |1061|1061| }, |1062|1062| |1063| |- "GARRISON":{ | |1063|+ "GARRISON": { |1064|1064| "APPROACHING": { |1065|1065| "enter": function() { |1066|1066| if (!this.MoveToGarrisonRange(this.order.data.target)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2038|2038| |2039|2039| "Attacked": function(msg) { |2040|2040| // If we are capturing and are attacked by something that we would not capture, attack that entity instead |2041| |- if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) |2042| |- && this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") | |2041|+ if (this.order.data.attackType == "Capture" && (this.GetStance().targetAttackersAlways || !this.order.data.force) && | |2042|+ this.order.data.target != msg.data.attacker && this.GetBestAttackAgainst(msg.data.attacker, true) != "Capture") |2043|2043| this.RespondToTargetedEntities([msg.data.attacker]); |2044|2044| }, |2045|2045| }, | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2774|2774| { |2775|2775| // The building was already finished/fully repaired before we arrived; |2776|2776| // let the ConstructionFinished handler handle this. |2777| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2777|+ this.OnGlobalConstructionFinished({ "entity": this.repairTarget, "newentity": this.repairTarget}); |2778|2778| return true; |2779|2779| } |2780|2780| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |2774|2774| { |2775|2775| // The building was already finished/fully repaired before we arrived; |2776|2776| // let the ConstructionFinished handler handle this. |2777| |- this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget}); | |2777|+ this.OnGlobalConstructionFinished({"entity": this.repairTarget, "newentity": this.repairTarget }); |2778|2778| return true; |2779|2779| } |2780|2780| | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3072|3072| this.StopTimer(); |3073|3073| this.ResetAnimation(); |3074|3074| if (this.formationAnimationVariant) |3075| |- this.SetAnimationVariant(this.formationAnimationVariant) | |3075|+ this.SetAnimationVariant(this.formationAnimationVariant); |3076|3076| else |3077|3077| this.SetDefaultAnimationVariant(); |3078|3078| var cmpResistance = Engine.QueryInterface(this.entity, IID_Resistance); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 7. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3298|3298| "COMBAT": "INDIVIDUAL.COMBAT", // reuse the same combat behaviour for animals |3299|3299| |3300|3300| "WALKING": "INDIVIDUAL.WALKING", // reuse the same walking behaviour for animals |3301| |- // only used for domestic animals | |3301|+ // only used for domestic animals |3302|3302| |3303|3303| // Reuse the same garrison behaviour for animals. |3304|3304| "GARRISON": "INDIVIDUAL.GARRISON", | | [NORMAL] ESLintBear (no-unneeded-ternary): | | Unnecessary use of boolean literals in conditional expression. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3360|3360| |3361|3361| UnitAI.prototype.IsAnimal = function() |3362|3362| { |3363| |- return (this.template.NaturalBehaviour ? true : false); | |3363|+ return (!!this.template.NaturalBehaviour); |3364|3364| }; |3365|3365| |3366|3366| UnitAI.prototype.IsDangerousAnimal = function() | | [NORMAL] ESLintBear (comma-spacing): | | A space is required after ','. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3476|3476| { |3477|3477| let index = this.GetCurrentState().indexOf("."); |3478|3478| if (index != -1) |3479| |- this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index)); | |3479|+ this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0, index)); |3480|3480| this.Stop(false); |3481|3481| } |3482|3482| | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3532|3532| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3533|3533| continue; |3534|3534| if (i == 0) |3535| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3535|+ this.UnitFsm.ProcessMessage(this, { "type": "PickupCanceled", "data": msg}); |3536|3536| else |3537|3537| this.orderQueue.splice(i, 1); |3538|3538| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3532|3532| if (this.orderQueue[i].type != "PickupUnit" || this.orderQueue[i].data.target != msg.entity) |3533|3533| continue; |3534|3534| if (i == 0) |3535| |- this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg}); | |3535|+ this.UnitFsm.ProcessMessage(this, {"type": "PickupCanceled", "data": msg }); |3536|3536| else |3537|3537| this.orderQueue.splice(i, 1); |3538|3538| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3616|3616| }; |3617|3617| |3618|3618| |3619| |-//// FSM linkage functions //// | |3619|+// // FSM linkage functions //// |3620|3620| |3621|3621| // Setting the next state to the current state will leave/re-enter the top-most substate. |3622|3622| UnitAI.prototype.SetNextState = function(state) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3787|3787| continue; |3788|3788| if (this.orderQueue[i].type == type) |3789|3789| continue; |3790| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3790|+ this.orderQueue.splice(i, 0, { "type": type, "data": data}); |3791|3791| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3792|3792| return; |3793|3793| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |3787|3787| continue; |3788|3788| if (this.orderQueue[i].type == type) |3789|3789| continue; |3790| |- this.orderQueue.splice(i, 0, {"type": type, "data": data}); | |3790|+ this.orderQueue.splice(i, 0, {"type": type, "data": data }); |3791|3791| Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() }); |3792|3792| return; |3793|3793| } | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4029|4029| if (data.timerRepeat === undefined) |4030|4030| this.timer = undefined; |4031|4031| |4032| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4032|+ this.UnitFsm.ProcessMessage(this, { "type": "Timer", "data": data, "lateness": lateness}); |4033|4033| }; |4034|4034| |4035|4035| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4029|4029| if (data.timerRepeat === undefined) |4030|4030| this.timer = undefined; |4031|4031| |4032| |- this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness}); | |4032|+ this.UnitFsm.ProcessMessage(this, {"type": "Timer", "data": data, "lateness": lateness }); |4033|4033| }; |4034|4034| |4035|4035| /** | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4074|4074| // TODO: This is a bit inefficient since every unit listens to every |4075|4075| // construction message - ideally we could scope it to only the one we're building |4076|4076| |4077| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4077|+ this.UnitFsm.ProcessMessage(this, { "type": "ConstructionFinished", "data": msg}); |4078|4078| }; |4079|4079| |4080|4080| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4074|4074| // TODO: This is a bit inefficient since every unit listens to every |4075|4075| // construction message - ideally we could scope it to only the one we're building |4076|4076| |4077| |- this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg}); | |4077|+ this.UnitFsm.ProcessMessage(this, {"type": "ConstructionFinished", "data": msg }); |4078|4078| }; |4079|4079| |4080|4080| UnitAI.prototype.OnGlobalEntityRenamed = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4099|4099| |4100|4100| UnitAI.prototype.OnAttacked = function(msg) |4101|4101| { |4102| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4102|+ this.UnitFsm.ProcessMessage(this, { "type": "Attacked", "data": msg}); |4103|4103| }; |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4099|4099| |4100|4100| UnitAI.prototype.OnAttacked = function(msg) |4101|4101| { |4102| |- this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg}); | |4102|+ this.UnitFsm.ProcessMessage(this, {"type": "Attacked", "data": msg }); |4103|4103| }; |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) |4106|4106| { |4107| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4107|+ this.UnitFsm.ProcessMessage(this, { "type": "GuardedAttacked", "data": msg.data}); |4108|4108| }; |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4104|4104| |4105|4105| UnitAI.prototype.OnGuardedAttacked = function(msg) |4106|4106| { |4107| |- this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data}); | |4107|+ this.UnitFsm.ProcessMessage(this, {"type": "GuardedAttacked", "data": msg.data }); |4108|4108| }; |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) |4111|4111| { |4112| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4112|+ this.UnitFsm.ProcessMessage(this, { "type": "HealthChanged", "from": msg.from, "to": msg.to}); |4113|4113| }; |4114|4114| |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4109|4109| |4110|4110| UnitAI.prototype.OnHealthChanged = function(msg) |4111|4111| { |4112| |- this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to}); | |4112|+ this.UnitFsm.ProcessMessage(this, {"type": "HealthChanged", "from": msg.from, "to": msg.to }); |4113|4113| }; |4114|4114| |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) |4116|4116| { |4117|4117| if (msg.tag == this.losRangeQuery) |4118| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4118|+ this.UnitFsm.ProcessMessage(this, { "type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120|4120| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4115|4115| UnitAI.prototype.OnRangeUpdate = function(msg) |4116|4116| { |4117|4117| if (msg.tag == this.losRangeQuery) |4118| |- this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); | |4118|+ this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg }); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120|4120| this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4117|4117| if (msg.tag == this.losRangeQuery) |4118|4118| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4120|+ this.UnitFsm.ProcessMessage(this, { "type": "LosHealRangeUpdate", "data": msg}); |4121|4121| }; |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4117|4117| if (msg.tag == this.losRangeQuery) |4118|4118| this.UnitFsm.ProcessMessage(this, {"type": "LosRangeUpdate", "data": msg}); |4119|4119| else if (msg.tag == this.losHealRangeQuery) |4120| |- this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg}); | |4120|+ this.UnitFsm.ProcessMessage(this, {"type": "LosHealRangeUpdate", "data": msg }); |4121|4121| }; |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) |4124|4124| { |4125| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4125|+ this.UnitFsm.ProcessMessage(this, { "type": "PackFinished", "packed": msg.packed}); |4126|4126| }; |4127|4127| |4128|4128| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4122|4122| |4123|4123| UnitAI.prototype.OnPackFinished = function(msg) |4124|4124| { |4125| |- this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); | |4125|+ this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed }); |4126|4126| }; |4127|4127| |4128|4128| //// Helper functions to be called by the FSM //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4125|4125| this.UnitFsm.ProcessMessage(this, {"type": "PackFinished", "packed": msg.packed}); |4126|4126| }; |4127|4127| |4128| |-//// Helper functions to be called by the FSM //// | |4128|+// // Helper functions to be called by the FSM //// |4129|4129| |4130|4130| UnitAI.prototype.GetWalkSpeed = function() |4131|4131| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4789|4789| UnitAI.prototype.AttackEntityInZone = function(ents) |4790|4790| { |4791|4791| var target = ents.find(target => |4792| |- this.CanAttack(target) |4793| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) | |4792|+ this.CanAttack(target) && | |4793|+ this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4794|4794| && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4795|4795| ); |4796|4796| if (!target) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4790|4790| { |4791|4791| var target = ents.find(target => |4792|4792| this.CanAttack(target) |4793| |- && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) |4794| |- && (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) | |4793|+ && this.CheckTargetDistanceFromHeldPosition(target, IID_Attack, this.GetBestAttackAgainst(target, true)) && | |4794|+ (this.GetStance().respondChaseBeyondVision || this.CheckTargetIsInVisionRange(target)) |4795|4795| ); |4796|4796| if (!target) |4797|4797| return false; | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4854|4854| // If we are guarding/escorting, don't abandon as long as the guarded unit is in target range of the attacker |4855|4855| if (this.isGuardOf) |4856|4856| { |4857| |- var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4857|+ var cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4858|4858| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4859|4859| if (cmpUnitAI && cmpAttack && |4860|4860| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4858|4858| var cmpAttack = Engine.QueryInterface(target, IID_Attack); |4859|4859| if (cmpUnitAI && cmpAttack && |4860|4860| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) |4861| |- return false; | |4861|+ return false; |4862|4862| } |4863|4863| |4864|4864| // Stop if we're in hold-ground mode and it's too far from the holding point | | [NORMAL] ESLintBear (no-multi-spaces): | | Multiple spaces found before 'Engine'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4896|4896| // If we are guarding/escorting, chase at least as long as the guarded unit is in target range of the attacker |4897|4897| if (this.isGuardOf) |4898|4898| { |4899| |- let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); | |4899|+ let cmpUnitAI = Engine.QueryInterface(target, IID_UnitAI); |4900|4900| let cmpAttack = Engine.QueryInterface(target, IID_Attack); |4901|4901| if (cmpUnitAI && cmpAttack && |4902|4902| cmpAttack.GetAttackTypes().some(type => cmpUnitAI.CheckTargetAttackRange(this.isGuardOf, type))) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |4909|4909| return false; |4910|4910| }; |4911|4911| |4912| |-//// External interface functions //// | |4912|+// // External interface functions //// |4913|4913| |4914|4914| UnitAI.prototype.SetFormationController = function(ent) |4915|4915| { | | [NORMAL] ESLintBear (no-else-return): | | Unnecessary 'else' after 'return'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5065|5065| { |5066|5066| if (this.isGuardOf == target && this.order && this.order.type == "Guard") |5067|5067| return; |5068| |- else |5069| |- this.RemoveGuard(); | |5068|+ this.RemoveGuard(); |5070|5069| } |5071|5070| |5072|5071| this.AddOrder("Guard", { "target": target, "force": false }, queued); | | [NORMAL] ESLintBear (no-trailing-spaces): | | Trailing spaces not allowed. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5407|5407| this.workOrders.length && this.workOrders[0].type == "Trade") |5408|5408| { |5409|5409| let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader); |5410| |- if (cmpTrader.HasBothMarkets() && | |5410|+ if (cmpTrader.HasBothMarkets() && |5411|5411| (cmpTrader.GetFirstMarket() == target && cmpTrader.GetSecondMarket() == source || |5412|5412| cmpTrader.GetFirstMarket() == source && cmpTrader.GetSecondMarket() == target)) |5413|5413| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5688|5688| { |5689|5689| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5690|5690| var targetClasses = this.order.data.targetClasses; |5691| |- if (targetClasses.attack && cmpIdentity |5692| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5691|+ if (targetClasses.attack && cmpIdentity && | |5692|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5693|5693| continue; |5694|5694| if (targetClasses.avoid && cmpIdentity |5695|5695| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5691|5691| if (targetClasses.attack && cmpIdentity |5692|5692| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5693|5693| continue; |5694| |- if (targetClasses.avoid && cmpIdentity |5695| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5694|+ if (targetClasses.avoid && cmpIdentity && | |5695|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5696|5696| continue; |5697|5697| // Only used by the AIs to prevent some choices of targets |5698|5698| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5714|5714| { |5715|5715| var cmpIdentity = Engine.QueryInterface(targ, IID_Identity); |5716|5716| var targetClasses = this.order.data.targetClasses; |5717| |- if (cmpIdentity && targetClasses.attack |5718| |- && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) | |5717|+ if (cmpIdentity && targetClasses.attack && | |5718|+ !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5719|5719| continue; |5720|5720| if (cmpIdentity && targetClasses.avoid |5721|5721| && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5717|5717| if (cmpIdentity && targetClasses.attack |5718|5718| && !MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.attack)) |5719|5719| continue; |5720| |- if (cmpIdentity && targetClasses.avoid |5721| |- && MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) | |5720|+ if (cmpIdentity && targetClasses.avoid && | |5721|+ MatchesClassList(cmpIdentity.GetClassesList(), targetClasses.avoid)) |5722|5722| continue; |5723|5723| // Only used by the AIs to prevent some choices of targets |5724|5724| if (targetClasses.vetoEntities && targetClasses.vetoEntities[targ]) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required after '{'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5858|5858| |5859|5859| UnitAI.prototype.SetHeldPosition = function(x, z) |5860|5860| { |5861| |- this.heldPosition = {"x": x, "z": z}; | |5861|+ this.heldPosition = { "x": x, "z": z}; |5862|5862| }; |5863|5863| |5864|5864| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (object-curly-spacing): | | A space is required before '}'. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5858|5858| |5859|5859| UnitAI.prototype.SetHeldPosition = function(x, z) |5860|5860| { |5861| |- this.heldPosition = {"x": x, "z": z}; | |5861|+ this.heldPosition = {"x": x, "z": z }; |5862|5862| }; |5863|5863| |5864|5864| UnitAI.prototype.SetHeldPositionOnEntity = function(entity) | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5885|5885| return false; |5886|5886| }; |5887|5887| |5888| |-//// Helper functions //// | |5888|+// // Helper functions //// |5889|5889| |5890|5890| /** |5891|5891| * General getter for ranges. | | [NORMAL] ESLintBear (semi): | | Missing semicolon. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |5904|5904| return; |5905|5905| |5906|5906| return component.GetRange(type); |5907| |-} | |5907|+}; |5908|5908| |5909|5909| UnitAI.prototype.CanAttack = function(target) |5910|5910| { | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6102|6102| return cmpPack && cmpPack.IsPacking(); |6103|6103| }; |6104|6104| |6105| |-//// Formation specific functions //// | |6105|+// // Formation specific functions //// |6106|6106| |6107|6107| UnitAI.prototype.IsAttackingAsFormation = function() |6108|6108| { | | [NORMAL] ESLintBear (operator-linebreak): | | '&&' should be placed at the end of the line. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6107|6107| UnitAI.prototype.IsAttackingAsFormation = function() |6108|6108| { |6109|6109| var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); |6110| |- return cmpAttack && cmpAttack.CanAttackAsFormation() |6111| |- && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; | |6110|+ return cmpAttack && cmpAttack.CanAttackAsFormation() && | |6111|+ this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6112|6112| }; |6113|6113| |6114|6114| //// Animal specific functions //// | | [NORMAL] ESLintBear (spaced-comment): | | Expected space or tab after '//' in comment. |----| | /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js | |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/UnitAI.js |6111|6111| && this.GetCurrentState() == "FORMATIONCONTROLLER.COMBAT.ATTACKING"; |6112|6112| }; |6113|6113| |6114| |-//// Animal specific functions //// | |6114|+// // Animal specific functions //// |6115|6115| |6116|6116| UnitAI.prototype.MoveRandomly = function(distance) |6117|6117| { binaries/data/mods/public/simulation/components/UnitAI.js | 338| » » » return·true; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Order.WalkToTarget' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |1248| » » » » return·false; | | [NORMAL] ESLintBear (consistent-return): | | Method 'Timer' expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |3934| » var·isWorkType·=·type·=>·type·==·"Gather"·||·type·==·"Trade"·||·type·==·"Repair"·||·type·==·"ReturnResource"; | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4776| » var·target·=·ents.find(target·=>·this.CanAttack(target)); | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4791| » var·target·=·ents.find(target·=> | | [NORMAL] ESLintBear (no-shadow): | | 'target' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4837| » var·ent·=·ents.find(ent·=>·this.CanHeal(ent)); | | [NORMAL] ESLintBear (no-shadow): | | 'ent' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |4860| » » ····cmpAttack.GetAttackTypes().some(type·=>·cmpUnitAI.CheckTargetAttackRange(this.isGuardOf,·type))) | | [NORMAL] ESLintBear (no-shadow): | | 'type' is already declared in the upper scope. binaries/data/mods/public/simulation/components/UnitAI.js |5906| » return·component.GetRange(type); | | [NORMAL] ESLintBear (consistent-return): | | Function expected no return value. binaries/data/mods/public/simulation/components/UnitAI.js |2042| » » » » » » &&·this.order.data.target·!=·msg.data.attacker·&&·this.GetBestAttackAgainst(msg.data.attacker,·true)·!=·"Capture") | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |3075| » » » » » this.SetAnimationVariant(this.formationAnimationVariant) | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |3881| » » var·order·=·{·"type":·type,·"data":·data·}; | | [NORMAL] JSHintBear: | | 'order' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |3965| » for·(var·i·=·0;·i·<·this.orderQueue.length;·++i) | | [NORMAL] JSHintBear: | | 'i' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |4793| » » &&·this.CheckTargetDistanceFromHeldPosition(target,·IID_Attack,·this.GetBestAttackAgainst(target,·true)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |4794| » » &&·(this.GetStance().respondChaseBeyondVision·||·this.CheckTargetIsInVisionRange(target)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5692| » » » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5695| » » » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5708| » var·targets·=·this.GetTargetsFromUnit(); | | [NORMAL] JSHintBear: | | 'targets' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5709| » for·(var·targ·of·targets) | | [NORMAL] JSHintBear: | | 'targ' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5715| » » » var·cmpIdentity·=·Engine.QueryInterface(targ,·IID_Identity); | | [NORMAL] JSHintBear: | | 'cmpIdentity' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5716| » » » var·targetClasses·=·this.order.data.targetClasses; | | [NORMAL] JSHintBear: | | 'targetClasses' is already defined. binaries/data/mods/public/simulation/components/UnitAI.js |5718| » » » » &&·!MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.attack)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5721| » » » » &&·MatchesClassList(cmpIdentity.GetClassesList(),·targetClasses.avoid)) | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. binaries/data/mods/public/simulation/components/UnitAI.js |5907| } | | [NORMAL] JSHintBear: | | Missing semicolon. binaries/data/mods/public/simulation/components/UnitAI.js |6111| » » &&·this.GetCurrentState()·==·"FORMATIONCONTROLLER.COMBAT.ATTACKING"; | | [NORMAL] JSHintBear: | | Misleading line break before '&&'; readers may interpret this as an expression boundary. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1644/display/redirect
Changes are correct by code.
Removing some code changes needed for D1958, so that one is easier to review.