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

Fix yellow tank timing; make ghosts go through doors, not stamp dirt

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-16 14:15:32 -07:00
parent 6587cbf7f0
commit b42b091181
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/game.js
View File

@ -325,6 +325,8 @@ export class Level {
this.bonus_points = 0;
this.aid = 0;
this.yellow_tank_decision = null;
// Time
if (this.stored_level.time_limit === 0) {
this.time_remaining = null;
@ -675,6 +677,9 @@ export class Level {
}
}
// This only persists for a single decision phase
this.yellow_tank_decision = null;
// THIRD PASS: everyone actually moves
let swap_player1 = false;
for (let i = this.actors.length - 1; i >= 0; i--) {

37
js/tiletypes.js
View File

@ -534,6 +534,8 @@ const TILE_TYPES = {
door_red: {
draw_layer: DRAW_LAYERS.terrain,
blocks(me, level, other) {
if (other.type.name === 'ghost')
return false;
// TODO not quite sure if this one is right; there are complex interactions with monsters, e.g. most monsters can eat blue keys but can't actually use them
return ! (other.type.has_inventory && other.has_item('key_red'));
},
@ -547,6 +549,8 @@ const TILE_TYPES = {
door_blue: {
draw_layer: DRAW_LAYERS.terrain,
blocks(me, level, other) {
if (other.type.name === 'ghost')
return false;
return ! (other.type.has_inventory && other.has_item('key_blue'));
},
on_arrive(me, level, other) {
@ -559,6 +563,8 @@ const TILE_TYPES = {
door_yellow: {
draw_layer: DRAW_LAYERS.terrain,
blocks(me, level, other) {
if (other.type.name === 'ghost')
return false;
return ! (other.type.has_inventory && other.has_item('key_yellow'));
},
on_arrive(me, level, other) {
@ -571,6 +577,8 @@ const TILE_TYPES = {
door_green: {
draw_layer: DRAW_LAYERS.terrain,
blocks(me, level, other) {
if (other.type.name === 'ghost')
return false;
return ! (other.type.has_inventory && other.has_item('key_green'));
},
on_arrive(me, level, other) {
@ -589,6 +597,9 @@ const TILE_TYPES = {
return (other.type.name === 'player2' && ! other.has_item('hiking_boots'));
},
on_arrive(me, level, other) {
// Bizarre interaction
if (other.type.name === 'ghost' && ! other.has_item('hiking_boots'))
return;
level.transmute_tile(me, 'floor');
},
},
@ -1381,23 +1392,7 @@ const TILE_TYPES = {
draw_layer: DRAW_LAYERS.terrain,
on_arrive(me, level, other) {
level.sfx.play_once('button-press', me.cell);
// Move all yellow tanks one tile in the direction of the pressing actor. But pretend
// it's simultaneous, so one in front will block one behind as usual.
// XXX this feels really weird, i'm wondering if cc2 does some other weird thing like
// not move any actor out of its cell until its first cooldown tick??
// FIXME not sure this interacts with railroads correctly
let unblocked_tanks = [];
for (let i = level.actors.length - 1; i >= 0; i--) {
let actor = level.actors[i];
// TODO generify somehow??
if (actor.type.name === 'tank_yellow' && level.check_movement(actor, actor.cell, other.direction, 'trace')) {
unblocked_tanks.push(actor);
}
}
for (let actor of unblocked_tanks) {
level.attempt_out_of_turn_step(actor, other.direction);
}
level.yellow_tank_decision = other.direction;
},
on_depart(me, level, other) {
level.sfx.play_once('button-release', me.cell);
@ -1866,6 +1861,14 @@ const TILE_TYPES = {
circuit_block: true,
},
movement_speed: 4,
decide_movement(me, level) {
if (level.yellow_tank_decision) {
return [level.yellow_tank_decision];
}
else {
return null;
}
}
},
blob: {
draw_layer: DRAW_LAYERS.actor,