/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:
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
 
   onNew = function(self)
30
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
31
 
           end,
32
29
   onStartFrame = function(self)
33
 
                     --- TAKE 2
34
 
 
35
 
                     local mouseVec = vector.new(
36
 
                        love.mouse.getX() - the.app.width / 2,
37
 
                        love.mouse.getY() - the.app.height / 2
38
 
                     )
39
 
 
40
 
                     self.rotation = math.atan2(mouseVec.y, mouseVec.x)
41
 
 
42
 
                     if mouseVec:len2() > 64^2 then
43
 
                        self.acceleration = vector.new(300, 0)
44
 
                        self.acceleration:rotate_inplace(self.rotation)
45
 
                        self.thrust.visible = true
46
 
                     else
47
 
                        self.acceleration = {x=0, y=0}
48
 
                        self.thrust.visible = false
49
 
                        if DEBUG and the.console.visible then
50
 
                           self.velocity = {x=0, y=0}
51
 
                        end
52
 
                     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)
53
40
 
54
41
                     if the.mouse:pressed() and -- assumes left button
55
42
                       love.timer.getTime() - self.lastFired > 0.25 and
56
43
                       the.cursor:inTargetArea() then
57
44
                           --print('pew')
58
45
                           b = Bullet:new{
59
 
                              x = self.x + self.width / 2,
60
 
                              y = self.y + self.height / 2,
 
46
                              x = self.x, y = self.y,
61
47
                           }
 
48
                           the.app.view:add(b)
62
49
                           self.lastFired = love.timer.getTime()
63
50
                     end
64
51
                  end,
65
52
   onUpdate = function(self)
66
 
                 self.thrust.x = self.x - self.width
67
 
                 self.thrust.y = self.y
68
 
                 self.thrust.rotation = self.rotation
69
 
              end,
70
 
   onEndFrame = function(self)
71
 
                   self:collide(the.rockColliders)
72
 
                end,
73
 
   onCollide = function(self, other)
74
 
                  if other:instanceOf(RockCollider) then
75
 
                     the.app.view:add( Boom:new {
76
 
                                          x = self.x,
77
 
                                          y = self.y,
78
 
                                          velocity = { rotation = 5 }
79
 
                                       })
80
 
 
81
 
                     self:die()
82
 
                     self.thrust:die()
83
 
 
84
 
                     the.over.visible = true
85
 
                     the.instructions.visible = true
86
 
                     the.app.view:updateScore()
87
 
 
88
 
                     local score = love.timer.getTime() - the.app.view.gameStart
89
 
                     if score > the.storage.data.highScore then
90
 
                        the.storage.data.highScore = score
91
 
                        the.storage:save()
92
 
 
93
 
                        the.highScore.text = string.format(
94
 
                           'High Score: %d:%02d', score / 60, score % 60
95
 
                        )
96
 
                     end
97
 
                  end
98
 
               end
 
53
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
 
54
              end
99
55
}
 
 
b'\\ No newline at end of file'