"Quick" weapon ego now increases weapon speed, not global attack speed

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

game/modules/tome/class/interface/Combat.lua

@@ -824,7 +824,6 @@ function _M:combatMentalResist()
 		local t = self:getTalentFromId(self.T_STEADY_MIND)
 		add = add + t.getMental(self, t)
 	end
-	local add = 0
 	if self:knowTalent(self.T_POWER_IS_MONEY) then
 		add = add + util.bound(self.money / (60 - self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 5), 0, self:getTalentLevelRaw(self.T_POWER_IS_MONEY) * 10)
 	end

game/modules/tome/data/general/objects/egos/weapon.lua

@@ -249,8 +249,8 @@ newEntity{
 	greater_ego = 1,
 	rarity = 25,
 	cost = 30,
+	combat = { physspeed = -0.1 },
 	wielder = {
-		physspeed = -0.1,
 		combat_atk = resolvers.mbonus_material(20, 2, function(e, v) return v * 0.3 end),
 		inc_stats = {
 			[Stats.STAT_DEX] = resolvers.mbonus_material(4, 3, function(e, v) return v * 3 end),

game/modules/tome/data/talents/psionic/projection.lua

@@ -299,7 +299,7 @@ newTalent{
 		local mast = aura_mastery(self, t)
 		local spikecost = t.getSpikeCost(self, t)
 		return ([[Fills the air around you with reactive currents of furnace-like heat that do %d fire damage to all who approach. All damage done by the aura will drain one point of energy per %0.2f points of damage dealt.
-		When deactivated, if you have at least %d energy, a massive spike of thermal energy is released as a conical blast (radius %d) of superheated air. Anybody caught in it will suffer %d fire damage. Telekinetically wielding a gem instead of a weapon will result in improved spike efficiency.
+		When deactivated, if you have at least %d energy, a massive spike of thermal energy is released as a conical blast (radius %d) of superheated air. Anybody caught in it will suffer %d fire damage over several turns. Telekinetically wielding a gem instead of a weapon will result in improved spike efficiency.
 		The damage will increase with the Willpower stat.
 		To turn off an aura without spiking it, deactivate it and target yourself.]]):format(dam, mast, spikecost, rad, spikedam)
 	end,