- Added Tombot enemy and the igloo Tombot generator.

- Added Snow Shooter enemy. - Added Snowball enemy. - Finished the implementation of Jamming. - Fixed Flammingle head hitbox. - Changed Penguin RNG distribution to prevent (or reduce the changes of) him repeat his moves so many times in a row. - Tweaked tiled sprite rendering by using the native capabilities of graphical API instead using a looping. This will allow to render a tiled sprite quickly even if the number of tiles is higer.
sharivan · Mar 22, 2023 · c7a226d · c7a226d
1 parent 035bb43
commit c7a226d
Show file tree

Hide file tree

Showing 93 changed files with 1,887 additions and 353 deletions.
diff --git a/XSharp/Engine/Consts.cs b/XSharp/Engine/Consts.cs
@@ -235,5 +235,5 @@ public class Consts
     public static readonly bool SKIP_MENU = false;
     public static readonly bool SKIP_INTRO = false;
     public const int INITIAL_LEVEL = 8;
-    public const int INITIAL_CHECKPOINT = 1;
+    public const int INITIAL_CHECKPOINT = 0;
 }
diff --git a/XSharp/Engine/Entities/Camera.cs b/XSharp/Engine/Entities/Camera.cs
@@ -328,7 +328,7 @@ public bool IsVisible(Box box)
         return VisibleBox(box).IsValid();
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
@@ -383,9 +383,9 @@ private bool DoMoving()
     }
 
     // TODO : Smooth movement is not working right for some situations. Please fix it!
-    protected internal override void PostThink()
+    protected override void OnPostThink()
     {
-        base.PostThink();
+        base.OnPostThink();
 
         DoMoving();
     }
@@ -394,7 +394,7 @@ protected override void OnStartTouch(Entity entity)
     {
         base.OnStartTouch(entity);
 
-        if (entity.Alive || entity.Spawning || !entity.Respawnable || !entity.RespawnOnNear)
+        if (entity.Alive || entity.Spawning || !entity.SpawnOnNear)
             return;
 
         if ((!entity.Dead || Engine.FrameCounter - entity.DeathFrame >= entity.MinimumIntervalToRespawn) && entity.IsInSpawnArea(VectorKind.ORIGIN))

diff --git a/XSharp/Engine/Entities/Checkpoint.cs b/XSharp/Engine/Entities/Checkpoint.cs
@@ -58,7 +58,7 @@ protected override Box GetHitbox()
         return hitbox;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Direction.cs b/XSharp/Engine/Entities/Direction.cs
@@ -65,4 +65,12 @@ public static int GetVerticalSignal(this Direction direction)
     {
         return direction == Direction.UP ? -1 : direction == Direction.DOWN ? 1 : 0;
     }
+
+    public static Vector GetUnitaryVector(this Direction direction)
+    {
+        var huv = direction.GetHorizontalUnitaryVector();
+        var vuv = direction.GetVerticalUnitaryVector();
+        var s = huv + vuv;
+        return s.Versor();
+    }
 }
diff --git a/XSharp/Engine/Entities/Effects/ChargingEffect.cs b/XSharp/Engine/Entities/Effects/ChargingEffect.cs
@@ -119,14 +119,14 @@ public ChargingEffect()
         SetAnimationNames("ChargingLevel1", "ChargingLevel2");
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
         level = 1;
     }
 
-    protected override void Think()
+    protected override void OnThink()
     {
         if (!soundPlayed)
         {
@@ -137,7 +137,7 @@ protected override void Think()
         Origin = Charger.Hitbox.Center;
         Direction = Charger.Direction;
 
-        base.Think();
+        base.OnThink();
     }
 
     protected override void OnDeath()

diff --git a/XSharp/Engine/Entities/Effects/DashSmokeEffect.cs b/XSharp/Engine/Entities/Effects/DashSmokeEffect.cs
@@ -36,7 +36,7 @@ public DashSmokeEffect()
         SetAnimationNames("DashSmokeEffect");
     }
 
-    protected internal override void OnAnimationEnd(Animation animation)
+    protected override void OnAnimationEnd(Animation animation)
     {
         base.OnAnimationEnd(animation);
         KillOnNextFrame();

diff --git a/XSharp/Engine/Entities/Effects/DashSparkEffect.cs b/XSharp/Engine/Entities/Effects/DashSparkEffect.cs
@@ -60,7 +60,7 @@ public DashSparkEffect()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -71,14 +71,14 @@ protected internal override void OnCreate()
         SetAnimationNames("PreDashSparkEffect", "DashSparkEffect");
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
         Direction = Player != null ? Player.Direction : DefaultDirection;
     }
 
-    protected internal override void OnAnimationEnd(Animation animation)
+    protected override void OnAnimationEnd(Animation animation)
     {
         base.OnAnimationEnd(animation);
 

diff --git a/XSharp/Engine/Entities/Effects/ExplosionEffect.cs b/XSharp/Engine/Entities/Effects/ExplosionEffect.cs
@@ -63,7 +63,7 @@ public ExplosionEffect()
         SetAnimationNames("Explosion");
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
@@ -87,7 +87,7 @@ protected internal override void OnSpawn()
         }
     }
 
-    protected internal override void OnAnimationEnd(Animation animation)
+    protected override void OnAnimationEnd(Animation animation)
     {
         base.OnAnimationEnd(animation);
         KillOnNextFrame();

diff --git a/XSharp/Engine/Entities/Effects/SpriteEffect.cs b/XSharp/Engine/Entities/Effects/SpriteEffect.cs
@@ -75,7 +75,7 @@ public override FixedSingle GetGravity()
         return HasGravity ? base.GetGravity() : FixedSingle.ZERO;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Effects/WallKickEffect.cs b/XSharp/Engine/Entities/Effects/WallKickEffect.cs
@@ -36,7 +36,7 @@ public WallKickEffect()
         SetAnimationNames("WallKickEffect");
     }
 
