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

Organized henna data related classes.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-06-28 12:37:06 +00:00
parent 00f8629732
commit f46bd54faa
10 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/CombinationDye.xml → L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/hennaCombinations.xml vendored
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/CombinationDye.xsd">
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/hennaCombinations.xsd">
<henna dyeId="337" itemTwo="96623" commission="300000" chance="50"> <!-- Potential of STR <STR+1> -->
<reward dyeId="338" type="ON_SUCCESS" />
<reward dyeId="337" type="ON_FAILURE" />

0
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/CombinationDye.xsd → L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/hennaCombinations.xsd vendored
View File

6
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/GameServer.java
View File

@ -57,7 +57,6 @@ import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.data.xml.ClanRewardData;
import org.l2jmobius.gameserver.data.xml.ClassListData;
import org.l2jmobius.gameserver.data.xml.CollectionData;
import org.l2jmobius.gameserver.data.xml.CombinationDyeData;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.data.xml.CubicData;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
@ -76,7 +75,9 @@ import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.data.xml.FenceData;
import org.l2jmobius.gameserver.data.xml.FishingData;
import org.l2jmobius.gameserver.data.xml.HennaCombinationData;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.data.xml.HennaPatternPotentialData;
import org.l2jmobius.gameserver.data.xml.HitConditionBonusData;
import org.l2jmobius.gameserver.data.xml.InitialEquipmentData;
import org.l2jmobius.gameserver.data.xml.InitialShortcutData;
@ -295,7 +296,6 @@ public class GameServer
BuyListData.getInstance();
MultisellData.getInstance();
CombinationItemsData.getInstance();
CombinationDyeData.getInstance();
EquipmentUpgradeData.getInstance();
EquipmentUpgradeNormalData.getInstance();
AgathionData.getInstance();
@ -304,6 +304,8 @@ public class GameServer
ArmorSetData.getInstance();
FishingData.getInstance();
HennaData.getInstance();
HennaCombinationData.getInstance();
HennaPatternPotentialData.getInstance();
PrimeShopData.getInstance();
LimitShopData.getInstance();
LimitShopCraftData.getInstance();

14
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CombinationDyeData.java → L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/HennaCombinationData.java
View File

@ -27,19 +27,19 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.item.combination.CombinationItemType;
import org.l2jmobius.gameserver.model.item.henna.CombinationHennaReward;
import org.l2jmobius.gameserver.model.item.henna.CombinationHenna;
import org.l2jmobius.gameserver.model.item.henna.CombinationHennaReward;
/**
* @author Index
*/
public class CombinationDyeData implements IXmlReader
public class HennaCombinationData implements IXmlReader
{
private static final Logger LOGGER = Logger.getLogger(CombinationDyeData.class.getName());
private static final Logger LOGGER = Logger.getLogger(HennaCombinationData.class.getName());
private final List<CombinationHenna> _henna = new ArrayList<>();
protected CombinationDyeData()
protected HennaCombinationData()
{
load();
}
@ -48,7 +48,7 @@ public class CombinationDyeData implements IXmlReader
public synchronized void load()
{
_henna.clear();
parseDatapackFile("data/CombinationDye.xml");
parseDatapackFile("data/stats/hennaCombinations.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _henna.size() + " henna combinations.");
}
@ -98,13 +98,13 @@ public class CombinationDyeData implements IXmlReader
return null;
}
public static final CombinationDyeData getInstance()
public static final HennaCombinationData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final CombinationDyeData INSTANCE = new CombinationDyeData();
protected static final HennaCombinationData INSTANCE = new HennaCombinationData();
}
}

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/newhenna/RequestNewHennaCompose.java
View File

