lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add ai type and state info

Browse Source
This commit is contained in:
Иванов Иван
2024-08-24 12:13:40 +02:00
parent ee37ffb219
commit f50e218013
7 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Client/Domain/AI/AI.cs
View File

@@ -1,4 +1,5 @@
using Client.Domain.AI.State;
using Client.Domain.Common;
using Client.Domain.Entities;
using Client.Domain.Events;
using Client.Domain.Service;
@@ -13,7 +14,7 @@ using System.Windows.Input;
namespace Client.Domain.AI
{
public class AI : AIInterface
public class AI : ObservableObject, AIInterface
{
public AI(WorldHandler worldHandler, Config config, AsyncPathMoverInterface asyncPathMover, TransitionBuilderLocator locator)
{
@@ -27,16 +28,17 @@ namespace Client.Domain.AI
public void Toggle()
{
isEnabled = !isEnabled;
if (isEnabled)
IsEnabled = !IsEnabled;
if (IsEnabled)
{
ResetState();
}
}
public bool IsEnabled => isEnabled;
public bool IsEnabled { get { return isEnabled; } private set { if (isEnabled != value) { isEnabled = value; OnPropertyChanged(); } } }
public TypeEnum Type { get { return type; } set { if (type != value) { type = value; ResetState(); } } }
public TypeEnum Type { get { return type; } set { if (type != value) { type = value; ResetState(); OnPropertyChanged(); } } }
public BaseState.Type CurrentState { get { return currentState; } private set { if (currentState != value) { currentState = value; OnPropertyChanged(); } } }
public async Task Update()
{
@@ -44,19 +46,18 @@ namespace Client.Domain.AI
await Task.Run(() =>
{
if (isEnabled && worldHandler.Hero != null)
if (IsEnabled && worldHandler.Hero != null)
{
states[currentState].Execute();
states[CurrentState].Execute();
foreach (var transition in locator.Get(Type).Build(worldHandler, config, asyncPathMover))
{
if (transition.fromStates.ContainsKey(BaseState.Type.Any) && transition.toState != currentState || transition.fromStates.ContainsKey(currentState))
if (transition.fromStates.ContainsKey(BaseState.Type.Any) && transition.toState != CurrentState || transition.fromStates.ContainsKey(CurrentState))
{
if (transition.predicate(states[currentState]))
if (transition.predicate(states[CurrentState]))
{
states[currentState].OnLeave();
currentState = transition.toState;
Debug.WriteLine(currentState.ToString());
states[currentState].OnEnter();
states[CurrentState].OnLeave();
CurrentState = transition.toState;
states[CurrentState].OnEnter();
break;
}
}
@@ -87,7 +88,7 @@ namespace Client.Domain.AI
private void ResetState()
{
currentState = BaseState.Type.Idle;
CurrentState = BaseState.Type.Idle;
}
private readonly WorldHandler worldHandler;

7
Client/Domain/AI/AIInterface.cs
View File

@@ -1,4 +1,6 @@
using Client.Domain.Events;
using Client.Domain.AI.State;
using Client.Domain.Common;
using Client.Domain.Events;
using System;
using System.Collections.Generic;
using System.Data;
@@ -8,7 +10,7 @@ using System.Threading.Tasks;
namespace Client.Domain.AI
{
public interface AIInterface
public interface AIInterface : ObservableObjectInterface
{
Task Update();
@@ -17,5 +19,6 @@ namespace Client.Domain.AI
bool IsEnabled { get; }
TypeEnum Type { get; set; }
BaseState.Type CurrentState { get; }
}
}

2
Client/Domain/Common/ObservableObject.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Client.Domain.Common
{
public class ObservableObject : INotifyPropertyChanged
public class ObservableObject : ObservableObjectInterface
{
public event PropertyChangedEventHandler? PropertyChanged;
public void OnPropertyChanged([CallerMemberName] string prop = "")

15
Client/Domain/Common/ObservableObjectInterface.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace Client.Domain.Common
{
public interface ObservableObjectInterface : INotifyPropertyChanged
{
void OnPropertyChanged([CallerMemberName] string prop = "");
}
}