/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:58:19 UTC
  • Revision ID: josh@9ix.org-20130616035819-y3jhfpuogpmy7se4
more old code cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
7
7
                        print('hi')
8
8
                     end
9
9
 
10
 
                     local dx = love.mouse.getX() - 400
11
 
                     local dy = love.mouse.getY() - 300
 
10
                     local dx = love.mouse.getX() - the.app.width / 2
 
11
                     local dy = love.mouse.getY() - the.app.height / 2
12
12
 
13
13
                     self.acceleration.x = dx * 10
14
14
                     self.acceleration.y = dy * 10
15
15
 
16
16
                     --print(dx, dy)
17
17
 
18
 
                     love.mouse.setPosition(400,300)
 
18
                     love.mouse.setPosition(the.app.width /2, the.app.height/2)
19
19
                  end
20
20
}
21
21
 
22
 
local velLimit = 600
 
22
local velLimit = 400
 
23
--local velLimit = 50
23
24
SpacePlayer = Tile:extend{
24
25
   image = 'data/ship.png',
25
26
   maxVelocity = {x=velLimit,y=velLimit},
26
27
   minVelocity = {x=-velLimit, y=-velLimit},
27
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,
28
34
   onStartFrame = function(self)
29
 
                     --local dx = love.mouse.getX() - self.x
30
 
                     --local dy = love.mouse.getY() - self.y
31
 
                     local dx = love.mouse.getX() - 400
32
 
                     local dy = love.mouse.getY() - 300
33
 
 
34
 
 
35
 
                     self.acceleration.x = dx * 2
36
 
                     self.acceleration.y = dy * 2
37
 
 
38
 
                     --TODO: acceleration limit.  It should at least be proportional (not 16:9)
39
 
 
40
 
                     if the.mouse:pressed() then -- assumes left button
41
 
                        if love.timer.getTime() - self.lastFired > 0.25 then
 
35
                     --- TAKE 2
 
36
 
 
37
                     local mouseVec = vector.new(
 
38
                        love.mouse.getX() - the.app.width / 2,
 
39
                        love.mouse.getY() - the.app.height / 2
 
40
                     )
 
41
 
 
42
                     self.rotation = math.atan2(mouseVec.y, mouseVec.x)
 
43
 
 
44
                     if mouseVec:len2() > 64^2 then
 
45
                        self.acceleration = vector.new(300, 0)
 
46
                        self.acceleration:rotate_inplace(self.rotation)
 
47
                        self.thrust.visible = true
 
48
                     else
 
49
                        self.acceleration = {x=0, y=0}
 
50
                        self.thrust.visible = false
 
51
                        if DEBUG and the.console.visible then
 
52
                           self.velocity = {x=0, y=0}
 
53
                        end
 
54
                     end
 
55
 
 
56
                     if the.mouse:pressed() and -- assumes left button
 
57
                       love.timer.getTime() - self.lastFired > 0.25 and
 
58
                       the.cursor:inTargetArea() then
42
59
                           --print('pew')
43
60
                           b = Bullet:new{
44
 
                              x = self.x, y = self.y,
45
 
                              rotation = self.rotation,
46
 
                              velocity = {
47
 
                                 x = self.velocity.x * 1.5,
48
 
                                 y = self.velocity.y * 1.5
49
 
                              },
 
61
                              x = self.x + self.width / 2,
 
62
                              y = self.y + self.height / 2,
50
63
                           }
51
 
                           the.app.view:add(b)
52
64
                           self.lastFired = love.timer.getTime()
53
 
                        end
54
65
                     end
55
66
                  end,
56
67
   onUpdate = function(self)
57
 
                 self.rotation = math.atan2(self.velocity.y, self.velocity.x)
58
 
              end
 
68
                 self.thrust.x = self.x - self.width
 
69
                 self.thrust.y = self.y
 
70
                 self.thrust.rotation = self.rotation
 
71
              end,
 
72
   onEndFrame = function(self)
 
73
                   self:collide(the.rockColliders)
 
74
                end,
 
75
   onCollide = function(self, other)
 
76
                  if other:instanceOf(RockCollider) then
 
77
                     the.app.view:add( Boom:new {
 
78
                                          x = self.x,
 
79
                                          y = self.y,
 
80
                                          velocity = { rotation = 5 }
 
81
                                       })
 
82
 
 
83
                     self:die()
 
84
                     self.thrust:die()
 
85
 
 
86
                     the.over.visible = true
 
87
                     the.instructions.visible = true
 
88
                     the.app.view:updateScore()
 
89
 
 
90
                     local score = love.timer.getTime() - the.app.view.gameStart
 
91
                     if score > the.storage.data.highScore then
 
92
                        the.storage.data.highScore = score
 
93
                        the.storage:save()
 
94
 
 
95
                        the.highScore.text = string.format(
 
96
                           'High Score: %d:%02d', score / 60, score % 60
 
97
                        )
 
98
                     end
 
99
                  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
59
113
}
 
 
b'\\ No newline at end of file'