Merge branch 'main' into Portraits

internal/action/cube_recipes.go

@@ -524,6 +524,11 @@ func hasItemsForGrandCharmReroll(ctx *context.Status, items []data.Item) ([]data
 				grandCharm = itm
 			}
 		} else if isPerfectGem(itm) && len(perfectGems) < 3 {
+			// Skip perfect amethysts and rubies if configured
+			if (ctx.CharacterCfg.CubeRecipes.SkipPerfectAmethysts && itm.Name == "PerfectAmethyst") ||
+				(ctx.CharacterCfg.CubeRecipes.SkipPerfectRubies && itm.Name == "PerfectRuby") {
+				continue
+			}
 			perfectGems = append(perfectGems, itm)
 		}
 

internal/action/stash.go

@@ -176,6 +176,11 @@ func shouldStashIt(i data.Item, firstRun bool) (bool, string, string) {
 	ctx := context.Get()
 	ctx.SetLastStep("shouldStashIt")
 
+	// Don't stash items in protected slots
+	if ctx.CharacterCfg.Inventory.InventoryLock[i.Position.Y][i.Position.X] == 0 {
+		return false, "", ""
+	}
+
 	// Don't stash items from quests during leveling process, it makes things easier to track
 	if _, isLevelingChar := ctx.Char.(context.LevelingCharacter); isLevelingChar && i.IsFromQuest() {
 		return false, "", ""

internal/action/step/attack.go

@@ -3,7 +3,6 @@ package step
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"math"
 	"time"
 
@@ -127,9 +126,6 @@ func isValidEnemy(monster data.Monster, ctx *context.Status) bool {
 
 	// Skip monsters in invalid positions
 	if !ctx.Data.AreaData.IsWalkable(monster.Position) {
-		ctx.Logger.Debug("Skipping monster in unwalkable position",
-			slog.Any("monster", monster.Name),
-			slog.Any("position", monster.Position))
 		return false
 	}
 

internal/action/step/move.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hectorgimenez/koolo/internal/utils"
 )
 
-const DistanceToFinishMoving = 7
+const DistanceToFinishMoving = 4
 
 func MoveTo(dest data.Position) error {
 	minDistanceToFinishMoving := DistanceToFinishMoving
@@ -112,8 +112,8 @@ func MoveTo(dest data.Position) error {
 		}
 
 		// This is a workaround to avoid the character to get stuck in the same position when the hitbox of the destination is too big
-		if distance < 20 && math.Abs(float64(previousDistance-distance)) < 5 {
-			minDistanceToFinishMoving += 5
+		if distance < 20 && math.Abs(float64(previousDistance-distance)) < 4 {
+			minDistanceToFinishMoving += 4
 		} else {
 			minDistanceToFinishMoving = DistanceToFinishMoving
 		}

internal/config/config.go

@@ -235,8 +235,10 @@ type CharacterCfg struct {
 		Items   []item.Name `yaml:"items"`
 	} `yaml:"gambling"`
 	CubeRecipes struct {
-		Enabled        bool     `yaml:"enabled"`
-		EnabledRecipes []string `yaml:"enabledRecipes"`
+		Enabled              bool     `yaml:"enabled"`
+		EnabledRecipes       []string `yaml:"enabledRecipes"`
+		SkipPerfectAmethysts bool     `yaml:"skipPerfectAmethysts"`
+		SkipPerfectRubies    bool     `yaml:"skipPerfectRubies"`
 	} `yaml:"cubing"`
 	BackToTown struct {
 		NoHpPotions     bool `yaml:"noHpPotions"`
@@ -308,7 +310,7 @@ func Load() error {
 
 	// Read character configs
 	for _, entry := range entries {
-		if !entry.IsDir() || entry.Name() == "template" {
+		if !entry.IsDir() {
 			continue
 		}
 

internal/pather/path_finder.go

@@ -47,6 +47,17 @@ func (pf *PathFinder) GetPathFrom(from, to data.Position) (Path, int, bool) {
 	// We don't want to modify the original grid
 	grid := a.Grid.Copy()
 
+	// Special handling for Arcane Sanctuary (to allow pathing with platforms)
+	if pf.data.PlayerUnit.Area == area.ArcaneSanctuary && pf.data.CanTeleport() {
+		// Make all non-walkable tiles into low priority tiles for teleport pathing
+		for y := 0; y < len(grid.CollisionGrid); y++ {
+			for x := 0; x < len(grid.CollisionGrid[y]); x++ {
+				if grid.CollisionGrid[y][x] == game.CollisionTypeNonWalkable {
+					grid.CollisionGrid[y][x] = game.CollisionTypeLowPriority
+				}
+			}
+		}
+	}
 	// Lut Gholein map is a bit bugged, we should close this fake path to avoid pathing issues
 	if a.Area == area.LutGholein {
 		a.CollisionGrid[13][210] = game.CollisionTypeNonWalkable

internal/server/http_server.go

@@ -959,6 +959,8 @@ func (s *HttpServer) characterSettings(w http.ResponseWriter, r *http.Request) {
 		cfg.CubeRecipes.Enabled = r.Form.Has("enableCubeRecipes")
 		enabledRecipes := r.Form["enabledRecipes"]
 		cfg.CubeRecipes.EnabledRecipes = enabledRecipes
+		cfg.CubeRecipes.SkipPerfectAmethysts = r.Form.Has("skipPerfectAmethysts")
+		cfg.CubeRecipes.SkipPerfectRubies = r.Form.Has("skipPerfectRubies")
 		// Companion
 
 		// Companion config

internal/server/templates/character_settings.gohtml

@@ -439,6 +439,14 @@
                 <input type="checkbox" style="padding-right: 30px" name="enableCubeRecipes" {{ if .Config.CubeRecipes.Enabled }}checked{{ end }}/>
                 Enable the bot to automatically cube item recipes.
             </label><br>
+            <label>
+                <input type="checkbox" name="skipPerfectAmethysts" {{ if .Config.CubeRecipes.SkipPerfectAmethysts }}checked{{ end }}/>
+                Don't use Perfect Amethysts when rolling charms
+            </label><br>
+            <label>
+                <input type="checkbox" name="skipPerfectRubies" {{ if .Config.CubeRecipes.SkipPerfectRubies }}checked{{ end }}/>
+                Don't use Perfect Rubies when rolling charms
+            </label><br>
 
             <div class="recipe-grid">
                 {{ range $index, $recipe := .RecipeList }}