Browse Source

Clean up grass positioning; Fix pacifist;

bjorn 10 years ago
parent
commit
95ff3da074
2 changed files with 4 additions and 4 deletions
  1. 3 3
      map.lua
  2. 1 1
      person.lua

+ 3 - 3
map.lua

@@ -42,15 +42,15 @@ function Map:draw()
     g.setColor(255, 255, 255)
     while xx < x2 do
       local image = data.media.graphics.dinoland['grassMid' .. love.math.random(1, 2)]
-      g.draw(image, math.min(xx, x2 - image:getWidth() * scale * 2), y - obstacle.height / 1.98, 0, scale, scale)
+      g.draw(image, math.min(xx, x2 - image:getWidth() * scale * 2), y - obstacle.height / 2 - padding, 0, scale, scale)
       xx = xx + image:getWidth() * scale
     end
     local image = data.media.graphics.dinoland.grassLeft
     local scale = 32 / image:getHeight()
     g.setColor(255, 255, 255)
-    g.draw(image, x1, y - obstacle.height / 1.98, 0, scale, scale)
+    g.draw(image, x1, y - obstacle.height / 2 - padding, 0, scale, scale)
     local image = data.media.graphics.dinoland.grassRight
-    g.draw(image, x2, y - obstacle.height / 1.98, 0, scale, scale, image:getWidth())
+    g.draw(image, x2, y - obstacle.height / 2 - padding, 0, scale, scale, image:getWidth())
   end
 
   -- Fake yellow sky

+ 1 - 1
person.lua

@@ -128,7 +128,7 @@ function Person.dead:enter(cause)
   self.body:setAngularVelocity(-20 + love.math.random() * 40)
   ctx.hud:addScore(10, 'person', cause)
   ctx.nonPeckKill = ctx.nonPeckKill or (cause ~= 'peck')
-  ctx.stats.peopledKilled = ctx.stats.peopleKilled + 1
+  ctx.stats.peopleKilled = ctx.stats.peopleKilled + 1
   if self.gender == 'male' and love.math.random() < .75 then
     self.screamSound = ctx.sound:play('scream2', function(sound)
       sound:setVolume(.75)