cleanup, getting ready for production

This commit is contained in:
2025-08-28 08:09:43 -04:00
parent 568bd445cf
commit 30c0ef4bf4

View File

@@ -1,7 +1,5 @@
using Terraria; using Terraria;
using Terraria.ID; using Terraria.ID;
using Terraria.Net;
using Terraria.Localization;
using TShockAPI; using TShockAPI;
using TShockAPI.Hooks; using TShockAPI.Hooks;
using TerrariaApi.Server; using TerrariaApi.Server;
@@ -57,6 +55,7 @@ public class HealingPlugin : TerrariaPlugin
ApplyRegenerationBuff(e.Player); ApplyRegenerationBuff(e.Player);
} }
// FIXME: not at all complete, needs some work
private void OnPlayerBuff(object sender, GetDataHandlers.PlayerBuffEventArgs args) private void OnPlayerBuff(object sender, GetDataHandlers.PlayerBuffEventArgs args)
{ {
// Console.WriteLine($"Player buff arguments: {args}"); // Console.WriteLine($"Player buff arguments: {args}");
@@ -86,7 +85,6 @@ public class HealingPlugin : TerrariaPlugin
int newHP = args.Current; int newHP = args.Current;
short healingAmount = (short)(newHP - previousHP); short healingAmount = (short)(newHP - previousHP);
bool isHealingItem = IsHealingValueValid(healingAmount); bool isHealingItem = IsHealingValueValid(healingAmount);
Console.WriteLine($"Player: {player.Name}, Previous HP: {previousHP}, New HP: {newHP}, Healing Amount: {healingAmount}");
if (healingAmount > 0 && isHealingItem) if (healingAmount > 0 && isHealingItem)
{ {
@@ -96,15 +94,12 @@ public class HealingPlugin : TerrariaPlugin
private void OnPlayerSlot(object sender, GetDataHandlers.PlayerSlotEventArgs args) private void OnPlayerSlot(object sender, GetDataHandlers.PlayerSlotEventArgs args)
{ {
Console.WriteLine("In OnPlayerSlot method");
TSPlayer player = args.Player; TSPlayer player = args.Player;
short slot = args.Slot; short slot = args.Slot;
short newStack = args.Stack; short newStack = args.Stack;
short itemType = args.Type; short itemType = args.Type;
Console.WriteLine($"Player: {player.Name}, Slot: {slot}, New Stack: {newStack}, Item Type: {itemType}");
var isHealingItem = IsHealingItem(itemType); var isHealingItem = IsHealingItem(itemType);
var isItemConsumed = IsItemBeingConsumed(player, slot, newStack); var isItemConsumed = IsItemBeingConsumed(player, slot, newStack);
Console.WriteLine($"Is Healing Item: {isHealingItem}, Is Item Being Consumed: {isItemConsumed}");
if (isHealingItem && isItemConsumed) if (isHealingItem && isItemConsumed)
{ {
@@ -112,7 +107,6 @@ public class HealingPlugin : TerrariaPlugin
var baseHeal = GetBaseHealAmount(itemType); var baseHeal = GetBaseHealAmount(itemType);
var enhancedHeal = (int)(baseHeal * multiplier); var enhancedHeal = (int)(baseHeal * multiplier);
var totalHealing = enhancedHeal + baseHeal; var totalHealing = enhancedHeal + baseHeal;
Console.WriteLine($"Base Heal: {baseHeal}, Multiplier: {multiplier}, Enhanced Heal: {enhancedHeal}");
player.Heal(enhancedHeal); player.Heal(enhancedHeal);
player.SendSuccessMessage($"Enhanced healing! Restored {enhancedHeal} HP (x{multiplier} multiplier)"); player.SendSuccessMessage($"Enhanced healing! Restored {enhancedHeal} HP (x{multiplier} multiplier)");
@@ -149,27 +143,6 @@ public class HealingPlugin : TerrariaPlugin
private void OnUpdate(EventArgs args) private void OnUpdate(EventArgs args)
{ {
if ((DateTime.UtcNow - _lastHealCheck).TotalSeconds >= 1)
{
foreach (var player in TShock.Players)
{
// Console.WriteLine($"Player {player.Name} has the following HP: {player.TPlayer.statLife}");
// if (player != null && player.Active && player.TPlayer.statLife < player.TPlayer.statLifeMax)
// {
// Console.WriteLine($"Player {player.Name} is not healed all the way, let's increase the regen");
// player.TPlayer.statLife += 10;
// player.SendData(PacketTypes.EffectHeal, "", player.Index, 10f);
// Console.WriteLine("Increased health via regen");
// }
// else if (player != null && player.TPlayer.statLife == player.TPlayer.statLifeMax)
// {
// Console.WriteLine($"Player {player.Name} is fully healed.");
// }
}
_lastHealCheck = DateTime.UtcNow;
}
if ((DateTime.UtcNow - _lastBuffCheck).TotalSeconds >= 30) if ((DateTime.UtcNow - _lastBuffCheck).TotalSeconds >= 30)
{ {
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)
@@ -184,6 +157,7 @@ public class HealingPlugin : TerrariaPlugin
} }
} }
// TODO: method might be used for later
// private void ApplyRegenerationToAllPlayers() // private void ApplyRegenerationToAllPlayers()
// { // {
// foreach (TSPlayer player in TShock.Players) // foreach (TSPlayer player in TShock.Players)
@@ -199,8 +173,7 @@ public class HealingPlugin : TerrariaPlugin
{ {
if (player?.Active == true && player.ConnectionAlive) if (player?.Active == true && player.ConnectionAlive)
{ {
player.SetBuff(2, 3600, bypass: true); player.SetBuff(BuffID.Regeneration, 3600, bypass: true);
Console.WriteLine($"set buff for player {player.Name}");
} }
} }