/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 01:14:37 UTC
  • Revision ID: josh@9ix.org-20130429011437-wvn3k55nyedhftza
more forgiving transition

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'
 
20
require 'boat'
18
21
 
19
22
require 'svg_levels'
20
23
 
32
35
                 if not the.inventory.items[obj.name] then
33
36
                    self:add(obj)
34
37
                 end
 
38
                 if obj.name == 'flag' then
 
39
                    self:add(obj)
 
40
                 end
35
41
              end
36
42
 
37
43
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
69
75
              end
70
76
 
71
77
              --the.inventory:add(Flag:new())
 
78
              --the.inventory:add(Fish:new())
72
79
           end,
73
80
   onUpdate = function (self, dt)
74
81
                 if the.keys:justPressed('escape') then