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

Renamed SeedData to ManorSeedData.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-27 01:20:46 +00:00
parent 2ac78a0934
commit fc864fbcca
17 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C6_Interlude/dist/game/data/Seeds.xml → L2J_Mobius_C6_Interlude/dist/game/data/ManorSeeds.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<!-- This file contains all special info about seeds. --> <!-- This file contains all special info about seeds. -->
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/Seeds.xsd"> <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ManorSeeds.xsd">
<seed id="5016" level="10" cropId="5073" matureId="5103" reward1="1864" reward2="1878" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Dark Coda --> <seed id="5016" level="10" cropId="5073" matureId="5103" reward1="1864" reward2="1878" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Dark Coda -->
<seed id="5017" level="13" cropId="5068" matureId="5098" reward1="1865" reward2="1879" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Red Coda --> <seed id="5017" level="13" cropId="5068" matureId="5098" reward1="1865" reward2="1879" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Red Coda -->
<seed id="5018" level="16" cropId="5065" matureId="5095" reward1="1866" reward2="1874" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Chilly Coda --> <seed id="5018" level="16" cropId="5065" matureId="5095" reward1="1866" reward2="1874" castleId="1" isAlternative="false" seedsLimit="8100" cropsLimit="9000"/> <!-- Seed: Chilly Coda -->

0
L2J_Mobius_C6_Interlude/dist/game/data/xsd/Seeds.xsd → L2J_Mobius_C6_Interlude/dist/game/data/xsd/ManorSeeds.xsd vendored
View File

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -70,7 +70,7 @@ import org.l2jmobius.gameserver.datatables.xml.FenceData;
import org.l2jmobius.gameserver.datatables.xml.FishData; import org.l2jmobius.gameserver.datatables.xml.FishData;
import org.l2jmobius.gameserver.datatables.xml.HennaData; import org.l2jmobius.gameserver.datatables.xml.HennaData;
import org.l2jmobius.gameserver.datatables.xml.RecipeData; import org.l2jmobius.gameserver.datatables.xml.RecipeData;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.datatables.xml.StaticObjectData; import org.l2jmobius.gameserver.datatables.xml.StaticObjectData;
import org.l2jmobius.gameserver.datatables.xml.SummonItemData; import org.l2jmobius.gameserver.datatables.xml.SummonItemData;
import org.l2jmobius.gameserver.datatables.xml.ZoneData; import org.l2jmobius.gameserver.datatables.xml.ZoneData;
@@ -339,7 +339,7 @@ public class GameServer
} }
Util.printSection("Manor"); Util.printSection("Manor");
SeedData.getInstance(); ManorSeedData.getInstance();
CastleManorManager.getInstance(); CastleManorManager.getInstance();
Util.printSection("Castles"); Util.printSection("Castles");

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/SeedData.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ManorSeedData.java
View File

@@ -37,13 +37,13 @@ import org.l2jmobius.gameserver.model.items.Item;
* This class loads and stores manor seed information. * This class loads and stores manor seed information.
* @author l3x, Mobius * @author l3x, Mobius
*/ */
public class SeedData implements IXmlReader public class ManorSeedData implements IXmlReader
{ {
private static final Logger LOGGER = Logger.getLogger(SeedData.class.getName()); private static final Logger LOGGER = Logger.getLogger(ManorSeedData.class.getName());
private static Map<Integer, SeedDataHolder> _seeds = new ConcurrentHashMap<>(); private static Map<Integer, SeedDataHolder> _seeds = new ConcurrentHashMap<>();
protected SeedData() protected ManorSeedData()
{ {
load(); load();
} }
@@ -52,7 +52,7 @@ public class SeedData implements IXmlReader
public void load() public void load()
{ {
_seeds.clear(); _seeds.clear();
parseDatapackFile("data/Seeds.xml"); parseDatapackFile("data/ManorSeeds.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _seeds.size() + " seeds."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _seeds.size() + " seeds.");
} }
@@ -309,13 +309,13 @@ public class SeedData implements IXmlReader
return 0; return 0;
} }
public static SeedData getInstance() public static ManorSeedData getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
} }
private static class SingletonHolder private static class SingletonHolder
{ {
protected static final SeedData INSTANCE = new SeedData(); protected static final ManorSeedData INSTANCE = new ManorSeedData();
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers;
import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
@@ -363,7 +363,7 @@ public class Seed implements IItemHandler
private boolean areaValid(int castleId) private boolean areaValid(int castleId)
{ {
return SeedData.getInstance().getCastleIdForSeed(_seedId) == castleId; return ManorSeedData.getInstance().getCastleIdForSeed(_seedId) == castleId;
} }
@Override @Override

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java
View File

@@ -20,7 +20,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.ISkillHandler;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.Skill.SkillType;
@@ -140,11 +140,11 @@ public class Sow implements ISkillHandler
} }
// TODO: check all the chances // TODO: check all the chances
int basicSuccess = (SeedData.getInstance().isAlternative(_seedId) ? 20 : 90); int basicSuccess = (ManorSeedData.getInstance().isAlternative(_seedId) ? 20 : 90);
int minlevelSeed = 0; int minlevelSeed = 0;
int maxlevelSeed = 0; int maxlevelSeed = 0;
minlevelSeed = SeedData.getInstance().getSeedMinLevel(_seedId); minlevelSeed = ManorSeedData.getInstance().getSeedMinLevel(_seedId);
maxlevelSeed = SeedData.getInstance().getSeedMaxLevel(_seedId); maxlevelSeed = ManorSeedData.getInstance().getSeedMaxLevel(_seedId);
final int levelPlayer = _player.getLevel(); // Attacker Level final int levelPlayer = _player.getLevel(); // Attacker Level
final int levelTarget = _target.getLevel(); // taret Level final int levelTarget = _target.getLevel(); // taret Level

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.model.ClanWarehouse; import org.l2jmobius.gameserver.model.ClanWarehouse;
import org.l2jmobius.gameserver.model.ItemContainer; import org.l2jmobius.gameserver.model.ItemContainer;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
@@ -328,7 +328,7 @@ public class CastleManorManager
if (count >= 1) if (count >= 1)
{ {
cwh.addItem("Manor", SeedData.getInstance().getMatureCrop(crop.getId()), count, null, null); cwh.addItem("Manor", ManorSeedData.getInstance().getMatureCrop(crop.getId()), count, null, null);
} }
} }
@@ -435,7 +435,7 @@ public class CastleManorManager
private List<SeedProduction> getNewSeedsList(int castleId) private List<SeedProduction> getNewSeedsList(int castleId)
{ {
final List<SeedProduction> seeds = new ArrayList<>(); final List<SeedProduction> seeds = new ArrayList<>();
final List<Integer> seedsIds = SeedData.getInstance().getSeedsForCastle(castleId); final List<Integer> seedsIds = ManorSeedData.getInstance().getSeedsForCastle(castleId);
for (int sd : seedsIds) for (int sd : seedsIds)
{ {
seeds.add(new SeedProduction(sd)); seeds.add(new SeedProduction(sd));
@@ -446,7 +446,7 @@ public class CastleManorManager
private List<CropProcure> getNewCropsList(int castleId) private List<CropProcure> getNewCropsList(int castleId)
{ {
final List<CropProcure> crops = new ArrayList<>(); final List<CropProcure> crops = new ArrayList<>();
final List<Integer> cropsIds = SeedData.getInstance().getCropsForCastle(castleId); final List<Integer> cropsIds = ManorSeedData.getInstance().getCropsForCastle(castleId);
for (int cr : cropsIds) for (int cr : cropsIds)
{ {
crops.add(new CropProcure(cr)); crops.add(new CropProcure(cr));

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.ai.FortSiegeGuardAI; import org.l2jmobius.gameserver.ai.FortSiegeGuardAI;
import org.l2jmobius.gameserver.ai.SiegeGuardAI; import org.l2jmobius.gameserver.ai.SiegeGuardAI;
import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropCategory;
@@ -3157,7 +3157,7 @@ public class Attackable extends NpcInstance
} }
final int diff = getLevel() - (SeedData.getInstance().getSeedLevel(_seedType) - 5); final int diff = getLevel() - (ManorSeedData.getInstance().getSeedLevel(_seedType) - 5);
// hi-lvl mobs bonus // hi-lvl mobs bonus
if (diff > 0) if (diff > 0)
@@ -3167,7 +3167,7 @@ public class Attackable extends NpcInstance
final List<RewardItem> harvested = new ArrayList<>(); final List<RewardItem> harvested = new ArrayList<>();
harvested.add(new RewardItem(SeedData.getInstance().getCropType(_seedType), count * Config.RATE_DROP_MANOR)); harvested.add(new RewardItem(ManorSeedData.getInstance().getCropType(_seedType), count * Config.RATE_DROP_MANOR));
_harvestItems = harvested.toArray(new RewardItem[harvested.size()]); _harvestItems = harvested.toArray(new RewardItem[harvested.size()]);
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java
View File

@@ -31,7 +31,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.sql.ClanTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData; import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
@@ -870,7 +870,7 @@ public class Castle
{ {
for (SeedProduction seed : production) for (SeedProduction seed : production)
{ {
total += SeedData.getInstance().getSeedBuyPrice(seed.getId()) * seed.getStartProduce(); total += ManorSeedData.getInstance().getSeedBuyPrice(seed.getId()) * seed.getStartProduce();
} }
} }

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.ManorManagerInstance;
@@ -132,7 +132,7 @@ public class RequestBuyProcure extends GameClientPacket
return; return;
} }
final Item template = ItemTable.getInstance().getTemplate(SeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward())); final Item template = ItemTable.getInstance().getTemplate(ManorSeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward()));
weight += count * template.getWeight(); weight += count * template.getWeight();
if (!template.isStackable()) if (!template.isStackable())
@@ -171,7 +171,7 @@ public class RequestBuyProcure extends GameClientPacket
count = 0; count = 0;
} }
final int rewardItemId = SeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward()); final int rewardItemId = ManorSeedData.getInstance().getRewardItem(itemId, manor.getCastle().getCrop(itemId, CastleManorManager.PERIOD_CURRENT).getReward());
int rewardItemCount = 1; // Manor.getInstance().getRewardAmount(itemId, manor.getCastle().getCropReward(itemId)); int rewardItemCount = 1; // Manor.getInstance().getRewardAmount(itemId, manor.getCastle().getCropReward(itemId));

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
@@ -136,7 +136,7 @@ public class RequestProcureCropList extends GameClientPacket
try try
{ {
final CropProcure crop = CastleManager.getInstance().getCastleById(manorId).getCrop(itemId, CastleManorManager.PERIOD_CURRENT); final CropProcure crop = CastleManager.getInstance().getCastleById(manorId).getCrop(itemId, CastleManorManager.PERIOD_CURRENT);
final int rewardItemId = SeedData.getInstance().getRewardItem(itemId, crop.getReward()); final int rewardItemId = ManorSeedData.getInstance().getRewardItem(itemId, crop.getReward());
final Item template = ItemTable.getInstance().getTemplate(rewardItemId); final Item template = ItemTable.getInstance().getTemplate(rewardItemId);
weight += count * template.getWeight(); weight += count * template.getWeight();
@@ -203,14 +203,14 @@ public class RequestProcureCropList extends GameClientPacket
int fee = 0; // fee for selling to other manors int fee = 0; // fee for selling to other manors
final int rewardItem = SeedData.getInstance().getRewardItem(cropId, crop.getReward()); final int rewardItem = ManorSeedData.getInstance().getRewardItem(cropId, crop.getReward());
if (count > crop.getAmount()) if (count > crop.getAmount())
{ {
continue; continue;
} }
final int sellPrice = count * SeedData.getInstance().getCropBasicPrice(cropId); final int sellPrice = count * ManorSeedData.getInstance().getCropBasicPrice(cropId);
final int rewardPrice = ItemTable.getInstance().getTemplate(rewardItem).getReferencePrice(); final int rewardPrice = ItemTable.getInstance().getTemplate(rewardItem).getReferencePrice();
if (rewardPrice == 0) if (rewardPrice == 0)

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
/** /**
@@ -58,11 +58,11 @@ public class ExShowCropInfo extends GameServerPacket
writeD(crop.getStartAmount()); // Buy writeD(crop.getStartAmount()); // Buy
writeD(crop.getPrice()); // Buy price writeD(crop.getPrice()); // Buy price
writeC(crop.getReward()); // Reward writeC(crop.getReward()); // Reward
writeD(SeedData.getInstance().getSeedLevelByCrop(crop.getId())); // Seed Level writeD(ManorSeedData.getInstance().getSeedLevelByCrop(crop.getId())); // Seed Level
writeC(1); // reward 1 Type writeC(1); // reward 1 Type
writeD(SeedData.getInstance().getRewardItem(crop.getId(), 1)); // Reward 1 Type Item Id writeD(ManorSeedData.getInstance().getRewardItem(crop.getId(), 1)); // Reward 1 Type Item Id
writeC(1); // reward 2 Type writeC(1); // reward 2 Type
writeD(SeedData.getInstance().getRewardItem(crop.getId(), 2)); // Reward 2 Type Item Id writeD(ManorSeedData.getInstance().getRewardItem(crop.getId(), 2)); // Reward 2 Type Item Id
} }
} }
} }

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
@@ -44,20 +44,20 @@ public class ExShowCropSetting extends GameServerPacket
{ {
_manorId = manorId; _manorId = manorId;
final Castle c = CastleManager.getInstance().getCastleById(_manorId); final Castle c = CastleManager.getInstance().getCastleById(_manorId);
final List<Integer> crops = SeedData.getInstance().getCropsForCastle(_manorId); final List<Integer> crops = ManorSeedData.getInstance().getCropsForCastle(_manorId);
_count = crops.size(); _count = crops.size();
_cropData = new int[_count * 14]; _cropData = new int[_count * 14];
int i = 0; int i = 0;
for (int cr : crops) for (int cr : crops)
{ {
_cropData[(i * 14) + 0] = cr; _cropData[(i * 14) + 0] = cr;
_cropData[(i * 14) + 1] = SeedData.getInstance().getSeedLevelByCrop(cr); _cropData[(i * 14) + 1] = ManorSeedData.getInstance().getSeedLevelByCrop(cr);
_cropData[(i * 14) + 2] = SeedData.getInstance().getRewardItem(cr, 1); _cropData[(i * 14) + 2] = ManorSeedData.getInstance().getRewardItem(cr, 1);
_cropData[(i * 14) + 3] = SeedData.getInstance().getRewardItem(cr, 2); _cropData[(i * 14) + 3] = ManorSeedData.getInstance().getRewardItem(cr, 2);
_cropData[(i * 14) + 4] = SeedData.getInstance().getCropPuchaseLimit(cr); _cropData[(i * 14) + 4] = ManorSeedData.getInstance().getCropPuchaseLimit(cr);
_cropData[(i * 14) + 5] = 0; // Looks like not used _cropData[(i * 14) + 5] = 0; // Looks like not used
_cropData[(i * 14) + 6] = (SeedData.getInstance().getCropBasicPrice(cr) * 60) / 100; _cropData[(i * 14) + 6] = (ManorSeedData.getInstance().getCropBasicPrice(cr) * 60) / 100;
_cropData[(i * 14) + 7] = SeedData.getInstance().getCropBasicPrice(cr) * 10; _cropData[(i * 14) + 7] = ManorSeedData.getInstance().getCropBasicPrice(cr) * 10;
CropProcure cropPr = c.getCrop(cr, CastleManorManager.PERIOD_CURRENT); CropProcure cropPr = c.getCrop(cr, CastleManorManager.PERIOD_CURRENT);
if (cropPr != null) if (cropPr != null)
{ {

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
/** /**
* format(packet 0xFE) ch cd [ddddcdcd] c - id h - sub id c d - size [ d - level d - seed price d - seed level d - crop price c d - reward 1 id c d - reward 2 id ] * format(packet 0xFE) ch cd [ddddcdcd] c - id h - sub id c d - size [ d - level d - seed price d - seed level d - crop price c d - reward 1 id c d - reward 2 id ]
@@ -30,7 +30,7 @@ public class ExShowManorDefaultInfo extends GameServerPacket
public ExShowManorDefaultInfo() public ExShowManorDefaultInfo()
{ {
_crops = SeedData.getInstance().getAllCrops(); _crops = ManorSeedData.getInstance().getAllCrops();
} }
@Override @Override
@@ -43,13 +43,13 @@ public class ExShowManorDefaultInfo extends GameServerPacket
for (int cropId : _crops) for (int cropId : _crops)
{ {
writeD(cropId); // crop Id writeD(cropId); // crop Id
writeD(SeedData.getInstance().getSeedLevelByCrop(cropId)); // level writeD(ManorSeedData.getInstance().getSeedLevelByCrop(cropId)); // level
writeD(SeedData.getInstance().getSeedBasicPriceByCrop(cropId)); // seed price writeD(ManorSeedData.getInstance().getSeedBasicPriceByCrop(cropId)); // seed price
writeD(SeedData.getInstance().getCropBasicPrice(cropId)); // crop price writeD(ManorSeedData.getInstance().getCropBasicPrice(cropId)); // crop price
writeC(1); // reward 1 Type writeC(1); // reward 1 Type
writeD(SeedData.getInstance().getRewardItem(cropId, 1)); // Reward 1 Type Item Id writeD(ManorSeedData.getInstance().getRewardItem(cropId, 1)); // Reward 1 Type Item Id
writeC(1); // reward 2 Type writeC(1); // reward 2 Type
writeD(SeedData.getInstance().getRewardItem(cropId, 2)); // Reward 2 Type Item Id writeD(ManorSeedData.getInstance().getRewardItem(cropId, 2)); // Reward 2 Type Item Id
} }
} }
} }

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction;
/** /**
@@ -56,11 +56,11 @@ public class ExShowSeedInfo extends GameServerPacket
writeD(seed.getCanProduce()); // Left to buy writeD(seed.getCanProduce()); // Left to buy
writeD(seed.getStartProduce()); // Started amount writeD(seed.getStartProduce()); // Started amount
writeD(seed.getPrice()); // Sell Price writeD(seed.getPrice()); // Sell Price
writeD(SeedData.getInstance().getSeedLevel(seed.getId())); // Seed Level writeD(ManorSeedData.getInstance().getSeedLevel(seed.getId())); // Seed Level
writeC(1); // reward 1 Type writeC(1); // reward 1 Type
writeD(SeedData.getInstance().getRewardItemBySeed(seed.getId(), 1)); // Reward 1 Type Item Id writeD(ManorSeedData.getInstance().getRewardItemBySeed(seed.getId(), 1)); // Reward 1 Type Item Id
writeC(1); // reward 2 Type writeC(1); // reward 2 Type
writeD(SeedData.getInstance().getRewardItemBySeed(seed.getId(), 2)); // Reward 2 Type Item Id writeD(ManorSeedData.getInstance().getRewardItemBySeed(seed.getId(), 2)); // Reward 2 Type Item Id
} }
} }
} }

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction;
@@ -43,20 +43,20 @@ public class ExShowSeedSetting extends GameServerPacket
{ {
_manorId = manorId; _manorId = manorId;
final Castle c = CastleManager.getInstance().getCastleById(_manorId); final Castle c = CastleManager.getInstance().getCastleById(_manorId);
final List<Integer> seeds = SeedData.getInstance().getSeedsForCastle(_manorId); final List<Integer> seeds = ManorSeedData.getInstance().getSeedsForCastle(_manorId);
_count = seeds.size(); _count = seeds.size();
_seedData = new int[_count * 12]; _seedData = new int[_count * 12];
int i = 0; int i = 0;
for (int s : seeds) for (int s : seeds)
{ {
_seedData[(i * 12) + 0] = s; _seedData[(i * 12) + 0] = s;
_seedData[(i * 12) + 1] = SeedData.getInstance().getSeedLevel(s); _seedData[(i * 12) + 1] = ManorSeedData.getInstance().getSeedLevel(s);
_seedData[(i * 12) + 2] = SeedData.getInstance().getRewardItemBySeed(s, 1); _seedData[(i * 12) + 2] = ManorSeedData.getInstance().getRewardItemBySeed(s, 1);
_seedData[(i * 12) + 3] = SeedData.getInstance().getRewardItemBySeed(s, 2); _seedData[(i * 12) + 3] = ManorSeedData.getInstance().getRewardItemBySeed(s, 2);
_seedData[(i * 12) + 4] = SeedData.getInstance().getSeedSaleLimit(s); _seedData[(i * 12) + 4] = ManorSeedData.getInstance().getSeedSaleLimit(s);
_seedData[(i * 12) + 5] = SeedData.getInstance().getSeedBuyPrice(s); _seedData[(i * 12) + 5] = ManorSeedData.getInstance().getSeedBuyPrice(s);
_seedData[(i * 12) + 6] = (SeedData.getInstance().getSeedBasicPrice(s) * 60) / 100; _seedData[(i * 12) + 6] = (ManorSeedData.getInstance().getSeedBasicPrice(s) * 60) / 100;
_seedData[(i * 12) + 7] = SeedData.getInstance().getSeedBasicPrice(s) * 10; _seedData[(i * 12) + 7] = ManorSeedData.getInstance().getSeedBasicPrice(s) * 10;
SeedProduction seedPr = c.getSeed(s, CastleManorManager.PERIOD_CURRENT); SeedProduction seedPr = c.getSeed(s, CastleManorManager.PERIOD_CURRENT);
if (seedPr != null) if (seedPr != null)
{ {

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.datatables.xml.SeedData; import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -42,7 +42,7 @@ public class ExShowSellCropList extends GameServerPacket
_castleCrops = new HashMap<>(); _castleCrops = new HashMap<>();
_cropsItems = new HashMap<>(); _cropsItems = new HashMap<>();
final List<Integer> allCrops = SeedData.getInstance().getAllCrops(); final List<Integer> allCrops = ManorSeedData.getInstance().getAllCrops();
for (int cropId : allCrops) for (int cropId : allCrops)
{ {
final ItemInstance item = player.getInventory().getItemByItemId(cropId); final ItemInstance item = player.getInventory().getItemByItemId(cropId);
@@ -80,11 +80,11 @@ public class ExShowSellCropList extends GameServerPacket
{ {
writeD(item.getObjectId()); // Object id writeD(item.getObjectId()); // Object id
writeD(item.getItemId()); // crop id writeD(item.getItemId()); // crop id
writeD(SeedData.getInstance().getSeedLevelByCrop(item.getItemId())); // seed level writeD(ManorSeedData.getInstance().getSeedLevelByCrop(item.getItemId())); // seed level
writeC(1); writeC(1);
writeD(SeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id
writeC(1); writeC(1);
writeD(SeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id
if (_castleCrops.containsKey(item.getItemId())) if (_castleCrops.containsKey(item.getItemId()))
{ {