Automatic Defence Mechanism

When an enemy reaches you, an explosion occurs which destroys all other infantry in a 100px radius. This is to stop large groups of infantry killing your really fast.
Torrunt · Oct 28, 2013 · 6480530 · 6480530
1 parent 16bcb02
commit 6480530
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/SingleSwitchGame/src/Entities/AI/InfantrymanAI.cs b/SingleSwitchGame/src/Entities/AI/InfantrymanAI.cs
@@ -62,7 +62,7 @@ protected override void OnWaypointReached()
                 Explosion explosion = new Explosion(Game, 8);
                 explosion.Position = Obj.Position;
                 Game.Layer_Other.AddChild(explosion);
-                Obj.Damage(Obj.Health);
+                Obj.Damage(Obj.Health, 0, Game.Player);
             }
             AlreadyAvoidedLandmine = true;
         }
@@ -77,7 +77,8 @@ public override void Update(float dt)
                 // Reached Hill
                 if (Game.Player != null)
                     Game.Player.Damage(1);
-                Obj.Damage(Obj.Health);
+                Game.Player.Weapon.Explode(Game.Player.Position, 100f, true);
+
                 return;
             }
 

diff --git a/SingleSwitchGame/src/Entities/Characters/Infantryman.cs b/SingleSwitchGame/src/Entities/Characters/Infantryman.cs
@@ -111,7 +111,7 @@ public override void Update(float dt)
                     return;
                 // Red Hot Beach?
                 if (Game.Player.HasPowerup(Powerup.RED_HOT_BEACH))
-                    Damage(10, DamageType.FIRE);
+                    Damage(10, DamageType.FIRE, Game.Player);
             }
             base.Update(dt);
         }

diff --git a/SingleSwitchGame/src/Weapons/CannonWeapon.cs b/SingleSwitchGame/src/Weapons/CannonWeapon.cs
@@ -61,8 +61,12 @@ public override void Fire(Vector2f pos, float direction, Vector2f? targetPos = n
                 ShootSound2.Play();
         }
 
-        public override void Explode(Vector2f pos)
+        /// <param name="radius">If left at -1, will use ExplosionRadius.</param>
+        /// <param name="directCall">If true, will not credit kill or activate pick-ups.</param>
+        public override void Explode(Vector2f pos, float radius = -1, bool directCall = false)
         {
+            if (radius == -1)
+                radius = ExplosionRadius;
             // Collision
             bool hitSomething = false;
             int numChildren = Game.Layer_Objects.NumChildren;
@@ -72,19 +76,19 @@ public override void Explode(Vector2f pos)
 
                 if (obj is PhysicalEntity && !obj.CanTakeDamage)
                     continue;
-                if ((!(obj is CollisionEntity) || obj.Collision == null) && !Utils.InCircle(pos, ExplosionRadius, obj.Position)) // Collide with Position if obj is not a CollisionEntity or has no Collision
+                if ((!(obj is CollisionEntity) || obj.Collision == null) && !Utils.InCircle(pos, radius, obj.Position)) // Collide with Position if obj is not a CollisionEntity or has no Collision
                     continue;
-                if (obj.Collision is CircleShape && !Utils.CircleCircleCollision(pos, ExplosionRadius, obj.Position, obj.Collision.Radius))
+                if (obj.Collision is CircleShape && !Utils.CircleCircleCollision(pos, radius, obj.Position, obj.Collision.Radius))
                     continue;
-                if (obj.Collision is RectangleShape && !Utils.CircleRectangleCollision(pos, ExplosionRadius, obj.Collision, obj.Rotation, obj.Position))
+                if (obj.Collision is RectangleShape && !Utils.CircleRectangleCollision(pos, radius, obj.Collision, obj.Rotation, obj.Position))
                     continue;
 
                 if (obj is PhysicalEntity)
                 {
                     // Damage
-                    obj.Damage(Damage, 0, SourceObject);
+                    obj.Damage(Damage, 0, !directCall ? SourceObject : null);
                 }
-                else if (obj is Pickup)
+                else if (!directCall && obj is Pickup)
                 {
                     // Pickup
                     obj.Activate(SourceObject);
@@ -103,7 +107,7 @@ public override void Explode(Vector2f pos)
             if (hitSomething || Utils.InCircle(Game.Island, pos))
             {
                 // Explosion
-                Explosion explosion = new Explosion(Game, ExplosionRadius);
+                Explosion explosion = new Explosion(Game, radius);
                 explosion.Position = pos;
                 Game.Layer_OtherAbove.AddChild(explosion);
 
@@ -128,7 +132,7 @@ public override void Explode(Vector2f pos)
             }
 
 
-            if (Game.Player == null)
+            if (directCall || Game.Player == null)
                 return;
             if (hitSomething)
                 Game.Player.IncreaseScoreMultiplier();

diff --git a/SingleSwitchGame/src/Weapons/ProjectileWeapon.cs b/SingleSwitchGame/src/Weapons/ProjectileWeapon.cs
@@ -66,7 +66,7 @@ public virtual void OnProjectileCollision(Projectile proj, dynamic hitTarget = n
             Explode(proj.Position);
         }
         /// <summary>The Explosion caused by the projectiles if there is one.</summary>
-        public virtual void Explode(Vector2f pos)
+        public virtual void Explode(Vector2f pos, float radius = -1, bool directCall = false)
         {
         }