/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 20:26:30 UTC
  • Revision ID: josh@9ix.org-20130513202630-jd3tf1rr5zp3gbcm
move player around looping world

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'
8
9
require 'player'
9
10
require 'enemy'
 
11
require 'cursor'
 
12
require 'bullet'
10
13
 
11
14
util = {
12
15
   signOf = function(value)
20
23
 
21
24
GameView = View:extend {
22
25
   onNew = function (self)
23
 
              for x = 1,30 do
24
 
                 for y = 1,30 do
25
 
                    self:add(Fill:new{x=x*400, y=y*400,
26
 
                                      width = 32, height = 32,
27
 
                                      fill = {0,0,255}
28
 
                                   })
29
 
                 end
30
 
              end
 
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
 
34
 
 
35
              the.bg = Tile:new{
 
36
                 image = 'data/stars3.png',
 
37
                 -- 1366x768 * 3
 
38
                 width = 4098,
 
39
                 height = 2304
 
40
              }
 
41
              self:add(the.bg)
31
42
 
32
43
              --the.player = CrystalPlayer:new{x=400,y=300}
33
 
              the.player = SpacePlayer:new{x=400,y=300}
 
44
              the.player = SpacePlayer:new{x=1366,y=768}
34
45
              self:add(the.player)
35
46
 
36
47
              self:add(Enemy:new{x=400, y=300})
37
48
 
 
49
              the.cursor = Cursor:new()
 
50
              self:add(the.cursor)
 
51
 
38
52
              love.mouse.setGrab(true)
39
 
              --love.mouse.setVisible(false)
 
53
              love.mouse.setVisible(false)
40
54
 
41
55
              --self:loadLayers('data/map.lua')
42
56
              self.focus = the.player
69
83
              if DEBUG then
70
84
                 self.console:watch('VERSION', 'VERSION')
71
85
                 self.console:watch('updateTook', 'the.updateTook')
 
86
                 self.console:watch('the.player.x', 'the.player.x')
 
87
                 self.console:watch('the.player.y', 'the.player.y')
 
88
                 self.console:watch('the.app.width', 'the.app.width')
 
89
                 self.console:watch('the.app.height', 'the.app.height')
72
90
                 --self.console:watch('drawTook', 'the.drawTook')
73
91
              end
74
92
           end,