From 14f1e75d4365714566915337eb1c5b5ef7027ef0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 2 Aug 2022 10:18:05 +0000 Subject: [PATCH] Addition of isHidingMessages skill parameter. --- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/stats/skills/47000-47099.xml | 12 +++++++++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/stats/skills/47000-47099.xml | 12 +++++++++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- .../dist/game/data/stats/skills/47000-47099.xml | 12 +++++++++++- .../dist/game/data/xsd/skills.xsd | 1 + .../org/l2jmobius/gameserver/model/skill/Skill.java | 4 +++- .../gameserver/model/skill/SkillCaster.java | 5 ++++- 72 files changed, 217 insertions(+), 49 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/skills.xsd b/L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/skills.xsd index 7e9eef3f87..be90acb277 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/skills.xsd @@ -2675,6 +2675,7 @@ + diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 4a157efcec..c86631bb43 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/xsd/skills.xsd b/L2J_Mobius_02.5_Underground/dist/game/data/xsd/skills.xsd index edda1ac34d..30021761cf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_02.5_Underground/dist/game/data/xsd/skills.xsd @@ -2770,6 +2770,7 @@ + diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index ed496ef422..3c4a02f345 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd b/L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd index 28d052f18f..729e6be58a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_03.0_Helios/dist/game/data/xsd/skills.xsd @@ -2808,6 +2808,7 @@ + diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index ed496ef422..3c4a02f345 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/skills.xsd b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/skills.xsd index 4901299045..b0cc39b85f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/skills.xsd @@ -2886,6 +2886,7 @@ + diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index ed496ef422..3c4a02f345 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/xsd/skills.xsd b/L2J_Mobius_05.0_Salvation/dist/game/data/xsd/skills.xsd index b9633f93c8..46dfca83c9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/xsd/skills.xsd @@ -2890,6 +2890,7 @@ + diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 56b4e1c506..007ef9ac1d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/skills.xsd b/L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/skills.xsd index 996585b2f5..4c2cb73423 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/skills.xsd @@ -2893,6 +2893,7 @@ + diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 56b4e1c506..007ef9ac1d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/skills.xsd index 99c3fc72da..796f7c4231 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/skills.xsd @@ -2893,6 +2893,7 @@ + diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 56b4e1c506..007ef9ac1d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/skills.xsd b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/skills.xsd index f84b2b8265..8576a9c705 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/skills.xsd @@ -2965,6 +2965,7 @@ + diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java index 1a09b3f7f8..0747f91ca2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index b97a959384..954d32dfc7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/skills.xsd b/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/skills.xsd index 6c893bc758..c4eceacb47 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/skills.xsd @@ -2985,6 +2985,7 @@ + diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java index 1a09b3f7f8..0747f91ca2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 8ad3f28b9c..84122cf204 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -347,7 +347,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd index 5ce51b824a..73a22a9127 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd @@ -2999,6 +2999,7 @@ + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java index 1a09b3f7f8..0747f91ca2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 0697922169..55974d3b0b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -347,7 +347,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/skills.xsd b/L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/skills.xsd index de1d76318f..f722f86afd 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/skills.xsd @@ -3018,6 +3018,7 @@ + diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java index 1a09b3f7f8..0747f91ca2 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index fc430863bd..cfd5aaee4a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -347,7 +347,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/skills.xsd b/L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/skills.xsd index de1d76318f..f722f86afd 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/skills.xsd @@ -3018,6 +3018,7 @@ + diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java index 58345240d5..0c0a36af04 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 9cd22f0668..b6eb20451e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -347,7 +347,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd index 1035161d9e..04edb88f22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd @@ -1964,6 +1964,7 @@ + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/skills.xsd index f7b6b7b6be..16d78e1bcb 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/skills.xsd @@ -1993,6 +1993,7 @@ + diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/skills.xsd index ab7a333af6..4c4d3aa4b0 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/skills.xsd @@ -1993,6 +1993,7 @@ + diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/skills.xsd index a7c1b1bd5c..7feeea71d1 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/skills.xsd @@ -1993,6 +1993,7 @@ + diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/skills.xsd index 790311d36d..5986218e46 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/skills.xsd @@ -2007,6 +2007,7 @@ + diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd index d97e422c56..68c84aa6a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd @@ -1770,6 +1770,7 @@ + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java index aa8c2684e6..6b8df43fc5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -211,6 +211,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -403,6 +404,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -923,7 +925,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 88ee87de38..b427d1f9c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -347,7 +347,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd index bbffc76ca3..bd6b598368 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd @@ -2872,6 +2872,7 @@ + diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java index 7e5fb9a18f..89ed243da3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -210,6 +210,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -401,6 +402,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -921,7 +923,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 310fce7da1..29fc21bf02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -346,7 +346,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd index 4a4b5e02e9..c48b4e962f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd @@ -2042,6 +2042,7 @@ + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java index aa8c2684e6..6b8df43fc5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -211,6 +211,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -403,6 +404,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -923,7 +925,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 4e723c8061..c591d9cc0e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -348,7 +348,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml index a0ff918bc8..a21a6fab81 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml @@ -180,6 +180,7 @@ 500 2300 true + true 1500 A1 5 @@ -237,6 +238,7 @@ 2300 ATTACK true + true 1500 A1 5 @@ -477,6 +479,7 @@ 5 ENEMY SINGLE + true @@ -533,6 +536,7 @@ 5 ENEMY SINGLE + true @@ -623,6 +627,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -647,6 +652,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -730,6 +736,7 @@ 5 ENEMY SINGLE + true @@ -785,6 +792,7 @@ 5 ENEMY SINGLE + true @@ -863,7 +871,7 @@ icon.freezing_wound 600 - 5-12 + 5-12 -2010 -2510 @@ -948,6 +956,7 @@ ENEMY RANGE NOT_FRIEND + true @@ -989,6 +998,7 @@ ENEMY RANGE NOT_FRIEND + true diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd index d6c96de25a..5c8dbbb672 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd @@ -2159,6 +2159,7 @@ + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java index aa8c2684e6..6b8df43fc5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -211,6 +211,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -403,6 +404,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -923,7 +925,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 4e723c8061..c591d9cc0e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -348,7 +348,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_USE_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/47000-47099.xml index a0ff918bc8..a21a6fab81 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/47000-47099.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/47000-47099.xml @@ -180,6 +180,7 @@ 500 2300 true + true 1500 A1 5 @@ -237,6 +238,7 @@ 2300 ATTACK true + true 1500 A1 5 @@ -477,6 +479,7 @@ 5 ENEMY SINGLE + true @@ -533,6 +536,7 @@ 5 ENEMY SINGLE + true @@ -623,6 +627,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -647,6 +652,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -730,6 +736,7 @@ 5 ENEMY SINGLE + true @@ -785,6 +792,7 @@ 5 ENEMY SINGLE + true @@ -863,7 +871,7 @@ icon.freezing_wound 600 - 5-12 + 5-12 -2010 -2510 @@ -948,6 +956,7 @@ ENEMY RANGE NOT_FRIEND + true @@ -989,6 +998,7 @@ ENEMY RANGE NOT_FRIEND + true diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/skills.xsd index d7c13db99d..c0fa5f8a85 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/skills.xsd @@ -2179,6 +2179,7 @@ + diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java index aa8c2684e6..6b8df43fc5 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -211,6 +211,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -403,6 +404,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -923,7 +925,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 877bc0fb2a..fcb077f98d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -348,7 +348,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml index 17e946d21f..4be92a324d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47000-47099.xml @@ -180,6 +180,7 @@ 500 2300 true + true 1500 A1 5 @@ -237,6 +238,7 @@ 2300 ATTACK true + true 1500 A1 5 @@ -477,6 +479,7 @@ 5 ENEMY SINGLE + true @@ -533,6 +536,7 @@ 5 ENEMY SINGLE + true @@ -623,6 +627,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -647,6 +652,7 @@ PHYSICAL ENEMY SINGLE + true 6550 @@ -730,6 +736,7 @@ 5 ENEMY SINGLE + true @@ -785,6 +792,7 @@ 5 ENEMY SINGLE + true @@ -863,7 +871,7 @@ icon.freezing_wound 600 - 5-12 + 5-12 -2010 -2510 @@ -948,6 +956,7 @@ ENEMY RANGE NOT_FRIEND + true @@ -989,6 +998,7 @@ ENEMY RANGE NOT_FRIEND + true diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/skills.xsd index d7c13db99d..c0fa5f8a85 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/skills.xsd @@ -2179,6 +2179,7 @@ + diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/Skill.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/Skill.java index aa8c2684e6..6b8df43fc5 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/Skill.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/Skill.java @@ -211,6 +211,7 @@ public class Skill implements IIdentifiable private final double _magicCriticalRate; private final SkillBuffType _buffType; private final boolean _displayInList; + private final boolean _isHidingMessages; public Skill(StatSet set) { @@ -403,6 +404,7 @@ public class Skill implements IIdentifiable _magicCriticalRate = set.getDouble("magicCriticalRate", 0); _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); + _isHidingMessages = set.getBoolean("isHidingMessages", false); } public TraitType getTraitType() @@ -923,7 +925,7 @@ public class Skill implements IIdentifiable public boolean isHidingMessages() { - return _operateType.isHidingMessages(); + return _isHidingMessages || _operateType.isHidingMessages(); } public boolean isNotBroadcastable() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 877bc0fb2a..fcb077f98d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -348,7 +348,10 @@ public class SkillCaster implements Runnable if (caster.isPlayer() && !instantCast) { // Send a system message to the player. - caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + if (!_skill.isHidingMessages()) + { + caster.sendPacket(_skill.getId() != 2046 ? new SystemMessage(SystemMessageId.YOU_VE_USED_S1).addSkillName(_skill) : new SystemMessage(SystemMessageId.SUMMONING_YOUR_PET)); + } // Show the gauge bar for casting. caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));