Anime-Game-Servers/AnimeGamesLua
1
0
Fork 0
mirror of https://github.com/Anime-Game-Servers/AnimeGamesLua.git synced 2024-11-26 22:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Refactoring] Some more small cleanups in the LuaContext classes and scriptLibHandlers

Browse Source
This commit is contained in:
hartie95 2024-01-10 21:46:31 +01:00
parent 4daa7f98a4
commit 85339662a7
11 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/GroupEventLuaContext.kt
View File

@ -1,12 +1,13 @@
package org.anime_game_servers.gi_lua.script_lib
import org.anime_game_servers.gi_lua.models.scene.group.SceneGroup
import org.anime_game_servers.gi_lua.models.ScriptArgs
import org.anime_game_servers.gi_lua.models.scene.group.SceneGroup
interface GroupEventLuaContext : LuaContext {
fun getGroupInstance(): SceneGroup
fun getArgs(): ScriptArgs
fun <T: GroupEventLuaContext> getScriptLibHandler(): ScriptLibHandler<T>?
fun <T: GroupEventLuaContext> getScriptLibHandlerProvider(): ScriptLibGroupHandlerProvider<T>
/*override fun uid() = getArgs().uid
override fun source_entity_id() = getArgs().source_eid

1
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/LuaContext.java
View File

@ -4,7 +4,6 @@ import org.anime_game_servers.lua.engine.LuaEngine;
public interface LuaContext {
LuaEngine getEngine();
ScriptLibHandler getScriptLibHandler();
// fields used by some scripts
/*int uid();

44
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLib.java
View File

@ -9,6 +9,8 @@ import org.anime_game_servers.gi_lua.models.constants.ExhibitionPlayType;
import org.anime_game_servers.gi_lua.models.constants.FlowSuiteOperatePolicy;
import org.anime_game_servers.gi_lua.models.constants.temporary.GalleryProgressScoreType;
import org.anime_game_servers.gi_lua.models.constants.temporary.GalleryProgressScoreUIType;
import org.anime_game_servers.gi_lua.script_lib.handler.ScriptLibStaticHandler;
import org.anime_game_servers.gi_lua.script_lib.handler.parameter.KillByConfigIdParams;
import org.anime_game_servers.lua.engine.LuaTable;
import static org.anime_game_servers.gi_lua.utils.ScriptUtils.luaToPos;
@ -37,10 +39,9 @@ public class ScriptLib {
* Context independent functions
*/
public static void PrintContextLog(LuaContext context, String msg) {
context.getScriptLibHandler().PrintContextLog(context, msg);
staticHandler.PrintContextLog(context, msg);
}
/**
* GroupEventLuaContext functions
*/
@ -206,7 +207,7 @@ public class ScriptLib {
int regionId = table.getInt("region_eid");
int entityType = table.getInt("entity_type");
if(entityType < 0 || entityType >= EntityType.values().length){
scriptLogger.error(() -> "Invalid entity type " + entityType);
scriptLogger.error(() -> "[GetRegionEntityCount] Invalid entity type " + entityType);
return 0;
}
val entityTypeEnum = EntityType.values()[entityType];
@ -253,7 +254,26 @@ public class ScriptLib {
public static int KillEntityByConfigId(LuaContext context, Object rawTable) {
val table = context.getEngine().getTable(rawTable);
return context.getScriptLibHandler().KillEntityByConfigId(context, table);
val configId = table.optInt("config_id", 0);
if (configId == 0){
scriptLogger.error(() -> "[KillEntityByConfigId] Invalid config id " + configId);
return INVALID_PARAMETER.getValue();
}
val groupId = table.optInt("group_id", 0);
val entityTypeValue = table.optInt("entity_type", 0);
if(entityTypeValue < 0 || entityTypeValue >= EntityType.values().length){
scriptLogger.error(() -> "[KillEntityByConfigId] Invalid entity type " + entityTypeValue);
return INVALID_PARAMETER.getValue();
}
val entityType = EntityType.values()[entityTypeValue];
val params = new KillByConfigIdParams(groupId, configId, entityType);
if (context instanceof GroupEventLuaContext gContext){
return gContext.getScriptLibHandlerProvider().getScriptLibHandler().KillEntityByConfigId(gContext, params);
} else if (context instanceof ControllerLuaContext cContext) {
return cContext.getScriptLibHandlerProvider().getGadgetControllerHandler().KillEntityByConfigId(cContext, params);
}
scriptLogger.error(() -> "[KillEntityByConfigId] unknown context type " + context.getClass().getName());
return NOT_IMPLEMENTED.getValue();
}
public static int CreateMonster(GroupEventLuaContext context, Object rawTable){
@ -418,7 +438,7 @@ public class ScriptLib {
public static int SetChallengeEventMark(GroupEventLuaContext context, int challengeId, int markType){
if(markType < 0 || markType >= ChallengeEventMarkType.values().length){
scriptLogger.error(() -> "Invalid mark type " + markType);
scriptLogger.error(() -> "[SetChallengeEventMark] Invalid mark type " + markType);
return 1;
}
val markTypeEnum = ChallengeEventMarkType.values()[markType];
@ -492,7 +512,7 @@ public class ScriptLib {
val battleParams = context.getEngine().getTable(battleParamsTable);
val battleType = battleParams.optInt("battle_type", -1);
if(battleType < 0 || battleType >= SealBattleType.values().length){
scriptLogger.error(() -> "Invalid battle type " + battleType);
scriptLogger.error(() -> "[StartSealBattle] Invalid battle type " + battleType);
return -1;
}
val battleTypeEnum = SealBattleType.values()[battleType];
@ -840,7 +860,7 @@ public class ScriptLib {
val groupId = table.optInt("group_id", -1);
val killPolicyId = table.optInt("kill_policy", -1);
if(groupId == -1){
scriptLogger.error(() -> "KillGroupEntity: groupId not set");
scriptLogger.error(() -> "[KillGroupEntity] groupId not set");
return INVALID_PARAMETER_TABLE_CONTENT.getValue();
}
if(killPolicyId == -1){
@ -850,9 +870,9 @@ public class ScriptLib {
}
private static int killByGroupPolicy(GroupEventLuaContext context, int groupId, int killPolicyId){
scriptLogger.debug(() -> "KillGroupEntity: kill by group policy");
scriptLogger.debug(() -> "[KillGroupEntity] kill by group policy");
if(killPolicyId >= GroupKillPolicy.values().length){
scriptLogger.error(() -> "KillGroupEntity: kill_policy out of bounds");
scriptLogger.error(() -> "[KillGroupEntity] kill_policy out of bounds");
return INVALID_PARAMETER.getValue();
}
val policy = GroupKillPolicy.values()[killPolicyId];
@ -860,7 +880,7 @@ public class ScriptLib {
}
private static int killByCfgIds(GroupEventLuaContext context, int groupId, LuaTable luaTable){
scriptLogger.debug(() -> "KillGroupEntity: kill by cfg ids");
scriptLogger.debug(() -> "[KillGroupEntity] kill by cfg ids");
val monsterList = luaTable.getTable("monsters");
val gadgetList = luaTable.getTable("gadgets");
val monsters = monsterList != null ? monsterList.getAsIntArray() : new int[0];
@ -970,11 +990,11 @@ public class ScriptLib {
val exhibitionTypeIndex = param4.optInt("play_type", -1);
val galleryId = param4.optInt("gallery_id", -1);
if(exhibitionTypeIndex < 0 || exhibitionTypeIndex >= ExhibitionPlayType.values().length){
scriptLogger.error(() -> "Invalid exhibition type " + exhibitionTypeIndex);
scriptLogger.error(() -> "[AddExhibitionAccumulableDataAfterSuccess] Invalid exhibition type " + exhibitionTypeIndex);
return INVALID_PARAMETER_TABLE_CONTENT.getValue();
}
if (galleryId == -1){
scriptLogger.error(() -> "Invalid gallery id " + galleryId);
scriptLogger.error(() -> "[AddExhibitionAccumulableDataAfterSuccess] Invalid gallery id " + galleryId);
return INVALID_PARAMETER_TABLE_CONTENT.getValue();
}
val exhibitionTypeEnum = ExhibitionPlayType.values()[exhibitionTypeIndex];

1
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLibControllerHandlerProvider.kt
View File

@ -3,6 +3,5 @@ package org.anime_game_servers.gi_lua.script_lib
import org.anime_game_servers.gi_lua.script_lib.handler.GadgetControllerHandler
interface ScriptLibControllerHandlerProvider<GadgetEntity, ControllerEventContext : ControllerLuaContext<GadgetEntity>> {
fun getScriptLibHandler(): ScriptLibHandler<*, *>
fun getGadgetControllerHandler(): GadgetControllerHandler<GadgetEntity, ControllerEventContext>?
}

2
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLibGroupHandlerProvider.kt
View File

@ -3,7 +3,7 @@ package org.anime_game_servers.gi_lua.script_lib
import org.anime_game_servers.gi_lua.script_lib.handler.activity.SummerTimeScriptHandler
interface ScriptLibGroupHandlerProvider<GroupEventContext : GroupEventLuaContext> {
fun getScriptLibHandler(): ScriptLibHandler<GroupEventContext, *>
fun getScriptLibHandler(): ScriptLibHandler<GroupEventContext>
/* Activity handlers */
fun getSummerTimeScriptHandler(): SummerTimeScriptHandler<GroupEventContext>? = null

14
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLibHandler.java
View File

@ -1,6 +1,5 @@
package org.anime_game_servers.gi_lua.script_lib;
import lombok.val;
import org.anime_game_servers.core.gi.enums.QuestState;
import org.anime_game_servers.core.gi.models.Vector;
import org.anime_game_servers.gi_lua.models.constants.*;
@ -8,18 +7,13 @@ import org.anime_game_servers.gi_lua.models.constants.ExhibitionPlayType;
import org.anime_game_servers.gi_lua.models.constants.FlowSuiteOperatePolicy;
import org.anime_game_servers.gi_lua.models.constants.temporary.GalleryProgressScoreType;
import org.anime_game_servers.gi_lua.models.constants.temporary.GalleryProgressScoreUIType;
import org.anime_game_servers.gi_lua.script_lib.handler.parameter.KillByConfigIdParams;
import org.anime_game_servers.lua.engine.LuaTable;
import javax.annotation.Nonnull;
@SuppressWarnings("unused")
public interface ScriptLibHandler<GroupEventContext extends GroupEventLuaContext, ControllerEventContext extends ControllerLuaContext<?>> {
/**
* Context independent functions
*/
void PrintContextLog(LuaContext context, String msg);
public interface ScriptLibHandler<GroupEventContext extends GroupEventLuaContext> {
/**
* GroupEventContext functions
@ -105,7 +99,7 @@ public interface ScriptLibHandler<GroupEventContext extends GroupEventLuaContext
int SetIsAllowUseSkill(GroupEventContext context, int canUse);
int KillEntityByConfigId(LuaContext context, LuaTable table);
int CreateMonster(GroupEventContext context, LuaTable table);
@ -312,6 +306,8 @@ public interface ScriptLibHandler<GroupEventContext extends GroupEventLuaContext
int KillGroupEntityByCfgIds(GroupEventContext context, int groupId, int[] monsters, int[] gadgets);
int KillGroupEntityByPolicy(GroupEventContext context, int groupId, GroupKillPolicy policy);
int KillEntityByConfigId(GroupEventContext context, KillByConfigIdParams params);
int GetGadgetIdByEntityId(GroupEventContext context, int entityId);
int GetMonsterIdByEntityId(GroupEventContext context, int entityId);
int GetMonsterConfigId(GroupEventContext context, int entityId);

6
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/ScriptLibStaticHandler.java
View File

@ -1,6 +0,0 @@
package org.anime_game_servers.gi_lua.script_lib;
public interface ScriptLibStaticHandler {
void PrintLog(String msg);
int GetEntityType(int entityId);
}

4
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/handler/GadgetControllerHandler.kt
View File

@ -1,6 +1,7 @@
package org.anime_game_servers.gi_lua.script_lib.handler
import org.anime_game_servers.gi_lua.script_lib.ControllerLuaContext
import org.anime_game_servers.gi_lua.script_lib.handler.parameter.KillByConfigIdParams
import org.anime_game_servers.lua.engine.LuaTable
/**
@ -51,4 +52,7 @@ interface GadgetControllerHandler<GadgetEntity, ControllerEventContext : Control
fun DropSubfield(context: ControllerEventContext, paramsTable: LuaTable?): Int
fun GetGatherConfigIdList(context: ControllerEventContext): IntArray?
fun KillEntityByConfigId(context: ControllerEventContext, params: KillByConfigIdParams): Int
}

10
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/handler/ScriptLibStaticHandler.kt Normal file
View File

@ -0,0 +1,10 @@
package org.anime_game_servers.gi_lua.script_lib.handler
import org.anime_game_servers.gi_lua.script_lib.LuaContext
interface ScriptLibStaticHandler {
fun PrintLog(msg: String?)
fun PrintContextLog(context: LuaContext, msg: String)
fun GetEntityType(entityId: Int): Int
}

9
GILua/src/main/java/org/anime_game_servers/gi_lua/script_lib/handler/parameter/KillByConfigIdParams.kt Normal file
View File

@ -0,0 +1,9 @@
package org.anime_game_servers.gi_lua.script_lib.handler.parameter
import org.anime_game_servers.gi_lua.models.constants.EntityType
data class KillByConfigIdParams(
val configId: Int = 0,
val groupId: Int = 0,
val entityType: EntityType = EntityType.NONE
)

2
base/src/jvmMain/kotlin/org/anime_game_servers/lua/engine/LuaEngine.kt
View File

@ -27,7 +27,7 @@ interface LuaEngine {
fun getScript(scriptPath: Path, scriptType: ScriptType): LuaScript?
fun getTable(table: Any): LuaTable?
fun getTable(table: Any): LuaTable
fun createTable(): LuaTable