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

Lots of fixes, changes, rewrites of various things, including but not limited to:

Browse source 
Logging of staff crafting items,
Fixes for the OSI client changes
The potion stacking stuff
BaseWeapon fix, so that damage increase things don't multiply themselves.
admin gump fixes for Firewall
Various display tweaks for weight
SoS no longer spawn in Tokuno
Hiryu hues happified to OSI standards
staff now see alliance chat correctly
Play barkeeper text increased per OSI
Various other OSI skill requirement changes
Various unimplemented features of the SE moves
EventSink for when the client version is received from client.
Client validation moved out of the core.
Client version validation now has options to ignore/kick/warn/annoy.  Automagically tries to detect current client.
Reverted the delayeddamagecontext back to OSI standards.
Can no longer use bags of sending in jail.

MagerySpell implemented. Now only Magery spells have a circle, and various other properties of 'em.
TransformationSpellHelper now implemented.  Things moved around for this.
Spells now need a Timespan for the cast delay, instead of arbitrarily based on Circle.  Circle doesn't make sense for non-Magery spells!
Alot of the spellweaving spells added to OSI standards.
This commit is contained in:
asayre 2007-05-26 03:12:41 +00:00
parent f12e9745c6
commit 2ad37d54aa
214 changed files with 4881 additions and 1243 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Engines/AI/AI/BaseAI.cs
View file

