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

- r101 fixed error for friend memo (SQL).

Browse Source 
- Fixed Awakening social action.
 - Implemented configs for awakening to skip or not Seize of Destiny quest and Scroll of Afterlife item.
 - Fixed mentee getting 2 letters with 2 headphones and fixed skill error, when adding mentee.
 - Implemented Change Attribute stone engine.
This commit is contained in:
erlandys56
2015-01-25 11:52:47 +00:00
parent effe7c4033
commit c38b542dda
19 changed files with 573 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15044,7 +15044,11 @@ public final class L2PcInstance extends L2Playable
{
return _vitPoints;
}
return getSubClasses().get(getClassIndex()).getVitalityPoints();
if (getSubClasses().containsKey(getClassIndex()))
{
return getSubClasses().get(getClassIndex()).getVitalityPoints();
}
return _vitPoints;
}
public void setVitalityPoints(int points)
@@ -15054,6 +15058,10 @@ public final class L2PcInstance extends L2Playable
_vitPoints = points;
return;
}
getSubClasses().get(getClassIndex()).setVitalityPoints(points);
if (getSubClasses().containsKey(getClassIndex()))
{
getSubClasses().get(getClassIndex()).setVitalityPoints(points);
}
_vitPoints = points;
}
}

30
trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java
View File

@@ -1153,6 +1153,36 @@ public final class L2ItemInstance extends L2Object
}
}
public void changeAttribute(byte element, int value)
{
if (_elementals == null)
{
_elementals = new Elementals[1];
_elementals[0] = new Elementals(element, value);
}
else
{
Elementals elm = getElemental(element);
if (elm != null)
{
elm.setValue(value);
}
else
{
_elementals = new Elementals[1];
_elementals[0] = new Elementals(element, value);
}
}
try (Connection con = L2DatabaseFactory.getInstance().getConnection())
{
updateItemElements(con);
}
catch (SQLException e)
{
_log.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e);
}
}
/**
* Add elemental attribute to item and save to db
* @param element

6
trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
View File

@@ -1401,13 +1401,13 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
// msg = new RequestHardWareInfo(); (SddddddSddddddddddSS)
break;
case 0xB0:
// msg = new SendChangeAttributeTargetItem();
msg = new SendChangeAttributeTargetItem();
break;
case 0xB1:
// msg = new RequestChangeAttributeItem();
msg = new RequestChangeAttributeItem();
break;
case 0xB2:
// msg = new RequestChangeAttributeCancel();
msg = new RequestChangeAttributeCancel();
break;
case 0xB3:
// msg = new RequestBR_PresentBuyProduct();

48
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeCancel.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* 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 com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author Erlandys
*/
public class RequestChangeAttributeCancel extends L2GameClientPacket
{
private static final String _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B7 RequestChangeAttributeCancel";
@Override
protected void readImpl()
{
}
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
}
player.setActiveEnchantAttrItemId(0);
}
@Override
public String getType()
{
return _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM;
}
}

133
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeAttributeItem.java Normal file
View File

@@ -0,0 +1,133 @@
/*
* 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 com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.PrivateStoreType;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeFail;
import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeItemList;
import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeOk;
import com.l2jserver.gameserver.network.serverpackets.ExStorageMaxCount;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.util.Rnd;
/**
* @author Erlandys
*/
public class RequestChangeAttributeItem extends L2GameClientPacket
{
private static final String _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B7 SendChangeAttributeTargetItem";
private int _attributeOID, _itemOID, _newAttributeID;
@Override
protected void readImpl()
{
_attributeOID = readD();
_itemOID = readD();
_newAttributeID = readD();
}
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
}
L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID);
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_AN_ATTRIBUTE_WHILE_USING_A_PRIVATE_STORE_OR_WORKSHOP);
return;
}
if (player.getActiveTradeList() != null)
{
player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_ATTRIBUTES_WHILE_EXCHANGING);
return;
}
if (!item.isWeapon())
{
player.setActiveEnchantAttrItemId(0);
player.sendPacket(new ExChangeAttributeItemList(player, _attributeOID));
return;
}
if (_newAttributeID == -1)
{
player.setActiveEnchantAttrItemId(0);
player.sendPacket(new ExChangeAttributeItemList(player, _attributeOID));
return;
}
L2ItemInstance attribute = player.getInventory().getItemByObjectId(_attributeOID);
player.getInventory().destroyItem("ChangingAttribute", _attributeOID, 1, player, null);
if (Rnd.get(100) < Config.CHANGE_CHANCE_ELEMENT)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_SUCCESSFULLY_CHANGED_TO_S3_ATTRIBUTE);
sm.addItemName(item);
sm.addElemental(item.getAttackElementType());
sm.addElemental(_newAttributeID);
item.changeAttribute((byte) _newAttributeID, item.getAttackElementPower());
if (item.isEquipped())
{
item.updateElementAttrBonus(player);
}
player.sendPacket(sm);
player.sendPacket(new ExChangeAttributeOk());
player.sendPacket(new UserInfo(player));
}
else
{
player.sendPacket(new ExChangeAttributeFail());
player.sendPacket(SystemMessageId.CHANGING_ATTRIBUTES_HAS_BEEN_FAILED);
}
// send packets
player.sendPacket(new ExStorageMaxCount(player));
InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(item);
if (player.getInventory().getItemByObjectId(_attributeOID) == null)
{
iu.addRemovedItem(attribute);
}
else
{
iu.addModifiedItem(attribute);
}
player.sendPacket(iu);
player.setActiveEnchantAttrItemId(0);
}
@Override
public String getType()
{
return _C__D0_B7_SENDCHANGEATTRIBUTETARGETITEM;
}
}

