Remove abrupt game over

[wgj58.git] / wgj58.js

diff --git a/wgj58.js b/wgj58.js
index b528662d13d32c7187e3314c16458dcaa76b7a56..9405c5af7a3d14e3ed6860ebf91134ce03ba2aea 100644 (file)
--- a/wgj58.js
+++ b/wgj58.js
@@ -422,8 +422,6 @@ class NPC_Saiki extends GameNPC {
                                                { actor: logic.player, text: "Haha! I always get it, Saiki!" } ] ));
                                        logic.closeDoor("carlosdoor");
                                        logic.openDoor("saikidoor");
                                                { actor: logic.player, text: "Haha! I always get it, Saiki!" } ] ));
                                        logic.closeDoor("carlosdoor");
                                        logic.openDoor("saikidoor");

-                                       // FIXME: Abrupt game over.
-                                       if (!logic.carlos.pigsemen) game.time.events.add(Phaser.Timer.SECOND * 15, game.state.start, game.state, 'GameOver', false);

                                        break;
                                case 1:
                                        logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "Now that I think about it, there's still one thing. You could look into why the access control system is acting so funny today." },
                                        break;
                                case 1:
                                        logic.gameinterface.talk(new Dialogue( [ { actor: this, text: "Now that I think about it, there's still one thing. You could look into why the access control system is acting so funny today." },


@@ -512,8 +510,6 @@ class NPC_Saiki extends GameNPC {
                logic.closeDoor("carlosdoor");
                logic.openDoor("saikidoor");
                logic.carlos.kill();
                logic.closeDoor("carlosdoor");
                logic.openDoor("saikidoor");
                logic.carlos.kill();

-               // FIXME: Abrupt game over.
-               game.time.events.add(Phaser.Timer.SECOND * 15, game.state.start, game.state, 'GameOver', false);

                return super.actionTake();
        }
 
                return super.actionTake();
        }
 


@@ -521,12 +517,6 @@ class NPC_Saiki extends GameNPC {
                return (logic.carlos.alive);
        }
 
                return (logic.carlos.alive);
        }
 

-       makeHappy() {
-               // FIXME: Abrupt game over.
-               game.time.events.add(Phaser.Timer.SECOND * 15, game.state.start, game.state, 'GameOver', false);
-               super.makeHappy();
-       }
-

        tpDone(value) {
                console.log("Woot-woot! Teleport complete:", value);
                value.makeHappy();
        tpDone(value) {
                console.log("Woot-woot! Teleport complete:", value);
                value.makeHappy();