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

Adapting Appearance Stone system from L2jServer.

Browse Source
This commit is contained in:
mobius
2015-02-25 17:57:47 +00:00
parent a3c6227823
commit 7068b969e5
41 changed files with 2830 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -161,6 +161,7 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.L2Vehicle;
import com.l2jserver.gameserver.model.actor.appearance.PcAppearance;
import com.l2jserver.gameserver.model.actor.knownlist.PcKnownList;
import com.l2jserver.gameserver.model.actor.request.AbstractRequest;
import com.l2jserver.gameserver.model.actor.stat.PcStat;
import com.l2jserver.gameserver.model.actor.status.PcStatus;
import com.l2jserver.gameserver.model.actor.tasks.player.DismountTask;
@ -759,6 +760,8 @@ public final class L2PcInstance extends L2Playable
private int _expertiseWeaponPenalty = 0;
private int _expertisePenaltyBonus = 0;
private volatile Map<Class<? extends AbstractRequest>, AbstractRequest> _requests;
private boolean _isEnchanting = false;
private int _activeEnchantItemId = ID_NONE;
private int _activeEnchantSupportItemId = ID_NONE;
@ -767,9 +770,6 @@ public final class L2PcInstance extends L2Playable
private int _firstCompoundOID = -1;
private int _secondCompoundOID = -1;
private L2ItemInstance _usingAStone = null;
private L2ItemInstance _appearanceItem = null;
private L2ItemInstance _targetAppearanceItem = null;
private boolean _usingPrimeShop = false;
@ -15044,6 +15044,105 @@ public final class L2PcInstance extends L2Playable
return getServitors().values().stream().mapToInt(L2Summon::getSummonPoints).sum();
}
/**
* @param request
* @return {@code true} if the request was registered successfully, {@code false} otherwise.
*/
public boolean addRequest(AbstractRequest request)
{
if (_requests == null)
{
synchronized (this)
{
if (_requests == null)
{
_requests = new ConcurrentHashMap<>();
}
}
}
return canRequest(request) && (_requests.putIfAbsent(request.getClass(), request) == null);
}
public boolean canRequest(AbstractRequest request)
{
return (_requests != null) && _requests.values().stream().allMatch(request::canWorkWith);
}
/**
* @param clazz
* @return {@code true} if request was successfully removed, {@code false} in case processing set is not created or not containing the request.
*/
public boolean removeRequest(Class<? extends AbstractRequest> clazz)
{
return (_requests != null) && (_requests.remove(clazz) != null);
}
/**
* @param <T>
* @param requestClass
* @return object that is instance of {@code requestClass} param, {@code null} if not instance or not set.
*/
public <T extends AbstractRequest> T getRequest(Class<T> requestClass)
{
return _requests != null ? requestClass.cast(_requests.get(requestClass)) : null;
}
/**
* @return {@code true} if player has any processing request set, {@code false} otherwise.
*/
public boolean hasRequests()
{
return (_requests != null) && !_requests.isEmpty();
}
public boolean hasItemRequest()
{
return (_requests != null) && _requests.values().stream().anyMatch(AbstractRequest::isItemRequest);
}
/**
* @param requestClass
* @param classes
* @return {@code true} if player has the provided request and processing it, {@code false} otherwise.
*/
@SafeVarargs
public final boolean hasRequest(Class<? extends AbstractRequest> requestClass, Class<? extends AbstractRequest>... classes)
{
if (_requests != null)
{
for (Class<? extends AbstractRequest> clazz : classes)
{
if (_requests.containsKey(clazz))
{
return true;
}
}
return _requests.containsKey(requestClass);
}
return false;
}
/**
* @param objectId
* @return {@code true} if item object id is currently in use by some request, {@code false} otherwise.
*/
public boolean isProcessingItem(int objectId)
{
return (_requests != null) && _requests.values().stream().anyMatch(req -> req.isUsing(objectId));
}
/**
* Removing all requests associated with the item object id provided.
* @param objectId
*/
public void removeRequestsThatProcessesItem(int objectId)
{
if (_requests != null)
{
_requests.values().removeIf(req -> req.isUsing(objectId));
}
}
/*
* Return current vitality points in integer format
*/
@ -15094,36 +15193,6 @@ public final class L2PcInstance extends L2Playable
_secondCompoundOID = secondCompoundOID;
}
public L2ItemInstance getUsingAppearanceStone()
{
return _usingAStone;
}
public void setUsingAppearanceStone(L2ItemInstance stone)
{
_usingAStone = stone;
}
public L2ItemInstance getAppearanceItem()
{
return _appearanceItem;
}
public void setAppearanceItem(L2ItemInstance item)
{
_appearanceItem = item;
}
public L2ItemInstance getTargetAppearanceItem()
{
return _targetAppearanceItem;
}
public void setTargetAppearanceItem(L2ItemInstance item)
{
_targetAppearanceItem = item;
}
public void setUsingPrimeShop(boolean isUsing)
{
_usingPrimeShop = isUsing;

94
trunk/java/com/l2jserver/gameserver/model/actor/request/AbstractRequest.java Normal file
View File

@ -0,0 +1,94 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server 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.
*
* L2J Server 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 com.l2jserver.gameserver.model.actor.request;
import java.util.Objects;
import java.util.concurrent.ScheduledFuture;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author UnAfraid
*/
public abstract class AbstractRequest
{
private final L2PcInstance _activeChar;
private volatile long _timestamp = 0;
private volatile boolean _isProcessing;
private ScheduledFuture<?> _timeOutTask;
public AbstractRequest(L2PcInstance activeChar)
{
Objects.requireNonNull(activeChar);
_activeChar = activeChar;
}
public L2PcInstance getActiveChar()
{
return _activeChar;
}
public long getTimestamp()
{
return _timestamp;
}
public void setTimestamp(long timestamp)
{
_timestamp = timestamp;
}
public void scheduleTimeout(long delay)
{
_timeOutTask = ThreadPoolManager.getInstance().scheduleGeneral(this::onTimeout, delay);
}
public boolean isTimeout()
{
return (_timeOutTask != null) && !_timeOutTask.isDone();
}
public boolean isProcessing()
{
return _isProcessing;
}
public boolean setProcessing(boolean isProcessing)
{
return _isProcessing = isProcessing;
}
public boolean canWorkWith(AbstractRequest request)
{
return true;
}
public boolean isItemRequest()
{
return false;
}
public abstract boolean isUsing(int objectId);
public void onTimeout()
{
}
}

75
trunk/java/com/l2jserver/gameserver/model/actor/request/ShapeShiftingItemRequest.java Normal file
View File

@ -0,0 +1,75 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server 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.
*
* L2J Server 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 com.l2jserver.gameserver.model.actor.request;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
/**
* @author Sdw
*/
public class ShapeShiftingItemRequest extends AbstractRequest
{
private L2ItemInstance _appearanceStone;
private L2ItemInstance _appearanceExtractItem;
public ShapeShiftingItemRequest(L2PcInstance activeChar, L2ItemInstance appearanceStone)
{
super(activeChar);
_appearanceStone = appearanceStone;
}
public L2ItemInstance getAppearanceStone()
{
return _appearanceStone;
}
public void setAppearanceStone(L2ItemInstance appearanceStone)
{
_appearanceStone = appearanceStone;
}
public L2ItemInstance getAppearanceExtractItem()
{
return _appearanceExtractItem;
}
public void setAppearanceExtractItem(L2ItemInstance appearanceExtractItem)
{
_appearanceExtractItem = appearanceExtractItem;
}
@Override
public boolean isItemRequest()
{
return true;
}
@Override
public boolean canWorkWith(AbstractRequest request)
{
return !request.isItemRequest();
}
@Override
public boolean isUsing(int objectId)
{
return (objectId > 0) && ((objectId == _appearanceStone.getObjectId()) || (objectId == _appearanceExtractItem.getObjectId()));
}
}