plop

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

game/engines/default/engine/interface/ActorLevel.lua

@@ -108,7 +108,7 @@ end
 -- @param target to whom is the exp rewarded
 -- @return the experience rewarded
 function _M:worthExp(target)
-	return self.level * self.exp_worth * (target.exp_gain_mult or 1)
+	return self.level * self.exp_worth
 end
 
 --- Method called when leveling up, module author rewrite it to do as you please

game/modules/tome/class/NicerTiles.lua

@@ -814,10 +814,12 @@ function _M:editTileGenericSandWalls(level, i, j, g, nt, type)
 	local g9 = level.map:checkEntity(i+1, j-1, Map.TERRAIN, kind) or type
 	local g1 = level.map:checkEntity(i-1, j+1, Map.TERRAIN, kind) or type
 	local g3 = level.map:checkEntity(i+1, j+1, Map.TERRAIN, kind) or type
+	local g2d = level.map:checkEntity(i, j+1, Map.TERRAIN, "is_door")
 	local g7d = nil
 	local g1d = nil
 	local g3d = nil
 	local g9d = nil
+	if g2d then g2 = "floor" end
 	if nt.consider_diagonal_doors then
 		g7d = level.map:checkEntity(i-1, j-1, Map.TERRAIN, "is_door")
 		g1d = level.map:checkEntity(i-1, j+1, Map.TERRAIN, "is_door")

game/modules/tome/class/Player.lua

@@ -665,7 +665,7 @@ function _M:getTarget(typ)
 			typ.immediate_keys = true
 			typ.default_target = self
 
-			if config.settings.tome.immediate_melee_keys_auto and not oldft then
+			if config.settings.tome.immediate_melee_keys_auto and not oldft and not typ.simple_dir_request then
 				local foes = {}
 				for _, c in pairs(util.adjacentCoords(self.x, self.y)) do
  					local target = game.level.map(c[1], c[2], Map.ACTOR)

game/modules/tome/data/general/grids/icecave.lua

@@ -76,9 +76,9 @@ newEntity{
 	door_closed = "ICECAVE_DOOR",
 }
 newEntity{ base = "ICECAVE_DOOR", define_as = "ICECAVE_DOOR_HORIZ", z=3, image = "terrain/icecave/icecave_door1.png", add_displays = {class.new{image="terrain/icecave/icecavewall_8_2.png", z=18, display_y=-1}}, door_opened = "ICECAVE_DOOR_HORIZ_OPEN"}
-newEntity{ base = "ICECAVE_DOOR_OPEN", define_as = "ICECAVE_DOOR_HORIZ_OPEN", image = "terrain/icecave/icecave_door1.png", add_displays = {class.new{image="terrain/icecave/icecave_door1_open.png", z=17}, class.new{image="terrain/icecave/icecavewall_8_2.png", z=18, display_y=-1}}, door_closed = "ICECAVE_DOOR_HORIZ"}
-newEntity{ base = "ICECAVE_DOOR", define_as = "ICECAVE_DOOR_VERT", image = "terrain/icecave/icecave_door1.png", add_displays = {class.new{image="terrain/icecave/icecave_door1_vert.png", z=17}, class.new{image="terrain/icecave/icecave_door1_vert_north.png", z=18, display_y=-1}}, door_opened = "ICECAVE_DOOR_OPEN_VERT", dig = "ICECAVE_DOOR_OPEN_VERT"}
-newEntity{ base = "ICECAVE_DOOR_OPEN", define_as = "ICECAVE_DOOR_OPEN_VERT", image = "terrain/icecave/icecave_door1.png", add_displays = {class.new{image="terrain/icecave/icecave_door1_open_vert.png", z=17}, class.new{image="terrain/icecave/icecave_door1_open_vert_north.png", z=18, display_y=-1}}, door_closed = "ICECAVE_DOOR_VERT"}
+newEntity{ base = "ICECAVE_DOOR_OPEN", define_as = "ICECAVE_DOOR_HORIZ_OPEN", image = "terrain/icecave/icecave_floor_1_01.png", add_mos={{image="terrain/icecave/icecave_door1_open_backg.png"}}, add_displays = {class.new{image="terrain/icecave/icecave_door1_open.png", z=17}, class.new{image="terrain/icecave/icecavewall_8_2.png", z=18, display_y=-1}}, door_closed = "ICECAVE_DOOR_HORIZ"}
+newEntity{ base = "ICECAVE_DOOR", define_as = "ICECAVE_DOOR_VERT", image = "terrain/icecave/icecave_floor_1_01.png", add_displays = {class.new{image="terrain/icecave/icecave_door1_vert.png", z=17}, class.new{image="terrain/icecave/icecave_door1_vert_north.png", z=18, display_y=-1}}, door_opened = "ICECAVE_DOOR_OPEN_VERT", dig = "ICECAVE_DOOR_OPEN_VERT"}
+newEntity{ base = "ICECAVE_DOOR_OPEN", define_as = "ICECAVE_DOOR_OPEN_VERT", z=3, image = "terrain/icecave/icecave_floor_1_01.png", add_mos={{image="terrain/icecave/icecave_door1_open_vert_backg.png"}}, add_displays = {class.new{image="terrain/icecave/icecave_door1_open_vert.png", z=17}, class.new{image="terrain/icecave/icecave_door1_open_vert_north.png", z=18, display_y=-1}}, door_closed = "ICECAVE_DOOR_VERT"}
 
 -----------------------------------------
 -- Cavy exits

game/modules/tome/data/talents/cunning/traps.lua

@@ -84,7 +84,7 @@ newTalent{
 	no_npc_use = true,
 	range = function(self, t) return math.ceil(self:getTalentLevel(t) + 5) end,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
 		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
@@ -245,7 +245,7 @@ newTalent{
 	tactical = { ATTACKAREA = { FIRE = 2 } },
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -293,7 +293,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -345,7 +345,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -403,7 +403,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -455,7 +455,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -505,7 +505,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -564,7 +564,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)
@@ -624,7 +624,7 @@ newTalent{
 	no_break_stealth = trap_stealth,
 	no_unlearn_last = true,
 	action = function(self, t)
-		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
+		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, simple_dir_request=true, talent=t}
 		local x, y, target = self:getTarget(tg)
 		if not x or not y then return nil end
 		local _ _, x, y = self:canProject(tg, x, y)