Closed HarkuLi closed 4 months ago
Looks like I'm unable to merge due to merge conflicts. Could you please resolve them? I'm unable to see which file it is, but probably .gitignore.
I have rebased master branch and resolved the conflict in the .gitignore
file.
Score Counting
Description
The score counting of Ariant Coliseum is broken. Score of a player isn't updated after catching a monster.
Cause/Solution
Ariant score should be updated whenever a player catching a monster.
Trade Conversation
Description
Players can't exchange the "Palm Tree Beach Chair" after earning 100 points.
Cause/Solution
The order for checking conditions of Ariant point is wrong. The correct order for checking conditions should be: