Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: dist/game/data/scripts/handlers/MasterHandler.java
- ===================================================================
- --- dist/game/data/scripts/handlers/MasterHandler.java (revision 259)
- +++ dist/game/data/scripts/handlers/MasterHandler.java (working copy)
- @@ -234,6 +234,8 @@
- import handlers.targethandlers.TargetAlly;
- import handlers.targethandlers.TargetArea;
- import handlers.targethandlers.TargetAreaCorpseMob;
- +import handlers.targethandlers.TargetAreaFan;
- +import handlers.targethandlers.TargetAreaSquare;
- import handlers.targethandlers.TargetAreaSummon;
- import handlers.targethandlers.TargetAreaUndead;
- import handlers.targethandlers.TargetAura;
- @@ -617,6 +619,8 @@
- {
- TARGET.registerSkillTargetType(new TargetAlly());
- TARGET.registerSkillTargetType(new TargetArea());
- + TARGET.registerSkillTargetType(new TargetAreaFan());
- + TARGET.registerSkillTargetType(new TargetAreaSquare());
- TARGET.registerSkillTargetType(new TargetAreaCorpseMob());
- TARGET.registerSkillTargetType(new TargetAreaSummon());
- TARGET.registerSkillTargetType(new TargetAreaUndead());
- Index: dist/game/data/scripts/handlers/targethandlers/TargetAreaFan.java
- ===================================================================
- --- dist/game/data/scripts/handlers/targethandlers/TargetAreaFan.java (revision 0)
- +++ dist/game/data/scripts/handlers/targethandlers/TargetAreaFan.java (revision 0)
- @@ -0,0 +1,99 @@
- +/*
- + * This program is free software: you can redistribute it and/or modify it under
- + * the terms of the GNU General Public License as published by the Free Software
- + * Foundation, either version 3 of the License, or (at your option) any later
- + * version.
- + *
- + * This program is distributed in the hope that it will be useful, but WITHOUT
- + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- + * details.
- + *
- + * You should have received a copy of the GNU General Public License along with
- + * this program. If not, see <http://www.gnu.org/licenses/>.
- + */
- +package handlers.targethandlers;
- +
- +import java.util.Collection;
- +import java.util.List;
- +
- +import javolution.util.FastList;
- +
- +import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
- +import com.l2jserver.gameserver.model.L2Object;
- +import com.l2jserver.gameserver.model.L2Skill;
- +import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
- +import com.l2jserver.gameserver.model.actor.L2Attackable;
- +import com.l2jserver.gameserver.model.actor.L2Character;
- +import com.l2jserver.gameserver.model.actor.L2Playable;
- +import com.l2jserver.gameserver.network.SystemMessageId;
- +import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
- +import com.l2jserver.gameserver.util.Util;
- +
- +/**
- + * @author UnAfraid
- + */
- +public class TargetAreaFan implements ISkillTargetTypeHandler
- +{
- + @Override
- + public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
- + {
- + List<L2Character> targetList = new FastList<L2Character>();
- + if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
- + {
- + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
- + return _emptyTargetList;
- + }
- +
- + final L2Character origin;
- + final boolean srcInArena = (activeChar.isInsideZone(L2Character.ZONE_PVP) && !activeChar.isInsideZone(L2Character.ZONE_SIEGE));
- +
- + if (skill.getCastRange() >= 0)
- + {
- + if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
- + return _emptyTargetList;
- +
- + if (onlyFirst)
- + return new L2Character[] { target };
- +
- + origin = target;
- + targetList.add(origin); // Add target to target list
- + }
- + else
- + origin = activeChar;
- +
- + activeChar.setHeading(Util.calculateHeadingFrom(activeChar.getX(), activeChar.getY(), target.getX(), target.getY()));
- +
- + final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
- + for (L2Character obj : objs)
- + {
- + if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
- + continue;
- +
- + if (obj == origin)
- + continue;
- +
- + if (Util.checkIfInFanRange(skill.getAreaParams()[0], skill.getAreaParams()[1], skill.getAreaParams()[2], skill.getAreaParams()[3], activeChar, obj))
- + {
- + if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
- + continue;
- +
- + if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
- + break;
- +
- + targetList.add(obj);
- + }
- + }
- +
- + if (targetList.isEmpty())
- + return _emptyTargetList;
- +
- + return targetList.toArray(new L2Character[targetList.size()]);
- + }
- +
- + @Override
- + public Enum<SkillTargetType> getTargetType()
- + {
- + return SkillTargetType.TARGET_AREA_FAN;
- + }
- +}
- Index: dist/game/data/scripts/handlers/targethandlers/TargetAreaSquare.java
- ===================================================================
- --- dist/game/data/scripts/handlers/targethandlers/TargetAreaSquare.java (revision 0)
- +++ dist/game/data/scripts/handlers/targethandlers/TargetAreaSquare.java (revision 0)
- @@ -0,0 +1,99 @@
- +/*
- + * This program is free software: you can redistribute it and/or modify it under
- + * the terms of the GNU General Public License as published by the Free Software
- + * Foundation, either version 3 of the License, or (at your option) any later
- + * version.
- + *
- + * This program is distributed in the hope that it will be useful, but WITHOUT
- + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- + * details.
- + *
- + * You should have received a copy of the GNU General Public License along with
- + * this program. If not, see <http://www.gnu.org/licenses/>.
- + */
- +package handlers.targethandlers;
- +
- +import java.util.Collection;
- +import java.util.List;
- +
- +import javolution.util.FastList;
- +
- +import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
- +import com.l2jserver.gameserver.model.L2Object;
- +import com.l2jserver.gameserver.model.L2Skill;
- +import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
- +import com.l2jserver.gameserver.model.actor.L2Attackable;
- +import com.l2jserver.gameserver.model.actor.L2Character;
- +import com.l2jserver.gameserver.model.actor.L2Playable;
- +import com.l2jserver.gameserver.network.SystemMessageId;
- +import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
- +import com.l2jserver.gameserver.util.Util;
- +
- +/**
- + * @author UnAfraid
- + */
- +public class TargetAreaSquare implements ISkillTargetTypeHandler
- +{
- + @Override
- + public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
- + {
- + List<L2Character> targetList = new FastList<L2Character>();
- + if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
- + {
- + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
- + return _emptyTargetList;
- + }
- +
- + final L2Character origin;
- + final boolean srcInArena = (activeChar.isInsideZone(L2Character.ZONE_PVP) && !activeChar.isInsideZone(L2Character.ZONE_SIEGE));
- +
- + if (skill.getCastRange() >= 0)
- + {
- + if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
- + return _emptyTargetList;
- +
- + if (onlyFirst)
- + return new L2Character[] { target };
- +
- + origin = target;
- + targetList.add(origin); // Add target to target list
- + }
- + else
- + origin = activeChar;
- +
- + activeChar.setHeading(Util.calculateHeadingFrom(activeChar.getX(), activeChar.getY(), target.getX(), target.getY()));
- +
- + final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
- + for (L2Character obj : objs)
- + {
- + if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
- + continue;
- +
- + if (obj == origin)
- + continue;
- +
- + if (Util.checkIfInSquareRange(skill.getAreaParams()[0], skill.getAreaParams()[1], skill.getAreaParams()[2], skill.getAreaParams()[3], activeChar, obj))
- + {
- + if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
- + continue;
- +
- + if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
- + break;
- +
- + targetList.add(obj);
- + }
- + }
- +
- + if (targetList.isEmpty())
- + return _emptyTargetList;
- +
- + return targetList.toArray(new L2Character[targetList.size()]);
- + }
- +
- + @Override
- + public Enum<SkillTargetType> getTargetType()
- + {
- + return SkillTargetType.TARGET_AREA_SQUARE;
- + }
- +}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement