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

Sell price checks.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-03-06 09:19:30 +00:00
parent a5266432c5
commit e867feb170
107 changed files with 458 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_6.0_Fafurion/dist/game/config/General.ini vendored
View File

@@ -288,6 +288,10 @@ GridNeighborTurnOnTime = 1
# Default: 90
GridNeighborTurnOffTime = 90
# Correct buylist and multisell prices when lower than sell price.
# Default: True
CorrectPrices = True
# ---------------------------------------------------------------------------
# Falling Damage

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java
View File

@@ -473,6 +473,7 @@ public class Config
public static int MAX_NPC_ANIMATION;
public static int MIN_MONSTER_ANIMATION;
public static int MAX_MONSTER_ANIMATION;
public static boolean CORRECT_PRICES;
public static boolean ENABLE_FALLING_DAMAGE;
public static boolean GRIDS_ALWAYS_ON;
public static int GRID_NEIGHBOR_TURNON_TIME;
@@ -2055,6 +2056,7 @@ public class Config
GRIDS_ALWAYS_ON = General.getBoolean("GridsAlwaysOn", false);
GRID_NEIGHBOR_TURNON_TIME = General.getInt("GridNeighborTurnOnTime", 1);
GRID_NEIGHBOR_TURNOFF_TIME = General.getInt("GridNeighborTurnOffTime", 90);
CORRECT_PRICES = General.getBoolean("CorrectPrices", true);
PEACE_ZONE_MODE = General.getInt("PeaceZoneMode", 0);
DEFAULT_GLOBAL_CHAT = General.getString("GlobalChat", "ON");
DEFAULT_TRADE_CHAT = General.getString("TradeChat", "ON");

11
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/BuyListData.java
View File

@@ -126,7 +126,16 @@ public class BuyListData implements IXmlReader
final long restockDelay = parseLong(attrs, "restock_delay", -1L);
final long count = parseLong(attrs, "count", -1L);
final int baseTax = parseInteger(attrs, "baseTax", defaultBaseTax);
buyList.addProduct(new Product(buyListId, item, price, restockDelay, count, baseTax));
final long sellPrice = item.getReferencePrice() / 2;
if (Config.CORRECT_PRICES && (price > -1) && (sellPrice > price) && (buyList.getNpcsAllowed() != null))
{
LOGGER.warning("Buy price " + price + " is less than sell price " + sellPrice + " for ItemID:" + itemId + " of buylist " + buyList.getListId() + ".");
buyList.addProduct(new Product(buyListId, item, sellPrice, restockDelay, count, baseTax));
}
else
{
buyList.addProduct(new Product(buyListId, item, price, restockDelay, count, baseTax));
}
}
else
{

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
View File

@@ -167,7 +167,7 @@ public class MultisellData implements IXmlReader
final Item item = ItemTable.getInstance().getTemplate(id);
if (item != null)
{
totalPrice += (item.getReferencePrice() * count);
totalPrice += ((item.getReferencePrice() / 2) * count);
}
}
else
@@ -186,7 +186,7 @@ public class MultisellData implements IXmlReader
// Check if buy price is lower than sell price.
// Only applies when there is only one ingredient and it is adena.
if ((ingredients.size() == 1) && (lastIngredientId == 57) && (lastIngredientCount < totalPrice))
if (Config.CORRECT_PRICES && (ingredients.size() == 1) && (lastIngredientId == 57) && (lastIngredientCount < totalPrice))
{
LOGGER.warning("Buy price " + lastIngredientCount + " is less than sell price " + totalPrice + " at entry " + entryCounter.intValue() + " of multisell " + listId + ".");
// Adjust price.

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/ProductList.java
View File

@@ -70,8 +70,8 @@ public class ProductList
return (_allowedNpcs != null) && _allowedNpcs.contains(npcId);
}
// public Set<Integer> getNpcsAllowed()
// {
// return _allowedNpcs;
// }
public Set<Integer> getNpcsAllowed()
{
return _allowedNpcs;
}
}