/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 22:26:28 UTC
  • Revision ID: josh@9ix.org-20130428222628-iw5am8h8mrzedutb
really basic feedback that your inventory changed

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 'levels'
 
14
require 'items'
 
15
require 'troll'
 
16
 
12
17
require 'svg_levels'
13
18
 
14
 
levels = {
15
 
   forest1 = {
16
 
      objects = function() return {
17
 
                      Tile:new{image = 'data/forest1-bg.png'},
18
 
                      Player:new{x = 200, y = 370,
19
 
                                 minY = 330, maxY = 500,
20
 
                                 image = 'data/forest1-player.png'},
21
 
                      Tile:new{image = 'data/forest1-fg.png'}
22
 
                   } end,
23
 
   },
24
 
   shore = {
25
 
      objects = function() return {
26
 
                      Tile:new{image = 'data/shore-bg.png'},
27
 
                      Player:new{x = 145, y = 133,
28
 
                                 minY = 133, maxY = 133,
29
 
                                 image = 'data/shore-player.png'},
30
 
                      Tile:new{image = 'data/shore-fg.png'},
31
 
                      Transition:new{x = 10, y = 133, target = 'forest1'}
32
 
                   } end
33
 
   }
34
 
}
35
 
 
36
19
GameView = View:extend {
37
20
   onNew = function (self)
38
 
              self:newLevel('forest1')
39
 
 
40
 
              --self:loadLayers('data/map.lua')
 
21
              --print('loading level: '..self.level)
 
22
              if not levels[self.level] then
 
23
                 error('no such level: '..self.level)
 
24
              end
 
25
              for _, obj in ipairs(levels[self.level].objects()) do
 
26
                 self:add(obj)
 
27
              end
 
28
              for _, obj in ipairs(svg_objects[self.level]) do
 
29
                 if not the.inventory.items[obj.name] then
 
30
                    self:add(obj)
 
31
                 end
 
32
              end
 
33
 
 
34
              self:add(the.inventory)
 
35
 
 
36
              self:flash({0,0,0})
 
37
 
41
38
              --self.focus = the.player
42
39
              --self:clampTo(self.map)
43
40
           end,
44
41
   draw = function (self, x, y)
45
42
             View.draw(self, x, y)
46
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
47
 
             love.graphics.print('version:' .. VERSION, 20, 570)
 
43
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
44
             --love.graphics.print('version:' .. VERSION, 20, 570)
48
45
          end,
49
46
   onUpdate = function (self, dt)
50
 
                 if the.keys:justPressed('a') then
51
 
                    self:newLevel('forest1')
52
 
                 elseif the.keys:justPressed('b') then
53
 
                    self:newLevel('shore')
54
 
                 end
55
 
              end,
56
 
   newLevel = function (self, level)
57
 
                 self.sprites = levels[level].objects()
58
 
                 for _, obj in ipairs(svg_objects[level]) do
59
 
                    self:add(obj)
60
 
                 end
61
47
              end
62
48
}
63
49
 
64
50
the.app = App:new {
 
51
   level = 'shore', --default level
65
52
   onRun = function (self)
66
 
              self.view = GameView:new()
 
53
              print('Version: ' .. VERSION)
 
54
              self.view = GameView:new{level = self.level}
67
55
              if DEBUG then
68
56
                 self.console:watch('VERSION', 'VERSION')
69
57
                 self.console:watch('updateTook', 'the.updateTook')
 
58
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
59
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
70
60
                 --self.console:watch('drawTook', 'the.drawTook')
71
61
 
72
62
                 -- back off that dark overlay a bit
73
63
                 self.console.fill.fill[4] = 75
74
64
              end
 
65
 
 
66
              --the.inventory:add(Flower:new())
75
67
           end,
76
68
   onUpdate = function (self, dt)
77
69
                 if the.keys:justPressed('escape') then
86
78
               end
87
79
            end
88
80
}
 
81
 
 
82
-- for accessing from debug console
 
83
function l(level)
 
84
   the.app.view = GameView:new{level = level}
 
85
end
 
86
 
 
87
function love.load(arg)
 
88
   if arg[2] then
 
89
      the.app.level = arg[2]
 
90
   end
 
91
 
 
92
   the.app:run()
 
93
end
 
 
b'\\ No newline at end of file'