Custom dash keybind implementation with proper netcode syncing

.gitignore

@@ -2,3 +2,6 @@
 .vs
 bin
 obj
+# we don't need to add the solution to version control
+PvPAdventure.sln
+*.sln

AdventureBossBar.cs

@@ -0,0 +1,57 @@
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Terraria;
+using Terraria.DataStructures;
+using Terraria.Enums;
+using Terraria.GameContent;
+using Terraria.ModLoader;
+
+namespace PvPAdventure;
+
+public class AdventureBossBar : GlobalBossBar
+{
+    public override void PostDraw(SpriteBatch spriteBatch, NPC npc, BossBarDrawParams drawParams)
+    {
+        // This is a constant position from BigProgressBarHelper.DrawFancyBar
+        var bossBarPosition = new Point(456, 22);
+
+        // Calculated as BigProgressBarHelper does
+        var rectangle =
+            Utils.CenteredRectangle(Main.ScreenSize.ToVector2() * new Vector2(0.5f, 1f) + new Vector2(0f, -50f),
+                bossBarPosition.ToVector2());
+
+        var adventureNpc = npc.GetGlobalNPC<AdventureNpc>();
+
+        // FIXME: This sort order should be pre-calculated for us so we don't need to do it all the time!
+        var teamLife = adventureNpc.TeamLife
+            .Where(kv => adventureNpc.HasBeenHurtByTeam.Contains(kv.Key))
+            .OrderByDescending(kv => kv.Value);
+
+        foreach (var (team, life) in teamLife)
+        {
+            // Shouldn't be possible, but be sure not to draw this.
+            if (team == Team.None)
+                continue;
+
+            var lifeRemaining = (float)life / npc.lifeMax;
+
+            var frame = TextureAssets.Pvp[1].Value.Frame(6);
+            frame.X = frame.Width * (int)team;
+
+            // FIXME: Looks a little silly when overlapping, maybe they should get stacked or staggered when on top.
+            var color = Color.White;
+            color *= lifeRemaining.Remap(0.85f, 1.0f, 1.0f, 0.0f);
+
+            spriteBatch.Draw(
+                TextureAssets.Pvp[1].Value,
+                rectangle.TopLeft() + new Vector2(
+                    (bossBarPosition.X * lifeRemaining) - (frame.Height / 2.0f),
+                    -30.0f
+                ),
+                frame,
+                color
+            );
+        }
+    }
+}

AdventureBuff.cs

@@ -1,4 +1,6 @@
+using System;
 using Terraria;
+using Terraria.DataStructures;
 using Terraria.ID;
 using Terraria.ModLoader;
 
@@ -19,20 +21,20 @@ public override void Update(int type, Player player, ref int buffIndex)
 
             if (player.beetleOrbs >= 1)
             {
-                damage += 0.15f;
-                attackSpeed += 0.15f;
+                damage += 0.08f;
+                attackSpeed += 0.08f;
             }
 
             if (player.beetleOrbs >= 2)
             {
-                damage += 0.10f;
-                attackSpeed += 0.10f;
+                damage += 0.08f;
+                attackSpeed += 0.08f;
             }
 
             if (player.beetleOrbs >= 3)
             {
-                damage += 0.05f;
-                attackSpeed += 0.20f;
+                damage += 0.08f;
+                attackSpeed += 0.08f;
             }
 
             player.GetDamage<MeleeDamageClass>() += damage;
@@ -48,4 +50,50 @@ public override bool RightClick(int type, int buffIndex)
 
         return true;
     }
