bzr branch
http://9ix.org/bzr/zoeplat
|
2
by Josh C
basic tiles, map, player, movement |
1 |
STRICT = true |
2 |
DEBUG = true |
|
3 |
||
4 |
require 'zoetrope' |
|
|
12
by Josh C
only jump when you're on the ground |
5 |
--inspect = require 'inspect' |
6 |
--_ = require 'underscore' |
|
|
2
by Josh C
basic tiles, map, player, movement |
7 |
|
|
10
by Josh C
make player an animation |
8 |
Player = Animation:extend {
|
|
2
by Josh C
basic tiles, map, player, movement |
9 |
image = 'data/player.png', |
|
10
by Josh C
make player an animation |
10 |
height = 32, |
11 |
width = 32, |
|
12 |
sequences = {
|
|
13 |
stand = { frames = { 1 }, fps = 1 },
|
|
14 |
walk = { frames = { 2, 3 }, fps = 5 },
|
|
15 |
jump = { frames = { 4 }, fps = 1 }
|
|
16 |
}, |
|
|
3
by Josh C
jump |
17 |
onNew = function (self) |
18 |
self.velocity.y = 0 |
|
|
5
by Josh C
use built-in maxVelocity system |
19 |
self.maxVelocity.y = 400 |
|
3
by Josh C
jump |
20 |
end, |
|
4
by Josh C
fix jitter caused by focus shift happening in the wrong order. Looks |
21 |
onStartFrame = function (self) |
22 |
-- this is all in startframe so it happens before |
|
23 |
-- physics calc at beginning of update |
|
|
3
by Josh C
jump |
24 |
|
|
12
by Josh C
only jump when you're on the ground |
25 |
-- jumping/falling updates could go in EndFrame... |
26 |
self.falling = self.velocity.y > 0 |
|
27 |
if self.falling then self.jumping = false end |
|
28 |
--print(self.jumping, self.falling) |
|
29 |
||
|
15
by Josh C
more reliable onGround calc |
30 |
if not self.onGround then |
|
13
by Josh C
reapply jump animation after Y collision. (there's a frame of no |
31 |
self:play('jump')
|
32 |
end |
|
33 |
||
|
6
by Josh C
whitespace cleanup |
34 |
self.velocity.x = 0 |
35 |
self.acceleration.y = 800 |
|
36 |
||
37 |
if the.keys:pressed('left') then
|
|
38 |
self.velocity.x = -200 |
|
|
15
by Josh C
more reliable onGround calc |
39 |
if self.onGround then self:play('walk') end
|
|
6
by Josh C
whitespace cleanup |
40 |
elseif the.keys:pressed('right') then
|
41 |
self.velocity.x = 200 |
|
|
15
by Josh C
more reliable onGround calc |
42 |
if self.onGround then self:play('walk') end
|
|
10
by Josh C
make player an animation |
43 |
else |
|
15
by Josh C
more reliable onGround calc |
44 |
if self.onGround then self:play('stand') end
|
|
6
by Josh C
whitespace cleanup |
45 |
end |
46 |
||
|
15
by Josh C
more reliable onGround calc |
47 |
if the.keys:justPressed('up') and self.onGround then
|
|
6
by Josh C
whitespace cleanup |
48 |
self.velocity.y = -400 |
|
12
by Josh C
only jump when you're on the ground |
49 |
self.jumping = true |
|
6
by Josh C
whitespace cleanup |
50 |
end |
51 |
end, |
|
|
15
by Josh C
more reliable onGround calc |
52 |
onUpdate = function (self) |
53 |
-- needs to happen right before collision |
|
54 |
self.onGround = false |
|
|
12
by Josh C
only jump when you're on the ground |
55 |
end, |
|
8
by Josh C
some basic collision (and workarounds) |
56 |
onCollide = function (self, other, xOverlap, yOverlap) |
57 |
-- seriously, why does this even fire? |
|
58 |
if other == the.view.map then return end |
|
59 |
||
60 |
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
|
|
61 |
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
|
|
62 |
||
63 |
-- assumption: any other collision is with a solid map tile |
|
64 |
if yOverlap > xOverlap then |
|
65 |
other:displace(self) |
|
|
16
by Josh C
try to track X collisions. break out Sprite's physics in prep for |
66 |
|
67 |
if self.velocity.x > 0 then |
|
68 |
self.onWall = 'right' |
|
69 |
elseif self.velocity.x < 0 then |
|
70 |
self.onWall = 'left' |
|
71 |
else |
|
72 |
print '??' |
|
73 |
end |
|
|
8
by Josh C
some basic collision (and workarounds) |
74 |
elseif xOverlap > yOverlap then |
75 |
-- check if we've moved since collisions were generated |
|
76 |
local xov, yov = self:overlap(other.x, other.y, |
|
77 |
other.width, other.height) |
|
78 |
if xov ~= 0 and yov ~= 0 then |
|
|
15
by Josh C
more reliable onGround calc |
79 |
--print('y collision')
|
80 |
if self.velocity.y > 0 then |
|
81 |
self.onGround = true |
|
82 |
end |
|
83 |
||
|
8
by Josh C
some basic collision (and workarounds) |
84 |
self.velocity.y = 0 |
85 |
other:displace(self) |
|
|
12
by Josh C
only jump when you're on the ground |
86 |
self.jumping = false |
|
8
by Josh C
some basic collision (and workarounds) |
87 |
end |
88 |
else |
|
89 |
print('??')
|
|
90 |
end |
|
91 |
||
|
12
by Josh C
only jump when you're on the ground |
92 |
end, |
|
2
by Josh C
basic tiles, map, player, movement |
93 |
} |
94 |
||
95 |
GameView = View:extend {
|
|
96 |
onNew = function (self) |
|
97 |
self:loadLayers('data/map.lua')
|
|
98 |
self.focus = the.player |
|
99 |
self:clampTo(self.map) |
|
|
8
by Josh C
some basic collision (and workarounds) |
100 |
end, |
101 |
onUpdate = function (self) |
|
102 |
--print('tick')
|
|
103 |
the.player:collide(self.map) |
|
104 |
--self.map:collide(the.player) |
|
105 |
end |
|
|
2
by Josh C
basic tiles, map, player, movement |
106 |
} |
107 |
||
108 |
the.app = App:new {
|
|
109 |
onRun = function (self) |
|
110 |
self.view = GameView:new() |
|
|
12
by Josh C
only jump when you're on the ground |
111 |
--print(inspect(_(the.app):keys())) |
|
15
by Josh C
more reliable onGround calc |
112 |
self.console:watch('onGround', 'the.player.onGround')
|
|
16
by Josh C
try to track X collisions. break out Sprite's physics in prep for |
113 |
self.console:watch('onWall', 'the.player.onWall')
|
|
2
by Josh C
basic tiles, map, player, movement |
114 |
end, |
115 |
onUpdate = function (self, dt) |
|
|
14
by Josh C
don't quit w/ escape if debug console is up |
116 |
if the.keys:justPressed('escape') and
|
117 |
not self.console.visible then |
|
|
12
by Josh C
only jump when you're on the ground |
118 |
love.event.quit() |
119 |
end |
|
|
2
by Josh C
basic tiles, map, player, movement |
120 |
end |
121 |
} |