/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 16:51:36 UTC
  • Revision ID: josh@9ix.org-20130428165136-f3eg4lscd1mdb9wo
level tweaks

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'
18
 
require 'fairyactivator'
19
 
require 'realfairy'
20
 
require 'boat'
 
13
require 'flower'
21
14
 
22
15
require 'svg_levels'
23
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
   shore = {
 
28
      objects = function() return {
 
29
                      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}
 
36
                   } 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
   }
 
54
}
 
55
 
24
56
GameView = View:extend {
 
57
   level = 'shore', --default level
25
58
   onNew = function (self)
26
59
              --print('loading level: '..self.level)
27
 
              if not levels[self.level] then
28
 
                 error('no such level: '..self.level)
29
 
              end
30
60
              for _, obj in ipairs(levels[self.level].objects()) do
31
61
                 self:add(obj)
32
 
                 --if obj.gateup then print('ADDING GATEUP') end
33
62
              end
34
63
              for _, obj in ipairs(svg_objects[self.level]) do
35
64
                 if not the.inventory.items[obj.name] then
36
65
                    self:add(obj)
37
66
                 end
38
 
                 if obj.name == 'flag' then
39
 
                    self:add(obj)
40
 
                 end
41
67
              end
42
68
 
43
 
              --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
44
 
 
45
69
              self:add(the.inventory)
46
70
 
47
71
              self:flash({0,0,0})
52
76
   draw = function (self, x, y)
53
77
             View.draw(self, x, y)
54
78
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
55
 
             --love.graphics.print('version:' .. VERSION, 20, 570)
 
79
             love.graphics.print('version:' .. VERSION, 20, 570)
56
80
          end,
57
81
   onUpdate = function (self, dt)
 
82
                 if the.keys:justPressed('a') then
 
83
                    the.app.view = GameView:new{level = 'forest1'}
 
84
                 elseif the.keys:justPressed('b') then
 
85
                    the.app.view = GameView:new{level = 'shore'}
 
86
                 end
58
87
              end
59
88
}
60
89
 
61
90
the.app = App:new {
62
 
   level = 'shore', --default level
63
91
   onRun = function (self)
64
 
              print('Version: ' .. VERSION)
65
 
              self.view = GameView:new{level = self.level}
 
92
              self.view = GameView:new()
66
93
              if DEBUG then
67
94
                 self.console:watch('VERSION', 'VERSION')
68
95
                 self.console:watch('updateTook', 'the.updateTook')
73
100
                 -- back off that dark overlay a bit
74
101
                 self.console.fill.fill[4] = 75
75
102
              end
76
 
 
77
 
              --the.inventory:add(Flag:new())
78
 
              --the.inventory:add(Fish:new())
79
103
           end,
80
104
   onUpdate = function (self, dt)
81
105
                 if the.keys:justPressed('escape') then
94
118
-- for accessing from debug console
95
119
function l(level)
96
120
   the.app.view = GameView:new{level = level}
97
 
end
98
 
 
99
 
function love.load(arg)
100
 
   if arg[2] then
101
 
      the.app.level = arg[2]
102
 
   end
103
 
 
104
 
   the.app:run()
105
121
end
 
 
b'\\ No newline at end of file'