Update file weapongenerator.lua

- /data/scripts/lib/inventoryitemprice.lua
- /data/scripts/lib/galaxy.lua
- /data/scripts/lib/turretingredients.lua
- /data/scripts/lib/weapongenerator.lua
- /data/scripts/lib/turretgenerator.lua

data/localization/ru.po

@@ -1,153 +0,0 @@
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "SmartCannon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Ionized"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "SmartCannon"
-msgstr "Умная пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Heavy Cannon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Diffusor"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Hookgun"
-msgstr ""
-
-
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "SmartCannon"
-msgstr "Умная пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Cumulative"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "Diffuser"
-msgstr "Диффузор"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Diffuser"
-msgstr "Диффузор"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "Harpoon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Harpoon"
-msgstr ""
-
-
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Type"
-msgid "Smart Сannon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Type"
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Type"
-msgid "Diffuser"
-msgstr "Диффузор"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Type"
-msgid "Hookgun"
-msgstr ""
-
-
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "WPE Turrets"
-msgstr "Расширенный пак оружия"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Intro"
-msgstr "Вступление"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "In this part of the encyclopedia you will find a description of the turrets from the Weapon Pack Extended mod.\n\nI recommend using turret models from the collection in the workshop."
-msgstr "В этой части энциклопедии вы найдете описание турелей из мода Weapon Pack Extended. \n\nЯ рекомендую использовать модели турелей из коллекции в мастерской"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Autocannon"
-msgstr "Автопушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "A lightweight version of the classic cannon.\n\nCompared to conventional cannons:\n+ Increased rate of fire (x2)\n+ Increased projectile speed (x1.5)\n+ A little more damage on the shield (10% - 15%)\n+ Can be equipped with homing missiles.\n- Less damage (x0.75)\n- Shorter damage range (x0.8)"
-msgstr "Облегченная версия классической пушки.\n\nПо сравнению с обычными пушками:\n+ Увеличенная скорострельность (x2)\n+ Увеличенная скорость полета снаряда (x1.5)\n+ Немного больший урон по щиту (10% - 15%)\n+ Может оснащаться самонаводящимися ракетами.\n- Меньший урон (x0.75)\n- Меньшая дальность поражения (x0.8)."
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "The cannon of the main caliber. It shoots with heavy explosive shells, the hit of which can displace the enemy ship.\n\n+ High damage\n+ High projectile speed\n+ When hit, push the opponent\n+ Also can have a penetration\n- Low rate of fire\n- Occupies many slots\n- Big size\n- Requires more crew"
-msgstr "Пушка главного калибра. Стреляет тяжелыми разрывными снарядами, попадание которых может смести вражеский корабль.\n\n+ Высокий урон\n+ Высокая скорость снаряда\n+ При попадании в цель толкает противника\n+ Также может иметь пробитие\n- Низкая скорострельность\n- Занимает много слотов\n- Большие размеры\n- Требует больше экипажа"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Energy diffuser"
-msgstr "Энегретический диффузор"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20"
-msgstr "Боевое оружие малой дальности. Не наносит повреждений корпусу, но чрезвычайно эффективно разрушает щиты. Требует гражданских слотов.\n\nУрон по щитам x20"
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Hookgun"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Short range combat weapon. Does not cause damage to the shield, but extremely effectively to attrac. Requires 2 gunners slots.\n May have penetration\n"
-msgstr ""
-
-
-# ========== old ==========
-# msgctxt "Weapon Type"
-# msgid "Auto Сannon"
-# msgstr "Автопушка"
-
-# msgctxt "Weapon Prefix"
-# msgid "Cumulative Heavy Cannon"
-# msgstr "Кумулятивная тяжелая пушка"
-
-

data/localization/template.pot

