/ld26

To get this branch, use:
bzr branch /bzr/ld26

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-04-28 22:13:30 UTC
  • Revision ID: josh@9ix.org-20130428221330-duv67kmceabcitda
troll

Show diffs side-by-side

added added

removed removed

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'
14
13
require 'levels'
15
14
require 'items'
16
15
require 'troll'
17
 
require 'gatetrigger'
18
 
require 'fairyactivator'
19
 
require 'realfairy'
20
16
 
21
17
require 'svg_levels'
22
18
 
28
24
              end
29
25
              for _, obj in ipairs(levels[self.level].objects()) do
30
26
                 self:add(obj)
31
 
                 --if obj.gateup then print('ADDING GATEUP') end
32
27
              end
33
28
              for _, obj in ipairs(svg_objects[self.level]) do
34
29
                 if not the.inventory.items[obj.name] then
35
30
                    self:add(obj)
36
31
                 end
37
 
                 if obj.name == 'flag' then
38
 
                    self:add(obj)
39
 
                 end
40
32
              end
41
33
 
42
 
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
43
 
 
44
34
              self:add(the.inventory)
45
35
 
46
36
              self:flash({0,0,0})
72
62
                 -- back off that dark overlay a bit
73
63
                 self.console.fill.fill[4] = 75
74
64
              end
75
 
 
76
 
              --the.inventory:add(Flag:new())
77
 
              the.inventory:add(Fairy:new())
78
65
           end,
79
66
   onUpdate = function (self, dt)
80
67
                 if the.keys:justPressed('escape') then