/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 19:40:13 UTC
  • Revision ID: josh@9ix.org-20130428194013-80jaqhflmrmwgo27
gate

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'
11
10
require 'transition'
12
11
require 'displacer'
13
12
require 'inventory'
 
13
require 'flower'
14
14
require 'levels'
15
 
require 'items'
16
 
require 'troll'
17
 
require 'gatetrigger'
18
15
 
19
16
require 'svg_levels'
20
17
 
26
23
              end
27
24
              for _, obj in ipairs(levels[self.level].objects()) do
28
25
                 self:add(obj)
29
 
                 --if obj.gateup then print('ADDING GATEUP') end
30
26
              end
31
27
              for _, obj in ipairs(svg_objects[self.level]) do
32
28
                 if not the.inventory.items[obj.name] then
33
29
                    self:add(obj)
34
30
                 end
35
 
                 if obj.name == 'flag' then
36
 
                    self:add(obj)
37
 
                 end
38
31
              end
39
32
 
40
 
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
41
 
 
42
33
              self:add(the.inventory)
43
34
 
44
35
              self:flash({0,0,0})
49
40
   draw = function (self, x, y)
50
41
             View.draw(self, x, y)
51
42
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
52
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
43
             love.graphics.print('version:' .. VERSION, 20, 570)
53
44
          end,
54
45
   onUpdate = function (self, dt)
55
46
              end
58
49
the.app = App:new {
59
50
   level = 'shore', --default level
60
51
   onRun = function (self)
61
 
              print('Version: ' .. VERSION)
62
52
              self.view = GameView:new{level = self.level}
63
53
              if DEBUG then
64
54
                 self.console:watch('VERSION', 'VERSION')
70
60
                 -- back off that dark overlay a bit
71
61
                 self.console.fill.fill[4] = 75
72
62
              end
73
 
 
74
 
              --the.inventory:add(Flag:new())
75
 
              the.inventory:add(Fairy:new())
76
63
           end,
77
64
   onUpdate = function (self, dt)
78
65
                 if the.keys:justPressed('escape') then