/ld28

To get this branch, use:
bzr branch http://9ix.org/bzr/ld28

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-12-15 03:05:42 UTC
  • Revision ID: josh@9ix.org-20131215030542-pneoyxj6rtm3c3hx
super hacky fix for passing through clones/goals

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
deque = require 'deque'
 
6
--inspect = require 'inspect'
 
7
require 'sprite'
6
8
 
 
9
require 'util'
7
10
require 'version'
8
11
require 'player'
9
12
require 'clone'
 
13
require 'goal'
 
14
require 'goal_person'
 
15
 
 
16
dirs = {'left', 'right', 'up', 'down'}
10
17
 
11
18
GameView = View:extend {
12
19
   onNew = function (self)
13
 
              --self:loadLayers('data/map.lua')
14
 
              --self.focus = the.player
15
 
              --self:clampTo(self.bg)
 
20
              self:loadLayers('data/map.lua')
 
21
 
 
22
              local tw = math.floor(the.app.width / 16)
 
23
              local th = math.floor(the.app.height / 16)
16
24
 
17
25
              the.player = Player:new{
18
 
                 x = math.random(the.app.width),
19
 
                 y = math.random(the.app.height),
 
26
                 x = math.random(2, tw-2) * 16,
 
27
                 y = math.random(2, th-2) * 16
20
28
              }
21
29
              self:add(the.player)
22
30
 
 
31
              the.goalPerson = GoalPerson:new{
 
32
                 x = math.random(2, tw-2) * 16,
 
33
                 y = math.random(2, th-2) * 16
 
34
              }
 
35
              self:add(the.goalPerson)
 
36
 
23
37
              the.clones = Group:new()
24
38
              self:add(the.clones)
25
 
              for _ = 1, 14 do
 
39
              for _ = 1, 15 do
26
40
                 the.clones:add(Clone:new {
27
 
                                       x = math.random(the.app.width),
28
 
                                       y = math.random(the.app.height),
29
 
                                    })
 
41
                                   x = math.random(2, tw-2) * 16,
 
42
                                   y = math.random(2, th-2) * 16
 
43
                                })
30
44
              end
31
45
           end,
32
46
   onUpdate = function(self, dt)
33
47
                 if the.player.moved then
34
48
                    -- this should encapsulate
 
49
 
 
50
                    the.clones:collide(the.player)
 
51
                    the.goalPerson:collide(the.player)
 
52
 
 
53
                    the.goalPerson:doMove()
 
54
 
35
55
                    for _, np in ipairs(the.clones.sprites) do
36
56
                       np:doMove()
37
57
                    end
38
58
 
 
59
                    -- yeah, again.  once for flip, twice for displace
 
60
                    the.clones:collide(the.player)
 
61
 
 
62
                    the.clones:collide(self.map)
 
63
                    the.player:collide(self.map)
 
64
                    the.goalPerson:collide(self.map)
 
65
 
 
66
                    the.clones:collide()
 
67
 
 
68
                    if math.random(1,5) == 1 then
 
69
                       local c = the.clones.sprites[math.random(the.clones:count())]
 
70
                       if not c.cured then
 
71
                          c.image = 'data/goal.png'
 
72
                       end
 
73
                    end
 
74
 
39
75
                    the.player.moved = false
40
76
                 end
41
77
 
47
83
 
48
84
the.app = App:new {
49
85
   name = "LD28",
 
86
   fps = 30,
50
87
   onRun = function (self)
51
88
              print('Version: ' .. VERSION)
52
89
 
59
96
                 self.console.fill.fill[4] = 75
60
97
              end
61
98
           end,
 
99
   onUpdate = function (self, dt)
 
100
                 if the.keys:justPressed('f1') then
 
101
                    local ss = love.graphics.newScreenshot()
 
102
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
103
                 end
 
104
              end
62
105
}