From 50e0bf029007483b61b52c4b087a8cf5a94503bc Mon Sep 17 00:00:00 2001 From: Quinci135 Date: Wed, 14 Oct 2020 15:21:16 -0700 Subject: [PATCH 1/4] Added 1.4.1.0 player inflicted debuffs to bouncer OnFire3/Hellfire - New magma stone debuff that deals 15 dps instead of 4 dps Frostburn2/Frostbite - Frost armor new set bonus 25 dps instead of 8 dps BoneWhipNPCDebuff - Debuff applied from new Spinal Tap whip --- TShockAPI/Bouncer.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 3c2d7c23..9161c8dd 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -2100,6 +2100,9 @@ namespace TShockAPI { BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316 { BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319 { BuffID.GelBalloonBuff, 1800 } // BuffID: 320 + { BuffID.OnFire3, 360 }, // BuffID: 323 + { BuffID.Frostburn2, 900 }, // BuffID: 324 + { BuffID.BoneWhipNPCDebuff, 240 } // BuffID: 326 }; /// From c2c24a34233a8e5e1a6414ef465f7337831be284 Mon Sep 17 00:00:00 2001 From: Quinci135 Date: Wed, 14 Oct 2020 15:41:01 -0700 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1697775c..e3f434b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin ## Upcoming changes * Added Gravedigger's Shovel support. (@Zennos) * You can now start up multiple TShock servers at once without getting a startup error. (@ZakFahey) +* Updated bouncer to include new Magma Stone, Frost Armor, and Spinal Tap inflicted npc debuffs to bouncer. (@Quinci135) ## TShock 4.4.0 (Pre-release 12) * Fixed various bugs related to Snake Charmer's Flute. (@rustly) From 253c239f860f12b2d89dc5f5289f79e988544a60 Mon Sep 17 00:00:00 2001 From: Quinci135 Date: Wed, 14 Oct 2020 15:45:43 -0700 Subject: [PATCH 3/4] Add missing comma --- TShockAPI/Bouncer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 9161c8dd..b79d59c5 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -2099,7 +2099,7 @@ namespace TShockAPI { BuffID.ThornWhipNPCDebuff, 240 }, // BuffID: 315 { BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316 { BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319 - { BuffID.GelBalloonBuff, 1800 } // BuffID: 320 + { BuffID.GelBalloonBuff, 1800 }, // BuffID: 320 { BuffID.OnFire3, 360 }, // BuffID: 323 { BuffID.Frostburn2, 900 }, // BuffID: 324 { BuffID.BoneWhipNPCDebuff, 240 } // BuffID: 326 From 1d7a0e8e6ebced52ad88da1afd14c639fe03a0fc Mon Sep 17 00:00:00 2001 From: Quinci135 Date: Wed, 14 Oct 2020 16:03:02 -0700 Subject: [PATCH 4/4] Update submodule. 1.4.0.5 -> 1.4.1.0 --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index 7942fe87..407c5458 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit 7942fe87e30e0c42c311848e95cde9100d08ae8d +Subproject commit 407c54586498b6f429237664f4039a9496c21d4a