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

Sets a default parameter for OnHit. More casting cleanup.

Browse source
This commit is contained in:
Kamron Batman 2018-09-09 08:54:10 -07:00
parent 74f498c1c8
commit d6c0bf2d4c
96 changed files with 350 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Weapons/Staves/BaseStaff.cs
View file

@ -35,7 +35,7 @@ namespace Server.Items
int version = reader.ReadInt();
}
public override void OnHit( Mobile attacker, Mobile defender, double damageBonus )
public override void OnHit( Mobile attacker, Mobile defender, double damageBonus = 1 )
{
base.OnHit( attacker, defender, damageBonus );

14
Scripts/Items/Weapons/Staves/ShepherdsCrook.cs
View file

@ -68,10 +68,8 @@ namespace Server.Items
protected override void OnTarget( Mobile from, object targ )
{
if ( targ is BaseCreature )
if ( targ is BaseCreature bc )
{
BaseCreature bc = (BaseCreature)targ;
if ( IsHerdable( bc ) )
{
if ( bc.Controlled )
@ -114,9 +112,7 @@ namespace Server.Items
Map map = bc.Map;
ChampionSpawnRegion region = Region.Find( bc.Home, map ) as ChampionSpawnRegion;
if ( region != null )
if ( Region.Find( bc.Home, map ) is ChampionSpawnRegion region )
{
ChampionSpawn spawn = region.ChampionSpawn;
@ -144,7 +140,7 @@ namespace Server.Items
protected override void OnTarget( Mobile from, object targ )
{
if ( targ is IPoint2D )
if ( targ is IPoint2D p )
{
double min = m_Creature.MinTameSkill - 30;
double max = m_Creature.MinTameSkill + 30 + Utility.Random( 10 );
@ -154,9 +150,7 @@ namespace Server.Items
if ( from.CheckTargetSkill( SkillName.Herding, m_Creature, min, max ) )
{
IPoint2D p = (IPoint2D) targ;
if ( targ != from )
if ( p != from )
p = new Point2D( p.X, p.Y );
m_Creature.TargetLocation = p;