Update file ru.po

- /data/localization/ru.po
- /data/scripts/lib/turretgenerator.lua

README.md

@@ -1,6 +1,9 @@
 [![pipeline status](http://gl.beaconborn.ru/bacon/weapon-project-extended/badges/main/pipeline.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/commits/main) [![Latest Release](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/badges/release.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/releases)
 # weapon project extended 2.0
 
+![Weapon Pack Extended Remastered](thumb.png)
+
+
 ## Getting started
 
 That mod for Avorion original writed [Alive!](https://steamcommunity.com/id/CasKepler2/) for 0.32 and updated by me with him 
@@ -10,3 +13,28 @@ That mod for Avorion original writed [Alive!](https://steamcommunity.com/id/CasK
 * Smart-cannon
 * Heavy Cannon
 * Diffuser
+
+### Описание
+
+Возвращение олдсульного мода на сбалансированное оружие!
+
+WPE-Remastered добавляет несколько новых, хорошо сбалансированных для ванильной игры орудий.
+
+В отличии от старой (ого, прошло уже больше 4 лет) версии часть орудий была заменена на новые образцы, а остальные доведены до идеала ( но могут быть отредактированы по отзывам пользователей).
+
+И так, орудия:
+
+Смарт-пушка: 
+Вариант пушки со снарядами, начиненными всякой электроникой для наведения и уничтожения врага. Да, дороже чем обычно, но поверьте, оно того стоит! [Возможны модификации для пробития щитов и плазменных зарядов]
+
+Тяжелая пушка:
+"Большому кораблю нужны большие калибры!" - именно этим девизом руководствовались инженеры разрабатывая данное оружие. Лучший способ доставить противнику **БОЛЬШИЕ** проблемы
+
+Гарпун:
+Враг убегает? Не сегодня! Гарпун не даст врагу и шанса улизнуть.
+
+Рассеиватель энергии:
+У врага мощный щит? Не проблема! Бюро сверхсовременных разработок нашло решение и этой проблемы: рассеиватель энергии уничтожит их за секунды (но увы, даже не поцарапает корпус).
+
+Сотовые ракетные установки:
+Что может быть лучше ракеты? Правильно - много ракет! Пусть по отдельности эти малышки слабы, их рой не оставит врагу и шанса.

data/localization/ru.po

@@ -0,0 +1,137 @@
+# ========== 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 "Smart-Cannon"
+msgstr "Смарт-Пушка"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid " Ionized"
+msgstr " Ионизирующая"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "[outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial]"
+msgid "%1%%2%%3%%4%%5%%6%%7%"
+msgstr "%2%%3%%4%%5%%6%%7%%1%"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid " Cumulative"
+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 "Mass Driver"
+msgstr "Магнитная катапульта"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Mass Warper"
+msgstr "Доставщмк проблем"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Diffuser"
+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/turretgenerator.lua:
+msgid " Holding"
+msgstr " Удерживающий"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Hive-Launcher"
+msgstr "Сотовая ракетная установка"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Swarm-Launcher"
+msgstr "Роевая ракетная установка"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid ""
+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 "Smart-Cannon"
+msgstr "Смарт-Пушка"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Smart-Cannon"
+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 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 "Hookgun"
+msgstr "Гарпун"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Hookgun"
+msgstr "Гарпун"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "Hive-Launcher"
+msgstr "Роевая ракетная установка"
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Hive-Launcher"
+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/lib/weapontype.lua:
+msgctxt "Weapon Type"
+msgid "Hive-Launcher"
+msgstr "Роевая ракетная установка"
+
+

data/localization/template.pot

@@ -1,138 +1,183 @@
-# ========== \data\scripts\lib\turretgenerator.lua ==========
+# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua ==========
-#: \data\scripts\lib\turretgenerator.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.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:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Intro"
 msgstr ""
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/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:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
+msgid "Smartcannon"
-msgid "SmartCannon"
 msgstr ""
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/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:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Heavy Cannon"
 msgstr ""
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/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:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Energy diffuser"
 msgstr ""
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/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:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Hookgun"
 msgstr ""
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/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 ""
 
+
+# ========== 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 "Smart-Cannon"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid "Ionized "
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "[outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial]"
+msgid "%1%%2%%3%%4%%5%%6%%7%"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid "Cumulative "
+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 "Mass Driver"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Mass Warper"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Diffuser"
+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/turretgenerator.lua:
+msgid "Stabilizing"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Hive-Launcher"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgctxt "weapon name"
+msgid "Swarm-Launcher"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+msgid ""
+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 "Smart-Cannon"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Smart-Cannon"
+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 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 "Hookgun"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Hookgun"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Name"
+msgid "Hive-Launcher"
+msgstr ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+msgctxt "Weapon Prefix"
+msgid "Hive-Launcher"
+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/lib/weapontype.lua:
+msgctxt "Weapon Type"
+msgid "HiveLauncher"
+msgstr ""
+
+

data/scripts/lib/inventoryitemprice.lua

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

data/scripts/lib/turretgenerator.lua

@@ -112,6 +112,7 @@ else
     }
 end
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -119,6 +120,7 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
     local crew = Crew()
     crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew, CrewMan(CrewProfessionType.Pilot))
     result.crew = crew
 
     -- generate weapons
@@ -127,16 +129,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 
+    if specType == 1 then
-        name = "Ionized Smart-Cannon /* weapon name*/"%_T
         weapon.shieldPenetration = 1
+        if rand:getInt(0, 1) then
+            weapon.pcolor = ColorHSV(rand:getFloat(180, 210), 0.8, 0.8)
+        else
+            weapon.pcolor = ColorHSV(rand:getFloat(260, 290), 0.8, 0.8)
+        end
     elseif specType == 2 then
-        name = "Plasmed Smart-Cannon /* weapon name*/"%_T
         weapon.damageType = DamageType.Plasma
         weapon.damage = weapon.damage * 0.9
+        weapon.pcolor = ColorHSV(rand:getFloat(90, 120), 0.7, 1)
     end
 
     -- attach weapons to turret
@@ -152,8 +156,13 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
+    local name = "Smart-Cannon /* weapon name*/"%_T
+
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
 
+    if specType == 1 then 
+        outerAdjective = " Ionized"%_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
@@ -162,6 +171,7 @@ end
 generatorFunction[WeaponType.SmartCannon] = TurretGenerator.generateSmartCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -181,7 +191,21 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     local Pen = rand:getInt(0, rarity.value)
     if Pen > 0 then 
         weapon.blockPenetration = Pen
-        outerAdjective = "Cumulative "%_T
+        outerAdjective = " Cumulative"%_T
+    end
+
+    if result.size >= 4 then
+        weapon.psize = weapon.psize * 1.5
+        weapon.speed = weapon.speed * 2
+        weapon.reach = weapon.reach * 1.2
+        weapon.pcolor = ColorHSV(rand:getFloat(10, 45), 0.7, 0.7)
+    end
+
+    if result.size >= 5 then
+        weapon.psize = weapon.psize * 1.5
+        weapon.speed = weapon.speed * 2
+        weapon.reach = weapon.reach * 1.5
+        weapon.pcolor = ColorHSV(rand:getFloat(10, 45), 0.7, 0.9)
     end
 
     -- attach weapons to turret
@@ -202,11 +226,11 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
    
     if result.size >= 4 then
-        name = "Mons Meg /* weapon name*/"%_T
+        name = "Mass Driver /* weapon name*/"%_T
     end
 
     if result.size >= 5 then
-        name = "Dulle Griet /* weapon name*/"%_T
+        name = "Mass Warper /* 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)
@@ -217,6 +241,7 @@ end
 generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -257,6 +282,7 @@ end
 generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -271,6 +297,13 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
 
     local weapon = WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     weapon.damage = weapon.damage / numWeapons
+    
+    local spec = rand:getInt(0, 1)
+    
+    if spec then
+        weapon.holdingForce = weapon.otherForce * 2
+        weapon.otherForce = 0
+    end
 
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -289,6 +322,11 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
     local name = "Hookgun /* weapon name*/"%_T
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
+
+    if spec then
+        outerAdjective = " Holding"%_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
@@ -297,7 +335,7 @@ end
 generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
 
 
-
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 

data/scripts/lib/turretingredients.lua

@@ -2,9 +2,9 @@
 TurretIngredients[WeaponType.SmartCannon] =
 {
     {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 = "Processor",            amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
-    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
+    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach",    investFactor = 1.5, changeType = StatChanges.Percentage},
-    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage",   investFactor = 0.5,},
+    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage",   investFactor = 1,   changeType = StatChanges.Percentage},
     {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,},
@@ -13,9 +13,9 @@ TurretIngredients[WeaponType.SmartCannon] =
 TurretIngredients[WeaponType.HeavyCannon] =
 {
     {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 = "Explosive Charge",     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 L",         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,},
 }
@@ -24,20 +24,19 @@ TurretIngredients[WeaponType.Diffuser] =
 {
     {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 = "Industrial Tesla Coil",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,},
 }
 
-TurretIngredients[WeaponType.Hookgun] = -- TODO Подумать над составляющими
+TurretIngredients[WeaponType.Hookgun] =
 {
-    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Force Generator",      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 = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Power Unit",           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 = "Conductor",            amount = 10,   investable = 0,  minimum = 10,},
-    {name = "Silver",               amount = 5,    investable = 0,  minimum = 5,},
 }
 
 TurretIngredients[WeaponType.HiveLauncher] =

data/scripts/lib/weapongenerator.lua

@@ -4,7 +4,7 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon:setProjectile()
 
     dps = dps * 0.9
-    local fireDelay = rand:getFloat(1.5, 2.5)*0.5
+    local fireDelay = rand:getFloat(0.6, 1)
     local reach = rand:getFloat(1100, 1500)*0.7
     local damage = dps * fireDelay
     local speed = rand:getFloat(300, 400)*4
@@ -32,7 +32,7 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.psize = rand:getFloat(0.2, 0.5)
     weapon.pmaximumTime = existingTime
     weapon.pvelocity = speed
-    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
+    weapon.pcolor = ColorHSV(rand:getFloat(20, 45), 0.7, 1)
 
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
@@ -53,7 +53,7 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
 
     dps = dps * 1.85
     local fireDelay = rand:getFloat(1.5, 2.0)*1.7
-    local reach = rand:getFloat(1100, 1500)*1.2
+    local reach = rand:getFloat(1100, 1500)*1.5
     local damage = dps * fireDelay
     local speed = rand:getFloat(600, 1000)*1.4
     local existingTime = (reach / speed)*1.1
@@ -65,7 +65,7 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     weapon.name = "Heavy Cannon /* Weapon Name*/"%_t
     weapon.icon = "data/textures/icons/heavycannon.png"
     weapon.sound = "cannon"
-    weapon.accuracy = 0.95 - rand:getFloat(0, 0.02)
+    weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
 
     weapon.damage = damage
     weapon.damageType = DamageType.Physical
@@ -75,10 +75,10 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     weapon.otherForce = dps*math.max(1, rarity.value)*89*5
 
 
-    weapon.psize = rand:getFloat(0.2, 0.5)
+    weapon.psize = rand:getFloat(1.2, 1.5)
     weapon.pmaximumTime = existingTime
     weapon.pvelocity = speed
-    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 45), 0.7, 0.4)
 
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
@@ -164,7 +164,6 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
 
     weapon.blockPenetration = rand:getInt(0, rarity.value) + 2
 
-
     weapon.otherForce = -500 * dps * rarity.value
 
     weapon.damage = damage
@@ -183,13 +182,11 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     weapon.banimationAcceleration = 0
     weapon.bshapeSize = 13
 
-    -- shades of blue
+    weapon.bouterColor = ColorHSV(rand:getInt(255, 260), 0,75, rand:getFloat(0.2, 0.25))
-    weapon.bouterColor = ColorHSV(0, 0, rand:getFloat(0.35, 0.65))
+    weapon.binnerColor = ColorHSV(rand:getInt(255, 260), 0,75, rand:getFloat(0, 0.15))
-    weapon.binnerColor = ColorHSV(1, 1, rand:getFloat(0.35, 0.65))
 
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
-
     return weapon
 end
 
@@ -204,7 +201,7 @@ function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
     local fireDelay = rand:getFloat(2.2, 3)
     local reach = rand:getFloat(1300, 1800)
     local damage = dps * fireDelay
-    local speed = rand:getFloat(150, 200)
+    local speed = rand:getFloat(200, 250)
     local existingTime = reach / speed
 
     weapon.fireDelay = fireDelay 
@@ -227,7 +224,7 @@ function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
     weapon.psize = rand:getFloat(0.2, 0.4)
     weapon.pmaximumTime = existingTime
     weapon.pvelocity = speed
-    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.8, rand:getFloat(0.25, 0.75))
     weapon.pshape = ProjectileShape.Rocket
 
     if rand:test(1) then

data/scripts/lib/weapontype.lua

@@ -1,6 +1,6 @@
 
-WeaponTypes.addType("SmartCannon", "Smart Сannon /* Weapon Type */"%_t, armed)
+WeaponTypes.addType("SmartCannon", "Smart-Сannon /* Weapon Type */"%_t, armed)
 WeaponTypes.addType("HeavyCannon", "Heavy Cannon /* Weapon Type */"%_t, armed)
 WeaponTypes.addType("Diffuser", "Diffuser /* Weapon Type */"%_t, armed)
 WeaponTypes.addType("Hookgun", "Hookgun /* Weapon Type */"%_t, armed)
-WeaponTypes.addType("HiveLauncher", "HiveLauncher /* Weapon Type */"%_t, armed)
+WeaponTypes.addType("HiveLauncher", "Hive-Launcher /* Weapon Type */"%_t, armed)