/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:35:28 UTC
  • Revision ID: josh@9ix.org-20130429003528-6o7b23zq3c4m8nxe
be moved

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
15
15
require 'items'
16
16
require 'troll'
17
17
require 'gatetrigger'
 
18
require 'fairyactivator'
 
19
require 'realfairy'
18
20
 
19
21
require 'svg_levels'
20
22
 
32
34
                 if not the.inventory.items[obj.name] then
33
35
                    self:add(obj)
34
36
                 end
 
37
                 if obj.name == 'flag' then
 
38
                    self:add(obj)
 
39
                 end
35
40
              end
36
41
 
37
42
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
69
74
              end
70
75
 
71
76
              --the.inventory:add(Flag:new())
 
77
              the.inventory:add(Fairy:new())
72
78
           end,
73
79
   onUpdate = function (self, dt)
74
80
                 if the.keys:justPressed('escape') then