branch sync

This commit is contained in:
mark 2012-11-11 00:04:51 +00:00
parent e10ca1fe1e
commit 24490dff69
5 changed files with 87 additions and 54 deletions

View file

@ -78,8 +78,10 @@ namespace Server.Mobiles
VirtualArmor = 44;
PackResources( 8 );
PackTalismans( 5 );
if ( Core.ML ) {
PackResources( 8 );
PackTalismans( 5 );
}
}
public virtual void PackResources( int amount )
@ -119,30 +121,32 @@ namespace Server.Mobiles
{
base.OnDeath( c );
c.DropItem( new GrizzledBones() );
if ( Core.ML ) {
c.DropItem( new GrizzledBones() );
// TODO: Parrots
/*if ( Utility.RandomDouble() < 0.6 )
c.DropItem( new ParrotItem() ); */
// TODO: Parrots
/*if ( Utility.RandomDouble() < 0.6 )
c.DropItem( new ParrotItem() ); */
if( Utility.RandomDouble() < 0.05 )
c.DropItem( new GrizzledMareStatuette() );
if( Utility.RandomDouble() < 0.05 )
c.DropItem( new GrizzledMareStatuette() );
if( Utility.RandomDouble() < 0.025 )
c.DropItem( new CrimsonCincture() );
if( Utility.RandomDouble() < 0.025 )
c.DropItem( new CrimsonCincture() );
// TODO: Armor sets
/*if ( Utility.RandomDouble() < 0.05 )
{
switch ( Utility.Random(5) )
// TODO: Armor sets
/*if ( Utility.RandomDouble() < 0.05 )
{
case 0: c.DropItem( new GrizzleGauntlets() ); break;
case 1: c.DropItem( new GrizzleGreaves() ); break;
case 2: c.DropItem( new GrizzleHelm() ); break;
case 3: c.DropItem( new GrizzleTunic() ); break;
case 4: c.DropItem( new GrizzleVambraces() ); break;
}
}*/
switch ( Utility.Random(5) )
{
case 0: c.DropItem( new GrizzleGauntlets() ); break;
case 1: c.DropItem( new GrizzleGreaves() ); break;
case 2: c.DropItem( new GrizzleHelm() ); break;
case 3: c.DropItem( new GrizzleTunic() ); break;
case 4: c.DropItem( new GrizzleVambraces() ); break;
}
}*/
}
}
public override bool Unprovokable { get { return true; } }

View file

@ -67,8 +67,10 @@ namespace Server.Mobiles
VirtualArmor = 28; // Don't know what it should be
PackResources(8);
PackTalismans(5);
if ( Core.ML ) {
PackResources(8);
PackTalismans(5);
}
Timer.DelayCall(TimeSpan.FromSeconds(1), new TimerCallback(SpawnTormented));
}
@ -99,25 +101,29 @@ namespace Server.Mobiles
{
base.OnDeath( c );
c.DropItem( new MalletAndChisel() );
if ( Core.ML ) {
c.DropItem( new MalletAndChisel() );
switch ( Utility.Random( 3 ) )
{
case 0: c.DropItem( new MinotaurHedge() ); break;
case 1: c.DropItem( new BonePile() ); break;
case 2: c.DropItem( new LightYarn() ); break;
switch ( Utility.Random( 3 ) )
{
case 0: c.DropItem( new MinotaurHedge() ); break;
case 1: c.DropItem( new BonePile() ); break;
case 2: c.DropItem( new LightYarn() ); break;
}
if ( Utility.RandomBool() )
c.DropItem( new TormentedChains() );
if ( Utility.RandomDouble() < 0.025 )
c.DropItem(new CrimsonCincture());
}
if ( Utility.RandomBool() )
c.DropItem( new TormentedChains() );
if ( Utility.RandomDouble() < 0.025 )
c.DropItem(new CrimsonCincture());
}
public override void GenerateLoot()
{
AddLoot( LootPack.AosSuperBoss, 5 ); // Need to verify
if ( Core.ML ) {
AddLoot( LootPack.AosSuperBoss, 5 ); // Need to verify
}
}
public override int GetAngerSound()