+
+    public class RemoveFlaskBuffsOnDeath : ModPlayer
+    {
+        // Array of buff IDs to remove on death
+        private readonly int[] buffsToRemove = { 71, 73, 74, 75, 76, 77, 78, 79 }; //Every single Flask buff that doesn't go away on death for some reason
+
+        public override void Kill(double damage, int hitDirection, bool pvp, PlayerDeathReason damageSource)
+        {
+
+            for (int i = 0; i < Player.MaxBuffs; i++)
+            {
+                int buffType = Player.buffType[i];
+
+
+                foreach (int buffId in buffsToRemove)
+                {
+                    if (buffType == buffId)
+                    {
+                        Player.DelBuff(i); // Remove the buff
+                        i--; // Adjust index since we removed a buff
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    public class ArcheryNerf : GlobalItem
+    {
+        public override void ModifyWeaponDamage(Item item, Player player, ref StatModifier damage)
+        {
+            if (player.HasBuff(BuffID.Archery) && item.useAmmo == AmmoID.Arrow)
+            {
+                damage /= 1.1f;
+            }
+        }
+    }
+    public class BuffTextChange : GlobalBuff
+    {
+   public override void ModifyBuffText(int type, ref string buffName, ref string tip, ref int rare)
+        {
+            if (type == BuffID.Archery)
+            {
+                tip = "20% increased arrow speed\nNo longer grants bow damage";
+            }
+        }
+    }
 }

AdventureClientConfig.cs

@@ -12,6 +12,9 @@ public class AdventureClientConfig : ModConfig
 
     public PlayerOutlineConfig PlayerOutline { get; set; } = new();
     public bool ShiftEnterOpensAllChat { get; set; }
+
+    [DefaultValue(true)]
+    public bool IsVanillaDashEnabled { get; set; }
     [DefaultValue(true)] public bool ShowPauseMessage { get; set; }
 
     public class PlayerOutlineConfig
@@ -125,7 +128,14 @@ public class PlayerKillMarkerConfig : KillMarkerConfig
         [DefaultValue(null)] [NullAllowed] public HitMarkerConfig NpcHitMarker { get; set; }
         [DefaultValue(null)] [NullAllowed] public PlayerHitMarkerConfig PlayerHitMarker { get; set; }
         [DefaultValue(null)] [NullAllowed] public PlayerKillMarkerConfig PlayerKillMarker { get; set; }
+
+
     }
 
     public SoundEffectConfig SoundEffect { get; set; } = new();
+
+    [Header("AdventureMirror")]
+    [DefaultValue(true)] public bool OpenMapAfterRecall;
+    [DefaultValue(true)] public bool ShowPopupText;
+    [DefaultValue(true)] public bool ShowPlayerIndicationWhenWhenHovering;
 }

AdventureConfig.cs

@@ -1,3 +1,4 @@
+using PvPAdventure.Content.Items;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -194,16 +195,27 @@ public float CalculateMultiplier(float tileDistance) =>
         [DefaultValue(3000.0f)]
         public float GhostHealMaxDistance { get; set; }
 
-        [Range(0.0f, 3000.0f)]
-        [DefaultValue(3000.0f)]
         public float GhostHealMaxDistanceNpc { get; set; }
 
+        public class TeamLifeConfig
+        {
+            [DefaultValue(0.5f)] public float Share { get; set; } = 0.5f;
+        }
+
+        [Description("Require each team to deal the maximum life in total damage to kill this NPC")]
+
+        public Dictionary<NPCDefinition, TeamLifeConfig> TeamLifeNpcs { get; set; } = new();
+
+        [Range(0.0f, 1.0f)]
+        [DefaultValue(0.0f)]
+
+
         [Description("Reduce the damage of certain projectiles after they have collided or bounced")]
         public float ProjectileCollisionDamageReduction { get; set; }
 
         public Dictionary<ProjectileDefinition, float> NoLineOfSightDamageReduction { get; set; } = new();
-
         public bool AwardBountyEveryKill { get; set; }
+
     }
 
     public class Statistics : IEquatable<Statistics>
@@ -324,6 +336,12 @@ public class WorldGenerationConfig
         [DefaultValue(30)] public int PlanteraBulbChanceDenominator { get; set; } = 30;
 
         [DefaultValue(8)] public int ChlorophyteSpreadChanceModifier { get; set; } = 8;
+
+        [Range(1, 1000)]
+        [DefaultValue(300)] public int ChlorophyteGrowChanceModifier { get; set; } = 300;
+
+        [Range(1, 999999)]
+        [DefaultValue(300)] public int ChlorophyteGrowLimitModifier { get; set; } = 300;
     }
 
     public WorldGenerationConfig WorldGeneration { get; set; } = new();
@@ -340,7 +358,6 @@ public class FloatStatistic
         public Dictionary<NPCDefinition, FloatStatistic> LifeMaxMultipliers { get; set; } = new();
         public Dictionary<NPCDefinition, FloatStatistic> DamageMultipliers { get; set; } = new();
         public bool NoMechanicalBossSummonDrops { get; set; }
-        public bool NoBiomeKeyDrops { get; set; }
     }
 
     public NpcBalanceConfig NpcBalance { get; set; } = new();
@@ -355,6 +372,11 @@ public class ChestItemReplacement
     [Range(0, 600)] public int MinimumDamageReceivedByPlayers { get; set; }
     [Range(0, 600)] public int MinimumDamageReceivedByPlayersFromPlayer { get; set; }
 
+    [Header("AdventureMirror")]
+    [Range(0, 60 * 60)]
+    [DefaultValue(4 * 60)]
+    public int AdventureMirrorRecallFrames { get; set; }
+
     public override bool AcceptClientChanges(ModConfig pendingConfig, int whoAmI, ref NetworkText message)
     {
         if (pendingConfig is not AdventureConfig pendingAdventureConfig)