/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-28 05:19:04 UTC
  • Revision ID: josh@9ix.org-20130428051904-7j0sucv9tm8rqdkf
inventory (and a flower)

Show diffs side-by-side

added added

removed removed

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