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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

123
Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs
View file

@ -1,85 +1,84 @@
using System;
using Server.Ethics;
namespace Server.Mobiles
{
public class HolyFamiliar : BaseCreature
{
public override string CorpseName => "a holy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public class HolyFamiliar : BaseCreature
{
[Constructible]
public HolyFamiliar()
: base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4)
{
Body = 100;
BaseSoundID = 0xE5;
public override string DefaultName => "a silver wolf";
SetStr(96, 120);
SetDex(81, 105);
SetInt(36, 60);
[Constructible]
public HolyFamiliar()
: base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 )
{
Body = 100;
BaseSoundID = 0xE5;
SetHits(58, 72);
SetMana(0);
SetStr( 96, 120 );
SetDex( 81, 105 );
SetInt( 36, 60 );
SetDamage(11, 17);
SetHits( 58, 72 );
SetMana( 0 );
SetDamageType(ResistanceType.Physical, 100);
SetDamage( 11, 17 );
SetResistance(ResistanceType.Physical, 20, 25);
SetResistance(ResistanceType.Fire, 10, 20);
SetResistance(ResistanceType.Cold, 5, 10);
SetResistance(ResistanceType.Poison, 5, 10);
SetResistance(ResistanceType.Energy, 10, 15);
SetDamageType( ResistanceType.Physical, 100 );
SetSkill(SkillName.MagicResist, 57.6, 75.0);
SetSkill(SkillName.Tactics, 50.1, 70.0);
SetSkill(SkillName.Wrestling, 60.1, 80.0);
SetResistance( ResistanceType.Physical, 20, 25 );
SetResistance( ResistanceType.Fire, 10, 20 );
SetResistance( ResistanceType.Cold, 5, 10 );
SetResistance( ResistanceType.Poison, 5, 10 );
SetResistance( ResistanceType.Energy, 10, 15 );
Fame = 2500;
Karma = 2500;
SetSkill( SkillName.MagicResist, 57.6, 75.0 );
SetSkill( SkillName.Tactics, 50.1, 70.0 );
SetSkill( SkillName.Wrestling, 60.1, 80.0 );
VirtualArmor = 22;
Fame = 2500;
Karma = 2500;
Tamable = false;
ControlSlots = 1;
}
VirtualArmor = 22;
public HolyFamiliar(Serial serial)
: base(serial)
{
}
Tamable = false;
ControlSlots = 1;
}
public override string CorpseName => "a holy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public override int Meat => 1;
public override int Hides => 7;
public override FoodType FavoriteFood => FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Canine;
public override string DefaultName => "a silver wolf";
public HolyFamiliar( Serial serial )
: base( serial )
{
}
public override int Meat => 1;
public override int Hides => 7;
public override FoodType FavoriteFood => FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Canine;
public override string ApplyNameSuffix( string suffix )
{
if ( suffix.Length == 0 )
suffix = Ethic.Hero.Definition.Adjunct.String;
else
suffix = string.Concat( suffix, " ", Ethic.Hero.Definition.Adjunct.String );
public override string ApplyNameSuffix(string suffix)
{
if (suffix.Length == 0)
suffix = Ethic.Hero.Definition.Adjunct.String;
else
suffix = string.Concat(suffix, " ", Ethic.Hero.Definition.Adjunct.String);
return base.ApplyNameSuffix( suffix );
}
return base.ApplyNameSuffix(suffix);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
}
}
}

131
Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs
View file

@ -1,89 +1,88 @@
using System;
using Server.Ethics;
namespace Server.Mobiles
{
public class HolySteed : BaseMount
{
public override string CorpseName => "a holy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public class HolySteed : BaseMount
{
[Constructible]
public HolySteed()
: base("a silver steed", 0x75, 0x3EA8, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4)
{
SetStr(496, 525);
SetDex(86, 105);
SetInt(86, 125);
public override bool HasBreath => true;
public override bool CanBreath => true;
SetHits(298, 315);
[Constructible]
public HolySteed()
: base( "a silver steed", 0x75, 0x3EA8, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4 )
{
SetStr( 496, 525 );
SetDex( 86, 105 );
SetInt( 86, 125 );
SetDamage(16, 22);
SetHits( 298, 315 );
SetDamageType(ResistanceType.Physical, 40);
SetDamageType(ResistanceType.Fire, 40);
SetDamageType(ResistanceType.Energy, 20);
SetDamage( 16, 22 );
SetResistance(ResistanceType.Physical, 55, 65);
SetResistance(ResistanceType.Fire, 30, 40);
SetResistance(ResistanceType.Cold, 30, 40);
SetResistance(ResistanceType.Poison, 30, 40);
SetResistance(ResistanceType.Energy, 20, 30);
SetDamageType( ResistanceType.Physical, 40 );
SetDamageType( ResistanceType.Fire, 40 );
SetDamageType( ResistanceType.Energy, 20 );
SetSkill(SkillName.MagicResist, 25.1, 30.0);
SetSkill(SkillName.Tactics, 97.6, 100.0);
SetSkill(SkillName.Wrestling, 80.5, 92.5);
SetResistance( ResistanceType.Physical, 55, 65 );
SetResistance( ResistanceType.Fire, 30, 40 );
SetResistance( ResistanceType.Cold, 30, 40 );
SetResistance( ResistanceType.Poison, 30, 40 );
SetResistance( ResistanceType.Energy, 20, 30 );
Fame = 14000;
Karma = 14000;
SetSkill( SkillName.MagicResist, 25.1, 30.0 );
SetSkill( SkillName.Tactics, 97.6, 100.0 );
SetSkill( SkillName.Wrestling, 80.5, 92.5 );
VirtualArmor = 60;
Fame = 14000;
Karma = 14000;
Tamable = false;
ControlSlots = 1;
}
VirtualArmor = 60;
public HolySteed(Serial serial)
: base(serial)
{
}
Tamable = false;
ControlSlots = 1;
}
public override string CorpseName => "a holy corpse";
public override bool IsDispellable => false;
public override bool IsBondable => false;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool HasBreath => true;
public override bool CanBreath => true;
public HolySteed( Serial serial )
: base( serial )
{
}
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override string ApplyNameSuffix( string suffix )
{
if ( suffix.Length == 0 )
suffix = Ethic.Hero.Definition.Adjunct.String;
else
suffix = string.Concat( suffix, " ", Ethic.Hero.Definition.Adjunct.String );
public override string ApplyNameSuffix(string suffix)
{
if (suffix.Length == 0)
suffix = Ethic.Hero.Definition.Adjunct.String;
else
suffix = string.Concat(suffix, " ", Ethic.Hero.Definition.Adjunct.String);
return base.ApplyNameSuffix( suffix );
}
return base.ApplyNameSuffix(suffix);
}
public override void OnDoubleClick( Mobile from )
{
if ( Ethic.Find( from ) != Ethic.Hero )
from.SendMessage( "You may not ride this steed." );
else
base.OnDoubleClick( from );
}
public override void OnDoubleClick(Mobile from)
{
if (Ethic.Find(from) != Ethic.Hero)
from.SendMessage("You may not ride this steed.");
else
base.OnDoubleClick(from);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
}
}
}