Revert "Updates Packets & Randomizer (#43)" (#61)

This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions

View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Mobiles;
namespace Server.Items
@ -74,7 +73,9 @@ namespace Server.Items
},
[TalismanSlayerName.Bovine] = new[]
{
typeof(Cow), typeof(Bull), typeof(Gaman), typeof(TormentedMinotaur)
typeof(Cow), typeof(Bull), typeof(Gaman) /*, typeof( MinotaurCaptain ),
typeof( MinotaurScout ), typeof( Minotaur )*/
// TODO TormentedMinotaur
}
};
}
@ -82,11 +83,15 @@ namespace Server.Items
public static bool Slays(TalismanSlayerName name, Mobile m)
{
if (m == null || !m_Table.TryGetValue(name, out Type[] types) || types == null)
return false;
return false;;
Type type = m.GetType();
return types.Any(t => t.IsAssignableFrom(type));
for (int i = 0; i < types.Length; i++)
if (types[i].IsAssignableFrom(type))
return true;
return false;
}
}
}

View file

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using Server.ContextMenus;
using Server.Items;
using Server.Regions;
namespace Server.Mobiles
{
@ -397,6 +396,9 @@ namespace Server.Mobiles
int version = reader.ReadEncodedInt();
}
/*
// An area attack that only damages staff, wtf?
private DateTime m_NextWave;
public void AreaHeatDamage()
@ -406,20 +408,29 @@ namespace Server.Mobiles
if ( mob != null )
{
if ( mob.InRange( Location, 2 ) )
if ( mob.AccessLevel == AccessLevel.Player )
{
if ( mob.AccessLevel != AccessLevel.Player )
{
AOS.Damage( mob, Utility.Random( 2, 3 ), 0, 100, 0, 0, 0 );
mob.SendLocalizedMessage( 1008112 ); // The intense heat is damaging you!
}
}
if ( Region is GuardedRegion && mob.Alive )
GuardedRegion r = Region as GuardedRegion;
if ( r != null && mob.Alive )
{
foreach ( Mobile m in GetMobilesInRange( 2 ) )
{
if ( !mob.CanBeHarmful( m ) )
mob.CriminalAction( false );
}
}
}
m_NextWave = DateTime.UtcNow + TimeSpan.FromSeconds( 3 );
}
*/
}
public class SummonedOrcBrute : BaseTalismanSummon
@ -620,4 +631,4 @@ namespace Server.Mobiles
int version = reader.ReadEncodedInt();
}
}
}
}