/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 = 300
 
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
 
   cargoSpace = 20,
32
 
   onPlanet = false,
33
 
   onNew = function(self)
34
 
              self.thrust = Tile:new{image = 'data/thrust.png'}
35
 
              self.shield = Shield:new{ship = self}
36
 
           end,
37
29
   onStartFrame = function(self)
38
30
                     --- TAKE 2
39
31
 
47
39
                     if mouseVec:len2() > 64^2 then
48
40
                        self.acceleration = vector.new(300, 0)
49
41
                        self.acceleration:rotate_inplace(self.rotation)
50
 
                        self.thrust.visible = true
51
42
                     else
52
43
                        self.acceleration = {x=0, y=0}
53
 
                        self.thrust.visible = false
54
44
                        if DEBUG and the.console.visible then
55
45
                           self.velocity = {x=0, y=0}
56
46
                        end
63
53
                           b = Bullet:new{
64
54
                              x = self.x + self.width / 2,
65
55
                              y = self.y + self.height / 2,
66
 
                              rotation = self.rotation,
67
 
                              source = self
68
56
                           }
69
57
                           self.lastFired = love.timer.getTime()
70
58
                     end
71
59
                  end,
72
60
   onUpdate = function(self)
73
 
                 self.thrust.x = self.x - self.width
74
 
                 self.thrust.y = self.y
75
 
                 self.thrust.rotation = self.rotation
76
61
              end,
77
62
   onEndFrame = function(self)
78
63
                   self:collide(the.rockColliders)
79
64
                end,
80
65
   onCollide = function(self, other)
81
 
                  if other:instanceOf(Bullet) and other.source ~= self then
82
 
                     if self.shield.strength == 0 then
83
 
                        -- die
84
 
                        the.app.view:add( Boom:new {
85
 
                                             x = self.x,
86
 
                                             y = self.y,
87
 
                                             velocity = { rotation = 5 }
88
 
                                          })
89
 
 
90
 
                        self:die()
91
 
                        self.thrust:die()
92
 
                     else
93
 
                        self.shield:onHit()
94
 
                     end
95
 
 
96
 
                     other:die()
97
 
                     the.bullets:remove(other)
98
 
                  end
99
 
 
100
66
                  if other:instanceOf(RockCollider) then
101
67
                     the.app.view:add( Boom:new {
102
68
                                          x = self.x,
105
71
                                       })
106
72
 
107
73
                     self:die()
108
 
                     self.thrust:die()
109
 
                  end
110
 
 
111
 
                  if not self.active then
112
 
                     the.interface:add(GameOver:new())
113
 
                  end
114
 
               end,
115
 
   buy = function(self, good, price)
116
 
            if self.money >= price and self:availableSpace() > 0 then
117
 
               self.goods[good] = (self.goods[good] or 0) + 1
118
 
               self.money = self.money - price
119
 
            end
120
 
         end,
121
 
   sell = function(self, good, price)
122
 
             if self.goods[good] and self.goods[good] > 0 then
123
 
                self.goods[good] = self.goods[good] - 1
124
 
                self.money = self.money + price
125
 
             end
126
 
          end,
127
 
   availableSpace = function(self)
128
 
                       local cargo = 0
129
 
                       for _, amt in pairs(self.goods) do
130
 
                          cargo = cargo + amt
131
 
                       end
132
 
 
133
 
                       return self.cargoSpace - cargo
134
 
                    end,
135
 
   save = function(self)
136
 
             -- save player data
137
 
             the.storage.data.player = {x = self.x,
138
 
                                        y = self.y,
139
 
                                        money = self.money,
140
 
                                        goods = self.goods,
141
 
                                        cargoSpace = self.cargoSpace
142
 
                                     }
143
 
             the.storage:save()
144
 
          end
 
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
145
97
}
 
 
b'\\ No newline at end of file'