/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:
7
7
                        print('hi')
8
8
                     end
9
9
 
10
 
                     --local dx = the.mouse.x - 400
11
 
                     --local dy = the.mouse.y - 300
12
 
                     local dx = love.mouse.getX() - 400
13
 
                     local dy = love.mouse.getY() - 300
 
10
                     local dx = love.mouse.getX() - the.app.width / 2
 
11
                     local dy = love.mouse.getY() - the.app.height / 2
14
12
 
15
13
                     self.acceleration.x = dx * 10
16
14
                     self.acceleration.y = dy * 10
17
15
 
18
16
                     --print(dx, dy)
19
17
 
20
 
                     -- NOTE: actually, maybe I want to show the mouse?
21
 
                     love.mouse.setPosition(400,300)
 
18
                     love.mouse.setPosition(the.app.width /2, the.app.height/2)
22
19
                  end
23
20
}
24
21
 
25
 
SpacePlayer = Fill:extend{
26
 
   fill = {255,0,0},
27
 
   height = 32,
28
 
   width = 32,
 
22
local velLimit = 600
 
23
--local velLimit = 50
 
24
SpacePlayer = Tile:extend{
 
25
   image = 'data/ship.png',
 
26
   maxVelocity = {x=velLimit,y=velLimit},
 
27
   minVelocity = {x=-velLimit, y=-velLimit},
 
28
   lastFired = 0,
29
29
   onStartFrame = function(self)
30
30
                     --local dx = love.mouse.getX() - self.x
31
31
                     --local dy = love.mouse.getY() - self.y
32
 
                     local dx = love.mouse.getX() - 400
33
 
                     local dy = love.mouse.getY() - 300
 
32
                     local dx = love.mouse.getX() - the.app.width / 2
 
33
                     local dy = love.mouse.getY() - the.app.height / 2
34
34
 
35
35
 
36
36
                     self.acceleration.x = dx * 2
37
37
                     self.acceleration.y = dy * 2
38
 
                  end
 
38
 
 
39
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
 
40
 
 
41
                     if the.mouse:pressed() and -- assumes left button
 
42
                       love.timer.getTime() - self.lastFired > 0.25 and
 
43
                       the.cursor:inTargetArea() then
 
44
                           --print('pew')
 
45
                           b = Bullet:new{
 
46
                              x = self.x, y = self.y,
 
47
                           }
 
48
                           the.app.view:add(b)
 
49
                           self.lastFired = love.timer.getTime()
 
50
                     end
 
51
                  end,
 
52
   onUpdate = function(self)
 
53
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
 
54
              end
39
55
}
 
 
b'\\ No newline at end of file'