/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
11
11
require 'player'
12
12
require 'clone'
13
13
require 'goal'
 
14
require 'goal_person'
 
15
 
 
16
dirs = {'left', 'right', 'up', 'down'}
14
17
 
15
18
GameView = View:extend {
16
19
   onNew = function (self)
25
28
              }
26
29
              self:add(the.player)
27
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
 
28
37
              the.clones = Group:new()
29
38
              self:add(the.clones)
30
39
              for _ = 1, 15 do
37
46
   onUpdate = function(self, dt)
38
47
                 if the.player.moved then
39
48
                    -- this should encapsulate
 
49
 
 
50
                    the.clones:collide(the.player)
 
51
                    the.goalPerson:collide(the.player)
 
52
 
 
53
                    the.goalPerson:doMove()
 
54
 
40
55
                    for _, np in ipairs(the.clones.sprites) do
41
56
                       np:doMove()
42
57
                    end
43
58
 
 
59
                    -- yeah, again.  once for flip, twice for displace
 
60
                    the.clones:collide(the.player)
 
61
 
44
62
                    the.clones:collide(self.map)
45
63
                    the.player:collide(self.map)
 
64
                    the.goalPerson:collide(self.map)
46
65
 
47
66
                    the.clones:collide()
48
 
                    the.clones:collide(the.player)
 
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
49
74
 
50
75
                    the.player.moved = false
51
76
                 end