/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-20 16:51:19 UTC
  • Revision ID: josh@9ix.org-20130520165119-mkjh7d9408e6ig0u
extract updating score.  update score again when you calc high score - 
should mitigate a bug I saw happen when thor played that put final score 
+ high score out of sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 600
 
22
local velLimit = 400
23
23
--local velLimit = 50
24
 
SpacePlayer = Tile:extend{
 
24
SpacePlayer = WrapTile: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
 
                     --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)
 
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
40
48
 
41
49
                     if the.mouse:pressed() and -- assumes left button
42
50
                       love.timer.getTime() - self.lastFired > 0.25 and
43
51
                       the.cursor:inTargetArea() then
44
52
                           --print('pew')
45
53
                           b = Bullet:new{
46
 
                              x = self.x, y = self.y,
 
54
                              x = self.x + self.width / 2,
 
55
                              y = self.y + self.height / 2,
47
56
                           }
48
 
                           the.app.view:add(b)
49
57
                           self.lastFired = love.timer.getTime()
50
58
                     end
51
59
                  end,
52
60
   onUpdate = function(self)
53
 
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
54
 
              end
 
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
 
 
84
                     the.app.view:updateScore()
 
85
 
 
86
                     local score = love.timer.getTime() - the.app.view.gameStart
 
87
                     if score > the.storage.data.highScore then
 
88
                        the.storage.data.highScore = score
 
89
                        the.storage:save()
 
90
 
 
91
                        the.highScore.text = string.format(
 
92
                           'High Score: %d:%02d', score / 60, score % 60
 
93
                        )
 
94
                     end
 
95
                  end
 
96
               end
55
97
}
 
 
b'\\ No newline at end of file'