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

Browse source
This commit is contained in:
mark 2011-06-29 03:29:14 +00:00
parent e6562fda8c
commit b2b1229fb8
6 changed files with 140 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Scripts/Accounting/AccountHandler.cs
View file

@ -37,18 +37,34 @@ namespace Server.Misc
private static CityInfo[] StartingCities = new CityInfo[]
{
new CityInfo( "Yew", "The Empath Abbey", 633, 858, 0 ),
new CityInfo( "Minoc", "The Barnacle", 2476, 413, 15 ),
new CityInfo( "Britain", "Sweet Dreams Inn", 1496, 1628, 10 ),
new CityInfo( "Moonglow", "The Scholars Inn", 4408, 1168, 0 ),
new CityInfo( "Trinsic", "The Traveler's Inn", 1845, 2745, 0 ),
new CityInfo( "Magincia", "The Great Horns Tavern", 3734, 2222, 20 ),
new CityInfo( "Jhelom", "The Mercenary Inn", 1374, 3826, 0 ),
new CityInfo( "Skara Brae", "The Falconer's Inn", 618, 2234, 0 ),
new CityInfo( "Vesper", "The Ironwood Inn", 2771, 976, 0 ),
new CityInfo( "Haven", "Buckler's Hideaway", 3667, 2625, 0 )
new CityInfo( "New Haven", "New Haven Bank", 1150168, 3667, 2625, 0 ),
new CityInfo( "Yew", "The Empath Abbey", 1075072, 633, 858, 0 ),
new CityInfo( "Minoc", "The Barnacle", 1075073, 2476, 413, 15 ),
new CityInfo( "Britain", "The Wayfarer's Inn", 1075074, 1602, 1591, 20 ),
new CityInfo( "Moonglow", "The Scholars Inn", 1075075, 4408, 1168, 0 ),
new CityInfo( "Trinsic", "The Traveler's Inn", 1075076, 1845, 2745, 0 ),
new CityInfo( "Jhelom", "The Mercenary Inn", 1075078, 1374, 3826, 0 ),
new CityInfo( "Skara Brae", "The Falconer's Inn", 1075079, 618, 2234, 0 ),
new CityInfo( "Vesper", "The Ironwood Inn", 1075080, 2771, 976, 0 )
};
/* Old Haven/Magincia Locations
new CityInfo( "Britain", "Sweet Dreams Inn", 1496, 1628, 10 );
// ..
// Trinsic
new CityInfo( "Magincia", "The Great Horns Tavern", 3734, 2222, 20 ),
// Jhelom
// ..
new CityInfo( "Haven", "Buckler's Hideaway", 3667, 2625, 0 )
if ( Core.AOS )
{
//CityInfo haven = new CityInfo( "Haven", "Uzeraan's Mansion", 3618, 2591, 0 );
CityInfo haven = new CityInfo( "Haven", "Uzeraan's Mansion", 3503, 2574, 14 );
StartingCities[StartingCities.Length - 1] = haven;
}
*/
private static bool PasswordCommandEnabled = false;
public static void Initialize()
@ -59,13 +75,6 @@ namespace Server.Misc
if ( PasswordCommandEnabled )
CommandSystem.Register( "Password", AccessLevel.Player, new CommandEventHandler( Password_OnCommand ) );
if ( Core.AOS )
{
//CityInfo haven = new CityInfo( "Haven", "Uzeraan's Mansion", 3618, 2591, 0 );
CityInfo haven = new CityInfo( "Haven", "Uzeraan's Mansion", 3503, 2574, 14 );
StartingCities[StartingCities.Length - 1] = haven;
}
}
[Usage( "Password <newPassword> <repeatPassword>" )]

11
Scripts/Items/Misc/LOSBlocker.cs
View file

@ -8,8 +8,8 @@ namespace Server.Items
{
public static void Initialize()
{
TileData.ItemTable[0x2199].Flags = TileFlag.Wall | TileFlag.NoShoot;
TileData.ItemTable[0x2199].Height = 20;
TileData.ItemTable[0x21A2].Flags = TileFlag.Wall | TileFlag.NoShoot;
TileData.ItemTable[0x21A2].Height = 20;
}
public override string DefaultName
@ -18,7 +18,7 @@ namespace Server.Items
}
[Constructable]
public LOSBlocker() : base( 0x2199 )
public LOSBlocker() : base( 0x21A2 )
{
Movable = false;
}
@ -41,7 +41,7 @@ namespace Server.Items
{
base.Serialize( writer );
writer.Write( (int) 0 );
writer.Write( (int) 1 );
}
public override void Deserialize( GenericReader reader )
@ -49,6 +49,9 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version < 1 && ItemID == 0x2199 )
this.ItemID = 0x21A2;
}
public sealed class GMItemPacket : Packet

1
Scripts/Misc/CharacterCreation.cs
View file

@ -692,7 +692,6 @@ namespace Server.Misc
}
CityInfo city = GetStartLocation( args, young );
//CityInfo city = new CityInfo( "Britain", "Sweet Dreams Inn", 1496, 1628, 10, Map.Felucca );
newChar.MoveToWorld( city.Location, city.Map );