From 2161028733a9fff3bb4d523b08c6e2b819fe03b6 Mon Sep 17 00:00:00 2001
From: Ny Bruker <robinhs@stud.ntnu.no>
Date: Sat, 29 Oct 2022 19:12:58 +0200
Subject: [PATCH] Updated to use the new paramers.
---
MrBigsock/Assets/Code/PlayerController.cs | 30 ++++++++++---------
MrBigsock/Assets/Code/orc/Enemy_orc_range.cs | 11 ++++++-
.../Code/skeleton/Enemy_skeleton_range.cs | 9 +++++-
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs
index be7b14b2..80c37730 100644
--- a/MrBigsock/Assets/Code/PlayerController.cs
+++ b/MrBigsock/Assets/Code/PlayerController.cs
@@ -34,6 +34,7 @@ namespace BigSock {
+
protected IAttack _testAttack;
protected IAttack _testAttack2;
protected IAbility _dodge;
@@ -118,30 +119,32 @@ namespace BigSock {
}
+
private void Update() {
+ // Regenerate mana & stamina.
Regenerate();
- if (Input.GetKeyDown(KeyCode.Space) || Input.GetMouseButton(0)) {
- // Manage attack cooldown.
- if(NextTimeCanAttack <= DateTime.Now) {
- //NextTimeCanAttack = DateTime.Now.AddSeconds(AttackCooldown);
+ // Object w/ parameters for abilities.
+ var par = new AbilityParam{
+ Actor = this,
+ TargetPos = Camera.main.ScreenToWorldPoint(Input.mousePosition),
+ MovementDir = moveDir,
+ };
- //var bullet = Instantiate(attack, new Vector3(transform.position.x, transform.position.y, transform.position.z), attack.transform.rotation);
- //bullet.GetComponent<AttackMovement>().Actor = this;
- _testAttack.Use(this, Camera.main.ScreenToWorldPoint(Input.mousePosition));
-
- }
+ // If pressed Soace or LMB: Regular attack.
+ if (Input.GetKeyDown(KeyCode.Space) || Input.GetMouseButton(0)) {
+ _testAttack.Use(par);
}
// If pressed Z: Big attack.
if(Input.GetKey(KeyCode.Z)) {
- _testAttack2.Use(this, Camera.main.ScreenToWorldPoint(Input.mousePosition));
+ _testAttack2.Use(par);
}
// If pressed X: dodge.
if(Input.GetKey(KeyCode.X)) {
- _dodge.Use(this, Camera.main.ScreenToWorldPoint(Input.mousePosition));
+ _dodge.Use(par);
}
@@ -152,9 +155,8 @@ namespace BigSock {
TryPickUpItem(item);
}
-
- if (Input.GetKeyDown(KeyCode.I))
- {
+ // Code for opening the menu.
+ if (Input.GetKeyDown(KeyCode.I)) {
GameObject canvas = GameObject.Find("Canvas");
if(canvas != null) {
var playerMenu = PrefabService.SINGLETON.Instance("UI/PlayerMenu", canvas.transform);
diff --git a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
index dff603f8..869611fd 100644
--- a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
+++ b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
@@ -71,7 +71,16 @@ namespace BigSock {
m_Animator_bow.SetTrigger("attack");
if(DateTime.Now >= NextTimeStateCanChange && target != null) {
m_Animator_bow.SetTrigger("none");
- _testAttack.Use(this, target.position);
+
+
+ // Object w/ parameters for abilities.
+ var par = new AbilityParam{
+ Actor = this,
+ TargetPos = target.position,
+ MovementDir = moveDir,
+ };
+
+ _testAttack.Use(par);
State = State.Attacking;
NextTimeStateCanChange = DateTime.Now + ATTACK_WAIT_TIME;
diff --git a/MrBigsock/Assets/Code/skeleton/Enemy_skeleton_range.cs b/MrBigsock/Assets/Code/skeleton/Enemy_skeleton_range.cs
index 91a18ee9..fbab9a4e 100644
--- a/MrBigsock/Assets/Code/skeleton/Enemy_skeleton_range.cs
+++ b/MrBigsock/Assets/Code/skeleton/Enemy_skeleton_range.cs
@@ -71,7 +71,14 @@ namespace BigSock {
if(DateTime.Now >= NextTimeStateCanChange && target != null) {
- _testAttack.Use(this, target.position);
+ // Object w/ parameters for abilities.
+ var par = new AbilityParam{
+ Actor = this,
+ TargetPos = target.position,
+ MovementDir = moveDir,
+ };
+
+ _testAttack.Use(par);
State = State.Attacking;
NextTimeStateCanChange = DateTime.Now + ATTACK_WAIT_TIME;
--
GitLab