Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: FlexiblePathfinding migration follow-ups #94

Merged
merged 6 commits into from Mar 6, 2022
Merged

chore: FlexiblePathfinding migration follow-ups #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91a5d6c
fix?: give `deer` movement types
skaldarnar Jan 22, 2022
f151644
chore: format lure behavior
skaldarnar Jan 23, 2022
3a50359
fix: remove duplicate component from sheepBase; sort components alpha…
skaldarnar Jan 23, 2022
661c9e9
feat: give deer the Falling movement type
skaldarnar Jan 29, 2022
17cc247
chore: format and sort prefabs for 'sheepBase' and 'deer'
skaldarnar Feb 11, 2022
4ecc03c
Merge branch 'develop' into fix/behavior-follow-ups
skaldarnar Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 10 additions & 14 deletions assets/behaviors/lure.behavior
View file
Open in desktop
@@ -1,24 +1,20 @@
{
dynamic: [
{
guard: {
componentPresent: "Behaviors:FindNearbyPlayers",
values: ["N charactersWithinRange nonEmpty"],
child: {
{
guard: {
componentPresent: "Behaviors:FindNearbyPlayers",
values: ["N charactersWithinRange nonEmpty"],
child: {
sequence: [
{ sleep: {time: 0.1f }},
{ sleep: { time: 0.1f } },
check_luring_item_in_use,
followCharacter,
{ lookup: {tree: "Behaviors:follow" }}
]
}
}
},
{
lookup: {
tree: "Behaviors:stray"
{ lookup: { tree: "Behaviors:follow" } }
]
}
}
},
{ lookup: { tree: "Behaviors:stray" } }
]
}

120 changes: 62 additions & 58 deletions assets/prefabs/animals/deer.prefab
View file
Open in desktop
@@ -1,60 +1,26 @@
{
"skeletalmesh" : {
"mesh" : "deer",
"heightOffset" : -0.8,
"material" : "deerSkin",
"animation" : "deer#Idle",
"loop" : true
// -- Properties ----------------------------------------
"persisted": true,
// -- Components ----------------------------------------
"AliveCharacter": {},
"BaseRegen": {
"regenRate": 2,
"waitBeforeRegen": 10
},
"Behavior": {
"tree": "Behaviors:critter"
},
"FleeOnHit": {
"minDistance": 5,
"speedMultiplier": 1.2
},
"DropGrammar": {
"blockDrops": [],
"itemDrops": [
"0.7|WildAnimals:meat",
"0.3|WildAnimals:deerHide"
]
},
"Stand": {
"animationPool": [
"deer#Idle",
"deer#Idle",
"deer#Idle",
"deer#Bite_InPlace",
"deer#Yes",
"deer#No"
]
},
"Walk" :{
"animationPool": ["deer#Walk"]
},
"Die": {
"animationPool": [
"deer#Death"
"BoxShape": {
"extents": [
1.5,
1.5,
1.5
]
},
"persisted": true,
"location": {},
"Character": {},
"AliveCharacter": {},
"WildAnimal": {
"name": "Deer",
"icon": "WildAnimals:icons#Deer"
},
"NPCMovement": {},
"CreatureNameGenerator": {
"genderRatio": 0,
"nobility": 0,
"theme": "ANIMAL"
},
"CharacterMovement": {
"CharacterMovement": {
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenFootsteps": 0.2,
"height": 1.6,
"radius": 0.3,
"jumpSpeed": 12
Expand All @@ -69,34 +35,72 @@
],
"footstepVolume": 0.03
},
"CreatureNameGenerator": {
"genderRatio": 0,
"nobility": 0,
"theme": "ANIMAL"
},
"DamageSound": {
"sounds": [
"DeerHit1",
"DeerHit2"
]
},
"Network": {},
"MinionMove": {},
"Die": {
"animationPool": [
"deer#Death"
]
},
"DropGrammar": {
"blockDrops": [],
"itemDrops": [
"0.7|WildAnimals:meat",
"0.3|WildAnimals:deerHide"
]
},
"FleeOnHit": {
"minDistance": 5,
"speedMultiplier": 1.2
},
"Health": {
"destroyEntityOnNoHealth": true,
"currentHealth": 50,
"maxHealth": 50
},
"BaseRegen": {
"regenRate": 2,
"waitBeforeRegen": 10
"Location": {},
"MinionMove": {
"movementTypes": ["walking", "leaping", "falling"]
},
"BoxShape": {
"extents": [
1.5,
1.5,
1.5
"Network": {},
"NPCMovement": {},
"SkeletalMesh" : {
"mesh" : "deer",
"heightOffset" : -0.8,
"material" : "deerSkin",
"animation" : "deer#Idle",
"loop" : true
},
"Stand": {
"animationPool": [
"deer#Idle",
"deer#Idle",
"deer#Idle",
"deer#Bite_InPlace",
"deer#Yes",
"deer#No"
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Walk" :{
"animationPool": ["deer#Walk"]
},
"WildAnimal": {
"name": "Deer",
"icon": "WildAnimals:icons#Deer"
}
}
105 changes: 53 additions & 52 deletions assets/prefabs/animals/sheepBase.prefab
View file
Open in desktop
@@ -1,48 +1,26 @@
{
"Behavior": {
"tree": "Behaviors:critter"
},
"FleeOnHit": {
"minDistance": 5,
"speedMultiplier": 1.2
},
"Stand": {
"animationPool": [
"sheep#Idle",
"sheep#Idle",
"sheep#Idle",
"sheep#Bite_InPlace",
"sheep#Yes",
"sheep#No"
]
// -- Properties ---
"persisted": true,
// -- Components ---
"AliveCharacter": {},
"BaseRegen": {
"regenRate": 2,
"waitBeforeRegen": 10
},
"Walk": {
"animationPool": [
"sheep#Walk"
]
"Behavior": {
"tree": "WildAnimals:lure"
},
"Die": {
"animationPool": [
"sheep#Death"
"BoxShape": {
"extents": [
1.5,
1.5,
1.5
]
},
"persisted": true,
"location": {},
"Character": {},
"AliveCharacter": {},
"WildAnimal": {
"name": "Sheep",
"icon": "WildAnimals:icons#Sheep"
},
"NPCMovement": {},
"CreatureNameGenerator": {
"genderRatio": 0,
"nobility": 0,
"theme": "ANIMAL"
},
"CharacterMovement": {
"CharacterMovement": {
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenFootsteps": 0.2,
"height": 1.6,
"radius": 0.3,
"jumpSpeed": 12
Expand All @@ -57,28 +35,48 @@
],
"footstepVolume": 0.03
},
"CreatureNameGenerator": {
"genderRatio": 0,
"nobility": 0,
"theme": "ANIMAL"
},
"DamageSound": {
"sounds": [
"SheepHit1",
"SheepHit2"
]
},
"Network": {},
"MinionMove": {},
"Die": {
"animationPool": [
"sheep#Death"
]
},
"FindNearbyPlayers": {
"searchRadius": 12
},
"FleeOnHit": {
"minDistance": 5,
"speedMultiplier": 1.2
},
"Health": {
"destroyEntityOnNoHealth": true,
"currentHealth": 25,
"maxHealth": 25
},
"BaseRegen": {
"regenRate": 2,
"waitBeforeRegen": 10
"Location": {},
"MinionMove": {
"movementTypes": ["walking", "leaping", "falling"]
},
"BoxShape": {
"extents": [
1.5,
1.5,
1.5
"Network": {},
"NPCMovement": {},
"Stand": {
"animationPool": [
"sheep#Idle",
"sheep#Idle",
"sheep#Idle",
"sheep#Bite_InPlace",
"sheep#Yes",
"sheep#No"
]
},
"Trigger": {
Expand All @@ -87,10 +85,13 @@
"engine:sensor"
]
},
"Behavior": {
"tree": "WildAnimals:lure"
"Walk": {
"animationPool": [
"sheep#Walk"
]
},
"FindNearbyPlayers": {
"searchRadius": 12
"WildAnimal": {
"name": "Sheep",
"icon": "WildAnimals:icons#Sheep"
}
}