/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-05-09 00:35:25 UTC
  • Revision ID: josh@9ix.org-20130509003525-ad51iyqb2j9eg1wl
get lasers going the right way

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
--__ = require 'underscore'
6
6
vector = require 'vector'
7
7
 
8
 
require 'group'
9
 
 
10
8
require 'version'
11
 
require 'wrap_tile'
12
9
require 'player'
13
10
require 'enemy'
14
11
require 'cursor'
15
12
require 'bullet'
16
 
require 'rock'
17
13
 
18
14
util = {
19
15
   signOf = function(value)
26
22
}
27
23
 
28
24
GameView = View:extend {
29
 
   lastRock = 0,
30
 
   rockInterval = 1,
31
 
   gameStart = 0,
32
25
   onNew = function (self)
33
 
              -- for x = 1,30 do
34
 
              --    for y = 1,30 do
35
 
              --       self:add(Fill:new{x=x*400, y=y*400,
36
 
              --                         width = 32, height = 32,
37
 
              --                         fill = {0,0,255}
38
 
              --                      })
39
 
              --    end
40
 
              -- end
41
 
 
42
 
              the.bg = Tile:new{
43
 
                 image = 'data/stars3.png',
44
 
                 -- 1366x768 * 3
45
 
                 width = 4098,
46
 
                 height = 2304
47
 
              }
48
 
              self:add(the.bg)
 
26
              for x = 1,30 do
 
27
                 for y = 1,30 do
 
28
                    self:add(Fill:new{x=x*400, y=y*400,
 
29
                                      width = 32, height = 32,
 
30
                                      fill = {0,0,255}
 
31
                                   })
 
32
                 end
 
33
              end
49
34
 
50
35
              --the.player = CrystalPlayer:new{x=400,y=300}
51
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
36
              the.player = SpacePlayer:new{x=400,y=300}
52
37
              self:add(the.player)
53
38
 
54
39
              self:add(Enemy:new{x=400, y=300})
62
47
              --self:loadLayers('data/map.lua')
63
48
              self.focus = the.player
64
49
              --self:clampTo(self.map)
65
 
 
66
 
              self.gameStart = love.timer.getTime()
67
50
           end,
68
 
   onUpdate = function(self, dt)
69
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
70
 
                    local rock = Rock:new{
71
 
                       x = math.random(the.bg.width),
72
 
                       y = math.random(the.bg.height),
73
 
                       velocity = {
74
 
                          x = math.random(-300, 300),
75
 
                          y = math.random(-300, 300),
76
 
                          rotation = math.random(-7, 7)
77
 
                       },
78
 
                       scale = math.random() + 0.5
79
 
                    }
80
 
                    self:add(rock)
81
 
 
82
 
                    self.lastRock = love.timer.getTime()
83
 
                 end
84
 
              end,
85
51
   draw = function (self, x, y)
86
52
             View.draw(self, x, y)
87
53
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
105
71
the.app = App:new {
106
72
   onRun = function (self)
107
73
              print('Version: ' .. VERSION)
108
 
 
109
 
              math.randomseed(os.time())
110
 
 
111
74
              self.view = GameView:new()
112
75
              if DEBUG then
113
76
                 self.console:watch('VERSION', 'VERSION')
114
77
                 self.console:watch('updateTook', 'the.updateTook')
115
 
                 self.console:watch('the.player.x', 'the.player.x')
116
 
                 self.console:watch('the.player.y', 'the.player.y')
117
 
                 self.console:watch('the.app.width', 'the.app.width')
118
 
                 self.console:watch('the.app.height', 'the.app.height')
119
78
                 --self.console:watch('drawTook', 'the.drawTook')
120
 
 
121
 
                 -- back off that dark overlay a bit
122
 
                 self.console.fill.fill[4] = 75
123
79
              end
124
80
           end,
125
81
   onUpdate = function (self, dt)