Update README.md

Update file ru.po
Update README.md
2023-09-02 21:51:06 +00:00 · 2023-09-02 21:50:30 +00:00 · 2023-09-02 21:49:59 +00:00 · 2023-09-02 21:49:54 +00:00 · 2023-09-02 21:41:23 +00:00 · 2023-09-02 21:37:55 +00:00
27 changed files with 1045 additions and 580 deletions
--- a/.gitattributes
+++ b/.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
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,17 @@ release_job:
  stage: release  # It only runs when *both* jobs in the test stage complete successfully.
  image: registry.gitlab.com/gitlab-org/release-cli:latest

-  rules:
-    - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
-    - if: $CI_COMMIT_TAG
-      when: never  
-    - if: 
+  only:
+    # - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+    refs:
+      - main
+      - ^tags
    changes:
+      - ^README.md
+      - ^CHANGELOG
+      - ^.gitattribute
+      - ^.gitignore
+      - ^.gitlab-ci.yml
      - data/**/*
      - modinfo.lua
      - thumb.png
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\C:\\Users\\riksl\\Source\\Repos\\weapon-project-extended",
-  "PreviewInSolutionExplorer": false
-}
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
--- a/.vs/weapon-project-extended/FileContentIndex/2fe244d5-ef8a-4276-982d-733b681bb951.vsidx
+++ b/.vs/weapon-project-extended/FileContentIndex/2fe244d5-ef8a-4276-982d-733b681bb951.vsidx
--- a/.vs/weapon-project-extended/v17/.wsuo
+++ b/.vs/weapon-project-extended/v17/.wsuo
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-[![pipeline status](http://gl.beaconborn.ru/bacon/weapon-project-extended/badges/main/pipeline.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/commits/main)
-# weapon project extended
+[![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
@@ -12,3 +13,28 @@ That mod for Avorion original writed [Alive!](https://steamcommunity.com/id/CasK
 * Smart-cannon
 * Heavy Cannon
 * Diffuser
+
+### Описание
+
+Возвращение олдсульного мода на сбалансированное оружие!
+
+WPE-Remastered добавляет несколько новых, хорошо сбалансированных для ванильной игры орудий.
+
+В отличии от старой (ого, прошло уже больше 4 лет) версии часть орудий была заменена на новые образцы, а остальные доведены до идеала ( но могут быть отредактированы по отзывам пользователей).
+
+И так, орудия:
+
+Смарт-пушка: 
+Вариант пушки со снарядами, начиненными всякой электроникой для наведения и уничтожения врага. Да, дороже чем обычно, но поверьте, оно того стоит! [Возможны модификации для пробития щитов и плазменных зарядов]
+
+Тяжелая пушка:
+"Большому кораблю нужны большие калибры!" - именно этим девизом руководствовались инженеры разрабатывая данное оружие. Лучший способ доставить противнику **БОЛЬШИЕ** проблемы
+
+Гарпун:
+Враг убегает? Не сегодня! Гарпун не даст врагу и шанса улизнуть.
+
+Рассеиватель энергии:
+У врага мощный щит? Не проблема! Бюро сверхсовременных разработок нашло решение и этой проблемы: рассеиватель энергии скушает щиты как вкусный тортик (но увы, даже не облизнет корпус).
+
+Сотовые ракетные установки:
+Что может быть лучше ракеты? Правильно - много ракет! Пусть по отдельности эти малышки слабы, их рой не оставит врагу и шанса.
--- a/data/localization/ru.po
+++ b/data/localization/ru.po
@@ -1,92 +1,137 @@
-# ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
+# ========== 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 "Умная пушка"
+msgid "Smart-Cannon"
+msgstr "Смарт-Пушка"

-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
-msgid "Smart Cannon"
-msgstr "Умная пушка"
+msgid "Smart-Cannon"
+msgstr "Смарт-Пушка"

-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
 msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
+msgstr "Тяжелое орудие"

-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Cumulative Heavy Cannon"
-msgstr "Кумулятивная тяжелая пушка"
-
-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
 msgid "Diffuser"
 msgstr "Диффузор"

-#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: 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 "Гарпун"

-# ========== /mods/WPE2/data/scripts/lib/weapontype.lua ==========
-#: /mods/WPE2/data/scripts/lib/weapontype.lua:
+#: 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 "Auto Сannon"
-msgstr "Автопушка"
+msgid "Smart-Сannon"
+msgstr "Смарт-Пушка"

-#: /mods/WPE2/data/scripts/lib/weapontype.lua:
+#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
 msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
+msgstr "Тяжелое орудие"

-#: /mods/WPE2/data/scripts/lib/weapontype.lua:
+#: 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 "Гарпун"

-# ========== /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ==========
-#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "WPE Turrets"
-msgstr "Расширенный пак оружия"
-
-#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Intro"
-msgstr "Вступление"
-
-#: /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Я рекомендую использовать модели турелей из коллекции в мастерской"
-
-#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Autocannon"
-msgstr "Автопушка"
-
-#: /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)."
-
-#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Heavy Cannon"
-msgstr "Тяжелая Пушка"
-
-#: /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- Требует больше экипажа"
-
-#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Energy diffuser"
-msgstr "Энегретический диффузор"
-
-#: /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/lib/weapontype.lua:
+msgctxt "Weapon Type"
+msgid "Hive-Launcher"
+msgstr "Роевая ракетная установка"


--- a/data/localization/template.pot
+++ b/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 ""
+
+
--- a/data/scripts/_player/ui/encyclopedia/chapters/wpeturrets.lua
+++ b/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,
    },
--- a/data/scripts/_player/ui/encyclopedia/contents.lua
+++ b/data/scripts/_player/ui/encyclopedia/contents.lua
--- a/data/scripts/_player/ui/encyclopedia/encyclopedia.lua
+++ b/data/scripts/_player/ui/encyclopedia/encyclopedia.lua
--- a/data/scripts/lib/galaxy.lua
+++ b/data/scripts/lib/galaxy.lua
@@ -1,5 +1,6 @@

-weaponProbabilities[WeaponType.Hookgun] =  {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.Harpoon] = {d = 0.6, p = 1.0}
+weaponProbabilities[WeaponType.SmartCannon] =  {d = 0.65, p = 2.0}
+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}
--- a/data/scripts/lib/inventoryitemprice.lua
+++ b/data/scripts/lib/inventoryitemprice.lua
@@ -1,5 +1,6 @@

-valueWeights[WeaponType.SmartCannon	] = 2
-valueWeights[WeaponType.HeavyCannon	] = 1.7
-valueWeights[WeaponType.Diffuser	] = 2.1
-valueWeights[WeaponType.Hookgun		] = 2.1
+valueWeights[WeaponType.SmartCannon	] = 1.2
+valueWeights[WeaponType.HeavyCannon	] = 1
+valueWeights[WeaponType.Diffuser	] = 2
+valueWeights[WeaponType.Hookgun		] = 1
+valueWeights[WeaponType.HiveLauncher] = 1
--- a/data/scripts/lib/turretgenerator.lua
+++ b/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,6 +26,14 @@ 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 = 4.0,    usedSlots = 6},
+}
+
+scales[WeaponType.HiveLauncher] = {
+    {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},
 }

@@ -34,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] = {
@@ -52,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] = {
@@ -71,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] = {
@@ -85,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] = {
@@ -95,6 +96,23 @@ else
    }
 end

