From 8fcd0a8f640cf0698ede2d3fd413e6f0e7651659 Mon Sep 17 00:00:00 2001 From: austin Date: Thu, 15 Aug 2024 13:04:33 -0400 Subject: [PATCH] rename move nodes --- .../{WalkStartNode.java => MoveStartNode.java} | 4 ++-- .../{WalkStopNode.java => MoveStopNode.java} | 4 ++-- .../ai/trees/creature/melee/MeleeAITree.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/electrosphere/server/ai/nodes/actions/move/{WalkStartNode.java => MoveStartNode.java} (93%) rename src/main/java/electrosphere/server/ai/nodes/actions/move/{WalkStopNode.java => MoveStopNode.java} (92%) diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStartNode.java similarity index 93% rename from src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java rename to src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStartNode.java index d57606bb..016e9bd6 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStartNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStartNode.java @@ -9,7 +9,7 @@ import electrosphere.server.ai.nodes.AITreeNode; /** * Starts walking */ -public class WalkStartNode implements AITreeNode { +public class MoveStartNode implements AITreeNode { /** * The facing to move in @@ -19,7 +19,7 @@ public class WalkStartNode implements AITreeNode { /** * Constructor */ - public WalkStartNode(MovementRelativeFacing facing){ + public MoveStartNode(MovementRelativeFacing facing){ if(facing == null){ throw new IllegalArgumentException("Trying to create walk start tree with null facing!"); } diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStopNode.java similarity index 92% rename from src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java rename to src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStopNode.java index c05ec4a2..df2acabb 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/move/WalkStopNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/move/MoveStopNode.java @@ -8,12 +8,12 @@ import electrosphere.server.ai.nodes.AITreeNode; /** * Stops walking */ -public class WalkStopNode implements AITreeNode { +public class MoveStopNode implements AITreeNode { /** * Constructor */ - public WalkStopNode(){ + public MoveStopNode(){ } @Override diff --git a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java index 1eff6602..387625ee 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java @@ -9,8 +9,8 @@ import electrosphere.server.ai.nodes.actions.combat.MeleeRangeCheckNode; import electrosphere.server.ai.nodes.actions.combat.MeleeTargetingNode; import electrosphere.server.ai.nodes.actions.combat.MeleeRangeCheckNode.MeleeRangeCheckType; import electrosphere.server.ai.nodes.actions.move.FaceTargetNode; -import electrosphere.server.ai.nodes.actions.move.WalkStartNode; -import electrosphere.server.ai.nodes.actions.move.WalkStopNode; +import electrosphere.server.ai.nodes.actions.move.MoveStartNode; +import electrosphere.server.ai.nodes.actions.move.MoveStopNode; import electrosphere.server.ai.nodes.checks.IsMovingNode; import electrosphere.server.ai.nodes.checks.equip.HasWeaponNode; import electrosphere.server.ai.nodes.meta.collections.RandomizerNode; @@ -56,7 +56,7 @@ public class MeleeAITree { //set state //stop walking now that we're in range new PublishStatusNode("Slowing down"), - new WalkStopNode(), + new MoveStopNode(), new UntilNode(AITreeNodeResult.FAILURE, new IsMovingNode()), //select action to perform @@ -96,24 +96,24 @@ public class MeleeAITree { new SequenceNode( new PublishStatusNode("Strafing right"), new InverterNode(new OnFailureNode( - new WalkStartNode(MovementRelativeFacing.RIGHT), + new MoveStartNode(MovementRelativeFacing.RIGHT), new FailerNode(null) )), new FaceTargetNode(), new TimerNode(new SucceederNode(null), 600), - new SucceederNode(new WalkStopNode()) + new SucceederNode(new MoveStopNode()) ), //strafe to the left new SequenceNode( new PublishStatusNode("Strafing left"), new InverterNode(new OnFailureNode( - new WalkStartNode(MovementRelativeFacing.LEFT), + new MoveStartNode(MovementRelativeFacing.LEFT), new FailerNode(null) )), new FaceTargetNode(), new TimerNode(new SucceederNode(null), 600), - new SucceederNode(new WalkStopNode()) + new SucceederNode(new MoveStopNode()) ), //approach target @@ -121,7 +121,7 @@ public class MeleeAITree { new SequenceNode( new PublishStatusNode("Move into attack range"), new FaceTargetNode(), - new SucceederNode(new WalkStartNode(MovementRelativeFacing.FORWARD)), + new SucceederNode(new MoveStartNode(MovementRelativeFacing.FORWARD)), new TimerNode(new SucceederNode(null), 600) ) )