From a7c38951ce41d61b8e203f584f422ded79af8922 Mon Sep 17 00:00:00 2001 From: xavier Date: Sat, 22 Oct 2011 23:55:28 +0000 Subject: [PATCH] crafting skill chances corrected for HollowPrism notoriety fix for confusion pots notoriety fix for basecreature typo corrected for "bone mage" buying value for scrolls restored to previous in holymage --- Scripts/Engines/Craft/DefGlassblowing.cs | 3 +++ .../Confusion Blast Potions/BaseConfusionBlastPotion.cs | 2 +- Scripts/Misc/Notoriety.cs | 4 ++-- Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs | 2 +- Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Scripts/Engines/Craft/DefGlassblowing.cs b/Scripts/Engines/Craft/DefGlassblowing.cs index 56ff8c448..0d13bdd6a 100644 --- a/Scripts/Engines/Craft/DefGlassblowing.cs +++ b/Scripts/Engines/Craft/DefGlassblowing.cs @@ -31,6 +31,9 @@ namespace Server.Engines.Craft public override double GetChanceAtMin( CraftItem item ) { + if( item.ItemType == typeof( HollowPrism ) ) + return 0.5; // 50% + return 0.0; // 0% } diff --git a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs index c1679562a..a808556a9 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs @@ -102,7 +102,7 @@ namespace Server.Items foreach ( Mobile mobile in map.GetMobilesInRange( loc, Radius ) ) { - if ( mobile is BaseCreature ) + if ( mobile is BaseCreature && ( Notoriety.Compute ( from, mobile ) != Notoriety.Innocent )) { BaseCreature mon = (BaseCreature) mobile; diff --git a/Scripts/Misc/Notoriety.cs b/Scripts/Misc/Notoriety.cs index 558b370af..4494871c4 100644 --- a/Scripts/Misc/Notoriety.cs +++ b/Scripts/Misc/Notoriety.cs @@ -350,10 +350,10 @@ namespace Server.Misc if( source is BaseCreature ) { BaseCreature bc = (BaseCreature)source; - Mobile master = bc.GetMaster(); + if( master != null ) - if( CheckAggressor( master.Aggressors, target ) || MobileNotoriety( master, target ) == Notoriety.CanBeAttacked ) + if( CheckAggressor( master.Aggressors, target ) || MobileNotoriety( master, target ) == Notoriety.CanBeAttacked || target is BaseCreature ) return Notoriety.CanBeAttacked; } diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs index 54abf6ceb..96c426aba 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/BoneMagi.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles [Constructable] public BoneMagi() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) { - Name = "a bone magi"; + Name = "a bone mage"; Body = 148; BaseSoundID = 451; diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs index a53bdc8d2..5e69dccf2 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles else if ( i > 6 ) --itemID; - Add( new GenericBuyInfo( types[i], 12 + ((i / 8) * 10), 20, itemID, 0 ) ); + Add( new GenericBuyInfo( types[ i ], 12 + ( ( i / 8 ) * 10 ), 20, itemID, 0 ) ); } } } @@ -86,7 +86,7 @@ namespace Server.Mobiles Type[] types = Loot.RegularScrollTypes; for ( int i = 0; i < types.Length; ++i ) - Add( types[i], ((i / 8) + 2) * 5 ); + Add( types[ i ], ( ( i / 8 ) + 2 ) * 2 ); } } }