Many new zone specific creature tiles

git-svn-id: http://svn.net-core.org/repos/t-engine4@3496 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/GameState.lua

@@ -425,8 +425,8 @@ function _M:spawnWorldAmbush(enc, dx, dy)
 	local g1 = game.level.map(dx, dy, engine.Map.TERRAIN)
 	local g2 = game.level.map(game.player.x, game.player.y, engine.Map.TERRAIN)
 	local g = g1
-	if not g.can_encounter then g = g2 end
-	if not g.can_encounter then return false end
+	if not g or not g.can_encounter then g = g2 end
+	if not g or not g.can_encounter then return false end
 
 	if g.can_encounter == "desert" then gen.floor = "SAND" gen.wall = "PALMTREE" end
 

game/modules/tome/data/damage_types.lua

@@ -19,7 +19,7 @@
 
 -- The basic stuff used to damage a grid
 setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
-	if not game.level.map(x, y) then return 0 end
+	if not game.level.map:isBound(x, y) then return 0 end
 	local terrain = game.level.map(x, y, Map.TERRAIN)
 	if terrain then terrain:check("damage_project", src, x, y, type, dam) end
 

game/modules/tome/data/gfx/particles/wormhole.lua

@@ -20,7 +20,7 @@
 base_size = 64
 
 return {
-	system_rotation = 0, system_rotationv = 0.5,
+	system_rotation = 0, system_rotationv = speed or 0.5,
 
 	base = 1000,
 
@@ -36,4 +36,4 @@ return {
 
 }, function(self)
 	self.ps:emit(1)
-end, 1, "shockbolt/terrain/wormhole", true
+end, 1, image or "shockbolt/terrain/wormhole", true