/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-27 17:56:22 UTC
  • Revision ID: josh@9ix.org-20130427175622-ksu8aap9zjpcicvx
add shore, first pass level switching

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
7
7
require 'version'
8
8
 
9
9
require 'player'
10
 
require 'transition'
11
 
require 'displacer'
12
 
require 'inventory'
13
 
require 'levels'
14
 
require 'items'
15
 
require 'troll'
16
 
 
17
 
require 'svg_levels'
18
10
 
19
11
GameView = View:extend {
20
12
   onNew = function (self)
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
 
 
 
13
              self:newLevel('forest1')
 
14
 
 
15
              --self:loadLayers('data/map.lua')
38
16
              --self.focus = the.player
39
17
              --self:clampTo(self.map)
40
18
           end,
41
19
   draw = function (self, x, y)
42
20
             View.draw(self, x, y)
43
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
44
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
21
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
22
             love.graphics.print('version:' .. VERSION, 20, 570)
45
23
          end,
46
24
   onUpdate = function (self, dt)
 
25
                 if the.keys:justPressed('a') then
 
26
                    self:newLevel('forest1')
 
27
                 elseif the.keys:justPressed('b') then
 
28
                    self:newLevel('shore')
 
29
                 end
 
30
              end,
 
31
   newLevel = function (self, level)
 
32
                 self.sprites = {}
 
33
                 bg = Tile:new{image = 'data/' .. level .. '-bg.png'}
 
34
                 fg = Tile:new{image = 'data/' .. level .. '-fg.png'}
 
35
                 the.player = Player:new{x = 196, y = 350}
 
36
                 self:add(bg)
 
37
                 self:add(the.player)
 
38
                 self:add(fg)
47
39
              end
48
40
}
49
41
 
50
42
the.app = App:new {
51
 
   level = 'shore', --default level
52
43
   onRun = function (self)
53
 
              print('Version: ' .. VERSION)
54
 
              self.view = GameView:new{level = self.level}
 
44
              self.view = GameView:new()
55
45
              if DEBUG then
56
46
                 self.console:watch('VERSION', 'VERSION')
57
47
                 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')
60
48
                 --self.console:watch('drawTook', 'the.drawTook')
61
 
 
62
 
                 -- back off that dark overlay a bit
63
 
                 self.console.fill.fill[4] = 75
64
49
              end
65
 
 
66
 
              --the.inventory:add(Flower:new())
67
50
           end,
68
51
   onUpdate = function (self, dt)
69
52
                 if the.keys:justPressed('escape') then
78
61
               end
79
62
            end
80
63
}
81
 
 
82
 
function l(level)
83
 
   the.app.view = GameView:new{level = level}
84
 
end
85
 
 
86
 
function love.load(arg)
87
 
   if arg[2] then
88
 
      the.app.level = arg[2]
89
 
   end
90
 
 
91
 
   the.app:run()
92
 
end
 
 
b'\\ No newline at end of file'