Skip to content

Spawn cancel (branched from spawn directions) - #68

Closed
sparr wants to merge 5 commits into
screeps:ptrfrom
sparr:spawn-cancel
Closed

sparr wants to merge 5 commits into
screeps:ptrfrom
sparr:spawn-cancel

Conversation

@sparr

@sparr sparr commented Oct 31, 2017

Copy link
Copy Markdown
Contributor

Closes #64

This PR is a branch from #61 because they share some functionality. I could rebase this from master if there's a chance of this going in before #61 does.

@sparr

sparr commented Oct 31, 2017

Copy link
Copy Markdown
Contributor Author

Also, crazy idea: canceling a spawn at 40% results in a creep popping out that has the last/inner 40% of its body parts. I could implement that here.

@TheRealMaxion

Copy link
Copy Markdown

I hope that idea does not become reality, but amusing to think about.

@artch

artch commented Jan 1, 2018

Copy link
Copy Markdown
Contributor

Please rebase this to the ptr branch. It will be included in the next PTR patch.

@sparr
sparr changed the base branch from master to ptr January 3, 2018 18:18
@artch

artch commented Jan 7, 2018

Copy link
Copy Markdown
Contributor

Actually, I just realized that this PR should have ptr base branch, but the branch should be rebased onto #61, otherwise we'll have merge conflicts because of the commits with the same contents but different commit hashes.

@sparr

sparr commented Jan 7, 2018

Copy link
Copy Markdown
Contributor Author

done

artch added a commit that referenced this pull request Feb 9, 2018
Squashed commit of the following:

commit 48aa1bb1ec54a0211d5d6e083f44467eb4a7d0c1
Merge: 072b738 cdd2f45
Author: Artem Chivchalov <chivchalov@gmail.com>
Date:   Fri Feb 9 12:15:05 2018 +0300

    Merge branch 'spawn-cancel' of https://github.com/sparr/screeps-engine into sparr-spawn-cancel

    # Conflicts:
    #	src/game/structures.js
    #	src/processor/intents/spawns/_born-creep.js
    #	src/processor/intents/spawns/intents.js
    #	src/utils.js

commit cdd2f45
Author: Clarence "Sparr" Risher <sparr0@gmail.com>
Date:   Tue Oct 31 14:13:57 2017 -0700

    Spawn.spawning.cancel()

commit 73f906f
Author: Clarence "Sparr" Risher <sparr0@gmail.com>
Date:   Mon Oct 23 22:13:24 2017 -0700

    move StructureSpawn.setSpawnDirections to StructureSpawn.Spawning.setDirections

commit d4e02ac
Author: Clarence "Sparr" Risher <sparr0@gmail.com>
Date:   Tue Oct 17 19:18:34 2017 -0700

    honor spawnDirections when spawning creep

commit 38b551d
Author: Clarence "Sparr" Risher <sparr0@gmail.com>
Date:   Tue Oct 17 19:17:47 2017 -0700

    implement Spawn.spawnCreep(...,{spawnDirections:[]})

commit 82385fa
Author: Clarence "Sparr" Risher <sparr0@gmail.com>
Date:   Tue Oct 17 15:49:00 2017 -0700

    implement StructureSpawn.setSpawnDirections
@artch

artch commented Feb 9, 2018

Copy link
Copy Markdown
Contributor

Merged in 8eee58c.

@artch artch closed this Feb 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants