/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-27 18:39:03 UTC
  • Revision ID: josh@9ix.org-20130427183903-3uc24myj115nckj0
scale movement with player size

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
10
 
17
11
levels = {
18
12
   forest1 = {
19
13
      objects = function() return {
20
14
                      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'},
 
15
                      Player:new{x = 200, y = 370, image = 'data/forest1-player.png'},
24
16
                      Tile:new{image = 'data/forest1-fg.png'}
25
17
                   } end,
26
18
   },
27
19
   shore = {
28
20
      objects = function() return {
29
21
                      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}
 
22
                      Player:new{x = 145, y = 133, image = 'data/shore-player.png'},
 
23
                      Tile:new{image = 'data/shore-fg.png'}
36
24
                   } 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
25
   }
54
26
}
55
27
 
56
28
GameView = View:extend {
57
 
   level = 'forest1', --default level
58
29
   onNew = function (self)
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
 
                 self:add(obj)
65
 
              end
66
 
 
67
 
              self:add(the.inventory)
68
 
 
69
 
              self:flash({0,0,0})
70
 
 
 
30
              self:newLevel('forest1')
 
31
 
 
32
              --self:loadLayers('data/map.lua')
71
33
              --self.focus = the.player
72
34
              --self:clampTo(self.map)
73
35
           end,
74
36
   draw = function (self, x, y)
75
37
             View.draw(self, x, y)
76
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
38
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
77
39
             love.graphics.print('version:' .. VERSION, 20, 570)
78
40
          end,
79
41
   onUpdate = function (self, dt)
80
42
                 if the.keys:justPressed('a') then
81
 
                    the.app.view = GameView:new{level = 'forest1'}
 
43
                    self:newLevel('forest1')
82
44
                 elseif the.keys:justPressed('b') then
83
 
                    the.app.view = GameView:new{level = 'shore'}
 
45
                    self:newLevel('shore')
84
46
                 end
 
47
              end,
 
48
   newLevel = function (self, level)
 
49
                 self.sprites = levels[level].objects()
85
50
              end
86
51
}
87
52
 
91
56
              if DEBUG then
92
57
                 self.console:watch('VERSION', 'VERSION')
93
58
                 self.console:watch('updateTook', 'the.updateTook')
94
 
                 self.console:watch('view.tween.status', 'the.app.view.tween.status()')
95
 
                 self.console:watch('view.tween.active', 'the.app.view.tween.active')
96
59
                 --self.console:watch('drawTook', 'the.drawTook')
97
 
 
98
 
                 -- back off that dark overlay a bit
99
 
                 self.console.fill.fill[4] = 75
100
60
              end
101
61
           end,
102
62
   onUpdate = function (self, dt)
112
72
               end
113
73
            end
114
74
}
115
 
 
116
 
function l(level)
117
 
   the.app.view = GameView:new{level = level}
118
 
end
 
 
b'\\ No newline at end of file'