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

Pack Attack zone #73

Merged
merged 14 commits into from
Jan 10, 2024
Merged

Pack Attack zone #73

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
28af91a
Packmaster zone: add core zone functionality
modargo Jan 9, 2024
ef16af0
Packmaster zone: add Pack Shrine event
modargo Jan 9, 2024
720c1ba
Packmaster zone: add Black Market Two event
modargo Jan 9, 2024
36eccbf
Pack Attack zone: rename zone from Packmaster to Pack Attack
modargo Jan 9, 2024
efcb74b
Pack Attack zone: give the zone more width variation
modargo Jan 9, 2024
5aff6d6
Pack Attack zone: reduce second option HP loss
modargo Jan 10, 2024
655ba76
Pack Attack zone: add an explicit safeguard against using the zone's …
modargo Jan 10, 2024
57030c3
Pack Attack zone: apply the normal upgrade logic to cards in rewards …
modargo Jan 10, 2024
212ab9d
Pack Attack zone: add a makeCopy when retrieving relic
modargo Jan 10, 2024
5b47f44
Pack Attack zone: fix card not being added to your deck after picking it
modargo Jan 10, 2024
3fa5ebe
Pack Attack zone: text tweaks for Black Market Two event
modargo Jan 10, 2024
b7632d4
Pack Attack zone: call out special events in zone description
modargo Jan 10, 2024
d123278
Pack Attack zone: clean up error cases and handle them in a more forg…
modargo Jan 10, 2024
c665cac
Pack Attack zone: fix a typo
modargo Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pack Attack zone: fix card not being added to your deck after picking it
  • Loading branch information
@modargo
modargo committed Jan 10, 2024
commit 5b47f44637995fd96a3e02ccdc22fba97615b4df
1 change: 1 addition & 0 deletions src/main/java/spireMapOverhaul/zones/packattack/events/PackShrine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ protected void buttonEffect(int buttonPressed) {
this.screenNum = 1;
this.imageEventText.updateDialogOption(0, OPTIONS[2]);
this.imageEventText.clearRemainingOptions();
this.pickCard = true;
this.getCardsAndOpenSelectScreen();
break;
case 1: // Offer
Expand Down