/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-07 22:24:32 UTC
  • Revision ID: josh@9ix.org-20130507222432-74d3ul1p8ffq40s5
only fire if cursor is in target area.  change cursor to reflect this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
6
6
vector = require 'vector'
7
7
 
8
8
require 'version'
9
 
require 'wrap_tile'
10
9
require 'player'
11
10
require 'enemy'
12
11
require 'cursor'
24
23
 
25
24
GameView = View:extend {
26
25
   onNew = function (self)
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)
 
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
43
34
 
44
35
              --the.player = CrystalPlayer:new{x=400,y=300}
45
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
36
              the.player = SpacePlayer:new{x=400,y=300}
46
37
              self:add(the.player)
47
38
 
48
39
              self:add(Enemy:new{x=400, y=300})
84
75
              if DEBUG then
85
76
                 self.console:watch('VERSION', 'VERSION')
86
77
                 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')
91
78
                 --self.console:watch('drawTook', 'the.drawTook')
92
 
 
93
 
                 -- back off that dark overlay a bit
94
 
                 self.console.fill.fill[4] = 75
95
79
              end
96
80
           end,
97
81
   onUpdate = function (self, dt)