/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
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--inspect = require 'inspect'
6
5
 
7
6
--require 'sprite'
8
7
require 'version'
9
8
 
10
9
require 'player'
11
 
require 'transition'
12
 
require 'displacer'
13
 
require 'inventory'
14
 
require 'levels'
15
 
require 'items'
16
 
require 'troll'
17
 
require 'gatetrigger'
18
 
 
19
 
require 'svg_levels'
20
10
 
21
11
GameView = View:extend {
22
12
   onNew = function (self)
23
 
              --print('loading level: '..self.level)
24
 
              if not levels[self.level] then
25
 
                 error('no such level: '..self.level)
26
 
              end
27
 
              for _, obj in ipairs(levels[self.level].objects()) do
28
 
                 self:add(obj)
29
 
                 --if obj.gateup then print('ADDING GATEUP') end
30
 
              end
31
 
              for _, obj in ipairs(svg_objects[self.level]) do
32
 
                 if not the.inventory.items[obj.name] then
33
 
                    self:add(obj)
34
 
                 end
35
 
                 if obj.name == 'flag' then
36
 
                    self:add(obj)
37
 
                 end
38
 
              end
39
 
 
40
 
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
41
 
 
42
 
              self:add(the.inventory)
43
 
 
44
 
              self:flash({0,0,0})
45
 
 
 
13
              self:newLevel('forest1')
 
14
 
 
15
              --self:loadLayers('data/map.lua')
46
16
              --self.focus = the.player
47
17
              --self:clampTo(self.map)
48
18
           end,
49
19
   draw = function (self, x, y)
50
20
             View.draw(self, x, y)
51
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
52
 
             --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)
53
23
          end,
54
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)
55
39
              end
56
40
}
57
41
 
58
42
the.app = App:new {
59
 
   level = 'shore', --default level
60
43
   onRun = function (self)
61
 
              print('Version: ' .. VERSION)
62
 
              self.view = GameView:new{level = self.level}
 
44
              self.view = GameView:new()
63
45
              if DEBUG then
64
46
                 self.console:watch('VERSION', 'VERSION')
65
47
                 self.console:watch('updateTook', 'the.updateTook')
66
 
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
67
 
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
68
48
                 --self.console:watch('drawTook', 'the.drawTook')
69
 
 
70
 
                 -- back off that dark overlay a bit
71
 
                 self.console.fill.fill[4] = 75
72
49
              end
73
 
 
74
 
              --the.inventory:add(Flag:new())
75
 
              --the.inventory:add(Flower:new())
76
50
           end,
77
51
   onUpdate = function (self, dt)
78
52
                 if the.keys:justPressed('escape') then
87
61
               end
88
62
            end
89
63
}
90
 
 
91
 
function l(level)
92
 
   the.app.view = GameView:new{level = level}
93
 
end
94
 
 
95
 
function love.load(arg)
96
 
   if arg[2] then
97
 
      the.app.level = arg[2]
98
 
   end
99
 
 
100
 
   the.app:run()
101
 
end
 
 
b'\\ No newline at end of file'