lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of AddHuntingTime effect handler.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-01-23 14:54:23 +00:00
parent 86b672924c
commit 3d0bdd0a46
18 changed files with 536 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -37,6 +37,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("AbsorbDamage", AbsorbDamage::new); EffectHandler.getInstance().registerHandler("AbsorbDamage", AbsorbDamage::new);
EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new); EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new);
EffectHandler.getInstance().registerHandler("AddHate", AddHate::new); EffectHandler.getInstance().registerHandler("AddHate", AddHate::new);
EffectHandler.getInstance().registerHandler("AddHuntingTime", AddHuntingTime::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionCp", AdditionalPotionCp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionCp", AdditionalPotionCp::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);

80
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java vendored Normal file
View File

@ -0,0 +1,80 @@
/*
* This file is part of the L2J Mobius project.
*
* 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.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.serverpackets.sessionzones.TimedHuntingZoneList;
/**
* @author Mobius
*/
public class AddHuntingTime extends AbstractEffect
{
private final int _zoneId;
private final long _time;
public AddHuntingTime(StatsSet params)
{
_zoneId = params.getInt("zoneId", 0);
_time = params.getLong("time", 3600000);
}
@Override
public boolean isInstant()
{
return true;
}
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
final PlayerInstance player = effected.getActingPlayer();
if (player == null)
{
return;
}
final long currentTime = System.currentTimeMillis();
if (player.isInTimedHuntingZone(_zoneId))
{
final long increasedTime = _time + player.getTimedHuntingZoneRemainingTime();
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, currentTime + increasedTime);
player.startTimedHuntingZone(_zoneId, increasedTime);
}
else
{
long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0);
if ((endTime + 18000000) < currentTime)
{
endTime = currentTime + 18000000;
}
else if (endTime < currentTime)
{
endTime = currentTime;
}
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, endTime + _time);
}
player.sendPacket(new TimedHuntingZoneList(player));
}
}

14
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80900-80999.xml vendored
View File

@ -67,7 +67,7 @@
<item id="80905" name="Storm Isle Time Recharge Stone" type="EtcItem"> <item id="80905" name="Storm Isle Time Recharge Stone" type="EtcItem">
<!-- Use to add 60 minutes to use the timed hunting zone Storm Isle. --> <!-- Use to add 60 minutes to use the timed hunting zone Storm Isle. -->
<set name="icon" val="icon.timezone_refill_1" /> <set name="icon" val="icon.timezone_refill_1" />
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" /> <set name="default_action" val="SKILL_REDUCE" />
<set name="material" val="PAPER" /> <set name="material" val="PAPER" />
<set name="weight" val="30" /> <set name="weight" val="30" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@ -75,11 +75,16 @@
<set name="is_depositable" val="false" /> <set name="is_depositable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<skills>
<skill id="39542" level="1" /> <!-- Storm Isle's Prolongating Stone -->
</skills>
</item> </item>
<item id="80906" name="Primeval Isle Time Recharge Stone" type="EtcItem"> <item id="80906" name="Primeval Isle Time Recharge Stone" type="EtcItem">
<!-- Prolongs your Primeval Isle's raid for 60 min. --> <!-- Prolongs your Primeval Isle's raid for 60 min. -->
<set name="icon" val="icon.timezone_refill_2" /> <set name="icon" val="icon.timezone_refill_2" />
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" /> <set name="default_action" val="SKILL_REDUCE" />
<set name="material" val="PAPER" /> <set name="material" val="PAPER" />
<set name="weight" val="30" /> <set name="weight" val="30" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@ -87,6 +92,11 @@
<set name="is_depositable" val="false" /> <set name="is_depositable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<skills>
<skill id="39543" level="1" /> <!-- Primeval Isle's Prolongating Stone -->
</skills>
</item> </item>
<item id="80907" name="PC Cafe Summoning Stick" type="EtcItem"> <item id="80907" name="PC Cafe Summoning Stick" type="EtcItem">
<!-- Double-click to summon either Pa'agrio Orc or Pa'agrio Orc Hero. --> <!-- Double-click to summon either Pa'agrio Orc or Pa'agrio Orc Hero. -->

42
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39500-39599.xml vendored
View File

@ -291,12 +291,50 @@
<reuseDelay>500</reuseDelay> <reuseDelay>500</reuseDelay>
</skill> </skill>
<skill id="39542" toLevel="1" name="Storm Isle Time Recharge Stone"> <skill id="39542" toLevel="1" name="Storm Isle Time Recharge Stone">
<magicLvl>1</magicLvl>
<operateType>A1</operateType> <operateType>A1</operateType>
<isMagic>4</isMagic> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>80905</itemConsumeId> <!-- Storm Isle Time Recharge Stone -->
<conditions>
<condition name="CheckLevel">
<minLevel>100</minLevel>
<maxLevel>120</maxLevel>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="AddHuntingTime">
<zoneId>1</zoneId>
<time>3600000</time>
</effect>
</effects>
</skill> </skill>
<skill id="39543" toLevel="1" name="Primeval Isle's Prolongating Stone"> <skill id="39543" toLevel="1" name="Primeval Isle's Prolongating Stone">
<magicLvl>1</magicLvl>
<operateType>A1</operateType> <operateType>A1</operateType>
<isMagic>4</isMagic> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>80906</itemConsumeId> <!-- Primeval Isle Time Recharge Stone -->
<conditions>
<condition name="CheckLevel">
<minLevel>105</minLevel>
<maxLevel>120</maxLevel>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="AddHuntingTime">
<zoneId>6</zoneId>
<time>3600000</time>
</effect>
</effects>
</skill> </skill>
<skill id="39544" toLevel="1" name="PC Cafe Summoning Stick"> <skill id="39544" toLevel="1" name="PC Cafe Summoning Stick">
<operateType>A1</operateType> <operateType>A1</operateType>

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -7,6 +7,7 @@ AbstractStatEffect: Abstract class for managing stats.
AbstractStatPercentEffect: Abstract class for managing stat percentages. (l2jmobius) AbstractStatPercentEffect: Abstract class for managing stat percentages. (l2jmobius)
Accuracy: P. Accuracy stat. Accuracy: P. Accuracy stat.
AddHate: Instant effect that increases target's hate towards you. AddHate: Instant effect that increases target's hate towards you.
AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)

313
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd vendored
View File

@ -872,21 +872,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="PLANT_WEAKNESS">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAtkAmount"> <xs:element name="pAtkAmount">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -903,13 +888,13 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="pAtkMode" type="xs:string" /> <xs:element name="pAtkMode" type="xs:string" />
<xs:element name="mAtkAmount"> <xs:element name="PLANT_WEAKNESS">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value"> <xs:element maxOccurs="unbounded" name="value">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:decimal"> <xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" /> <xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
@ -918,135 +903,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="mAtkMode" type="xs:string" />
<xs:element name="pAccuracyAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAccuracyMode" type="xs:string" />
<xs:element name="mAccuracyAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAccuracyMode" type="xs:string" />
<xs:element name="pAtkSpeedAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAtkSpeedMode" type="xs:string" />
<xs:element name="mAtkSpeedAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAtkSpeedMode" type="xs:string" />
<xs:element name="pCritDamageAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pCritDamageMode" type="xs:string" />
<xs:element name="pCritRateAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pCritRateMode" type="xs:string" />
<xs:element name="mCritDamageAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mpCritDamageMode" type="xs:string" />
<xs:element name="mCritRateAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mCritRateMode" type="xs:string" />
<xs:element name="HOLD"> <xs:element name="HOLD">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -1150,6 +1006,22 @@
<xs:attribute name="level" type="xs:unsignedByte" use="optional" /> <xs:attribute name="level" type="xs:unsignedByte" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="pAccuracyAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAccuracyMode" type="xs:string" />
<xs:element name="hpPercent" type="xs:unsignedByte" /> <xs:element name="hpPercent" type="xs:unsignedByte" />
<xs:element name="attribute" type="xs:string" /> <xs:element name="attribute" type="xs:string" />
<xs:element name="attackerType" type="xs:string" /> <xs:element name="attackerType" type="xs:string" />
@ -1487,21 +1359,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="DUALBLUNT">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DUAL"> <xs:element name="DUAL">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -2004,6 +1861,12 @@
<xs:element name="instanceId" type="xs:string" /> <xs:element name="instanceId" type="xs:string" />
<xs:element name="GUST" type="xs:unsignedByte" /> <xs:element name="GUST" type="xs:unsignedByte" />
<xs:element name="id" type="xs:unsignedShort" /> <xs:element name="id" type="xs:unsignedShort" />
<xs:element name="pAtkSpeedAmount" type="xs:unsignedByte" />
<xs:element name="pAtkSpeedMode" type="xs:string" />
<xs:element name="pCritDamageAmount" type="xs:unsignedShort" />
<xs:element name="pCritDamageMode" type="xs:string" />
<xs:element name="pCritRateAmount" type="xs:decimal" />
<xs:element name="pCritRateMode" type="xs:string" />
<xs:element name="BOSS" type="xs:unsignedByte" /> <xs:element name="BOSS" type="xs:unsignedByte" />
<xs:element name="ZONE"> <xs:element name="ZONE">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
@ -2073,9 +1936,25 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="fame" type="xs:unsignedInt" /> <xs:element name="fame" type="xs:unsignedInt" />
<xs:element name="disable" type="xs:string" />
<xs:element name="allowSkillAttack" type="xs:boolean" />
<xs:element name="affectScope" type="xs:string" /> <xs:element name="affectScope" type="xs:string" />
<xs:element name="disable" type="xs:string" />
<xs:element name="AGGRESSION">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="allowSkillAttack" type="xs:boolean" />
<xs:element name="attackSkillId" type="xs:unsignedShort" />
<xs:element name="skillSubLevel"> <xs:element name="skillSubLevel">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
@ -2096,7 +1975,6 @@
</xs:element> </xs:element>
<xs:element name="allowNormalAttack" type="xs:boolean" /> <xs:element name="allowNormalAttack" type="xs:boolean" />
<xs:element name="saveHp" type="xs:unsignedByte" /> <xs:element name="saveHp" type="xs:unsignedByte" />
<xs:element name="attackSkillId" type="xs:unsignedShort" />
<xs:element name="summonPoints" type="xs:unsignedByte" /> <xs:element name="summonPoints" type="xs:unsignedByte" />
<xs:element name="abnormalType" type="xs:string" /> <xs:element name="abnormalType" type="xs:string" />
<xs:element name="CRITICAL_DAMAGE" type="xs:unsignedByte" /> <xs:element name="CRITICAL_DAMAGE" type="xs:unsignedByte" />
@ -2156,21 +2034,6 @@
<xs:element name="replacementSkillId" type="xs:unsignedShort" /> <xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="isSummonSpawn" type="xs:boolean" /> <xs:element name="isSummonSpawn" type="xs:boolean" />
<xs:element name="randomOffset" type="xs:unsignedByte" /> <xs:element name="randomOffset" type="xs:unsignedByte" />
<xs:element name="AGGRESSION">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="debuffModifier" type="xs:decimal" /> <xs:element name="debuffModifier" type="xs:decimal" />
<xs:element name="HATE"> <xs:element name="HATE">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
@ -2190,6 +2053,56 @@
<xs:element name="damageModifier" type="xs:decimal" /> <xs:element name="damageModifier" type="xs:decimal" />
<xs:element name="animationSpeed" type="xs:unsignedShort" /> <xs:element name="animationSpeed" type="xs:unsignedShort" />
<xs:element name="pAtkMod" type="xs:unsignedByte" /> <xs:element name="pAtkMod" type="xs:unsignedByte" />
<xs:element name="mAtkAmount">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAtkMode" type="xs:string" />
<xs:element name="mAtkSpeedAmount">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAtkSpeedMode" type="xs:string" />
<xs:element name="mCritRateAmount">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mCritRateMode" type="xs:string" />
<xs:element name="zoneId" type="xs:unsignedByte" />
<xs:element name="time" type="xs:unsignedInt" />
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" /> <xs:attribute name="name" type="xs:string" use="required" />
@ -2569,8 +2482,8 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element minOccurs="0" name="mode" type="xs:string" /> <xs:element minOccurs="0" name="mode" type="xs:string" />
<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="position" type="xs:string" /> <xs:element minOccurs="0" name="position" type="xs:string" />
<xs:element minOccurs="0" name="magicType" type="xs:unsignedByte" />
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" /> <xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" /> <xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
@ -2657,7 +2570,6 @@
<xs:element name="channelingStart" type="xs:decimal" /> <xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" /> <xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" /> <xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" /> <xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" /> <xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect"> <xs:element name="effect">
@ -2707,7 +2619,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element minOccurs="0" name="chance" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" /> <xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="skillLevel"> <xs:element minOccurs="0" name="skillLevel">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
@ -2726,7 +2637,6 @@
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" /> <xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="abnormalTime" type="xs:unsignedByte" use="optional" />
<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" /> <xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" /> <xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
</xs:complexType> </xs:complexType>
@ -2749,23 +2659,8 @@
<xs:element minOccurs="0" name="DUAL" type="xs:byte" /> <xs:element minOccurs="0" name="DUAL" type="xs:byte" />
<xs:element minOccurs="0" name="DUALBLUNT" type="xs:byte" /> <xs:element minOccurs="0" name="DUALBLUNT" type="xs:byte" />
<xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" /> <xs:element minOccurs="0" name="skillId" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="skillLevel"> <xs:element minOccurs="0" name="skillLevel" type="xs:unsignedByte" />
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" /> <xs:element minOccurs="0" name="fullLethal" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="halfLethal" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="amount"> <xs:element minOccurs="0" name="amount">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -2844,27 +2739,12 @@
<xs:sequence> <xs:sequence>
<xs:choice maxOccurs="unbounded"> <xs:choice maxOccurs="unbounded">
<xs:element name="minDamage" type="xs:unsignedByte" /> <xs:element name="minDamage" type="xs:unsignedByte" />
<xs:element name="fullLethal" type="xs:unsignedByte" />
<xs:element name="chance" type="xs:unsignedByte" /> <xs:element name="chance" type="xs:unsignedByte" />
<xs:element name="staticChance" type="xs:boolean" /> <xs:element name="staticChance" type="xs:boolean" />
<xs:element name="magicTypes" type="xs:string" /> <xs:element name="magicTypes" type="xs:string" />
<xs:element name="skillId" type="xs:unsignedShort" /> <xs:element name="skillId" type="xs:unsignedShort" />
<xs:element name="skillLevel"> <xs:element name="skillLevel" type="xs:unsignedByte" />
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="fullLethal" type="xs:unsignedByte" />
<xs:element name="halfLethal" type="xs:unsignedByte" />
<xs:element name="amount"> <xs:element name="amount">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -3147,6 +3027,7 @@
<xs:element name="clanRepConsume" type="xs:unsignedShort" /> <xs:element name="clanRepConsume" type="xs:unsignedShort" />
<xs:element name="resetQuest" type="xs:string" /> <xs:element name="resetQuest" type="xs:string" />
<xs:element name="despawnDelay" type="xs:unsignedInt" /> <xs:element name="despawnDelay" type="xs:unsignedInt" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />

10
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -14253,6 +14253,7 @@ public class PlayerInstance extends Playable
// TODO: Delay window. // TODO: Delay window.
// sendPacket(new TimedHuntingZoneEnter((int) (delay / 60 / 1000))); // sendPacket(new TimedHuntingZoneEnter((int) (delay / 60 / 1000)));
sendMessage("You have " + (delay / 60 / 1000) + " minutes left for this timed zone.");
_timedHuntingZoneFinishTask = ThreadPool.schedule(() -> _timedHuntingZoneFinishTask = ThreadPool.schedule(() ->
{ {
@ -14272,7 +14273,16 @@ public class PlayerInstance extends Playable
{ {
_timedHuntingZoneFinishTask.cancel(true); _timedHuntingZoneFinishTask.cancel(true);
_timedHuntingZoneFinishTask = null; _timedHuntingZoneFinishTask = null;
}
sendPacket(TimedHuntingZoneExit.STATIC_PACKET); sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
} }
public long getTimedHuntingZoneRemainingTime()
{
if ((_timedHuntingZoneFinishTask != null) && !_timedHuntingZoneFinishTask.isCancelled() && !_timedHuntingZoneFinishTask.isDone())
{
return _timedHuntingZoneFinishTask.getDelay(TimeUnit.MILLISECONDS);
}
return 0;
} }
} }

38
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/sessionzones/ExTimedHuntingZoneEnter.java
View File

@ -73,30 +73,32 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
return; return;
} }
if (player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0) > System.currentTimeMillis())
{
if (player.isInTimedHuntingZone())
{
player.sendPacket(SystemMessageId.YOU_WILL_EXCEED_THE_MAX_AMOUNT_OF_TIME_FOR_THE_HUNTING_ZONE_SO_YOU_CANNOT_ADD_ANY_MORE_TIME);
}
else
{
player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_TIME_AVAILABLE_TO_ENTER_THE_HUNTING_ZONE);
}
return;
}
if (((_zoneId == 1) && (player.getLevel() < 100)) // if (((_zoneId == 1) && (player.getLevel() < 100)) //
|| ((_zoneId == 6) && (player.getLevel() < 105)) // || ((_zoneId == 6) && (player.getLevel() < 105)) //
) )
{ {
player.sendMessage("Your level does not corespont the zone equivalent."); player.sendMessage("Your level does not correspond the zone equivalent.");
} }
final long currentTime = System.currentTimeMillis();
long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0);
if ((endTime + 18000000) < currentTime)
{
endTime = currentTime + 18000000; // 300 minutes
}
if (endTime > currentTime)
{
if (player.getAdena() > 150000) if (player.getAdena() > 150000)
{ {
player.reduceAdena("TimedHuntingZone", 150000, player, true); player.reduceAdena("TimedHuntingZone", 150000, player, true);
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, System.currentTimeMillis() + 18000000); // 300 minutes }
else
{
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA);
return;
}
switch (_zoneId) switch (_zoneId)
{ {
case 1: // Storm Isle case 1: // Storm Isle
@ -110,11 +112,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
break; break;
} }
} }
player.startTimedHuntingZone(_zoneId, 18000000); // 300 minutes
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, endTime);
player.startTimedHuntingZone(_zoneId, endTime - currentTime);
} }
else else
{ {
player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA); player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_TIME_AVAILABLE_TO_ENTER_THE_HUNTING_ZONE);
} }
} }
} }

