mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-04-03 06:22:28 +02:00
Merge unstable into development (#2173)
* Remove more scene synchronized
* Fix worktop options not appearing
* Format code [skip actions]
* Fix delay with server tasks
* Format code [skip actions]
* Fully fix fairy clock (#2146)
* Fix scene transition
* fully fix fairy clock
* Re-add call to `Player#updatePlayerGameTime`
* Format code [skip actions]
* Initialize the script loader in `ResourceLoader#loadAll`
* Fix region removal checking
* Format code [skip actions]
* Use Lombok's `EqualsAndHashCode` for comparing scene regions
* Format code [skip actions]
* Move 'invalid gather object' to `trace`
* Add more information to the 'unknown condition handler' message
* Move invalid ability action to trace
* Make `KcpTunnel` public
* Validate the NPC being talked to
* Format code [skip actions]
* NPCs are not spawned server side; change logic to handle it
* Format code [skip actions]
* unload scene when there are no players (#2147)
* unload scene when there are no players
* Update src/main/java/emu/grasscutter/game/world/Scene.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Check if a command should be copied or HTTP should be used
* Lint Code [skip actions]
* Fix character names rendering incorrectly
* Add basic troubleshooting command
* Implement handbook teleporting
also a few formatting changes and sort data by logical sense
* Fix listener `ConcurrentModificationException` issue
* Add color change to `Join the Community!`
* Lint Code [skip actions]
* Make clickable buttons appear clickable
* Remove 'Mechanicus' entities from the list of entities
* Format code [skip actions]
* Fix going back returning a blank screen
* Implement entity spawning
* Add setting level to entity card
* Add support for 'plain text' mode
* Make descriptions of objects scrollable
* Lint Code [skip actions]
* Format code [skip actions]
* Change the way existing hooks work
* Format code [skip actions]
* Upgrade Javalin to 5.5.0 & Fix project warnings
* Upgrade logging libraries
* Fix gacha mappings static file issue
* Add temporary backwards compatability for `ServerHelper`
* Format code [skip actions]
* Remove artifact signatures from VCS
* Fix forge queue data protocol definition
* Run `spotlessApply`
* Format code [skip actions]
* Download data required for building artifacts
* Add call for Facebook logins
* Add the wiki page as a submodule
* Format code [skip actions]
* Update translation (#2150)
* Update translation
* Update translation
* Separate the dispatch and game servers (pt. 1)
gacha is still broken, handbook still needs to be done
* Format code [skip actions]
* Separate the dispatch and game servers (pt. 2)
this commit fixes the gacha page
* Add description for '/troubleshoot'
* Set default avatar talent level to 10
* Separate the dispatch and game servers (pt. 3)
implement handbook across servers!
* Format code [skip actions]
* Update GitHub Actions to use 'download-file' over 'wget'
* Gm handbook lmao (#2149)
* Fix font issue
* Fix avatars
* Fix text overflow in commands
* Fix virtualized lists and items page 😭😭
* magix why 💀
* use hover style in all minicards
* button
* remove console.log
* lint
* Add icons
* magix asked
* Fix overflow padding issue
* Fix achievement text overflow
* remove icons from repo
* Change command icon
* Add the wiki page as a submodule
* total magix moment
* fix text overflow in commands
* Fix discord button
* Make text scale on Minicard
* import icons and font from another source
* Add hover effects to siebar buttons
* move font and readme to submodule repo
* Make data folder a submodule
* import icons and font from data submodule
* Update README.md
* total magix moment
* magix moment v2
* submodule change
* Import `.webp` files
* Resize `HomeButton`
* Fix 'Copy Command' reappearing after changing pages
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
* Lint Code [skip actions]
* Download data for the build, not for the lint
* format imports
this is really just to see if build handbook works kek
* Implement proper handbook authentication (pt. 1)
* Implement proper handbook authentication (pt. 2)
* Format code [skip actions]
* Add quest data dumping for the handbook
* Change colors to fit _something suitable_
* Format code [skip actions]
* Fix force pushing to branches after linting
* Fix logic of `SetPlayerPropReq`
* Move more group loading to `trace`
* Add handbook IP authentication in hybrid mode
* Fix player level up not displaying on the client properly
* Format code [skip actions]
* Fix game time locking
* Format code [skip actions]
* Update player properties
* Format code [skip actions]
* Move `warn`s for groups to `debug`
* Fix player pausing
* Move more logs to `trace`
* Use `removeItemById` for deleting items via quests
* Clean up logger more
* Pause in-game time when the world is paused
* Format code [skip actions]
* More player property documentation
* Multi-threaded resource loading
* Format code [skip actions]
* Add quest widgets
* Add quests page (basic impl.)
* Add/fix colors
also fix tailwind
* Remove banned packets
client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted
* Re-add `BeginCameraSceneLookNotify`
* Fix being unable to attack (#2157)
* Add `PlayerOpenChestEvent`
* Add methods to get players from the server
* Add static methods to register an event handler
* Add `PlayerEnterDungeonEvent`
* Remove legacy documentation from `PlayerMoveEvent`
* Add `PlayerChatEvent`
* Add defaults to `Position`
* Clean up `.utils`
* Revert `Multi-threaded resource loading`
* Fix changing target UID when talking to the server
* Lint Code [skip actions]
* Format code [skip actions]
* fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
* Format code [skip actions]
* Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows
* Go ahead and move it before the return before Magix tells me to.
* Format code [skip actions]
* Bring back period lol (#2160)
* Disable SNI for the HTTPS server
* Add `EntityCreationEvent`
* Add initial startup message
this is so the server appears like its preparing to start
* Format code [skip actions]
* Enable debug mode for plugin loggers if enabled for the primary logger
* Add documentation about `WorldAreaConfigData`
* Make more fields in excels accessible
* Remove deprecated fields from `GetShopRsp`
* Run `spotlessApply` on definitions
* Add `PlayerEnterAreaEvent`
* Optimize event calls
* Fix event invokes
* Format code [skip actions]
* Remove manual autofinish for main quests. (#2162)
* Add world areas to the textmap cache
* Format code [skip actions]
* Don't overdefine variables in extended classes (#2163)
* Add dumper for world areas
* Format code [skip actions]
* instantiate personalLineList (#2165)
* Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
* Fix the background color leaking from the character widget
* Change HTML spacing to 2 spaces
* Implement hiding widgets
* Change scrollbar to a vibrant color
* Add _some_ scaling to the home buttons and its text
* Build the handbook with Gradle
* Fix the 'finer details' with the handbook UI
* Lint Code [skip actions]
* Fix target destination for the Gradle-built handbook
* Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
* Fix GitHub actions
* Fix event calling & canceling
* Run `spotlessApply`
* Rename fields (might be wrong)
* Add/update all/more protocol definitions
* Add/update all/more protocol definitions
* Remove outdated packet
* Fix protocol definitions
* Format code [skip actions]
* Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam
* Add GetHostQuestState
This fixes some chapter 3 stuff.
* Format code [skip actions]
* Fix merge import
* Format code [skip actions]
* Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time
* Make it so relogging keeps the time lock state.
* Refactor out questLockTime
* Per Hartie, the client packet needs to be changed too
* Update src/main/java/emu/grasscutter/game/world/World.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
* Remove all code not needed to get clock working
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Implement a proper ability system (#2166)
* Apply fix `21dec2fe`
* Apply fix `89d01d5f`
* Apply fix `d900f154`
this one was already implemented; updated to use call from previous commit
* Ability changing commit
TODO: change info to debug
* Remove use of deprecated methods/fields
* Temp commit v2
(Adding LoseHP and some fixes)
* Oopsie
* Probably fix monster battle
* Fix issue with reflecting into fields
* Fix some things
* Fix ability names for 3.6 resources
* Improve logging
---------
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
* Format code [skip actions]
* Add system for sending messages between servers
* Format some code
* Remove protocol definitions from Spotless
* Default debug to false; enable with `-debug`
* Implement completely useless global value copying
* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
* Add properties to `AbilityModifier`
* Change the way HTML is served after authentication
* Use thread executors to speed up the database loading process
* Format code [skip actions]
* Add system for setting handbook address and port
* Lint Code [skip actions]
* Format code [skip actions]
* Fix game-related data not saving
* Format code [skip actions]
* Fix handbook server details
* Lint Code [skip actions]
* Format code [skip actions]
* Use the headers provided by a context to get the IP address
should acknowledge #1975
* Format code [skip actions]
* Move more logs to `trace`
* Format code [skip actions]
* more trace
* Fix something and implement weapon entities
* Format code [skip actions]
* Fix `EntityWeapon`
* Remove deprecated API & Fix resource checking
* Fix unnecessary warning for first-time setup
* Implement handbook request limiting
* Format code [skip actions]
* Fix new avatar weapons being null
* Format code [skip actions]
* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
* Load activity config on server startup
* Require plugins to specify an API version and match with the server
* Add default open state ignore list
* Format code [skip actions]
* Quick fix for questing, needs more investigation
This would make the questing work again
* Remove existing hack for 35303
* Fix ignored open states from being set
* Format code [skip actions]
* fix the stupidest bug ive ever seen
* Optimize player kicking on server close
* Format code [skip actions]
* Re-add hack to fix 35303
* Update GitHub actions
* Format code [skip actions]
* Potentially fix issues with regions
* Download additional handbook data
* Revert "Potentially fix issues with regions"
This reverts commit 84e3823695.
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
This commit is contained in:
Magix
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;
|
||||
@@ -29,12 +30,10 @@ public class DropData {
|
||||
return minCount;
|
||||
}
|
||||
|
||||
|
||||
public int getMaxCount() {
|
||||
return maxCount;
|
||||
}
|
||||
|
||||
|
||||
public int getMinWeight() {
|
||||
return minWeight;
|
||||
}
|
||||
@@ -43,7 +42,6 @@ public class DropData {
|
||||
return maxWeight;
|
||||
}
|
||||
|
||||
|
||||
public boolean isShare() {
|
||||
return share;
|
||||
}
|
||||
@@ -51,5 +49,4 @@ public class DropData {
|
||||
public void setIsShare(boolean share) {
|
||||
this.share = share;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,11 @@ package emu.grasscutter.game.drop;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class DropInfo {
|
||||
private int monsterId;
|
||||
private List<DropData> dropDataList;
|
||||
|
||||
public int getMonsterId() {
|
||||
return monsterId;
|
||||
}
|
||||
@@ -10,7 +14,4 @@ public class DropInfo {
|
||||
public List<DropData> getDropDataList() {
|
||||
return dropDataList;
|
||||
}
|
||||
|
||||
private int monsterId;
|
||||
private List<DropData> dropDataList;
|
||||
}
|
||||
|
||||
@@ -3,104 +3,271 @@ 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.*;
|
||||
|
||||
import java.util.List;
|
||||
public final class DropSystem extends BaseGameSystem {
|
||||
private final Int2ObjectMap<DropTableData> dropTable;
|
||||
private final Map<String, List<BaseDropData>> chestReward;
|
||||
private final Map<String, List<BaseDropData>> monsterDrop;
|
||||
private final Random rand;
|
||||
|
||||
public class DropSystem extends BaseGameSystem {
|
||||
private final Int2ObjectMap<List<DropData>> dropData;
|
||||
// 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;
|
||||
}
|
||||
this.rand = new Random();
|
||||
this.dropTable = GameData.getDropTableDataMap();
|
||||
this.chestReward = new HashMap<>();
|
||||
this.monsterDrop = new HashMap<>();
|
||||
|
||||
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());
|
||||
var 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);
|
||||
} catch (Exception ignored) {
|
||||
Grasscutter.getLogger()
|
||||
.error("Unable to load chest drop data. Please place ChestDrop.json in data folder.");
|
||||
}
|
||||
|
||||
try {
|
||||
var dataList = DataLoader.loadList("MonsterDrop.json", BaseDropData.class);
|
||||
for (var i : dataList) {
|
||||
if (!monsterDrop.containsKey(i.getIndex())) {
|
||||
monsterDrop.put(i.getIndex(), new ArrayList<>());
|
||||
}
|
||||
monsterDrop.get(i.getIndex()).add(i);
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
Grasscutter.getLogger()
|
||||
.error("Unable to load monster drop data. Please place MonsterDrop.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);
|
||||
|
||||
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 {
|
||||
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));
|
||||
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;
|
||||
}
|
||||
|
||||
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());
|
||||
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;
|
||||
}
|
||||
|
||||
if (itemData == null) {
|
||||
return;
|
||||
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 (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);
|
||||
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 {
|
||||
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);
|
||||
} 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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
112
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
Normal file
112
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
Normal file
@@ -0,0 +1,112 @@
|
||||
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.Position;
|
||||
import emu.grasscutter.game.world.Scene;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import java.util.List;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
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