fix: Fixes random skills and groupings (#1846)
This commit is contained in:
parent
8ec203f387
commit
16de17e8a6
5 changed files with 127 additions and 107 deletions
|
|
@ -21,91 +21,6 @@ public static class Utility
|
|||
{
|
||||
private static Dictionary<IPAddress, IPAddress> _ipAddressTable;
|
||||
|
||||
private static SkillName[] _allSkills =
|
||||
[
|
||||
SkillName.Alchemy,
|
||||
SkillName.Anatomy,
|
||||
SkillName.AnimalLore,
|
||||
SkillName.ItemID,
|
||||
SkillName.ArmsLore,
|
||||
SkillName.Parry,
|
||||
SkillName.Begging,
|
||||
SkillName.Blacksmith,
|
||||
SkillName.Fletching,
|
||||
SkillName.Peacemaking,
|
||||
SkillName.Camping,
|
||||
SkillName.Carpentry,
|
||||
SkillName.Cartography,
|
||||
SkillName.Cooking,
|
||||
SkillName.DetectHidden,
|
||||
SkillName.Discordance,
|
||||
SkillName.EvalInt,
|
||||
SkillName.Healing,
|
||||
SkillName.Fishing,
|
||||
SkillName.Forensics,
|
||||
SkillName.Herding,
|
||||
SkillName.Hiding,
|
||||
SkillName.Provocation,
|
||||
SkillName.Inscribe,
|
||||
SkillName.Lockpicking,
|
||||
SkillName.Magery,
|
||||
SkillName.MagicResist,
|
||||
SkillName.Tactics,
|
||||
SkillName.Snooping,
|
||||
SkillName.Musicianship,
|
||||
SkillName.Poisoning,
|
||||
SkillName.Archery,
|
||||
SkillName.SpiritSpeak,
|
||||
SkillName.Stealing,
|
||||
SkillName.Tailoring,
|
||||
SkillName.AnimalTaming,
|
||||
SkillName.TasteID,
|
||||
SkillName.Tinkering,
|
||||
SkillName.Tracking,
|
||||
SkillName.Veterinary,
|
||||
SkillName.Swords,
|
||||
SkillName.Macing,
|
||||
SkillName.Fencing,
|
||||
SkillName.Wrestling,
|
||||
SkillName.Lumberjacking,
|
||||
SkillName.Mining,
|
||||
SkillName.Meditation,
|
||||
SkillName.Stealth,
|
||||
SkillName.RemoveTrap,
|
||||
SkillName.Necromancy,
|
||||
SkillName.Focus,
|
||||
SkillName.Chivalry,
|
||||
SkillName.Bushido,
|
||||
SkillName.Ninjitsu,
|
||||
SkillName.Spellweaving,
|
||||
// TODO: Update RandomSkill once these are implemented!
|
||||
// SkillName.Mysticism,
|
||||
// SkillName.Imbuing,
|
||||
SkillName.Throwing
|
||||
];
|
||||
|
||||
private static readonly SkillName[] m_CombatSkills =
|
||||
[
|
||||
SkillName.Archery,
|
||||
SkillName.Swords,
|
||||
SkillName.Macing,
|
||||
SkillName.Fencing,
|
||||
SkillName.Wrestling
|
||||
];
|
||||
|
||||
private static readonly SkillName[] m_CraftSkills =
|
||||
[
|
||||
SkillName.Alchemy,
|
||||
SkillName.Blacksmith,
|
||||
SkillName.Fletching,
|
||||
SkillName.Carpentry,
|
||||
SkillName.Cartography,
|
||||
SkillName.Cooking,
|
||||
SkillName.Inscribe,
|
||||
SkillName.Tailoring,
|
||||
SkillName.Tinkering
|
||||
];
|
||||
|
||||
private static readonly Stack<ConsoleColor> m_ConsoleColors = new();
|
||||
|
||||
public static void Separate(StringBuilder sb, string value, string separator)
|
||||
|
|
@ -365,25 +280,6 @@ public static class Utility
|
|||
public static object GetArrayCap(Array array, int index, object emptyValue = null) =>
|
||||
array.Length > 0 ? array.GetValue(Math.Clamp(index, 0, array.Length - 1)) : emptyValue;
|
||||
|
||||
public static SkillName RandomSkill()
|
||||
{
|
||||
// TODO: Add 2 to each entry for Mysticism and Imbuing, once they are uncommented on _allSkills.
|
||||
var offset = Core.Expansion switch
|
||||
{
|
||||
>= Expansion.SA => 0,
|
||||
Expansion.ML => 1,
|
||||
Expansion.SE => 2,
|
||||
Expansion.AOS => 4,
|
||||
_ => 7
|
||||
};
|
||||
|
||||
return _allSkills[Random(_allSkills.Length - offset)];
|
||||
}
|
||||
|
||||
public static SkillName RandomCombatSkill() => m_CombatSkills.RandomElement();
|
||||
|
||||
public static SkillName RandomCraftSkill() => m_CraftSkills.RandomElement();
|
||||
|
||||
public static void FixPoints(ref Point3D top, ref Point3D bottom)
|
||||
{
|
||||
if (bottom.m_X < top.m_X)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue