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

feat: Adds allow skill gain to regions (#1286)

Browse source
This commit is contained in:
Kamron Batman 2022-11-28 20:46:10 -08:00 • committed by GitHub
parent 537526a328
commit c8a804d0b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Regions/Region.cs
View file

@ -758,6 +758,8 @@ public class Region : IComparable<Region>
Parent?.OnSpeech(args);
}
public virtual bool AllowGain(Mobile m, Skill skill, object obj) => Parent?.AllowGain(m, skill, obj) ?? true;
public virtual bool OnSkillUse(Mobile m, int skill) => Parent?.OnSkillUse(m, skill) ?? true;
public virtual bool OnBeginSpellCast(Mobile m, ISpell s) => Parent?.OnBeginSpellCast(m, s) ?? true;

26
Projects/UOContent/Misc/SkillCheck.cs
View file

@ -160,12 +160,21 @@ public static class SkillCheck
}
var success = chance >= Utility.RandomDouble();
var region = from.Region;
if (from.Alive && region.AllowGain(from, skill, amObj))
{
if (skill.Base < 10.0) // Gain regardless of the AllowGain check
{
Gain(from, skill);
}
else if (AllowGain(from, skill, amObj))
{
var gc = (double)(from.Skills.Cap - from.Skills.Total) / from.Skills.Cap;
gc += (skill.Cap - skill.Base) / skill.Cap;
gc /= 2;
gc += (1.0 - chance) * (success ? 0.5 :
Core.AOS ? 0.0 : 0.2);
gc += (1.0 - chance) * (success ? 0.5 : Core.AOS ? 0.0 : 0.2);
gc /= 2;
gc *= skill.Info.GainFactor;
@ -175,15 +184,17 @@ public static class SkillCheck
gc = 0.01;
}
if (from is BaseCreature creature && creature.Controlled)
if (from is BaseCreature { Controlled: true })
{
gc *= 2;
}
if (from.Alive && (gc >= Utility.RandomDouble() && AllowGain(from, skill, amObj) || skill.Base < 10.0))
if (gc >= Utility.RandomDouble())
{
Gain(from, skill);
}
}
}
return success;
}
@ -256,12 +267,7 @@ public static class SkillCheck
public static void Gain(Mobile from, Skill skill)
{
if (from.Region.IsPartOf<JailRegion>())
{
return;
}
if (from is BaseCreature creature && creature.IsDeadPet)
if (from is BaseCreature { IsDeadPet: true })
{
return;
}

2
Projects/UOContent/Regions/JailRegion.cs
View file

@ -14,6 +14,8 @@ public class JailRegion : BaseRegion
{
}
public override bool AllowGain(Mobile m, Skill skill, object obj) => m.AccessLevel > AccessLevel.Player;
public override bool AllowBeneficial(Mobile from, Mobile target)
{
if (from.AccessLevel == AccessLevel.Player)