mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-22 11:54:39 +01:00
Implement a new item drops system (#2112)
* 1 * Delete .gitattributes * implement * Update PacketDropHintNotify.java * Update PacketWorldChestOpenNotify.java * Update FileUtils.java * Update PacketDropHintNotify.java * Update WorldDataSystem.java --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
This commit is contained in:
dragon
11
src/main/java/emu/grasscutter/game/drop/BaseDropData.java
Normal file
11
src/main/java/emu/grasscutter/game/drop/BaseDropData.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package emu.grasscutter.game.drop;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class BaseDropData {
|
||||
private int minLevel;
|
||||
private String index;
|
||||
private int dropId;
|
||||
private int dropCount;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package emu.grasscutter.game.drop;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class ChestDropData extends BaseDropData {
|
||||
private int sourceType;
|
||||
private String type;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package emu.grasscutter.game.drop;
|
||||
|
||||
@Deprecated
|
||||
public class DropData {
|
||||
private int minWeight;
|
||||
private int maxWeight;
|
||||
|
||||
@@ -3,109 +3,257 @@ package emu.grasscutter.game.drop;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.DataLoader;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.ItemData;
|
||||
import emu.grasscutter.game.entity.EntityItem;
|
||||
import emu.grasscutter.data.common.DropItemData;
|
||||
import emu.grasscutter.data.excels.DropMaterialData;
|
||||
import emu.grasscutter.data.excels.DropTableData;
|
||||
import emu.grasscutter.game.entity.EntityMonster;
|
||||
import emu.grasscutter.game.entity.GameEntity;
|
||||
import emu.grasscutter.game.inventory.GameItem;
|
||||
import emu.grasscutter.game.inventory.ItemType;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.ActionReason;
|
||||
import emu.grasscutter.game.world.Scene;
|
||||
import emu.grasscutter.scripts.data.SceneMonster;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.utils.Position;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import emu.grasscutter.server.packet.send.PacketDropHintNotify;
|
||||
import emu.grasscutter.server.packet.send.PacketGadgetAutoPickDropInfoNotify;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import java.util.List;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class DropSystem extends BaseGameSystem {
|
||||
private final Int2ObjectMap<List<DropData>> dropData;
|
||||
private final Int2ObjectMap<DropTableData> dropTable;
|
||||
private final Map<String, List<BaseDropData>> chestReward;
|
||||
private final Map<String, List<BaseDropData>> monsterDrop;
|
||||
private final Random rand;
|
||||
//TODO:don't know how to determine boss level.Have to hard-code the data from wiki.
|
||||
private final int[] bossLevel = {36, 37, 41, 50, 62, 72, 83, 91, 93};
|
||||
|
||||
public DropSystem(GameServer server) {
|
||||
super(server);
|
||||
this.dropData = new Int2ObjectOpenHashMap<>();
|
||||
this.load();
|
||||
}
|
||||
|
||||
public Int2ObjectMap<List<DropData>> getDropData() {
|
||||
return dropData;
|
||||
}
|
||||
|
||||
public synchronized void load() {
|
||||
getDropData().clear();
|
||||
rand = new Random();
|
||||
dropTable = GameData.getDropTableDataMap();
|
||||
chestReward = new HashMap<>();
|
||||
monsterDrop = new HashMap<>();
|
||||
try {
|
||||
List<DropInfo> banners = DataLoader.loadList("Drop.json", DropInfo.class);
|
||||
if (banners.size() > 0) {
|
||||
for (DropInfo di : banners) {
|
||||
getDropData().put(di.getMonsterId(), di.getDropDataList());
|
||||
List<ChestDropData> dataList = DataLoader.loadList("ChestDrop.json", ChestDropData.class);
|
||||
for (var i : dataList) {
|
||||
if (!chestReward.containsKey(i.getIndex())) {
|
||||
chestReward.put(i.getIndex(), new ArrayList<>());
|
||||
}
|
||||
Grasscutter.getLogger().debug("Drop data successfully loaded.");
|
||||
} else {
|
||||
Grasscutter.getLogger().error("Unable to load drop data. Drop data size is 0.");
|
||||
chestReward.get(i.getIndex()).add(i);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load drop data.", e);
|
||||
Grasscutter.getLogger().error("Unable to load chest drop data.Please place ChestDrop.json in data folder.");
|
||||
}
|
||||
}
|
||||
|
||||
private void addDropEntity(
|
||||
DropData dd, Scene dropScene, ItemData itemData, Position pos, int num, Player target) {
|
||||
if (!dd.isGive()
|
||||
&& (itemData.getItemType() != ItemType.ITEM_VIRTUAL || itemData.getGadgetId() != 0)) {
|
||||
EntityItem entity = new EntityItem(dropScene, target, itemData, pos, num, dd.isShare());
|
||||
if (!dd.isShare()) dropScene.addEntityToSingleClient(target, entity);
|
||||
else dropScene.addEntity(entity);
|
||||
} else {
|
||||
if (target != null) {
|
||||
target.getInventory().addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true);
|
||||
} else {
|
||||
// target is null if items will be added are shared. no one could pick it up because of the
|
||||
// combination(give + shared)
|
||||
// so it will be sent to all players' inventories directly.
|
||||
dropScene
|
||||
.getPlayers()
|
||||
.forEach(
|
||||
x ->
|
||||
x.getInventory()
|
||||
.addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void processDrop(DropData dd, EntityMonster em, Player gp) {
|
||||
int target = Utils.randomRange(1, 10000);
|
||||
if (target >= dd.getMinWeight() && target < dd.getMaxWeight()) {
|
||||
ItemData itemData = GameData.getItemDataMap().get(dd.getItemId());
|
||||
int num = Utils.randomRange(dd.getMinCount(), dd.getMaxCount());
|
||||
|
||||
if (itemData == null) {
|
||||
return;
|
||||
}
|
||||
if (itemData.isEquip()) {
|
||||
for (int i = 0; i < num; i++) {
|
||||
float range = (2.5f + (.05f * num));
|
||||
Position pos = em.getPosition().nearby2d(range).addY(3f);
|
||||
addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
|
||||
try {
|
||||
List<BaseDropData> dataList = DataLoader.loadList("MonsterDrop.json", BaseDropData.class);
|
||||
for (var i : dataList) {
|
||||
if (!monsterDrop.containsKey(i.getIndex())) {
|
||||
monsterDrop.put(i.getIndex(), new ArrayList<>());
|
||||
}
|
||||
} else {
|
||||
Position pos = em.getPosition().clone().addY(3f);
|
||||
addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
|
||||
monsterDrop.get(i.getIndex()).add(i);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load monster drop data.Please place MonsterDrop.json in data folder.");
|
||||
}
|
||||
}
|
||||
|
||||
public void callDrop(EntityMonster em) {
|
||||
int id = em.getMonsterData().getId();
|
||||
if (getDropData().containsKey(id)) {
|
||||
for (DropData dd : getDropData().get(id)) {
|
||||
if (dd.isShare()) processDrop(dd, em, null);
|
||||
else {
|
||||
for (Player gp : em.getScene().getPlayers()) {
|
||||
processDrop(dd, em, gp);
|
||||
private int queryDropData(String dropTag, int level, Map<String, List<BaseDropData>> rewards) {
|
||||
if (!rewards.containsKey(dropTag)) return 0;
|
||||
var rewardList = rewards.get(dropTag);
|
||||
BaseDropData dropData = null;
|
||||
int minLevel = 0;
|
||||
for (var i : rewardList) {
|
||||
if (level >= i.getMinLevel() && i.getMinLevel() > minLevel) {
|
||||
minLevel = i.getMinLevel();
|
||||
dropData = i;
|
||||
}
|
||||
}
|
||||
if (dropData == null) return 0;
|
||||
return dropData.getDropId();
|
||||
}
|
||||
|
||||
public boolean handleMonsterDrop(EntityMonster monster) {
|
||||
int dropId;
|
||||
int level = monster.getLevel();
|
||||
SceneMonster sceneMonster = monster.getMetaMonster();
|
||||
if (sceneMonster != null) {
|
||||
if (sceneMonster.drop_tag != null) {
|
||||
dropId = queryDropData(sceneMonster.drop_tag, level, monsterDrop);
|
||||
} else {
|
||||
dropId = sceneMonster.drop_id;
|
||||
}
|
||||
} else {
|
||||
dropId = monster.getMonsterData().getKillDropId();
|
||||
}
|
||||
if (!dropTable.containsKey(dropId)) return false;
|
||||
var dropData = dropTable.get(dropId);
|
||||
List<GameItem> items = new ArrayList<>();
|
||||
processDrop(dropData, 1, items);
|
||||
if (dropData.isFallToGround()) {
|
||||
dropItems(items, ActionReason.MonsterDie, monster, monster.getScene().getPlayers().get(0), true);
|
||||
} else {
|
||||
for (Player p : monster.getScene().getPlayers()) {
|
||||
p.getInventory().addItems(items, ActionReason.MonsterDie);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleChestDrop(int chestDropId, int dropCount, GameEntity bornFrom) {
|
||||
if (!dropTable.containsKey(chestDropId)) return false;
|
||||
var dropData = dropTable.get(chestDropId);
|
||||
List<GameItem> items = new ArrayList<>();
|
||||
processDrop(dropData, dropCount, items);
|
||||
if (dropData.isFallToGround()) {
|
||||
dropItems(items, ActionReason.OpenChest, bornFrom, bornFrom.getWorld().getHost(), false);
|
||||
} else {
|
||||
bornFrom.getWorld().getHost().getInventory().addItems(items, ActionReason.OpenChest);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean handleChestDrop(String dropTag, int level, GameEntity bornFrom) {
|
||||
int dropId = queryDropData(dropTag, level, chestReward);
|
||||
if (dropId == 0) return false;
|
||||
return handleChestDrop(dropId, 1, bornFrom);
|
||||
}
|
||||
|
||||
public boolean handleBossChestDrop(String dropTag, Player player) {
|
||||
int dropId = queryDropData(dropTag, bossLevel[player.getWorldLevel()], chestReward);
|
||||
if (!dropTable.containsKey(dropId)) return false;
|
||||
var dropData = dropTable.get(dropId);
|
||||
List<GameItem> items = new ArrayList<>();
|
||||
processDrop(dropData, 1, items);
|
||||
player.getInventory().addItems(items, ActionReason.OpenWorldBossChest);
|
||||
player.sendPacket(new PacketGadgetAutoPickDropInfoNotify(items));
|
||||
return true;
|
||||
}
|
||||
|
||||
private void processDrop(DropTableData dropData, int count, List<GameItem> items) {
|
||||
//TODO:Not clear on the meaning of some fields,like "dropLevel".Will ignore them.
|
||||
//TODO:solve drop limits,like everydayLimit.
|
||||
if (count > 1) {
|
||||
for (int i = 0; i < count; i++) processDrop(dropData, 1, items);
|
||||
return;
|
||||
}
|
||||
if (dropData.getRandomType() == 0) {
|
||||
int weightSum = 0;
|
||||
for (var i : dropData.getDropVec()) {
|
||||
int id = i.getId();
|
||||
if (id == 0) continue;
|
||||
weightSum += i.getWeight();
|
||||
}
|
||||
if (weightSum == 0) return;
|
||||
int weight = rand.nextInt(weightSum);
|
||||
int sum = 0;
|
||||
for (var i : dropData.getDropVec()) {
|
||||
int id = i.getId();
|
||||
if (id == 0) continue;
|
||||
sum += i.getWeight();
|
||||
if (weight < sum) {
|
||||
//win the item
|
||||
int amount = calculateDropAmount(i) * count;
|
||||
if (amount <= 0) break;
|
||||
if (dropTable.containsKey(id)) {
|
||||
processDrop(dropTable.get(id), amount, items);
|
||||
} else {
|
||||
boolean flag = true;
|
||||
for (var j : items) {
|
||||
if (j.getItemId() == id) {
|
||||
j.setCount(j.getCount() + amount);
|
||||
flag = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (flag) items.add(new GameItem(id, amount));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (dropData.getRandomType() == 1) {
|
||||
for (var i : dropData.getDropVec()) {
|
||||
int id = i.getId();
|
||||
if (id == 0) continue;
|
||||
if (rand.nextInt(10000) < i.getWeight()) {
|
||||
int amount = calculateDropAmount(i) * count;
|
||||
if (amount <= 0) continue;
|
||||
if (dropTable.containsKey(id)) {
|
||||
processDrop(dropTable.get(id), amount, items);
|
||||
} else {
|
||||
boolean flag = true;
|
||||
for (var j : items) {
|
||||
if (j.getItemId() == id) {
|
||||
j.setCount(j.getCount() + amount);
|
||||
flag = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (flag) items.add(new GameItem(id, amount));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int calculateDropAmount(DropItemData i) {
|
||||
int amount;
|
||||
if (i.getCountRange().contains(";")) {
|
||||
String[] ranges = i.getCountRange().split(";");
|
||||
amount = rand.nextInt(Integer.parseInt(ranges[0]), Integer.parseInt(ranges[1]) + 1);
|
||||
} else if (i.getCountRange().contains(".")) {
|
||||
double expectAmount = Double.parseDouble(i.getCountRange());
|
||||
amount = (int) expectAmount;
|
||||
if (rand.nextDouble() < expectAmount - amount) amount++;
|
||||
} else {
|
||||
amount = Integer.parseInt(i.getCountRange());
|
||||
}
|
||||
return amount;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param share Whether other players in the scene could see the drop items.
|
||||
*/
|
||||
private void dropItem(GameItem item, ActionReason reason, Player player, GameEntity bornFrom, boolean share) {
|
||||
DropMaterialData drop = GameData.getDropMaterialDataMap().get(item.getItemId());
|
||||
if ((drop != null && drop.isAutoPick()) || (item.getItemData().getItemType() == ItemType.ITEM_VIRTUAL && item.getItemData().getGadgetId() == 0)) {
|
||||
giveItem(item, reason, player, share);
|
||||
} else {
|
||||
//TODO:solve share problem
|
||||
player.getScene().addDropEntity(item, bornFrom, player, share);
|
||||
}
|
||||
}
|
||||
|
||||
private void dropItems(List<GameItem> items, ActionReason reason, GameEntity bornFrom, Player player, boolean share) {
|
||||
for (var i : items) {
|
||||
dropItem(i, reason, player, bornFrom, share);
|
||||
}
|
||||
}
|
||||
|
||||
private void giveItem(GameItem item, ActionReason reason, Player player, boolean share) {
|
||||
if (share) {
|
||||
for (var p : player.getScene().getPlayers()) {
|
||||
p.getInventory().addItem(item, reason);
|
||||
p.sendPacket(new PacketDropHintNotify(item.getItemId(), player.getPosition().toProto()));
|
||||
}
|
||||
} else {
|
||||
player.getInventory().addItem(item, reason);
|
||||
player.sendPacket(new PacketDropHintNotify(item.getItemId(), player.getPosition().toProto()));
|
||||
}
|
||||
}
|
||||
|
||||
private void giveItems(List<GameItem> items, ActionReason reason, Player player, boolean share) {
|
||||
//don't know whether we need PacketDropHintNotify.
|
||||
if (share) {
|
||||
for (var p : player.getScene().getPlayers()) {
|
||||
p.getInventory().addItems(items, reason);
|
||||
p.sendPacket(new PacketDropHintNotify(items, player.getPosition().toProto()));
|
||||
}
|
||||
} else {
|
||||
player.getInventory().addItems(items, reason);
|
||||
player.sendPacket(new PacketDropHintNotify(items, player.getPosition().toProto()));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
106
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
Normal file
106
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
Normal file
@@ -0,0 +1,106 @@
|
||||
package emu.grasscutter.game.drop;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.DataLoader;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.ItemData;
|
||||
import emu.grasscutter.game.entity.EntityItem;
|
||||
import emu.grasscutter.game.entity.EntityMonster;
|
||||
import emu.grasscutter.game.inventory.GameItem;
|
||||
import emu.grasscutter.game.inventory.ItemType;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.ActionReason;
|
||||
import emu.grasscutter.game.world.Scene;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.utils.Position;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class DropSystemLegacy extends BaseGameSystem {
|
||||
private final Int2ObjectMap<List<DropData>> dropData;
|
||||
|
||||
public DropSystemLegacy(GameServer server) {
|
||||
super(server);
|
||||
this.dropData = new Int2ObjectOpenHashMap<>();
|
||||
this.load();
|
||||
}
|
||||
|
||||
public Int2ObjectMap<List<DropData>> getDropData() {
|
||||
return dropData;
|
||||
}
|
||||
|
||||
public synchronized void load() {
|
||||
getDropData().clear();
|
||||
try {
|
||||
List<DropInfo> banners = DataLoader.loadList("Drop.json", DropInfo.class);
|
||||
if (banners.size() > 0) {
|
||||
for (DropInfo di : banners) {
|
||||
getDropData().put(di.getMonsterId(), di.getDropDataList());
|
||||
}
|
||||
Grasscutter.getLogger().debug("Drop data successfully loaded.");
|
||||
} else {
|
||||
Grasscutter.getLogger().error("Unable to load drop data. Drop data size is 0.");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load drop data.", e);
|
||||
}
|
||||
}
|
||||
private void addDropEntity(DropData dd, Scene dropScene, ItemData itemData, Position pos, int num, Player target) {
|
||||
if (!dd.isGive() && (itemData.getItemType() != ItemType.ITEM_VIRTUAL || itemData.getGadgetId() != 0)) {
|
||||
EntityItem entity = new EntityItem(dropScene, target, itemData, pos, num, dd.isShare());
|
||||
if (!dd.isShare())
|
||||
dropScene.addEntityToSingleClient(target, entity);
|
||||
else
|
||||
dropScene.addEntity(entity);
|
||||
} else {
|
||||
if (target != null) {
|
||||
target.getInventory().addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true);
|
||||
} else {
|
||||
// target is null if items will be added are shared. no one could pick it up because of the combination(give + shared)
|
||||
// so it will be sent to all players' inventories directly.
|
||||
dropScene.getPlayers().forEach(x -> x.getInventory().addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void processDrop(DropData dd, EntityMonster em, Player gp) {
|
||||
int target = Utils.randomRange(1, 10000);
|
||||
if (target >= dd.getMinWeight() && target < dd.getMaxWeight()) {
|
||||
ItemData itemData = GameData.getItemDataMap().get(dd.getItemId());
|
||||
int num = Utils.randomRange(dd.getMinCount(), dd.getMaxCount());
|
||||
|
||||
if (itemData == null) {
|
||||
return;
|
||||
}
|
||||
if (itemData.isEquip()) {
|
||||
for (int i = 0; i < num; i++) {
|
||||
float range = (2.5f + (.05f * num));
|
||||
Position pos = em.getPosition().nearby2d(range).addY(3f);
|
||||
addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
|
||||
}
|
||||
} else {
|
||||
Position pos = em.getPosition().clone().addY(3f);
|
||||
addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void callDrop(EntityMonster em) {
|
||||
int id = em.getMonsterData().getId();
|
||||
if (getDropData().containsKey(id)) {
|
||||
for (DropData dd : getDropData().get(id)) {
|
||||
if (dd.isShare())
|
||||
processDrop(dd, em, null);
|
||||
else {
|
||||
for (Player gp : em.getScene().getPlayers()) {
|
||||
processDrop(dd, em, gp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user