Merge remote-tracking branch 'upstream/master' into i18n

game/modules/tome/data/talents/cursed/cursed.lua

@@ -42,9 +42,9 @@ newTalentType{ allow_random=false, is_mind=true, type="cursed/curses", name = _t
 newTalentType{ allow_random=true, is_mind=true, type="cursed/fears", name = _t"fears", description = _t"Use the fear that lies at the heart of your curse to attack the minds of your enemies." }
 
 -- Fallen Class Evolution
-newTalentType{ allow_random=true, is_mind=true, type="cursed/bloodstained", name = _t"Bloodstained", description = _t"You, like your weapons, are tainted forever." }
-newTalentType{ allow_random=true, is_mind=true, type="cursed/crimson-templar", name = _t"Crimson Templar", description = _t"Blood is power. Let the rivers run red." }
-newTalentType{ allow_random=true, is_mind=true, generic=true, type="cursed/self-hatred", name = _t"Self-Hatred", description = _t"Of all the things in this dark world, you are the worst.  Torment yourself and find the power therein." }
+newTalentType{ allow_random=true, is_mind=true, type="cursed/bloodstained", name = _t"Bloodstained", description = "You, like your weapons, are tainted forever." }
+newTalentType{ allow_random=true, is_mind=true, type="cursed/crimson-templar", name = _t"Crimson Templar", description = "Blood is power. Let the rivers run red." }
+newTalentType{ allow_random=true, is_mind=true, generic=true, type="cursed/hatred", name = _t"Hatred", description = "All the things in this dark world are contemptible.  Let yourself hate them and find the power therein." }
 newTalentType{ allow_random=false, type="cursed/other", name = _t"Cursed", description = _t"Hate-powered abilities that don't belong anywhere else." }
 
 cursed_wil_req1 = {

game/modules/tome/data/talents/cursed/self-hatred.lua

@@ -18,8 +18,8 @@
 -- darkgod@te4.org
 
 newTalent{
-	name = "Self-Harm", short_name = "SELF_HARM",
-	type = {"cursed/self-hatred", 1},
+	name = "Self-Sacrifice", short_name = "SELF_SACRIFICE",
+	type = {"cursed/hatred", 1},
 	require = cursed_wil_req1,
 	points = 5,
 	no_energy = true,
@@ -58,15 +58,13 @@ newTalent{
 		local regen = t.getHate(self, t)
 		return ([[At the start of each turn, if you're bleeding, you gain %d hate.
 
-You can activate this talent to quickly draw a blade across your skin, bleeding yourself for a small portion of your maximum life (%0.2f damage) over the next 5 turns. This bleed cannot be resisted or removed, but can be reduced by Bloodstained.
-
-#{italic}#Pain is just about the only thing you can still feel.#{normal}#]]):tformat(regen, damage)
+You can activate this talent to use your own life for power, bleeding yourself for a small portion of your maximum life (%0.2f damage) over the next 5 turns. This bleed cannot be resisted or removed, but can be reduced by Bloodstained.]]):tformat(regen, damage)
 	end,
 }
 
 newTalent{
 	name = "Self-Loathing", short_name = "SELF_LOATHING",
-	type = {"cursed/self-hatred", 2},
+	type = {"cursed/hatred", 2},
 	require = cursed_wil_req2,
 	points = 5,
 	mode = "passive",
@@ -89,7 +87,7 @@ newTalent{
 
 newTalent{
 	name = "Self-Destruction", short_name = "SELF_DESTRUCTION",
-	type = {"cursed/self-hatred", 3},
+	type = {"cursed/hatred", 3},
 	require = cursed_wil_req3,
 	points = 5,
 	no_energy = true,
@@ -156,7 +154,7 @@ This strength comes at a cost: you lose %d%% of your maximum life every turn.  T
 
 newTalent{
 	name = "Self-Judgement", short_name = "SELF_JUDGEMENT",
-	type = {"cursed/self-hatred", 4},
+	type = {"cursed/hatred", 4},
 	require = cursed_wil_req4,
 	points = 5,
 	mode = "passive",
@@ -202,6 +200,6 @@ newTalent{
 		local failThreshold = t.getSpillThreshold(self, t)
 		return ([[Any direct damage that exceeds %d%% of your maximum life has the excess damage converted to a shallow wound that bleeds over the next %d turns. This bleed cannot be resisted or removed, but can be reduced by Bloodstained. Extremely powerful hits (more than %d%% of your max life) are not fully converted.
 
-#{italic}#You can't just die. That would be too easy. You deserve to die slowly.#{normal}#]]):tformat(threshold, time, failThreshold)
+#{italic}#You can't just die. That would be too easy.#{normal}#]]):tformat(threshold, time, failThreshold)
 	end,
 }

game/modules/tome/data/talents/uber/wil.lua

@@ -338,7 +338,7 @@ uberTalent{
 		t.learnAndMaster(self, "cursed/crimson-templar", self:knowTalentType("celestial/guardian"), 1.3 + (self.__increased_talent_types["celestial/guardian"] and 0.2 or 0))
 		t.learnAndMaster(self, "celestial/dark-sun", self:knowTalentType("celestial/crusader"), 1.3 + (self.__increased_talent_types["celestial/crusader"] and 0.2 or 0))
 		
-		t.learnAndMaster(self, "cursed/self-hatred", true, 1.3)
+		t.learnAndMaster(self, "cursed/hatred", true, 1.3)
 		t.learnAndMaster(self, "celestial/dirge", true, 1.3)
 		
 		local removes = {
@@ -359,7 +359,7 @@ uberTalent{
 		self:attr("swap_combat_techniques_hate", 1)
 		
 		self:learnTalent(self.T_DIRGE_ACOLYTE, true, 1)
-		self:learnTalent(self.T_SELF_HARM, true, 1)
+		self:learnTalent(self.T_SELF_SACRIFICE, true, 1)
 
 		self.descriptor.class_evolution = _t"Fallen"
 
@@ -395,7 +395,7 @@ uberTalent{
 		You will learn the following talents trees:
 		- #CRIMSON#Bloodstained#LAST#: Make your foes bleed!
 		- #CRIMSON#Darkside#LAST#: Every light casts a shadow, yours is powerful indeed
-		- #CRIMSON#Self-Hatred#LAST#: Manifest your self hatred through bleeding
+		- #CRIMSON#Hatred#LAST#: Manifest your hatred through bleeding
 		- #CRIMSON#Dirge#LAST#: Sing of death and sorrow to strengthen your resolve
 
 		You will forget the following talent trees, refunding any talent points: Shield Offense, Two-handed Assault.

game/modules/tome/data/texts/unlock-paladin_fallen.lua

@@ -27,7 +27,7 @@ You have unlocked the #LIGHT_GREEN#Fallen class evolution#WHITE# for Sun Paladin
 Learn new Talents:#YELLOW#
 - Bloodstained: Make your foes bleed!
 - Darkside: Every light casts a shadow, yours is powerful indeed
-- Self-Hatred: Manifest your self hatred through bleeding
+- Hatred: Manifest your hatred through bleeding
 - Dirges: Sing of death and sorrow to strength your resolve#WHITE#
 
 Swap your paladin Talents:#YELLOW#