search

tadeaustria / EverdellScore

Serverless JS App for counting Everdell Score
https://tadeaustria.github.io/EverdellScore/
GNU General Public License v3.0
2 stars 3 forks source link

[PoC] [WiP] Find cards by base card #46

Closed Dajakk closed 5 months ago

Dajakk commented 5 months ago

Legendary cards and farms through the seasons cards should behave as their basic counterparts for most of the effects

tadeaustria commented 5 months ago

I cleaned up the old function, but I think this is good

tadeaustria commented 5 months ago

OK, I have to revert my statement. The old function is still needed for the wife points. Maybe we can get rid of it, with #45

Dajakk commented 5 months ago

The old function is still needed for the wife points. Maybe we can get rid of it, with #45

I had a feeling it might not be as simple as replacing one with the other for now, but had no computing power to analyze each place. Step by step ;]

Dajakk commented 5 months ago

@tadeaustria Please avoid force pushes. Now I have conflicts when trying to pull your changes

tadeaustria commented 5 months ago

@tadeaustria Please avoid force pushes. Now I have conflicts when trying to pull your changes

Sorry, but that I cannot guarantee. In the end I wanted to have one nice clean commit, for this issue. But I agree in this case the cleanup could have been postponed. To get to the latest branch use simply git fetch + git reset --hard {remote}/{branch} to avoid merge conflicts (asuming you do not have unpushed local changes). But @Dajakk please do not push, if you did not change anything again...

Dajakk commented 5 months ago

In the end I wanted to have one nice clean commit, for this issue. But I agree in this case the cleanup could have been postponed.

Isn't this what 'Squash and merge' button is for? I'm no expert to GitHub, I'm working with BitBucket, but the description suggests it is exactly for that purpose.

Sorry about the push, I wanted to clean this up and added very small change that got mixed up somewhere (missing semicolon)

tadeaustria commented 5 months ago

basically yes - as I've said, in this case it would have worked

Dajakk commented 5 months ago

Btw, maybe we could establish any other means of communications? Those comments are at least suboptimal in my opinion

tadeaustria commented 5 months ago

What type of communication are you thinking about?

Dajakk commented 5 months ago

Any IM? Right now I'm more or less active on Messenger and WhatsApp, but we could agree on anything