/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 = 380,
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
 
                                     targetX = 735, targetY = 370}
33
 
                   } end
34
 
   },
35
 
   lake = {
36
 
      objects = function() return {
37
 
                      Tile:new{image = 'data/lake-bg.png'},
38
 
                      Player:new{x = 540, y = 266,
39
 
                                 image = 'data/lake-player.png'},
40
 
                   }
41
 
                end
42
 
   },
43
 
   village = {
44
 
      objects = function() return {
45
 
                      Tile:new{image = 'data/village-bg.png'},
46
 
                      Player:new{x = 121, y = 440,
47
 
                                 image = 'data/village-player.png'},
48
 
                   }
49
 
                end
50
 
   }
51
 
}
52
 
 
53
19
GameView = View:extend {
54
 
   level = 'forest1', --default level
55
20
   onNew = function (self)
56
21
              --print('loading level: '..self.level)
 
22
              if not levels[self.level] then
 
23
                 error('no such level: '..self.level)
 
24
              end
57
25
              for _, obj in ipairs(levels[self.level].objects()) do
58
26
                 self:add(obj)
59
27
              end
60
28
              for _, obj in ipairs(svg_objects[self.level]) do
61
 
                 self:add(obj)
 
29
                 if not the.inventory.items[obj.name] then
 
30
                    self:add(obj)
 
31
                 end
62
32
              end
63
33
 
 
34
              self:add(the.inventory)
 
35
 
64
36
              self:flash({0,0,0})
65
37
 
66
38
              --self.focus = the.player
68
40
           end,
69
41
   draw = function (self, x, y)
70
42
             View.draw(self, x, y)
71
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
72
 
             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)
73
45
          end,
74
46
   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
47
              end
81
48
}
82
49
 
83
50
the.app = App:new {
 
51
   level = 'shore', --default level
84
52
   onRun = function (self)
85
 
              self.view = GameView:new()
 
53
              print('Version: ' .. VERSION)
 
54
              self.view = GameView:new{level = self.level}
86
55
              if DEBUG then
87
56
                 self.console:watch('VERSION', 'VERSION')
88
57
                 self.console:watch('updateTook', 'the.updateTook')
93
62
                 -- back off that dark overlay a bit
94
63
                 self.console.fill.fill[4] = 75
95
64
              end
 
65
 
 
66
              --the.inventory:add(Flower:new())
96
67
           end,
97
68
   onUpdate = function (self, dt)
98
69
                 if the.keys:justPressed('escape') then
111
82
-- for accessing from debug console
112
83
function l(level)
113
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()
114
93
end
 
 
b'\\ No newline at end of file'