/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
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'},
31
42
                      Transition:new{x = 10, y = 133, target = 'forest1',
32
43
                                     targetX = 735, targetY = 370}
33
44
                   } end
 
45
   },
 
46
   lake = {
 
47
      objects = function() return {
 
48
                      Tile:new{image = 'data/lake-bg.png'},
 
49
                      Player:new{x = 540, y = 266,
 
50
                                 image = 'data/lake-player.png'},
 
51
                   }
 
52
                end
 
53
   },
 
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 = {
 
63
      objects = function() return {
 
64
                      Tile:new{image = 'data/bridge-bg.png'},
 
65
                      Player:new{x = 121, y = 440,
 
66
                                 image = 'data/bridge-player.png'},
 
67
                      Tile:new{image = 'data/bridge-fg.png'}
 
68
                   }
 
69
                end
34
70
   }
35
71
}
36
72
 
37
73
GameView = View:extend {
38
 
   level = 'forest1', --default level
 
74
   level = 'shore', --default level
39
75
   onNew = function (self)
40
76
              --print('loading level: '..self.level)
 
77
              if not levels[self.level] then
 
78
                 error('no such level: '..self.level)
 
79
              end
41
80
              for _, obj in ipairs(levels[self.level].objects()) do
42
81
                 self:add(obj)
43
82
              end
44
83
              for _, obj in ipairs(svg_objects[self.level]) do
45
 
                 self:add(obj)
 
84
                 if not the.inventory.items[obj.name] then
 
85
                    self:add(obj)
 
86
                 end
46
87
              end
47
88
 
 
89
              self:add(the.inventory)
 
90
 
48
91
              self:flash({0,0,0})
49
92
 
50
93
              --self.focus = the.player
52
95
           end,
53
96
   draw = function (self, x, y)
54
97
             View.draw(self, x, y)
55
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
98
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
56
99
             love.graphics.print('version:' .. VERSION, 20, 570)
57
100
          end,
58
101
   onUpdate = function (self, dt)
59
 
                 if the.keys:justPressed('a') then
60
 
                    the.app.view = GameView:new{level = 'forest1'}
61
 
                 elseif the.keys:justPressed('b') then
62
 
                    the.app.view = GameView:new{level = 'shore'}
63
 
                 end
64
102
              end
65
103
}
66
104
 
91
129
               end
92
130
            end
93
131
}
 
132
 
 
133
-- for accessing from debug console
 
134
function l(level)
 
135
   the.app.view = GameView:new{level = level}
 
136
end
 
 
b'\\ No newline at end of file'