Skip to content

Fix the crash when opening the box manager on a short box #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gui-camargo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the crash when opening the box manager on a short box #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/PKForge.App/Views/BoxBrowserPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,23 +233,25 @@ private void PaintBoxNeighbors(object? sender, SKPaintSurfaceEventArgs args)
PksmPaint.CenterText(canvas, "LOCK", rect.Right - 22, rect.Bottom - 8, label,
SKColors.White, Pksm.Illegal, SKTextAlign.Center);

var slots = Enumerable.Range(0, BoxGridRenderer.Columns * BoxGridRenderer.Rows)
.Select(slot => session.ReadEntity(box, slot)).ToArray();
// The 6×5 grid is the paint size. Gen 1/2 international boxes hold 20 slots
// and Let's Go holds 25; reading a slot past that throws and kills the page.
var capacity = BoxCapacity(session, box);
var dotW = (rect.Width - 12) / BoxGridRenderer.Columns;
var dotH = (rect.Height - 24) / BoxGridRenderer.Rows;
using var occupied = new SKPaint { Color = SKColors.White.WithAlpha(220), IsAntialias = true };
using var shiny = new SKPaint { Color = Pksm.ShinyGold, IsAntialias = true };
for (var slot = 0; slot < slots.Length; slot++)
for (var slot = 0; slot < capacity; slot++)
{
if (slots[slot].IsEmpty) continue;
var mon = session.ReadEntity(box, slot);
if (mon.IsEmpty) continue;
var x = rect.Left + 6 + (slot % BoxGridRenderer.Columns + 0.5f) * dotW;
var y = rect.Top + 21 + (slot / BoxGridRenderer.Columns + 0.5f) * dotH;
var radius = Math.Min(dotW, dotH) * 0.42f;
var sprite = _sprites.GetSprite(slots[slot].Look);
var sprite = _sprites.GetSprite(mon.Look);
if (sprite is null)
{
_sprites.Warm(slots[slot].Look, _boxNeighbors.InvalidateSurface);
canvas.DrawCircle(x, y, radius * 0.65f, slots[slot].IsShiny ? shiny : occupied);
_sprites.Warm(mon.Look, _boxNeighbors.InvalidateSurface);
canvas.DrawCircle(x, y, radius * 0.65f, mon.IsShiny ? shiny : occupied);
continue;
}
using var image = SKImage.FromBitmap(sprite);
Expand All @@ -261,6 +263,16 @@ private void PaintBoxNeighbors(object? sender, SKPaintSurfaceEventArgs args)
}
}

/// <summary>Slots this save stores in the box. The snapshot lists every slot, empty
/// ones included, so the highest index plus one is the box size.</summary>
private static int BoxCapacity(ISaveEngineSession session, int box)
{
var capacity = 0;
foreach (var slot in session.Snapshot.Slots)
if (slot.Box == box && slot.Slot >= capacity) capacity = slot.Slot + 1;
return Math.Min(capacity, BoxGridRenderer.Columns * BoxGridRenderer.Rows);
}

// ── Cursor modes ──────────────────────────────────────────────────────────
// Like the games' PC: the red hand moves one Pokémon, the green hand marks many.
// Select (-) flips between them from anywhere on the grid; the cursor colour, the
Expand Down Expand Up @@ -990,7 +1002,7 @@ await _viewModel.RunMutationAsync(session =>
if (!confirmed) return;
await _viewModel.RunMutationAsync(session =>
{
var copies = selected.Select(source => Enumerable.Range(0, BoxGridRenderer.Columns * BoxGridRenderer.Rows)
var copies = selected.Select(source => Enumerable.Range(0, BoxCapacity(session, source))
.Where(slot => !session.ReadEntity(source, slot).IsEmpty)
.Select(slot => (Slot: slot, Export: session.ExportSlot(source, slot))).ToArray()).ToArray();
for (var i = 0; i < copies.Length; i++)
Expand Down Expand Up @@ -2333,7 +2345,7 @@ private async Task RunBatchEditorAsync()
{
foreach (var box in boxes!)
{
var slotCount = box == -1 ? 6 : BoxGridRenderer.Columns * BoxGridRenderer.Rows;
var slotCount = box == -1 ? 6 : BoxCapacity(session, box);
for (var slot = 0; slot < slotCount; slot++)
if (!session.ReadEntity(box, slot).IsEmpty) mons++;
}
Expand Down