Remove starter cards, add some info in Log, Add Color team for Dragon by m0ssa99 · Pull Request #120 · PCJones/Ultimate-Splinterlands-Bot-V2

m0ssa99 · 2024-05-19T21:14:43Z

modified: .gitignore modified: Api/SplinterlandsAPI.cs modified: Bot/BotInstance.cs modified: Config/Settings.cs modified: Model/DetailedCard.cs modified: Model/LogSummary.cs modified: Model/UserCard.cs

…lands-Bot-V2

Plloi · 2024-05-21T16:10:56Z

this pr has mixed tabs and spaces for indentation.
this also has multiple changes that (imo) would be better split into multiple commits/pull requests to be assessed separately

Plloi · 2024-05-21T16:18:38Z

also commenting out no longer valid/needed functions/code clutters the code, (yes i know it's already like that, but why make it worse?)

Plloi · 2024-05-21T17:36:39Z

Api/SplinterlandsAPI.cs

                    gameResult = 2;
                }
-
+var rhsr = JToken.Parse((string)matchHistory["battles"][0]["dec_info"]);


no indentation, could also use a better name, rewardInfo or matchRewards maybe

Plloi · 2024-05-21T17:38:03Z

Api/SplinterlandsAPI.cs

+				int glint = Convert.ToInt32((int)rhsr["glint"]);

-                return (newRating, ratingChange, spsReward, gameResult);
+                return (newRating, ratingChange, spsReward, gameResult,glint);


i would suggest a space between the comma and glint for readability and to match style

Plloi · 2024-05-21T17:39:56Z

Api/SplinterlandsAPI.cs

            }
            return null;
        }
+        public static async Task<decimal> GetTotalUnclaimedBalanceAsync(string username, string accessToken)


function looks good, but indentation is inconsistent

Plloi · 2024-05-21T17:40:24Z

Api/SplinterlandsAPI.cs

                }

-                DateTime oneDayAgo = DateTime.Now.AddDays(-1);
+                DateTime oneDayAgo = DateTime.Now.AddDays(-2);


onedayago now 2 days?

yep, https://docs.splinterlands.com/cards/card-cooldown

should be renamed to twoDaysAgo then probably?

or maybe cooldown, in case the change it again

Plloi · 2024-05-21T17:50:30Z

Bot/BotInstance.cs

                var cardQuery = CardsCached.Where(x => x.card_detail_id == (string)team["summoner_id"]);
                string summoner = cardQuery.Any() ? cardQuery.First().card_long_id : null;
                string monsters = "";
+                var culoare = (string)Settings.CardsDetails[((int)team["summoner_id"]) - 1].GetstringCardColor();


mixing languages in a codebase can be confusing

is there an issue this is meant to solve i'm not aware of?

Changed

Is for color of team,

I also don't understand this change.

1.Why is it needed?
2.Is it ment to be called "color"? It says "culoare"

Now, when submitting a team you now need to provide an “allyColor” parameters that matches the element you want to be selected for that summoner, i.e. “Blue”, “Red”, “Green”, “Black”, or “White”., Dragon and Gray is determined by the card colors in the deck.
I changed variable name

Plloi · 2024-05-21T17:53:10Z

Bot/BotInstance.cs

                    CurrentlyActive = false;
                }
-                Settings.LogSummaryList.Add((LogSummary.Index, LogSummary.Account, LogSummary.BattleResult, LogSummary.Rating, LogSummary.ECR, LogSummary.QuestStatus));
+                Settings.LogSummaryList.Add((LogSummary.Index, LogSummary.Account, LogSummary.BattleResult, LogSummary.Rating, LogSummary.ECR, LogSummary.QuestStatus,LogSummary.SPSStake));


i would suggest a space between the comma and LogSummary.SPSStake for readability and to match style

Plloi · 2024-05-21T17:54:08Z

Bot/BotInstance.cs

        private async Task ShowBattleResultLegacyAsync(string tx)
        {
-            (int newRating, int ratingChange, decimal decReward, int result) battleResult = new();
+            (int newRating, int ratingChange, decimal decReward, int result,int glint) battleResult = new();


space after comma here to

Plloi · 2024-05-21T17:54:22Z

Bot/BotInstance.cs

            {
                await Task.Delay(6000);
-                battleResult = await SplinterlandsAPI.GetBattleResultAsync(Username, tx);
+                battleResult = await SplinterlandsAPI.GetBattleResultAsync(Username, tx,AccessToken);


...and here

Plloi · 2024-05-21T17:57:49Z

Logic all looks good.
Not sure i would fully nix the starter card logic, making the starter array empty should stop it from picking starter cards.

most of the issues i see are style/readability related

…lands-Bot-V2

der1sebi · 2024-05-22T11:45:52Z

Logic all looks good. Not sure i would fully nix the starter card logic, making the starter array empty should stop it from picking starter cards.

most of the issues i see are style/readability related

As starter cards are not allowed in wild ranked anymore we can delete it I guess

…lands-Bot-V2

PCJones · 2024-05-22T15:07:40Z

Someone needs to fix the merge conflicts first. Also, are all changes compatible with the API?

I sadly don't have the time to fully dive into this.

…lands-Bot-V2

m0ssa99 added 3 commits May 19, 2024 22:49

Remove starter cards, add some info in Log

b743f9f

modified: .gitignore modified: Api/SplinterlandsAPI.cs modified: Bot/BotInstance.cs modified: Config/Settings.cs modified: Model/DetailedCard.cs modified: Model/LogSummary.cs modified: Model/UserCard.cs

Remove starter cards, add some info in Log

aaecf4b

modified: .gitignore modified: Api/SplinterlandsAPI.cs modified: Bot/BotInstance.cs modified: Config/Settings.cs modified: Model/DetailedCard.cs modified: Model/LogSummary.cs modified: Model/UserCard.cs

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

b72a0c2

…lands-Bot-V2

Plloi reviewed May 21, 2024

View reviewed changes

m0ssa99 added 8 commits May 22, 2024 09:30

Refactor style/readability

f009d26

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

7a01e2a

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

4fece3c

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

54bec4e

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

5d8d94f

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

3f1ac16

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

7bead57

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

5a7a5ef

…lands-Bot-V2

m0ssa99 added 4 commits May 22, 2024 15:37

Cleanup unused code

9a86623

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

332be9d

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

db2b35b

…lands-Bot-V2

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

4a30cdf

…lands-Bot-V2

m0ssa99 added 2 commits May 22, 2024 18:23

Merge branch 'master' into master

1b79989

Add second BattleAPI server

8539c8b

m0ssa99 added 2 commits May 28, 2024 18:37

style changes

26d1a68

Merge branch 'master' of https://github.com/m0ssa99/Ultimate-Splinter…

e9e29c4

…lands-Bot-V2

Conversation

m0ssa99 commented May 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Plloi commented May 21, 2024

Uh oh!

Plloi commented May 21, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Plloi commented May 21, 2024

Uh oh!

der1sebi commented May 22, 2024

Uh oh!

PCJones commented May 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

m0ssa99 commented May 19, 2024 •

edited

Loading