/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 17:18:46 UTC
  • Revision ID: josh@9ix.org-20130428171846-5m9e3db99r338ppj
foresthut

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
9
9
require 'player'
10
10
require 'transition'
11
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
 
12
15
require 'svg_levels'
13
16
 
14
17
levels = {
21
24
                      Tile:new{image = 'data/forest1-fg.png'}
22
25
                   } end,
23
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
   },
24
35
   shore = {
25
36
      objects = function() return {
26
37
                      Tile:new{image = 'data/shore-bg.png'},
51
62
}
52
63
 
53
64
GameView = View:extend {
54
 
   level = 'forest1', --default level
 
65
   level = 'shore', --default level
55
66
   onNew = function (self)
56
67
              --print('loading level: '..self.level)
57
68
              for _, obj in ipairs(levels[self.level].objects()) do
58
69
                 self:add(obj)
59
70
              end
60
71
              for _, obj in ipairs(svg_objects[self.level]) do
61
 
                 self:add(obj)
 
72
                 if not the.inventory.items[obj.name] then
 
73
                    self:add(obj)
 
74
                 end
62
75
              end
63
76
 
 
77
              self:add(the.inventory)
 
78
 
64
79
              self:flash({0,0,0})
65
80
 
66
81
              --self.focus = the.player
68
83
           end,
69
84
   draw = function (self, x, y)
70
85
             View.draw(self, x, y)
71
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
86
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
72
87
             love.graphics.print('version:' .. VERSION, 20, 570)
73
88
          end,
74
89
   onUpdate = function (self, dt)
75
 
                 if the.keys:justPressed('a') then
76
 
                    the.app.view = GameView:new{level = 'forest1'}
77
 
                 elseif the.keys:justPressed('b') then
78
 
                    the.app.view = GameView:new{level = 'shore'}
79
 
                 end
80
90
              end
81
91
}
82
92