-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat!: Replace Pathfinding with FlexiblePathfinding (part 2) (#89)
* feat!: integrate classes from FlexibleMovement * feat!: add assets from FlexibleMovement * chore!: remove left-over actions using Pathfinding * chore!: remove behavior node prefabs that got a replacement * chore!: remove dead code and broken references * chore: rename all remaining occurrences of FlexibleMovementComponent to MinionMoveComponent * test: add descriptions to BehaviorTests * test: fix test by waiting for chunk generation Co-authored-by: Josephine Rueckert <jd.rueckert@googlemail.com>
- Loading branch information
1 parent
d3600d1
commit 317dd65
Showing
56 changed files
with
1,717 additions
and
560 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ | |
} | ||
} | ||
}, | ||
move_to | ||
move_to | ||
] | ||
} | ||
] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
{ | ||
set_target_nearby_block : { moveProbability: 65 } | ||
}, | ||
move_to | ||
move_to | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ | |
} | ||
} | ||
}, | ||
move_to | ||
move_to | ||
] | ||
}, | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
sequence: [ | ||
{ | ||
move_to: { | ||
move_to: { | ||
distance: 0.7 | ||
} | ||
}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
sequence : [ | ||
{ | ||
selector : [ | ||
find_path | ||
] | ||
}, | ||
{ move_along_path: { | ||
child : { | ||
move_to: {} | ||
} | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ | |
{ | ||
move_along_path: { | ||
child: { | ||
move_to: {} | ||
move_to: {} | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ | |
{ | ||
move_along_path: { | ||
child: { | ||
move_to: {} | ||
move_to: {} | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
loop : { | ||
child : { | ||
success : { | ||
child: { | ||
timeout : { | ||
"time": 0.7, | ||
"child": { | ||
lookup: { | ||
tree: "Behaviors:naiveMoveTo" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"BehaviorNode": { | ||
"type": "FindDummyPathToNode", | ||
"name": "Find Dummy Path", | ||
"category": "movement", | ||
"shape": "rect", | ||
"description": "Finds a dummy path to target consisting of the current and target location", | ||
"color": [180, 180, 180, 255], | ||
"textColor": [0, 0, 0, 255] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"BehaviorNode": { | ||
"type": "FindPathToNode", | ||
"name": "Find Path", | ||
"category": "movement", | ||
"shape": "rect", | ||
"description": "Finds a path to target using FlexiblePathfinding", | ||
"color": [180, 180, 180, 255], | ||
"textColor": [0, 0, 0, 255] | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"BehaviorNode": { | ||
"type": "MoveAlongPathNode", | ||
"name": "Move Along Path", | ||
"category": "movement", | ||
"shape": "rect", | ||
"description": "Move sequentially along this entity's path", | ||
"color": [180, 180, 180, 255], | ||
"textColor": [0, 0, 0, 255] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"BehaviorNode": { | ||
"type": "MoveToNode", | ||
"name": "Move To", | ||
"category": "movement", | ||
"shape": "rect", | ||
"description": "Move to this entity's immediate move target using the FlexibleMovement mode", | ||
"color": [180, 180, 180, 255], | ||
"textColor": [0, 0, 0, 255] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"BehaviorNode": { | ||
"type": "ValidatePathNode", | ||
"name": "Validate Path", | ||
"category": "movement", | ||
"shape": "rect", | ||
"description": "Validate that this entity can traverse its current path", | ||
"color": [180, 180, 180, 255], | ||
"textColor": [0, 0, 0, 255] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"parent": "Behaviors:testcharacter", | ||
"MinionMove": { | ||
"movementTypes": ["walking", "leaping", "swimming"] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"parent": "Behaviors:testcharacter", | ||
"MinionMove": { | ||
"movementTypes": ["flying"] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"parent": "Behaviors:testcharacter", | ||
"MinionMove": { | ||
"movementTypes": [ | ||
"swimming" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ | ||
"MinionMove": { | ||
"movementTypes": ["walking", "leaping"] | ||
}, | ||
"NameTag": { "text": "testcharacter" }, | ||
"Behavior" : { | ||
"tree" : "naiveMoveTo" | ||
}, | ||
"persisted" : true, | ||
"location" : {}, | ||
"Character": {}, | ||
"CharacterHeldItem" : { }, | ||
"Network" :{}, | ||
"Health" : { | ||
"maxHealth": 1, | ||
"currentHealth": 1, | ||
"excessSpeedDamageMultiplier": 0, | ||
"destroyEntityOnNoHealth" : true | ||
}, | ||
"Trigger" : { | ||
"detectGroups" : ["engine:debris", "engine:sensor"] | ||
}, | ||
"CreatureNameGenerator" : { | ||
"genderRatio" : 0.5, | ||
"nobility" : 0.5, | ||
"theme": "DWARF" | ||
}, | ||
"AliveCharacter": {}, | ||
"CharacterMovement" : { | ||
"groundFriction" : 16, | ||
"speedMultiplier" : 0.3, | ||
"distanceBetweenFootsteps" : 0.2, | ||
"distanceBetweenSwimStrokes" : 2.5, | ||
"height" : 0.9, | ||
"radius" : 0.3, | ||
"jumpSpeed" : 12 | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"parent": "engine:iconItem", | ||
"DebugMoveTo": {}, | ||
"DisplayName": { | ||
"name": "Path to" | ||
}, | ||
"Item" : { | ||
"name" : "Walk to block", | ||
"icon" : "engine:items#walkToJob", | ||
"usage" : "ON_BLOCK" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
{ | ||
"type": "FlexibleMovementDebugLayout", | ||
"skin": "engineDefault" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 0 additions & 44 deletions
44
src/main/java/org/terasology/module/behaviors/actions/ContinuousMoveAlongPathNode.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.