/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 20:31:58 UTC
  • Revision ID: josh@9ix.org-20130428203158-uan2kd0ybns063vb
cleanup

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