moar

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

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

@@ -42,3 +42,17 @@ newEntity{
 		e.charm_power = math.ceil(e.charm_power * rng.float(1.3, 1.5))
 	end),
 }
+
+newEntity{
+	name = "overpowered ", prefix=true,
+	keywords = {['overpower']=true},
+	level_range = {30, 50},
+	greater_ego = 1,
+	rarity = 16,
+	cost = 5,
+	resolvers.genericlast(function(e)
+		if not e.use_power or not e.charm_power then return end
+		e.use_power.power = math.ceil(e.use_power.power * rng.float(1.4, 1.7))
+		e.charm_power = math.ceil(e.charm_power * rng.float(1.6, 1.9))
+	end),
+}

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

@@ -23,7 +23,7 @@ local DamageType = require "engine.DamageType"
 load("/data/general/objects/egos/charms.lua")
 
 newEntity{
-	name = "arcane ", prefix=true,
+	name = "arcane ", prefix=true, second=true,
 	keywords = {arcane=true},
 	level_range = {10, 50},
 	rarity = 12,
@@ -37,7 +37,7 @@ newEntity{
 }
 
 newEntity{
-	name = "defiled ", prefix=true,
+	name = "defiled ", prefix=true, second=true,
 	keywords = {defiled=true},
 	level_range = {10, 50},
 	rarity = 12,
@@ -51,7 +51,7 @@ newEntity{
 }
 
 newEntity{
-	name = "bright ", prefix=true,
+	name = "bright ", prefix=true, second=true,
 	keywords = {bright=true},
 	level_range = {10, 50},
 	rarity = 12,
@@ -65,7 +65,7 @@ newEntity{
 }
 
 newEntity{
-	name = "shadowy ", prefix=true,
+	name = "shadowy ", prefix=true, second=true,
 	keywords = {shadow=true},
 	level_range = {10, 50},
 	rarity = 12,
@@ -79,7 +79,7 @@ newEntity{
 }
 
 newEntity{
-	name = "warded ", prefix=true,
+	name = "warded ", prefix=true, second=true,
 	keywords = {ward=true},
 	level_range = {30, 50},
 	rarity = 12,
@@ -99,7 +99,7 @@ newEntity{
 }
 
 newEntity{
-	name = "void ", prefix=true,
+	name = "void ", prefix=true, second=true,
 	keywords = {void=true},
 	level_range = {30, 50},
 	rarity = 12,
@@ -113,7 +113,7 @@ newEntity{
 }
 
 newEntity{
-	name = "volcanic ", prefix=true,
+	name = "volcanic ", prefix=true, second=true,
 	keywords = {volcanic=true},
 	level_range = {30, 50},
 	rarity = 12,
@@ -126,7 +126,7 @@ newEntity{
 }
 
 newEntity{
-	name = "striking ", prefix=true,
+	name = "striking ", prefix=true, second=true,
 	keywords = {striking=true},
 	level_range = {30, 50},
 	rarity = 12,

game/modules/tome/data/general/objects/torques.lua

@@ -31,6 +31,7 @@ newEntity{
 	egos = "/data/general/objects/egos/torques.lua", egos_chance = { prefix=resolvers.mbonus(20, 5), suffix=resolvers.mbonus(20, 5) },
 	addons = "/data/general/objects/egos/torques-powers.lua",
 	power_source = {psionic=true},
+	randart_able = { misc=10 },
 	talent_cooldown = "T_GLOBAL_CD",
 }
 

game/modules/tome/data/general/objects/totems.lua

@@ -31,6 +31,7 @@ newEntity{
 	egos = "/data/general/objects/egos/totems.lua", egos_chance = { prefix=resolvers.mbonus(20, 5), suffix=resolvers.mbonus(20, 5) },
 	addons = "/data/general/objects/egos/totems-powers.lua",
 	power_source = {nature=true},
+	randart_able = { misc=10 },
 	talent_cooldown = "T_GLOBAL_CD",
 }
 

game/modules/tome/data/general/objects/wands.lua

@@ -28,7 +28,7 @@ newEntity{
 	add_name = "#CHARM# #CHARGES#",
 	use_sound = "talents/spell_generic",
 	desc = [[Magical wands are made by powerful Alchemists and Archmagi to store spells. Anybody can use them to release the spells.]],
-	egos = "/data/general/objects/egos/wands.lua", egos_chance = { prefix=resolvers.mbonus(20, 5), suffix=resolvers.mbonus(20, 5) },
+	egos = "/data/general/objects/egos/wands.lua", egos_chance = { prefix=resolvers.mbonus(20, 5), },
 	addons = "/data/general/objects/egos/wands-powers.lua",
 	power_source = {arcane=true},
 	randart_able = { misc=10 },

game/modules/tome/data/talents/misc/npcs.lua

@@ -25,6 +25,7 @@ newTalentType{ no_silence=true, is_spell=true, type="chronomancy/other", name =
 newTalentType{ no_silence=true, is_spell=true, type="spell/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 newTalentType{ no_silence=true, is_spell=true, type="corruption/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 newTalentType{ is_nature=true, type="wild-gift/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
+newTalentType{ type="psionic/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 newTalentType{ type="other/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 newTalentType{ type="undead/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
 
@@ -1044,10 +1045,10 @@ newTalent{
 
 newTalent{
 	name = "Mind Sear",
-	type = {"wild-gift/other", 1},
+	type = {"psionic/other", 1},
 	points = 5,
 	cooldown = 2,
-	equilibrium = 5,
+	psi = 5,
 	range = 7,
 	direct_hit = true,
 	requires_target = true,
@@ -1071,10 +1072,10 @@ newTalent{
 
 newTalent{
 	name = "Silence",
-	type = {"wild-gift/other", 1},
+	type = {"psionic/other", 1},
 	points = 5,
 	cooldown = 10,
-	equilibrium = 5,
+	psi = 5,
 	range = 7,
 	direct_hit = true,
 	requires_target = true,
@@ -1115,7 +1116,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Sends a telekinetic attack, knocking back the target and doing %0.2f physical damage.
-		The damage will increase with Willpower and Cunning stats.]]):format(self:combatTalentMindDamage(t, 10, 170))
+		The damage will increase with Mindpower.]]):format(self:combatTalentMindDamage(t, 10, 170))
 	end,
 }