/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 16:51:36 UTC
  • Revision ID: josh@9ix.org-20130428165136-f3eg4lscd1mdb9wo
level tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
10
10
require 'transition'
11
11
require 'displacer'
12
12
require 'inventory'
13
 
require 'levels'
14
 
require 'items'
15
 
require 'troll'
 
13
require 'flower'
16
14
 
17
15
require 'svg_levels'
18
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
 
19
56
GameView = View:extend {
 
57
   level = 'shore', --default level
20
58
   onNew = function (self)
21
59
              --print('loading level: '..self.level)
22
 
              if not levels[self.level] then
23
 
                 error('no such level: '..self.level)
24
 
              end
25
60
              for _, obj in ipairs(levels[self.level].objects()) do
26
61
                 self:add(obj)
27
62
              end
41
76
   draw = function (self, x, y)
42
77
             View.draw(self, x, y)
43
78
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
44
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
79
             love.graphics.print('version:' .. VERSION, 20, 570)
45
80
          end,
46
81
   onUpdate = function (self, dt)
 
82
                 if the.keys:justPressed('a') then
 
83
                    the.app.view = GameView:new{level = 'forest1'}
 
84
                 elseif the.keys:justPressed('b') then
 
85
                    the.app.view = GameView:new{level = 'shore'}
 
86
                 end
47
87
              end
48
88
}
49
89
 
50
90
the.app = App:new {
51
 
   level = 'shore', --default level
52
91
   onRun = function (self)
53
 
              print('Version: ' .. VERSION)
54
 
              self.view = GameView:new{level = self.level}
 
92
              self.view = GameView:new()
55
93
              if DEBUG then
56
94
                 self.console:watch('VERSION', 'VERSION')
57
95
                 self.console:watch('updateTook', 'the.updateTook')
62
100
                 -- back off that dark overlay a bit
63
101
                 self.console.fill.fill[4] = 75
64
102
              end
65
 
 
66
 
              --the.inventory:add(Flower:new())
67
103
           end,
68
104
   onUpdate = function (self, dt)
69
105
                 if the.keys:justPressed('escape') then
82
118
-- for accessing from debug console
83
119
function l(level)
84
120
   the.app.view = GameView:new{level = level}
85
 
end
86
 
 
87
 
function love.load(arg)
88
 
   if arg[2] then
89
 
      the.app.level = arg[2]
90
 
   end
91
 
 
92
 
   the.app:run()
93
121
end
 
 
b'\\ No newline at end of file'