/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-15 23:38:45 UTC
  • Revision ID: josh@9ix.org-20130615233845-7jk8myzua5e842vz
money

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 = 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
   onNew = function(self)
 
31
              self.thrust = Tile:new{image = 'data/thrust.png'}
 
32
           end,
29
33
   onStartFrame = function(self)
30
34
                     --- TAKE 2
31
35
 
39
43
                     if mouseVec:len2() > 64^2 then
40
44
                        self.acceleration = vector.new(300, 0)
41
45
                        self.acceleration:rotate_inplace(self.rotation)
 
46
                        self.thrust.visible = true
42
47
                     else
43
48
                        self.acceleration = {x=0, y=0}
 
49
                        self.thrust.visible = false
44
50
                        if DEBUG and the.console.visible then
45
51
                           self.velocity = {x=0, y=0}
46
52
                        end
58
64
                     end
59
65
                  end,
60
66
   onUpdate = function(self)
 
67
                 self.thrust.x = self.x - self.width
 
68
                 self.thrust.y = self.y
 
69
                 self.thrust.rotation = self.rotation
61
70
              end,
62
71
   onEndFrame = function(self)
63
72
                   self:collide(the.rockColliders)
71
80
                                       })
72
81
 
73
82
                     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
 
                     --the.storage.data.highScore
 
83
                     self.thrust:die()
 
84
 
 
85
                     the.over.visible = true
 
86
                     the.instructions.visible = true
 
87
                     the.app.view:updateScore()
 
88
 
85
89
                     local score = love.timer.getTime() - the.app.view.gameStart
86
90
                     if score > the.storage.data.highScore then
87
91
                        the.storage.data.highScore = score