+if GameVersion() >= Version(0, 31, 0) then
+    possibleSpecialties[WeaponType.HiveLauncher] = {
+        {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] = {
+        Specialty.HighDamage,
+        Specialty.HighRange,
+        Specialty.FasterRechargeTime,
+    }
+end
+
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
    local result = TurretTemplate()

@@ -102,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
@@ -110,6 +129,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)

@@ -118,23 +151,34 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)

    TurretGenerator.scale(rand, result, WeaponType.SmartCannon, tech, 0.6)
-    TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)

+    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
 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

@@ -144,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)

@@ -152,16 +216,32 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)

    TurretGenerator.scale(rand, result, WeaponType.HeavyCannon, tech, 0.6)
-    TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)

+    result.slotType = TurretSlotType.Armed
    result:updateStaticStats()

+    local name = "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
+
+    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

 generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret


+ -- ===========================================================================================================================================================
 function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
    local result = TurretTemplate()

@@ -186,16 +266,23 @@ function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarit


    TurretGenerator.scale(rand, result, WeaponType.Diffuser, tech, 0.75)
-    TurretGenerator.addSpecialties(rand, result, WeaponType.Diffuser)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.Diffuser)

+    result.slotType = TurretSlotType.Armed
    result:updateStaticStats()

+    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] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
+
    return result
 end

 generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret


+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity)
    local result = TurretTemplate()

@@ -211,6 +298,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)

@@ -220,11 +314,78 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity


    TurretGenerator.scale(rand, result, WeaponType.Hookgun, tech, 0.75)
-    TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun)

+    result.slotType = TurretSlotType.Armed
    result:updateStaticStats()

+    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
 end

 generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
+
+
+ -- ===========================================================================================================================================================
+function TurretGenerator.generateHiveLauncherTurret(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))
+    result.crew = crew
+
+    -- generate weapons
+    local numWeapons = rand:getInt(1, 2)
+
+    local weapon = WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
+    weapon.damage = weapon.damage / numWeapons
+
+    -- attach weapons to turret
+    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
+
+    -- 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.RocketLauncher, tech, 0.6, coaxialAllowed)
+    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.RocketLauncher)
+
+    result.slotType = TurretSlotType.Armed
+    result:updateStaticStats()
+
+    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)
+    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
+
+generatorFunction[WeaponType.HiveLauncher] = TurretGenerator.generateHiveLauncherTurret
--- a/data/scripts/lib/turretingredients.lua
+++ b/data/scripts/lib/turretingredients.lua
@@ -2,44 +2,50 @@
 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 = "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.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,},
-    -- {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 = "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,},
-    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
 }

 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 = "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 = "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 = "Conductor",            amount = 10,   investable = 0,  minimum = 10,},
+}
+
+TurretIngredients[WeaponType.HiveLauncher] =
+{
+    {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,},
 }
--- a/data/scripts/lib/weapongenerator.lua
+++ b/data/scripts/lib/weapongenerator.lua
@@ -3,21 +3,21 @@ 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
    weapon.reach = reach
    weapon.appearanceSeed = rand:getInt()
-    weapon.seeker = rand:test(1 / 2)
+    weapon.seeker = 1
    weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "Smart Cannon /* Weapon Name*/"%_t
-    weapon.prefix = "Smart Cannon /* Weapon Prefix*/"%_t
-    weapon.icon = "data/textures/icons/autocannon.png" 
+    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)

@@ -28,10 +28,11 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
    weapon.impactSound = 1
    weapon.impactExplosion = true

+
    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)

@@ -44,13 +45,15 @@ 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
@@ -62,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
@@ -72,19 +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)
-
-    local Pen = rand:getInt(0, rarity.value)
-    if Pen > 0 then 
-        weapon.blockPenetration = Pen
-        weapon.prefix = "Cumulative Heavy Cannon /* Weapon Prefix*/"%_t
-    else
-        weapon.prefix = "Heavy Cannon /* Weapon Prefix*/"%_t
-    end
-
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 45), 0.7, 0.4)

    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)

@@ -98,6 +92,7 @@ end
 generatorFunction[WeaponType.HeavyCannon] = WeaponGenerator.generateHeavyCannon


+
 function WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
    local weapon = Weapon()
    weapon:setBeam()
@@ -163,13 +158,12 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
    weapon.appearance = WeaponAppearance.Cannon
    weapon.name = "Hookgun /* Weapon Name*/"%_t
    weapon.prefix = "Hookgun /* Weapon Prefix*/"%_t
