Update README.md

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

.gitattributes

@@ -4,4 +4,4 @@ CHANGELOG export-ignore
 .gitlab-ci.yml export-ignore
 .git export-ignore
 .vs export-ignore
-.gitignore exsport-ignore
+.gitignore export-ignore

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

@@ -1,56 +1,81 @@
 # ========== 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 ""
+msgid "Smart-Cannon"
+msgstr "Смарт-Пушка"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Ionized"
-msgstr ""
+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 "Умная пушка"
+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 ""
+msgstr "Тяжелое орудие"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
 msgctxt "weapon name"
-msgid "Diffusor"
-msgstr ""
+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 "SmartCannon"
-msgstr "Умная пушка"
+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 Prefix"
-msgid "Cumulative"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
+msgstr "Тяжелое орудие"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
@@ -64,25 +89,35 @@ msgstr "Диффузор"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
-msgid "Harpoon"
-msgstr ""
+msgid "Hookgun"
+msgstr "Гарпун"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
-msgid "Harpoon"
-msgstr ""
+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 ""
+msgid "Smart-Сannon"
+msgstr "Смарт-Пушка"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
 msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
+msgstr "Тяжелое орудие"
 
 #: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
@@ -92,62 +127,11 @@ 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 "Кумулятивная тяжелая пушка"
+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

@@ -0,0 +1,183 @@
+# ========== 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 ""
+
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua:
+msgid "Smartcannon"
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+
+# ========== 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/_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,
     },

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.Hookgun		] = 1.5
-valueWeights[WeaponType.HiveLauncher] = 2
+valueWeights[WeaponType.SmartCannon	] = 1.2
+valueWeights[WeaponType.HeavyCannon	] = 1
+valueWeights[WeaponType.Diffuser	] = 2
+valueWeights[WeaponType.Hookgun		] = 1
+valueWeights[WeaponType.HiveLauncher] = 1

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] = {
@@ -116,6 +112,7 @@ else
     }
 end
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -123,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
@@ -130,6 +128,20 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
 
     local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
+    
+    local specType = rand:getInt(0, 2)
+    if specType == 1 then
+        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
+        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
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -144,17 +156,14 @@ 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 name = "Smart-Cannon /* weapon name*/"%_T
 
     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 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
 end
@@ -162,13 +171,14 @@ end
 generatorFunction[WeaponType.SmartCannon] = TurretGenerator.generateSmartCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
     -- 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 +188,26 @@ 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
+
+    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
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
 
@@ -193,14 +223,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 = "Mass Driver /* 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 = "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)
 
     return result
 end
@@ -208,6 +241,7 @@ end
 generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -237,10 +271,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
@@ -248,6 +282,7 @@ end
 generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -262,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)
@@ -278,22 +320,22 @@ 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)
+
+    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
 end
 
 generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
 
+
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -310,30 +352,38 @@ function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, r
     weapon.damage = weapon.damage / numWeapons
 
     -- attach weapons to turret
-    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
+    local positions = {}
+    if rand:getBool() then
+        table.insert(positions, vec3(0, 0.3, 0))
+    else
+        table.insert(positions, vec3(0.4, 0.3, 0))
+        table.insert(positions, vec3(-0.4, 0.3, 0))
+    end
 
-    local rechargeTime = 4 * rand:getFloat(0.8, 1.2)
-    local shootingTime = 2 * rand:getFloat(0.8, 1.2)
-    TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime)
+    -- attach
+    for _, position in pairs(positions) do
+        weapon.localPosition = position * result.size
+        result:addWeapon(weapon)
+    end
 
+    local shootingTime = 20 * rand:getFloat(0.8, 1.2)
+    local coolingTime = 15 * rand:getFloat(0.8, 1.2)
+    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
 
-    TurretGenerator.scale(rand, result, WeaponType.HiveLauncher, tech, 0.75)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.HiveLauncher)
+    TurretGenerator.scale(rand, result, WeaponType.RocketLauncher, tech, 0.6, coaxialAllowed)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.RocketLauncher)
 
     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,51 @@
 
 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 = "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 = "Servo",                amount = 15,   investable = 10, minimum = 5,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Processor",            amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {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 = 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,},
-    -- {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 = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {name = "Servo",                amount = 8,    investable = 8,  minimum = 4,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {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,},
-    -- {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 = "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] =
 {
-    {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 = "Force Generator",      amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Energy Tube",          amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
+    {name = "Power Unit",           amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Steel",                amount = 20,   investable = 0,  minimum = 20,},
+    {name = "Conductor",            amount = 10,   investable = 0,  minimum = 10,},
 }
 
 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
-    local fireDelay = rand:getFloat(1.5, 2.5)*0.5
+    dps = dps * 0.9
+    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)*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)
@@ -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)
 
@@ -46,13 +46,14 @@ end
 generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
 
 
+
 function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
 
     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
@@ -64,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
@@ -74,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)
 
@@ -91,6 +92,7 @@ end
 generatorFunction[WeaponType.HeavyCannon] = WeaponGenerator.generateHeavyCannon
 
 
+
 function WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setBeam()
@@ -162,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
@@ -181,64 +182,61 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     weapon.banimationAcceleration = 0
     weapon.bshapeSize = 13
 
-    -- shades of blue
-    weapon.bouterColor = ColorHSV(0, 0, rand:getFloat(0.35, 0.65))
-    weapon.binnerColor = ColorHSV(1, 1, rand:getFloat(0.35, 0.65))
+    weapon.bouterColor = ColorHSV(rand:getInt(255, 260), 0,75, rand:getFloat(0.2, 0.25))
+    weapon.binnerColor = ColorHSV(rand:getInt(255, 260), 0,75, rand:getFloat(0, 0.15))
 
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
-
     return weapon
 end
 
 generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun
 
+
+
 function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
     local weapon = Weapon()
-    weapon:setBeam()
+    weapon:setProjectile()
 
-    local fireDelay = rand:getFloat(0.2, 0.5)
-    local reach = rand:getFloat(500, 900)
+    local fireDelay = rand:getFloat(2.2, 3)
+    local reach = rand:getFloat(1300, 1800)
     local damage = dps * fireDelay
+    local speed = rand:getFloat(200, 250)
+    local existingTime = reach / speed
 
-    weapon.fireDelay = fireDelay
-    weapon.appearanceSeed = rand:getInt()
+    weapon.fireDelay = fireDelay 
     weapon.reach = reach
-    weapon.continuousBeam = true
-    weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "HiveLauncher /* Weapon Name*/"%_t
-    weapon.prefix = "HiveLauncher /* Weapon Prefix*/"%_t
+    weapon.appearanceSeed = rand:getInt()
+    weapon.seeker = true
+    weapon.appearance = WeaponAppearance.RocketLauncher
+    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.99 - rand:getFloat(0, 0.02)
-
-    weapon.blockPenetration = rand:getInt(0, rarity.value) + 2
-
-
-    weapon.otherForce = -500 * dps * rarity.value
+    weapon.accuracy = 0.5 - rand:getFloat(0, 0.02)
 
     weapon.damage = damage
     weapon.damageType = DamageType.Physical
-    weapon.impactParticles = ImpactParticles.Physical
-    weapon.shieldDamageMultiplicator = 0.75
-    weapon.stoneDamageMultiplicator = 1.2
-    weapon.hullDamageMultiplicator = 1
+    weapon.impactParticles = ImpactParticles.Explosion
     weapon.impactSound = 1
+    weapon.impactExplosion = true
 
-    weapon.blength = weapon.reach
-    weapon.bshape = BeamShape.Swirly
-    weapon.bwidth = 0.5
-    weapon.bauraWidth = 3
-    weapon.banimationSpeed = 0
-    weapon.banimationAcceleration = 0
-    weapon.bshapeSize = 13
+    weapon.psize = rand:getFloat(0.2, 0.4)
+    weapon.pmaximumTime = existingTime
+    weapon.pvelocity = speed
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.8, rand:getFloat(0.25, 0.75))
+    weapon.pshape = ProjectileShape.Rocket
 
-    -- shades of blue
-    weapon.bouterColor = ColorHSV(0, 0, rand:getFloat(0.35, 0.65))
-    weapon.binnerColor = ColorHSV(1, 1, rand:getFloat(0.35, 0.65))
+    if rand:test(1) then
+        local shots = {6, 10, 14, 18, 22, 26, 30}
+        weapon.shotsFired = shots[rand:getInt(1, #shots)]
+        weapon.damage = (weapon.damage * 1.5) / weapon.shotsFired
+    end
 
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
+    weapon.recoil = weapon.damage * 2
+    weapon.explosionRadius = math.sqrt(weapon.damage * 5)
 
     return weapon
 end

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)