Merge branch 'master' of git.net-core.org:tome/t-engine4

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

@@ -42,7 +42,7 @@ newTalentType{ no_silence=true, is_spell=true, type="celestial/other", name = _t
 -- Fallen Class Evolution
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dirges", name = "Dirges", description = "The songs the Fallen sing." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/darkside", name = "Darkside", description = "Signature magics of the Fallen.  The sun shines for the guilty and the innocent alike." }
-newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/black-sun", name = "Black Sun", description = "Celestial combat techniques inspired by the dark places that are not empty." }
+newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dark-sun", name = "Dark Sun", description = "Celestial combat techniques inspired by the dark places that are not empty." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, generic=true, type="celestial/dirge", name = "Dirges", description = "Sing of death and damnation." }
 
 -- Generic requires for celestial spells based on talent level
@@ -87,7 +87,7 @@ divi_req_high5 = {
 	level = function(level) return 26 + (level-1)  end,
 }
 
--- Used by Fallen Black Sun tree
+-- Used by Fallen Dark Sun tree
 divi_str_req_high1 = {
 	stat = { str=function(level) return 22 + (level-1) * 2 end },
 	level = function(level) return 10 + (level-1)  end,
@@ -128,5 +128,5 @@ load("/data/talents/celestial/circles.lua")
 load("/data/talents/celestial/other.lua")
 
 load("/data/talents/celestial/darkside.lua")
-load("/data/talents/celestial/black-sun.lua")
+load("/data/talents/celestial/dark-sun.lua")
 load("/data/talents/celestial/dirge.lua")

game/modules/tome/data/talents/celestial/black-sun.lua → game/modules/tome/data/talents/celestial/dark-sun.lua

@@ -21,7 +21,7 @@ local Object = require "mod.class.Object"
 
 newTalent{
 	name = "Collapse", short_name = "FALLEN_BREACH",
-	type = {"celestial/black-sun", 1},
+	type = {"celestial/dark-sun", 1},
 	require = divi_str_req_high1,
 	points = 5,
 	cooldown = 12,
@@ -135,7 +135,7 @@ The damage will increase with your Spellpower.]]):
 
 newTalent{
 	name = "Devourer Stance",
-	type = {"celestial/black-sun", 2},
+	type = {"celestial/dark-sun", 2},
 	require = divi_str_req_high2,
 	points = 5,
 	cooldown = 15,
@@ -154,7 +154,7 @@ The damage will increase with your Spellpower.]]):tformat(t.getDuration(self,t),
 
 newTalent{
 	name = "Singularity Armor",
-	type = {"celestial/black-sun", 3},
+	type = {"celestial/dark-sun", 3},
 	require = divi_str_req_high3,
 	points = 5,
 	mode = "sustained",
@@ -190,7 +190,7 @@ newTalent{
 
 newTalent{
 	name = "Doom Spiral",
-	type = {"celestial/black-sun", 4},
+	type = {"celestial/dark-sun", 4},
 	require = divi_str_req_high4,
 	points = 5,
 	random_ego = "attack",

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

@@ -336,7 +336,7 @@ uberTalent{
 		t.learnAndMaster(self, "cursed/gloom", self:knowTalentType("celestial/radiance"), 1.3 + (self.__increased_talent_types["celestial/radiance"] and 0.2 or 0))
 		
 		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/black-sun", self:knowTalentType("celestial/crusader"), 1.3 + (self.__increased_talent_types["celestial/crusader"] 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, "celestial/dirge", true, 1.3)
@@ -390,7 +390,7 @@ uberTalent{
 		The following talent trees are swapped:
 		- #GOLD#Radiance#LAST# turns into #CRIMSON#Gloom#LAST#: Project onto others your own hate, hindering them
 		- #GOLD#Guardian#LAST# turns into #CRIMSON#Crimson Templar#LAST#: Use the power of blood to control and defeat the fools that oppose you
-		- #GOLD#Crusader#LAST# turns into #CRIMSON#Black Sun#LAST#: Call upon the energies of dead suns to crush your foes
+		- #GOLD#Crusader#LAST# turns into #CRIMSON#Dark Sun#LAST#: Call upon the energies of dead suns to crush your foes
 
 		You will learn the following talents trees:
 		- #CRIMSON#Bloodstained#LAST#: Make your foes bleed!

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

@@ -32,7 +32,7 @@ Learn new Talents:#YELLOW#
 
 Swap your paladin Talents:#YELLOW#
 - Radiance turns into Gloom: Project onto others your own hate, hindering them
-- Crusader turns into Black Sun: Call upon the energies of dead suns to crush your foes
+- Crusader turns into Dark Sun: Call upon the energies of dead suns to crush your foes
 - Guardian turns into Crimson Templar: Use the power of blood to control and defeat the fools that oppose you
 #WHITE#