Browse Source

Animation, art updates; Fix crash;

Sophia 10 years ago
parent
commit
4b405c90ff

+ 1 - 1
hud.lua

@@ -83,7 +83,7 @@ Hud.bonuses = {
     description = 'Don\'t kill anything',
     score = 500000,
     check = function()
-      return ctx.pigeon.stats.buildingsDestroyed == 0 and ctx.pigeon.stats.peopleKilled == 0
+      return ctx.stats.buildingsDestroyed == 0 and ctx.stats.peopleKilled == 0
     end
   },
   scrub = {

+ 5 - 4
map.lua

@@ -34,22 +34,23 @@ function Map:draw()
 
   local function drawGrass(obstacle)
     local x, y = obstacle.body:getPosition()
-    local x1, x2 = x - obstacle.width / 2, x + obstacle.width / 2
+    local padding = 5
+    local x1, x2 = x - obstacle.width / 2 - padding, x + obstacle.width / 2 + padding
     local image = data.media.graphics.dinoland.grassLeft
     local scale = 32 / image:getHeight()
     local xx = x1 + image:getWidth() * scale
     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 / 2, 0, scale, scale)
+      g.draw(image, math.min(xx, x2 - image:getWidth() * scale * 2), y - obstacle.height / 1.98, 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 / 2, 0, scale, scale)
+    g.draw(image, x1, y - obstacle.height / 1.98, 0, scale, scale)
     local image = data.media.graphics.dinoland.grassRight
-    g.draw(image, x2, y - obstacle.height / 2, 0, scale, scale, image:getWidth())
+    g.draw(image, x2, y - obstacle.height / 1.98, 0, scale, scale, image:getWidth())
   end
 
   -- Fake yellow sky

BIN
media/graphics/dinoland/hut1.png


BIN
media/graphics/dinoland/hut2.png


BIN
media/graphics/kingdumb/wizard/normal1.png


BIN
media/graphics/kingdumb/wizard/panic1.png


File diff suppressed because it is too large
+ 371 - 371
media/skeletons/pigeon/pigeon.json


Some files were not shown because too many files changed in this diff