/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'
9
10
require 'player'
10
11
require 'transition'
11
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
 
12
22
require 'svg_levels'
13
23
 
14
 
levels = {
15
 
   forest1 = {
16
 
      objects = function() return {
17
 
                      Tile:new{image = 'data/forest1-bg.png'},
18
 
                      Player:new{x = 200, y = 380,
19
 
                                 minY = 330, maxY = 500,
20
 
                                 image = 'data/forest1-player.png'},
21
 
                      Tile:new{image = 'data/forest1-fg.png'}
22
 
                   } end,
23
 
   },
24
 
   shore = {
25
 
      objects = function() return {
26
 
                      Tile:new{image = 'data/shore-bg.png'},
27
 
                      Player:new{x = 145, y = 133,
28
 
                                 minY = 133, maxY = 133,
29
 
                                 image = 'data/shore-player.png'},
30
 
                      Tile:new{image = 'data/shore-fg.png'},
31
 
                      Transition:new{x = 10, y = 133, target = 'forest1',
32
 
                                     targetX = 735, targetY = 370}
33
 
                   } end
34
 
   },
35
 
   lake = {
36
 
      objects = function() return {
37
 
                      Tile:new{image = 'data/lake-bg.png'},
38
 
                      Player:new{x = 540, y = 266,
39
 
                                 image = 'data/lake-player.png'},
40
 
                   }
41
 
                end
42
 
   },
43
 
   village = {
44
 
      objects = function() return {
45
 
                      Tile:new{image = 'data/village-bg.png'},
46
 
                      Player:new{x = 121, y = 440,
47
 
                                 image = 'data/village-player.png'},
48
 
                   }
49
 
                end
50
 
   }
51
 
}
52
 
 
53
24
GameView = View:extend {
54
 
   level = 'forest1', --default level
55
25
   onNew = function (self)
56
26
              --print('loading level: '..self.level)
 
27
              if not levels[self.level] then
 
28
                 error('no such level: '..self.level)
 
29
              end
57
30
              for _, obj in ipairs(levels[self.level].objects()) do
58
31
                 self:add(obj)
 
32
                 --if obj.gateup then print('ADDING GATEUP') end
59
33
              end
60
34
              for _, obj in ipairs(svg_objects[self.level]) do
61
 
                 self:add(obj)
 
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
62
41
              end
63
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
 
64
47
              self:flash({0,0,0})
65
48
 
66
49
              --self.focus = the.player
68
51
           end,
69
52
   draw = function (self, x, y)
70
53
             View.draw(self, x, y)
71
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
72
 
             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)
73
56
          end,
74
57
   onUpdate = function (self, dt)
75
 
                 if the.keys:justPressed('a') then
76
 
                    the.app.view = GameView:new{level = 'forest1'}
77
 
                 elseif the.keys:justPressed('b') then
78
 
                    the.app.view = GameView:new{level = 'shore'}
79
 
                 end
80
58
              end
81
59
}
82
60
 
83
61
the.app = App:new {
 
62
   level = 'shore', --default level
84
63
   onRun = function (self)
85
 
              self.view = GameView:new()
 
64
              print('Version: ' .. VERSION)
 
65
              self.view = GameView:new{level = self.level}
86
66
              if DEBUG then
87
67
                 self.console:watch('VERSION', 'VERSION')
88
68
                 self.console:watch('updateTook', 'the.updateTook')
93
73
                 -- back off that dark overlay a bit
94
74
                 self.console.fill.fill[4] = 75
95
75
              end
 
76
 
 
77
              --the.inventory:add(Flag:new())
 
78
              --the.inventory:add(Fish:new())
96
79
           end,
97
80
   onUpdate = function (self, dt)
98
81
                 if the.keys:justPressed('escape') then
111
94
-- for accessing from debug console
112
95
function l(level)
113
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()
114
105
end
 
 
b'\\ No newline at end of file'