@ -11,6 +11,8 @@ using Server.ContextMenus;
using Server.Engines.Quests;
using Server.Engines.Quests.Necro;
using MoveImpl=Server.Movement.MovementImpl;
using Server.Spells;
using Server.Spells.Spellweaving;
namespace Server.Mobiles
{
@ -1486,7 +1488,7 @@ namespace Server.Mobiles
if( aggr.IsDeadBondedPet || !aggr.Alive )
continue;
double aggrScore = m_Mobile.GetValueFrom( aggr, FightMode.Closest, false );
double aggrScore = m_Mobile.GetFightModeRanking( aggr, FightMode.Closest, false );
if( (newCombatant == null || aggrScore > newScore) && m_Mobile.InLOS( aggr ) )
{
@ -2484,6 +2486,10 @@ namespace Server.Mobiles
if ( bFacFoe && !m_Mobile.IsEnemy( m ) )
continue;
//Ignore anyone under EtherealVoyage
if( TransformationSpellHelper.UnderTransformation( m, typeof( EtherealVoyageSpell ) ) )
continue;
if( acqType == FightMode.Aggressor || acqType == FightMode.Evil )
{
// Only acquire this mobile if it attacked us, or if it's evil.
@ -2516,7 +2522,7 @@ namespace Server.Mobiles
if ( bFacFoe && !bFacFriend && !m_Mobile.CanBeHarmful( m, false ) )
continue;
theirVal = m_Mobile.GetValueFrom( m, acqType, bPlayerOnly );
theirVal = m_Mobile.GetFightModeRanking( m, acqType, bPlayerOnly );
if( theirVal > val && m_Mobile.InLOS( m ) )
{

14
Scripts/Engines/AI/Creature/BaseCreature.cs
View file

@ -13,6 +13,7 @@ using Server.ContextMenus;
using Server.Engines.Quests;
using Server.Factions;
using Server.Spells.Bushido;
using Server.Spells.Spellweaving;
namespace Server.Mobiles
{
@ -758,6 +759,9 @@ namespace Server.Mobiles
if ( !(m is BaseCreature) || m is Server.Engines.Quests.Haven.MilitiaFighter )
return true;
if( TransformationSpellHelper.UnderTransformation( m, typeof( EtherealVoyageSpell ) ) )
return false;
BaseCreature c = (BaseCreature)m;
return ( m_iTeam != c.m_iTeam || ( (m_bSummoned || m_bControlled) != (c.m_bSummoned || c.m_bControlled) )/* || c.Combatant == this*/ );
@ -2519,15 +2523,13 @@ namespace Server.Mobiles
this.PublicOverheadMessage( MessageType.Regular, 41, false, String.Format( format, args ) );
}
/*
* Will need to be givent a better name
*
/*
* This function can be overriden.. so a "Strongest" mobile, can have a different definition depending
* on who check for value
* -Could add a FightMode.Prefered
*
*/
public virtual double GetValueFrom( Mobile m, FightMode acqType, bool bPlayerOnly )
public virtual double GetFightModeRanking( Mobile m, FightMode acqType, bool bPlayerOnly )
{
if ( ( bPlayerOnly && m.Player ) || !bPlayerOnly )
{
@ -2549,7 +2551,7 @@ namespace Server.Mobiles
}
}
// Turn, - for let, + for right
// Turn, - for left, + for right
// Basic for now, needs work
public virtual void Turn(int iTurnSteps)
{
@ -4159,6 +4161,8 @@ namespace Server.Mobiles
this.OwnerAbandonTime = DateTime.MinValue;
}
GiftOfLifeSpell.HandleDeath( this );
CheckStatTimers();
}
else

2
Scripts/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -1011,7 +1011,7 @@ namespace Server.Engines.CannedEvil
public override void AlterLightLevel( Mobile m, ref int global, ref int personal )
{
base.AlterLightLevel( m, ref global, ref personal );
global = Math.Max( global, 1 + m_Spawn.Level ); //This is a gusstimate. TODO: Verify & get exact values // OSI testing: at 2 red skulls, light = 0x3 ; 1 red = 0x3.; 3 = 8; 9 = 0xD 8 = 0xD 12 = 0x12 10 = 0xD
global = Math.Max( global, 1 + m_Spawn.Level ); //This is a guesstimate. TODO: Verify & get exact values // OSI testing: at 2 red skulls, light = 0x3 ; 1 red = 0x3.; 3 = 8; 9 = 0xD 8 = 0xD 12 = 0x12 10 = 0xD
}
}

10
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -5,6 +5,7 @@ using Server;
using Server.Items;
using Server.Factions;
using Server.Mobiles;
using Server.Commands;
namespace Server.Engines.Craft
{
@ -679,11 +680,11 @@ namespace Server.Engines.Craft
{
// Runebooks are a special case, they need a blank recall rune
Item[] runes = ourPack.FindItemsByType( typeof( RecallRune ) );
List<RecallRune> runes = ourPack.FindItemsByType<RecallRune>();
for ( int i = 0; i < runes.Length; ++i )
for ( int i = 0; i < runes.Count; ++i )
{
RecallRune rune = runes[i] as RecallRune;
RecallRune rune = runes[i];
if ( rune != null && !rune.Marked )
{
@ -1115,6 +1116,9 @@ namespace Server.Engines.Craft
from.AddToBackpack( item );
if( from.AccessLevel > AccessLevel.Player )
CommandLogging.WriteLine( from, "Crafting {0} with craft system {1}", CommandLogging.Format( item ), craftSystem.GetType().Name );
//from.PlaySound( 0x57 );
}

217
Scripts/Engines/Craft/DefBlacksmithy.cs
View file

@ -282,7 +282,7 @@ namespace Server.Engines.Craft
index = AddCraft( typeof( StandardPlateKabuto ), 1011079, 1030196, 90.0, 140.0, typeof( IronIngot ), 1044036, 25, 1044037 );
SetNeededExpansion( index, Expansion.SE );
/*
if( Core.ML )
{
index = AddCraft( typeof( Circlet ), 1011079, 1032645, 62.1, 112.1, typeof( IronIngot ), 1044036, 6, 1044037 );
@ -296,8 +296,8 @@ namespace Server.Engines.Craft
AddRes( index, typeof( Amethyst ), 1044236, 1, 1044240 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
SetNeededExpansion( index, Expansion.ML );
}
* */
}
#endregion
@ -336,7 +336,6 @@ namespace Server.Engines.Craft
if( Core.SE )
{
index = AddCraft( typeof( NoDachi ), 1011081, 1030221, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
SetNeededExpansion( index, Expansion.SE );
index = AddCraft( typeof( Wakizashi ), 1011081, 1030223, 50.0, 100.0, typeof( IronIngot ), 1044036, 8, 1044037 );
@ -353,7 +352,7 @@ namespace Server.Engines.Craft
SetNeededExpansion( index, Expansion.SE );
index = AddCraft( typeof( Sai ), 1011081, 1030234, 50.0, 100.0, typeof( IronIngot ), 1044036, 12, 1044037 );
SetNeededExpansion( index, Expansion.SE );
/*
if( Core.ML )
{
index = AddCraft( typeof( RadiantScimitar ), 1011081, 1031571, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
@ -409,17 +408,152 @@ namespace Server.Engines.Craft
ForceNonExceptional( index );
SetNeededExpansion( index, Expansion.ML );
/* //TODO: true spellblade;
index = AddCraft( typeof( ), 1011081, 1072920, 70.0, 120.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( GrizzledBones ), 1032684, 1, 1053098 );
AddRes( index, typeof( Blight ), 1032675, 10, 1053098 );
AddRes( index, typeof( Scourge ), 1032677, 10, 1053098 );
index = AddCraft( typeof( TrueSpellblade ), 1011081, 1073513, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
AddRecipe( index, 4 );
ForceNonExceptional( index );
SetNeededExpansion( index, Expansion.ML );
* */
index = AddCraft( typeof( IcySpellblade ), 1011081, 1073514, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( Turquoise ), 1032691, 1, 1044240 );
AddRecipe( index, 5 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( FierySpellblade ), 1011081, 1073515, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( FireRuby ), 1032695, 1, 1044240 );
AddRecipe( index, 6 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( SpellbladeOfDefense ), 1011081, 1073516, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
AddRes( index, typeof( WhitePearl ), 1032694, 1, 1044240 );
AddRecipe( index, 7 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( TrueAssassinSpike ), 1011081, 1073517, 75.0, 125.0, typeof( IronIngot ), 1044036, 9, 1044037 );
AddRes( index, typeof( DarkSapphire ), 1032690, 1, 1044240 );
AddRecipe( index, 8 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( ChargedAssassinSpike ), 1011081, 1073518, 75.0, 125.0, typeof( IronIngot ), 1044036, 9, 1044037 );
AddRes( index, typeof( EcruCitrine ), 1032693, 1, 1044240 );
AddRecipe( index, 9 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( MagekillerAssassinSpike ), 1011081, 1073519, 75.0, 125.0, typeof( IronIngot ), 1044036, 9, 1044037 );
AddRes( index, typeof( BrilliantAmber ), 1032697, 1, 1044240 );
AddRecipe( index, 10 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( WoundingAssassinSpike ), 1011081, 1073520, 75.0, 125.0, typeof( IronIngot ), 1044036, 9, 1044037 );
AddRes( index, typeof( PerfectEmerald ), 1032692, 1, 1044240 );
AddRecipe( index, 11 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( TrueLeafblade ), 1011081, 1073521, 75.0, 125.0, typeof( IronIngot ), 1044036, 12, 1044037 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
AddRecipe( index, 12 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( Luckblade ), 1011081, 1073522, 75.0, 125.0, typeof( IronIngot ), 1044036, 12, 1044037 );
AddRes( index, typeof( WhitePearl ), 1032694, 1, 1044240 );
AddRecipe( index, 13 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( MagekillerLeafblade ), 1011081, 1073523, 75.0, 125.0, typeof( IronIngot ), 1044036, 12, 1044037 );
AddRes( index, typeof( FireRuby ), 1032695, 1, 1044240 );
AddRecipe( index, 14 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( LeafbladeOfEase ), 1011081, 1073524, 75.0, 125.0, typeof( IronIngot ), 1044036, 12, 1044037 );
AddRes( index, typeof( PerfectEmerald ), 1032692, 1, 1044240 );
AddRecipe( index, 15 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( KnightsWarCleaver ), 1011081, 1073525, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
AddRes( index, typeof( PerfectEmerald ), 1032692, 1, 1044240 );
AddRecipe( index, 16 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( ButchersWarCleaver ), 1011081, 1073526, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
AddRes( index, typeof( Turquoise ), 1032691, 1, 1044240 );
AddRecipe( index, 17 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( SerratedWarCleaver ), 1011081, 1073527, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
AddRes( index, typeof( EcruCitrine ), 1032693, 1, 1044240 );
AddRecipe( index, 18 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( TrueWarCleaver ), 1011081, 1073528, 75.0, 125.0, typeof( IronIngot ), 1044036, 18, 1044037 );
AddRes( index, typeof( BrilliantAmber ), 1032697, 1, 1044240 );
AddRecipe( index, 19 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( AdventurersMachete ), 1011081, 1073533, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( WhitePearl ), 1032694, 1, 1044240 );
AddRecipe( index, 20 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( OrcishMachete ), 1011081, 1073534, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( Scourge ), 1072136, 1, 1042081 );
AddRecipe( index, 21 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( MacheteOfDefense ), 1011081, 1073535, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( BrilliantAmber ), 1032697, 1, 1044240 );
AddRecipe( index, 22 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( DiseasedMachete ), 1011081, 1073536, 75.0, 125.0, typeof( IronIngot ), 1044036, 14, 1044037 );
AddRes( index, typeof( Blight ), 1072134, 1, 1042081 );
AddRecipe( index, 23 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( RuneSabre ), 1011081, 1073537, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( Turquoise ), 1032691, 1, 1044240 );
AddRecipe( index, 24 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( MagesRuneBlade ), 1011081, 1073538, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
AddRecipe( index, 25 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( RuneBladeOfKnowledge ), 1011081, 1073539, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( EcruCitrine ), 1032693, 1, 1044240 );
AddRecipe( index, 26 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( CorruptedRuneBlade ), 1011081, 1073540, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( Corruption ), 1072135, 1, 1042081 );
AddRecipe( index, 27 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( TrueRadiantScimitar ), 1011081, 1073541, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( BrilliantAmber ), 1032697, 1, 1044240 );
AddRecipe( index, 28 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( DarkglowScimitar ), 1011081, 1073542, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( DarkSapphire ), 1032690, 1, 1044240 );
AddRecipe( index, 29 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( IcyScimitar ), 1011081, 1073543, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( DarkSapphire ), 1032690, 1, 1044240 );
AddRecipe( index, 30 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( TwinklingScimitar ), 1011081, 1073544, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( DarkSapphire ), 1032690, 1, 1044240 );
AddRecipe( index, 31 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( BoneMachete ), 1011081, 1020526, 75.0, 125.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( Bone ), 1049064, 6, 1049063 );
AddRecipe( index, 32 );
SetNeededExpansion( index, Expansion.ML );
}
*/
}
#endregion
@ -431,6 +565,33 @@ namespace Server.Engines.Craft
AddCraft( typeof( LargeBattleAxe ), 1011082, 1025115, 28.0, 78.0, typeof( IronIngot ), 1044036, 12, 1044037 );
AddCraft( typeof( TwoHandedAxe ), 1011082, 1025187, 33.0, 83.0, typeof( IronIngot ), 1044036, 16, 1044037 );
AddCraft( typeof( WarAxe ), 1011082, 1025040, 39.1, 89.1, typeof( IronIngot ), 1044036, 16, 1044037 );
/*
if( Core.ML )
{
index = AddCraft( typeof( OrnateAxe ), 1011082, 1031572, 70.0, 120.0, typeof( IronIngot ), 1044036, 18, 1044037 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( GuardianAxe ), 1011082, 1073545, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
AddRecipe( index, 33 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( SingingAxe ), 1011082, 1073546, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( BrilliantAmber ), 1032697, 1, 1044240 );
AddRecipe( index, 34 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( ThunderingAxe ), 1011082, 1073547, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( EcruCitrine ), 1032693, 1, 1044240 );
AddRecipe( index, 35 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( HeavyOrnateAxe ), 1011082, 1073548, 75.0, 125.0, typeof( IronIngot ), 1044036, 15, 1044037 );
AddRes( index, typeof( Turquoise ), 1032691, 1, 1044240 );
AddRecipe( index, 36 );
SetNeededExpansion( index, Expansion.ML );
}*/
#endregion
#region Pole Arms
@ -481,6 +642,40 @@ namespace Server.Engines.Craft
AddRes( index, typeof( Cloth ), 1044286, 10, 1044287 );
SetNeededExpansion( index, Expansion.SE );
}
/*
if( Core.ML )
{
index = AddCraft( typeof( DiamondMace ), 1011084, 1073568, 70.0, 120.0, typeof( IronIngot ), 1044036, 20, 1044037 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( ShardThrasher ), 1011084, 1072918, 70.0, 120.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( EyeOfTheTravesty ), 1073126, 1, 1042081 );
AddRes( index, typeof( Muculent ), 1072139, 10, 1042081 );
AddRes( index, typeof( Corruption ), 1072135, 10, 1042081 );
AddRecipe( index, 37 );
ForceNonExceptional( index );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( RubyMace ), 1011084, 1073529, 75.0, 125.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( FireRuby ), 1032695, 1, 1044240 );
AddRecipe( index, 38 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( EmeraldMace ), 1011084, 1073530, 75.0, 125.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( PerfectEmerald ), 1032692, 1, 1044240 );
AddRecipe( index, 39 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( SapphireMace ), 1011084, 1073531, 75.0, 125.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( DarkSapphire ), 1032690, 1, 1044240 );
AddRecipe( index, 40 );
SetNeededExpansion( index, Expansion.ML );
index = AddCraft( typeof( SilverEtchedMace ), 1011084, 1073532, 75.0, 125.0, typeof( IronIngot ), 1044036, 20, 1044037 );
AddRes( index, typeof( BlueDiamond ), 1032696, 1, 1044240 );
AddRecipe( index, 41 );
SetNeededExpansion( index, Expansion.ML );
}*/
#endregion
#region Dragon Scale Armor

20
Scripts/Engines/Craft/DefCarpentry.cs
View file

@ -115,6 +115,15 @@ namespace Server.Engines.Craft
SetNeededExpansion( index, Expansion.SE );
}
if( Core.AOS ) //Duplicate Entries to preserve ordering depending on era
{
index = AddCraft( typeof( FishingPole ), 1044294, 1023519, 68.4, 93.4, typeof( Log ), 1044041, 5, 1044351 ); //This is in the categor of Other during AoS
AddSkill( index, SkillName.Tailoring, 40.0, 45.0 );
AddRes( index, typeof( Cloth ), 1044286, 5, 1044287 );
}
// Furniture
AddCraft( typeof( FootStool ), 1044291, 1022910, 11.0, 36.0, typeof( Log ), 1044041, 9, 1044351 );
AddCraft( typeof( Stool ), 1044291, 1022602, 11.0, 36.0, typeof( Log ), 1044041, 9, 1044351 );
@ -194,10 +203,13 @@ namespace Server.Engines.Craft
AddCraft( typeof( QuarterStaff ), 1044295, 1023721, 73.6, 98.6, typeof( Log ), 1044041, 6, 1044351 );
AddCraft( typeof( GnarledStaff ), 1044295, 1025112, 78.9, 103.9, typeof( Log ), 1044041, 7, 1044351 );
AddCraft( typeof( WoodenShield ), 1044295, 1027034, 52.6, 77.6, typeof( Log ), 1044041, 9, 1044351 );
index = AddCraft( typeof( FishingPole ), Core.AOS ? 1044294 : 1044295, 1023519, 68.4, 93.4, typeof( Log ), 1044041, 5, 1044351 ); //This is in the categor of Other during AoS
AddSkill( index, SkillName.Tailoring, 40.0, 45.0 );
AddRes( index, typeof( Cloth ), 1044286, 5, 1044287 );
if( !Core.AOS ) //Duplicate Entries to preserve ordering depending on era
{
index = AddCraft( typeof( FishingPole ), 1044295, 1023519, 68.4, 93.4, typeof( Log ), 1044041, 5, 1044351 ); //This is in the categor of Other during AoS
AddSkill( index, SkillName.Tailoring, 40.0, 45.0 );
AddRes( index, typeof( Cloth ), 1044286, 5, 1044287 );
}
if( Core.SE )
{

15
Scripts/Engines/Harvest/Fishing.cs
View file

@ -4,6 +4,7 @@ using Server.Items;
using Server.Mobiles;
using Server.Engines.Quests;
using Server.Engines.Quests.Collector;
using System.Collections.Generic;
namespace Server.Engines.Harvest
{
@ -200,11 +201,11 @@ namespace Server.Engines.Harvest
if ( pack != null )
{
Item[] messages = pack.FindItemsByType( typeof( SOS ) );
List<SOS> messages = pack.FindItemsByType<SOS>();
for ( int i = 0; i < messages.Length; ++i )
for ( int i = 0; i < messages.Count; ++i )
{
SOS sos = (SOS)messages[i];
SOS sos = messages[i];
if ( from.Map == sos.TargetMap && from.InRange( sos.TargetLocation, 60 ) )
return true;
@ -228,18 +229,18 @@ namespace Server.Engines.Harvest
}
else if ( type == typeof( MessageInABottle ) )
{
return new MessageInABottle( SafeMap( from.Map ) );
return new MessageInABottle( from.Map == Map.Felucca ? Map.Felucca : Map.Trammel );
}
Container pack = from.Backpack;
if ( pack != null )
{
Item[] messages = pack.FindItemsByType( typeof( SOS ) );
List<SOS> messages = pack.FindItemsByType<SOS>();
for ( int i = 0; i < messages.Length; ++i )
for ( int i = 0; i < messages.Count; ++i )
{
SOS sos = (SOS)messages[i];
SOS sos = messages[i];
if ( from.Map == sos.TargetMap && from.InRange( sos.TargetLocation, 60 ) )
{

2
Scripts/Engines/Help/HelpGump.cs
View file

@ -298,7 +298,7 @@ namespace Server.Engines.Help
}
else
{
from.MoveToWorld( new Point3D( 3618, 2587, 0 ), Map.Trammel );
from.MoveToWorld( new Point3D( 3503, 2574, 14 ), Map.Trammel );
}
}

4
Scripts/Engines/Help/SpeechLog.cs
View file

@ -15,7 +15,7 @@ namespace Server.Engines.Help
public static readonly bool Enabled = true;
// How long should we maintain each speech entry?
public static readonly TimeSpan EntryDuration = TimeSpan.FromMinutes( 10.0 );
public static readonly TimeSpan EntryDuration = TimeSpan.FromMinutes( 20.0 );
// What is the maximum number of entries a log can contain? (0 -> no limit)
public static readonly int MaxLength = 0;
@ -49,7 +49,7 @@ namespace Server.Engines.Help
{
from.SendMessage( "Speech logs aren't supported on that target." );
}
else if ( from != targeted && from.AccessLevel <= pm.AccessLevel )
else if ( from != targeted && from.AccessLevel <= pm.AccessLevel && from.AccessLevel != AccessLevel.Owner )
{
from.SendMessage( "You don't have the required access level to view {0} speech log.", pm.Female ? "her" : "his" );
}

2
Scripts/Engines/Plants/PlantItem.cs
View file

@ -431,7 +431,7 @@ namespace Server.Engines.Plants
int message;
if ( ApplyPotion( potion.PotionEffect, false, out message ) )
{
potion.Delete();
potion.Consume();
from.PlaySound( 0x240 );
from.AddToBackpack( new Bottle() );
}

5
Scripts/Engines/Plants/PlantSystem.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections;
using Server;
using Server.Items;
using System.Collections.Generic;
namespace Server.Engines.Plants
{
@ -391,7 +392,7 @@ namespace Server.Engines.Plants
if ( from.Backpack != null )
{
Item[] plants = from.Backpack.FindItemsByType( typeof( PlantItem ) );
List<PlantItem> plants = from.Backpack.FindItemsByType<PlantItem>();
foreach ( PlantItem plant in plants )
{
@ -404,7 +405,7 @@ namespace Server.Engines.Plants
if ( bank != null )
{
Item[] plants = bank.FindItemsByType( typeof( PlantItem ) );
List<PlantItem> plants = bank.FindItemsByType<PlantItem>();
foreach ( PlantItem plant in plants )
{

1
Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -6,6 +6,7 @@ namespace Server.Items
{
public class EnchantedSextant : Item
{
//TODO: Trammel/Haven
private static readonly Point2D[] m_TrammelBanks = new Point2D[]
{
new Point2D( 652, 820 ),

2
Scripts/Engines/Reports/Reports.cs
View file

@ -160,7 +160,7 @@ namespace Server.Engines.Reports
public static SkillDistribution[] GetSkillDistribution()
{
int skip = ( Core.ML ? 0 : Core.SE ? 1 : Core.AOS ? 3 : 6 ); //TODO: Change for ML
int skip = ( Core.ML ? 0 : Core.SE ? 1 : Core.AOS ? 3 : 6 );
SkillDistribution[] distribs = new SkillDistribution[SkillInfo.Table.Length - skip];

10
Scripts/Engines/Virtues/Honor.cs
View file

@ -369,16 +369,14 @@ namespace Server
}
}
public void ApplyPerfectionDamageBonus( ref double factor )
public int PerfectionDamageBonus
{
if ( m_Perfection > 0 )
factor *= 1.0 + (m_Perfection / 100.0);
get { return m_Perfection; }
}
public void ApplyPerfectionLuckBonus( ref int luck )
public int PerfectionLuckBonus
{
if ( m_Perfection > 0 )
luck += (m_Perfection * m_Perfection) / 10;
get{ return (m_Perfection * m_Perfection) / 10; }
}
public bool CheckDistance()