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

Timed hunting zone rework.

Browse Source 
Contributed by dontknowdontcare.
This commit is contained in:
MobiusDevelopment
2022-08-23 23:40:25 +00:00
parent e9b5d1101c
commit 035eb24568
141 changed files with 2728 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_08.2_Homunculus/dist/game/data/TimedHuntingZoneData.xml vendored
View File

@@ -5,7 +5,6 @@
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>7200</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>100</minLevel>
@@ -16,7 +15,6 @@
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>7200</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>105</minLevel>
@@ -27,7 +25,6 @@
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>7200</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>107</minLevel>
@@ -38,7 +35,6 @@
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>18000</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>99</minLevel>
@@ -49,7 +45,6 @@
<initialTime>36000</initialTime> <!-- 10 hours -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>36000</maxAddedTime> <!-- 12 hours -->
<remainRefillTime>0</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>110</minLevel>
@@ -62,7 +57,6 @@
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>864000</resetDelay> <!-- 10 days -->
<maxAddedTime>3600</maxAddedTime> <!-- 1 hour -->
<remainRefillTime>0</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
<entryFee>150000</entryFee>
<minLevel>105</minLevel>

36
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java vendored
View File

@@ -25,8 +25,7 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneList;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneChargeResult;
/**
* @author Mobius
@@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect
}
final long currentTime = System.currentTimeMillis();
final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId);
long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId);
if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime()))
{
player.getInventory().addItem("AddHuntingTime effect refund", item.getId(), 1, player, player);
@@ -72,24 +71,37 @@ public class AddHuntingTime extends AbstractEffect
return;
}
final long remainRefill = player.getVariables().getInt(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + _zoneId, holder.getRemainRefillTime());
if ((_time < remainRefill) || (remainRefill == 0))
long remainRefillTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + _zoneId, holder.getRefillTimeMax());
remainRefillTime -= _time / 1000;
if (remainRefillTime < 0)
{
player.getInventory().addItem("AddHuntingTime effect refund", item.getId(), 1, player, player);
player.sendMessage("You cannot exceed the time zone limit.");
player.sendMessage("Time for this zone can be extended no further.");
return;
}
player.getVariables().set(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + _zoneId, remainRefillTime);
final long remainTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, holder.getInitialTime());
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, remainTime + _time);
player.getVariables().set(PlayerVariables.HUNTING_ZONE_REMAIN_REFILL + _zoneId, remainRefill - (_time / 1000));
final long remainTime;
if (player.isInTimedHuntingZone(_zoneId))
{
remainTime = _time + player.getTimedHuntingZoneRemainingTime(_zoneId);
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, remainTime);
player.startTimedHuntingZone(_zoneId, endTime);
player.sendPacket(new TimedHuntingZoneEnter(player, _zoneId));
}
else
{
if ((endTime + holder.getResetDelay()) < currentTime)
{
endTime = currentTime + holder.getInitialTime();
}
else if (endTime < currentTime)
{
endTime = currentTime;
}
remainTime = (endTime - currentTime) + _time;
player.getVariables().set(PlayerVariables.HUNTING_ZONE_TIME + _zoneId, remainTime);
}
player.sendPacket(new TimedHuntingZoneList(player));
player.sendPacket(new TimedHuntingZoneChargeResult(_zoneId, (int) (remainTime / 1000), (int) remainRefillTime));
}
}

5
L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@@ -10,7 +10,6 @@
<xs:element type="xs:int" name="initialTime" />
<xs:element type="xs:int" name="resetDelay" minOccurs="0" />
<xs:element type="xs:int" name="maxAddedTime" />
<xs:element type="xs:int" name="remainRefillTime" minOccurs="0" />
<xs:element type="xs:int" name="refillTimeMax" minOccurs="0" />
<xs:element type="xs:int" name="entryItemId" minOccurs="0" />
<xs:element type="xs:int" name="entryFee" />
@@ -20,6 +19,8 @@
<xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" />
<xs:element type="xs:boolean" name="useWorldPrefix" minOccurs="0" />
<xs:element type="xs:boolean" name="pvpZone" minOccurs="0" />
<xs:element type="xs:boolean" name="noPvpZone" minOccurs="0" />
</xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" />
<xs:attribute type="xs:string" name="name" use="optional" />
@@ -29,4 +30,4 @@
<xs:attribute type="xs:boolean" name="enabled" />
</xs:complexType>
</xs:element>
</xs:schema>
</xs:schema>