Skip to content

Generic state machine setup #3

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

Open
abhi6403 wants to merge 15 commits into
base: Project-Setup
Choose a base branch
from
Open

Generic state machine setup #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
44f2f1a
Implemented Finite State Machine for OnePunchMan
mridul-outscal Jul 25, 2023
ef458ec
Implemented PatrolMan AI with Finite State Machine
mridul-outscal Jul 25, 2023
4ae0dfc
updated data and prefabs
mridul-outscal Jul 25, 2023
1513800
Merge branch 'dev/StateMachine_Setup' into dev/StateMachine_Solution
mridul-outscal Jul 28, 2023
68b639e
Merge branch 'dev/Patrol_Man_Setup' into mergeTest
mridul-outscal Jul 28, 2023
c0cde62
Merge branch 'dev/StateMachine_Setup' into dev/StateMachine_Solution
mridul-outscal Jul 29, 2023
1bf72a6
Merge branch 'dev/Patrol_Man_Setup' into de/Patrol_Man_Solution
mridul-outscal Jul 29, 2023
01ef8cf
Merge branch 'dev/StateMachine_Setup' into dev/StateMachine_Solution
mridul-outscal Oct 17, 2023
ac71298
Merge branch 'dev/Patrol_Man_Setup' into de/Patrol_Man_Solution
mridul-outscal Oct 17, 2023
9c973a2
Merge branch 'State-Machine-Setup' into State-Machine-Solution
mridul-outscal Oct 18, 2023
1f1be35
Merge branch 'Patrol-Man-Setup' into Patrol-Man-Solution
mridul-outscal Oct 18, 2023
5a9286d
Unity Changes
abhi6403 Mar 25, 2025
3cbb1af
unity changes
abhi6403 Mar 27, 2025
79b954b
created generic state machine
abhi6403 Mar 27, 2025
9fc262a
using Generic State Machine
abhi6403 Mar 27, 2025
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
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .idea/.idea.AGD_StateMachine/.idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.AGD_StateMachine/.idea/indexLayout.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.AGD_StateMachine/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

188 changes: 126 additions & 62 deletions Assets/Fonts/Kenney Future SDF.asset
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 1/OnPunchMan_1.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 0
SpawnPosition: {x: 0.75, y: 1.5, z: 8}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 3.5
MovementSpeed: 1
MaximumHealth: 10
RangeRadius: 4
IdleTime: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 1/OnPunchMan_2.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 0
SpawnPosition: {x: 3, y: 1.5, z: 14}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 3.5
MovementSpeed: 1
MaximumHealth: 10
RangeRadius: 4
IdleTime: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 1/OnPunchMan_3.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 0
SpawnPosition: {x: -5.5, y: 1.5, z: 8.5}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 3.5
MovementSpeed: 1
MaximumHealth: 10
RangeRadius: 4
IdleTime: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 1/OnPunchMan_4.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 0
SpawnPosition: {x: -4, y: 1.5, z: -5}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 3.5
MovementSpeed: 1
MaximumHealth: 10
RangeRadius: 4
IdleTime: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 1/OnPunchMan_5.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 0
SpawnPosition: {x: 3, y: 1.5, z: 0.75}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 3.5
MovementSpeed: 1
MaximumHealth: 10
RangeRadius: 4
IdleTime: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_1.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: 8, y: 1.5, z: 14}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_2.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: -5, y: 1.5, z: 7}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_3.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: -1, y: 1.5, z: -3}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_4.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: -1, y: 1.5, z: 10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_5.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: 7.5, y: 1.5, z: -1}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 2/PatrolMan_6.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 1
SpawnPosition: {x: 7.5, y: 1.5, z: -10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_1.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: 8, y: 1.5, z: 14}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_2.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: -5, y: 1.5, z: 7}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_3.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: -1, y: 1.5, z: -3}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_4.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: -1, y: 1.5, z: 10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_5.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: 7.5, y: 1.5, z: 5}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 3/HitMan_6.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 2
SpawnPosition: {x: 7.5, y: 1.5, z: -10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_1.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: 8, y: 1.5, z: 14}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_2.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: -5, y: 1.5, z: 7}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_3.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: -1, y: 1.5, z: -3}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_4.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: -1, y: 1.5, z: 10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_5.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: 7.5, y: 1.5, z: 5}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Enemies/Level 4/Robot_6.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
Type: 3
SpawnPosition: {x: 7.5, y: 1.5, z: -10}
SpawnRotation: {x: 0, y: -90, z: 0}
MovementSpeed: 5
MovementSpeed: 1.5
MaximumHealth: 10
RangeRadius: 6
IdleTime: 3
Expand Down
1 change: 1 addition & 0 deletions Assets/Scenes/GameScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ MonoBehaviour:
playerScriptableObject: {fileID: 11400000, guid: 4240caefbf2e2f64eb8046b7c92646e0, type: 2}
levelScriptableObjects:
- {fileID: 11400000, guid: bada358cc71564c49831629438d87724, type: 2}
- {fileID: 11400000, guid: 3ceefc333a7c35a4d8743f64f88754db, type: 2}
sfxSource: {fileID: 629913882}
bgMusicSource: {fileID: 973737936}
--- !u!4 &2053379264
Expand Down
8 changes: 4 additions & 4 deletions Assets/Scripts/Enemy/EnemyController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ public class EnemyController

protected int currentHealth;
protected EnemyState currentState;
protected NavMeshAgent Agent => enemyView.Agent;
protected EnemyScriptableObject Data => enemyScriptableObject;
protected Quaternion Rotation => enemyView.transform.rotation;
protected Vector3 Position => enemyView.transform.position;
public NavMeshAgent Agent => enemyView.Agent;
public EnemyScriptableObject Data => enemyScriptableObject;
public Quaternion Rotation => enemyView.transform.rotation;
public Vector3 Position => enemyView.transform.position;


public EnemyController(EnemyScriptableObject enemyScriptableObject)
Expand Down
3 changes: 3 additions & 0 deletions Assets/Scripts/Enemy/EnemyService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public EnemyController CreateEnemy(EnemyScriptableObject enemyScriptableObject)
case EnemyType.OnePunchMan:
enemy = new OnePunchManController(enemyScriptableObject);
break;
case EnemyType.PatrolMan:
enemy = new PatrolManController(enemyScriptableObject);
break;
default:
enemy = new EnemyController(enemyScriptableObject);
break;
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Enemy/EnemyType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public enum EnemyType
{
OnePunchMan,
DashMan,
PatrolMan,
Hitman,
Robot
}
Expand Down
Loading