42
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sessionzones/TimedHuntingZoneList.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.sessionzones;
import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@ -26,10 +27,12 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
*/ */
public class TimedHuntingZoneList implements IClientOutgoingPacket public class TimedHuntingZoneList implements IClientOutgoingPacket
{ {
private final PlayerInstance _player;
private final boolean _isInTimedHuntingZone; private final boolean _isInTimedHuntingZone;
public TimedHuntingZoneList(PlayerInstance player) public TimedHuntingZoneList(PlayerInstance player)
{ {
_player = player;
_isInTimedHuntingZone = player.isInTimedHuntingZone(); _isInTimedHuntingZone = player.isInTimedHuntingZone();
} }
@ -38,21 +41,29 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet);
final long currentTime = System.currentTimeMillis();
long endTime;
packet.writeD(2); // zone count packet.writeD(2); // zone count
// Isle of Storms // Storm Isle
packet.writeD(1); // required item count packet.writeD(1); // required item count
packet.writeD(57); // item id packet.writeD(57); // item id
packet.writeQ(150000); // item count packet.writeQ(150000); // item count
packet.writeD(1); // reset cycle packet.writeD(1); // reset cycle
packet.writeD(1); // field id packet.writeD(1); // zone id
packet.writeD(100); // min level packet.writeD(100); // min level
packet.writeD(120); // max level packet.writeD(120); // max level
packet.writeD(3600); // remain time base packet.writeD(0); // remain time base?
packet.writeD(3600); // remain time endTime = _player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + 1, 0);
packet.writeD(21600); // remain time max if ((endTime + 18000000) < currentTime)
packet.writeD(18000); // remain refill time {
packet.writeD(18000); // refill time max endTime = currentTime + 18000000;
}
packet.writeD((int) (Math.max(endTime - currentTime, 0)) / 1000); // remain time
packet.writeD(18000); // remain time max
packet.writeD(3600); // remain refill time
packet.writeD(3600); // refill time max
packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated
// Primeval Isle // Primeval Isle
@ -60,14 +71,19 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket
packet.writeD(57); // item id packet.writeD(57); // item id
packet.writeQ(150000); // item count packet.writeQ(150000); // item count
packet.writeD(1); // reset cycle packet.writeD(1); // reset cycle
packet.writeD(6); // field id packet.writeD(6); // zone id
packet.writeD(105); // min level packet.writeD(105); // min level
packet.writeD(120); // max level packet.writeD(120); // max level
packet.writeD(3600); // remain time base packet.writeD(0); // remain time base?
packet.writeD(3600); // remain time endTime = _player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + 6, 0);
packet.writeD(21600); // remain time max if ((endTime + 18000000) < currentTime)
packet.writeD(18000); // remain refill time {
packet.writeD(18000); // refill time max endTime = currentTime + 18000000;
}
packet.writeD((int) (Math.max(endTime - currentTime, 0)) / 1000); // remain time
packet.writeD(18000); // remain time max
packet.writeD(3600); // remain refill time
packet.writeD(3600); // refill time max
packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated
return true; return true;

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java vendored
View File

@ -37,6 +37,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("AbsorbDamage", AbsorbDamage::new); EffectHandler.getInstance().registerHandler("AbsorbDamage", AbsorbDamage::new);
EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new); EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new);
EffectHandler.getInstance().registerHandler("AddHate", AddHate::new); EffectHandler.getInstance().registerHandler("AddHate", AddHate::new);
EffectHandler.getInstance().registerHandler("AddHuntingTime", AddHuntingTime::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionCp", AdditionalPotionCp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionCp", AdditionalPotionCp::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new); EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);

80
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java vendored Normal file
View File

@ -0,0 +1,80 @@
/*
* This file is part of the L2J Mobius project.
*
* 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.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.serverpackets.sessionzones.TimedHuntingZoneList;
/**
* @author Mobius
*/
public class AddHuntingTime extends AbstractEffect
{
private final int _zoneId;
private final long _time;
public AddHuntingTime(StatsSet params)
{
_zoneId = params.getInt("zoneId", 0);
_time = params.getLong("time", 3600000);
}
@Override
public boolean isInstant()
{
return true;
}
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
final PlayerInstance player = effected.getActingPlayer();
if (player == null)
{
return;
}
final long currentTime = System.currentTimeMillis();
if (player.isInTimedHuntingZone(_zoneId))
{
final long increasedTime = _time + player.getTimedHuntingZoneRemainingTime();
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, currentTime + increasedTime);
player.startTimedHuntingZone(_zoneId, increasedTime);
}
else
{
long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0);
if ((endTime + 18000000) < currentTime)
{
endTime = currentTime + 18000000;
}
else if (endTime < currentTime)
{
endTime = currentTime;
}
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, endTime + _time);
}
player.sendPacket(new TimedHuntingZoneList(player));
}
}

17
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91900-91999.xml vendored
View File

