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

Kamisato Ayaka and Mona talent moving costs stamina

Browse Source
This commit is contained in:
gentlespoon 2022-05-07 00:37:27 -07:00 committed by Melledy
parent 9b3ca239c9
commit 6bba3c8477
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/emu/grasscutter/game/managers/MovementManager/MovementManager.java
View File

@ -37,6 +37,7 @@ public class MovementManager {
SWIM_DASH_START(-200), SWIM_DASH_START(-200),
SWIM_DASH(-200), SWIM_DASH(-200),
SWIMMING(-80), SWIMMING(-80),
FIGHT(0),
// restore // restore
STANDBY(500), STANDBY(500),
@ -75,8 +76,9 @@ public class MovementManager {
private Timer movementManagerTickTimer; private Timer movementManagerTickTimer;
private GameSession cachedSession = null; private GameSession cachedSession = null;
private GameEntity cachedEntity = null; private GameEntity cachedEntity = null;
private int staminaRecoverDelay = 0; private int staminaRecoverDelay = 0;
private int skillCaster = 0;
private int skillCasting = 0;
public MovementManager(Player player) { public MovementManager(Player player) {
previousCoordinates.add(new Position(0,0,0)); previousCoordinates.add(new Position(0,0,0));
@ -125,6 +127,12 @@ public class MovementManager {
MotionState.MOTION_WALK, MotionState.MOTION_WALK,
MotionState.MOTION_DANGER_WALK MotionState.MOTION_DANGER_WALK
))); )));
MotionStatesCategorized.put("FIGHT", new HashSet<>(Arrays.asList(
MotionState.MOTION_FIGHT
)));
} }
public void handle(GameSession session, EntityMoveInfoOuterClass.EntityMoveInfo moveInfo, GameEntity entity) { public void handle(GameSession session, EntityMoveInfoOuterClass.EntityMoveInfo moveInfo, GameEntity entity) {
@ -145,7 +153,7 @@ public class MovementManager {
currentCoordinates = newPos; currentCoordinates = newPos;
} }
currentState = motionInfo.getState(); currentState = motionInfo.getState();
Grasscutter.getLogger().debug("" + currentState); Grasscutter.getLogger().debug("" + currentState + "\t" + (moveInfo.getIsReliable() ? "reliable" : ""));
handleFallOnGround(motionInfo); handleFallOnGround(motionInfo);
} }
@ -293,6 +301,8 @@ public class MovementManager {
consumption = getFlyConsumption(); consumption = getFlyConsumption();
} else if (MotionStatesCategorized.get("STANDBY").contains(currentState)) { } else if (MotionStatesCategorized.get("STANDBY").contains(currentState)) {
consumption = getStandConsumption(); consumption = getStandConsumption();
} else if (MotionStatesCategorized.get("FIGHT").contains(currentState)) {
consumption = getFightConsumption();
} }
// delay 2 seconds before start recovering - as official server does. // delay 2 seconds before start recovering - as official server does.
@ -306,7 +316,7 @@ public class MovementManager {
consumption = new Consumption(ConsumptionType.None); consumption = new Consumption(ConsumptionType.None);
} }
} }
Grasscutter.getLogger().debug(getCurrentStamina() + "/" + getMaximumStamina() + "\t" + currentState + "\t" + "isMoving: " + isPlayerMoving() + "\t(" + consumption.consumptionType + "," + consumption.amount + ")"); // Grasscutter.getLogger().debug(getCurrentStamina() + "/" + getMaximumStamina() + "\t" + currentState + "\t" + "isMoving: " + isPlayerMoving() + "\t(" + consumption.consumptionType + "," + consumption.amount + ")");
updateStamina(cachedSession, consumption.amount); updateStamina(cachedSession, consumption.amount);
} }
@ -340,8 +350,6 @@ public class MovementManager {
return consumption; return consumption;
} }
// TODO: Kamisato Ayaka & Mona
private Consumption getSwimConsumptions() { private Consumption getSwimConsumptions() {
Consumption consumption = new Consumption(ConsumptionType.None); Consumption consumption = new Consumption(ConsumptionType.None);
if (currentState == MotionState.MOTION_SWIM_MOVE) { if (currentState == MotionState.MOTION_SWIM_MOVE) {
@ -410,5 +418,25 @@ public class MovementManager {
} }
return consumption; return consumption;
} }
private Consumption getFightConsumption() {
Consumption consumption = new Consumption(ConsumptionType.None);
HashMap<Integer, Integer> fightingCost = new HashMap<>() {{
put(10013, -1000); // Kamisato Ayaka
put(10413, -1000); // Mona
}};
if (fightingCost.containsKey(skillCasting)) {
consumption = new Consumption(ConsumptionType.FIGHT, fightingCost.get(skillCasting));
// only handle once, so reset.
skillCasting = 0;
skillCaster = 0;
}
return consumption;
}
public void notifySkill(int caster, int skillId) {
skillCaster = caster;
skillCasting = skillId;
}
} }

6
src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java
View File

@ -16,11 +16,9 @@ public class HandlerEvtDoSkillSuccNotify extends PacketHandler {
// TODO: Will be used for deducting stamina for charged skills. // TODO: Will be used for deducting stamina for charged skills.
int caster = notify.getCasterId(); int caster = notify.getCasterId();
int skill = notify.getSkillId(); int skillId = notify.getSkillId();
// Grasscutter.getLogger().warn(caster + "\t" + skill); session.getPlayer().getMovementManager().notifySkill(caster, skillId);
// session.getPlayer().getScene().broadcastPacket(new PacketEvtAvatarStandUpNotify(notify));
} }
} }