Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-09 04:03:21 +08:00
Code Issues Projects Releases Wiki Activity

make xxGroupVariableValueByGroup the same as xxGroupVariableValue (#2266)

Browse Source
This commit is contained in:
Nazrin 2023-07-22 20:17:11 -07:00 committed by GitHub
parent ae2ab20b5b
commit 49ba0e55e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/emu/grasscutter/scripts/ScriptLib.java
View File

@ -398,12 +398,41 @@ public class ScriptLib {
val old = variables.getOrDefault(var, 0); val old = variables.getOrDefault(var, 0);
variables.put(var, old + value); variables.put(var, old + value);
logger.debug("[LUA] Call ChangeGroupVariableValue with {},{}",
old, old+value);
getSceneScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_VARIABLE_CHANGE, old+value, old).setEventSource(var)); getSceneScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_VARIABLE_CHANGE, old+value, old).setEventSource(var));
return LuaValue.ZERO; return LuaValue.ZERO;
} }
public int GetGroupVariableValueByGroup(String var, int groupId){
logger.debug("[LUA] Call GetGroupVariableValueByGroup with {},{}",
var,groupId);
return getSceneScriptManager().getVariables(groupId).getOrDefault(var, 0);
}
public int SetGroupVariableValueByGroup(String var, int value, int groupId){
logger.debug("[LUA] Call SetGroupVariableValueByGroup with {},{},{}",
var,value,groupId);
val variables = getSceneScriptManager().getVariables(groupId);
val old = variables.getOrDefault(var, value);
variables.put(var, value);
getSceneScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_VARIABLE_CHANGE, value, old).setEventSource(var));
return 0;
}
public int ChangeGroupVariableValueByGroup(String var, int value, int groupId){
logger.debug("[LUA] Call ChangeGroupVariableValueByGroup with {},{}",
var,groupId);
val variables = getSceneScriptManager().getVariables(groupId);
val old = variables.getOrDefault(var, 0);
variables.put(var, old + value);
getSceneScriptManager().callEvent(new ScriptArgs(groupId, EventType.EVENT_VARIABLE_CHANGE, old+value, old).setEventSource(var));
return 0;
}
/** /**
* Set the actions and triggers to designated group * Set the actions and triggers to designated group
*/ */
@ -533,20 +562,6 @@ public class ScriptLib {
return 0; return 0;
} }
public int GetGroupVariableValueByGroup(String name, int groupId){
logger.debug("[LUA] Call GetGroupVariableValueByGroup with {},{}",
name,groupId);
return getSceneScriptManager().getVariables(groupId).getOrDefault(name, 0);
}
public int ChangeGroupVariableValueByGroup(String name, int value, int groupId){
logger.debug("[LUA] Call ChangeGroupVariableValueByGroup with {},{}",
name,groupId);
//TODO test
getSceneScriptManager().getVariables(groupId).put(name, value);
return 0;
}
public int SetIsAllowUseSkill(int canUse){ public int SetIsAllowUseSkill(int canUse){
logger.debug("[LUA] Call SetIsAllowUseSkill with {}", logger.debug("[LUA] Call SetIsAllowUseSkill with {}",
canUse); canUse);
@ -571,14 +586,6 @@ public class ScriptLib {
return 0; return 0;
} }
public int SetGroupVariableValueByGroup(String key, int value, int groupId){
logger.debug("[LUA] Call SetGroupVariableValueByGroup with {},{},{}",
key,value,groupId);
getSceneScriptManager().getVariables(groupId).put(key, value);
return 0;
}
public int CreateMonster(LuaTable table){ public int CreateMonster(LuaTable table){
logger.debug("[LUA] Call CreateMonster with {}", logger.debug("[LUA] Call CreateMonster with {}",
printTable(table)); printTable(table));