From 07c9a83f756b23c346fc9e5bb6c70bdf271cd756 Mon Sep 17 00:00:00 2001 From: "Eevee (Evelyn Woods)" Date: Tue, 15 Dec 2020 00:48:28 -0700 Subject: [PATCH] Fix crash with teeth and Cerise --- js/format-c2g.js | 5 ++++- js/tiletypes.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/format-c2g.js b/js/format-c2g.js index 352da4f..23cf749 100644 --- a/js/format-c2g.js +++ b/js/format-c2g.js @@ -355,7 +355,10 @@ const TILE_ENCODING = { name: 'bomb', has_next: true, }, - //0x41: Open trap (unused in main levels) : + 0x41: { + // FIXME cc2lp1 uses this, i don't know what it actually does + error: "Open trap is not yet implemented!", + }, 0x42: { name: 'trap', }, diff --git a/js/tiletypes.js b/js/tiletypes.js index b4dd3f0..f3cc90f 100644 --- a/js/tiletypes.js +++ b/js/tiletypes.js @@ -1843,7 +1843,7 @@ const TILE_TYPES = { movement_parity: 2, decide_movement(me, level) { let preference = pursue_player(me, level); - if (level.player.type.name === 'player2') { + if (preference && level.player.type.name === 'player2') { // Run away from Cerise for (let [i, direction] of preference.entries()) { preference[i] = DIRECTIONS[direction].opposite;