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.

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

[FEATURE] (Content) - Wave 8 mini expansions #526

Closed
wants to merge 34 commits into from

Conversation

deusabianca
Copy link
Contributor

@deusabianca deusabianca commented Dec 2, 2024

This consists of The Caverns, The Abyss, Tales of Old Gravehold and promos

src/aer-data/src/ENG/theCaverns/cards.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/cards.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/cards.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/cards.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/cards.ts Outdated Show resolved Hide resolved
Torgen's suggestions. Also, changing 'elementaltoken' to 'elemental token'.
@deusabianca
Copy link
Contributor Author

Thanks @Torgen - FYI I also changed 'elementaltoken' to 'elemental token'

@deusabianca deusabianca changed the title Wave 8 - The Caverns [CONTENT] Wave 8 - The Caverns Dec 3, 2024
@Torgen
Copy link
Contributor

Torgen commented Dec 3, 2024

FYI, am pretty close to having the Descent data entered, including friends and foes. Will probably make that a single PR, then a separate one for the code changes to make the friends and foes selectable in settings and allow picking them at random.

@deusabianca
Copy link
Contributor Author

FYI, am pretty close to having the Descent data entered, including friends and foes.

Awesome ty @Torgen. I can work on the promos and The Abyss, though you could add the friends and foes from The Caverns and The Abyss?

@Torgen
Copy link
Contributor

Torgen commented Dec 3, 2024

Option 1 is if my PR gets merged first, you rebase so you can see the type changes that add friends and foes, then I do a PR into your branch to add them. Option 2 is you clone this PR into one against my branch and we end up with one big PR.

@deusabianca deusabianca marked this pull request as draft December 3, 2024 21:10
@deusabianca deusabianca changed the title [CONTENT] Wave 8 - The Caverns [FEATURE] (Content) - Wave 8 mini expansions Dec 3, 2024
@deusabianca
Copy link
Contributor Author

All content from the minis aside from friends and foes and banners should be in this PR now.

@Torgen option 1 sounds good

@Torgen
Copy link
Contributor

Torgen commented Dec 4, 2024

There are no friends, foes, or banners in TOG, right? We didn't get that one.

@deusabianca
Copy link
Contributor Author

TOG only has 2 supply cards and a mage

src/aer-data/src/ENG/theCaverns/foes.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/friends.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/friends.ts Outdated Show resolved Hide resolved
src/aer-data/src/ENG/theCaverns/banners.ts Outdated Show resolved Hide resolved
@deusabianca deusabianca marked this pull request as ready for review December 4, 2024 21:00
@on3iro
Copy link
Owner

on3iro commented Dec 6, 2024

Hey @deusabianca is this ready for a final review and merge?

@deusabianca
Copy link
Contributor Author

@on3iro Yes should be good to go!

on3iro
on3iro previously approved these changes Dec 7, 2024
@on3iro
Copy link
Owner

on3iro commented Dec 7, 2024

@deusabianca thanks for the PR. Could you please do the following:

  1. Squash all commits into a single one
  2. Make sure to rebase the the current main branch into your branch and resolve all conflicts
  3. Force push onto this branch again, to update the pr$

(I would've done this myself, however it seems you are probably using windows and your line endings are not configured properly. I tried to fix this quickly on my local machine, but didn't quite get it right and I am really short on time right now. I thought our .gitattributes file should've handled this already, but it seems that it's not yet configured properly....)

@deusabianca
Copy link
Contributor Author

I am still very much a noob with Github so the best way I found to do that I made a new pull request. I hope that's fine and we can close this one.

@on3iro
Copy link
Owner

on3iro commented Dec 8, 2024

Sure no - problem :) thanks @deusabianca

@on3iro on3iro closed this Dec 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants