Migrated Sokoban to v0.4:latest

Sygmei · Sygmei · commit 336e6d348742 · 2020-06-05T00:10:44.000+02:00
diff --git a/Sokoban/Data/GameObjects/Barrel/Barrel.obj.vili b/Sokoban/Data/GameObjects/Barrel/Barrel.obj.vili
@@ -1,13 +1,16 @@
-Include (Obe);
-
 Barrel:
     Sprite:
         path:"Sprites/GameObjects/Barrel/Barrel.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.1, 0.1)
+        rect:
+            x:0.0
+            y:0.0
+            width:0.1
+            height:0.1
+            unit:"SceneUnits"
         xTransform:"Camera"
         yTransform:"Camera"
-        layer:1.0
-        z-depth:1.0
+        layer:1
+        zdepth:1
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Barrel/Barrel.lua"
diff --git a/Sokoban/Data/GameObjects/Floor/Floor.obj.vili b/Sokoban/Data/GameObjects/Floor/Floor.obj.vili
@@ -1,13 +1,16 @@
-Include (Obe);
-
 Floor:
     Sprite:
         path:"Sprites/GameObjects/Floor/Floor.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.1, 0.1)
+        rect:
+            x:0.0
+            y:0.0
+            width:0.1
+            height:0.1
+            unit:"SceneUnits"
         xTransform:"Camera"
         yTransform:"Camera"
-        layer:1.0
-        z-depth:1.0
+        layer:1
+        zdepth:1
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Floor/Floor.lua"
diff --git a/Sokoban/Data/GameObjects/Game/Game.lua b/Sokoban/Data/GameObjects/Game/Game.lua
@@ -15,7 +15,9 @@ function Local.Init()
         y = victory_sprite:getSize().y / camera_size.y
     }
 
+    print("Loading Scene Sokoban.map.vili");
     Engine.Scene:loadFromFile("Data/Maps/Sokoban.map.vili", function()
+        print("================ OK SCENE LOADED ================")
         Engine.Scene:getGameObject("Terrain"):init(
             obe.System.Path("Data/Maps/level" .. Object.level .. ".txt"):find())
     end);
diff --git a/Sokoban/Data/GameObjects/Game/Game.obj.vili b/Sokoban/Data/GameObjects/Game/Game.obj.vili
@@ -1,7 +1,5 @@
-Include (Obe);
-
 Game:
     Script:
         source:"Data/GameObjects/Game/Game.lua"
-    permanent:True
+    permanent:true
 
diff --git a/Sokoban/Data/GameObjects/Objective/Objective.obj.vili b/Sokoban/Data/GameObjects/Objective/Objective.obj.vili
@@ -1,13 +1,16 @@
-Include (Obe);
-
 Objective:
     Sprite:
         path:"Sprites/GameObjects/Objective/Objective.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.1, 0.1)
+        rect:
+            x:0.0
+            y:0.0
+            width:0.1
+            height:0.1
+            unit:"SceneUnits"
         xTransform:"Camera"
         yTransform:"Camera"
-        layer:1.0
-        z-depth:2.0
+        layer:1
+        zdepth:2
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Objective/Objective.lua"
diff --git a/Sokoban/Data/GameObjects/Robot/Robot.lua b/Sokoban/Data/GameObjects/Robot/Robot.lua
@@ -15,6 +15,8 @@ EndWalking = 2;
 NotWalking = 3;
 
 function Local.Init(position)
+    print("Beep boop");
+    print("============= Initializing Robot", inspect(position));
     Terrain = Engine.Scene:getGameObject("Terrain");
     Object.pos = { x = position.x, y = position.y};
     Object.direction = "NONE";
@@ -28,6 +30,7 @@ function Local.Init(position)
         position.y * This.Sprite:getSize().y
     );
     This.Sprite:setPosition(pVec);
+    print("Robot is done");
 end
 
 function Object:getType()
@@ -39,6 +42,7 @@ function Object:getSprSize()
 end
 
 function InitializeBindings()
+    print("=============== Initializing Robot Bindings");
     for k, v in pairs(Directions) do
         Event.Actions[k] = function()
             if Object.walking == NotWalking and not Engine.Scene:getGameObject("Game").victory then
diff --git a/Sokoban/Data/GameObjects/Robot/Robot.obj.vili b/Sokoban/Data/GameObjects/Robot/Robot.obj.vili
@@ -1,14 +1,17 @@
-Include (Obe);
-
 Robot:
     Sprite:
-        path:"Sprites/GameObjects/Robot/Robot_DOWN.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.1, 0.1)
+        path:"Sprites/GameObjects/Robot/Robot_DOWNd.png"
+        rect:
+            x:0.0
+            y:0.0
+            width:0.1
+            height:0.1
+            unit:"SceneUnits"
         xTransform:"Camera"
         yTransform:"Camera"
-        layer:1.0
-        z-depth:1.0
+        layer:1
+        zdepth:1
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Robot/Robot.lua"
 
diff --git a/Sokoban/Data/GameObjects/Terrain/Terrain.lua b/Sokoban/Data/GameObjects/Terrain/Terrain.lua
@@ -17,13 +17,16 @@ function Object:uninit()
 end
 
 function Object:init(path)
+    print("Init terrain", path)
     if not Object.initialized and file_exists(path) then
         This:initialize();
+        print("Terrain initialized");
         local lines = lines_from(path)
         local maxY;
         local maxX;
         local sprSize;
         local load_table = {};
+        print("Lines", inspect(lines));
         for i, str in pairs(lines) do
             if maxY == nil or i>maxY then
                 maxY = i;
@@ -37,12 +40,14 @@ function Object:init(path)
                 load_table[i][j] = char;
             end
         end
+        print("Loadtable", inspect(load_table));
         local offset = {x = (maxX/2), y = (maxY/2)};
         for i, v in pairs(load_table) do
             Object.elements[i] = {}
             for j, v2 in pairs(v) do
                 if v2 ~= " " then
                     local position = { x = j-1, y = i-1 };
+                    print("Loading element", v2);
                     Object.elements[i][j] = blocFunctions[v2](position);
                     if sprSize == nil then
                         sprSize = Object.elements[i][j][1].getSprSize();
@@ -51,6 +56,7 @@ function Object:init(path)
             end
         end
 
+        print("Setting camera");
         local pVec = obe.Transform.UnitVector(
             offset.x * sprSize.x,
             offset.y * sprSize.y
@@ -63,6 +69,7 @@ function Object:init(path)
         local camera = Engine.Scene:getCamera();
         camera:setPosition(pVec, obe.Transform.Referential.Center);
         camera:scale(pSize, obe.Transform.Referential.Center);
+        print("Terrain done :)");
         Object.initialized = true;
     end
 end
diff --git a/Sokoban/Data/GameObjects/Terrain/Terrain.obj.vili b/Sokoban/Data/GameObjects/Terrain/Terrain.obj.vili
@@ -1,5 +1,5 @@
 Terrain:
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Terrain/Terrain.lua"
 
diff --git a/Sokoban/Data/GameObjects/Wall/Wall.obj.vili b/Sokoban/Data/GameObjects/Wall/Wall.obj.vili
@@ -1,13 +1,16 @@
-Include (Obe);
-
 Wall:
     Sprite:
         path:"Sprites/GameObjects/Wall/Wall.png"
-        rect:Rect<SceneUnits>(0.0, 0.0, 0.1, 0.1)
+        rect:
+            x:0.0
+            y:0.0
+            width:0.1
+            height:0.1
+            unit:"SceneUnits"
         xTransform:"Camera"
         yTransform:"Camera"
-        layer:1.0
-        z-depth:1.0
+        layer:1
+        zdepth:1
     Script:
-        priority:0.0
+        priority:0
         source:"Data/GameObjects/Wall/Wall.lua"
diff --git a/Sokoban/Data/Maps/Menu.map.vili b/Sokoban/Data/Maps/Menu.map.vili
@@ -1,14 +1,13 @@
-Include (Obe);
-Flag (Map);
-Flag (Lock);
-
 Meta:
     name:"Menu"
 
 View:
     size:1.0
-    pos:Vector2<SceneUnits>(0.0, 0.0)
-    Referential:Referential<TopLeft>()
+    position:
+        x:0.0
+        y:0.0
+        unit:"SceneUnits"
+    Referential:"TopLeft"
 
 GameObjects:
     Game:
diff --git a/Sokoban/Data/Maps/Sokoban.map.vili b/Sokoban/Data/Maps/Sokoban.map.vili
@@ -1,14 +1,13 @@
-Include (Obe);
-Flag (Map);
-Flag (Lock);
-
 Meta:
     name:"Sokoban"
 
 View:
     size:1.0
-    pos:Vector2<SceneUnits>(0.0, 0.0)
-    Referential:Referential<TopLeft>()
+    position:
+        x:0.0
+        y:0.0
+        unit:"SceneUnits"
+    Referential:"TopLeft"
 
 GameObjects:
     Terrain:
diff --git a/Sokoban/Data/config.cfg.vili b/Sokoban/Data/config.cfg.vili
@@ -1,5 +1,3 @@
-Define Flag (Settings);
-
 KeyBinding:
     game:
         UP:"Hold:Z"
diff --git a/Sokoban/Mount.vili b/Sokoban/Mount.vili
@@ -1,5 +1,3 @@
-Include(Obe);
-
 Mount:
-    Sokoban:Workspace("Sokoban", 1)
-    Root:Path("", 0)
+    Sokoban: Workspace { path: "Sokoban" }
+    Root: Path
diff --git a/Sokoban/Sprites/GameObjects/Robot/Robot_DOWN.png b/Sokoban/Sprites/GameObjects/Robot/Robot_DOWN.png

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ function Local.Init()`
`15`	`15`	`y = victory_sprite:getSize().y / camera_size.y`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ print("Loading Scene Sokoban.map.vili");`
`18`	`19`	`Engine.Scene:loadFromFile("Data/Maps/Sokoban.map.vili", function()`
	`20`	`+ print("================ OK SCENE LOADED ================")`
`19`	`21`	`Engine.Scene:getGameObject("Terrain"):init(`
`20`	`22`	`obe.System.Path("Data/Maps/level" .. Object.level .. ".txt"):find())`
`21`	`23`	`end);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-Define Flag (Settings);`
`2`		`-`
`3`	`1`	`KeyBinding:`
`4`	`2`	`game:`
`5`	`3`	`UP:"Hold:Z"`