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

New artifact enchant system adjustments and related cleanups.

Browse Source 
Contributed by Fakee.
This commit is contained in:
MobiusDevelopment
2022-11-20 05:47:44 +00:00
parent 36cfb2919d
commit b23c1aeec5
28 changed files with 106 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 2) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 2; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;

21
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
View File

@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class RequestExTryEnchantArtifact implements ClientPacket public class RequestExTryEnchantArtifact implements ClientPacket
{ {
private static final int[] ENCHANT_CHANCES = private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
return; return;
} }
int minIngridientEnchant = -1; int ingredientEnchant = -1;
if (enchantLevel <= 3) if (enchantLevel <= 3)
{ {
minIngridientEnchant = 0; ingredientEnchant = 0;
} }
else if (enchantLevel <= 6) else if (enchantLevel <= 6)
{ {
minIngridientEnchant = 1; ingredientEnchant = 1;
} }
else if (enchantLevel <= 9) else if (enchantLevel <= 9)
{ {
minIngridientEnchant = 3; ingredientEnchant = 3;
} }
if (minIngridientEnchant == -1) if (ingredientEnchant == -1)
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
for (int objectId : _ingredients) for (int objectId : _ingredients)
{ {
final Item ingridient = player.getInventory().getItemByObjectId(objectId); final Item ingredient = player.getInventory().getItemByObjectId(objectId);
if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getEnchantLevel() > ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
{ {
player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
return; return;
} }
player.destroyItem("Artifact", ingridient, 1, player, true); player.destroyItem("Artifact", ingredient, 1, player, true);
} }
if (Rnd.get(100) < chance) if (Rnd.get(100) < chance)

3
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 29.09.2019
*/ */
public class RequestExPledgeMissionInfo implements ClientPacket public class RequestExPledgeMissionInfo implements ClientPacket
{ {

5
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
View File

@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.ServerPackets;
/** /**
* @author Bonux (bonuxq@gmail.com) * @author Bonux
* @date 09.09.2019 */
**/
public class ExTryEnchantArtifactResult extends ServerPacket public class ExTryEnchantArtifactResult extends ServerPacket
{ {
public static final int SUCCESS = 0; public static final int SUCCESS = 0;

5
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/** /**
* @author Bonux (bonuxq@gmail.com), NasSeKa * @author Bonux, NasSeKa
* @date 29.09.2019 */
**/
public class ExPledgeMissionRewardCount extends ServerPacket public class ExPledgeMissionRewardCount extends ServerPacket
{ {
private final int _doneMissionsCount; private final int _doneMissionsCount;