/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 18:51:02 UTC
  • Revision ID: josh@9ix.org-20130428185102-2gekwj8pzvlnwvhb
collision 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 = {
15
18
   forest1 = {
16
19
      objects = function() return {
17
20
                      Tile:new{image = 'data/forest1-bg.png'},
18
 
                      Player:new{x = 200, y = 370,
 
21
                      Player:new{x = 200, y = 380,
19
22
                                 minY = 330, maxY = 500,
20
23
                                 image = 'data/forest1-player.png'},
21
24
                      Tile:new{image = 'data/forest1-fg.png'}
22
25
                   } end,
23
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
   },
24
35
   shore = {
25
36
      objects = function() return {
26
37
                      Tile:new{image = 'data/shore-bg.png'},
28
39
                                 minY = 133, maxY = 133,
29
40
                                 image = 'data/shore-player.png'},
30
41
                      Tile:new{image = 'data/shore-fg.png'},
31
 
                      Transition:new{x = 10, y = 133, target = 'forest1'}
 
42
                      Transition:new{x = 10, y = 133, target = 'forest1',
 
43
                                     targetX = 735, targetY = 370}
32
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
   bridge = {
 
63
      objects = function() return {
 
64
                      Tile:new{image = 'data/bridge-bg.png'},
 
65
                      Player:new{x = 121, y = 440,
 
66
                                 image = 'data/bridge-player.png'},
 
67
                      Tile:new{image = 'data/bridge-fg.png'}
 
68
                   }
 
69
                end
33
70
   }
34
71
}
35
72
 
36
73
GameView = View:extend {
 
74
   level = 'shore', --default level
37
75
   onNew = function (self)
38
 
              self:newLevel('forest1')
39
 
 
40
 
              --self:loadLayers('data/map.lua')
 
76
              --print('loading level: '..self.level)
 
77
              if not levels[self.level] then
 
78
                 error('no such level: '..self.level)
 
79
              end
 
80
              for _, obj in ipairs(levels[self.level].objects()) do
 
81
                 self:add(obj)
 
82
              end
 
83
              for _, obj in ipairs(svg_objects[self.level]) do
 
84
                 if not the.inventory.items[obj.name] then
 
85
                    self:add(obj)
 
86
                 end
 
87
              end
 
88
 
 
89
              self:add(the.inventory)
 
90
 
 
91
              self:flash({0,0,0})
 
92
 
41
93
              --self.focus = the.player
42
94
              --self:clampTo(self.map)
43
95
           end,
44
96
   draw = function (self, x, y)
45
97
             View.draw(self, x, y)
46
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
98
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
47
99
             love.graphics.print('version:' .. VERSION, 20, 570)
48
100
          end,
49
101
   onUpdate = function (self, dt)
50
 
                 if the.keys:justPressed('a') then
51
 
                    self:newLevel('forest1')
52
 
                 elseif the.keys:justPressed('b') then
53
 
                    self:newLevel('shore')
54
 
                 end
55
 
              end,
56
 
   newLevel = function (self, level)
57
 
                 self.sprites = levels[level].objects()
58
 
                 for _, obj in ipairs(svg_objects[level]) do
59
 
                    self:add(obj)
60
 
                 end
61
102
              end
62
103
}
63
104
 
67
108
              if DEBUG then
68
109
                 self.console:watch('VERSION', 'VERSION')
69
110
                 self.console:watch('updateTook', 'the.updateTook')
 
111
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
 
112
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
70
113
                 --self.console:watch('drawTook', 'the.drawTook')
71
114
 
72
115
                 -- back off that dark overlay a bit
86
129
               end
87
130
            end
88
131
}
 
132
 
 
133
-- for accessing from debug console
 
134
function l(level)
 
135
   the.app.view = GameView:new{level = level}
 
136
end
 
 
b'\\ No newline at end of file'