fixed collision detection

c272 · Mar 13, 2022 · 4d3813e · 4d3813e
1 parent 6856666
commit 4d3813e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Characters/Enemy.cs b/Characters/Enemy.cs
@@ -329,7 +329,7 @@ public float[] playerDirection()
 
         private void attack()
         {
-            if (playerInView(40,true) && player.pushStats.isPushed() == false && player.attacking == false && !attacking)
+            if (playerInView(37,true) && player.pushStats.isPushed() == false && player.attacking == false && !attacking)
             {
                 //attacking = true;
                 if (weapon != null)

diff --git a/Characters/Player.cs b/Characters/Player.cs
@@ -54,7 +54,7 @@ public Player()
             attackCooldown.Loop = true;
             speed = 110;
             health = 100;
-            damage = 5;
+            damage = 8;
             healthBar = new ProgressBar(new Vector2(200, 32));
             healthBar.ForegroundColour = Color.Green;
             healthBar.BackgroundColour = Color.Red;

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) < 35 && Math.Abs(enemyPos.Y - currentPos.Y) < 35)
+                else if (Math.Abs(enemyPos.X - currentPos.X) < 40 && Math.Abs(enemyPos.Y - currentPos.Y) < 40)
                 {
                     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) < 35 && Math.Abs(enemy.Position.Y - character.Position.Y) < 35)
+                    if (Math.Abs(enemy.Position.X - character.Position.X) < 40 && Math.Abs(enemy.Position.Y - character.Position.Y) < 40)
                     {
                         enemy.onDamage(damage * character.damage, character.attackDirection, (int)(knockback * 1.5));
                         isAttacking = false;