@@ -0,0 +1,138 @@
+# ========== \data\scripts\lib\turretgenerator.lua ==========
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "SmartCannon"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Ionized SmartCannon"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Heavy Cannon"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Cumulative Heavy Cannon"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Diffuser"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Hookgun"
+msgstr ""
+
+#: \data\scripts\lib\turretgenerator.lua:
+msgctxt "weapon name"
+msgid "HiveLauncher"
+msgstr ""
+
+# ========== \data\scripts\lib\weapongenerator.lua ==========
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "SmartCannon"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "SmartCannon"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "Heavy Cannon"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "Diffuser"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Diffuser"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "Hookgun"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Hookgun"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "HiveLauncher"
+msgstr ""
+
+#: \data\scripts\lib\weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "HiveLauncher"
+msgstr ""
+
+# ========== \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua ==========
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "WPE Turrets"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Intro"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "In this part of the encyclopedia you will find a description of the turrets from the Weapon Pack Extended mod.\n\nI recommend using turret models from the collection in the workshop."
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "SmartCannon"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "A lightweight version of the classic cannon.\n\nCompared to conventional cannons:\n+ Increased rate of fire (x2)\n+ Increased projectile speed (x1.5)\n+ A little more damage on the shield (10% - 15%)\n+ Can be equipped with homing missiles.\n- Less damage (x0.75)\n- Shorter damage range (x0.8)"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Heavy Cannon"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "The cannon of the main caliber. It shoots with heavy explosive shells, the hit of which can displace the enemy ship.\n\n+ High damage\n+ High projectile speed\n+ When hit, push the opponent\n+ Also can have a penetration\n- Low rate of fire\n- Occupies many slots\n- Big size\n- Requires more crew"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Energy diffuser"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Hookgun"
+msgstr ""
+
+#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+msgctxt ""
+msgid "Short range combat weapon. Does not cause damage to the shield, but extremely effectively to attrac. Requires 2 gunners slots.\n May have penetration\n"
+msgstr ""
+

data/scripts/lib/galaxy.lua

@@ -1,6 +1,6 @@
 
 weaponProbabilities[WeaponType.SmartCannon] =  {d = 0.65, p = 2.0}
-weaponProbabilities[WeaponType.HeavyCannon] = {d = 0.6, p = 1.0}
-weaponProbabilities[WeaponType.Diffuser] = {d = 0.6, p = 1.0}
-weaponProbabilities[WeaponType.Hookgun] = {d = 0.6, p = 1.0}
-weaponProbabilities[WeaponType.HiveLauncher] = {d = 0.6, p = 1.0} -- TODO Подсмотреть у ванильных ракетниц
+weaponProbabilities[WeaponType.HeavyCannon] = {d = 0.65, p = 2.0}
+weaponProbabilities[WeaponType.Diffuser] = {d = 0.55, p = 1.0}
+weaponProbabilities[WeaponType.Hookgun] = {d = 0.55, p = 1.0}
+weaponProbabilities[WeaponType.HiveLauncher] = {d = 0.6, p = 1.0}

data/scripts/lib/inventoryitemprice.lua

@@ -1,6 +1,6 @@
 
-valueWeights[WeaponType.SmartCannon	] = 2
-valueWeights[WeaponType.HeavyCannon	] = 2.5
-valueWeights[WeaponType.Diffuser	] = 1.7
+valueWeights[WeaponType.SmartCannon	] = 1.5
+valueWeights[WeaponType.HeavyCannon	] = 1.5
+valueWeights[WeaponType.Diffuser	] = 2
 valueWeights[WeaponType.Hookgun		] = 1.5
-valueWeights[WeaponType.HiveLauncher] = 2
+valueWeights[WeaponType.HiveLauncher] = 1.5

data/scripts/lib/turretgenerator.lua

@@ -1,8 +1,8 @@
 
 scales[WeaponType.SmartCannon] = {
     {from = 0, to = 28, size = 1.0,     usedSlots = 2},
-    {from = 29, to = 38, size = 2.0,    usedSlots = 3},
-    {from = 39, to = 49, size = 3.0,    usedSlots = 4},
+    {from = 29, to = 38, size = 1,5,    usedSlots = 3},
+    {from = 39, to = 49, size = 2.0,    usedSlots = 4},
     --dummy for cooaxial, add 1 to size and level
     {from = 50, to = 52, size = 4.0,    usedSlots = 5},
 }
