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

Feature: split agent projects and improved namespaces #175

Merged
merged 7 commits into from
Jun 28, 2024
Merged

Feature: split agent projects and improved namespaces #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7dd83d8
Start of agent project split
crashkonijn Jun 26, 2024
1886151
Merge branch 'feature/v2.2' into feature/split-agent-projects
crashkonijn Jun 28, 2024
154aa51
Fixed merge issues
crashkonijn Jun 28, 2024
5883592
Temp
crashkonijn Jun 28, 2024
7f66517
Fixes #129
crashkonijn Jun 28, 2024
84102bf
Formatted code
crashkonijn Jun 28, 2024
45c43cc
Fixed certain extension method usage, improved editor namespaces
crashkonijn Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 4 additions & 5 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/CreateItemAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
using System;
using System.Linq;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.References;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Classes.Items;
using CrashKonijn.Goap.Demos.Complex.Goap;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Runtime;
using UnityEngine;
using Random = UnityEngine.Random;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class CreateItemAction<TCreatable> : ActionBase<CreateItemAction<TCreatable>.Data, CreateItemAction<TCreatable>.Props>, IInjectable
public class CreateItemAction<TCreatable> : GoapActionBase<CreateItemAction<TCreatable>.Data, CreateItemAction<TCreatable>.Props>, IInjectable
where TCreatable : ItemBase, ICreatable
{
private ItemFactory itemFactory;
Expand Down
11 changes: 5 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/EatAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using System.Linq;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.References;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Goap;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class EatAction : ActionBase<EatAction.Data>, IInjectable
public class EatAction : GoapActionBase<EatAction.Data>, IInjectable
{
private InstanceHandler instanceHandler;

Expand All @@ -28,7 +27,7 @@ public override void Start(IMonoAgent agent, Data data)
data.Inventory.Hold(data.Eatable);
}

public override bool IsValid(IMonoAgent agent, Data data)
public override bool IsValid(IActionReceiver agent, Data data)
{
if (data.Eatable == null)
return false;
Expand Down
10 changes: 4 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/GatherItemAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
using System;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.References;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Goap;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Runtime;
using UnityEngine;
using Random = UnityEngine.Random;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class GatherItemAction<TGatherable> : ActionBase<GatherItemAction<TGatherable>.Data, GatherItemAction<TGatherable>.Props>, IInjectable
public class GatherItemAction<TGatherable> : GoapActionBase<GatherItemAction<TGatherable>.Data, GatherItemAction<TGatherable>.Props>, IInjectable
where TGatherable : ItemBase
{
private ItemFactory itemFactory;
Expand Down
10 changes: 4 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/HaulItemAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
using System.Linq;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes;
using CrashKonijn.Goap.Classes.References;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Classes.Sources;
using CrashKonijn.Goap.Demos.Complex.Goap;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Runtime;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class HaulItemAction : ActionBase<HaulItemAction.Data>, IInjectable
public class HaulItemAction : GoapActionBase<HaulItemAction.Data>, IInjectable
{
private ItemCollection itemCollection;

Expand Down
12 changes: 5 additions & 7 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/PickupItemAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
using System.Linq;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes;
using CrashKonijn.Goap.Classes.References;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Goap;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class PickupItemAction<THoldable> : ActionBase<PickupItemAction<THoldable>.Data>, IInjectable
public class PickupItemAction<THoldable> : GoapActionBase<PickupItemAction<THoldable>.Data>, IInjectable
where THoldable : IHoldable
{
private ItemCollection itemCollection;
Expand Down Expand Up @@ -51,7 +49,7 @@ public override void Start(IMonoAgent agent, Data data)
data.Holdable = holdable;
}

public override bool IsValid(IMonoAgent agent, Data data)
public override bool IsValid(IActionReceiver agent, Data data)
{
if (data.Holdable == null)
return false;
Expand Down
7 changes: 3 additions & 4 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/WanderAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using System;
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.RunStates;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Goap.Runtime;
using Random = UnityEngine.Random;

namespace CrashKonijn.Goap.Demos.Complex.Actions
{
public class WanderAction : ActionBase<WanderAction.Data, WanderAction.Props>
public class WanderAction : GoapActionBase<WanderAction.Data, WanderAction.Props>
{
public override void Created()
{
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Behaviours/AgentMoveBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex.Behaviours
Expand Down
6 changes: 3 additions & 3 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Behaviours/AgentSpawnBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Classes;
using CrashKonijn.Goap.Runtime;
using UnityEngine;
using Random = UnityEngine.Random;

Expand Down Expand Up @@ -37,7 +37,7 @@ private void Start()

private void SpawnAgent(string setId, ComplexAgentBrain.AgentType agentType, Color color)
{
var agent = Instantiate(this.agentPrefab, this.GetRandomPosition(), Quaternion.identity).GetComponent<AgentBehaviour>();
var agent = Instantiate(this.agentPrefab, this.GetRandomPosition(), Quaternion.identity).GetComponent<GoapActionProvider>();

agent.AgentType = this.goap.GetAgentType(setId);
agent.gameObject.SetActive(true);
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Behaviours/AnimationBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Agent.Core;
using CrashKonijn.Agent.Runtime;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex.Behaviours
Expand Down
9 changes: 5 additions & 4 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Behaviours/ComplexAgentBrain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Classes.Items;
using CrashKonijn.Goap.Demos.Complex.Goals;
using CrashKonijn.Goap.Runtime;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex.Behaviours
{
public class ComplexAgentBrain : MonoBehaviour
{
public AgentType agentType;
private AgentBehaviour agent;
private GoapActionProvider agent;
private ComplexHungerBehaviour complexHunger;
private ItemCollection itemCollection;
private ComplexInventoryBehaviour inventory;

private void Awake()
{
this.agent = this.GetComponent<AgentBehaviour>();
this.agent = this.GetComponent<GoapActionProvider>();
this.complexHunger = this.GetComponent<ComplexHungerBehaviour>();
this.inventory = this.GetComponent<ComplexInventoryBehaviour>();
this.itemCollection = FindObjectOfType<ItemCollection>();
Expand Down
14 changes: 8 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Behaviours/ComplexTextBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.Validators;
using CrashKonijn.Agent.Runtime;
using CrashKonijn.Goap.Runtime;
using TMPro;
using UnityEngine;

Expand All @@ -8,13 +8,15 @@ namespace CrashKonijn.Goap.Demos.Complex.Behaviours
public class ComplexTextBehaviour : MonoBehaviour
{
private TextMeshProUGUI text;
private AgentBehaviour agent;
private GoapActionProvider actionProvider;
private ComplexHungerBehaviour simpleComplexHunger;
private ComplexAgentBrain brain;
private AgentBehaviour agent;

private void Awake()
{
this.text = this.GetComponentInChildren<TextMeshProUGUI>();
this.actionProvider = this.GetComponent<GoapActionProvider>();
this.agent = this.GetComponent<AgentBehaviour>();
this.simpleComplexHunger = this.GetComponent<ComplexHungerBehaviour>();
this.brain = this.GetComponent<ComplexAgentBrain>();
Expand All @@ -27,13 +29,13 @@ private void Update()

private string GetText()
{
if (this.agent.CurrentGoal is null)
if (this.actionProvider.CurrentGoal is null)
return $"{this.GetTypeText()}\nIdle";

if (this.agent.ActionState.Action is null)
if (this.actionProvider.Agent.ActionState.Action is null)
return $"{this.GetTypeText()}\nIdle";

return $"{this.GetTypeText()}\n{this.agent.CurrentGoal.GetType().GetGenericTypeName()}\n{this.agent.ActionState.Action.GetType().GetGenericTypeName()}\n{this.agent.State}\nhunger: {this.simpleComplexHunger.hunger:0.00}";
return $"{this.GetTypeText()}\n{this.actionProvider.CurrentGoal.GetType().GetGenericTypeName()}\n{this.actionProvider.Agent.ActionState.Action.GetType().GetGenericTypeName()}\n{this.agent.State}\nhunger: {this.simpleComplexHunger.hunger:0.00}";
}

private string GetTypeText()
Expand Down
1 change: 0 additions & 1 deletion Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using CrashKonijn.Goap.Behaviours;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex
Expand Down
9 changes: 3 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Capabilities/BaseCapability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using CrashKonijn.Goap.Classes;
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Factories.Extensions;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Sensors.Target;
using TransformTarget = CrashKonijn.Goap.Demos.Complex.Targets.TransformTarget;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Capabilities
{
Expand All @@ -14,7 +11,7 @@ public override ICapabilityConfig Create()
var builder = new CapabilityBuilder("BaseCapability");

builder.AddTargetSensor<TransformSensor>()
.SetTarget<TransformTarget>();
.SetTarget<Targets.TransformTarget>();

return builder.Build();
}
Expand Down
9 changes: 3 additions & 6 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Capabilities/HungerCapability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using CrashKonijn.Goap.Classes;
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Actions;
using CrashKonijn.Goap.Demos.Complex.Classes.Items;
using CrashKonijn.Goap.Demos.Complex.Factories.Extensions;
using CrashKonijn.Goap.Demos.Complex.Goals;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Targets;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using TransformTarget = CrashKonijn.Goap.Demos.Complex.Targets.TransformTarget;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Capabilities
{
Expand All @@ -25,7 +22,7 @@ public override ICapabilityConfig Create()

// Actions
builder.AddAction<EatAction>()
.SetTarget<TransformTarget>()
.SetTarget<Targets.TransformTarget>()
.AddEffect<IsHungry>(EffectType.Decrease)
.AddCondition<IsHolding<IEatable>>(Comparison.GreaterThanOrEqual, 1);

Expand Down
6 changes: 2 additions & 4 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Capabilities/WanderCapability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
using CrashKonijn.Goap.Classes;
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Actions;
using CrashKonijn.Goap.Demos.Complex.Factories.Extensions;
using CrashKonijn.Goap.Demos.Complex.Goals;
using CrashKonijn.Goap.Demos.Complex.Sensors.Target;
using CrashKonijn.Goap.Demos.Complex.Targets;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Capabilities
{
Expand Down
9 changes: 4 additions & 5 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/CleanerAgentTypeConfigFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
using CrashKonijn.Goap.Behaviours;
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core.Interfaces;
using CrashKonijn.Agent.Core;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Actions;
using CrashKonijn.Goap.Demos.Complex.Classes;
using CrashKonijn.Goap.Demos.Complex.Factories.Capabilities;
using CrashKonijn.Goap.Demos.Complex.Goals;
using CrashKonijn.Goap.Demos.Complex.Sensors.World;
using CrashKonijn.Goap.Demos.Complex.Targets;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories
{
Expand All @@ -28,7 +27,7 @@ public override IAgentTypeConfig Create()
.AddCondition<ItemsOnFloor>(Comparison.SmallerThanOrEqual, 0);

capability.AddAction<HaulItemAction>()
.SetTarget<TransformTarget>()
.SetTarget<Targets.TransformTarget>()
.AddEffect<ItemsOnFloor>(EffectType.Decrease)
.AddCondition<ItemsOnFloor>(Comparison.GreaterThanOrEqual, 1)
.SetMoveMode(ActionMoveMode.PerformWhileMoving);
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Extensions/ActionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System;
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Actions;
using CrashKonijn.Goap.Demos.Complex.Behaviours;
using CrashKonijn.Goap.Demos.Complex.Classes.Items;
using CrashKonijn.Goap.Demos.Complex.Classes.Sources;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Targets;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Extensions
{
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Extensions/GoalExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Core.Enums;
using CrashKonijn.Goap.Core;
using CrashKonijn.Goap.Demos.Complex.Goals;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Extensions
{
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Extensions/TargetSensorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Sensors.Target;
using CrashKonijn.Goap.Demos.Complex.Targets;
using CrashKonijn.Goap.Runtime;
using UnityEngine;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Extensions
Expand Down
4 changes: 2 additions & 2 deletions Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Extensions/WorldSensorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CrashKonijn.Goap.Classes.Builders;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Interfaces;
using CrashKonijn.Goap.Demos.Complex.Sensors.World;
using CrashKonijn.Goap.Demos.Complex.WorldKeys;
using CrashKonijn.Goap.Runtime;

namespace CrashKonijn.Goap.Demos.Complex.Factories.Extensions
{
Expand Down
Loading
Loading