Skip to content

Commit a8a8f7f

Browse files
semperrabbitsemperrabbit
committed
RANGE_* constants for creeps, structures and powercreeps
clone and fixed merge conflicts of screeps/engine PR screeps#6 by PostCrafter added RANGE_* constants for PowerCreeps
1 parent a4e431c commit a8a8f7f

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

‎src/game/creeps.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
358358
if(!target.energy) {
359359
return C.ERR_NOT_ENOUGH_RESOURCES;
360360
}
361-
if(!target.pos.isNearTo(this.pos)) {
361+
if(!target.pos.inRangeTo(this.pos, C.RANGE_HARVEST_SOURCE)) {
362362
return C.ERR_NOT_IN_RANGE;
363363
}
364364
if(this.room.controller && (
@@ -373,7 +373,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
373373
if(!target.mineralAmount) {
374374
return C.ERR_NOT_ENOUGH_RESOURCES;
375375
}
376-
if(!target.pos.isNearTo(this.pos)) {
376+
if(!target.pos.inRangeTo(this.pos, C.RANGE_HARVEST_MINERAL)) {
377377
return C.ERR_NOT_IN_RANGE;
378378
}
379379
var extractor = _.find(target.pos.lookFor('structure'), {structureType: C.STRUCTURE_EXTRACTOR});
@@ -481,7 +481,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
481481
}
482482
}
483483

484-
if(!target.pos.isNearTo(this.pos)) {
484+
if(!target.pos.inRangeTo(this.pos, C.RANGE_TRANSFER)) {
485485
return C.ERR_NOT_IN_RANGE;
486486
}
487487
if(!data(this.id)[resourceType]) {
@@ -629,7 +629,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
629629
}
630630
}
631631

632-
if(!target.pos.isNearTo(this.pos)) {
632+
if(!target.pos.inRangeTo(this.pos, C.RANGE_WITHDRAW)) {
633633
return C.ERR_NOT_IN_RANGE;
634634
}
635635

@@ -701,7 +701,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
701701
if(utils.calcResources(this.carry) >= this.carryCapacity) {
702702
return C.ERR_FULL;
703703
}
704-
if(!target.pos.isNearTo(this.pos)) {
704+
if(!target.pos.inRangeTo(this.pos, C.RANGE_PICKUP)) {
705705
return C.ERR_NOT_IN_RANGE;
706706
}
707707

@@ -739,7 +739,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
739739
return C.ERR_INVALID_TARGET;
740740
}
741741

742-
if(!target.pos.isNearTo(this.pos)) {
742+
if(!target.pos.inRangeTo(this.pos, C.RANGE_ATTACK)) {
743743
return C.ERR_NOT_IN_RANGE;
744744
}
745745

@@ -767,7 +767,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
767767
register.assertTargetObject(target);
768768
return C.ERR_INVALID_TARGET;
769769
}
770-
if(!this.pos.inRangeTo(target, 3)) {
770+
if(!this.pos.inRangeTo(target, C.RANGE_RANGED_ATTACK)) {
771771
return C.ERR_NOT_IN_RANGE;
772772
}
773773

@@ -816,7 +816,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
816816
register.assertTargetObject(target);
817817
return C.ERR_INVALID_TARGET;
818818
}
819-
if(!target.pos.isNearTo(this.pos)) {
819+
if(!target.pos.inRangeTo(this.pos, C.RANGE_HEAL)) {
820820
return C.ERR_NOT_IN_RANGE;
821821
}
822822
if(this.room.controller && !this.room.controller.my && this.room.controller.safeMode) {
@@ -875,7 +875,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
875875
register.assertTargetObject(target);
876876
return C.ERR_INVALID_TARGET;
877877
}
878-
if(!this.pos.inRangeTo(target, 3)) {
878+
if(!this.pos.inRangeTo(target, C.RANGE_REPAIR)) {
879879
return C.ERR_NOT_IN_RANGE;
880880
}
881881

@@ -902,7 +902,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
902902
register.assertTargetObject(target);
903903
return C.ERR_INVALID_TARGET;
904904
}
905-
if(!this.pos.inRangeTo(target, 3)) {
905+
if(!this.pos.inRangeTo(target, C.RANGE_BUILD)) {
906906
return C.ERR_NOT_IN_RANGE;
907907
}
908908

@@ -985,7 +985,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
985985
if(!_hasActiveBodypart(this.body, C.CLAIM)) {
986986
return C.ERR_NO_BODYPART;
987987
}
988-
if(!target.pos.isNearTo(this.pos)) {
988+
if(!target.pos.inRangeTo(this.pos, C.RANGE_CLAIM_CONTROLLER)) {
989989
return C.ERR_NOT_IN_RANGE;
990990
}
991991
if(target.structureType != 'controller') {
@@ -1021,7 +1021,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
10211021
if(!_getActiveBodyparts(this.body, C.CLAIM)) {
10221022
return C.ERR_NO_BODYPART;
10231023
}
1024-
if(!target.pos.isNearTo(this.pos)) {
1024+
if(!target.pos.inRangeTo(this.pos, C.RANGE_ATTACK_CONTROLLER)) {
10251025
return C.ERR_NOT_IN_RANGE;
10261026
}
10271027
if(!target.owner && !target.reservation) {
@@ -1059,7 +1059,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
10591059
if(target.upgradeBlocked && target.upgradeBlocked > 0) {
10601060
return C.ERR_INVALID_TARGET;
10611061
}
1062-
if(!target.pos.inRangeTo(this.pos, 3)) {
1062+
if(!target.pos.inRangeTo(this.pos, C.RANGE_UPGRADE_CONTROLLER)) {
10631063
return C.ERR_NOT_IN_RANGE;
10641064
}
10651065
if(!target.my) {
@@ -1086,7 +1086,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
10861086
register.assertTargetObject(target);
10871087
return C.ERR_INVALID_TARGET;
10881088
}
1089-
if(!target.pos.isNearTo(this.pos)) {
1089+
if(!target.pos.inRangeTo(this.pos, C.RANGE_RESERVE_CONTROLLER)) {
10901090
return C.ERR_NOT_IN_RANGE;
10911091
}
10921092
if(target.structureType != 'controller') {
@@ -1152,7 +1152,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
11521152
register.assertTargetObject(target);
11531153
return C.ERR_INVALID_TARGET;
11541154
}
1155-
if(!target.pos.isNearTo(this.pos)) {
1155+
if(!target.pos.inRangeTo(this.pos, C.RANGE_DISMANTLE)) {
11561156
return C.ERR_NOT_IN_RANGE;
11571157
}
11581158
if(this.room.controller && !this.room.controller.my && this.room.controller.safeMode) {
@@ -1183,7 +1183,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
11831183
register.assertTargetObject(target);
11841184
return C.ERR_INVALID_TARGET;
11851185
}
1186-
if(!target.pos.isNearTo(this.pos)) {
1186+
if(!target.pos.inRangeTo(this.pos, C.RANGE_GENERATE_SAFEMODE)) {
11871187
return C.ERR_NOT_IN_RANGE;
11881188
}
11891189

@@ -1201,7 +1201,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
12011201
register.assertTargetObject(target);
12021202
return C.ERR_INVALID_TARGET;
12031203
}
1204-
if(!target.pos.isNearTo(this.pos)) {
1204+
if(!target.pos.inRangeTo(this.pos, C.RANGE_SIGN_CONTROLLER)) {
12051205
return C.ERR_NOT_IN_RANGE;
12061206
}
12071207
if(target.structureType != 'controller') {

‎src/game/power-creeps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
311311
register.assertTargetObject(target);
312312
return C.ERR_INVALID_TARGET;
313313
}
314-
if(!target.pos.isNearTo(this.pos)) {
314+
if(!target.pos.inRangeTo(this.pos, C.RANGE_ENABLE_POWER)) {
315315
return C.ERR_NOT_IN_RANGE;
316316
}
317317
if(target.structureType != 'controller' || target.safeMode && !target.my) {

‎src/game/structures.js

+12-9
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function _transfer(target, resourceType, amount) {
5454
if (data(target.id).energyCapacity && (!amount || utils.calcResources(data(target.id)) + amount > data(target.id).energyCapacity)) {
5555
return C.ERR_FULL;
5656
}
57-
if (!target.pos.isNearTo(this.pos)) {
57+
if (!target.pos.inRangeTo(this.pos, C.RANGE_WITHDRAW)) {
5858
return C.ERR_NOT_IN_RANGE;
5959
}
6060

@@ -93,7 +93,7 @@ function _transferEnergy(target, amount) {
9393
if(data(target.id).energyCapacity && (!amount || utils.calcResources(data(target.id)) + amount > data(target.id).energyCapacity)) {
9494
return C.ERR_FULL;
9595
}
96-
if(!target.pos.isNearTo(this.pos)) {
96+
if(!target.pos.inRangeTo(this.pos, C.RANGE_WITHDRAW)) {
9797
return C.ERR_NOT_IN_RANGE;
9898
}
9999

@@ -421,7 +421,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
421421
if (data(target.id).energyCapacity && (!amount || utils.calcResources(data(target.id)) + amount > data(target.id).energyCapacity)) {
422422
return C.ERR_FULL;
423423
}
424-
if (!target.pos.isNearTo(this.pos)) {
424+
if (!target.pos.inRangeTo(this.pos, C.RANGE_WITHDRAW)) {
425425
return C.ERR_NOT_IN_RANGE;
426426
}
427427

@@ -449,7 +449,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
449449
register.assertTargetObject(lab2);
450450
return C.ERR_INVALID_TARGET;
451451
}
452-
if(this.pos.getRangeTo(lab1) > 2 || this.pos.getRangeTo(lab2) > 2) {
452+
if(this.pos.getRangeTo(lab1) > C.RANGE_RUN_REACTION || this.pos.getRangeTo(lab2) > C.RANGE_RUN_REACTION) {
453453
return C.ERR_NOT_IN_RANGE;
454454
}
455455
var reactionAmount = C.LAB_REACTION_AMOUNT;
@@ -483,7 +483,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
483483
register.assertTargetObject(target);
484484
return C.ERR_INVALID_TARGET;
485485
}
486-
if(!this.pos.isNearTo(target)) {
486+
if(!this.pos.inRangeTo(target, C.RANGE_BOOST_CREEP)) {
487487
return C.ERR_NOT_IN_RANGE;
488488
}
489489
if(data(this.id).energy < C.LAB_BOOST_ENERGY) {
@@ -520,7 +520,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
520520
if(!_.some(target.body, p => !!p.boost)) {
521521
return C.ERR_NOT_FOUND;
522522
}
523-
if(!this.pos.isNearTo(target)) {
523+
if(!this.pos.inRange(target, C.RANGE_UNBOOST_CREEP)) {
524524
return C.ERR_NOT_IN_RANGE;
525525
}
526526

@@ -584,7 +584,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
584584
register.deprecated('`StructureLink.transferEnergy` applied to creeps is considered deprecated and will be ' +
585585
'removed soon. Please use `Creep.withdraw` instead.');
586586

587-
if (!this.pos.isNearTo(target)) {
587+
if (!this.pos.inRangeTo(target, C.RANGE_WITHDRAW)) {
588588
return C.ERR_NOT_IN_RANGE;
589589
}
590590
}
@@ -1316,7 +1316,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
13161316
if(data(target.id).energy == data(target.id).energyCapacity) {
13171317
return C.ERR_FULL;
13181318
}
1319-
if(!target.pos.isNearTo(this.pos)) {
1319+
if(!target.pos.inRangeTo(this.pos, C.RANGE_WITHDRAW)) {
13201320
return C.ERR_NOT_IN_RANGE;
13211321
}
13221322

@@ -1358,6 +1358,9 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
13581358
if(runtimeData.roomObjects[this.id].off) {
13591359
return C.ERR_RCL_NOT_ENOUGH;
13601360
}
1361+
if(!target.my) {
1362+
return C.ERR_NOT_OWNER;
1363+
}
13611364
if(!target.pos.isNearTo(this.pos)) {
13621365
return C.ERR_NOT_IN_RANGE;
13631366
}
@@ -1390,7 +1393,7 @@ exports.make = function(_runtimeData, _intents, _register, _globals) {
13901393
if(!target.my) {
13911394
return C.ERR_NOT_OWNER;
13921395
}
1393-
if(!target.pos.isNearTo(this.pos)) {
1396+
if(!target.pos.inRangeTo(this.pos, C.RANGE_RECYCLE_CREEP)) {
13941397
return C.ERR_NOT_IN_RANGE;
13951398
}
13961399

0 commit comments

Comments
 (0)