Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce harvesting logic and first steps to State Machine #147

Merged
merged 18 commits into from
May 2, 2017
Merged

Introduce harvesting logic and first steps to State Machine #147

merged 18 commits into from
May 2, 2017

Commits on Oct 17, 2016

  1. When harvester is on spice[hill] then start harvesting animation and … 

    …deduct spice value from terrain
    @stefanhendriks
    stefanhendriks committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    682bf6c View commit details
    Browse the repository at this point in the history

  2. harvester unit determined by entityData (which is still hard coded by… 

    … ID) + when selecting one or multiple harvesters then show 'attack' image on harvestable cells
    @stefanhendriks
    stefanhendriks committed Oct 17, 2016
    Configuration menu
    Copy the full SHA
    d9afb14 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2016

  1. "if" is not needed

    @stefanhendriks
    stefanhendriks committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    b4104af View commit details
    Browse the repository at this point in the history

  2. remove unneeded code

    @stefanhendriks
    stefanhendriks committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    dde73c7 View commit details
    Browse the repository at this point in the history

  3. Introduce F(inite) S(tate) M(achine), now for idle, dying, dead state… 

    …s. In preparation for harvesting logic later.
    @stefanhendriks
    stefanhendriks committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    f217406 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Introduce and use harvesting state machine logic

    @stefanhendriks
    stefanhendriks committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    afa8351 View commit details
    Browse the repository at this point in the history

  2. hitpoints never go below zero

    @stefanhendriks
    stefanhendriks committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    5b1690f View commit details
    Browse the repository at this point in the history

  3. is destroyed with zero hitpoints

    @stefanhendriks
    stefanhendriks committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    8035827 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2016

  1. Merge branch 'master' into harvester/harvesting-logic

    @stefanhendriks
    stefanhendriks committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    9ebfaaa View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2016

  1. use state objects for moving units around

    @stefanhendriks
    stefanhendriks committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    0629780 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2016

  1. Merge branch 'master' into harvester/harvesting-logic

    @stefanhendriks
    stefanhendriks committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    b30d99d View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2017

  1. Merge branch 'master' into harvester/harvesting-logic

    @stefanhendriks
    stefanhendriks committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    a154dc4 View commit details
    Browse the repository at this point in the history

  2. Fix bug, whenever a unit was moving, and ordered to move to a differe… 

    …nt vector, then do not block on self-claimed vectors.

- add tests for UnitMoveIntents to secure this behavior
- add an idle behavior/state
    @stefanhendriks
    stefanhendriks committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    85d34bd View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. fix the .gitignore, so that only root dir of ‘graphics’ is ignored

    @stefanhendriks
    stefanhendriks committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    b40f513 View commit details
    Browse the repository at this point in the history

  2. When unit is ordered mid-way, make sure it completes its movement to the 

    current cell and then re-evaluates where to go
    @stefanhendriks
    stefanhendriks committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    5adc4c9 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. Fail tests when debug mode is on

    @stefanhendriks
    stefanhendriks committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    e9e9a5f View commit details
    Browse the repository at this point in the history

  2. Unit should only harvest when it is a harvester... 

    ... or capable of harvesting
    @stefanhendriks
    stefanhendriks committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    7734671 View commit details
    Browse the repository at this point in the history

  3. Move around some terrain class (and its test) so we can add a dummy 

    harvestable terrain
    @stefanhendriks
    stefanhendriks committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    c633703 View commit details
    Browse the repository at this point in the history