@ -565,11 +565,19 @@
<item id="91939" name="Ancient Pirates' Tomb's Prolongating Stone" type="EtcItem"> <item id="91939" name="Ancient Pirates' Tomb's Prolongating Stone" type="EtcItem">
<!-- Prolongs your Ancient Pirates' Tomb's raid for 60 min. --> <!-- Prolongs your Ancient Pirates' Tomb's raid for 60 min. -->
<set name="icon" val="icon.timezone_refill_2" /> <set name="icon" val="icon.timezone_refill_2" />
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" /> <set name="default_action" val="SKILL_REDUCE" />
<set name="material" val="STEEL" /> <set name="material" val="STEEL" />
<set name="weight" val="5" /> <set name="weight" val="5" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_depositable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<skills>
<skill id="50158" level="1" /> <!-- Ancient Pirates' Tomb's Prolongating Stone -->
</skills>
</item> </item>
<item id="91940" name="Heavenly Rift's Prolongating Stone" type="EtcItem"> <item id="91940" name="Heavenly Rift's Prolongating Stone" type="EtcItem">
<!-- Prolongs your Heavenly Rift's raid for 60 min. --> <!-- Prolongs your Heavenly Rift's raid for 60 min. -->
@ -1133,7 +1141,7 @@
<item id="91984" name="Ancient Pirates' Tomb's Prolongating Stone" additionalName="Event" type="EtcItem"> <item id="91984" name="Ancient Pirates' Tomb's Prolongating Stone" additionalName="Event" type="EtcItem">
<!-- Prolongs your Ancient Pirates' Tomb's raid for 60 min. --> <!-- Prolongs your Ancient Pirates' Tomb's raid for 60 min. -->
<set name="icon" val="icon.timezone_refill_2" /> <set name="icon" val="icon.timezone_refill_2" />
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" /> <set name="default_action" val="SKILL_REDUCE" />
<set name="material" val="STEEL" /> <set name="material" val="STEEL" />
<set name="weight" val="5" /> <set name="weight" val="5" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@ -1141,6 +1149,11 @@
<set name="is_depositable" val="false" /> <set name="is_depositable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ItemSkills" />
<set name="immediate_effect" val="true" />
<skills>
<skill id="50178" level="1" /> <!-- Ancient Pirates' Tomb's Prolongating Stone -->
</skills>
</item> </item>
<item id="91985" name="Heavenly Rift's Prolongating Stone" additionalName="Event" type="EtcItem"> <item id="91985" name="Heavenly Rift's Prolongating Stone" additionalName="Event" type="EtcItem">
<!-- Prolongs your Heavenly Rift's raid for 60 min. --> <!-- Prolongs your Heavenly Rift's raid for 60 min. -->

46
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/50100-50199.xml vendored
View File

@ -442,10 +442,27 @@
<reuseDelay>3000</reuseDelay> <reuseDelay>3000</reuseDelay>
</skill> </skill>
<skill id="50158" toLevel="1" name="Ancient Pirates' Tomb's Prolongating Stone"> <skill id="50158" toLevel="1" name="Ancient Pirates' Tomb's Prolongating Stone">
<magicLvl>1</magicLvl>
<operateType>A1</operateType> <operateType>A1</operateType>
<hitTime>500</hitTime> <magicCriticalRate>5</magicCriticalRate>
<coolTime>500</coolTime> <hitCancelTime>0</hitCancelTime>
<reuseDelay>3000</reuseDelay> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>91939</itemConsumeId> <!-- Ancient Pirates' Tomb's Prolongating Stone -->
<conditions>
<condition name="CheckLevel">
<minLevel>78</minLevel>
<maxLevel>999</maxLevel>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="AddHuntingTime">
<zoneId>2</zoneId>
<time>3600000</time>
</effect>
</effects>
</skill> </skill>
<skill id="50159" toLevel="1" name="Heavenly Rift's Prolongating Stone"> <skill id="50159" toLevel="1" name="Heavenly Rift's Prolongating Stone">
<operateType>A1</operateType> <operateType>A1</operateType>
@ -629,10 +646,27 @@
<reuseDelay>3000</reuseDelay> <reuseDelay>3000</reuseDelay>
</skill> </skill>
<skill id="50178" toLevel="1" name="Ancient Pirates' Tomb's Prolongating Stone"> <skill id="50178" toLevel="1" name="Ancient Pirates' Tomb's Prolongating Stone">
<magicLvl>1</magicLvl>
<operateType>A1</operateType> <operateType>A1</operateType>
<hitTime>500</hitTime> <magicCriticalRate>5</magicCriticalRate>
<coolTime>500</coolTime> <hitCancelTime>0</hitCancelTime>
<reuseDelay>3000</reuseDelay> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>91984</itemConsumeId> <!-- Ancient Pirates' Tomb's Prolongating Stone -->
<conditions>
<condition name="CheckLevel">
<minLevel>78</minLevel>
<maxLevel>999</maxLevel>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="AddHuntingTime">
<zoneId>2</zoneId>
<time>3600000</time>
</effect>
</effects>
</skill> </skill>
<skill id="50179" toLevel="1" name="Heavenly Rift's Prolongating Stone"> <skill id="50179" toLevel="1" name="Heavenly Rift's Prolongating Stone">
<operateType>A1</operateType> <operateType>A1</operateType>

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt vendored
View File

@ -7,6 +7,7 @@ AbstractStatEffect: Abstract class for managing stats.
AbstractStatPercentEffect: Abstract class for managing stat percentages. (l2jmobius) AbstractStatPercentEffect: Abstract class for managing stat percentages. (l2jmobius)
Accuracy: P. Accuracy stat. Accuracy: P. Accuracy stat.
AddHate: Instant effect that increases target's hate towards you. AddHate: Instant effect that increases target's hate towards you.
AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius) AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)

