/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:12:25 UTC
  • Revision ID: josh@9ix.org-20130429011225-2i6tjd5t6s5rhme2
inventory stack bug

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