/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
11
11
require 'displacer'
12
12
require 'inventory'
13
13
require 'flower'
14
 
require 'levels'
15
14
 
16
15
require 'svg_levels'
17
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
 
18
73
GameView = View:extend {
19
74
   level = 'shore', --default level
20
75
   onNew = function (self)