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

Add DefaultName property to Mobiles & Items (#18)

Browse source
This commit is contained in:
Kamron Batman 2018-08-09 17:18:41 -07:00 • committed by GitHub
parent b06f5bf60d
commit 8ee42c8ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
713 changed files with 5112 additions and 4987 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -18,8 +18,8 @@ namespace Server.Mobiles
{
}
public override bool SubdueBeforeTame{ get{ return true; } } // Must be beaten into submission
public override bool ReduceSpeedWithDamage{ get{ return false; } }
public override bool SubdueBeforeTame => true; // Must be beaten into submission
public override bool ReduceSpeedWithDamage => false;
[Constructible]
public Beetle( string name ) : base( name, 0x317, 0x3EBC, AIType.AI_Melee, FightMode.Closest, 10, 1, 0.25, 0.5 )
@ -175,4 +175,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -102,7 +102,7 @@ namespace Server.Mobiles
{
}
public override bool DisplayLootType { get { return false; } }
public override bool DisplayLootType => false;
public virtual int FollowerSlots { get { return 1; } }
@ -367,8 +367,8 @@ namespace Server.Mobiles
m_Mount = mount;
}
public override bool ClearHandsOnCast { get { return false; } }
public override bool RevealOnCast { get { return false; } }
public override bool ClearHandsOnCast => false;
public override bool RevealOnCast => false;
public override TimeSpan GetCastRecovery()
{
@ -715,7 +715,7 @@ namespace Server.Mobiles
public class RideablePolarBear : EtherealMount
{
public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear
public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear
public override int EtherealHue { get { return 0; } }
[Constructible]

4
Scripts/Mobiles/Animals/Mounts/FireSteed.cs
View file

@ -52,7 +52,7 @@ namespace Server.Mobiles
PackItem( new Ruby( Utility.RandomMinMax( 16, 30 ) ) );
}
public override bool HasBreath{ get{ return true; } } // fire breath enabled
public override bool HasBreath => true; // fire breath enabled
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon | PackInstinct.Equine; } }
@ -90,4 +90,4 @@ namespace Server.Mobiles
}
}
}
}
}

8
Scripts/Mobiles/Animals/Mounts/HellSteed.cs
View file

@ -6,11 +6,11 @@ namespace Server.Mobiles
[CorpseName( "a hellsteed corpse" )]
public class HellSteed : BaseMount
{
public override bool HasBreath { get { return true; } }
public override bool HasBreath => true;
public override int BreathChaosDamage { get { return 100; } }
public override Poison PoisonImmune{ get{ return Poison.Lethal; } }
public override Poison PoisonImmune => Poison.Lethal;
[Constructible]
[Constructible]
public HellSteed() : this( "a hellsteed" )
{
}
@ -64,4 +64,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

23
Scripts/Mobiles/Animals/Mounts/Hiryu.cs
View file

@ -10,12 +10,9 @@ namespace Server.Mobiles
{
public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using per landed hit */
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override bool StatLossAfterTame { get { return true; } }
public override bool StatLossAfterTame => true;
private static int GetHue()
{
@ -23,23 +20,23 @@ namespace Server.Mobiles
/*
1000 1075 No Hue Color 93.02% 0x0
*
*
10 1075 Ice Green 0.93% 0x847F
10 1075 Light Blue 0.93% 0x848D
10 1075 Strong Cyan 0.93% 0x8495
10 1075 Agapite 0.93% 0x8899
10 1075 Gold 0.93% 0x8032
*
*
8 1075 Blue and Yellow 0.74% 0x8487
*
*
5 1075 Ice Blue 0.47% 0x8482
*
*
3 1075 Cyan 0.28% 0x8123
3 1075 Light Green 0.28% 0x8295
*
*
2 1075 Strong Yellow 0.19% 0x8037
2 1075 Green 0.19% 0x8030 //this one is an approximation
*
*
1 1075 Strong Purple 0.09% 0x8490
1 1075 Strong Green 0.09% 0x855C
* */
@ -70,7 +67,7 @@ namespace Server.Mobiles
return 0x848D;
else if( rand <= 74 )
return 0x847F;
return 0;
}
@ -153,7 +150,7 @@ namespace Server.Mobiles
public override int Meat { get { return 16; } }
public override int Hides { get { return 60; } }
public override FoodType FavoriteFood { get { return FoodType.Meat; } }
public override bool CanAngerOnTame { get { return true; } }
public override bool CanAngerOnTame => true;
public override void OnGaveMeleeAttack( Mobile defender )
{

8
Scripts/Mobiles/Animals/Mounts/Kirin.cs
View file

@ -8,10 +8,10 @@ namespace Server.Mobiles
[CorpseName( "a ki-rin corpse" )]
public class Kirin : BaseMount
{
public override bool AllowFemaleRider{ get{ return false; } }
public override bool AllowFemaleTamer{ get{ return false; } }
public override bool AllowFemaleRider => false;
public override bool AllowFemaleTamer => false;
public override bool InitialInnocent{ get{ return true; } }
public override bool InitialInnocent => true;
public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } }
@ -130,4 +130,4 @@ namespace Server.Mobiles
AI = AIType.AI_Mage;
}
}
}
}

