leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete the pgchip ice block emulation (fixes #34)

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-12-22 22:30:59 -07:00
parent 2c95c7eacd
commit 1e02c6aa6f
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/defs.js
View File

@ -246,8 +246,7 @@ export const COMPAT_FLAGS = [
label: "Pulling blocks with the hook happens at decision time", label: "Pulling blocks with the hook happens at decision time",
rulesets: new Set(['steam', 'steam-strict']), rulesets: new Set(['steam', 'steam-strict']),
}, { }, {
// FIXME this is kind of annoying, there are some collision rules too key: 'use_pgchip_ice_blocks',
key: 'tanks_teeth_push_ice_blocks',
label: "Ice blocks emulate pgchip rules", label: "Ice blocks emulate pgchip rules",
rulesets: new Set(['ms']), rulesets: new Set(['ms']),
}, { }, {

2
js/game.js
View File

@ -1631,7 +1631,7 @@ export class Level extends LevelInterface {
return false; return false;
if (actor.can_push(tile, direction, this) || ( if (actor.can_push(tile, direction, this) || (
this.compat.tanks_teeth_push_ice_blocks && tile.type.name === 'ice_block' && this.compat.use_pgchip_ice_blocks && tile.type.name === 'ice_block' &&
(actor.type.name === 'teeth' || actor.type.name === 'teeth_timid' || actor.type.name === 'tank_blue') (actor.type.name === 'teeth' || actor.type.name === 'teeth_timid' || actor.type.name === 'tank_blue')
)) { )) {
// Collect pushables for later, so we don't inadvertently push through a wall // Collect pushables for later, so we don't inadvertently push through a wall

28
js/tiletypes.js
View File

@ -166,7 +166,7 @@ function button_visual_state(me) {
} }
} }
return 'released'; return 'released';
}; }
// Logic for chasing after the player (or running away); shared by both teeth and mimics // Logic for chasing after the player (or running away); shared by both teeth and mimics
function pursue_player(me, level) { function pursue_player(me, level) {
@ -213,6 +213,15 @@ function pursue_player(me, level) {
} }
} }
// Ugh. Check for can_reveal_walls, but special-casing it for the pgchip ice blocks, where the
// static property is different. This sux!!
function can_actually_reveal_walls(tile, level) {
if (level.compat.use_pgchip_ice_blocks && tile.type.name == 'ice_block')
return false;
return tile.type.can_reveal_walls;
}
// Chunks of properties that are shared among bunches of tiles // Chunks of properties that are shared among bunches of tiles
const COMMON_MONSTER = { const COMMON_MONSTER = {
layer: LAYERS.actor, layer: LAYERS.actor,
@ -311,7 +320,7 @@ const TILE_TYPES = {
layer: LAYERS.terrain, layer: LAYERS.terrain,
blocks_collision: COLLISION.all_but_ghost, blocks_collision: COLLISION.all_but_ghost,
on_bumped(me, level, other) { on_bumped(me, level, other) {
if (other.type.can_reveal_walls) { if (can_actually_reveal_walls(other, level)) {
level.spawn_animation(me.cell, 'wall_invisible_revealed'); level.spawn_animation(me.cell, 'wall_invisible_revealed');
} }
}, },
@ -320,7 +329,7 @@ const TILE_TYPES = {
layer: LAYERS.terrain, layer: LAYERS.terrain,
blocks_collision: COLLISION.all_but_ghost, blocks_collision: COLLISION.all_but_ghost,
on_bumped(me, level, other) { on_bumped(me, level, other) {
if (other.type.can_reveal_walls) { if (can_actually_reveal_walls(other, level)) {
level.transmute_tile(me, 'wall'); level.transmute_tile(me, 'wall');
} }
}, },
@ -406,7 +415,7 @@ const TILE_TYPES = {
} }
}, },
on_bumped(me, level, other) { on_bumped(me, level, other) {
if (other.type.can_reveal_walls) { if (can_actually_reveal_walls(other, level)) {
level.transmute_tile(me, 'wall'); level.transmute_tile(me, 'wall');
} }
}, },
@ -422,7 +431,7 @@ const TILE_TYPES = {
} }
}, },
on_bumped(me, level, other) { on_bumped(me, level, other) {
if (other.type.can_reveal_walls && ! level.compat.blue_floors_vanish_on_arrive) { if (can_actually_reveal_walls(other, level) && ! level.compat.blue_floors_vanish_on_arrive) {
this.reveal(me, level, other); this.reveal(me, level, other);
} }
}, },
@ -1141,6 +1150,13 @@ const TILE_TYPES = {
ice_block: { ice_block: {
layer: LAYERS.actor, layer: LAYERS.actor,
collision_mask: COLLISION.block_cc2, collision_mask: COLLISION.block_cc2,
blocked_by(me, level, other) {
// pgchip's ice blocks followed dirt block collision rules, except for being able to go
// on dirt
if (level.compat.use_pgchip_ice_blocks && other.type.name !== 'dirt' &&
(other.type.blocks_collision & COLLISION.block_cc1))
return true;
},
blocks_collision: COLLISION.all, blocks_collision: COLLISION.all,
item_pickup_priority: PICKUP_PRIORITIES.never, item_pickup_priority: PICKUP_PRIORITIES.never,
is_actor: true, is_actor: true,
@ -1158,7 +1174,7 @@ const TILE_TYPES = {
on_after_bumped(me, level, other) { on_after_bumped(me, level, other) {
// Fireballs melt ice blocks on regular floor FIXME and water! // Fireballs melt ice blocks on regular floor FIXME and water!
// XXX what if i'm in motion? // XXX what if i'm in motion?
if (other.type.name === 'fireball') { if (other.type.name === 'fireball' && ! level.compat.use_pgchip_ice_blocks) {
let terrain = me.cell.get_terrain(); let terrain = me.cell.get_terrain();
if (terrain.type.name === 'floor') { if (terrain.type.name === 'floor') {
level.transmute_tile(me, 'splash'); level.transmute_tile(me, 'splash');