/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-13 21:25:26 UTC
  • Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
--__ = require 'underscore'
 
6
vector = require 'vector'
6
7
 
7
8
require 'version'
 
9
require 'wrap_tile'
8
10
require 'player'
9
11
require 'enemy'
10
12
require 'cursor'
 
13
require 'bullet'
11
14
 
12
15
util = {
13
16
   signOf = function(value)
21
24
 
22
25
GameView = View:extend {
23
26
   onNew = function (self)
24
 
              for x = 1,30 do
25
 
                 for y = 1,30 do
26
 
                    self:add(Fill:new{x=x*400, y=y*400,
27
 
                                      width = 32, height = 32,
28
 
                                      fill = {0,0,255}
29
 
                                   })
30
 
                 end
31
 
              end
 
27
              -- for x = 1,30 do
 
28
              --    for y = 1,30 do
 
29
              --       self:add(Fill:new{x=x*400, y=y*400,
 
30
              --                         width = 32, height = 32,
 
31
              --                         fill = {0,0,255}
 
32
              --                      })
 
33
              --    end
 
34
              -- end
 
35
 
 
36
              the.bg = Tile:new{
 
37
                 image = 'data/stars3.png',
 
38
                 -- 1366x768 * 3
 
39
                 width = 4098,
 
40
                 height = 2304
 
41
              }
 
42
              self:add(the.bg)
32
43
 
33
44
              --the.player = CrystalPlayer:new{x=400,y=300}
34
 
              the.player = SpacePlayer:new{x=400,y=300}
 
45
              the.player = SpacePlayer:new{x=1366,y=768}
35
46
              self:add(the.player)
36
47
 
37
48
              self:add(Enemy:new{x=400, y=300})
38
49
 
39
 
              self:add(Cursor:new())
 
50
              the.cursor = Cursor:new()
 
51
              self:add(the.cursor)
40
52
 
41
53
              love.mouse.setGrab(true)
42
54
              love.mouse.setVisible(false)
72
84
              if DEBUG then
73
85
                 self.console:watch('VERSION', 'VERSION')
74
86
                 self.console:watch('updateTook', 'the.updateTook')
 
87
                 self.console:watch('the.player.x', 'the.player.x')
 
88
                 self.console:watch('the.player.y', 'the.player.y')
 
89
                 self.console:watch('the.app.width', 'the.app.width')
 
90
                 self.console:watch('the.app.height', 'the.app.height')
75
91
                 --self.console:watch('drawTook', 'the.drawTook')
 
92
 
 
93
                 -- back off that dark overlay a bit
 
94
                 self.console.fill.fill[4] = 75
76
95
              end
77
96
           end,
78
97
   onUpdate = function (self, dt)