add DROWNING

Author: tomsoftware

game.js

@@ -148,29 +148,35 @@ function createGame(gameCavas, onGameLoaded)
     }
   }
 
+
+  game.eventHandler = new EventHandler(game);
+
+  game.triggerHandler = new TriggerHandler(game);
+
+
   game.fileLoader = new FileLoader();
 
+  //- loading main.dat
   game.mainFileProvider = new MainFileProvider(game);
   game.mainFileProvider.load(function()
   {
     game.lemmingDrawer = new LemmingDrawer(game);
     game.lemmingDrawer.load();
 
-  });
-
+    //- creating GUI : requires main.dat
+    game.gameGui = new GameGui(game);
+    game.gameGui.load();
 
-  game.levelHandler = new LevelHandler(game);
-  game.levelHandler.load(onLevelLoaded, game.levelIndex);
+    //- loading level01.dat
+    game.levelHandler = new LevelHandler(game);
+    game.levelHandler.load(onLevelLoaded, game.levelIndex);
 
-  game.eventHandler = new EventHandler(game);
+  });
 
 
-  game.triggerHandler = new TriggerHandler(game);
 
   function onLevelLoaded()
   {
-    game.levelDrawer = new LevelDrawer(game);
-    game.levelDrawer.load(onLevelDrawn);
     game.viewX = game.levelHandler.screenPositionX;
 
     for (var i = 0; i < 10; i++)
@@ -181,19 +187,22 @@ function createGame(gameCavas, onGameLoaded)
     game.releaseRate = game.levelHandler.releaseRate;
     game.releaseRateMin = game.levelHandler.releaseRate;
     game.releaseCount = game.levelHandler.releaseCount;
+
+
+    //- load GROUNDxO.DAT and VGAGRx.DAT
+    game.levelDrawer = new LevelDrawer(game);
+    game.levelDrawer.load(onLevelDrawerLoaded);
   }
 
 
-  function onLevelDrawn()
+  function onLevelDrawerLoaded()
   {
     //- generate terrain layer
     game.levelDrawer.createTerrain();
 
     game.levelDrawer.createObjectTrigger();
 
-    game.gameGui = new GameGui(game);
-    game.gameGui.load();
-
+    //- callback
     if (typeof onGameLoaded !== "undefined") onGameLoaded();
   }
 

lemming.js

@@ -4,23 +4,24 @@ function Lemming(gameObject, x, y)
 {
 
   this.STATE = {
-    UNKNOWN  :   {id:0,  canSetState:false, isFalling:false,  name: "unknown"},
-    WALKING  :   {id:1,  canSetState:true,  isFalling:false,  name: "walking"},
-    FALLING  :   {id:3,  canSetState:false, isFalling:true,   name: "fall"},
-    FLYING   :   {id:4,  canSetState:false, isFalling:true,   name: "falling"},
-    DIGGING  :   {id:5,  canSetState:true,  isFalling:false,  name: "digging"},
-    BLOCKING :   {id:6,  canSetState:false, isFalling:false,  name: "blocking"},
-    BUILDING :   {id:7,  canSetState:true,  isFalling:false,  name: "build"},
-    BASHING  :   {id:8,  canSetState:true,  isFalling:false,  name: "bush"},
-    MINING   :   {id:9,  canSetState:true,  isFalling:false,  name: "mining"},
-    CLIMBING :   {id:10, canSetState:false, isFalling:false,  name: "climbing"},
-    OHNO     :   {id:11, canSetState:false, isFalling:false,  name: "Oh No"},
-    EXPLODING:   {id:12, canSetState:false, isFalling:false,  name: "exploding"},
-    UMBRELLA :   {id:13, canSetState:false, isFalling:true,   name: "flying 1"},
-    PREUMBRELLA: {id:14, canSetState:false, isFalling:true,   name: "flying 2"},
-    BOMBING  :   {id:15, canSetState:true,  isFalling:false,  name: "exploding"},
-    SPLATTING:   {id:16, canSetState:false, isFalling:false,  name: "splatting"},
-    EXITING  :   {id:17, canSetState:true,  isFalling:false,  name: "leaving"},
+    UNKNOWN  :   {id:0,  canSetState:false, isFalling:false,  canFall:true, name: "unknown"},
+    WALKING  :   {id:1,  canSetState:true,  isFalling:false,  canFall:true, name: "walking"},
+    FALLING  :   {id:3,  canSetState:false, isFalling:true,   canFall:true, name: "fall"},
+    FLYING   :   {id:4,  canSetState:false, isFalling:true,   canFall:true, name: "falling"},
+    DIGGING  :   {id:5,  canSetState:true,  isFalling:false,  canFall:true, name: "digging"},
+    BLOCKING :   {id:6,  canSetState:false, isFalling:false,  canFall:true, name: "blocking"},
+    BUILDING :   {id:7,  canSetState:true,  isFalling:false,  canFall:true, name: "build"},
+    BASHING  :   {id:8,  canSetState:true,  isFalling:false,  canFall:true, name: "bush"},
+    MINING   :   {id:9,  canSetState:true,  isFalling:false,  canFall:true, name: "mining"},
+    CLIMBING :   {id:10, canSetState:false, isFalling:false,  canFall:true, name: "climbing"},
+    OHNO     :   {id:11, canSetState:false, isFalling:false,  canFall:true, name: "Oh No"},
+    EXPLODING:   {id:12, canSetState:false, isFalling:false,  canFall:true, name: "exploding"},
+    UMBRELLA :   {id:13, canSetState:false, isFalling:true,   canFall:true, name: "flying 1"},
+    PREUMBRELLA: {id:14, canSetState:false, isFalling:true,   canFall:true, name: "flying 2"},
+    BOMBING  :   {id:15, canSetState:true,  isFalling:false,  canFall:true, name: "exploding"},
+    SPLATTING:   {id:16, canSetState:false, isFalling:false,  canFall:true, name: "splatting"},
+    EXITING  :   {id:17, canSetState:false, isFalling:false,  canFall:false, name: "leaving"},
+    DROWNING :   {id:18, canSetState:false, isFalling:false,  canFall:false, name: "drowning"}
   };
 
 
@@ -44,6 +45,7 @@ function Lemming(gameObject, x, y)
 
     this.stateTicks++;
 
+
     //- process Triggers    
     var triggerState = self.game.triggerHandler.trigger(self.x, self.y, gametick);
     if (triggerState != null)
@@ -53,20 +55,30 @@ function Lemming(gameObject, x, y)
       switch (triggerState)
       {
         case TRIGGERS.EXIT:
-          self.changeState(self.STATE.EXITING);
+          self.changeState(self.STATE.EXITING, false);
           break;
         case TRIGGERS.BLOCKER_LEFT:
           if ((self.state != self.STATE.BLOCKER) && (self.dir > 0)) self.dir = -1;
           break;
         case TRIGGERS.BLOCKER_RIGHT:
           if ((self.state != self.STATE.BLOCKER) && (self.dir < 0)) self.dir = 1;
           break;
+        case TRIGGERS.DROWN:
+          self.changeState(self.STATE.DROWNING, false);
+          break;
       }
     }
 
     if ((self.state == self.STATE.EXITING) && (this.stateTicks >= 8))
     {
       self.removeLem(true);
+      return;
+    }
+
+    if ((self.state == self.STATE.DROWNING) && (this.stateTicks >= 16))
+    {
+      self.removeLem(true);
+      return;
     }
 
     //- process explosion timeout
