chore!: remove 'flex_' prefix from action names

Terasology-Archived · Jan 13, 2022 · e722d75 · e722d75
1 parent 7d8b204
commit e722d75
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 31 deletions.
diff --git a/assets/behaviors/common/attackFollowedEntity.behavior b/assets/behaviors/common/attackFollowedEntity.behavior
@@ -17,20 +17,20 @@
                   loop: {
                     child: {
                       sequence: [
-                        flex_set_target_to_followed_entity,
+                        set_target_to_followed_entity,
                         { sleep: {time: 0.5}}
                       ]
                     }
                   }
                 },
-               flex_move_to
+               move_to
               ]
             }
           ]
         },
         {
           sequence: [
-          flex_stop_moving,
+          stop_moving,
             {
               animation: {
                 play: "engine:Stand.animationPool",

diff --git a/assets/behaviors/common/doRandomMove.behavior b/assets/behaviors/common/doRandomMove.behavior
@@ -1,9 +1,9 @@
 {
   sequence : [
   {
-    flex_set_target_nearby_block : { moveProbability: 65 }
+    set_target_nearby_block : { moveProbability: 65 }
   },
-   flex_move_to
+   move_to
   ]
 }
 
diff --git a/assets/behaviors/common/flee.behavior b/assets/behaviors/common/flee.behavior
@@ -14,8 +14,8 @@
   },
   {
     sequence : [
-      flex_set_target_nearby_block_away_from_instigator,
-      flex_move_to
+      set_target_nearby_block_away_from_instigator,
+      move_to
     ]
   }
   ]

diff --git a/assets/behaviors/common/follow.behavior b/assets/behaviors/common/follow.behavior
@@ -22,13 +22,13 @@
           loop: {
             child: {
               sequence: [
-                flex_set_target_to_followed_entity,
+                set_target_to_followed_entity,
                 { sleep: {time: 0.2}}
               ]
             }
           }
         },
-       flex_move_to
+       move_to
       ]
     },
     {

diff --git a/assets/behaviors/common/restrictedStray.behavior b/assets/behaviors/common/restrictedStray.behavior
@@ -12,10 +12,10 @@
         {
             sequence : [
                 {
-                    flex_set_target_nearby_block_restricted : { moveProbability: 65 }
+                    set_target_nearby_block_restricted : { moveProbability: 65 }
                 },
                 {
-                   flex_move_to: { distance:  2}
+                   move_to: { distance:  2}
                 }
             ]
         },

diff --git a/assets/behaviors/creatures/territorialCritter.behavior b/assets/behaviors/creatures/territorialCritter.behavior
@@ -33,8 +33,8 @@
     },
     {
       "sequence": [
-        "flex_set_target_territory",
-        "flex_move_to"
+        "set_target_territory",
+        "move_to"
       ]
     }
   ]

