mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-14 16:04:40 +01:00
Fix Lua require, Fix monster abilities & Fix ServerLuaCall
This commit is contained in:
@@ -19,11 +19,12 @@ import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType;
|
||||
import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
|
||||
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
|
||||
import io.netty.util.concurrent.FastThreadLocalThread;
|
||||
import java.util.HashMap;
|
||||
import java.util.concurrent.*;
|
||||
import lombok.Getter;
|
||||
import org.reflections.Reflections;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.concurrent.*;
|
||||
|
||||
public final class AbilityManager extends BasePlayerManager {
|
||||
private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers =
|
||||
new HashMap<>();
|
||||
@@ -179,7 +180,12 @@ public final class AbilityManager extends BasePlayerManager {
|
||||
.handleModifierDurabilityChange(invoke);
|
||||
case ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke);
|
||||
case ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE -> this.handleKillState(invoke);
|
||||
default -> {}
|
||||
default -> {
|
||||
if (DebugConstants.LOG_MISSING_ABILITIES) {
|
||||
Grasscutter.getLogger().trace("Missing invoke handler for ability {}.",
|
||||
invoke.getArgumentType().name());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -520,27 +526,28 @@ public final class AbilityManager extends BasePlayerManager {
|
||||
var entity = this.player.getScene().getEntityById(invoke.getEntityId());
|
||||
|
||||
if (entity == null) {
|
||||
Grasscutter.getLogger().trace("Entity not found: {}", invoke.getEntityId());
|
||||
if (DebugConstants.LOG_ABILITIES)
|
||||
Grasscutter.getLogger().debug("Entity not found: {}", invoke.getEntityId());
|
||||
return;
|
||||
}
|
||||
|
||||
var addAbility = AbilityMetaAddAbility.parseFrom(invoke.getAbilityData());
|
||||
|
||||
var abilityName = Ability.getAbilityName(addAbility.getAbility().getAbilityName());
|
||||
|
||||
var ability = GameData.getAbilityData(abilityName);
|
||||
if (ability == null) {
|
||||
Grasscutter.getLogger().trace("Ability not found: {}", abilityName);
|
||||
if (DebugConstants.LOG_MISSING_ABILITIES)
|
||||
Grasscutter.getLogger().debug("Ability not found: {}", abilityName);
|
||||
return;
|
||||
}
|
||||
|
||||
entity.getInstancedAbilities().add(new Ability(ability, entity, player));
|
||||
|
||||
Grasscutter.getLogger()
|
||||
.trace(
|
||||
"Ability added to entity {} at index {}",
|
||||
entity.getId(),
|
||||
entity.getInstancedAbilities().size());
|
||||
if (DebugConstants.LOG_ABILITIES) {
|
||||
Grasscutter.getLogger()
|
||||
.debug(
|
||||
"Ability added to entity {} at index {}.",
|
||||
entity.getId(),
|
||||
entity.getInstancedAbilities().size());
|
||||
}
|
||||
}
|
||||
|
||||
private void handleKillState(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {
|
||||
@@ -568,7 +575,7 @@ public final class AbilityManager extends BasePlayerManager {
|
||||
}
|
||||
|
||||
public void addAbilityToEntity(GameEntity entity, AbilityData abilityData) {
|
||||
Ability ability = new Ability(abilityData, entity, this.player);
|
||||
var ability = new Ability(abilityData, entity, this.player);
|
||||
entity.getInstancedAbilities().add(ability); // This are in order
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,9 +5,11 @@ import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
|
||||
import emu.grasscutter.game.ability.Ability;
|
||||
import emu.grasscutter.game.entity.GameEntity;
|
||||
import javax.script.Bindings;
|
||||
import emu.grasscutter.scripts.ScriptLoader;
|
||||
import org.luaj.vm2.LuaFunction;
|
||||
|
||||
import javax.script.Bindings;
|
||||
|
||||
@AbilityAction(AbilityModifierAction.Type.ServerLuaCall)
|
||||
public final class ActionServerLuaCall extends AbilityActionHandler {
|
||||
@Override
|
||||
@@ -17,6 +19,11 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
|
||||
var scriptManager = scene.getScriptManager();
|
||||
var functionName = action.funcName;
|
||||
|
||||
// Set the script library's manager.
|
||||
var scriptLib = ScriptLoader.getScriptLib();
|
||||
scriptLib.setCurrentEntity(target);
|
||||
scriptLib.setSceneScriptManager(scriptManager);
|
||||
// Attempt to call the function.
|
||||
return switch (action.luaCallType) {
|
||||
default -> false;
|
||||
case FromGroup -> {
|
||||
@@ -24,6 +31,9 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
|
||||
var group = scriptManager.getGroupById(groupId);
|
||||
var script = group.getBindings();
|
||||
|
||||
// Set the script library's group.
|
||||
scriptLib.setCurrentGroup(group);
|
||||
|
||||
yield ActionServerLuaCall.callFunction(script, functionName);
|
||||
}
|
||||
case SpecificGroup -> {
|
||||
@@ -31,6 +41,9 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
|
||||
var group = scriptManager.getGroupById(groupId);
|
||||
var script = group.getBindings();
|
||||
|
||||
// Set the script library's group.
|
||||
scriptLib.setCurrentGroup(group);
|
||||
|
||||
yield ActionServerLuaCall.callFunction(script, functionName);
|
||||
}
|
||||
};
|
||||
@@ -51,7 +64,7 @@ public final class ActionServerLuaCall extends AbilityActionHandler {
|
||||
throw new Exception("Function is not a LuaFunction.");
|
||||
|
||||
// Attempt to invoke the function.
|
||||
luaFunction.call();
|
||||
luaFunction.call(ScriptLoader.getScriptLibLua());
|
||||
|
||||
return true;
|
||||
} catch (Exception exception) {
|
||||
|
||||
@@ -1,19 +1,15 @@
|
||||
package emu.grasscutter.game.entity;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.binout.AbilityData;
|
||||
import emu.grasscutter.data.binout.config.ConfigEntityMonster;
|
||||
import emu.grasscutter.data.common.PropGrowCurve;
|
||||
import emu.grasscutter.data.excels.EnvAnimalGatherConfigData;
|
||||
import emu.grasscutter.data.excels.monster.MonsterCurveData;
|
||||
import emu.grasscutter.data.excels.monster.MonsterData;
|
||||
import emu.grasscutter.data.excels.monster.*;
|
||||
import emu.grasscutter.game.dungeons.enums.DungeonPassConditionType;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.*;
|
||||
import emu.grasscutter.game.quest.enums.QuestContent;
|
||||
import emu.grasscutter.game.world.Position;
|
||||
import emu.grasscutter.game.world.Scene;
|
||||
import emu.grasscutter.game.world.SceneGroupInstance;
|
||||
import emu.grasscutter.game.world.*;
|
||||
import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
|
||||
import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
|
||||
import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
|
||||
@@ -28,18 +24,14 @@ import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
|
||||
import emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo;
|
||||
import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
|
||||
import emu.grasscutter.scripts.constants.EventType;
|
||||
import emu.grasscutter.scripts.data.SceneMonster;
|
||||
import emu.grasscutter.scripts.data.ScriptArgs;
|
||||
import emu.grasscutter.scripts.data.*;
|
||||
import emu.grasscutter.server.event.entity.EntityDamageEvent;
|
||||
import emu.grasscutter.utils.helpers.ProtoHelper;
|
||||
import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.*;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.*;
|
||||
|
||||
import static emu.grasscutter.scripts.constants.EventType.EVENT_SPECIFIC_MONSTER_HP_CHANGE;
|
||||
|
||||
@@ -64,17 +56,19 @@ public class EntityMonster extends GameEntity {
|
||||
|
||||
public EntityMonster(Scene scene, MonsterData monsterData, Position pos, int level) {
|
||||
super(scene);
|
||||
this.id = getWorld().getNextEntityId(EntityIdType.MONSTER);
|
||||
|
||||
this.id = this.getWorld().getNextEntityId(EntityIdType.MONSTER);
|
||||
this.monsterData = monsterData;
|
||||
this.fightProperties = new Int2FloatOpenHashMap();
|
||||
this.position = new Position(pos);
|
||||
this.rotation = new Position();
|
||||
this.bornPos = getPosition().clone();
|
||||
this.bornPos = this.getPosition().clone();
|
||||
this.level = level;
|
||||
this.playerOnBattle = new ArrayList<>();
|
||||
|
||||
if(GameData.getMonsterMappingMap().containsKey(getMonsterId())) {
|
||||
this.configEntityMonster = GameData.getMonsterConfigData().get(GameData.getMonsterMappingMap().get(getMonsterId()).getMonsterJson());
|
||||
if (GameData.getMonsterMappingMap().containsKey(this.getMonsterId())) {
|
||||
this.configEntityMonster = GameData.getMonsterConfigData().get(
|
||||
GameData.getMonsterMappingMap().get(this.getMonsterId()).getMonsterJson());
|
||||
} else {
|
||||
this.configEntityMonster = null;
|
||||
}
|
||||
@@ -87,90 +81,95 @@ public class EntityMonster extends GameEntity {
|
||||
}
|
||||
|
||||
this.recalcStats();
|
||||
|
||||
initAbilities();
|
||||
this.initAbilities();
|
||||
}
|
||||
|
||||
private void addConfigAbility(String name){
|
||||
AbilityData data = GameData.getAbilityData(name);
|
||||
if(data != null)
|
||||
getScene().getWorld().getHost().getAbilityManager().addAbilityToEntity(
|
||||
this, data);
|
||||
private void addConfigAbility(String name) {
|
||||
var data = GameData.getAbilityData(name);
|
||||
if (data != null) {
|
||||
this.getWorld().getHost()
|
||||
.getAbilityManager()
|
||||
.addAbilityToEntity(this, data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initAbilities() {
|
||||
if(configEntityMonster != null) {
|
||||
// Affix abilities
|
||||
var optionalGroup = getScene().getLoadedGroups().stream()
|
||||
// Affix abilities
|
||||
var optionalGroup = this.getScene().getLoadedGroups().stream()
|
||||
.filter(g -> g.id == this.getGroupId())
|
||||
.findAny();
|
||||
List<Integer> affixes = null;
|
||||
if (optionalGroup.isPresent()) {
|
||||
var group = optionalGroup.get();
|
||||
List<Integer> affixes = null;
|
||||
if (optionalGroup.isPresent()) {
|
||||
var group = optionalGroup.get();
|
||||
|
||||
SceneMonster monster = group.monsters.get(getConfigId());
|
||||
if(monster != null) affixes = monster.affix;
|
||||
}
|
||||
var monster = group.monsters.get(getConfigId());
|
||||
if (monster != null) affixes = monster.affix;
|
||||
}
|
||||
|
||||
if (monsterData != null) {
|
||||
// TODO: Research if group affixes goes first
|
||||
if (affixes == null) affixes = monsterData.getAffix();
|
||||
else affixes.addAll(monsterData.getAffix());
|
||||
}
|
||||
if (monsterData != null) {
|
||||
// TODO: Research if group affixes goes first
|
||||
if (affixes == null) affixes = monsterData.getAffix();
|
||||
else affixes.addAll(monsterData.getAffix());
|
||||
}
|
||||
|
||||
if(affixes != null) {
|
||||
for(var affixId : affixes) {
|
||||
var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
|
||||
if (!affix.isPreAdd()) continue;
|
||||
if (affixes != null) {
|
||||
for (var affixId : affixes) {
|
||||
var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
|
||||
if (!affix.isPreAdd()) continue;
|
||||
|
||||
//Add the ability
|
||||
for(var name : affix.getAbilityName()) {
|
||||
this.addConfigAbility(name);
|
||||
}
|
||||
//Add the ability
|
||||
for (var name : affix.getAbilityName()) {
|
||||
this.addConfigAbility(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: Research if any monster is non humanoid
|
||||
for(var ability : GameData.getConfigGlobalCombat().getDefaultAbilities().getNonHumanoidMoveAbilities()) {
|
||||
this.addConfigAbility(ability);
|
||||
// TODO: Research if any monster is non humanoid
|
||||
for(var ability : GameData.getConfigGlobalCombat()
|
||||
.getDefaultAbilities()
|
||||
.getNonHumanoidMoveAbilities()) {
|
||||
this.addConfigAbility(ability);
|
||||
}
|
||||
|
||||
if (this.configEntityMonster != null &&
|
||||
this.configEntityMonster.getAbilities() != null) {
|
||||
for (var configAbilityData : this.configEntityMonster.getAbilities()) {
|
||||
this.addConfigAbility(configAbilityData.abilityName);
|
||||
}
|
||||
}
|
||||
|
||||
if (configEntityMonster.getAbilities() != null)
|
||||
for (var configAbilityData : configEntityMonster.getAbilities()) {
|
||||
this.addConfigAbility(configAbilityData.abilityName);
|
||||
}
|
||||
if (optionalGroup.isPresent()) {
|
||||
var group = optionalGroup.get();
|
||||
var monster = group.monsters.get(getConfigId());
|
||||
if (monster != null && monster.isElite) {
|
||||
this.addConfigAbility(GameData.getConfigGlobalCombat()
|
||||
.getDefaultAbilities()
|
||||
.getMonterEliteAbilityName());
|
||||
}
|
||||
}
|
||||
|
||||
if (optionalGroup.isPresent()) {
|
||||
var group = optionalGroup.get();
|
||||
SceneMonster monster = group.monsters.get(getConfigId());
|
||||
if(monster != null && monster.isElite) {
|
||||
addConfigAbility(GameData.getConfigGlobalCombat().getDefaultAbilities().getMonterEliteAbilityName());
|
||||
if (affixes != null) {
|
||||
for (var affixId : affixes) {
|
||||
var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
|
||||
if (affix.isPreAdd()) continue;
|
||||
|
||||
//Add the ability
|
||||
for(var name : affix.getAbilityName()) {
|
||||
this.addConfigAbility(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (affixes != null) {
|
||||
for (var affixId : affixes) {
|
||||
var affix = GameData.getMonsterAffixDataMap().get(affixId.intValue());
|
||||
if(affix.isPreAdd()) continue;
|
||||
var levelEntityConfig = getScene().getSceneData().getLevelEntityConfig();
|
||||
var config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig);
|
||||
if (config == null){
|
||||
return;
|
||||
}
|
||||
|
||||
//Add the ability
|
||||
for(var name : affix.getAbilityName()) {
|
||||
this.addConfigAbility(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var levelEntityConfig = getScene().getSceneData().getLevelEntityConfig();
|
||||
var config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig);
|
||||
if (config == null){
|
||||
return;
|
||||
}
|
||||
|
||||
if (config.getMonsterAbilities() != null) {
|
||||
for (var monsterAbility : config.getMonsterAbilities()) {
|
||||
addConfigAbility(monsterAbility.abilityName);
|
||||
}
|
||||
if (config.getMonsterAbilities() != null) {
|
||||
for (var monsterAbility : config.getMonsterAbilities()) {
|
||||
addConfigAbility(monsterAbility.abilityName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,9 +15,10 @@ import emu.grasscutter.scripts.data.controller.EntityController;
|
||||
import emu.grasscutter.server.event.entity.*;
|
||||
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
|
||||
import it.unimi.dsi.fastutil.ints.*;
|
||||
import java.util.*;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public abstract class GameEntity {
|
||||
@Getter private final Scene scene;
|
||||
@Getter protected int id;
|
||||
@@ -338,4 +339,10 @@ public abstract class GameEntity {
|
||||
}
|
||||
|
||||
public abstract SceneEntityInfo toProto();
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Entity ID: %s; Group ID: %s; Config ID: %s"
|
||||
.formatted(this.getId(), this.getGroupId(), this.getConfigId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,8 +23,8 @@ import emu.grasscutter.game.props.*;
|
||||
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||
import emu.grasscutter.game.world.data.TeleportProperties;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.proto.*;
|
||||
import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
|
||||
import emu.grasscutter.net.proto.*;
|
||||
import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
|
||||
import emu.grasscutter.scripts.*;
|
||||
import emu.grasscutter.scripts.constants.EventType;
|
||||
@@ -35,11 +35,12 @@ import emu.grasscutter.server.packet.send.*;
|
||||
import emu.grasscutter.server.scheduler.ServerTaskScheduler;
|
||||
import emu.grasscutter.utils.objects.KahnsSort;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import lombok.*;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.annotation.Nullable;
|
||||
import lombok.*;
|
||||
|
||||
public final class Scene {
|
||||
@Getter private final World world;
|
||||
@@ -715,6 +716,11 @@ public final class Scene {
|
||||
* @param runnable The callback to be executed.
|
||||
*/
|
||||
public void runWhenHostInitialized(Runnable runnable) {
|
||||
if (this.isFinishedLoading()) {
|
||||
runnable.run();
|
||||
return;
|
||||
}
|
||||
|
||||
this.afterHostInitCallbacks.add(runnable);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user