platform collides with barrier

leafo · leafo · commit fc55fb9f8555 · 2013-04-28T14:16:09.000-07:00
diff --git a/levels.moon b/levels.moon
@@ -32,18 +32,16 @@ Levels = {
 -- 1
 -- 2
 -- 3
-class Barrier
+class Barrier extends Box
   watch_class @
 
   w: 300
   h: 150
 
   row_dist: 130
+  has_collided: false
 
   new: (@row) =>
-    @position!
-
-  position: =>
     h = g.getHeight!
     @y = h * ((Ground.width * 0.6) + (1 - Ground.width))
 
@@ -55,12 +53,11 @@ class Barrier
       @y += @row_dist
       @h = @@h + 50
 
-  draw_origin: =>
-    @x - @w / 2, @y - @h
+    @y -= @h
 
   draw_shadow: =>
     g.push!
-    g.translate @draw_origin!
+    g.translate @x, @y
 
     sw = 40
     sh = 30
@@ -76,7 +73,7 @@ class Barrier
 
     g.push!
 
-    g.translate @draw_origin!
+    g.translate @x, @y
 
     g.setColor 50,50,50
     g.rectangle "fill", ox, oy, @w, @h
@@ -86,6 +83,9 @@ class Barrier
 
     g.pop!
 
+    g.setColor 255,255,255, 128
+    @outline!
+
   update: (dt, world) =>
     b = world.box
     grow = 1.5 + @row/4
@@ -96,7 +96,9 @@ class Barrier
     left = cx - hw * grow
     right = cx + hw * grow
     @progress = world\block_progress!
-    @x = (1 - @progress) * (right - left) + left
+
+    x = (1 - @progress) * (right - left) + left
+    @x = x - @w / 2
 
 class World
   watch_class @
@@ -174,6 +176,8 @@ class World
 
   setup_block: (bid) =>
     @active_block = @level[bid]
+    for i=1,3
+      @barriers[i].has_collided = false
 
   update: (dt) =>
     @traversed += dt * @speed
@@ -206,4 +210,11 @@ class World
     for thing in *@collide\get_touching @player.box
       @player\take_hit thing, @
 
+    -- barriers colliding
+    row = @platform\row!
+    if @active_block[row]
+      b = @barriers[row]
+      if not b.has_collided and b\touches_box @platform.hitbox
+        @platform\take_hit b, @
+        b.has_collided = true
 
diff --git a/main.moon b/main.moon
@@ -78,6 +78,8 @@ class Platform
     @ox, @oy = g.getWidth! / 2, g.getHeight! * (2/3)
     @elapsed = 0
 
+    @hitbox = Box 0,0,450,120
+
     @box = Box -@width/2, -@height/2, @width, @height
     @inner_box = Box -@inner_width/2, -@inner_height/2, @inner_width, @inner_height
     @recalc!
@@ -132,6 +134,9 @@ class Platform
     fn! if fn
     @draw_wheels!
 
+    g.setColor 255,200, 100
+    @hitbox\outline!
+
   draw_body: =>
     @transformed (elapsed) ->
       g.setColor 200,200,200
@@ -198,9 +203,21 @@ class Platform
   update: (dt, world) =>
     @elapsed += dt
 
+    @hitbox\move_center @ox, @oy
+
     for w in *@wheels
       w\update dt
 
+  take_hit: (barrier, world) =>
+    s = Sequence ->
+      with world.particles
+        for i = 1,8
+          \add Explosion world, @hitbox\random_point!
+          wait rand 0.05, 0.1
+
+    s.draw = -> -- lol
+    world.particles\add s
+
 class Wheel
   segments: 6
   speed: 6
diff --git a/player.moon b/player.moon
@@ -45,6 +45,8 @@ class Player extends Entity
 
   mover = make_mover "w", "s", "a", "d"
 
+  life: 100
+
   w: 15
   h: 50
 
