/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 22:00:27 UTC
  • Revision ID: josh@9ix.org-20130428220027-uneuwd3am4wl6klk
GET FISH

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