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