/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
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
   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
}
 
72
 
19
73
GameView = View:extend {
 
74
   level = 'shore', --default level
20
75
   onNew = function (self)
21
76
              --print('loading level: '..self.level)
22
77
              if not levels[self.level] then
41
96
   draw = function (self, x, y)
42
97
             View.draw(self, x, y)
43
98
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
44
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
99
             love.graphics.print('version:' .. VERSION, 20, 570)
45
100
          end,
46
101
   onUpdate = function (self, dt)
47
102
              end
48
103
}
49
104
 
50
105
the.app = App:new {
51
 
   level = 'shore', --default level
52
106
   onRun = function (self)
53
 
              print('Version: ' .. VERSION)
54
 
              self.view = GameView:new{level = self.level}
 
107
              self.view = GameView:new()
55
108
              if DEBUG then
56
109
                 self.console:watch('VERSION', 'VERSION')
57
110
                 self.console:watch('updateTook', 'the.updateTook')
62
115
                 -- back off that dark overlay a bit
63
116
                 self.console.fill.fill[4] = 75
64
117
              end
65
 
 
66
 
              --the.inventory:add(Flower:new())
67
118
           end,
68
119
   onUpdate = function (self, dt)
69
120
                 if the.keys:justPressed('escape') then
82
133
-- for accessing from debug console
83
134
function l(level)
84
135
   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
136
end
 
 
b'\\ No newline at end of file'