/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 00:36:07 UTC
  • Revision ID: josh@9ix.org-20130429003607-bzwrrvoltjzv4ifm
blah

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'
 
18
require 'fairyactivator'
 
19
require 'realfairy'
15
20
 
16
21
require 'svg_levels'
17
22
 
23
28
              end
24
29
              for _, obj in ipairs(levels[self.level].objects()) do
25
30
                 self:add(obj)
 
31
                 --if obj.gateup then print('ADDING GATEUP') end
26
32
              end
27
33
              for _, obj in ipairs(svg_objects[self.level]) do
28
34
                 if not the.inventory.items[obj.name] then
29
35
                    self:add(obj)
30
36
                 end
 
37
                 if obj.name == 'flag' then
 
38
                    self:add(obj)
 
39
                 end
31
40
              end
32
41
 
 
42
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
 
43
 
33
44
              self:add(the.inventory)
34
45
 
35
46
              self:flash({0,0,0})
40
51
   draw = function (self, x, y)
41
52
             View.draw(self, x, y)
42
53
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
43
 
             love.graphics.print('version:' .. VERSION, 20, 570)
 
54
             --love.graphics.print('version:' .. VERSION, 20, 570)
44
55
          end,
45
56
   onUpdate = function (self, dt)
46
57
              end
49
60
the.app = App:new {
50
61
   level = 'shore', --default level
51
62
   onRun = function (self)
 
63
              print('Version: ' .. VERSION)
52
64
              self.view = GameView:new{level = self.level}
53
65
              if DEBUG then
54
66
                 self.console:watch('VERSION', 'VERSION')
60
72
                 -- back off that dark overlay a bit
61
73
                 self.console.fill.fill[4] = 75
62
74
              end
 
75
 
 
76
              --the.inventory:add(Flag:new())
 
77
              the.inventory:add(Fairy:new())
63
78
           end,
64
79
   onUpdate = function (self, dt)
65
80
                 if the.keys:justPressed('escape') then