Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/aCis_gameserver/config/en/rus_acis.properties b/aCis_gameserver/config/en/rus_acis.properties
- index 0ac920d..00fac2f 100644
- --- a/aCis_gameserver/config/en/rus_acis.properties
- +++ b/aCis_gameserver/config/en/rus_acis.properties
- @@ -5,6 +5,9 @@
- InfinitySS = False
- InfinityArrows = False
- +# Time in seconds for /unstuck
- +UnstuckTime = 15
- +
- # Alt Oly period: MONTH/DAY/WEEK
- # MONTH, WEEK, DAY
- # Exemple. 2 weeks-->AltOlyPeriod=WEEK and AltOlyPeriodMultiplier=2.
- diff --git a/aCis_gameserver/config/rus_acis.properties b/aCis_gameserver/config/rus_acis.properties
- index d60eb4c..13a1f67 100644
- --- a/aCis_gameserver/config/rus_acis.properties
- +++ b/aCis_gameserver/config/rus_acis.properties
- @@ -5,6 +5,9 @@
- InfinitySS = False
- InfinityArrows = False
- +# Время в секундах для /unstuck
- +UnstuckTime = 15
- +
- # Период олимпиады: месяц / день / неделя
- # месяц / день / неделя
- # Например: 2 недели-->AltOlyPeriod=Неделя и AltOlyPeriodMultiplier=2.
- diff --git a/aCis_gameserver/java/net/sf/l2j/Config.java b/aCis_gameserver/java/net/sf/l2j/Config.java
- index a28b524..a0704e2 100644
- --- a/aCis_gameserver/java/net/sf/l2j/Config.java
- +++ b/aCis_gameserver/java/net/sf/l2j/Config.java
- @@ -872,6 +872,9 @@
- public static boolean INFINITY_SS;
- public static boolean INFINITY_ARROWS;
- + /** Unstuck Time */
- + public static int UNSTUCK_TIME;
- +
- /** Olympiad Period */
- public static OlympiadPeriod OLY_PERIOD;
- public static int OLY_PERIOD_MULTIPLIER;
- @@ -2578,6 +2581,8 @@
- INFINITY_SS = rusacis.getProperty("InfinitySS", false);
- INFINITY_ARROWS = rusacis.getProperty("InfinityArrows", false);
- + UNSTUCK_TIME = rusacis.getProperty("UnstuckTime", 30);
- +
- OLY_PERIOD = OlympiadPeriod.valueOf(rusacis.getProperty("OlyPeriod", "MONTH"));
- OLY_PERIOD_MULTIPLIER = rusacis.getProperty("OlyPeriodMultiplier", 1);
- diff --git a/aCis_gameserver/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java b/aCis_gameserver/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java
- index 7e263a3..9136698 100644
- --- a/aCis_gameserver/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java
- +++ b/aCis_gameserver/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java
- @@ -1,5 +1,7 @@
- package net.sf.l2j.gameserver.handler.usercommandhandlers;
- +import net.sf.l2j.Config;
- +import net.sf.l2j.gameserver.data.SkillTable;
- import net.sf.l2j.gameserver.enums.ZoneId;
- import net.sf.l2j.gameserver.handler.IUserCommandHandler;
- import net.sf.l2j.gameserver.model.actor.Player;
- @@ -9,6 +11,8 @@
- import net.sf.l2j.gameserver.model.entity.events.teamvsteam.TvTEvent;
- import net.sf.l2j.gameserver.network.SystemMessageId;
- import net.sf.l2j.gameserver.network.serverpackets.PlaySound;
- +import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- +import net.sf.l2j.gameserver.skills.L2Skill;
- public class Escape implements IUserCommandHandler
- {
- @@ -38,9 +42,16 @@
- else
- {
- player.sendPacket(new PlaySound("systemmsg_e.809"));
- - player.sendPacket(SystemMessageId.STUCK_TRANSPORT_IN_FIVE_MINUTES);
- -
- + int unstuckTimer = Config.UNSTUCK_TIME * 1000;
- +
- + L2Skill skill = SkillTable.getInstance().getInfo(2099, 1);
- + skill.setHitTime(unstuckTimer);
- player.getAI().tryToCast(player, 2099, 1);
- +
- + if (unstuckTimer < 60000)
- + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2).addString("You will unstuck in " + unstuckTimer / 1000 + " seconds."));
- + else
- + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2).addString("You will unstuck i " + unstuckTimer / 60000 + " minutes."));
- }
- }
- diff --git a/aCis_gameserver/java/net/sf/l2j/gameserver/skills/L2Skill.java b/aCis_gameserver/java/net/sf/l2j/gameserver/skills/L2Skill.java
- index 46d49d2..7d011fb 100644
- --- a/aCis_gameserver/java/net/sf/l2j/gameserver/skills/L2Skill.java
- +++ b/aCis_gameserver/java/net/sf/l2j/gameserver/skills/L2Skill.java
- @@ -85,7 +85,7 @@
- private final int _abnormalLvl; // Abnormal levels for skills and their canceling
- private final int _effectAbnormalLvl;
- - private final int _hitTime; // all times in milliseconds
- + private int _hitTime; // all times in milliseconds
- private final int _coolTime;
- private final int _reuseDelay;
- @@ -1508,4 +1508,9 @@
- {
- return _icon;
- }
- +
- + public void setHitTime(int value)
- + {
- + _hitTime = value;
- + }
- }
- \ No newline at end of file
Add Comment
Please, Sign In to add comment