added new assets made it so enemy rotates aswell

c272 · Mar 13, 2022 · b48aa01 · b48aa01
1 parent 805ef79
commit b48aa01
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 6 deletions.
diff --git a/Assets/LancasterGuy.png b/Assets/LancasterGuy.png
diff --git a/Assets/LancasterGuy_Fists_Attacked.png b/Assets/LancasterGuy_Fists_Attacked.png
diff --git a/Assets/LancasterGuy_Fists_Resting.png b/Assets/LancasterGuy_Fists_Resting.png
diff --git a/Assets/UclanGuy.png b/Assets/UclanGuy.png
diff --git a/Assets/UclanGuy_Fists_Attacked.png b/Assets/UclanGuy_Fists_Attacked.png
diff --git a/Assets/UclanGuy_Fists_Resting.png b/Assets/UclanGuy_Fists_Resting.png
diff --git a/Assets/YorkGuy.png b/Assets/YorkGuy.png
diff --git a/Assets/YorkGuy_Fists_Attacked.png b/Assets/YorkGuy_Fists_Attacked.png
diff --git a/Assets/YorkGuy_Fists_Resting.png b/Assets/YorkGuy_Fists_Resting.png
diff --git a/Assets/Zombie.png b/Assets/Zombie.png
diff --git a/Assets/Zombie_Fists_Attacked.png b/Assets/Zombie_Fists_Attacked.png
diff --git a/Assets/Zombie_Fists_Resting.png b/Assets/Zombie_Fists_Resting.png
diff --git a/Characters/Enemy.cs b/Characters/Enemy.cs
@@ -59,7 +59,7 @@ public void newStartDistance(int distanceFromStart, List<Node> path)
 
         public Enemy(string directionName, float distance, Vector2 location)
         {
-            playerModelPath = "Assets/dave.png";
+            playerModelPath = "FinalAssets/Zombie.png";
             isEnemy = true;
             if (directionName == "up" || directionName == "left")
                 direction = -1;
@@ -375,6 +375,21 @@ public override void Update(GameTime delta)
                 {
                     player = (Player)Scene.GameObjects.Where(x => x is Player).FirstOrDefault();
                 }
+                if(player!=null)
+                {
+                    Vector2 deltaPos = new Vector2((player.Position.X - Position.X), -(player.Position.Y - Position.Y));
+                    float angleA = sprite.Rotation;
+                    if (deltaPos.Y >= 0)
+                    {
+                        angleA = (float)Math.Atan(deltaPos.X / deltaPos.Y);
+                    }
+                    else
+                    {
+                        angleA = (float)(Math.Atan(deltaPos.X / deltaPos.Y) + Math.PI);
+                    }
+
+                    sprite.Rotation = angleA;
+                }
                 if (!pushStats.isPushed() && attacking)
                 {
                     attacking = false;

diff --git a/Characters/EnemySprint.cs b/Characters/EnemySprint.cs
@@ -13,7 +13,7 @@ internal class EnemySprint : Enemy
     {
         public EnemySprint(string directionName, float distance, Vector2 location) : base(directionName, distance, location)
         {
-            playerModelPath = "Assets/daveSprint.png";
+            playerModelPath = "FinalAssets/UclanGuy.png";
             sprite.Texture = AssetManager.AttemptLoad<Texture2D>(playerModelPath);
             speed = 150;
             damage = 7;

diff --git a/Characters/EnemyTank.cs b/Characters/EnemyTank.cs
@@ -13,7 +13,7 @@ internal class EnemyTank : Enemy
     {
         public EnemyTank(string directionName, float distance, Vector2 location) : base(directionName, distance, location)
         {
-            playerModelPath = "Assets/daveTank.png";
+            playerModelPath = "FinalAssets/YorkGuy.png";
             sprite.Texture = AssetManager.AttemptLoad<Texture2D>(playerModelPath);
             speed = 50;
             damage = 20;

diff --git a/Characters/Player.cs b/Characters/Player.cs
@@ -41,7 +41,7 @@ public class Player : Character
         //public Timer cooldown;
         public Player()
         {
-            playerModelPath = "Assets/TestModel.png";
+            playerModelPath = "FinalAssets/LancasterGuy.png";
             sprite = new SpriteComponent()
             {
                 Texture = AssetManager.AttemptLoad<Texture2D>(playerModelPath),

diff --git a/Entities/Weapon.cs b/Entities/Weapon.cs
@@ -149,7 +149,7 @@ public bool checkAttack(Vector2 newPos,bool player)
                         currentEnemy.onDamage(damage*character.damage, character.attackDirection, (int)(knockback * 1.5));
                     hit = true;
                 }
-                else if (Math.Abs(enemyPos.X - currentPos.X) < 40 && Math.Abs(enemyPos.Y - currentPos.Y) < 40)
+                else if (Math.Abs(enemyPos.X - currentPos.X) < 35 && Math.Abs(enemyPos.Y - currentPos.Y) < 35)
                 {
                     currentEnemy.onDamage(damage, character.attackDirection, (int)(knockback * 1.5));
                     hit = true;
@@ -181,7 +181,7 @@ public virtual bool Attack(bool lungeAttack,bool player)
                 Point enemyTile = Scene.GridToTileLocation(enemy.Position);
                 if (lungeAttack)
                 {
-                    if (Math.Abs(enemy.Position.X - character.Position.X) < 40 && Math.Abs(enemy.Position.Y - character.Position.Y) < 40)
+                    if (Math.Abs(enemy.Position.X - character.Position.X) < 35 && Math.Abs(enemy.Position.Y - character.Position.Y) < 35)
                     {
                         enemy.onDamage(damage * character.damage, character.attackDirection, (int)(knockback * 1.5));
                         isAttacking = false;

diff --git a/campus-crawl.teproj b/campus-crawl.teproj