Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-25 09:02:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-05-31 23:57:51 +00:00
parent 77a70c7880
commit bcf54dd6ba
7 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
View File

@@ -10,17 +10,18 @@ import emu.grasscutter.game.world.*;
import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
import emu.grasscutter.scripts.EntityControllerScriptManager;
import it.unimi.dsi.fastutil.ints.*;
import lombok.*;
import javax.annotation.Nullable;
import lombok.*;
@ToString(callSuper = true)
public class EntityWeapon extends EntityBaseGadget {
@Getter private final GadgetData gadgetData;
@Getter(onMethod_ = @Override) @Setter
@Getter(onMethod_ = @Override)
@Setter
private int gadgetId;
@Nullable @Getter
private ConfigEntityGadget configGadget;
@Nullable @Getter private ConfigEntityGadget configGadget;
@Getter(onMethod_ = @Override, lazy = true)
private final Int2FloatMap fightProperties = new Int2FloatOpenHashMap();
@@ -50,21 +51,20 @@ public class EntityWeapon extends EntityBaseGadget {
}
this.id = scene.getWorld().getNextEntityId(EntityIdType.WEAPON);
Grasscutter.getLogger().trace("New weapon entity {} in scene {}.",
this.id, this.getScene().getId());
Grasscutter.getLogger()
.trace("New weapon entity {} in scene {}.", this.id, this.getScene().getId());
this.initAbilities();
}
private void addConfigAbility(ConfigAbilityData abilityData){
var data = GameData.getAbilityData(abilityData.getAbilityName());
if (data != null) this.getWorld().getHost()
.getAbilityManager().addAbilityToEntity(this, data);
private void addConfigAbility(ConfigAbilityData abilityData) {
var data = GameData.getAbilityData(abilityData.getAbilityName());
if (data != null) this.getWorld().getHost().getAbilityManager().addAbilityToEntity(this, data);
}
@Override
public void initAbilities() {
//TODO: handle pre-dynamic, static and dynamic here
// TODO: handle pre-dynamic, static and dynamic here
if (this.configGadget != null && this.configGadget.getAbilities() != null) {
for (var ability : this.configGadget.getAbilities()) {
this.addConfigAbility(ability);

9
src/main/java/emu/grasscutter/game/world/WorldDataSystem.java
View File

@@ -9,10 +9,9 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.InvestigationMonsterOuterClass;
import emu.grasscutter.scripts.data.*;
import emu.grasscutter.server.game.*;
import org.luaj.vm2.LuaError;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import org.luaj.vm2.LuaError;
public class WorldDataSystem extends BaseGameSystem {
private final Map<String, ChestInteractHandler> chestInteractHandlerMap; // chestType-Handler
@@ -56,8 +55,10 @@ public class WorldDataSystem extends BaseGameSystem {
.filter(imd -> imd.getMonsterIdList().get(0) == monsterId)
.findFirst();
return investigationMonsterData.map(monsterData -> GameData.getRewardPreviewDataMap()
.get(monsterData.getRewardPreviewId())).orElse(null);
return investigationMonsterData
.map(
monsterData -> GameData.getRewardPreviewDataMap().get(monsterData.getRewardPreviewId()))
.orElse(null);
}
private SceneGroup getInvestigationGroup(int sceneId, int groupId) {