/ld26

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-04-28 18:51:02 UTC
  • Revision ID: josh@9ix.org-20130428185102-2gekwj8pzvlnwvhb
collision tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
24
24
                      Tile:new{image = 'data/forest1-fg.png'}
25
25
                   } end,
26
26
   },
 
27
   foresthut = {
 
28
      objects = function() return {
 
29
                      Tile:new{image = 'data/foresthut-bg.png'},
 
30
                      Player:new{x = 745, y = 430,
 
31
                                 image = 'data/forest1-player.png'},
 
32
                      Tile:new{image = 'data/foresthut-fg.png'}
 
33
                   } end,
 
34
   },
27
35
   shore = {
28
36
      objects = function() return {
29
37
                      Tile:new{image = 'data/shore-bg.png'},
43
51
                   }
44
52
                end
45
53
   },
46
 
   village = {
 
54
   -- village = {
 
55
   --    objects = function() return {
 
56
   --                    Tile:new{image = 'data/village-bg.png'},
 
57
   --                    Player:new{x = 121, y = 440,
 
58
   --                               image = 'data/village-player.png'},
 
59
   --                 }
 
60
   --              end
 
61
   -- },
 
62
   bridge = {
47
63
      objects = function() return {
48
 
                      Tile:new{image = 'data/village-bg.png'},
 
64
                      Tile:new{image = 'data/bridge-bg.png'},
49
65
                      Player:new{x = 121, y = 440,
50
 
                                 image = 'data/village-player.png'},
 
66
                                 image = 'data/bridge-player.png'},
 
67
                      Tile:new{image = 'data/bridge-fg.png'}
51
68
                   }
52
69
                end
53
70
   }
54
71
}
55
72
 
56
73
GameView = View:extend {
57
 
   level = 'forest1', --default level
 
74
   level = 'shore', --default level
58
75
   onNew = function (self)
59
76
              --print('loading level: '..self.level)
 
77
              if not levels[self.level] then
 
78
                 error('no such level: '..self.level)
 
79
              end
60
80
              for _, obj in ipairs(levels[self.level].objects()) do
61
81
                 self:add(obj)
62
82
              end
79
99
             love.graphics.print('version:' .. VERSION, 20, 570)
80
100
          end,
81
101
   onUpdate = function (self, dt)
82
 
                 if the.keys:justPressed('a') then
83
 
                    the.app.view = GameView:new{level = 'forest1'}
84
 
                 elseif the.keys:justPressed('b') then
85
 
                    the.app.view = GameView:new{level = 'shore'}
86
 
                 end
87
102
              end
88
103
}
89
104