/traderous

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-05-13 20:32:58 UTC
  • Revision ID: josh@9ix.org-20130513203258-eywmfkprzcgw3jz6
slow the ship down a bit

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
21
21
 
22
22
local velLimit = 400
23
23
--local velLimit = 50
24
 
SpacePlayer = WrapTile:extend{
 
24
SpacePlayer = Tile:extend{
25
25
   image = 'data/ship.png',
26
26
   maxVelocity = {x=velLimit,y=velLimit},
27
27
   minVelocity = {x=-velLimit, y=-velLimit},
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
47
44
                     end
48
45
 
49
46
                     if the.mouse:pressed() and -- assumes left button
51
48
                       the.cursor:inTargetArea() then
52
49
                           --print('pew')
53
50
                           b = Bullet:new{
54
 
                              x = self.x + self.width / 2,
55
 
                              y = self.y + self.height / 2,
 
51
                              x = self.x, y = self.y,
56
52
                           }
 
53
                           the.app.view:add(b)
57
54
                           self.lastFired = love.timer.getTime()
58
55
                     end
59
56
                  end,
60
57
   onUpdate = function(self)
61
 
              end,
62
 
   onEndFrame = function(self)
63
 
                   self:collide(the.rockColliders)
64
 
                end,
65
 
   onCollide = function(self, other)
66
 
                  if other:instanceOf(RockCollider) then
67
 
                     the.app.view:add( Boom:new {
68
 
                                          x = self.x,
69
 
                                          y = self.y,
70
 
                                          velocity = { rotation = 5 }
71
 
                                       })
72
 
 
73
 
                     self:die()
74
 
 
75
 
                     local over = Text:new{
76
 
                        y = self.y,
77
 
                        x = self.x - the.app.width / 2,
78
 
                        width = the.app.width,
79
 
                        align = 'center',
80
 
                        font = 25,
81
 
                        text = "Game Over" }
82
 
                     the.app.view:add(over)
83
 
                  end
84
 
               end
 
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
              end
85
71
}
 
 
b'\\ No newline at end of file'