lower passive healing; gollum

gdg-garage · Oct 9, 2023 · e31adde · e31adde
1 parent 1db2005
commit e31adde
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 2 deletions.
diff --git a/sources/generateFloor.cpp b/sources/generateFloor.cpp
@@ -24,6 +24,7 @@ Monster monsterSatyr(uint32 level);
 Monster monsterElemental(uint32 level);
 Monster monsterVandal(uint32 level);
 Monster monsterNuclearBomb(uint32 level);
+Monster monsterGollum(uint32 level);
 
 namespace std
 {
@@ -1443,6 +1444,15 @@ namespace
 			surroundWithDecorations(f, p, "bones");
 		}
 
+		// the gollum
+		if (f.level > 45 && randomChance() < 0.05)
+		{
+			const Vec2i p = findAny(f, TileEnum::Empty);
+			f.tile(p) = TileEnum::Monster;
+			f.extra(p).push_back(monsterGollum(f.level));
+			surroundWithDecorations(f, p, "rocks");
+		}
+
 		// templars
 		if (f.level > 70 && randomChance() < 0.05)
 		{

diff --git a/sources/generateMonsters.cpp b/sources/generateMonsters.cpp
@@ -246,7 +246,7 @@ Monster monsterTroll(const Generate &generate)
 	{
 		Skill sk(generate);
 		sk.name = "Regenerate";
-		sk.caster.attributes[AttributeEnum::Life][AttributeEnum::Constitution] = makeAttrFactor(generate.power, sk.addPower(1, "Quick")) * 0.3;
+		sk.caster.attributes[AttributeEnum::Life][AttributeEnum::Constitution] = makeAttrFactor(generate.power, sk.addPower(1, "Quick")) * 0.1;
 		sk.flags.passive = true;
 		it.addOther(sk, 1);
 		it.skills.push_back(std::move(sk));
@@ -1243,7 +1243,7 @@ Monster monsterHealingTotem(uint32 level)
 		sk.name = "Blessed Healing";
 		sk.radius[AttributeEnum::Constant] = randomRange(2.0, 4.0);
 		sk.duration[AttributeEnum::Constant] = randomRange(1.0, 2.0);
-		sk.target.attributes[AttributeEnum::Life][AttributeEnum::Constant] = level / 4;
+		sk.target.attributes[AttributeEnum::Life][AttributeEnum::Constant] = level * 0.1;
 		sk.caster.flags.groundEffect = true;
 		sk.flags.passive = true;
 		it.addOther(sk, 1);
@@ -1490,3 +1490,55 @@ Monster monsterNuclearBomb(uint32 level)
 	mr.updateName("Nuclear Bomb");
 	return mr;
 }
+
+Monster monsterGollum(uint32 level)
+{
+	Generate generate = Generate(level, 0);
+	generate.magic = 0;
+	generate.ranged = 0;
+	generate.defensive = 0;
+	generate.support = 0;
+
+	Monster mr(generate);
+	mr.icon = "gollum";
+	mr.algorithm = "random";
+	mr.faction = "neutral";
+
+	mr.attributes[AttributeEnum::Life] = generate.power + randomRange(30, 50);
+
+	const auto &item = [](uint32 level)
+	{
+		Generate g(level, 0);
+		g.magic = 1;
+		g.ranged = 0;
+		g.defensive = 1;
+		g.support = 0;
+
+		Item it(g);
+		it.slot = SlotEnum::OffHand;
+		it.name = "Ring";
+		it.icon = "ring";
+
+		{
+			Skill sk(g);
+			sk.name = "Invisibility";
+			sk.caster.attributes[AttributeEnum::Life][AttributeEnum::Constant] = g.power * 0.1 + 5;
+			sk.flags.passive = true;
+			it.addOther(sk, 1);
+			it.skills.push_back(std::move(sk));
+		}
+
+		return it;
+	};
+
+	{
+		Item it = item(level);
+		mr.addOther(it, 1);
+		mr.equippedItems.push_back(std::move(it));
+	}
+
+	mr.onDeath.push_back(item(level));
+
+	mr.updateName("Gollum");
+	return mr;
+}