docked pillars bug fix

jjppof · Jan 23, 2024 · 3f57372 · 3f57372
1 parent 2f9ac5f
commit 3f57372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/base/field_abilities/FieldAbilities.ts b/base/field_abilities/FieldAbilities.ts
@@ -10,6 +10,7 @@ import * as _ from "lodash";
 import {Button} from "../XGamepad";
 import {DialogManager} from "../utils/DialogManager";
 import {degree360} from "../magic_numbers";
+import {Pushable} from "../interactable_objects/Pushable";
 
 /**
  * Defines and manages the usage of field psynergy.
@@ -215,6 +216,9 @@ export abstract class FieldAbilities {
                 if (!(target_object as InteractableObjects).enable && !this.works_on_disabled_target) {
                     continue;
                 }
+                if ((target_object as Pushable).docked) {
+                    continue;
+                }
             }
             if (this.target_found_extra_check && !this.target_found_extra_check(target_object)) {
                 continue;

diff --git a/base/field_abilities/MoveFieldPsynergy.ts b/base/field_abilities/MoveFieldPsynergy.ts
@@ -259,7 +259,7 @@ export class MoveFieldPsynergy extends FieldAbilities {
                     reverse_directions[this.cast_direction]
                 );
                 this.hand_sprite.animations.play(anim_key);
-                if (this.target_object && !(this.target_object as Pushable).docked) {
+                if (this.target_object) {
                     this.target_object.manage_filter(this.target_object.hue_filter, true);
                     this.target_hueshift_timer = this.game.time.create(false);
                     this.target_hueshift_timer.loop(5, () => {