Psi, paradox, and unarmed combat should show up in the vault now

Reduced scaling on Fade from Time and Haste
All timed effects now have a subtype
Moved many timed effects into more logical types (many rage effects are now mental for instance, burning is physical, etc.), players should double check timed effects to learn the new system
Body Reversion now only removes physical effects
Timeless and Providence no longer remove saturation effects (since these were moved to other)
Fixed Darkest Light no damage bug
Starting characters will now have a wild infusion that clears all physical effects rather then just poison (poison is now a physical effect with a poison subtype)


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

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

@@ -79,7 +79,9 @@ function _M:dumpToJSON(js)
 	if self:knowTalent(self.T_POSITIVE_POOL) then r[#r+1] = {positive=string.format("%d/%d", self.positive, self.max_positive)} end
 	if self:knowTalent(self.T_NEGATIVE_POOL) then r[#r+1] = {negative=string.format("%d/%d", self.negative, self.max_negative)} end
 	if self:knowTalent(self.T_VIM_POOL) then r[#r+1] = {vim=string.format("%d/%d", self.vim, self.max_vim)} end
+	if self:knowTalent(self.T_PSI_POOL) then r[#r+1] = {psi=string.format("%d/%d", self.psi, self.max_psi)} end
 	if self:knowTalent(self.T_EQUILIBRIUM_POOL) then r[#r+1] = {equilibrium=string.format("%d", self.equilibrium)} end
+	if self:knowTalent(self.T_PARADOX_POOL) then r[#r+1] = {paradox=string.format("%d", self.paradox)} end
 	if self:knowTalent(self.T_HATE_POOL) then r[#r+1] = {hate=string.format("%0.2f/%0.2f", self.hate, self.max_hate)} end
 
 	-------------------------------------------------------------------
@@ -123,6 +125,18 @@ function _M:dumpToJSON(js)
 			if mean and mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
 		end
 	end
+	--Unarmed?
+	if self:isUnarmed() then
+		local mean, dam = self.combat, self.combat
+		if mean and dam then
+			c[#c+1] = { ["accuracy (unarmed)"] = string.format("%d", self:combatAttack(mean)) }
+			c[#c+1] = { ["damage (unarmed)"] = string.format("%d", self:combatDamage(dam)) }
+			c[#c+1] = { ["APR (unarmed)"] = string.format("%d", self:combatAPR(dam)) }
+			c[#c+1] = { ["crit (unarmed)"] = string.format("%d%%", self:combatCrit(dam)) }
+			c[#c+1] = { ["speed (unarmed)"] = string.format("%0.2f", self:combatSpeed(mean)) }
+		end
+		if mean and mean.range then c[#c+1] = { ["range (unarmed)"] = mean.range } end
+	end
 	if self:getInven(self.INVEN_OFFHAND) then
 		local offmult = self:getOffHandMult()
 		for i, o in ipairs(self:getInven(self.INVEN_OFFHAND)) do

game/modules/tome/data/talents/celestial/eclipse.lua

@@ -159,6 +159,7 @@ newTalent{
 	end,
 	deactivate = function(self, t, p)
 		self:removeTemporaryValue("invisible", p.invisible)
+		self:removeTemporaryValue("invisible_damage_penalty", p.invisible_damage_penalty)
 		self:removeTemporaryValue("positive_regen", p.fill)
 		self:removeTemporaryValue("negative_regen", p.drain)
 		local tg = {type="ball", range=0, selffire=true, radius= t.getRadius(self, t), talent=t}

game/modules/tome/data/talents/chronomancy/paradox.lua

@@ -122,7 +122,7 @@ newTalent{
 	paradox = 10,
 	cooldown = 24,
 	tactical = { DEFEND = 2 },
-	getResist = function(self, t) return self:combatTalentSpellDamage(t, 10, 70) * getParadoxModifier(self, pm) end,
+	getResist = function(self, t) return self:combatTalentSpellDamage(t, 10, 50) * getParadoxModifier(self, pm) end,
 	action = function(self, t)
 		self:setEffect(self.EFF_FADE_FROM_TIME, 10, {power=t.getResist(self, t)})
 		game:playSoundNear(self, "talents/heal")
@@ -130,7 +130,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		local resist = t.getResist(self, t)
-		return ([[You partially remove yourself from the timeline for 10 turns, increasing your resistance to all damage by %d%%, reducing the duration of all detrimental effects by %d%%, and reducing all damage you deal by 10%%.
+		return ([[You partially remove yourself from the timeline for 10 turns, increasing your resistance to all damage by %d%%, reducing the duration of all detrimental effects by %d%%, and reducing all damage you deal by 20%%.
 		The resistance bonus, detrimental effect reduction, and damage penalty will gradually lose power over the course of the spell.
 		The effect will scale with your Paradox and Spellpower.]]):
 		format(resist, resist, resist/10)

game/modules/tome/data/talents/chronomancy/speed-control.lua

@@ -146,7 +146,7 @@ newTalent{
 	cooldown = 50,
 	tactical = { BUFF = 2, CLOSEIN = 2, ESCAPE = 2 },
 	no_energy = true,
-	getPower = function(self, t) return ((10 + (self:combatTalentSpellDamage(t, 10, 50) * getParadoxModifier(self, pm))) / 100) end,
+	getPower = function(self, t) return (self:combatTalentSpellDamage(t, 10, 50) * getParadoxModifier(self, pm)) / 100 end,
 	action = function(self, t)
 		self:setEffect(self.EFF_HASTE, 8, {power=t.getPower(self, t)})
 		return true

game/modules/tome/data/timed_effects.lua

@@ -17,6 +17,15 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+--	All timed effects are divided into physical, mental, magical, or other types.  Timed effect types are organized based on what saving throw or dispel would be most appropriate
+--	along with consideration based on how it can be applied.  There's a lot of overlap between natural and magical timed effects so when in doubt an effect will not be magical.
+--	Frozen is a good example of this because of Frost Breath.  Effects falling into the other category have no save and generally can not be removed unless they're specifically called.
+	
+--	All subtype organization is based off the root cause if one is available or effect if not.  For example burning is a fire effect, caused by fire.  
+--	Stun is a more general effect and can have many causes, thus it's subtype is based off its effect, so in this case the subtype is simply 'stun'.
+--	Burning Shock could easily fall into either of these subtypes.  First we ask if it has a cause, it does, fire.  Therefore it is subtype 'fire' rather then subtype 'stun'.
+
+
 local Stats = require "engine.interface.ActorStats"
 local Particles = require "engine.Particles"
 local Entity = require "engine.Entity"

game/modules/tome/data/timed_effects/other.lua

@@ -151,6 +151,7 @@ newEffect{
 	desc = "Golem out of sight",
 	long_desc = function(self, eff) return "The golem is out of sight of the alchemist; direct control will be lost!" end,
 	type = "other",
+	subtype = "miscellaneous",
 	status = "detrimental",
 	parameters = { },
 	on_gain = function(self, err) return "#LIGHT_RED##Target# is out of sight of its master; direct control will break!.", "+Out of sight" end,
@@ -177,7 +178,7 @@ newEffect{
 	desc = "Continuum Destabilization",
 	long_desc = function(self, eff) return ("The target has been affected by space or time manipulations and is becoming more resistant to them (+%d)."):format(eff.power) end,
 	type = "other",
-	subtype = "spacetime",
+	subtype = "time",
 	status = "beneficial",
 	parameters = { power=10 },
 	on_gain = function(self, err) return "#Target# looks a little pale around the edges.", "+Destabilized" end,
@@ -207,6 +208,7 @@ newEffect{
 	desc = "Summoning Destabilization",
 	long_desc = function(self, eff) return ("The more the target summons creatures the longer it will take to summon more (+%d turns)."):format(eff.power) end,
 	type = "other", -- Type "other" so that nothing can dispel it
+	subtype = "miscellaneous",
 	status = "detrimental",
 	parameters = { power=10 },
 	on_merge = function(self, old_eff, new_eff)
@@ -291,7 +293,7 @@ newEffect{
 	desc = "Temporal Stun",
 	long_desc = function(self, eff) return "The target is paralyzed, preventing any actions." end,
 	type = "other",
-	--subtype = "time", --no subtype so it can't be removed
+	subtype = "time",
 	status = "detrimental",
 	parameters = {},
 	on_gain = function(self, err) return "#Target# is paralyzed!", "+Paralyzed" end,
@@ -309,7 +311,7 @@ newEffect{
 	desc = "Precognition",
 	long_desc = function(self, eff) return "You walk into the future; when the effect ends, if you are not dead, you are brought back to the past." end,
 	type = "other",
-	--subtype = "time", --no subtype so it can't be removed
+	subtype = "time",
 	status = "beneficial",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -335,7 +337,7 @@ newEffect{
 	desc = "See the Threads",
 	long_desc = function(self, eff) return ("You walk three different timelines, choosing the one you prefer at the end (current timeline: %d)."):format(eff.thread) end,
 	type = "other",
-	--subtype = "time", --no subtype so it can't be removed
+	subtype = "time",
 	status = "beneficial",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -390,7 +392,7 @@ newEffect{
 	desc = "Imminent Paradox Clone",
 	long_desc = function(self, eff) return "When the effect expires you'll be pulled into the past." end,
 	type = "other",
-	--subtype = "time", --no subtype so it can't be removed
+	subtype = "time",
 	status = "detrimental",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -442,7 +444,7 @@ newEffect{
 	desc = "Paradox Clone",
 	long_desc = function(self, eff) return "You've been pulled into the past." end,
 	type = "other",
-	--subtype = "time", --no subtype so it can't be removed
+	subtype = "time",
 	status = "detrimental",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -467,6 +469,7 @@ newEffect{
 	desc = "Militant Mind",
 	long_desc = function(self, eff) return ("Increases physical power, spellpower and mindpower by %d."):format(eff.power) end,
 	type = "other",
+	subtype = "miscellaneous",
 	status = "beneficial",
 	parameters = { power=10 },
 	activate = function(self, eff)
@@ -520,7 +523,7 @@ newEffect{
 	name = "FADE_FROM_TIME",
 	desc = "Fade From Time",
 	long_desc = function(self, eff) return ("The target is partially removed from the timeline, reducing all damage dealt by %d%%, all damage recieved by %d%%, and the duration of all detrimental effects by %d%%."):
-	format(eff.dur + 1, eff.cur_power or eff.power, eff.cur_power or eff.power) end,
+	format(eff.dur + 1 * 2, eff.cur_power or eff.power, eff.cur_power or eff.power) end,
 	type = "other",
 	subtype = "time",
 	status = "beneficial",
@@ -531,7 +534,7 @@ newEffect{
 		self:removeTemporaryValue("inc_damage", old_eff.dmgid)
 		self:removeTemporaryValue("resists", old_eff.rstid)
 		old_eff.cur_power = (new_eff.power)
-		old_eff.dmgid = self:addTemporaryValue("inc_damage", {all = - old_eff.dur})
+		old_eff.dmgid = self:addTemporaryValue("inc_damage", {all = - old_eff.dur * 2})
 		old_eff.rstid = self:addTemporaryValue("resists", {all = old_eff.cur_power})
 
 		old_eff.dur = old_eff.dur
@@ -544,7 +547,7 @@ newEffect{
 	activate = function(self, eff)
 		eff.cur_power = eff.power
 		eff.rstid = self:addTemporaryValue("resists", { all = eff.power})
-		eff.dmgid = self:addTemporaryValue("inc_damage", {all = -10})
+		eff.dmgid = self:addTemporaryValue("inc_damage", {all = -20})
 	end,
 	deactivate = function(self, eff)
 		self:removeTemporaryValue("resists", eff.rstid)
@@ -557,6 +560,7 @@ newEffect{
 	desc = "Shadow Veil",
 	long_desc = function(self, eff) return ("You veil yourself in shadows and let them control you. While in the veil you become immune to status effects, gain %d%% all damage reduction and each turn you blink to a nearby foe, hitting it for %d%% darkness weapon damage. While this goes on you can not be stopped unless you are killed and can not control you character."):format(eff.res, eff.dam * 100) end,
 	type = "other",
+	subtype = "darkness",
 	status = "beneficial",
 	parameters = { res=10, dam=1.5 },
 	on_gain = function(self, err) return "#Target# is covered in a veil of shadows!", "+Assail" end,

game/modules/tome/dialogs/CharacterSheet.lua

@@ -852,7 +852,6 @@ function _M:dump()
 	nl(("CON:  %d"):format(player:getCon()))
 
 	 -- All weapons in main hands
-
 	local strings = {}
 	for i = 1, 6 do strings[i]="" end
 	if player:getInven(player.INVEN_MAINHAND) then
@@ -871,6 +870,18 @@ function _M:dump()
 			if mean and mean.range then strings[6] = ("Range (Main Hand): %3d"):format(mean.range) end
 		end
 	end
+	--Unarmed??
+	if player:isUnarmed() then
+		local mean, dam = player.combat, player.combat
+		if mean and dam then
+			strings[1] = ("Accuracy(Unarmed): %3d"):format(player:combatAttack(mean))
+			strings[2] = ("Damage  (Unarmed): %3d"):format(player:combatDamage(dam))
+			strings[3] = ("APR     (Unarmed): %3d"):format(player:combatAPR(dam))
+			strings[4] = ("Crit    (Unarmed): %3d%%"):format(player:combatCrit(dam))
+			strings[5] = ("Speed   (Unarmed): %0.2f"):format(player:combatSpeed(mean))
+		end
+		if mean and mean.range then strings[6] = ("Range (Unarmed): %3d"):format(mean.range) end
+	end
 
 	local enc, max = player:getEncumbrance(), player:getMaxEncumbrance()
 
@@ -918,6 +929,12 @@ function _M:dump()
 	else
 		nl()
 	end
+	nnl(("%-32s"):format(""))
+	if player:knowTalent(player.T_PARADOX_POOL) then
+		nl((makelabel("Paradox", ("    %d"):format(player:getParadox()))))
+	else
+		nl()
+	end
 
 	-- All weapons in off hands
 	-- Offhand attacks are with a damage penalty, that can be reduced by talents