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

Browse source
This commit is contained in:
mark 2009-06-07 04:21:58 +00:00
parent b2349aed25
commit d03acbffaf
15 changed files with 81 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -529,6 +529,9 @@ namespace Server.Mobiles
int poisDamage = BreathPoisonDamage;
int nrgyDamage = BreathEnergyDamage;
if( Evasion.CheckSpellEvasion( target ) )
return;
if ( physDamage == 0 && fireDamage == 0 && coldDamage == 0 && poisDamage == 0 && nrgyDamage == 0 )
{ // Unresistable damage even in AOS
target.Damage( BreathComputeDamage(), this );

2
Scripts/Engines/Craft/DefTailoring.cs
View file

@ -59,7 +59,7 @@ namespace Server.Engines.Craft
public override bool RetainsColorFrom( CraftItem item, Type type )
{
if ( !type.IsSubclassOf( typeof( Cloth ) ) )
if ( !( type == typeof( Cloth ) ) )
return false;
type = item.ItemType;

3
Scripts/Engines/Harvest/Mining.cs
View file

@ -308,6 +308,7 @@ namespace Server.Engines.Harvest
if ( map.CanSpawnMobile( x, y, from.Z ) )
{
spawned.OnBeforeSpawn( new Point3D( x, y, from.Z ), map );
spawned.MoveToWorld( new Point3D( x, y, from.Z ), map );
spawned.Combatant = from;
return;
@ -318,6 +319,7 @@ namespace Server.Engines.Harvest
if ( map.CanSpawnMobile( x, y, z ) )
{
spawned.OnBeforeSpawn( new Point3D( x, y, z ), map );
spawned.MoveToWorld( new Point3D( x, y, z ), map );
spawned.Combatant = from;
return;
@ -325,6 +327,7 @@ namespace Server.Engines.Harvest
}
}
spawned.OnBeforeSpawn( from.Location, from.Map );
spawned.MoveToWorld( from.Location, from.Map );
spawned.Combatant = from;
}

6
Scripts/Engines/Plants/PlantBowl.cs
View file

@ -54,13 +54,15 @@ namespace Server.Engines.Plants
if ( targeted is FertileDirt )
{
int _dirtNeeded = Core.ML ? 20 : 40;
FertileDirt dirt = (FertileDirt)targeted;
if ( !dirt.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042664 ); // You must have the object in your backpack to use it.
}
else if ( dirt.Amount < 40 )
else if ( dirt.Amount < _dirtNeeded )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1061896 ); // You need more dirt to fill a plant bowl!
}
@ -70,7 +72,7 @@ namespace Server.Engines.Plants
if ( from.PlaceInBackpack( fullBowl ) )
{
dirt.Consume( 40 );
dirt.Consume( _dirtNeeded );
m_PlantBowl.Delete();
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1061895 ); // You fill the bowl with fresh dirt.