/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-29 00:08:20 UTC
  • Revision ID: josh@9ix.org-20130429000820-bth2m0z5q94drdxn
fairy

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