@@ -75,7 +87,11 @@ function Lemming(gameObject, x, y)
       self.ticksToDie--;
       if (self.ticksToDie ==   0) self.state = self.STATE.OHNO;
       if (self.ticksToDie == -16) self.state = self.STATE.EXPLODING;
-      if (self.ticksToDie <  -16) self.removeLem();
+      if (self.ticksToDie <  -16) 
+      {
+        self.removeLem();
+        return;
+      }
     }
 
     var lineLen1 = self.game.gameTerrain.width * 4;
@@ -104,7 +120,7 @@ function Lemming(gameObject, x, y)
     }
 
 
-    if (data[dataPos + lineLen1] == 0)
+    if ((data[dataPos + lineLen1] == 0) && (self.state.canFall))
     {
       //- there is no ground below
 
@@ -254,11 +270,11 @@ function Lemming(gameObject, x, y)
 
         case self.STATE.MINING:
           self.y += 1;
-          self.x += 1;
+          self.x += self.dir;
           break;
 
         case self.STATE.BASHING:
-          self.x += 1;
+          self.x += self.dir;
           break;
 
 
@@ -275,6 +291,7 @@ function Lemming(gameObject, x, y)
       case self.STATE.FALLING:
       case self.STATE.PREUMBRELLA:
       case self.STATE.UMBRELLA:
+      case self.STATE.DROWNING:
         if (self.state != newState)
         {
           self.state = newState;

lemmingDrawer.js

@@ -32,7 +32,7 @@ function LemmingDrawer(gameObject)
     self.registerAnimation(state.DIGGING,     0, fr, 3, 16, 14, 16); //- digging
     self.registerAnimation(state.CLIMBING,    1, fr, 2, 16, 12, 8); //- climbing (r)
     self.registerAnimation(state.CLIMBING,   -1, fr, 2, 16, 12, 8); //- climbing (l)
-    self.registerAnimation(state.UNKNOWN,     0, fr, 2, 16, 10, 16); //- drowning
+    self.registerAnimation(state.DROWNING,    0, fr, 2, 16, 10, 16); //- drowning
     self.registerAnimation(state.UNKNOWN,     1, fr, 2, 16, 12, 8); //- post-climb (r)
     self.registerAnimation(state.UNKNOWN,    -1, fr, 2, 16, 12, 8); //- post-climb (l)
     self.registerAnimation(state.BUILDING,    1, fr, 3, 16, 13, 16); //- brick-laying (r)