Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

merge dev into dor #3695

Merged
merged 39 commits into from
Nov 19, 2019
Merged

merge dev into dor #3695

merged 39 commits into from
Nov 19, 2019

Conversation

The-Outcast
Copy link
Collaborator

No description provided.

The-Outcast and others added 30 commits October 1, 2019 02:26
- Write Kyuden ikoma implementation
- Write tests for Kyüden Ikoma
* TEL - Kyüden Ikoma

- Implement Kyüden Ikoma
- Write tests for Kyüden Ikoma

* Rename a test

* Fix naming and missing semi
* wrote the card class based on guardin of virtue

* wrote three tests to cover gohei ability
- Implement Ashigaru Levy
- Tests for Ashigaru Levy
* TEL - Kenson no Gakka

- Implement Kenson no Gakka
- Tests for Kenson no Gakka

* Fix code styling
* TEL - Matsu Tsuko

- Implement Matsu Tsuko
- Tests for Matsu Tsuko

* Update Tsuko2 definition

- Correctly implement more honorable condition.
* Implement Champions of Yomi

* Add tests for Champions of Yomi

* Assert that stronghold is bowed after triggering Champions of Yomi
* Implement Insolent Outcast

* Add tests for Insolent Outcast
* TEL - Yasuki Hikaru

- Implement Yasuki Hikaru
- Tests for Yasuki Hikaru

* isParticipating is redundant with isDefending
* TEL - Kitsu Motso

- Implement Kitsu Motso
- Tests for Kitsu Motso

* Update spec with semicolons

* Fix review remarks:
- remove redundant isDuringConflict
- remove activePromptitle

* Fix tests

* Update KitsuMotso.js
* TEL - Ardent Omoidasu
- Implement Ardent Omoidasu

* Fix tests name

* Fix code styling

* Rework checking for opponents card/ring effect
* TEL - Prepare for War

- w.i.p. implementation Prepare for War

* Update Prepare for War

Made sure the option to discard the statustoken is presented.

* TEL - Prepare for War

- Finish implementation
- Write tests

* Fix code styling

* Bug fixes for multiple actions & discard token

* Use discardFromPlay
* Implement Moto Ariq

* Add tests for Moto Ariq

* Remove unnecessary condition check from Moto Ariq
* Kitsuki Kagi implementation and tests.

* Reverted change in RemoveFromGameAction.ts

* Updated Kagi to use move(removed from game) instead of removeFromGame()
* TEL - Tacitical Ingenuity

- Implement Tactical Ingenuity
- Tests for Tactical Ingenuity

* Fix code style

* - Add attachment conditions

* Fix trailing spaces
* TEL - Doji Kuzunobu

* Update restriction.js
* TEL - Hall of Victories

w.i.p. implementation

* Finish Hall of Victories Implementation and tests
* TEL - Embrace Death

- Implement Embrace Death
- Tests for Embrace Death

* Fix floating comma

* use gameactions instead of handlers

* Fix tests according to order of new gameaction usage

* remove unused var

* Rework ability and tests

* Remove trailing spaces

* Fix comma dangle
* Isawa Tsuke

- card implementation
- tests

* Fix review remarks
* TEL - Honor in Battle

- Implement Honor in Battle
- Tests for Honor in Battle

* Remove unused imports

* Refactor according to review remarks

* fix trailing space

* Fix indentation

* Update tests
* TEL - Voice of the Ancestors

* Test & fixes
* Initial Draft SetBaseGlory and Shosuro Denmaru

* Update drawcard.js

* Fix lint errors
jeremylarner and others added 9 commits November 6, 2019 15:53
TEL - Right Hand of the Emperor
* TEL - Kitsu Motso

- Work in progress

* Trying to get provinces passed as attachable cards.

* Add attachment conditions

* Total Warfare happy path

* Total Warfare testing

Also trying to get flipping and discarding of attachments to work.

* Remove references to attachToProvinceAction

* Don't discard attachments on flip

* Fix tests and attaching to province

* Go back to checking cardtype for province to attach to

* Fix code style breaches

* Fix lint errors

* apply attachment limit and more tests

* add trait limits to attachment conditions

* add test for VoH double-attachment crash

* Added test to verify detachment of second attached Watch Commander (#4)

* Remove lasting effects in leavePlayEventHandler

Done as a test to see if this fixes the issue around turning dynasty characters into attachments (VotA)

* Update game engine to check for illegal attachments on provinces (#5)

* Cards in discard piles use printed type to determine location legality.

* Fix: Allow provinces to check for and remove illegal attachments.
Fix: when discarding cards, fallback to type if printedType doesn't exist.
Minor test cleanup

* Corrected log message. It not English so good.

* Also render stronghold province attachments and don't reveal facedown name

* Rework traitlimit definition

* - Move attachment functionality to Basecard

* Fix linting errors
# Conflicts:
#	server/game/drawcard.js
Merge The Emperor's Legion Lion Clan Pack
@The-Outcast The-Outcast merged commit ac3133a into dor Nov 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants