Merge pull request #7 from hatkirby/es-rewrite

The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.

3 files changed, 48 insertions, 0 deletions

@@ -0,0 +1,19 @@
+checkpoint = {}
+
+function checkpoint.OnTouch(id, player)
+  curMap = entity.new(realizing().activeMap)
+
+  if not player:playable().checkpointMapObject or
+      not curMap:mappable().mapId == player:playable().checkpointMapId or
+      not id:prototypable().mapObjectIndex ==
+        player:playable().checkpointMapObjectIndex then
+
+    player:playable().checkpointMapObject = true
+    player:playable().checkpointMapId = curMap:mappable().mapId
+    player:playable().checkpointMapObjectIndex =
+      id:prototypable().mapObjectIndex
+    player:playable().checkpointPos = player:transformable().pos
+
+    playSound("res/Pickup_Coin23.wav", 0.25)
+  end
+end
@@ -0,0 +1,21 @@
+function waitForTick()
+  return coroutine.yield()
+end
+
+function moveLeft(id, len, speed)
+  local remaining = len / speed
+
+  while (remaining > 0) do
+    id:ponderable().vel.x = -speed
+    remaining = remaining - waitForTick()
+  end
+end
+
+function moveRight(id, len, speed)
+  local remaining = len / speed
+
+  while (remaining > 0) do
+    id:ponderable().vel.x = speed
+    remaining = remaining - waitForTick()
+  end
+end
@@ -0,0 +1,8 @@
+movplat = {}
+
+function movplat.Behavior(id)
+  while true do
+    moveRight(id, 90, 30)
+    moveLeft(id, 90, 30)
+  end
+end