Fix sit to die

Only use heal spells up to 90% health
ethanmoffat · May 11, 2021 · 814a3c5 · 814a3c5
1 parent ce4c534
commit 814a3c5
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/EOBot/TrainerBot.cs b/EOBot/TrainerBot.cs
@@ -131,7 +131,14 @@ protected override async Task DoWorkAsync(CancellationToken ct)
                         if (priorityCoord.HasValue && !cellState.NPC.HasValue)
                             priorityCoord = null;
 
-                        if ((attackCount < CONSECUTIVE_ATTACK_COUNT && !currentPositionCellState.NPC.HasValue) || cellState.NPC.HasValue)
+                        if (character.Stats[CharacterStat.Weight] >= character.Stats[CharacterStat.MaxWeight])
+                        {
+                            Console.WriteLine($"[    ] OVER WEIGHT LIMIT - TIME TO DIE");
+                            await ToggleSit();
+                            action_taken = true;
+                            time_to_die = true;
+                        }
+                        else if ((attackCount < CONSECUTIVE_ATTACK_COUNT && !currentPositionCellState.NPC.HasValue) || cellState.NPC.HasValue)
                         {
                             if (cellState.NPC.HasValue && character.Stats[CharacterStat.HP] > character.Stats[CharacterStat.MaxHP] * .1)
                             {
@@ -158,18 +165,12 @@ protected override async Task DoWorkAsync(CancellationToken ct)
 
                                 action_taken = true;
                             }
-                            else if (healSpells.Any() && character.Stats[CharacterStat.HP] < character.Stats[CharacterStat.MaxHP]
+                            else if (healSpells.Any() && character.Stats[CharacterStat.HP] < character.Stats[CharacterStat.MaxHP] * .9
                                 && character.Stats[CharacterStat.TP] > character.Stats[CharacterStat.MaxTP] * .5)
                             {
                                 await CastHealSpell(healSpells);
                                 action_taken = true;
                             }
-                            else if (character.Stats[CharacterStat.Weight] >= character.Stats[CharacterStat.MaxWeight])
-                            {
-                                await SitDown();
-                                action_taken = true;
-                                time_to_die = true;
-                            }
 
                             healItems = charInventoryRepo.ItemInventory
                                 .Where(x => _itemData.Data.Any(y => y.ID == x.ItemID && y.Type == ItemType.Heal))
@@ -313,9 +314,10 @@ private async Task UseHealItem(IEnumerable<IInventoryItem> healItems)
             await Task.Delay(ATTACK_BACKOFF_MS);
         }
 
-        private async Task SitDown()
+        private async Task ToggleSit()
         {
-            Console.WriteLine($"[SIT ] OVER WEIGHT LIMIT - TIME TO DIE");
+            var renderProps = _characterRepository.MainCharacter.RenderProperties;
+            Console.WriteLine($"[SIT ]         - Toggling from: {Enum.GetName(typeof(SitState), renderProps.SitState)}");
             await TrySend(_characterActions.ToggleSit);
         }