310
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd vendored
View File

@ -332,8 +332,8 @@
</xs:element> </xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" /> <xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel"> <xs:element minOccurs="0" name="minLevel">
<xs:complexType> <xs:complexType mixed="true">
<xs:sequence> <xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value"> <xs:element maxOccurs="unbounded" name="value">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
@ -347,8 +347,8 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element minOccurs="0" name="maxLevel"> <xs:element minOccurs="0" name="maxLevel">
<xs:complexType> <xs:complexType mixed="true">
<xs:sequence> <xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value"> <xs:element maxOccurs="unbounded" name="value">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
@ -616,21 +616,6 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="expMultiplier" type="xs:decimal" /> <xs:element name="expMultiplier" type="xs:decimal" />
<xs:element name="halfLethal">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="allowedSkills" type="xs:unsignedShort" /> <xs:element name="allowedSkills" type="xs:unsignedShort" />
<xs:element name="ticks" type="xs:unsignedByte" /> <xs:element name="ticks" type="xs:unsignedByte" />
<xs:element name="percentage"> <xs:element name="percentage">
@ -715,21 +700,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="PLANT_WEAKNESS">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAtkAmount"> <xs:element name="pAtkAmount">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -746,13 +716,13 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="pAtkMode" type="xs:string" /> <xs:element name="pAtkMode" type="xs:string" />
<xs:element name="mAtkAmount"> <xs:element name="PLANT_WEAKNESS">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value"> <xs:element maxOccurs="unbounded" name="value">
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:decimal"> <xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" /> <xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
@ -761,135 +731,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="mAtkMode" type="xs:string" />
<xs:element name="pAccuracyAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAccuracyMode" type="xs:string" />
<xs:element name="mAccuracyAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAccuracyMode" type="xs:string" />
<xs:element name="pAtkSpeedAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pAtkSpeedMode" type="xs:string" />
<xs:element name="mAtkSpeedAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mAtkSpeedMode" type="xs:string" />
<xs:element name="pCritDamageAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pCritDamageMode" type="xs:string" />
<xs:element name="pCritRateAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="pCritRateMode" type="xs:string" />
<xs:element name="mCritDamageAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mpCritDamageMode" type="xs:string" />
<xs:element name="mCritRateAmount">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:decimal">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="mCritRateMode" type="xs:string" />
<xs:element name="HOLD"> <xs:element name="HOLD">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -1063,21 +904,6 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="side" type="xs:string" /> <xs:element name="side" type="xs:string" />
<xs:element name="fullLethal">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PARALYZE"> <xs:element name="PARALYZE">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -1108,6 +934,21 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="BLUNT">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="isAdvanced" type="xs:boolean" /> <xs:element name="isAdvanced" type="xs:boolean" />
<xs:element name="BLEED"> <xs:element name="BLEED">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
@ -1154,21 +995,7 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="max"> <xs:element name="max" type="xs:byte" />
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="armorTYpe"> <xs:element name="armorTYpe">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
@ -1253,6 +1080,36 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="charge">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="fullLethal">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="maxSouls"> <xs:element name="maxSouls">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
@ -1283,22 +1140,8 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="charge">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="npcCount" type="xs:unsignedByte" /> <xs:element name="npcCount" type="xs:unsignedByte" />
<xs:element name="halfLethal" type="xs:unsignedByte" />
<xs:element name="shieldDefPercent" type="xs:unsignedByte" /> <xs:element name="shieldDefPercent" type="xs:unsignedByte" />
<xs:element name="castSkillId" type="xs:unsignedShort" /> <xs:element name="castSkillId" type="xs:unsignedShort" />
<xs:element name="escapeType" type="xs:string" /> <xs:element name="escapeType" type="xs:string" />
@ -1362,21 +1205,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="TWOHANDCROSSBOW">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:unsignedByte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SWORD"> <xs:element name="SWORD">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -1452,36 +1280,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="BLUNT">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DUALBLUNT">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:byte">
<xs:attribute name="level" type="xs:unsignedByte" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DUAL"> <xs:element name="DUAL">
<xs:complexType mixed="true"> <xs:complexType mixed="true">
<xs:sequence minOccurs="0"> <xs:sequence minOccurs="0">
@ -1657,6 +1455,8 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="zoneId" type="xs:unsignedByte" />
<xs:element name="time" type="xs:unsignedInt" />
<xs:element name="reputation" type="xs:unsignedByte" /> <xs:element name="reputation" type="xs:unsignedByte" />
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>