diff --git a/assets/behaviors/creatures/worker.behavior b/assets/behaviors/creatures/worker.behavior
@@ -1,7 +1,7 @@
 {
   sequence: [
     {
-     flex_move_to: {
+     move_to: {
         distance: 0.7
       }
     },

diff --git a/assets/behaviors/naiveMoveTo.behavior b/assets/behaviors/naiveMoveTo.behavior
@@ -2,12 +2,12 @@
   sequence : [
     {
       selector : [
-        flex_find_path
+        find_path
       ]
     },
-    { flex_move_along_path: {
+    { move_along_path: {
       child : {
-        flex_move_to: {}
+        move_to: {}
       }
      }
     }

diff --git a/assets/behaviors/pathfinding/dynamicPathfindingFollow.behavior b/assets/behaviors/pathfinding/dynamicPathfindingFollow.behavior
@@ -15,7 +15,7 @@
             loop: {
                 child: {
                     sequence: [
-                        flex_set_target_to_followed_entity,
+                        set_target_to_followed_entity,
                         find_path,
                         setup_continuous_pathfinding,
                         {
@@ -24,7 +24,7 @@
                                 child: {
                                     move_along_path_continuous: {
                                         child: {
-                                           flex_move_to: {}
+                                           move_to: {}
                                         }
                                     }
                                 }

diff --git a/assets/behaviors/pathfinding/pointPathfindingFollow.behavior b/assets/behaviors/pathfinding/pointPathfindingFollow.behavior
@@ -19,7 +19,7 @@
                         {
                             move_along_path: {
                                 child: {
-                                   flex_move_to: {}
+                                   move_to: {}
                                 }
                             }
                         }

diff --git a/assets/behaviors/pathfinding/staticPathfindingFollow.behavior b/assets/behaviors/pathfinding/staticPathfindingFollow.behavior
@@ -15,12 +15,12 @@
             loop: {
                 child: {
                     sequence: [
-                        flex_set_target_to_followed_entity,
+                        set_target_to_followed_entity,
                         find_path,
                         {
                             move_along_path: {
                                 child: {
-                                   flex_move_to: {}
+                                   move_to: {}
                                 }
                             }
                         }

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/FindPathToNode.java b/src/main/java/org/terasology/flexiblemovement/actions/FindPathToNode.java
@@ -29,7 +29,7 @@
  * FAILURE: When the pathfinder returns a failure or invalid path
  *
  */
-@BehaviorAction(name = "flex_find_path")
+@BehaviorAction(name = "find_path")
 public class FindPathToNode extends BaseAction {
 
     @In

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/MoveAlongPathNode.java b/src/main/java/org/terasology/flexiblemovement/actions/MoveAlongPathNode.java
@@ -21,7 +21,7 @@
  * <p>
  * 5. When end of path is reached, returns SUCCESS
  */
-@BehaviorAction(name = "flex_move_along_path", isDecorator = true)
+@BehaviorAction(name = "move_along_path", isDecorator = true)
 public class MoveAlongPathNode extends BaseAction {
 
     @Override

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/MoveToAction.java b/src/main/java/org/terasology/flexiblemovement/actions/MoveToAction.java
@@ -29,7 +29,7 @@
  * <p>
  * FAILURE: When the actor believes it is unable to reach its immediate target
  */
-@BehaviorAction(name = "flex_move_to")
+@BehaviorAction(name = "move_to")
 public class MoveToAction extends BaseAction {
     private static final Logger logger = LoggerFactory.getLogger(MoveToAction.class);
 

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/NearbyBlockRestricted.java b/src/main/java/org/terasology/flexiblemovement/actions/NearbyBlockRestricted.java
@@ -31,7 +31,7 @@
  * Sets a character's {@link MinionMoveComponent} target to a random nearby block inside the area defined in the character's {@link
  * StrayRestrictionComponent}.
  */
-@BehaviorAction(name = "flex_set_target_nearby_block_restricted")
+@BehaviorAction(name = "set_target_nearby_block_restricted")
 public class NearbyBlockRestricted extends BaseAction {
 
     private static final Logger logger = LoggerFactory.getLogger(NearbyBlockRestricted.class);

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToFollowedEntityAction.java b/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToFollowedEntityAction.java
@@ -10,7 +10,7 @@
 import org.terasology.flexiblemovement.components.MinionMoveComponent;
 import org.terasology.module.behaviors.components.FollowComponent;
 
-@BehaviorAction(name = "flex_set_target_to_followed_entity")
+@BehaviorAction(name = "set_target_to_followed_entity")
 public class SetTargetToFollowedEntityAction extends BaseAction {
 
     @Override

diff --git a/...g/terasology/flexiblemovement/actions/SetTargetToNearbyBlockAwayFromInstigatorAction.java b/...g/terasology/flexiblemovement/actions/SetTargetToNearbyBlockAwayFromInstigatorAction.java
@@ -27,7 +27,7 @@
 
 import static java.lang.Integer.min;
 
-@BehaviorAction(name = "flex_set_target_nearby_block_away_from_instigator")
+@BehaviorAction(name = "set_target_nearby_block_away_from_instigator")
 public class SetTargetToNearbyBlockAwayFromInstigatorAction extends BaseAction {
 
     private static final Logger logger = LoggerFactory.getLogger(SetTargetToNearbyBlockAwayFromInstigatorAction.class);

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToNearbyBlockNode.java b/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToNearbyBlockNode.java
@@ -24,7 +24,7 @@
 import java.util.Random;
 
 
-@BehaviorAction(name = "flex_set_target_nearby_block")
+@BehaviorAction(name = "set_target_nearby_block")
 public class SetTargetToNearbyBlockNode extends BaseAction {
     private static final Logger logger = LoggerFactory.getLogger(SetTargetToNearbyBlockNode.class);
     private int moveProbability = 100;

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToTerritory.java b/src/main/java/org/terasology/flexiblemovement/actions/SetTargetToTerritory.java
@@ -12,7 +12,7 @@
 import org.terasology.module.behaviors.components.TerritoryDistance;
 
 
-@BehaviorAction(name = "flex_set_target_territory")
+@BehaviorAction(name = "set_target_territory")
 public class SetTargetToTerritory extends BaseAction {
     @Override
     public BehaviorState modify(Actor actor, BehaviorState result) {

diff --git a/src/main/java/org/terasology/flexiblemovement/actions/StopMovingAction.java b/src/main/java/org/terasology/flexiblemovement/actions/StopMovingAction.java
@@ -10,7 +10,7 @@
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.flexiblemovement.components.MinionMoveComponent;
 
-@BehaviorAction(name = "flex_stop_moving")
+@BehaviorAction(name = "stop_moving")
 public class StopMovingAction extends BaseAction {
 
     @Override