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

Fix, partially, stopping yourself on force floors

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-25 20:45:01 -06:00
parent 55014fa1ca
commit 68de70743f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/game.js
View File

@ -760,10 +760,19 @@ export class Level {
if (actor.slide_mode === 'ice') { if (actor.slide_mode === 'ice') {
// Actors on ice turn around when they hit something // Actors on ice turn around when they hit something
this.set_actor_direction(actor, DIRECTIONS[direction].opposite); this.set_actor_direction(actor, DIRECTIONS[direction].opposite);
// Somewhat clumsy hack: step on the ice tile again, so if it's }
// a corner, it'll turn us in the correct direction if (actor.slide_mode !== null) {
// Somewhat clumsy hack: if an actor is sliding and hits something, step on the
// relevant tile again. This fixes two problems: if it was on an ice corner then it
// needs to turn a second time even though it didn't move; and if it was a player
// overriding a force floor into a wall, then their direction needs to be set back
// to the force floor direction.
// (For random force floors, this does still match CC2 behavior: after an override,
// CC2 will try to force you in the /next/ RFF direction.)
// FIXME now overriding into a wall doesn't show you facing that way at all! lynx
// only changes your direction at decision time by examining the floor tile...
for (let tile of actor.cell) { for (let tile of actor.cell) {
if (tile.type.slide_mode === 'ice' && tile.type.on_arrive) { if (tile.type.slide_mode === actor.slide_mode && tile.type.on_arrive) {
tile.type.on_arrive(tile, this, actor); tile.type.on_arrive(tile, this, actor);
} }
} }

1
js/tiletypes.js
View File

@ -461,6 +461,7 @@ const TILE_TYPES = {
draw_layer: LAYER_TERRAIN, draw_layer: LAYER_TERRAIN,
slide_mode: 'force', slide_mode: 'force',
// TODO ms: this is random, and an acting wall to monsters (!) // TODO ms: this is random, and an acting wall to monsters (!)
// TODO lynx/cc2 check this at decision time, which may affect ordering
on_arrive(me, level, other) { on_arrive(me, level, other) {
level.set_actor_direction(other, level.get_force_floor_direction()); level.set_actor_direction(other, level.get_force_floor_direction());
}, },