/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:01:54 UTC
  • Revision ID: josh@9ix.org-20130428180154-k9g0f2yxrm4fheul
level tweaks & fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--inspect = require 'inspect'
6
5
 
7
6
--require 'sprite'
8
7
require 'version'
11
10
require 'transition'
12
11
require 'displacer'
13
12
require 'inventory'
14
 
require 'levels'
15
 
require 'items'
16
 
require 'troll'
17
 
require 'gatetrigger'
 
13
require 'flower'
18
14
 
19
15
require 'svg_levels'
20
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
 
21
73
GameView = View:extend {
 
74
   level = 'shore', --default level
22
75
   onNew = function (self)
23
76
              --print('loading level: '..self.level)
24
 
              if not levels[self.level] then
25
 
                 error('no such level: '..self.level)
26
 
              end
27
77
              for _, obj in ipairs(levels[self.level].objects()) do
28
78
                 self:add(obj)
29
 
                 --if obj.gateup then print('ADDING GATEUP') end
30
79
              end
31
80
              for _, obj in ipairs(svg_objects[self.level]) do
32
81
                 if not the.inventory.items[obj.name] then
33
82
                    self:add(obj)
34
83
                 end
35
 
                 if obj.name == 'flag' then
36
 
                    self:add(obj)
37
 
                 end
38
84
              end
39
85
 
40
 
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
41
 
 
42
86
              self:add(the.inventory)
43
87
 
44
88
              self:flash({0,0,0})
49
93
   draw = function (self, x, y)
50
94
             View.draw(self, x, y)
51
95
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
52
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
96
             love.graphics.print('version:' .. VERSION, 20, 570)
53
97
          end,
54
98
   onUpdate = function (self, dt)
55
99
              end
56
100
}
57
101
 
58
102
the.app = App:new {
59
 
   level = 'shore', --default level
60
103
   onRun = function (self)
61
 
              print('Version: ' .. VERSION)
62
 
              self.view = GameView:new{level = self.level}
 
104
              self.view = GameView:new()
63
105
              if DEBUG then
64
106
                 self.console:watch('VERSION', 'VERSION')
65
107
                 self.console:watch('updateTook', 'the.updateTook')
70
112
                 -- back off that dark overlay a bit
71
113
                 self.console.fill.fill[4] = 75
72
114
              end
73
 
 
74
 
              --the.inventory:add(Flag:new())
75
 
              --the.inventory:add(Flower:new())
76
115
           end,
77
116
   onUpdate = function (self, dt)
78
117
                 if the.keys:justPressed('escape') then
91
130
-- for accessing from debug console
92
131
function l(level)
93
132
   the.app.view = GameView:new{level = level}
94
 
end
95
 
 
96
 
function love.load(arg)
97
 
   if arg[2] then
98
 
      the.app.level = arg[2]
99
 
   end
100
 
 
101
 
   the.app:run()
102
133
end
 
 
b'\\ No newline at end of file'