mirror of
https://github.com/Melledy/Nebula.git
synced 2025-12-14 13:24:43 +01:00
Implement shop purchase limits
This commit is contained in:
@@ -5,6 +5,7 @@ import com.google.gson.annotations.SerializedName;
|
|||||||
import emu.nebula.data.BaseDef;
|
import emu.nebula.data.BaseDef;
|
||||||
import emu.nebula.data.ResourceType;
|
import emu.nebula.data.ResourceType;
|
||||||
import emu.nebula.game.inventory.ItemParamMap;
|
import emu.nebula.game.inventory.ItemParamMap;
|
||||||
|
import emu.nebula.game.player.Player;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -27,6 +28,10 @@ public class MallShopDef extends BaseDef {
|
|||||||
return IdString.hashCode();
|
return IdString.hashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getStock(Player player) {
|
||||||
|
return Math.max(this.getStock() - player.getInventory().getMallBuyCount().get(this.getIdString()), 0);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
this.products = new ItemParamMap();
|
this.products = new ItemParamMap();
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package emu.nebula.data.resources;
|
|||||||
import emu.nebula.data.BaseDef;
|
import emu.nebula.data.BaseDef;
|
||||||
import emu.nebula.data.ResourceType;
|
import emu.nebula.data.ResourceType;
|
||||||
import emu.nebula.game.inventory.ItemParamMap;
|
import emu.nebula.game.inventory.ItemParamMap;
|
||||||
|
import emu.nebula.game.player.Player;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -24,6 +25,10 @@ public class ResidentGoodsDef extends BaseDef {
|
|||||||
public int getId() {
|
public int getId() {
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getStock(Player player) {
|
||||||
|
return Math.max(this.getMaximumLimit() - player.getInventory().getMallBuyCount().getInt(this.getId()), 0);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
|
|||||||
@@ -64,7 +64,8 @@ public final class DatabaseManager {
|
|||||||
|
|
||||||
// Add our custom fastutil codecs
|
// Add our custom fastutil codecs
|
||||||
var codecProvider = CodecRegistries.fromCodecs(
|
var codecProvider = CodecRegistries.fromCodecs(
|
||||||
new IntSetCodec(), new IntListCodec(), new Int2IntMapCodec(), new ItemParamMapCodec(), new BitsetCodec()
|
new IntSetCodec(), new IntListCodec(), new Int2IntMapCodec(),
|
||||||
|
new ItemParamMapCodec(), new String2IntMapCodec(), new BitsetCodec()
|
||||||
);
|
);
|
||||||
|
|
||||||
// Set mapper options
|
// Set mapper options
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package emu.nebula.database.codecs;
|
||||||
|
|
||||||
|
import org.bson.BsonReader;
|
||||||
|
import org.bson.BsonType;
|
||||||
|
import org.bson.BsonWriter;
|
||||||
|
import org.bson.codecs.Codec;
|
||||||
|
import org.bson.codecs.DecoderContext;
|
||||||
|
import org.bson.codecs.EncoderContext;
|
||||||
|
|
||||||
|
import emu.nebula.util.String2IntMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom mongodb codec for encoding/decoding fastutil int2int maps.
|
||||||
|
*/
|
||||||
|
public class String2IntMapCodec implements Codec<String2IntMap> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Class<String2IntMap> getEncoderClass() {
|
||||||
|
return String2IntMap.class;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void encode(BsonWriter writer, String2IntMap collection, EncoderContext encoderContext) {
|
||||||
|
writer.writeStartDocument();
|
||||||
|
for (var entry : collection.object2IntEntrySet()) {
|
||||||
|
writer.writeName(entry.getKey());
|
||||||
|
writer.writeInt32(entry.getIntValue());
|
||||||
|
}
|
||||||
|
writer.writeEndDocument();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String2IntMap decode(BsonReader reader, DecoderContext decoderContext) {
|
||||||
|
String2IntMap collection = new String2IntMap();
|
||||||
|
reader.readStartDocument();
|
||||||
|
while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
|
||||||
|
collection.put(reader.readName(), reader.readInt32());
|
||||||
|
}
|
||||||
|
reader.readEndDocument();
|
||||||
|
return collection;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,8 @@ import dev.morphia.annotations.Id;
|
|||||||
import emu.nebula.GameConstants;
|
import emu.nebula.GameConstants;
|
||||||
import emu.nebula.Nebula;
|
import emu.nebula.Nebula;
|
||||||
import emu.nebula.data.GameData;
|
import emu.nebula.data.GameData;
|
||||||
|
import emu.nebula.data.resources.MallShopDef;
|
||||||
|
import emu.nebula.data.resources.ResidentGoodsDef;
|
||||||
import emu.nebula.database.GameDatabaseObject;
|
import emu.nebula.database.GameDatabaseObject;
|
||||||
import emu.nebula.game.player.PlayerManager;
|
import emu.nebula.game.player.PlayerManager;
|
||||||
import emu.nebula.game.quest.QuestCondType;
|
import emu.nebula.game.quest.QuestCondType;
|
||||||
@@ -17,6 +19,7 @@ import emu.nebula.proto.Public.Item;
|
|||||||
import emu.nebula.proto.Public.Res;
|
import emu.nebula.proto.Public.Res;
|
||||||
import emu.nebula.proto.Public.Title;
|
import emu.nebula.proto.Public.Title;
|
||||||
import emu.nebula.proto.Public.UI32;
|
import emu.nebula.proto.Public.UI32;
|
||||||
|
import emu.nebula.util.String2IntMap;
|
||||||
import emu.nebula.game.player.Player;
|
import emu.nebula.game.player.Player;
|
||||||
import emu.nebula.game.player.PlayerChangeInfo;
|
import emu.nebula.game.player.PlayerChangeInfo;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
@@ -38,6 +41,10 @@ public class Inventory extends PlayerManager implements GameDatabaseObject {
|
|||||||
private IntSet titles;
|
private IntSet titles;
|
||||||
private IntSet honorList;
|
private IntSet honorList;
|
||||||
|
|
||||||
|
// Buy limit
|
||||||
|
private ItemParamMap shopBuyCount;
|
||||||
|
private String2IntMap mallBuyCount;
|
||||||
|
|
||||||
// Items/resources
|
// Items/resources
|
||||||
private transient Int2ObjectMap<GameResource> resources;
|
private transient Int2ObjectMap<GameResource> resources;
|
||||||
private transient Int2ObjectMap<GameItem> items;
|
private transient Int2ObjectMap<GameItem> items;
|
||||||
@@ -58,6 +65,9 @@ public class Inventory extends PlayerManager implements GameDatabaseObject {
|
|||||||
this.titles = new IntOpenHashSet();
|
this.titles = new IntOpenHashSet();
|
||||||
this.honorList = new IntOpenHashSet();
|
this.honorList = new IntOpenHashSet();
|
||||||
|
|
||||||
|
this.shopBuyCount = new ItemParamMap();
|
||||||
|
this.mallBuyCount = new String2IntMap();
|
||||||
|
|
||||||
// Add titles directly
|
// Add titles directly
|
||||||
this.getTitles().add(player.getTitlePrefix());
|
this.getTitles().add(player.getTitlePrefix());
|
||||||
this.getTitles().add(player.getTitleSuffix());
|
this.getTitles().add(player.getTitleSuffix());
|
||||||
@@ -640,27 +650,75 @@ public class Inventory extends PlayerManager implements GameDatabaseObject {
|
|||||||
return change;
|
return change;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayerChangeInfo buyItem(int currencyId, int currencyCount, ItemParamMap buyItems, int buyCount) {
|
public PlayerChangeInfo buyMallItem(MallShopDef data, int buyCount) {
|
||||||
return this.buyItem(currencyId, currencyCount, buyItems, buyCount, null);
|
// Check stock
|
||||||
}
|
int stock = data.getStock(this.getPlayer());
|
||||||
|
if (buyCount > stock) {
|
||||||
public PlayerChangeInfo buyItem(int currencyId, int currencyCount, ItemParamMap buyItems, int buyCount, PlayerChangeInfo change) {
|
return null;
|
||||||
// Player change info
|
|
||||||
if (change == null) {
|
|
||||||
change = new PlayerChangeInfo();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Buy item
|
||||||
|
var change = this.buyItem(data.getExchangeItemId(), data.getExchangeItemQty(), data.getProducts(), buyCount);
|
||||||
|
|
||||||
|
if (change == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update purchase limit
|
||||||
|
this.getMallBuyCount().addTo(data.getIdString(), buyCount);
|
||||||
|
Nebula.getGameDatabase().update(
|
||||||
|
this,
|
||||||
|
getUid(),
|
||||||
|
"mallBuyCount." + data.getIdString(),
|
||||||
|
getMallBuyCount().get(data.getIdString())
|
||||||
|
);
|
||||||
|
|
||||||
|
// Return
|
||||||
|
return change;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PlayerChangeInfo buyShopItem(ResidentGoodsDef data, int buyCount) {
|
||||||
|
// Check stock
|
||||||
|
int stock = data.getStock(this.getPlayer());
|
||||||
|
if (buyCount > stock) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Buy item
|
||||||
|
var change = this.buyItem(data.getCurrencyItemId(), data.getPrice(), data.getProducts(), buyCount);
|
||||||
|
|
||||||
|
if (change == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update purchase limit
|
||||||
|
this.getShopBuyCount().add(data.getId(), buyCount);
|
||||||
|
Nebula.getGameDatabase().update(
|
||||||
|
this,
|
||||||
|
getUid(),
|
||||||
|
"shopBuyCount." + data.getId(),
|
||||||
|
getShopBuyCount().get(data.getId())
|
||||||
|
);
|
||||||
|
|
||||||
|
// Return
|
||||||
|
return change;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PlayerChangeInfo buyItem(int currencyId, int currencyCount, ItemParamMap buyItems, int buyCount) {
|
||||||
// Sanity check
|
// Sanity check
|
||||||
if (buyCount <= 0) {
|
if (buyCount <= 0) {
|
||||||
return change;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure we have the currency
|
// Make sure we have the currency
|
||||||
int cost = buyCount * currencyCount;
|
int cost = buyCount * currencyCount;
|
||||||
|
|
||||||
if (!this.hasItem(currencyId, cost)) {
|
if (!this.hasItem(currencyId, cost)) {
|
||||||
return change;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Player change info
|
||||||
|
var change = new PlayerChangeInfo();
|
||||||
|
|
||||||
// Remove currency item
|
// Remove currency item
|
||||||
this.removeItem(currencyId, cost, change);
|
this.removeItem(currencyId, cost, change);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class HandlerMallShopListReq extends NetHandler {
|
|||||||
|
|
||||||
var info = ProductInfo.newInstance()
|
var info = ProductInfo.newInstance()
|
||||||
.setId(data.getIdString())
|
.setId(data.getIdString())
|
||||||
.setStock(data.getStock())
|
.setStock(data.getStock(session.getPlayer()))
|
||||||
.setRefreshTime(refreshTime);
|
.setRefreshTime(refreshTime);
|
||||||
|
|
||||||
rsp.addList(info);
|
rsp.addList(info);
|
||||||
|
|||||||
@@ -22,12 +22,7 @@ public class HandlerMallShopOrderReq extends NetHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Buy items
|
// Buy items
|
||||||
var change = session.getPlayer().getInventory().buyItem(
|
var change = session.getPlayer().getInventory().buyMallItem(data, req.getQty());
|
||||||
data.getExchangeItemId(),
|
|
||||||
data.getExchangeItemQty(),
|
|
||||||
data.getProducts(),
|
|
||||||
req.getQty()
|
|
||||||
);
|
|
||||||
|
|
||||||
if (change == null) {
|
if (change == null) {
|
||||||
return session.encodeMsg(NetMsgId.mall_shop_order_failed_ack);
|
return session.encodeMsg(NetMsgId.mall_shop_order_failed_ack);
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ package emu.nebula.server.handlers;
|
|||||||
|
|
||||||
import emu.nebula.net.NetHandler;
|
import emu.nebula.net.NetHandler;
|
||||||
import emu.nebula.net.NetMsgId;
|
import emu.nebula.net.NetMsgId;
|
||||||
|
import emu.nebula.proto.Public.BoughtGoods;
|
||||||
import emu.nebula.proto.Public.ResidentShop;
|
import emu.nebula.proto.Public.ResidentShop;
|
||||||
import emu.nebula.proto.ResidentShopGet.ResidentShopGetResp;
|
import emu.nebula.proto.ResidentShopGet.ResidentShopGetResp;
|
||||||
|
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
import emu.nebula.net.HandlerId;
|
import emu.nebula.net.HandlerId;
|
||||||
import emu.nebula.data.GameData;
|
import emu.nebula.data.GameData;
|
||||||
import emu.nebula.net.GameSession;
|
import emu.nebula.net.GameSession;
|
||||||
@@ -13,15 +15,41 @@ public class HandlerResidentShopGetReq extends NetHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] handle(GameSession session, byte[] message) throws Exception {
|
public byte[] handle(GameSession session, byte[] message) throws Exception {
|
||||||
// Build response
|
// Get shops
|
||||||
var rsp = ResidentShopGetResp.newInstance();
|
var shops = new Int2ObjectOpenHashMap<ResidentShop>();
|
||||||
|
|
||||||
for (var data : GameData.getResidentShopDataTable()) {
|
for (var data : GameData.getResidentShopDataTable()) {
|
||||||
var proto = ResidentShop.newInstance()
|
var proto = ResidentShop.newInstance()
|
||||||
.setId(data.getId())
|
.setId(data.getId())
|
||||||
.setRefreshTime(Long.MAX_VALUE);
|
.setRefreshTime(Long.MAX_VALUE);
|
||||||
|
|
||||||
rsp.addShops(proto);
|
shops.put(data.getId(), proto);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add bought goods
|
||||||
|
for (var data : GameData.getResidentGoodsDataTable()) {
|
||||||
|
int bought = session.getPlayer().getInventory().getShopBuyCount().get(data.getId());
|
||||||
|
if (bought == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var shop = shops.get(data.getShopId());
|
||||||
|
if (shop == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var info = BoughtGoods.newInstance()
|
||||||
|
.setId(data.getId())
|
||||||
|
.setNumber(bought);
|
||||||
|
|
||||||
|
shop.addInfos(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build response
|
||||||
|
var rsp = ResidentShopGetResp.newInstance();
|
||||||
|
|
||||||
|
for (var shop : shops.values()) {
|
||||||
|
rsp.addShops(shop);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Encode and send
|
// Encode and send
|
||||||
|
|||||||
@@ -23,17 +23,16 @@ public class HandlerResidentShopPurchaseReq extends NetHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Buy
|
// Buy
|
||||||
var change = session.getPlayer().getInventory().buyItem(
|
var change = session.getPlayer().getInventory().buyShopItem(data, req.getNumber());
|
||||||
data.getCurrencyItemId(),
|
|
||||||
data.getPrice(),
|
if (change == null) {
|
||||||
data.getProducts(),
|
return session.encodeMsg(NetMsgId.resident_shop_purchase_failed_ack);
|
||||||
req.getNumber()
|
}
|
||||||
);
|
|
||||||
|
|
||||||
// Build response
|
// Build response
|
||||||
var rsp = ResidentShopPurchaseResp.newInstance()
|
var rsp = ResidentShopPurchaseResp.newInstance()
|
||||||
.setChange(change.toProto())
|
.setChange(change.toProto())
|
||||||
.setPurchasedNumber(0); // Prevent avaliable item count from decreasing
|
.setPurchasedNumber(req.getNumber());
|
||||||
|
|
||||||
rsp.getMutableShop()
|
rsp.getMutableShop()
|
||||||
.setId(data.getShopId())
|
.setId(data.getShopId())
|
||||||
|
|||||||
15
src/main/java/emu/nebula/util/String2IntMap.java
Normal file
15
src/main/java/emu/nebula/util/String2IntMap.java
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package emu.nebula.util;
|
||||||
|
|
||||||
|
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||||
|
|
||||||
|
public class String2IntMap extends Object2IntOpenHashMap<String> {
|
||||||
|
private static final long serialVersionUID = -7301945177198000055L;
|
||||||
|
|
||||||
|
public int get(String key) {
|
||||||
|
return super.getInt(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FastEntrySet<String> entries() {
|
||||||
|
return super.object2IntEntrySet();
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user