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

Adjustments to match seed XML values with data holder.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-27 01:30:57 +00:00
parent fc864fbcca
commit 053319b432
4 changed files with 297 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java
View File

@@ -77,7 +77,7 @@ public class ManorSeedData implements IXmlReader
}
final int id = set.getInt("id");
_seeds.put(id, new SeedDataHolder(id, set.getInt("level"), set.getInt("cropId"), set.getInt("matureId"), set.getInt("reward1"), set.getInt("reward2"), set.getInt("castleId"), set.getBoolean("isAlternative"), set.getInt("seedsLimit"), set.getInt("cropsLimit")));
_seeds.put(id, new SeedDataHolder(id, set.getInt("level"), set.getInt("cropId"), set.getInt("matureId"), set.getInt("reward1"), set.getInt("reward2"), set.getInt("castleId"), set.getBoolean("isAlternative"), set.getInt("seedLimit"), set.getInt("cropLimit")));
}
}
}
@@ -87,9 +87,9 @@ public class ManorSeedData implements IXmlReader
final List<Integer> crops = new ArrayList<>();
for (SeedDataHolder seed : _seeds.values())
{
if (!crops.contains(seed.getCrop()) && (seed.getCrop() != 0))
if (!crops.contains(seed.getCropId()) && (seed.getCropId() != 0))
{
crops.add(seed.getCrop());
crops.add(seed.getCropId());
}
}
return crops;
@@ -109,7 +109,7 @@ public class ManorSeedData implements IXmlReader
{
for (SeedDataHolder seed : _seeds.values())
{
if (seed.getCrop() == cropId)
if (seed.getCropId() == cropId)
{
return getSeedBasicPrice(seed.getId());
}
@@ -131,9 +131,9 @@ public class ManorSeedData implements IXmlReader
{
for (SeedDataHolder seed : _seeds.values())
{
if (seed.getCrop() == cropId)
if (seed.getCropId() == cropId)
{
return seed.getMature();
return seed.getMatureId();
}
}
return 0;
@@ -174,7 +174,7 @@ public class ManorSeedData implements IXmlReader
{
for (SeedDataHolder seed : _seeds.values())
{
if (seed.getCrop() == cropId)
if (seed.getCropId() == cropId)
{
return seed.getLevel();
}
@@ -209,7 +209,7 @@ public class ManorSeedData implements IXmlReader
final SeedDataHolder seed = _seeds.get(seedId);
if (seed != null)
{
return seed.getCrop();
return seed.getCropId();
}
return -1;
}
@@ -218,7 +218,7 @@ public class ManorSeedData implements IXmlReader
{
for (SeedDataHolder seed : _seeds.values())
{
if (seed.getCrop() == cropId)
if (seed.getCropId() == cropId)
{
return seed.getReward(type); // there can be several seeds with same crop, but reward should be the same for all
}
@@ -246,9 +246,9 @@ public class ManorSeedData implements IXmlReader
final List<Integer> crops = new ArrayList<>();
for (SeedDataHolder seed : _seeds.values())
{
if ((seed.getManorId() == castleId) && !crops.contains(seed.getCrop()))
if ((seed.getCastleId() == castleId) && !crops.contains(seed.getCropId()))
{
crops.add(seed.getCrop());
crops.add(seed.getCropId());
}
}
return crops;
@@ -264,7 +264,7 @@ public class ManorSeedData implements IXmlReader
final List<Integer> seedsID = new ArrayList<>();
for (SeedDataHolder seed : _seeds.values())
{
if ((seed.getManorId() == castleId) && !seedsID.contains(seed.getId()))
if ((seed.getCastleId() == castleId) && !seedsID.contains(seed.getId()))
{
seedsID.add(seed.getId());
}
@@ -282,7 +282,7 @@ public class ManorSeedData implements IXmlReader
final SeedDataHolder seed = _seeds.get(seedId);
if (seed != null)
{
return seed.getManorId();
return seed.getCastleId();
}
return 0;
}
@@ -301,7 +301,7 @@ public class ManorSeedData implements IXmlReader
{
for (SeedDataHolder seed : _seeds.values())
{
if (seed.getCrop() == cropId)
if (seed.getCropId() == cropId)
{
return seed.getCropLimit();
}

50
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/SeedDataHolder.java
View File

@@ -24,33 +24,33 @@ import org.l2jmobius.Config;
public class SeedDataHolder
{
private final int _id;
private final int _level; // seed level
private final int _crop; // crop type
private final int _mature; // mature crop type
private final int _type1;
private final int _type2;
private final int _manorId; // id of manor (castle id) where seed can be farmed
private final int _level;
private final int _cropId;
private final int _matureId;
private final int _reward1;
private final int _reward2;
private final int _castleId;
private final boolean _isAlternative;
private final int _limitSeeds;
private final int _limitCrops;
private final int _seedLimit;
private final int _cropLimit;
public SeedDataHolder(int id, int level, int crop, int mature, int type1, int type2, int manorId, boolean isAlternative, int limitSeeds, int limitCrops)
public SeedDataHolder(int id, int level, int crop, int mature, int reward1, int reward2, int castleId, boolean isAlternative, int seedLimit, int cropLimit)
{
_id = id;
_level = level;
_crop = crop;
_mature = mature;
_type1 = type1;
_type2 = type2;
_manorId = manorId;
_cropId = crop;
_matureId = mature;
_reward1 = reward1;
_reward2 = reward2;
_castleId = castleId;
_isAlternative = isAlternative;
_limitSeeds = limitSeeds;
_limitCrops = limitCrops;
_seedLimit = seedLimit;
_cropLimit = cropLimit;
}
public int getManorId()
public int getCastleId()
{
return _manorId;
return _castleId;
}
public int getId()
@@ -58,19 +58,19 @@ public class SeedDataHolder
return _id;
}
public int getCrop()
public int getCropId()
{
return _crop;
return _cropId;
}
public int getMature()
public int getMatureId()
{
return _mature;
return _matureId;
}
public int getReward(int type)
{
return type == 1 ? _type1 : _type2;
return type == 1 ? _reward1 : _reward2;
}
public int getLevel()
@@ -85,11 +85,11 @@ public class SeedDataHolder
public int getSeedLimit()
{
return _limitSeeds * Config.RATE_DROP_MANOR;
return _seedLimit * Config.RATE_DROP_MANOR;
}
public int getCropLimit()
{
return _limitCrops * Config.RATE_DROP_MANOR;
return _cropLimit * Config.RATE_DROP_MANOR;
}
}