10
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -14194,6 +14194,7 @@ public class PlayerInstance extends Playable
// TODO: Delay window. // TODO: Delay window.
// sendPacket(new TimedHuntingZoneEnter((int) (delay / 60 / 1000))); // sendPacket(new TimedHuntingZoneEnter((int) (delay / 60 / 1000)));
sendMessage("You have " + (delay / 60 / 1000) + " minutes left for this timed zone.");
_timedHuntingZoneFinishTask = ThreadPool.schedule(() -> _timedHuntingZoneFinishTask = ThreadPool.schedule(() ->
{ {
@ -14213,7 +14214,16 @@ public class PlayerInstance extends Playable
{ {
_timedHuntingZoneFinishTask.cancel(true); _timedHuntingZoneFinishTask.cancel(true);
_timedHuntingZoneFinishTask = null; _timedHuntingZoneFinishTask = null;
}
sendPacket(TimedHuntingZoneExit.STATIC_PACKET); sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
} }
public long getTimedHuntingZoneRemainingTime()
{
if ((_timedHuntingZoneFinishTask != null) && !_timedHuntingZoneFinishTask.isCancelled() && !_timedHuntingZoneFinishTask.isDone())
{
return _timedHuntingZoneFinishTask.getDelay(TimeUnit.MILLISECONDS);
}
return 0;
} }
} }

38
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/sessionzones/ExTimedHuntingZoneEnter.java
View File

@ -72,28 +72,30 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
return; return;
} }
if (player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0) > System.currentTimeMillis())
{
if (player.isInTimedHuntingZone())
{
player.sendMessage("You will exceed the max amount of time for the hunting zone, so you cannot add any more time.");
}
else
{
player.sendMessage("You don't have enough time available to enter the hunting zone.");
}
return;
}
if ((_zoneId == 2) && (player.getLevel() < 78)) if ((_zoneId == 2) && (player.getLevel() < 78))
{ {
player.sendMessage("Your level is too low."); player.sendMessage("Your level does not correspond the zone equivalent.");
} }
final long currentTime = System.currentTimeMillis();
long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0);
if ((endTime + 18000000) < currentTime)
{
endTime = currentTime + 18000000; // 300 minutes
}
if (endTime > currentTime)
{
if (player.getAdena() > 10000) if (player.getAdena() > 10000)
{ {
player.reduceAdena("TimedHuntingZone", 10000, player, true); player.reduceAdena("TimedHuntingZone", 10000, player, true);
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, System.currentTimeMillis() + 18000000); // 300 minutes }
else
{
player.sendMessage("Not enough adena.");
return;
}
switch (_zoneId) switch (_zoneId)
{ {
case 2: // Ancient Pirates' Tomb case 2: // Ancient Pirates' Tomb
@ -102,11 +104,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
break; break;
} }
} }
player.startTimedHuntingZone(_zoneId, 18000000); // 300 minutes
player.getVariables().set(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, endTime);
player.startTimedHuntingZone(_zoneId, endTime - currentTime);
} }
else else
{ {
player.sendMessage("Not enough adena."); player.sendMessage("You don't have enough time available to enter the hunting zone.");
} }
} }
} }

23
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sessionzones/TimedHuntingZoneList.java
View File

@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.sessionzones;
import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@ -26,10 +27,12 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
*/ */
public class TimedHuntingZoneList implements IClientOutgoingPacket public class TimedHuntingZoneList implements IClientOutgoingPacket
{ {
private final PlayerInstance _player;
private final boolean _isInTimedHuntingZone; private final boolean _isInTimedHuntingZone;
public TimedHuntingZoneList(PlayerInstance player) public TimedHuntingZoneList(PlayerInstance player)
{ {
_player = player;
_isInTimedHuntingZone = player.isInTimedHuntingZone(); _isInTimedHuntingZone = player.isInTimedHuntingZone();
} }
@ -38,6 +41,9 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet);
final long currentTime = System.currentTimeMillis();
long endTime;
packet.writeD(1); // zone count packet.writeD(1); // zone count
// Ancient Pirates' Tomb // Ancient Pirates' Tomb
@ -45,14 +51,19 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket
packet.writeD(57); // item id packet.writeD(57); // item id
packet.writeQ(10000); // item count packet.writeQ(10000); // item count
packet.writeD(1); // reset cycle packet.writeD(1); // reset cycle
packet.writeD(2); // field id packet.writeD(2); // zone id
packet.writeD(78); // min level packet.writeD(78); // min level
packet.writeD(999); // max level packet.writeD(999); // max level
packet.writeD(3600); // remain time base packet.writeD(0); // remain time base?
packet.writeD(3600); // remain time endTime = _player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + 2, 0);
packet.writeD(21600); // remain time max if ((endTime + 18000000) < currentTime)
packet.writeD(18000); // remain refill time {
packet.writeD(18000); // refill time max endTime = currentTime + 18000000;
}
packet.writeD((int) (Math.max(endTime - currentTime, 0)) / 1000); // remain time
packet.writeD(18000); // remain time max
packet.writeD(3600); // remain refill time
packet.writeD(3600); // refill time max
packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated packet.writeC(_isInTimedHuntingZone ? 0 : 1); // field activated
return true; return true;