From a45f1239331b2360b830ffa2ab46741e1c0e0d81 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Wed, 16 Jul 2014 13:07:38 +0000
Subject: [PATCH] BETA: DP-Part of [L6598]
---
.../data/scripts/ai/individual/Beleth.java | 2 +-
.../admincommandhandlers/AdminEditChar.java | 3 +-
.../handlers/itemhandlers/PetFood.java | 2 +-
.../dist/game/data/zones/castle_trap.xml | 48 +++++++++----------
.../dist/game/data/zones/devil_isle.xml | 2 +-
5 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
index 52e378c544..5bef4671d1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
@@ -544,7 +544,7 @@ public final class Beleth extends AbstractNpcAI
{
npc.setTarget(player);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
- int speed = npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed();
+ double speed = npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed();
int time = (int) (((distance2 - 890) / speed) * 1000);
ThreadPoolManager.getInstance().scheduleGeneral(new Cast(FIREBALL, npc), time);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 2e69e14a75..3d2b3c0526 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -54,7 +54,6 @@ import com.l2jserver.gameserver.network.serverpackets.GMViewItemList;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAll;
import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDeleteAll;
-import com.l2jserver.gameserver.network.serverpackets.SetSummonRemainTime;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.gameserver.util.HtmlUtil;
@@ -545,7 +544,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
L2PetInstance targetPet = (L2PetInstance) target;
targetPet.setCurrentFed(targetPet.getMaxFed());
- targetPet.sendPacket(new SetSummonRemainTime(targetPet.getMaxFed(), targetPet.getCurrentFed()));
+ targetPet.broadcastStatusUpdate();
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
index 02eec374b6..258ef9a340 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
@@ -72,7 +72,7 @@ public class PetFood implements IItemHandler
pet.broadcastPacket(new MagicSkillUse(pet, pet, skillId, skillLevel, 0, 0));
pet.setCurrentFed(pet.getCurrentFed() + (skill.getFeed() * Config.PET_FOOD_RATE));
pet.broadcastStatusUpdate();
- if (pet.getCurrentFed() < ((pet.getPetData().getHungryLimit() / 100f) * pet.getPetLevelData().getPetMaxFeed()))
+ if (pet.isHungry())
{
pet.sendPacket(SystemMessageId.YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/zones/castle_trap.xml b/L2J_DataPack_BETA/dist/game/data/zones/castle_trap.xml
index de5e5a9aa8..6da99cb320 100644
--- a/L2J_DataPack_BETA/dist/game/data/zones/castle_trap.xml
+++ b/L2J_DataPack_BETA/dist/game/data/zones/castle_trap.xml
@@ -3,7 +3,7 @@
<!-- Castle Trap Zones -->
<zone name="aden_slow_8" id="70001" type="SwampZone" shape="NPoly" minZ="-560" maxZ="-360"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="149084" Y="7070" />
<node X="149349" Y="7069" />
@@ -12,7 +12,7 @@
</zone>
<zone name="aden_slow_7" id="70002" type="SwampZone" shape="NPoly" minZ="-528" maxZ="-328"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="149084" Y="6942" />
<node X="149349" Y="6941" />
@@ -21,7 +21,7 @@
</zone>
<zone name="aden_slow_6" id="70003" type="SwampZone" shape="NPoly" minZ="-528" maxZ="-328"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="149084" Y="6814" />
<node X="149349" Y="6813" />
@@ -30,7 +30,7 @@
</zone>
<zone name="aden_slow_5" id="70004" type="SwampZone" shape="NPoly" minZ="-528" maxZ="-328"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="149084" Y="6686" />
<node X="149349" Y="6685" />
@@ -39,7 +39,7 @@
</zone>
<zone name="aden_slow_4" id="70005" type="SwampZone" shape="NPoly" minZ="-528" maxZ="-328"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="145548" Y="7054" />
<node X="145813" Y="7053" />
@@ -48,7 +48,7 @@
</zone>
<zone name="aden_slow_3" id="70006" type="SwampZone" shape="NPoly" minZ="-496" maxZ="-296"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="145548" Y="6926" />
<node X="145813" Y="6925" />
@@ -57,7 +57,7 @@
</zone>
<zone name="aden_slow_2" id="70007" type="SwampZone" shape="NPoly" minZ="-496" maxZ="-296"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="145548" Y="6798" />
<node X="145813" Y="6797" />
@@ -66,7 +66,7 @@
</zone>
<zone name="aden_slow_1" id="70008" type="SwampZone" shape="NPoly" minZ="-496" maxZ="-296"> <!-- [24_18] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="5" />
<node X="145548" Y="6670" />
<node X="145813" Y="6669" />
@@ -138,7 +138,7 @@
</zone>
<zone name="gludio_slow_1" id="70017" type="SwampZone" shape="NPoly" minZ="-2627" maxZ="-2427"> <!-- [19_21] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="1" />
<node X="-18255" Y="110790" />
<node X="-17971" Y="110790" />
@@ -147,7 +147,7 @@
</zone>
<zone name="gludio_slow_2" id="70018" type="SwampZone" shape="NPoly" minZ="-2595" maxZ="-2395"> <!-- [19_21] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="1" />
<node X="-19213" Y="107137" />
<node X="-18827" Y="107137" />
@@ -172,7 +172,7 @@
</zone>
<zone name="dion_slow_1" id="70021" type="SwampZone" shape="NPoly" minZ="-2821" maxZ="30341"> <!-- [20_22] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="2" />
<node X="22215" Y="158960" />
<node X="21931" Y="158960" />
@@ -181,7 +181,7 @@
</zone>
<zone name="dion_slow_2" id="70022" type="SwampZone" shape="NPoly" minZ="-2789" maxZ="30373"> <!-- [20_22] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="2" />
<node X="23173" Y="162613" />
<node X="22787" Y="162613" />
@@ -205,7 +205,7 @@
</zone>
<zone name="giran_slow_1" id="70025" type="SwampZone" shape="NPoly" minZ="-2694" maxZ="13957"> <!-- [23_22] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="3" />
<node X="115132" Y="144954" />
<node X="115132" Y="145238" />
@@ -214,7 +214,7 @@
</zone>
<zone name="giran_slow_2" id="70026" type="SwampZone" shape="NPoly" minZ="-2662" maxZ="13989"> <!-- [23_22] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="3" />
<node X="118785" Y="143996" />
<node X="118785" Y="144382" />
@@ -239,7 +239,7 @@
</zone>
<zone name="oren_slow_1" id="70029" type="SwampZone" shape="NPoly" minZ="-2421" maxZ="13957"> <!-- [22_19] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="4" />
<node X="81208" Y="37049" />
<node X="81208" Y="37333" />
@@ -248,7 +248,7 @@
</zone>
<zone name="oren_slow_2" id="70030" type="SwampZone" shape="NPoly" minZ="-2389" maxZ="13989"> <!-- [22_19] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="4" />
<node X="84861" Y="36091" />
<node X="84861" Y="36477" />
@@ -273,7 +273,7 @@
</zone>
<zone name="innadrile_slow_1" id="70033" type="SwampZone" shape="NPoly" minZ="-917" maxZ="30341"> <!-- [23_25] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="6" />
<node X="116166" Y="247739" />
<node X="115882" Y="247739" />
@@ -282,7 +282,7 @@
</zone>
<zone name="innadrile_slow_2" id="70034" type="SwampZone" shape="NPoly" minZ="-885" maxZ="30373"> <!-- [23_25] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="6" />
<node X="117124" Y="251392" />
<node X="116738" Y="251392" />
@@ -307,7 +307,7 @@
</zone>
<zone name="godad_slow_1" id="70037" type="SwampZone" shape="NPoly" minZ="-1789" maxZ="-1489"> <!-- [24_16] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="7" />
<node X="149235" Y="-47768" />
<node X="149579" Y="-47608" />
@@ -316,7 +316,7 @@
</zone>
<zone name="godad_slow_2" id="70038" type="SwampZone" shape="NPoly" minZ="-1789" maxZ="-1439"> <!-- [24_16] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="7" />
<node X="145352" Y="-47607" />
<node X="145696" Y="-47768" />
@@ -341,7 +341,7 @@
</zone>
<zone name="rune_slow_1" id="70041" type="SwampZone" shape="NPoly" minZ="509" maxZ="809"> <!-- [20_16] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="8" />
<node X="13785" Y="-47663" />
<node X="14046" Y="-47854" />
@@ -350,7 +350,7 @@
</zone>
<zone name="rune_slow_2" id="70042" type="SwampZone" shape="NPoly" minZ="518" maxZ="818"> <!-- [20_16] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="8" />
<node X="13917" Y="-50851" />
<node X="14209" Y="-50630" />
@@ -375,7 +375,7 @@
</zone>
<zone name="schutt_slow_1" id="70045" type="SwampZone" shape="NPoly" minZ="-93" maxZ="207"> <!-- [22_13] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="9" />
<node X="75440" Y="-151667" />
<node X="75787" Y="-151830" />
@@ -384,7 +384,7 @@
</zone>
<zone name="schutt_slow_2" id="70046" type="SwampZone" shape="NPoly" minZ="-77" maxZ="223"> <!-- [22_13] -->
<stat name="default_enabled" val="false" />
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<stat name="castleId" val="9" />
<node X="79322" Y="-151831" />
<node X="79668" Y="-151670" />
diff --git a/L2J_DataPack_BETA/dist/game/data/zones/devil_isle.xml b/L2J_DataPack_BETA/dist/game/data/zones/devil_isle.xml
index 7f37530a13..15abc8a584 100644
--- a/L2J_DataPack_BETA/dist/game/data/zones/devil_isle.xml
+++ b/L2J_DataPack_BETA/dist/game/data/zones/devil_isle.xml
@@ -121,7 +121,7 @@
<!-- Swamp -->
<zone name="devil_slow_8" type="SwampZone" shape="NPoly" minZ="-3964" maxZ="-3364"> <!-- [21_24] -->
<!-- stat name="initialDelay" val="1000" / -->
- <stat name="move_bonus" val="-80" />
+ <stat name="move_bonus" val="0.2" /> <!-- -80% -->
<node X="55250" Y="210873" />
<node X="55762" Y="211217" />
<node X="55934" Y="212274" />
--
GitLab