diff --git a/Data/Config/go.xml b/Data/Config/go.xml index d03d2ca..04b5c82 100644 --- a/Data/Config/go.xml +++ b/Data/Config/go.xml @@ -55,20 +55,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Data/Spawns/land.map b/Data/Spawns/land.map index 6f500dd..bec38cc 100644 --- a/Data/Spawns/land.map +++ b/Data/Spawns/land.map @@ -1,3 +1,82 @@ ## OCEAN *|GiantCrab:Lobstran:Lurker:Sahuagin:Sahuaginmage:Shark:GiantEel:Silisk:WaterElemental:Typhoon:Turtle:StormCloud|Dolphin:Seahorse|SeaSerpent:DeepSeaSerpent:GreatWhite:GiantSquid:DeepSeaElemental|SeaHydra:Ktulu:Krakoa:NagaWarrior:NagaQueen:Naga:WaterElementalElder|Dagon:SeaDevil:Megalodon:Lochasaur:Kraken:Leviathan:DragonTurtle:SeaDragon||10|10|-5|1|0|0|7200|7200|12345|400|50|300|200|100|0 *|SunkenShip||||||10|10|0|1|0|0|7200|7200|12345|100|0|0|0|0|0 +##Forts +#Brigand Central Camp +*|Brigand||||||3078|1117|0|1|0|0|20|10|1|3|0|0|0|0|0 +*|Brigand||||||3067|1111|0|1|0|0|6|2|1|1|0|0|0|0|0 +*|Brigand||||||3083|1111|0|1|0|0|6|2|1|1|0|0|0|0|0 +*|Brigand||||||3076|1128|0|1|0|0|6|2|1|1|0|0|0|0|0 +#Brigand Island Camp +*|brigand||||||4241|1717|0|1|0|0|5|4|1|1|0|0|0|0|0 +*|brigand||||||4246|1726|0|1|0|0|10|4|1|1|0|0|0|0|0 +*|brigand||||||4243|1715|20|1|0|0|-3|0|1|1|0|0|0|0|0 +*|brigand||||||4243|1715|40|1|0|0|6|0|1|1|0|0|0|0|0 +*|horse||||||4249|1715|0|1|0|0|5|0|1|1|0|0|0|0|0 +*|brigand||||||4238|1729|0|1|0|0|3|2|1|1|0|0|0|0|0 +*|brigand||||||4241|1709|0|1|0|0|6|2|1|1|0|0|0|0|0 +#Brigand West Camp +*|brigand||||||1165|1175|0|1|0|0|20|15|1|6|0|0|0|0|0 +#Hobgoblin Camp +*|hobgoblin:hobgoblinarcher||||||1245|1068|0|1|0|0|10|8|1|3|0|0|0|0|0 +*|hobgoblin:hobgoblinarcher:hobgoblinchief:hobgoblinshaman||||||1236|1062|0|1|0|0|20|15|1|5|0|0|0|0|0 +#Hobgoblin Fort +*|hobgoblin:hobgoblinarcher:hobgoblinchief:hobgoblinshaman||||||5745|1870|0|1|0|0|20|12|1|8|0|0|0|0|0 +#Orc Island Fort +*|orccaptain:standardorc||||||2323|3403|0|1|0|0|6|4|1|2|0|0|0|0|0 +*|orcishmage||||||2323|3419|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|orcishmage||||||2339|3411|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|orccaptain||||||2354|3403|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|standardorc||||||2339|3411|0|1|0|0|11|9|1|5|0|0|0|0|0 +*|orcishmage:orccaptain||||||2328|3426|0|1|0|0|6|2|1|2|0|0|0|0|0 +*|orcishlord||||||2332|3434|0|1|0|0|7|2|1|1|0|0|0|0|0 +*|orcishlord||||||2338|3442|0|1|0|0|7|2|1|1|0|0|0|0|0 +*|standardorc:orccaptain||||||2338|3436|0|1|0|0|5|4|1|2|0|0|0|0|0 +*|standardorc:orcishmage:orccaptain||||||2354|3443|3|1|0|0|15|9|1|6|0|0|0|0|0 +*|OrcishLord:orcishmage||||||2371|3418|1|1|0|0|5|3|1|1|0|0|0|0|0 +*|OrcishLord:orcishmage||||||2371|3434|0|1|0|0|5|3|1|1|0|0|0|0|0 +*|ettin:troll:ogre:headlessone:mongbat||||||2409|3407|0|1|0|0|40|20|1|10|0|0|0|0|0 +#Orc North Fort +*|standardorc:orcishmage:orccaptain||||||2193|817|0|1|0|0|10|3|1|3|0|0|0|0|0 +*|standardorc:orcishmage:orccaptain||||||2209|812|0|1|0|0|10|3|1|3|0|0|0|0|0 +*|standardorc:orcishmage:orccaptain||||||2224|816|0|1|0|0|10|3|1|3|0|0|0|0|0 +*|orcishlord:orccaptain||||||2212|812|20|1|0|0|6|0|1|2|0|0|0|0|0 +*|orcishmage||||||2193|831|22|1|0|0|10|0|1|1|0|0|0|0|0 +*|orcishmage||||||2192|806|22|1|0|0|10|0|1|1|0|0|0|0|0 +*|orcishmage||||||2225|806|22|1|0|0|10|0|1|1|0|0|0|0|0 +*|standardorc||||||2210|835|0|1|0|0|15|5|1|3|0|0|0|0|0 +#Ratman Central Fort +*|Ratman:RatmanArcher:RatmanMage||||||1289|2253|0|1|0|0|20|12|1|7|0|0|0|0|0 +#Ratman South Fort +*|ratmanarcher||||||1596|2797|20|1|0|0|0|0|1|1|0|0|0|0|0 +*|ratman||||||1596|2797|0|1|0|0|2|2|1|1|0|0|0|0|0 +*|ratmanarcher||||||1603|2785|20|1|0|0|0|0|1|1|0|0|0|0|0 +*|ratman:ratmanmage||||||1602|2777|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|ratman||||||1601|2804|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|ratman||||||1613|2789|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|ratman||||||1602|2785|0|1|0|0|2|2|1|2|0|0|0|0|0 +*|RatmanMage||||||1597|2785|0|1|0|0|2|2|1|1|0|0|0|0|0 +*|ratman||||||1604|2793|0|1|0|0|4|4|1|2|0|0|0|0|0 +#Savage Central huts +*|Savage:SavageLeader:SavageShaman||||||5772|1271|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|Savage||||||5781|1305|1|1|0|0|12|4|1|3|0|0|0|0|0 +*|Savage:SavageLeader:SavageShaman||||||5758|1301|0|1|0|0|10|4|1|3|0|0|0|0|0 +*|savageleader||||||5759|1285|0|1|0|0|4|1|1|1|0|0|0|0|0 +*|savage||||||5811|1323|0|1|0|0|10|8|1|3|0|0|0|0|0 +*|savage||||||5782|1326|0|1|0|0|10|8|1|3|0|0|0|0|0 +*|savageshaman||||||5781|1327|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savage||||||5754|1328|0|1|0|0|10|4|1|2|0|0|0|0|0 +*|savageshaman||||||5734|1311|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savage||||||5732|1286|0|1|0|0|10|6|1|2|0|0|0|0|0 +*|savageleader||||||5732|1287|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savageshaman||||||5751|1262|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savage||||||5808|1275|0|1|0|0|20|20|1|4|0|0|0|0|0 +#Savage North huts +*|savageleader||||||5638|624|1|1|0|0|4|4|1|1|0|0|0|0|0 +*|savageshaman||||||5658|623|1|1|0|0|4|4|1|1|0|0|0|0|0 +*|savage||||||5649|634|15|1|0|0|10|4|1|3|0|0|0|0|0 +#Savage South huts +*|savageleader||||||6366|1744|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savageshaman||||||6408|1742|1|1|0|0|2|2|1|1|0|0|0|0|0 +*|savageshaman||||||6385|1743|0|1|0|0|4|4|1|1|0|0|0|0|0 +*|savage||||||6399|1743|1|1|0|0|4|4|1|2|0|0|0|0|0 diff --git a/Scripts/Items/Skill Items/Carpenter Items/TrophyBoard.cs b/Scripts/Items/Skill Items/Carpenter Items/TrophyBoard.cs index da1807c..525582d 100644 --- a/Scripts/Items/Skill Items/Carpenter Items/TrophyBoard.cs +++ b/Scripts/Items/Skill Items/Carpenter Items/TrophyBoard.cs @@ -101,7 +101,7 @@ namespace Server.Items else if ( typeof( PolarBear ) == c.Owner.GetType() ){ i = new TrophyPolarBear(); } else if ( typeof( FrostTroll ) == c.Owner.GetType() ){ i = new TrophyTroll(); } else if ( typeof( Troll ) == c.Owner.GetType() ){ i = new TrophyTroll(); } - else if ( typeof( Orc ) == c.Owner.GetType() ){ i = new TrophyOrc(); } + else if ( typeof( StandardOrc ) == c.Owner.GetType() ){ i = new TrophyOrc(); } else if ( typeof( OrcCaptain ) == c.Owner.GetType() ){ i = new TrophyOrc(); } else if ( typeof( OrcishLord ) == c.Owner.GetType() ){ i = new TrophyOrc(); } else if ( typeof( OrcishMage ) == c.Owner.GetType() ){ i = new TrophyOrc(); } @@ -542,4 +542,4 @@ namespace Server.Items public override void Serialize( GenericWriter writer ){ base.Serialize( writer ); writer.Write( (int) 0 ); } public override void Deserialize( GenericReader reader ){ base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SlayerGroup.cs b/Scripts/Items/Weapons/SlayerGroup.cs index 67e447b..7e94d86 100644 --- a/Scripts/Items/Weapons/SlayerGroup.cs +++ b/Scripts/Items/Weapons/SlayerGroup.cs @@ -125,7 +125,7 @@ namespace Server.Items typeof( Ogre ), typeof( OgreLord ), typeof( OgreMagi ), - typeof( Orc ), + typeof( StandardOrc ), typeof( OrcCaptain ), typeof( OrcishLord ), typeof( OrcishMage ), @@ -177,7 +177,7 @@ namespace Server.Items typeof( OgreMagi ), typeof( ArcticOgreLord ) ), new SlayerEntry( SlayerName.OrcSlaying, - typeof( Orc ), + typeof( StandardOrc ), typeof( OrcCaptain ), typeof( OrcishLord ), typeof( OrcishMage ) ), @@ -664,4 +664,4 @@ namespace Server.Items { } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Base/AI/SpeedInfo.cs b/Scripts/Mobiles/Base/AI/SpeedInfo.cs index 2d29846..03b0124 100644 --- a/Scripts/Mobiles/Base/AI/SpeedInfo.cs +++ b/Scripts/Mobiles/Base/AI/SpeedInfo.cs @@ -369,7 +369,7 @@ namespace Server typeof( Minion ), typeof( MinionWizard ), typeof( MinionWarrior ), - typeof( Orc ), + typeof( StandardOrc ), typeof( OrcCaptain ), typeof( OrcishLord ), typeof( OrcishMage ), @@ -455,4 +455,4 @@ namespace Server } ) }; } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Humanoid/Orc.cs b/Scripts/Mobiles/Humanoid/Orc.cs index da040c7..9a4e5ff 100644 --- a/Scripts/Mobiles/Humanoid/Orc.cs +++ b/Scripts/Mobiles/Humanoid/Orc.cs @@ -7,12 +7,12 @@ using Server.Misc; namespace Server.Mobiles { [CorpseName( "an orcish corpse" )] - public class Orc : BaseCreature + public class StandardOrc : BaseCreature { public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } [Constructable] - public Orc() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) + public StandardOrc() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) { Name = NameList.RandomName( "orc" ); HiddenTitle = "the orc"; @@ -65,7 +65,7 @@ namespace Server.Mobiles public override bool CanRummageCorpses{ get{ return true; } } public override int Meat{ get{ return 1; } } - public Orc( Serial serial ) : base( serial ) + public StandardOrc( Serial serial ) : base( serial ) { } diff --git a/Scripts/Mobiles/Humanoid/SavageLeader.cs b/Scripts/Mobiles/Humanoid/SavageLeader.cs index 39d6a0f..ac6fedc 100644 --- a/Scripts/Mobiles/Humanoid/SavageLeader.cs +++ b/Scripts/Mobiles/Humanoid/SavageLeader.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles { Name = NameList.RandomName( "savage" ); HiddenTitle = "the savage chief"; - Body = 183; + Body = 0x191; BaseSoundID = 0x25C; Clan = Clan.Humanoid; @@ -65,4 +65,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Humanoid/SavageShaman.cs b/Scripts/Mobiles/Humanoid/SavageShaman.cs index ee04360..b7aec12 100644 --- a/Scripts/Mobiles/Humanoid/SavageShaman.cs +++ b/Scripts/Mobiles/Humanoid/SavageShaman.cs @@ -13,16 +13,12 @@ namespace Server.Mobiles [Constructable] public SavageShaman() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = NameList.RandomName( "savage shaman" ); + Name = NameList.RandomName( "savage" ); HiddenTitle = "the savage shaman"; Hue = 0; + Body = 0x190; Clan = Clan.Humanoid; - if ( Utility.RandomBool() ) - Body = 0x191; - else - Body = 0x190; - SetStr( 126, 145 ); SetDex( 91, 110 ); SetInt( 161, 185 ); @@ -230,4 +226,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +}