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

Fix ActionGenerateElemBall

Browse Source
This commit is contained in:
KingRainbow44 2023-06-04 01:00:27 -04:00
parent b050337216
commit b09c0d48bf
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/emu/grasscutter/game/ability/actions/ActionGenerateElemBall.java
View File

@ -2,6 +2,7 @@ package emu.grasscutter.game.ability.actions;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction; import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
@ -12,13 +13,12 @@ import emu.grasscutter.game.entity.EntityItem;
import emu.grasscutter.game.entity.GameEntity; import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.SceneType; import emu.grasscutter.game.props.SceneType;
import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall; import emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall;
import emu.grasscutter.utils.Position; import emu.grasscutter.game.world.Position;
@AbilityAction(AbilityModifierAction.Type.GenerateElemBall) @AbilityAction(AbilityModifierAction.Type.GenerateElemBall)
public class ActionGenerateElemBall extends AbilityActionHandler { public final class ActionGenerateElemBall extends AbilityActionHandler {
@Override @Override
public boolean execute( public boolean execute(Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
GameEntity owner = ability.getOwner(); GameEntity owner = ability.getOwner();
AbilityActionGenerateElemBall generateElemBall; AbilityActionGenerateElemBall generateElemBall;
@ -32,9 +32,7 @@ public class ActionGenerateElemBall extends AbilityActionHandler {
if(action.dropType == 0x0) { if(action.dropType == 0x0) {
String levelEntityConfig = owner.getScene().getSceneData().getLevelEntityConfig(); String levelEntityConfig = owner.getScene().getSceneData().getLevelEntityConfig();
ConfigLevelEntity config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig); ConfigLevelEntity config = GameData.getConfigLevelEntityDataMap().get(levelEntityConfig);
if (config != null if(config != null && config.getDropElemControlType() != null && config.getDropElemControlType().compareTo("None") == 0) {
&& config.getDropElemControlType() != null
&& config.getDropElemControlType().compareTo("None") == 0) {
Grasscutter.getLogger().warn("This level config don't allow element balls"); Grasscutter.getLogger().warn("This level config don't allow element balls");
return true; return true;
} }
@ -62,12 +60,8 @@ public class ActionGenerateElemBall extends AbilityActionHandler {
var itemUse = itemData.getItemUse().get(0); var itemUse = itemData.getItemUse().get(0);
double requiredEnergy; double requiredEnergy;
switch(itemUse.getUseOp()) { switch(itemUse.getUseOp()) {
case ITEM_USE_ADD_ELEM_ENERGY: case ITEM_USE_ADD_ELEM_ENERGY: requiredEnergy = Integer.parseInt(itemUse.getUseParam()[1]); break;
requiredEnergy = Integer.parseInt(itemUse.getUseParam()[1]); case ITEM_USE_ADD_ALL_ENERGY: requiredEnergy = Integer.parseInt(itemUse.getUseParam()[0]); break;
break;
case ITEM_USE_ADD_ALL_ENERGY:
requiredEnergy = Integer.parseInt(itemUse.getUseParam()[0]);
break;
default: default:
Grasscutter.getLogger().warn("UseOp not implemented", itemUse.getUseOp()); Grasscutter.getLogger().warn("UseOp not implemented", itemUse.getUseOp());
return false; return false;
@ -75,22 +69,13 @@ public class ActionGenerateElemBall extends AbilityActionHandler {
var amountGenerated = (int)Math.ceil(energy / requiredEnergy); var amountGenerated = (int)Math.ceil(energy / requiredEnergy);
if(amountGenerated >= 21) { if(amountGenerated >= 21) {
Grasscutter.getLogger() Grasscutter.getLogger().warn("Attempt to generate more than 20 element balls {}", amountGenerated);
.warn("Attempt to generate more than 20 element balls {}", amountGenerated);
return false; return false;
} }
Grasscutter.getLogger() Grasscutter.getLogger().debug("Generating {} of {} element balls", amountGenerated, action.configID);
.debug("Generating {} of {} element balls", amountGenerated, action.configID);
for(int i = 0; i < amountGenerated; i++) { for(int i = 0; i < amountGenerated; i++) {
EntityItem energyBall = EntityItem energyBall = new EntityItem(owner.getScene(), (owner instanceof EntityAvatar avatar) ? avatar.getPlayer() : null, itemData, new Position(generateElemBall.getPos()), new Position(generateElemBall.getRot()), 1);
new EntityItem(
owner.getScene(),
(owner instanceof EntityAvatar avatar) ? avatar.getPlayer() : null,
itemData,
new Position(generateElemBall.getPos()),
new Position(generateElemBall.getRot()),
1);
owner.getScene().addEntity(energyBall); owner.getScene().addEntity(energyBall);
} }