[wip] still working on Bomberman v0.5 port

Author: Sygmei

Bomberman/GameObjects/Bomb/Bomb.lua

@@ -1,25 +1,59 @@
-Directions = 
-{
-    Left = { propagate = true, x = -1, y = 0, cmp = "_LESS", use = "x", part = "exp_hori", endpart = "exp_left_end" },
-    Right = { propagate = true, x = 1, y = 0, cmp = "_MORE", use = "x", part = "exp_hori", endpart = "exp_right_end"},
-    Up = { propagate = true, x = 0, y = -1, cmp = "_LESS", use = "y", part = "exp_vert", endpart = "exp_up_end"},
-    Down = { propagate = true, x = 0, y = 1, cmp = "_MORE", use = "y", part = "exp_vert", endpart = "exp_down_end"},
+Directions = {
+    Left = {
+        propagate = true,
+        x = -1,
+        y = 0,
+        cmp = "_LESS",
+        use = "x",
+        part = "exp_hori",
+        endpart = "exp_left_end"
+    },
+    Right = {
+        propagate = true,
+        x = 1,
+        y = 0,
+        cmp = "_MORE",
+        use = "x",
+        part = "exp_hori",
+        endpart = "exp_right_end"
+    },
+    Up = {
+        propagate = true,
+        x = 0,
+        y = -1,
+        cmp = "_LESS",
+        use = "y",
+        part = "exp_vert",
+        endpart = "exp_up_end"
+    },
+    Down = {
+        propagate = true,
+        x = 0,
+        y = 1,
+        cmp = "_MORE",
+        use = "y",
+        part = "exp_vert",
+        endpart = "exp_down_end"
+    }
 }
 
 local CompOps = {
-    _LESS = function(a, b) return a <= b; end,
-    _MORE = function(a, b) return a >= b; end
+    _LESS = function(a, b)
+        return a <= b;
+    end,
+    _MORE = function(a, b)
+        return a >= b;
+    end
 }
 
 ExpSprites = {};
 
 function Local.Init(position, terrain, power)
-    local pVec = obe.UnitVector(
-        position.x * This:LevelSprite():getSize().x, 
-        position.y * This:LevelSprite():getSize().y
+    local pVec = obe.Transform.UnitVector(
+        position.x * This.Sprite:getSize().x, position.y * This.Sprite:getSize().y
     );
-    This:LevelSprite():setPosition(pVec, obe.Referential.TopLeft)
-    This:Animator():setKey("Bomb");
+    This.Sprite:setPosition(pVec, obe.Transform.Referential.TopLeft)
+    This.Animator:setKey("Bomb");
     Object.exploded = false;
     Object.terrain = terrain;
     Object.position = position;
@@ -43,13 +77,18 @@ function Object:canPropagate(x, y)
 end
 
 function Object:propagate()
-    for i = 1, Object.power do 
+    for i = 1, Object.power do
         for direction, info in pairs(Directions) do
             if info.propagate then
                 local useImg;
-                local propagationStatus = self:canPropagate(Object.position.x + info.x * i + 1, Object.position.y + info.y * i + 1);
+                local propagationStatus = self:canPropagate(
+                    Object.position.x + info.x * i + 1, Object.position.y + info.y * i + 1
+                );
                 if i ~= Object.power and propagationStatus == CAN_PROPAGATE then
-                    local futurePropagation = self:canPropagate(Object.position.x + info.x * (i + 1) + 1, Object.position.y + info.y * (i + 1) + 1);
+                    local futurePropagation = self:canPropagate(
+                        Object.position.x + info.x * (i + 1) + 1,
+                            Object.position.y + info.y * (i + 1) + 1
+                    );
                     if futurePropagation == CAN_PROPAGATE or futurePropagation == STOP_PROPAGATE then
                         useImg = info.part;
                     else
@@ -63,13 +102,18 @@ function Object:propagate()
                     local newSprite = Scene:createLevelSprite(sprId);
                     table.insert(ExpSprites, sprId);
                     newSprite:loadTexture("Sprites/GameObjects/Bomb/" .. useImg .. ".png");
-                    local spriteSize = obe.UnitVector(This:LevelSprite():getSize().x,This:LevelSprite():getSize().y);
-                    newSprite:setSize(spriteSize, obe.Referential.TopLeft);
-                    local spritePos = obe.UnitVector(
-                        (Object.position.x + info.x * i) * newSprite:getSize().x, (Object.position.y + info.y * i) * newSprite:getSize().y
+                    local spriteSize = obe.Transform.UnitVector(
+                        This.Sprite:getSize().x, This.Sprite:getSize().y
+                    );
+                    newSprite:setSize(spriteSize, obe.Transform.Referential.TopLeft);
+                    local spritePos = obe.Transform.UnitVector(
+                        (Object.position.x + info.x * i) * newSprite:getSize().x,
+                            (Object.position.y + info.y * i) * newSprite:getSize().y
+                    );
+                    newSprite:setPosition(spritePos, obe.Transform.Referential.TopLeft);
+                    self.terrain:removeElementAtPos(
+                        Object.position.x + info.x * i + 1, Object.position.y + info.y * i + 1
                     );
-                    newSprite:setPosition(spritePos, obe.Referential.TopLeft);
-                    self.terrain:removeElementAtPos(Object.position.x + info.x * i + 1, Object.position.y + info.y * i + 1);
 
                     checkForKills(Object.position.x + info.x * i, Object.position.y + info.y * i);
                 end
@@ -83,7 +127,7 @@ function Object:propagate()
 end
 
 function Global.Game.Update(dt)
-    if This:Animator():getKey() == "Propagate" and not Object.exploded then
+    if This.Animator:getKey() == "Propagate" and not Object.exploded then
         Object:propagate();
         Object.exploded = true;
     end
@@ -107,4 +151,4 @@ function checkForKills(x, y)
     if character2.pos.x == x and character2.pos.y == y then
         character2:kill();
     end
-end
+end

Bomberman/GameObjects/Bomb/Bomb.obj.vili

@@ -1,14 +1,15 @@
-Include (Obe);
+Animator:
+    path: "Sprites/GameObjects/Bomb"
 
-Bomb:
-    Animator:
-        path:"Sprites/GameObjects/Bomb"
-    LevelSprite:
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.181818, 0.181818)
-        xTransform:"Camera"
-        yTransform:"Camera"
-        z-depth:2
-    Script:
-        priority:0.0
-        source:"Data/GameObjects/Bomb/Bomb.lua"
+Sprite:
+    rect:
+        x: 0
+        y: 0
+        width: 0.181818
+        height: 0.181818
+    transform: CameraTransform
+    zdepth: 2
 
+Script:
+    priority: 0
+    source: "self://Bomb.lua"

Bomberman/GameObjects/Box/Box.obj.vili

@@ -1,11 +1,12 @@
-Include (Obe);
+Sprite:
+    path: "Sprites/GameObjects/Box/box.png"
+    rect:
+        x: 0
+        y: 0
+        width: 0.181818
+        height: 0.181818
+    transform: CameraTransform
+    zdepth: 2
 
-Box:
-    LevelSprite:
-        path:"Sprites/GameObjects/Box/box.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.181818, 0.181818)
-        xTransform:"Camera"
-        yTransform:"Camera"
-        z-depth:2
-    Script:
-        source:"Data/GameObjects/Box/Box.lua"
+Script:
+    source: "self://Box.lua"

Bomberman/GameObjects/Bush/Bush.obj.vili

@@ -1,11 +1,12 @@
-Include (Obe);
+Sprite:
+    path: "Sprites/GameObjects/Bush/bush.png"
+    rect:
+        x: 0
+        y: 0
+        width: 0.181818
+        height: 0.181818
+    transform: CameraTransform
+    zdepth: 2
 
-Bush:
-    LevelSprite:
-        path:"Sprites/GameObjects/Bush/bush.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.181818, 0.181818)
-        xTransform:"Camera"
-        yTransform:"Camera"
-        z-depth:2
-    Script:
-        source:"Data/GameObjects/Bush/Bush.lua"
+Script:
+    source: "self://Bush.lua"

Bomberman/GameObjects/Character/Character.lua

@@ -1,12 +1,16 @@
-local Directions = { 
-    Left = { x = -1, y = 0, cmp = "_LESS", use = "x" },
-    Right = { x = 1, y = 0, cmp = "_MORE", use = "x" },
-    Down = { x = 0, y = 1, cmp = "_MORE", use = "y" },
-    Up = { x = 0, y = -1, cmp = "_LESS", use = "y" }
+local Directions = {
+    Left = {x = -1, y = 0, cmp = "_LESS", use = "x"},
+    Right = {x = 1, y = 0, cmp = "_MORE", use = "x"},
+    Down = {x = 0, y = 1, cmp = "_MORE", use = "y"},
+    Up = {x = 0, y = -1, cmp = "_LESS", use = "y"}
 }
 local CompOps = {
-    _LESS = function(a, b) return a <= b; end,
-    _MORE = function(a, b) return a >= b; end
+    _LESS = function(a, b)
+        return a <= b;
+    end,
+    _MORE = function(a, b)
+        return a >= b;
+    end
 }
 
 StartWalking = 0;
@@ -15,25 +19,24 @@ EndWalking = 2;
 NotWalking = 3;
 
 function Local.Init(characterId, terrainId, pos)
-    Terrain = Scene:getGameObject(terrainId);
+    Terrain = Engine.Scene:getGameObject(terrainId);
     Object.cid = characterId;
-    Object.pos = { x = pos.x, y = pos.y};
+    Object.pos = {x = pos.x, y = pos.y};
     Object.direction = "None";
     Object.walking = NotWalking;
-    Object.sprSize = This:LevelSprite():getSize().x;
+    Object.sprSize = This.Sprite:getSize().x;
     Object.speed = 0.5;
     Object.bombIndex = 0;
-    This:Animator():setPath("Sprites/GameObjects/Character/" .. characterId);
-    This:Animator():loadAnimator();
-    This:Animator():setKey("Idle_Right");
+    This.Animator:load(obe.System.Path("root://Sprites/GameObjects/Character/" .. characterId));
+    This.Animator:setKey("Idle_Right");
     InitializeBindings();
     Object.dead = false;
 end
 
 function InitializeBindings()
     for k, v in pairs(Directions) do
         Global.Actions[Object.cid .. "_" .. k] = function()
-            if Object.walking == NotWalking then 
+            if Object.walking == NotWalking then
                 Object.direction = k;
                 Object.walking = StartWalking;
             end
@@ -42,19 +45,19 @@ function InitializeBindings()
     Global.Actions[Object.cid .. "_Bomb"] = function()
         if not Object.dead then
             Object.bombIndex = Object.bombIndex + 1;
-            Scene:createGameObject("Bomb", Object.cid .. "_bomb_" .. tostring(Object.bombIndex))(
-                { position = Object.pos, terrain = Terrain, power = 6 }
-            );
+            Engine.Scene:createGameObject(
+                "Bomb", Object.cid .. "_bomb_" .. tostring(Object.bombIndex)
+            )({position = Object.pos, terrain = Terrain, power = 6});
         end
     end
 end
 
-function Global.Game.Update(dt)
+function Event.Game.Update(evt)
     if Object.walking == StartWalking then
         if not Object.dead then
-            This:Animator():setKey("Walk_" .. Object.direction);
+            This.Animator:setKey("Walk_" .. Object.direction);
         end
-        Object.bound = { 
+        Object.bound = {
             x = Directions[Object.direction].x,
             y = Directions[Object.direction].y,
             cmp = Directions[Object.direction].cmp,
@@ -67,46 +70,47 @@ function Global.Game.Update(dt)
         if tileOnFuturePosition ~= "Grass" then
             Object.walking = NotWalking;
             if not Object.dead then
-                This:Animator():setKey("Idle_" .. Object.direction);
+                This.Animator:setKey("Idle_" .. Object.direction);
             end
         else
-            Object.pos = { 
+            Object.pos = {
                 x = Object.pos.x + Directions[Object.direction].x,
                 y = Object.pos.y + Directions[Object.direction].y
             };
         end
     elseif Object.walking == Walking then
         local mx, my;
         if Object.bound.use == "x" then
-            mx, my = Object.bound.x * dt * Object.speed, 0;
-        else 
-            mx, my = 0, Object.bound.y * dt * Object.speed;
+            mx, my = Object.bound.x * evt.dt * Object.speed, 0;
+        else
+            mx, my = 0, Object.bound.y * evt.dt * Object.speed;
         end
-        local move = obe.UnitVector(mx, my);
-        This:LevelSprite():move(move);
-        local newpos = This:LevelSprite():getPosition(obe.Referential.TopLeft);
-        if CompOps[Object.bound.cmp](newpos[Object.bound.use], Object.pos[Object.bound.use] * Object.sprSize) then
+        local move = obe.Transform.UnitVector(mx, my);
+        This.Sprite:move(move);
+        local newpos = This.Sprite:getPosition(obe.Transform.Referential.TopLeft);
+        if CompOps[Object.bound.cmp](
+            newpos[Object.bound.use], Object.pos[Object.bound.use] * Object.sprSize
+        ) then
             Object.walking = EndWalking;
         end
     elseif Object.walking == EndWalking then
         if not InputManager:getAction(Object.cid .. "_" .. Object.direction):check() then
             if not Object.dead then
-                This:Animator():setKey("Idle_" .. Object.direction);
+                This.Animator:setKey("Idle_" .. Object.direction);
             end
             Object.walking = NotWalking;
         else
             Object.walking = StartWalking;
         end
     else
-        local spritePos = obe.UnitVector(
-            Object.pos.x * This:LevelSprite():getSize().x, 
-            Object.pos.y * This:LevelSprite():getSize().y
+        local spritePos = obe.Transform.UnitVector(
+            Object.pos.x * This.Sprite:getSize().x, Object.pos.y * This.Sprite:getSize().y
         );
-        This:LevelSprite():setPosition(spritePos, obe.Referential.TopLeft);
+        This.Sprite:setPosition(spritePos, obe.Transform.Referential.TopLeft);
     end
 end
 
 function Object:kill()
     Object.dead = true;
-    This:Animator():setKey("Dead");
-end
+    This.Animator:setKey("Dead");
+end