@@ -12,7 +12,7 @@ scales[WeaponType.HeavyCannon] = {
     {from = 29, to = 38, size = 4.0,    usedSlots = 5},
     {from = 39, to = 49, size = 5.0,    usedSlots = 6},
     --dummy for cooaxial, add 1 to size and level
-    {from = 50, to = 52, size = 5,    usedSlots = 6},
+    {from = 50, to = 52, size = 6,    usedSlots = 6},
 }
 
 scales[WeaponType.Diffuser] = {
@@ -26,12 +26,13 @@ scales[WeaponType.Hookgun] = {
     {from = 0, to = 46, size = 1.0,     usedSlots = 2},
     {from = 47, to = 50, size = 2.0,    usedSlots = 4},
     --dummy for cooaxial, add 1 to size and level
-    {from = 51, to = 52, size = 3.0,    usedSlots = 6},
+    {from = 51, to = 52, size = 4.0,    usedSlots = 6},
 }
 
 scales[WeaponType.HiveLauncher] = {
-    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
-    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
+    {from = 0, to = 32, size = 1.0, usedSlots = 2},
+    {from = 33, to = 40, size = 1.5, usedSlots = 3},
+    {from = 41, to = 50, size = 2.0, usedSlots = 4},
     --dummy for cooaxial, add 1 to size and level
     {from = 51, to = 52, size = 3.0,    usedSlots = 6},
 }
@@ -41,8 +42,6 @@ if GameVersion() >= Version(0, 31, 0) then
         {specialty = Specialty.HighDamage,      probability = 0.2},
         {specialty = Specialty.HighFireRate,    probability = 0.3},
         {specialty = Specialty.HighRange,       probability = 0.7},
-        -- {specialty = Specialty.HighHullDamage,  probability = 0.5},
-        -- {specialty = Specialty.LessCoolingTime,  probability = 0.4},
     }
 else
     possibleSpecialties[WeaponType.SmartCannon] = {
@@ -59,9 +58,6 @@ if GameVersion() >= Version(0, 31, 0) then
         {specialty = Specialty.HighDamage,      probability = 0.2},
         {specialty = Specialty.HighRange,       probability = 0.35},
         {specialty = Specialty.HighFireRate,    probability = 0.3},
-        -- {specialty = Specialty.HighHullDamage,       probability = 0.2},
-        -- {specialty = Specialty.HighShieldDamage, probability = 0.2},
-        -- {specialty = Specialty.LessCoolingTime, probability = 0.2}
     }
 else
     possibleSpecialties[WeaponType.HeavyCannon] = {
@@ -78,7 +74,6 @@ if GameVersion() >= Version(0, 31, 0) then
     possibleSpecialties[WeaponType.Diffuser] = {
         {specialty = Specialty.HighDamage,      probability = 0.3},
         {specialty = Specialty.HighRange,       probability = 0.3},
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
     }
 else
     possibleSpecialties[WeaponType.Diffuser] = {
@@ -92,7 +87,6 @@ if GameVersion() >= Version(0, 31, 0) then
     possibleSpecialties[WeaponType.Hookgun] = {
         {specialty = Specialty.HighDamage,      probability = 0.3},
         {specialty = Specialty.HighRange,       probability = 0.3},
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
     }
 else
     possibleSpecialties[WeaponType.Hookgun] = {
@@ -104,9 +98,11 @@ end
 
 if GameVersion() >= Version(0, 31, 0) then
     possibleSpecialties[WeaponType.HiveLauncher] = {
-        {specialty = Specialty.HighDamage,      probability = 0.3},
-        {specialty = Specialty.HighRange,       probability = 0.3},
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
+        {specialty = Specialty.HighShootingTime, probability = 0.2},
+        {specialty = Specialty.HighDamage, probability = 0.15},
+        {specialty = Specialty.HighFireRate, probability = 0.15},
+        {specialty = Specialty.HighRange, probability = 0.25},
+        {specialty = Specialty.BurstFire, probability = 0.1},
     }
 else
     possibleSpecialties[WeaponType.HiveLauncher] = {
@@ -130,6 +126,18 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
 
     local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
+    
+    local name = "Smart-Cannon /* weapon name*/"%_T
+    
+    local specType = rand:getInt(0, 2)
+    if specType == 1 then 
+        name = "Ionized Smart-Cannon /* weapon name*/"%_T
+        weapon.shieldPenetration = 1
+    elseif specType == 2 then
+        name = "Plasmed Smart-Cannon /* weapon name*/"%_T
+        weapon.damageType = DamageType.Plasma
+        weapon.damage = weapon.damage * 0.9
+    end
 
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -144,17 +152,9 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "SmartCannon /* weapon name*/"%_T
-    
-    local specType = 1
-    if specType > 0 then 
-        name = "Ionized SmartCannon /* weapon name*/"%_T
-        weapon.shieldPenetration = 1
-    end
-
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
 
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
 end
@@ -168,7 +168,7 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     -- generate turret
     local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
     local crew = Crew()
-    crew:add(requiredCrew*2, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew * 3, CrewMan(CrewProfessionType.Gunner))
     crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair))
     result.crew = crew
 
@@ -178,6 +178,12 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     local weapon = WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
 
+    local Pen = rand:getInt(0, rarity.value)
+    if Pen > 0 then 
+        weapon.blockPenetration = Pen
+        outerAdjective = "Cumulative "%_T
+    end
+
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
 
@@ -193,14 +199,17 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
 
     local name = "Heavy Cannon /* weapon name*/"%_T
 
-    local Pen = rand:getInt(0, rarity.value)
-    if Pen > 0 then 
-        weapon.blockPenetration = Pen
-        name = "Cumulative Heavy Cannon /* weapon name*/"%_T
+    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
+   
+    if result.size >= 4 then
+        name = "Mons Meg /* weapon name*/"%_T
     end
 
-    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+    if result.size >= 5 then
+        name = "Dulle Griet /* weapon name*/"%_T
+    end
+
+    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
 end
@@ -237,10 +246,10 @@ function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarit
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "Diffusor /* weapon name*/"%_T
+    local name = "Diffuser /* weapon name*/"%_T
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Energy)
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
 end
@@ -278,22 +287,17 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
     result:updateStaticStats()
 
     local name = "Hookgun /* weapon name*/"%_T
-    
-    local specType = 0
-    if specType >0 then
-    
-    else
-        
-    end
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
 end
 
 generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
 
+
+
 function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -334,17 +338,14 @@ function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, r
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "HiveLauncher /* weapon name*/"%_T
-    
-    local specType = 0
-    if specType >0 then
-    
-    else
-        
+    local name = "Hive-Launcher /* weapon name*/"%_T
+    if weapon.shotsFired > 20 then
+        name = "Swarm-Launcher /* weapon name*/"%_T
     end
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+    multishot = ""%_T
+    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
 end

data/scripts/lib/turretingredients.lua

@@ -1,56 +1,52 @@
 
 TurretIngredients[WeaponType.SmartCannon] =
 {
-    {name = "Servo",                amount = 15,   investable = 10, minimum = 5,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Servo",                amount = 15,   investable = 10, minimum = 5,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
     {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
     {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage", investFactor = 0.5,},
-    {name = "Targeting Card",       amount = 3,    investable = 3,  minimum = 0,     weaponStat = "seeker", investFactor = 1, changeType = StatChanges.Flat},
+    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage",   investFactor = 0.5,},
+    {name = "Targeting Card",       amount = 3,    investable = 3,  minimum = 0,    weaponStat = "seeker",   investFactor = 1,   changeType = StatChanges.Flat},
     {name = "Steel",                amount = 8,    investable = 10, minimum = 3,},
     {name = "Steel Tube",           amount = 5,    investable = 10, minimum = 3,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
 }
 
 TurretIngredients[WeaponType.HeavyCannon] =
 {
-    {name = "Servo",                amount = 8,   investable = 8, minimum = 4,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Servo",                amount = 8,    investable = 8,  minimum = 4,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
     {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
     {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition",           amount = 5,    investable = 10,  minimum = 3,    weaponStat = "damage", investFactor = 0.2,},
+    {name = "Ammunition",           amount = 5,    investable = 10, minimum = 3,    weaponStat = "damage",   investFactor = 0.2,},
     {name = "Steel",                amount = 20,   investable = 10, minimum = 20,},
     {name = "Metal Plate",          amount = 8,    investable = 10, minimum = 10,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
 }
 
 TurretIngredients[WeaponType.Diffuser] =
 {
-    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
     {name = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
     {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
-    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
-    {name = "Silver",               amount = 5,   investable = 0, minimum = 5,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
+    {name = "Steel",                amount = 20,   investable = 0,  minimum = 20,},
+    {name = "Copper",               amount = 10,   investable = 0,  minimum = 10,},
+    {name = "Silver",               amount = 5,    investable = 0,  minimum = 5,},
 }
 
-TurretIngredients[WeaponType.Hookgun] =
+TurretIngredients[WeaponType.Hookgun] = -- TODO Подумать над составляющими
 {
-    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
     {name = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
     {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
-    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
-    {name = "Silver",               amount = 5,   investable = 0, minimum = 5,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
+    {name = "Steel",                amount = 20,   investable = 0,  minimum = 20,},
+    {name = "Copper",               amount = 10,   investable = 0,  minimum = 10,},
+    {name = "Silver",               amount = 5,    investable = 0,  minimum = 5,},
 }
 
 TurretIngredients[WeaponType.HiveLauncher] =
 {
-    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
-    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
-    {name = "Silver",               amount = 5,   investable = 0, minimum = 5,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
+    {name = "Servo",                amount = 15,   investable = 10, minimum = 5,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Rocket",               amount = 15,   investable = 10, minimum = 15,  weaponStat = "damage",   investFactor = 0.2, changeType = StatChanges.Percentage},
+    {name = "High Pressure Tube",   amount = 6,    investable = 12, minimum = 1,   weaponStat = "reach",    investFactor = 0.4, changeType = StatChanges.Percentage},
+    {name = "Fuel",                 amount = 6,    investable = 12, minimum = 1,   weaponStat = "reach",    investFactor = 0.5, changeType = StatChanges.Percentage},
+    {name = "Targeting Card",       amount = 10,   investable = 10, minimum = 0,   weaponStat = "seeker",   investFactor = 1,   changeType = StatChanges.Flat},
+    {name = "Steel",                amount = 8,    investable = 10, minimum = 3,},
+    {name = "Wire",                 amount = 5,    investable = 10, minimum = 3,},
 }

data/scripts/lib/weapongenerator.lua

@@ -3,11 +3,11 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
 
-    dps = dps * 0.75
+    dps = dps * 0.9
     local fireDelay = rand:getFloat(1.5, 2.5)*0.5
     local reach = rand:getFloat(1100, 1500)*0.7
     local damage = dps * fireDelay
-    local speed = rand:getFloat(300, 400)*2
+    local speed = rand:getFloat(300, 400)*4
     local existingTime = (reach / speed)*1.2
 
     weapon.fireDelay = fireDelay
@@ -15,8 +15,8 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.appearanceSeed = rand:getInt()
     weapon.seeker = 1
     weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "SmartCannon /* Weapon Name*/"%_t
-    weapon.prefix = "SmartCannon /* Weapon Prefix*/"%_t
+    weapon.name = "Smart-Cannon /* Weapon Name*/"%_t
+    weapon.prefix = "Smart-Cannon /* Weapon Prefix*/"%_t
     weapon.icon = "data/textures/icons/smartcannon.png" 
     weapon.sound = "cannon"
     weapon.accuracy = 0.99 - rand:getFloat(0, 0.03)
@@ -212,8 +212,8 @@ function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
     weapon.appearanceSeed = rand:getInt()
     weapon.seeker = true
     weapon.appearance = WeaponAppearance.RocketLauncher
-    weapon.name = "HiveLauncher /* Weapon Name*/"%_t
-    weapon.prefix = "HiveLauncher /* Weapon Prefix*/"%_t
+    weapon.name = "Hive-Launcher /* Weapon Name*/"%_t
+    weapon.prefix = "Hive-Launcher /* Weapon Prefix*/"%_t
     weapon.icon = "data/textures/icons/hivelauncher.png" 
     weapon.sound = "cannon"
     weapon.accuracy = 0.5 - rand:getFloat(0, 0.02)
@@ -233,7 +233,6 @@ function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
     if rand:test(1) then
         local shots = {6, 10, 14, 18, 22, 26, 30}
         weapon.shotsFired = shots[rand:getInt(1, #shots)]
-        print()
         weapon.damage = (weapon.damage * 1.5) / weapon.shotsFired
     end
 

data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua

@@ -14,7 +14,7 @@ category.chapters =
     },
 
     {   
-        title = "Autocannon"%_t,
+        title = "Smartcannon"%_t,
         picture = "data/textures/slide/3.png",
         text = "A lightweight version of the classic cannon.\n\nCompared to conventional cannons:\n+ Increased rate of fire (x2)\n+ Increased projectile speed (x1.5)\n+ A little more damage on the shield (10% - 15%)\n+ Can be equipped with homing missiles.\n- Less damage (x0.75)\n- Shorter damage range (x0.8)"%_t,
     },