/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 23:19:25 UTC
  • Revision ID: josh@9ix.org-20130428231925-m2rgt3n1dg9gryz2
cat

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
30
34
                 end
31
35
              end
32
36
 
 
37
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
 
38
 
33
39
              self:add(the.inventory)
34
40
 
35
41
              self:flash({0,0,0})
61
67
                 -- back off that dark overlay a bit
62
68
                 self.console.fill.fill[4] = 75
63
69
              end
 
70
 
 
71
              --the.inventory:add(Flag:new())
64
72
           end,
65
73
   onUpdate = function (self, dt)
66
74
                 if the.keys:justPressed('escape') then