/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
9
9
require 'player'
10
10
require 'transition'
11
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
 
12
15
require 'svg_levels'
13
16
 
14
17
levels = {
31
34
                      Transition:new{x = 10, y = 133, target = 'forest1',
32
35
                                     targetX = 735, targetY = 370}
33
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
34
53
   }
35
54
}
36
55
 
37
56
GameView = View:extend {
 
57
   level = 'shore', --default level
38
58
   onNew = function (self)
39
 
              self:newLevel('forest1')
40
 
 
41
 
              --self:loadLayers('data/map.lua')
 
59
              --print('loading level: '..self.level)
 
60
              for _, obj in ipairs(levels[self.level].objects()) do
 
61
                 self:add(obj)
 
62
              end
 
63
              for _, obj in ipairs(svg_objects[self.level]) do
 
64
                 if not the.inventory.items[obj.name] then
 
65
                    self:add(obj)
 
66
                 end
 
67
              end
 
68
 
 
69
              self:add(the.inventory)
 
70
 
 
71
              self:flash({0,0,0})
 
72
 
42
73
              --self.focus = the.player
43
74
              --self:clampTo(self.map)
44
75
           end,
45
76
   draw = function (self, x, y)
46
77
             View.draw(self, x, y)
47
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
78
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
48
79
             love.graphics.print('version:' .. VERSION, 20, 570)
49
80
          end,
50
81
   onUpdate = function (self, dt)
51
82
                 if the.keys:justPressed('a') then
52
 
                    self:newLevel('forest1')
 
83
                    the.app.view = GameView:new{level = 'forest1'}
53
84
                 elseif the.keys:justPressed('b') then
54
 
                    self:newLevel('shore')
55
 
                 end
56
 
              end,
57
 
   newLevel = function (self, level)
58
 
                 self.sprites = levels[level].objects()
59
 
                 for _, obj in ipairs(svg_objects[level]) do
60
 
                    self:add(obj)
 
85
                    the.app.view = GameView:new{level = 'shore'}
61
86
                 end
62
87
              end
63
88
}
68
93
              if DEBUG then
69
94
                 self.console:watch('VERSION', 'VERSION')
70
95
                 self.console:watch('updateTook', 'the.updateTook')
 
96
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
97
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
71
98
                 --self.console:watch('drawTook', 'the.drawTook')
72
99
 
73
100
                 -- back off that dark overlay a bit
87
114
               end
88
115
            end
89
116
}
 
117
 
 
118
-- for accessing from debug console
 
119
function l(level)
 
120
   the.app.view = GameView:new{level = level}
 
121
end
 
 
b'\\ No newline at end of file'