themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' into general-devel

Browse source
This commit is contained in:
Stargazing Koishi 2020-05-23 23:39:14 -07:00 • committed by GitHub
commit 11fd1f067c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -4,6 +4,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming release
* Update for OTAPI 2.0.0.36 and Terraria 1.4.0.4. (@hakusaro, @Patrikkk, @DeathCradle)
* Fixed /wind command. (@AxeelAnder)
* Fixed NPC buff bouncer. (@AxeelAnder)
## TShock 4.4.0 (Pre-release 7 (Entangled))
* Fixed bed spawn issues when trying to remove spawn point in SSC. (@Olink)

59
TShockAPI/Bouncer.cs
View file

@ -2048,36 +2048,35 @@ namespace TShockAPI
// These time values are references from Projectile.cs, at npc.AddBuff() calls.
private static Dictionary<int, short> NPCAddBuffTimeMax = new Dictionary<int, short>()
{
{ BuffID.Poisoned, 3600 },
{ BuffID.OnFire, 1200 },
{ BuffID.CursedInferno, 420 },
{ BuffID.Frostburn, 900 },
{ BuffID.Ichor, 1200 },
{ BuffID.Venom, 1260 },
{ BuffID.Midas, 120 },
{ BuffID.Wet, 1500 },
{ BuffID.Slimed, 1500 },
{ BuffID.Lovestruck, 1800 },
{ BuffID.Stinky, 1800 },
{ BuffID.SoulDrain, 30 },
{ BuffID.ShadowFlame, 660 },
{ BuffID.DryadsWard, 120 },
{ BuffID.BoneJavelin, 900 },
{ BuffID.StardustMinionBleed, 900 },
{ BuffID.DryadsWardDebuff, 120 },
{ BuffID.BetsysCurse, 600 },
{ BuffID.Oiled, 540 },
{ BuffID.Confused, 450 }, // Brain of Confusion Internal Item ID: 3223
{ BuffID.Daybreak, 300 }, // Solar Eruption Item ID: 3473, Daybreak Item ID: 3543
{ BuffID.BlandWhipEnemyDebuff, 240 },
{ BuffID.SwordWhipNPCDebuff, 240 },
{ BuffID.ScytheWhipEnemyDebuff, 240 },
{ BuffID.FlameWhipEnemyDebuff, 240 },
{ BuffID.ThornWhipNPCDebuff, 240 },
{ BuffID.RainbowWhipNPCDebuff, 240 },
{ BuffID.MaceWhipNPCDebuff, 240 },
{ BuffID.GelBalloonBuff, 1800 }
{ BuffID.Poisoned, 3600 }, // BuffID: 20
{ BuffID.OnFire, 1200 }, // BuffID: 24
{ BuffID.Confused, short.MaxValue }, // BuffID: 31 Brain of Confusion Internal Item ID: 3223
{ BuffID.CursedInferno, 420 }, // BuffID: 39
{ BuffID.Frostburn, 900 }, // BuffID: 44
{ BuffID.Ichor, 1200 }, // BuffID: 69
{ BuffID.Venom, 1800 }, // BuffID: 70
{ BuffID.Midas, 120 }, // BuffID: 72
{ BuffID.Wet, 1500 }, // BuffID: 103
{ BuffID.Lovestruck, 1800 }, // BuffID: 119
{ BuffID.Stinky, 1800 }, // BuffID: 120
{ BuffID.Slimed, 1500 }, // BuffID: 137
{ BuffID.SoulDrain, 30 }, // BuffID: 151
{ BuffID.ShadowFlame, 660 }, // BuffID: 153
{ BuffID.DryadsWard, 120 }, // BuffID: 165
{ BuffID.BoneJavelin, 900 }, // BuffID: 169
{ BuffID.StardustMinionBleed, 900 }, // BuffID: 183
{ BuffID.DryadsWardDebuff, 120 }, // BuffID: 186
{ BuffID.Daybreak, 300 }, // BuffID: 189 Solar Eruption Item ID: 3473, Daybreak Item ID: 3543
{ BuffID.BetsysCurse, 600 }, // BuffID: 203
{ BuffID.Oiled, 540 }, // BuffID: 204
{ BuffID.BlandWhipEnemyDebuff, 240 }, // BuffID: 307
{ BuffID.SwordWhipNPCDebuff, 240 }, // BuffID: 309
{ BuffID.ScytheWhipEnemyDebuff, 240 }, // BuffID: 310
{ BuffID.FlameWhipEnemyDebuff, 240 }, // BuffID: 313
{ BuffID.ThornWhipNPCDebuff, 240 }, // BuffID: 315
{ BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316
{ BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319
{ BuffID.GelBalloonBuff, 1800 } // BuffID: 320
};
/// <summary>

3
TShockAPI/Commands.cs
View file

@ -4044,7 +4044,6 @@ namespace TShockAPI
{
tsply.SaveServerCharacter();
}
args.Player.SendSuccessMessage("Save succeeded.");
}
private static void Settle(CommandArgs args)
@ -4264,7 +4263,7 @@ namespace TShockAPI
}
Main.windSpeedCurrent = speed;
Main.windSpeedTarget = 0f;
Main.windSpeedTarget = speed;
TSPlayer.All.SendData(PacketTypes.WorldInfo);
TSPlayer.All.SendInfoMessage("{0} changed the wind speed to {1}.", args.Player.Name, speed);
}

7
TShockAPI/SaveManager.cs
View file

@ -55,7 +55,7 @@ namespace TShockAPI
// These can be caused by an unexpected error such as a bad or out of date plugin
try
{
TShock.Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
TShock.Utils.Broadcast("Saving world...", Color.Yellow);
}
catch (Exception ex)
{
@ -130,8 +130,11 @@ namespace TShockAPI
}
else
WorldFile.SaveWorld(task.resetTime);
if (TShock.Config.AnnounceSave)
TShock.Utils.Broadcast("World saved.", Color.Yellow);
TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
}
catch (Exception e)
{