tile event manager: add remove_from_field

jjppof · Jan 8, 2024 · ee2aa3d · ee2aa3d
1 parent f3bfd94
commit ee2aa3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/base/game_events/GameEventManager.ts b/base/game_events/GameEventManager.ts
@@ -579,7 +579,8 @@ export class GameEventManager {
                     info.io_label,
                     info.activate_at,
                     info.pos,
-                    info.collision_layers
+                    info.collision_layers,
+                    info.remove_from_field
                 );
             case event_types.DESTROYER:
                 return new DestroyerEvent(

diff --git a/base/game_events/TileEventManageEvent.ts b/base/game_events/TileEventManageEvent.ts
@@ -8,6 +8,7 @@ export class TileEventManageEvent extends GameEvent {
     private activate_at: {[direction: string]: boolean};
     private pos: {x: number; y: number};
     private collision_layers: number[];
+    private remove_from_field: boolean;
 
     constructor(
         game,
@@ -19,20 +20,22 @@ export class TileEventManageEvent extends GameEvent {
         io_label,
         activate_at,
         pos,
-        collision_layers
+        collision_layers,
+        remove_from_field
     ) {
         super(game, data, event_types.TILE_EVENT_MANAGE, active, key_name, keep_reveal);
         this.tile_event_key = tile_event_key;
         this.io_label = io_label;
         this.activate_at = activate_at;
+        this.remove_from_field = remove_from_field;
         this.pos = pos;
         if (collision_layers !== undefined) {
             this.collision_layers = Array.isArray(collision_layers) ? collision_layers : [collision_layers];
         }
     }
 
     _fire() {
-        let events = [];
+        let events: TileEvent[] = [];
         if (this.tile_event_key) {
             const event = TileEvent.get_labeled_event(this.tile_event_key);
             if (event) {
@@ -87,6 +90,10 @@ export class TileEventManageEvent extends GameEvent {
             if (this.pos) {
                 event.set_position(this.pos.x, this.pos.y, true);
             }
+
+            if (this.remove_from_field) {
+                this.data.map.remove_event(event.location_key, event.id);
+            }
         }
     }