/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-09 00:35:25 UTC
  • Revision ID: josh@9ix.org-20130509003525-ad51iyqb2j9eg1wl
get lasers going the right way

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 400
 
22
local velLimit = 600
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},
28
28
   lastFired = 0,
29
29
   onStartFrame = function(self)
30
 
                     --- TAKE 2
31
 
 
32
 
                     local mouseVec = vector.new(
33
 
                        love.mouse.getX() - the.app.width / 2,
34
 
                        love.mouse.getY() - the.app.height / 2
35
 
                     )
36
 
 
37
 
                     self.rotation = math.atan2(mouseVec.y, mouseVec.x)
38
 
 
39
 
                     if mouseVec:len2() > 64^2 then
40
 
                        self.acceleration = vector.new(300, 0)
41
 
                        self.acceleration:rotate_inplace(self.rotation)
42
 
                     else
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
 
                     end
 
30
                     --local dx = love.mouse.getX() - self.x
 
31
                     --local dy = love.mouse.getY() - self.y
 
32
                     local dx = love.mouse.getX() - the.app.width / 2
 
33
                     local dy = love.mouse.getY() - the.app.height / 2
 
34
 
 
35
 
 
36
                     self.acceleration.x = dx * 2
 
37
                     self.acceleration.y = dy * 2
 
38
 
 
39
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
48
40
 
49
41
                     if the.mouse:pressed() and -- assumes left button
50
42
                       love.timer.getTime() - self.lastFired > 0.25 and
51
43
                       the.cursor:inTargetArea() then
52
44
                           --print('pew')
53
45
                           b = Bullet:new{
54
 
                              x = self.x + self.width / 2,
55
 
                              y = self.y + self.height / 2,
 
46
                              x = self.x, y = self.y,
56
47
                           }
 
48
                           the.app.view:add(b)
57
49
                           self.lastFired = love.timer.getTime()
58
50
                     end
59
51
                  end,
60
52
   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
 
53
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
 
54
              end
85
55
}
 
 
b'\\ No newline at end of file'