Acid, Frost, Lightning Infusions do not reduce the total damage done

Alchemists Bombs do not use Dex anymore


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

game/modules/tome/data/birth/classes/mage.lua

@@ -50,14 +50,14 @@ newBirthDescriptor{
 		"They do not use the forbidden arcane arts practised by the mages of old - such perverters of nature have been shunned or actively hunted down since the Spellblaze.",
 		"Alchemists can transmute gems to bring forth elemental effects, turning them into balls of fire, torrents of acid, and other effects.  They can also reinforce armour with magical effects using gems, and channel arcane staffs to produce bolts of energy.",
 		"Though normally physically weak, most alchemists are accompanied by magical golems which they construct and use as bodyguards.  These golems are enslaved to their master's will, and can grow in power as their master advances through the arts.",
-		"Their most important stats are: Magic and Dexterity",
+		"Their most important stats are: Magic and Constitution",
 		"#GOLD#Stat modifiers:",
-		"#LIGHT_BLUE# * +0 Strength, +3 Dexterity, +0 Constitution",
+		"#LIGHT_BLUE# * +0 Strength, +0 Dexterity, +3 Constitution",
 		"#LIGHT_BLUE# * +5 Magic, +1 Willpower, +0 Cunning",
 		"#GOLD#Life per level:#LIGHT_BLUE# -1",
 	},
 	power_source = {arcane=true},
-	stats = { mag=5, dex=3, wil=1, },
+	stats = { mag=5, con=3, wil=1, },
 	talents_types = {
 		["spell/explosives"]={true, 0.3},
 		["spell/infusion"]={true, 0.3},

game/modules/tome/data/damage_types.lua

@@ -534,7 +534,16 @@ newDamageType{
 	antimagic_resolve = true,
 	projector = function(src, x, y, type, dam)
 		if src.fire_convert_to then
-			return DamageType:get(src.fire_convert_to[1]).projector(src, x, y, src.fire_convert_to[1], dam * src.fire_convert_to[2] / 100)
+			if src.fire_convert_to[2] >= 100 then
+				return DamageType:get(src.fire_convert_to[1]).projector(src, x, y, src.fire_convert_to[1], dam * src.fire_convert_to[2] / 100)
+			else
+				local old = src.fire_convert_to
+				src.fire_convert_to = nil
+				dam = DamageType:get(old[1]).projector(src, x, y, old[1], dam * old[2] / 100) + 
+				       DamageType:get(type).projector(src, x, y, type, dam * (100 - old[2]) / 100)
+				src.fire_convert_to = old
+				return dam
+			end
 		end
 		local realdam = DamageType.defaultProjector(src, x, y, type, dam)
 		if realdam > 0 then

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

@@ -25,7 +25,7 @@ newTalent{
 	mana = 5,
 	cooldown = 4,
 	range = function(self, t)
-		return math.ceil(5 + self:getDex(6))
+		return math.ceil(4 + self:getTalentLevelRaw(t))
 	end,
 	radius = function(self, t)
 		return util.bound(1+self:getTalentLevelRaw(self.T_EXPLOSION_EXPERT), 1, 6)
@@ -201,7 +201,7 @@ newTalent{
 	mana = 32,
 	cooldown = 10,
 	range = function(self, t)
-		return math.ceil(5 + self:getDex(6))
+		return math.ceil(4 + self:getTalentLevelRaw(t))
 	end,
 	radius = 2,
 	direct_hit = true,