plop

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

game/modules/tome/data/birth/descriptors.lua

@@ -85,7 +85,7 @@ newBirthDescriptor{
 			{type="scroll", subtype="rune", name="rune of invisibility", ego_chance=-1000},
 		},
 		resolvers.inscription("INFUSION:_HEALING", {cooldown=10, heal=50}),
-		resolvers.inscription("INFUSION:_CURE", {cooldown=7, what={poison=true}}),
+		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
 	},
 }
 

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

@@ -176,10 +176,10 @@ newEntity{
 newEntity{
 	name = " of healing", suffix=true, instant_resolve=true,
 	level_range = {25, 50},
-	rarity = 10,
-	cost_per_charge = 2,
+	rarity = 20,
+	cost_per_charge = 4,
 
-	use_power = { name = "heal", power = 7, use = function(self, who)
+	use_power = { name = "heal", power = 12, use = function(self, who)
 		local tg = {default_target=who, type="hit", nowarning=true, range=6 + who:getMag(4), first_target="friend"}
 		local x, y = who:getTarget(tg)
 		if not x or not y then return nil end

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

@@ -203,7 +203,7 @@ newEntity{ base = "BASE_INFUSION",
 		use_stat_mod = 2,
 	},
 
-	use_simple = { name="inscribe your skin with a infusion that allows you to randomly teleport.", use = function(self, who, inven, item)
+	use_simple = { name="inscribe your skin with an infusion that allows you to randomly teleport.", use = function(self, who, inven, item)
 		if who:setInscription(nil, "INFUSION:_HEALING", self.inscription_data, true, true, {obj=self, inven=inven, item=item}) then
 			return "destroy", true
 		end
@@ -211,27 +211,32 @@ newEntity{ base = "BASE_INFUSION",
 }
 
 newEntity{ base = "BASE_INFUSION",
-	name = "infusion of cure",
+	name = "infusion of the wild",
 	level_range = {1, 50},
-	rarity = 9,
-	cost = 10,
+	rarity = 12,
+	cost = 20,
 	material_level = 1,
 
 	inscription_data = resolvers.generic(function(e)
 		return {
-			cooldown = rng.range(4, 8),
-			poison = true,
-			disease = rng.percent(40),
-			curse = rng.percent(40),
-			hex = rng.percent(40),
-			magical = rng.percent(40),
-			physical = rng.percent(40),
-			mental = rng.percent(40),
+			cooldown = rng.range(10, 15),
+			dur = rng.mbonus(4, 4),
+			power = rng.mbonus(30, 20),
+			use_stat_mod = 0.1,
+			what = {
+				poison = true,
+				disease = rng.percent(40) and true or nil,
+				curse = rng.percent(40) and true or nil,
+				hex = rng.percent(40) and true or nil,
+				magical = rng.percent(40) and true or nil,
+				physical = rng.percent(40) and true or nil,
+				mental = rng.percent(40) and true or nil,
+			}
 		}
 	end),
 
-	use_simple = { name="inscribe your skin with a infusion that allows you to cure yourself.", use = function(self, who, inven, item)
-		if who:setInscription(nil, "INFUSION:_CURE", self.inscription_data, true, true, {obj=self, inven=inven, item=item}) then
+	use_simple = { name="inscribe your skin with an infusion that allows you to cure yourself and reduce damage taken for a few turns.", use = function(self, who, inven, item)
+		if who:setInscription(nil, "INFUSION:_WILD", self.inscription_data, true, true, {obj=self, inven=inven, item=item}) then
 			return "destroy", true
 		end
 	end}
@@ -250,34 +255,13 @@ newEntity{ base = "BASE_INFUSION",
 		use_stat_mod = 0.05,
 	},
 
-	use_simple = { name="inscribe your skin with a infusion that allows you to become immune to movement imparing effects.", use = function(self, who, inven, item)
+	use_simple = { name="inscribe your skin with an infusion that allows you to become immune to movement imparing effects.", use = function(self, who, inven, item)
 		if who:setInscription(nil, "INFUSION:_MOVEMENT", self.inscription_data, true, true, {obj=self, inven=inven, item=item}) then
 			return "destroy", true
 		end
 	end}
 }
 
-newEntity{ base = "BASE_INFUSION",
-	name = "infusion of pain suppression",
-	level_range = {15, 50},
-	rarity = 9,
-	cost = 30,
-	material_level = 3,
-
-	inscription_data = {
-		cooldown = resolvers.rngrange(9, 12),
-		dur = resolvers.mbonus(4, 4),
-		power = resolvers.mbonus(30, 20),
-		use_stat_mod = 0.1,
-	},
-
-	use_simple = { name="inscribe your skin with a infusion that allows you to reduce damage taken for a few turns.", use = function(self, who, inven, item)
-		if who:setInscription(nil, "INFUSION:_PAIN_SUPPRESSION", self.inscription_data, true, true, {obj=self, inven=inven, item=item}) then
-			return "destroy", true
-		end
-	end}
-}
-
 newEntity{ base = "BASE_RUNE",
 	name = "rune of phase door",
 	level_range = {1, 50},

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

@@ -48,9 +48,10 @@ newInscription{
 }
 
 newInscription{
-	name = "Infusion: Cure",
+	name = "Infusion: Wild",
 	type = {"inscriptions/infusions", 1},
 	points = 1,
+	no_energy = true,
 	cooldown = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
 		return data.cooldown
@@ -82,12 +83,13 @@ newInscription{
 		if known then
 			game.logSeen(self, "%s is cured!", self.name:capitalize())
 		end
+		self:setEffect(self.EFF_PAIN_SUPPRESSION, data.dur, {power=data.power + data.inc_stat})
 		return true
 	end,
 	info = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
 		local what = table.concat(table.keys(data.what), ", ")
-		return ([[Activate the infusion to cure yourself of %s effects.]]):format(what)
+		return ([[Activate the infusion to cure yourself of %s effects and reduce all damage taken by %d%% for %D turns.]]):format(what, data.power+data.inc_stat, data.dur)
 	end,
 }
 
@@ -110,25 +112,6 @@ newInscription{
 	end,
 }
 
-newInscription{
-	name = "Infusion: Pain Suppression",
-	type = {"inscriptions/infusions", 1},
-	points = 1,
-	cooldown = function(self, t)
-		local data = self:getInscriptionData(t.short_name)
-		return data.cooldown
-	end,
-	action = function(self, t)
-		local data = self:getInscriptionData(t.short_name)
-		self:setEffect(self.EFF_PAIN_SUPPRESSION, data.dur, {power=data.power + data.inc_stat})
-		return true
-	end,
-	info = function(self, t)
-		local data = self:getInscriptionData(t.short_name)
-		return ([[Activate the infusion to reduce the pain you suffer, reducing all damage taken by %d%% for %d turns.]]):format(data.power + data.inc_stat, data.dur)
-	end,
-}
-
 -----------------------------------------------------------------------
 -- Runes
 -----------------------------------------------------------------------

game/modules/tome/data/zones/ruins-kor-pul/zone.lua

@@ -51,7 +51,6 @@ return {
 		object = {
 			class = "engine.generator.object.Random",
 			nb_object = {6, 9},
-			filters = { {type="potion" }, {type="potion" }, {type="potion" }, {type="scroll" }, {max_ood=7}, {max_ood=7} }
 		},
 		trap = {
 			class = "engine.generator.trap.Random",

game/modules/tome/data/zones/trollshaws/zone.lua

@@ -60,7 +60,6 @@ return {
 		object = {
 			class = "engine.generator.object.Random",
 			nb_object = {6, 9},
-			filters = { {type="potion" }, {type="potion" }, {type="potion" }, {type="scroll" }, {max_ood=7}, {max_ood=7} }
 		},
 		trap = {
 			class = "engine.generator.trap.Random",