From 64063f9f68c8c9584b78fb5665ceb8056792711d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 29 Jul 2011 10:36:30 +0000
Subject: [PATCH] fixed sand transitions
git-svn-id: http://svn.net-core.org/repos/t-engine4@4002 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/modules/boot/class/Game.lua | 2 +-
game/engines/default/modules/boot/data/damage_types.lua | 4 ++--
game/modules/tome/data/general/grids/sand.lua | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/game/engines/default/modules/boot/class/Game.lua b/game/engines/default/modules/boot/class/Game.lua
index ea5840c129..ca29939a2a 100644
--- a/game/engines/default/modules/boot/class/Game.lua
+++ b/game/engines/default/modules/boot/class/Game.lua
@@ -172,7 +172,7 @@ function _M:setupDisplayMode()
Map.tiles.use_images = true
-- Create the framebuffer
- self.fbo = core.display.newFBO(game.w, game.h)
+-- self.fbo = core.display.newFBO(game.w, game.h)
if self.fbo then
self.fbo_shader = Shader.new("main_fbo")
if not self.fbo_shader.shad then
diff --git a/game/engines/default/modules/boot/data/damage_types.lua b/game/engines/default/modules/boot/data/damage_types.lua
index a3eb877292..4104d171de 100644
--- a/game/engines/default/modules/boot/data/damage_types.lua
+++ b/game/engines/default/modules/boot/data/damage_types.lua
@@ -29,9 +29,9 @@ setDefaultProjector(function(src, x, y, type, dam)
end
else
if src == game.player then
- game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -3, tostring(-math.ceil(dam)), {0,255,0})
+ game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -rng.float(2, 3), tostring(-math.ceil(dam)), {0,255,0})
elseif target == game.player then
- game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, -3, tostring(-math.ceil(dam)), {255,0,0})
+ game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, rng.float(2, 3), tostring(-math.ceil(dam)), {255,0,0})
end
end
return dam
diff --git a/game/modules/tome/data/general/grids/sand.lua b/game/modules/tome/data/general/grids/sand.lua
index 9b6f9367f4..b8d09f57dd 100644
--- a/game/modules/tome/data/general/grids/sand.lua
+++ b/game/modules/tome/data/general/grids/sand.lua
@@ -17,6 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+local sand_editer = { method="borders_def", def="sand"}
local sand_wall_editer = { method="sandWalls_def", def="sandwall"}
newEntity{
--
GitLab