Added knife and fixed pick up weapon bug

c272 · Mar 17, 2022 · 0ddf39c · 0ddf39c
1 parent 7e8f54c
commit 0ddf39c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/Assets/LancasterGuy_Knife_Attacked.png b/Assets/LancasterGuy_Knife_Attacked.png
diff --git a/Assets/LancasterGuy_Knife_Resting.png b/Assets/LancasterGuy_Knife_Resting.png
diff --git a/Characters/Character.cs b/Characters/Character.cs
@@ -182,15 +182,14 @@ public void ScanAndPickUpEntities()
             {
                 if (Scene.GridToTileLocation(entity.Position) == Scene.GridToTileLocation(this.Position) && entity != doNotPickUp)
                 {
-                    //UNCOMMENT
                     // This means, we have an entity that we can pick up.
-                    entity.PickedUp();
                     entity.Initialise(Scene, Layer);
                     if (entity is Weapon)
                     {
                         weapon = (Weapon)entity;
                         weapon.SetCharacter(this);
                     }
+                    entity.PickedUp();
                 }
             }
         }

diff --git a/Characters/Player.cs b/Characters/Player.cs
@@ -93,10 +93,11 @@ private float clamp(float val, float min, float max)
             else return val;
         }
 
-        public void SpawnRandomWeapon()
+        public void SpawnRandomKnife()
         {
-            Fists e = new Fists();
-            e.SetCharacter(this);
+            Knife k = new Knife();
+            k.Initialise(Scene, Layer);
+            k.Spawn(Position);
         }
 
         public void Respawn()

diff --git a/Entities/Weapons/Knife.cs b/Entities/Weapons/Knife.cs
@@ -13,25 +13,11 @@ namespace CampusCrawl.Entities.Weapons
 {
     internal class Knife : Weapon
     {
-        int lungeSize = 10;
         public Knife() : base("Assets/Knife.png", "Knife")
         {
-            damage = 5;
+            damage = 2;
             range = 1;
-            knockback = 20;
-        }
-
-        public void Lunge(float multiplier,bool player)
-        {
-            range += 2;
-            damage += 1 * multiplier;
-            float[] attackDirection = character.mouseDirection();
-            if (!player)
-                attackDirection = character.attackDirection;
-            character.PushSelf(-(int)attackDirection[0] * lungeSize, -(int)attackDirection[1] * lungeSize);
-            Attack(true,player);
-            damage -= 1 * multiplier;
-            range -= 2;
+            knockback = 15;
         }
     }
 }
diff --git a/Game.cs b/Game.cs
@@ -42,6 +42,7 @@ public void StartGame(Point location)
             mainPlayer.SetLayer("Objects");
             BaseScene scene = (BaseScene)TileEngine.Instance.GetScene();
             mainPlayer.CreateAndSetWeapon(new Fists());
+            mainPlayer.SpawnRandomKnife();
         }
         public override void Initialize()
         {

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