fix: error codes for PWR_DISRUPT_TERMINAL and PWR_FORTIFY

DEV-390

Author: o4kapuk

src/game/creeps.js

@@ -581,6 +581,13 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
             return C.ERR_INVALID_TARGET;
         }
 
+        if(target.structureType == 'terminal') {
+            var effect = _.find(target.effects, {power: C.PWR_DISRUPT_TERMINAL});
+            if(effect && effect.ticksRemaining > 0) {
+                return C.ERR_INVALID_TARGET;
+            }
+        }
+
         if(target.my === false && _.any(target.pos.lookFor('structure'), i => i.structureType == C.STRUCTURE_RAMPART && !i.my && !i.isPublic)) {
             return C.ERR_NOT_OWNER;
         }
@@ -726,6 +733,12 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
             register.assertTargetObject(target);
             return C.ERR_INVALID_TARGET;
         }
+
+        var effect = _.find(target.effects, {power: C.PWR_FORTIFY});
+        if(effect && effect.ticksRemaining > 0) {
+            return C.ERR_INVALID_TARGET;
+        }
+
         if(!target.pos.isNearTo(this.pos)) {
             return C.ERR_NOT_IN_RANGE;
         }
@@ -758,6 +771,10 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
             return C.ERR_NOT_IN_RANGE;
         }
 
+        var effect = _.find(target.effects, {power: C.PWR_FORTIFY});
+        if(effect && effect.ticksRemaining > 0) {
+            return C.ERR_INVALID_TARGET;
+        }
 
         intents.set(this.id, 'rangedAttack', {id: target.id});
         return C.OK;
@@ -1142,6 +1159,11 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
             return C.ERR_NO_BODYPART;
         }
 
+        var effect = _.find(target.effects, {power: C.PWR_FORTIFY});
+        if(effect && effect.ticksRemaining > 0) {
+            return C.ERR_INVALID_TARGET;
+        }
+
         intents.set(this.id, 'dismantle', {id: target.id});
         return C.OK;
     });

src/processor/intents/creeps/dismantle.js

@@ -34,8 +34,8 @@ module.exports = function(object, intent, scope) {
     amount = Math.min(power, target.hits),
     energyGain = Math.floor(amount * C.DISMANTLE_COST);
 
-    var effect = _.find(target.effects, {power: C.PWR_SHIELD});
-    if(effect && effect.endTime >= gameTime) {
+    var effect = _.find(target.effects, e => e.endTime >= gameTime && (e.power == C.PWR_SHIELD || e.power == C.PWR_FORTIFY));
+    if(effect) {
         energyGain = 0;
     }
 
@@ -50,4 +50,4 @@ module.exports = function(object, intent, scope) {
 
         require('../_damage')(object, target, amount, C.EVENT_ATTACK_TYPE_DISMANTLE, scope);
     }
-};
+};