Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Server/MirEnvir/Map.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2559,7 +2559,10 @@ public bool Spawn()
MonsterObject ob = MonsterObject.GetMonster(Monster);
if (ob == null) return true;

MonsterType type = Settings.MonsterRarityEnabled
bool allowRarity = Settings.MonsterRarityEnabled &&
(Monster == null || !Monster.IsBoss);

MonsterType type = allowRarity
? MonsterRarityData.Roll(RandomProvider.GetThreadRandom())
: MonsterType.Normal;

Expand Down
43 changes: 39 additions & 4 deletions Server/Settings.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Drawing;
using System.Security.Cryptography;
using Server.MirDatabase;
using Server.MirObjects;
Expand Down Expand Up @@ -119,7 +120,7 @@ private static MessageQueue MessageQueue
public static bool MonsterRecallEnabled = true;
public static int MonsterRecallRange = 12;
public static int MonsterRecallCooldown = 5000;
public static bool MonsterRarityEnabled = true;
public static bool MonsterRarityEnabled = false;
public static double MonsterRarityUncommonChancePercent = 3.0,
MonsterRarityRareChancePercent = 0.75,
MonsterRarityEliteChancePercent = 0.1;
Expand All @@ -146,6 +147,9 @@ private static MessageQueue MessageQueue
MonsterRarityEliteGoldMultiplier = 2.50;
public static int MonsterRarityEliteItemDropBonusPercent = 75,
MonsterRarityEliteGoldDropBonusPercent = 75;
public static Color MonsterRarityUncommonNameColour = Color.LightGreen;
public static Color MonsterRarityRareNameColour = Color.DeepSkyBlue;
public static Color MonsterRarityEliteNameColour = Color.Gold;

public static bool PetSave = false;

Expand Down Expand Up @@ -1731,6 +1735,7 @@ public static void LoadMonsterRarity()
MonsterRarityRareGoldMultiplier = rarityReader.ReadDouble("Rare", "GoldMultiplier", MonsterRarityRareGoldMultiplier);
MonsterRarityRareItemDropBonusPercent = rarityReader.ReadInt32("Rare", "ItemDropBonusPercent", MonsterRarityRareItemDropBonusPercent);
MonsterRarityRareGoldDropBonusPercent = rarityReader.ReadInt32("Rare", "GoldDropBonusPercent", MonsterRarityRareGoldDropBonusPercent);
MonsterRarityRareNameColour = ReadRarityColour(rarityReader, "Rare", "NameColour", MonsterRarityRareNameColour);

MonsterRarityEliteHpMultiplier = rarityReader.ReadDouble("Elite", "HpMultiplier", MonsterRarityEliteHpMultiplier);
MonsterRarityEliteDefenseMultiplier = rarityReader.ReadDouble("Elite", "DefenseMultiplier", MonsterRarityEliteDefenseMultiplier);
Expand All @@ -1739,6 +1744,8 @@ public static void LoadMonsterRarity()
MonsterRarityEliteGoldMultiplier = rarityReader.ReadDouble("Elite", "GoldMultiplier", MonsterRarityEliteGoldMultiplier);
MonsterRarityEliteItemDropBonusPercent = rarityReader.ReadInt32("Elite", "ItemDropBonusPercent", MonsterRarityEliteItemDropBonusPercent);
MonsterRarityEliteGoldDropBonusPercent = rarityReader.ReadInt32("Elite", "GoldDropBonusPercent", MonsterRarityEliteGoldDropBonusPercent);
MonsterRarityEliteNameColour = ReadRarityColour(rarityReader, "Elite", "NameColour", MonsterRarityEliteNameColour);
MonsterRarityUncommonNameColour = ReadRarityColour(rarityReader, "Uncommon", "NameColour", MonsterRarityUncommonNameColour);

MonsterRarityData.SetEnabled(MonsterRarityEnabled);
MonsterRarityData.Configure(MonsterRarityUncommonChancePercent, MonsterRarityRareChancePercent, MonsterRarityEliteChancePercent);
Expand All @@ -1754,7 +1761,7 @@ public static void LoadMonsterRarity()
GoldMultiplier = MonsterRarityUncommonGoldMultiplier,
ItemDropBonusPercent = MonsterRarityUncommonItemDropBonusPercent,
GoldDropBonusPercent = MonsterRarityUncommonGoldDropBonusPercent,
NameColour = MonsterRarityData.GetProfile(MonsterType.Uncommon).NameColour
NameColour = MonsterRarityUncommonNameColour
},
[MonsterType.Rare] = new MonsterRarityProfile
{
Expand All @@ -1765,7 +1772,7 @@ public static void LoadMonsterRarity()
GoldMultiplier = MonsterRarityRareGoldMultiplier,
ItemDropBonusPercent = MonsterRarityRareItemDropBonusPercent,
GoldDropBonusPercent = MonsterRarityRareGoldDropBonusPercent,
NameColour = MonsterRarityData.GetProfile(MonsterType.Rare).NameColour
NameColour = MonsterRarityRareNameColour
},
[MonsterType.Elite] = new MonsterRarityProfile
{
Expand All @@ -1776,7 +1783,7 @@ public static void LoadMonsterRarity()
GoldMultiplier = MonsterRarityEliteGoldMultiplier,
ItemDropBonusPercent = MonsterRarityEliteItemDropBonusPercent,
GoldDropBonusPercent = MonsterRarityEliteGoldDropBonusPercent,
NameColour = MonsterRarityData.GetProfile(MonsterType.Elite).NameColour
NameColour = MonsterRarityEliteNameColour
}
};

Expand All @@ -1793,5 +1800,33 @@ private static double ReadRarityChancePercent(InIReader reader, string percentKe
return percent;
}

public static void SaveMonsterRarity()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of values missing here not being saved. Everything that's loaded should also be saved.

{
var rarityReader = new InIReader(Path.Combine(ConfigPath, "MonsterRarity.ini"));

rarityReader.Write("General", "Enabled", MonsterRarityEnabled);

rarityReader.Write("Uncommon", "NameColour", ColorTranslator.ToHtml(MonsterRarityUncommonNameColour));
rarityReader.Write("Rare", "NameColour", ColorTranslator.ToHtml(MonsterRarityRareNameColour));
rarityReader.Write("Elite", "NameColour", ColorTranslator.ToHtml(MonsterRarityEliteNameColour));

rarityReader.Save();
}

private static Color ReadRarityColour(InIReader reader, string section, string key, Color defaultColour)
{
string value = reader.ReadString(section, key, ColorTranslator.ToHtml(defaultColour));

try
{
Color parsed = ColorTranslator.FromHtml(value);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it wants to use Color.FromName

if (parsed.IsEmpty) return defaultColour;
return parsed;
}
catch
{
return defaultColour;
}
}
}
}