-    weapon.icon = "data/textures/icons/harpoon.png" 
+    weapon.icon = "data/textures/icons/hookgun.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.damage = damage
@@ -188,14 +182,63 @@ 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:setProjectile()
+
+    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.reach = reach
+    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.5 - rand:getFloat(0, 0.02)
+
+    weapon.damage = damage
+    weapon.damageType = DamageType.Physical
+    weapon.impactParticles = ImpactParticles.Explosion
+    weapon.impactSound = 1
+    weapon.impactExplosion = true
+
+    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
+
+    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
+
+generatorFunction[WeaponType.HiveLauncher] = WeaponGenerator.generateHiveLauncher
--- a/data/scripts/lib/weapontype.lua
+++ b/data/scripts/lib/weapontype.lua
@@ -1,5 +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", "Hive-Launcher /* Weapon Type */"%_t, armed)
--- a/data/textures/icons/autocannon.png
+++ b/data/textures/icons/autocannon.png
--- a/data/textures/icons/diffuser.png
+++ b/data/textures/icons/diffuser.png
--- a/data/textures/icons/harpoon.png
+++ b/data/textures/icons/harpoon.png
--- a/data/textures/icons/hivelauncher.png
+++ b/data/textures/icons/hivelauncher.png
--- a/data/textures/icons/hookgun.png
+++ b/data/textures/icons/hookgun.png
--- a/data/textures/icons/railgun.png
+++ b/data/textures/icons/railgun.png
--- a/data/textures/icons/smartcannon.png
+++ b/data/textures/icons/smartcannon.png
--- a/modinfo.lua
+++ b/modinfo.lua
@@ -10,17 +10,17 @@ meta =
    name = "Weapon_Pack_Extended2",

    -- Title of your mod that will be displayed to players
-    title = "Weapon Pack Extended2",
+    title = "Weapon Pack Extended - Reloaded",

    -- Description of your mod that will be displayed to players
    description = "Adds some new weapon to the game.",

    -- Insert all authors into this list
-    authors = {"Alive!"},
+    authors = {"Casimir Kepler, Baconborn, OmenOs"},

    -- Version of your mod, should be in format 1.0.0 (major.minor.patch) or 1.0 (major.minor)
    -- This will be used to check for unmet dependencies or incompatibilities
-    version = "1.3",
+    version = "2.0",

    -- If your mod requires dependencies, enter them here. The game will check that all dependencies given here are met.
    -- Possible attributes:
@@ -52,5 +52,5 @@ meta =
    saveGameAltering = false,

    -- Contact info for other users to reach you in case they have questions
-    contact = "https://steamcommunity.com/id/CasKepler2/",
+    contact = "https://steamcommunity.com/id/CasKepler2/", "https://steamcommunity.com/id/baconborn/",
 }
