stuff

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

game/modules/tome/data/general/objects/boss-artifacts.lua

@@ -132,7 +132,7 @@ newEntity{ base = "BASE_LEATHER_BOOT",
 newEntity{ base = "BASE_HELM",
 	power_source = {technique=true},
 	define_as = "DRAGON_SKULL",
-	name = "Dragonskull Helm", unique=true, unided_name="skull helm",
+	name = "Dragonskull Helm", unique=true, unided_name="skull helm", image = "object/artifact/dragonskull_helmet.png",
 	desc = [[Traces of a dragon's power still remain in this bleached and cracked skull.]],
 	require = { stat = { mag=24 }, },
 	level_range = {45, 50},

game/modules/tome/data/talents/spells/explosives.lua

@@ -28,7 +28,7 @@ newTalent{
 		return math.ceil(5 + self:getDex(6))
 	end,
 	radius = function(self, t)
-		return 1+self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT)
+		return util.bound(1+self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT), 1, 6)
 	end,
 	direct_hit = true,
 	requires_target = true,
@@ -84,6 +84,20 @@ newTalent{
 		end
 		local dam_done = 0
 
+		-- Compare theorical AOE zone with actual zone and adjust damage accordingly
+		if self:knowTalent(self.T_EXPLOSION_EXPERT) then
+			local theorical_nb = ({ 9, 25, 45, 77, 109, 145 })[tg.radius]
+			local nb = 0
+			local grids = self:project(tg, x, y, function(tx, ty) end)
+			for px, ys in pairs(grids) do for py, _ in pairs(ys) do nb = nb + 1 end end
+			nb = theorical_nb - nb
+			if nb > 0 then
+				local mult = (math.log10(nb) / (6 - self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT)))
+				print("Adjusting explosion damage to account for ", nb, " lost tiles => ", mult * 100)
+				dam = dam + dam * mult
+			end
+		end
+
 		local tmp = {}
 		local grids = self:project(tg, x, y, function(tx, ty)
 			local d = dam
@@ -174,7 +188,8 @@ newTalent{
 	mode = "passive",
 	points = 5,
 	info = function(self, t)
-		return ([[Your alchemist bombs now affect a radius of %d around them.]]):format(self:getTalentLevelRaw(t))
+		return ([[Your alchemist bombs now affect a radius of %d around them.
+		Additionally tiles that would have been lost to terrain will now have the damage spread out over the effect.]]):format(self:getTalentLevelRaw(t))
 	end,
 }
 

game/modules/tome/data/talents/spells/golemancy.lua

@@ -36,7 +36,7 @@ local function makeGolem()
 
 		combat = { dam=10, atk=10, apr=0, dammod={str=1} },
 
-		body = { INVEN = 1000, MAINHAND=1, BODY=1, GEM=2 },
+		body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, BODY=1, GEM=2 },
 		infravision = 20,
 		rank = 3,
 		size_category = 4,