diff --git a/Data/Config/names.xml b/Data/Config/names.xml index 5632ee3..626288f 100644 --- a/Data/Config/names.xml +++ b/Data/Config/names.xml @@ -20,7 +20,7 @@ Kaltivel, Anshu, Maliel, Baratoz, Almonjin - the Lord of the Abyss, the Collector of Souls, the Slayer + the Lord of the Abyss, the Collector of Souls, the Slayer, the Breaker of Bodies, the Bone Splinterer Pariah, Ydoc Llessue, Zhaan, Lorbna, Gragok, Thranger, Krygar, @@ -651,4 +651,4 @@ Nandrien, Olonal, Peorilien, Regornolas, Rylvarn, Silnaliel, Talendeor, Uomo, Verlolas - \ No newline at end of file + diff --git a/Scripts/Misc/Notoriety.cs b/Scripts/Misc/Notoriety.cs index 9c90cfc..c04e265 100644 --- a/Scripts/Misc/Notoriety.cs +++ b/Scripts/Misc/Notoriety.cs @@ -416,22 +416,27 @@ namespace Server.Misc return Notoriety.Criminal; // --- CUSTOM: Hostiles are always red. Peaceful mobs are orange --- - if ( target is BaseCreature ) - { - BaseCreature bc = (BaseCreature)target; - - // If it is wild (not tamed), not a summon, and has negative Karma (hostile) - if ( bc.AI != AIType.AI_Animal && !bc.Controlled && !bc.Summoned && bc.Karma < 0 ) - { - return Notoriety.Murderer; - } - // Defensive/Neutral: Aggressor FightMode or 0 Karma shows as Orange - if ( !target.Body.IsHuman && bc.AI != AIType.AI_Animal && ( bc.FightMode == FightMode.Aggressor || bc.Karma >= 0 ) ) - { - return Notoriety.Enemy; - } - } - // --------------------------------------------- + if ( target is BaseCreature ) + { + BaseCreature bc = (BaseCreature)target; + + // Protects player pets and summons from changing color + if ( !bc.Controlled && !bc.Summoned ) + { + // Hostiles: Negative Karma shows as Red + if ( bc.AI != AIType.AI_Animal && bc.Karma < 0 ) + { + return Notoriety.Murderer; + } + + // Defensive/Neutral: Aggressor FightMode or >= 0 Karma shows as Orange + if ( !target.Body.IsHuman && bc.AI != AIType.AI_Animal && ( bc.FightMode == FightMode.Aggressor || bc.Karma >= 0 ) ) + { + return Notoriety.Enemy; + } + } + } + // --------------------------------------------- Guild sourceGuild = GetGuildFor( source.Guild as Guild, source ); Guild targetGuild = GetGuildFor( target.Guild as Guild, target );