diff options
Diffstat (limited to 'Scripts')
| -rw-r--r-- | Scripts/init.lua | 32 | ||||
| -rw-r--r-- | Scripts/world.lua | 42 |
2 files changed, 54 insertions, 20 deletions
diff --git a/Scripts/init.lua b/Scripts/init.lua index d76a402..cdd6ccb 100644 --- a/Scripts/init.lua +++ b/Scripts/init.lua @@ -1,3 +1,5 @@ +game.loadFont("default", "Assets/FreePixel.ttf", 16) + player = { Player = 0, EventListeners = { @@ -6,6 +8,7 @@ player = { self.Render.flipx = true; end, MoveLeftReleased = function(self) + game.puts("default", self.Position.x, self.Position.y+100, "Hey. Hag?") self.Velocity.x = self.Velocity.x + 3.0 end, MoveRightPressed = function(self) @@ -52,20 +55,37 @@ player = { --end --self.visibleTick = self.visibleTick + 1 end, - PhysicsIdle = function(self) - if self.Velocity.x < 0 then - self.Render.flipx = true - elseif self.Velocity.x > 0 then - self.Render.flipx = false + visibleTick = 0 +} + +ball = { + Position = { + x = 20, + y = 100 + }, + Velocity = { + x = 0.0, + y = 0.0, + }, + Physics = 0, + Render = { + texture = "Assets/ball.png", + normal = "Assets/ball_normal.png", + visible = true, + }, + Idle = function(self) + if self.Physics.standing == true then + self.Velocity.y = self.Velocity.y + 15 + self.Velocity.x = math.random(-1, 1); end end, - visibleTick = 0 } -- Create the world dofile("Scripts/world.lua") playerSpawn = game.spawn(player); +game.spawn(ball); ------------------- -- SERIALIZING -- diff --git a/Scripts/world.lua b/Scripts/world.lua index 044559a..3b56d9a 100644 --- a/Scripts/world.lua +++ b/Scripts/world.lua @@ -13,51 +13,63 @@ world = { texture = { file = "Assets/world.png", offset = { x = 0, y = 0 }, - size = { x = 8, y = 8 } + size = { x = 64, y = 64 } }, normal = { file = "Assets/world_normal.png", offset = { x = 0, y = 0 }, - size = { x = 8, y = 8 } + size = { x = 64, y = 64 } } }); self:registerMaterial("dirt", { texture = { file = "Assets/world.png", - offset = { x = 8, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 64, y = 0 }, + size = { x = 64, y = 64 } }, normal = { file = "Assets/world_normal.png", - offset = { x = 8, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 64, y = 0 }, + size = { x = 64, y = 64 } } }); self:registerMaterial("stone", { texture = { file = "Assets/world.png", - offset = { x = 16, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 128, y = 0 }, + size = { x = 64, y = 64 } }, normal = { file = "Assets/world_normal.png", - offset = { x = 16, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 128, y = 0 }, + size = { x = 64, y = 64 } } }); self:registerMaterial("flower", { texture = { file = "Assets/world.png", - offset = { x = 24, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 192, y = 0 }, + size = { x = 64, y = 64 } }, normal = { file = "Assets/world_normal.png", - offset = { x = 24, y = 0 }, - size = { x = 8, y = 8 } + offset = { x = 192, y = 0 }, + size = { x = 64, y = 64 } }, passable = true }); + self:registerMaterial("trunk", { + texture = { + file = "Assets/world.png", + offset = { x = 256, y = 0 }, + size = { x = 64, y = 64 } + }, + normal = { + file = "Assets/world_normal.png", + offset = { x = 256, y = 0 }, + size = { x = 64, y = 64 } + } + }); end, Generate = function(self) @@ -83,6 +95,8 @@ world = { elseif Y == YGen + 1 then if math.random(0, 100) == 53 then self:setData(X, Y, Z, "flower"); + elseif math.random(0, 100) == 45 then + self:setData(X, Y, Z, "trunk"); end end --print(X..","..Y..","..Z); |