@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.newhenna;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.CombinationDyeData;
import org.l2jmobius.gameserver.data.xml.HennaCombinationData;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@ -67,7 +67,7 @@ public class RequestNewHennaCompose implements IClientIncomingPacket
}
final Henna henna = player.getHenna(_slotOneIndex);
final CombinationHenna combinationHennas = CombinationDyeData.getInstance().getByHenna(henna.getDyeId());
final CombinationHenna combinationHennas = HennaCombinationData.getInstance().getByHenna(henna.getDyeId());
if (combinationHennas == null)
{
player.sendPacket(new NewHennaPotenCompose(henna.getDyeId(), -1, false));

2
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CombinationDye.xml → L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/hennaCombinations.xml vendored
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/CombinationDye.xsd">
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/hennaCombinations.xsd">
<henna dyeId="337" itemTwo="96623" commission="300000" chance="50"> <!-- Potential of STR <STR+1> -->
<reward dyeId="338" type="ON_SUCCESS" />
<reward dyeId="337" type="ON_FAILURE" />

0
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/CombinationDye.xsd → L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/hennaCombinations.xsd vendored
View File

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/GameServer.java
View File

@ -57,7 +57,6 @@ import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.data.xml.ClanRewardData;
import org.l2jmobius.gameserver.data.xml.ClassListData;
import org.l2jmobius.gameserver.data.xml.CollectionData;
import org.l2jmobius.gameserver.data.xml.CombinationDyeData;
import org.l2jmobius.gameserver.data.xml.CombinationItemsData;
import org.l2jmobius.gameserver.data.xml.CubicData;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
@ -76,7 +75,9 @@ import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.data.xml.FakePlayerData;
import org.l2jmobius.gameserver.data.xml.FenceData;
import org.l2jmobius.gameserver.data.xml.FishingData;
import org.l2jmobius.gameserver.data.xml.HennaCombinationData;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.data.xml.HennaPatternPotentialData;
import org.l2jmobius.gameserver.data.xml.HitConditionBonusData;
import org.l2jmobius.gameserver.data.xml.InitialEquipmentData;
import org.l2jmobius.gameserver.data.xml.InitialShortcutData;
@ -295,7 +296,6 @@ public class GameServer
BuyListData.getInstance();
MultisellData.getInstance();
CombinationItemsData.getInstance();
CombinationDyeData.getInstance();
EquipmentUpgradeData.getInstance();
EquipmentUpgradeNormalData.getInstance();
AgathionData.getInstance();
@ -304,6 +304,8 @@ public class GameServer
ArmorSetData.getInstance();
FishingData.getInstance();
HennaData.getInstance();
HennaCombinationData.getInstance();
HennaPatternPotentialData.getInstance();
PrimeShopData.getInstance();
LimitShopData.getInstance();
LimitShopCraftData.getInstance();

14
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/CombinationDyeData.java → L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/HennaCombinationData.java
View File

@ -27,19 +27,19 @@ import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.item.combination.CombinationItemType;
import org.l2jmobius.gameserver.model.item.henna.CombinationHennaReward;
import org.l2jmobius.gameserver.model.item.henna.CombinationHenna;
import org.l2jmobius.gameserver.model.item.henna.CombinationHennaReward;
/**
* @author Index
*/
public class CombinationDyeData implements IXmlReader
public class HennaCombinationData implements IXmlReader
{
private static final Logger LOGGER = Logger.getLogger(CombinationDyeData.class.getName());
private static final Logger LOGGER = Logger.getLogger(HennaCombinationData.class.getName());
private final List<CombinationHenna> _henna = new ArrayList<>();
protected CombinationDyeData()
protected HennaCombinationData()
{
load();
}
@ -48,7 +48,7 @@ public class CombinationDyeData implements IXmlReader
public synchronized void load()
{
_henna.clear();
parseDatapackFile("data/CombinationDye.xml");
parseDatapackFile("data/stats/hennaCombinations.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _henna.size() + " henna combinations.");
}
@ -98,13 +98,13 @@ public class CombinationDyeData implements IXmlReader
return null;
}
public static final CombinationDyeData getInstance()
public static final HennaCombinationData getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final CombinationDyeData INSTANCE = new CombinationDyeData();
protected static final HennaCombinationData INSTANCE = new HennaCombinationData();
}
}

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/newhenna/RequestNewHennaCompose.java
View File

@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.newhenna;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.CombinationDyeData;
import org.l2jmobius.gameserver.data.xml.HennaCombinationData;
import org.l2jmobius.gameserver.data.xml.HennaData;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
@ -67,7 +67,7 @@ public class RequestNewHennaCompose implements IClientIncomingPacket
}
final Henna henna = player.getHenna(_slotOneIndex);
final CombinationHenna combinationHennas = CombinationDyeData.getInstance().getByHenna(henna.getDyeId());
final CombinationHenna combinationHennas = HennaCombinationData.getInstance().getByHenna(henna.getDyeId());
if (combinationHennas == null)
{
player.sendPacket(new NewHennaPotenCompose(henna.getDyeId(), -1, false));