/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
7
7
require 'version'
8
8
 
9
9
require 'player'
 
10
require 'transition'
 
11
require 'displacer'
 
12
require 'inventory'
 
13
require 'flower'
 
14
 
 
15
require 'svg_levels'
 
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
   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
   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
 
70
   }
 
71
}
10
72
 
11
73
GameView = View:extend {
 
74
   level = 'shore', --default level
12
75
   onNew = function (self)
13
 
              bg = Tile:new{image = 'data/forest1-bg.png'}
14
 
              fg = Tile:new{image = 'data/forest1-fg.png'}
15
 
              the.player = Player:new{x = 196, y = 350}
16
 
              self:add(bg)
17
 
              self:add(the.player)
18
 
              self:add(fg)
19
 
 
20
 
              --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
 
21
93
              --self.focus = the.player
22
94
              --self:clampTo(self.map)
23
95
           end,
24
96
   draw = function (self, x, y)
25
97
             View.draw(self, x, y)
26
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
27
 
          end
 
98
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
99
             love.graphics.print('version:' .. VERSION, 20, 570)
 
100
          end,
 
101
   onUpdate = function (self, dt)
 
102
              end
28
103
}
29
104
 
30
105
the.app = App:new {
33
108
              if DEBUG then
34
109
                 self.console:watch('VERSION', 'VERSION')
35
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')
36
113
                 --self.console:watch('drawTook', 'the.drawTook')
 
114
 
 
115
                 -- back off that dark overlay a bit
 
116
                 self.console.fill.fill[4] = 75
37
117
              end
38
118
           end,
39
119
   onUpdate = function (self, dt)
49
129
               end
50
130
            end
51
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'