SKoutpost directive and overload: improvements and fixes #134

zGeneral · 2019-05-18T01:42:32Z

Pull request summary

Edit: verified and checked again on 14/June, waiting for PR review.

(all tested and working properly now)!

SKOuptpost container construction sites for minerals are now pushed to colony worker build list.
similarly,
SKOuptpost containers with hits < 50% are now maintained by workers (previously, harvesters maintain their own containers, but mineral drones have their container unrepaired and decay to destruction)

When there is no container:
drones extracting minerals assume containers already exist to transfer mineral in.
when there is no container (mainly in SK rooms due to container build delay) the drones stay idle and die of age.
this PR makes them travel back to colony for to drop it off as a temp alternative option until the container is built.

this should also fix issue #120, miners spawn in own room without having terminal/storage

sourceReapers now do not spawn in center SK room

Description:

Added:

None

Changed:

None

Removed:

None

Fixed:

issue #120

None

Testing checklist:

Changes are backward-compatible OR version migration code is included
Codebase compiles with current tsconfig configuration
Tested changes on {choose PUBLIC/PRIVATE} server OR changes are trivial (e.g. typos)

… it instead of staying idle

… terminal

bencbartlett

see comments -- there are some good changes in here but also some things I'm confused about

bencbartlett · 2019-06-14T18:36:25Z

package.json

@@ -31,14 +31,15 @@
    "rollup-plugin-node-resolve": "3.3.0",
    "rollup-plugin-progress": "^0.4.0",
    "rollup-plugin-screeps": "0.1.2",
-    "rollup-plugin-typescript2": "0.16.1",
+    "rollup-plugin-typescript2": "^0.21.1",


I'm hesitant to make changes to dependencies, as it can break the checksum generation process. Is there a reason you are updating the rollup plugin?

fixed, check latest PR

bencbartlett · 2019-06-14T18:39:07Z

src/directives/colony/outpostSK.ts


 	constructor(flag: Flag) {
 		super(flag, colony => colony.level >= 7);
 	}
