fixing bug with check_collision_structures logic

jjppof · Sep 7, 2023 · 28b5e40 · 28b5e40
1 parent 681c608
commit 28b5e40
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/base/Map.ts b/base/Map.ts
@@ -554,7 +554,8 @@ export class Map {
                 let sensor_active = false;
                 if (collision_object.properties) {
                     sensor_active =
-                        collision_object.properties.affected_by_reveal && collision_object.properties.collide_on_reveal;
+                        Boolean(collision_object.properties.affected_by_reveal) &&
+                        Boolean(collision_object.properties.collide_on_reveal);
                     if (collision_object.properties.controller_variable) {
                         const is_sensor_by_controller = !(this.data.storage.get(
                             collision_object.properties.controller_variable
@@ -629,7 +630,8 @@ export class Map {
                 let split_polygon = false;
                 if (collision_object.properties) {
                     sensor_active =
-                        collision_object.properties.affected_by_reveal && collision_object.properties.collide_on_reveal;
+                        Boolean(collision_object.properties.affected_by_reveal) &&
+                        Boolean(collision_object.properties.collide_on_reveal);
                     if (collision_object.properties.controller_variable) {
                         const is_sensor_by_controller = !(this.data.storage.get(
                             collision_object.properties.controller_variable

diff --git a/base/game_events/SetValueEvent.ts b/base/game_events/SetValueEvent.ts
@@ -156,15 +156,25 @@ export class SetValueEvent extends GameEvent {
                     npc_index: this.npc_index,
                     npc_label: this.npc_label,
                 }) ?? this.origin_npc;
-            (char as NPC).check_storage_keys();
+            if (char) {
+                (char as NPC).check_storage_keys();
+            } else {
+                this.data.logger.log_message(
+                    `NPC label not passed to "set_value" event when "check_npc_storage_values" was set true.`
+                );
+            }
         }
         if (this.check_collision_structures) {
             this.data.map.collision_sprite.body.data.shapes.forEach(shape => {
                 if (shape.properties?.controller_variable) {
                     const is_sensor_by_controller = !(this.data.storage.get(
                         shape.properties.controller_variable
                     ) as boolean);
-                    shape.sensor = is_sensor_by_controller ? true : shape.sensor;
+                    if (is_sensor_by_controller) {
+                        shape.sensor = true;
+                    } else if (!shape.properties.affected_by_reveal) {
+                        shape.sensor = false;
+                    }
                 }
             });
         }