/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 03:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 
22
22
local velLimit = 400
23
23
--local velLimit = 50
24
 
SpacePlayer = WrapTile:extend{
 
24
SpacePlayer = Tile: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
           end,
29
34
   onStartFrame = function(self)
30
35
                     --- TAKE 2
31
36
 
39
44
                     if mouseVec:len2() > 64^2 then
40
45
                        self.acceleration = vector.new(300, 0)
41
46
                        self.acceleration:rotate_inplace(self.rotation)
 
47
                        self.thrust.visible = true
42
48
                     else
43
49
                        self.acceleration = {x=0, y=0}
 
50
                        self.thrust.visible = false
44
51
                        if DEBUG and the.console.visible then
45
52
                           self.velocity = {x=0, y=0}
46
53
                        end
58
65
                     end
59
66
                  end,
60
67
   onUpdate = function(self)
 
68
                 self.thrust.x = self.x - self.width
 
69
                 self.thrust.y = self.y
 
70
                 self.thrust.rotation = self.rotation
61
71
              end,
62
72
   onEndFrame = function(self)
63
73
                   self:collide(the.rockColliders)
71
81
                                       })
72
82
 
73
83
                     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
                     self.thrust:die()
 
85
 
 
86
                     the.over.visible = true
 
87
                     the.instructions.visible = true
84
88
                     the.app.view:updateScore()
85
89
 
86
90
                     local score = love.timer.getTime() - the.app.view.gameStart
93
97
                        )
94
98
                     end
95
99
                  end
96
 
               end
 
100
               end,
 
101
   buy = function(self, good, price)
 
102
            if self.money >= price then
 
103
               self.goods[good] = (self.goods[good] or 0) + 1
 
104
               self.money = self.money - price
 
105
            end
 
106
         end,
 
107
   sell = function(self, good, price)
 
108
             if self.goods[good] and self.goods[good] > 0 then
 
109
                self.goods[good] = self.goods[good] - 1
 
110
                self.money = self.money + price
 
111
             end
 
112
          end
97
113
}
 
 
b'\\ No newline at end of file'