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

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

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