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

Partially restore Lynx force floor behavior

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-05-10 20:46:19 -06:00
parent ca42dbcf59
commit 9369b2b167
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/defs.js
View File

@ -180,6 +180,10 @@ export const COMPAT_FLAGS = [
key: 'no_backwards_override', key: 'no_backwards_override',
label: "Player can't override backwards on a force floor", label: "Player can't override backwards on a force floor",
rulesets: new Set(['lynx']), rulesets: new Set(['lynx']),
}, {
key: 'force_floor_only_on_arrive',
label: "Force floors only affect actors when stepped on",
rulesets: new Set(['lynx', 'ms']),
}, { }, {
key: 'traps_like_lynx', key: 'traps_like_lynx',
label: "Traps eject faster, and even when already open", label: "Traps eject faster, and even when already open",

6
js/game.js
View File

@ -1332,7 +1332,7 @@ export class Level extends LevelInterface {
return null; return null;
if (! terrain.type.get_slide_direction) if (! terrain.type.get_slide_direction)
return null; return null;
if (! (actor.is_pending_slide || terrain.type.slide_automatically)) if (! actor.is_pending_slide && ! (terrain.type.slide_automatically && ! this.compat.force_floor_only_on_arrive))
return null; return null;
if (actor.ignores(terrain.type.name)) if (actor.ignores(terrain.type.name))
return null; return null;
@ -1792,8 +1792,8 @@ export class Level extends LevelInterface {
// does NOT act like a bonk (hence why it's here) // does NOT act like a bonk (hence why it's here)
if (this.compat.no_backwards_override) { if (this.compat.no_backwards_override) {
let terrain = orig_cell.get_terrain() let terrain = orig_cell.get_terrain()
if (terrain.type.slide_mode === 'force' && ! actor.ignores(terrain.type.name) && if (! actor.ignores(terrain.type.name) &&
direction === DIRECTIONS[actor.direction].opposite) terrain.type.force_floor_direction === DIRECTIONS[direction].opposite)
{ {
return false; return false;
} }

9
js/tiletypes.js
View File

@ -62,6 +62,11 @@ function _define_force_floor(direction, opposite_type) {
get_slide_direction(me, level, other) { get_slide_direction(me, level, other) {
return direction; return direction;
}, },
force_floor_direction: direction,
on_arrive(me, level, other) {
// Necessary for compat.force_floor_only_on_arrive, which disables slide_automatically
level._set_tile_prop(other, 'is_pending_slide', true);
},
activate(me, level) { activate(me, level) {
level.transmute_tile(me, opposite_type); level.transmute_tile(me, opposite_type);
}, },
@ -984,6 +989,10 @@ const TILE_TYPES = {
return (level.compat.rff_blocks_monsters && return (level.compat.rff_blocks_monsters &&
(other.type.collision_mask & COLLISION.monster_typical)); (other.type.collision_mask & COLLISION.monster_typical));
}, },
on_arrive(me, level, other) {
// Necessary for compat.force_floor_only_on_arrive, which disables slide_automatically
level._set_tile_prop(other, 'is_pending_slide', true);
},
}, },
slime: { slime: {
layer: LAYERS.terrain, layer: LAYERS.terrain,