/spacey

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-13 21:25:26 UTC
  • Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 600
 
22
local velLimit = 400
23
23
--local velLimit = 50
24
 
SpacePlayer = Tile:extend{
 
24
SpacePlayer = WrapTile:extend{
25
25
   image = 'data/ship.png',
26
26
   maxVelocity = {x=velLimit,y=velLimit},
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
37
37
                     self.rotation = math.atan2(mouseVec.y, mouseVec.x)
38
38
 
39
39
                     if mouseVec:len2() > 64^2 then
40
 
                        self.acceleration = vector.new(500, 0)
 
40
                        self.acceleration = vector.new(300, 0)
41
41
                        self.acceleration:rotate_inplace(self.rotation)
42
42
                     else
43
43
                        self.acceleration = {x=0, y=0}
 
44
                        if DEBUG and the.console.visible then
 
45
                           self.velocity = {x=0, y=0}
 
46
                        end
44
47
                     end
45
48
 
46
49
                     if the.mouse:pressed() and -- assumes left button
55
58
                     end
56
59
                  end,
57
60
   onUpdate = function(self)
58
 
                 if self.x < the.app.width / 2 then
59
 
                    self.x = the.bg.width - the.app.width / 2
60
 
                 elseif self.x > the.bg.width - the.app.width / 2 then
61
 
                    self.x = the.app.width / 2
62
 
                 end
63
 
 
64
 
                 if self.y < the.app.height / 2 then
65
 
                    self.y = the.bg.height - the.app.height / 2
66
 
                 elseif self.y > the.bg.height - the.app.height / 2 then
67
 
                    self.y = the.app.height / 2
68
 
                 end
69
 
 
70
61
              end
71
62
}
 
 
b'\\ No newline at end of file'