/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-07 22:24:32 UTC
  • Revision ID: josh@9ix.org-20130507222432-74d3ul1p8ffq40s5
only fire if cursor is in target area.  change cursor to reflect this.

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