-    protected internal override void OnAnimationEnd(Animation animation)
+    protected override void OnAnimationEnd(Animation animation)
     {
         base.OnAnimationEnd(animation);
         KillOnNextFrame();

diff --git a/XSharp/Engine/Entities/Effects/WallSlideEffect.cs b/XSharp/Engine/Entities/Effects/WallSlideEffect.cs
@@ -36,7 +36,7 @@ public WallSlideEffect()
         SetAnimationNames("WallSlideEffect");
     }
 
-    protected internal override void OnAnimationEnd(Animation animation)
+    protected override void OnAnimationEnd(Animation animation)
     {
         base.OnAnimationEnd(animation);
         KillOnNextFrame();

diff --git a/XSharp/Engine/Entities/Enemies/AxeMax/AxeMax.cs b/XSharp/Engine/Entities/Enemies/AxeMax/AxeMax.cs
@@ -115,7 +115,7 @@ public AxeMax()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -141,7 +141,7 @@ protected override Box GetHitbox()
         return AxeMaxTrunkBase.HITBOX;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxLumberjack.cs b/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxLumberjack.cs
@@ -52,7 +52,7 @@ public AxeMaxLumberjack()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -126,7 +126,7 @@ protected override FixedSingle GetCollisionBoxLegsHeight()
         return COLLISION_BOX_LEGS_HEIGHT;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunk.cs b/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunk.cs
@@ -63,7 +63,7 @@ public AxeMaxTrunk()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -134,7 +134,7 @@ public override FixedSingle GetGravity()
         return Idle ? base.GetGravity() : 0;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
@@ -157,9 +157,9 @@ protected internal override void OnSpawn()
         }
     }
 
-    protected override void Think()
+    protected override void OnThink()
     {
-        base.Think();
+        base.OnThink();
 
         if (TrunkIndex >= 0)
         {

diff --git a/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunkBase.cs b/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunkBase.cs
@@ -60,7 +60,7 @@ public AxeMaxTrunkBase()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -96,7 +96,7 @@ internal Vector GetTrunkPositionFromIndex(int index)
         return (origin.X, origin.Y - 16 * (index + 1));
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
@@ -126,9 +126,9 @@ private void SpawnTrunk(int index)
         trunk.Spawn();
     }
 
-    protected override void Think()
+    protected override void OnThink()
     {
-        base.Think();
+        base.OnThink();
 
         if (!Regenerating)
         {

diff --git a/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunkHurtbox.cs b/XSharp/Engine/Entities/Enemies/AxeMax/AxeMaxTrunkHurtbox.cs
@@ -33,7 +33,7 @@ public AxeMaxTrunkHurtbox()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -63,7 +63,7 @@ protected override Box GetCollisionBox()
         return COLLISION_BOX;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Enemies/BattonBoneG.cs b/XSharp/Engine/Entities/Enemies/BattonBoneG.cs
@@ -100,7 +100,7 @@ public BattonBoneG()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -119,7 +119,7 @@ public override FixedSingle GetGravity()
         return 0;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Enemies/BombBeen/BombBeen.cs b/XSharp/Engine/Entities/Enemies/BombBeen/BombBeen.cs
@@ -166,7 +166,7 @@ public BombBeen()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -239,7 +239,7 @@ protected override Box GetHitbox()
         return HITBOX;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 

diff --git a/XSharp/Engine/Entities/Enemies/BombBeen/BombBeenBomb.cs b/XSharp/Engine/Entities/Enemies/BombBeen/BombBeenBomb.cs
@@ -39,7 +39,7 @@ public BombBeenBomb()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -103,10 +103,11 @@ protected override Box GetCollisionBox()
         return BombBeen.BOMB_COLLISION_BOX;
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
+        KillOnOffscreen = true;
         Health = BombBeen.BOMB_HEALTH;
 
         tick = 0;

diff --git a/XSharp/Engine/Entities/Enemies/Bosses/Boss.cs b/XSharp/Engine/Entities/Enemies/Bosses/Boss.cs
@@ -170,7 +170,7 @@ protected Boss()
     {
     }
 
-    protected internal override void OnCreate()
+    protected override void OnCreate()
     {
         base.OnCreate();
 
@@ -232,7 +232,7 @@ protected override bool OnTakeDamage(Sprite attacker, ref FixedSingle damage)
         return base.OnTakeDamage(attacker, ref damage);
     }
 
-    protected internal override void OnSpawn()
+    protected override void OnSpawn()
     {
         base.OnSpawn();
 
@@ -253,9 +253,9 @@ protected override void OnDeath()
         base.OnDeath();
     }
 
-    protected override void Think()
+    protected override void OnThink()
     {
-        base.Think();
+        base.OnThink();
 
         if (HealthFilling)
         {

diff --git a/XSharp/Engine/Entities/Enemies/Bosses/BossHealthHUD.cs b/XSharp/Engine/Entities/Enemies/Bosses/BossHealthHUD.cs
@@ -18,11 +18,11 @@ public BossHealthHUD()
         Image = HUDImage.BOSS;
     }
 
-    protected internal override void PostThink()
+    protected override void OnPostThink()
     {
         Capacity = Boss.MaxHealth;
         Value = Boss.Health;
 
-        base.PostThink();
+        base.OnPostThink();
     }
 }