59
trunk/java/com/l2jserver/gameserver/network/clientpackets/SendChangeAttributeTargetItem.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* 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 com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.serverpackets.ExChangeAttributeInfo;
/**
* @author Erlandys
*/
public class SendChangeAttributeTargetItem extends L2GameClientPacket
{
private static final String _C__D0_B0_SENDCHANGEATTRIBUTETARGETITEM = "[C] D0:B0 SendChangeAttributeTargetItem";
int _elementOID;
int _itemOID;
@Override
protected void readImpl()
{
_elementOID = readD();
_itemOID = readD();
}
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
if (player == null)
{
return;
}
L2ItemInstance item = player.getInventory().getItemByObjectId(_itemOID);
if (item == null)
{
return;
}
player.sendPacket(new ExChangeAttributeInfo(_elementOID, _itemOID, item.getAttackElementType()));
}
@Override
public String getType()
{
return _C__D0_B0_SENDCHANGEATTRIBUTETARGETITEM;
}
}

2
trunk/java/com/l2jserver/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
View File

@@ -85,7 +85,7 @@ public class ConfirmMenteeAdd extends L2GameClientPacket
MentorManager.getInstance().addMentor(mentor.getObjectId(), mentee.getObjectId());
// Notify to scripts
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor, mentee);
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentee);
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee));
mentor.sendPacket(new ExMentorList(mentor));

32
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeFail.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* 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 com.l2jserver.gameserver.network.serverpackets;
/**
* @author Erlandys
*/
public class ExChangeAttributeFail extends L2GameServerPacket
{
public ExChangeAttributeFail()
{
}
@Override
protected void writeImpl()
{
writeC(0xFE);
writeH(0x116);
}
}

62
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeInfo.java Normal file
View File

@@ -0,0 +1,62 @@
/*
* 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 com.l2jserver.gameserver.network.serverpackets;
/**
* @author Erlandys
*/
public class ExChangeAttributeInfo extends L2GameServerPacket
{
private final int itemOID;
private final int attributeOID;
private final int attributes;
public ExChangeAttributeInfo(int _attributeOID, int _itemOID, int _attribute)
{
itemOID = _itemOID;
attributeOID = _attributeOID;
switch (_attribute)
{
case 0:
attributes = -2;
break;
case 1:
attributes = -3;
break;
case 2:
attributes = -5;
break;
case 3:
attributes = -9;
break;
case 4:
attributes = -17;
break;
default:
attributes = -33;
break;
}
}
@Override
protected void writeImpl()
{
writeC(0xFE);
writeH(0x114);
writeD(attributeOID);
writeD(attributes);
}
}

62
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeItemList.java Normal file
View File

@@ -0,0 +1,62 @@
/*
* 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.network.serverpackets;
import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
/**
* @author Erlandys
*/
public class ExChangeAttributeItemList extends AbstractItemPacket
{
private final ArrayList<L2ItemInstance> _itemsList;
private final int _itemOID;
public ExChangeAttributeItemList(L2PcInstance player, int itemOID)
{
_itemsList = new ArrayList<>();
for (L2ItemInstance item : player.getInventory().getItems())
{
if (item.isWeapon())
{
if (item.getAttackElementPower() > 0)
{
_itemsList.add(item);
}
}
}
_itemOID = itemOID;
}
@Override
protected void writeImpl()
{
writeC(0xFE);
writeH(0x113);
writeD(_itemOID);
writeD(_itemsList.size());
for (L2ItemInstance item : _itemsList)
{
writeItem(item);
}
}
}

32
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExChangeAttributeOk.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* 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 com.l2jserver.gameserver.network.serverpackets;
/**
* @author Erlandys
*/
public class ExChangeAttributeOk extends L2GameServerPacket
{
public ExChangeAttributeOk()
{
}
@Override
protected void writeImpl()
{
writeC(0xFE);
writeH(0x115);
}
}