fix: update refill consumption to use player hurtbox bounds

Author: CoolSpring8

src/GameScene.ts

@@ -1397,7 +1397,7 @@ export class GameScene extends Phaser.Scene {
   private updateRefills(): number {
     if (this.refills.length === 0) return 0;
 
-    const player = this.player.getHitboxBounds();
+    const player = this.player.getPlayerColliderBounds();
     const consumed = this.world.consumeTouchingRefills(player, (target) => this.player.tryRefill(target));
     for (const refill of consumed) {
       this.refillEmitter.setParticleTint(this.refillColor(refill.type));

src/player/Player.ts

@@ -2,6 +2,7 @@ import { DEFAULT_ASSIST_OPTIONS, type AssistOptions } from "../assists";
 import { COLORS, PLAYER_CONFIG, PLAYER_GEOMETRY, PlayerConfig, WORLD } from "../constants";
 import { CollisionWorld } from "../entities/CollisionWorld";
 import { Hitbox } from "../entities/core/Hitbox";
+import type { Aabb } from "../entities/types";
 import {
   addFloat,
   approach,
@@ -357,18 +358,23 @@ export class Player extends Actor {
     return out;
   }
 
-  getCollisionBounds(): { x: number; y: number; w: number; h: number } {
+  getCollisionBounds(): Aabb {
     return this.getHitboxBounds();
   }
 
-  getHitboxBounds(): { x: number; y: number; w: number; h: number } {
+  getHitboxBounds(): Aabb {
     return this.bodyBoundsFor(this.requireBodyHitbox(), this.x, this.y);
   }
 
-  getHurtboxBounds(): { x: number; y: number; w: number; h: number } {
+  getHurtboxBounds(): Aabb {
     return this.bodyBoundsFor(this.hurtbox, this.x, this.y);
   }
 
+  // Celeste temporarily swaps Collider to hurtbox for PlayerCollider checks.
+  getPlayerColliderBounds(): Aabb {
+    return this.getHurtboxBounds();
+  }
+
   setAssistOptions(options: AssistOptions): void {
     const previousMaxDashes = this.maxAirDashes();
     this.assistOptions = { ...options };
@@ -1791,7 +1797,7 @@ export class Player extends Actor {
     return collider;
   }
 
-  private bodyBoundsFor(hitbox: Hitbox, entityX: number, entityY: number): { x: number; y: number; w: number; h: number } {
+  private bodyBoundsFor(hitbox: Hitbox, entityX: number, entityY: number): Aabb {
     return {
       x: entityX + hitbox.left,
       y: entityY + hitbox.top,

tests/entities/refill.test.ts

@@ -13,12 +13,28 @@ describe("Refill entity", () => {
     world.update(DT, 0.5);
     player.update(DT, makeInput());
     let freeze = player.consumeFreezeRequest();
-    const consumed = world.consumeTouchingRefills(player.getHitboxBounds(), (target) => player.tryRefill(target));
+    const consumed = world.consumeTouchingRefills(player.getPlayerColliderBounds(), (target) => player.tryRefill(target));
     if (consumed.length > 0) {
       freeze = Math.max(freeze, PLAYER_CONFIG.dash.freezeTime);
     }
 
     expect(consumed).toHaveLength(1);
     expect(freeze).toBe(PLAYER_CONFIG.dash.freezeTime);
   });
+
+  test("refill pickup uses the player hurtbox instead of the body hitbox", () => {
+    const hitboxWorld = buildWorld([
+      { kind: "refill", x: 96, y: 96, type: "max" },
+    ]);
+    const hitboxPlayer = createPlayer(hitboxWorld, 96, 95);
+
+    expect(hitboxWorld.consumeTouchingRefills(hitboxPlayer.getHitboxBounds(), () => true)).toHaveLength(1);
+
+    const hurtboxWorld = buildWorld([
+      { kind: "refill", x: 96, y: 96, type: "max" },
+    ]);
+    const hurtboxPlayer = createPlayer(hurtboxWorld, 96, 95);
+
+    expect(hurtboxWorld.consumeTouchingRefills(hurtboxPlayer.getPlayerColliderBounds(), () => true)).toHaveLength(0);
+  });
 });