This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Merge fte into develop #3290
Merged
Merge fte into develop #3290
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
Merge develop into fte
* FtE: Hantei Sotorii * Changed to AbilityDsl
* FtE: Shiba Sophist * Fixed multiple elements
* FtE: Shinjo Kyora * add SwitchConflictElement action * Update KuroiMori.js * Update to SwitchConflictElement action
* Add implementation and tests for Fifth Tower Watch * Trailing comma * Fix and test for Fifth Tower Watch to trigger with opponent's WotC
* Added A Perfect cut + Tests * Fixed linting errors * incorporated review feedback
Merge develop into fte
* wrote the class and one test ; * add more tests * change to multiple game action * fixed bug for discardStatusToken not have the correct target * made changes to the message created to by the delay effect and tested it * fixed linting error * changed the message and effect to display the correct message
* FtE - Toshi Ranbo * test fix * Fix for Kitsuki Yaruma not targeting provinces * Add tests for Toshi Ranbo * Add startsGameFaceup support for provinces * Add additional chat message for GainExtraFateWhenPlayed effects
Merge develop into fte
* implemented Hiruma Signaller * implemented suggestions
* Implemented Scene of the Crime * Implemented suggestion
* first version of the card with a test * ttying to debug the card * fixed test so the card can trigger and added more tests * Update FalseLoyalties.js * Update FalseLoyalties.js
* Zentaro and TakeControlAction * Add changePlayer to MoveCardAction - Fix ModifyBidAction bug * Implement PlayDisguisedCharacterAction * Lint fixes * Add discard character to disguised Also adds support for uncancellable game actions * Bugfix for Zentaro and add effect to TakeControl * Add tests for Akodo Zentaro's ability (Disguised keyword untested) * Partial fix for Zentaro * Further Zentaro tests and fixes * Fix for IronMine to use game actions * Change Iron Mine to use game action * Fix remaining test fails * lint fix * Change Zentaro to not use TakeControl * use new isInProvince method * Add isInPlay, tidy up and removed unneeded test
Merge develop into fte
* Added tests for Above Question, Adept of Shadows and Adept of the Waves * Introduced AbilityDsl to Above Question, Adept of Shadows and Adept of the Waves * Added Tests for Admit Defeat, Against the Waves, Aggressive Moto, Akodo Gunso and Akodo Toturi * Introduced AbilityDsl to Admit Defeat, Agasha Swordsmith, Against the Waves, Aggressive Moto, Akodo Gunso and Akodo Toturi * Added tests for Asahina Artisan, Asako Diplomat, Ascetic Visionary and Assassination * Introduced AbilityDsl to Ambush, Ancestral Lands, Artisan Academy, Asahina Artisan, Asahina Storyteller, Asako Diplomat, Ascetic Visionary and Assassination * Added Tests for Bayushi Yunako, Blackmail Artist, Borderlands Defender, Borderlands Fortifications, Border Rider, Born in War and Brash Samurai * Introduced AbilityDsl for Bayushi Manipulator, Bayushi Shoju, Bayushi Yunako, Blackmail, Blackmail Artist, Borderlands Defender, Border Rider, Born in War and Brash Samurai * Added Tests and AbilitiyDsl to Breakthrough * Added Tests for Captive Audience, Contingency Plan and Court Mask * Introduced AbilityDsl to a lot of cards * Added failing test for Borderlands Fortification * Revert "Added failing test for Borderlands Fortification" This reverts commit 7510132. * Revert "Revert "Added failing test for Borderlands Fortification"" This reverts commit aef6db1. * Added chatLog test to contingency plan * Revert "Revert "Revert "Added failing test for Borderlands Fortification""" This reverts commit 42c18cf. * Fixed small bug in ModifyBidAction.ts
Merge develop into fte
* Add playIntoConflictOnly functionality to PlayCharacterAction * Add implementation and tests for Gateway to Meido * Adjust to work with disguised keyword
* Fix Toshi Ranbo to work with disguised keyword * Add tests for Doomed Shugenja and disguised with TR * Fix disguised to work with extra fate
* Add new PersonalHonorStatus enum * Add implementation and tests for Shameless Gossip * Removed PersonalHonorStatus
* BoB - Festival of the Departed (#3188) * BoB - Festival of the Departed * Festival of the Departed updates * Add tests and fixes for Festival of the Departed * Add CannotHaveSkillsReduced effect * Add implementation and tests for Give No Ground * Fix typo * Add StatModifier and refactor to use CannotHaveSkillsModified * Check CannotHaveSkillsModified in LastingEffectCardAction * Add SuppressEffects effect Adjust Give No Ground and Festival of the Departed to use new SuppressEffects effect. Adjust attachment bonuses and honor status tokens to now use effects to modify skill. * Do not alter honor status modifiers if they have no amount * Add getRawEffects() function * Tidy up * Test for Festival to work with base modifiers * Refactor base skill calculation for base skill switching Add new effect switchBaseSkill * Use isNaN instead of Number.isNaN * Rename setDash to setBaseDash and reuse setDash * Remove countsAsBase from statmodifiers * Add additional Yunako test * Remove unneeded bits and typo * Remove checkEffects and fix tests
* Add additional cost effect * FtE - Command Respect * lint fix * Update CommandRespect.js
* wip * implementation Greater Understanding * Created specific attachment on ring action. Need to find a better way to identify attachment that attach to a ring. * Complete ring selection and attachment adding to ring in gamestate * fiveringsdb-data * add attachments to be retrieved * Pass controller to client on drawcard.js Start designing front end for Ring Attachments * render attachments on rings in center (layout not finished) added less file to start css work for ring attachments * - Added css to show attachments for rings stacked under the same ring. - Updated actions on Greater Understanding * Clean up and tag attachments on rings as selectable * finish rendering of ring attachment for opponent, more css. * - fix message when attaching Greater Understanding - fix ring attachments to be targetable by attachment removal * - Rework identifying what attachment need to be attached to a ring * - fix alterations in code during testing that should have been removed * Fix code styles * More code styling fixes * final code style fixes? * - Added tests for Greater Understanding - Reworked targetting conditions for some on-character-specific attachment removal - Added fallback for isParticipating() on gameObject to have a fallback for people using parent.isParticipating() when this can be a ring now * Fix code styling * add submodules update
* Add OnSpendFate event for pay fate costs * Add implementation and tests for Sententious Poet * Change to a more robust spentFate solution * Add onCostsPaid event * Fix fate cost dumb mistakes * Change Sententious Poet to use onSpendFate and onMoveFate * Fix lint and enable/adjust tests * Tidy up
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.
To sort conflicts before final merge