warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes random skill chosen based on expansion (#1139)

Browse source
This commit is contained in:
Daniel Knight 2022-08-17 11:52:18 -04:00 • committed by GitHub
parent 23ae7a3c26
commit 6e168c137b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Projects/Server/Utilities/Utility.cs
View file

@ -80,6 +80,7 @@ public static class Utility
SkillName.Bushido,
SkillName.Ninjitsu,
SkillName.Spellweaving,
// TODO: Update RandomSkill once these are implemented!
// SkillName.Mysticism,
// SkillName.Imbuing,
SkillName.Throwing
@ -624,8 +625,20 @@ 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() =>
_allSkills[Random(_allSkills.Length - (Core.ML ? 0 : Core.SE ? 1 : Core.AOS ? 3 : 6))];
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();

2
Projects/UOContent/Misc/CharacterCreation.cs
View file

@ -357,7 +357,7 @@ public static class CharacterCreation
{
var (name, value) = skills[i];
var notValid = value is < 0 or > 50 || !_allowedStartingSkills.Contains(name) ||
!Core.AOS && name is SkillName.Necromancy or SkillName.Chivalry ||
!Core.AOS && name is SkillName.Necromancy or SkillName.Chivalry or SkillName.Focus ||
!Core.SE && name is SkillName.Ninjitsu or SkillName.Bushido ||
Core.SA && (raceFlag == Race.AllowGargoylesOnly && name == SkillName.Archery ||
raceFlag != Race.AllowGargoylesOnly && name == SkillName.Throwing) ||