--- a/thumb.png
+++ b/thumb.png
Author	SHA1	Message	Date
Alex	8fbf824f7f	Update README.md	2023-09-02 21:51:06 +00:00
Slava	c55d5e6ddc	Update file ru.po	2023-09-02 21:50:30 +00:00
Alex	567792c74c	Update README.md	2023-09-02 21:49:59 +00:00
Slava	ea8dfa8489	Update file ru.po	2023-09-02 21:49:54 +00:00
Slava	43dd5cfbc9	Update 2 files - /data/localization/ru.po - /data/scripts/lib/turretgenerator.lua	2023-09-02 21:41:23 +00:00
Alex	d9b94de051	Update README.md	2023-09-02 21:37:55 +00:00
Slava	75a2857eae	Update file ru.po	2023-09-02 21:33:50 +00:00
Slava	ab165df8a2	Update file weapontype.lua	2023-09-02 21:30:32 +00:00
Slava	e0a322ae86	Update file ru.po	2023-09-02 21:29:33 +00:00
bacon	ab3aaa88ee	remove unused	2023-09-03 00:19:08 +03:00
bacon	7c23013cfb	mask encyclopedia	2023-09-03 00:19:08 +03:00
bacon	58374c979c	reset localization	2023-09-03 00:19:08 +03:00
Alex	5b5f424f95	Update file weapongenerator.lua	2023-09-02 21:04:38 +00:00
Alex	ee72127b0a	Update file inventoryitemprice.lua	2023-09-02 20:59:09 +00:00
Alex	29928558d3	Replace thumb.png	2023-09-02 20:47:48 +00:00
Alex	101d4e1c44	Update file weapongenerator.lua	2023-09-02 20:47:34 +00:00
Alex	314e65c4bc	Update 2 files - /data/scripts/lib/turretgenerator.lua - /data/scripts/lib/weapongenerator.lua	2023-09-02 20:31:32 +00:00
Alex	577378ae36	Update 2 files - /data/scripts/lib/turretgenerator.lua - /data/scripts/lib/weapongenerator.lua	2023-09-02 20:07:13 +00:00
Alex	59c5f2cb36	Replace thumb.png	2023-09-02 20:01:13 +00:00
Slava	138f510ea2	Update 2 files - /data/scripts/player/ui/encyclopedia/encyclopedia.lua - /data/scripts/player/ui/encyclopedia/_encyclopedia.lua	2023-09-02 19:39:31 +00:00
Slava	d6ea8f534e	Update file README.md	2023-09-02 19:35:58 +00:00
Alex	85889377c9	Replace thumb.png	2023-09-02 19:32:57 +00:00
Alex	f37108304e	Update file turretgenerator.lua	2023-09-02 18:56:12 +00:00
Alex	d72a2b701e	Update file turretgenerator.lua	2023-09-02 18:55:23 +00:00
Alex	c0b7a4ef83	Update file turretgenerator.lua	2023-09-02 18:55:09 +00:00
Alex	8e63f249a7	Update file turretgenerator.lua	2023-09-02 18:54:06 +00:00
Alex	9a56e21c2a	Update file turretgenerator.lua	2023-09-02 18:49:04 +00:00
Alex	32fc8f43ea	Update 3 files - /data/scripts/lib/weapongenerator.lua - /data/scripts/lib/turretgenerator.lua - /data/scripts/lib/turretingredients.lua	2023-09-02 18:19:34 +00:00
Weblate Admin	b7351d174a	Translated using Weblate (Russian) Currently translated at 59.2% (16 of 27 strings) Translation: WPE-2/ru	2023-09-02 07:30:17 +00:00
Weblate Admin	f4ca4afa45	Added translation using Weblate (Russian)	2023-09-01 03:33:57 +00:00
Alex	863e00a5d0	Update file weapongenerator.lua	2023-08-30 20:17:50 +00:00
Alex	f258093ca3	Update file weapongenerator.lua	2023-08-30 19:19:23 +00:00
Slava	a0a45906a1	Delete ru.po	2023-08-30 18:40:03 +00:00
Alex	0a3f032d56	Update file turretgenerator.lua	2023-08-30 18:37:08 +00:00
Alex	e531517104	Update file turretgenerator.lua	2023-08-30 18:30:44 +00:00
Alex	c2d09f1cc2	Update file turretgenerator.lua	2023-08-30 18:22:54 +00:00
Alex	c232b70341	Update 5 files - /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	2023-08-30 18:21:10 +00:00
Alex	f7d95dab9d	Update file turretgenerator.lua	2023-08-30 06:41:01 +00:00
Weblate	fa2efb38ff	Merge branch 'origin/main' into Weblate.	2023-08-29 23:10:52 +00:00
Weblate Admin	0dc950077d	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 23:10:51 +00:00
Weblate Admin	b2f7d58187	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 23:08:58 +00:00
Weblate Admin	425e3fc101	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 23:06:18 +00:00
Slava	ad6bcf30dc	Update file ru.po	2023-08-29 21:38:15 +00:00
Weblate Admin	b35cfba58e	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 21:28:43 +00:00
Weblate Admin	899f3702c7	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 21:08:14 +00:00
Weblate Admin	cfdb5e445d	Translated using Weblate (Russian) Currently translated at 100.0% (27 of 27 strings) Translation: WPE-2/ru Translate-URL: http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/	2023-08-29 21:02:10 +00:00
Slava	de517a1b5b	Update 2 files - /data/localization/template.pot - /data/localization/ru.po	2023-08-29 20:52:08 +00:00
Slava	b5036334b1	Update 3 files - /data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua - /data/localization/ru.po - /data/localization/template.pot	2023-08-29 20:48:31 +00:00
Slava	385608bb7a	Update 3 files - /data/localization/template.pot - /data/localization/ru.po - /data/scripts/lib/turretgenerator.lua	2023-08-29 19:21:40 +00:00
Slava	357d46cd1f	Reset Translate	2023-08-29 19:03:58 +00:00
Slava	3cd1e2d575	Add translation template file	2023-08-29 15:31:29 +00:00
Alex	9111bf856e	Update 2 files - /data/scripts/lib/weapongenerator.lua - /data/scripts/lib/turretgenerator.lua	2023-08-29 15:11:13 +00:00
bacon	f74138d77b	changed main	2023-08-29 02:06:55 +03:00
Slava	cbcc5ae680	Update file .gitattributes	2023-08-28 21:01:26 +00:00
Alex	fc351d2555	Update 2 files - /data/textures/icons/hive.png - /data/textures/icons/hivelauncher.png	2023-08-28 20:08:36 +00:00
Alex	e90ff8f1e2	Update file weapongenerator.lua	2023-08-28 20:08:13 +00:00
Alex	13a688edb3	Update 2 files - /data/scripts/lib/turretgenerator.lua - /data/scripts/lib/weapongenerator.lua	2023-08-28 20:07:43 +00:00
Slava	0880b82677	Update 6 files - /data/scripts/lib/galaxy.lua - /data/scripts/lib/inventoryitemprice.lua - /data/scripts/lib/turretgenerator.lua - /data/scripts/lib/turretingredients.lua - /data/scripts/lib/weapongenerator.lua - /data/scripts/lib/weapontype.lua	2023-08-28 18:50:20 +00:00
bacon	050a642982	- retexture	2023-08-28 01:09:23 +03:00
bacon	6a8483efa5	Merge branch 'HEAD' of git@gl.beaconborn.ru:bacon/weapon-project-extended.git	2023-08-28 00:52:40 +03:00
bacon	e8f8d9d195	- retexture - rebalance	2023-08-28 00:48:41 +03:00
Alex	eec8c10de4	Update file modinfo.lua	2023-08-27 21:38:49 +00:00
Alex	f51f351e06	Update file modinfo.lua	2023-08-27 21:38:08 +00:00
bacon	7d60ec6da3	Merge remote-tracking branch 'origin/main'	2023-08-27 20:02:13 +03:00
bacon	1eec0fba6c	up	2023-08-27 20:01:07 +03:00
Slava	b137aec60a	Update file weapongenerator.lua	2023-08-27 17:00:17 +00:00
bacon	f3deba9b30	fixed	2023-08-27 19:46:14 +03:00
Slava	ca00911fd7	Update 2 files - /data/localization/ru.po - /data/scripts/lib/weapongenerator.lua	2023-08-27 16:41:44 +00:00
Slava	3b34148f77	Updated balance	2023-08-27 16:32:58 +00:00
Slava	cae212f5a9	Merge branch 'alive-main-patch-16741' into 'main' Upload New File See merge request bacon/weapon-project-extended!1	2023-08-27 16:31:14 +00:00
Alex	3988151ccf	Upload New File	2023-08-27 16:29:28 +00:00
Slava	94eff683a6	Update README.md	2023-08-27 06:42:45 +00:00
Slava	8ba224680f	Update README.md	2023-08-26 23:39:09 +00:00
Slava	5f3dac6eef	Update file modinfo.lua	2023-08-26 23:38:28 +00:00
Slava	03dd9529e0	Update .gitlab-ci.yml file	2023-08-26 23:37:32 +00:00
Slava	abd1186280	Update .gitlab-ci.yml file	2023-08-26 23:27:42 +00:00
Slava	4f65bc33b4	Update .gitlab-ci.yml file	2023-08-26 23:25:00 +00:00
Slava	3f17cef2f3	Update .gitlab-ci.yml file	2023-08-26 23:24:50 +00:00
Slava	83b57db47c	Update 4 files - /.vs/weapon-project-extended/FileContentIndex/2fe244d5-ef8a-4276-982d-733b681bb951.vsidx - /.vs/weapon-project-extended/v17/.wsuo - /.vs/VSWorkspaceState.json - /.vs/slnx.sqlite	2023-08-26 23:23:44 +00:00