/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
21
21
 
22
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
 
   money = 2000, -- what to use for money symbol? ✪ or ☥ or Ⓐ?
30
 
   goods = {},
31
 
   onNew = function(self)
32
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
33
 
              self.shield = Shield:new{ship = self}
34
 
           end,
35
29
   onStartFrame = function(self)
36
30
                     --- TAKE 2
37
31
 
45
39
                     if mouseVec:len2() > 64^2 then
46
40
                        self.acceleration = vector.new(300, 0)
47
41
                        self.acceleration:rotate_inplace(self.rotation)
48
 
                        self.thrust.visible = true
49
42
                     else
50
43
                        self.acceleration = {x=0, y=0}
51
 
                        self.thrust.visible = false
52
44
                        if DEBUG and the.console.visible then
53
45
                           self.velocity = {x=0, y=0}
54
46
                        end
61
53
                           b = Bullet:new{
62
54
                              x = self.x + self.width / 2,
63
55
                              y = self.y + self.height / 2,
64
 
                              rotation = self.rotation
65
56
                           }
66
57
                           self.lastFired = love.timer.getTime()
67
58
                     end
68
59
                  end,
69
60
   onUpdate = function(self)
70
 
                 self.thrust.x = self.x - self.width
71
 
                 self.thrust.y = self.y
72
 
                 self.thrust.rotation = self.rotation
73
61
              end,
74
62
   onEndFrame = function(self)
75
63
                   self:collide(the.rockColliders)
76
64
                end,
77
65
   onCollide = function(self, other)
78
 
                  if other:instanceOf(Bullet) then
79
 
                     if self.shield.strength == 0 then
80
 
                        -- die
81
 
                        the.app.view:add( Boom:new {
82
 
                                             x = self.x,
83
 
                                             y = self.y,
84
 
                                             velocity = { rotation = 5 }
85
 
                                          })
86
 
 
87
 
                        self:die()
88
 
                        self.thrust:die()
89
 
                     else
90
 
                        self.shield:onHit()
91
 
                        other:die()
92
 
                        the.bullets:remove(other)
93
 
                     end
94
 
                  end
95
 
 
96
66
                  if other:instanceOf(RockCollider) then
97
67
                     the.app.view:add( Boom:new {
98
68
                                          x = self.x,
101
71
                                       })
102
72
 
103
73
                     self:die()
104
 
                     self.thrust:die()
105
 
 
106
 
                     the.over.visible = true
107
 
                     the.instructions.visible = true
 
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
 
108
84
                     the.app.view:updateScore()
109
85
 
110
86
                     local score = love.timer.getTime() - the.app.view.gameStart
117
93
                        )
118
94
                     end
119
95
                  end
120
 
               end,
121
 
   buy = function(self, good, price)
122
 
            if self.money >= price then
123
 
               self.goods[good] = (self.goods[good] or 0) + 1
124
 
               self.money = self.money - price
125
 
            end
126
 
         end,
127
 
   sell = function(self, good, price)
128
 
             if self.goods[good] and self.goods[good] > 0 then
129
 
                self.goods[good] = self.goods[good] - 1
130
 
                self.money = self.money + price
131
 
             end
132
 
          end
 
96
               end
133
97
}
 
 
b'\\ No newline at end of file'