Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regular ScriptLib update! #2349

Merged
merged 3 commits into from
Sep 10, 2023
Merged

Regular ScriptLib update! #2349

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8286dca
Regular ScriptLib update!
scooterboo Sep 9, 2023
ba425f9
Move RefreshGroup down to debug
scooterboo Sep 9, 2023
928d02d
Update SetGadgetEnableInteract
scooterboo Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/main/java/emu/grasscutter/scripts/ScriptLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,12 @@ public int MoveAvatarByPointArray(int uid, int targetId, LuaTable var3, String v
return 0;
}

public int MoveAvatarByPointArrayWithTemplate(int uid, int pointarray_id, int[] routelist, int var4, LuaTable var5){
logger.warn("[LUA] Call unimplemented MoveAvatarByPointArrayWithTemplate with {} {} {} {} {}", uid, pointarray_id, routelist, var4, printTable(var5));
//TODO implement var5 contains int speed
return 0;
}

public int MovePlayerToPos(LuaTable var1){
logger.warn("[LUA] Call unchecked MovePlayerToPos with {}", printTable(var1));
//TODO implement var1 contains int[] uid_list, Position pos, int radius, Position rot
Expand Down Expand Up @@ -1262,6 +1268,7 @@ public int[] GetOpeningDungeonListByRosterId(int var1){
}

public int SetWeatherAreaState(int var1, int var2) {
logger.debug("[LUA] Call SetWeatherAreaState with {} {}", var1, var2);
this.getSceneScriptManager().getScene().getPlayers()
.forEach(p -> p.setWeather(var1, ClimateType.getTypeByValue(var2)));
return 0;
Expand Down Expand Up @@ -1405,6 +1412,11 @@ public int RevokePlayerShowTemplateReminder(int var1, LuaValue var2){
return 0;
}

public int SetPlayerInteractOption(String var1){
logger.warn("[LUA] Call unimplemented SetPlayerInteractOption {}", var1);
return 0;
}

public int UnlockForce(int force){
logger.debug("[LUA] Call UnlockForce {}", force);
getSceneScriptManager().getScene().unlockForce(force);
Expand Down Expand Up @@ -1552,7 +1564,7 @@ public LuaTable GetActivityOpenAndCloseTimeByScheduleId(int scheduleId){
}

public int GetRegionConfigId(LuaTable var1){
logger.warn("[LUA] Call untested GetRegionConfigId with {}", printTable(var1));
logger.debug("[LUA] Call GetRegionConfigId with {}", printTable(var1));
var EntityId = var1.get("region_eid").toint();
var entity = getSceneScriptManager().getScene().getScriptManager().getRegionById(EntityId);
if (entity == null){
Expand Down Expand Up @@ -1657,9 +1669,11 @@ public int GetContextGroupId() {
}

public int SetGadgetEnableInteract(int groupId, int configId, boolean enable) {
EntityGadget gadget = getCurrentEntityGadget();
if(gadget.getGroupId() != groupId || gadget.getConfigId() != configId) return -1;

logger.debug("[LUA] Call SetGadgetEnableInteract with {} {} {}", groupId, configId, enable);
var entity = getSceneScriptManager().getScene().getEntityByConfigId(configId, groupId);
if (!(entity instanceof EntityGadget gadget)) {
return -1;
}
gadget.setInteractEnabled(enable);

return 0;
Expand Down
Loading