This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Merge develop into acf #3642
Merged
Merge develop into acf #3642
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
Bugfix for limited cards
Regal Bearing doesn't evaluate bid after being set to 1 correctly
…onditions (#3598) * change attachment limitations and blanking * Update effects.js * Rework cards with attachment limit * Add support for trait limits * Update drawcard.js * Update Adopted Kin test and bug fix * Remove fit :$ * Implement Attachmonks as lasting effects * Add canChangeZoneOnce support to lasting effects * Change cost reducers to have a cardType property
…rdsDiscardedFromHand (#3624) * Add amount property to onCardsDiscardedFromHand event fired by ChosenDiscardAction The amount property was previously only available from a RandomDiscardAction, which made checking for it unreliable. * Add discardedAtRandom property to onCardsDiscardedFromHand event There is currently no clean way to determine if a discard was random, which could be relevant in the future.
* Make playType a property of context * Ensure PlayCardAction always sets a playType * Update PlayCardAction.ts
* Track cards played during a conflict on the conflict object * Update conflict.js * Update abilityresolver.js * Update abilityresolver.js * Update abilityresolver.js
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.