/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'
8
9
 
9
10
require 'player'
 
11
require 'transition'
 
12
require 'displacer'
 
13
require 'inventory'
 
14
require 'levels'
 
15
require 'items'
 
16
require 'troll'
 
17
require 'gatetrigger'
 
18
require 'fairyactivator'
 
19
require 'realfairy'
 
20
require 'boat'
 
21
 
 
22
require 'svg_levels'
10
23
 
11
24
GameView = View:extend {
12
25
   onNew = function (self)
13
 
              self:newLevel('forest1')
14
 
 
15
 
              --self:loadLayers('data/map.lua')
 
26
              --print('loading level: '..self.level)
 
27
              if not levels[self.level] then
 
28
                 error('no such level: '..self.level)
 
29
              end
 
30
              for _, obj in ipairs(levels[self.level].objects()) do
 
31
                 self:add(obj)
 
32
                 --if obj.gateup then print('ADDING GATEUP') end
 
33
              end
 
34
              for _, obj in ipairs(svg_objects[self.level]) do
 
35
                 if not the.inventory.items[obj.name] then
 
36
                    self:add(obj)
 
37
                 end
 
38
                 if obj.name == 'flag' then
 
39
                    self:add(obj)
 
40
                 end
 
41
              end
 
42
 
 
43
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
 
44
 
 
45
              self:add(the.inventory)
 
46
 
 
47
              self:flash({0,0,0})
 
48
 
16
49
              --self.focus = the.player
17
50
              --self:clampTo(self.map)
18
51
           end,
19
52
   draw = function (self, x, y)
20
53
             View.draw(self, x, y)
21
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
22
 
             love.graphics.print('version:' .. VERSION, 20, 570)
 
54
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
55
             --love.graphics.print('version:' .. VERSION, 20, 570)
23
56
          end,
24
57
   onUpdate = function (self, dt)
25
 
                 if the.keys:justPressed('a') then
26
 
                    self:newLevel('forest1')
27
 
                 elseif the.keys:justPressed('b') then
28
 
                    self:newLevel('shore')
29
 
                 end
30
 
              end,
31
 
   newLevel = function (self, level)
32
 
                 self.sprites = {}
33
 
                 bg = Tile:new{image = 'data/' .. level .. '-bg.png'}
34
 
                 fg = Tile:new{image = 'data/' .. level .. '-fg.png'}
35
 
                 the.player = Player:new{x = 196, y = 350}
36
 
                 self:add(bg)
37
 
                 self:add(the.player)
38
 
                 self:add(fg)
39
58
              end
40
59
}
41
60
 
42
61
the.app = App:new {
 
62
   level = 'shore', --default level
43
63
   onRun = function (self)
44
 
              self.view = GameView:new()
 
64
              print('Version: ' .. VERSION)
 
65
              self.view = GameView:new{level = self.level}
45
66
              if DEBUG then
46
67
                 self.console:watch('VERSION', 'VERSION')
47
68
                 self.console:watch('updateTook', 'the.updateTook')
 
69
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
70
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
48
71
                 --self.console:watch('drawTook', 'the.drawTook')
 
72
 
 
73
                 -- back off that dark overlay a bit
 
74
                 self.console.fill.fill[4] = 75
49
75
              end
 
76
 
 
77
              --the.inventory:add(Flag:new())
 
78
              --the.inventory:add(Fish:new())
50
79
           end,
51
80
   onUpdate = function (self, dt)
52
81
                 if the.keys:justPressed('escape') then
61
90
               end
62
91
            end
63
92
}
 
93
 
 
94
-- for accessing from debug console
 
95
function l(level)
 
96
   the.app.view = GameView:new{level = level}
 
97
end
 
98
 
 
99
function love.load(arg)
 
100
   if arg[2] then
 
101
      the.app.level = arg[2]
 
102
   end
 
103
 
 
104
   the.app:run()
 
105
end
 
 
b'\\ No newline at end of file'