diff --git a/CHANGELOG.md b/CHANGELOG.md index fb23edd..59aea04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ # This is an archive of changelog messages from `tfa_loader.lua`. +## 4.7.6.1 +* Restored old secondary melee fallback behavior (only fallback to primary if there are no secondary attacks available) +* Melee weapons can now use SWEP.Primary/Secondary.Damage instead of split per-attack value +* Added random damage multiplier controls to server settings menu + ## 4.7.6.0 * Keybind tooltips are now less annoying (do not force display when picking up props) * Fixed safety holster not working for bow-based weapons diff --git a/lua/tfa/documentation/tfa_melee_template.lua b/lua/tfa/documentation/tfa_melee_template.lua index d969d84..44504eb 100644 --- a/lua/tfa/documentation/tfa_melee_template.lua +++ b/lua/tfa/documentation/tfa_melee_template.lua @@ -72,13 +72,15 @@ SWEP.Primary.Attacks = { -- main attacks table, the values are select } SWEP.Primary.MaxCombo = -1 -- How many attacks are allowed on single attack key hold SWEP.Primary.Directional = false -- Prefer attacks with player's movement direction first +SWEP.Primary.SplitDamage = true -- Use the "dmg" value of the attack table? If false, SWEP.Primary.Damage will be used instead. -- Attacks - Secondary -- If secondary attacks table is empty or not defined, it falls back to primary table SWEP.Secondary.Attacks = {} -- same as SWEP.Primary.Attacks SWEP.Secondary.MaxCombo = -1 SWEP.Secondary.Directional = false -SWEP.Secondary.PrimaryFallback = true -- Allow falling back to primary attacks if secondary attack is not selected +SWEP.Secondary.SplitDamage = true -- Use the "dmg" value of the attack table? If false, SWEP.Secondary.Damage will be used instead. +SWEP.Secondary.PrimaryFallback = true -- Allow falling back to primary attacks if secondary attacks table is empty/unavailable -- Attacks - Alternative (melee bash) SWEP.Secondary.CanBash = true -- set to false to disable bashing diff --git a/resource/localization/en/tfa_base.properties b/resource/localization/en/tfa_base.properties index 6aeb60f..f396780 100644 --- a/resource/localization/en/tfa_base.properties +++ b/resource/localization/en/tfa_base.properties @@ -52,6 +52,9 @@ tfa.svsettings.crosshairshowplayer=Crosshair color reveals players tfa.svsettings.crosshairshowplayerteam=Crosshair color reveals player's team tfa.svsettings.damagemult=Damage Multiplier tfa.svsettings.damagemultnpc=Damage Multiplier for NPCs weapons +tfa.svsettings.damagemultrand_min=Minimum Random Damage Multiplier +tfa.svsettings.damagemultrand_max=Maximum Random Damage Multiplier +tfa.svsettings.damagemultrand_tip=Additional RNG-based damage multiplier added on top of regular multiplier. Set minimum and maximum to 1 to stop randomization. tfa.svsettings.doorrespawntime=Door Respawn Time tfa.svsettings.jamchance=Jam Chance Multiplier tfa.svsettings.jamfactormult=Jam Factor Multiplier