9
Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -10,12 +10,9 @@ namespace Server.Mobiles
{
public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using; 1 in 5 chance of success */
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override bool StatLossAfterTame { get { return true; } }
public override bool StatLossAfterTame => true;
private static int GetHue()
{
@ -153,7 +150,7 @@ namespace Server.Mobiles
public override int Meat { get { return 16; } }
public override int Hides { get { return 60; } }
public override FoodType FavoriteFood { get { return FoodType.Meat; } }
public override bool CanAngerOnTame { get { return true; } }
public override bool CanAngerOnTame => true;
public override void OnGaveMeleeAttack( Mobile defender )
{

6
Scripts/Mobiles/Animals/Mounts/Nightmare.cs
View file

@ -92,12 +92,12 @@ namespace Server.Mobiles
return base.GetAngerSound();
}
public override bool HasBreath{ get{ return true; } } // fire breath enabled
public override bool HasBreath => true; // fire breath enabled
public override int Meat{ get{ return 5; } }
public override int Hides{ get{ return 10; } }
public override HideType HideType{ get{ return HideType.Barbed; } }
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override bool CanAngerOnTame { get { return true; } }
public override bool CanAngerOnTame => true;
public Nightmare( Serial serial ) : base( serial )
{
@ -122,4 +122,4 @@ namespace Server.Mobiles
BaseSoundID = 0x16A;
}
}
}
}

4
Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs
View file

@ -54,7 +54,7 @@ namespace Server.Mobiles
return 1.0;
}
public override bool AutoDispel{ get{ return !Controlled; } }
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public ScaledSwampDragon( Serial serial ) : base( serial )
@ -75,4 +75,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

13
Scripts/Mobiles/Animals/Mounts/SkeletalMount.cs
View file

@ -6,8 +6,10 @@ namespace Server.Mobiles
[CorpseName( "an undead horse corpse" )]
public class SkeletalMount : BaseMount
{
[Constructible]
public SkeletalMount() : this( "a skeletal steed" )
public override string DefaultName => "a skeletal steed";
[Constructible]
public SkeletalMount() : this( null )
{
}
@ -38,8 +40,8 @@ namespace Server.Mobiles
Karma = 0;
}
public override Poison PoisonImmune{ get{ return Poison.Lethal; } }
public override bool BleedImmune{ get{ return true; } }
public override Poison PoisonImmune => Poison.Lethal;
public override bool BleedImmune => true;
public SkeletalMount( Serial serial ) : base( serial )
{
@ -62,7 +64,6 @@ namespace Server.Mobiles
{
case 0:
{
Name = "a skeletal steed";
Tamable = false;
MinTameSkill = 0.0;
ControlSlots = 0;
@ -71,4 +72,4 @@ namespace Server.Mobiles
}
}
}
}
}

8
Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -152,14 +152,14 @@ namespace Server.Mobiles
return 1.0;
}
public override bool ReacquireOnMovement{ get{ return true; } }
public override bool AutoDispel{ get{ return !Controlled; } }
public override bool ReacquireOnMovement => true;
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override int Meat{ get{ return 19; } }
public override int Hides{ get{ return 20; } }
public override int Scales{ get{ return 5; } }
public override ScaleType ScaleType{ get{ return ScaleType.Green; } }
public override bool CanAngerOnTame { get { return true; } }
public override bool CanAngerOnTame => true;
public SwampDragon( Serial serial ) : base( serial )
{
@ -212,4 +212,4 @@ namespace Server.Mobiles
BaseSoundID = 0x16A;
}
}
}
}

10
Scripts/Mobiles/Animals/Mounts/Unicorn.cs
View file

@ -8,10 +8,10 @@ namespace Server.Mobiles
[CorpseName( "a unicorn corpse" )]
public class Unicorn : BaseMount
{
public override bool AllowMaleRider{ get{ return false; } }
public override bool AllowMaleTamer{ get{ return false; } }
public override bool AllowMaleRider => false;
public override bool AllowMaleTamer => false;
public override bool InitialInnocent{ get{ return true; } }
public override bool InitialInnocent => true;
public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } }
@ -114,7 +114,7 @@ namespace Server.Mobiles
get{ return OppositionGroup.FeyAndUndead; }
}
public override Poison PoisonImmune{ get{ return Poison.Lethal; } }
public override Poison PoisonImmune => Poison.Lethal;
public override int Meat{ get{ return 3; } }
public override int Hides{ get{ return 10; } }
public override HideType HideType{ get{ return HideType.Horned; } }
@ -138,4 +138,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}