+
+	isCenterRoom(): boolean {


this is unnecessary; use something like const isCenterRoom = Cartographer.roomType(this.pos.roomName) == ROOMTYPE_CORE

done, check latest PR

bencbartlett · 2019-06-14T18:40:04Z

src/directives/colony/outpostSK.ts


 	spawnMoarOverlords() {
-		this.overlords.sourceReaper = new SourceReaperOverlord(this);
+		if(this.memory.isCenterRoom == undefined){
+			this.memory.isCenterRoom = this.isCenterRoom();


don't store isCenterRoom in memory. it's inexpensive to calculate and can be stuck directly in the DirectiveSKOutpost constructor

done, it is now checked in constructor.
existing Overmind users that already have the directive flag in place will not benefit from this, would you suggest to add it under init() too?

bencbartlett · 2019-06-14T18:40:59Z

src/directives/colony/outpostSK.ts

+		if(Game.time % 150 == 0){
+			const containerNeedRepair = this.getContainersToRepair();
+			if (containerNeedRepair && !this.colony.overlords.work.repairStructures.includes(containerNeedRepair)) {
+				this.colony.overlords.work.repairStructures.push(containerNeedRepair);


sk miners already build and repair their own containers -- why do you want to offload this to the colony workers?

drones that harvest minerals do not repair their containers like the drones harvesting energy.
I have noticed in replays, that mineral containers always decays out without repair.

this changes does not have a filter for mineral container only, the worker will repair all containers in SKroom below 50%, which will most probably apply to mineral container being below the threshold

bencbartlett · 2019-06-14T18:41:55Z

src/directives/resource/extract.ts

@@ -36,7 +36,10 @@ export class DirectiveExtract extends Directive {
 		} else {
 			priority = OverlordPriority.remoteSKRoom.mineral;
 		}
-		this.overlords.extract = new ExtractorOverlord(this, priority);
+		//Fix: Only spawn drones if there is a terminal or storage
+		if (!!this.colony.terminal || !!this.colony.storage){


bencbartlett · 2019-06-14T18:42:47Z

src/overlords/mining/extractor.ts

@@ -105,6 +105,16 @@ export class ExtractorOverlord extends Overlord {
 	}

 	private handleDrone(drone: Zerg): void {
+		//fix: if there is no container, then transfer the minerals yourself!
+		if(!this.container && _.sum(drone.carry) == drone.carryCapacity ){


we probably just shouldn't spawn any extractors unless there is a container

good idea,
what about changing the amount to zero in wishlist if there is no container, something like this:
const amount = this.mineral && this.mineral.mineralAmount > 0 && this.container ? this.mineral.pos.availableNeighbors().length : 0;

bencbartlett · 2019-06-14T18:43:30Z

src/overlords/mining/sourceKeeperReeper.ts

@@ -95,7 +95,7 @@ export class SourceReaperOverlord extends CombatOverlord {
 				reaper.healSelfIfPossible();
 			}
 			// Kite around ranged invaders until a defender arrives
-			if (this.room.invaders.length > 2 && _.filter(this.defenders, def => def.room == this.room).length == 0) {
+			if (this.pos.findInRange(this.room.invaders,10).length > 2 && _.filter(this.defenders, def => def.room == this.room).length == 0) {


why this change?

will revert this one back.

hasoon hasoon added 9 commits May 18, 2019 04:01

fix handleDrone, if there is no container, then miner should transfer…

fa85104

… it instead of staying idle

fix handleDrone, if there is no container, then miner should transfer…

1725754

… it instead of staying idle

check for max carry capacity

458220b

pushed container constuction site to workers

0419b12

pushed container constuction site to workers

d98ceda

drone transferAll instead of transfer, target changed from storage to…

5064107

… terminal

drone transferAll instead of transfer, target changed from storage to…

2235352

… terminal

drone transferAll instead of transfer, target changed from storage to…

92fcb30

… terminal

Game.rooms[this.pos.roomName];

0d8ab06

zGeneral changed the title ~~Fix handleDrone~~ Fix SKOutpost building container@mineral site and handleDrone May 18, 2019

added containers to worker repair list in SK room

5c1ee27

zGeneral changed the title ~~Fix SKOutpost building container@mineral site and handleDrone~~ Fix SKOutpost building/repair container@mineral site and handleDrone May 19, 2019

zGeneral changed the title ~~Fix SKOutpost building/repair container@mineral site and handleDrone~~ Fix SKOutpost building/repair container@mineral site and handleDrone adjustment May 19, 2019

only spawn miner in own room when there is a terminal/strorage

ae83f31

zGeneral mentioned this pull request May 22, 2019

Bug: Drones mine minerals without storage/terminal (after room wipe) #120

Open

hasoon hasoon added 3 commits June 7, 2019 07:57

SKroom directive cleanup

863fd3f

safe SK room = no reaper

2371f0e

centerRoom in memory now

e72592d

zGeneral changed the title ~~Fix SKOutpost building/repair container@mineral site and handleDrone adjustment~~ SKoutpost directive and overload: improvements and fixes Jun 8, 2019

hasoon hasoon added 3 commits June 8, 2019 07:40

reaper invaders in range of 10 > 2)

709231c

CPU optimization

b28e28e

package.json!

7cd05ee

bencbartlett requested changes Jun 14, 2019

View reviewed changes

hasoon hasoon added 7 commits June 15, 2019 00:54

lint comment fix

ba13e30

uninstall lint

6821128

uninstall lint

fab0e98

uninstall lint

507a351

Merge branch 'master' into fixHandleDrone

e059b48

limit SKroom drones to 1

f55d19f

transfer home if no container

11604c9

hasoon hasoon added 11 commits June 20, 2019 01:35

transfer home if no container

4a35d8d

done build and repair containers now

0a9ae07

only repair when mineral > 0

c34a87b

do not spawn harvester/miners under heavy invasion

6989120

fix

a928988

adjust reaper amount

9bb8fb9

fixed major introcuded bug

6d6b4a5

drone pick up energy from tombstomes

54645a4

drone pick up energy from tombstomes

4a5e2b6

drone pick up energy from tombstomes

e432131

remove drone pick up energy from tombstomes

edff4be

zGeneral closed this Jan 10, 2021

zGeneral deleted the fixHandleDrone branch January 10, 2021 17:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SKoutpost directive and overload: improvements and fixes #134

SKoutpost directive and overload: improvements and fixes #134

zGeneral commented May 18, 2019 •

edited

Loading

bencbartlett left a comment

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

zGeneral Jun 14, 2019

bencbartlett Jun 14, 2019

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

bencbartlett Jun 14, 2019

zGeneral Jun 14, 2019

SKoutpost directive and overload: improvements and fixes #134

SKoutpost directive and overload: improvements and fixes #134

Conversation

zGeneral commented May 18, 2019 • edited Loading

Pull request summary

Description:

Added:

Changed:

Removed:

Fixed:

Testing checklist:

bencbartlett left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zGeneral commented May 18, 2019 •

edited

Loading