/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-06-16 20:20:20 UTC
  • Revision ID: josh@9ix.org-20130616202020-dcra09dhl5bdx8lc
rotate enemy ship slower

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
30
30
   goods = {},
31
31
   onNew = function(self)
32
32
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
 
              self.shield = Shield:new{ship = self}
34
33
           end,
35
34
   onStartFrame = function(self)
36
35
                     --- TAKE 2
61
60
                           b = Bullet:new{
62
61
                              x = self.x + self.width / 2,
63
62
                              y = self.y + self.height / 2,
64
 
                              rotation = self.rotation,
65
 
                              source = self
 
63
                              rotation = self.rotation
66
64
                           }
67
65
                           self.lastFired = love.timer.getTime()
68
66
                     end
76
74
                   self:collide(the.rockColliders)
77
75
                end,
78
76
   onCollide = function(self, other)
79
 
                  if other:instanceOf(Bullet) and other.source ~= self then
80
 
                     if self.shield.strength == 0 then
81
 
                        -- die
82
 
                        the.app.view:add( Boom:new {
83
 
                                             x = self.x,
84
 
                                             y = self.y,
85
 
                                             velocity = { rotation = 5 }
86
 
                                          })
87
 
 
88
 
                        self:die()
89
 
                        self.thrust:die()
90
 
                     else
91
 
                        self.shield:onHit()
92
 
                     end
93
 
 
94
 
                     other:die()
95
 
                     the.bullets:remove(other)
96
 
                  end
97
 
 
98
77
                  if other:instanceOf(RockCollider) then
99
78
                     the.app.view:add( Boom:new {
100
79
                                          x = self.x,
104
83
 
105
84
                     self:die()
106
85
                     self.thrust:die()
107
 
                  end
108
86
 
109
 
                  if not self.active then
110
87
                     the.over.visible = true
111
88
                     the.instructions.visible = true
 
89
                     the.app.view:updateScore()
 
90
 
 
91
                     local score = love.timer.getTime() - the.app.view.gameStart
 
92
                     if score > the.storage.data.highScore then
 
93
                        the.storage.data.highScore = score
 
94
                        the.storage:save()
 
95
 
 
96
                        the.highScore.text = string.format(
 
97
                           'High Score: %d:%02d', score / 60, score % 60
 
98
                        )
 
99
                     end
112
100
                  end
113
101
               end,
114
102
   buy = function(self, good, price)