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

Change flame jet activation to be actor-based

Browse Source 
This fixes CC2LP1's Waterfall, and allows me to remove `on_tic`.
This commit is contained in:
Eevee (Evelyn Woods) 2021-03-01 20:21:59 -07:00
parent 5fcce3f453
commit d5b9a2a307
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/game.js
View File

@ -507,10 +507,6 @@ export class Level extends LevelInterface {
// If there's exactly one yellow teleporter when the level loads, it cannot be picked up // If there's exactly one yellow teleporter when the level loads, it cannot be picked up
let yellow_teleporter_count = 0; let yellow_teleporter_count = 0;
this.allow_taking_yellow_teleporters = false; this.allow_taking_yellow_teleporters = false;
// Speedup for flame jets, which aren't actors but do a thing every tic
// TODO this won't notice if a new tile with an on_tic is created, but that's impossible
// atm... or, at least, it's hacked to still work with flame_jet_off
this.static_on_tic_tiles = [];
for (let y = 0; y < this.height; y++) { for (let y = 0; y < this.height; y++) {
let row = []; let row = [];
for (let x = 0; x < this.width; x++) { for (let x = 0; x < this.width; x++) {
@ -539,9 +535,6 @@ export class Level extends LevelInterface {
if (tile.type.is_actor) { if (tile.type.is_actor) {
this.actors.push(tile); this.actors.push(tile);
} }
else if (tile.type.on_tic) {
this.static_on_tic_tiles.push(tile);
}
cell._add(tile); cell._add(tile);
if (tile.type.connects_to) { if (tile.type.connects_to) {
@ -957,11 +950,20 @@ export class Level extends LevelInterface {
// the way of the teleporter but finished moving away during the above loop; this is // the way of the teleporter but finished moving away during the above loop; this is
// particularly bad when it happens with a block you're pushing. (CC2 doesn't need to do // particularly bad when it happens with a block you're pushing. (CC2 doesn't need to do
// this because blocks you're pushing are always a frame ahead of you anyway.) // this because blocks you're pushing are always a frame ahead of you anyway.)
// This is also where we handle tiles with persistent standing behavior.
for (let i = this.actors.length - 1; i >= 0; i--) { for (let i = this.actors.length - 1; i >= 0; i--) {
let actor = this.actors[i]; let actor = this.actors[i];
if (! actor.cell) if (! actor.cell)
continue; continue;
if (actor.type.ttl)
continue;
if (actor.movement_cooldown <= 0) {
let terrain = actor.cell.get_terrain();
if (terrain.type.on_stand && ! actor.ignores(terrain.type.name)) {
terrain.type.on_stand(terrain, this, actor);
}
}
if (actor.just_stepped_on_teleporter) { if (actor.just_stepped_on_teleporter) {
this.attempt_teleport(actor); this.attempt_teleport(actor);
} }
@ -972,8 +974,6 @@ export class Level extends LevelInterface {
this._do_wire_phase(); this._do_wire_phase();
this._do_wire_phase(); this._do_wire_phase();
this._do_wire_phase(); this._do_wire_phase();
// TODO should this also happen three times?
this._do_static_phase();
this._do_cleanup_phase(); this._do_cleanup_phase();
} }
@ -997,7 +997,6 @@ export class Level extends LevelInterface {
this._do_decision_phase(); this._do_decision_phase();
this._do_combined_action_phase(3); this._do_combined_action_phase(3);
this._do_wire_phase(); this._do_wire_phase();
this._do_static_phase();
this._do_cleanup_phase(); this._do_cleanup_phase();
} }
@ -1008,12 +1007,10 @@ export class Level extends LevelInterface {
this._do_decision_phase(true); this._do_decision_phase(true);
this._do_combined_action_phase(1, true); this._do_combined_action_phase(1, true);
this._do_wire_phase(); this._do_wire_phase();
this._do_static_phase();
this._do_decision_phase(true); this._do_decision_phase(true);
this._do_combined_action_phase(1, true); this._do_combined_action_phase(1, true);
this._do_wire_phase(); this._do_wire_phase();
this._do_static_phase();
} }
// This is in the "finish" part to preserve the property turn-based mode expects, where "finish" // This is in the "finish" part to preserve the property turn-based mode expects, where "finish"
// picks up right when the player could provide input // picks up right when the player could provide input
@ -1021,7 +1018,6 @@ export class Level extends LevelInterface {
this._do_decision_phase(); this._do_decision_phase();
this._do_combined_action_phase(1); this._do_combined_action_phase(1);
this._do_wire_phase(); this._do_wire_phase();
this._do_static_phase();
this._do_cleanup_phase(); this._do_cleanup_phase();
} }
@ -1094,6 +1090,12 @@ export class Level extends LevelInterface {
continue; continue;
this._do_actor_cooldown(actor, cooldown); this._do_actor_cooldown(actor, cooldown);
if (actor.movement_cooldown <= 0) {
let terrain = actor.cell.get_terrain();
if (terrain.type.on_stand && ! actor.ignores(terrain.type.name)) {
terrain.type.on_stand(terrain, this, actor);
}
}
if (actor.just_stepped_on_teleporter) { if (actor.just_stepped_on_teleporter) {
this.attempt_teleport(actor); this.attempt_teleport(actor);
} }
@ -2154,15 +2156,6 @@ export class Level extends LevelInterface {
}); });
} }
// Some non-actor tiles still want to act every tic. Note that this should happen AFTER wiring.
_do_static_phase() {
for (let tile of this.static_on_tic_tiles) {
if (tile.type.on_tic) {
tile.type.on_tic(tile, this);
}
}
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Board inspection // Board inspection

31
js/tiletypes.js
View File

@ -1812,9 +1812,6 @@ const TILE_TYPES = {
on_power(me, level) { on_power(me, level) {
me.type.activate(me, level); me.type.activate(me, level);
}, },
// This is a silly hack to get us flagged as a static tile, so when we're turned on, that
// tile's on_tic will still run
on_tic() {},
}, },
flame_jet_on: { flame_jet_on: {
layer: LAYERS.terrain, layer: LAYERS.terrain,
@ -1827,19 +1824,16 @@ const TILE_TYPES = {
on_power(me, level) { on_power(me, level) {
me.type.activate(me, level); me.type.activate(me, level);
}, },
on_tic(me, level) { on_stand(me, level, other) {
let actor = me.cell.get_actor();
if (actor && actor.movement_cooldown <= 0 && ! actor.ignores(me.type.name)) {
// Note that (dirt?) blocks, fireballs, and anything with fire boots are immune // Note that (dirt?) blocks, fireballs, and anything with fire boots are immune
// TODO would be neat if this understood "ignores anything with fire immunity" but that // TODO would be neat if this understood "ignores anything with fire immunity" but that
// might be a bit too high-level for this game // might be a bit too high-level for this game
if (actor.type.is_real_player) { if (other.type.is_real_player) {
level.fail('burned', me, actor); level.fail('burned', me, other);
} }
else { else {
level.sfx.play_once('bomb', me.cell); level.sfx.play_once('bomb', me.cell);
level.transmute_tile(actor, 'explosion'); level.transmute_tile(other, 'explosion');
}
} }
}, },
}, },
@ -1850,19 +1844,16 @@ const TILE_TYPES = {
level._set_tile_prop(me, 'wire_directions', 15); level._set_tile_prop(me, 'wire_directions', 15);
level.recalculate_circuitry_next_wire_phase = true; level.recalculate_circuitry_next_wire_phase = true;
}, },
on_tic(me, level) { on_stand(me, level, other) {
if (me.is_active) if (! me.is_active)
{ return;
let actor = me.cell.get_actor();
if (actor && actor.movement_cooldown <= 0 && ! actor.ignores(me.type.name)) { if (other.type.is_real_player) {
if (actor.type.is_real_player) { level.fail('electrocuted', me, other);
level.fail('electrocuted', me, actor);
} }
else { else {
level.sfx.play_once('bomb', me.cell); level.sfx.play_once('bomb', me.cell);
level.transmute_tile(actor, 'explosion'); level.transmute_tile(other, 'explosion');
}
}
} }
}, },
on_power(me, level) { on_power(me, level) {