Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Shrieking hat #586

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Shrieking hat #586

wants to merge 8 commits into from

Commits on Nov 25, 2020

  1. Shrieking Hat

    @wang429
    wang429 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    da4c134 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/dbjorge/jorbs-spire-mod i… 

    …nto shrieking-hat

# Conflicts:
#	CHANGELOG.md
    @wang429
    wang429 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    38f80a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2020

  1. Merge branch 'master' of https://github.com/dbjorge/jorbs-spire-mod i… 

    …nto shrieking-hat
    @wang429
    wang429 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    9264eeb View commit details
    Browse the repository at this point in the history

  2. Instead of overriding AbstractCard::shuffle, search the master deck f… 

    …or death prevention cards then add them to the sorted set.
    @wang429
    wang429 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    f3b03af View commit details
    Browse the repository at this point in the history

  3. moving a comment.

    @wang429
    wang429 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    8ce9de3 View commit details
    Browse the repository at this point in the history

  4. address case where player picked up shrieking hat then old book, then… 

    … dies without shrieking hat in hand. Old book should trigger in that case.
    @wang429
    wang429 committed Dec 6, 2020
    Configuration menu
    Copy the full SHA
    4056b07 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2020

  1. Mark Old Book as a healing card, preventing it from being found mid-c… 

    …ombat (pots, discovery, nilry's, etc).
    @wang429
    wang429 committed Dec 13, 2020
    Configuration menu
    Copy the full SHA
    21778f0 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. OldBook::use does the entomb action and then exhuasts if somehow played

    @wang429
    wang429 committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    7e2c8ac View commit details
    Browse the repository at this point in the history