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