Gavin-L #29
Merged
Gavin-L #29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e map as well as transactions. The player and merchant instances are now accessable during a tansaction and the transaction is able to be fully completed. Tested with next day cycle and it works as expected. Planning to further polish the game this upcoming weak and finish the Start menu.
checks to make sure the instance it is colliding with is of the type "model.Merchant". If it is of a different type, it will stop movement, but not give the option for a transaction. This will allow us to add objects such as trees, houses, etc. to our Map.
Added method isMerchantNearby() in PlayerSprite so the code would be easier to read.
gal11002
added a commit
that referenced
this pull request
Apr 23, 2015
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.