diff --git a/CHANGELOG.md b/CHANGELOG.md index 874a97d3..f30631a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Fixed disappearing NPCs (@WhiteXZ) * Added much more performant code, SendQ, to server module. Reduces downstream network overhead by at least 40% (@tylerjwatson) * API: Updated TSPlayer.Disable to use new buffs (@Enerdy) +* Updated default max damage & projectile damage to 1,175 (based on 625 people) ## TShock 4.3.1 diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index adcea438..7851dca7 100755 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -290,10 +290,10 @@ namespace TShockAPI public bool AllowLoginAnyUsername = true; [Description("The maximum damage a player/npc can inflict.")] - public int MaxDamage = 175; + public int MaxDamage = 1175; [Description("The maximum damage a projectile can inflict.")] - public int MaxProjDamage = 175; + public int MaxProjDamage = 1175; [Description("Kicks a user if set to true, if they inflict more damage then the max damage.")] public bool KickOnDamageThresholdBroken = false; diff --git a/scripts/deploy_release.py b/scripts/deploy_release.py index a9194eba..5e2a90e1 100644 --- a/scripts/deploy_release.py +++ b/scripts/deploy_release.py @@ -99,7 +99,7 @@ upload_headers = {'Authorization': 'token ' + token, 'Content-Type':'application #upload the binary, resulting in a complete binary r = requests.post(upload_url, data=open(release_name, 'rb'), headers = upload_headers, verify=False) -read_and_update_config_on_confluence(config_desc_page, "ConfigDescriptions.txt") -read_and_update_config_on_confluence(ssc_desc_page, "ServerSideConfigDescriptions.txt") -read_and_update_config_on_confluence(permissions_desc_page, "PermissionsDescriptions.txt") -read_and_update_config_on_confluence(rest_desc_page, "RestDescriptions.txt") \ No newline at end of file +# read_and_update_config_on_confluence(config_desc_page, "ConfigDescriptions.txt") +# read_and_update_config_on_confluence(ssc_desc_page, "ServerSideConfigDescriptions.txt") +# read_and_update_config_on_confluence(permissions_desc_page, "PermissionsDescriptions.txt") +# read_and_update_config_on_confluence(rest_desc_page, "RestDescriptions.txt") \ No newline at end of file