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.

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

Implemented player phase modal, as well as some bug fixes #81

Merged
merged 12 commits into from Jan 11, 2015

Conversation

Projects
None yet
2 participants
@DrkSephy
Copy link
Collaborator

DrkSephy commented Jan 11, 2015

This pull request fixes issue #79 . Clicking on an enemy during the player's turn will not perma-lock the menu. This pull request also contains work in progress code towards implementing player/enemy turn modals (commented out).

UPDATE: This pull request also fixes issue #80, player units can no longer stack on each other.

UPDATE 2: This pull request now implements displaying the player phase modal (enemy phase modal still needs to be hooked). Here are the new changes:

  • The player is locked from moving any units until the player phase modal has finished displaying (currently set to display for one second).
  • The active unit's movement display is also disabled until the player phase modal has finished displaying.
  • Every time the player begins a new turn, the player phase modal will display.

This feature gives some clear separation to the gameplay, and helps the player intuitively know when they can and cannot move their units. I am currently working on displaying the enemy phase modal as well, but this code can be folded in at your own discretion and I can send a separate pull request if needed when that feature is complete.

UPDATE 3: This pull request now implements the enemy phase modal too, but it currently does not display for the proper time. The enemies will not move until the modal is done being displayed (as expected), but the modal does not appear for the time set. Perhaps @chessmasterhong could look into this before merging?

@DrkSephy DrkSephy changed the title Fixing issue #79 Implemented player phase modal, as well as some bug fixes Jan 11, 2015

chessmasterhong added a commit that referenced this pull request Jan 11, 2015

Merge pull request #81 from DrkSephy/dev
Implemented player phase modal, as well as some bug fixes

@chessmasterhong chessmasterhong merged commit b9026b3 into chessmasterhong:dev Jan 11, 2015

@chessmasterhong

This comment has been minimized.

Copy link
Owner

chessmasterhong commented Jan 11, 2015

I think the content in this pull request is sufficient and stable enough for a merge. I will look into the enemy phase modal display time issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment