From 194522eaa04a013594acae5eaa57c575830ff5e9 Mon Sep 17 00:00:00 2001 From: MadMan2021 Date: Thu, 11 May 2017 23:27:56 +0100 Subject: [PATCH 1/3] Increased /butcher damage to defence fixes issue #1447 --- TShockAPI/Commands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index cd90f8e6..ee9106fc 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -5207,7 +5207,7 @@ namespace TShockAPI { if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId)) { - TSPlayer.Server.StrikeNPC(i, (int)(Main.npc[i].life + (Main.npc[i].defense * 0.5)), 0, 0); + TSPlayer.Server.StrikeNPC(i, (int)(Main.npc[i].life + (Main.npc[i].defense * 0.6)), 0, 0); kills++; } } From 492bb3ec2d1f706a9e6546fe756e05e1efdfab93 Mon Sep 17 00:00:00 2001 From: Tyler Watson Date: Sun, 14 May 2017 21:08:57 +1000 Subject: [PATCH 2/3] create_release script now compatible with mono 5 --- scripts/create_release.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/create_release.py b/scripts/create_release.py index 3d86912d..3a25f76d 100755 --- a/scripts/create_release.py +++ b/scripts/create_release.py @@ -36,7 +36,7 @@ sqlite_bin_name = "Mono.Data.Sqlite.dll" json_bin_name = "Newtonsoft.Json.dll" http_bin_name = "HttpServer.dll" tshock_bin_name = "TShockAPI.dll" -tshock_symbols = "TShockAPI.dll.mdb" +tshock_symbols = "TShockAPI.pdb" bcrypt_bin_name = "BCrypt.Net.dll" geoip_db_name = "GeoIP.dat" @@ -140,6 +140,7 @@ def upload_artifacts(): def update_terraria_source(): subprocess.check_call(['/usr/bin/git', 'submodule', 'init']) subprocess.check_call(['/usr/bin/git', 'submodule', 'update']) + subprocess.check_call(['nuget', 'restore']) subprocess.check_call(['nuget', 'restore', 'TerrariaServerAPI/']) def run_bootstrapper(): From 7e80a6dc4eda23a07a64bc99bf904320a44fdf89 Mon Sep 17 00:00:00 2001 From: Tyler Watson Date: Sun, 14 May 2017 21:12:55 +1000 Subject: [PATCH 3/3] Submodule update for ILRepack.Lib 2.0.13 --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index c22ec39f..a9d1b0e4 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit c22ec39f707f32e19fd59f685d59a79be8d12b5a +Subproject commit a9d1b0e4e096ecbd0b2033ce4ff636759c9448c3