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