/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 22:23:30 UTC
  • Revision ID: josh@9ix.org-20130428222330-ng2gzvphijabfjfm
flag

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