Changed OpSocialClassSkillCondition according to previous core changes.
This commit is contained in:
parent
28e36d17c6
commit
0e65792652
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -219,6 +219,9 @@
|
|||||||
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
|
<condition name="OpSocialClass">
|
||||||
|
<socialClass>-1</socialClass>
|
||||||
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="HealPercent">
|
<effect name="HealPercent">
|
||||||
|
@ -439,7 +439,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -218,6 +218,9 @@
|
|||||||
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
|
<condition name="OpSocialClass">
|
||||||
|
<socialClass>-1</socialClass>
|
||||||
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="HealPercent">
|
<effect name="HealPercent">
|
||||||
|
@ -443,7 +443,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -218,6 +218,9 @@
|
|||||||
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
|
<condition name="OpSocialClass">
|
||||||
|
<socialClass>-1</socialClass>
|
||||||
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="HealPercent">
|
<effect name="HealPercent">
|
||||||
|
@ -443,7 +443,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -218,6 +218,9 @@
|
|||||||
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
|
<condition name="OpSocialClass">
|
||||||
|
<socialClass>-1</socialClass>
|
||||||
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="HealPercent">
|
<effect name="HealPercent">
|
||||||
|
@ -445,7 +445,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2787,7 +2787,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -222,7 +222,7 @@
|
|||||||
<blockedInOlympiad>true</blockedInOlympiad>
|
<blockedInOlympiad>true</blockedInOlympiad>
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -1053,7 +1053,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1081,7 +1081,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1109,7 +1109,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1137,7 +1137,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -348,7 +348,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2787,7 +2787,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -222,7 +222,7 @@
|
|||||||
<blockedInOlympiad>true</blockedInOlympiad>
|
<blockedInOlympiad>true</blockedInOlympiad>
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -1053,7 +1053,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1081,7 +1081,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1109,7 +1109,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1137,7 +1137,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -348,7 +348,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -222,7 +222,7 @@
|
|||||||
<blockedInOlympiad>true</blockedInOlympiad>
|
<blockedInOlympiad>true</blockedInOlympiad>
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -1061,7 +1061,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1089,7 +1089,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1117,7 +1117,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1145,7 +1145,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -348,7 +348,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2789,7 +2789,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -222,7 +222,7 @@
|
|||||||
<blockedInOlympiad>true</blockedInOlympiad>
|
<blockedInOlympiad>true</blockedInOlympiad>
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -1061,7 +1061,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1089,7 +1089,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1117,7 +1117,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
@ -1145,7 +1145,7 @@
|
|||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
|
@ -348,7 +348,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
|
|||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.WorldObject;
|
import org.l2jmobius.gameserver.model.WorldObject;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||||
|
|
||||||
@ -37,6 +38,18 @@ public class OpSocialClassSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getPledgeClass() >= _socialClass);
|
final PlayerInstance player = caster.getActingPlayer();
|
||||||
|
if ((player == null) || (player.getClan() == null))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final boolean isClanLeader = player.isClanLeader();
|
||||||
|
if ((_socialClass == -1) && !isClanLeader)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isClanLeader || (player.getPledgeClass() >= _socialClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2788,7 +2788,7 @@
|
|||||||
<conditions>
|
<conditions>
|
||||||
<condition name="OpCanNotUseAirship" />
|
<condition name="OpCanNotUseAirship" />
|
||||||
<condition name="OpSocialClass">
|
<condition name="OpSocialClass">
|
||||||
<socialClass>8</socialClass>
|
<socialClass>-1</socialClass>
|
||||||
</condition>
|
</condition>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
@ -218,6 +218,9 @@
|
|||||||
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition name="CanUseInBattlefield" />
|
<condition name="CanUseInBattlefield" />
|
||||||
|
<condition name="OpSocialClass">
|
||||||
|
<socialClass>-1</socialClass>
|
||||||
|
</condition>
|
||||||
</conditions>
|
</conditions>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="HealPercent">
|
<effect name="HealPercent">
|
||||||
|
@ -445,7 +445,7 @@
|
|||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" maxOccurs="unbounded" name="npcId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="instanceId" type="xs:unsignedByte" />
|
||||||
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
<xs:element minOccurs="0" name="itemId" type="xs:unsignedShort" />
|
||||||
<xs:element minOccurs="0" name="socialClass" type="xs:unsignedByte" />
|
<xs:element minOccurs="0" name="socialClass" type="xs:int" />
|
||||||
<xs:element minOccurs="0" name="npcsIds">
|
<xs:element minOccurs="0" name="npcsIds">
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence>
|
<xs:sequence>
|
||||||
|
Loading…
Reference in New Issue
Block a user