/ld28

To get this branch, use:
bzr branch http://9ix.org/bzr/ld28

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-12-15 03:05:42 UTC
  • Revision ID: josh@9ix.org-20131215030542-pneoyxj6rtm3c3hx
super hacky fix for passing through clones/goals

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
1
 
Player = Fill:extend {
2
 
   fill = {255,0,0},
3
 
   width = 16, height = 16,
 
1
Player = Tile:extend {
 
2
   image = 'data/player.png',
4
3
   queue = deque.new(),
5
4
   onNew = function(self)
6
5
              for _ = 1, math.random(1,3) do
37
36
                 end
38
37
              end,
39
38
   onCollide = function(self, other)
40
 
                  if other ~= the.view.map then
 
39
                  if other ~= the.view.map and other ~= the.goalPerson then
41
40
                     --print('collision')
42
41
 
43
42
                     other:displaceDir(self,