Модуль:Prototypes/Оружия: различия между версиями

@@ Строка 60: / Строка 60: @@
          local oneHandDamage = melee.damage.types
-         local additionalDamage = (entry.IncreaseDamageOnWield and entry.IncreaseDamageOnWield.damage and entry.IncreaseDamageOnWield.damage.types)
+         local resultParts = {}
-                              or (entry.DamageOtherOnHit and entry.DamageOtherOnHit.damage and entry.DamageOtherOnHit.damage.types)
-        local resultParts = {}
          table.insert(resultParts, "В одной руке: " .. formatDamageList(oneHandDamage))
-         if additionalDamage then
+         if entry.IncreaseDamageOnWield
-             local twoHandDamage = combineDamageTables(oneHandDamage, additionalDamage)
+            and entry.IncreaseDamageOnWield.damage
+            and entry.IncreaseDamageOnWield.damage.types then
+             local twoHandDamage = combineDamageTables(oneHandDamage, entry.IncreaseDamageOnWield.damage.types)
              table.insert(resultParts, "В двух руках: " .. formatDamageList(twoHandDamage))
+        end
+        if entry.DamageOtherOnHit
+            and entry.DamageOtherOnHit.damage
+            and entry.DamageOtherOnHit.damage.types then
+            local throwingDamage = entry.DamageOtherOnHit.damage.types
+            table.insert(resultParts, "Матательный: " .. formatDamageList(throwingDamage))
          end