Cleanup Expansions

WorldPacketSA should not be used yet. There is much more work to be done and that version has not been looked at in quite some time.
This commit is contained in:
mark 2010-06-17 07:11:43 +00:00
parent 01eee98298
commit 177eb4c6ff
26 changed files with 388 additions and 204 deletions

View file

@ -24,9 +24,6 @@ namespace Server
}
}
private static readonly ClientVersion m_RequiredClient = new ClientVersion( "5.0.2b" );
public static ClientVersion RequiredClient { get { return m_RequiredClient; } }
#region Properties
private BuffIcon m_ID;
public BuffIcon ID { get { return m_ID; } }

View file

@ -734,14 +734,13 @@ namespace Server.Misc
}
}
private static readonly ClientVersion m_NewHavenClient = new ClientVersion( "6.0.0.0" );
private static readonly CityInfo m_NewHavenInfo = new CityInfo( "New Haven", "The Bountiful Harvest Inn", 3503, 2574, 14, Map.Trammel );
private static CityInfo GetStartLocation( CharacterCreatedEventArgs args, bool isYoung )
{
if( Core.ML )
{
//if( args.State != null && args.State.Version >= m_NewHavenClient )
//if( args.State != null && args.State.NewHaven )
return m_NewHavenInfo; //We don't get the client Version until AFTER Character creation
//return args.City; TODO: Uncomment when the old quest system is actually phased out
@ -749,14 +748,14 @@ namespace Server.Misc
bool useHaven = isYoung;
int flags = args.State == null ? 0 : args.State.Flags;
ClientFlags flags = args.State == null ? ClientFlags.None : args.State.Flags;
Mobile m = args.Mobile;
switch ( args.Profession )
{
case 4: //Necro
{
if ( (flags & 0x8) != 0 )
if ( (flags & ClientFlags.Malas) != 0 )
{
return new CityInfo( "Umbra", "Mardoth's Tower", 2114, 1301, -50, Map.Malas );
}
@ -782,7 +781,7 @@ namespace Server.Misc
}
case 6: //Samurai
{
if ( (flags & 0x10) != 0 )
if ( (flags & ClientFlags.Tokuno) != 0 )
{
return new CityInfo( "Samurai DE", "Haoti's Grounds", 368, 780, -1, Map.Malas );
}
@ -804,7 +803,7 @@ namespace Server.Misc
}
case 7: //Ninja
{
if ( (flags & 0x10) != 0 )
if ( (flags & ClientFlags.Tokuno) != 0 )
{
return new CityInfo( "Ninja DE", "Enimo's Residence", 414, 823, -1, Map.Malas );
}

View file

@ -5,7 +5,7 @@ namespace Server
{
public class CurrentExpansion
{
private static readonly Expansion Expansion = Expansion.ML;
private static readonly Expansion Expansion = Expansion.SA;
public static void Configure()
{